From 75028631a95c53f76806e85469fc482c30208ef5 Mon Sep 17 00:00:00 2001
From: Brian Canini <canini.16@osu.edu>
Date: Wed, 10 Jun 2020 10:16:48 -0400
Subject: [PATCH] updating core from 8.8.6 --> 8.9.0
---
composer.json | 2 +-
composer.lock | 1123 ++++---
vendor/asm89/stack-cors/composer.json | 4 +-
.../src/Asm89/Stack/CorsService.php | 2 +
vendor/composer/autoload_classmap.php | 421 +--
vendor/composer/autoload_files.php | 29 +-
vendor/composer/autoload_namespaces.php | 1 -
vendor/composer/autoload_psr4.php | 11 +-
vendor/composer/autoload_real.php | 3 -
vendor/composer/autoload_static.php | 515 +--
vendor/composer/installed.json | 1201 ++++---
vendor/composer/installers/composer.json | 13 +-
.../src/Composer/Installers/BaseInstaller.php | 1 +
.../Composer/Installers/CakePHPInstaller.php | 28 +-
.../Composer/Installers/DrupalInstaller.php | 4 +-
.../src/Composer/Installers/Installer.php | 2 +
.../Composer/Installers/MantisBTInstaller.php | 23 +
.../src/Composer/Installers/Plugin.php | 14 +-
.../Composer/Installers/SyliusInstaller.php | 9 +
vendor/composer/semver/CHANGELOG.md | 6 +
vendor/composer/semver/composer.json | 3 +-
.../semver/src/Constraint/Constraint.php | 10 +-
.../semver/src/Constraint/EmptyConstraint.php | 2 +-
.../semver/src/Constraint/MultiConstraint.php | 2 +-
vendor/composer/semver/src/Semver.php | 4 +-
vendor/composer/semver/src/VersionParser.php | 21 +-
.../EmailValidator/EmailLexer.php | 44 +-
.../EmailValidator/EmailParser.php | 37 +-
.../EmailValidator/EmailValidator.php | 8 +-
.../EmailValidator/Parser/DomainPart.php | 36 +-
.../EmailValidator/Parser/LocalPart.php | 19 +-
.../EmailValidator/Parser/Parser.php | 36 +-
.../Validation/DNSCheckValidation.php | 11 +-
.../Exception/EmptyValidationList.php | 3 +
.../Validation/MultipleErrors.php | 8 +-
.../Validation/MultipleValidationWithAnd.php | 19 +-
.../Validation/NoRFCWarningsValidation.php | 2 +-
.../Validation/RFCValidation.php | 4 +-
.../Validation/SpoofCheckValidation.php | 8 +-
.../EmailValidator/Warning/QuotedPart.php | 4 +
.../EmailValidator/Warning/QuotedString.php | 4 +
.../EmailValidator/Warning/Warning.php | 21 +-
vendor/egulias/email-validator/composer.json | 23 +-
.../egulias/email-validator/phpunit.xml.dist | 4 -
.../email-validator/psalm.baseline.xml | 19 +
vendor/egulias/email-validator/psalm.xml | 19 +
vendor/guzzlehttp/guzzle/.php_cs | 23 +
vendor/guzzlehttp/guzzle/CHANGELOG.md | 47 +
vendor/guzzlehttp/guzzle/Dockerfile | 18 +
vendor/guzzlehttp/guzzle/README.md | 25 +-
vendor/guzzlehttp/guzzle/composer.json | 43 +-
vendor/guzzlehttp/guzzle/src/Client.php | 99 +-
.../guzzlehttp/guzzle/src/ClientInterface.php | 7 +-
.../guzzle/src/Cookie/CookieJar.php | 8 +-
.../guzzle/src/Cookie/CookieJarInterface.php | 6 +-
.../guzzle/src/Cookie/FileCookieJar.php | 3 +-
.../guzzle/src/Cookie/SessionCookieJar.php | 1 +
.../guzzle/src/Cookie/SetCookie.php | 4 +-
.../guzzle/src/Exception/ClientException.php | 4 +-
.../guzzle/src/Exception/GuzzleException.php | 30 +-
.../Exception/InvalidArgumentException.php | 7 +
.../guzzle/src/Exception/RequestException.php | 35 +-
.../guzzle/src/Exception/ServerException.php | 4 +-
.../Exception/TooManyRedirectsException.php | 4 +-
.../src/Exception/TransferException.php | 4 +-
.../guzzle/src/Handler/CurlFactory.php | 44 +-
.../guzzle/src/Handler/CurlMultiHandler.php | 34 +-
.../guzzle/src/Handler/MockHandler.php | 10 +-
.../guzzle/src/Handler/StreamHandler.php | 25 +-
vendor/guzzlehttp/guzzle/src/HandlerStack.php | 14 +-
.../guzzle/src/MessageFormatter.php | 5 +
vendor/guzzlehttp/guzzle/src/Middleware.php | 7 +-
vendor/guzzlehttp/guzzle/src/Pool.php | 15 +-
.../guzzle/src/PrepareBodyMiddleware.php | 5 +
.../guzzle/src/RedirectMiddleware.php | 28 +-
.../guzzlehttp/guzzle/src/RequestOptions.php | 10 +-
.../guzzlehttp/guzzle/src/RetryMiddleware.php | 22 +-
.../guzzlehttp/guzzle/src/TransferStats.php | 12 +-
vendor/guzzlehttp/guzzle/src/Utils.php | 89 +
vendor/guzzlehttp/guzzle/src/functions.php | 15 +-
.../laminas-diactoros}/CHANGELOG.md | 314 +-
vendor/laminas/laminas-diactoros/COPYRIGHT.md | 2 +
.../laminas-diactoros}/LICENSE.md | 18 +-
vendor/laminas/laminas-diactoros/README.md | 34 +
.../laminas/laminas-diactoros/composer.json | 88 +
.../src/AbstractSerializer.php | 11 +-
.../laminas-diactoros}/src/CallbackStream.php | 11 +-
.../Exception/DeprecatedMethodException.php | 18 +
.../src/Exception/ExceptionInterface.php | 16 +
.../laminas-diactoros}/src/HeaderSecurity.php | 17 +-
.../laminas-diactoros}/src/MessageTrait.php | 9 +-
.../laminas-diactoros}/src/PhpInputStream.php | 9 +-
.../laminas-diactoros}/src/RelativeStream.php | 11 +-
.../laminas-diactoros}/src/Request.php | 9 +-
.../src/Request/ArraySerializer.php | 13 +-
.../src/Request/Serializer.php | 19 +-
.../laminas-diactoros}/src/RequestTrait.php | 9 +-
.../laminas-diactoros}/src/Response.php | 9 +-
.../src/Response/ArraySerializer.php | 13 +-
.../src/Response/EmitterInterface.php | 11 +-
.../src/Response/EmptyResponse.php | 15 +-
.../src/Response/HtmlResponse.php | 15 +-
.../src/Response/InjectContentTypeTrait.php | 11 +-
.../src/Response/JsonResponse.php | 13 +-
.../src/Response/RedirectResponse.php | 13 +-
.../src/Response/SapiEmitter.php | 11 +-
.../src/Response/SapiEmitterTrait.php | 13 +-
.../src/Response/SapiStreamEmitter.php | 11 +-
.../src/Response/Serializer.php | 15 +-
.../src/Response/TextResponse.php | 15 +-
.../src/Response/XmlResponse.php | 13 +-
.../laminas-diactoros}/src/Server.php | 11 +-
.../laminas-diactoros}/src/ServerRequest.php | 9 +-
.../src/ServerRequestFactory.php | 27 +-
.../laminas-diactoros}/src/Stream.php | 9 +-
.../laminas-diactoros}/src/UploadedFile.php | 9 +-
.../laminas-diactoros}/src/Uri.php | 9 +-
.../functions/create_uploaded_file.legacy.php | 19 +
.../src/functions/create_uploaded_file.php | 9 +-
.../marshal_headers_from_sapi.legacy.php | 19 +
.../functions/marshal_headers_from_sapi.php | 9 +-
.../marshal_method_from_sapi.legacy.php | 19 +
.../functions/marshal_method_from_sapi.php | 20 +
...shal_protocol_version_from_sapi.legacy.php | 19 +
.../marshal_protocol_version_from_sapi.php | 9 +-
.../marshal_uri_from_sapi.legacy.php | 19 +
.../src/functions/marshal_uri_from_sapi.php | 13 +-
.../src/functions/normalize_server.legacy.php | 19 +
.../src/functions/normalize_server.php | 9 +-
.../normalize_uploaded_files.legacy.php | 19 +
.../functions/normalize_uploaded_files.php | 9 +-
.../functions/parse_cookie_header.legacy.php | 19 +
.../src/functions/parse_cookie_header.php | 9 +-
vendor/laminas/laminas-escaper/CHANGELOG.md | 73 +
vendor/laminas/laminas-escaper/COPYRIGHT.md | 2 +
.../laminas-escaper}/LICENSE.md | 18 +-
vendor/laminas/laminas-escaper/README.md | 28 +
.../laminas-escaper}/composer.json | 50 +-
.../laminas-escaper}/src/Escaper.php | 11 +-
.../src/Exception/ExceptionInterface.php | 13 +
.../Exception/InvalidArgumentException.php | 17 +
.../src/Exception/RuntimeException.php | 17 +
vendor/laminas/laminas-feed/CHANGELOG.md | 519 +++
vendor/laminas/laminas-feed/COPYRIGHT.md | 2 +
.../laminas-feed}/LICENSE.md | 18 +-
vendor/laminas/laminas-feed/README.md | 12 +
vendor/laminas/laminas-feed/composer.json | 76 +
.../src/Exception/BadMethodCallException.php | 13 +
.../src/Exception/ExceptionInterface.php | 13 +
.../Exception/InvalidArgumentException.php | 13 +
.../src/Exception/RuntimeException.php | 13 +
.../src/PubSubHubbub/AbstractCallback.php | 90 +-
.../src/PubSubHubbub/CallbackInterface.php | 27 +-
.../Exception/ExceptionInterface.php | 15 +
.../Exception/InvalidArgumentException.php | 15 +
.../Exception/RuntimeException.php | 15 +
.../src/PubSubHubbub/HttpResponse.php | 20 +-
.../src/PubSubHubbub/Model/AbstractModel.php | 33 +
.../src/PubSubHubbub/Model/Subscription.php | 31 +-
.../SubscriptionPersistenceInterface.php | 15 +-
.../src/PubSubHubbub/PubSubHubbub.php | 38 +-
.../src/PubSubHubbub/Publisher.php | 112 +-
.../src/PubSubHubbub/Subscriber.php | 219 +-
.../src/PubSubHubbub/Subscriber/Callback.php | 42 +-
.../laminas-feed/src/PubSubHubbub/Version.php | 14 +
.../src/Reader/AbstractEntry.php | 53 +-
.../laminas-feed}/src/Reader/AbstractFeed.php | 46 +-
.../laminas-feed/src/Reader/Collection.php | 20 +
.../Reader/Collection/AbstractCollection.php | 11 +-
.../src/Reader/Collection/Author.php | 11 +-
.../src/Reader/Collection/Category.php | 11 +-
.../src/Reader/Collection/Collection.php | 15 +
.../src/Reader/Entry/AbstractEntry.php | 35 +-
.../laminas-feed}/src/Reader/Entry/Atom.php | 30 +-
.../src/Reader/Entry/EntryInterface.php | 21 +-
.../laminas-feed}/src/Reader/Entry/Rss.php | 83 +-
.../Exception/BadMethodCallException.php | 15 +
.../Reader/Exception/ExceptionInterface.php | 15 +
.../Exception/InvalidArgumentException.php | 15 +
.../Exception/InvalidHttpClientException.php | 15 +
.../src/Reader/Exception/RuntimeException.php | 15 +
.../src/Reader/Extension/AbstractEntry.php | 39 +-
.../src/Reader/Extension/AbstractFeed.php | 25 +-
.../src/Reader/Extension/Atom/Entry.php | 93 +-
.../src/Reader/Extension/Atom/Feed.php | 79 +-
.../src/Reader/Extension/Content/Entry.php | 15 +-
.../Extension/CreativeCommons/Entry.php | 22 +-
.../Reader/Extension/CreativeCommons/Feed.php | 19 +-
.../src/Reader/Extension/DublinCore/Entry.php | 35 +-
.../src/Reader/Extension/DublinCore/Feed.php | 45 +-
.../Extension/GooglePlayPodcast/Entry.php | 12 +-
.../Extension/GooglePlayPodcast/Feed.php | 16 +-
.../src/Reader/Extension/Podcast/Entry.php | 12 +-
.../src/Reader/Extension/Podcast/Feed.php | 16 +-
.../src/Reader/Extension/Slash/Entry.php | 25 +-
.../src/Reader/Extension/Syndication/Feed.php | 37 +-
.../src/Reader/Extension/Thread/Entry.php | 19 +-
.../Reader/Extension/WellFormedWeb/Entry.php | 17 +-
.../src/Reader/ExtensionManager.php | 15 +-
.../src/Reader}/ExtensionManagerInterface.php | 11 +-
.../src/Reader/ExtensionPluginManager.php | 85 +-
.../src/Reader/Feed/AbstractFeed.php | 49 +-
.../laminas-feed}/src/Reader/Feed/Atom.php | 59 +-
.../src/Reader/Feed/Atom/Source.php | 26 +-
.../src/Reader/Feed/FeedInterface.php | 39 +-
.../laminas-feed}/src/Reader/Feed/Rss.php | 167 +-
.../laminas-feed}/src/Reader/FeedSet.php | 75 +-
.../src/Reader/Http/ClientInterface.php | 20 +
.../Http/HeaderAwareClientInterface.php | 14 +-
.../Http/HeaderAwareResponseInterface.php | 15 +-
.../Http/LaminasHttpClientDecorator.php} | 35 +-
.../src/Reader/Http/Psr7ResponseDecorator.php | 14 +-
.../src/Reader/Http/Response.php | 30 +-
.../src/Reader/Http/ResponseInterface.php | 26 +
.../laminas-feed}/src/Reader/Reader.php | 135 +-
.../src/Reader/ReaderImportInterface.php | 19 +-
.../src/Reader/StandaloneExtensionManager.php | 45 +-
.../laminas-feed}/src/Uri.php | 15 +-
.../laminas-feed}/src/Writer/AbstractFeed.php | 257 +-
.../laminas-feed}/src/Writer/Deleted.php | 78 +-
.../laminas-feed}/src/Writer/Entry.php | 136 +-
.../Exception/BadMethodCallException.php | 20 +
.../Writer/Exception/ExceptionInterface.php | 18 +
.../Exception/InvalidArgumentException.php | 20 +
.../src/Writer/Exception/RuntimeException.php | 15 +
.../src/Writer/Extension/AbstractRenderer.php | 38 +-
.../Writer/Extension/Atom/Renderer/Feed.php | 17 +-
.../Extension/Content/Renderer/Entry.php | 17 +-
.../Extension/DublinCore/Renderer/Entry.php | 17 +-
.../Extension/DublinCore/Renderer/Feed.php | 17 +-
.../Extension/GooglePlayPodcast/Entry.php | 24 +-
.../Extension/GooglePlayPodcast/Feed.php | 39 +-
.../GooglePlayPodcast/Renderer/Entry.php | 17 +-
.../GooglePlayPodcast/Renderer/Feed.php | 19 +-
.../src/Writer/Extension/ITunes/Entry.php | 118 +-
.../src/Writer/Extension/ITunes/Feed.php | 156 +-
.../Extension/ITunes/Renderer/Entry.php | 39 +-
.../Writer/Extension/ITunes/Renderer/Feed.php | 39 +-
.../Writer/Extension/RendererInterface.php | 15 +-
.../Writer/Extension/Slash/Renderer/Entry.php | 19 +-
.../Extension/Threading/Renderer/Entry.php | 19 +-
.../WellFormedWeb/Renderer/Entry.php | 21 +-
.../src/Writer/ExtensionManager.php | 15 +-
.../src/Writer}/ExtensionManagerInterface.php | 11 +-
.../src/Writer/ExtensionPluginManager.php | 93 +-
.../laminas-feed}/src/Writer/Feed.php | 56 +-
.../laminas-feed}/src/Writer/FeedFactory.php | 26 +-
.../src/Writer/Renderer/AbstractRenderer.php | 38 +-
.../src/Writer/Renderer/Entry/Atom.php | 93 +-
.../Writer/Renderer/Entry/Atom/Deleted.php | 30 +-
.../src/Writer/Renderer/Entry/AtomDeleted.php | 32 +-
.../src/Writer/Renderer/Entry/Rss.php | 74 +-
.../src/Writer/Renderer/Feed/AbstractAtom.php | 63 +-
.../src/Writer/Renderer/Feed/Atom.php | 32 +-
.../Renderer/Feed/Atom/AbstractAtom.php | 45 +-
.../src/Writer/Renderer/Feed/Atom/Source.php | 28 +-
.../src/Writer/Renderer/Feed/AtomSource.php | 30 +-
.../src/Writer/Renderer/Feed/Rss.php | 86 +-
.../src/Writer/Renderer/RendererInterface.php | 15 +-
.../laminas-feed/src/Writer/Source.php | 13 +
.../src/Writer/StandaloneExtensionManager.php | 41 +-
.../laminas-feed/src/Writer/Version.php | 14 +
.../laminas-feed}/src/Writer/Writer.php | 34 +-
vendor/laminas/laminas-stdlib/CHANGELOG.md | 385 +++
vendor/laminas/laminas-stdlib/COPYRIGHT.md | 2 +
vendor/laminas/laminas-stdlib/LICENSE.md | 27 +
vendor/laminas/laminas-stdlib/README.md | 29 +
vendor/laminas/laminas-stdlib/composer.json | 60 +
.../laminas-stdlib}/src/AbstractOptions.php | 13 +-
.../laminas-stdlib}/src/ArrayObject.php | 11 +-
.../src/ArraySerializableInterface.php | 11 +-
.../laminas-stdlib}/src/ArrayStack.php | 11 +-
.../laminas-stdlib}/src/ArrayUtils.php | 15 +-
.../src/ArrayUtils/MergeRemoveKey.php | 13 +
.../src/ArrayUtils/MergeReplaceKey.php | 11 +-
.../ArrayUtils/MergeReplaceKeyInterface.php | 20 +
.../laminas-stdlib}/src/ConsoleHelper.php | 9 +-
.../src/DispatchableInterface.php | 21 +
.../laminas-stdlib}/src/ErrorHandler.php | 11 +-
.../src/Exception/BadMethodCallException.php | 16 +
.../src/Exception/DomainException.php | 16 +
.../src/Exception/ExceptionInterface.php | 16 +
.../Exception/ExtensionNotLoadedException.php | 16 +
.../Exception/InvalidArgumentException.php | 16 +
.../src/Exception/LogicException.php | 16 +
.../src/Exception/RuntimeException.php | 16 +
.../laminas-stdlib}/src/FastPriorityQueue.php | 15 +-
.../laminas-stdlib}/src/Glob.php | 11 +-
.../src/Guard/AllGuardsTrait.php | 19 +
.../Guard/ArrayOrTraversableGuardTrait.php | 13 +-
.../src/Guard/EmptyGuardTrait.php | 13 +-
.../src/Guard/NullGuardTrait.php | 13 +-
.../src/InitializableInterface.php | 22 +
.../laminas-stdlib/src/JsonSerializable.php | 16 +
.../laminas-stdlib}/src/Message.php | 11 +-
.../laminas-stdlib}/src/MessageInterface.php | 11 +-
.../src/ParameterObjectInterface.php | 11 +-
.../laminas-stdlib}/src/Parameters.php | 11 +-
.../src/ParametersInterface.php | 11 +-
.../laminas-stdlib}/src/PriorityList.php | 11 +-
.../laminas-stdlib}/src/PriorityQueue.php | 15 +-
vendor/laminas/laminas-stdlib/src/Request.php | 14 +
.../laminas-stdlib/src/RequestInterface.php | 13 +
.../laminas/laminas-stdlib/src/Response.php | 14 +
.../laminas-stdlib/src/ResponseInterface.php | 13 +
.../laminas-stdlib}/src/SplPriorityQueue.php | 11 +-
.../laminas-stdlib}/src/SplQueue.php | 11 +-
.../laminas-stdlib}/src/SplStack.php | 11 +-
.../laminas-stdlib}/src/StringUtils.php | 21 +-
.../StringWrapper/AbstractStringWrapper.php | 15 +-
.../src/StringWrapper/Iconv.php | 13 +-
.../src/StringWrapper/Intl.php | 13 +-
.../src/StringWrapper/MbString.php | 13 +-
.../src/StringWrapper/Native.php | 15 +-
.../StringWrapper/StringWrapperInterface.php | 11 +-
.../.github/FUNDING.yml | 1 +
.../laminas-zendframework-bridge/CHANGELOG.md | 641 ++++
.../laminas-zendframework-bridge/COPYRIGHT.md | 1 +
.../laminas-zendframework-bridge/LICENSE.md | 26 +
.../laminas-zendframework-bridge/README.md | 24 +
.../composer.json | 62 +
.../config/replacements.php | 372 +++
.../src/Autoloader.php | 168 +
.../src/ConfigPostProcessor.php | 434 +++
.../src/Module.php | 54 +
.../src/Replacements.php | 46 +
.../src/RewriteRules.php | 79 +
.../src/autoload.php | 9 +
vendor/pear/console_getopt/Console/Getopt.php | 18 +-
vendor/pear/console_getopt/package.xml | 24 +-
.../pear/pear-core-minimal/src/OS/Guess.php | 24 +-
vendor/pear/pear-core-minimal/src/PEAR.php | 22 +
vendor/pear/pear-core-minimal/src/System.php | 6 +-
vendor/pear/pear_exception/composer.json | 4 +-
vendor/psr/log/.gitignore | 1 -
vendor/psr/log/Psr/Log/LoggerInterface.php | 40 +-
vendor/psr/log/Psr/Log/LoggerTrait.php | 2 +
vendor/psr/log/Psr/Log/NullLogger.php | 2 +
vendor/psr/log/Psr/Log/Test/DummyTest.php | 18 +
.../log/Psr/Log/Test/LoggerInterfaceTest.php | 10 +-
vendor/psr/log/Psr/Log/Test/TestLogger.php | 1 +
vendor/psr/log/README.md | 6 +
vendor/psr/log/composer.json | 2 +-
.../class-loader/ClassCollectionLoader.php | 6 +-
vendor/symfony/class-loader/LICENSE | 2 +-
vendor/symfony/class-loader/README.md | 2 +-
vendor/symfony/console/Application.php | 21 +-
vendor/symfony/console/Command/Command.php | 6 +-
.../Descriptor/ApplicationDescription.php | 26 +-
.../console/Formatter/OutputFormatter.php | 2 +-
.../Formatter/OutputFormatterStyle.php | 8 +-
.../console/Helper/FormatterHelper.php | 14 +-
.../symfony/console/Helper/ProcessHelper.php | 4 +
.../symfony/console/Helper/QuestionHelper.php | 44 +-
.../console/Helper/SymfonyQuestionHelper.php | 10 +-
vendor/symfony/console/Helper/Table.php | 2 +-
vendor/symfony/console/Helper/TableStyle.php | 2 +-
vendor/symfony/console/Input/ArrayInput.php | 6 +-
vendor/symfony/console/Input/StringInput.php | 2 +-
vendor/symfony/console/LICENSE | 2 +-
.../symfony/console/Output/StreamOutput.php | 6 +-
.../console/Question/ChoiceQuestion.php | 2 +-
vendor/symfony/console/README.md | 2 +-
vendor/symfony/console/Style/SymfonyStyle.php | 2 +-
.../symfony/console/Tests/ApplicationTest.php | 30 +-
.../Descriptor/ApplicationDescriptionTest.php | 53 +
.../Tests/Fixtures/stream_output_file.txt | 0
.../Tests/Formatter/OutputFormatterTest.php | 2 +-
.../Tests/Helper/QuestionHelperTest.php | 54 +-
.../Helper/SymfonyQuestionHelperTest.php | 50 +-
.../console/Tests/Helper/TableTest.php | 2 +-
.../console/Tests/Output/StreamOutputTest.php | 8 +
vendor/symfony/console/Tests/TerminalTest.php | 2 +-
vendor/symfony/debug/ErrorHandler.php | 8 +-
vendor/symfony/debug/LICENSE | 2 +-
vendor/symfony/debug/README.md | 14 +-
.../debug/Tests/DebugClassLoaderTest.php | 55 +-
.../symfony/debug/Tests/ErrorHandlerTest.php | 30 +-
.../Tests/Exception/FlattenExceptionTest.php | 12 +
.../ClassNotFoundFatalErrorHandlerTest.php | 4 +
.../ErrorHandlerThatUsesThePreviousOne.php | 4 +-
.../Compiler/AbstractRecursivePass.php | 4 +-
.../Compiler/AutowirePass.php | 11 +-
.../Compiler/CheckDefinitionValidityPass.php | 15 +-
.../Compiler/Compiler.php | 2 +-
.../Compiler/PassConfig.php | 4 +-
.../Compiler/ResolveBindingsPass.php | 2 +-
.../ResolveInstanceofConditionalsPass.php | 3 +-
.../Compiler/ResolveNamedArgumentsPass.php | 2 +-
.../ResolveParameterPlaceHoldersPass.php | 15 +-
.../dependency-injection/ContainerBuilder.php | 14 +-
.../Dumper/GraphvizDumper.php | 5 +-
.../dependency-injection/Dumper/PhpDumper.php | 16 +-
.../dependency-injection/Dumper/XmlDumper.php | 5 +
.../dependency-injection/EnvVarProcessor.php | 8 +-
.../Extension/Extension.php | 9 +-
vendor/symfony/dependency-injection/LICENSE | 2 +-
.../Configurator/AbstractConfigurator.php | 2 +-
.../Configurator/ContainerConfigurator.php | 8 +-
.../Configurator/PrototypeConfigurator.php | 7 +-
.../Configurator/ServicesConfigurator.php | 12 +-
.../Loader/FileLoader.php | 8 +-
.../Loader/XmlFileLoader.php | 19 +-
.../Loader/YamlFileLoader.php | 56 +-
.../EnvPlaceholderParameterBag.php | 4 +-
.../ParameterBag/ParameterBag.php | 2 +-
vendor/symfony/dependency-injection/README.md | 2 +-
.../Tests/Compiler/AutowirePassTest.php | 104 +-
.../Compiler/ResolveBindingsPassTest.php | 1 -
.../ResolveParameterPlaceHoldersPassTest.php | 26 +
.../Config/AutowireServiceResourceTest.php | 4 +-
.../Tests/ContainerBuilderTest.php | 6 +-
.../Tests/Fixtures/config/basic.expected.yml | 1 -
.../Tests/Fixtures/config/child.expected.yml | 5 +-
.../Fixtures/config/defaults.expected.yml | 1 -
.../Fixtures/config/instanceof.expected.yml | 2 -
.../Tests/Fixtures/config/php7.expected.yml | 1 -
.../Fixtures/config/prototype.expected.yml | 2 -
.../Tests/Fixtures/config/services9.php | 3 +-
.../Tests/Fixtures/containers/container8.php | 11 +
...gumentsOptionalScalarNotReallyOptional.php | 14 +
.../Fixtures/includes/autowiring_classes.php | 6 -
.../Tests/Fixtures/php/services8.php | 11 +
.../Tests/Fixtures/xml/services8.xml | 11 +
.../Tests/Fixtures/yaml/services8.yml | 11 +
.../Tests/Loader/FileLoaderTest.php | 9 +-
.../Tests/Loader/YamlFileLoaderTest.php | 18 +-
.../EnvPlaceholderParameterBagTest.php | 2 +-
.../Tests/ParameterBag/ParameterBagTest.php | 2 +-
.../ContainerAwareEventDispatcher.php | 4 +-
.../EventSubscriberInterface.php | 3 +
vendor/symfony/event-dispatcher/LICENSE | 2 +-
vendor/symfony/event-dispatcher/README.md | 2 +-
.../http-foundation/BinaryFileResponse.php | 4 +-
vendor/symfony/http-foundation/File/File.php | 6 +-
.../File/MimeType/MimeTypeGuesser.php | 2 +-
.../http-foundation/File/UploadedFile.php | 8 +-
vendor/symfony/http-foundation/HeaderBag.php | 2 +-
vendor/symfony/http-foundation/LICENSE | 2 +-
vendor/symfony/http-foundation/README.md | 2 +-
.../http-foundation/RedirectResponse.php | 4 +-
vendor/symfony/http-foundation/Response.php | 2 +-
.../http-foundation/ResponseHeaderBag.php | 17 +-
vendor/symfony/http-foundation/ServerBag.php | 8 +-
.../http-foundation/Session/SessionUtils.php | 59 +
.../Handler/AbstractSessionHandler.php | 61 +-
.../Handler/MemcacheSessionHandler.php | 2 +-
.../Handler/MemcachedSessionHandler.php | 2 +-
.../Storage/Handler/MongoDbSessionHandler.php | 4 +-
.../Handler/NativeFileSessionHandler.php | 4 +-
.../Storage/Handler/PdoSessionHandler.php | 6 +-
.../Storage/MockArraySessionStorage.php | 4 +-
.../Storage/MockFileSessionStorage.php | 4 +-
.../Session/Storage/NativeSessionStorage.php | 64 +-
.../Session/Storage/Proxy/AbstractProxy.php | 6 +-
.../Tests/RedirectResponseTest.php | 5 +-
.../Tests/ResponseHeaderBagTest.php | 12 +-
.../Handler/Fixtures/regenerate.expected | 1 +
.../Storage/Handler/Fixtures/storage.expected | 3 +-
.../Fixtures/with_cookie_and_session.expected | 1 +
.../Handler/Fixtures/with_samesite.expected | 16 +
.../Handler/Fixtures/with_samesite.php | 13 +
.../with_samesite_and_migration.expected | 23 +
.../Fixtures/with_samesite_and_migration.php | 15 +
.../Storage/NativeSessionStorageTest.php | 21 +-
vendor/symfony/http-kernel/Bundle/Bundle.php | 2 +-
.../CacheClearer/Psr6CacheClearer.php | 2 +-
.../Controller/ArgumentResolver.php | 2 +-
.../Controller/ControllerResolver.php | 24 +-
.../ControllerMetadata/ArgumentMetadata.php | 2 +-
.../DataCollector/DumpDataCollector.php | 2 +-
.../DataCollector/LoggerDataCollector.php | 2 +-
.../ResettableServicePass.php | 2 +-
.../EventListener/DebugHandlersListener.php | 5 +-
.../http-kernel/Fragment/FragmentHandler.php | 2 +-
.../Fragment/HIncludeFragmentRenderer.php | 2 +-
.../HttpCache/AbstractSurrogate.php | 2 +-
.../http-kernel/HttpCache/HttpCache.php | 38 +-
.../HttpCache/ResponseCacheStrategy.php | 2 -
.../symfony/http-kernel/HttpCache/Store.php | 29 +-
vendor/symfony/http-kernel/HttpKernel.php | 2 +-
vendor/symfony/http-kernel/Kernel.php | 18 +-
vendor/symfony/http-kernel/LICENSE | 2 +-
vendor/symfony/http-kernel/Log/Logger.php | 21 +-
vendor/symfony/http-kernel/README.md | 2 +-
.../CacheClearer/Psr6CacheClearerTest.php | 2 +-
.../Tests/Controller/ArgumentResolverTest.php | 8 +-
.../ContainerControllerResolverTest.php | 8 +-
.../Controller/ControllerResolverTest.php | 22 +-
.../ArgumentMetadataFactoryTest.php | 10 +-
.../DataCollector/LoggerDataCollectorTest.php | 4 +-
.../RequestDataCollectorTest.php | 2 +-
.../ResettableServicePassTest.php | 2 +-
.../Controller/LegacyNullableController.php | 19 +
.../Controller/NullableController.php | 2 +-
.../Tests/HttpCache/HttpCacheTest.php | 181 +-
.../http-kernel/Tests/HttpCache/StoreTest.php | 21 +
.../http-kernel/Tests/Log/LoggerTest.php | 2 +-
vendor/symfony/polyfill-ctype/bootstrap.php | 20 +
vendor/symfony/polyfill-ctype/composer.json | 2 +-
vendor/symfony/polyfill-iconv/README.md | 4 +-
.../Resources/charset/translit.php | 129 +
vendor/symfony/polyfill-iconv/bootstrap.php | 46 +-
vendor/symfony/polyfill-iconv/composer.json | 2 +-
vendor/symfony/polyfill-intl-idn/Idn.php | 287 ++
vendor/symfony/polyfill-intl-idn/LICENSE | 19 +
vendor/symfony/polyfill-intl-idn/README.md | 12 +
.../symfony/polyfill-intl-idn/bootstrap.php | 141 +
.../symfony/polyfill-intl-idn/composer.json | 36 +
vendor/symfony/polyfill-mbstring/Mbstring.php | 22 +-
vendor/symfony/polyfill-mbstring/README.md | 2 +-
.../symfony/polyfill-mbstring/bootstrap.php | 93 +-
.../symfony/polyfill-mbstring/composer.json | 2 +-
vendor/symfony/polyfill-php56/README.md | 4 +-
vendor/symfony/polyfill-php56/bootstrap.php | 48 +-
vendor/symfony/polyfill-php56/composer.json | 2 +-
vendor/symfony/polyfill-php70/README.md | 10 +-
vendor/symfony/polyfill-php70/bootstrap.php | 29 +-
vendor/symfony/polyfill-php70/composer.json | 2 +-
vendor/symfony/polyfill-php72/LICENSE | 19 +
vendor/symfony/polyfill-php72/Php72.php | 217 ++
vendor/symfony/polyfill-php72/README.md | 28 +
vendor/symfony/polyfill-php72/bootstrap.php | 57 +
vendor/symfony/polyfill-php72/composer.json | 31 +
.../polyfill-util/TestListenerForV7.php | 2 +-
.../polyfill-util/TestListenerTrait.php | 6 +-
vendor/symfony/polyfill-util/composer.json | 2 +-
vendor/symfony/process/InputStream.php | 2 +-
vendor/symfony/process/LICENSE | 2 +-
.../symfony/process/Pipes/AbstractPipes.php | 2 +-
vendor/symfony/process/Pipes/UnixPipes.php | 2 +-
vendor/symfony/process/Pipes/WindowsPipes.php | 2 +-
vendor/symfony/process/Process.php | 12 +-
vendor/symfony/process/ProcessUtils.php | 2 +-
.../PipeStdinInStdoutStdErrStreamSelect.php | 10 +-
.../process/Tests/ProcessBuilderTest.php | 2 +-
vendor/symfony/process/Tests/ProcessTest.php | 13 +-
vendor/symfony/routing/Annotation/Route.php | 2 +-
vendor/symfony/routing/LICENSE | 2 +-
.../routing/Loader/AnnotationClassLoader.php | 2 +-
.../routing/Loader/ObjectRouteLoader.php | 8 +-
.../symfony/routing/Loader/XmlFileLoader.php | 4 +-
.../symfony/routing/Loader/YamlFileLoader.php | 2 +-
.../Matcher/Dumper/PhpMatcherDumper.php | 2 +-
vendor/symfony/routing/Matcher/UrlMatcher.php | 4 +-
vendor/symfony/routing/README.md | 2 +-
vendor/symfony/routing/RequestContext.php | 4 +-
vendor/symfony/routing/RouteCompiler.php | 2 +-
.../Tests/RouteCollectionBuilderTest.php | 2 +-
.../symfony/serializer/Annotation/Groups.php | 4 +-
.../serializer/Annotation/MaxDepth.php | 4 +-
.../symfony/serializer/Encoder/XmlEncoder.php | 13 +-
vendor/symfony/serializer/LICENSE | 2 +-
.../Mapping/Factory/ClassResolverTrait.php | 4 +-
.../serializer/Mapping/Loader/FileLoader.php | 4 +-
.../serializer/Mapping/Loader/LoaderChain.php | 2 +-
.../Normalizer/AbstractNormalizer.php | 24 +-
.../Normalizer/AbstractObjectNormalizer.php | 9 +-
.../Normalizer/ArrayDenormalizer.php | 4 +
.../Normalizer/DateIntervalNormalizer.php | 2 +-
.../Normalizer/DateTimeNormalizer.php | 8 +-
.../Normalizer/JsonSerializableNormalizer.php | 2 +-
.../Normalizer/ObjectNormalizer.php | 6 +
.../Normalizer/PropertyNormalizer.php | 11 +
vendor/symfony/serializer/Serializer.php | 18 +-
.../serializer/Tests/Fixtures/Php74Dummy.php | 22 +
.../AbstractObjectNormalizerTest.php | 28 +-
.../Normalizer/ArrayDenormalizerTest.php | 4 +-
.../Normalizer/GetSetMethodNormalizerTest.php | 30 +-
.../Tests/Normalizer/ObjectNormalizerTest.php | 39 +-
.../Normalizer/PropertyNormalizerTest.php | 23 +-
.../Catalogue/AbstractOperation.php | 6 +-
.../translation/Command/XliffLintCommand.php | 1 +
.../TranslationDataCollector.php | 1 +
.../translation/Dumper/JsonFileDumper.php | 2 +-
.../translation/Dumper/XliffFileDumper.php | 4 +-
vendor/symfony/translation/LICENSE | 2 +-
.../translation/Loader/IcuDatFileLoader.php | 2 +-
.../translation/Loader/IcuResFileLoader.php | 2 +-
.../translation/Loader/JsonFileLoader.php | 2 +-
.../translation/Loader/PhpFileLoader.php | 16 +-
.../translation/Loader/XliffFileLoader.php | 6 +-
.../translation/Loader/YamlFileLoader.php | 2 +-
.../symfony/translation/MessageCatalogue.php | 6 +-
vendor/symfony/translation/README.md | 20 +-
.../Tests/Loader/JsonFileLoaderTest.php | 2 +-
.../translation/Tests/TranslatorTest.php | 42 +-
vendor/symfony/translation/Translator.php | 19 +-
.../translation/Writer/TranslationWriter.php | 2 +-
vendor/symfony/validator/Constraint.php | 16 +-
.../symfony/validator/ConstraintValidator.php | 26 +-
.../symfony/validator/ConstraintViolation.php | 32 +-
.../ConstraintViolationInterface.php | 2 +-
.../Constraints/AbstractComparison.php | 6 +-
.../AbstractComparisonValidator.php | 4 +-
.../validator/Constraints/AllValidator.php | 2 +-
.../validator/Constraints/BicValidator.php | 2 +-
.../validator/Constraints/BlankValidator.php | 2 +-
.../Constraints/CallbackValidator.php | 6 +-
.../Constraints/CardSchemeValidator.php | 2 +-
.../validator/Constraints/ChoiceValidator.php | 6 +-
.../validator/Constraints/Collection.php | 2 +-
.../Constraints/CollectionValidator.php | 2 +-
.../validator/Constraints/Composite.php | 9 +-
.../symfony/validator/Constraints/Count.php | 2 +-
.../validator/Constraints/CountValidator.php | 2 +-
.../Constraints/CountryValidator.php | 2 +-
.../Constraints/CurrencyValidator.php | 2 +-
.../Constraints/DateTimeValidator.php | 2 +-
.../validator/Constraints/DateValidator.php | 2 +-
.../validator/Constraints/EmailValidator.php | 7 +-
.../Constraints/ExpressionValidator.php | 2 +-
vendor/symfony/validator/Constraints/File.php | 2 +-
.../validator/Constraints/FileValidator.php | 2 +-
.../GreaterThanOrEqualValidator.php | 2 +-
.../Constraints/GreaterThanValidator.php | 2 +-
.../validator/Constraints/IbanValidator.php | 2 +-
.../validator/Constraints/ImageValidator.php | 16 +-
vendor/symfony/validator/Constraints/Ip.php | 2 +-
.../validator/Constraints/IpValidator.php | 2 +-
.../Constraints/IsFalseValidator.php | 2 +-
.../validator/Constraints/IsNullValidator.php | 2 +-
.../validator/Constraints/IsTrueValidator.php | 2 +-
.../validator/Constraints/IsbnValidator.php | 2 +-
.../validator/Constraints/IssnValidator.php | 2 +-
.../Constraints/LanguageValidator.php | 2 +-
.../symfony/validator/Constraints/Length.php | 2 +-
.../validator/Constraints/LengthValidator.php | 14 +-
.../Constraints/LessThanOrEqualValidator.php | 2 +-
.../Constraints/LessThanValidator.php | 2 +-
.../validator/Constraints/LocaleValidator.php | 2 +-
.../validator/Constraints/LuhnValidator.php | 2 +-
.../Constraints/NotBlankValidator.php | 2 +-
.../Constraints/NotNullValidator.php | 2 +-
.../symfony/validator/Constraints/Range.php | 2 +-
.../validator/Constraints/RangeValidator.php | 2 +-
.../validator/Constraints/RegexValidator.php | 2 +-
.../validator/Constraints/TimeValidator.php | 2 +-
.../validator/Constraints/Traverse.php | 2 +-
.../validator/Constraints/TypeValidator.php | 2 +-
.../validator/Constraints/UrlValidator.php | 6 +-
.../validator/Constraints/UuidValidator.php | 2 +-
.../validator/Constraints/ValidValidator.php | 2 +-
.../validator/Context/ExecutionContext.php | 9 +-
.../Context/ExecutionContextInterface.php | 8 +-
vendor/symfony/validator/LICENSE | 2 +-
.../validator/Mapping/ClassMetadata.php | 15 +-
.../Factory/LazyLoadingMetadataFactory.php | 31 +-
.../validator/Mapping/GetterMetadata.php | 4 +-
.../Mapping/Loader/AbstractLoader.php | 2 +-
.../validator/Mapping/Loader/FileLoader.php | 6 +-
.../validator/Mapping/Loader/LoaderChain.php | 2 +-
.../Mapping/Loader/StaticMethodLoader.php | 2 +-
.../Mapping/Loader/YamlFileLoader.php | 2 +-
.../validator/Mapping/MemberMetadata.php | 2 +-
.../validator/Mapping/PropertyMetadata.php | 23 +-
.../Resources/translations/validators.ar.xlf | 48 +
.../Resources/translations/validators.cs.xlf | 48 +
.../Resources/translations/validators.de.xlf | 16 +
.../Resources/translations/validators.en.xlf | 16 +
.../Resources/translations/validators.es.xlf | 20 +-
.../Resources/translations/validators.fr.xlf | 16 +
.../Resources/translations/validators.hu.xlf | 16 +
.../Resources/translations/validators.it.xlf | 16 +
.../Resources/translations/validators.ja.xlf | 12 +
.../Resources/translations/validators.lt.xlf | 16 +
.../Resources/translations/validators.mn.xlf | 220 ++
.../Resources/translations/validators.nn.xlf | 160 +
.../Resources/translations/validators.pl.xlf | 50 +-
.../Resources/translations/validators.ru.xlf | 16 +
.../Resources/translations/validators.sl.xlf | 48 +
.../translations/validators.sr_Latn.xlf | 18 +-
.../Resources/translations/validators.uk.xlf | 16 +
.../Resources/translations/validators.vi.xlf | 20 +
.../translations/validators.zh_TW.xlf | 88 +
.../Test/ConstraintValidatorTestCase.php | 6 +-
.../Tests/ConstraintValidatorTest.php | 12 +-
.../AbstractComparisonValidatorTestCase.php | 32 +-
.../Tests/Constraints/CollectionTest.php | 12 +
.../Constraints/CollectionValidatorTest.php | 23 +
.../Tests/Constraints/CompositeTest.php | 26 +-
.../Tests/Constraints/EmailValidatorTest.php | 15 +
.../Constraints/EqualToValidatorTest.php | 7 +
.../GreaterThanOrEqualValidatorTest.php | 7 +
.../Constraints/GreaterThanValidatorTest.php | 7 +
.../Constraints/IdenticalToValidatorTest.php | 7 +
.../LessThanOrEqualValidatorTest.php | 7 +
.../Constraints/LessThanValidatorTest.php | 7 +
.../Constraints/NotEqualToValidatorTest.php | 7 +
.../NotIdenticalToValidatorTest.php | 7 +
.../Tests/Constraints/UrlValidatorTest.php | 6 +
.../Tests/Fixtures/AbstractPropertyGetter.php | 13 +
.../Tests/Fixtures/ChildGetterInterface.php | 7 +
.../validator/Tests/Fixtures/Entity.php | 10 +
.../EntityWithGroupedConstraintOnMethods.php | 27 +
.../validator/Tests/Fixtures/Entity_74.php | 8 +
.../Tests/Fixtures/Entity_74_Proxy.php | 18 +
.../Tests/Fixtures/FakeMetadataFactory.php | 2 +-
.../Tests/Fixtures/PropertyGetter.php | 12 +
.../Fixtures/PropertyGetterInterface.php | 8 +
.../LazyLoadingMetadataFactoryTest.php | 25 +-
.../Tests/Mapping/GetterMetadataTest.php | 2 +-
.../Mapping/Loader/StaticMethodLoaderTest.php | 14 +-
.../Tests/Mapping/PropertyMetadataTest.php | 28 +
.../Tests/Validator/AbstractTest.php | 21 +
.../Tests/Validator/AbstractValidatorTest.php | 55 +-
.../Validator/RecursiveValidatorTest.php | 40 +
.../ConstraintViolationBuilderTest.php | 106 +
.../validator/Validator/LazyProperty.php | 32 +
.../RecursiveContextualValidator.php | 29 +-
vendor/symfony/yaml/Dumper.php | 17 +-
vendor/symfony/yaml/Escaper.php | 4 +-
vendor/symfony/yaml/Inline.php | 52 +-
vendor/symfony/yaml/LICENSE | 2 +-
vendor/symfony/yaml/Parser.php | 13 +-
vendor/symfony/yaml/README.md | 2 +-
vendor/symfony/yaml/Tests/DumperTest.php | 51 +-
...nes_as_literal_block_for_tagged_values.yml | 2 +
.../yaml/Tests/Fixtures/sfComments.yml | 14 +
vendor/symfony/yaml/Tests/InlineTest.php | 73 +-
vendor/symfony/yaml/Tests/ParserTest.php | 29 +-
vendor/twig/twig/.gitattributes | 2 +
vendor/twig/twig/CHANGELOG | 9 +
vendor/twig/twig/LICENSE | 4 +-
vendor/twig/twig/composer.json | 4 +-
vendor/twig/twig/doc/advanced.rst | 7 +-
vendor/twig/twig/doc/advanced_legacy.rst | 5 -
vendor/twig/twig/doc/api.rst | 15 +-
vendor/twig/twig/doc/filters/batch.rst | 1 +
vendor/twig/twig/doc/filters/filter.rst | 2 +-
vendor/twig/twig/doc/filters/map.rst | 1 -
vendor/twig/twig/doc/filters/reduce.rst | 3 +-
vendor/twig/twig/doc/functions/block.rst | 4 +-
vendor/twig/twig/doc/functions/constant.rst | 4 +-
vendor/twig/twig/doc/templates.rst | 8 +-
vendor/twig/twig/doc/tests/constant.rst | 2 +-
vendor/twig/twig/doc/tests/sameas.rst | 2 +-
vendor/twig/twig/drupal_test.sh | 3 +-
vendor/twig/twig/ext/twig/php_twig.h | 2 +-
vendor/twig/twig/phpunit.xml.dist | 33 -
vendor/twig/twig/src/Environment.php | 8 +-
vendor/twig/twig/src/ExpressionParser.php | 2 +-
.../twig/twig/src/Extension/CoreExtension.php | 2 +-
vendor/twig/twig/src/Lexer.php | 2 +-
.../Expression/NullCoalesceExpression.php | 14 +-
vendor/twig/twig/src/Parser.php | 4 +-
.../twig/twig/src/Sandbox/SecurityPolicy.php | 4 +-
vendor/twig/twig/src/Template.php | 6 +-
vendor/twig/twig/tests/AutoloaderTest.php | 26 -
.../twig/twig/tests/Cache/FilesystemTest.php | 193 --
vendor/twig/twig/tests/CompilerTest.php | 38 -
.../twig/tests/ContainerRuntimeLoaderTest.php | 44 -
.../twig/twig/tests/CustomExtensionTest.php | 94 -
vendor/twig/twig/tests/EnvironmentTest.php | 678 ----
vendor/twig/twig/tests/ErrorTest.php | 234 --
.../twig/twig/tests/ExpressionParserTest.php | 382 ---
vendor/twig/twig/tests/Extension/CoreTest.php | 371 ---
.../twig/twig/tests/Extension/SandboxTest.php | 365 --
.../twig/tests/FactoryRuntimeLoaderTest.php | 36 -
vendor/twig/twig/tests/FileCachingTest.php | 66 -
.../FileExtensionEscapingStrategyTest.php | 55 -
vendor/twig/twig/tests/FilesystemHelper.php | 32 -
.../twig/tests/Fixtures/autoescape/block.test | 21 -
.../twig/tests/Fixtures/autoescape/name.test | 22 -
.../twig/twig/tests/Fixtures/errors/base.html | 1 -
.../twig/tests/Fixtures/errors/index.html | 7 -
.../tests/Fixtures/errors/leak-output.php | 33 -
.../child_contents_outside_blocks.test | 15 -
.../exception_in_extension_extends.test | 12 -
.../exception_in_extension_include.test | 12 -
...ltiline_array_with_undefined_variable.test | 18 -
...e_array_with_undefined_variable_again.test | 18 -
...line_function_with_undefined_variable.test | 12 -
...tiline_function_with_unknown_argument.test | 9 -
...multiline_tag_with_undefined_variable.test | 12 -
.../strict_comparison_operator.test | 6 -
.../syntax_error_in_reused_template.test | 10 -
.../Fixtures/exceptions/unclosed_tag.test | 20 -
.../Fixtures/exceptions/undefined_parent.test | 10 -
.../undefined_template_in_child_template.test | 15 -
.../Fixtures/exceptions/undefined_trait.test | 9 -
.../tests/Fixtures/expressions/_self.test | 8 -
.../tests/Fixtures/expressions/array.test | 61 -
.../Fixtures/expressions/array_call.test | 14 -
.../tests/Fixtures/expressions/binary.test | 46 -
.../tests/Fixtures/expressions/bitwise.test | 14 -
.../call_argument_defined_twice.test | 8 -
.../call_positional_arg_after_named_arg.test | 8 -
.../Fixtures/expressions/comparison.test | 14 -
.../Fixtures/expressions/divisibleby.test | 17 -
.../tests/Fixtures/expressions/dotdot.test | 20 -
.../tests/Fixtures/expressions/ends_with.test | 26 -
.../tests/Fixtures/expressions/floats.test | 16 -
.../tests/Fixtures/expressions/grouping.test | 8 -
.../tests/Fixtures/expressions/literals.test | 22 -
.../Fixtures/expressions/magic_call.test | 27 -
.../tests/Fixtures/expressions/matches.test | 12 -
.../Fixtures/expressions/method_call.test | 28 -
.../expressions/negative_numbers.test | 18 -
.../Fixtures/expressions/not_arrow_fn.test | 8 -
.../expressions/operators_as_variables.test | 16 -
.../tests/Fixtures/expressions/postfix.test | 22 -
.../tests/Fixtures/expressions/power.test | 20 -
.../tests/Fixtures/expressions/sameas.test | 21 -
.../Fixtures/expressions/starts_with.test | 27 -
.../string_operator_as_var_assignment.test | 18 -
.../tests/Fixtures/expressions/strings.test | 10 -
.../expressions/ternary_operator.test | 18 -
.../expressions/ternary_operator_noelse.test | 10 -
.../expressions/ternary_operator_nothen.test | 10 -
.../two_word_operators_as_variables.test | 8 -
.../tests/Fixtures/expressions/unary.test | 12 -
.../expressions/unary_macro_arguments.test | 22 -
.../expressions/unary_precedence.test | 14 -
.../twig/twig/tests/Fixtures/filters/abs.test | 30 -
.../twig/tests/Fixtures/filters/batch.test | 31 -
.../tests/Fixtures/filters/batch_float.test | 29 -
.../filters/batch_with_empty_fill.test | 37 -
.../filters/batch_with_exact_elements.test | 33 -
.../Fixtures/filters/batch_with_fill.test | 37 -
.../Fixtures/filters/batch_with_keys.test | 10 -
.../filters/batch_with_more_elements.test | 23 -
.../filters/batch_with_zero_elements.test | 10 -
.../Fixtures/filters/convert_encoding.test | 10 -
.../twig/tests/Fixtures/filters/date.test | 90 -
.../Fixtures/filters/date_default_format.test | 14 -
.../filters/date_default_format_interval.test | 16 -
.../Fixtures/filters/date_immutable.test | 37 -
.../tests/Fixtures/filters/date_interval.test | 19 -
.../tests/Fixtures/filters/date_modify.test | 14 -
.../Fixtures/filters/date_namedargs.test | 13 -
.../twig/tests/Fixtures/filters/default.test | 150 -
.../Fixtures/filters/dynamic_filter.test | 10 -
.../twig/tests/Fixtures/filters/escape.test | 8 -
.../Fixtures/filters/escape_html_attr.test | 8 -
.../Fixtures/filters/escape_javascript.test | 8 -
.../filters/escape_non_supported_charset.test | 8 -
.../twig/tests/Fixtures/filters/filter.test | 46 -
.../tests/Fixtures/filters/filter_php_55.test | 23 -
.../tests/Fixtures/filters/filter_php_56.test | 27 -
.../twig/tests/Fixtures/filters/first.test | 17 -
.../tests/Fixtures/filters/force_escape.test | 18 -
.../twig/tests/Fixtures/filters/format.test | 8 -
.../twig/tests/Fixtures/filters/join.test | 38 -
.../tests/Fixtures/filters/json_encode.test | 12 -
.../twig/tests/Fixtures/filters/last.test | 17 -
.../twig/tests/Fixtures/filters/length.test | 40 -
.../tests/Fixtures/filters/length_utf8.test | 12 -
.../twig/twig/tests/Fixtures/filters/map.test | 41 -
.../twig/tests/Fixtures/filters/merge.test | 25 -
.../twig/tests/Fixtures/filters/nl2br.test | 14 -
.../tests/Fixtures/filters/number_format.test | 18 -
.../filters/number_format_default.test | 21 -
.../twig/tests/Fixtures/filters/reduce.test | 14 -
.../twig/tests/Fixtures/filters/replace.test | 12 -
.../Fixtures/filters/replace_invalid_arg.test | 8 -
.../twig/tests/Fixtures/filters/reverse.test | 18 -
.../twig/tests/Fixtures/filters/round.test | 22 -
.../twig/tests/Fixtures/filters/slice.test | 54 -
.../twig/tests/Fixtures/filters/sort.test | 12 -
.../tests/Fixtures/filters/spaceless.test | 8 -
.../tests/Fixtures/filters/special_chars.test | 8 -
.../twig/tests/Fixtures/filters/split.test | 22 -
.../tests/Fixtures/filters/split_utf8.test | 24 -
.../tests/Fixtures/filters/static_calls.test | 10 -
.../twig/tests/Fixtures/filters/trim.test | 24 -
.../tests/Fixtures/filters/urlencode.test | 16 -
.../filters/urlencode_deprecated.test | 16 -
.../tests/Fixtures/functions/attribute.test | 18 -
.../twig/tests/Fixtures/functions/block.test | 12 -
.../functions/block_with_template.test | 22 -
.../functions/block_without_name.test | 12 -
.../tests/Fixtures/functions/constant.test | 10 -
.../twig/tests/Fixtures/functions/cycle.test | 16 -
.../twig/tests/Fixtures/functions/date.test | 27 -
.../Fixtures/functions/date_namedargs.test | 11 -
.../twig/tests/Fixtures/functions/dump.test | 16 -
.../tests/Fixtures/functions/dump_array.test | 19 -
.../Fixtures/functions/dynamic_function.test | 10 -
.../functions/include/assignment.test | 13 -
.../functions/include/autoescaping.test | 10 -
.../Fixtures/functions/include/basic.test | 17 -
.../functions/include/expression.test | 17 -
.../functions/include/ignore_missing.test | 10 -
.../include/ignore_missing_exists.test | 11 -
.../include/include_missing_extends.test | 13 -
.../Fixtures/functions/include/missing.test | 8 -
.../functions/include/missing_nested.test | 16 -
.../Fixtures/functions/include/sandbox.test | 13 -
.../functions/include/sandbox_disabling.test | 16 -
.../sandbox_disabling_ignore_missing.test | 13 -
.../functions/include/template_instance.test | 10 -
.../functions/include/templates_as_array.test | 12 -
.../functions/include/with_context.test | 16 -
.../functions/include/with_variables.test | 12 -
.../include_template_from_string.test | 11 -
.../tests/Fixtures/functions/magic_call.test | 8 -
.../Fixtures/functions/magic_call53.test | 12 -
.../twig/tests/Fixtures/functions/max.test | 12 -
.../twig/tests/Fixtures/functions/min.test | 12 -
.../twig/tests/Fixtures/functions/range.test | 8 -
.../recursive_block_with_inheritance.test | 21 -
.../twig/tests/Fixtures/functions/source.test | 17 -
.../Fixtures/functions/special_chars.test | 8 -
.../Fixtures/functions/static_calls.test | 10 -
.../functions/template_from_string.test | 15 -
.../functions/template_from_string_error.test | 8 -
.../tests/Fixtures/macros/default_values.test | 16 -
.../tests/Fixtures/macros/nested_calls.test | 18 -
.../Fixtures/macros/reserved_variables.test | 14 -
.../twig/tests/Fixtures/macros/simple.test | 22 -
.../twig/tests/Fixtures/macros/varargs.test | 21 -
.../Fixtures/macros/varargs_argument.test | 7 -
.../tests/Fixtures/macros/with_filters.test | 14 -
.../regression/block_names_unicity.test | 19 -
.../regression/combined_debug_info.test | 15 -
.../Fixtures/regression/empty_token.test | 8 -
.../tests/Fixtures/regression/issue_1143.test | 23 -
.../Fixtures/regression/multi_word_tests.test | 10 -
.../regression/simple_xml_element.test | 19 -
.../regression/strings_like_numbers.test | 8 -
.../twig/tests/Fixtures/tags/apply/basic.test | 10 -
.../Fixtures/tags/apply/json_encode.test | 8 -
.../tests/Fixtures/tags/apply/multiple.test | 10 -
.../tests/Fixtures/tags/apply/nested.test | 16 -
.../twig/tests/Fixtures/tags/apply/scope.test | 15 -
.../Fixtures/tags/apply/with_for_tag.test | 13 -
.../Fixtures/tags/apply/with_if_tag.test | 29 -
.../tests/Fixtures/tags/autoescape/basic.test | 26 -
.../Fixtures/tags/autoescape/blocks.test | 12 -
.../tags/autoescape/double_escaping.test | 10 -
.../Fixtures/tags/autoescape/functions.test | 83 -
.../Fixtures/tags/autoescape/literal.test | 87 -
.../Fixtures/tags/autoescape/nested.test | 26 -
.../Fixtures/tags/autoescape/objects.test | 26 -
.../tests/Fixtures/tags/autoescape/raw.test | 10 -
.../tags/autoescape/strategy.legacy.test | 11 -
.../Fixtures/tags/autoescape/strategy.test | 11 -
.../tests/Fixtures/tags/autoescape/type.test | 69 -
.../tags/autoescape/with_filters.test | 131 -
.../autoescape/with_filters_arguments.test | 23 -
.../autoescape/with_pre_escape_filters.test | 68 -
.../with_preserves_safety_filters.test | 50 -
.../twig/tests/Fixtures/tags/block/basic.test | 11 -
.../tags/block/block_unique_name.test | 11 -
.../Fixtures/tags/block/special_chars.test | 10 -
.../tags/deprecated/block.legacy.test | 20 -
.../tags/deprecated/macro.legacy.test | 21 -
.../tags/deprecated/template.legacy.test | 12 -
.../twig/tests/Fixtures/tags/embed/basic.test | 35 -
.../tags/embed/complex_dynamic_parent.test | 35 -
.../Fixtures/tags/embed/dynamic_parent.test | 35 -
.../tests/Fixtures/tags/embed/error_line.test | 16 -
.../tests/Fixtures/tags/embed/multiple.test | 50 -
.../tests/Fixtures/tags/embed/nested.test | 42 -
.../Fixtures/tags/embed/with_extends.test | 60 -
.../tests/Fixtures/tags/filter/basic.test | 10 -
.../Fixtures/tags/filter/json_encode.test | 8 -
.../tests/Fixtures/tags/filter/multiple.test | 10 -
.../tests/Fixtures/tags/filter/nested.test | 16 -
.../tests/Fixtures/tags/filter/scope.test | 11 -
.../Fixtures/tags/filter/with_for_tag.test | 13 -
.../Fixtures/tags/filter/with_if_tag.test | 29 -
.../tests/Fixtures/tags/for/condition.test | 14 -
.../twig/tests/Fixtures/tags/for/context.test | 18 -
.../twig/tests/Fixtures/tags/for/else.test | 23 -
.../Fixtures/tags/for/inner_variables.test | 17 -
.../twig/tests/Fixtures/tags/for/keys.test | 11 -
.../Fixtures/tags/for/keys_and_values.test | 11 -
.../tests/Fixtures/tags/for/loop_context.test | 19 -
.../Fixtures/tags/for/loop_context_local.test | 10 -
.../Fixtures/tags/for/loop_not_defined.test | 10 -
.../tags/for/loop_not_defined_cond.test | 9 -
.../tests/Fixtures/tags/for/nested_else.test | 17 -
.../twig/tests/Fixtures/tags/for/objects.test | 43 -
.../Fixtures/tags/for/objects_countable.test | 47 -
.../tests/Fixtures/tags/for/recursive.test | 18 -
.../twig/tests/Fixtures/tags/for/values.test | 11 -
.../twig/twig/tests/Fixtures/tags/from.test | 14 -
.../twig/tests/Fixtures/tags/if/basic.test | 22 -
.../tests/Fixtures/tags/if/expression.test | 22 -
.../tests/Fixtures/tags/include/basic.test | 16 -
.../Fixtures/tags/include/expression.test | 16 -
.../Fixtures/tags/include/ignore_missing.test | 10 -
.../tags/include/ignore_missing_exists.test | 11 -
.../tags/include/include_missing_extends.test | 13 -
.../tests/Fixtures/tags/include/missing.test | 8 -
.../Fixtures/tags/include/missing_nested.test | 16 -
.../tests/Fixtures/tags/include/only.test | 20 -
.../tags/include/template_instance.test | 10 -
.../tags/include/templates_as_array.test | 12 -
.../Fixtures/tags/include/with_variables.test | 14 -
.../Fixtures/tags/inheritance/basic.test | 14 -
.../Fixtures/tags/inheritance/block_expr.test | 30 -
.../tags/inheritance/block_expr2.test | 32 -
.../tags/inheritance/conditional.test | 14 -
.../Fixtures/tags/inheritance/dynamic.test | 14 -
.../Fixtures/tags/inheritance/empty.test | 10 -
.../tags/inheritance/extends_as_array.test | 12 -
.../extends_as_array_with_empty_name.test | 12 -
.../extends_as_array_with_null_name.test | 12 -
.../tags/inheritance/extends_in_block.test | 10 -
.../tags/inheritance/extends_in_macro.test | 10 -
.../Fixtures/tags/inheritance/multiple.test | 12 -
.../tags/inheritance/multiple_dynamic.test | 22 -
.../tags/inheritance/nested_blocks.test | 22 -
.../nested_blocks_parent_only.test | 15 -
.../tags/inheritance/nested_inheritance.test | 16 -
.../Fixtures/tags/inheritance/parent.test | 12 -
.../parent_as_template_wrapper.test | 12 -
.../tags/inheritance/parent_change.test | 16 -
.../tags/inheritance/parent_isolation.test | 20 -
.../tags/inheritance/parent_nested.test | 28 -
.../inheritance/parent_without_extends.test | 8 -
.../parent_without_extends_but_traits.test | 14 -
.../tags/inheritance/template_instance.test | 14 -
.../tests/Fixtures/tags/inheritance/use.test | 44 -
.../twig/tests/Fixtures/tags/macro/basic.test | 17 -
.../Fixtures/tags/macro/endmacro_name.test | 16 -
.../tests/Fixtures/tags/macro/external.test | 17 -
.../twig/tests/Fixtures/tags/macro/from.test | 18 -
.../tags/macro/from_in_block_is_local.test | 18 -
.../tags/macro/from_local_override.test | 28 -
.../tags/macro/from_macro_in_a_macro.test | 18 -
.../tags/macro/from_nested_blocks.test | 18 -
.../from_nested_blocks_with_global_macro.test | 18 -
.../tags/macro/from_syntax_error.test | 8 -
.../tags/macro/from_with_reserved_name.test | 8 -
.../tests/Fixtures/tags/macro/global.test | 14 -
.../tags/macro/import_and_blocks.test | 36 -
.../macro/import_from_string_template.test | 10 -
.../tags/macro/import_in_block_is_local.test | 18 -
.../tags/macro/import_local_override.test | 28 -
.../tags/macro/import_macro_in_a_macro.test | 18 -
.../macro/import_nested_blocks.legacy.test | 18 -
...ested_blocks_with_global_macro.legacy.test | 18 -
.../tags/macro/import_self_parent.test | 23 -
.../tags/macro/import_syntax_error.test | 10 -
.../tags/macro/import_with_reserved_name.test | 10 -
.../Fixtures/tags/macro/reserved_name.test | 10 -
.../Fixtures/tags/macro/self_import.test | 17 -
.../Fixtures/tags/macro/special_chars.test | 14 -
.../Fixtures/tags/macro/super_globals.test | 14 -
.../tests/Fixtures/tags/raw/basic.legacy.test | 10 -
.../tags/raw/mixed_usage_with_raw.legacy.test | 10 -
.../tags/raw/whitespace_control.legacy.test | 56 -
.../tests/Fixtures/tags/sandbox/array.test | 16 -
.../Fixtures/tags/sandbox/not_valid1.test | 11 -
.../Fixtures/tags/sandbox/not_valid2.test | 14 -
.../tests/Fixtures/tags/sandbox/simple.test | 22 -
.../twig/tests/Fixtures/tags/set/basic.test | 20 -
.../Fixtures/tags/set/capture-empty.test | 9 -
.../twig/tests/Fixtures/tags/set/capture.test | 10 -
.../Fixtures/tags/set/capture_scope.test | 10 -
.../tests/Fixtures/tags/set/expression.test | 12 -
.../tests/Fixtures/tags/set/inheritance.test | 24 -
.../tags/set/inheritance_overriding.test | 24 -
.../tests/Fixtures/tags/set/mutating.test | 17 -
.../tests/Fixtures/tags/spaceless/simple.test | 12 -
.../tests/Fixtures/tags/special_chars.test | 8 -
.../twig/tests/Fixtures/tags/use/aliases.test | 12 -
.../twig/tests/Fixtures/tags/use/basic.test | 12 -
.../twig/tests/Fixtures/tags/use/deep.test | 22 -
.../tests/Fixtures/tags/use/deep_empty.test | 10 -
.../tests/Fixtures/tags/use/inheritance.test | 25 -
.../tests/Fixtures/tags/use/inheritance2.test | 24 -
.../tests/Fixtures/tags/use/multiple.test | 21 -
.../Fixtures/tags/use/multiple_aliases.test | 23 -
.../tests/Fixtures/tags/use/parent_block.test | 24 -
.../Fixtures/tags/use/parent_block2.test | 24 -
.../Fixtures/tags/use/parent_block3.test | 38 -
.../Fixtures/tags/use/use_with_parent.test | 24 -
.../tests/Fixtures/tags/verbatim/basic.test | 10 -
.../tags/verbatim/mixed_usage_with_raw.test | 10 -
.../tags/verbatim/whitespace_control.test | 56 -
.../twig/tests/Fixtures/tags/with/basic.test | 13 -
.../tests/Fixtures/tags/with/expression.test | 10 -
.../tests/Fixtures/tags/with/globals.test | 10 -
.../tests/Fixtures/tags/with/iterable.test | 10 -
.../twig/tests/Fixtures/tags/with/nested.test | 15 -
.../Fixtures/tags/with/with_no_hash.test | 10 -
.../tests/Fixtures/tags/with/with_only.test | 10 -
.../twig/twig/tests/Fixtures/tests/array.test | 24 -
.../twig/tests/Fixtures/tests/constant.test | 14 -
.../twig/tests/Fixtures/tests/defined.test | 129 -
.../Fixtures/tests/defined_for_attribute.test | 35 -
.../Fixtures/tests/defined_for_blocks.test | 38 -
.../defined_for_blocks_with_template.test | 17 -
.../Fixtures/tests/defined_for_constants.test | 14 -
.../tests/defined_on_complex_expr.test | 8 -
.../tests/Fixtures/tests/dynamic_test.test | 14 -
.../twig/twig/tests/Fixtures/tests/empty.test | 54 -
.../twig/twig/tests/Fixtures/tests/even.test | 14 -
vendor/twig/twig/tests/Fixtures/tests/in.test | 118 -
.../tests/Fixtures/tests/in_with_objects.test | 19 -
.../twig/tests/Fixtures/tests/iterable.test | 19 -
.../tests/Fixtures/tests/null_coalesce.test | 30 -
.../twig/twig/tests/Fixtures/tests/odd.test | 10 -
.../tests/Fixtures/whitespace/trim_block.test | 68 -
.../whitespace/trim_delimiter_as_strings.test | 10 -
.../tests/Fixtures/whitespace/trim_left.test | 32 -
.../Fixtures/whitespace/trim_line_left.test | 33 -
.../Fixtures/whitespace/trim_line_right.test | 32 -
.../tests/Fixtures/whitespace/trim_right.test | 28 -
vendor/twig/twig/tests/IntegrationTest.php | 386 ---
.../autoescape/filename.legacy.test | 18 -
.../functions/undefined_block.legacy.test | 12 -
.../tests/LegacyFixtures/test.legacy.test | 8 -
.../twig/twig/tests/LegacyIntegrationTest.php | 59 -
vendor/twig/twig/tests/LexerTest.php | 378 ---
vendor/twig/twig/tests/Loader/ArrayTest.php | 139 -
vendor/twig/twig/tests/Loader/ChainTest.php | 133 -
.../twig/twig/tests/Loader/FilesystemTest.php | 247 --
.../array_inheritance_empty_parent.html.twig | 3 -
...y_inheritance_nonexistent_parent.html.twig | 3 -
.../array_inheritance_null_parent.html.twig | 3 -
.../array_inheritance_valid_parent.html.twig | 3 -
.../Fixtures/inheritance/parent.html.twig | 1 -
.../inheritance/spare_parent.html.twig | 1 -
.../tests/Loader/Fixtures/named/index.html | 1 -
.../Loader/Fixtures/named_bis/index.html | 1 -
.../Loader/Fixtures/named_final/index.html | 1 -
.../Fixtures/named_quater/named_absolute.html | 1 -
.../Loader/Fixtures/named_ter/index.html | 1 -
.../tests/Loader/Fixtures/normal/index.html | 1 -
.../Loader/Fixtures/normal_bis/index.html | 1 -
.../Loader/Fixtures/normal_final/index.html | 1 -
.../Loader/Fixtures/normal_ter/index.html | 1 -
.../Loader/Fixtures/phar/phar-sample.phar | 293 --
.../Fixtures/themes/theme1/blocks.html.twig | 3 -
.../Fixtures/themes/theme2/blocks.html.twig | 3 -
.../twig/twig/tests/NativeExtensionTest.php | 43 -
.../twig/twig/tests/Node/AutoEscapeTest.php | 39 -
.../twig/tests/Node/BlockReferenceTest.php | 36 -
vendor/twig/twig/tests/Node/BlockTest.php | 45 -
.../twig/twig/tests/Node/DeprecatedTest.php | 82 -
vendor/twig/twig/tests/Node/DoTest.php | 38 -
.../twig/tests/Node/Expression/ArrayTest.php | 43 -
.../tests/Node/Expression/AssignNameTest.php | 34 -
.../tests/Node/Expression/Binary/AddTest.php | 40 -
.../tests/Node/Expression/Binary/AndTest.php | 40 -
.../Node/Expression/Binary/ConcatTest.php | 40 -
.../tests/Node/Expression/Binary/DivTest.php | 40 -
.../Node/Expression/Binary/FloorDivTest.php | 40 -
.../tests/Node/Expression/Binary/ModTest.php | 40 -
.../tests/Node/Expression/Binary/MulTest.php | 40 -
.../tests/Node/Expression/Binary/OrTest.php | 40 -
.../tests/Node/Expression/Binary/SubTest.php | 40 -
.../twig/tests/Node/Expression/CallTest.php | 139 -
.../tests/Node/Expression/ConditionalTest.php | 44 -
.../tests/Node/Expression/ConstantTest.php | 35 -
.../twig/tests/Node/Expression/FilterTest.php | 161 -
.../tests/Node/Expression/FunctionTest.php | 119 -
.../tests/Node/Expression/GetAttrTest.php | 59 -
.../twig/tests/Node/Expression/NameTest.php | 49 -
.../Node/Expression/NullCoalesceTest.php | 38 -
.../Node/Expression/PHP53/FilterInclude.php | 8 -
.../Node/Expression/PHP53/FunctionInclude.php | 8 -
.../Node/Expression/PHP53/TestInclude.php | 8 -
.../twig/tests/Node/Expression/ParentTest.php | 33 -
.../twig/tests/Node/Expression/TestTest.php | 92 -
.../tests/Node/Expression/Unary/NegTest.php | 38 -
.../tests/Node/Expression/Unary/NotTest.php | 37 -
.../tests/Node/Expression/Unary/PosTest.php | 37 -
vendor/twig/twig/tests/Node/ForTest.php | 201 --
vendor/twig/twig/tests/Node/IfTest.php | 97 -
vendor/twig/twig/tests/Node/ImportTest.php | 47 -
vendor/twig/twig/tests/Node/IncludeTest.php | 95 -
vendor/twig/twig/tests/Node/MacroTest.php | 83 -
vendor/twig/twig/tests/Node/ModuleTest.php | 270 --
vendor/twig/twig/tests/Node/PrintTest.php | 35 -
vendor/twig/twig/tests/Node/SandboxTest.php | 49 -
vendor/twig/twig/tests/Node/SetTest.php | 80 -
vendor/twig/twig/tests/Node/SpacelessTest.php | 44 -
vendor/twig/twig/tests/Node/TextTest.php | 33 -
vendor/twig/twig/tests/NodeTraverserTest.php | 49 -
.../twig/tests/NodeVisitor/OptimizerTest.php | 116 -
vendor/twig/twig/tests/ParserTest.php | 218 --
.../tests/Profiler/Dumper/AbstractTest.php | 107 -
.../tests/Profiler/Dumper/BlackfireTest.php | 36 -
.../twig/tests/Profiler/Dumper/HtmlTest.php | 34 -
.../twig/tests/Profiler/Dumper/TextTest.php | 34 -
.../twig/twig/tests/Profiler/ProfileTest.php | 114 -
vendor/twig/twig/tests/TemplateTest.php | 809 -----
.../twig/twig/tests/TemplateWrapperTest.php | 70 -
vendor/twig/twig/tests/TokenStreamTest.php | 85 -
.../tests/Util/DeprecationCollectorTest.php | 48 -
vendor/twig/twig/tests/escapingTest.php | 327 --
.../typo3/phar-stream-wrapper/.appveyor.yml | 53 -
vendor/typo3/phar-stream-wrapper/.gitignore | 3 -
.../zend-diactoros/.coveralls.yml | 2 -
.../zendframework/zend-diactoros/CONDUCT.md | 43 -
.../zend-diactoros/CONTRIBUTING.md | 228 --
.../zendframework/zend-diactoros/LICENSE.md | 12 -
vendor/zendframework/zend-diactoros/README.md | 34 -
.../zend-diactoros/composer.json | 72 -
.../zend-diactoros/composer.lock | 1695 ----------
.../zendframework/zend-diactoros/mkdocs.yml | 16 -
.../Exception/DeprecatedMethodException.php | 19 -
.../src/Exception/ExceptionInterface.php | 17 -
.../functions/marshal_method_from_sapi.php | 19 -
.../zendframework/zend-escaper/CHANGELOG.md | 73 -
vendor/zendframework/zend-escaper/README.md | 28 -
.../src/Exception/ExceptionInterface.php | 14 -
.../Exception/InvalidArgumentException.php | 18 -
.../src/Exception/RuntimeException.php | 18 -
vendor/zendframework/zend-feed/CHANGELOG.md | 475 ---
vendor/zendframework/zend-feed/README.md | 12 -
vendor/zendframework/zend-feed/composer.json | 72 -
.../src/Exception/BadMethodCallException.php | 14 -
.../src/Exception/ExceptionInterface.php | 14 -
.../Exception/InvalidArgumentException.php | 14 -
.../src/Exception/RuntimeException.php | 14 -
.../Exception/ExceptionInterface.php | 16 -
.../Exception/InvalidArgumentException.php | 16 -
.../Exception/RuntimeException.php | 16 -
.../src/PubSubHubbub/Model/AbstractModel.php | 39 -
.../zend-feed/src/PubSubHubbub/Version.php | 15 -
.../zend-feed/src/Reader/Collection.php | 21 -
.../src/Reader/Collection/Collection.php | 16 -
.../Exception/BadMethodCallException.php | 16 -
.../Reader/Exception/ExceptionInterface.php | 16 -
.../Exception/InvalidArgumentException.php | 16 -
.../Exception/InvalidHttpClientException.php | 16 -
.../src/Reader/Exception/RuntimeException.php | 16 -
.../src/Reader/Http/ClientInterface.php | 21 -
.../src/Reader/Http/ResponseInterface.php | 27 -
.../Exception/BadMethodCallException.php | 21 -
.../Writer/Exception/ExceptionInterface.php | 19 -
.../Exception/InvalidArgumentException.php | 21 -
.../src/Writer/Exception/RuntimeException.php | 16 -
.../zend-feed/src/Writer/Source.php | 16 -
.../zend-feed/src/Writer/Version.php | 15 -
vendor/zendframework/zend-stdlib/CHANGELOG.md | 385 ---
vendor/zendframework/zend-stdlib/README.md | 29 -
.../zendframework/zend-stdlib/composer.json | 56 -
.../src/ArrayUtils/MergeRemoveKey.php | 14 -
.../ArrayUtils/MergeReplaceKeyInterface.php | 21 -
.../zend-stdlib/src/DispatchableInterface.php | 22 -
.../src/Exception/BadMethodCallException.php | 17 -
.../src/Exception/DomainException.php | 17 -
.../src/Exception/ExceptionInterface.php | 17 -
.../Exception/ExtensionNotLoadedException.php | 17 -
.../Exception/InvalidArgumentException.php | 17 -
.../src/Exception/LogicException.php | 17 -
.../src/Exception/RuntimeException.php | 17 -
.../zend-stdlib/src/Guard/AllGuardsTrait.php | 20 -
.../src/InitializableInterface.php | 23 -
.../zend-stdlib/src/JsonSerializable.php | 17 -
.../zendframework/zend-stdlib/src/Request.php | 15 -
.../zend-stdlib/src/RequestInterface.php | 14 -
.../zend-stdlib/src/Response.php | 15 -
.../zend-stdlib/src/ResponseInterface.php | 14 -
web/core/.eslintignore | 1 +
web/core/.eslintrc.json | 1 +
web/core/CHANGELOG.txt | 4 +-
web/core/COPYRIGHT.txt | 33 +-
web/core/MAINTAINERS.txt | 6 +-
web/core/UPDATE.txt | 257 +-
.../scaffold/files/default.settings.php | 37 +
.../assets/scaffold/files/drupal.README.txt | 4 +
.../scaffold/files/example.settings.local.php | 8 +-
web/core/assets/scaffold/files/htaccess | 17 +-
.../assets/vendor/backbone/backbone-min.js | 2 +-
.../assets/vendor/backbone/backbone-min.map | 2 +-
web/core/assets/vendor/backbone/backbone.js | 604 ++--
.../assets/vendor/jquery-once/jquery.once.js | 13 +-
.../vendor/jquery-once/jquery.once.min.js | 4 +-
.../vendor/jquery-once/jquery.once.min.js.map | 2 +-
.../vendor/jquery.cookie/jquery.cookie.min.js | 2 -
.../jquery/jquery-htmlprefilter-3.5.0.js | 96 -
web/core/assets/vendor/jquery/jquery.js | 1238 ++++---
web/core/assets/vendor/jquery/jquery.min.js | 4 +-
web/core/assets/vendor/jquery/jquery.min.map | 2 +-
.../assets/vendor/js-cookie/js.cookie.min.js | 2 +
.../vendor/picturefill/picturefill.min.js | 8 +-
web/core/assets/vendor/popperjs/popper.min.js | 2 +-
.../assets/vendor/popperjs/popper.min.js.map | 2 +-
.../assets/vendor/sortable/Sortable.min.js | 4 +-
.../vendor/underscore/underscore-min.js | 7 +-
.../vendor/underscore/underscore-min.js.map | 1 +
.../vendor/underscore/underscore-min.map | 1 -
web/core/authorize.php | 16 +-
web/core/composer.json | 9 +-
web/core/core.api.php | 35 +
web/core/core.libraries.yml | 61 +-
web/core/core.services.yml | 74 +-
web/core/drupalci.yml | 2 +
web/core/includes/bootstrap.inc | 2 +-
web/core/includes/common.inc | 2 +-
web/core/includes/install.core.inc | 78 +-
web/core/includes/install.inc | 89 +-
web/core/includes/schema.inc | 7 +-
web/core/includes/update.inc | 114 +-
web/core/lib/Drupal.php | 2 +-
.../Bridge/ZfExtensionManagerSfContainer.php | 33 +-
.../lib/Drupal/Component/Bridge/composer.json | 2 +-
.../Component/Datetime/DateTimePlus.php | 20 +-
.../DependencyInjection/Container.php | 55 +-
.../Dumper/OptimizedPhpArrayDumper.php | 10 +-
.../DependencyInjection/PhpArrayContainer.php | 55 +-
.../Component/FileSecurity/FileSecurity.php | 3 -
.../FileSystem/RegexDirectoryIterator.php | 2 +-
.../lib/Drupal/Component/Gettext/PoHeader.php | 15 +
.../Component/Plugin/LazyPluginCollection.php | 14 +-
.../lib/Drupal/Component/Utility/Unicode.php | 1 +
.../lib/Drupal/Core/Access/AccessManager.php | 2 +-
.../Access/CsrfRequestHeaderAccessCheck.php | 5 +-
.../Core/Ajax/OpenOffCanvasDialogCommand.php | 2 +-
web/core/lib/Drupal/Core/Archiver/Zip.php | 2 +-
.../Asset/LibrariesDirectoryFileFinder.php | 100 +
.../Core/Asset/LibraryDiscoveryParser.php | 34 +-
.../Context/ProtocolVersionCacheContext.php | 38 +
.../lib/Drupal/Core/Command/DbDumpCommand.php | 4 +-
.../Drupal/Core/Command/DbImportCommand.php | 2 +-
.../Core/Command/DbToolsApplication.php | 2 +-
.../Drupal/Core/Command/InstallCommand.php | 5 +
.../lib/Drupal/Core/Composer/Composer.php | 6 +-
.../lib/Drupal/Core/Config/ConfigEvents.php | 2 +-
.../lib/Drupal/Core/Config/ConfigFactory.php | 2 +-
.../Drupal/Core/Config/ConfigInstaller.php | 1 +
.../Core/Config/Entity/ConfigEntityBase.php | 11 +-
.../Config/Entity/ConfigEntityUpdater.php | 4 +-
.../Core/Config/Entity/Query/Condition.php | 11 +
.../Drupal/Core/Config/Entity/Query/Query.php | 3 +
.../Core/Config/Entity/Query/QueryFactory.php | 2 +-
.../Core/Config/ImportStorageTransformer.php | 2 +-
.../Drupal/Core/Config/StorageCopyTrait.php | 10 +-
.../lib/Drupal/Core/Database/Connection.php | 62 +-
.../lib/Drupal/Core/Database/Database.php | 172 +-
.../Core/Database/Driver/mysql/Schema.php | 31 +-
.../Core/Database/Driver/pgsql/Schema.php | 31 +-
.../Database/Driver/sqlite/Connection.php | 4 +-
.../Core/Database/Driver/sqlite/Schema.php | 28 +-
.../Drupal/Core/Database/Install/Tasks.php | 24 +-
.../Drupal/Core/Database/Query/Condition.php | 2 +-
.../lib/Drupal/Core/Database/Query/Delete.php | 2 +-
.../lib/Drupal/Core/Database/Query/Merge.php | 4 +-
.../Database/Query/QueryConditionTrait.php | 2 +-
.../lib/Drupal/Core/Database/Query/Select.php | 4 +-
.../Core/Database/Query/SelectExtender.php | 2 +-
.../lib/Drupal/Core/Database/Query/Update.php | 2 +-
web/core/lib/Drupal/Core/Database/Schema.php | 5 +-
.../lib/Drupal/Core/Database/Statement.php | 5 +
.../Core/Database/StatementPrefetch.php | 13 +-
web/core/lib/Drupal/Core/DrupalKernel.php | 2 +-
.../Core/Entity/ContentEntityStorageBase.php | 2 +-
.../Core/Entity/EntityAutocompleteMatcher.php | 22 +-
.../EntityAutocompleteMatcherInterface.php | 30 +
.../lib/Drupal/Core/Entity/EntityBase.php | 19 +-
.../Core/Entity/EntityBundleAccessCheck.php | 51 +
.../lib/Drupal/Core/Entity/EntityType.php | 9 +-
.../Core/Entity/EntityTypeInterface.php | 19 +-
.../FieldableEntityStorageInterface.php | 2 +-
.../Derivative/DefaultSelectionDeriver.php | 4 +-
.../DefaultSelection.php | 13 +-
.../EntityReferenceSelection/PhpSelection.php | 13 +
.../Core/Entity/Query/Sql/Condition.php | 2 +
.../Drupal/Core/Entity/Query/Sql/Query.php | 24 +
.../Drupal/Core/Entity/Query/Sql/Tables.php | 13 +-
.../Sql/SqlContentEntityStorageSchema.php | 30 +-
.../lib/Drupal/Core/Entity/entity.api.php | 6 +-
.../ConfigImportSubscriber.php | 2 +
.../ExceptionLoggingSubscriber.php | 8 +-
.../FinishResponseSubscriber.php | 2 +-
.../Core/Extension/ModuleHandlerInterface.php | 4 +-
.../Drupal/Core/Extension/ModuleInstaller.php | 15 +-
...duleRequiredByThemesUninstallValidator.php | 84 +
.../ModuleUninstallValidatorInterface.php | 14 -
.../Core/Extension/ThemeExtensionList.php | 18 +
.../Drupal/Core/Extension/ThemeInstaller.php | 60 +-
.../Extension/ThemeInstallerInterface.php | 3 +
.../lib/Drupal/Core/Extension/module.api.php | 47 +-
.../lib/Drupal/Core/Field/FieldConfigBase.php | 2 +-
.../lib/Drupal/Core/Field/FieldItemList.php | 9 +
.../Form/FileTransferAuthorizeForm.php | 19 +-
web/core/lib/Drupal/Core/Form/FormBuilder.php | 21 +-
web/core/lib/Drupal/Core/GeneratedButton.php | 19 +
.../Core/Installer/Form/SelectProfileForm.php | 2 +-
.../Core/Installer/Form/SiteSettingsForm.php | 37 +-
.../NormalInstallerServiceProvider.php | 2 +-
.../Language/LanguageManagerInterface.php | 2 +-
.../Logger/LoggerChannelFactoryInterface.php | 2 +-
.../Menu/DefaultMenuLinkTreeManipulators.php | 2 +-
.../lib/Drupal/Core/Menu/MenuLinkManager.php | 2 +-
web/core/lib/Drupal/Core/Pager/Pager.php | 2 +-
.../Core/Password/PhpassHashedPassword.php | 2 +
.../Plugin/DefaultLazyPluginCollection.php | 12 +-
.../DefaultSingleLazyPluginCollection.php | 2 +-
.../Drupal/Core/ProxyBuilder/ProxyBuilder.php | 2 +-
...duleRequiredByThemesUninstallValidator.php | 88 +
.../Core/Render/Element/PasswordConfirm.php | 10 +-
web/core/lib/Drupal/Core/Render/Renderer.php | 2 +-
web/core/lib/Drupal/Core/Render/theme.api.php | 2 +-
web/core/lib/Drupal/Core/Site/Settings.php | 17 +-
.../Drupal/Core/Template/TwigExtension.php | 15 +-
.../lib/Drupal/Core/Test/TestDiscovery.php | 2 +-
.../lib/Drupal/Core/Theme/ActiveTheme.php | 11 +-
web/core/lib/Drupal/Core/Theme/Registry.php | 8 +
.../Drupal/Core/Theme/ThemeInitialization.php | 12 +-
.../Core/TypedData/TypedDataInterface.php | 4 +-
.../Validation/TypedDataMetadata.php | 9 -
.../Core/Update/UpdateServiceProvider.php | 2 +-
web/core/lib/Drupal/Core/Updater/Updater.php | 14 +-
web/core/lib/Drupal/Core/Url.php | 8 +
.../lib/Drupal/Core/Utility/LinkGenerator.php | 37 +-
.../lib/Drupal/Core/Utility/TableSort.php | 2 +-
web/core/misc/ajax.es6.js | 36 +-
web/core/misc/ajax.js | 14 +-
web/core/misc/dialog/dialog.ajax.es6.js | 7 +-
web/core/misc/dialog/dialog.ajax.js | 4 +-
web/core/misc/entity-form.es6.js | 2 +-
web/core/misc/jquery.cookie.shim.es6.js | 224 ++
web/core/misc/jquery.cookie.shim.js | 88 +
web/core/misc/machine-name.es6.js | 23 +-
web/core/misc/machine-name.js | 13 +-
web/core/misc/message.es6.js | 2 +-
web/core/misc/message.js | 2 +-
web/core/misc/polyfills/object.assign.es6.js | 42 +
web/core/misc/polyfills/object.assign.js | 35 +
web/core/misc/tabledrag.es6.js | 14 +-
web/core/misc/tabledrag.js | 8 +-
web/core/misc/tableheader.es6.js | 2 +-
web/core/misc/tableheader.js | 2 +-
web/core/modules/action/action.info.yml | 2 +-
.../modules/action/action.post_update.php | 7 +
.../action/config/schema/action.schema.yml | 9 -
.../action/migrations/action_settings.yml | 8 +-
.../update/action.settings_3022401.yml} | 0
.../update/drupal-8.action-3022401.php | 41 +
.../src/Functional/ConfigurationTest.php | 12 +-
.../Functional/Update/ActionConfigTest.php | 46 +
.../Migrate/d6/MigrateActionConfigsTest.php | 7 +-
.../Kernel/Migrate/d6/MigrateActionsTest.php | 2 +-
.../Migrate/d7/MigrateActionConfigsTest.php | 7 +-
.../Kernel/Migrate/d7/MigrateActionsTest.php | 2 +-
.../modules/aggregator/aggregator.info.yml | 2 +-
.../aggregator/parser/DefaultParser.php | 6 +-
.../src/Tests/AggregatorTestBase.php | 8 +-
.../tests/src/Functional/AddFeedTest.php | 8 +-
.../src/Functional/AggregatorAdminTest.php | 4 +-
.../Functional/AggregatorRenderingTest.php | 20 +-
.../src/Functional/AggregatorTestBase.php | 12 +-
.../tests/src/Functional/DeleteFeedTest.php | 2 +-
.../src/Functional/FeedAdminDisplayTest.php | 2 +-
.../tests/src/Functional/FeedParserTest.php | 7 +-
.../Functional/FeedProcessorPluginTest.php | 2 +-
.../Functional/Hal/ItemHalJsonTestBase.php | 2 +-
.../Functional/Rest/FeedResourceTestBase.php | 3 +
.../src/Functional/UpdateFeedItemTest.php | 4 +-
.../tests/src/Functional/UpdateFeedTest.php | 2 +-
.../Kernel/AggregatorPluginManagerTest.php | 4 +-
.../tests/src/Kernel/AggregatorTitleTest.php | 24 +-
.../tests/src/Kernel/FeedValidationTest.php | 4 +-
.../Migrate/d7/MigrateAggregatorFeedTest.php | 2 +-
.../src/Kernel/Views/IntegrationTest.php | 9 +-
web/core/modules/ban/ban.info.yml | 2 +-
.../Plugin/migrate/destination/BlockedIp.php | 4 +-
.../src/Functional/IpAddressBlockingTest.php | 4 +-
.../Migrate/d7/MigrateBlockedIPsTest.php | 4 +-
.../modules/basic_auth/basic_auth.info.yml | 2 +-
.../src/Authentication/Provider/BasicAuth.php | 12 +-
.../tests/src/Functional/BasicAuthTest.php | 55 +-
.../tests/src/Functional/BigPipeTest.php | 13 +-
.../Placeholder/BigPipeStrategyTest.php | 2 +-
web/core/modules/block/js/block.es6.js | 2 +-
web/core/modules/block/src/BlockForm.php | 2 +-
.../Plugin/migrate/process/BlockSettings.php | 5 +
.../block/src/Plugin/migrate/source/Block.php | 5 +
.../modules/block/src/Tests/BlockTestBase.php | 8 +-
.../src/Functional/BlockAdminThemeTest.php | 4 +-
.../tests/src/Functional/BlockCacheTest.php | 4 +-
.../tests/src/Functional/BlockDemoTest.php | 6 +-
.../src/Functional/BlockFormInBlockTest.php | 4 +-
.../block/tests/src/Functional/BlockTest.php | 6 +-
.../tests/src/Functional/BlockTestBase.php | 8 +-
.../tests/src/Functional/BlockUiTest.php | 15 +-
.../Functional/Rest/BlockResourceTestBase.php | 3 +
.../src/Functional/Views/DisplayBlockTest.php | 22 +-
.../FunctionalJavascript/BlockFilterTest.php | 4 +-
.../tests/src/Kernel/BlockStorageUnitTest.php | 8 +-
.../d6/MigrateBlockContentTranslationTest.php | 2 -
.../Kernel/Migrate/d6/MigrateBlockTest.php | 4 +-
.../d7/MigrateBlockContentTranslationTest.php | 2 -
.../Kernel/Migrate/d7/MigrateBlockTest.php | 2 +-
.../block_content/block_content.info.yml | 2 +-
.../src/Tests/Views/BlockContentTestBase.php | 6 +-
.../Functional/BlockContentCreationTest.php | 6 +-
.../src/Functional/BlockContentListTest.php | 16 +-
.../Functional/BlockContentListViewsTest.php | 23 +-
.../Functional/BlockContentPageViewTest.php | 4 +-
.../Functional/BlockContentRevisionsTest.php | 6 +-
.../BlockContentTranslationUITest.php | 2 +-
.../src/Functional/BlockContentTypeTest.php | 11 +-
.../Functional/BlockContentValidationTest.php | 4 +-
.../Update/BlockContentUpdateTest.php | 4 +-
.../Views/BlockContentFieldFilterTest.php | 2 +-
.../Views/BlockContentIntegrationTest.php | 4 +-
.../Functional/Views/BlockContentTestBase.php | 6 +-
.../MigrateBlockContentBodyFieldTest.php | 4 +-
.../MigrateBlockContentEntityDisplayTest.php | 2 +-
...grateBlockContentEntityFormDisplayTest.php | 2 +-
.../Migrate/MigrateBlockContentStubTest.php | 2 +-
.../Migrate/MigrateBlockContentTypeTest.php | 2 +-
...grateCustomBlockContentTranslationTest.php | 2 -
...grateCustomBlockContentTranslationTest.php | 2 -
.../Migrate/d7/MigrateCustomBlockTest.php | 2 +-
.../src/Unit/Access/DependentAccessTest.php | 6 +-
.../modules/block_place/block_place.module | 2 -
.../tests/src/Functional/BlockPlaceTest.php | 4 +-
web/core/modules/book/src/BookManager.php | 3 +-
.../modules/book/src/BookManagerInterface.php | 2 +-
.../src/Functional/BookBreadcrumbTest.php | 10 +-
.../Functional/BookContentModerationTest.php | 7 +-
.../book/tests/src/Functional/BookTest.php | 16 +-
.../src/Kernel/BookPendingRevisionTest.php | 10 +-
.../tests/src/Kernel/BookUninstallTest.php | 10 +-
.../modules/breakpoint/breakpoint.info.yml | 2 +-
.../modules/ckeditor/js/ckeditor.admin.es6.js | 8 +-
.../js/ckeditor.drupalimage.admin.es6.js | 2 +-
web/core/modules/ckeditor/js/ckeditor.es6.js | 3 +
web/core/modules/ckeditor/js/ckeditor.js | 2 +
.../js/ckeditor.off-canvas-css-reset.es6.js | 5 +
.../js/ckeditor.off-canvas-css-reset.js | 5 +
.../js/ckeditor.stylescombo.admin.es6.js | 4 +-
.../js/plugins/drupalimage/plugin.es6.js | 2 +-
.../ckeditor/js/views/KeyboardView.es6.js | 2 +-
.../src/Plugin/CKEditorPlugin/Internal.php | 2 +-
.../src/Plugin/CKEditorPlugin/Language.php | 5 +-
.../src/Functional/CKEditorAdminTest.php | 26 +-
.../src/Functional/CKEditorLoadingTest.php | 16 +-
.../CKEditorIntegrationTest.php | 21 +
.../tests/src/Kernel/CKEditorTest.php | 10 +-
.../Plugin/CKEditorPlugin/LanguageTest.php | 14 +-
web/core/modules/color/color.info.yml | 2 +-
web/core/modules/color/color.module | 2 +-
web/core/modules/color/preview.es6.js | 12 +-
.../color/tests/src/Functional/ColorTest.php | 10 +-
web/core/modules/comment/comment.info.yml | 2 +-
.../comment/js/comment-new-indicator.es6.js | 2 +-
.../comment/js/comment-new-indicator.js | 2 +-
.../modules/comment/migrations/d6_comment.yml | 3 +
.../modules/comment/migrations/d7_comment.yml | 3 +
.../Plugin/views/field/NodeNewComments.php | 4 +-
.../comment/src/Tests/CommentTestBase.php | 9 +-
.../tests/src/Functional/CommentAdminTest.php | 12 +-
.../src/Functional/CommentAnonymousTest.php | 14 +-
.../tests/src/Functional/CommentCSSTest.php | 6 +-
.../src/Functional/CommentEntityTest.php | 10 +-
.../src/Functional/CommentFieldsTest.php | 8 +-
.../src/Functional/CommentInterfaceTest.php | 10 +-
.../src/Functional/CommentLanguageTest.php | 7 +-
.../Functional/CommentNewIndicatorTest.php | 6 +-
.../src/Functional/CommentNodeChangesTest.php | 2 +-
.../src/Functional/CommentNonNodeTest.php | 18 +-
.../src/Functional/CommentPreviewTest.php | 12 +-
.../tests/src/Functional/CommentTestBase.php | 13 +-
.../tests/src/Functional/CommentTitleTest.php | 2 +-
.../Functional/CommentTokenReplaceTest.php | 2 +-
.../Functional/CommentTranslationUITest.php | 9 +-
.../tests/src/Functional/CommentTypeTest.php | 7 +-
.../Rest/CommentResourceTestBase.php | 6 +
.../Views/CommentFieldFilterTest.php | 2 +-
.../Views/CommentOperationsTest.php | 6 +-
.../Views/CommentRestExportTest.php | 12 +-
.../src/Functional/Views/CommentRowTest.php | 2 +-
.../src/Functional/Views/NodeCommentsTest.php | 4 +-
.../tests/src/Functional/Views/RowRssTest.php | 2 +-
.../src/Kernel/CommentIntegrationTest.php | 16 +-
.../tests/src/Kernel/CommentItemTest.php | 8 +-
.../tests/src/Kernel/CommentLegacyTest.php | 2 +-
.../src/Kernel/CommentValidationTest.php | 16 +-
.../d6/MigrateCommentEntityDisplayTest.php | 2 +-
...ateCommentEntityFormDisplaySubjectTest.php | 2 +-
.../MigrateCommentEntityFormDisplayTest.php | 2 +-
.../d7/MigrateCommentEntityDisplayTest.php | 2 +-
...ateCommentEntityFormDisplaySubjectTest.php | 2 +-
.../MigrateCommentEntityFormDisplayTest.php | 2 +-
.../Kernel/Migrate/d7/MigrateCommentTest.php | 2 -
.../src/Kernel/Views/CommentAdminViewTest.php | 14 +-
.../src/Unit/CommentStatisticsUnitTest.php | 2 +-
web/core/modules/config/config.info.yml | 2 +-
.../modules/config/src/Form/ConfigSync.php | 4 +-
.../src/EventSubscriber.php | 14 +-
.../Rest/ConfigTestResourceTestBase.php | 1 +
.../ConfigDraggableListBuilderTest.php | 2 +-
.../src/Functional/ConfigEntityListTest.php | 12 +-
.../Functional/ConfigEntityStatusUITest.php | 4 +-
.../tests/src/Functional/ConfigEntityTest.php | 12 +-
.../Functional/ConfigExportImportUITest.php | 12 +-
.../src/Functional/ConfigExportUITest.php | 4 +-
.../src/Functional/ConfigImportUITest.php | 66 +-
.../src/Functional/ConfigImportUploadTest.php | 4 +-
.../ConfigInstallProfileOverrideTest.php | 2 +-
...figInstallProfileUnmetDependenciesTest.php | 4 +-
.../src/Functional/ConfigInstallWebTest.php | 2 +-
.../ConfigLanguageOverrideWebTest.php | 2 +-
.../ConfigSingleImportExportTest.php | 4 +-
.../config_translation.info.yml | 2 +-
.../src/ConfigEntityMapper.php | 2 +
.../ConfigTranslationFieldListBuilder.php | 4 +-
.../src/FormElement/FormElementBase.php | 8 +-
.../ConfigTranslationDateFormatUiTest.php | 4 +-
.../ConfigTranslationInstallTest.php | 2 +-
.../ConfigTranslationOverviewTest.php | 36 +-
.../Functional/ConfigTranslationUiTest.php | 20 +-
.../ConfigTranslationUiThemeTest.php | 2 +-
...igrateSystemMaintenanceTranslationTest.php | 2 -
.../d6/MigrateSystemSiteTranslationTest.php | 2 -
.../d6/MigrateUserConfigsTranslationTest.php | 2 -
...serProfileFieldInstanceTranslationTest.php | 2 -
...igrateSystemMaintenanceTranslationTest.php | 2 -
.../d7/MigrateSystemSiteTranslationTest.php | 2 -
.../d7/MigrateUserConfigsTranslationTest.php | 2 -
.../tests/src/Unit/ConfigEntityMapperTest.php | 2 +-
.../tests/src/Unit/ConfigFieldMapperTest.php | 2 +-
web/core/modules/contact/contact.info.yml | 2 +-
.../contact/src/ContactFormInterface.php | 2 +-
.../src/Functional/ContactLanguageTest.php | 4 +-
.../src/Functional/ContactPersonalTest.php | 42 +-
.../src/Functional/ContactSitewideTest.php | 50 +-
.../Migrate/MigrateContactCategoryTest.php | 2 +-
.../content_moderation.module | 7 +-
.../src/ModerationInformation.php | 2 +-
.../FieldWidget/ModerationStateWidget.php | 2 +-
.../src/Functional/ModerationFormTest.php | 34 +-
.../ModerationStateNodeTypeTest.php | 6 +-
.../tests/src/Functional/NodeAccessTest.php | 26 +-
.../Kernel/ContentModerationAccessTest.php | 97 +
.../src/Kernel/ContentModerationStateTest.php | 2 +-
.../ModerationStateFieldItemListTest.php | 4 +-
.../Kernel/ViewsModerationStateFilterTest.php | 2 +-
.../content_translation.info.yml | 2 +-
.../d6_entity_reference_translation.yml | 1 +
.../migrations/d6_term_node_translation.yml | 6 +-
.../d7_entity_reference_translation.yml | 1 +
.../d7_taxonomy_term_translation.yml | 1 +
.../node_translation_menu_links.yml | 2 +
.../content_translation.migrate_drupal.yml | 11 +-
...nSynchronizedFieldsConstraintValidator.php | 2 +-
.../ContentTranslationEntityBundleUITest.php | 12 +-
.../ContentTranslationLanguageChangeTest.php | 22 +-
.../ContentTranslationLinkTagTest.php | 7 +-
.../ContentTranslationOperationsTest.php | 12 +-
...tentTranslationPendingRevisionTestBase.php | 7 +-
.../ContentTranslationSettingsTest.php | 9 +-
.../ContentTranslationSyncImageTest.php | 8 +-
.../ContentTranslationUITestBase.php | 12 +-
.../ContentTranslationWorkflowsTest.php | 13 +-
.../Views/ContentTranslationViewsUITest.php | 2 +-
.../ContentTranslationContextualLinksTest.php | 2 +-
.../ContentTranslationConfigImportTest.php | 8 +-
...ontentTranslationFieldSyncRevisionTest.php | 8 +-
.../ContentTranslationSettingsApiTest.php | 7 +-
.../d6/MigrateTaxonomyTermTranslationTest.php | 2 -
.../MigrateEntityTranslationSettingsTest.php | 2 -
.../modules/contextual/contextual.info.yml | 2 +-
.../modules/contextual/js/contextual.es6.js | 4 +-
web/core/modules/contextual/js/contextual.js | 2 +-
.../js/toolbar/views/AuralView.es6.js | 2 +-
.../js/toolbar/views/VisualView.es6.js | 2 +-
.../contextual/js/views/AuralView.es6.js | 2 +-
.../contextual/js/views/RegionView.es6.js | 2 +-
.../contextual/js/views/VisualView.es6.js | 2 +-
.../contextual/src/ContextualController.php | 4 +-
.../optional/views.view.contextual_recent.yml | 327 ++
.../ContextualDynamicContextTest.php | 19 +-
.../DuplicateContextualLinksTest.php | 58 +
.../src/FunctionalJavascript/EditModeTest.php | 2 +-
.../tests/src/Functional/DateFilterTest.php | 4 +-
.../src/Functional/DateTimeFieldTest.php | 32 +-
.../src/Functional/Views/FilterDateTest.php | 4 +-
.../tests/src/Kernel/DateTimeItemTest.php | 8 +-
.../src/Functional/DateRangeFieldTest.php | 82 +-
.../src/Kernel/SeparatorTranslationTest.php | 4 +-
.../tests/src/Kernel/Views/FilterDateTest.php | 7 +-
web/core/modules/dblog/dblog.info.yml | 2 +-
.../dblog/src/Controller/DbLogController.php | 116 +-
.../Plugin/rest/resource/DBLogResource.php | 4 +-
.../src/Functional/DbLogResourceTest.php | 2 +-
.../dblog/tests/src/Functional/DbLogTest.php | 97 +-
.../tests/src/Functional/DbLogViewsTest.php | 9 +-
.../src/Kernel/Views/ViewsIntegrationTest.php | 8 +-
.../dynamic_page_cache.info.yml | 4 +-
.../js/editor.formattedTextEditor.es6.js | 8 +-
web/core/modules/editor/src/Element.php | 6 +-
.../tests/src/Functional/EditorAdminTest.php | 32 +-
.../src/Functional/EditorLoadingTest.php | 36 +-
.../QuickEditIntegrationLoadingTest.php | 2 +-
.../Kernel/EditorFileReferenceFilterTest.php | 9 +-
.../src/Kernel/EditorImageDialogTest.php | 9 +-
web/core/modules/field/field.api.php | 4 +-
web/core/modules/field/field.purge.inc | 2 +-
.../field/src/Entity/FieldStorageConfig.php | 4 +-
.../src/Form/NestedEntityTestForm.php | 6 +-
.../Boolean/BooleanFormatterSettingsTest.php | 2 +-
.../src/Functional/Email/EmailFieldTest.php | 2 +-
.../EntityReferenceAdminTest.php | 15 +-
.../EntityReferenceFieldDefaultValueTest.php | 8 +-
.../EntityReferenceFileUploadTest.php | 4 +-
.../EntityReferenceIntegrationTest.php | 2 +-
.../FieldImportDeleteUninstallUiTest.php | 8 +-
.../field/tests/src/Functional/FormTest.php | 10 +-
.../tests/src/Functional/NestedFormTest.php | 2 +-
.../src/Functional/String/StringFieldTest.php | 2 +-
.../src/Functional/Update/FieldUpdateTest.php | 4 +-
.../src/Functional/Views/FieldUITest.php | 4 +-
.../Functional/reEnableModuleFieldTest.php | 2 +-
.../EntityReferenceAdminTest.php | 36 +-
.../src/Kernel/Boolean/BooleanItemTest.php | 4 +-
.../field/tests/src/Kernel/BulkDeleteTest.php | 22 +-
.../src/Kernel/ConfigFieldDefinitionTest.php | 4 +-
.../tests/src/Kernel/Email/EmailItemTest.php | 4 +-
.../EntityReferenceFormatterTest.php | 2 +-
.../EntityReferenceItemTest.php | 51 +-
.../EntityReferenceSettingsTest.php | 11 +-
.../Views/EntityReferenceRelationshipTest.php | 8 +-
.../src/Kernel/FieldAttachStorageTest.php | 4 +-
.../field/tests/src/Kernel/FieldCrudTest.php | 2 +-
.../src/Kernel/FieldImportCreateTest.php | 4 +-
.../src/Kernel/FieldImportDeleteTest.php | 2 +-
.../tests/src/Kernel/FieldKernelTestBase.php | 9 +-
.../tests/src/Kernel/FieldStorageCrudTest.php | 46 +-
.../src/Kernel/FieldTypePluginManagerTest.php | 4 +-
.../tests/src/Kernel/FieldValidationTest.php | 2 +-
.../d6/MigrateFieldFormatterSettingsTest.php | 6 +-
.../d6/MigrateFieldWidgetSettingsTest.php | 10 +-
.../d7/MigrateFieldFormatterSettingsTest.php | 6 +-
...grateFieldInstanceLabelDescriptionTest.php | 2 -
...MigrateFieldInstanceWidgetSettingsTest.php | 4 +-
.../Migrate/d7/MigrateViewModesTest.php | 2 +-
.../src/Kernel/Number/NumberItemTest.php | 14 +-
.../field/tests/src/Kernel/ShapeItemTest.php | 4 +-
.../Kernel/String/RawStringFormatterTest.php | 8 +-
.../src/Kernel/String/StringFormatterTest.php | 9 +-
.../src/Kernel/String/UuidFormatterTest.php | 6 +-
.../field/tests/src/Kernel/TestItemTest.php | 4 +-
.../tests/src/Kernel/TestObjectItemTest.php | 2 +-
.../Kernel/Timestamp/TimestampItemTest.php | 4 +-
.../src/Kernel/WidgetPluginManagerTest.php | 2 +-
.../process/d7/FieldInstanceSettingsTest.php | 2 +-
.../migrate/process/d7/FieldSettingsTest.php | 2 +-
.../tests/src/Functional/FieldLayoutTest.php | 7 +-
.../FunctionalJavascript/FieldLayoutTest.php | 7 +-
.../Kernel/FieldLayoutEntityDisplayTest.php | 8 +-
web/core/modules/field_ui/field_ui.info.yml | 2 +-
.../Plugin/Derivative/FieldUiLocalTask.php | 2 +-
.../src/Functional/EntityDisplayModeTest.php | 12 +-
.../src/Functional/FieldUIDeleteTest.php | 12 +-
.../tests/src/Functional/FieldUIRouteTest.php | 8 +-
.../src/Functional/ManageDisplayTest.php | 19 +-
.../Functional/ManageFieldsFunctionalTest.php | 23 +-
.../ManageDisplayTest.php | 8 +-
.../tests/src/Kernel/EntityDisplayTest.php | 11 +-
.../src/Kernel/EntityFormDisplayTest.php | 9 +-
web/core/modules/file/file.info.yml | 2 +-
.../rest/resource/FileUploadResource.php | 2 +-
.../tests/src/Functional/DownloadTest.php | 20 +-
.../FileFieldAnonymousSubmissionTest.php | 16 +-
.../src/Functional/FileFieldRevisionTest.php | 14 +-
.../src/Functional/FileFieldValidateTest.php | 18 +-
.../src/Functional/FileFieldWidgetTest.php | 34 +-
.../tests/src/Functional/FileListingTest.php | 16 +-
.../src/Functional/FileManagedTestBase.php | 2 +-
.../tests/src/Functional/FilePrivateTest.php | 45 +-
.../src/Functional/FileTokenReplaceTest.php | 2 +-
.../src/Functional/MultipleFileUploadTest.php | 8 +-
.../PrivateFileOnTranslatedEntityTest.php | 4 +-
.../src/Functional/SaveUploadFormTest.php | 59 +-
.../tests/src/Functional/SaveUploadTest.php | 48 +-
.../FileFieldWidgetTest.php | 6 +-
.../file/tests/src/Kernel/CopyTest.php | 4 +-
.../file/tests/src/Kernel/DeleteTest.php | 14 +-
.../file/tests/src/Kernel/FileItemTest.php | 4 +-
.../src/Kernel/FileItemValidationTest.php | 9 +-
.../src/Kernel/FileManagedUnitTestBase.php | 2 +-
.../file/tests/src/Kernel/LoadTest.php | 6 +-
.../src/Kernel/Migrate/d6/MigrateFileTest.php | 4 +-
.../d6/MigrateUploadEntityDisplayTest.php | 2 +-
.../d6/MigrateUploadEntityFormDisplayTest.php | 2 +-
.../Migrate/d6/MigrateUploadInstanceTest.php | 2 +-
.../Kernel/Migrate/d6/MigrateUploadTest.php | 8 +-
.../file/tests/src/Kernel/MoveTest.php | 8 +-
.../file/tests/src/Kernel/SaveTest.php | 6 +-
.../file/tests/src/Kernel/UsageTest.php | 36 +-
.../file/tests/src/Kernel/ValidatorTest.php | 44 +-
.../filter/migrations/d7_filter_format.yml | 11 +-
.../modules/filter/src/Element/TextFormat.php | 9 +-
.../src/Plugin/migrate/process/FilterID.php | 457 +++
.../tests/src/Functional/FilterAdminTest.php | 12 +-
.../src/Functional/FilterFormatAccessTest.php | 32 +-
.../Rest/FilterFormatResourceTestBase.php | 4 +-
.../filter/tests/src/Kernel/FilterAPITest.php | 6 +-
.../src/Kernel/FilterCaptionTwigDebugTest.php | 4 +-
.../tests/src/Kernel/FilterKernelTest.php | 16 +-
.../Plugin/migrate/process/FilterIdTest.php | 28 +-
.../src/Kernel/TextFormatElementFormTest.php | 8 +-
web/core/modules/forum/forum.install | 4 +-
.../ForumListingBreadcrumbBuilder.php | 2 +-
.../src/Functional/ForumNodeAccessTest.php | 10 +-
.../forum/tests/src/Functional/ForumTest.php | 50 +-
.../src/Functional/ForumUninstallTest.php | 2 +-
.../tests/src/Kernel/ForumValidationTest.php | 6 +-
.../Kernel/Migrate/d6/MigrateForumTest.php | 4 +-
.../Normalizer/ContentEntityNormalizer.php | 17 +-
.../EntityReferenceItemNormalizer.php | 2 +-
.../tests/src/Kernel/HalLinkManagerTest.php | 10 +-
.../tests/src/Kernel/NormalizerTestBase.php | 12 +-
.../help_page_test/help_page_test.module | 2 +
.../src/Functional/ExperimentalHelpTest.php | 10 +-
.../tests/src/Functional/HelpBlockTest.php | 7 +-
.../help/tests/src/Functional/HelpTest.php | 6 +-
.../help/tests/src/Functional/NoHelpTest.php | 6 +-
.../help_topics/ban.banning_ips.html.twig | 14 +
.../help_topics/block.overview.html.twig | 2 +
.../help_topics/block_content.type.html.twig | 3 +
.../help_topics/book.about.html.twig | 28 +
.../help_topics/book.adding.html.twig | 20 +
.../help_topics/book.configuring.html.twig | 18 +
.../help_topics/book.creating.html.twig | 17 +
.../help_topics/book.organizing.html.twig | 19 +
.../help_topics/breakpoint.overview.html.twig | 21 +
.../help_topics/color.changing.html.twig | 20 +
.../help_topics/core.appearance.html.twig | 20 +
.../core.content_structure.html.twig | 46 +
.../help_topics/core.cron.html.twig | 28 +
.../help_topics/core.extending.html.twig | 17 +
.../help_topics/core.maintenance.html.twig | 24 +
.../help_topics/core.performance.html.twig | 29 +
.../help_topics/core.security.html.twig | 2 +-
.../help_topics/field_ui.add_field.html.twig | 23 +
.../field_ui.manage_display.html.twig | 24 +
.../field_ui.manage_form.html.twig | 23 +
.../field_ui.reference_field.html.twig | 25 +
.../help.help_topic_search.html.twig | 8 +-
.../layout_builder.overview.html.twig | 35 +
.../help_topics/system.cache.html.twig | 19 +
.../help_topics/system.config_error.html.twig | 2 +-
.../system.maintenance_mode.html.twig | 21 +
.../system.module_install.html.twig | 17 +
.../system.module_uninstall.html.twig | 19 +
.../help_topics/system.reports.html.twig | 20 +
.../system.theme_install.html.twig | 18 +
.../system.theme_uninstall.html.twig | 15 +
.../help_topics/user.create.html.twig | 20 +
.../help_topics/user.new_role.html.twig | 16 +
.../help_topics/user.overview.html.twig | 12 +
.../help_topics/user.permissions.html.twig | 16 +
.../user.security_account_settings.html.twig | 3 +-
.../help_topics/user.update.html.twig | 17 +
.../src/Functional/HelpTopicSearchTest.php | 2 +-
.../tests/src/Functional/HelpTopicTest.php | 2 +-
.../src/Functional/HelpTopicsSyntaxTest.php | 14 +-
.../src/Unit/HelpTopicTwigLoaderTest.php | 6 +-
.../tests/src/Functional/HistoryTest.php | 4 +-
.../src/Kernel/Views/HistoryTimestampTest.php | 6 +-
web/core/modules/image/image.info.yml | 2 +-
.../modules/image/js/editors/image.es6.js | 10 +-
.../ImageStyleDownloadController.php | 2 +-
.../migrate/destination/EntityImageStyle.php | 2 +-
.../tests/src/Functional/FileMoveTest.php | 6 +-
.../src/Functional/ImageAdminStylesTest.php | 15 +-
.../src/Functional/ImageDimensionsTest.php | 60 +-
.../tests/src/Functional/ImageEffectsTest.php | 2 +-
.../src/Functional/ImageFieldDisplayTest.php | 10 +-
.../src/Functional/ImageFieldValidateTest.php | 8 +-
.../src/Functional/ImageFieldWidgetTest.php | 4 +-
.../src/Functional/ImageStyleDeleteTest.php | 11 +-
.../src/Functional/ImageStyleFlushTest.php | 4 +-
.../Functional/ImageStylesPathAndUrlTest.php | 49 +-
.../QuickEditImageControllerTest.php | 6 +-
.../ImageFieldValidateTest.php | 2 +-
.../tests/src/Kernel/ImageFormatterTest.php | 14 +-
.../tests/src/Kernel/ImageImportTest.php | 4 +-
.../image/tests/src/Kernel/ImageItemTest.php | 4 +-
.../src/Kernel/ImageStyleIntegrationTest.php | 9 +-
.../src/Kernel/ImageThemeFunctionTest.php | 25 +-
.../Migrate/d6/MigrateImageCacheTest.php | 2 +-
.../Migrate/d7/MigrateImageStylesTest.php | 4 +-
.../src/Kernel/Views/ImageViewsDataTest.php | 9 +-
.../Views/RelationshipUserImageDataTest.php | 9 +-
.../FormErrorHandlerCKEditorTest.php | 7 +-
.../jsonapi/src/Context/FieldResolver.php | 6 +-
.../jsonapi/src/Controller/EntryPoint.php | 3 +-
.../TemporaryJsonapiFileFieldUploader.php | 6 +-
.../EntityAccessDeniedHttpException.php | 2 +-
.../ResourceIdentifierTrait.php | 2 +-
.../src/Query/EntityConditionGroup.php | 2 +-
web/core/modules/jsonapi/src/Query/Sort.php | 2 +-
.../tests/src/Functional/FileUploadTest.php | 20 +-
.../tests/src/Functional/FilterFormatTest.php | 4 +-
.../JsonApiFunctionalMultilingualTest.php | 2 +-
.../src/Functional/JsonApiFunctionalTest.php | 31 +-
.../src/Functional/JsonApiRegressionTest.php | 2 +-
.../src/Functional/MenuLinkContentTest.php | Bin 8273 -> 8308 bytes
.../jsonapi/tests/src/Functional/NodeTest.php | 2 +-
.../tests/src/Functional/ResourceTestBase.php | 10 +-
.../Revisions/VersionNegotiatorTest.php | 4 +-
.../src/Kernel/Serializer/SerializerTest.php | 4 +-
.../src/Unit/Query/EntityConditionTest.php | 2 +-
web/core/modules/language/language.info.yml | 2 +-
.../language/src/Form/LanguageAddForm.php | 2 +-
.../language/src/Form/LanguageEditForm.php | 2 +-
.../LanguageNegotiationBrowser.php | 22 +-
.../LanguageNegotiationContentEntity.php | 4 +-
.../migrate/process/LanguageNegotiation.php | 7 +
...uageBrowserDetectionAcceptLanguageTest.php | 7 +-
.../LanguageConfigOverrideImportTest.php | 7 +-
.../LanguageConfigurationElementTest.php | 8 +-
.../tests/src/Functional/LanguageListTest.php | 10 +-
.../LanguageNegotiationContentEntityTest.php | 7 +-
.../LanguageNegotiationInfoTest.php | 4 +-
.../LanguagePathMonolingualTest.php | 2 +-
.../src/Functional/LanguageSwitchingTest.php | 9 +-
.../LanguageUILanguageNegotiationTest.php | 22 +-
.../Functional/LanguageUrlRewritingTest.php | 12 +-
.../src/Kernel/EntityDefaultLanguageTest.php | 9 +-
.../src/Kernel/EntityUrlLanguageTest.php | 12 +-
.../d6/MigrateLanguageContentSettingsTest.php | 8 +-
.../Kernel/Migrate/d6/MigrateLanguageTest.php | 2 +-
.../d7/MigrateLanguageContentSettingsTest.php | 8 +-
.../layout_builder.post_update.php | 7 +
.../layout_builder/layout_builder.routing.yml | 2 +-
.../layout_builder.services.yml | 7 +
.../Controller/ChooseSectionController.php | 8 +-
.../LayoutBuilderHtmlEntityFormController.php | 59 +
.../src/Form/DefaultsEntityForm.php | 15 +
.../Field/FieldWidget/LayoutBuilderWidget.php | 15 +
.../Plugin/Layout/MultiWidthLayoutBase.php | 15 +-
.../src/Plugin/Layout/ThreeColumnLayout.php | 7 +
.../src/Plugin/Layout/TwoColumnLayout.php | 7 +
..._field_block_theme_suggestions_test.module | 19 -
.../layout_builder_form_block_test.info.yml | 5 +
.../src/Plugin/Block/TestFormApiFormBlock.php | 115 +
.../Block/TestInlineTemplateFormBlock.php | 32 +
...t_builder_theme_suggestions_test.info.yml} | 0
...yout_builder_theme_suggestions_test.module | 30 +
...ndle-with-section-field--default.html.twig | 0
.../install/views.view.test_block_view.yml | 73 +
... => LayoutBuilderThemeSuggestionsTest.php} | 18 +-
.../src/Functional/LayoutSectionTest.php | 7 +-
.../FunctionalJavascript/AjaxBlockTest.php | 2 +-
.../ContentPreviewToggleTest.php | 2 +-
.../FunctionalJavascript/InlineBlockTest.php | 5 +-
.../LayoutBuilderDisableInteractionsTest.php | 4 +-
.../LayoutBuilderNestedFormUiTest.php | 165 +
.../TestMultiWidthLayoutsTest.php | 12 +-
.../tests/src/Kernel/LayoutTest.php | 2 +-
.../link/config/schema/link.schema.yml | 4 +-
.../src/Plugin/Field/FieldType/LinkItem.php | 2 +
.../Plugin/migrate/cckfield/d7/LinkField.php | 2 +-
.../tests/src/Functional/LinkFieldTest.php | 68 +-
.../link/tests/src/Kernel/LinkItemTest.php | 4 +-
web/core/modules/locale/locale.admin.es6.js | 2 +-
web/core/modules/locale/locale.batch.inc | 8 +-
.../modules/locale_test/locale_test.module | 1 +
.../locale_test_development_release.info.yml | 2 +-
.../LocaleConfigTranslationTest.php | 8 +-
.../src/Functional/LocaleLocaleLookupTest.php | 4 +-
.../tests/src/Functional/LocalePathTest.php | 2 +-
.../LocaleTranslationDownloadTest.php | 6 +-
.../Functional/LocaleTranslationUiTest.php | 11 +-
.../src/Kernel/LocaleConfigManagerTest.php | 8 +-
.../src/Kernel/LocaleConfigSubscriberTest.php | 6 +-
.../tests/src/Unit/LocaleLookupTest.php | 7 +-
web/core/modules/media/media.module | 2 +-
.../src/Access/MediaRevisionAccessCheck.php | 2 +-
.../media/src/Form/EditorMediaDialog.php | 2 +-
.../modules/media/src/MediaSourceBase.php | 8 +-
.../media/src/MediaSourceInterface.php | 2 +-
.../modules/media/src/OEmbed/Resource.php | 21 +-
.../media/src/OEmbed/ResourceFetcher.php | 1 +
.../OEmbedResourceConstraintValidator.php | 5 +
.../media/src/Plugin/media/Source/OEmbed.php | 5 +
.../oembed/photo_flickr_no_dimensions.json | 10 +
.../fixtures/oembed/video_collegehumor.xml | 2 +-
.../FieldFormatter/OEmbedFormatterTest.php | 12 +-
.../Functional/Rest/MediaResourceTestBase.php | 13 +
.../tests/src/Functional/UrlResolverTest.php | 2 +-
.../CKEditorIntegrationTest.php | 4 +-
.../FunctionalJavascript/MediaDisplayTest.php | 8 +-
.../MediaSourceImageTest.php | 2 +-
.../MediaSourceOEmbedVideoTest.php | 2 +-
.../MediaStandardProfileTest.php | 4 +-
.../MediaUiJavascriptTest.php | 2 +-
.../tests/src/Kernel/MediaCreationTest.php | 8 +-
.../src/Kernel/MediaEmbedFilterTestBase.php | 8 +-
.../tests/src/Kernel/MediaKernelTestBase.php | 2 +-
.../tests/src/Kernel/MediaSourceFileTest.php | 2 +-
.../tests/src/Kernel/MediaSourceTest.php | 4 +
.../src/Kernel/OEmbedIframeControllerTest.php | 2 +-
.../OEmbedResourceConstraintValidatorTest.php | 76 +
.../tests/src/Kernel/OEmbedSourceTest.php | 37 +
.../media/tests/src/Unit/ResourceTest.php | 88 +
.../media_library/js/media_library.ui.es6.js | 24 -
.../media_library/js/media_library.ui.js | 12 -
.../media_library/media_library.info.yml | 1 +
.../media_library/media_library.install | 4 +-
.../media_library/media_library.module | 1 -
.../media_library/src/Form/AddFormBase.php | 14 +-
...ibrary-update-views-classnames-3049943.php | 2 +-
.../MediaLibraryDisplayModeTest.php | 2 +-
.../CKEditorIntegrationTest.php | 2 +-
.../menu_link_content.info.yml | 2 +-
.../menu_link_content.install | 12 -
.../Functional/MenuLinkContentFormTest.php | 4 +-
.../Rest/MenuLinkContentResourceTestBase.php | 1 +
...enuLinkContentCacheabilityBubblingTest.php | 9 +-
.../src/Kernel/MenuLinkContentDeriverTest.php | 22 +-
.../tests/src/Kernel/MenuLinksTest.php | 12 +-
.../Kernel/Migrate/d6/MigrateMenuLinkTest.php | 2 -
.../d6/MigrateMenuLinkTranslationTest.php | 2 -
.../Kernel/Migrate/d7/MigrateMenuLinkTest.php | 2 -
.../Kernel/PathAliasMenuLinkContentTest.php | 9 +-
web/core/modules/menu_ui/menu_ui.module | 2 +-
web/core/modules/menu_ui/src/MenuForm.php | 2 +-
.../MenuSettingsConstraintValidator.php | 1 -
.../MenuUiContentModerationTest.php | 8 +-
.../tests/src/Functional/MenuUiNodeTest.php | 12 +-
.../tests/src/Functional/MenuUiTest.php | 44 +-
.../modules/migrate/src/Audit/IdAuditor.php | 44 +-
.../Derivative/MigrateEntityComplete.php | 27 +
.../Plugin/MigrateDestinationInterface.php | 7 +-
.../modules/migrate/src/Plugin/Migration.php | 4 +
.../destination/EntityContentComplete.php | 142 +
.../migrate/src/Plugin/migrate/id_map/Sql.php | 14 +-
.../migrate/process/FileProcessBase.php | 2 +
.../src/Plugin/migrate/process/Substr.php | 5 +-
.../migrate_no_migrate_drupal_test.info.yml | 8 +
...migrate_no_migrate_drupal_test.routing.yml | 7 +
.../migrations/node_migration_no_upgrade.yml | 22 +
.../src/Controller/ExecuteMigration.php | 45 +
.../Functional/MigrateNoMigrateDrupalTest.php | 58 +
.../process/DownloadFunctionalTest.php | 2 +-
.../src/Kernel/HighWaterNotJoinableTest.php | 6 +-
.../MigrateEntityContentValidationTest.php | 2 +-
.../Kernel/MigrateExternalTranslatedTest.php | 15 +-
.../tests/src/Kernel/MigrateMessageTest.php | 4 +-
.../MigrateRollbackEntityConfigTest.php | 10 +-
.../tests/src/Kernel/Plugin/MigrationTest.php | 57 +-
.../tests/src/Kernel/process/DownloadTest.php | 4 +-
.../tests/src/Kernel/process/FileCopyTest.php | 15 +-
.../tests/src/Unit/MigrateSourceTest.php | 2 +-
.../tests/src/Unit/MigrateSqlIdMapTest.php | 4 +-
.../src/Unit/MigrationPluginManagerTest.php | 2 +-
.../tests/src/Unit/process/IteratorTest.php | 4 +-
.../tests/src/Unit/process/UrlEncodeTest.php | 2 +-
.../migrate_drupal/migrate_drupal.module | 56 +-
.../migrate_drupal.post_update.php | 7 +
.../src/Annotation/MigrateField.php | 2 +-
.../src/MigrationConfigurationTrait.php | 30 +-
.../migrate_drupal/src/NodeMigrateType.php | 88 +
.../EntityReferenceTranslationDeriver.php | 4 +-
.../process/NodeCompleteNodeLookup.php | 37 +
.../NodeCompleteNodeRevisionLookup.php | 37 +
.../NodeCompleteNodeTranslationLookup.php | 39 +
.../Plugin/migrate/source/ContentEntity.php | 4 +
.../src/Tests/StubTestTrait.php | 14 +-
...-8.migrate-drupal-multilingual-enabled.php | 36 +
.../migrate_drupal/tests/fixtures/drupal6.php | 54 +-
.../migrate_drupal/tests/fixtures/drupal7.php | 2965 ++++++++++++++---
.../Functional/MigrateDrupalUpdateTest.php | 38 +
.../MigrateCckFieldPluginManagerTest.php | 11 +-
.../src/Kernel/MigrateDrupalTestBase.php | 9 +-
.../src/Kernel/MigrationPluginAlterTest.php | 377 ---
.../NodeMigrationTypePluginAlterTest.php | 169 +
.../migrate/DestinationCategoryTest.php | 4 +-
.../migrate/source/ContentEntityTest.php | 6 +
.../src/Kernel/d6/FieldDiscoveryTest.php | 4 +-
.../Kernel/d6/MigrateDrupal6AuditIdsTest.php | 1 +
.../src/Kernel/d6/MigrateDrupal6TestBase.php | 6 +
.../src/Kernel/d7/FieldDiscoveryTest.php | 16 +-
.../Kernel/d7/MigrateDrupal7AuditIdsTest.php | 1 +
.../src/Kernel/d7/MigrateDrupal7TestBase.php | 7 +
.../src/Traits/NodeMigrateTypeTestTrait.php | 209 ++
.../src/Unit/source/d6/Drupal6SqlBaseTest.php | 4 +-
.../migrate_drupal_multilingual.info.yml | 1 +
.../migrate_drupal_multilingual.install | 23 +
.../src/Form/IdConflictForm.php | 7 +-
.../src/Form/IncrementalForm.php | 5 +-
.../src/Form/MigrateUpgradeFormBase.php | 9 +
.../src/Form/OverviewForm.php | 7 +-
.../migrate_drupal_ui/src/Form/ReviewForm.php | 4 +-
.../src/Functional/MigrateAccessTest.php | 4 +-
.../MigrateUpgradeExecuteTestBase.php | 21 +-
.../MigrateUpgradeFormStepsTest.php | 6 +-
.../src/Functional/MigrateUpgradeTestBase.php | 5 +-
.../MultilingualReviewPageTestBase.php | 2 +-
.../NoMultilingualReviewPageTestBase.php | 4 +-
.../src/Functional/d6/IdConflictTest.php | 4 +-
.../d6/MultilingualReviewPageTest.php | 4 +-
.../src/Functional/d6/NoMultilingualTest.php | 209 --
.../src/Functional/d6/NodeClassicTest.php | 131 +
.../tests/src/Functional/d6/Upgrade6Test.php | 21 +-
.../src/Functional/d7/IdConflictTest.php | 4 +-
.../d7/MultilingualReviewPageTest.php | 4 +-
.../src/Functional/d7/NoMultilingualTest.php | 220 --
.../tests/src/Functional/d7/Upgrade7Test.php | 39 +-
.../node/migrations/d6_node_complete.yml | 58 +
.../node/migrations/d7_node_complete.yml | 48 +
web/core/modules/node/node.module | 2 +-
.../node/src/NodeAccessControlHandler.php | 12 +-
.../node/src/NodeGrantDatabaseStorage.php | 2 +-
web/core/modules/node/src/NodeTypeForm.php | 2 +-
web/core/modules/node/src/NodeViewsData.php | 2 +-
.../Plugin/migrate/source/d6/NodeComplete.php | 49 +
.../src/Plugin/migrate/source/d7/Node.php | 7 +
.../Plugin/migrate/source/d7/NodeComplete.php | 98 +
.../node/src/Plugin/views/wizard/Node.php | 2 +
.../src/Functional/AssertButtonsTrait.php | 2 +-
.../Functional/NodeAccessBaseTableTest.php | 6 +-
.../Functional/NodeAccessCacheabilityTest.php | 5 +-
.../NodeAccessCacheabilityWithNodeGrants.php | 66 +
.../NodeAccessLanguageFallbackTest.php | 6 +-
.../NodeActionsConfigurationTest.php | 12 +-
.../tests/src/Functional/NodeAdminTest.php | 8 +-
.../tests/src/Functional/NodeCreationTest.php | 10 +-
.../tests/src/Functional/NodeHelpTest.php | 4 +-
.../src/Functional/NodeLoadMultipleTest.php | 9 +-
.../src/Functional/NodePostSettingsTest.php | 4 +-
.../src/Functional/NodeQueryAlterTest.php | 12 +-
.../src/Functional/NodeRevisionsTest.php | 16 +-
.../src/Functional/NodeRevisionsUiTest.php | 2 +-
.../tests/src/Functional/NodeTitleTest.php | 2 +-
.../src/Functional/NodeTranslationUITest.php | 20 +-
.../tests/src/Functional/NodeTypeTest.php | 14 +-
.../Functional/NodeTypeTranslationTest.php | 4 +-
.../tests/src/Functional/PagePreviewTest.php | 15 +-
.../tests/src/Functional/PageViewTest.php | 6 +-
.../Functional/Rest/NodeResourceTestBase.php | 3 +
.../src/Functional/Views/BulkFormTest.php | 4 +-
.../src/Functional/Views/FrontPageTest.php | 2 +-
.../Functional/Views/NodeFieldFilterTest.php | 2 +-
.../Functional/Views/NodeIntegrationTest.php | 4 +-
.../src/Functional/Views/PathPluginTest.php | 2 +-
.../src/Functional/Views/RevisionLinkTest.php | 2 +-
.../src/Functional/Views/RowPluginTest.php | 8 +-
.../Kernel/Config/NodeImportChangeTest.php | 9 +-
.../Migrate/d6/MigrateNodeCompleteTest.php | 1257 +++++++
.../Migrate/d6/MigrateNodeRevisionTest.php | 17 +-
.../src/Kernel/Migrate/d6/MigrateNodeTest.php | 11 +-
.../Migrate/d6/MigrateViewModesTest.php | 2 +-
.../d6/NodeTranslationRedirectTest.php | 2 -
.../Migrate/d7/MigrateNodeCompleteTest.php | 1206 +++++++
.../Migrate/d7/MigrateNodeRevisionTest.php | 6 +-
.../src/Kernel/Migrate/d7/MigrateNodeTest.php | 8 +-
.../Migrate/d7/MigrateNodeTitleLabelTest.php | 4 +-
.../Kernel/Migrate/d7/MigrateNodeTypeTest.php | 4 +-
.../d7/NodeTranslationRedirectTest.php | 2 -
...NodeAccessLanguageAwareCombinationTest.php | 36 +-
.../Kernel/NodeAccessLanguageAwareTest.php | 24 +-
.../src/Kernel/NodeAccessLanguageTest.php | 10 +-
.../src/Kernel/NodeAccessRecordsTest.php | 10 +-
.../src/Kernel/NodeBodyFieldStorageTest.php | 13 +-
.../src/Kernel/NodeFieldOverridesTest.php | 2 +-
.../node/tests/src/Kernel/NodeLegacyTest.php | 2 +-
.../tests/src/Kernel/NodeTokenReplaceTest.php | 4 +-
.../tests/src/Kernel/NodeValidationTest.php | 10 +-
.../tests/src/Kernel/NodeViewBuilderTest.php | 4 +-
.../Kernel/Views/ArgumentUidRevisionTest.php | 8 +-
.../src/Kernel/Views/NidArgumentTest.php | 15 +-
web/core/modules/options/options.module | 2 +-
.../OptionsDynamicValuesValidationTest.php | 4 +-
.../src/Functional/OptionsFieldUITest.php | 10 +-
.../OptionsFloatFieldImportTest.php | 8 +-
.../src/Functional/OptionsWidgetsTest.php | 9 +-
.../src/Kernel/Views/OptionsTestBase.php | 8 +-
.../modules/page_cache/page_cache.info.yml | 4 +-
.../tests/src/Functional/PageCacheTest.php | 53 +-
.../modules/path/migrations/d6_url_alias.yml | 6 +-
.../modules/path/migrations/d7_url_alias.yml | 6 +-
.../tests/src/Functional/PathAliasTest.php | 28 +-
.../tests/src/Functional/PathLanguageTest.php | 11 +-
.../src/Functional/PathTaxonomyTermTest.php | 4 +-
.../Kernel/Migrate/d6/MigrateUrlAliasTest.php | 2 -
.../path/tests/src/Kernel/PathItemTest.php | 10 +-
.../src/Kernel/PathNoCanonicalLinkTest.php | 13 +-
.../Hal/PathAliasHalJsonTestBase.php | 2 +-
.../Rest/PathAliasResourceTestBase.php | 2 +-
.../src/Functional/UrlAlterFunctionalTest.php | 4 +-
.../path_alias/tests/src/Kernel/AliasTest.php | 2 +-
.../quickedit/js/editors/formEditor.es6.js | 8 +-
.../js/editors/plainTextEditor.es6.js | 8 +-
.../quickedit/js/models/EntityModel.es6.js | 5 +-
.../quickedit/js/models/FieldModel.es6.js | 2 +-
web/core/modules/quickedit/js/theme.es6.js | 10 +-
web/core/modules/quickedit/js/theme.js | 10 +-
.../quickedit/js/views/EditorView.es6.js | 2 +-
.../js/views/EntityDecorationView.es6.js | 4 +-
.../js/views/EntityToolbarView.es6.js | 4 +-
.../js/views/FieldDecorationView.es6.js | 2 +-
.../js/views/FieldToolbarView.es6.js | 2 +-
.../QuickEditCustomPipelineTest.php | 8 +-
.../QuickEditAutocompleteTermTest.php | 4 +-
.../QuickEditLoadingTest.php | 2 +-
.../tests/src/Kernel/QuickEditTestBase.php | 11 +-
web/core/modules/rdf/rdf.module | 2 +-
.../modules/rdf/tests/src/Kernel/CrudTest.php | 2 +-
.../tests/src/Traits/EasyRdf_ParsedUri.php | 12 +-
.../rdf/tests/src/Traits/RdfParsingTrait.php | 2 +-
.../src/Entity/ResponsiveImageStyle.php | 2 +
.../src/ResponsiveImageStyleListBuilder.php | 2 -
.../templates/responsive-image.html.twig | 6 -
.../Functional/ResponsiveImageAdminUITest.php | 8 +-
.../ResponsiveImageFieldDisplayTest.php | 25 +-
.../Kernel/ResponsiveImageIntegrationTest.php | 11 +-
.../rest/src/Entity/ConfigDependencies.php | 4 +
.../rest/src/Entity/RestResourceConfig.php | 8 +-
.../Plugin/rest/resource/EntityResource.php | 3 +
web/core/modules/rest/src/RequestHandler.php | 12 +-
.../tests/modules/rest_test/rest_test.module | 1 +
.../EntityResource/EntityResourceTestBase.php | 23 +-
.../XmlEntityNormalizationQuirksTrait.php | 5 +
.../Functional/FileUploadResourceTestBase.php | 34 +-
.../tests/src/Functional/ResourceTest.php | 6 +-
.../Views/ExcludedFieldTokenTest.php | 2 +-
.../src/Functional/Views/FieldCounterTest.php | 2 +-
.../Functional/Views/StyleSerializerTest.php | 111 +-
.../Kernel/Entity/RestResourceConfigTest.php | 9 +-
.../tests/src/Kernel/RequestHandlerTest.php | 55 +-
.../tests/src/Kernel/Views/RestExportTest.php | 7 +-
.../rest/tests/src/Unit/CollectRoutesTest.php | 6 +-
web/core/modules/search/search.info.yml | 2 +-
.../tests/src/Functional/SearchBlockTest.php | 10 +-
.../SearchConfigSettingsFormTest.php | 23 +-
.../src/Functional/SearchDateIntervalTest.php | 7 +-
.../SearchKeywordsConditionsTest.php | 7 +-
.../src/Functional/SearchLanguageTest.php | 2 +-
.../SearchMultilingualEntityTest.php | 24 +-
.../src/Functional/SearchPageTextTest.php | 12 +-
.../src/Functional/SearchRankingTest.php | 5 +
.../tests/src/Kernel/SearchExcerptTest.php | 48 +-
.../SearchSimplifyTest.php | 11 +-
.../SearchTokenizerTest.php | 13 +-
.../src/Kernel/EntitySerializationTest.php | 20 +-
.../src/Kernel/FieldItemSerializationTest.php | 11 +-
.../tests/src/Kernel/NormalizerTestBase.php | 10 +-
.../TimestampItemNormalizerTest.php | 2 +-
.../OverriddenConfigurationTest.php | 2 +-
.../SettingsTrayBlockFormTest.php | 2 +-
web/core/modules/shortcut/shortcut.module | 112 +-
.../modules/shortcut/shortcut.services.yml | 4 +
.../src/Plugin/migrate/source/d7/Shortcut.php | 2 +-
.../shortcut/src/ShortcutLazyBuilders.php | 68 +
.../src/ShortcutSetAccessControlHandler.php | 1 +
.../Rest/ShortcutSetResourceTestBase.php | 1 +
.../src/Functional/ShortcutCacheTagsTest.php | 122 +-
.../src/Functional/ShortcutLinksTest.php | 39 +-
.../tests/src/Functional/ShortcutSetsTest.php | 8 +-
.../Migrate/d7/MigrateShortcutSetTest.php | 2 +-
.../Kernel/Migrate/d7/MigrateShortcutTest.php | 2 +-
.../modules/simpletest/src/TestDiscovery.php | 2 +-
.../modules/simpletest/src/WebTestBase.php | 2 +-
.../simpletest_phpunit_browsertest.php | 2 +
.../simpletest_phpunit_run_command_test.php | 2 +
.../tests/src/Kernel/PhpUnitErrorTest.php | 2 +-
.../migrations/statistics_node_counter.yml | 8 +-
.../migrate/destination/NodeCounter.php | 5 +-
.../Functional/StatisticsTokenReplaceTest.php | 2 +-
.../src/Functional/Views/IntegrationTest.php | 2 +-
.../Migrate/d6/MigrateNodeCounterTest.php | 2 -
.../Migrate/d7/MigrateNodeCounterTest.php | 2 -
.../src/Controller/DbUpdateController.php | 5 +-
.../EntityAutocompleteController.php | 8 +-
.../src/Controller/SystemController.php | 57 +-
.../system/src/Controller/ThemeController.php | 4 +
.../system/src/FileDownloadController.php | 2 +-
.../system/src/Form/DateFormatFormBase.php | 3 -
.../system/src/Form/ModulesListForm.php | 41 +-
.../PrepareModulesEntityUninstallForm.php | 2 +-
.../modules/system/src/Form/RegionalForm.php | 39 -
.../src/ModuleDependencyMessageTrait.php | 55 +
.../Cache/GenericCacheBackendUnitTestBase.php | 6 +-
.../src/Tests/Entity/EntityUnitTestBase.php | 9 +-
web/core/modules/system/system.admin.inc | 35 +-
web/core/modules/system/system.install | 206 +-
web/core/modules/system/system.module | 77 +-
.../modules/system/system.post_update.php | 7 -
web/core/modules/system/system.routing.yml | 7 +
.../templates/system-themes-page.html.twig | 6 +
.../update/drupal-8.entity-test-initial.php | 24 -
.../src/Form/BatchTestMultiStepForm.php | 1 +
.../modules/cache_test/cache_test.routing.yml | 7 +
.../src/Controller/CacheTestController.php | 26 +
.../modules/common_test/common_test.module | 20 +-
.../modules/csrf_test/csrf_test.routing.yml | 4 +-
.../DeprecatedCsrfTokenController.php | 2 +-
.../css/disable_transitions.theme.css | 6 -
.../src/LoggedStatementsTrait.php | 10 +-
.../src/mysql/Install/Tasks.php | 8 +
.../src/pgsql/Install/Tasks.php | 8 +
.../src/sqlite/Install/Tasks.php | 8 +
.../modules/driver_test/driver_test.info.yml | 5 +
.../Database/DrivertestMysql/Connection.php | 19 +
.../Database/DrivertestMysql/Delete.php | 10 +
.../Database/DrivertestMysql/Insert.php | 10 +
.../DrivertestMysql/Install/Tasks.php | 19 +
.../Driver/Database/DrivertestMysql/Merge.php | 10 +
.../Database/DrivertestMysql/Schema.php | 10 +
.../Database/DrivertestMysql/Select.php | 10 +
.../Database/DrivertestMysql/Transaction.php | 10 +
.../Database/DrivertestMysql/Truncate.php | 10 +
.../Database/DrivertestMysql/Update.php | 10 +
.../Database/DrivertestMysql/Upsert.php | 10 +
.../Connection.php | 46 +
.../Install/Tasks.php | 19 +
.../Database/DrivertestPgsql/Connection.php | 19 +
.../Database/DrivertestPgsql/Delete.php | 10 +
.../Database/DrivertestPgsql/Insert.php | 10 +
.../DrivertestPgsql/Install/Tasks.php | 19 +
.../Driver/Database/DrivertestPgsql/Merge.php | 10 +
.../Database/DrivertestPgsql/NativeUpsert.php | 10 +
.../Database/DrivertestPgsql/Schema.php | 10 +
.../Database/DrivertestPgsql/Select.php | 10 +
.../Database/DrivertestPgsql/Transaction.php | 10 +
.../Database/DrivertestPgsql/Truncate.php | 10 +
.../Database/DrivertestPgsql/Update.php | 10 +
.../Database/DrivertestPgsql/Upsert.php | 10 +
.../Hal/EntityTestLabelHalJsonAnonTest.php | 2 +-
.../Hal/EntityTestMapFieldHalJsonAnonTest.php | 2 +-
.../Rest/EntityTestLabelResourceTestBase.php | 5 +
.../Rest/EntityTestResourceTestBase.php | 4 +
.../Rest/EntityTestTextItemNormalizerTest.php | 2 +-
.../entity_test_update.info.yml | 2 +
.../FormTestEventSubscriber.php | 2 +-
.../src/Form/FormTestMachineNameForm.php | 13 +
.../src/Form/FormTestPatternForm.php | 2 +-
.../form_test/src/Form/FormTestTableForm.php | 2 +-
.../js/js_cookie_shim_test.es6.js | 31 +
.../js_cookie_test/js/js_cookie_shim_test.js | 36 +
.../js_cookie_test/js_cookie_test.info.yml | 5 +
.../js_cookie_test.libraries.yml | 9 +
.../js_cookie_test/js_cookie_test.routing.yml | 7 +
.../src/Controller/JsCookieTestController.php | 59 +
.../js_message_test/js/js_message_test.es6.js | 4 +-
.../js_message_test/js/js_message_test.js | 4 +-
.../src/Plugin/TestLazyPluginCollection.php | 2 +-
.../src/TestControllers.php | 2 +-
.../session_test/session_test.routing.yml | 30 +
.../session_test/session_test.services.yml | 4 +
.../src/Controller/SessionTestController.php | 51 +
.../src/Session/TestSessionBag.php | 96 +
.../src/Controller/SystemTestController.php | 4 +-
.../system_test/system_test.routing.yml | 8 +-
.../theme_legacy_suggestions_test.inc} | 2 +-
.../theme_legacy_suggestions_test.info.yml | 5 +
.../theme_legacy_suggestions_test.module | 33 +
.../src/ThemeTestController.php | 40 +
.../theme_legacy_test/theme_legacy_test.inc | 13 +
.../theme_legacy_test.info.yml | 5 +
.../theme_legacy_test.module | 115 +
.../theme_legacy_test.routing.yml | 22 +
.../theme_suggestions_test.module | 26 -
.../theme_test/src/ThemeTestController.php | 26 -
.../templates/theme-test-foo.html.twig | 2 +
...eme-test-render-element-children.html.twig | 2 +
.../tests/modules/theme_test/theme_test.inc | 7 -
.../modules/theme_test/theme_test.module | 68 -
.../modules/theme_test/theme_test.routing.yml | 23 -
.../twig_theme_test.filter.html.twig | 5 +
.../update_script_test.install | 1 +
.../update_test_last_removed.info.yml | 5 +
.../update_test_last_removed.install | 20 +
.../src/Functional/Batch/ProcessingTest.php | 4 +-
.../AssertPageCacheContextsAndTagsTrait.php | 6 +-
.../Cache/PageCacheTagsTestBase.php | 15 +-
.../Common/EarlyRenderingControllerTest.php | 32 +-
.../src/Functional/Common/RenderWebTest.php | 2 +-
.../tests/src/Functional/Common/UrlTest.php | 6 +-
.../src/Functional/CsrfRequestHeaderTest.php | 3 +
.../Database/SelectPagerDefaultTest.php | 1 +
.../Database/SelectTableSortDefaultTest.php | 2 +-
.../src/Functional/Entity/EntityAddUITest.php | 6 +-
.../Entity/EntityCacheTagsTestBase.php | 18 +-
.../src/Functional/Entity/EntityFormTest.php | 2 +-
.../EntityReferenceSelectionAccessTest.php | 13 +-
.../Entity/EntityTranslationFormTest.php | 2 +-
.../Entity/EntityViewControllerTest.php | 2 +-
.../Entity/EntityWithUriCacheTagsTestBase.php | 11 +-
...ntEntityStorageSchemaConverterTestBase.php | 2 +-
.../UpdateApiEntityDefinitionUpdateTest.php | 16 +-
.../tests/src/Functional/Form/AlterTest.php | 2 +-
.../src/Functional/Form/CheckboxTest.php | 4 +-
.../src/Functional/Form/ConfirmFormTest.php | 2 +-
.../tests/src/Functional/Form/ElementTest.php | 28 +-
.../Form/ElementsTableSelectTest.php | 6 +-
.../Form/FormStoragePageCacheTest.php | 2 +-
.../Form/ModulesListFormWebTest.php | 27 +-
.../src/Functional/Form/RedirectTest.php | 8 +-
.../src/Functional/Form/ResponseTest.php | 4 +-
.../Form/StateValuesCleanAdvancedTest.php | 4 +-
.../tests/src/Functional/Form/StorageTest.php | 6 +-
.../Functional/Menu/AssertBreadcrumbTrait.php | 2 +-
.../Menu/BreadcrumbFrontCacheContextsTest.php | 2 +-
.../src/Functional/Menu/BreadcrumbTest.php | 2 +-
.../src/Functional/Menu/LocalActionTest.php | 4 +-
.../src/Functional/Menu/LocalTasksTest.php | 14 +-
.../src/Functional/Menu/MenuAccessTest.php | 8 +-
.../src/Functional/Menu/MenuRouterTest.php | 4 +-
.../src/Functional/Module/ClassLoaderTest.php | 6 +-
.../src/Functional/Module/DependencyTest.php | 10 +-
.../src/Functional/Module/InstallTest.php | 4 +-
.../Module/InstallUninstallTest.php | 9 +-
.../Module/PrepareUninstallTest.php | 4 +-
.../src/Functional/Module/UninstallTest.php | 4 +-
.../Functional/Page/DefaultMetatagsTest.php | 4 +-
.../tests/src/Functional/Pager/PagerTest.php | 6 +-
.../Render/HtmlResponseAttachmentsTest.php | 28 +-
.../Functional/Routing/DestinationTest.php | 2 +-
.../Routing/RouterPermissionTest.php | 11 +-
.../src/Functional/Routing/RouterTest.php | 25 +-
.../Session/SessionAuthenticationTest.php | 14 +-
.../Functional/Session/SessionHttpsTest.php | 16 +-
.../src/Functional/Session/SessionTest.php | 41 +-
.../Functional/System/AccessDeniedTest.php | 8 +-
.../tests/src/Functional/System/AdminTest.php | 4 +-
.../src/Functional/System/CronRunTest.php | 16 +-
.../System/DateFormatsLockedTest.php | 8 +-
.../src/Functional/System/DateTimeTest.php | 12 +-
.../Functional/System/ErrorHandlerTest.php | 10 +-
.../src/Functional/System/HtaccessTest.php | 12 +-
.../src/Functional/System/IndexPhpTest.php | 4 +-
.../Functional/System/PageNotFoundTest.php | 4 +-
.../System/ResponseGeneratorTest.php | 6 +-
.../Functional/System/RetrieveFileTest.php | 4 +-
.../Functional/System/SiteMaintenanceTest.php | 4 +-
.../System/SitesDirectoryHardeningTest.php | 18 +-
.../src/Functional/System/StatusTest.php | 4 +-
.../Functional/System/SystemAuthorizeTest.php | 4 +-
.../tests/src/Functional/System/ThemeTest.php | 14 +-
.../Functional/System/TrustedHostsTest.php | 4 +-
.../Theme/EntityFilteringThemeTest.php | 2 +-
.../Functional/Theme/HtmlAttributesTest.php | 2 +-
.../Theme/LegacyStyleSheetsRemoveTest.php | 41 +
.../src/Functional/Theme/ThemeInfoTest.php | 14 +-
.../src/Functional/Theme/ThemeLegacyTest.php | 83 +
.../Theme/ThemeSuggestionsAlterTest.php | 41 -
.../tests/src/Functional/Theme/ThemeTest.php | 22 +-
.../src/Functional/Theme/ThemeTokenTest.php | 2 +-
.../src/Functional/Theme/ThemeUiTest.php | 321 ++
.../Functional/Theme/TwigDebugMarkupTest.php | 18 +-
.../Theme/TwigRegistryLoaderTest.php | 4 +-
.../src/Functional/Theme/TwigSettingsTest.php | 4 +-
.../src/Functional/Theme/TwigTransTest.php | 2 +-
.../Update/DatabaseVersionCheckUpdateTest.php | 68 +
.../Update/EntityUpdateInitialTest.php | 39 -
.../IdentifierFieldSchemaTypeUpdateTest.php | 63 +
.../Update/MenuTreeSerializationTitleTest.php | 4 +-
.../UpdatePathWithBrokenRoutingFilledTest.php | 50 -
.../BrokenCacheUpdateTest.php | 2 +-
.../DependencyHookInvocationTest.php | 2 +-
.../DependencyMissingTest.php | 2 +-
.../DependencyOrderingTest.php | 9 +-
.../UpdateSystem/EntityUpdateInitialTest.php | 63 +
.../InvalidUpdateHookTest.php | 8 +-
.../NoPreExistingSchemaUpdateTest.php | 27 +-
.../RebuildScriptTest.php | 2 +-
.../UpdateCacheTest.php | 2 +-
.../UpdatePathLastRemovedTest.php | 75 +
.../UpdatePathNewDependencyTest.php | 6 +-
.../UpdatePathTestBaseFilledTest.php | 13 +-
.../UpdatePathTestJavaScriptTest.php | 3 +-
.../UpdatePathWithBrokenRoutingTest.php | 6 +-
.../UpdatePostUpdateFailingTest.php | 2 +-
.../UpdatePostUpdateTest.php | 4 +-
.../UpdateRemovedPostUpdateTest.php | 2 +-
.../UpdateSchemaTest.php | 2 +-
.../UpdateScriptTest.php | 140 +-
.../UpdatesWith7xTest.php | 2 +-
.../FunctionalJavascript/Form/RebuildTest.php | 6 +-
.../Form/TriggeringElementTest.php | 2 +-
.../FunctionalJavascript/FrameworkTest.php | 12 +-
.../ModalRendererTest.php | 4 +-
.../tests/src/Kernel/Action/ActionTest.php | 6 +-
.../src/Kernel/Common/SystemListingTest.php | 2 +-
...ityReferenceSelectionReferenceableTest.php | 11 +-
.../Kernel/Extension/ModuleHandlerTest.php | 6 +-
.../InstallerDependenciesResolutionTest.php | 10 +-
.../Kernel/Installer/UninstallKernelTest.php | 9 +-
.../system/tests/src/Kernel/Mail/MailTest.php | 2 +-
.../PhpStorage/PhpStorageFactoryTest.php | 12 +-
.../src/Kernel/Scripts/DbDumpCommandTest.php | 34 +-
.../Kernel/Scripts/DbImportCommandTest.php | 11 +-
.../Kernel/Scripts/DbToolsApplicationTest.php | 1 +
.../tests/src/Kernel/Theme/FunctionsTest.php | 8 +-
.../tests/src/Kernel/Theme/ThemeTest.php | 2 +-
.../tests/src/Kernel/Theme/TwigFilterTest.php | 16 +
.../src/Kernel/Theme/TwigNamespaceTest.php | 11 +-
.../src/Kernel/Timezone/TimezoneTest.php | 4 +-
.../Kernel/Token/TokenReplaceKernelTest.php | 4 +-
.../test_basetheme/test_basetheme.info.yml | 6 +-
.../test_legacy_stylesheets_remove.info.yml | 9 +
.../test_legacy_theme.info.yml | 6 +
.../test_legacy_theme/test_legacy_theme.theme | 44 +
.../test_subtheme/test_subtheme.info.yml | 13 +-
.../theme-test--suggestion.html.twig | 2 +
.../themes/test_theme/test_theme.info.yml | 6 +-
.../tests/themes/test_theme/test_theme.theme | 43 -
...test_module_compatible_constraint.info.yml | 4 +
...st_module_incompatible_constraint.info.yml | 4 +
..._depending_on_constrained_modules.info.yml | 6 +
..._another_module_required_by_theme.info.yml | 4 +
.../test_module_required_by_theme.info.yml | 4 +
.../test_module_required_by_theme.module | 20 +
.../test_theme_depending_on_modules.info.yml | 6 +
...e_depending_on_nonexisting_module.info.yml | 6 +
...t_theme_mixed_module_dependencies.info.yml | 5 +
...a_base_theme_depending_on_modules.info.yml | 3 +
.../taxonomy/migrations/d6_term_node.yml | 6 +-
.../migrations/d6_term_node_revision.yml | 6 +-
.../taxonomy/src/Form/OverviewTerms.php | 4 +
.../src/Plugin/migrate/source/d7/Term.php | 8 +-
.../views/argument_validator/TermName.php | 1 +
.../taxonomy/src/TermBreadcrumbBuilder.php | 2 +-
web/core/modules/taxonomy/src/TermForm.php | 1 +
.../modules/taxonomy/src/TermViewsData.php | 4 +-
web/core/modules/taxonomy/taxonomy.es6.js | 4 +-
.../Functional/Hal/TermHalJsonAnonTest.php | 3 +
.../tests/src/Functional/LoadMultipleTest.php | 4 +-
.../Functional/Rest/TermResourceTestBase.php | 7 +
.../taxonomy/tests/src/Functional/RssTest.php | 2 +-
.../src/Functional/TaxonomyImageTest.php | 8 +-
.../src/Functional/TermAutocompleteTest.php | 6 +-
.../tests/src/Functional/TermTest.php | 14 +-
.../src/Functional/TermTranslationUITest.php | 4 +-
.../tests/src/Functional/TokenReplaceTest.php | 4 +-
.../Views/TaxonomyFieldAllTermsTest.php | 4 +-
.../Views/TaxonomyFieldFilterTest.php | 11 +-
.../Views/TaxonomyIndexTidUiTest.php | 26 +-
.../Views/TaxonomyRelationshipTest.php | 13 +-
.../Views/TaxonomyTermArgumentDepthTest.php | 7 +-
.../Views/TaxonomyTermFilterDepthTest.php | 7 +-
.../Functional/Views/TaxonomyTermViewTest.php | 6 +-
.../src/Functional/VocabularyLanguageTest.php | 2 +-
.../Functional/VocabularyPermissionsTest.php | 34 +-
.../tests/src/Functional/VocabularyUiTest.php | 2 +-
.../Migrate/MigrateTaxonomyTermStubTest.php | 2 +-
.../Migrate/TaxonomyTermDeriverTest.php | 38 +
...grateTaxonomyVocabularyTranslationTest.php | 2 -
.../MigrateTermLocalizedTranslationTest.php | 2 -
.../Migrate/d6/MigrateTermNodeComplete.php | 67 +
.../d6/MigrateTermNodeRevisionTest.php | 2 +-
.../Kernel/Migrate/d6/MigrateTermNodeTest.php | 4 +-
.../d6/MigrateTermNodeTranslationTest.php | 1 -
.../d6/MigrateVocabularyEntityDisplayTest.php | 2 +-
...MigrateVocabularyEntityFormDisplayTest.php | 2 +-
.../d6/MigrateVocabularyFieldInstanceTest.php | 6 +-
.../Migrate/d7/MigrateNodeTaxonomyTest.php | 2 +-
.../Migrate/d7/MigrateTaxonomyTermTest.php | 20 +-
.../d7/MigrateTaxonomyTermTranslationTest.php | 12 +-
.../d7/MigrateTaxonomyVocabularyTest.php | 2 +-
...grateTaxonomyVocabularyTranslationTest.php | 2 -
.../MigrateTermLocalizedTranslationTest.php | 2 -
.../tests/src/Kernel/PendingRevisionTest.php | 9 +-
.../tests/src/Kernel/TaxonomyLegacyTest.php | 2 +-
.../tests/src/Kernel/TermKernelTest.php | 12 +-
.../tests/src/Kernel/TermValidationTest.php | 10 +-
.../Views/ArgumentTransformTermTest.php | 64 +
.../src/Kernel/Views/TaxonomyFieldTidTest.php | 7 +-
.../src/Kernel/Views/TaxonomyFieldVidTest.php | 7 +-
.../tests/src/Kernel/TelephoneItemTest.php | 4 +-
.../Field/FieldWidget/TextareaWidget.php | 3 +-
.../Field/FieldWidget/TextfieldWidget.php | 5 +-
.../src/Plugin/migrate/field/d6/TextField.php | 2 +
.../src/Plugin/migrate/field/d7/TextField.php | 3 +
.../tests/src/Functional/TextFieldTest.php | 14 +-
.../src/Kernel/TextWithSummaryItemTest.php | 4 +-
.../toolbar/js/models/ToolbarModel.es6.js | 2 +-
.../toolbar/js/views/BodyVisualView.es6.js | 2 +-
.../toolbar/js/views/MenuVisualView.es6.js | 2 +-
.../toolbar/js/views/ToolbarVisualView.es6.js | 2 +-
.../src/Functional/ToolbarAdminMenuTest.php | 30 +-
.../Functional/ToolbarCacheContextsTest.php | 5 -
.../src/Functional/ToolbarHookToolbarTest.php | 2 +-
.../Functional/ToolbarMenuTranslationTest.php | 11 +-
web/core/modules/tour/js/tour.es6.js | 2 +-
.../tour/tests/src/Functional/TourTest.php | 34 +-
.../tests/src/Functional/TourTestBase.php | 3 +-
.../tour/tests/src/Kernel/TourPluginTest.php | 2 +-
web/core/modules/tour/tour.info.yml | 2 +-
.../tests/src/Functional/TrackerTest.php | 14 +-
.../update/src/Form/UpdateManagerUpdate.php | 18 +-
.../modules/update/src/Form/UpdateReady.php | 9 +-
.../update/src/ProjectSecurityData.php | 53 +-
.../modules/update/src/UpdateSettingsForm.php | 17 +-
.../templates/update-project-status.html.twig | 16 +-
.../update/tests/aaa_update_test.tar.gz | 4 +-
.../aaa_update_test.1_0-supported.xml | 0
.../aaa_update_test.1_0-unsupported.xml | 0
.../release-history}/aaa_update_test.1_0.xml | 0
.../aaa_update_test.1_1-alpha1.xml | 0
.../aaa_update_test.1_1-beta1.xml | 0
.../release-history}/aaa_update_test.1_1.xml | 0
.../aaa_update_test.1_2-alpha1.xml | 0
.../aaa_update_test.1_2-beta1.xml | 0
.../release-history}/aaa_update_test.1_2.xml | 0
.../aaa_update_test.2_0-alpha1.xml | 0
.../aaa_update_test.2_0-beta1.xml | 0
.../release-history}/aaa_update_test.2_0.xml | 0
.../aaa_update_test.8.x-1.2.xml | 17 +
...est.core_compatibility.8.x-1.2_8.x-2.2.xml | 0
.../aaa_update_test.no-releases.xml | 0
.../aaa_update_test.sec.8.x-1.1_8.x-1.2.xml | 0
.../aaa_update_test.sec.8.x-1.2.xml | 0
.../aaa_update_test.sec.8.x-1.2_8.x-2.2.xml | 0
...aaa_update_test.sec.8.x-2.2_1.x_secure.xml | 0
.../release-history}/bbb_update_test.1_0.xml | 0
.../release-history}/bbb_update_test.1_1.xml | 0
.../release-history}/bbb_update_test.1_2.xml | 0
.../release-history}/ccc_update_test.1_0.xml | 0
.../release-history}/drupal.0.0-alpha1.xml | 0
.../release-history}/drupal.0.0-beta1.xml | 0
.../release-history}/drupal.0.0.xml | 0
.../release-history}/drupal.0.1-alpha1.xml | 0
.../release-history}/drupal.0.1-beta1.xml | 0
.../release-history}/drupal.0.1.xml | 0
.../release-history}/drupal.1.0-alpha1.xml | 0
.../release-history}/drupal.1.0-beta1.xml | 0
.../drupal.1.0-unsupported.xml | 0
.../release-history}/drupal.1.0.xml | 0
.../drupal.1.1-alpha1-core_compatibility.xml | 0
.../release-history}/drupal.1.1-alpha1.xml | 0
.../release-history}/drupal.1.1-beta1.xml | 0
.../drupal.1.1-core_compatibility.xml | 0
.../release-history}/drupal.1.1.xml | 0
.../release-history}/drupal.9.xml | 0
.../release-history}/drupal.dev.xml | 0
.../release-history}/drupal.sec.0.1_0.2.xml | 0
.../release-history}/drupal.sec.0.2-rc2-b.xml | 0
.../release-history}/drupal.sec.0.2-rc2.xml | 0
.../release-history}/drupal.sec.0.2.xml | 0
.../release-history}/drupal.sec.1.2.xml | 0
.../drupal.sec.1.2_insecure-unsupported.xml | 0
.../drupal.sec.1.2_insecure.xml | 0
.../release-history}/drupal.sec.2.0.xml | 0
.../drupal.sec.2.0_3.0-rc1.xml | 0
.../release-history}/drupal.sec.2.0_9.0.0.xml | 0
.../release-history}/drupal.sec.9.0.xml | 0
.../release-history}/drupal.sec.9.9.0.xml | 0
.../update_test_basetheme.1_1-sec.xml | 0
.../update_test_new_module.1_1.xml | 0
.../update_test_subtheme.1_0.xml | 0
.../bbb_update_test/bbb_update_test.info.yml | 1 -
.../ccc_update_test/ccc_update_test.info.yml | 1 -
.../src/Controller/UpdateTestController.php | 2 +-
.../modules/update_test/update_test.info.yml | 1 -
.../src/Functional/UpdateContribTest.php | 21 +-
.../tests/src/Functional/UpdateCoreTest.php | 34 +-
.../tests/src/Functional/UpdateTestBase.php | 4 +-
.../tests/src/Functional/UpdateUploadTest.php | 6 +-
.../tests/src/Kernel/UpdateReportTest.php | 57 +
.../src/Unit/ProjectCoreCompatibilityTest.php | 1 -
.../8.x-1.0/update_test_new_module.tar.gz | 6 +-
.../8.x-1.1/update_test_new_module.tar.gz | 7 +-
web/core/modules/update/update.api.php | 4 +-
web/core/modules/update/update.authorize.inc | 44 +-
web/core/modules/update/update.compare.inc | 71 +-
web/core/modules/update/update.fetch.inc | 4 +-
web/core/modules/update/update.install | 39 +-
web/core/modules/update/update.manager.inc | 4 +-
web/core/modules/update/update.module | 31 +-
web/core/modules/update/update.report.inc | 63 +-
web/core/modules/user/src/AccountForm.php | 28 +-
.../LanguageNegotiationUserAdmin.php | 2 +-
.../user/src/Theme/AdminNegotiator.php | 2 +-
.../tests/src/Functional/AccessRoleUITest.php | 2 +-
.../Functional/Rest/UserResourceTestBase.php | 4 +
.../src/Functional/UserAccountLinksTest.php | 18 +-
.../src/Functional/UserAdminLanguageTest.php | 12 +-
.../src/Functional/UserAdminListingTest.php | 6 +-
.../tests/src/Functional/UserAdminTest.php | 4 +-
.../tests/src/Functional/UserBlocksTest.php | 10 +-
.../tests/src/Functional/UserCancelTest.php | 4 +-
.../tests/src/Functional/UserCreateTest.php | 4 +-
.../Functional/UserLanguageCreationTest.php | 4 +-
.../src/Functional/UserPasswordResetTest.php | 34 +-
.../tests/src/Functional/UserPictureTest.php | 6 +-
.../src/Functional/UserRegistrationTest.php | 11 +-
.../src/Functional/UserRoleAdminTest.php | 8 +-
.../Functional/UserRolesAssignmentTest.php | 4 +-
.../tests/src/Functional/UserSearchTest.php | 10 +-
.../src/Functional/UserTokenReplaceTest.php | 8 +-
.../src/Functional/UserTranslationUITest.php | 7 +-
.../src/Functional/Views/AccessRoleTest.php | 16 +-
.../Functional/Views/BulkFormAccessTest.php | 8 +-
.../Views/HandlerFieldUserNameTest.php | 8 +-
.../src/Functional/Views/UserChangedTest.php | 2 +-
.../Views/UserFieldsAccessChangeTest.php | 4 +-
.../d6/MigrateUserProfileValuesTest.php | 2 +-
.../MigrateUserPictureFieldInstanceTest.php | 2 +-
.../d7/MigrateUserPictureFieldTest.php | 2 +-
.../Kernel/Migrate/d7/MigrateUserRoleTest.php | 2 +-
.../src/Kernel/Migrate/d7/MigrateUserTest.php | 4 +-
.../src/Kernel/UserEntityReferenceTest.php | 12 +-
.../user/tests/src/Kernel/UserLegacyTest.php | 2 +-
.../tests/src/Kernel/UserValidationTest.php | 26 +-
.../Views/HandlerFilterPermissionTest.php | 10 +-
.../src/Unit/Theme/AdminNegotiatorTest.php | 44 +
web/core/modules/user/user.module | 125 +-
web/core/modules/views/js/ajax_view.es6.js | 2 +-
.../ViewsEntitySchemaSubscriber.php | 9 +
.../views/src/Plugin/views/HandlerBase.php | 6 +
.../views/argument/ArgumentPluginBase.php | 2 +
.../Plugin/views/cache/CachePluginBase.php | 2 +
.../src/Plugin/views/display/Attachment.php | 7 +
.../views/src/Plugin/views/display/Block.php | 12 +
.../views/display/DisplayPluginBase.php | 34 +-
.../views/src/Plugin/views/display/Feed.php | 3 +
.../views/src/Plugin/views/display/Page.php | 4 +
.../exposed_form/ExposedFormPluginBase.php | 1 -
.../views/src/Plugin/views/field/BulkForm.php | 11 +-
.../Plugin/views/field/FieldPluginBase.php | 1 -
.../views/src/Plugin/views/field/FileSize.php | 1 +
.../views/src/Plugin/views/filter/Combine.php | 24 +-
.../src/Plugin/views/filter/NumericFilter.php | 1 +
.../src/Plugin/views/join/JoinPluginBase.php | 37 +-
.../views/src/Plugin/views/sort/Date.php | 5 +
.../views/src/Routing/ViewPageController.php | 2 +-
.../views/src/Tests/ViewKernelTestBase.php | 8 +-
web/core/modules/views/src/Views.php | 1 +
.../modules/views/src/ViewsConfigUpdater.php | 415 +++
.../templates/views-view-table.html.twig | 16 +-
.../views.view.test_user_multi_value.yml | 240 ++
...iews.view.test_argument_transform_term.yml | 217 ++
.../src/Plugin/views/query/QueryTest.php | 1 +
.../tests/src/Functional/BulkFormTest.php | 54 +-
.../tests/src/Functional/DefaultViewsTest.php | 12 +-
.../Entity/FieldEntityTranslationTest.php | 7 +-
.../FieldRenderedEntityTranslationTest.php | 7 +-
.../Entity/ViewNonTranslatableEntityTest.php | 2 +-
.../tests/src/Functional/GlossaryTest.php | 2 +-
.../Handler/AreaHTTPStatusCodeTest.php | 4 +-
.../tests/src/Functional/Handler/AreaTest.php | 22 +-
.../Handler/FieldDropButtonTest.php | 4 +-
.../Handler/FieldEntityOperationsTest.php | 2 +-
.../src/Functional/Handler/FieldWebTest.php | 12 +-
.../src/Functional/Handler/FilterDateTest.php | 12 +-
.../src/Functional/Handler/HandlerAllTest.php | 8 +-
.../src/Functional/Handler/HandlerTest.php | 4 +-
.../src/Functional/Plugin/AccessTest.php | 4 +-
.../Functional/Plugin/ArgumentDefaultTest.php | 6 +-
.../src/Functional/Plugin/CacheWebTest.php | 4 +-
.../ContextualFiltersBlockContextTest.php | 8 +-
.../Functional/Plugin/DisabledDisplayTest.php | 6 +-
.../Plugin/DisplayAttachmentTest.php | 24 +-
.../Plugin/DisplayEntityReferenceTest.php | 12 +-
.../src/Functional/Plugin/DisplayFeedTest.php | 14 +-
.../Plugin/DisplayFeedTranslationTest.php | 9 +-
.../Functional/Plugin/DisplayPageWebTest.php | 40 +-
.../src/Functional/Plugin/DisplayTest.php | 42 +-
.../Plugin/ExposedFormCheckboxesTest.php | 12 +-
.../src/Functional/Plugin/ExposedFormTest.php | 26 +-
.../src/Functional/Plugin/FilterTest.php | 12 +-
.../src/Functional/Plugin/MenuLinkTest.php | 9 +-
.../tests/src/Functional/Plugin/PagerTest.php | 16 +-
.../Functional/Plugin/StyleSummaryTest.php | 16 +-
.../src/Functional/Plugin/StyleTableTest.php | 8 +-
.../src/Functional/Plugin/ViewsFormTest.php | 2 +-
.../src/Functional/SearchMultilingualTest.php | 7 +-
.../Update/EntityLinkOutputUrlUpdateTest.php | 4 +
...ViewsMultiValueBaseFieldDataUpdateTest.php | 14 +-
.../Update/ImageStyleDependencyUpdateTest.php | 2 +-
.../Update/LimitOperatorsDefaultsTest.php | 4 +
.../tests/src/Functional/ViewAjaxTest.php | 2 +-
.../tests/src/Functional/ViewElementTest.php | 8 +-
.../tests/src/Functional/Wizard/BasicTest.php | 12 +-
.../Functional/Wizard/ItemsPerPageTest.php | 2 +-
.../tests/src/Functional/Wizard/MenuTest.php | 2 +-
.../src/Functional/Wizard/SortingTest.php | 4 +-
.../src/Functional/Wizard/TaggedWithTest.php | 6 +-
.../BlockExposedFilterAJAXTest.php | 18 +-
.../ClickSortingAJAXTest.php | 8 +-
.../ExposedFilterAJAXTest.php | 28 +-
.../PaginationAJAXTest.php | 16 +-
.../Handler/GroupedExposedFilterTest.php | 8 +-
.../views/tests/src/Kernel/BasicTest.php | 8 +-
.../Kernel/Entity/RowEntityRenderersTest.php | 10 +-
.../Entity/ViewEntityDependenciesTest.php | 9 +-
...sEntitySchemaSubscriberIntegrationTest.php | 7 +-
.../src/Kernel/Handler/AreaEntityTest.php | 22 +-
.../tests/src/Kernel/Handler/AreaViewTest.php | 6 +-
.../src/Kernel/Handler/ArgumentNullTest.php | 2 +-
.../src/Kernel/Handler/ComputedFieldTest.php | 2 +-
.../src/Kernel/Handler/FieldCounterTest.php | 8 +-
.../src/Kernel/Handler/FieldCustomTest.php | 2 +-
.../Kernel/Handler/FieldDropbuttonTest.php | 16 +-
.../src/Kernel/Handler/FieldFieldTest.php | 42 +-
.../src/Kernel/Handler/FieldKernelTest.php | 8 +-
.../FilterBooleanOperatorStringTest.php | 8 +-
.../Handler/FilterBooleanOperatorTest.php | 12 +-
.../src/Kernel/Handler/FilterCombineTest.php | 8 +
.../Kernel/Handler/FilterInOperatorTest.php | 8 +-
.../tests/src/Kernel/Handler/SortDateTest.php | 10 +
.../views/tests/src/Kernel/ModuleTest.php | 44 +-
.../Kernel/Plugin/ArgumentValidatorTest.php | 2 +-
.../tests/src/Kernel/Plugin/CacheTest.php | 16 +-
.../src/Kernel/Plugin/DisplayExtenderTest.php | 9 +-
.../src/Kernel/Plugin/DisplayKernelTest.php | 14 +-
.../Kernel/Plugin/ExposedFormRenderTest.php | 4 +-
.../Kernel/Plugin/FieldOrLanguageJoinTest.php | 24 +-
.../tests/src/Kernel/Plugin/JoinTest.php | 40 +-
.../tests/src/Kernel/Plugin/QueryTest.php | 2 +-
.../src/Kernel/Plugin/RelationshipTest.php | 6 +-
.../tests/src/Kernel/Plugin/RowEntityTest.php | 10 +-
.../tests/src/Kernel/Plugin/RssFieldsTest.php | 2 +-
.../src/Kernel/Plugin/StyleFieldsTest.php | 68 +
.../tests/src/Kernel/Plugin/StyleGridTest.php | 4 +
.../src/Kernel/Plugin/StyleHtmlListTest.php | 8 +-
.../src/Kernel/Plugin/StyleMappingTest.php | 6 +-
.../src/Kernel/Plugin/StyleTableUnitTest.php | 6 +-
.../tests/src/Kernel/Plugin/StyleTest.php | 8 +-
.../Kernel/Plugin/StyleUnformattedTest.php | 2 +-
.../tests/src/Kernel/PluginInstanceTest.php | 8 +-
.../tests/src/Kernel/QueryGroupByTest.php | 26 +-
.../src/Kernel/RenderCacheIntegrationTest.php | 4 +-
.../tests/src/Kernel/ViewElementTest.php | 10 +-
.../tests/src/Kernel/ViewExecutableTest.php | 82 +-
.../tests/src/Kernel/ViewStorageTest.php | 16 +-
...ViewsConfigDependenciesIntegrationTest.php | 15 +-
.../src/Kernel/ViewsConfigUpdaterTest.php | 102 +
.../tests/src/Kernel/ViewsKernelTestBase.php | 9 +-
.../tests/src/Kernel/ViewsPreprocessTest.php | 6 +-
.../tests/src/Kernel/ViewsTemplateTest.php | 4 +-
.../Wizard/WizardPluginBaseKernelTest.php | 2 +-
.../Controller/ViewAjaxControllerTest.php | 10 +-
.../Plugin/display/PathPluginBaseTest.php | 26 +-
.../views/field/EntityOperationsUnitTest.php | 2 +-
.../Unit/Routing/ViewPageControllerTest.php | 2 +-
web/core/modules/views/views.api.php | 23 +-
web/core/modules/views/views.install | 134 +-
web/core/modules/views/views.module | 47 +-
web/core/modules/views/views.post_update.php | 84 +-
web/core/modules/views/views.theme.inc | 19 +-
web/core/modules/views/views.tokens.inc | 6 +
web/core/modules/views/views.views.inc | 1 +
.../modules/views_ui/src/ViewEditForm.php | 6 +-
.../modules/views_ui/src/ViewListBuilder.php | 2 +
web/core/modules/views_ui/src/ViewUI.php | 2 +-
.../src/Functional/CustomBooleanTest.php | 14 +-
.../tests/src/Functional/DefaultViewsTest.php | 24 +-
.../tests/src/Functional/DisplayCRUDTest.php | 4 +-
.../tests/src/Functional/DisplayPathTest.php | 8 +-
.../src/Functional/ExposedFormUITest.php | 13 +-
.../src/Functional/FilterBooleanWebTest.php | 2 +-
.../tests/src/Functional/HandlerTest.php | 6 +-
.../Functional/NewViewConfigSchemaTest.php | 10 +-
.../src/Functional/OverrideDisplaysTest.php | 16 +-
.../tests/src/Functional/PreviewTest.php | 24 +-
.../tests/src/Functional/ReportTest.php | 2 +-
.../tests/src/Functional/RowUITest.php | 2 +-
.../tests/src/Functional/SettingsTest.php | 8 +-
.../src/Functional/UnsavedPreviewTest.php | 16 +-
.../tests/src/Functional/ViewEditTest.php | 18 +-
.../tests/src/Functional/ViewsListTest.php | 9 +-
.../FilterOptionsTest.php | 7 +-
.../src/FunctionalJavascript/PreviewTest.php | 2 +-
.../views_ui/tests/src/Kernel/TagTest.php | 11 +-
.../tests/src/Unit/ViewUIObjectTest.php | 2 +-
web/core/modules/views_ui/views_ui.api.php | 21 +
web/core/modules/views_ui/views_ui.info.yml | 2 +-
web/core/modules/views_ui/views_ui.theme.inc | 9 +
.../workflows/src/Form/WorkflowEditForm.php | 8 +-
.../src/Form/WorkflowStateEditForm.php | 2 +-
.../src/WorkflowDeleteAccessCheck.php | 6 +-
.../src/Kernel/WorkflowDependenciesTest.php | 7 +-
.../workspaces/src/EntityQuery/Query.php | 2 +-
.../workspaces/src/ViewsQueryAlter.php | 3 +-
.../WorkspaceResourceTestBase.php | 11 +-
.../src/Functional/PathWorkspacesTest.php | 8 +-
.../Update/WorkspacesUpdateTest.php | 22 -
.../ActiveWorkspaceUpdateTest.php | 63 +
.../Functional/WorkspaceCacheContextTest.php | 12 +-
.../WorkspaceToolbarIntegrationTest.php | 2 +-
.../src/Kernel/WorkspaceIntegrationTest.php | 21 +-
web/core/phpcs.xml.dist | 8 +-
.../install/block.block.umami_page_title.yml | 9 +-
.../install/media.type.remote_video.yml | 2 +-
.../config/install/views.view.frontpage.yml | 17 +-
.../demo_umami_content.install | 8 +-
.../demo_umami_content/src/InstallHelper.php | 8 +
.../UninstallDefaultContentTest.php | 4 +-
.../demo_umami/themes/umami/css/base.css | 2 +-
.../themes/umami/css/classy/README.txt | 12 +
.../css/classy/components/action-links.css | 43 +
.../css/classy/components/book-navigation.css | 40 +
.../css/classy/components/breadcrumb.css | 29 +
.../umami/css/classy/components/button.css | 15 +
.../classy/components/collapse-processed.css | 32 +
.../classy/components/container-inline.css | 22 +
.../umami/css/classy/components/details.css | 23 +
.../umami/css/classy/components/dialog.css | 72 +
.../css/classy/components/dropbutton.css | 33 +
.../css/classy/components/exposed-filters.css | 46 +
.../umami/css/classy/components/field.css | 25 +
.../umami/css/classy/components/file.css | 62 +
.../umami/css/classy/components/form.css | 104 +
.../umami/css/classy/components/forum.css | 46 +
.../umami/css/classy/components/icons.css | 21 +
.../css/classy/components/image-widget.css | 33 +
.../css/classy/components/inline-form.css | 33 +
.../umami/css/classy/components/item-list.css | 32 +
.../umami/css/classy/components/link.css | 16 +
.../umami/css/classy/components/links.css | 23 +
.../classy/components/media-embed-error.css | 20 +
.../umami/css/classy/components/menu.css | 34 +
.../umami/css/classy/components/more-link.css | 12 +
.../umami/css/classy/components/node.css | 8 +
.../umami/css/classy/components/pager.css | 16 +
.../umami/css/classy/components/progress.css | 69 +
.../css/classy/components/search-results.css | 8 +
.../umami/css/classy/components/tabledrag.css | 14 +
.../css/classy/components/tableselect.css | 19 +
.../umami/css/classy/components/tablesort.css | 11 +
.../umami/css/classy/components/tabs.css | 33 +
.../umami/css/classy/components/textarea.css | 11 +
.../umami/css/classy/components/ui-dialog.css | 15 +
.../umami/css/classy/components/user.css | 66 +
.../umami/css/classy/layout/media-library.css | 28 +
.../umami/css/components/views/frontpage.css | 15 +-
.../themes/umami/images/classy/README.txt | 12 +
.../classy/icons/application-octet-stream.png | 3 +
.../images/classy/icons/application-pdf.png | 5 +
.../classy/icons/application-x-executable.png | 3 +
.../images/classy/icons/audio-x-generic.png | 3 +
.../umami/images/classy/icons/forum-icons.png | 10 +
.../images/classy/icons/image-x-generic.png | 6 +
.../images/classy/icons/package-x-generic.png | 4 +
.../umami/images/classy/icons/text-html.png | 7 +
.../umami/images/classy/icons/text-plain.png | 4 +
.../images/classy/icons/text-x-generic.png | 4 +
.../images/classy/icons/text-x-script.png | 5 +
.../images/classy/icons/video-x-generic.png | 5 +
.../images/classy/icons/x-office-document.png | 5 +
.../classy/icons/x-office-presentation.png | 5 +
.../classy/icons/x-office-spreadsheet.png | 4 +
.../themes/umami/js/classy/README.txt | 12 +
.../classy/media_embed_ckeditor.theme.es6.js | 22 +
.../js/classy/media_embed_ckeditor.theme.js | 12 +
.../themes/umami/templates/classy/README.txt | 12 +
.../block--local-actions-block.html.twig | 12 +
.../block/block--local-tasks-block.html.twig | 14 +
.../block/block--system-menu-block.html.twig | 56 +
.../templates/classy/block/block.html.twig | 44 +
.../content-edit/file-managed-file.html.twig | 22 +
.../content-edit/filter-caption.html.twig | 18 +
.../content-edit/filter-guidelines.html.twig | 29 +
.../classy/content-edit/filter-tips.html.twig | 61 +
.../content-edit/image-widget.html.twig | 23 +
.../content-edit/node-add-list.html.twig | 30 +
.../content-edit/node-edit-form.html.twig | 28 +
.../text-format-wrapper.html.twig | 26 +
.../classy/content/aggregator-item.html.twig | 31 +
.../content/book-node-export-html.html.twig | 20 +
.../classy/content/comment.html.twig | 111 +
.../classy/content/links--node.html.twig | 40 +
.../templates/classy/content/mark.html.twig | 20 +
.../content/media-embed-error.html.twig | 21 +
.../templates/classy/content/media.html.twig | 28 +
.../classy/content/page-title.html.twig | 19 +
.../classy/content/search-result.html.twig | 72 +
.../classy/content/taxonomy-term.html.twig | 41 +
.../classy/dataset/aggregator-feed.html.twig | 36 +
.../classy/dataset/forum-icon.html.twig | 30 +
.../classy/dataset/forum-list.html.twig | 79 +
.../templates/classy/dataset/forums.html.twig | 24 +
.../item-list--search-results.html.twig | 29 +
.../classy/dataset/item-list.html.twig | 41 +
.../templates/classy/dataset/table.html.twig | 113 +
.../classy/field/field--comment.html.twig | 57 +
.../field/field--node--created.html.twig | 34 +
.../classy/field/field--node--title.html.twig | 34 +
.../classy/field/field--node--uid.html.twig | 34 +
.../classy/field/field--text-long.html.twig | 1 +
.../field/field--text-with-summary.html.twig | 1 +
.../classy/field/field--text.html.twig | 28 +
.../templates/classy/field/field.html.twig | 81 +
.../classy/field/file-audio.html.twig | 23 +
.../classy/field/file-link.html.twig | 17 +
.../classy/field/file-video.html.twig | 23 +
.../templates/classy/field/image.html.twig | 18 +
.../link-formatter-link-separate.html.twig | 22 +
.../templates/classy/field/time.html.twig | 22 +
.../classy/form/datetime-form.html.twig | 15 +
.../classy/form/datetime-wrapper.html.twig | 36 +
.../templates/classy/form/details.html.twig | 44 +
.../templates/classy/form/fieldset.html.twig | 60 +
.../classy/form/form-element-label.html.twig | 25 +
.../classy/form/form-element.html.twig | 95 +
.../templates/classy/form/radios.html.twig | 13 +
.../templates/classy/form/textarea.html.twig | 25 +
.../classy/layout/book-export-html.html.twig | 45 +
.../templates/classy/layout/html.html.twig | 55 +
.../classy/layout/maintenance-page.html.twig | 65 +
.../templates/classy/layout/region.html.twig | 25 +
...container--media-library-content.html.twig | 28 +
...--media-library-widget-selection.html.twig | 28 +
.../links--media-library-menu.html.twig | 36 +
.../media--media-library.html.twig | 55 +
.../media-library-item--small.html.twig | 31 +
.../media-library-item.html.twig | 28 +
.../media-library-wrapper.html.twig | 21 +
...-view-unformatted--media-library.html.twig | 35 +
.../classy/misc/help-section.html.twig | 48 +
.../classy/misc/progress-bar.html.twig | 22 +
.../classy/misc/rdf-metadata.html.twig | 20 +
.../navigation/book-all-books-block.html.twig | 22 +
.../navigation/book-navigation.html.twig | 56 +
.../classy/navigation/book-tree.html.twig | 55 +
.../classy/navigation/toolbar.html.twig | 46 +
.../classy/user/forum-submitted.html.twig | 21 +
.../templates/classy/user/user.html.twig | 23 +
.../templates/classy/user/username.html.twig | 29 +
.../classy/views/views-exposed-form.html.twig | 21 +
.../classy/views/views-mini-pager.html.twig | 42 +
.../views/views-view-grouping.html.twig | 20 +
.../classy/views/views-view-row-rss.html.twig | 30 +
.../views-view-summary-unformatted.html.twig | 31 +
.../classy/views/views-view-summary.html.twig | 31 +
.../classy/views/views-view-table.html.twig | 120 +
.../classy/views/views-view.html.twig | 95 +
.../navigation/menu-local-tasks.html.twig | 21 +
.../content/node--article--full.html.twig | 2 +-
.../content/node--card-common.html.twig | 2 +-
.../templates/content/node--card.html.twig | 2 +-
.../umami/templates/content/node.html.twig | 2 +-
.../demo_umami/themes/umami/umami.info.yml | 34 +
.../themes/umami/umami.libraries.yml | 111 +
.../tests/src/Functional/MinimalTest.php | 2 +-
.../optional/media.type.remote_video.yml | 2 +-
.../tests/src/Functional/StandardTest.php | 8 +-
.../Template/ComposerProjectTemplatesTest.php | 85 +-
.../BuildTests/Framework/BuildTestBase.php | 6 +-
.../Ajax/AjaxFormCacheTest.php | 4 +-
.../Ajax/AjaxFormPageCacheTest.php | 2 +-
.../Ajax/AjaxTest.php | 8 +-
.../Ajax/CommandsTest.php | 2 +-
.../Ajax/DialogTest.php | 2 +-
.../Ajax/ElementValidationTest.php | 2 +-
.../Ajax/FormValuesTest.php | 6 +-
.../Ajax/MultiFormTest.php | 4 +-
.../Core/JsMessageTest.php | 6 +-
.../Core/MachineNameTest.php | 7 +-
.../EntityReferenceAutocompleteWidgetTest.php | 4 +-
.../TableDrag/TableDragTest.php | 123 +
.../Tests/JSWebAssertTest.php | 12 +-
.../Theme/ClaroTableDragTest.php | 30 +
.../WebDriverTestBase.php | 2 +-
.../WebDriverWebAssert.php | 16 +-
.../FunctionalTests/AssertLegacyTrait.php | 16 +-
.../Bootstrap/UncaughtExceptionTest.php | 19 +-
.../FunctionalTests/BrowserTestBaseTest.php | 21 +-
.../Test/AssertLegacyTraitDeprecatedTest.php | 2 +-
.../Datetime/TimestampTest.php | 2 +-
.../Entity/EntityBundleListCacheTest.php | 80 +
.../Image/ToolkitSetupFormTest.php | 2 +-
.../FunctionalTests/Image/ToolkitTest.php | 2 +-
.../ConfigAfterInstallerTestBase.php | 8 +-
...istributionProfileExistingSettingsTest.php | 2 +-
.../Installer/DistributionProfileTest.php | 2 +-
...istributionProfileTranslationQueryTest.php | 2 +-
.../DistributionProfileTranslationTest.php | 2 +-
.../InstallProfileDependenciesTest.php | 2 +-
...ConfigDirectorySetNoDirectoryErrorTest.php | 2 +-
...allerConfigDirectorySetNoDirectoryTest.php | 4 +-
...stallerCustomConfigDirectoryCreateTest.php | 5 +-
.../Installer/InstallerEmptySettingsTest.php | 2 +-
...llerExistingBrokenDatabaseSettingsTest.php | 72 +
.../InstallerExistingConfigDirectoryTest.php | 2 +-
.../InstallerExistingDatabaseSettingsTest.php | 2 +-
...InstallerExistingSettingsNoProfileTest.php | 2 +-
.../InstallerExistingSettingsTest.php | 2 +-
.../InstallerLanguageDirectionTest.php | 2 +-
.../Installer/InstallerLanguagePageTest.php | 2 +-
.../InstallerNonDefaultDatabaseDriverTest.php | 65 +
.../InstallerSkipPermissionHardeningTest.php | 4 +-
.../Installer/InstallerTest.php | 15 +-
.../InstallerTranslationQueryTest.php | 2 +-
.../Installer/InstallerTranslationTest.php | 4 +-
.../MultipleDistributionsProfileTest.php | 2 +-
.../Installer/SingleVisibleProfileTest.php | 2 +-
.../FunctionalTests/MailCaptureTest.php | 14 +-
.../Routing/RouteCachingLanguageTest.php | 8 +-
.../FunctionalTests/Theme/BartikTest.php | 4 +-
.../Update/UpdatePathTestBase.php | 6 +-
.../Drupal/KernelTests/AssertConfigTrait.php | 3 +
.../Drupal/KernelTests/AssertContentTrait.php | 46 +-
.../KernelTests/Config/TypedConfigTest.php | 2 +-
.../Core/Asset/AttachedAssetsTest.php | 68 +-
...solvedLibraryDefinitionsFilesMatchTest.php | 2 +-
.../Cache/GenericCacheBackendUnitTestBase.php | 60 +-
.../KernelTests/Core/Command/DbDumpTest.php | 12 +-
.../Core/Config/ConfigCRUDTest.php | 2 +-
.../Core/Config/ConfigDependencyTest.php | 44 +-
.../Core/Config/ConfigDiffTest.php | 14 +-
.../Core/Config/ConfigEntityUnitTest.php | 4 +-
.../Core/Config/ConfigFileContentTest.php | 6 +-
.../Core/Config/ConfigImportRecreateTest.php | 6 +-
.../ConfigImportRenameValidationTest.php | 9 +-
.../ConfigImporterMissingContentTest.php | 8 +-
.../Core/Config/ConfigImporterTest.php | 20 +-
.../Config/ConfigLanguageOverrideTest.php | 8 +-
.../Config/ConfigOverridesPriorityTest.php | 7 +-
.../Core/Config/ConfigSchemaTest.php | 23 +-
.../Config/Storage/ConfigStorageTestBase.php | 11 +-
.../Core/Config/Storage/FileStorageTest.php | 2 +-
.../KernelTests/Core/Database/AlterTest.php | 6 +-
.../Core/Database/ConnectionTest.php | 14 +
.../Core/Database/DeleteTruncateTest.php | 2 +-
.../KernelTests/Core/Database/FetchTest.php | 74 +-
.../KernelTests/Core/Database/LoggingTest.php | 14 +-
.../KernelTests/Core/Database/QueryTest.php | 4 +-
.../Core/Database/RangeQueryTest.php | 2 +-
.../Core/Database/SelectSubqueryTest.php | 6 +-
.../KernelTests/Core/Database/SelectTest.php | 26 +-
.../Core/Datetime/TimestampSchemaTest.php | 7 +-
.../Core/DrupalKernel/DrupalKernelTest.php | 2 +-
.../Core/Element/PathElementFormTest.php | 8 +-
.../Core/Entity/ContentEntityChangedTest.php | 10 +-
.../Core/Entity/CreateSampleEntityTest.php | 13 +-
.../EntityAutocompleteElementFormTest.php | 10 +-
.../Entity/EntityAccessControlHandlerTest.php | 2 +-
.../Core/Entity/EntityCrudHookTest.php | 15 +-
.../Core/Entity/EntityDisplayBaseTest.php | 9 +-
.../Core/Entity/EntityFieldTest.php | 40 +-
.../Core/Entity/EntityKernelTestBase.php | 9 +-
.../Core/Entity/EntityLegacyTest.php | 2 +-
.../Entity/EntityQueryRelationshipTest.php | 4 +-
.../Core/Entity/EntityQueryTest.php | 111 +-
.../Core/Entity/EntityRepositoryTest.php | 3 +-
.../Core/Entity/EntitySchemaTest.php | 61 +-
.../Core/Entity/EntityTranslationTest.php | 20 +-
.../Entity/EntityTypedDataDefinitionTest.php | 32 +-
.../Core/Entity/EntityUUIDTest.php | 3 +
.../Core/Entity/EntityValidationTest.php | 4 +-
.../Core/Entity/EntityViewBuilderTest.php | 6 +-
.../Core/Entity/FieldSqlStorageTest.php | 2 +-
.../FieldWidgetConstraintValidatorTest.php | 8 +-
.../FieldableEntityDefinitionUpdateTest.php | 6 +-
.../RevisionableContentEntityBaseTest.php | 2 +-
.../Extension/ModuleImplementsAlterTest.php | 9 +-
.../Core/Extension/ThemeExtensionListTest.php | 8 +
.../Core/Field/FieldAccessTest.php | 9 +-
.../KernelTests/Core/File/DirectoryTest.php | 18 +-
.../KernelTests/Core/File/FileCopyTest.php | 22 +-
.../Core/File/FileDeleteRecursiveTest.php | 18 +-
.../KernelTests/Core/File/FileDeleteTest.php | 4 +-
.../KernelTests/Core/File/FileMoveTest.php | 16 +-
.../KernelTests/Core/File/FileTestBase.php | 5 +-
.../KernelTests/Core/File/HtaccessTest.php | 30 +-
.../KernelTests/Core/File/NameMungingTest.php | 2 +-
.../KernelTests/Core/File/PharWrapperTest.php | 4 +-
.../Core/File/ReadOnlyStreamWrapperTest.php | 2 +-
.../Core/File/ScanDirectoryTest.php | 18 +-
.../Core/File/StreamWrapperTest.php | 6 +-
.../Core/Form/ExternalFormUrlTest.php | 2 +-
.../Core/Form/FormDefaultHandlersTest.php | 4 +-
.../KernelTests/Core/Image/ToolkitGdTest.php | 15 +-
.../Core/Installer/InstallerLanguageTest.php | 2 +-
.../DatabaseStorageExpirableTest.php | 4 +-
.../KeyValueStore/GarbageCollectionTest.php | 4 +-
.../Menu/MenuLinkDefaultIntegrationTest.php | 4 +-
.../Core/Menu/MenuLinkTreeTest.php | 10 +-
.../Core/Menu/MenuTreeStorageTest.php | 28 +-
.../Context/ContextAwarePluginBaseTest.php | 2 +-
.../Core/Plugin/ContextPluginTest.php | 9 +-
.../Core/Render/Element/TableTest.php | 6 +-
.../KernelTests/Core/Render/RenderTest.php | 2 +-
.../Routing/ContentNegotiationRoutingTest.php | 2 +-
.../Core/Routing/ExceptionHandlingTest.php | 10 +-
.../Core/Routing/MatcherDumperTest.php | 4 +-
.../Core/Routing/RouteProviderTest.php | 67 +-
.../Core/TempStore/TempStoreDatabaseTest.php | 2 +-
.../Core/Test/AssertMailTraitTest.php | 2 +-
.../MarkupInterfaceComparatorTest.php | 160 +
.../Core/Theme/ConfirmClassyCopiesTest.php | 869 +++++
.../Core/Theme/RegistryLegacyTest.php | 70 +
.../KernelTests/Core/Theme/RegistryTest.php | 9 -
.../Core/Theme/ThemeInstallerTest.php | 75 +
.../Theme/ThemeNotUsingClassyLibraryTest.php | 447 +++
.../Theme/ThemeRenderAndAutoescapeTest.php | 2 +-
.../Core/Theme/ThemeSettingsTest.php | 6 +-
.../ThemesNotUsingClassyTemplatesTest.php | 193 ++
.../Core/Theme/TwigEnvironmentTest.php | 2 +-
.../Core/Theme/TwigMarkupInterfaceTest.php | 2 +-
.../Core/Theme/TwigWhiteListTest.php | 10 +-
.../TypedData/TypedDataDefinitionTest.php | 16 +-
.../Core/TypedData/TypedDataTest.php | 76 +-
.../Core/Update/CompatibilityFixTest.php | 2 +-
.../Core/Url/LinkGenerationTest.php | 8 +-
.../Drupal/KernelTests/KernelTestBase.php | 26 +-
.../Nightwatch/Commands/drupalInstall.js | 15 +-
.../Nightwatch/Tests/installProfileTest.js | 19 +
.../Drupal/Nightwatch/Tests/jsCookieTest.js | 254 ++
.../Drupal/Nightwatch/Tests/langcodeTest.js | 18 +
.../Commands/TestSiteInstallCommand.php | 3 -
.../Comparator/MarkupInterfaceComparator.php | 34 +
.../PhpUnit6/TestCompatibilityTrait.php | 190 +-
.../PhpUnit7/TestCompatibilityTrait.php | 190 +-
.../tests/Drupal/Tests/BrowserTestBase.php | 4 +
.../Annotation/Doctrine/DocParserTest.php | 116 +-
.../Annotation/Doctrine/Ticket/DCOM58Test.php | 12 +-
.../ZfExtensionManagerSfContainerTest.php | 6 +-
.../DependencyInjection/ContainerTest.php | 6 +-
.../Tests/Component/Graph/GraphTest.php | 2 +-
.../PhpStorage/FileStorageReadOnlyTest.php | 2 +-
.../Component/PhpStorage/FileStorageTest.php | 4 +-
.../MTimeProtectedFileStorageBase.php | 2 +-
.../Render/FormattableMarkupTest.php | 2 +-
.../Component/Serialization/YamlTest.php | 2 +-
.../Tests/Component/Utility/NumberTest.php | 4 +-
.../Component/Utility/SafeMarkupTest.php | 9 +-
.../Tests/Component/Utility/SortArrayTest.php | 6 +-
.../Tests/Component/Utility/UrlHelperTest.php | 2 +-
.../Tests/Component/Utility/XssTest.php | 2 +-
.../Drupal/Tests/Composer/ComposerTest.php | 19 -
.../Tests/Composer/Generator/BuilderTest.php | 4 +-
.../Tests/Composer/Generator/Fixtures.php | 16 +-
.../OverlapWithTopLevelDependenciesTest.php | 51 +
.../Plugin/Scaffold/AssertUtilsTrait.php | 4 +-
.../Scaffold/Functional/ComposerHookTest.php | 50 +-
.../Functional/ManageGitIgnoreTest.php | 2 +
.../Scaffold/Functional/ScaffoldTest.php | 10 +-
.../Functional/ScaffoldUpgradeTest.php | 122 +
.../Scaffold/Integration/AppendOpTest.php | 25 +-
.../Scaffold/Integration/ReplaceOpTest.php | 4 +-
.../ScaffoldFileCollectionTest.php | 10 +-
.../Scaffold/Integration/SkipOpTest.php | 4 +-
.../fixtures/drupal-drupal/composer.json.tmpl | 1 -
.../Drupal/Tests/ComposerIntegrationTest.php | 2 +-
.../Tests/Core/Access/AccessManagerTest.php | 8 +-
.../Tests/Core/Access/AccessResultTest.php | 8 +-
.../Core/Access/CsrfTokenGeneratorTest.php | 4 +-
.../Core/Assert/AssertLegacyTraitTest.php | 4 +-
.../Asset/CssCollectionGrouperUnitTest.php | 12 +-
.../LibrariesDirectoryFileFinderTest.php | 88 +
.../Core/Asset/LibraryDiscoveryParserTest.php | 71 +-
.../example_contrib_module.libraries.yml | 5 +
.../Tests/Core/Batch/BatchBuilderTest.php | 8 +-
.../BackendChainImplementationUnitTest.php | 10 +-
.../Core/Cache/ChainedFastBackendTest.php | 2 +-
.../ProtocolVersionCacheContextTest.php | 42 +
.../Cache/Context/SessionCacheContextTest.php | 6 +-
.../Entity/ConfigEntityBaseUnitTest.php | 10 +-
.../Core/Config/StorageCopyTraitTest.php | 71 +
.../Controller/ControllerResolverTest.php | 4 +-
.../Tests/Core/Database/ConditionTest.php | 27 +
.../Tests/Core/Database/ConnectionTest.php | 55 +
.../Tests/Core/Database/DatabaseTest.php | 123 +
.../Database/Driver/sqlite/ConnectionTest.php | 49 +
.../Core/Database/EmptyStatementTest.php | 2 +-
.../Core/Database/InstallerObjectTest.php | 74 +
.../Tests/Core/Database/UrlConversionTest.php | 178 +-
.../ContainerBuilderTest.php | 6 +-
.../Core/DrupalKernel/DrupalKernelTest.php | 2 +-
.../EntityRevisionRouteEnhancerTest.php | 2 +-
.../Core/Entity/ContentEntityBaseUnitTest.php | 4 +-
.../Enhancer/EntityRouteEnhancerTest.php | 2 +-
.../Entity/EntityBundleAccessCheckTest.php | 97 +
.../Core/Entity/EntityListBuilderTest.php | 8 +-
.../Tests/Core/Entity/EntityTypeTest.php | 31 +
.../Tests/Core/Entity/EntityUnitTest.php | 61 +
.../Entity/Sql/DefaultTableMappingTest.php | 2 +-
.../Sql/SqlContentEntityStorageSchemaTest.php | 4 +-
.../TypedData/EntityAdapterUnitTest.php | 6 +-
.../FinalExceptionSubscriberTest.php | 2 +-
...RequiredByThemesUninstallValidatorTest.php | 161 +
.../Tests/Core/Field/FieldItemListTest.php | 19 +
.../Tests/Core/Form/FormBuilderTest.php | 30 +
.../Drupal/Tests/Core/Image/ImageTest.php | 2 +-
.../Core/Layout/LayoutPluginManagerTest.php | 28 +-
.../Core/Lock/LockBackendAbstractTest.php | 2 +-
.../DefaultMenuLinkTreeManipulatorsTest.php | 2 +-
.../Core/Plugin/DefaultPluginManagerTest.php | 12 +-
...tainerDerivativeDiscoveryDecoratorTest.php | 2 +-
.../DerivativeDiscoveryDecoratorTest.php | 4 +-
.../Discovery/YamlDirectoryDiscoveryTest.php | 2 +-
.../Discovery/YamlDiscoveryDecoratorTest.php | 2 +-
.../Plugin/Discovery/YamlDiscoveryTest.php | 2 +-
.../Drupal/Tests/Core/PrivateKeyTest.php | 2 +-
.../Tests/Core/Render/Element/HtmlTagTest.php | 2 +-
.../Core/Render/RendererRecursionTest.php | 8 +-
.../Drupal/Tests/Core/Render/RendererTest.php | 8 +-
.../Tests/Core/Render/RendererTestBase.php | 5 +
.../Core/Routing/AcceptHeaderMatcherTest.php | 2 +-
.../Routing/ContentTypeHeaderMatcherTest.php | 6 +-
.../Routing/TrustedRedirectResponseTest.php | 2 +-
.../Tests/Core/Routing/UrlGeneratorTest.php | 3 +
.../Core/Security/RequestSanitizerTest.php | 2 +-
.../Tests/Core/Template/AttributeTest.php | 2 +-
.../Core/Test/AssertContentTraitTest.php | 6 +-
.../Tests/Core/Test/JUnitConverterTest.php | 2 +-
.../Drupal/Tests/Core/Test/PhpUnitCliTest.php | 35 +
.../ClassyTemplatesIdenticalToStableTest.php | 62 +
.../Tests/Core/Theme/RegistryLegacyTest.php | 149 +
.../Drupal/Tests/Core/Theme/RegistryTest.php | 47 +-
.../Drupal/Tests/Core/UnroutedUrlTest.php | 2 +-
web/core/tests/Drupal/Tests/Core/UrlTest.php | 2 +-
.../Tests/Core/Utility/LinkGeneratorTest.php | 27 +-
.../Drupal/Tests/Core/Utility/TokenTest.php | 2 +-
.../Drupal/Tests/ExpectDeprecationTest.php | 2 +-
.../Listeners/DeprecationListenerTrait.php | 1 -
.../Tests/PhpunitCompatibilityTraitTest.php | 81 +
.../Tests/Scripts/TestSiteApplicationTest.php | 28 +-
.../Drupal/Tests/TestFileCreationTrait.php | 2 +
.../Tests/Traits/ExpectDeprecationTrait.php | 4 +-
web/core/tests/Drupal/Tests/UiHelperTrait.php | 5 +-
.../Drupal/Tests/UpdatePathTestTrait.php | 5 +-
web/core/tests/README.md | 24 +-
.../core/corefake/Connection.php | 14 +
.../core/corefake/Install/Tasks.php | 16 +
.../custom/corefake/Connection.php | 7 +
.../custom/corefake/Install/Tasks.php | 9 +
.../custom}/fake/Connection.php | 0
.../custom/fake/Install/Tasks.php | 16 +
.../Driver/Database/corefake/Connection.php | 14 +
.../Database/corefake/Install/Tasks.php | 16 +
web/core/themes/bartik/bartik.info.yml | 38 +
web/core/themes/bartik/bartik.libraries.yml | 117 +
web/core/themes/bartik/css/classy/README.txt | 12 +
.../css/classy/components/action-links.css | 43 +
.../css/classy/components/book-navigation.css | 40 +
.../css/classy/components/breadcrumb.css | 29 +
.../bartik/css/classy/components/button.css | 15 +
.../classy/components/collapse-processed.css | 32 +
.../classy/components/container-inline.css | 22 +
.../bartik/css/classy/components/details.css | 23 +
.../bartik/css/classy/components/dialog.css | 72 +
.../css/classy/components/dropbutton.css | 33 +
.../css/classy/components/exposed-filters.css | 46 +
.../bartik/css/classy/components/field.css | 25 +
.../bartik/css/classy/components/file.css | 62 +
.../bartik/css/classy/components/form.css | 104 +
.../bartik/css/classy/components/forum.css | 46 +
.../bartik/css/classy/components/icons.css | 21 +
.../css/classy/components/image-widget.css | 33 +
.../bartik/css/classy/components/indented.css | 16 +
.../css/classy/components/inline-form.css | 33 +
.../css/classy/components/item-list.css | 32 +
.../bartik/css/classy/components/link.css | 16 +
.../bartik/css/classy/components/links.css | 23 +
.../classy/components/media-embed-error.css | 20 +
.../bartik/css/classy/components/menu.css | 34 +
.../bartik/css/classy/components/messages.css | 72 +
.../css/classy/components/more-link.css | 12 +
.../bartik/css/classy/components/node.css | 8 +
.../bartik/css/classy/components/pager.css | 16 +
.../bartik/css/classy/components/progress.css | 69 +
.../css/classy/components/search-results.css | 8 +
.../css/classy/components/tabledrag.css | 14 +
.../css/classy/components/tableselect.css | 19 +
.../css/classy/components/tablesort.css | 11 +
.../bartik/css/classy/components/tabs.css | 33 +
.../bartik/css/classy/components/textarea.css | 11 +
.../css/classy/components/ui-dialog.css | 15 +
.../bartik/css/classy/components/user.css | 66 +
.../css/classy/layout/media-library.css | 28 +
.../themes/bartik/css/components/form.css | 11 -
.../themes/bartik/images/classy/README.txt | 12 +
.../classy/icons/application-octet-stream.png | 3 +
.../images/classy/icons/application-pdf.png | 5 +
.../classy/icons/application-x-executable.png | 3 +
.../images/classy/icons/audio-x-generic.png | 3 +
.../images/classy/icons/forum-icons.png | 10 +
.../images/classy/icons/image-x-generic.png | 6 +
.../images/classy/icons/package-x-generic.png | 4 +
.../bartik/images/classy/icons/text-html.png | 7 +
.../bartik/images/classy/icons/text-plain.png | 4 +
.../images/classy/icons/text-x-generic.png | 4 +
.../images/classy/icons/text-x-script.png | 5 +
.../images/classy/icons/video-x-generic.png | 5 +
.../images/classy/icons/x-office-document.png | 5 +
.../classy/icons/x-office-presentation.png | 5 +
.../classy/icons/x-office-spreadsheet.png | 4 +
web/core/themes/bartik/js/classy/README.txt | 12 +
.../classy/media_embed_ckeditor.theme.es6.js | 22 +
.../js/classy/media_embed_ckeditor.theme.js | 12 +
.../block--search-form-block.html.twig | 45 +-
.../block--system-menu-block.html.twig | 69 +-
.../themes/bartik/templates/classy/README.txt | 12 +
.../block--local-actions-block.html.twig | 12 +
.../block/block--local-tasks-block.html.twig | 14 +
.../content-edit/file-managed-file.html.twig | 22 +
.../content-edit/filter-caption.html.twig | 18 +
.../content-edit/filter-guidelines.html.twig | 29 +
.../classy/content-edit/filter-tips.html.twig | 61 +
.../content-edit/image-widget.html.twig | 23 +
.../content-edit/node-add-list.html.twig | 30 +
.../content-edit/node-edit-form.html.twig | 28 +
.../text-format-wrapper.html.twig | 26 +
.../classy/content/aggregator-item.html.twig | 31 +
.../content/book-node-export-html.html.twig | 20 +
.../classy/content/links--node.html.twig | 40 +
.../templates/classy/content/mark.html.twig | 20 +
.../content/media-embed-error.html.twig | 21 +
.../templates/classy/content/media.html.twig | 28 +
.../classy/content/search-result.html.twig | 72 +
.../classy/content/taxonomy-term.html.twig | 41 +
.../classy/dataset/aggregator-feed.html.twig | 36 +
.../classy/dataset/forum-icon.html.twig | 30 +
.../classy/dataset/forum-list.html.twig | 79 +
.../templates/classy/dataset/forums.html.twig | 24 +
.../item-list--search-results.html.twig | 29 +
.../classy/dataset/item-list.html.twig | 41 +
.../templates/classy/dataset/table.html.twig | 113 +
.../classy/field/field--comment.html.twig | 57 +
.../field/field--node--created.html.twig | 34 +
.../classy/field/field--node--title.html.twig | 34 +
.../classy/field/field--node--uid.html.twig | 34 +
.../classy/field/field--text-long.html.twig | 1 +
.../field/field--text-with-summary.html.twig | 1 +
.../classy/field/field--text.html.twig | 28 +
.../templates/classy/field/field.html.twig | 81 +
.../classy/field/file-audio.html.twig | 23 +
.../classy/field/file-link.html.twig | 17 +
.../classy/field/file-video.html.twig | 23 +
.../templates/classy/field/image.html.twig | 18 +
.../link-formatter-link-separate.html.twig | 22 +
.../templates/classy/field/time.html.twig | 22 +
.../classy/form/datetime-form.html.twig | 15 +
.../classy/form/datetime-wrapper.html.twig | 36 +
.../templates/classy/form/details.html.twig | 44 +
.../templates/classy/form/fieldset.html.twig | 60 +
.../classy/form/form-element-label.html.twig | 25 +
.../classy/form/form-element.html.twig | 95 +
.../templates/classy/form/radios.html.twig | 13 +
.../templates/classy/form/textarea.html.twig | 25 +
.../classy/layout/book-export-html.html.twig | 45 +
.../templates/classy/layout/html.html.twig | 55 +
.../templates/classy/layout/region.html.twig | 25 +
...container--media-library-content.html.twig | 28 +
...--media-library-widget-selection.html.twig | 28 +
.../links--media-library-menu.html.twig | 36 +
.../media--media-library.html.twig | 55 +
.../media-library-item--small.html.twig | 31 +
.../media-library-item.html.twig | 28 +
.../media-library-wrapper.html.twig | 21 +
...-view-unformatted--media-library.html.twig | 35 +
.../classy/misc/help-section.html.twig | 48 +
.../classy/misc/progress-bar.html.twig | 22 +
.../classy/misc/rdf-metadata.html.twig | 20 +
.../navigation/book-all-books-block.html.twig | 22 +
.../navigation/book-navigation.html.twig | 56 +
.../classy/navigation/book-tree.html.twig | 55 +
.../classy/navigation/breadcrumb.html.twig | 25 +
.../navigation/menu-local-task.html.twig | 17 +
.../navigation/menu-local-tasks.html.twig | 21 +
.../classy/navigation/menu.html.twig | 55 +
.../classy/navigation/toolbar.html.twig | 46 +
.../classy/user/forum-submitted.html.twig | 21 +
.../templates/classy/user/user.html.twig | 23 +
.../templates/classy/user/username.html.twig | 29 +
.../classy/views/views-exposed-form.html.twig | 21 +
.../classy/views/views-mini-pager.html.twig | 42 +
.../views/views-view-grouping.html.twig | 20 +
.../classy/views/views-view-row-rss.html.twig | 30 +
.../views-view-summary-unformatted.html.twig | 31 +
.../classy/views/views-view-summary.html.twig | 31 +
.../classy/views/views-view-table.html.twig | 120 +
.../classy/views/views-view.html.twig | 95 +
.../themes/bartik/templates/node.html.twig | 2 +-
.../bartik/templates/page-title.html.twig | 14 +-
.../templates/status-messages.html.twig | 50 +-
web/core/themes/claro/claro.info.yml | 52 +-
web/core/themes/claro/claro.libraries.yml | 55 +-
web/core/themes/claro/claro.theme | 19 +-
web/core/themes/claro/css/base/elements.css | 16 +-
.../themes/claro/css/base/elements.pcss.css | 4 +-
.../themes/claro/css/base/variables.pcss.css | 3 +
web/core/themes/claro/css/classy/README.txt | 12 +
.../css/classy/components/book-navigation.css | 40 +
.../classy/components/container-inline.css | 22 +
.../css/classy/components/exposed-filters.css | 46 +
.../claro/css/classy/components/field.css | 25 +
.../claro/css/classy/components/file.css | 62 +
.../claro/css/classy/components/forum.css | 46 +
.../claro/css/classy/components/icons.css | 21 +
.../claro/css/classy/components/indented.css | 16 +
.../css/classy/components/inline-form.css | 33 +
.../claro/css/classy/components/item-list.css | 32 +
.../claro/css/classy/components/link.css | 16 +
.../claro/css/classy/components/links.css | 23 +
.../classy/components/media-embed-error.css | 20 +
.../claro/css/classy/components/menu.css | 34 +
.../claro/css/classy/components/more-link.css | 12 +
.../claro/css/classy/components/node.css | 8 +
.../css/classy/components/search-results.css | 8 +
.../claro/css/classy/components/tablesort.css | 11 +
.../claro/css/classy/components/textarea.css | 11 +
.../claro/css/classy/components/ui-dialog.css | 15 +
.../claro/css/components/content-header.css | 2 +-
.../css/components/content-header.pcss.css | 4 +-
.../claro/css/components/dropbutton.css | 3 +-
.../claro/css/components/dropbutton.pcss.css | 3 +-
.../css/components/form--password-confirm.css | 1 -
.../form--password-confirm.pcss.css | 1 -
.../claro/css/components/form--text.css | 1 -
.../claro/css/components/form--text.pcss.css | 1 -
web/core/themes/claro/css/components/form.css | 4 -
web/core/themes/claro/css/components/tabs.css | 29 +-
.../themes/claro/css/components/tabs.pcss.css | 27 +-
.../themes/claro/css/layout/image-widget.css | 2 +-
.../claro/css/layout/image-widget.pcss.css | 2 +-
web/core/themes/claro/css/layout/layout.css | 13 +-
.../themes/claro/css/layout/layout.pcss.css | 10 +-
.../claro/css/theme/ckeditor-editor.css | 89 +-
.../claro/css/theme/ckeditor-editor.pcss.css | 59 +-
.../themes/claro/images/classy/README.txt | 12 +
.../classy/icons/application-octet-stream.png | 3 +
.../images/classy/icons/application-pdf.png | 5 +
.../classy/icons/application-x-executable.png | 3 +
.../images/classy/icons/audio-x-generic.png | 3 +
.../claro/images/classy/icons/forum-icons.png | 10 +
.../images/classy/icons/image-x-generic.png | 6 +
.../images/classy/icons/package-x-generic.png | 4 +
.../claro/images/classy/icons/text-html.png | 7 +
.../claro/images/classy/icons/text-plain.png | 4 +
.../images/classy/icons/text-x-generic.png | 4 +
.../images/classy/icons/text-x-script.png | 5 +
.../images/classy/icons/video-x-generic.png | 5 +
.../images/classy/icons/x-office-document.png | 5 +
.../classy/icons/x-office-presentation.png | 5 +
.../classy/icons/x-office-spreadsheet.png | 4 +
web/core/themes/claro/js/classy/README.txt | 12 +
.../classy/media_embed_ckeditor.theme.es6.js | 22 +
.../js/classy/media_embed_ckeditor.theme.js | 12 +
web/core/themes/claro/js/messages.es6.js | 24 -
web/core/themes/claro/js/messages.js | 12 -
web/core/themes/claro/js/nav-tabs.es6.js | 2 +-
web/core/themes/claro/js/tabledrag.es6.js | 18 +-
web/core/themes/claro/js/tabledrag.js | 12 +-
web/core/themes/claro/js/user.es6.js | 2 +-
web/core/themes/claro/src/ClaroPreRender.php | 17 +
.../themes/claro/templates/classy/README.txt | 12 +
.../block/block--search-form-block.html.twig | 45 +
.../block--system-branding-block.html.twig | 30 +
.../block/block--system-menu-block.html.twig | 56 +
.../templates/classy/block/block.html.twig | 44 +
.../content-edit/filter-caption.html.twig | 18 +
.../classy/content/aggregator-item.html.twig | 31 +
.../content/book-node-export-html.html.twig | 20 +
.../classy/content/comment.html.twig | 111 +
.../classy/content/links--node.html.twig | 40 +
.../templates/classy/content/mark.html.twig | 20 +
.../content/media-embed-error.html.twig | 21 +
.../templates/classy/content/media.html.twig | 28 +
.../templates/classy/content/node.html.twig | 108 +
.../classy/content/page-title.html.twig | 19 +
.../classy/content/search-result.html.twig | 72 +
.../classy/content/taxonomy-term.html.twig | 41 +
.../classy/dataset/aggregator-feed.html.twig | 36 +
.../classy/dataset/forum-icon.html.twig | 30 +
.../classy/dataset/forum-list.html.twig | 79 +
.../templates/classy/dataset/forums.html.twig | 24 +
.../item-list--search-results.html.twig | 29 +
.../classy/dataset/item-list.html.twig | 41 +
.../templates/classy/dataset/table.html.twig | 113 +
.../classy/field/field--comment.html.twig | 57 +
.../field/field--node--created.html.twig | 34 +
.../classy/field/field--node--title.html.twig | 34 +
.../classy/field/field--node--uid.html.twig | 34 +
.../classy/field/field--text-long.html.twig | 1 +
.../field/field--text-with-summary.html.twig | 1 +
.../classy/field/field--text.html.twig | 28 +
.../templates/classy/field/field.html.twig | 81 +
.../classy/field/file-audio.html.twig | 23 +
.../classy/field/file-video.html.twig | 23 +
.../templates/classy/field/image.html.twig | 18 +
.../link-formatter-link-separate.html.twig | 22 +
.../templates/classy/field/time.html.twig | 22 +
.../templates/classy/form/radios.html.twig | 13 +
.../templates/classy/form/textarea.html.twig | 25 +
.../classy/layout/book-export-html.html.twig | 45 +
.../templates/classy/layout/html.html.twig | 55 +
.../templates/classy/layout/region.html.twig | 25 +
...container--media-library-content.html.twig | 28 +
...--media-library-widget-selection.html.twig | 28 +
.../links--media-library-menu.html.twig | 36 +
.../media--media-library.html.twig | 55 +
.../media-library-item--small.html.twig | 31 +
.../media-library-item.html.twig | 28 +
.../media-library-wrapper.html.twig | 21 +
.../classy/misc/help-section.html.twig | 48 +
.../classy/misc/progress-bar.html.twig | 22 +
.../classy/misc/rdf-metadata.html.twig | 20 +
.../navigation/book-all-books-block.html.twig | 22 +
.../navigation/book-navigation.html.twig | 56 +
.../classy/navigation/book-tree.html.twig | 55 +
.../classy/navigation/menu.html.twig | 55 +
.../classy/navigation/toolbar.html.twig | 46 +
.../classy/user/forum-submitted.html.twig | 21 +
.../templates/classy/user/user.html.twig | 23 +
.../templates/classy/user/username.html.twig | 29 +
.../views/views-view-grouping.html.twig | 20 +
.../classy/views/views-view-row-rss.html.twig | 30 +
.../views-view-summary-unformatted.html.twig | 31 +
.../classy/views/views-view-summary.html.twig | 31 +
.../classy/views/views-view-table.html.twig | 120 +
.../classy/views/views-view.html.twig | 95 +
.../claro/templates/entity-add-list.html.twig | 2 +-
.../claro/templates/field/file-link.html.twig | 2 +-
.../templates/form-element-label.html.twig | 22 +-
.../claro/templates/form/checkboxes.html.twig | 15 +
.../claro/templates/form/radios.html.twig | 13 +
.../templates/system-themes-page.html.twig | 6 +
.../classy/templates/field/field.html.twig | 1 +
.../templates/field/image-formatter.html.twig | 1 -
.../views/views-view-table.html.twig | 16 +-
web/core/themes/seven/css/base/elements.css | 10 +
web/core/themes/seven/css/classy/README.txt | 12 +
.../css/classy/components/action-links.css | 43 +
.../css/classy/components/book-navigation.css | 40 +
.../css/classy/components/breadcrumb.css | 29 +
.../seven/css/classy/components/button.css | 15 +
.../classy/components/collapse-processed.css | 32 +
.../classy/components/container-inline.css | 22 +
.../css/classy/components/dropbutton.css | 33 +
.../css/classy/components/exposed-filters.css | 46 +
.../seven/css/classy/components/field.css | 25 +
.../seven/css/classy/components/file.css | 62 +
.../seven/css/classy/components/form.css | 104 +
.../seven/css/classy/components/forum.css | 46 +
.../seven/css/classy/components/icons.css | 21 +
.../css/classy/components/image-widget.css | 33 +
.../seven/css/classy/components/indented.css | 16 +
.../css/classy/components/inline-form.css | 33 +
.../seven/css/classy/components/item-list.css | 32 +
.../seven/css/classy/components/link.css | 16 +
.../seven/css/classy/components/links.css | 23 +
.../classy/components/media-embed-error.css | 20 +
.../seven/css/classy/components/menu.css | 34 +
.../seven/css/classy/components/messages.css | 72 +
.../seven/css/classy/components/more-link.css | 12 +
.../seven/css/classy/components/node.css | 8 +
.../seven/css/classy/components/pager.css | 16 +
.../seven/css/classy/components/progress.css | 69 +
.../css/classy/components/search-results.css | 8 +
.../seven/css/classy/components/tabledrag.css | 14 +
.../css/classy/components/tableselect.css | 19 +
.../seven/css/classy/components/tablesort.css | 11 +
.../seven/css/classy/components/tabs.css | 33 +
.../seven/css/classy/components/textarea.css | 11 +
.../seven/css/classy/components/ui-dialog.css | 15 +
.../seven/css/classy/components/user.css | 66 +
.../seven/css/classy/layout/media-library.css | 28 +
web/core/themes/seven/css/components/form.css | 22 -
.../themes/seven/images/classy/README.txt | 12 +
.../classy/icons/application-octet-stream.png | 3 +
.../images/classy/icons/application-pdf.png | 5 +
.../classy/icons/application-x-executable.png | 3 +
.../images/classy/icons/audio-x-generic.png | 3 +
.../seven/images/classy/icons/forum-icons.png | 10 +
.../images/classy/icons/image-x-generic.png | 6 +
.../images/classy/icons/package-x-generic.png | 4 +
.../seven/images/classy/icons/text-html.png | 7 +
.../seven/images/classy/icons/text-plain.png | 4 +
.../images/classy/icons/text-x-generic.png | 4 +
.../images/classy/icons/text-x-script.png | 5 +
.../images/classy/icons/video-x-generic.png | 5 +
.../images/classy/icons/x-office-document.png | 5 +
.../classy/icons/x-office-presentation.png | 5 +
.../classy/icons/x-office-spreadsheet.png | 4 +
web/core/themes/seven/js/classy/README.txt | 12 +
.../classy/media_embed_ckeditor.theme.es6.js | 22 +
.../js/classy/media_embed_ckeditor.theme.js | 12 +
web/core/themes/seven/js/nav-tabs.es6.js | 2 +-
web/core/themes/seven/seven.info.yml | 53 +
web/core/themes/seven/seven.libraries.yml | 77 +
.../themes/seven/templates/classy/README.txt | 12 +
.../block/block--local-tasks-block.html.twig | 14 +
.../block/block--search-form-block.html.twig | 45 +
.../block--system-branding-block.html.twig | 30 +
.../block/block--system-menu-block.html.twig | 56 +
.../templates/classy/block/block.html.twig | 44 +
.../content-edit/file-managed-file.html.twig | 22 +
.../content-edit/filter-caption.html.twig | 18 +
.../content-edit/filter-guidelines.html.twig | 29 +
.../classy/content-edit/filter-tips.html.twig | 61 +
.../text-format-wrapper.html.twig | 26 +
.../classy/content/aggregator-item.html.twig | 31 +
.../content/book-node-export-html.html.twig | 20 +
.../classy/content/comment.html.twig | 111 +
.../classy/content/links--node.html.twig | 40 +
.../templates/classy/content/mark.html.twig | 20 +
.../content/media-embed-error.html.twig | 21 +
.../templates/classy/content/media.html.twig | 28 +
.../templates/classy/content/node.html.twig | 108 +
.../classy/content/page-title.html.twig | 19 +
.../classy/content/search-result.html.twig | 72 +
.../classy/content/taxonomy-term.html.twig | 41 +
.../classy/dataset/aggregator-feed.html.twig | 36 +
.../classy/dataset/forum-icon.html.twig | 30 +
.../classy/dataset/forum-list.html.twig | 79 +
.../templates/classy/dataset/forums.html.twig | 24 +
.../item-list--search-results.html.twig | 29 +
.../classy/dataset/item-list.html.twig | 41 +
.../templates/classy/dataset/table.html.twig | 113 +
.../classy/field/field--comment.html.twig | 57 +
.../field/field--node--created.html.twig | 34 +
.../classy/field/field--node--title.html.twig | 34 +
.../classy/field/field--node--uid.html.twig | 34 +
.../classy/field/field--text-long.html.twig | 1 +
.../field/field--text-with-summary.html.twig | 1 +
.../classy/field/field--text.html.twig | 28 +
.../templates/classy/field/field.html.twig | 81 +
.../classy/field/file-audio.html.twig | 23 +
.../classy/field/file-link.html.twig | 17 +
.../classy/field/file-video.html.twig | 23 +
.../templates/classy/field/image.html.twig | 18 +
.../link-formatter-link-separate.html.twig | 22 +
.../templates/classy/field/time.html.twig | 22 +
.../classy/form/datetime-form.html.twig | 15 +
.../classy/form/datetime-wrapper.html.twig | 36 +
.../templates/classy/form/fieldset.html.twig | 60 +
.../classy/form/form-element-label.html.twig | 25 +
.../classy/form/form-element.html.twig | 95 +
.../templates/classy/form/radios.html.twig | 13 +
.../templates/classy/form/textarea.html.twig | 25 +
.../classy/layout/book-export-html.html.twig | 45 +
.../templates/classy/layout/html.html.twig | 55 +
.../templates/classy/layout/region.html.twig | 25 +
...container--media-library-content.html.twig | 28 +
...--media-library-widget-selection.html.twig | 28 +
.../links--media-library-menu.html.twig | 36 +
.../media--media-library.html.twig | 55 +
.../media-library-item--small.html.twig | 31 +
.../media-library-item.html.twig | 28 +
.../media-library-wrapper.html.twig | 21 +
.../classy/misc/help-section.html.twig | 48 +
.../classy/misc/progress-bar.html.twig | 22 +
.../classy/misc/rdf-metadata.html.twig | 20 +
.../classy/misc/status-messages.html.twig | 55 +
.../navigation/book-all-books-block.html.twig | 22 +
.../navigation/book-navigation.html.twig | 56 +
.../classy/navigation/book-tree.html.twig | 55 +
.../classy/navigation/breadcrumb.html.twig | 25 +
.../navigation/menu-local-task.html.twig | 17 +
.../classy/navigation/menu.html.twig | 55 +
.../classy/navigation/toolbar.html.twig | 46 +
.../classy/user/forum-submitted.html.twig | 21 +
.../templates/classy/user/user.html.twig | 23 +
.../templates/classy/user/username.html.twig | 29 +
.../classy/views/views-exposed-form.html.twig | 21 +
.../classy/views/views-mini-pager.html.twig | 42 +
.../views/views-view-grouping.html.twig | 20 +
.../classy/views/views-view-row-rss.html.twig | 30 +
.../views-view-summary-unformatted.html.twig | 31 +
.../classy/views/views-view-summary.html.twig | 31 +
.../classy/views/views-view-table.html.twig | 120 +
.../classy/views/views-view.html.twig | 95 +
.../themes/seven/templates/details.html.twig | 2 +-
.../seven/templates/entity-add-list.html.twig | 2 +-
.../seven/templates/image-widget.html.twig | 19 +-
.../admin/system-themes-page.html.twig | 6 +
.../admin/update-project-status.html.twig | 16 +-
.../field/responsive-image.html.twig | 6 -
.../form/field-multiple-value-form.html.twig | 1 -
.../stable/templates/form/select.html.twig | 4 +-
.../views/views-view-table.html.twig | 16 +-
web/core/yarn.lock | 2255 +++++++------
web/sites/default/default.settings.php | 37 +
web/sites/example.settings.local.php | 8 +-
3761 files changed, 61805 insertions(+), 35980 deletions(-)
create mode 100644 vendor/composer/installers/src/Composer/Installers/MantisBTInstaller.php
create mode 100644 vendor/composer/installers/src/Composer/Installers/SyliusInstaller.php
create mode 100644 vendor/egulias/email-validator/psalm.baseline.xml
create mode 100644 vendor/egulias/email-validator/psalm.xml
create mode 100644 vendor/guzzlehttp/guzzle/.php_cs
create mode 100644 vendor/guzzlehttp/guzzle/Dockerfile
create mode 100644 vendor/guzzlehttp/guzzle/src/Exception/InvalidArgumentException.php
create mode 100644 vendor/guzzlehttp/guzzle/src/Utils.php
rename vendor/{zendframework/zend-diactoros => laminas/laminas-diactoros}/CHANGELOG.md (61%)
create mode 100644 vendor/laminas/laminas-diactoros/COPYRIGHT.md
rename vendor/{zendframework/zend-stdlib => laminas/laminas-diactoros}/LICENSE.md (68%)
create mode 100644 vendor/laminas/laminas-diactoros/README.md
create mode 100644 vendor/laminas/laminas-diactoros/composer.json
rename vendor/{zendframework/zend-diactoros => laminas/laminas-diactoros}/src/AbstractSerializer.php (92%)
rename vendor/{zendframework/zend-diactoros => laminas/laminas-diactoros}/src/CallbackStream.php (89%)
create mode 100644 vendor/laminas/laminas-diactoros/src/Exception/DeprecatedMethodException.php
create mode 100644 vendor/laminas/laminas-diactoros/src/Exception/ExceptionInterface.php
rename vendor/{zendframework/zend-diactoros => laminas/laminas-diactoros}/src/HeaderSecurity.php (88%)
rename vendor/{zendframework/zend-diactoros => laminas/laminas-diactoros}/src/MessageTrait.php (97%)
rename vendor/{zendframework/zend-diactoros => laminas/laminas-diactoros}/src/PhpInputStream.php (82%)
rename vendor/{zendframework/zend-diactoros => laminas/laminas-diactoros}/src/RelativeStream.php (89%)
rename vendor/{zendframework/zend-diactoros => laminas/laminas-diactoros}/src/Request.php (84%)
rename vendor/{zendframework/zend-diactoros => laminas/laminas-diactoros}/src/Request/ArraySerializer.php (87%)
rename vendor/{zendframework/zend-diactoros => laminas/laminas-diactoros}/src/Request/Serializer.php (89%)
rename vendor/{zendframework/zend-diactoros => laminas/laminas-diactoros}/src/RequestTrait.php (96%)
rename vendor/{zendframework/zend-diactoros => laminas/laminas-diactoros}/src/Response.php (94%)
rename vendor/{zendframework/zend-diactoros => laminas/laminas-diactoros}/src/Response/ArraySerializer.php (87%)
rename vendor/{zendframework/zend-diactoros => laminas/laminas-diactoros}/src/Response/EmitterInterface.php (64%)
rename vendor/{zendframework/zend-diactoros => laminas/laminas-diactoros}/src/Response/EmptyResponse.php (64%)
rename vendor/{zendframework/zend-diactoros => laminas/laminas-diactoros}/src/Response/HtmlResponse.php (82%)
rename vendor/{zendframework/zend-diactoros => laminas/laminas-diactoros}/src/Response/InjectContentTypeTrait.php (66%)
rename vendor/{zendframework/zend-diactoros => laminas/laminas-diactoros}/src/Response/JsonResponse.php (92%)
rename vendor/{zendframework/zend-diactoros => laminas/laminas-diactoros}/src/Response/RedirectResponse.php (76%)
rename vendor/{zendframework/zend-diactoros => laminas/laminas-diactoros}/src/Response/SapiEmitter.php (68%)
rename vendor/{zendframework/zend-diactoros => laminas/laminas-diactoros}/src/Response/SapiEmitterTrait.php (86%)
rename vendor/{zendframework/zend-diactoros => laminas/laminas-diactoros}/src/Response/SapiStreamEmitter.php (89%)
rename vendor/{zendframework/zend-diactoros => laminas/laminas-diactoros}/src/Response/Serializer.php (88%)
rename vendor/{zendframework/zend-diactoros => laminas/laminas-diactoros}/src/Response/TextResponse.php (82%)
rename vendor/{zendframework/zend-diactoros => laminas/laminas-diactoros}/src/Response/XmlResponse.php (83%)
rename vendor/{zendframework/zend-diactoros => laminas/laminas-diactoros}/src/Server.php (92%)
rename vendor/{zendframework/zend-diactoros => laminas/laminas-diactoros}/src/ServerRequest.php (95%)
rename vendor/{zendframework/zend-diactoros => laminas/laminas-diactoros}/src/ServerRequestFactory.php (85%)
rename vendor/{zendframework/zend-diactoros => laminas/laminas-diactoros}/src/Stream.php (96%)
rename vendor/{zendframework/zend-diactoros => laminas/laminas-diactoros}/src/UploadedFile.php (96%)
rename vendor/{zendframework/zend-diactoros => laminas/laminas-diactoros}/src/Uri.php (98%)
create mode 100644 vendor/laminas/laminas-diactoros/src/functions/create_uploaded_file.legacy.php
rename vendor/{zendframework/zend-diactoros => laminas/laminas-diactoros}/src/functions/create_uploaded_file.php (74%)
create mode 100644 vendor/laminas/laminas-diactoros/src/functions/marshal_headers_from_sapi.legacy.php
rename vendor/{zendframework/zend-diactoros => laminas/laminas-diactoros}/src/functions/marshal_headers_from_sapi.php (79%)
create mode 100644 vendor/laminas/laminas-diactoros/src/functions/marshal_method_from_sapi.legacy.php
create mode 100644 vendor/laminas/laminas-diactoros/src/functions/marshal_method_from_sapi.php
create mode 100644 vendor/laminas/laminas-diactoros/src/functions/marshal_protocol_version_from_sapi.legacy.php
rename vendor/{zendframework/zend-diactoros => laminas/laminas-diactoros}/src/functions/marshal_protocol_version_from_sapi.php (70%)
create mode 100644 vendor/laminas/laminas-diactoros/src/functions/marshal_uri_from_sapi.legacy.php
rename vendor/{zendframework/zend-diactoros => laminas/laminas-diactoros}/src/functions/marshal_uri_from_sapi.php (92%)
create mode 100644 vendor/laminas/laminas-diactoros/src/functions/normalize_server.legacy.php
rename vendor/{zendframework/zend-diactoros => laminas/laminas-diactoros}/src/functions/normalize_server.php (83%)
create mode 100644 vendor/laminas/laminas-diactoros/src/functions/normalize_uploaded_files.legacy.php
rename vendor/{zendframework/zend-diactoros => laminas/laminas-diactoros}/src/functions/normalize_uploaded_files.php (93%)
create mode 100644 vendor/laminas/laminas-diactoros/src/functions/parse_cookie_header.legacy.php
rename vendor/{zendframework/zend-diactoros => laminas/laminas-diactoros}/src/functions/parse_cookie_header.php (75%)
create mode 100644 vendor/laminas/laminas-escaper/CHANGELOG.md
create mode 100644 vendor/laminas/laminas-escaper/COPYRIGHT.md
rename vendor/{zendframework/zend-escaper => laminas/laminas-escaper}/LICENSE.md (68%)
create mode 100644 vendor/laminas/laminas-escaper/README.md
rename vendor/{zendframework/zend-escaper => laminas/laminas-escaper}/composer.json (50%)
rename vendor/{zendframework/zend-escaper => laminas/laminas-escaper}/src/Escaper.php (97%)
create mode 100644 vendor/laminas/laminas-escaper/src/Exception/ExceptionInterface.php
create mode 100644 vendor/laminas/laminas-escaper/src/Exception/InvalidArgumentException.php
create mode 100644 vendor/laminas/laminas-escaper/src/Exception/RuntimeException.php
create mode 100644 vendor/laminas/laminas-feed/CHANGELOG.md
create mode 100644 vendor/laminas/laminas-feed/COPYRIGHT.md
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/LICENSE.md (68%)
create mode 100644 vendor/laminas/laminas-feed/README.md
create mode 100644 vendor/laminas/laminas-feed/composer.json
create mode 100644 vendor/laminas/laminas-feed/src/Exception/BadMethodCallException.php
create mode 100644 vendor/laminas/laminas-feed/src/Exception/ExceptionInterface.php
create mode 100644 vendor/laminas/laminas-feed/src/Exception/InvalidArgumentException.php
create mode 100644 vendor/laminas/laminas-feed/src/Exception/RuntimeException.php
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/PubSubHubbub/AbstractCallback.php (76%)
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/PubSubHubbub/CallbackInterface.php (51%)
create mode 100644 vendor/laminas/laminas-feed/src/PubSubHubbub/Exception/ExceptionInterface.php
create mode 100644 vendor/laminas/laminas-feed/src/PubSubHubbub/Exception/InvalidArgumentException.php
create mode 100644 vendor/laminas/laminas-feed/src/PubSubHubbub/Exception/RuntimeException.php
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/PubSubHubbub/HttpResponse.php (90%)
create mode 100644 vendor/laminas/laminas-feed/src/PubSubHubbub/Model/AbstractModel.php
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/PubSubHubbub/Model/Subscription.php (81%)
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/PubSubHubbub/Model/SubscriptionPersistenceInterface.php (59%)
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/PubSubHubbub/PubSubHubbub.php (74%)
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/PubSubHubbub/Publisher.php (75%)
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/PubSubHubbub/Subscriber.php (77%)
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/PubSubHubbub/Subscriber/Callback.php (88%)
create mode 100644 vendor/laminas/laminas-feed/src/PubSubHubbub/Version.php
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/Reader/AbstractEntry.php (75%)
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/Reader/AbstractFeed.php (83%)
create mode 100644 vendor/laminas/laminas-feed/src/Reader/Collection.php
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/Reader/Collection/AbstractCollection.php (57%)
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/Reader/Collection/Author.php (55%)
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/Reader/Collection/Category.php (69%)
create mode 100644 vendor/laminas/laminas-feed/src/Reader/Collection/Collection.php
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/Reader/Entry/AbstractEntry.php (86%)
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/Reader/Entry/Atom.php (92%)
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/Reader/Entry/EntryInterface.php (81%)
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/Reader/Entry/Rss.php (88%)
create mode 100644 vendor/laminas/laminas-feed/src/Reader/Exception/BadMethodCallException.php
create mode 100644 vendor/laminas/laminas-feed/src/Reader/Exception/ExceptionInterface.php
create mode 100644 vendor/laminas/laminas-feed/src/Reader/Exception/InvalidArgumentException.php
create mode 100644 vendor/laminas/laminas-feed/src/Reader/Exception/InvalidHttpClientException.php
create mode 100644 vendor/laminas/laminas-feed/src/Reader/Exception/RuntimeException.php
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/Reader/Extension/AbstractEntry.php (79%)
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/Reader/Extension/AbstractFeed.php (83%)
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/Reader/Extension/Atom/Entry.php (86%)
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/Reader/Extension/Atom/Feed.php (88%)
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/Reader/Extension/Content/Entry.php (64%)
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/Reader/Extension/CreativeCommons/Entry.php (67%)
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/Reader/Extension/CreativeCommons/Feed.php (69%)
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/Reader/Extension/DublinCore/Entry.php (85%)
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/Reader/Extension/DublinCore/Feed.php (86%)
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/Reader/Extension/GooglePlayPodcast/Entry.php (83%)
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/Reader/Extension/GooglePlayPodcast/Feed.php (89%)
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/Reader/Extension/Podcast/Entry.php (95%)
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/Reader/Extension/Podcast/Feed.php (94%)
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/Reader/Extension/Slash/Entry.php (80%)
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/Reader/Extension/Syndication/Feed.php (78%)
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/Reader/Extension/Thread/Entry.php (73%)
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/Reader/Extension/WellFormedWeb/Entry.php (64%)
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/Reader/ExtensionManager.php (80%)
rename vendor/{zendframework/zend-feed/src/Writer => laminas/laminas-feed/src/Reader}/ExtensionManagerInterface.php (51%)
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/Reader/ExtensionPluginManager.php (61%)
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/Reader/Feed/AbstractFeed.php (86%)
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/Reader/Feed/Atom.php (88%)
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/Reader/Feed/Atom/Source.php (72%)
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/Reader/Feed/FeedInterface.php (65%)
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/Reader/Feed/Rss.php (81%)
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/Reader/FeedSet.php (71%)
create mode 100644 vendor/laminas/laminas-feed/src/Reader/Http/ClientInterface.php
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/Reader/Http/HeaderAwareClientInterface.php (54%)
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/Reader/Http/HeaderAwareResponseInterface.php (51%)
rename vendor/{zendframework/zend-feed/src/Reader/Http/ZendHttpClientDecorator.php => laminas/laminas-feed/src/Reader/Http/LaminasHttpClientDecorator.php} (74%)
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/Reader/Http/Psr7ResponseDecorator.php (75%)
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/Reader/Http/Response.php (83%)
create mode 100644 vendor/laminas/laminas-feed/src/Reader/Http/ResponseInterface.php
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/Reader/Reader.php (86%)
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/Reader/ReaderImportInterface.php (72%)
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/Reader/StandaloneExtensionManager.php (53%)
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/Uri.php (89%)
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/Writer/AbstractFeed.php (81%)
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/Writer/Deleted.php (74%)
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/Writer/Entry.php (87%)
create mode 100644 vendor/laminas/laminas-feed/src/Writer/Exception/BadMethodCallException.php
create mode 100644 vendor/laminas/laminas-feed/src/Writer/Exception/ExceptionInterface.php
create mode 100644 vendor/laminas/laminas-feed/src/Writer/Exception/InvalidArgumentException.php
create mode 100644 vendor/laminas/laminas-feed/src/Writer/Exception/RuntimeException.php
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/Writer/Extension/AbstractRenderer.php (74%)
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/Writer/Extension/Atom/Renderer/Feed.php (86%)
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/Writer/Extension/Content/Renderer/Entry.php (78%)
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/Writer/Extension/DublinCore/Renderer/Entry.php (79%)
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/Writer/Extension/DublinCore/Renderer/Feed.php (79%)
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/Writer/Extension/GooglePlayPodcast/Entry.php (86%)
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/Writer/Extension/GooglePlayPodcast/Feed.php (89%)
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/Writer/Extension/GooglePlayPodcast/Renderer/Entry.php (83%)
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/Writer/Extension/GooglePlayPodcast/Renderer/Feed.php (89%)
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/Writer/Extension/ITunes/Entry.php (80%)
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/Writer/Extension/ITunes/Feed.php (75%)
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/Writer/Extension/ITunes/Renderer/Entry.php (89%)
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/Writer/Extension/ITunes/Renderer/Feed.php (90%)
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/Writer/Extension/RendererInterface.php (60%)
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/Writer/Extension/Slash/Renderer/Entry.php (75%)
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/Writer/Extension/Threading/Renderer/Entry.php (87%)
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/Writer/Extension/WellFormedWeb/Renderer/Entry.php (75%)
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/Writer/ExtensionManager.php (80%)
rename vendor/{zendframework/zend-feed/src/Reader => laminas/laminas-feed/src/Writer}/ExtensionManagerInterface.php (51%)
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/Writer/ExtensionPluginManager.php (65%)
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/Writer/Feed.php (79%)
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/Writer/FeedFactory.php (82%)
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/Writer/Renderer/AbstractRenderer.php (85%)
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/Writer/Renderer/Entry/Atom.php (83%)
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/Writer/Renderer/Entry/Atom/Deleted.php (76%)
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/Writer/Renderer/Entry/AtomDeleted.php (75%)
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/Writer/Renderer/Entry/Rss.php (84%)
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/Writer/Renderer/Feed/AbstractAtom.php (87%)
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/Writer/Renderer/Feed/Atom.php (78%)
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/Writer/Renderer/Feed/Atom/AbstractAtom.php (91%)
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/Writer/Renderer/Feed/Atom/Source.php (76%)
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/Writer/Renderer/Feed/AtomSource.php (75%)
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/Writer/Renderer/Feed/Rss.php (86%)
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/Writer/Renderer/RendererInterface.php (83%)
create mode 100644 vendor/laminas/laminas-feed/src/Writer/Source.php
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/Writer/StandaloneExtensionManager.php (56%)
create mode 100644 vendor/laminas/laminas-feed/src/Writer/Version.php
rename vendor/{zendframework/zend-feed => laminas/laminas-feed}/src/Writer/Writer.php (89%)
create mode 100644 vendor/laminas/laminas-stdlib/CHANGELOG.md
create mode 100644 vendor/laminas/laminas-stdlib/COPYRIGHT.md
create mode 100644 vendor/laminas/laminas-stdlib/LICENSE.md
create mode 100644 vendor/laminas/laminas-stdlib/README.md
create mode 100644 vendor/laminas/laminas-stdlib/composer.json
rename vendor/{zendframework/zend-stdlib => laminas/laminas-stdlib}/src/AbstractOptions.php (92%)
rename vendor/{zendframework/zend-stdlib => laminas/laminas-stdlib}/src/ArrayObject.php (96%)
rename vendor/{zendframework/zend-stdlib => laminas/laminas-stdlib}/src/ArraySerializableInterface.php (53%)
rename vendor/{zendframework/zend-stdlib => laminas/laminas-stdlib}/src/ArrayStack.php (62%)
rename vendor/{zendframework/zend-stdlib => laminas/laminas-stdlib}/src/ArrayUtils.php (95%)
create mode 100644 vendor/laminas/laminas-stdlib/src/ArrayUtils/MergeRemoveKey.php
rename vendor/{zendframework/zend-stdlib => laminas/laminas-stdlib}/src/ArrayUtils/MergeReplaceKey.php (52%)
create mode 100644 vendor/laminas/laminas-stdlib/src/ArrayUtils/MergeReplaceKeyInterface.php
rename vendor/{zendframework/zend-stdlib => laminas/laminas-stdlib}/src/ConsoleHelper.php (93%)
create mode 100644 vendor/laminas/laminas-stdlib/src/DispatchableInterface.php
rename vendor/{zendframework/zend-stdlib => laminas/laminas-stdlib}/src/ErrorHandler.php (87%)
create mode 100644 vendor/laminas/laminas-stdlib/src/Exception/BadMethodCallException.php
create mode 100644 vendor/laminas/laminas-stdlib/src/Exception/DomainException.php
create mode 100644 vendor/laminas/laminas-stdlib/src/Exception/ExceptionInterface.php
create mode 100644 vendor/laminas/laminas-stdlib/src/Exception/ExtensionNotLoadedException.php
create mode 100644 vendor/laminas/laminas-stdlib/src/Exception/InvalidArgumentException.php
create mode 100644 vendor/laminas/laminas-stdlib/src/Exception/LogicException.php
create mode 100644 vendor/laminas/laminas-stdlib/src/Exception/RuntimeException.php
rename vendor/{zendframework/zend-stdlib => laminas/laminas-stdlib}/src/FastPriorityQueue.php (95%)
rename vendor/{zendframework/zend-stdlib => laminas/laminas-stdlib}/src/Glob.php (94%)
create mode 100644 vendor/laminas/laminas-stdlib/src/Guard/AllGuardsTrait.php
rename vendor/{zendframework/zend-stdlib => laminas/laminas-stdlib}/src/Guard/ArrayOrTraversableGuardTrait.php (68%)
rename vendor/{zendframework/zend-stdlib => laminas/laminas-stdlib}/src/Guard/EmptyGuardTrait.php (60%)
rename vendor/{zendframework/zend-stdlib => laminas/laminas-stdlib}/src/Guard/NullGuardTrait.php (60%)
create mode 100644 vendor/laminas/laminas-stdlib/src/InitializableInterface.php
create mode 100644 vendor/laminas/laminas-stdlib/src/JsonSerializable.php
rename vendor/{zendframework/zend-stdlib => laminas/laminas-stdlib}/src/Message.php (89%)
rename vendor/{zendframework/zend-stdlib => laminas/laminas-stdlib}/src/MessageInterface.php (65%)
rename vendor/{zendframework/zend-stdlib => laminas/laminas-stdlib}/src/ParameterObjectInterface.php (60%)
rename vendor/{zendframework/zend-stdlib => laminas/laminas-stdlib}/src/Parameters.php (86%)
rename vendor/{zendframework/zend-stdlib => laminas/laminas-stdlib}/src/ParametersInterface.php (82%)
rename vendor/{zendframework/zend-stdlib => laminas/laminas-stdlib}/src/PriorityList.php (94%)
rename vendor/{zendframework/zend-stdlib => laminas/laminas-stdlib}/src/PriorityQueue.php (94%)
create mode 100644 vendor/laminas/laminas-stdlib/src/Request.php
create mode 100644 vendor/laminas/laminas-stdlib/src/RequestInterface.php
create mode 100644 vendor/laminas/laminas-stdlib/src/Response.php
create mode 100644 vendor/laminas/laminas-stdlib/src/ResponseInterface.php
rename vendor/{zendframework/zend-stdlib => laminas/laminas-stdlib}/src/SplPriorityQueue.php (85%)
rename vendor/{zendframework/zend-stdlib => laminas/laminas-stdlib}/src/SplQueue.php (70%)
rename vendor/{zendframework/zend-stdlib => laminas/laminas-stdlib}/src/SplStack.php (71%)
rename vendor/{zendframework/zend-stdlib => laminas/laminas-stdlib}/src/StringUtils.php (87%)
rename vendor/{zendframework/zend-stdlib => laminas/laminas-stdlib}/src/StringWrapper/AbstractStringWrapper.php (95%)
rename vendor/{zendframework/zend-stdlib => laminas/laminas-stdlib}/src/StringWrapper/Iconv.php (94%)
rename vendor/{zendframework/zend-stdlib => laminas/laminas-stdlib}/src/StringWrapper/Intl.php (83%)
rename vendor/{zendframework/zend-stdlib => laminas/laminas-stdlib}/src/StringWrapper/MbString.php (89%)
rename vendor/{zendframework/zend-stdlib => laminas/laminas-stdlib}/src/StringWrapper/Native.php (89%)
rename vendor/{zendframework/zend-stdlib => laminas/laminas-stdlib}/src/StringWrapper/StringWrapperInterface.php (89%)
create mode 100644 vendor/laminas/laminas-zendframework-bridge/.github/FUNDING.yml
create mode 100644 vendor/laminas/laminas-zendframework-bridge/CHANGELOG.md
create mode 100644 vendor/laminas/laminas-zendframework-bridge/COPYRIGHT.md
create mode 100644 vendor/laminas/laminas-zendframework-bridge/LICENSE.md
create mode 100644 vendor/laminas/laminas-zendframework-bridge/README.md
create mode 100644 vendor/laminas/laminas-zendframework-bridge/composer.json
create mode 100644 vendor/laminas/laminas-zendframework-bridge/config/replacements.php
create mode 100644 vendor/laminas/laminas-zendframework-bridge/src/Autoloader.php
create mode 100644 vendor/laminas/laminas-zendframework-bridge/src/ConfigPostProcessor.php
create mode 100644 vendor/laminas/laminas-zendframework-bridge/src/Module.php
create mode 100644 vendor/laminas/laminas-zendframework-bridge/src/Replacements.php
create mode 100644 vendor/laminas/laminas-zendframework-bridge/src/RewriteRules.php
create mode 100644 vendor/laminas/laminas-zendframework-bridge/src/autoload.php
delete mode 100644 vendor/psr/log/.gitignore
create mode 100644 vendor/psr/log/Psr/Log/Test/DummyTest.php
create mode 100644 vendor/symfony/console/Tests/Descriptor/ApplicationDescriptionTest.php
create mode 100644 vendor/symfony/console/Tests/Fixtures/stream_output_file.txt
create mode 100644 vendor/symfony/dependency-injection/Tests/Fixtures/includes/MultipleArgumentsOptionalScalarNotReallyOptional.php
create mode 100644 vendor/symfony/http-foundation/Session/SessionUtils.php
create mode 100644 vendor/symfony/http-foundation/Tests/Session/Storage/Handler/Fixtures/with_samesite.expected
create mode 100644 vendor/symfony/http-foundation/Tests/Session/Storage/Handler/Fixtures/with_samesite.php
create mode 100644 vendor/symfony/http-foundation/Tests/Session/Storage/Handler/Fixtures/with_samesite_and_migration.expected
create mode 100644 vendor/symfony/http-foundation/Tests/Session/Storage/Handler/Fixtures/with_samesite_and_migration.php
create mode 100644 vendor/symfony/http-kernel/Tests/Fixtures/Controller/LegacyNullableController.php
create mode 100644 vendor/symfony/polyfill-intl-idn/Idn.php
create mode 100644 vendor/symfony/polyfill-intl-idn/LICENSE
create mode 100644 vendor/symfony/polyfill-intl-idn/README.md
create mode 100644 vendor/symfony/polyfill-intl-idn/bootstrap.php
create mode 100644 vendor/symfony/polyfill-intl-idn/composer.json
create mode 100644 vendor/symfony/polyfill-php72/LICENSE
create mode 100644 vendor/symfony/polyfill-php72/Php72.php
create mode 100644 vendor/symfony/polyfill-php72/README.md
create mode 100644 vendor/symfony/polyfill-php72/bootstrap.php
create mode 100644 vendor/symfony/polyfill-php72/composer.json
create mode 100644 vendor/symfony/serializer/Tests/Fixtures/Php74Dummy.php
create mode 100644 vendor/symfony/validator/Tests/Fixtures/AbstractPropertyGetter.php
create mode 100644 vendor/symfony/validator/Tests/Fixtures/ChildGetterInterface.php
create mode 100644 vendor/symfony/validator/Tests/Fixtures/EntityWithGroupedConstraintOnMethods.php
create mode 100644 vendor/symfony/validator/Tests/Fixtures/Entity_74.php
create mode 100644 vendor/symfony/validator/Tests/Fixtures/Entity_74_Proxy.php
create mode 100644 vendor/symfony/validator/Tests/Fixtures/PropertyGetter.php
create mode 100644 vendor/symfony/validator/Tests/Fixtures/PropertyGetterInterface.php
create mode 100644 vendor/symfony/validator/Tests/Violation/ConstraintViolationBuilderTest.php
create mode 100644 vendor/symfony/validator/Validator/LazyProperty.php
create mode 100644 vendor/symfony/yaml/Tests/Fixtures/multiple_lines_as_literal_block_for_tagged_values.yml
create mode 100644 vendor/twig/twig/.gitattributes
delete mode 100644 vendor/twig/twig/phpunit.xml.dist
delete mode 100644 vendor/twig/twig/tests/AutoloaderTest.php
delete mode 100644 vendor/twig/twig/tests/Cache/FilesystemTest.php
delete mode 100644 vendor/twig/twig/tests/CompilerTest.php
delete mode 100644 vendor/twig/twig/tests/ContainerRuntimeLoaderTest.php
delete mode 100644 vendor/twig/twig/tests/CustomExtensionTest.php
delete mode 100644 vendor/twig/twig/tests/EnvironmentTest.php
delete mode 100644 vendor/twig/twig/tests/ErrorTest.php
delete mode 100644 vendor/twig/twig/tests/ExpressionParserTest.php
delete mode 100644 vendor/twig/twig/tests/Extension/CoreTest.php
delete mode 100644 vendor/twig/twig/tests/Extension/SandboxTest.php
delete mode 100644 vendor/twig/twig/tests/FactoryRuntimeLoaderTest.php
delete mode 100644 vendor/twig/twig/tests/FileCachingTest.php
delete mode 100644 vendor/twig/twig/tests/FileExtensionEscapingStrategyTest.php
delete mode 100644 vendor/twig/twig/tests/FilesystemHelper.php
delete mode 100644 vendor/twig/twig/tests/Fixtures/autoescape/block.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/autoescape/name.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/errors/base.html
delete mode 100644 vendor/twig/twig/tests/Fixtures/errors/index.html
delete mode 100644 vendor/twig/twig/tests/Fixtures/errors/leak-output.php
delete mode 100644 vendor/twig/twig/tests/Fixtures/exceptions/child_contents_outside_blocks.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/exceptions/exception_in_extension_extends.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/exceptions/exception_in_extension_include.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/exceptions/multiline_array_with_undefined_variable.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/exceptions/multiline_array_with_undefined_variable_again.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/exceptions/multiline_function_with_undefined_variable.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/exceptions/multiline_function_with_unknown_argument.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/exceptions/multiline_tag_with_undefined_variable.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/exceptions/strict_comparison_operator.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/exceptions/syntax_error_in_reused_template.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/exceptions/unclosed_tag.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/exceptions/undefined_parent.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/exceptions/undefined_template_in_child_template.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/exceptions/undefined_trait.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/expressions/_self.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/expressions/array.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/expressions/array_call.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/expressions/binary.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/expressions/bitwise.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/expressions/call_argument_defined_twice.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/expressions/call_positional_arg_after_named_arg.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/expressions/comparison.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/expressions/divisibleby.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/expressions/dotdot.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/expressions/ends_with.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/expressions/floats.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/expressions/grouping.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/expressions/literals.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/expressions/magic_call.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/expressions/matches.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/expressions/method_call.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/expressions/negative_numbers.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/expressions/not_arrow_fn.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/expressions/operators_as_variables.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/expressions/postfix.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/expressions/power.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/expressions/sameas.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/expressions/starts_with.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/expressions/string_operator_as_var_assignment.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/expressions/strings.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/expressions/ternary_operator.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/expressions/ternary_operator_noelse.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/expressions/ternary_operator_nothen.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/expressions/two_word_operators_as_variables.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/expressions/unary.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/expressions/unary_macro_arguments.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/expressions/unary_precedence.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/filters/abs.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/filters/batch.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/filters/batch_float.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/filters/batch_with_empty_fill.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/filters/batch_with_exact_elements.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/filters/batch_with_fill.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/filters/batch_with_keys.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/filters/batch_with_more_elements.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/filters/batch_with_zero_elements.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/filters/convert_encoding.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/filters/date.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/filters/date_default_format.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/filters/date_default_format_interval.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/filters/date_immutable.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/filters/date_interval.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/filters/date_modify.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/filters/date_namedargs.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/filters/default.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/filters/dynamic_filter.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/filters/escape.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/filters/escape_html_attr.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/filters/escape_javascript.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/filters/escape_non_supported_charset.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/filters/filter.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/filters/filter_php_55.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/filters/filter_php_56.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/filters/first.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/filters/force_escape.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/filters/format.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/filters/join.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/filters/json_encode.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/filters/last.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/filters/length.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/filters/length_utf8.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/filters/map.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/filters/merge.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/filters/nl2br.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/filters/number_format.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/filters/number_format_default.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/filters/reduce.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/filters/replace.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/filters/replace_invalid_arg.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/filters/reverse.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/filters/round.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/filters/slice.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/filters/sort.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/filters/spaceless.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/filters/special_chars.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/filters/split.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/filters/split_utf8.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/filters/static_calls.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/filters/trim.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/filters/urlencode.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/filters/urlencode_deprecated.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/functions/attribute.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/functions/block.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/functions/block_with_template.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/functions/block_without_name.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/functions/constant.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/functions/cycle.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/functions/date.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/functions/date_namedargs.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/functions/dump.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/functions/dump_array.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/functions/dynamic_function.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/functions/include/assignment.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/functions/include/autoescaping.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/functions/include/basic.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/functions/include/expression.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/functions/include/ignore_missing.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/functions/include/ignore_missing_exists.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/functions/include/include_missing_extends.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/functions/include/missing.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/functions/include/missing_nested.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/functions/include/sandbox.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/functions/include/sandbox_disabling.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/functions/include/sandbox_disabling_ignore_missing.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/functions/include/template_instance.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/functions/include/templates_as_array.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/functions/include/with_context.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/functions/include/with_variables.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/functions/include_template_from_string.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/functions/magic_call.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/functions/magic_call53.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/functions/max.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/functions/min.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/functions/range.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/functions/recursive_block_with_inheritance.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/functions/source.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/functions/special_chars.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/functions/static_calls.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/functions/template_from_string.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/functions/template_from_string_error.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/macros/default_values.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/macros/nested_calls.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/macros/reserved_variables.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/macros/simple.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/macros/varargs.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/macros/varargs_argument.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/macros/with_filters.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/regression/block_names_unicity.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/regression/combined_debug_info.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/regression/empty_token.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/regression/issue_1143.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/regression/multi_word_tests.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/regression/simple_xml_element.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/regression/strings_like_numbers.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/apply/basic.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/apply/json_encode.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/apply/multiple.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/apply/nested.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/apply/scope.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/apply/with_for_tag.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/apply/with_if_tag.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/autoescape/basic.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/autoescape/blocks.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/autoescape/double_escaping.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/autoescape/functions.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/autoescape/literal.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/autoescape/nested.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/autoescape/objects.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/autoescape/raw.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/autoescape/strategy.legacy.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/autoescape/strategy.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/autoescape/type.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/autoescape/with_filters.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/autoescape/with_filters_arguments.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/autoescape/with_pre_escape_filters.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/autoescape/with_preserves_safety_filters.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/block/basic.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/block/block_unique_name.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/block/special_chars.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/deprecated/block.legacy.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/deprecated/macro.legacy.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/deprecated/template.legacy.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/embed/basic.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/embed/complex_dynamic_parent.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/embed/dynamic_parent.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/embed/error_line.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/embed/multiple.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/embed/nested.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/embed/with_extends.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/filter/basic.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/filter/json_encode.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/filter/multiple.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/filter/nested.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/filter/scope.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/filter/with_for_tag.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/filter/with_if_tag.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/for/condition.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/for/context.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/for/else.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/for/inner_variables.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/for/keys.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/for/keys_and_values.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/for/loop_context.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/for/loop_context_local.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/for/loop_not_defined.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/for/loop_not_defined_cond.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/for/nested_else.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/for/objects.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/for/objects_countable.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/for/recursive.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/for/values.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/from.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/if/basic.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/if/expression.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/include/basic.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/include/expression.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/include/ignore_missing.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/include/ignore_missing_exists.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/include/include_missing_extends.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/include/missing.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/include/missing_nested.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/include/only.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/include/template_instance.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/include/templates_as_array.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/include/with_variables.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/inheritance/basic.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/inheritance/block_expr.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/inheritance/block_expr2.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/inheritance/conditional.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/inheritance/dynamic.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/inheritance/empty.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/inheritance/extends_as_array.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/inheritance/extends_as_array_with_empty_name.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/inheritance/extends_as_array_with_null_name.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/inheritance/extends_in_block.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/inheritance/extends_in_macro.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/inheritance/multiple.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/inheritance/multiple_dynamic.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/inheritance/nested_blocks.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/inheritance/nested_blocks_parent_only.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/inheritance/nested_inheritance.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/inheritance/parent.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/inheritance/parent_as_template_wrapper.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/inheritance/parent_change.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/inheritance/parent_isolation.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/inheritance/parent_nested.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/inheritance/parent_without_extends.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/inheritance/parent_without_extends_but_traits.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/inheritance/template_instance.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/inheritance/use.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/macro/basic.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/macro/endmacro_name.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/macro/external.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/macro/from.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/macro/from_in_block_is_local.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/macro/from_local_override.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/macro/from_macro_in_a_macro.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/macro/from_nested_blocks.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/macro/from_nested_blocks_with_global_macro.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/macro/from_syntax_error.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/macro/from_with_reserved_name.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/macro/global.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/macro/import_and_blocks.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/macro/import_from_string_template.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/macro/import_in_block_is_local.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/macro/import_local_override.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/macro/import_macro_in_a_macro.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/macro/import_nested_blocks.legacy.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/macro/import_nested_blocks_with_global_macro.legacy.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/macro/import_self_parent.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/macro/import_syntax_error.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/macro/import_with_reserved_name.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/macro/reserved_name.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/macro/self_import.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/macro/special_chars.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/macro/super_globals.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/raw/basic.legacy.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/raw/mixed_usage_with_raw.legacy.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/raw/whitespace_control.legacy.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/sandbox/array.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/sandbox/not_valid1.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/sandbox/not_valid2.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/sandbox/simple.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/set/basic.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/set/capture-empty.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/set/capture.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/set/capture_scope.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/set/expression.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/set/inheritance.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/set/inheritance_overriding.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/set/mutating.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/spaceless/simple.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/special_chars.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/use/aliases.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/use/basic.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/use/deep.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/use/deep_empty.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/use/inheritance.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/use/inheritance2.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/use/multiple.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/use/multiple_aliases.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/use/parent_block.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/use/parent_block2.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/use/parent_block3.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/use/use_with_parent.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/verbatim/basic.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/verbatim/mixed_usage_with_raw.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/verbatim/whitespace_control.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/with/basic.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/with/expression.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/with/globals.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/with/iterable.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/with/nested.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/with/with_no_hash.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tags/with/with_only.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tests/array.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tests/constant.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tests/defined.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tests/defined_for_attribute.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tests/defined_for_blocks.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tests/defined_for_blocks_with_template.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tests/defined_for_constants.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tests/defined_on_complex_expr.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tests/dynamic_test.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tests/empty.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tests/even.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tests/in.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tests/in_with_objects.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tests/iterable.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tests/null_coalesce.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/tests/odd.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/whitespace/trim_block.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/whitespace/trim_delimiter_as_strings.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/whitespace/trim_left.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/whitespace/trim_line_left.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/whitespace/trim_line_right.test
delete mode 100644 vendor/twig/twig/tests/Fixtures/whitespace/trim_right.test
delete mode 100644 vendor/twig/twig/tests/IntegrationTest.php
delete mode 100644 vendor/twig/twig/tests/LegacyFixtures/autoescape/filename.legacy.test
delete mode 100644 vendor/twig/twig/tests/LegacyFixtures/functions/undefined_block.legacy.test
delete mode 100644 vendor/twig/twig/tests/LegacyFixtures/test.legacy.test
delete mode 100644 vendor/twig/twig/tests/LegacyIntegrationTest.php
delete mode 100644 vendor/twig/twig/tests/LexerTest.php
delete mode 100644 vendor/twig/twig/tests/Loader/ArrayTest.php
delete mode 100644 vendor/twig/twig/tests/Loader/ChainTest.php
delete mode 100644 vendor/twig/twig/tests/Loader/FilesystemTest.php
delete mode 100644 vendor/twig/twig/tests/Loader/Fixtures/inheritance/array_inheritance_empty_parent.html.twig
delete mode 100644 vendor/twig/twig/tests/Loader/Fixtures/inheritance/array_inheritance_nonexistent_parent.html.twig
delete mode 100644 vendor/twig/twig/tests/Loader/Fixtures/inheritance/array_inheritance_null_parent.html.twig
delete mode 100644 vendor/twig/twig/tests/Loader/Fixtures/inheritance/array_inheritance_valid_parent.html.twig
delete mode 100644 vendor/twig/twig/tests/Loader/Fixtures/inheritance/parent.html.twig
delete mode 100644 vendor/twig/twig/tests/Loader/Fixtures/inheritance/spare_parent.html.twig
delete mode 100644 vendor/twig/twig/tests/Loader/Fixtures/named/index.html
delete mode 100644 vendor/twig/twig/tests/Loader/Fixtures/named_bis/index.html
delete mode 100644 vendor/twig/twig/tests/Loader/Fixtures/named_final/index.html
delete mode 100644 vendor/twig/twig/tests/Loader/Fixtures/named_quater/named_absolute.html
delete mode 100644 vendor/twig/twig/tests/Loader/Fixtures/named_ter/index.html
delete mode 100644 vendor/twig/twig/tests/Loader/Fixtures/normal/index.html
delete mode 100644 vendor/twig/twig/tests/Loader/Fixtures/normal_bis/index.html
delete mode 100644 vendor/twig/twig/tests/Loader/Fixtures/normal_final/index.html
delete mode 100644 vendor/twig/twig/tests/Loader/Fixtures/normal_ter/index.html
delete mode 100644 vendor/twig/twig/tests/Loader/Fixtures/phar/phar-sample.phar
delete mode 100644 vendor/twig/twig/tests/Loader/Fixtures/themes/theme1/blocks.html.twig
delete mode 100644 vendor/twig/twig/tests/Loader/Fixtures/themes/theme2/blocks.html.twig
delete mode 100644 vendor/twig/twig/tests/NativeExtensionTest.php
delete mode 100644 vendor/twig/twig/tests/Node/AutoEscapeTest.php
delete mode 100644 vendor/twig/twig/tests/Node/BlockReferenceTest.php
delete mode 100644 vendor/twig/twig/tests/Node/BlockTest.php
delete mode 100644 vendor/twig/twig/tests/Node/DeprecatedTest.php
delete mode 100644 vendor/twig/twig/tests/Node/DoTest.php
delete mode 100644 vendor/twig/twig/tests/Node/Expression/ArrayTest.php
delete mode 100644 vendor/twig/twig/tests/Node/Expression/AssignNameTest.php
delete mode 100644 vendor/twig/twig/tests/Node/Expression/Binary/AddTest.php
delete mode 100644 vendor/twig/twig/tests/Node/Expression/Binary/AndTest.php
delete mode 100644 vendor/twig/twig/tests/Node/Expression/Binary/ConcatTest.php
delete mode 100644 vendor/twig/twig/tests/Node/Expression/Binary/DivTest.php
delete mode 100644 vendor/twig/twig/tests/Node/Expression/Binary/FloorDivTest.php
delete mode 100644 vendor/twig/twig/tests/Node/Expression/Binary/ModTest.php
delete mode 100644 vendor/twig/twig/tests/Node/Expression/Binary/MulTest.php
delete mode 100644 vendor/twig/twig/tests/Node/Expression/Binary/OrTest.php
delete mode 100644 vendor/twig/twig/tests/Node/Expression/Binary/SubTest.php
delete mode 100644 vendor/twig/twig/tests/Node/Expression/CallTest.php
delete mode 100644 vendor/twig/twig/tests/Node/Expression/ConditionalTest.php
delete mode 100644 vendor/twig/twig/tests/Node/Expression/ConstantTest.php
delete mode 100644 vendor/twig/twig/tests/Node/Expression/FilterTest.php
delete mode 100644 vendor/twig/twig/tests/Node/Expression/FunctionTest.php
delete mode 100644 vendor/twig/twig/tests/Node/Expression/GetAttrTest.php
delete mode 100644 vendor/twig/twig/tests/Node/Expression/NameTest.php
delete mode 100644 vendor/twig/twig/tests/Node/Expression/NullCoalesceTest.php
delete mode 100644 vendor/twig/twig/tests/Node/Expression/PHP53/FilterInclude.php
delete mode 100644 vendor/twig/twig/tests/Node/Expression/PHP53/FunctionInclude.php
delete mode 100644 vendor/twig/twig/tests/Node/Expression/PHP53/TestInclude.php
delete mode 100644 vendor/twig/twig/tests/Node/Expression/ParentTest.php
delete mode 100644 vendor/twig/twig/tests/Node/Expression/TestTest.php
delete mode 100644 vendor/twig/twig/tests/Node/Expression/Unary/NegTest.php
delete mode 100644 vendor/twig/twig/tests/Node/Expression/Unary/NotTest.php
delete mode 100644 vendor/twig/twig/tests/Node/Expression/Unary/PosTest.php
delete mode 100644 vendor/twig/twig/tests/Node/ForTest.php
delete mode 100644 vendor/twig/twig/tests/Node/IfTest.php
delete mode 100644 vendor/twig/twig/tests/Node/ImportTest.php
delete mode 100644 vendor/twig/twig/tests/Node/IncludeTest.php
delete mode 100644 vendor/twig/twig/tests/Node/MacroTest.php
delete mode 100644 vendor/twig/twig/tests/Node/ModuleTest.php
delete mode 100644 vendor/twig/twig/tests/Node/PrintTest.php
delete mode 100644 vendor/twig/twig/tests/Node/SandboxTest.php
delete mode 100644 vendor/twig/twig/tests/Node/SetTest.php
delete mode 100644 vendor/twig/twig/tests/Node/SpacelessTest.php
delete mode 100644 vendor/twig/twig/tests/Node/TextTest.php
delete mode 100644 vendor/twig/twig/tests/NodeTraverserTest.php
delete mode 100644 vendor/twig/twig/tests/NodeVisitor/OptimizerTest.php
delete mode 100644 vendor/twig/twig/tests/ParserTest.php
delete mode 100644 vendor/twig/twig/tests/Profiler/Dumper/AbstractTest.php
delete mode 100644 vendor/twig/twig/tests/Profiler/Dumper/BlackfireTest.php
delete mode 100644 vendor/twig/twig/tests/Profiler/Dumper/HtmlTest.php
delete mode 100644 vendor/twig/twig/tests/Profiler/Dumper/TextTest.php
delete mode 100644 vendor/twig/twig/tests/Profiler/ProfileTest.php
delete mode 100644 vendor/twig/twig/tests/TemplateTest.php
delete mode 100644 vendor/twig/twig/tests/TemplateWrapperTest.php
delete mode 100644 vendor/twig/twig/tests/TokenStreamTest.php
delete mode 100644 vendor/twig/twig/tests/Util/DeprecationCollectorTest.php
delete mode 100644 vendor/twig/twig/tests/escapingTest.php
delete mode 100644 vendor/typo3/phar-stream-wrapper/.appveyor.yml
delete mode 100644 vendor/typo3/phar-stream-wrapper/.gitignore
delete mode 100644 vendor/zendframework/zend-diactoros/.coveralls.yml
delete mode 100644 vendor/zendframework/zend-diactoros/CONDUCT.md
delete mode 100644 vendor/zendframework/zend-diactoros/CONTRIBUTING.md
delete mode 100644 vendor/zendframework/zend-diactoros/LICENSE.md
delete mode 100644 vendor/zendframework/zend-diactoros/README.md
delete mode 100644 vendor/zendframework/zend-diactoros/composer.json
delete mode 100644 vendor/zendframework/zend-diactoros/composer.lock
delete mode 100644 vendor/zendframework/zend-diactoros/mkdocs.yml
delete mode 100644 vendor/zendframework/zend-diactoros/src/Exception/DeprecatedMethodException.php
delete mode 100644 vendor/zendframework/zend-diactoros/src/Exception/ExceptionInterface.php
delete mode 100644 vendor/zendframework/zend-diactoros/src/functions/marshal_method_from_sapi.php
delete mode 100644 vendor/zendframework/zend-escaper/CHANGELOG.md
delete mode 100644 vendor/zendframework/zend-escaper/README.md
delete mode 100644 vendor/zendframework/zend-escaper/src/Exception/ExceptionInterface.php
delete mode 100644 vendor/zendframework/zend-escaper/src/Exception/InvalidArgumentException.php
delete mode 100644 vendor/zendframework/zend-escaper/src/Exception/RuntimeException.php
delete mode 100644 vendor/zendframework/zend-feed/CHANGELOG.md
delete mode 100644 vendor/zendframework/zend-feed/README.md
delete mode 100644 vendor/zendframework/zend-feed/composer.json
delete mode 100644 vendor/zendframework/zend-feed/src/Exception/BadMethodCallException.php
delete mode 100644 vendor/zendframework/zend-feed/src/Exception/ExceptionInterface.php
delete mode 100644 vendor/zendframework/zend-feed/src/Exception/InvalidArgumentException.php
delete mode 100644 vendor/zendframework/zend-feed/src/Exception/RuntimeException.php
delete mode 100644 vendor/zendframework/zend-feed/src/PubSubHubbub/Exception/ExceptionInterface.php
delete mode 100644 vendor/zendframework/zend-feed/src/PubSubHubbub/Exception/InvalidArgumentException.php
delete mode 100644 vendor/zendframework/zend-feed/src/PubSubHubbub/Exception/RuntimeException.php
delete mode 100644 vendor/zendframework/zend-feed/src/PubSubHubbub/Model/AbstractModel.php
delete mode 100644 vendor/zendframework/zend-feed/src/PubSubHubbub/Version.php
delete mode 100644 vendor/zendframework/zend-feed/src/Reader/Collection.php
delete mode 100644 vendor/zendframework/zend-feed/src/Reader/Collection/Collection.php
delete mode 100644 vendor/zendframework/zend-feed/src/Reader/Exception/BadMethodCallException.php
delete mode 100644 vendor/zendframework/zend-feed/src/Reader/Exception/ExceptionInterface.php
delete mode 100644 vendor/zendframework/zend-feed/src/Reader/Exception/InvalidArgumentException.php
delete mode 100644 vendor/zendframework/zend-feed/src/Reader/Exception/InvalidHttpClientException.php
delete mode 100644 vendor/zendframework/zend-feed/src/Reader/Exception/RuntimeException.php
delete mode 100644 vendor/zendframework/zend-feed/src/Reader/Http/ClientInterface.php
delete mode 100644 vendor/zendframework/zend-feed/src/Reader/Http/ResponseInterface.php
delete mode 100644 vendor/zendframework/zend-feed/src/Writer/Exception/BadMethodCallException.php
delete mode 100644 vendor/zendframework/zend-feed/src/Writer/Exception/ExceptionInterface.php
delete mode 100644 vendor/zendframework/zend-feed/src/Writer/Exception/InvalidArgumentException.php
delete mode 100644 vendor/zendframework/zend-feed/src/Writer/Exception/RuntimeException.php
delete mode 100644 vendor/zendframework/zend-feed/src/Writer/Source.php
delete mode 100644 vendor/zendframework/zend-feed/src/Writer/Version.php
delete mode 100644 vendor/zendframework/zend-stdlib/CHANGELOG.md
delete mode 100644 vendor/zendframework/zend-stdlib/README.md
delete mode 100644 vendor/zendframework/zend-stdlib/composer.json
delete mode 100644 vendor/zendframework/zend-stdlib/src/ArrayUtils/MergeRemoveKey.php
delete mode 100644 vendor/zendframework/zend-stdlib/src/ArrayUtils/MergeReplaceKeyInterface.php
delete mode 100644 vendor/zendframework/zend-stdlib/src/DispatchableInterface.php
delete mode 100644 vendor/zendframework/zend-stdlib/src/Exception/BadMethodCallException.php
delete mode 100644 vendor/zendframework/zend-stdlib/src/Exception/DomainException.php
delete mode 100644 vendor/zendframework/zend-stdlib/src/Exception/ExceptionInterface.php
delete mode 100644 vendor/zendframework/zend-stdlib/src/Exception/ExtensionNotLoadedException.php
delete mode 100644 vendor/zendframework/zend-stdlib/src/Exception/InvalidArgumentException.php
delete mode 100644 vendor/zendframework/zend-stdlib/src/Exception/LogicException.php
delete mode 100644 vendor/zendframework/zend-stdlib/src/Exception/RuntimeException.php
delete mode 100644 vendor/zendframework/zend-stdlib/src/Guard/AllGuardsTrait.php
delete mode 100644 vendor/zendframework/zend-stdlib/src/InitializableInterface.php
delete mode 100644 vendor/zendframework/zend-stdlib/src/JsonSerializable.php
delete mode 100644 vendor/zendframework/zend-stdlib/src/Request.php
delete mode 100644 vendor/zendframework/zend-stdlib/src/RequestInterface.php
delete mode 100644 vendor/zendframework/zend-stdlib/src/Response.php
delete mode 100644 vendor/zendframework/zend-stdlib/src/ResponseInterface.php
delete mode 100644 web/core/assets/vendor/jquery.cookie/jquery.cookie.min.js
delete mode 100644 web/core/assets/vendor/jquery/jquery-htmlprefilter-3.5.0.js
create mode 100644 web/core/assets/vendor/js-cookie/js.cookie.min.js
create mode 100644 web/core/assets/vendor/underscore/underscore-min.js.map
delete mode 100644 web/core/assets/vendor/underscore/underscore-min.map
create mode 100644 web/core/lib/Drupal/Core/Asset/LibrariesDirectoryFileFinder.php
create mode 100644 web/core/lib/Drupal/Core/Cache/Context/ProtocolVersionCacheContext.php
create mode 100644 web/core/lib/Drupal/Core/Entity/EntityAutocompleteMatcherInterface.php
create mode 100644 web/core/lib/Drupal/Core/Entity/EntityBundleAccessCheck.php
create mode 100644 web/core/lib/Drupal/Core/Extension/ModuleRequiredByThemesUninstallValidator.php
create mode 100644 web/core/lib/Drupal/Core/GeneratedButton.php
create mode 100644 web/core/lib/Drupal/Core/ProxyClass/Extension/ModuleRequiredByThemesUninstallValidator.php
create mode 100644 web/core/misc/jquery.cookie.shim.es6.js
create mode 100644 web/core/misc/jquery.cookie.shim.js
create mode 100644 web/core/misc/polyfills/object.assign.es6.js
create mode 100644 web/core/misc/polyfills/object.assign.js
delete mode 100644 web/core/modules/action/config/schema/action.schema.yml
rename web/core/modules/action/{config/install/action.settings.yml => tests/fixtures/update/action.settings_3022401.yml} (100%)
create mode 100644 web/core/modules/action/tests/fixtures/update/drupal-8.action-3022401.php
create mode 100644 web/core/modules/action/tests/src/Functional/Update/ActionConfigTest.php
create mode 100644 web/core/modules/content_moderation/tests/src/Kernel/ContentModerationAccessTest.php
create mode 100644 web/core/modules/contextual/tests/modules/contextual_test/config/optional/views.view.contextual_recent.yml
create mode 100644 web/core/modules/contextual/tests/src/FunctionalJavascript/DuplicateContextualLinksTest.php
create mode 100644 web/core/modules/help_topics/help_topics/ban.banning_ips.html.twig
create mode 100644 web/core/modules/help_topics/help_topics/book.about.html.twig
create mode 100644 web/core/modules/help_topics/help_topics/book.adding.html.twig
create mode 100644 web/core/modules/help_topics/help_topics/book.configuring.html.twig
create mode 100644 web/core/modules/help_topics/help_topics/book.creating.html.twig
create mode 100644 web/core/modules/help_topics/help_topics/book.organizing.html.twig
create mode 100644 web/core/modules/help_topics/help_topics/breakpoint.overview.html.twig
create mode 100644 web/core/modules/help_topics/help_topics/color.changing.html.twig
create mode 100644 web/core/modules/help_topics/help_topics/core.appearance.html.twig
create mode 100644 web/core/modules/help_topics/help_topics/core.content_structure.html.twig
create mode 100644 web/core/modules/help_topics/help_topics/core.cron.html.twig
create mode 100644 web/core/modules/help_topics/help_topics/core.extending.html.twig
create mode 100644 web/core/modules/help_topics/help_topics/core.maintenance.html.twig
create mode 100644 web/core/modules/help_topics/help_topics/core.performance.html.twig
create mode 100644 web/core/modules/help_topics/help_topics/field_ui.add_field.html.twig
create mode 100644 web/core/modules/help_topics/help_topics/field_ui.manage_display.html.twig
create mode 100644 web/core/modules/help_topics/help_topics/field_ui.manage_form.html.twig
create mode 100644 web/core/modules/help_topics/help_topics/field_ui.reference_field.html.twig
create mode 100644 web/core/modules/help_topics/help_topics/layout_builder.overview.html.twig
create mode 100644 web/core/modules/help_topics/help_topics/system.cache.html.twig
create mode 100644 web/core/modules/help_topics/help_topics/system.maintenance_mode.html.twig
create mode 100644 web/core/modules/help_topics/help_topics/system.module_install.html.twig
create mode 100644 web/core/modules/help_topics/help_topics/system.module_uninstall.html.twig
create mode 100644 web/core/modules/help_topics/help_topics/system.reports.html.twig
create mode 100644 web/core/modules/help_topics/help_topics/system.theme_install.html.twig
create mode 100644 web/core/modules/help_topics/help_topics/system.theme_uninstall.html.twig
create mode 100644 web/core/modules/help_topics/help_topics/user.create.html.twig
create mode 100644 web/core/modules/help_topics/help_topics/user.new_role.html.twig
create mode 100644 web/core/modules/help_topics/help_topics/user.overview.html.twig
create mode 100644 web/core/modules/help_topics/help_topics/user.permissions.html.twig
create mode 100644 web/core/modules/help_topics/help_topics/user.update.html.twig
create mode 100644 web/core/modules/layout_builder/src/Controller/LayoutBuilderHtmlEntityFormController.php
delete mode 100644 web/core/modules/layout_builder/tests/modules/layout_builder_field_block_theme_suggestions_test/layout_builder_field_block_theme_suggestions_test.module
create mode 100644 web/core/modules/layout_builder/tests/modules/layout_builder_form_block_test/layout_builder_form_block_test.info.yml
create mode 100644 web/core/modules/layout_builder/tests/modules/layout_builder_form_block_test/src/Plugin/Block/TestFormApiFormBlock.php
create mode 100644 web/core/modules/layout_builder/tests/modules/layout_builder_form_block_test/src/Plugin/Block/TestInlineTemplateFormBlock.php
rename web/core/modules/layout_builder/tests/modules/{layout_builder_field_block_theme_suggestions_test/layout_builder_field_block_theme_suggestions_test.info.yml => layout_builder_theme_suggestions_test/layout_builder_theme_suggestions_test.info.yml} (100%)
create mode 100644 web/core/modules/layout_builder/tests/modules/layout_builder_theme_suggestions_test/layout_builder_theme_suggestions_test.module
rename web/core/modules/layout_builder/tests/modules/{layout_builder_field_block_theme_suggestions_test => layout_builder_theme_suggestions_test}/templates/field--node--body--bundle-with-section-field--default.html.twig (100%)
rename web/core/modules/layout_builder/tests/src/Functional/{LayoutBuilderFieldBlockThemeSuggestionsTest.php => LayoutBuilderThemeSuggestionsTest.php} (74%)
create mode 100644 web/core/modules/layout_builder/tests/src/FunctionalJavascript/LayoutBuilderNestedFormUiTest.php
create mode 100644 web/core/modules/media/tests/fixtures/oembed/photo_flickr_no_dimensions.json
create mode 100644 web/core/modules/media/tests/src/Kernel/OEmbedResourceConstraintValidatorTest.php
create mode 100644 web/core/modules/media/tests/src/Kernel/OEmbedSourceTest.php
create mode 100644 web/core/modules/media/tests/src/Unit/ResourceTest.php
create mode 100644 web/core/modules/migrate/src/Plugin/Derivative/MigrateEntityComplete.php
create mode 100644 web/core/modules/migrate/src/Plugin/migrate/destination/EntityContentComplete.php
create mode 100644 web/core/modules/migrate/tests/modules/migrate_no_migrate_drupal_test/migrate_no_migrate_drupal_test.info.yml
create mode 100644 web/core/modules/migrate/tests/modules/migrate_no_migrate_drupal_test/migrate_no_migrate_drupal_test.routing.yml
create mode 100644 web/core/modules/migrate/tests/modules/migrate_no_migrate_drupal_test/migrations/node_migration_no_upgrade.yml
create mode 100644 web/core/modules/migrate/tests/modules/migrate_no_migrate_drupal_test/src/Controller/ExecuteMigration.php
create mode 100644 web/core/modules/migrate/tests/src/Functional/MigrateNoMigrateDrupalTest.php
create mode 100644 web/core/modules/migrate_drupal/src/NodeMigrateType.php
create mode 100644 web/core/modules/migrate_drupal/src/Plugin/migrate/process/NodeCompleteNodeLookup.php
create mode 100644 web/core/modules/migrate_drupal/src/Plugin/migrate/process/NodeCompleteNodeRevisionLookup.php
create mode 100644 web/core/modules/migrate_drupal/src/Plugin/migrate/process/NodeCompleteNodeTranslationLookup.php
create mode 100644 web/core/modules/migrate_drupal/tests/fixtures/drupal-8.migrate-drupal-multilingual-enabled.php
create mode 100644 web/core/modules/migrate_drupal/tests/src/Functional/MigrateDrupalUpdateTest.php
delete mode 100644 web/core/modules/migrate_drupal/tests/src/Kernel/MigrationPluginAlterTest.php
create mode 100644 web/core/modules/migrate_drupal/tests/src/Kernel/NodeMigrationTypePluginAlterTest.php
create mode 100644 web/core/modules/migrate_drupal/tests/src/Traits/NodeMigrateTypeTestTrait.php
create mode 100644 web/core/modules/migrate_drupal_multilingual/migrate_drupal_multilingual.install
delete mode 100644 web/core/modules/migrate_drupal_ui/tests/src/Functional/d6/NoMultilingualTest.php
create mode 100644 web/core/modules/migrate_drupal_ui/tests/src/Functional/d6/NodeClassicTest.php
delete mode 100644 web/core/modules/migrate_drupal_ui/tests/src/Functional/d7/NoMultilingualTest.php
create mode 100644 web/core/modules/node/migrations/d6_node_complete.yml
create mode 100644 web/core/modules/node/migrations/d7_node_complete.yml
create mode 100644 web/core/modules/node/src/Plugin/migrate/source/d6/NodeComplete.php
create mode 100644 web/core/modules/node/src/Plugin/migrate/source/d7/NodeComplete.php
create mode 100644 web/core/modules/node/tests/src/Functional/NodeAccessCacheabilityWithNodeGrants.php
create mode 100644 web/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeCompleteTest.php
create mode 100644 web/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeCompleteTest.php
rename web/core/modules/search/tests/src/{Functional => Kernel}/SearchSimplifyTest.php (94%)
rename web/core/modules/search/tests/src/{Functional => Kernel}/SearchTokenizerTest.php (94%)
create mode 100644 web/core/modules/shortcut/shortcut.services.yml
create mode 100644 web/core/modules/shortcut/src/ShortcutLazyBuilders.php
create mode 100644 web/core/modules/system/src/ModuleDependencyMessageTrait.php
delete mode 100644 web/core/modules/system/tests/fixtures/update/drupal-8.entity-test-initial.php
create mode 100644 web/core/modules/system/tests/modules/database_statement_monitoring_test/src/mysql/Install/Tasks.php
create mode 100644 web/core/modules/system/tests/modules/database_statement_monitoring_test/src/pgsql/Install/Tasks.php
create mode 100644 web/core/modules/system/tests/modules/database_statement_monitoring_test/src/sqlite/Install/Tasks.php
create mode 100644 web/core/modules/system/tests/modules/driver_test/driver_test.info.yml
create mode 100644 web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestMysql/Connection.php
create mode 100644 web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestMysql/Delete.php
create mode 100644 web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestMysql/Insert.php
create mode 100644 web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestMysql/Install/Tasks.php
create mode 100644 web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestMysql/Merge.php
create mode 100644 web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestMysql/Schema.php
create mode 100644 web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestMysql/Select.php
create mode 100644 web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestMysql/Transaction.php
create mode 100644 web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestMysql/Truncate.php
create mode 100644 web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestMysql/Update.php
create mode 100644 web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestMysql/Upsert.php
create mode 100644 web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestMysqlDeprecatedVersion/Connection.php
create mode 100644 web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestMysqlDeprecatedVersion/Install/Tasks.php
create mode 100644 web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestPgsql/Connection.php
create mode 100644 web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestPgsql/Delete.php
create mode 100644 web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestPgsql/Insert.php
create mode 100644 web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestPgsql/Install/Tasks.php
create mode 100644 web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestPgsql/Merge.php
create mode 100644 web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestPgsql/NativeUpsert.php
create mode 100644 web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestPgsql/Schema.php
create mode 100644 web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestPgsql/Select.php
create mode 100644 web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestPgsql/Transaction.php
create mode 100644 web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestPgsql/Truncate.php
create mode 100644 web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestPgsql/Update.php
create mode 100644 web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestPgsql/Upsert.php
create mode 100644 web/core/modules/system/tests/modules/js_cookie_test/js/js_cookie_shim_test.es6.js
create mode 100644 web/core/modules/system/tests/modules/js_cookie_test/js/js_cookie_shim_test.js
create mode 100644 web/core/modules/system/tests/modules/js_cookie_test/js_cookie_test.info.yml
create mode 100644 web/core/modules/system/tests/modules/js_cookie_test/js_cookie_test.libraries.yml
create mode 100644 web/core/modules/system/tests/modules/js_cookie_test/js_cookie_test.routing.yml
create mode 100644 web/core/modules/system/tests/modules/js_cookie_test/src/Controller/JsCookieTestController.php
create mode 100644 web/core/modules/system/tests/modules/session_test/src/Session/TestSessionBag.php
rename web/core/modules/system/tests/modules/{theme_suggestions_test/theme_suggestions_test.inc => theme_legacy_suggestions_test/theme_legacy_suggestions_test.inc} (74%)
create mode 100644 web/core/modules/system/tests/modules/theme_legacy_suggestions_test/theme_legacy_suggestions_test.info.yml
create mode 100644 web/core/modules/system/tests/modules/theme_legacy_suggestions_test/theme_legacy_suggestions_test.module
create mode 100644 web/core/modules/system/tests/modules/theme_legacy_test/src/ThemeTestController.php
create mode 100644 web/core/modules/system/tests/modules/theme_legacy_test/theme_legacy_test.inc
create mode 100644 web/core/modules/system/tests/modules/theme_legacy_test/theme_legacy_test.info.yml
create mode 100644 web/core/modules/system/tests/modules/theme_legacy_test/theme_legacy_test.module
create mode 100644 web/core/modules/system/tests/modules/theme_legacy_test/theme_legacy_test.routing.yml
create mode 100644 web/core/modules/system/tests/modules/theme_test/templates/theme-test-foo.html.twig
create mode 100644 web/core/modules/system/tests/modules/theme_test/templates/theme-test-render-element-children.html.twig
create mode 100644 web/core/modules/system/tests/modules/update_test_last_removed/update_test_last_removed.info.yml
create mode 100644 web/core/modules/system/tests/modules/update_test_last_removed/update_test_last_removed.install
create mode 100644 web/core/modules/system/tests/src/Functional/Theme/LegacyStyleSheetsRemoveTest.php
create mode 100644 web/core/modules/system/tests/src/Functional/Theme/ThemeLegacyTest.php
create mode 100644 web/core/modules/system/tests/src/Functional/Theme/ThemeUiTest.php
create mode 100644 web/core/modules/system/tests/src/Functional/Update/DatabaseVersionCheckUpdateTest.php
delete mode 100644 web/core/modules/system/tests/src/Functional/Update/EntityUpdateInitialTest.php
create mode 100644 web/core/modules/system/tests/src/Functional/Update/IdentifierFieldSchemaTypeUpdateTest.php
delete mode 100644 web/core/modules/system/tests/src/Functional/Update/UpdatePathWithBrokenRoutingFilledTest.php
rename web/core/modules/system/tests/src/Functional/{Update => UpdateSystem}/BrokenCacheUpdateTest.php (97%)
rename web/core/modules/system/tests/src/Functional/{Update => UpdateSystem}/DependencyHookInvocationTest.php (96%)
rename web/core/modules/system/tests/src/Functional/{Update => UpdateSystem}/DependencyMissingTest.php (96%)
rename web/core/modules/system/tests/src/Functional/{Update => UpdateSystem}/DependencyOrderingTest.php (91%)
create mode 100644 web/core/modules/system/tests/src/Functional/UpdateSystem/EntityUpdateInitialTest.php
rename web/core/modules/system/tests/src/Functional/{Update => UpdateSystem}/InvalidUpdateHookTest.php (89%)
rename web/core/modules/system/tests/src/Functional/{Update => UpdateSystem}/NoPreExistingSchemaUpdateTest.php (58%)
rename web/core/modules/system/tests/src/Functional/{Update => UpdateSystem}/RebuildScriptTest.php (94%)
rename web/core/modules/system/tests/src/Functional/{Update => UpdateSystem}/UpdateCacheTest.php (95%)
create mode 100644 web/core/modules/system/tests/src/Functional/UpdateSystem/UpdatePathLastRemovedTest.php
rename web/core/modules/system/tests/src/Functional/{Update => UpdateSystem}/UpdatePathNewDependencyTest.php (91%)
rename web/core/modules/system/tests/src/Functional/{Update => UpdateSystem}/UpdatePathTestBaseFilledTest.php (97%)
rename web/core/modules/system/tests/src/Functional/{Update => UpdateSystem}/UpdatePathTestJavaScriptTest.php (95%)
rename web/core/modules/system/tests/src/Functional/{Update => UpdateSystem}/UpdatePathWithBrokenRoutingTest.php (87%)
rename web/core/modules/system/tests/src/Functional/{Update => UpdateSystem}/UpdatePostUpdateFailingTest.php (97%)
rename web/core/modules/system/tests/src/Functional/{Update => UpdateSystem}/UpdatePostUpdateTest.php (97%)
rename web/core/modules/system/tests/src/Functional/{Update => UpdateSystem}/UpdateSchemaTest.php (97%)
rename web/core/modules/system/tests/src/Functional/{Update => UpdateSystem}/UpdateScriptTest.php (80%)
rename web/core/modules/system/tests/src/Functional/{Update => UpdateSystem}/UpdatesWith7xTest.php (96%)
create mode 100644 web/core/modules/system/tests/themes/test_legacy_stylesheets_remove/test_legacy_stylesheets_remove.info.yml
create mode 100644 web/core/modules/system/tests/themes/test_legacy_theme/test_legacy_theme.info.yml
create mode 100644 web/core/modules/system/tests/themes/test_legacy_theme/test_legacy_theme.theme
create mode 100644 web/core/modules/system/tests/themes/test_theme/templates/theme-test--suggestion.html.twig
create mode 100644 web/core/modules/system/tests/themes/test_theme_depending_on_constrained_modules/test_module_compatible_constraint/test_module_compatible_constraint.info.yml
create mode 100644 web/core/modules/system/tests/themes/test_theme_depending_on_constrained_modules/test_module_incompatible_constraint/test_module_incompatible_constraint.info.yml
create mode 100644 web/core/modules/system/tests/themes/test_theme_depending_on_constrained_modules/test_theme_depending_on_constrained_modules.info.yml
create mode 100644 web/core/modules/system/tests/themes/test_theme_depending_on_modules/test_another_module_required_by_theme/test_another_module_required_by_theme.info.yml
create mode 100644 web/core/modules/system/tests/themes/test_theme_depending_on_modules/test_module_required_by_theme/test_module_required_by_theme.info.yml
create mode 100644 web/core/modules/system/tests/themes/test_theme_depending_on_modules/test_module_required_by_theme/test_module_required_by_theme.module
create mode 100644 web/core/modules/system/tests/themes/test_theme_depending_on_modules/test_theme_depending_on_modules.info.yml
create mode 100644 web/core/modules/system/tests/themes/test_theme_depending_on_nonexisting_module/test_theme_depending_on_nonexisting_module.info.yml
create mode 100644 web/core/modules/system/tests/themes/test_theme_mixed_module_dependencies/test_theme_mixed_module_dependencies.info.yml
create mode 100644 web/core/modules/system/tests/themes/test_theme_with_a_base_theme_depending_on_modules/test_theme_with_a_base_theme_depending_on_modules.info.yml
create mode 100644 web/core/modules/taxonomy/tests/src/Kernel/Migrate/TaxonomyTermDeriverTest.php
create mode 100644 web/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTermNodeComplete.php
create mode 100644 web/core/modules/taxonomy/tests/src/Kernel/Views/ArgumentTransformTermTest.php
rename web/core/modules/update/tests/{modules/update_test => fixtures/release-history}/aaa_update_test.1_0-supported.xml (100%)
rename web/core/modules/update/tests/{modules/update_test => fixtures/release-history}/aaa_update_test.1_0-unsupported.xml (100%)
rename web/core/modules/update/tests/{modules/update_test => fixtures/release-history}/aaa_update_test.1_0.xml (100%)
rename web/core/modules/update/tests/{modules/update_test => fixtures/release-history}/aaa_update_test.1_1-alpha1.xml (100%)
rename web/core/modules/update/tests/{modules/update_test => fixtures/release-history}/aaa_update_test.1_1-beta1.xml (100%)
rename web/core/modules/update/tests/{modules/update_test => fixtures/release-history}/aaa_update_test.1_1.xml (100%)
rename web/core/modules/update/tests/{modules/update_test => fixtures/release-history}/aaa_update_test.1_2-alpha1.xml (100%)
rename web/core/modules/update/tests/{modules/update_test => fixtures/release-history}/aaa_update_test.1_2-beta1.xml (100%)
rename web/core/modules/update/tests/{modules/update_test => fixtures/release-history}/aaa_update_test.1_2.xml (100%)
rename web/core/modules/update/tests/{modules/update_test => fixtures/release-history}/aaa_update_test.2_0-alpha1.xml (100%)
rename web/core/modules/update/tests/{modules/update_test => fixtures/release-history}/aaa_update_test.2_0-beta1.xml (100%)
rename web/core/modules/update/tests/{modules/update_test => fixtures/release-history}/aaa_update_test.2_0.xml (100%)
rename web/core/modules/update/tests/{modules/update_test => fixtures/release-history}/aaa_update_test.8.x-1.2.xml (79%)
rename web/core/modules/update/tests/{modules/update_test => fixtures/release-history}/aaa_update_test.core_compatibility.8.x-1.2_8.x-2.2.xml (100%)
rename web/core/modules/update/tests/{modules/update_test => fixtures/release-history}/aaa_update_test.no-releases.xml (100%)
rename web/core/modules/update/tests/{modules/update_test => fixtures/release-history}/aaa_update_test.sec.8.x-1.1_8.x-1.2.xml (100%)
rename web/core/modules/update/tests/{modules/update_test => fixtures/release-history}/aaa_update_test.sec.8.x-1.2.xml (100%)
rename web/core/modules/update/tests/{modules/update_test => fixtures/release-history}/aaa_update_test.sec.8.x-1.2_8.x-2.2.xml (100%)
rename web/core/modules/update/tests/{modules/update_test => fixtures/release-history}/aaa_update_test.sec.8.x-2.2_1.x_secure.xml (100%)
rename web/core/modules/update/tests/{modules/update_test => fixtures/release-history}/bbb_update_test.1_0.xml (100%)
rename web/core/modules/update/tests/{modules/update_test => fixtures/release-history}/bbb_update_test.1_1.xml (100%)
rename web/core/modules/update/tests/{modules/update_test => fixtures/release-history}/bbb_update_test.1_2.xml (100%)
rename web/core/modules/update/tests/{modules/update_test => fixtures/release-history}/ccc_update_test.1_0.xml (100%)
rename web/core/modules/update/tests/{modules/update_test => fixtures/release-history}/drupal.0.0-alpha1.xml (100%)
rename web/core/modules/update/tests/{modules/update_test => fixtures/release-history}/drupal.0.0-beta1.xml (100%)
rename web/core/modules/update/tests/{modules/update_test => fixtures/release-history}/drupal.0.0.xml (100%)
rename web/core/modules/update/tests/{modules/update_test => fixtures/release-history}/drupal.0.1-alpha1.xml (100%)
rename web/core/modules/update/tests/{modules/update_test => fixtures/release-history}/drupal.0.1-beta1.xml (100%)
rename web/core/modules/update/tests/{modules/update_test => fixtures/release-history}/drupal.0.1.xml (100%)
rename web/core/modules/update/tests/{modules/update_test => fixtures/release-history}/drupal.1.0-alpha1.xml (100%)
rename web/core/modules/update/tests/{modules/update_test => fixtures/release-history}/drupal.1.0-beta1.xml (100%)
rename web/core/modules/update/tests/{modules/update_test => fixtures/release-history}/drupal.1.0-unsupported.xml (100%)
rename web/core/modules/update/tests/{modules/update_test => fixtures/release-history}/drupal.1.0.xml (100%)
rename web/core/modules/update/tests/{modules/update_test => fixtures/release-history}/drupal.1.1-alpha1-core_compatibility.xml (100%)
rename web/core/modules/update/tests/{modules/update_test => fixtures/release-history}/drupal.1.1-alpha1.xml (100%)
rename web/core/modules/update/tests/{modules/update_test => fixtures/release-history}/drupal.1.1-beta1.xml (100%)
rename web/core/modules/update/tests/{modules/update_test => fixtures/release-history}/drupal.1.1-core_compatibility.xml (100%)
rename web/core/modules/update/tests/{modules/update_test => fixtures/release-history}/drupal.1.1.xml (100%)
rename web/core/modules/update/tests/{modules/update_test => fixtures/release-history}/drupal.9.xml (100%)
rename web/core/modules/update/tests/{modules/update_test => fixtures/release-history}/drupal.dev.xml (100%)
rename web/core/modules/update/tests/{modules/update_test => fixtures/release-history}/drupal.sec.0.1_0.2.xml (100%)
rename web/core/modules/update/tests/{modules/update_test => fixtures/release-history}/drupal.sec.0.2-rc2-b.xml (100%)
rename web/core/modules/update/tests/{modules/update_test => fixtures/release-history}/drupal.sec.0.2-rc2.xml (100%)
rename web/core/modules/update/tests/{modules/update_test => fixtures/release-history}/drupal.sec.0.2.xml (100%)
rename web/core/modules/update/tests/{modules/update_test => fixtures/release-history}/drupal.sec.1.2.xml (100%)
rename web/core/modules/update/tests/{modules/update_test => fixtures/release-history}/drupal.sec.1.2_insecure-unsupported.xml (100%)
rename web/core/modules/update/tests/{modules/update_test => fixtures/release-history}/drupal.sec.1.2_insecure.xml (100%)
rename web/core/modules/update/tests/{modules/update_test => fixtures/release-history}/drupal.sec.2.0.xml (100%)
rename web/core/modules/update/tests/{modules/update_test => fixtures/release-history}/drupal.sec.2.0_3.0-rc1.xml (100%)
rename web/core/modules/update/tests/{modules/update_test => fixtures/release-history}/drupal.sec.2.0_9.0.0.xml (100%)
rename web/core/modules/update/tests/{modules/update_test => fixtures/release-history}/drupal.sec.9.0.xml (100%)
rename web/core/modules/update/tests/{modules/update_test => fixtures/release-history}/drupal.sec.9.9.0.xml (100%)
rename web/core/modules/update/tests/{modules/update_test => fixtures/release-history}/update_test_basetheme.1_1-sec.xml (100%)
rename web/core/modules/update/tests/{modules/update_test => fixtures/release-history}/update_test_new_module.1_1.xml (100%)
rename web/core/modules/update/tests/{modules/update_test => fixtures/release-history}/update_test_subtheme.1_0.xml (100%)
create mode 100644 web/core/modules/update/tests/src/Kernel/UpdateReportTest.php
create mode 100644 web/core/modules/user/tests/src/Unit/Theme/AdminNegotiatorTest.php
create mode 100644 web/core/modules/views/src/ViewsConfigUpdater.php
create mode 100644 web/core/modules/views/tests/fixtures/update/views.view.test_user_multi_value.yml
create mode 100644 web/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_transform_term.yml
create mode 100644 web/core/modules/views/tests/src/Kernel/Plugin/StyleFieldsTest.php
create mode 100644 web/core/modules/views/tests/src/Kernel/ViewsConfigUpdaterTest.php
create mode 100644 web/core/modules/workspaces/tests/src/Functional/UpdateSystem/ActiveWorkspaceUpdateTest.php
create mode 100644 web/core/profiles/demo_umami/themes/umami/css/classy/README.txt
create mode 100644 web/core/profiles/demo_umami/themes/umami/css/classy/components/action-links.css
create mode 100644 web/core/profiles/demo_umami/themes/umami/css/classy/components/book-navigation.css
create mode 100644 web/core/profiles/demo_umami/themes/umami/css/classy/components/breadcrumb.css
create mode 100644 web/core/profiles/demo_umami/themes/umami/css/classy/components/button.css
create mode 100644 web/core/profiles/demo_umami/themes/umami/css/classy/components/collapse-processed.css
create mode 100644 web/core/profiles/demo_umami/themes/umami/css/classy/components/container-inline.css
create mode 100644 web/core/profiles/demo_umami/themes/umami/css/classy/components/details.css
create mode 100644 web/core/profiles/demo_umami/themes/umami/css/classy/components/dialog.css
create mode 100644 web/core/profiles/demo_umami/themes/umami/css/classy/components/dropbutton.css
create mode 100644 web/core/profiles/demo_umami/themes/umami/css/classy/components/exposed-filters.css
create mode 100644 web/core/profiles/demo_umami/themes/umami/css/classy/components/field.css
create mode 100644 web/core/profiles/demo_umami/themes/umami/css/classy/components/file.css
create mode 100644 web/core/profiles/demo_umami/themes/umami/css/classy/components/form.css
create mode 100644 web/core/profiles/demo_umami/themes/umami/css/classy/components/forum.css
create mode 100644 web/core/profiles/demo_umami/themes/umami/css/classy/components/icons.css
create mode 100644 web/core/profiles/demo_umami/themes/umami/css/classy/components/image-widget.css
create mode 100644 web/core/profiles/demo_umami/themes/umami/css/classy/components/inline-form.css
create mode 100644 web/core/profiles/demo_umami/themes/umami/css/classy/components/item-list.css
create mode 100644 web/core/profiles/demo_umami/themes/umami/css/classy/components/link.css
create mode 100644 web/core/profiles/demo_umami/themes/umami/css/classy/components/links.css
create mode 100644 web/core/profiles/demo_umami/themes/umami/css/classy/components/media-embed-error.css
create mode 100644 web/core/profiles/demo_umami/themes/umami/css/classy/components/menu.css
create mode 100644 web/core/profiles/demo_umami/themes/umami/css/classy/components/more-link.css
create mode 100644 web/core/profiles/demo_umami/themes/umami/css/classy/components/node.css
create mode 100644 web/core/profiles/demo_umami/themes/umami/css/classy/components/pager.css
create mode 100644 web/core/profiles/demo_umami/themes/umami/css/classy/components/progress.css
create mode 100644 web/core/profiles/demo_umami/themes/umami/css/classy/components/search-results.css
create mode 100644 web/core/profiles/demo_umami/themes/umami/css/classy/components/tabledrag.css
create mode 100644 web/core/profiles/demo_umami/themes/umami/css/classy/components/tableselect.css
create mode 100644 web/core/profiles/demo_umami/themes/umami/css/classy/components/tablesort.css
create mode 100644 web/core/profiles/demo_umami/themes/umami/css/classy/components/tabs.css
create mode 100644 web/core/profiles/demo_umami/themes/umami/css/classy/components/textarea.css
create mode 100644 web/core/profiles/demo_umami/themes/umami/css/classy/components/ui-dialog.css
create mode 100644 web/core/profiles/demo_umami/themes/umami/css/classy/components/user.css
create mode 100644 web/core/profiles/demo_umami/themes/umami/css/classy/layout/media-library.css
create mode 100644 web/core/profiles/demo_umami/themes/umami/images/classy/README.txt
create mode 100644 web/core/profiles/demo_umami/themes/umami/images/classy/icons/application-octet-stream.png
create mode 100644 web/core/profiles/demo_umami/themes/umami/images/classy/icons/application-pdf.png
create mode 100644 web/core/profiles/demo_umami/themes/umami/images/classy/icons/application-x-executable.png
create mode 100644 web/core/profiles/demo_umami/themes/umami/images/classy/icons/audio-x-generic.png
create mode 100644 web/core/profiles/demo_umami/themes/umami/images/classy/icons/forum-icons.png
create mode 100644 web/core/profiles/demo_umami/themes/umami/images/classy/icons/image-x-generic.png
create mode 100644 web/core/profiles/demo_umami/themes/umami/images/classy/icons/package-x-generic.png
create mode 100644 web/core/profiles/demo_umami/themes/umami/images/classy/icons/text-html.png
create mode 100644 web/core/profiles/demo_umami/themes/umami/images/classy/icons/text-plain.png
create mode 100644 web/core/profiles/demo_umami/themes/umami/images/classy/icons/text-x-generic.png
create mode 100644 web/core/profiles/demo_umami/themes/umami/images/classy/icons/text-x-script.png
create mode 100644 web/core/profiles/demo_umami/themes/umami/images/classy/icons/video-x-generic.png
create mode 100644 web/core/profiles/demo_umami/themes/umami/images/classy/icons/x-office-document.png
create mode 100644 web/core/profiles/demo_umami/themes/umami/images/classy/icons/x-office-presentation.png
create mode 100644 web/core/profiles/demo_umami/themes/umami/images/classy/icons/x-office-spreadsheet.png
create mode 100644 web/core/profiles/demo_umami/themes/umami/js/classy/README.txt
create mode 100644 web/core/profiles/demo_umami/themes/umami/js/classy/media_embed_ckeditor.theme.es6.js
create mode 100644 web/core/profiles/demo_umami/themes/umami/js/classy/media_embed_ckeditor.theme.js
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/README.txt
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/block/block--local-actions-block.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/block/block--local-tasks-block.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/block/block--system-menu-block.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/block/block.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/content-edit/file-managed-file.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/content-edit/filter-caption.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/content-edit/filter-guidelines.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/content-edit/filter-tips.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/content-edit/image-widget.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/content-edit/node-add-list.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/content-edit/node-edit-form.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/content-edit/text-format-wrapper.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/content/aggregator-item.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/content/book-node-export-html.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/content/comment.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/content/links--node.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/content/mark.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/content/media-embed-error.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/content/media.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/content/page-title.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/content/search-result.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/content/taxonomy-term.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/dataset/aggregator-feed.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/dataset/forum-icon.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/dataset/forum-list.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/dataset/forums.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/dataset/item-list--search-results.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/dataset/item-list.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/dataset/table.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/field/field--comment.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/field/field--node--created.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/field/field--node--title.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/field/field--node--uid.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/field/field--text-long.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/field/field--text-with-summary.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/field/field--text.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/field/field.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/field/file-audio.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/field/file-link.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/field/file-video.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/field/image.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/field/link-formatter-link-separate.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/field/time.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/form/datetime-form.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/form/datetime-wrapper.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/form/details.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/form/fieldset.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/form/form-element-label.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/form/form-element.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/form/radios.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/form/textarea.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/layout/book-export-html.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/layout/html.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/layout/maintenance-page.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/layout/region.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/media-library/container--media-library-content.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/media-library/container--media-library-widget-selection.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/media-library/links--media-library-menu.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/media-library/media--media-library.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/media-library/media-library-item--small.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/media-library/media-library-item.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/media-library/media-library-wrapper.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/media-library/views-view-unformatted--media-library.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/misc/help-section.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/misc/progress-bar.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/misc/rdf-metadata.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/navigation/book-all-books-block.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/navigation/book-navigation.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/navigation/book-tree.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/navigation/toolbar.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/user/forum-submitted.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/user/user.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/user/username.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/views/views-exposed-form.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/views/views-mini-pager.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/views/views-view-grouping.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/views/views-view-row-rss.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/views/views-view-summary-unformatted.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/views/views-view-summary.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/views/views-view-table.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/views/views-view.html.twig
create mode 100644 web/core/profiles/demo_umami/themes/umami/templates/components/navigation/menu-local-tasks.html.twig
create mode 100644 web/core/tests/Drupal/FunctionalJavascriptTests/Theme/ClaroTableDragTest.php
create mode 100644 web/core/tests/Drupal/FunctionalTests/Entity/EntityBundleListCacheTest.php
create mode 100644 web/core/tests/Drupal/FunctionalTests/Installer/InstallerExistingBrokenDatabaseSettingsTest.php
create mode 100644 web/core/tests/Drupal/FunctionalTests/Installer/InstallerNonDefaultDatabaseDriverTest.php
create mode 100644 web/core/tests/Drupal/KernelTests/Core/Test/Comparator/MarkupInterfaceComparatorTest.php
create mode 100644 web/core/tests/Drupal/KernelTests/Core/Theme/ConfirmClassyCopiesTest.php
create mode 100644 web/core/tests/Drupal/KernelTests/Core/Theme/RegistryLegacyTest.php
create mode 100644 web/core/tests/Drupal/KernelTests/Core/Theme/ThemeNotUsingClassyLibraryTest.php
create mode 100644 web/core/tests/Drupal/KernelTests/Core/Theme/ThemesNotUsingClassyTemplatesTest.php
create mode 100644 web/core/tests/Drupal/Nightwatch/Tests/installProfileTest.js
create mode 100644 web/core/tests/Drupal/Nightwatch/Tests/jsCookieTest.js
create mode 100644 web/core/tests/Drupal/Nightwatch/Tests/langcodeTest.js
create mode 100644 web/core/tests/Drupal/TestTools/Comparator/MarkupInterfaceComparator.php
create mode 100644 web/core/tests/Drupal/Tests/Composer/Generator/OverlapWithTopLevelDependenciesTest.php
create mode 100644 web/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Functional/ScaffoldUpgradeTest.php
create mode 100644 web/core/tests/Drupal/Tests/Core/Asset/LibrariesDirectoryFileFinderTest.php
create mode 100644 web/core/tests/Drupal/Tests/Core/Asset/library_test_files/example_contrib_module.libraries.yml
create mode 100644 web/core/tests/Drupal/Tests/Core/Cache/Context/ProtocolVersionCacheContextTest.php
create mode 100644 web/core/tests/Drupal/Tests/Core/Database/DatabaseTest.php
create mode 100644 web/core/tests/Drupal/Tests/Core/Database/Driver/sqlite/ConnectionTest.php
create mode 100644 web/core/tests/Drupal/Tests/Core/Database/InstallerObjectTest.php
create mode 100644 web/core/tests/Drupal/Tests/Core/Entity/EntityBundleAccessCheckTest.php
create mode 100644 web/core/tests/Drupal/Tests/Core/Extension/ModuleRequiredByThemesUninstallValidatorTest.php
create mode 100644 web/core/tests/Drupal/Tests/Core/Test/PhpUnitCliTest.php
create mode 100644 web/core/tests/Drupal/Tests/Core/Theme/ClassyTemplatesIdenticalToStableTest.php
create mode 100644 web/core/tests/Drupal/Tests/Core/Theme/RegistryLegacyTest.php
create mode 100644 web/core/tests/fixtures/database_drivers/core/corefake/Connection.php
create mode 100644 web/core/tests/fixtures/database_drivers/core/corefake/Install/Tasks.php
create mode 100644 web/core/tests/fixtures/database_drivers/custom/corefake/Connection.php
create mode 100644 web/core/tests/fixtures/database_drivers/custom/corefake/Install/Tasks.php
rename web/core/tests/{Drupal/Tests/Core/Database/fixtures/driver => fixtures/database_drivers/custom}/fake/Connection.php (100%)
create mode 100644 web/core/tests/fixtures/database_drivers/custom/fake/Install/Tasks.php
create mode 100644 web/core/tests/fixtures/database_drivers/module/corefake/src/Driver/Database/corefake/Connection.php
create mode 100644 web/core/tests/fixtures/database_drivers/module/corefake/src/Driver/Database/corefake/Install/Tasks.php
create mode 100644 web/core/themes/bartik/css/classy/README.txt
create mode 100644 web/core/themes/bartik/css/classy/components/action-links.css
create mode 100644 web/core/themes/bartik/css/classy/components/book-navigation.css
create mode 100644 web/core/themes/bartik/css/classy/components/breadcrumb.css
create mode 100644 web/core/themes/bartik/css/classy/components/button.css
create mode 100644 web/core/themes/bartik/css/classy/components/collapse-processed.css
create mode 100644 web/core/themes/bartik/css/classy/components/container-inline.css
create mode 100644 web/core/themes/bartik/css/classy/components/details.css
create mode 100644 web/core/themes/bartik/css/classy/components/dialog.css
create mode 100644 web/core/themes/bartik/css/classy/components/dropbutton.css
create mode 100644 web/core/themes/bartik/css/classy/components/exposed-filters.css
create mode 100644 web/core/themes/bartik/css/classy/components/field.css
create mode 100644 web/core/themes/bartik/css/classy/components/file.css
create mode 100644 web/core/themes/bartik/css/classy/components/form.css
create mode 100644 web/core/themes/bartik/css/classy/components/forum.css
create mode 100644 web/core/themes/bartik/css/classy/components/icons.css
create mode 100644 web/core/themes/bartik/css/classy/components/image-widget.css
create mode 100644 web/core/themes/bartik/css/classy/components/indented.css
create mode 100644 web/core/themes/bartik/css/classy/components/inline-form.css
create mode 100644 web/core/themes/bartik/css/classy/components/item-list.css
create mode 100644 web/core/themes/bartik/css/classy/components/link.css
create mode 100644 web/core/themes/bartik/css/classy/components/links.css
create mode 100644 web/core/themes/bartik/css/classy/components/media-embed-error.css
create mode 100644 web/core/themes/bartik/css/classy/components/menu.css
create mode 100644 web/core/themes/bartik/css/classy/components/messages.css
create mode 100644 web/core/themes/bartik/css/classy/components/more-link.css
create mode 100644 web/core/themes/bartik/css/classy/components/node.css
create mode 100644 web/core/themes/bartik/css/classy/components/pager.css
create mode 100644 web/core/themes/bartik/css/classy/components/progress.css
create mode 100644 web/core/themes/bartik/css/classy/components/search-results.css
create mode 100644 web/core/themes/bartik/css/classy/components/tabledrag.css
create mode 100644 web/core/themes/bartik/css/classy/components/tableselect.css
create mode 100644 web/core/themes/bartik/css/classy/components/tablesort.css
create mode 100644 web/core/themes/bartik/css/classy/components/tabs.css
create mode 100644 web/core/themes/bartik/css/classy/components/textarea.css
create mode 100644 web/core/themes/bartik/css/classy/components/ui-dialog.css
create mode 100644 web/core/themes/bartik/css/classy/components/user.css
create mode 100644 web/core/themes/bartik/css/classy/layout/media-library.css
create mode 100644 web/core/themes/bartik/images/classy/README.txt
create mode 100644 web/core/themes/bartik/images/classy/icons/application-octet-stream.png
create mode 100644 web/core/themes/bartik/images/classy/icons/application-pdf.png
create mode 100644 web/core/themes/bartik/images/classy/icons/application-x-executable.png
create mode 100644 web/core/themes/bartik/images/classy/icons/audio-x-generic.png
create mode 100644 web/core/themes/bartik/images/classy/icons/forum-icons.png
create mode 100644 web/core/themes/bartik/images/classy/icons/image-x-generic.png
create mode 100644 web/core/themes/bartik/images/classy/icons/package-x-generic.png
create mode 100644 web/core/themes/bartik/images/classy/icons/text-html.png
create mode 100644 web/core/themes/bartik/images/classy/icons/text-plain.png
create mode 100644 web/core/themes/bartik/images/classy/icons/text-x-generic.png
create mode 100644 web/core/themes/bartik/images/classy/icons/text-x-script.png
create mode 100644 web/core/themes/bartik/images/classy/icons/video-x-generic.png
create mode 100644 web/core/themes/bartik/images/classy/icons/x-office-document.png
create mode 100644 web/core/themes/bartik/images/classy/icons/x-office-presentation.png
create mode 100644 web/core/themes/bartik/images/classy/icons/x-office-spreadsheet.png
create mode 100644 web/core/themes/bartik/js/classy/README.txt
create mode 100644 web/core/themes/bartik/js/classy/media_embed_ckeditor.theme.es6.js
create mode 100644 web/core/themes/bartik/js/classy/media_embed_ckeditor.theme.js
create mode 100644 web/core/themes/bartik/templates/classy/README.txt
create mode 100644 web/core/themes/bartik/templates/classy/block/block--local-actions-block.html.twig
create mode 100644 web/core/themes/bartik/templates/classy/block/block--local-tasks-block.html.twig
create mode 100644 web/core/themes/bartik/templates/classy/content-edit/file-managed-file.html.twig
create mode 100644 web/core/themes/bartik/templates/classy/content-edit/filter-caption.html.twig
create mode 100644 web/core/themes/bartik/templates/classy/content-edit/filter-guidelines.html.twig
create mode 100644 web/core/themes/bartik/templates/classy/content-edit/filter-tips.html.twig
create mode 100644 web/core/themes/bartik/templates/classy/content-edit/image-widget.html.twig
create mode 100644 web/core/themes/bartik/templates/classy/content-edit/node-add-list.html.twig
create mode 100644 web/core/themes/bartik/templates/classy/content-edit/node-edit-form.html.twig
create mode 100644 web/core/themes/bartik/templates/classy/content-edit/text-format-wrapper.html.twig
create mode 100644 web/core/themes/bartik/templates/classy/content/aggregator-item.html.twig
create mode 100644 web/core/themes/bartik/templates/classy/content/book-node-export-html.html.twig
create mode 100644 web/core/themes/bartik/templates/classy/content/links--node.html.twig
create mode 100644 web/core/themes/bartik/templates/classy/content/mark.html.twig
create mode 100644 web/core/themes/bartik/templates/classy/content/media-embed-error.html.twig
create mode 100644 web/core/themes/bartik/templates/classy/content/media.html.twig
create mode 100644 web/core/themes/bartik/templates/classy/content/search-result.html.twig
create mode 100644 web/core/themes/bartik/templates/classy/content/taxonomy-term.html.twig
create mode 100644 web/core/themes/bartik/templates/classy/dataset/aggregator-feed.html.twig
create mode 100644 web/core/themes/bartik/templates/classy/dataset/forum-icon.html.twig
create mode 100644 web/core/themes/bartik/templates/classy/dataset/forum-list.html.twig
create mode 100644 web/core/themes/bartik/templates/classy/dataset/forums.html.twig
create mode 100644 web/core/themes/bartik/templates/classy/dataset/item-list--search-results.html.twig
create mode 100644 web/core/themes/bartik/templates/classy/dataset/item-list.html.twig
create mode 100644 web/core/themes/bartik/templates/classy/dataset/table.html.twig
create mode 100644 web/core/themes/bartik/templates/classy/field/field--comment.html.twig
create mode 100644 web/core/themes/bartik/templates/classy/field/field--node--created.html.twig
create mode 100644 web/core/themes/bartik/templates/classy/field/field--node--title.html.twig
create mode 100644 web/core/themes/bartik/templates/classy/field/field--node--uid.html.twig
create mode 100644 web/core/themes/bartik/templates/classy/field/field--text-long.html.twig
create mode 100644 web/core/themes/bartik/templates/classy/field/field--text-with-summary.html.twig
create mode 100644 web/core/themes/bartik/templates/classy/field/field--text.html.twig
create mode 100644 web/core/themes/bartik/templates/classy/field/field.html.twig
create mode 100644 web/core/themes/bartik/templates/classy/field/file-audio.html.twig
create mode 100644 web/core/themes/bartik/templates/classy/field/file-link.html.twig
create mode 100644 web/core/themes/bartik/templates/classy/field/file-video.html.twig
create mode 100644 web/core/themes/bartik/templates/classy/field/image.html.twig
create mode 100644 web/core/themes/bartik/templates/classy/field/link-formatter-link-separate.html.twig
create mode 100644 web/core/themes/bartik/templates/classy/field/time.html.twig
create mode 100644 web/core/themes/bartik/templates/classy/form/datetime-form.html.twig
create mode 100644 web/core/themes/bartik/templates/classy/form/datetime-wrapper.html.twig
create mode 100644 web/core/themes/bartik/templates/classy/form/details.html.twig
create mode 100644 web/core/themes/bartik/templates/classy/form/fieldset.html.twig
create mode 100644 web/core/themes/bartik/templates/classy/form/form-element-label.html.twig
create mode 100644 web/core/themes/bartik/templates/classy/form/form-element.html.twig
create mode 100644 web/core/themes/bartik/templates/classy/form/radios.html.twig
create mode 100644 web/core/themes/bartik/templates/classy/form/textarea.html.twig
create mode 100644 web/core/themes/bartik/templates/classy/layout/book-export-html.html.twig
create mode 100644 web/core/themes/bartik/templates/classy/layout/html.html.twig
create mode 100644 web/core/themes/bartik/templates/classy/layout/region.html.twig
create mode 100644 web/core/themes/bartik/templates/classy/media-library/container--media-library-content.html.twig
create mode 100644 web/core/themes/bartik/templates/classy/media-library/container--media-library-widget-selection.html.twig
create mode 100644 web/core/themes/bartik/templates/classy/media-library/links--media-library-menu.html.twig
create mode 100644 web/core/themes/bartik/templates/classy/media-library/media--media-library.html.twig
create mode 100644 web/core/themes/bartik/templates/classy/media-library/media-library-item--small.html.twig
create mode 100644 web/core/themes/bartik/templates/classy/media-library/media-library-item.html.twig
create mode 100644 web/core/themes/bartik/templates/classy/media-library/media-library-wrapper.html.twig
create mode 100644 web/core/themes/bartik/templates/classy/media-library/views-view-unformatted--media-library.html.twig
create mode 100644 web/core/themes/bartik/templates/classy/misc/help-section.html.twig
create mode 100644 web/core/themes/bartik/templates/classy/misc/progress-bar.html.twig
create mode 100644 web/core/themes/bartik/templates/classy/misc/rdf-metadata.html.twig
create mode 100644 web/core/themes/bartik/templates/classy/navigation/book-all-books-block.html.twig
create mode 100644 web/core/themes/bartik/templates/classy/navigation/book-navigation.html.twig
create mode 100644 web/core/themes/bartik/templates/classy/navigation/book-tree.html.twig
create mode 100644 web/core/themes/bartik/templates/classy/navigation/breadcrumb.html.twig
create mode 100644 web/core/themes/bartik/templates/classy/navigation/menu-local-task.html.twig
create mode 100644 web/core/themes/bartik/templates/classy/navigation/menu-local-tasks.html.twig
create mode 100644 web/core/themes/bartik/templates/classy/navigation/menu.html.twig
create mode 100644 web/core/themes/bartik/templates/classy/navigation/toolbar.html.twig
create mode 100644 web/core/themes/bartik/templates/classy/user/forum-submitted.html.twig
create mode 100644 web/core/themes/bartik/templates/classy/user/user.html.twig
create mode 100644 web/core/themes/bartik/templates/classy/user/username.html.twig
create mode 100644 web/core/themes/bartik/templates/classy/views/views-exposed-form.html.twig
create mode 100644 web/core/themes/bartik/templates/classy/views/views-mini-pager.html.twig
create mode 100644 web/core/themes/bartik/templates/classy/views/views-view-grouping.html.twig
create mode 100644 web/core/themes/bartik/templates/classy/views/views-view-row-rss.html.twig
create mode 100644 web/core/themes/bartik/templates/classy/views/views-view-summary-unformatted.html.twig
create mode 100644 web/core/themes/bartik/templates/classy/views/views-view-summary.html.twig
create mode 100644 web/core/themes/bartik/templates/classy/views/views-view-table.html.twig
create mode 100644 web/core/themes/bartik/templates/classy/views/views-view.html.twig
create mode 100644 web/core/themes/claro/css/classy/README.txt
create mode 100644 web/core/themes/claro/css/classy/components/book-navigation.css
create mode 100644 web/core/themes/claro/css/classy/components/container-inline.css
create mode 100644 web/core/themes/claro/css/classy/components/exposed-filters.css
create mode 100644 web/core/themes/claro/css/classy/components/field.css
create mode 100644 web/core/themes/claro/css/classy/components/file.css
create mode 100644 web/core/themes/claro/css/classy/components/forum.css
create mode 100644 web/core/themes/claro/css/classy/components/icons.css
create mode 100644 web/core/themes/claro/css/classy/components/indented.css
create mode 100644 web/core/themes/claro/css/classy/components/inline-form.css
create mode 100644 web/core/themes/claro/css/classy/components/item-list.css
create mode 100644 web/core/themes/claro/css/classy/components/link.css
create mode 100644 web/core/themes/claro/css/classy/components/links.css
create mode 100644 web/core/themes/claro/css/classy/components/media-embed-error.css
create mode 100644 web/core/themes/claro/css/classy/components/menu.css
create mode 100644 web/core/themes/claro/css/classy/components/more-link.css
create mode 100644 web/core/themes/claro/css/classy/components/node.css
create mode 100644 web/core/themes/claro/css/classy/components/search-results.css
create mode 100644 web/core/themes/claro/css/classy/components/tablesort.css
create mode 100644 web/core/themes/claro/css/classy/components/textarea.css
create mode 100644 web/core/themes/claro/css/classy/components/ui-dialog.css
create mode 100644 web/core/themes/claro/images/classy/README.txt
create mode 100644 web/core/themes/claro/images/classy/icons/application-octet-stream.png
create mode 100644 web/core/themes/claro/images/classy/icons/application-pdf.png
create mode 100644 web/core/themes/claro/images/classy/icons/application-x-executable.png
create mode 100644 web/core/themes/claro/images/classy/icons/audio-x-generic.png
create mode 100644 web/core/themes/claro/images/classy/icons/forum-icons.png
create mode 100644 web/core/themes/claro/images/classy/icons/image-x-generic.png
create mode 100644 web/core/themes/claro/images/classy/icons/package-x-generic.png
create mode 100644 web/core/themes/claro/images/classy/icons/text-html.png
create mode 100644 web/core/themes/claro/images/classy/icons/text-plain.png
create mode 100644 web/core/themes/claro/images/classy/icons/text-x-generic.png
create mode 100644 web/core/themes/claro/images/classy/icons/text-x-script.png
create mode 100644 web/core/themes/claro/images/classy/icons/video-x-generic.png
create mode 100644 web/core/themes/claro/images/classy/icons/x-office-document.png
create mode 100644 web/core/themes/claro/images/classy/icons/x-office-presentation.png
create mode 100644 web/core/themes/claro/images/classy/icons/x-office-spreadsheet.png
create mode 100644 web/core/themes/claro/js/classy/README.txt
create mode 100644 web/core/themes/claro/js/classy/media_embed_ckeditor.theme.es6.js
create mode 100644 web/core/themes/claro/js/classy/media_embed_ckeditor.theme.js
create mode 100644 web/core/themes/claro/templates/classy/README.txt
create mode 100644 web/core/themes/claro/templates/classy/block/block--search-form-block.html.twig
create mode 100644 web/core/themes/claro/templates/classy/block/block--system-branding-block.html.twig
create mode 100644 web/core/themes/claro/templates/classy/block/block--system-menu-block.html.twig
create mode 100644 web/core/themes/claro/templates/classy/block/block.html.twig
create mode 100644 web/core/themes/claro/templates/classy/content-edit/filter-caption.html.twig
create mode 100644 web/core/themes/claro/templates/classy/content/aggregator-item.html.twig
create mode 100644 web/core/themes/claro/templates/classy/content/book-node-export-html.html.twig
create mode 100644 web/core/themes/claro/templates/classy/content/comment.html.twig
create mode 100644 web/core/themes/claro/templates/classy/content/links--node.html.twig
create mode 100644 web/core/themes/claro/templates/classy/content/mark.html.twig
create mode 100644 web/core/themes/claro/templates/classy/content/media-embed-error.html.twig
create mode 100644 web/core/themes/claro/templates/classy/content/media.html.twig
create mode 100644 web/core/themes/claro/templates/classy/content/node.html.twig
create mode 100644 web/core/themes/claro/templates/classy/content/page-title.html.twig
create mode 100644 web/core/themes/claro/templates/classy/content/search-result.html.twig
create mode 100644 web/core/themes/claro/templates/classy/content/taxonomy-term.html.twig
create mode 100644 web/core/themes/claro/templates/classy/dataset/aggregator-feed.html.twig
create mode 100644 web/core/themes/claro/templates/classy/dataset/forum-icon.html.twig
create mode 100644 web/core/themes/claro/templates/classy/dataset/forum-list.html.twig
create mode 100644 web/core/themes/claro/templates/classy/dataset/forums.html.twig
create mode 100644 web/core/themes/claro/templates/classy/dataset/item-list--search-results.html.twig
create mode 100644 web/core/themes/claro/templates/classy/dataset/item-list.html.twig
create mode 100644 web/core/themes/claro/templates/classy/dataset/table.html.twig
create mode 100644 web/core/themes/claro/templates/classy/field/field--comment.html.twig
create mode 100644 web/core/themes/claro/templates/classy/field/field--node--created.html.twig
create mode 100644 web/core/themes/claro/templates/classy/field/field--node--title.html.twig
create mode 100644 web/core/themes/claro/templates/classy/field/field--node--uid.html.twig
create mode 100644 web/core/themes/claro/templates/classy/field/field--text-long.html.twig
create mode 100644 web/core/themes/claro/templates/classy/field/field--text-with-summary.html.twig
create mode 100644 web/core/themes/claro/templates/classy/field/field--text.html.twig
create mode 100644 web/core/themes/claro/templates/classy/field/field.html.twig
create mode 100644 web/core/themes/claro/templates/classy/field/file-audio.html.twig
create mode 100644 web/core/themes/claro/templates/classy/field/file-video.html.twig
create mode 100644 web/core/themes/claro/templates/classy/field/image.html.twig
create mode 100644 web/core/themes/claro/templates/classy/field/link-formatter-link-separate.html.twig
create mode 100644 web/core/themes/claro/templates/classy/field/time.html.twig
create mode 100644 web/core/themes/claro/templates/classy/form/radios.html.twig
create mode 100644 web/core/themes/claro/templates/classy/form/textarea.html.twig
create mode 100644 web/core/themes/claro/templates/classy/layout/book-export-html.html.twig
create mode 100644 web/core/themes/claro/templates/classy/layout/html.html.twig
create mode 100644 web/core/themes/claro/templates/classy/layout/region.html.twig
create mode 100644 web/core/themes/claro/templates/classy/media-library/container--media-library-content.html.twig
create mode 100644 web/core/themes/claro/templates/classy/media-library/container--media-library-widget-selection.html.twig
create mode 100644 web/core/themes/claro/templates/classy/media-library/links--media-library-menu.html.twig
create mode 100644 web/core/themes/claro/templates/classy/media-library/media--media-library.html.twig
create mode 100644 web/core/themes/claro/templates/classy/media-library/media-library-item--small.html.twig
create mode 100644 web/core/themes/claro/templates/classy/media-library/media-library-item.html.twig
create mode 100644 web/core/themes/claro/templates/classy/media-library/media-library-wrapper.html.twig
create mode 100644 web/core/themes/claro/templates/classy/misc/help-section.html.twig
create mode 100644 web/core/themes/claro/templates/classy/misc/progress-bar.html.twig
create mode 100644 web/core/themes/claro/templates/classy/misc/rdf-metadata.html.twig
create mode 100644 web/core/themes/claro/templates/classy/navigation/book-all-books-block.html.twig
create mode 100644 web/core/themes/claro/templates/classy/navigation/book-navigation.html.twig
create mode 100644 web/core/themes/claro/templates/classy/navigation/book-tree.html.twig
create mode 100644 web/core/themes/claro/templates/classy/navigation/menu.html.twig
create mode 100644 web/core/themes/claro/templates/classy/navigation/toolbar.html.twig
create mode 100644 web/core/themes/claro/templates/classy/user/forum-submitted.html.twig
create mode 100644 web/core/themes/claro/templates/classy/user/user.html.twig
create mode 100644 web/core/themes/claro/templates/classy/user/username.html.twig
create mode 100644 web/core/themes/claro/templates/classy/views/views-view-grouping.html.twig
create mode 100644 web/core/themes/claro/templates/classy/views/views-view-row-rss.html.twig
create mode 100644 web/core/themes/claro/templates/classy/views/views-view-summary-unformatted.html.twig
create mode 100644 web/core/themes/claro/templates/classy/views/views-view-summary.html.twig
create mode 100644 web/core/themes/claro/templates/classy/views/views-view-table.html.twig
create mode 100644 web/core/themes/claro/templates/classy/views/views-view.html.twig
create mode 100644 web/core/themes/claro/templates/form/checkboxes.html.twig
create mode 100644 web/core/themes/claro/templates/form/radios.html.twig
create mode 100644 web/core/themes/seven/css/classy/README.txt
create mode 100644 web/core/themes/seven/css/classy/components/action-links.css
create mode 100644 web/core/themes/seven/css/classy/components/book-navigation.css
create mode 100644 web/core/themes/seven/css/classy/components/breadcrumb.css
create mode 100644 web/core/themes/seven/css/classy/components/button.css
create mode 100644 web/core/themes/seven/css/classy/components/collapse-processed.css
create mode 100644 web/core/themes/seven/css/classy/components/container-inline.css
create mode 100644 web/core/themes/seven/css/classy/components/dropbutton.css
create mode 100644 web/core/themes/seven/css/classy/components/exposed-filters.css
create mode 100644 web/core/themes/seven/css/classy/components/field.css
create mode 100644 web/core/themes/seven/css/classy/components/file.css
create mode 100644 web/core/themes/seven/css/classy/components/form.css
create mode 100644 web/core/themes/seven/css/classy/components/forum.css
create mode 100644 web/core/themes/seven/css/classy/components/icons.css
create mode 100644 web/core/themes/seven/css/classy/components/image-widget.css
create mode 100644 web/core/themes/seven/css/classy/components/indented.css
create mode 100644 web/core/themes/seven/css/classy/components/inline-form.css
create mode 100644 web/core/themes/seven/css/classy/components/item-list.css
create mode 100644 web/core/themes/seven/css/classy/components/link.css
create mode 100644 web/core/themes/seven/css/classy/components/links.css
create mode 100644 web/core/themes/seven/css/classy/components/media-embed-error.css
create mode 100644 web/core/themes/seven/css/classy/components/menu.css
create mode 100644 web/core/themes/seven/css/classy/components/messages.css
create mode 100644 web/core/themes/seven/css/classy/components/more-link.css
create mode 100644 web/core/themes/seven/css/classy/components/node.css
create mode 100644 web/core/themes/seven/css/classy/components/pager.css
create mode 100644 web/core/themes/seven/css/classy/components/progress.css
create mode 100644 web/core/themes/seven/css/classy/components/search-results.css
create mode 100644 web/core/themes/seven/css/classy/components/tabledrag.css
create mode 100644 web/core/themes/seven/css/classy/components/tableselect.css
create mode 100644 web/core/themes/seven/css/classy/components/tablesort.css
create mode 100644 web/core/themes/seven/css/classy/components/tabs.css
create mode 100644 web/core/themes/seven/css/classy/components/textarea.css
create mode 100644 web/core/themes/seven/css/classy/components/ui-dialog.css
create mode 100644 web/core/themes/seven/css/classy/components/user.css
create mode 100644 web/core/themes/seven/css/classy/layout/media-library.css
create mode 100644 web/core/themes/seven/images/classy/README.txt
create mode 100644 web/core/themes/seven/images/classy/icons/application-octet-stream.png
create mode 100644 web/core/themes/seven/images/classy/icons/application-pdf.png
create mode 100644 web/core/themes/seven/images/classy/icons/application-x-executable.png
create mode 100644 web/core/themes/seven/images/classy/icons/audio-x-generic.png
create mode 100644 web/core/themes/seven/images/classy/icons/forum-icons.png
create mode 100644 web/core/themes/seven/images/classy/icons/image-x-generic.png
create mode 100644 web/core/themes/seven/images/classy/icons/package-x-generic.png
create mode 100644 web/core/themes/seven/images/classy/icons/text-html.png
create mode 100644 web/core/themes/seven/images/classy/icons/text-plain.png
create mode 100644 web/core/themes/seven/images/classy/icons/text-x-generic.png
create mode 100644 web/core/themes/seven/images/classy/icons/text-x-script.png
create mode 100644 web/core/themes/seven/images/classy/icons/video-x-generic.png
create mode 100644 web/core/themes/seven/images/classy/icons/x-office-document.png
create mode 100644 web/core/themes/seven/images/classy/icons/x-office-presentation.png
create mode 100644 web/core/themes/seven/images/classy/icons/x-office-spreadsheet.png
create mode 100644 web/core/themes/seven/js/classy/README.txt
create mode 100644 web/core/themes/seven/js/classy/media_embed_ckeditor.theme.es6.js
create mode 100644 web/core/themes/seven/js/classy/media_embed_ckeditor.theme.js
create mode 100644 web/core/themes/seven/templates/classy/README.txt
create mode 100644 web/core/themes/seven/templates/classy/block/block--local-tasks-block.html.twig
create mode 100644 web/core/themes/seven/templates/classy/block/block--search-form-block.html.twig
create mode 100644 web/core/themes/seven/templates/classy/block/block--system-branding-block.html.twig
create mode 100644 web/core/themes/seven/templates/classy/block/block--system-menu-block.html.twig
create mode 100644 web/core/themes/seven/templates/classy/block/block.html.twig
create mode 100644 web/core/themes/seven/templates/classy/content-edit/file-managed-file.html.twig
create mode 100644 web/core/themes/seven/templates/classy/content-edit/filter-caption.html.twig
create mode 100644 web/core/themes/seven/templates/classy/content-edit/filter-guidelines.html.twig
create mode 100644 web/core/themes/seven/templates/classy/content-edit/filter-tips.html.twig
create mode 100644 web/core/themes/seven/templates/classy/content-edit/text-format-wrapper.html.twig
create mode 100644 web/core/themes/seven/templates/classy/content/aggregator-item.html.twig
create mode 100644 web/core/themes/seven/templates/classy/content/book-node-export-html.html.twig
create mode 100644 web/core/themes/seven/templates/classy/content/comment.html.twig
create mode 100644 web/core/themes/seven/templates/classy/content/links--node.html.twig
create mode 100644 web/core/themes/seven/templates/classy/content/mark.html.twig
create mode 100644 web/core/themes/seven/templates/classy/content/media-embed-error.html.twig
create mode 100644 web/core/themes/seven/templates/classy/content/media.html.twig
create mode 100644 web/core/themes/seven/templates/classy/content/node.html.twig
create mode 100644 web/core/themes/seven/templates/classy/content/page-title.html.twig
create mode 100644 web/core/themes/seven/templates/classy/content/search-result.html.twig
create mode 100644 web/core/themes/seven/templates/classy/content/taxonomy-term.html.twig
create mode 100644 web/core/themes/seven/templates/classy/dataset/aggregator-feed.html.twig
create mode 100644 web/core/themes/seven/templates/classy/dataset/forum-icon.html.twig
create mode 100644 web/core/themes/seven/templates/classy/dataset/forum-list.html.twig
create mode 100644 web/core/themes/seven/templates/classy/dataset/forums.html.twig
create mode 100644 web/core/themes/seven/templates/classy/dataset/item-list--search-results.html.twig
create mode 100644 web/core/themes/seven/templates/classy/dataset/item-list.html.twig
create mode 100644 web/core/themes/seven/templates/classy/dataset/table.html.twig
create mode 100644 web/core/themes/seven/templates/classy/field/field--comment.html.twig
create mode 100644 web/core/themes/seven/templates/classy/field/field--node--created.html.twig
create mode 100644 web/core/themes/seven/templates/classy/field/field--node--title.html.twig
create mode 100644 web/core/themes/seven/templates/classy/field/field--node--uid.html.twig
create mode 100644 web/core/themes/seven/templates/classy/field/field--text-long.html.twig
create mode 100644 web/core/themes/seven/templates/classy/field/field--text-with-summary.html.twig
create mode 100644 web/core/themes/seven/templates/classy/field/field--text.html.twig
create mode 100644 web/core/themes/seven/templates/classy/field/field.html.twig
create mode 100644 web/core/themes/seven/templates/classy/field/file-audio.html.twig
create mode 100644 web/core/themes/seven/templates/classy/field/file-link.html.twig
create mode 100644 web/core/themes/seven/templates/classy/field/file-video.html.twig
create mode 100644 web/core/themes/seven/templates/classy/field/image.html.twig
create mode 100644 web/core/themes/seven/templates/classy/field/link-formatter-link-separate.html.twig
create mode 100644 web/core/themes/seven/templates/classy/field/time.html.twig
create mode 100644 web/core/themes/seven/templates/classy/form/datetime-form.html.twig
create mode 100644 web/core/themes/seven/templates/classy/form/datetime-wrapper.html.twig
create mode 100644 web/core/themes/seven/templates/classy/form/fieldset.html.twig
create mode 100644 web/core/themes/seven/templates/classy/form/form-element-label.html.twig
create mode 100644 web/core/themes/seven/templates/classy/form/form-element.html.twig
create mode 100644 web/core/themes/seven/templates/classy/form/radios.html.twig
create mode 100644 web/core/themes/seven/templates/classy/form/textarea.html.twig
create mode 100644 web/core/themes/seven/templates/classy/layout/book-export-html.html.twig
create mode 100644 web/core/themes/seven/templates/classy/layout/html.html.twig
create mode 100644 web/core/themes/seven/templates/classy/layout/region.html.twig
create mode 100644 web/core/themes/seven/templates/classy/media-library/container--media-library-content.html.twig
create mode 100644 web/core/themes/seven/templates/classy/media-library/container--media-library-widget-selection.html.twig
create mode 100644 web/core/themes/seven/templates/classy/media-library/links--media-library-menu.html.twig
create mode 100644 web/core/themes/seven/templates/classy/media-library/media--media-library.html.twig
create mode 100644 web/core/themes/seven/templates/classy/media-library/media-library-item--small.html.twig
create mode 100644 web/core/themes/seven/templates/classy/media-library/media-library-item.html.twig
create mode 100644 web/core/themes/seven/templates/classy/media-library/media-library-wrapper.html.twig
create mode 100644 web/core/themes/seven/templates/classy/misc/help-section.html.twig
create mode 100644 web/core/themes/seven/templates/classy/misc/progress-bar.html.twig
create mode 100644 web/core/themes/seven/templates/classy/misc/rdf-metadata.html.twig
create mode 100644 web/core/themes/seven/templates/classy/misc/status-messages.html.twig
create mode 100644 web/core/themes/seven/templates/classy/navigation/book-all-books-block.html.twig
create mode 100644 web/core/themes/seven/templates/classy/navigation/book-navigation.html.twig
create mode 100644 web/core/themes/seven/templates/classy/navigation/book-tree.html.twig
create mode 100644 web/core/themes/seven/templates/classy/navigation/breadcrumb.html.twig
create mode 100644 web/core/themes/seven/templates/classy/navigation/menu-local-task.html.twig
create mode 100644 web/core/themes/seven/templates/classy/navigation/menu.html.twig
create mode 100644 web/core/themes/seven/templates/classy/navigation/toolbar.html.twig
create mode 100644 web/core/themes/seven/templates/classy/user/forum-submitted.html.twig
create mode 100644 web/core/themes/seven/templates/classy/user/user.html.twig
create mode 100644 web/core/themes/seven/templates/classy/user/username.html.twig
create mode 100644 web/core/themes/seven/templates/classy/views/views-exposed-form.html.twig
create mode 100644 web/core/themes/seven/templates/classy/views/views-mini-pager.html.twig
create mode 100644 web/core/themes/seven/templates/classy/views/views-view-grouping.html.twig
create mode 100644 web/core/themes/seven/templates/classy/views/views-view-row-rss.html.twig
create mode 100644 web/core/themes/seven/templates/classy/views/views-view-summary-unformatted.html.twig
create mode 100644 web/core/themes/seven/templates/classy/views/views-view-summary.html.twig
create mode 100644 web/core/themes/seven/templates/classy/views/views-view-table.html.twig
create mode 100644 web/core/themes/seven/templates/classy/views/views-view.html.twig
diff --git a/composer.json b/composer.json
index 7700c6d752..a5f42a493c 100644
--- a/composer.json
+++ b/composer.json
@@ -105,7 +105,7 @@
"drupal/config_update": "1.5",
"drupal/console": "1.8",
"drupal/content_access": "1.0-alpha1",
- "drupal/core-recommended": "8.8.6",
+ "drupal/core-recommended": "8.9.0",
"drupal/crop": "2.0-rc1",
"drupal/ctools": "3.2",
"drupal/devel": "2.0",
diff --git a/composer.lock b/composer.lock
index a430964a9f..b2df2fd7c7 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "06cb2e5d7529b74c6d0f3eb3e53025e2",
+ "content-hash": "807a55f9c8496dc8ac9059ce43ee7a4f",
"packages": [
{
"name": "alchemy/zippy",
@@ -72,22 +72,22 @@
},
{
"name": "asm89/stack-cors",
- "version": "1.2.0",
+ "version": "1.3.0",
"source": {
"type": "git",
"url": "https://github.com/asm89/stack-cors.git",
- "reference": "c163e2b614550aedcf71165db2473d936abbced6"
+ "reference": "b9c31def6a83f84b4d4a40d35996d375755f0e08"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/asm89/stack-cors/zipball/c163e2b614550aedcf71165db2473d936abbced6",
- "reference": "c163e2b614550aedcf71165db2473d936abbced6",
+ "url": "https://api.github.com/repos/asm89/stack-cors/zipball/b9c31def6a83f84b4d4a40d35996d375755f0e08",
+ "reference": "b9c31def6a83f84b4d4a40d35996d375755f0e08",
"shasum": ""
},
"require": {
"php": ">=5.5.9",
- "symfony/http-foundation": "~2.7|~3.0|~4.0",
- "symfony/http-kernel": "~2.7|~3.0|~4.0"
+ "symfony/http-foundation": "~2.7|~3.0|~4.0|~5.0",
+ "symfony/http-kernel": "~2.7|~3.0|~4.0|~5.0"
},
"require-dev": {
"phpunit/phpunit": "^5.0 || ^4.8.10",
@@ -120,7 +120,7 @@
"cors",
"stack"
],
- "time": "2017-12-20T14:37:45+00:00"
+ "time": "2019-12-24T22:41:47+00:00"
},
{
"name": "browserstate/history.js",
@@ -297,28 +297,31 @@
},
{
"name": "composer/installers",
- "version": "v1.7.0",
+ "version": "v1.9.0",
"source": {
"type": "git",
"url": "https://github.com/composer/installers.git",
- "reference": "141b272484481432cda342727a427dc1e206bfa0"
+ "reference": "b93bcf0fa1fccb0b7d176b0967d969691cd74cca"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/installers/zipball/141b272484481432cda342727a427dc1e206bfa0",
- "reference": "141b272484481432cda342727a427dc1e206bfa0",
+ "url": "https://api.github.com/repos/composer/installers/zipball/b93bcf0fa1fccb0b7d176b0967d969691cd74cca",
+ "reference": "b93bcf0fa1fccb0b7d176b0967d969691cd74cca",
"shasum": ""
},
"require": {
- "composer-plugin-api": "^1.0"
+ "composer-plugin-api": "^1.0 || ^2.0"
},
"replace": {
"roundcube/plugin-installer": "*",
"shama/baton": "*"
},
"require-dev": {
- "composer/composer": "1.0.*@dev",
- "phpunit/phpunit": "^4.8.36"
+ "composer/composer": "1.6.* || 2.0.*@dev",
+ "composer/semver": "1.0.* || 2.0.*@dev",
+ "phpunit/phpunit": "^4.8.36",
+ "sebastian/comparator": "^1.2.4",
+ "symfony/process": "^2.3"
},
"type": "composer-plugin",
"extra": {
@@ -354,6 +357,7 @@
"Kanboard",
"Lan Management System",
"MODX Evo",
+ "MantisBT",
"Mautic",
"Maya",
"OXID",
@@ -408,6 +412,7 @@
"shopware",
"silverstripe",
"sydes",
+ "sylius",
"symfony",
"typo3",
"wordpress",
@@ -415,28 +420,27 @@
"zend",
"zikula"
],
- "time": "2019-08-12T15:00:31+00:00"
+ "time": "2020-04-07T06:57:05+00:00"
},
{
"name": "composer/semver",
- "version": "1.5.0",
+ "version": "1.5.1",
"source": {
"type": "git",
"url": "https://github.com/composer/semver.git",
- "reference": "46d9139568ccb8d9e7cdd4539cab7347568a5e2e"
+ "reference": "c6bea70230ef4dd483e6bbcab6005f682ed3a8de"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/semver/zipball/46d9139568ccb8d9e7cdd4539cab7347568a5e2e",
- "reference": "46d9139568ccb8d9e7cdd4539cab7347568a5e2e",
+ "url": "https://api.github.com/repos/composer/semver/zipball/c6bea70230ef4dd483e6bbcab6005f682ed3a8de",
+ "reference": "c6bea70230ef4dd483e6bbcab6005f682ed3a8de",
"shasum": ""
},
"require": {
"php": "^5.3.2 || ^7.0"
},
"require-dev": {
- "phpunit/phpunit": "^4.5 || ^5.0.5",
- "phpunit/phpunit-mock-objects": "2.3.0 || ^3.0"
+ "phpunit/phpunit": "^4.5 || ^5.0.5"
},
"type": "library",
"extra": {
@@ -477,7 +481,7 @@
"validation",
"versioning"
],
- "time": "2019-03-19T17:25:45+00:00"
+ "time": "2020-01-13T12:06:48+00:00"
},
{
"name": "consolidation/annotated-command",
@@ -3388,16 +3392,16 @@
},
{
"name": "drupal/core",
- "version": "8.8.6",
+ "version": "8.9.0",
"source": {
"type": "git",
"url": "https://github.com/drupal/core.git",
- "reference": "a5daf2aa45bbc72da72e1e64d5261f746ffb508c"
+ "reference": "f90882ab0723becda2333e4d33e1a6ab27cb8f0c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/drupal/core/zipball/a5daf2aa45bbc72da72e1e64d5261f746ffb508c",
- "reference": "a5daf2aa45bbc72da72e1e64d5261f746ffb508c",
+ "url": "https://api.github.com/repos/drupal/core/zipball/f90882ab0723becda2333e4d33e1a6ab27cb8f0c",
+ "reference": "f90882ab0723becda2333e4d33e1a6ab27cb8f0c",
"shasum": ""
},
"require": {
@@ -3421,16 +3425,19 @@
"ext-tokenizer": "*",
"ext-xml": "*",
"guzzlehttp/guzzle": "^6.3",
+ "laminas/laminas-diactoros": "^1.8",
+ "laminas/laminas-feed": "^2.12",
"masterminds/html5": "^2.1",
"pear/archive_tar": "^1.4.9",
"php": ">=7.0.8",
+ "psr/log": "^1.0",
"stack/builder": "^1.0",
"symfony-cmf/routing": "^1.4",
"symfony/class-loader": "~3.4.0",
"symfony/console": "~3.4.0",
"symfony/dependency-injection": "~3.4.26",
"symfony/event-dispatcher": "~3.4.0",
- "symfony/http-foundation": "~3.4.27",
+ "symfony/http-foundation": "~3.4.35",
"symfony/http-kernel": "~3.4.14",
"symfony/polyfill-iconv": "^1.0",
"symfony/process": "~3.4.0",
@@ -3441,9 +3448,7 @@
"symfony/validator": "~3.4.0",
"symfony/yaml": "~3.4.5",
"twig/twig": "^1.38.2",
- "typo3/phar-stream-wrapper": "^3.1.3",
- "zendframework/zend-diactoros": "^1.8",
- "zendframework/zend-feed": "^2.12"
+ "typo3/phar-stream-wrapper": "^3.1.3"
},
"conflict": {
"drupal/pathauto": "<1.6",
@@ -3619,76 +3624,78 @@
"GPL-2.0-or-later"
],
"description": "Drupal is an open source content management platform powering millions of websites and applications.",
- "time": "2020-05-20T08:22:02+00:00"
+ "time": "2020-06-03T16:44:36+00:00"
},
{
"name": "drupal/core-recommended",
- "version": "8.8.6",
+ "version": "8.9.0",
"source": {
"type": "git",
"url": "https://github.com/drupal/core-recommended.git",
- "reference": "361d61f272767e0e34f8ac8c7a51e7c14e387714"
+ "reference": "1b87cf5dea633a66a1c4f22d635bc92c127071d9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/drupal/core-recommended/zipball/361d61f272767e0e34f8ac8c7a51e7c14e387714",
- "reference": "361d61f272767e0e34f8ac8c7a51e7c14e387714",
+ "url": "https://api.github.com/repos/drupal/core-recommended/zipball/1b87cf5dea633a66a1c4f22d635bc92c127071d9",
+ "reference": "1b87cf5dea633a66a1c4f22d635bc92c127071d9",
"shasum": ""
},
"require": {
- "asm89/stack-cors": "1.2.0",
- "composer/installers": "v1.7.0",
- "composer/semver": "1.5.0",
+ "asm89/stack-cors": "1.3.0",
+ "composer/semver": "1.5.1",
"doctrine/annotations": "v1.4.0",
"doctrine/cache": "v1.6.2",
"doctrine/collections": "v1.4.0",
"doctrine/common": "v2.7.3",
"doctrine/inflector": "v1.2.0",
"doctrine/lexer": "1.0.2",
- "drupal/core": "8.8.6",
+ "drupal/core": "8.9.0",
"easyrdf/easyrdf": "0.9.1",
- "egulias/email-validator": "2.1.11",
- "guzzlehttp/guzzle": "6.3.3",
+ "egulias/email-validator": "2.1.17",
+ "guzzlehttp/guzzle": "6.5.4",
"guzzlehttp/promises": "v1.3.1",
"guzzlehttp/psr7": "1.6.1",
+ "laminas/laminas-diactoros": "1.8.7p2",
+ "laminas/laminas-escaper": "2.6.1",
+ "laminas/laminas-feed": "2.12.2",
+ "laminas/laminas-stdlib": "3.2.1",
+ "laminas/laminas-zendframework-bridge": "1.0.4",
"masterminds/html5": "2.3.0",
"paragonie/random_compat": "v9.99.99",
"pear/archive_tar": "1.4.9",
- "pear/console_getopt": "v1.4.2",
- "pear/pear-core-minimal": "v1.10.9",
- "pear/pear_exception": "v1.0.0",
+ "pear/console_getopt": "v1.4.3",
+ "pear/pear-core-minimal": "v1.10.10",
+ "pear/pear_exception": "v1.0.1",
"psr/container": "1.0.0",
"psr/http-message": "1.0.1",
- "psr/log": "1.1.0",
+ "psr/log": "1.1.3",
"ralouphie/getallheaders": "3.0.3",
"stack/builder": "v1.0.5",
"symfony-cmf/routing": "1.4.1",
- "symfony/class-loader": "v3.4.35",
- "symfony/console": "v3.4.35",
- "symfony/debug": "v3.4.35",
- "symfony/dependency-injection": "v3.4.35",
- "symfony/event-dispatcher": "v3.4.35",
- "symfony/http-foundation": "v3.4.35",
- "symfony/http-kernel": "v3.4.35",
- "symfony/polyfill-ctype": "v1.12.0",
- "symfony/polyfill-iconv": "v1.12.0",
- "symfony/polyfill-mbstring": "v1.12.0",
- "symfony/polyfill-php56": "v1.12.0",
- "symfony/polyfill-php70": "v1.12.0",
- "symfony/polyfill-util": "v1.12.0",
- "symfony/process": "v3.4.35",
+ "symfony/class-loader": "v3.4.41",
+ "symfony/console": "v3.4.41",
+ "symfony/debug": "v3.4.41",
+ "symfony/dependency-injection": "v3.4.41",
+ "symfony/event-dispatcher": "v3.4.41",
+ "symfony/http-foundation": "v3.4.41",
+ "symfony/http-kernel": "v3.4.41",
+ "symfony/polyfill-ctype": "v1.17.0",
+ "symfony/polyfill-iconv": "v1.17.0",
+ "symfony/polyfill-intl-idn": "v1.17.0",
+ "symfony/polyfill-mbstring": "v1.17.0",
+ "symfony/polyfill-php56": "v1.17.0",
+ "symfony/polyfill-php70": "v1.17.0",
+ "symfony/polyfill-php72": "v1.17.0",
+ "symfony/polyfill-util": "v1.17.0",
+ "symfony/process": "v3.4.41",
"symfony/psr-http-message-bridge": "v1.1.2",
- "symfony/routing": "v3.4.35",
- "symfony/serializer": "v3.4.35",
- "symfony/translation": "v3.4.35",
- "symfony/validator": "v3.4.35",
- "symfony/yaml": "v3.4.35",
- "twig/twig": "v1.42.3",
- "typo3/phar-stream-wrapper": "v3.1.3",
- "zendframework/zend-diactoros": "1.8.7",
- "zendframework/zend-escaper": "2.6.1",
- "zendframework/zend-feed": "2.12.0",
- "zendframework/zend-stdlib": "3.2.1"
+ "symfony/routing": "v3.4.41",
+ "symfony/serializer": "v3.4.41",
+ "symfony/translation": "v3.4.41",
+ "symfony/validator": "v3.4.41",
+ "symfony/yaml": "v3.4.41",
+ "twig/twig": "v1.42.5",
+ "typo3/phar-stream-wrapper": "v3.1.4"
},
"conflict": {
"webflo/drupal-core-strict": "*"
@@ -3699,7 +3706,7 @@
"GPL-2.0-or-later"
],
"description": "Locked core dependencies; require this project INSTEAD OF drupal/core.",
- "time": "2020-05-20T08:22:02+00:00"
+ "time": "2020-06-03T16:44:36+00:00"
},
{
"name": "drupal/crop",
@@ -6088,7 +6095,8 @@
"homepage": "https://www.drupal.org/project/migrate_devel",
"support": {
"source": "http://cgit.drupalcode.org/migrate_devel"
- }
+ },
+ "time": "2017-06-25T23:46:13+00:00"
},
{
"name": "drupal/migrate_plus",
@@ -8812,12 +8820,12 @@
"version": "0.9.1",
"source": {
"type": "git",
- "url": "https://github.com/njh/easyrdf.git",
+ "url": "https://github.com/easyrdf/easyrdf.git",
"reference": "acd09dfe0555fbcfa254291e433c45fdd4652566"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/njh/easyrdf/zipball/acd09dfe0555fbcfa254291e433c45fdd4652566",
+ "url": "https://api.github.com/repos/easyrdf/easyrdf/zipball/acd09dfe0555fbcfa254291e433c45fdd4652566",
"reference": "acd09dfe0555fbcfa254291e433c45fdd4652566",
"shasum": ""
},
@@ -8871,27 +8879,27 @@
},
{
"name": "egulias/email-validator",
- "version": "2.1.11",
+ "version": "2.1.17",
"source": {
"type": "git",
"url": "https://github.com/egulias/EmailValidator.git",
- "reference": "92dd169c32f6f55ba570c309d83f5209cefb5e23"
+ "reference": "ade6887fd9bd74177769645ab5c474824f8a418a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/92dd169c32f6f55ba570c309d83f5209cefb5e23",
- "reference": "92dd169c32f6f55ba570c309d83f5209cefb5e23",
+ "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/ade6887fd9bd74177769645ab5c474824f8a418a",
+ "reference": "ade6887fd9bd74177769645ab5c474824f8a418a",
"shasum": ""
},
"require": {
"doctrine/lexer": "^1.0.1",
- "php": ">= 5.5"
+ "php": ">=5.5",
+ "symfony/polyfill-intl-idn": "^1.10"
},
"require-dev": {
- "dominicsayers/isemail": "dev-master",
- "phpunit/phpunit": "^4.8.35||^5.7||^6.0",
- "satooshi/php-coveralls": "^1.0.1",
- "symfony/phpunit-bridge": "^4.4@dev"
+ "dominicsayers/isemail": "^3.0.7",
+ "phpunit/phpunit": "^4.8.36|^7.5.15",
+ "satooshi/php-coveralls": "^1.0.1"
},
"suggest": {
"ext-intl": "PHP Internationalization Libraries are required to use the SpoofChecking validation"
@@ -8925,7 +8933,7 @@
"validation",
"validator"
],
- "time": "2019-08-13T17:33:27+00:00"
+ "time": "2020-02-13T22:36:52+00:00"
},
{
"name": "enshrined/svg-sanitize",
@@ -9234,27 +9242,29 @@
},
{
"name": "guzzlehttp/guzzle",
- "version": "6.3.3",
+ "version": "6.5.4",
"source": {
"type": "git",
"url": "https://github.com/guzzle/guzzle.git",
- "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba"
+ "reference": "a4a1b6930528a8f7ee03518e6442ec7a44155d9d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/guzzle/guzzle/zipball/407b0cb880ace85c9b63c5f9551db498cb2d50ba",
- "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba",
+ "url": "https://api.github.com/repos/guzzle/guzzle/zipball/a4a1b6930528a8f7ee03518e6442ec7a44155d9d",
+ "reference": "a4a1b6930528a8f7ee03518e6442ec7a44155d9d",
"shasum": ""
},
"require": {
+ "ext-json": "*",
"guzzlehttp/promises": "^1.0",
- "guzzlehttp/psr7": "^1.4",
- "php": ">=5.5"
+ "guzzlehttp/psr7": "^1.6.1",
+ "php": ">=5.5",
+ "symfony/polyfill-intl-idn": "1.17.0"
},
"require-dev": {
"ext-curl": "*",
"phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0",
- "psr/log": "^1.0"
+ "psr/log": "^1.1"
},
"suggest": {
"psr/log": "Required for using the Log middleware"
@@ -9262,16 +9272,16 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "6.3-dev"
+ "dev-master": "6.5-dev"
}
},
"autoload": {
- "files": [
- "src/functions_include.php"
- ],
"psr-4": {
"GuzzleHttp\\": "src/"
- }
+ },
+ "files": [
+ "src/functions_include.php"
+ ]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -9295,7 +9305,7 @@
"rest",
"web service"
],
- "time": "2018-04-22T15:46:56+00:00"
+ "time": "2020-05-25T19:35:05+00:00"
},
{
"name": "guzzlehttp/promises",
@@ -9608,6 +9618,299 @@
"abandoned": "php-parallel-lint/php-console-highlighter",
"time": "2018-09-29T18:48:56+00:00"
},
+ {
+ "name": "laminas/laminas-diactoros",
+ "version": "1.8.7p2",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/laminas/laminas-diactoros.git",
+ "reference": "6991c1af7c8d2c8efee81b22ba97024781824aaa"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/6991c1af7c8d2c8efee81b22ba97024781824aaa",
+ "reference": "6991c1af7c8d2c8efee81b22ba97024781824aaa",
+ "shasum": ""
+ },
+ "require": {
+ "laminas/laminas-zendframework-bridge": "^1.0",
+ "php": "^5.6 || ^7.0",
+ "psr/http-message": "^1.0"
+ },
+ "provide": {
+ "psr/http-message-implementation": "1.0"
+ },
+ "replace": {
+ "zendframework/zend-diactoros": "~1.8.7.0"
+ },
+ "require-dev": {
+ "ext-dom": "*",
+ "ext-libxml": "*",
+ "laminas/laminas-coding-standard": "~1.0",
+ "php-http/psr7-integration-tests": "dev-master",
+ "phpunit/phpunit": "^5.7.16 || ^6.0.8 || ^7.2.7"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-release-1.8": "1.8.x-dev"
+ }
+ },
+ "autoload": {
+ "files": [
+ "src/functions/create_uploaded_file.php",
+ "src/functions/marshal_headers_from_sapi.php",
+ "src/functions/marshal_method_from_sapi.php",
+ "src/functions/marshal_protocol_version_from_sapi.php",
+ "src/functions/marshal_uri_from_sapi.php",
+ "src/functions/normalize_server.php",
+ "src/functions/normalize_uploaded_files.php",
+ "src/functions/parse_cookie_header.php",
+ "src/functions/create_uploaded_file.legacy.php",
+ "src/functions/marshal_headers_from_sapi.legacy.php",
+ "src/functions/marshal_method_from_sapi.legacy.php",
+ "src/functions/marshal_protocol_version_from_sapi.legacy.php",
+ "src/functions/marshal_uri_from_sapi.legacy.php",
+ "src/functions/normalize_server.legacy.php",
+ "src/functions/normalize_uploaded_files.legacy.php",
+ "src/functions/parse_cookie_header.legacy.php"
+ ],
+ "psr-4": {
+ "Laminas\\Diactoros\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "description": "PSR HTTP Message implementations",
+ "homepage": "https://laminas.dev",
+ "keywords": [
+ "http",
+ "laminas",
+ "psr",
+ "psr-7"
+ ],
+ "time": "2020-03-23T15:28:28+00:00"
+ },
+ {
+ "name": "laminas/laminas-escaper",
+ "version": "2.6.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/laminas/laminas-escaper.git",
+ "reference": "25f2a053eadfa92ddacb609dcbbc39362610da70"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/laminas/laminas-escaper/zipball/25f2a053eadfa92ddacb609dcbbc39362610da70",
+ "reference": "25f2a053eadfa92ddacb609dcbbc39362610da70",
+ "shasum": ""
+ },
+ "require": {
+ "laminas/laminas-zendframework-bridge": "^1.0",
+ "php": "^5.6 || ^7.0"
+ },
+ "replace": {
+ "zendframework/zend-escaper": "self.version"
+ },
+ "require-dev": {
+ "laminas/laminas-coding-standard": "~1.0.0",
+ "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.6.x-dev",
+ "dev-develop": "2.7.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Laminas\\Escaper\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "description": "Securely and safely escape HTML, HTML attributes, JavaScript, CSS, and URLs",
+ "homepage": "https://laminas.dev",
+ "keywords": [
+ "escaper",
+ "laminas"
+ ],
+ "time": "2019-12-31T16:43:30+00:00"
+ },
+ {
+ "name": "laminas/laminas-feed",
+ "version": "2.12.2",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/laminas/laminas-feed.git",
+ "reference": "8a193ac96ebcb3e16b6ee754ac2a889eefacb654"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/laminas/laminas-feed/zipball/8a193ac96ebcb3e16b6ee754ac2a889eefacb654",
+ "reference": "8a193ac96ebcb3e16b6ee754ac2a889eefacb654",
+ "shasum": ""
+ },
+ "require": {
+ "ext-dom": "*",
+ "ext-libxml": "*",
+ "laminas/laminas-escaper": "^2.5.2",
+ "laminas/laminas-stdlib": "^3.2.1",
+ "laminas/laminas-zendframework-bridge": "^1.0",
+ "php": "^5.6 || ^7.0"
+ },
+ "replace": {
+ "zendframework/zend-feed": "^2.12.0"
+ },
+ "require-dev": {
+ "laminas/laminas-cache": "^2.7.2",
+ "laminas/laminas-coding-standard": "~1.0.0",
+ "laminas/laminas-db": "^2.8.2",
+ "laminas/laminas-http": "^2.7",
+ "laminas/laminas-servicemanager": "^2.7.8 || ^3.3",
+ "laminas/laminas-validator": "^2.10.1",
+ "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.20",
+ "psr/http-message": "^1.0.1"
+ },
+ "suggest": {
+ "laminas/laminas-cache": "Laminas\\Cache component, for optionally caching feeds between requests",
+ "laminas/laminas-db": "Laminas\\Db component, for use with PubSubHubbub",
+ "laminas/laminas-http": "Laminas\\Http for PubSubHubbub, and optionally for use with Laminas\\Feed\\Reader",
+ "laminas/laminas-servicemanager": "Laminas\\ServiceManager component, for easily extending ExtensionManager implementations",
+ "laminas/laminas-validator": "Laminas\\Validator component, for validating email addresses used in Atom feeds and entries when using the Writer subcomponent",
+ "psr/http-message": "PSR-7 ^1.0.1, if you wish to use Laminas\\Feed\\Reader\\Http\\Psr7ResponseDecorator"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.12.x-dev",
+ "dev-develop": "2.13.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Laminas\\Feed\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "description": "provides functionality for consuming RSS and Atom feeds",
+ "homepage": "https://laminas.dev",
+ "keywords": [
+ "feed",
+ "laminas"
+ ],
+ "time": "2020-03-29T12:36:29+00:00"
+ },
+ {
+ "name": "laminas/laminas-stdlib",
+ "version": "3.2.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/laminas/laminas-stdlib.git",
+ "reference": "2b18347625a2f06a1a485acfbc870f699dbe51c6"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/laminas/laminas-stdlib/zipball/2b18347625a2f06a1a485acfbc870f699dbe51c6",
+ "reference": "2b18347625a2f06a1a485acfbc870f699dbe51c6",
+ "shasum": ""
+ },
+ "require": {
+ "laminas/laminas-zendframework-bridge": "^1.0",
+ "php": "^5.6 || ^7.0"
+ },
+ "replace": {
+ "zendframework/zend-stdlib": "self.version"
+ },
+ "require-dev": {
+ "laminas/laminas-coding-standard": "~1.0.0",
+ "phpbench/phpbench": "^0.13",
+ "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "3.2.x-dev",
+ "dev-develop": "3.3.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Laminas\\Stdlib\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "description": "SPL extensions, array utilities, error handlers, and more",
+ "homepage": "https://laminas.dev",
+ "keywords": [
+ "laminas",
+ "stdlib"
+ ],
+ "time": "2019-12-31T17:51:15+00:00"
+ },
+ {
+ "name": "laminas/laminas-zendframework-bridge",
+ "version": "1.0.4",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/laminas/laminas-zendframework-bridge.git",
+ "reference": "fcd87520e4943d968557803919523772475e8ea3"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/laminas/laminas-zendframework-bridge/zipball/fcd87520e4943d968557803919523772475e8ea3",
+ "reference": "fcd87520e4943d968557803919523772475e8ea3",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^5.6 || ^7.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^5.7 || ^6.5 || ^7.5 || ^8.1",
+ "squizlabs/php_codesniffer": "^3.5"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0.x-dev",
+ "dev-develop": "1.1.x-dev"
+ },
+ "laminas": {
+ "module": "Laminas\\ZendFrameworkBridge"
+ }
+ },
+ "autoload": {
+ "files": [
+ "src/autoload.php"
+ ],
+ "psr-4": {
+ "Laminas\\ZendFrameworkBridge\\": "src//"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "description": "Alias legacy ZF class names to Laminas Project equivalents.",
+ "keywords": [
+ "ZendFramework",
+ "autoloading",
+ "laminas",
+ "zf"
+ ],
+ "time": "2020-05-20T16:45:56+00:00"
+ },
{
"name": "league/container",
"version": "2.4.1",
@@ -10053,16 +10356,16 @@
},
{
"name": "pear/console_getopt",
- "version": "v1.4.2",
+ "version": "v1.4.3",
"source": {
"type": "git",
"url": "https://github.com/pear/Console_Getopt.git",
- "reference": "6c77aeb625b32bd752e89ee17972d103588b90c0"
+ "reference": "a41f8d3e668987609178c7c4a9fe48fecac53fa0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/pear/Console_Getopt/zipball/6c77aeb625b32bd752e89ee17972d103588b90c0",
- "reference": "6c77aeb625b32bd752e89ee17972d103588b90c0",
+ "url": "https://api.github.com/repos/pear/Console_Getopt/zipball/a41f8d3e668987609178c7c4a9fe48fecac53fa0",
+ "reference": "a41f8d3e668987609178c7c4a9fe48fecac53fa0",
"shasum": ""
},
"type": "library",
@@ -10079,11 +10382,6 @@
"BSD-2-Clause"
],
"authors": [
- {
- "name": "Greg Beaver",
- "email": "cellog@php.net",
- "role": "Helper"
- },
{
"name": "Andrei Zmievski",
"email": "andrei@php.net",
@@ -10093,10 +10391,15 @@
"name": "Stig Bakken",
"email": "stig@php.net",
"role": "Developer"
+ },
+ {
+ "name": "Greg Beaver",
+ "email": "cellog@php.net",
+ "role": "Helper"
}
],
"description": "More info available on: http://pear.php.net/package/Console_Getopt",
- "time": "2019-02-06T16:52:33+00:00"
+ "time": "2019-11-20T18:27:48+00:00"
},
{
"name": "pear/console_table",
@@ -10155,16 +10458,16 @@
},
{
"name": "pear/pear-core-minimal",
- "version": "v1.10.9",
+ "version": "v1.10.10",
"source": {
"type": "git",
"url": "https://github.com/pear/pear-core-minimal.git",
- "reference": "742be8dd68c746a01e4b0a422258e9c9cae1c37f"
+ "reference": "625a3c429d9b2c1546438679074cac1b089116a7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/pear/pear-core-minimal/zipball/742be8dd68c746a01e4b0a422258e9c9cae1c37f",
- "reference": "742be8dd68c746a01e4b0a422258e9c9cae1c37f",
+ "url": "https://api.github.com/repos/pear/pear-core-minimal/zipball/625a3c429d9b2c1546438679074cac1b089116a7",
+ "reference": "625a3c429d9b2c1546438679074cac1b089116a7",
"shasum": ""
},
"require": {
@@ -10195,20 +10498,20 @@
}
],
"description": "Minimal set of PEAR core files to be used as composer dependency",
- "time": "2019-03-13T18:15:44+00:00"
+ "time": "2019-11-19T19:00:24+00:00"
},
{
"name": "pear/pear_exception",
- "version": "v1.0.0",
+ "version": "v1.0.1",
"source": {
"type": "git",
"url": "https://github.com/pear/PEAR_Exception.git",
- "reference": "8c18719fdae000b690e3912be401c76e406dd13b"
+ "reference": "dbb42a5a0e45f3adcf99babfb2a1ba77b8ac36a7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/pear/PEAR_Exception/zipball/8c18719fdae000b690e3912be401c76e406dd13b",
- "reference": "8c18719fdae000b690e3912be401c76e406dd13b",
+ "url": "https://api.github.com/repos/pear/PEAR_Exception/zipball/dbb42a5a0e45f3adcf99babfb2a1ba77b8ac36a7",
+ "reference": "dbb42a5a0e45f3adcf99babfb2a1ba77b8ac36a7",
"shasum": ""
},
"require": {
@@ -10224,9 +10527,9 @@
}
},
"autoload": {
- "psr-0": {
- "PEAR": ""
- }
+ "classmap": [
+ "PEAR/"
+ ]
},
"notification-url": "https://packagist.org/downloads/",
"include-path": [
@@ -10250,7 +10553,7 @@
"keywords": [
"exception"
],
- "time": "2015-02-10T20:07:52+00:00"
+ "time": "2019-12-10T10:24:42+00:00"
},
{
"name": "psr/container",
@@ -10353,16 +10656,16 @@
},
{
"name": "psr/log",
- "version": "1.1.0",
+ "version": "1.1.3",
"source": {
"type": "git",
"url": "https://github.com/php-fig/log.git",
- "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd"
+ "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-fig/log/zipball/6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
- "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
+ "url": "https://api.github.com/repos/php-fig/log/zipball/0f73288fd15629204f9d42b7055f72dacbe811fc",
+ "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc",
"shasum": ""
},
"require": {
@@ -10371,7 +10674,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.0.x-dev"
+ "dev-master": "1.1.x-dev"
}
},
"autoload": {
@@ -10396,7 +10699,7 @@
"psr",
"psr-3"
],
- "time": "2018-11-20T15:27:04+00:00"
+ "time": "2020-03-23T09:12:05+00:00"
},
{
"name": "psy/psysh",
@@ -10894,16 +11197,16 @@
},
{
"name": "symfony/class-loader",
- "version": "v3.4.35",
+ "version": "v3.4.41",
"source": {
"type": "git",
"url": "https://github.com/symfony/class-loader.git",
- "reference": "e212b06996819a2bce026a63da03b7182d05a690"
+ "reference": "e4636a4f23f157278a19e5db160c63de0da297d8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/class-loader/zipball/e212b06996819a2bce026a63da03b7182d05a690",
- "reference": "e212b06996819a2bce026a63da03b7182d05a690",
+ "url": "https://api.github.com/repos/symfony/class-loader/zipball/e4636a4f23f157278a19e5db160c63de0da297d8",
+ "reference": "e4636a4f23f157278a19e5db160c63de0da297d8",
"shasum": ""
},
"require": {
@@ -10946,7 +11249,7 @@
],
"description": "Symfony ClassLoader Component",
"homepage": "https://symfony.com",
- "time": "2019-08-20T13:31:17+00:00"
+ "time": "2020-03-15T09:38:08+00:00"
},
{
"name": "symfony/config",
@@ -11014,16 +11317,16 @@
},
{
"name": "symfony/console",
- "version": "v3.4.35",
+ "version": "v3.4.41",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
- "reference": "17b154f932c5874cdbda6d05796b6490eec9f9f7"
+ "reference": "bfe29ead7e7b1cc9ce74c6a40d06ad1f96fced13"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/17b154f932c5874cdbda6d05796b6490eec9f9f7",
- "reference": "17b154f932c5874cdbda6d05796b6490eec9f9f7",
+ "url": "https://api.github.com/repos/symfony/console/zipball/bfe29ead7e7b1cc9ce74c6a40d06ad1f96fced13",
+ "reference": "bfe29ead7e7b1cc9ce74c6a40d06ad1f96fced13",
"shasum": ""
},
"require": {
@@ -11082,7 +11385,7 @@
],
"description": "Symfony Console Component",
"homepage": "https://symfony.com",
- "time": "2019-11-13T07:12:39+00:00"
+ "time": "2020-05-30T18:58:05+00:00"
},
{
"name": "symfony/css-selector",
@@ -11139,16 +11442,16 @@
},
{
"name": "symfony/debug",
- "version": "v3.4.35",
+ "version": "v3.4.41",
"source": {
"type": "git",
"url": "https://github.com/symfony/debug.git",
- "reference": "f72e33fdb1170b326e72c3157f0cd456351dd086"
+ "reference": "518c6a00d0872da30bd06aee3ea59a0a5cf54d6d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/debug/zipball/f72e33fdb1170b326e72c3157f0cd456351dd086",
- "reference": "f72e33fdb1170b326e72c3157f0cd456351dd086",
+ "url": "https://api.github.com/repos/symfony/debug/zipball/518c6a00d0872da30bd06aee3ea59a0a5cf54d6d",
+ "reference": "518c6a00d0872da30bd06aee3ea59a0a5cf54d6d",
"shasum": ""
},
"require": {
@@ -11191,20 +11494,20 @@
],
"description": "Symfony Debug Component",
"homepage": "https://symfony.com",
- "time": "2019-10-24T15:33:53+00:00"
+ "time": "2020-05-22T18:25:20+00:00"
},
{
"name": "symfony/dependency-injection",
- "version": "v3.4.35",
+ "version": "v3.4.41",
"source": {
"type": "git",
"url": "https://github.com/symfony/dependency-injection.git",
- "reference": "0ea4d39ca82409a25a43b61ce828048a90000920"
+ "reference": "e39380b7104b0ec538a075ae919f00c7e5267bac"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/0ea4d39ca82409a25a43b61ce828048a90000920",
- "reference": "0ea4d39ca82409a25a43b61ce828048a90000920",
+ "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/e39380b7104b0ec538a075ae919f00c7e5267bac",
+ "reference": "e39380b7104b0ec538a075ae919f00c7e5267bac",
"shasum": ""
},
"require": {
@@ -11262,7 +11565,7 @@
],
"description": "Symfony DependencyInjection Component",
"homepage": "https://symfony.com",
- "time": "2019-11-08T16:18:30+00:00"
+ "time": "2020-05-30T21:06:01+00:00"
},
{
"name": "symfony/dom-crawler",
@@ -11323,16 +11626,16 @@
},
{
"name": "symfony/event-dispatcher",
- "version": "v3.4.35",
+ "version": "v3.4.41",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
- "reference": "f9031c22ec127d4a2450760f81a8677fe8a10177"
+ "reference": "14d978f8e8555f2de719c00eb65376be7d2e9081"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/f9031c22ec127d4a2450760f81a8677fe8a10177",
- "reference": "f9031c22ec127d4a2450760f81a8677fe8a10177",
+ "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/14d978f8e8555f2de719c00eb65376be7d2e9081",
+ "reference": "14d978f8e8555f2de719c00eb65376be7d2e9081",
"shasum": ""
},
"require": {
@@ -11382,7 +11685,7 @@
],
"description": "Symfony EventDispatcher Component",
"homepage": "https://symfony.com",
- "time": "2019-10-24T15:33:53+00:00"
+ "time": "2020-05-05T15:06:23+00:00"
},
{
"name": "symfony/filesystem",
@@ -11485,16 +11788,16 @@
},
{
"name": "symfony/http-foundation",
- "version": "v3.4.35",
+ "version": "v3.4.41",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-foundation.git",
- "reference": "9e4b3ac8fa3348b4811674d23de32d201de225ce"
+ "reference": "fbd216d2304b1a3fe38d6392b04729c8dd356359"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-foundation/zipball/9e4b3ac8fa3348b4811674d23de32d201de225ce",
- "reference": "9e4b3ac8fa3348b4811674d23de32d201de225ce",
+ "url": "https://api.github.com/repos/symfony/http-foundation/zipball/fbd216d2304b1a3fe38d6392b04729c8dd356359",
+ "reference": "fbd216d2304b1a3fe38d6392b04729c8dd356359",
"shasum": ""
},
"require": {
@@ -11535,20 +11838,20 @@
],
"description": "Symfony HttpFoundation Component",
"homepage": "https://symfony.com",
- "time": "2019-11-11T12:53:10+00:00"
+ "time": "2020-05-16T13:15:54+00:00"
},
{
"name": "symfony/http-kernel",
- "version": "v3.4.35",
+ "version": "v3.4.41",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-kernel.git",
- "reference": "e1764b3de00ec5636dd03d02fd44bcb1147d70d9"
+ "reference": "e4e4ed6c008c983645b4eee6b67d8f258cde54df"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-kernel/zipball/e1764b3de00ec5636dd03d02fd44bcb1147d70d9",
- "reference": "e1764b3de00ec5636dd03d02fd44bcb1147d70d9",
+ "url": "https://api.github.com/repos/symfony/http-kernel/zipball/e4e4ed6c008c983645b4eee6b67d8f258cde54df",
+ "reference": "e4e4ed6c008c983645b4eee6b67d8f258cde54df",
"shasum": ""
},
"require": {
@@ -11625,20 +11928,20 @@
],
"description": "Symfony HttpKernel Component",
"homepage": "https://symfony.com",
- "time": "2019-11-13T08:44:50+00:00"
+ "time": "2020-05-31T05:14:17+00:00"
},
{
"name": "symfony/polyfill-ctype",
- "version": "v1.12.0",
+ "version": "v1.17.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-ctype.git",
- "reference": "550ebaac289296ce228a706d0867afc34687e3f4"
+ "reference": "e94c8b1bbe2bc77507a1056cdb06451c75b427f9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/550ebaac289296ce228a706d0867afc34687e3f4",
- "reference": "550ebaac289296ce228a706d0867afc34687e3f4",
+ "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e94c8b1bbe2bc77507a1056cdb06451c75b427f9",
+ "reference": "e94c8b1bbe2bc77507a1056cdb06451c75b427f9",
"shasum": ""
},
"require": {
@@ -11650,7 +11953,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.12-dev"
+ "dev-master": "1.17-dev"
}
},
"autoload": {
@@ -11683,20 +11986,20 @@
"polyfill",
"portable"
],
- "time": "2019-08-06T08:03:45+00:00"
+ "time": "2020-05-12T16:14:59+00:00"
},
{
"name": "symfony/polyfill-iconv",
- "version": "v1.12.0",
+ "version": "v1.17.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-iconv.git",
- "reference": "685968b11e61a347c18bf25db32effa478be610f"
+ "reference": "c4de7601eefbf25f9d47190abe07f79fe0a27424"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/685968b11e61a347c18bf25db32effa478be610f",
- "reference": "685968b11e61a347c18bf25db32effa478be610f",
+ "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/c4de7601eefbf25f9d47190abe07f79fe0a27424",
+ "reference": "c4de7601eefbf25f9d47190abe07f79fe0a27424",
"shasum": ""
},
"require": {
@@ -11708,7 +12011,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.12-dev"
+ "dev-master": "1.17-dev"
}
},
"autoload": {
@@ -11742,20 +12045,82 @@
"portable",
"shim"
],
- "time": "2019-08-06T08:03:45+00:00"
+ "time": "2020-05-12T16:47:27+00:00"
+ },
+ {
+ "name": "symfony/polyfill-intl-idn",
+ "version": "v1.17.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/polyfill-intl-idn.git",
+ "reference": "3bff59ea7047e925be6b7f2059d60af31bb46d6a"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/3bff59ea7047e925be6b7f2059d60af31bb46d6a",
+ "reference": "3bff59ea7047e925be6b7f2059d60af31bb46d6a",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.3",
+ "symfony/polyfill-mbstring": "^1.3",
+ "symfony/polyfill-php72": "^1.10"
+ },
+ "suggest": {
+ "ext-intl": "For best performance"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.17-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Symfony\\Polyfill\\Intl\\Idn\\": ""
+ },
+ "files": [
+ "bootstrap.php"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Laurent Bassin",
+ "email": "laurent@bassin.info"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
+ }
+ ],
+ "description": "Symfony polyfill for intl's idn_to_ascii and idn_to_utf8 functions",
+ "homepage": "https://symfony.com",
+ "keywords": [
+ "compatibility",
+ "idn",
+ "intl",
+ "polyfill",
+ "portable",
+ "shim"
+ ],
+ "time": "2020-05-12T16:47:27+00:00"
},
{
"name": "symfony/polyfill-mbstring",
- "version": "v1.12.0",
+ "version": "v1.17.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
- "reference": "b42a2f66e8f1b15ccf25652c3424265923eb4f17"
+ "reference": "fa79b11539418b02fc5e1897267673ba2c19419c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/b42a2f66e8f1b15ccf25652c3424265923eb4f17",
- "reference": "b42a2f66e8f1b15ccf25652c3424265923eb4f17",
+ "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fa79b11539418b02fc5e1897267673ba2c19419c",
+ "reference": "fa79b11539418b02fc5e1897267673ba2c19419c",
"shasum": ""
},
"require": {
@@ -11767,7 +12132,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.12-dev"
+ "dev-master": "1.17-dev"
}
},
"autoload": {
@@ -11801,20 +12166,20 @@
"portable",
"shim"
],
- "time": "2019-08-06T08:03:45+00:00"
+ "time": "2020-05-12T16:47:27+00:00"
},
{
"name": "symfony/polyfill-php56",
- "version": "v1.12.0",
+ "version": "v1.17.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php56.git",
- "reference": "0e3b212e96a51338639d8ce175c046d7729c3403"
+ "reference": "e3c8c138280cdfe4b81488441555583aa1984e23"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/0e3b212e96a51338639d8ce175c046d7729c3403",
- "reference": "0e3b212e96a51338639d8ce175c046d7729c3403",
+ "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/e3c8c138280cdfe4b81488441555583aa1984e23",
+ "reference": "e3c8c138280cdfe4b81488441555583aa1984e23",
"shasum": ""
},
"require": {
@@ -11824,7 +12189,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.12-dev"
+ "dev-master": "1.17-dev"
}
},
"autoload": {
@@ -11857,20 +12222,20 @@
"portable",
"shim"
],
- "time": "2019-08-06T08:03:45+00:00"
+ "time": "2020-05-12T16:47:27+00:00"
},
{
"name": "symfony/polyfill-php70",
- "version": "v1.12.0",
+ "version": "v1.17.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php70.git",
- "reference": "54b4c428a0054e254223797d2713c31e08610831"
+ "reference": "82225c2d7d23d7e70515496d249c0152679b468e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/54b4c428a0054e254223797d2713c31e08610831",
- "reference": "54b4c428a0054e254223797d2713c31e08610831",
+ "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/82225c2d7d23d7e70515496d249c0152679b468e",
+ "reference": "82225c2d7d23d7e70515496d249c0152679b468e",
"shasum": ""
},
"require": {
@@ -11880,7 +12245,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.12-dev"
+ "dev-master": "1.17-dev"
}
},
"autoload": {
@@ -11916,20 +12281,75 @@
"portable",
"shim"
],
- "time": "2019-08-06T08:03:45+00:00"
+ "time": "2020-05-12T16:47:27+00:00"
+ },
+ {
+ "name": "symfony/polyfill-php72",
+ "version": "v1.17.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/polyfill-php72.git",
+ "reference": "f048e612a3905f34931127360bdd2def19a5e582"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/f048e612a3905f34931127360bdd2def19a5e582",
+ "reference": "f048e612a3905f34931127360bdd2def19a5e582",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.3"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.17-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Symfony\\Polyfill\\Php72\\": ""
+ },
+ "files": [
+ "bootstrap.php"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Nicolas Grekas",
+ "email": "p@tchwork.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
+ }
+ ],
+ "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions",
+ "homepage": "https://symfony.com",
+ "keywords": [
+ "compatibility",
+ "polyfill",
+ "portable",
+ "shim"
+ ],
+ "time": "2020-05-12T16:47:27+00:00"
},
{
"name": "symfony/polyfill-util",
- "version": "v1.12.0",
+ "version": "v1.17.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-util.git",
- "reference": "4317de1386717b4c22caed7725350a8887ab205c"
+ "reference": "4afb4110fc037752cf0ce9869f9ab8162c4e20d7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/4317de1386717b4c22caed7725350a8887ab205c",
- "reference": "4317de1386717b4c22caed7725350a8887ab205c",
+ "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/4afb4110fc037752cf0ce9869f9ab8162c4e20d7",
+ "reference": "4afb4110fc037752cf0ce9869f9ab8162c4e20d7",
"shasum": ""
},
"require": {
@@ -11938,7 +12358,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.12-dev"
+ "dev-master": "1.17-dev"
}
},
"autoload": {
@@ -11968,20 +12388,20 @@
"polyfill",
"shim"
],
- "time": "2019-08-06T08:03:45+00:00"
+ "time": "2020-05-12T16:14:59+00:00"
},
{
"name": "symfony/process",
- "version": "v3.4.35",
+ "version": "v3.4.41",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
- "reference": "c19da50bc3e8fa7d60628fdb4ab5d67de534cf3e"
+ "reference": "8a895f0c92a7c4b10db95139bcff71bdf66d4d21"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/process/zipball/c19da50bc3e8fa7d60628fdb4ab5d67de534cf3e",
- "reference": "c19da50bc3e8fa7d60628fdb4ab5d67de534cf3e",
+ "url": "https://api.github.com/repos/symfony/process/zipball/8a895f0c92a7c4b10db95139bcff71bdf66d4d21",
+ "reference": "8a895f0c92a7c4b10db95139bcff71bdf66d4d21",
"shasum": ""
},
"require": {
@@ -12017,7 +12437,7 @@
],
"description": "Symfony Process Component",
"homepage": "https://symfony.com",
- "time": "2019-10-24T15:33:53+00:00"
+ "time": "2020-05-23T17:05:51+00:00"
},
{
"name": "symfony/psr-http-message-bridge",
@@ -12084,16 +12504,16 @@
},
{
"name": "symfony/routing",
- "version": "v3.4.35",
+ "version": "v3.4.41",
"source": {
"type": "git",
"url": "https://github.com/symfony/routing.git",
- "reference": "afc10b9c6b5196e0fecbc3bd373c7b4482e5b6b5"
+ "reference": "e0d43b6f9417ad59ecaa8e2f799b79eef417387f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/routing/zipball/afc10b9c6b5196e0fecbc3bd373c7b4482e5b6b5",
- "reference": "afc10b9c6b5196e0fecbc3bd373c7b4482e5b6b5",
+ "url": "https://api.github.com/repos/symfony/routing/zipball/e0d43b6f9417ad59ecaa8e2f799b79eef417387f",
+ "reference": "e0d43b6f9417ad59ecaa8e2f799b79eef417387f",
"shasum": ""
},
"require": {
@@ -12156,20 +12576,20 @@
"uri",
"url"
],
- "time": "2019-11-08T17:25:00+00:00"
+ "time": "2020-05-30T19:50:06+00:00"
},
{
"name": "symfony/serializer",
- "version": "v3.4.35",
+ "version": "v3.4.41",
"source": {
"type": "git",
"url": "https://github.com/symfony/serializer.git",
- "reference": "9d14f7ff2c585a8a9f6f980253066285ddc2f675"
+ "reference": "0db90db012b1b0a04fbb2d64ae9160871cad9d4f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/serializer/zipball/9d14f7ff2c585a8a9f6f980253066285ddc2f675",
- "reference": "9d14f7ff2c585a8a9f6f980253066285ddc2f675",
+ "url": "https://api.github.com/repos/symfony/serializer/zipball/0db90db012b1b0a04fbb2d64ae9160871cad9d4f",
+ "reference": "0db90db012b1b0a04fbb2d64ae9160871cad9d4f",
"shasum": ""
},
"require": {
@@ -12235,20 +12655,20 @@
],
"description": "Symfony Serializer Component",
"homepage": "https://symfony.com",
- "time": "2019-11-12T17:51:12+00:00"
+ "time": "2020-05-30T18:58:05+00:00"
},
{
"name": "symfony/translation",
- "version": "v3.4.35",
+ "version": "v3.4.41",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation.git",
- "reference": "2031c895bc97ac1787d418d90bd1ed7d299f2772"
+ "reference": "b0cd62ef0ff7ec31b67d78d7fc818e2bda4e844f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/translation/zipball/2031c895bc97ac1787d418d90bd1ed7d299f2772",
- "reference": "2031c895bc97ac1787d418d90bd1ed7d299f2772",
+ "url": "https://api.github.com/repos/symfony/translation/zipball/b0cd62ef0ff7ec31b67d78d7fc818e2bda4e844f",
+ "reference": "b0cd62ef0ff7ec31b67d78d7fc818e2bda4e844f",
"shasum": ""
},
"require": {
@@ -12305,20 +12725,20 @@
],
"description": "Symfony Translation Component",
"homepage": "https://symfony.com",
- "time": "2019-10-30T12:43:22+00:00"
+ "time": "2020-05-30T18:58:05+00:00"
},
{
"name": "symfony/validator",
- "version": "v3.4.35",
+ "version": "v3.4.41",
"source": {
"type": "git",
"url": "https://github.com/symfony/validator.git",
- "reference": "b11f45742c5c9a228cedc46b70c6317780a1ac80"
+ "reference": "5fb88120a11a75e17b602103a893dd8b27804529"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/validator/zipball/b11f45742c5c9a228cedc46b70c6317780a1ac80",
- "reference": "b11f45742c5c9a228cedc46b70c6317780a1ac80",
+ "url": "https://api.github.com/repos/symfony/validator/zipball/5fb88120a11a75e17b602103a893dd8b27804529",
+ "reference": "5fb88120a11a75e17b602103a893dd8b27804529",
"shasum": ""
},
"require": {
@@ -12391,7 +12811,7 @@
],
"description": "Symfony Validator Component",
"homepage": "https://symfony.com",
- "time": "2019-11-05T22:03:38+00:00"
+ "time": "2020-05-30T18:43:38+00:00"
},
{
"name": "symfony/var-dumper",
@@ -12464,16 +12884,16 @@
},
{
"name": "symfony/yaml",
- "version": "v3.4.35",
+ "version": "v3.4.41",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
- "reference": "dab657db15207879217fc81df4f875947bf68804"
+ "reference": "7233ac2bfdde24d672f5305f2b3f6b5d741ef8eb"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/yaml/zipball/dab657db15207879217fc81df4f875947bf68804",
- "reference": "dab657db15207879217fc81df4f875947bf68804",
+ "url": "https://api.github.com/repos/symfony/yaml/zipball/7233ac2bfdde24d672f5305f2b3f6b5d741ef8eb",
+ "reference": "7233ac2bfdde24d672f5305f2b3f6b5d741ef8eb",
"shasum": ""
},
"require": {
@@ -12519,7 +12939,7 @@
],
"description": "Symfony Yaml Component",
"homepage": "https://symfony.com",
- "time": "2019-10-24T15:33:53+00:00"
+ "time": "2020-05-11T07:51:54+00:00"
},
{
"name": "twig/extensions",
@@ -12578,16 +12998,16 @@
},
{
"name": "twig/twig",
- "version": "v1.42.3",
+ "version": "v1.42.5",
"source": {
"type": "git",
"url": "https://github.com/twigphp/Twig.git",
- "reference": "201baee843e0ffe8b0b956f336dd42b2a92fae4e"
+ "reference": "87b2ea9d8f6fd014d0621ca089bb1b3769ea3f8e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/twigphp/Twig/zipball/201baee843e0ffe8b0b956f336dd42b2a92fae4e",
- "reference": "201baee843e0ffe8b0b956f336dd42b2a92fae4e",
+ "url": "https://api.github.com/repos/twigphp/Twig/zipball/87b2ea9d8f6fd014d0621ca089bb1b3769ea3f8e",
+ "reference": "87b2ea9d8f6fd014d0621ca089bb1b3769ea3f8e",
"shasum": ""
},
"require": {
@@ -12596,8 +13016,7 @@
},
"require-dev": {
"psr/container": "^1.0",
- "symfony/debug": "^3.4|^4.2",
- "symfony/phpunit-bridge": "^4.4@dev|^5.0"
+ "symfony/phpunit-bridge": "^4.4|^5.0"
},
"type": "library",
"extra": {
@@ -12626,7 +13045,6 @@
},
{
"name": "Twig Team",
- "homepage": "https://twig.symfony.com/contributors",
"role": "Contributors"
},
{
@@ -12640,20 +13058,20 @@
"keywords": [
"templating"
],
- "time": "2019-08-24T12:51:03+00:00"
+ "time": "2020-02-11T05:59:23+00:00"
},
{
"name": "typo3/phar-stream-wrapper",
- "version": "v3.1.3",
+ "version": "v3.1.4",
"source": {
"type": "git",
"url": "https://github.com/TYPO3/phar-stream-wrapper.git",
- "reference": "586ff60beea128e069a5dc271d3d8133a9bc460a"
+ "reference": "e0c1b495cfac064f4f5c4bcb6bf67bb7f345ed04"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/TYPO3/phar-stream-wrapper/zipball/586ff60beea128e069a5dc271d3d8133a9bc460a",
- "reference": "586ff60beea128e069a5dc271d3d8133a9bc460a",
+ "url": "https://api.github.com/repos/TYPO3/phar-stream-wrapper/zipball/e0c1b495cfac064f4f5c4bcb6bf67bb7f345ed04",
+ "reference": "e0c1b495cfac064f4f5c4bcb6bf67bb7f345ed04",
"shasum": ""
},
"require": {
@@ -12690,7 +13108,7 @@
"security",
"stream-wrapper"
],
- "time": "2019-10-18T11:57:16+00:00"
+ "time": "2019-12-10T11:53:27+00:00"
},
{
"name": "webflo/drupal-finder",
@@ -12912,226 +13330,6 @@
],
"description": "Composer plugin to improve composer performance for Drupal projects",
"time": "2019-02-20T10:00:17+00:00"
- },
- {
- "name": "zendframework/zend-diactoros",
- "version": "1.8.7",
- "source": {
- "type": "git",
- "url": "https://github.com/zendframework/zend-diactoros.git",
- "reference": "a85e67b86e9b8520d07e6415fcbcb8391b44a75b"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/a85e67b86e9b8520d07e6415fcbcb8391b44a75b",
- "reference": "a85e67b86e9b8520d07e6415fcbcb8391b44a75b",
- "shasum": ""
- },
- "require": {
- "php": "^5.6 || ^7.0",
- "psr/http-message": "^1.0"
- },
- "provide": {
- "psr/http-message-implementation": "1.0"
- },
- "require-dev": {
- "ext-dom": "*",
- "ext-libxml": "*",
- "php-http/psr7-integration-tests": "dev-master",
- "phpunit/phpunit": "^5.7.16 || ^6.0.8 || ^7.2.7",
- "zendframework/zend-coding-standard": "~1.0"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-release-1.8": "1.8.x-dev"
- }
- },
- "autoload": {
- "files": [
- "src/functions/create_uploaded_file.php",
- "src/functions/marshal_headers_from_sapi.php",
- "src/functions/marshal_method_from_sapi.php",
- "src/functions/marshal_protocol_version_from_sapi.php",
- "src/functions/marshal_uri_from_sapi.php",
- "src/functions/normalize_server.php",
- "src/functions/normalize_uploaded_files.php",
- "src/functions/parse_cookie_header.php"
- ],
- "psr-4": {
- "Zend\\Diactoros\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-2-Clause"
- ],
- "description": "PSR HTTP Message implementations",
- "homepage": "https://github.com/zendframework/zend-diactoros",
- "keywords": [
- "http",
- "psr",
- "psr-7"
- ],
- "abandoned": "laminas/laminas-diactoros",
- "time": "2019-08-06T17:53:53+00:00"
- },
- {
- "name": "zendframework/zend-escaper",
- "version": "2.6.1",
- "source": {
- "type": "git",
- "url": "https://github.com/zendframework/zend-escaper.git",
- "reference": "3801caa21b0ca6aca57fa1c42b08d35c395ebd5f"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-escaper/zipball/3801caa21b0ca6aca57fa1c42b08d35c395ebd5f",
- "reference": "3801caa21b0ca6aca57fa1c42b08d35c395ebd5f",
- "shasum": ""
- },
- "require": {
- "php": "^5.6 || ^7.0"
- },
- "require-dev": {
- "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2",
- "zendframework/zend-coding-standard": "~1.0.0"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.6.x-dev",
- "dev-develop": "2.7.x-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Zend\\Escaper\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "description": "Securely and safely escape HTML, HTML attributes, JavaScript, CSS, and URLs",
- "keywords": [
- "ZendFramework",
- "escaper",
- "zf"
- ],
- "abandoned": "laminas/laminas-escaper",
- "time": "2019-09-05T20:03:20+00:00"
- },
- {
- "name": "zendframework/zend-feed",
- "version": "2.12.0",
- "source": {
- "type": "git",
- "url": "https://github.com/zendframework/zend-feed.git",
- "reference": "d926c5af34b93a0121d5e2641af34ddb1533d733"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-feed/zipball/d926c5af34b93a0121d5e2641af34ddb1533d733",
- "reference": "d926c5af34b93a0121d5e2641af34ddb1533d733",
- "shasum": ""
- },
- "require": {
- "ext-dom": "*",
- "ext-libxml": "*",
- "php": "^5.6 || ^7.0",
- "zendframework/zend-escaper": "^2.5.2",
- "zendframework/zend-stdlib": "^3.2.1"
- },
- "require-dev": {
- "phpunit/phpunit": "^5.7.23 || ^6.4.3",
- "psr/http-message": "^1.0.1",
- "zendframework/zend-cache": "^2.7.2",
- "zendframework/zend-coding-standard": "~1.0.0",
- "zendframework/zend-db": "^2.8.2",
- "zendframework/zend-http": "^2.7",
- "zendframework/zend-servicemanager": "^2.7.8 || ^3.3",
- "zendframework/zend-validator": "^2.10.1"
- },
- "suggest": {
- "psr/http-message": "PSR-7 ^1.0.1, if you wish to use Zend\\Feed\\Reader\\Http\\Psr7ResponseDecorator",
- "zendframework/zend-cache": "Zend\\Cache component, for optionally caching feeds between requests",
- "zendframework/zend-db": "Zend\\Db component, for use with PubSubHubbub",
- "zendframework/zend-http": "Zend\\Http for PubSubHubbub, and optionally for use with Zend\\Feed\\Reader",
- "zendframework/zend-servicemanager": "Zend\\ServiceManager component, for easily extending ExtensionManager implementations",
- "zendframework/zend-validator": "Zend\\Validator component, for validating email addresses used in Atom feeds and entries when using the Writer subcomponent"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.12.x-dev",
- "dev-develop": "2.13.x-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Zend\\Feed\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "description": "provides functionality for consuming RSS and Atom feeds",
- "keywords": [
- "ZendFramework",
- "feed",
- "zf"
- ],
- "abandoned": "laminas/laminas-feed",
- "time": "2019-03-05T20:08:49+00:00"
- },
- {
- "name": "zendframework/zend-stdlib",
- "version": "3.2.1",
- "source": {
- "type": "git",
- "url": "https://github.com/zendframework/zend-stdlib.git",
- "reference": "66536006722aff9e62d1b331025089b7ec71c065"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/66536006722aff9e62d1b331025089b7ec71c065",
- "reference": "66536006722aff9e62d1b331025089b7ec71c065",
- "shasum": ""
- },
- "require": {
- "php": "^5.6 || ^7.0"
- },
- "require-dev": {
- "phpbench/phpbench": "^0.13",
- "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2",
- "zendframework/zend-coding-standard": "~1.0.0"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "3.2.x-dev",
- "dev-develop": "3.3.x-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Zend\\Stdlib\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "description": "SPL extensions, array utilities, error handlers, and more",
- "keywords": [
- "ZendFramework",
- "stdlib",
- "zf"
- ],
- "abandoned": "laminas/laminas-stdlib",
- "time": "2018-08-28T21:34:05+00:00"
}
],
"packages-dev": [],
@@ -13149,6 +13347,5 @@
"platform-dev": [],
"platform-overrides": {
"php": "7.0.8"
- },
- "plugin-api-version": "1.1.0"
+ }
}
diff --git a/vendor/asm89/stack-cors/composer.json b/vendor/asm89/stack-cors/composer.json
index 643053868e..b629bf199a 100644
--- a/vendor/asm89/stack-cors/composer.json
+++ b/vendor/asm89/stack-cors/composer.json
@@ -13,8 +13,8 @@
],
"require": {
"php": ">=5.5.9",
- "symfony/http-foundation": "~2.7|~3.0|~4.0",
- "symfony/http-kernel": "~2.7|~3.0|~4.0"
+ "symfony/http-foundation": "~2.7|~3.0|~4.0|~5.0",
+ "symfony/http-kernel": "~2.7|~3.0|~4.0|~5.0"
},
"require-dev": {
"phpunit/phpunit": "^5.0 || ^4.8.10",
diff --git a/vendor/asm89/stack-cors/src/Asm89/Stack/CorsService.php b/vendor/asm89/stack-cors/src/Asm89/Stack/CorsService.php
index ccf5d58cae..3ce324a922 100644
--- a/vendor/asm89/stack-cors/src/Asm89/Stack/CorsService.php
+++ b/vendor/asm89/stack-cors/src/Asm89/Stack/CorsService.php
@@ -130,6 +130,8 @@ private function buildPreflightCheckResponse(Request $request)
: implode(', ', $this->options['allowedHeaders']);
$response->headers->set('Access-Control-Allow-Headers', $allowHeaders);
+ $response->setStatusCode(204);
+
return $response;
}
diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php
index 60b29f5914..715ab9ec38 100644
--- a/vendor/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@@ -208,6 +208,7 @@
'Composer\\Installers\\MagentoInstaller' => $vendorDir . '/composer/installers/src/Composer/Installers/MagentoInstaller.php',
'Composer\\Installers\\MajimaInstaller' => $vendorDir . '/composer/installers/src/Composer/Installers/MajimaInstaller.php',
'Composer\\Installers\\MakoInstaller' => $vendorDir . '/composer/installers/src/Composer/Installers/MakoInstaller.php',
+ 'Composer\\Installers\\MantisBTInstaller' => $vendorDir . '/composer/installers/src/Composer/Installers/MantisBTInstaller.php',
'Composer\\Installers\\MauticInstaller' => $vendorDir . '/composer/installers/src/Composer/Installers/MauticInstaller.php',
'Composer\\Installers\\MayaInstaller' => $vendorDir . '/composer/installers/src/Composer/Installers/MayaInstaller.php',
'Composer\\Installers\\MediaWikiInstaller' => $vendorDir . '/composer/installers/src/Composer/Installers/MediaWikiInstaller.php',
@@ -239,6 +240,7 @@
'Composer\\Installers\\SilverStripeInstaller' => $vendorDir . '/composer/installers/src/Composer/Installers/SilverStripeInstaller.php',
'Composer\\Installers\\SiteDirectInstaller' => $vendorDir . '/composer/installers/src/Composer/Installers/SiteDirectInstaller.php',
'Composer\\Installers\\SyDESInstaller' => $vendorDir . '/composer/installers/src/Composer/Installers/SyDESInstaller.php',
+ 'Composer\\Installers\\SyliusInstaller' => $vendorDir . '/composer/installers/src/Composer/Installers/SyliusInstaller.php',
'Composer\\Installers\\Symfony1Installer' => $vendorDir . '/composer/installers/src/Composer/Installers/Symfony1Installer.php',
'Composer\\Installers\\TYPO3CmsInstaller' => $vendorDir . '/composer/installers/src/Composer/Installers/TYPO3CmsInstaller.php',
'Composer\\Installers\\TYPO3FlowInstaller' => $vendorDir . '/composer/installers/src/Composer/Installers/TYPO3FlowInstaller.php',
@@ -1346,6 +1348,7 @@
'Drupal\\Core\\Asset\\JsCollectionOptimizer' => $baseDir . '/web/core/lib/Drupal/Core/Asset/JsCollectionOptimizer.php',
'Drupal\\Core\\Asset\\JsCollectionRenderer' => $baseDir . '/web/core/lib/Drupal/Core/Asset/JsCollectionRenderer.php',
'Drupal\\Core\\Asset\\JsOptimizer' => $baseDir . '/web/core/lib/Drupal/Core/Asset/JsOptimizer.php',
+ 'Drupal\\Core\\Asset\\LibrariesDirectoryFileFinder' => $baseDir . '/web/core/lib/Drupal/Core/Asset/LibrariesDirectoryFileFinder.php',
'Drupal\\Core\\Asset\\LibraryDependencyResolver' => $baseDir . '/web/core/lib/Drupal/Core/Asset/LibraryDependencyResolver.php',
'Drupal\\Core\\Asset\\LibraryDependencyResolverInterface' => $baseDir . '/web/core/lib/Drupal/Core/Asset/LibraryDependencyResolverInterface.php',
'Drupal\\Core\\Asset\\LibraryDiscovery' => $baseDir . '/web/core/lib/Drupal/Core/Asset/LibraryDiscovery.php',
@@ -1417,6 +1420,7 @@
'Drupal\\Core\\Cache\\Context\\PagersCacheContext' => $baseDir . '/web/core/lib/Drupal/Core/Cache/Context/PagersCacheContext.php',
'Drupal\\Core\\Cache\\Context\\PathCacheContext' => $baseDir . '/web/core/lib/Drupal/Core/Cache/Context/PathCacheContext.php',
'Drupal\\Core\\Cache\\Context\\PathParentCacheContext' => $baseDir . '/web/core/lib/Drupal/Core/Cache/Context/PathParentCacheContext.php',
+ 'Drupal\\Core\\Cache\\Context\\ProtocolVersionCacheContext' => $baseDir . '/web/core/lib/Drupal/Core/Cache/Context/ProtocolVersionCacheContext.php',
'Drupal\\Core\\Cache\\Context\\QueryArgsCacheContext' => $baseDir . '/web/core/lib/Drupal/Core/Cache/Context/QueryArgsCacheContext.php',
'Drupal\\Core\\Cache\\Context\\RequestFormatCacheContext' => $baseDir . '/web/core/lib/Drupal/Core/Cache/Context/RequestFormatCacheContext.php',
'Drupal\\Core\\Cache\\Context\\RequestStackCacheContextBase' => $baseDir . '/web/core/lib/Drupal/Core/Cache/Context/RequestStackCacheContextBase.php',
@@ -1742,7 +1746,9 @@
'Drupal\\Core\\Entity\\EntityAccessControlHandler' => $baseDir . '/web/core/lib/Drupal/Core/Entity/EntityAccessControlHandler.php',
'Drupal\\Core\\Entity\\EntityAccessControlHandlerInterface' => $baseDir . '/web/core/lib/Drupal/Core/Entity/EntityAccessControlHandlerInterface.php',
'Drupal\\Core\\Entity\\EntityAutocompleteMatcher' => $baseDir . '/web/core/lib/Drupal/Core/Entity/EntityAutocompleteMatcher.php',
+ 'Drupal\\Core\\Entity\\EntityAutocompleteMatcherInterface' => $baseDir . '/web/core/lib/Drupal/Core/Entity/EntityAutocompleteMatcherInterface.php',
'Drupal\\Core\\Entity\\EntityBase' => $baseDir . '/web/core/lib/Drupal/Core/Entity/EntityBase.php',
+ 'Drupal\\Core\\Entity\\EntityBundleAccessCheck' => $baseDir . '/web/core/lib/Drupal/Core/Entity/EntityBundleAccessCheck.php',
'Drupal\\Core\\Entity\\EntityBundleListener' => $baseDir . '/web/core/lib/Drupal/Core/Entity/EntityBundleListener.php',
'Drupal\\Core\\Entity\\EntityBundleListenerInterface' => $baseDir . '/web/core/lib/Drupal/Core/Entity/EntityBundleListenerInterface.php',
'Drupal\\Core\\Entity\\EntityChangedInterface' => $baseDir . '/web/core/lib/Drupal/Core/Entity/EntityChangedInterface.php',
@@ -1977,6 +1983,7 @@
'Drupal\\Core\\Extension\\ModuleHandlerInterface' => $baseDir . '/web/core/lib/Drupal/Core/Extension/ModuleHandlerInterface.php',
'Drupal\\Core\\Extension\\ModuleInstaller' => $baseDir . '/web/core/lib/Drupal/Core/Extension/ModuleInstaller.php',
'Drupal\\Core\\Extension\\ModuleInstallerInterface' => $baseDir . '/web/core/lib/Drupal/Core/Extension/ModuleInstallerInterface.php',
+ 'Drupal\\Core\\Extension\\ModuleRequiredByThemesUninstallValidator' => $baseDir . '/web/core/lib/Drupal/Core/Extension/ModuleRequiredByThemesUninstallValidator.php',
'Drupal\\Core\\Extension\\ModuleUninstallValidatorException' => $baseDir . '/web/core/lib/Drupal/Core/Extension/ModuleUninstallValidatorException.php',
'Drupal\\Core\\Extension\\ModuleUninstallValidatorInterface' => $baseDir . '/web/core/lib/Drupal/Core/Extension/ModuleUninstallValidatorInterface.php',
'Drupal\\Core\\Extension\\ProfileExtensionList' => $baseDir . '/web/core/lib/Drupal/Core/Extension/ProfileExtensionList.php',
@@ -2147,6 +2154,7 @@
'Drupal\\Core\\Form\\OptGroup' => $baseDir . '/web/core/lib/Drupal/Core/Form/OptGroup.php',
'Drupal\\Core\\Form\\SubformState' => $baseDir . '/web/core/lib/Drupal/Core/Form/SubformState.php',
'Drupal\\Core\\Form\\SubformStateInterface' => $baseDir . '/web/core/lib/Drupal/Core/Form/SubformStateInterface.php',
+ 'Drupal\\Core\\GeneratedButton' => $baseDir . '/web/core/lib/Drupal/Core/GeneratedButton.php',
'Drupal\\Core\\GeneratedLink' => $baseDir . '/web/core/lib/Drupal/Core/GeneratedLink.php',
'Drupal\\Core\\GeneratedNoLink' => $baseDir . '/web/core/lib/Drupal/Core/GeneratedNoLink.php',
'Drupal\\Core\\GeneratedUrl' => $baseDir . '/web/core/lib/Drupal/Core/GeneratedUrl.php',
@@ -2399,6 +2407,7 @@
'Drupal\\Core\\ProxyClass\\Cron' => $baseDir . '/web/core/lib/Drupal/Core/ProxyClass/Cron.php',
'Drupal\\Core\\ProxyClass\\Entity\\ContentUninstallValidator' => $baseDir . '/web/core/lib/Drupal/Core/ProxyClass/Entity/ContentUninstallValidator.php',
'Drupal\\Core\\ProxyClass\\Extension\\ModuleInstaller' => $baseDir . '/web/core/lib/Drupal/Core/ProxyClass/Extension/ModuleInstaller.php',
+ 'Drupal\\Core\\ProxyClass\\Extension\\ModuleRequiredByThemesUninstallValidator' => $baseDir . '/web/core/lib/Drupal/Core/ProxyClass/Extension/ModuleRequiredByThemesUninstallValidator.php',
'Drupal\\Core\\ProxyClass\\Extension\\RequiredModuleUninstallValidator' => $baseDir . '/web/core/lib/Drupal/Core/ProxyClass/Extension/RequiredModuleUninstallValidator.php',
'Drupal\\Core\\ProxyClass\\File\\MimeType\\ExtensionMimeTypeGuesser' => $baseDir . '/web/core/lib/Drupal/Core/ProxyClass/File/MimeType/ExtensionMimeTypeGuesser.php',
'Drupal\\Core\\ProxyClass\\File\\MimeType\\MimeTypeGuesser' => $baseDir . '/web/core/lib/Drupal/Core/ProxyClass/File/MimeType/MimeTypeGuesser.php',
@@ -3182,6 +3191,7 @@
'GuzzleHttp\\Exception\\ClientException' => $vendorDir . '/guzzlehttp/guzzle/src/Exception/ClientException.php',
'GuzzleHttp\\Exception\\ConnectException' => $vendorDir . '/guzzlehttp/guzzle/src/Exception/ConnectException.php',
'GuzzleHttp\\Exception\\GuzzleException' => $vendorDir . '/guzzlehttp/guzzle/src/Exception/GuzzleException.php',
+ 'GuzzleHttp\\Exception\\InvalidArgumentException' => $vendorDir . '/guzzlehttp/guzzle/src/Exception/InvalidArgumentException.php',
'GuzzleHttp\\Exception\\RequestException' => $vendorDir . '/guzzlehttp/guzzle/src/Exception/RequestException.php',
'GuzzleHttp\\Exception\\SeekException' => $vendorDir . '/guzzlehttp/guzzle/src/Exception/SeekException.php',
'GuzzleHttp\\Exception\\ServerException' => $vendorDir . '/guzzlehttp/guzzle/src/Exception/ServerException.php',
@@ -3240,6 +3250,7 @@
'GuzzleHttp\\RetryMiddleware' => $vendorDir . '/guzzlehttp/guzzle/src/RetryMiddleware.php',
'GuzzleHttp\\TransferStats' => $vendorDir . '/guzzlehttp/guzzle/src/TransferStats.php',
'GuzzleHttp\\UriTemplate' => $vendorDir . '/guzzlehttp/guzzle/src/UriTemplate.php',
+ 'GuzzleHttp\\Utils' => $vendorDir . '/guzzlehttp/guzzle/src/Utils.php',
'Interop\\Container\\ContainerInterface' => $vendorDir . '/container-interop/container-interop/src/Interop/Container/ContainerInterface.php',
'Interop\\Container\\Exception\\ContainerException' => $vendorDir . '/container-interop/container-interop/src/Interop/Container/Exception/ContainerException.php',
'Interop\\Container\\Exception\\NotFoundException' => $vendorDir . '/container-interop/container-interop/src/Interop/Container/Exception/NotFoundException.php',
@@ -3250,6 +3261,210 @@
'JakubOnderka\\PhpConsoleColor\\ConsoleColor' => $vendorDir . '/jakub-onderka/php-console-color/src/ConsoleColor.php',
'JakubOnderka\\PhpConsoleColor\\InvalidStyleException' => $vendorDir . '/jakub-onderka/php-console-color/src/InvalidStyleException.php',
'JakubOnderka\\PhpConsoleHighlighter\\Highlighter' => $vendorDir . '/jakub-onderka/php-console-highlighter/src/Highlighter.php',
+ 'Laminas\\Diactoros\\AbstractSerializer' => $vendorDir . '/laminas/laminas-diactoros/src/AbstractSerializer.php',
+ 'Laminas\\Diactoros\\CallbackStream' => $vendorDir . '/laminas/laminas-diactoros/src/CallbackStream.php',
+ 'Laminas\\Diactoros\\Exception\\DeprecatedMethodException' => $vendorDir . '/laminas/laminas-diactoros/src/Exception/DeprecatedMethodException.php',
+ 'Laminas\\Diactoros\\Exception\\ExceptionInterface' => $vendorDir . '/laminas/laminas-diactoros/src/Exception/ExceptionInterface.php',
+ 'Laminas\\Diactoros\\HeaderSecurity' => $vendorDir . '/laminas/laminas-diactoros/src/HeaderSecurity.php',
+ 'Laminas\\Diactoros\\MessageTrait' => $vendorDir . '/laminas/laminas-diactoros/src/MessageTrait.php',
+ 'Laminas\\Diactoros\\PhpInputStream' => $vendorDir . '/laminas/laminas-diactoros/src/PhpInputStream.php',
+ 'Laminas\\Diactoros\\RelativeStream' => $vendorDir . '/laminas/laminas-diactoros/src/RelativeStream.php',
+ 'Laminas\\Diactoros\\Request' => $vendorDir . '/laminas/laminas-diactoros/src/Request.php',
+ 'Laminas\\Diactoros\\RequestTrait' => $vendorDir . '/laminas/laminas-diactoros/src/RequestTrait.php',
+ 'Laminas\\Diactoros\\Request\\ArraySerializer' => $vendorDir . '/laminas/laminas-diactoros/src/Request/ArraySerializer.php',
+ 'Laminas\\Diactoros\\Request\\Serializer' => $vendorDir . '/laminas/laminas-diactoros/src/Request/Serializer.php',
+ 'Laminas\\Diactoros\\Response' => $vendorDir . '/laminas/laminas-diactoros/src/Response.php',
+ 'Laminas\\Diactoros\\Response\\ArraySerializer' => $vendorDir . '/laminas/laminas-diactoros/src/Response/ArraySerializer.php',
+ 'Laminas\\Diactoros\\Response\\EmitterInterface' => $vendorDir . '/laminas/laminas-diactoros/src/Response/EmitterInterface.php',
+ 'Laminas\\Diactoros\\Response\\EmptyResponse' => $vendorDir . '/laminas/laminas-diactoros/src/Response/EmptyResponse.php',
+ 'Laminas\\Diactoros\\Response\\HtmlResponse' => $vendorDir . '/laminas/laminas-diactoros/src/Response/HtmlResponse.php',
+ 'Laminas\\Diactoros\\Response\\InjectContentTypeTrait' => $vendorDir . '/laminas/laminas-diactoros/src/Response/InjectContentTypeTrait.php',
+ 'Laminas\\Diactoros\\Response\\JsonResponse' => $vendorDir . '/laminas/laminas-diactoros/src/Response/JsonResponse.php',
+ 'Laminas\\Diactoros\\Response\\RedirectResponse' => $vendorDir . '/laminas/laminas-diactoros/src/Response/RedirectResponse.php',
+ 'Laminas\\Diactoros\\Response\\SapiEmitter' => $vendorDir . '/laminas/laminas-diactoros/src/Response/SapiEmitter.php',
+ 'Laminas\\Diactoros\\Response\\SapiEmitterTrait' => $vendorDir . '/laminas/laminas-diactoros/src/Response/SapiEmitterTrait.php',
+ 'Laminas\\Diactoros\\Response\\SapiStreamEmitter' => $vendorDir . '/laminas/laminas-diactoros/src/Response/SapiStreamEmitter.php',
+ 'Laminas\\Diactoros\\Response\\Serializer' => $vendorDir . '/laminas/laminas-diactoros/src/Response/Serializer.php',
+ 'Laminas\\Diactoros\\Response\\TextResponse' => $vendorDir . '/laminas/laminas-diactoros/src/Response/TextResponse.php',
+ 'Laminas\\Diactoros\\Response\\XmlResponse' => $vendorDir . '/laminas/laminas-diactoros/src/Response/XmlResponse.php',
+ 'Laminas\\Diactoros\\Server' => $vendorDir . '/laminas/laminas-diactoros/src/Server.php',
+ 'Laminas\\Diactoros\\ServerRequest' => $vendorDir . '/laminas/laminas-diactoros/src/ServerRequest.php',
+ 'Laminas\\Diactoros\\ServerRequestFactory' => $vendorDir . '/laminas/laminas-diactoros/src/ServerRequestFactory.php',
+ 'Laminas\\Diactoros\\Stream' => $vendorDir . '/laminas/laminas-diactoros/src/Stream.php',
+ 'Laminas\\Diactoros\\UploadedFile' => $vendorDir . '/laminas/laminas-diactoros/src/UploadedFile.php',
+ 'Laminas\\Diactoros\\Uri' => $vendorDir . '/laminas/laminas-diactoros/src/Uri.php',
+ 'Laminas\\Escaper\\Escaper' => $vendorDir . '/laminas/laminas-escaper/src/Escaper.php',
+ 'Laminas\\Escaper\\Exception\\ExceptionInterface' => $vendorDir . '/laminas/laminas-escaper/src/Exception/ExceptionInterface.php',
+ 'Laminas\\Escaper\\Exception\\InvalidArgumentException' => $vendorDir . '/laminas/laminas-escaper/src/Exception/InvalidArgumentException.php',
+ 'Laminas\\Escaper\\Exception\\RuntimeException' => $vendorDir . '/laminas/laminas-escaper/src/Exception/RuntimeException.php',
+ 'Laminas\\Feed\\Exception\\BadMethodCallException' => $vendorDir . '/laminas/laminas-feed/src/Exception/BadMethodCallException.php',
+ 'Laminas\\Feed\\Exception\\ExceptionInterface' => $vendorDir . '/laminas/laminas-feed/src/Exception/ExceptionInterface.php',
+ 'Laminas\\Feed\\Exception\\InvalidArgumentException' => $vendorDir . '/laminas/laminas-feed/src/Exception/InvalidArgumentException.php',
+ 'Laminas\\Feed\\Exception\\RuntimeException' => $vendorDir . '/laminas/laminas-feed/src/Exception/RuntimeException.php',
+ 'Laminas\\Feed\\PubSubHubbub\\AbstractCallback' => $vendorDir . '/laminas/laminas-feed/src/PubSubHubbub/AbstractCallback.php',
+ 'Laminas\\Feed\\PubSubHubbub\\CallbackInterface' => $vendorDir . '/laminas/laminas-feed/src/PubSubHubbub/CallbackInterface.php',
+ 'Laminas\\Feed\\PubSubHubbub\\Exception\\ExceptionInterface' => $vendorDir . '/laminas/laminas-feed/src/PubSubHubbub/Exception/ExceptionInterface.php',
+ 'Laminas\\Feed\\PubSubHubbub\\Exception\\InvalidArgumentException' => $vendorDir . '/laminas/laminas-feed/src/PubSubHubbub/Exception/InvalidArgumentException.php',
+ 'Laminas\\Feed\\PubSubHubbub\\Exception\\RuntimeException' => $vendorDir . '/laminas/laminas-feed/src/PubSubHubbub/Exception/RuntimeException.php',
+ 'Laminas\\Feed\\PubSubHubbub\\HttpResponse' => $vendorDir . '/laminas/laminas-feed/src/PubSubHubbub/HttpResponse.php',
+ 'Laminas\\Feed\\PubSubHubbub\\Model\\AbstractModel' => $vendorDir . '/laminas/laminas-feed/src/PubSubHubbub/Model/AbstractModel.php',
+ 'Laminas\\Feed\\PubSubHubbub\\Model\\Subscription' => $vendorDir . '/laminas/laminas-feed/src/PubSubHubbub/Model/Subscription.php',
+ 'Laminas\\Feed\\PubSubHubbub\\Model\\SubscriptionPersistenceInterface' => $vendorDir . '/laminas/laminas-feed/src/PubSubHubbub/Model/SubscriptionPersistenceInterface.php',
+ 'Laminas\\Feed\\PubSubHubbub\\PubSubHubbub' => $vendorDir . '/laminas/laminas-feed/src/PubSubHubbub/PubSubHubbub.php',
+ 'Laminas\\Feed\\PubSubHubbub\\Publisher' => $vendorDir . '/laminas/laminas-feed/src/PubSubHubbub/Publisher.php',
+ 'Laminas\\Feed\\PubSubHubbub\\Subscriber' => $vendorDir . '/laminas/laminas-feed/src/PubSubHubbub/Subscriber.php',
+ 'Laminas\\Feed\\PubSubHubbub\\Subscriber\\Callback' => $vendorDir . '/laminas/laminas-feed/src/PubSubHubbub/Subscriber/Callback.php',
+ 'Laminas\\Feed\\PubSubHubbub\\Version' => $vendorDir . '/laminas/laminas-feed/src/PubSubHubbub/Version.php',
+ 'Laminas\\Feed\\Reader\\AbstractEntry' => $vendorDir . '/laminas/laminas-feed/src/Reader/AbstractEntry.php',
+ 'Laminas\\Feed\\Reader\\AbstractFeed' => $vendorDir . '/laminas/laminas-feed/src/Reader/AbstractFeed.php',
+ 'Laminas\\Feed\\Reader\\Collection' => $vendorDir . '/laminas/laminas-feed/src/Reader/Collection.php',
+ 'Laminas\\Feed\\Reader\\Collection\\AbstractCollection' => $vendorDir . '/laminas/laminas-feed/src/Reader/Collection/AbstractCollection.php',
+ 'Laminas\\Feed\\Reader\\Collection\\Author' => $vendorDir . '/laminas/laminas-feed/src/Reader/Collection/Author.php',
+ 'Laminas\\Feed\\Reader\\Collection\\Category' => $vendorDir . '/laminas/laminas-feed/src/Reader/Collection/Category.php',
+ 'Laminas\\Feed\\Reader\\Collection\\Collection' => $vendorDir . '/laminas/laminas-feed/src/Reader/Collection/Collection.php',
+ 'Laminas\\Feed\\Reader\\Entry\\AbstractEntry' => $vendorDir . '/laminas/laminas-feed/src/Reader/Entry/AbstractEntry.php',
+ 'Laminas\\Feed\\Reader\\Entry\\Atom' => $vendorDir . '/laminas/laminas-feed/src/Reader/Entry/Atom.php',
+ 'Laminas\\Feed\\Reader\\Entry\\EntryInterface' => $vendorDir . '/laminas/laminas-feed/src/Reader/Entry/EntryInterface.php',
+ 'Laminas\\Feed\\Reader\\Entry\\Rss' => $vendorDir . '/laminas/laminas-feed/src/Reader/Entry/Rss.php',
+ 'Laminas\\Feed\\Reader\\Exception\\BadMethodCallException' => $vendorDir . '/laminas/laminas-feed/src/Reader/Exception/BadMethodCallException.php',
+ 'Laminas\\Feed\\Reader\\Exception\\ExceptionInterface' => $vendorDir . '/laminas/laminas-feed/src/Reader/Exception/ExceptionInterface.php',
+ 'Laminas\\Feed\\Reader\\Exception\\InvalidArgumentException' => $vendorDir . '/laminas/laminas-feed/src/Reader/Exception/InvalidArgumentException.php',
+ 'Laminas\\Feed\\Reader\\Exception\\InvalidHttpClientException' => $vendorDir . '/laminas/laminas-feed/src/Reader/Exception/InvalidHttpClientException.php',
+ 'Laminas\\Feed\\Reader\\Exception\\RuntimeException' => $vendorDir . '/laminas/laminas-feed/src/Reader/Exception/RuntimeException.php',
+ 'Laminas\\Feed\\Reader\\ExtensionManager' => $vendorDir . '/laminas/laminas-feed/src/Reader/ExtensionManager.php',
+ 'Laminas\\Feed\\Reader\\ExtensionManagerInterface' => $vendorDir . '/laminas/laminas-feed/src/Reader/ExtensionManagerInterface.php',
+ 'Laminas\\Feed\\Reader\\ExtensionPluginManager' => $vendorDir . '/laminas/laminas-feed/src/Reader/ExtensionPluginManager.php',
+ 'Laminas\\Feed\\Reader\\Extension\\AbstractEntry' => $vendorDir . '/laminas/laminas-feed/src/Reader/Extension/AbstractEntry.php',
+ 'Laminas\\Feed\\Reader\\Extension\\AbstractFeed' => $vendorDir . '/laminas/laminas-feed/src/Reader/Extension/AbstractFeed.php',
+ 'Laminas\\Feed\\Reader\\Extension\\Atom\\Entry' => $vendorDir . '/laminas/laminas-feed/src/Reader/Extension/Atom/Entry.php',
+ 'Laminas\\Feed\\Reader\\Extension\\Atom\\Feed' => $vendorDir . '/laminas/laminas-feed/src/Reader/Extension/Atom/Feed.php',
+ 'Laminas\\Feed\\Reader\\Extension\\Content\\Entry' => $vendorDir . '/laminas/laminas-feed/src/Reader/Extension/Content/Entry.php',
+ 'Laminas\\Feed\\Reader\\Extension\\CreativeCommons\\Entry' => $vendorDir . '/laminas/laminas-feed/src/Reader/Extension/CreativeCommons/Entry.php',
+ 'Laminas\\Feed\\Reader\\Extension\\CreativeCommons\\Feed' => $vendorDir . '/laminas/laminas-feed/src/Reader/Extension/CreativeCommons/Feed.php',
+ 'Laminas\\Feed\\Reader\\Extension\\DublinCore\\Entry' => $vendorDir . '/laminas/laminas-feed/src/Reader/Extension/DublinCore/Entry.php',
+ 'Laminas\\Feed\\Reader\\Extension\\DublinCore\\Feed' => $vendorDir . '/laminas/laminas-feed/src/Reader/Extension/DublinCore/Feed.php',
+ 'Laminas\\Feed\\Reader\\Extension\\GooglePlayPodcast\\Entry' => $vendorDir . '/laminas/laminas-feed/src/Reader/Extension/GooglePlayPodcast/Entry.php',
+ 'Laminas\\Feed\\Reader\\Extension\\GooglePlayPodcast\\Feed' => $vendorDir . '/laminas/laminas-feed/src/Reader/Extension/GooglePlayPodcast/Feed.php',
+ 'Laminas\\Feed\\Reader\\Extension\\Podcast\\Entry' => $vendorDir . '/laminas/laminas-feed/src/Reader/Extension/Podcast/Entry.php',
+ 'Laminas\\Feed\\Reader\\Extension\\Podcast\\Feed' => $vendorDir . '/laminas/laminas-feed/src/Reader/Extension/Podcast/Feed.php',
+ 'Laminas\\Feed\\Reader\\Extension\\Slash\\Entry' => $vendorDir . '/laminas/laminas-feed/src/Reader/Extension/Slash/Entry.php',
+ 'Laminas\\Feed\\Reader\\Extension\\Syndication\\Feed' => $vendorDir . '/laminas/laminas-feed/src/Reader/Extension/Syndication/Feed.php',
+ 'Laminas\\Feed\\Reader\\Extension\\Thread\\Entry' => $vendorDir . '/laminas/laminas-feed/src/Reader/Extension/Thread/Entry.php',
+ 'Laminas\\Feed\\Reader\\Extension\\WellFormedWeb\\Entry' => $vendorDir . '/laminas/laminas-feed/src/Reader/Extension/WellFormedWeb/Entry.php',
+ 'Laminas\\Feed\\Reader\\FeedSet' => $vendorDir . '/laminas/laminas-feed/src/Reader/FeedSet.php',
+ 'Laminas\\Feed\\Reader\\Feed\\AbstractFeed' => $vendorDir . '/laminas/laminas-feed/src/Reader/Feed/AbstractFeed.php',
+ 'Laminas\\Feed\\Reader\\Feed\\Atom' => $vendorDir . '/laminas/laminas-feed/src/Reader/Feed/Atom.php',
+ 'Laminas\\Feed\\Reader\\Feed\\Atom\\Source' => $vendorDir . '/laminas/laminas-feed/src/Reader/Feed/Atom/Source.php',
+ 'Laminas\\Feed\\Reader\\Feed\\FeedInterface' => $vendorDir . '/laminas/laminas-feed/src/Reader/Feed/FeedInterface.php',
+ 'Laminas\\Feed\\Reader\\Feed\\Rss' => $vendorDir . '/laminas/laminas-feed/src/Reader/Feed/Rss.php',
+ 'Laminas\\Feed\\Reader\\Http\\ClientInterface' => $vendorDir . '/laminas/laminas-feed/src/Reader/Http/ClientInterface.php',
+ 'Laminas\\Feed\\Reader\\Http\\HeaderAwareClientInterface' => $vendorDir . '/laminas/laminas-feed/src/Reader/Http/HeaderAwareClientInterface.php',
+ 'Laminas\\Feed\\Reader\\Http\\HeaderAwareResponseInterface' => $vendorDir . '/laminas/laminas-feed/src/Reader/Http/HeaderAwareResponseInterface.php',
+ 'Laminas\\Feed\\Reader\\Http\\LaminasHttpClientDecorator' => $vendorDir . '/laminas/laminas-feed/src/Reader/Http/LaminasHttpClientDecorator.php',
+ 'Laminas\\Feed\\Reader\\Http\\Psr7ResponseDecorator' => $vendorDir . '/laminas/laminas-feed/src/Reader/Http/Psr7ResponseDecorator.php',
+ 'Laminas\\Feed\\Reader\\Http\\Response' => $vendorDir . '/laminas/laminas-feed/src/Reader/Http/Response.php',
+ 'Laminas\\Feed\\Reader\\Http\\ResponseInterface' => $vendorDir . '/laminas/laminas-feed/src/Reader/Http/ResponseInterface.php',
+ 'Laminas\\Feed\\Reader\\Reader' => $vendorDir . '/laminas/laminas-feed/src/Reader/Reader.php',
+ 'Laminas\\Feed\\Reader\\ReaderImportInterface' => $vendorDir . '/laminas/laminas-feed/src/Reader/ReaderImportInterface.php',
+ 'Laminas\\Feed\\Reader\\StandaloneExtensionManager' => $vendorDir . '/laminas/laminas-feed/src/Reader/StandaloneExtensionManager.php',
+ 'Laminas\\Feed\\Uri' => $vendorDir . '/laminas/laminas-feed/src/Uri.php',
+ 'Laminas\\Feed\\Writer\\AbstractFeed' => $vendorDir . '/laminas/laminas-feed/src/Writer/AbstractFeed.php',
+ 'Laminas\\Feed\\Writer\\Deleted' => $vendorDir . '/laminas/laminas-feed/src/Writer/Deleted.php',
+ 'Laminas\\Feed\\Writer\\Entry' => $vendorDir . '/laminas/laminas-feed/src/Writer/Entry.php',
+ 'Laminas\\Feed\\Writer\\Exception\\BadMethodCallException' => $vendorDir . '/laminas/laminas-feed/src/Writer/Exception/BadMethodCallException.php',
+ 'Laminas\\Feed\\Writer\\Exception\\ExceptionInterface' => $vendorDir . '/laminas/laminas-feed/src/Writer/Exception/ExceptionInterface.php',
+ 'Laminas\\Feed\\Writer\\Exception\\InvalidArgumentException' => $vendorDir . '/laminas/laminas-feed/src/Writer/Exception/InvalidArgumentException.php',
+ 'Laminas\\Feed\\Writer\\Exception\\RuntimeException' => $vendorDir . '/laminas/laminas-feed/src/Writer/Exception/RuntimeException.php',
+ 'Laminas\\Feed\\Writer\\ExtensionManager' => $vendorDir . '/laminas/laminas-feed/src/Writer/ExtensionManager.php',
+ 'Laminas\\Feed\\Writer\\ExtensionManagerInterface' => $vendorDir . '/laminas/laminas-feed/src/Writer/ExtensionManagerInterface.php',
+ 'Laminas\\Feed\\Writer\\ExtensionPluginManager' => $vendorDir . '/laminas/laminas-feed/src/Writer/ExtensionPluginManager.php',
+ 'Laminas\\Feed\\Writer\\Extension\\AbstractRenderer' => $vendorDir . '/laminas/laminas-feed/src/Writer/Extension/AbstractRenderer.php',
+ 'Laminas\\Feed\\Writer\\Extension\\Atom\\Renderer\\Feed' => $vendorDir . '/laminas/laminas-feed/src/Writer/Extension/Atom/Renderer/Feed.php',
+ 'Laminas\\Feed\\Writer\\Extension\\Content\\Renderer\\Entry' => $vendorDir . '/laminas/laminas-feed/src/Writer/Extension/Content/Renderer/Entry.php',
+ 'Laminas\\Feed\\Writer\\Extension\\DublinCore\\Renderer\\Entry' => $vendorDir . '/laminas/laminas-feed/src/Writer/Extension/DublinCore/Renderer/Entry.php',
+ 'Laminas\\Feed\\Writer\\Extension\\DublinCore\\Renderer\\Feed' => $vendorDir . '/laminas/laminas-feed/src/Writer/Extension/DublinCore/Renderer/Feed.php',
+ 'Laminas\\Feed\\Writer\\Extension\\GooglePlayPodcast\\Entry' => $vendorDir . '/laminas/laminas-feed/src/Writer/Extension/GooglePlayPodcast/Entry.php',
+ 'Laminas\\Feed\\Writer\\Extension\\GooglePlayPodcast\\Feed' => $vendorDir . '/laminas/laminas-feed/src/Writer/Extension/GooglePlayPodcast/Feed.php',
+ 'Laminas\\Feed\\Writer\\Extension\\GooglePlayPodcast\\Renderer\\Entry' => $vendorDir . '/laminas/laminas-feed/src/Writer/Extension/GooglePlayPodcast/Renderer/Entry.php',
+ 'Laminas\\Feed\\Writer\\Extension\\GooglePlayPodcast\\Renderer\\Feed' => $vendorDir . '/laminas/laminas-feed/src/Writer/Extension/GooglePlayPodcast/Renderer/Feed.php',
+ 'Laminas\\Feed\\Writer\\Extension\\ITunes\\Entry' => $vendorDir . '/laminas/laminas-feed/src/Writer/Extension/ITunes/Entry.php',
+ 'Laminas\\Feed\\Writer\\Extension\\ITunes\\Feed' => $vendorDir . '/laminas/laminas-feed/src/Writer/Extension/ITunes/Feed.php',
+ 'Laminas\\Feed\\Writer\\Extension\\ITunes\\Renderer\\Entry' => $vendorDir . '/laminas/laminas-feed/src/Writer/Extension/ITunes/Renderer/Entry.php',
+ 'Laminas\\Feed\\Writer\\Extension\\ITunes\\Renderer\\Feed' => $vendorDir . '/laminas/laminas-feed/src/Writer/Extension/ITunes/Renderer/Feed.php',
+ 'Laminas\\Feed\\Writer\\Extension\\RendererInterface' => $vendorDir . '/laminas/laminas-feed/src/Writer/Extension/RendererInterface.php',
+ 'Laminas\\Feed\\Writer\\Extension\\Slash\\Renderer\\Entry' => $vendorDir . '/laminas/laminas-feed/src/Writer/Extension/Slash/Renderer/Entry.php',
+ 'Laminas\\Feed\\Writer\\Extension\\Threading\\Renderer\\Entry' => $vendorDir . '/laminas/laminas-feed/src/Writer/Extension/Threading/Renderer/Entry.php',
+ 'Laminas\\Feed\\Writer\\Extension\\WellFormedWeb\\Renderer\\Entry' => $vendorDir . '/laminas/laminas-feed/src/Writer/Extension/WellFormedWeb/Renderer/Entry.php',
+ 'Laminas\\Feed\\Writer\\Feed' => $vendorDir . '/laminas/laminas-feed/src/Writer/Feed.php',
+ 'Laminas\\Feed\\Writer\\FeedFactory' => $vendorDir . '/laminas/laminas-feed/src/Writer/FeedFactory.php',
+ 'Laminas\\Feed\\Writer\\Renderer\\AbstractRenderer' => $vendorDir . '/laminas/laminas-feed/src/Writer/Renderer/AbstractRenderer.php',
+ 'Laminas\\Feed\\Writer\\Renderer\\Entry\\Atom' => $vendorDir . '/laminas/laminas-feed/src/Writer/Renderer/Entry/Atom.php',
+ 'Laminas\\Feed\\Writer\\Renderer\\Entry\\AtomDeleted' => $vendorDir . '/laminas/laminas-feed/src/Writer/Renderer/Entry/AtomDeleted.php',
+ 'Laminas\\Feed\\Writer\\Renderer\\Entry\\Atom\\Deleted' => $vendorDir . '/laminas/laminas-feed/src/Writer/Renderer/Entry/Atom/Deleted.php',
+ 'Laminas\\Feed\\Writer\\Renderer\\Entry\\Rss' => $vendorDir . '/laminas/laminas-feed/src/Writer/Renderer/Entry/Rss.php',
+ 'Laminas\\Feed\\Writer\\Renderer\\Feed\\AbstractAtom' => $vendorDir . '/laminas/laminas-feed/src/Writer/Renderer/Feed/AbstractAtom.php',
+ 'Laminas\\Feed\\Writer\\Renderer\\Feed\\Atom' => $vendorDir . '/laminas/laminas-feed/src/Writer/Renderer/Feed/Atom.php',
+ 'Laminas\\Feed\\Writer\\Renderer\\Feed\\AtomSource' => $vendorDir . '/laminas/laminas-feed/src/Writer/Renderer/Feed/AtomSource.php',
+ 'Laminas\\Feed\\Writer\\Renderer\\Feed\\Atom\\AbstractAtom' => $vendorDir . '/laminas/laminas-feed/src/Writer/Renderer/Feed/Atom/AbstractAtom.php',
+ 'Laminas\\Feed\\Writer\\Renderer\\Feed\\Atom\\Source' => $vendorDir . '/laminas/laminas-feed/src/Writer/Renderer/Feed/Atom/Source.php',
+ 'Laminas\\Feed\\Writer\\Renderer\\Feed\\Rss' => $vendorDir . '/laminas/laminas-feed/src/Writer/Renderer/Feed/Rss.php',
+ 'Laminas\\Feed\\Writer\\Renderer\\RendererInterface' => $vendorDir . '/laminas/laminas-feed/src/Writer/Renderer/RendererInterface.php',
+ 'Laminas\\Feed\\Writer\\Source' => $vendorDir . '/laminas/laminas-feed/src/Writer/Source.php',
+ 'Laminas\\Feed\\Writer\\StandaloneExtensionManager' => $vendorDir . '/laminas/laminas-feed/src/Writer/StandaloneExtensionManager.php',
+ 'Laminas\\Feed\\Writer\\Version' => $vendorDir . '/laminas/laminas-feed/src/Writer/Version.php',
+ 'Laminas\\Feed\\Writer\\Writer' => $vendorDir . '/laminas/laminas-feed/src/Writer/Writer.php',
+ 'Laminas\\Stdlib\\AbstractOptions' => $vendorDir . '/laminas/laminas-stdlib/src/AbstractOptions.php',
+ 'Laminas\\Stdlib\\ArrayObject' => $vendorDir . '/laminas/laminas-stdlib/src/ArrayObject.php',
+ 'Laminas\\Stdlib\\ArraySerializableInterface' => $vendorDir . '/laminas/laminas-stdlib/src/ArraySerializableInterface.php',
+ 'Laminas\\Stdlib\\ArrayStack' => $vendorDir . '/laminas/laminas-stdlib/src/ArrayStack.php',
+ 'Laminas\\Stdlib\\ArrayUtils' => $vendorDir . '/laminas/laminas-stdlib/src/ArrayUtils.php',
+ 'Laminas\\Stdlib\\ArrayUtils\\MergeRemoveKey' => $vendorDir . '/laminas/laminas-stdlib/src/ArrayUtils/MergeRemoveKey.php',
+ 'Laminas\\Stdlib\\ArrayUtils\\MergeReplaceKey' => $vendorDir . '/laminas/laminas-stdlib/src/ArrayUtils/MergeReplaceKey.php',
+ 'Laminas\\Stdlib\\ArrayUtils\\MergeReplaceKeyInterface' => $vendorDir . '/laminas/laminas-stdlib/src/ArrayUtils/MergeReplaceKeyInterface.php',
+ 'Laminas\\Stdlib\\ConsoleHelper' => $vendorDir . '/laminas/laminas-stdlib/src/ConsoleHelper.php',
+ 'Laminas\\Stdlib\\DispatchableInterface' => $vendorDir . '/laminas/laminas-stdlib/src/DispatchableInterface.php',
+ 'Laminas\\Stdlib\\ErrorHandler' => $vendorDir . '/laminas/laminas-stdlib/src/ErrorHandler.php',
+ 'Laminas\\Stdlib\\Exception\\BadMethodCallException' => $vendorDir . '/laminas/laminas-stdlib/src/Exception/BadMethodCallException.php',
+ 'Laminas\\Stdlib\\Exception\\DomainException' => $vendorDir . '/laminas/laminas-stdlib/src/Exception/DomainException.php',
+ 'Laminas\\Stdlib\\Exception\\ExceptionInterface' => $vendorDir . '/laminas/laminas-stdlib/src/Exception/ExceptionInterface.php',
+ 'Laminas\\Stdlib\\Exception\\ExtensionNotLoadedException' => $vendorDir . '/laminas/laminas-stdlib/src/Exception/ExtensionNotLoadedException.php',
+ 'Laminas\\Stdlib\\Exception\\InvalidArgumentException' => $vendorDir . '/laminas/laminas-stdlib/src/Exception/InvalidArgumentException.php',
+ 'Laminas\\Stdlib\\Exception\\LogicException' => $vendorDir . '/laminas/laminas-stdlib/src/Exception/LogicException.php',
+ 'Laminas\\Stdlib\\Exception\\RuntimeException' => $vendorDir . '/laminas/laminas-stdlib/src/Exception/RuntimeException.php',
+ 'Laminas\\Stdlib\\FastPriorityQueue' => $vendorDir . '/laminas/laminas-stdlib/src/FastPriorityQueue.php',
+ 'Laminas\\Stdlib\\Glob' => $vendorDir . '/laminas/laminas-stdlib/src/Glob.php',
+ 'Laminas\\Stdlib\\Guard\\AllGuardsTrait' => $vendorDir . '/laminas/laminas-stdlib/src/Guard/AllGuardsTrait.php',
+ 'Laminas\\Stdlib\\Guard\\ArrayOrTraversableGuardTrait' => $vendorDir . '/laminas/laminas-stdlib/src/Guard/ArrayOrTraversableGuardTrait.php',
+ 'Laminas\\Stdlib\\Guard\\EmptyGuardTrait' => $vendorDir . '/laminas/laminas-stdlib/src/Guard/EmptyGuardTrait.php',
+ 'Laminas\\Stdlib\\Guard\\NullGuardTrait' => $vendorDir . '/laminas/laminas-stdlib/src/Guard/NullGuardTrait.php',
+ 'Laminas\\Stdlib\\InitializableInterface' => $vendorDir . '/laminas/laminas-stdlib/src/InitializableInterface.php',
+ 'Laminas\\Stdlib\\JsonSerializable' => $vendorDir . '/laminas/laminas-stdlib/src/JsonSerializable.php',
+ 'Laminas\\Stdlib\\Message' => $vendorDir . '/laminas/laminas-stdlib/src/Message.php',
+ 'Laminas\\Stdlib\\MessageInterface' => $vendorDir . '/laminas/laminas-stdlib/src/MessageInterface.php',
+ 'Laminas\\Stdlib\\ParameterObjectInterface' => $vendorDir . '/laminas/laminas-stdlib/src/ParameterObjectInterface.php',
+ 'Laminas\\Stdlib\\Parameters' => $vendorDir . '/laminas/laminas-stdlib/src/Parameters.php',
+ 'Laminas\\Stdlib\\ParametersInterface' => $vendorDir . '/laminas/laminas-stdlib/src/ParametersInterface.php',
+ 'Laminas\\Stdlib\\PriorityList' => $vendorDir . '/laminas/laminas-stdlib/src/PriorityList.php',
+ 'Laminas\\Stdlib\\PriorityQueue' => $vendorDir . '/laminas/laminas-stdlib/src/PriorityQueue.php',
+ 'Laminas\\Stdlib\\Request' => $vendorDir . '/laminas/laminas-stdlib/src/Request.php',
+ 'Laminas\\Stdlib\\RequestInterface' => $vendorDir . '/laminas/laminas-stdlib/src/RequestInterface.php',
+ 'Laminas\\Stdlib\\Response' => $vendorDir . '/laminas/laminas-stdlib/src/Response.php',
+ 'Laminas\\Stdlib\\ResponseInterface' => $vendorDir . '/laminas/laminas-stdlib/src/ResponseInterface.php',
+ 'Laminas\\Stdlib\\SplPriorityQueue' => $vendorDir . '/laminas/laminas-stdlib/src/SplPriorityQueue.php',
+ 'Laminas\\Stdlib\\SplQueue' => $vendorDir . '/laminas/laminas-stdlib/src/SplQueue.php',
+ 'Laminas\\Stdlib\\SplStack' => $vendorDir . '/laminas/laminas-stdlib/src/SplStack.php',
+ 'Laminas\\Stdlib\\StringUtils' => $vendorDir . '/laminas/laminas-stdlib/src/StringUtils.php',
+ 'Laminas\\Stdlib\\StringWrapper\\AbstractStringWrapper' => $vendorDir . '/laminas/laminas-stdlib/src/StringWrapper/AbstractStringWrapper.php',
+ 'Laminas\\Stdlib\\StringWrapper\\Iconv' => $vendorDir . '/laminas/laminas-stdlib/src/StringWrapper/Iconv.php',
+ 'Laminas\\Stdlib\\StringWrapper\\Intl' => $vendorDir . '/laminas/laminas-stdlib/src/StringWrapper/Intl.php',
+ 'Laminas\\Stdlib\\StringWrapper\\MbString' => $vendorDir . '/laminas/laminas-stdlib/src/StringWrapper/MbString.php',
+ 'Laminas\\Stdlib\\StringWrapper\\Native' => $vendorDir . '/laminas/laminas-stdlib/src/StringWrapper/Native.php',
+ 'Laminas\\Stdlib\\StringWrapper\\StringWrapperInterface' => $vendorDir . '/laminas/laminas-stdlib/src/StringWrapper/StringWrapperInterface.php',
+ 'Laminas\\ZendFrameworkBridge\\Autoloader' => $vendorDir . '/laminas/laminas-zendframework-bridge/src/Autoloader.php',
+ 'Laminas\\ZendFrameworkBridge\\ConfigPostProcessor' => $vendorDir . '/laminas/laminas-zendframework-bridge/src/ConfigPostProcessor.php',
+ 'Laminas\\ZendFrameworkBridge\\Module' => $vendorDir . '/laminas/laminas-zendframework-bridge/src/Module.php',
+ 'Laminas\\ZendFrameworkBridge\\Replacements' => $vendorDir . '/laminas/laminas-zendframework-bridge/src/Replacements.php',
+ 'Laminas\\ZendFrameworkBridge\\RewriteRules' => $vendorDir . '/laminas/laminas-zendframework-bridge/src/RewriteRules.php',
'League\\Container\\Argument\\ArgumentResolverInterface' => $vendorDir . '/league/container/src/Argument/ArgumentResolverInterface.php',
'League\\Container\\Argument\\ArgumentResolverTrait' => $vendorDir . '/league/container/src/Argument/ArgumentResolverTrait.php',
'League\\Container\\Argument\\RawArgument' => $vendorDir . '/league/container/src/Argument/RawArgument.php',
@@ -3309,7 +3524,6 @@
'PEAR_Error' => $vendorDir . '/pear/pear-core-minimal/src/PEAR.php',
'PEAR_ErrorStack' => $vendorDir . '/pear/pear-core-minimal/src/PEAR/ErrorStack.php',
'PEAR_Exception' => $vendorDir . '/pear/pear_exception/PEAR/Exception.php',
- 'PEAR_ExceptionTest' => $vendorDir . '/pear/pear_exception/tests/PEAR/ExceptionTest.php',
'PantheonSystems\\CDNBehatHelpers\\AgeTracker' => $baseDir . '/web/modules/pantheon_advanced_page_cache/tests/behat/helper_classes/AgeTracker.php',
'PantheonSystems\\CDNBehatHelpers\\Contexts\\FeatureContext' => $baseDir . '/web/modules/pantheon_advanced_page_cache/tests/behat/helper_classes/Contexts/FeatureContext.php',
'PantheonSystems\\CDNBehatHelpers\\tests\\AgeTrackerTest' => $baseDir . '/web/modules/pantheon_advanced_page_cache/tests/behat/helper_classes/tests/AgeTrackerTest.php',
@@ -3552,7 +3766,7 @@
'Psr\\Log\\LoggerInterface' => $vendorDir . '/psr/log/Psr/Log/LoggerInterface.php',
'Psr\\Log\\LoggerTrait' => $vendorDir . '/psr/log/Psr/Log/LoggerTrait.php',
'Psr\\Log\\NullLogger' => $vendorDir . '/psr/log/Psr/Log/NullLogger.php',
- 'Psr\\Log\\Test\\DummyTest' => $vendorDir . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php',
+ 'Psr\\Log\\Test\\DummyTest' => $vendorDir . '/psr/log/Psr/Log/Test/DummyTest.php',
'Psr\\Log\\Test\\LoggerInterfaceTest' => $vendorDir . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php',
'Psr\\Log\\Test\\TestLogger' => $vendorDir . '/psr/log/Psr/Log/Test/TestLogger.php',
'Psy\\CodeCleaner' => $vendorDir . '/psy/psysh/src/CodeCleaner.php',
@@ -4678,6 +4892,7 @@
'Symfony\\Component\\HttpFoundation\\Session\\SessionBagInterface' => $vendorDir . '/symfony/http-foundation/Session/SessionBagInterface.php',
'Symfony\\Component\\HttpFoundation\\Session\\SessionBagProxy' => $vendorDir . '/symfony/http-foundation/Session/SessionBagProxy.php',
'Symfony\\Component\\HttpFoundation\\Session\\SessionInterface' => $vendorDir . '/symfony/http-foundation/Session/SessionInterface.php',
+ 'Symfony\\Component\\HttpFoundation\\Session\\SessionUtils' => $vendorDir . '/symfony/http-foundation/Session/SessionUtils.php',
'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\AbstractSessionHandler' => $vendorDir . '/symfony/http-foundation/Session/Storage/Handler/AbstractSessionHandler.php',
'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\MemcacheSessionHandler' => $vendorDir . '/symfony/http-foundation/Session/Storage/Handler/MemcacheSessionHandler.php',
'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\MemcachedSessionHandler' => $vendorDir . '/symfony/http-foundation/Session/Storage/Handler/MemcachedSessionHandler.php',
@@ -5208,6 +5423,7 @@
'Symfony\\Component\\Validator\\ValidatorBuilder' => $vendorDir . '/symfony/validator/ValidatorBuilder.php',
'Symfony\\Component\\Validator\\ValidatorBuilderInterface' => $vendorDir . '/symfony/validator/ValidatorBuilderInterface.php',
'Symfony\\Component\\Validator\\Validator\\ContextualValidatorInterface' => $vendorDir . '/symfony/validator/Validator/ContextualValidatorInterface.php',
+ 'Symfony\\Component\\Validator\\Validator\\LazyProperty' => $vendorDir . '/symfony/validator/Validator/LazyProperty.php',
'Symfony\\Component\\Validator\\Validator\\RecursiveContextualValidator' => $vendorDir . '/symfony/validator/Validator/RecursiveContextualValidator.php',
'Symfony\\Component\\Validator\\Validator\\RecursiveValidator' => $vendorDir . '/symfony/validator/Validator/RecursiveValidator.php',
'Symfony\\Component\\Validator\\Validator\\TraceableValidator' => $vendorDir . '/symfony/validator/Validator/TraceableValidator.php',
@@ -5268,9 +5484,11 @@
'Symfony\\Component\\Yaml\\Yaml' => $vendorDir . '/symfony/yaml/Yaml.php',
'Symfony\\Polyfill\\Ctype\\Ctype' => $vendorDir . '/symfony/polyfill-ctype/Ctype.php',
'Symfony\\Polyfill\\Iconv\\Iconv' => $vendorDir . '/symfony/polyfill-iconv/Iconv.php',
+ 'Symfony\\Polyfill\\Intl\\Idn\\Idn' => $vendorDir . '/symfony/polyfill-intl-idn/Idn.php',
'Symfony\\Polyfill\\Mbstring\\Mbstring' => $vendorDir . '/symfony/polyfill-mbstring/Mbstring.php',
'Symfony\\Polyfill\\Php56\\Php56' => $vendorDir . '/symfony/polyfill-php56/Php56.php',
'Symfony\\Polyfill\\Php70\\Php70' => $vendorDir . '/symfony/polyfill-php70/Php70.php',
+ 'Symfony\\Polyfill\\Php72\\Php72' => $vendorDir . '/symfony/polyfill-php72/Php72.php',
'Symfony\\Polyfill\\Util\\Binary' => $vendorDir . '/symfony/polyfill-util/Binary.php',
'Symfony\\Polyfill\\Util\\BinaryNoFuncOverload' => $vendorDir . '/symfony/polyfill-util/BinaryNoFuncOverload.php',
'Symfony\\Polyfill\\Util\\BinaryOnFuncOverload' => $vendorDir . '/symfony/polyfill-util/BinaryOnFuncOverload.php',
@@ -5713,205 +5931,6 @@
'Webmozart\\PathUtil\\Url' => $vendorDir . '/webmozart/path-util/src/Url.php',
'WhiteHat101\\Crypt\\APR1_MD5' => $vendorDir . '/whitehat101/apr1-md5/src/APR1_MD5.php',
'XdgBaseDir\\Xdg' => $vendorDir . '/dnoegel/php-xdg-base-dir/src/Xdg.php',
- 'Zend\\Diactoros\\AbstractSerializer' => $vendorDir . '/zendframework/zend-diactoros/src/AbstractSerializer.php',
- 'Zend\\Diactoros\\CallbackStream' => $vendorDir . '/zendframework/zend-diactoros/src/CallbackStream.php',
- 'Zend\\Diactoros\\Exception\\DeprecatedMethodException' => $vendorDir . '/zendframework/zend-diactoros/src/Exception/DeprecatedMethodException.php',
- 'Zend\\Diactoros\\Exception\\ExceptionInterface' => $vendorDir . '/zendframework/zend-diactoros/src/Exception/ExceptionInterface.php',
- 'Zend\\Diactoros\\HeaderSecurity' => $vendorDir . '/zendframework/zend-diactoros/src/HeaderSecurity.php',
- 'Zend\\Diactoros\\MessageTrait' => $vendorDir . '/zendframework/zend-diactoros/src/MessageTrait.php',
- 'Zend\\Diactoros\\PhpInputStream' => $vendorDir . '/zendframework/zend-diactoros/src/PhpInputStream.php',
- 'Zend\\Diactoros\\RelativeStream' => $vendorDir . '/zendframework/zend-diactoros/src/RelativeStream.php',
- 'Zend\\Diactoros\\Request' => $vendorDir . '/zendframework/zend-diactoros/src/Request.php',
- 'Zend\\Diactoros\\RequestTrait' => $vendorDir . '/zendframework/zend-diactoros/src/RequestTrait.php',
- 'Zend\\Diactoros\\Request\\ArraySerializer' => $vendorDir . '/zendframework/zend-diactoros/src/Request/ArraySerializer.php',
- 'Zend\\Diactoros\\Request\\Serializer' => $vendorDir . '/zendframework/zend-diactoros/src/Request/Serializer.php',
- 'Zend\\Diactoros\\Response' => $vendorDir . '/zendframework/zend-diactoros/src/Response.php',
- 'Zend\\Diactoros\\Response\\ArraySerializer' => $vendorDir . '/zendframework/zend-diactoros/src/Response/ArraySerializer.php',
- 'Zend\\Diactoros\\Response\\EmitterInterface' => $vendorDir . '/zendframework/zend-diactoros/src/Response/EmitterInterface.php',
- 'Zend\\Diactoros\\Response\\EmptyResponse' => $vendorDir . '/zendframework/zend-diactoros/src/Response/EmptyResponse.php',
- 'Zend\\Diactoros\\Response\\HtmlResponse' => $vendorDir . '/zendframework/zend-diactoros/src/Response/HtmlResponse.php',
- 'Zend\\Diactoros\\Response\\InjectContentTypeTrait' => $vendorDir . '/zendframework/zend-diactoros/src/Response/InjectContentTypeTrait.php',
- 'Zend\\Diactoros\\Response\\JsonResponse' => $vendorDir . '/zendframework/zend-diactoros/src/Response/JsonResponse.php',
- 'Zend\\Diactoros\\Response\\RedirectResponse' => $vendorDir . '/zendframework/zend-diactoros/src/Response/RedirectResponse.php',
- 'Zend\\Diactoros\\Response\\SapiEmitter' => $vendorDir . '/zendframework/zend-diactoros/src/Response/SapiEmitter.php',
- 'Zend\\Diactoros\\Response\\SapiEmitterTrait' => $vendorDir . '/zendframework/zend-diactoros/src/Response/SapiEmitterTrait.php',
- 'Zend\\Diactoros\\Response\\SapiStreamEmitter' => $vendorDir . '/zendframework/zend-diactoros/src/Response/SapiStreamEmitter.php',
- 'Zend\\Diactoros\\Response\\Serializer' => $vendorDir . '/zendframework/zend-diactoros/src/Response/Serializer.php',
- 'Zend\\Diactoros\\Response\\TextResponse' => $vendorDir . '/zendframework/zend-diactoros/src/Response/TextResponse.php',
- 'Zend\\Diactoros\\Response\\XmlResponse' => $vendorDir . '/zendframework/zend-diactoros/src/Response/XmlResponse.php',
- 'Zend\\Diactoros\\Server' => $vendorDir . '/zendframework/zend-diactoros/src/Server.php',
- 'Zend\\Diactoros\\ServerRequest' => $vendorDir . '/zendframework/zend-diactoros/src/ServerRequest.php',
- 'Zend\\Diactoros\\ServerRequestFactory' => $vendorDir . '/zendframework/zend-diactoros/src/ServerRequestFactory.php',
- 'Zend\\Diactoros\\Stream' => $vendorDir . '/zendframework/zend-diactoros/src/Stream.php',
- 'Zend\\Diactoros\\UploadedFile' => $vendorDir . '/zendframework/zend-diactoros/src/UploadedFile.php',
- 'Zend\\Diactoros\\Uri' => $vendorDir . '/zendframework/zend-diactoros/src/Uri.php',
- 'Zend\\Escaper\\Escaper' => $vendorDir . '/zendframework/zend-escaper/src/Escaper.php',
- 'Zend\\Escaper\\Exception\\ExceptionInterface' => $vendorDir . '/zendframework/zend-escaper/src/Exception/ExceptionInterface.php',
- 'Zend\\Escaper\\Exception\\InvalidArgumentException' => $vendorDir . '/zendframework/zend-escaper/src/Exception/InvalidArgumentException.php',
- 'Zend\\Escaper\\Exception\\RuntimeException' => $vendorDir . '/zendframework/zend-escaper/src/Exception/RuntimeException.php',
- 'Zend\\Feed\\Exception\\BadMethodCallException' => $vendorDir . '/zendframework/zend-feed/src/Exception/BadMethodCallException.php',
- 'Zend\\Feed\\Exception\\ExceptionInterface' => $vendorDir . '/zendframework/zend-feed/src/Exception/ExceptionInterface.php',
- 'Zend\\Feed\\Exception\\InvalidArgumentException' => $vendorDir . '/zendframework/zend-feed/src/Exception/InvalidArgumentException.php',
- 'Zend\\Feed\\Exception\\RuntimeException' => $vendorDir . '/zendframework/zend-feed/src/Exception/RuntimeException.php',
- 'Zend\\Feed\\PubSubHubbub\\AbstractCallback' => $vendorDir . '/zendframework/zend-feed/src/PubSubHubbub/AbstractCallback.php',
- 'Zend\\Feed\\PubSubHubbub\\CallbackInterface' => $vendorDir . '/zendframework/zend-feed/src/PubSubHubbub/CallbackInterface.php',
- 'Zend\\Feed\\PubSubHubbub\\Exception\\ExceptionInterface' => $vendorDir . '/zendframework/zend-feed/src/PubSubHubbub/Exception/ExceptionInterface.php',
- 'Zend\\Feed\\PubSubHubbub\\Exception\\InvalidArgumentException' => $vendorDir . '/zendframework/zend-feed/src/PubSubHubbub/Exception/InvalidArgumentException.php',
- 'Zend\\Feed\\PubSubHubbub\\Exception\\RuntimeException' => $vendorDir . '/zendframework/zend-feed/src/PubSubHubbub/Exception/RuntimeException.php',
- 'Zend\\Feed\\PubSubHubbub\\HttpResponse' => $vendorDir . '/zendframework/zend-feed/src/PubSubHubbub/HttpResponse.php',
- 'Zend\\Feed\\PubSubHubbub\\Model\\AbstractModel' => $vendorDir . '/zendframework/zend-feed/src/PubSubHubbub/Model/AbstractModel.php',
- 'Zend\\Feed\\PubSubHubbub\\Model\\Subscription' => $vendorDir . '/zendframework/zend-feed/src/PubSubHubbub/Model/Subscription.php',
- 'Zend\\Feed\\PubSubHubbub\\Model\\SubscriptionPersistenceInterface' => $vendorDir . '/zendframework/zend-feed/src/PubSubHubbub/Model/SubscriptionPersistenceInterface.php',
- 'Zend\\Feed\\PubSubHubbub\\PubSubHubbub' => $vendorDir . '/zendframework/zend-feed/src/PubSubHubbub/PubSubHubbub.php',
- 'Zend\\Feed\\PubSubHubbub\\Publisher' => $vendorDir . '/zendframework/zend-feed/src/PubSubHubbub/Publisher.php',
- 'Zend\\Feed\\PubSubHubbub\\Subscriber' => $vendorDir . '/zendframework/zend-feed/src/PubSubHubbub/Subscriber.php',
- 'Zend\\Feed\\PubSubHubbub\\Subscriber\\Callback' => $vendorDir . '/zendframework/zend-feed/src/PubSubHubbub/Subscriber/Callback.php',
- 'Zend\\Feed\\PubSubHubbub\\Version' => $vendorDir . '/zendframework/zend-feed/src/PubSubHubbub/Version.php',
- 'Zend\\Feed\\Reader\\AbstractEntry' => $vendorDir . '/zendframework/zend-feed/src/Reader/AbstractEntry.php',
- 'Zend\\Feed\\Reader\\AbstractFeed' => $vendorDir . '/zendframework/zend-feed/src/Reader/AbstractFeed.php',
- 'Zend\\Feed\\Reader\\Collection' => $vendorDir . '/zendframework/zend-feed/src/Reader/Collection.php',
- 'Zend\\Feed\\Reader\\Collection\\AbstractCollection' => $vendorDir . '/zendframework/zend-feed/src/Reader/Collection/AbstractCollection.php',
- 'Zend\\Feed\\Reader\\Collection\\Author' => $vendorDir . '/zendframework/zend-feed/src/Reader/Collection/Author.php',
- 'Zend\\Feed\\Reader\\Collection\\Category' => $vendorDir . '/zendframework/zend-feed/src/Reader/Collection/Category.php',
- 'Zend\\Feed\\Reader\\Collection\\Collection' => $vendorDir . '/zendframework/zend-feed/src/Reader/Collection/Collection.php',
- 'Zend\\Feed\\Reader\\Entry\\AbstractEntry' => $vendorDir . '/zendframework/zend-feed/src/Reader/Entry/AbstractEntry.php',
- 'Zend\\Feed\\Reader\\Entry\\Atom' => $vendorDir . '/zendframework/zend-feed/src/Reader/Entry/Atom.php',
- 'Zend\\Feed\\Reader\\Entry\\EntryInterface' => $vendorDir . '/zendframework/zend-feed/src/Reader/Entry/EntryInterface.php',
- 'Zend\\Feed\\Reader\\Entry\\Rss' => $vendorDir . '/zendframework/zend-feed/src/Reader/Entry/Rss.php',
- 'Zend\\Feed\\Reader\\Exception\\BadMethodCallException' => $vendorDir . '/zendframework/zend-feed/src/Reader/Exception/BadMethodCallException.php',
- 'Zend\\Feed\\Reader\\Exception\\ExceptionInterface' => $vendorDir . '/zendframework/zend-feed/src/Reader/Exception/ExceptionInterface.php',
- 'Zend\\Feed\\Reader\\Exception\\InvalidArgumentException' => $vendorDir . '/zendframework/zend-feed/src/Reader/Exception/InvalidArgumentException.php',
- 'Zend\\Feed\\Reader\\Exception\\InvalidHttpClientException' => $vendorDir . '/zendframework/zend-feed/src/Reader/Exception/InvalidHttpClientException.php',
- 'Zend\\Feed\\Reader\\Exception\\RuntimeException' => $vendorDir . '/zendframework/zend-feed/src/Reader/Exception/RuntimeException.php',
- 'Zend\\Feed\\Reader\\ExtensionManager' => $vendorDir . '/zendframework/zend-feed/src/Reader/ExtensionManager.php',
- 'Zend\\Feed\\Reader\\ExtensionManagerInterface' => $vendorDir . '/zendframework/zend-feed/src/Reader/ExtensionManagerInterface.php',
- 'Zend\\Feed\\Reader\\ExtensionPluginManager' => $vendorDir . '/zendframework/zend-feed/src/Reader/ExtensionPluginManager.php',
- 'Zend\\Feed\\Reader\\Extension\\AbstractEntry' => $vendorDir . '/zendframework/zend-feed/src/Reader/Extension/AbstractEntry.php',
- 'Zend\\Feed\\Reader\\Extension\\AbstractFeed' => $vendorDir . '/zendframework/zend-feed/src/Reader/Extension/AbstractFeed.php',
- 'Zend\\Feed\\Reader\\Extension\\Atom\\Entry' => $vendorDir . '/zendframework/zend-feed/src/Reader/Extension/Atom/Entry.php',
- 'Zend\\Feed\\Reader\\Extension\\Atom\\Feed' => $vendorDir . '/zendframework/zend-feed/src/Reader/Extension/Atom/Feed.php',
- 'Zend\\Feed\\Reader\\Extension\\Content\\Entry' => $vendorDir . '/zendframework/zend-feed/src/Reader/Extension/Content/Entry.php',
- 'Zend\\Feed\\Reader\\Extension\\CreativeCommons\\Entry' => $vendorDir . '/zendframework/zend-feed/src/Reader/Extension/CreativeCommons/Entry.php',
- 'Zend\\Feed\\Reader\\Extension\\CreativeCommons\\Feed' => $vendorDir . '/zendframework/zend-feed/src/Reader/Extension/CreativeCommons/Feed.php',
- 'Zend\\Feed\\Reader\\Extension\\DublinCore\\Entry' => $vendorDir . '/zendframework/zend-feed/src/Reader/Extension/DublinCore/Entry.php',
- 'Zend\\Feed\\Reader\\Extension\\DublinCore\\Feed' => $vendorDir . '/zendframework/zend-feed/src/Reader/Extension/DublinCore/Feed.php',
- 'Zend\\Feed\\Reader\\Extension\\GooglePlayPodcast\\Entry' => $vendorDir . '/zendframework/zend-feed/src/Reader/Extension/GooglePlayPodcast/Entry.php',
- 'Zend\\Feed\\Reader\\Extension\\GooglePlayPodcast\\Feed' => $vendorDir . '/zendframework/zend-feed/src/Reader/Extension/GooglePlayPodcast/Feed.php',
- 'Zend\\Feed\\Reader\\Extension\\Podcast\\Entry' => $vendorDir . '/zendframework/zend-feed/src/Reader/Extension/Podcast/Entry.php',
- 'Zend\\Feed\\Reader\\Extension\\Podcast\\Feed' => $vendorDir . '/zendframework/zend-feed/src/Reader/Extension/Podcast/Feed.php',
- 'Zend\\Feed\\Reader\\Extension\\Slash\\Entry' => $vendorDir . '/zendframework/zend-feed/src/Reader/Extension/Slash/Entry.php',
- 'Zend\\Feed\\Reader\\Extension\\Syndication\\Feed' => $vendorDir . '/zendframework/zend-feed/src/Reader/Extension/Syndication/Feed.php',
- 'Zend\\Feed\\Reader\\Extension\\Thread\\Entry' => $vendorDir . '/zendframework/zend-feed/src/Reader/Extension/Thread/Entry.php',
- 'Zend\\Feed\\Reader\\Extension\\WellFormedWeb\\Entry' => $vendorDir . '/zendframework/zend-feed/src/Reader/Extension/WellFormedWeb/Entry.php',
- 'Zend\\Feed\\Reader\\FeedSet' => $vendorDir . '/zendframework/zend-feed/src/Reader/FeedSet.php',
- 'Zend\\Feed\\Reader\\Feed\\AbstractFeed' => $vendorDir . '/zendframework/zend-feed/src/Reader/Feed/AbstractFeed.php',
- 'Zend\\Feed\\Reader\\Feed\\Atom' => $vendorDir . '/zendframework/zend-feed/src/Reader/Feed/Atom.php',
- 'Zend\\Feed\\Reader\\Feed\\Atom\\Source' => $vendorDir . '/zendframework/zend-feed/src/Reader/Feed/Atom/Source.php',
- 'Zend\\Feed\\Reader\\Feed\\FeedInterface' => $vendorDir . '/zendframework/zend-feed/src/Reader/Feed/FeedInterface.php',
- 'Zend\\Feed\\Reader\\Feed\\Rss' => $vendorDir . '/zendframework/zend-feed/src/Reader/Feed/Rss.php',
- 'Zend\\Feed\\Reader\\Http\\ClientInterface' => $vendorDir . '/zendframework/zend-feed/src/Reader/Http/ClientInterface.php',
- 'Zend\\Feed\\Reader\\Http\\HeaderAwareClientInterface' => $vendorDir . '/zendframework/zend-feed/src/Reader/Http/HeaderAwareClientInterface.php',
- 'Zend\\Feed\\Reader\\Http\\HeaderAwareResponseInterface' => $vendorDir . '/zendframework/zend-feed/src/Reader/Http/HeaderAwareResponseInterface.php',
- 'Zend\\Feed\\Reader\\Http\\Psr7ResponseDecorator' => $vendorDir . '/zendframework/zend-feed/src/Reader/Http/Psr7ResponseDecorator.php',
- 'Zend\\Feed\\Reader\\Http\\Response' => $vendorDir . '/zendframework/zend-feed/src/Reader/Http/Response.php',
- 'Zend\\Feed\\Reader\\Http\\ResponseInterface' => $vendorDir . '/zendframework/zend-feed/src/Reader/Http/ResponseInterface.php',
- 'Zend\\Feed\\Reader\\Http\\ZendHttpClientDecorator' => $vendorDir . '/zendframework/zend-feed/src/Reader/Http/ZendHttpClientDecorator.php',
- 'Zend\\Feed\\Reader\\Reader' => $vendorDir . '/zendframework/zend-feed/src/Reader/Reader.php',
- 'Zend\\Feed\\Reader\\ReaderImportInterface' => $vendorDir . '/zendframework/zend-feed/src/Reader/ReaderImportInterface.php',
- 'Zend\\Feed\\Reader\\StandaloneExtensionManager' => $vendorDir . '/zendframework/zend-feed/src/Reader/StandaloneExtensionManager.php',
- 'Zend\\Feed\\Uri' => $vendorDir . '/zendframework/zend-feed/src/Uri.php',
- 'Zend\\Feed\\Writer\\AbstractFeed' => $vendorDir . '/zendframework/zend-feed/src/Writer/AbstractFeed.php',
- 'Zend\\Feed\\Writer\\Deleted' => $vendorDir . '/zendframework/zend-feed/src/Writer/Deleted.php',
- 'Zend\\Feed\\Writer\\Entry' => $vendorDir . '/zendframework/zend-feed/src/Writer/Entry.php',
- 'Zend\\Feed\\Writer\\Exception\\BadMethodCallException' => $vendorDir . '/zendframework/zend-feed/src/Writer/Exception/BadMethodCallException.php',
- 'Zend\\Feed\\Writer\\Exception\\ExceptionInterface' => $vendorDir . '/zendframework/zend-feed/src/Writer/Exception/ExceptionInterface.php',
- 'Zend\\Feed\\Writer\\Exception\\InvalidArgumentException' => $vendorDir . '/zendframework/zend-feed/src/Writer/Exception/InvalidArgumentException.php',
- 'Zend\\Feed\\Writer\\Exception\\RuntimeException' => $vendorDir . '/zendframework/zend-feed/src/Writer/Exception/RuntimeException.php',
- 'Zend\\Feed\\Writer\\ExtensionManager' => $vendorDir . '/zendframework/zend-feed/src/Writer/ExtensionManager.php',
- 'Zend\\Feed\\Writer\\ExtensionManagerInterface' => $vendorDir . '/zendframework/zend-feed/src/Writer/ExtensionManagerInterface.php',
- 'Zend\\Feed\\Writer\\ExtensionPluginManager' => $vendorDir . '/zendframework/zend-feed/src/Writer/ExtensionPluginManager.php',
- 'Zend\\Feed\\Writer\\Extension\\AbstractRenderer' => $vendorDir . '/zendframework/zend-feed/src/Writer/Extension/AbstractRenderer.php',
- 'Zend\\Feed\\Writer\\Extension\\Atom\\Renderer\\Feed' => $vendorDir . '/zendframework/zend-feed/src/Writer/Extension/Atom/Renderer/Feed.php',
- 'Zend\\Feed\\Writer\\Extension\\Content\\Renderer\\Entry' => $vendorDir . '/zendframework/zend-feed/src/Writer/Extension/Content/Renderer/Entry.php',
- 'Zend\\Feed\\Writer\\Extension\\DublinCore\\Renderer\\Entry' => $vendorDir . '/zendframework/zend-feed/src/Writer/Extension/DublinCore/Renderer/Entry.php',
- 'Zend\\Feed\\Writer\\Extension\\DublinCore\\Renderer\\Feed' => $vendorDir . '/zendframework/zend-feed/src/Writer/Extension/DublinCore/Renderer/Feed.php',
- 'Zend\\Feed\\Writer\\Extension\\GooglePlayPodcast\\Entry' => $vendorDir . '/zendframework/zend-feed/src/Writer/Extension/GooglePlayPodcast/Entry.php',
- 'Zend\\Feed\\Writer\\Extension\\GooglePlayPodcast\\Feed' => $vendorDir . '/zendframework/zend-feed/src/Writer/Extension/GooglePlayPodcast/Feed.php',
- 'Zend\\Feed\\Writer\\Extension\\GooglePlayPodcast\\Renderer\\Entry' => $vendorDir . '/zendframework/zend-feed/src/Writer/Extension/GooglePlayPodcast/Renderer/Entry.php',
- 'Zend\\Feed\\Writer\\Extension\\GooglePlayPodcast\\Renderer\\Feed' => $vendorDir . '/zendframework/zend-feed/src/Writer/Extension/GooglePlayPodcast/Renderer/Feed.php',
- 'Zend\\Feed\\Writer\\Extension\\ITunes\\Entry' => $vendorDir . '/zendframework/zend-feed/src/Writer/Extension/ITunes/Entry.php',
- 'Zend\\Feed\\Writer\\Extension\\ITunes\\Feed' => $vendorDir . '/zendframework/zend-feed/src/Writer/Extension/ITunes/Feed.php',
- 'Zend\\Feed\\Writer\\Extension\\ITunes\\Renderer\\Entry' => $vendorDir . '/zendframework/zend-feed/src/Writer/Extension/ITunes/Renderer/Entry.php',
- 'Zend\\Feed\\Writer\\Extension\\ITunes\\Renderer\\Feed' => $vendorDir . '/zendframework/zend-feed/src/Writer/Extension/ITunes/Renderer/Feed.php',
- 'Zend\\Feed\\Writer\\Extension\\RendererInterface' => $vendorDir . '/zendframework/zend-feed/src/Writer/Extension/RendererInterface.php',
- 'Zend\\Feed\\Writer\\Extension\\Slash\\Renderer\\Entry' => $vendorDir . '/zendframework/zend-feed/src/Writer/Extension/Slash/Renderer/Entry.php',
- 'Zend\\Feed\\Writer\\Extension\\Threading\\Renderer\\Entry' => $vendorDir . '/zendframework/zend-feed/src/Writer/Extension/Threading/Renderer/Entry.php',
- 'Zend\\Feed\\Writer\\Extension\\WellFormedWeb\\Renderer\\Entry' => $vendorDir . '/zendframework/zend-feed/src/Writer/Extension/WellFormedWeb/Renderer/Entry.php',
- 'Zend\\Feed\\Writer\\Feed' => $vendorDir . '/zendframework/zend-feed/src/Writer/Feed.php',
- 'Zend\\Feed\\Writer\\FeedFactory' => $vendorDir . '/zendframework/zend-feed/src/Writer/FeedFactory.php',
- 'Zend\\Feed\\Writer\\Renderer\\AbstractRenderer' => $vendorDir . '/zendframework/zend-feed/src/Writer/Renderer/AbstractRenderer.php',
- 'Zend\\Feed\\Writer\\Renderer\\Entry\\Atom' => $vendorDir . '/zendframework/zend-feed/src/Writer/Renderer/Entry/Atom.php',
- 'Zend\\Feed\\Writer\\Renderer\\Entry\\AtomDeleted' => $vendorDir . '/zendframework/zend-feed/src/Writer/Renderer/Entry/AtomDeleted.php',
- 'Zend\\Feed\\Writer\\Renderer\\Entry\\Atom\\Deleted' => $vendorDir . '/zendframework/zend-feed/src/Writer/Renderer/Entry/Atom/Deleted.php',
- 'Zend\\Feed\\Writer\\Renderer\\Entry\\Rss' => $vendorDir . '/zendframework/zend-feed/src/Writer/Renderer/Entry/Rss.php',
- 'Zend\\Feed\\Writer\\Renderer\\Feed\\AbstractAtom' => $vendorDir . '/zendframework/zend-feed/src/Writer/Renderer/Feed/AbstractAtom.php',
- 'Zend\\Feed\\Writer\\Renderer\\Feed\\Atom' => $vendorDir . '/zendframework/zend-feed/src/Writer/Renderer/Feed/Atom.php',
- 'Zend\\Feed\\Writer\\Renderer\\Feed\\AtomSource' => $vendorDir . '/zendframework/zend-feed/src/Writer/Renderer/Feed/AtomSource.php',
- 'Zend\\Feed\\Writer\\Renderer\\Feed\\Atom\\AbstractAtom' => $vendorDir . '/zendframework/zend-feed/src/Writer/Renderer/Feed/Atom/AbstractAtom.php',
- 'Zend\\Feed\\Writer\\Renderer\\Feed\\Atom\\Source' => $vendorDir . '/zendframework/zend-feed/src/Writer/Renderer/Feed/Atom/Source.php',
- 'Zend\\Feed\\Writer\\Renderer\\Feed\\Rss' => $vendorDir . '/zendframework/zend-feed/src/Writer/Renderer/Feed/Rss.php',
- 'Zend\\Feed\\Writer\\Renderer\\RendererInterface' => $vendorDir . '/zendframework/zend-feed/src/Writer/Renderer/RendererInterface.php',
- 'Zend\\Feed\\Writer\\Source' => $vendorDir . '/zendframework/zend-feed/src/Writer/Source.php',
- 'Zend\\Feed\\Writer\\StandaloneExtensionManager' => $vendorDir . '/zendframework/zend-feed/src/Writer/StandaloneExtensionManager.php',
- 'Zend\\Feed\\Writer\\Version' => $vendorDir . '/zendframework/zend-feed/src/Writer/Version.php',
- 'Zend\\Feed\\Writer\\Writer' => $vendorDir . '/zendframework/zend-feed/src/Writer/Writer.php',
- 'Zend\\Stdlib\\AbstractOptions' => $vendorDir . '/zendframework/zend-stdlib/src/AbstractOptions.php',
- 'Zend\\Stdlib\\ArrayObject' => $vendorDir . '/zendframework/zend-stdlib/src/ArrayObject.php',
- 'Zend\\Stdlib\\ArraySerializableInterface' => $vendorDir . '/zendframework/zend-stdlib/src/ArraySerializableInterface.php',
- 'Zend\\Stdlib\\ArrayStack' => $vendorDir . '/zendframework/zend-stdlib/src/ArrayStack.php',
- 'Zend\\Stdlib\\ArrayUtils' => $vendorDir . '/zendframework/zend-stdlib/src/ArrayUtils.php',
- 'Zend\\Stdlib\\ArrayUtils\\MergeRemoveKey' => $vendorDir . '/zendframework/zend-stdlib/src/ArrayUtils/MergeRemoveKey.php',
- 'Zend\\Stdlib\\ArrayUtils\\MergeReplaceKey' => $vendorDir . '/zendframework/zend-stdlib/src/ArrayUtils/MergeReplaceKey.php',
- 'Zend\\Stdlib\\ArrayUtils\\MergeReplaceKeyInterface' => $vendorDir . '/zendframework/zend-stdlib/src/ArrayUtils/MergeReplaceKeyInterface.php',
- 'Zend\\Stdlib\\ConsoleHelper' => $vendorDir . '/zendframework/zend-stdlib/src/ConsoleHelper.php',
- 'Zend\\Stdlib\\DispatchableInterface' => $vendorDir . '/zendframework/zend-stdlib/src/DispatchableInterface.php',
- 'Zend\\Stdlib\\ErrorHandler' => $vendorDir . '/zendframework/zend-stdlib/src/ErrorHandler.php',
- 'Zend\\Stdlib\\Exception\\BadMethodCallException' => $vendorDir . '/zendframework/zend-stdlib/src/Exception/BadMethodCallException.php',
- 'Zend\\Stdlib\\Exception\\DomainException' => $vendorDir . '/zendframework/zend-stdlib/src/Exception/DomainException.php',
- 'Zend\\Stdlib\\Exception\\ExceptionInterface' => $vendorDir . '/zendframework/zend-stdlib/src/Exception/ExceptionInterface.php',
- 'Zend\\Stdlib\\Exception\\ExtensionNotLoadedException' => $vendorDir . '/zendframework/zend-stdlib/src/Exception/ExtensionNotLoadedException.php',
- 'Zend\\Stdlib\\Exception\\InvalidArgumentException' => $vendorDir . '/zendframework/zend-stdlib/src/Exception/InvalidArgumentException.php',
- 'Zend\\Stdlib\\Exception\\LogicException' => $vendorDir . '/zendframework/zend-stdlib/src/Exception/LogicException.php',
- 'Zend\\Stdlib\\Exception\\RuntimeException' => $vendorDir . '/zendframework/zend-stdlib/src/Exception/RuntimeException.php',
- 'Zend\\Stdlib\\FastPriorityQueue' => $vendorDir . '/zendframework/zend-stdlib/src/FastPriorityQueue.php',
- 'Zend\\Stdlib\\Glob' => $vendorDir . '/zendframework/zend-stdlib/src/Glob.php',
- 'Zend\\Stdlib\\Guard\\AllGuardsTrait' => $vendorDir . '/zendframework/zend-stdlib/src/Guard/AllGuardsTrait.php',
- 'Zend\\Stdlib\\Guard\\ArrayOrTraversableGuardTrait' => $vendorDir . '/zendframework/zend-stdlib/src/Guard/ArrayOrTraversableGuardTrait.php',
- 'Zend\\Stdlib\\Guard\\EmptyGuardTrait' => $vendorDir . '/zendframework/zend-stdlib/src/Guard/EmptyGuardTrait.php',
- 'Zend\\Stdlib\\Guard\\NullGuardTrait' => $vendorDir . '/zendframework/zend-stdlib/src/Guard/NullGuardTrait.php',
- 'Zend\\Stdlib\\InitializableInterface' => $vendorDir . '/zendframework/zend-stdlib/src/InitializableInterface.php',
- 'Zend\\Stdlib\\JsonSerializable' => $vendorDir . '/zendframework/zend-stdlib/src/JsonSerializable.php',
- 'Zend\\Stdlib\\Message' => $vendorDir . '/zendframework/zend-stdlib/src/Message.php',
- 'Zend\\Stdlib\\MessageInterface' => $vendorDir . '/zendframework/zend-stdlib/src/MessageInterface.php',
- 'Zend\\Stdlib\\ParameterObjectInterface' => $vendorDir . '/zendframework/zend-stdlib/src/ParameterObjectInterface.php',
- 'Zend\\Stdlib\\Parameters' => $vendorDir . '/zendframework/zend-stdlib/src/Parameters.php',
- 'Zend\\Stdlib\\ParametersInterface' => $vendorDir . '/zendframework/zend-stdlib/src/ParametersInterface.php',
- 'Zend\\Stdlib\\PriorityList' => $vendorDir . '/zendframework/zend-stdlib/src/PriorityList.php',
- 'Zend\\Stdlib\\PriorityQueue' => $vendorDir . '/zendframework/zend-stdlib/src/PriorityQueue.php',
- 'Zend\\Stdlib\\Request' => $vendorDir . '/zendframework/zend-stdlib/src/Request.php',
- 'Zend\\Stdlib\\RequestInterface' => $vendorDir . '/zendframework/zend-stdlib/src/RequestInterface.php',
- 'Zend\\Stdlib\\Response' => $vendorDir . '/zendframework/zend-stdlib/src/Response.php',
- 'Zend\\Stdlib\\ResponseInterface' => $vendorDir . '/zendframework/zend-stdlib/src/ResponseInterface.php',
- 'Zend\\Stdlib\\SplPriorityQueue' => $vendorDir . '/zendframework/zend-stdlib/src/SplPriorityQueue.php',
- 'Zend\\Stdlib\\SplQueue' => $vendorDir . '/zendframework/zend-stdlib/src/SplQueue.php',
- 'Zend\\Stdlib\\SplStack' => $vendorDir . '/zendframework/zend-stdlib/src/SplStack.php',
- 'Zend\\Stdlib\\StringUtils' => $vendorDir . '/zendframework/zend-stdlib/src/StringUtils.php',
- 'Zend\\Stdlib\\StringWrapper\\AbstractStringWrapper' => $vendorDir . '/zendframework/zend-stdlib/src/StringWrapper/AbstractStringWrapper.php',
- 'Zend\\Stdlib\\StringWrapper\\Iconv' => $vendorDir . '/zendframework/zend-stdlib/src/StringWrapper/Iconv.php',
- 'Zend\\Stdlib\\StringWrapper\\Intl' => $vendorDir . '/zendframework/zend-stdlib/src/StringWrapper/Intl.php',
- 'Zend\\Stdlib\\StringWrapper\\MbString' => $vendorDir . '/zendframework/zend-stdlib/src/StringWrapper/MbString.php',
- 'Zend\\Stdlib\\StringWrapper\\Native' => $vendorDir . '/zendframework/zend-stdlib/src/StringWrapper/Native.php',
- 'Zend\\Stdlib\\StringWrapper\\StringWrapperInterface' => $vendorDir . '/zendframework/zend-stdlib/src/StringWrapper/StringWrapperInterface.php',
'cweagans\\Composer\\PatchEvent' => $vendorDir . '/cweagans/composer-patches/src/PatchEvent.php',
'cweagans\\Composer\\PatchEvents' => $vendorDir . '/cweagans/composer-patches/src/PatchEvents.php',
'cweagans\\Composer\\Patches' => $vendorDir . '/cweagans/composer-patches/src/Patches.php',
diff --git a/vendor/composer/autoload_files.php b/vendor/composer/autoload_files.php
index e27cd9d826..6602945058 100644
--- a/vendor/composer/autoload_files.php
+++ b/vendor/composer/autoload_files.php
@@ -9,21 +9,32 @@
'0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => $vendorDir . '/symfony/polyfill-mbstring/bootstrap.php',
'320cde22f66dd4f5d3fd621d3e88b98f' => $vendorDir . '/symfony/polyfill-ctype/bootstrap.php',
'023d27dca8066ef29e6739335ea73bad' => $vendorDir . '/symfony/polyfill-php70/bootstrap.php',
- 'bd9634f2d41831496de0d3dfe4c94881' => $vendorDir . '/symfony/polyfill-php56/bootstrap.php',
'667aeda72477189d0494fecd327c3641' => $vendorDir . '/symfony/var-dumper/Resources/functions/dump.php',
+ 'bd9634f2d41831496de0d3dfe4c94881' => $vendorDir . '/symfony/polyfill-php56/bootstrap.php',
+ '7e9bd612cc444b3eed788ebbe46263a0' => $vendorDir . '/laminas/laminas-zendframework-bridge/src/autoload.php',
+ '25072dd6e2470089de65ae7bf11d3109' => $vendorDir . '/symfony/polyfill-php72/bootstrap.php',
+ 'f598d06aa772fa33d905e87be6398fb1' => $vendorDir . '/symfony/polyfill-intl-idn/bootstrap.php',
'7b11c4dc42b3b3023073cb14e519683c' => $vendorDir . '/ralouphie/getallheaders/src/getallheaders.php',
'c964ee0ededf28c96ebd9db5099ef910' => $vendorDir . '/guzzlehttp/promises/src/functions_include.php',
'a0edc8309cc5e1d60e3047b5df6b7052' => $vendorDir . '/guzzlehttp/psr7/src/functions_include.php',
'37a3dc5111fe8f707ab4c132ef1dbc62' => $vendorDir . '/guzzlehttp/guzzle/src/functions_include.php',
+ '07d7f1a47144818725fd8d91a907ac57' => $vendorDir . '/laminas/laminas-diactoros/src/functions/create_uploaded_file.php',
+ 'da94ac5d3ca7d2dbab84ce561ce72bfd' => $vendorDir . '/laminas/laminas-diactoros/src/functions/marshal_headers_from_sapi.php',
+ '3d97c8dcdfba8cb85d3b34f116bb248b' => $vendorDir . '/laminas/laminas-diactoros/src/functions/marshal_method_from_sapi.php',
+ 'e6f3bc6883e449ab367280b34158c05b' => $vendorDir . '/laminas/laminas-diactoros/src/functions/marshal_protocol_version_from_sapi.php',
+ 'd59fbae42019aedf227094ac49a46f50' => $vendorDir . '/laminas/laminas-diactoros/src/functions/marshal_uri_from_sapi.php',
+ 'de95e0ac670b27c84ef8c5ac41fc1b34' => $vendorDir . '/laminas/laminas-diactoros/src/functions/normalize_server.php',
+ 'b6c2870932b0250c10334a86dcb33c7f' => $vendorDir . '/laminas/laminas-diactoros/src/functions/normalize_uploaded_files.php',
+ 'd02cf21124526632320d6f20b1bbf905' => $vendorDir . '/laminas/laminas-diactoros/src/functions/parse_cookie_header.php',
+ 'd919fc9d5ad52cfb7f322f7fe36458ab' => $vendorDir . '/laminas/laminas-diactoros/src/functions/create_uploaded_file.legacy.php',
+ 'e397f74f8af3b1e56166a6e99f216ee7' => $vendorDir . '/laminas/laminas-diactoros/src/functions/marshal_headers_from_sapi.legacy.php',
+ 'd154b49fab8e4da34fb553a2d644918c' => $vendorDir . '/laminas/laminas-diactoros/src/functions/marshal_method_from_sapi.legacy.php',
+ '9d3db23ca418094bcf0b641a0c9559ed' => $vendorDir . '/laminas/laminas-diactoros/src/functions/marshal_protocol_version_from_sapi.legacy.php',
+ 'b0b88a3b89caae681462c58ff19a7059' => $vendorDir . '/laminas/laminas-diactoros/src/functions/marshal_uri_from_sapi.legacy.php',
+ 'cc8e14526dc240491e17a838cb78508c' => $vendorDir . '/laminas/laminas-diactoros/src/functions/normalize_server.legacy.php',
+ '786bf90caabc9e09b6ad4cc5ca8f0e30' => $vendorDir . '/laminas/laminas-diactoros/src/functions/normalize_uploaded_files.legacy.php',
+ '751a5a3f463e4be759be31748b61737c' => $vendorDir . '/laminas/laminas-diactoros/src/functions/parse_cookie_header.legacy.php',
'def43f6c87e4f8dfd0c9e1b1bab14fe8' => $vendorDir . '/symfony/polyfill-iconv/bootstrap.php',
- 'cf97c57bfe0f23854afd2f3818abb7a0' => $vendorDir . '/zendframework/zend-diactoros/src/functions/create_uploaded_file.php',
- '9bf37a3d0dad93e29cb4e1b1bfab04e9' => $vendorDir . '/zendframework/zend-diactoros/src/functions/marshal_headers_from_sapi.php',
- 'ce70dccb4bcc2efc6e94d2ee526e6972' => $vendorDir . '/zendframework/zend-diactoros/src/functions/marshal_method_from_sapi.php',
- 'f86420df471f14d568bfcb71e271b523' => $vendorDir . '/zendframework/zend-diactoros/src/functions/marshal_protocol_version_from_sapi.php',
- 'b87481e008a3700344428ae089e7f9e5' => $vendorDir . '/zendframework/zend-diactoros/src/functions/marshal_uri_from_sapi.php',
- '0b0974a5566a1077e4f2e111341112c1' => $vendorDir . '/zendframework/zend-diactoros/src/functions/normalize_server.php',
- '1ca3bc274755662169f9629d5412a1da' => $vendorDir . '/zendframework/zend-diactoros/src/functions/normalize_uploaded_files.php',
- '40360c0b9b437e69bcbb7f1349ce029e' => $vendorDir . '/zendframework/zend-diactoros/src/functions/parse_cookie_header.php',
'801c31d8ed748cfa537fa45402288c95' => $vendorDir . '/psy/psysh/src/functions.php',
'6175f5662c2e26de0149cb048cda7209' => $vendorDir . '/simplesamlphp/saml2/src/_autoload.php',
'952683d815ff0a7bf322b93c0be7e4e4' => $vendorDir . '/chi-teck/drupal-code-generator/src/bootstrap.php',
diff --git a/vendor/composer/autoload_namespaces.php b/vendor/composer/autoload_namespaces.php
index 95bd206b1e..8c5b9f67e1 100644
--- a/vendor/composer/autoload_namespaces.php
+++ b/vendor/composer/autoload_namespaces.php
@@ -10,7 +10,6 @@
'Twig_' => array($vendorDir . '/twig/twig/lib'),
'Stack' => array($vendorDir . '/stack/builder/src'),
'SAML2\\' => array($vendorDir . '/simplesamlphp/saml2/src'),
- 'PEAR' => array($vendorDir . '/pear/pear_exception'),
'EasyRdf_' => array($vendorDir . '/easyrdf/easyrdf/lib'),
'Doctrine\\Common\\Collections\\' => array($vendorDir . '/doctrine/collections/lib'),
'Dflydev\\PlaceholderResolver' => array($vendorDir . '/dflydev/placeholder-resolver/src'),
diff --git a/vendor/composer/autoload_psr4.php b/vendor/composer/autoload_psr4.php
index 10aab0af16..d743c08493 100644
--- a/vendor/composer/autoload_psr4.php
+++ b/vendor/composer/autoload_psr4.php
@@ -10,10 +10,6 @@
'rvtraveller\\QuicksilverComposerInstaller\\' => array($vendorDir . '/rvtraveller/qs-composer-installer/src'),
'enshrined\\svgSanitize\\' => array($vendorDir . '/enshrined/svg-sanitize/src'),
'cweagans\\Composer\\' => array($vendorDir . '/cweagans/composer-patches/src'),
- 'Zend\\Stdlib\\' => array($vendorDir . '/zendframework/zend-stdlib/src'),
- 'Zend\\Feed\\' => array($vendorDir . '/zendframework/zend-feed/src'),
- 'Zend\\Escaper\\' => array($vendorDir . '/zendframework/zend-escaper/src'),
- 'Zend\\Diactoros\\' => array($vendorDir . '/zendframework/zend-diactoros/src'),
'XdgBaseDir\\' => array($vendorDir . '/dnoegel/php-xdg-base-dir/src'),
'WhiteHat101\\Crypt\\' => array($vendorDir . '/whitehat101/apr1-md5/src'),
'Webmozart\\PathUtil\\' => array($vendorDir . '/webmozart/path-util/src'),
@@ -22,9 +18,11 @@
'Twig\\' => array($vendorDir . '/twig/twig/src'),
'TYPO3\\PharStreamWrapper\\' => array($vendorDir . '/typo3/phar-stream-wrapper/src'),
'Symfony\\Polyfill\\Util\\' => array($vendorDir . '/symfony/polyfill-util'),
+ 'Symfony\\Polyfill\\Php72\\' => array($vendorDir . '/symfony/polyfill-php72'),
'Symfony\\Polyfill\\Php70\\' => array($vendorDir . '/symfony/polyfill-php70'),
'Symfony\\Polyfill\\Php56\\' => array($vendorDir . '/symfony/polyfill-php56'),
'Symfony\\Polyfill\\Mbstring\\' => array($vendorDir . '/symfony/polyfill-mbstring'),
+ 'Symfony\\Polyfill\\Intl\\Idn\\' => array($vendorDir . '/symfony/polyfill-intl-idn'),
'Symfony\\Polyfill\\Iconv\\' => array($vendorDir . '/symfony/polyfill-iconv'),
'Symfony\\Polyfill\\Ctype\\' => array($vendorDir . '/symfony/polyfill-ctype'),
'Symfony\\Component\\Yaml\\' => array($vendorDir . '/symfony/yaml'),
@@ -62,6 +60,11 @@
'OomphInc\\ComposerInstallersExtender\\' => array($vendorDir . '/oomphinc/composer-installers-extender/src'),
'Masterminds\\' => array($vendorDir . '/masterminds/html5/src'),
'League\\Container\\' => array($vendorDir . '/league/container/src'),
+ 'Laminas\\ZendFrameworkBridge\\' => array($vendorDir . '/laminas/laminas-zendframework-bridge/src'),
+ 'Laminas\\Stdlib\\' => array($vendorDir . '/laminas/laminas-stdlib/src'),
+ 'Laminas\\Feed\\' => array($vendorDir . '/laminas/laminas-feed/src'),
+ 'Laminas\\Escaper\\' => array($vendorDir . '/laminas/laminas-escaper/src'),
+ 'Laminas\\Diactoros\\' => array($vendorDir . '/laminas/laminas-diactoros/src'),
'JakubOnderka\\PhpConsoleHighlighter\\' => array($vendorDir . '/jakub-onderka/php-console-highlighter/src'),
'JakubOnderka\\PhpConsoleColor\\' => array($vendorDir . '/jakub-onderka/php-console-color/src'),
'JaimePerez\\TwigConfigurableI18n\\' => array($vendorDir . '/jaimeperez/twig-configurable-i18n/src'),
diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php
index fe8678ed14..126478a282 100644
--- a/vendor/composer/autoload_real.php
+++ b/vendor/composer/autoload_real.php
@@ -13,9 +13,6 @@ public static function loadClassLoader($class)
}
}
- /**
- * @return \Composer\Autoload\ClassLoader
- */
public static function getLoader()
{
if (null !== self::$loader) {
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
index 9741b9b316..33130dc5b1 100644
--- a/vendor/composer/autoload_static.php
+++ b/vendor/composer/autoload_static.php
@@ -10,21 +10,32 @@ class ComposerStaticInit5c689ffcd54b9e495ed983fdce09b530
'0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
'320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php',
'023d27dca8066ef29e6739335ea73bad' => __DIR__ . '/..' . '/symfony/polyfill-php70/bootstrap.php',
- 'bd9634f2d41831496de0d3dfe4c94881' => __DIR__ . '/..' . '/symfony/polyfill-php56/bootstrap.php',
'667aeda72477189d0494fecd327c3641' => __DIR__ . '/..' . '/symfony/var-dumper/Resources/functions/dump.php',
+ 'bd9634f2d41831496de0d3dfe4c94881' => __DIR__ . '/..' . '/symfony/polyfill-php56/bootstrap.php',
+ '7e9bd612cc444b3eed788ebbe46263a0' => __DIR__ . '/..' . '/laminas/laminas-zendframework-bridge/src/autoload.php',
+ '25072dd6e2470089de65ae7bf11d3109' => __DIR__ . '/..' . '/symfony/polyfill-php72/bootstrap.php',
+ 'f598d06aa772fa33d905e87be6398fb1' => __DIR__ . '/..' . '/symfony/polyfill-intl-idn/bootstrap.php',
'7b11c4dc42b3b3023073cb14e519683c' => __DIR__ . '/..' . '/ralouphie/getallheaders/src/getallheaders.php',
'c964ee0ededf28c96ebd9db5099ef910' => __DIR__ . '/..' . '/guzzlehttp/promises/src/functions_include.php',
'a0edc8309cc5e1d60e3047b5df6b7052' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/functions_include.php',
'37a3dc5111fe8f707ab4c132ef1dbc62' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/functions_include.php',
+ '07d7f1a47144818725fd8d91a907ac57' => __DIR__ . '/..' . '/laminas/laminas-diactoros/src/functions/create_uploaded_file.php',
+ 'da94ac5d3ca7d2dbab84ce561ce72bfd' => __DIR__ . '/..' . '/laminas/laminas-diactoros/src/functions/marshal_headers_from_sapi.php',
+ '3d97c8dcdfba8cb85d3b34f116bb248b' => __DIR__ . '/..' . '/laminas/laminas-diactoros/src/functions/marshal_method_from_sapi.php',
+ 'e6f3bc6883e449ab367280b34158c05b' => __DIR__ . '/..' . '/laminas/laminas-diactoros/src/functions/marshal_protocol_version_from_sapi.php',
+ 'd59fbae42019aedf227094ac49a46f50' => __DIR__ . '/..' . '/laminas/laminas-diactoros/src/functions/marshal_uri_from_sapi.php',
+ 'de95e0ac670b27c84ef8c5ac41fc1b34' => __DIR__ . '/..' . '/laminas/laminas-diactoros/src/functions/normalize_server.php',
+ 'b6c2870932b0250c10334a86dcb33c7f' => __DIR__ . '/..' . '/laminas/laminas-diactoros/src/functions/normalize_uploaded_files.php',
+ 'd02cf21124526632320d6f20b1bbf905' => __DIR__ . '/..' . '/laminas/laminas-diactoros/src/functions/parse_cookie_header.php',
+ 'd919fc9d5ad52cfb7f322f7fe36458ab' => __DIR__ . '/..' . '/laminas/laminas-diactoros/src/functions/create_uploaded_file.legacy.php',
+ 'e397f74f8af3b1e56166a6e99f216ee7' => __DIR__ . '/..' . '/laminas/laminas-diactoros/src/functions/marshal_headers_from_sapi.legacy.php',
+ 'd154b49fab8e4da34fb553a2d644918c' => __DIR__ . '/..' . '/laminas/laminas-diactoros/src/functions/marshal_method_from_sapi.legacy.php',
+ '9d3db23ca418094bcf0b641a0c9559ed' => __DIR__ . '/..' . '/laminas/laminas-diactoros/src/functions/marshal_protocol_version_from_sapi.legacy.php',
+ 'b0b88a3b89caae681462c58ff19a7059' => __DIR__ . '/..' . '/laminas/laminas-diactoros/src/functions/marshal_uri_from_sapi.legacy.php',
+ 'cc8e14526dc240491e17a838cb78508c' => __DIR__ . '/..' . '/laminas/laminas-diactoros/src/functions/normalize_server.legacy.php',
+ '786bf90caabc9e09b6ad4cc5ca8f0e30' => __DIR__ . '/..' . '/laminas/laminas-diactoros/src/functions/normalize_uploaded_files.legacy.php',
+ '751a5a3f463e4be759be31748b61737c' => __DIR__ . '/..' . '/laminas/laminas-diactoros/src/functions/parse_cookie_header.legacy.php',
'def43f6c87e4f8dfd0c9e1b1bab14fe8' => __DIR__ . '/..' . '/symfony/polyfill-iconv/bootstrap.php',
- 'cf97c57bfe0f23854afd2f3818abb7a0' => __DIR__ . '/..' . '/zendframework/zend-diactoros/src/functions/create_uploaded_file.php',
- '9bf37a3d0dad93e29cb4e1b1bfab04e9' => __DIR__ . '/..' . '/zendframework/zend-diactoros/src/functions/marshal_headers_from_sapi.php',
- 'ce70dccb4bcc2efc6e94d2ee526e6972' => __DIR__ . '/..' . '/zendframework/zend-diactoros/src/functions/marshal_method_from_sapi.php',
- 'f86420df471f14d568bfcb71e271b523' => __DIR__ . '/..' . '/zendframework/zend-diactoros/src/functions/marshal_protocol_version_from_sapi.php',
- 'b87481e008a3700344428ae089e7f9e5' => __DIR__ . '/..' . '/zendframework/zend-diactoros/src/functions/marshal_uri_from_sapi.php',
- '0b0974a5566a1077e4f2e111341112c1' => __DIR__ . '/..' . '/zendframework/zend-diactoros/src/functions/normalize_server.php',
- '1ca3bc274755662169f9629d5412a1da' => __DIR__ . '/..' . '/zendframework/zend-diactoros/src/functions/normalize_uploaded_files.php',
- '40360c0b9b437e69bcbb7f1349ce029e' => __DIR__ . '/..' . '/zendframework/zend-diactoros/src/functions/parse_cookie_header.php',
'801c31d8ed748cfa537fa45402288c95' => __DIR__ . '/..' . '/psy/psysh/src/functions.php',
'6175f5662c2e26de0149cb048cda7209' => __DIR__ . '/..' . '/simplesamlphp/saml2/src/_autoload.php',
'952683d815ff0a7bf322b93c0be7e4e4' => __DIR__ . '/..' . '/chi-teck/drupal-code-generator/src/bootstrap.php',
@@ -49,13 +60,6 @@ class ComposerStaticInit5c689ffcd54b9e495ed983fdce09b530
array (
'cweagans\\Composer\\' => 18,
),
- 'Z' =>
- array (
- 'Zend\\Stdlib\\' => 12,
- 'Zend\\Feed\\' => 10,
- 'Zend\\Escaper\\' => 13,
- 'Zend\\Diactoros\\' => 15,
- ),
'X' =>
array (
'XdgBaseDir\\' => 11,
@@ -75,9 +79,11 @@ class ComposerStaticInit5c689ffcd54b9e495ed983fdce09b530
'S' =>
array (
'Symfony\\Polyfill\\Util\\' => 22,
+ 'Symfony\\Polyfill\\Php72\\' => 23,
'Symfony\\Polyfill\\Php70\\' => 23,
'Symfony\\Polyfill\\Php56\\' => 23,
'Symfony\\Polyfill\\Mbstring\\' => 26,
+ 'Symfony\\Polyfill\\Intl\\Idn\\' => 26,
'Symfony\\Polyfill\\Iconv\\' => 23,
'Symfony\\Polyfill\\Ctype\\' => 23,
'Symfony\\Component\\Yaml\\' => 23,
@@ -130,6 +136,11 @@ class ComposerStaticInit5c689ffcd54b9e495ed983fdce09b530
'L' =>
array (
'League\\Container\\' => 17,
+ 'Laminas\\ZendFrameworkBridge\\' => 28,
+ 'Laminas\\Stdlib\\' => 15,
+ 'Laminas\\Feed\\' => 13,
+ 'Laminas\\Escaper\\' => 16,
+ 'Laminas\\Diactoros\\' => 18,
),
'J' =>
array (
@@ -212,22 +223,6 @@ class ComposerStaticInit5c689ffcd54b9e495ed983fdce09b530
array (
0 => __DIR__ . '/..' . '/cweagans/composer-patches/src',
),
- 'Zend\\Stdlib\\' =>
- array (
- 0 => __DIR__ . '/..' . '/zendframework/zend-stdlib/src',
- ),
- 'Zend\\Feed\\' =>
- array (
- 0 => __DIR__ . '/..' . '/zendframework/zend-feed/src',
- ),
- 'Zend\\Escaper\\' =>
- array (
- 0 => __DIR__ . '/..' . '/zendframework/zend-escaper/src',
- ),
- 'Zend\\Diactoros\\' =>
- array (
- 0 => __DIR__ . '/..' . '/zendframework/zend-diactoros/src',
- ),
'XdgBaseDir\\' =>
array (
0 => __DIR__ . '/..' . '/dnoegel/php-xdg-base-dir/src',
@@ -260,6 +255,10 @@ class ComposerStaticInit5c689ffcd54b9e495ed983fdce09b530
array (
0 => __DIR__ . '/..' . '/symfony/polyfill-util',
),
+ 'Symfony\\Polyfill\\Php72\\' =>
+ array (
+ 0 => __DIR__ . '/..' . '/symfony/polyfill-php72',
+ ),
'Symfony\\Polyfill\\Php70\\' =>
array (
0 => __DIR__ . '/..' . '/symfony/polyfill-php70',
@@ -272,6 +271,10 @@ class ComposerStaticInit5c689ffcd54b9e495ed983fdce09b530
array (
0 => __DIR__ . '/..' . '/symfony/polyfill-mbstring',
),
+ 'Symfony\\Polyfill\\Intl\\Idn\\' =>
+ array (
+ 0 => __DIR__ . '/..' . '/symfony/polyfill-intl-idn',
+ ),
'Symfony\\Polyfill\\Iconv\\' =>
array (
0 => __DIR__ . '/..' . '/symfony/polyfill-iconv',
@@ -420,6 +423,26 @@ class ComposerStaticInit5c689ffcd54b9e495ed983fdce09b530
array (
0 => __DIR__ . '/..' . '/league/container/src',
),
+ 'Laminas\\ZendFrameworkBridge\\' =>
+ array (
+ 0 => __DIR__ . '/..' . '/laminas/laminas-zendframework-bridge/src',
+ ),
+ 'Laminas\\Stdlib\\' =>
+ array (
+ 0 => __DIR__ . '/..' . '/laminas/laminas-stdlib/src',
+ ),
+ 'Laminas\\Feed\\' =>
+ array (
+ 0 => __DIR__ . '/..' . '/laminas/laminas-feed/src',
+ ),
+ 'Laminas\\Escaper\\' =>
+ array (
+ 0 => __DIR__ . '/..' . '/laminas/laminas-escaper/src',
+ ),
+ 'Laminas\\Diactoros\\' =>
+ array (
+ 0 => __DIR__ . '/..' . '/laminas/laminas-diactoros/src',
+ ),
'JakubOnderka\\PhpConsoleHighlighter\\' =>
array (
0 => __DIR__ . '/..' . '/jakub-onderka/php-console-highlighter/src',
@@ -609,13 +632,6 @@ class ComposerStaticInit5c689ffcd54b9e495ed983fdce09b530
0 => __DIR__ . '/..' . '/simplesamlphp/saml2/src',
),
),
- 'P' =>
- array (
- 'PEAR' =>
- array (
- 0 => __DIR__ . '/..' . '/pear/pear_exception',
- ),
- ),
'E' =>
array (
'EasyRdf_' =>
@@ -869,6 +885,7 @@ class ComposerStaticInit5c689ffcd54b9e495ed983fdce09b530
'Composer\\Installers\\MagentoInstaller' => __DIR__ . '/..' . '/composer/installers/src/Composer/Installers/MagentoInstaller.php',
'Composer\\Installers\\MajimaInstaller' => __DIR__ . '/..' . '/composer/installers/src/Composer/Installers/MajimaInstaller.php',
'Composer\\Installers\\MakoInstaller' => __DIR__ . '/..' . '/composer/installers/src/Composer/Installers/MakoInstaller.php',
+ 'Composer\\Installers\\MantisBTInstaller' => __DIR__ . '/..' . '/composer/installers/src/Composer/Installers/MantisBTInstaller.php',
'Composer\\Installers\\MauticInstaller' => __DIR__ . '/..' . '/composer/installers/src/Composer/Installers/MauticInstaller.php',
'Composer\\Installers\\MayaInstaller' => __DIR__ . '/..' . '/composer/installers/src/Composer/Installers/MayaInstaller.php',
'Composer\\Installers\\MediaWikiInstaller' => __DIR__ . '/..' . '/composer/installers/src/Composer/Installers/MediaWikiInstaller.php',
@@ -900,6 +917,7 @@ class ComposerStaticInit5c689ffcd54b9e495ed983fdce09b530
'Composer\\Installers\\SilverStripeInstaller' => __DIR__ . '/..' . '/composer/installers/src/Composer/Installers/SilverStripeInstaller.php',
'Composer\\Installers\\SiteDirectInstaller' => __DIR__ . '/..' . '/composer/installers/src/Composer/Installers/SiteDirectInstaller.php',
'Composer\\Installers\\SyDESInstaller' => __DIR__ . '/..' . '/composer/installers/src/Composer/Installers/SyDESInstaller.php',
+ 'Composer\\Installers\\SyliusInstaller' => __DIR__ . '/..' . '/composer/installers/src/Composer/Installers/SyliusInstaller.php',
'Composer\\Installers\\Symfony1Installer' => __DIR__ . '/..' . '/composer/installers/src/Composer/Installers/Symfony1Installer.php',
'Composer\\Installers\\TYPO3CmsInstaller' => __DIR__ . '/..' . '/composer/installers/src/Composer/Installers/TYPO3CmsInstaller.php',
'Composer\\Installers\\TYPO3FlowInstaller' => __DIR__ . '/..' . '/composer/installers/src/Composer/Installers/TYPO3FlowInstaller.php',
@@ -2007,6 +2025,7 @@ class ComposerStaticInit5c689ffcd54b9e495ed983fdce09b530
'Drupal\\Core\\Asset\\JsCollectionOptimizer' => __DIR__ . '/../..' . '/web/core/lib/Drupal/Core/Asset/JsCollectionOptimizer.php',
'Drupal\\Core\\Asset\\JsCollectionRenderer' => __DIR__ . '/../..' . '/web/core/lib/Drupal/Core/Asset/JsCollectionRenderer.php',
'Drupal\\Core\\Asset\\JsOptimizer' => __DIR__ . '/../..' . '/web/core/lib/Drupal/Core/Asset/JsOptimizer.php',
+ 'Drupal\\Core\\Asset\\LibrariesDirectoryFileFinder' => __DIR__ . '/../..' . '/web/core/lib/Drupal/Core/Asset/LibrariesDirectoryFileFinder.php',
'Drupal\\Core\\Asset\\LibraryDependencyResolver' => __DIR__ . '/../..' . '/web/core/lib/Drupal/Core/Asset/LibraryDependencyResolver.php',
'Drupal\\Core\\Asset\\LibraryDependencyResolverInterface' => __DIR__ . '/../..' . '/web/core/lib/Drupal/Core/Asset/LibraryDependencyResolverInterface.php',
'Drupal\\Core\\Asset\\LibraryDiscovery' => __DIR__ . '/../..' . '/web/core/lib/Drupal/Core/Asset/LibraryDiscovery.php',
@@ -2078,6 +2097,7 @@ class ComposerStaticInit5c689ffcd54b9e495ed983fdce09b530
'Drupal\\Core\\Cache\\Context\\PagersCacheContext' => __DIR__ . '/../..' . '/web/core/lib/Drupal/Core/Cache/Context/PagersCacheContext.php',
'Drupal\\Core\\Cache\\Context\\PathCacheContext' => __DIR__ . '/../..' . '/web/core/lib/Drupal/Core/Cache/Context/PathCacheContext.php',
'Drupal\\Core\\Cache\\Context\\PathParentCacheContext' => __DIR__ . '/../..' . '/web/core/lib/Drupal/Core/Cache/Context/PathParentCacheContext.php',
+ 'Drupal\\Core\\Cache\\Context\\ProtocolVersionCacheContext' => __DIR__ . '/../..' . '/web/core/lib/Drupal/Core/Cache/Context/ProtocolVersionCacheContext.php',
'Drupal\\Core\\Cache\\Context\\QueryArgsCacheContext' => __DIR__ . '/../..' . '/web/core/lib/Drupal/Core/Cache/Context/QueryArgsCacheContext.php',
'Drupal\\Core\\Cache\\Context\\RequestFormatCacheContext' => __DIR__ . '/../..' . '/web/core/lib/Drupal/Core/Cache/Context/RequestFormatCacheContext.php',
'Drupal\\Core\\Cache\\Context\\RequestStackCacheContextBase' => __DIR__ . '/../..' . '/web/core/lib/Drupal/Core/Cache/Context/RequestStackCacheContextBase.php',
@@ -2403,7 +2423,9 @@ class ComposerStaticInit5c689ffcd54b9e495ed983fdce09b530
'Drupal\\Core\\Entity\\EntityAccessControlHandler' => __DIR__ . '/../..' . '/web/core/lib/Drupal/Core/Entity/EntityAccessControlHandler.php',
'Drupal\\Core\\Entity\\EntityAccessControlHandlerInterface' => __DIR__ . '/../..' . '/web/core/lib/Drupal/Core/Entity/EntityAccessControlHandlerInterface.php',
'Drupal\\Core\\Entity\\EntityAutocompleteMatcher' => __DIR__ . '/../..' . '/web/core/lib/Drupal/Core/Entity/EntityAutocompleteMatcher.php',
+ 'Drupal\\Core\\Entity\\EntityAutocompleteMatcherInterface' => __DIR__ . '/../..' . '/web/core/lib/Drupal/Core/Entity/EntityAutocompleteMatcherInterface.php',
'Drupal\\Core\\Entity\\EntityBase' => __DIR__ . '/../..' . '/web/core/lib/Drupal/Core/Entity/EntityBase.php',
+ 'Drupal\\Core\\Entity\\EntityBundleAccessCheck' => __DIR__ . '/../..' . '/web/core/lib/Drupal/Core/Entity/EntityBundleAccessCheck.php',
'Drupal\\Core\\Entity\\EntityBundleListener' => __DIR__ . '/../..' . '/web/core/lib/Drupal/Core/Entity/EntityBundleListener.php',
'Drupal\\Core\\Entity\\EntityBundleListenerInterface' => __DIR__ . '/../..' . '/web/core/lib/Drupal/Core/Entity/EntityBundleListenerInterface.php',
'Drupal\\Core\\Entity\\EntityChangedInterface' => __DIR__ . '/../..' . '/web/core/lib/Drupal/Core/Entity/EntityChangedInterface.php',
@@ -2638,6 +2660,7 @@ class ComposerStaticInit5c689ffcd54b9e495ed983fdce09b530
'Drupal\\Core\\Extension\\ModuleHandlerInterface' => __DIR__ . '/../..' . '/web/core/lib/Drupal/Core/Extension/ModuleHandlerInterface.php',
'Drupal\\Core\\Extension\\ModuleInstaller' => __DIR__ . '/../..' . '/web/core/lib/Drupal/Core/Extension/ModuleInstaller.php',
'Drupal\\Core\\Extension\\ModuleInstallerInterface' => __DIR__ . '/../..' . '/web/core/lib/Drupal/Core/Extension/ModuleInstallerInterface.php',
+ 'Drupal\\Core\\Extension\\ModuleRequiredByThemesUninstallValidator' => __DIR__ . '/../..' . '/web/core/lib/Drupal/Core/Extension/ModuleRequiredByThemesUninstallValidator.php',
'Drupal\\Core\\Extension\\ModuleUninstallValidatorException' => __DIR__ . '/../..' . '/web/core/lib/Drupal/Core/Extension/ModuleUninstallValidatorException.php',
'Drupal\\Core\\Extension\\ModuleUninstallValidatorInterface' => __DIR__ . '/../..' . '/web/core/lib/Drupal/Core/Extension/ModuleUninstallValidatorInterface.php',
'Drupal\\Core\\Extension\\ProfileExtensionList' => __DIR__ . '/../..' . '/web/core/lib/Drupal/Core/Extension/ProfileExtensionList.php',
@@ -2808,6 +2831,7 @@ class ComposerStaticInit5c689ffcd54b9e495ed983fdce09b530
'Drupal\\Core\\Form\\OptGroup' => __DIR__ . '/../..' . '/web/core/lib/Drupal/Core/Form/OptGroup.php',
'Drupal\\Core\\Form\\SubformState' => __DIR__ . '/../..' . '/web/core/lib/Drupal/Core/Form/SubformState.php',
'Drupal\\Core\\Form\\SubformStateInterface' => __DIR__ . '/../..' . '/web/core/lib/Drupal/Core/Form/SubformStateInterface.php',
+ 'Drupal\\Core\\GeneratedButton' => __DIR__ . '/../..' . '/web/core/lib/Drupal/Core/GeneratedButton.php',
'Drupal\\Core\\GeneratedLink' => __DIR__ . '/../..' . '/web/core/lib/Drupal/Core/GeneratedLink.php',
'Drupal\\Core\\GeneratedNoLink' => __DIR__ . '/../..' . '/web/core/lib/Drupal/Core/GeneratedNoLink.php',
'Drupal\\Core\\GeneratedUrl' => __DIR__ . '/../..' . '/web/core/lib/Drupal/Core/GeneratedUrl.php',
@@ -3060,6 +3084,7 @@ class ComposerStaticInit5c689ffcd54b9e495ed983fdce09b530
'Drupal\\Core\\ProxyClass\\Cron' => __DIR__ . '/../..' . '/web/core/lib/Drupal/Core/ProxyClass/Cron.php',
'Drupal\\Core\\ProxyClass\\Entity\\ContentUninstallValidator' => __DIR__ . '/../..' . '/web/core/lib/Drupal/Core/ProxyClass/Entity/ContentUninstallValidator.php',
'Drupal\\Core\\ProxyClass\\Extension\\ModuleInstaller' => __DIR__ . '/../..' . '/web/core/lib/Drupal/Core/ProxyClass/Extension/ModuleInstaller.php',
+ 'Drupal\\Core\\ProxyClass\\Extension\\ModuleRequiredByThemesUninstallValidator' => __DIR__ . '/../..' . '/web/core/lib/Drupal/Core/ProxyClass/Extension/ModuleRequiredByThemesUninstallValidator.php',
'Drupal\\Core\\ProxyClass\\Extension\\RequiredModuleUninstallValidator' => __DIR__ . '/../..' . '/web/core/lib/Drupal/Core/ProxyClass/Extension/RequiredModuleUninstallValidator.php',
'Drupal\\Core\\ProxyClass\\File\\MimeType\\ExtensionMimeTypeGuesser' => __DIR__ . '/../..' . '/web/core/lib/Drupal/Core/ProxyClass/File/MimeType/ExtensionMimeTypeGuesser.php',
'Drupal\\Core\\ProxyClass\\File\\MimeType\\MimeTypeGuesser' => __DIR__ . '/../..' . '/web/core/lib/Drupal/Core/ProxyClass/File/MimeType/MimeTypeGuesser.php',
@@ -3843,6 +3868,7 @@ class ComposerStaticInit5c689ffcd54b9e495ed983fdce09b530
'GuzzleHttp\\Exception\\ClientException' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/Exception/ClientException.php',
'GuzzleHttp\\Exception\\ConnectException' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/Exception/ConnectException.php',
'GuzzleHttp\\Exception\\GuzzleException' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/Exception/GuzzleException.php',
+ 'GuzzleHttp\\Exception\\InvalidArgumentException' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/Exception/InvalidArgumentException.php',
'GuzzleHttp\\Exception\\RequestException' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/Exception/RequestException.php',
'GuzzleHttp\\Exception\\SeekException' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/Exception/SeekException.php',
'GuzzleHttp\\Exception\\ServerException' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/Exception/ServerException.php',
@@ -3901,6 +3927,7 @@ class ComposerStaticInit5c689ffcd54b9e495ed983fdce09b530
'GuzzleHttp\\RetryMiddleware' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/RetryMiddleware.php',
'GuzzleHttp\\TransferStats' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/TransferStats.php',
'GuzzleHttp\\UriTemplate' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/UriTemplate.php',
+ 'GuzzleHttp\\Utils' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/Utils.php',
'Interop\\Container\\ContainerInterface' => __DIR__ . '/..' . '/container-interop/container-interop/src/Interop/Container/ContainerInterface.php',
'Interop\\Container\\Exception\\ContainerException' => __DIR__ . '/..' . '/container-interop/container-interop/src/Interop/Container/Exception/ContainerException.php',
'Interop\\Container\\Exception\\NotFoundException' => __DIR__ . '/..' . '/container-interop/container-interop/src/Interop/Container/Exception/NotFoundException.php',
@@ -3911,6 +3938,210 @@ class ComposerStaticInit5c689ffcd54b9e495ed983fdce09b530
'JakubOnderka\\PhpConsoleColor\\ConsoleColor' => __DIR__ . '/..' . '/jakub-onderka/php-console-color/src/ConsoleColor.php',
'JakubOnderka\\PhpConsoleColor\\InvalidStyleException' => __DIR__ . '/..' . '/jakub-onderka/php-console-color/src/InvalidStyleException.php',
'JakubOnderka\\PhpConsoleHighlighter\\Highlighter' => __DIR__ . '/..' . '/jakub-onderka/php-console-highlighter/src/Highlighter.php',
+ 'Laminas\\Diactoros\\AbstractSerializer' => __DIR__ . '/..' . '/laminas/laminas-diactoros/src/AbstractSerializer.php',
+ 'Laminas\\Diactoros\\CallbackStream' => __DIR__ . '/..' . '/laminas/laminas-diactoros/src/CallbackStream.php',
+ 'Laminas\\Diactoros\\Exception\\DeprecatedMethodException' => __DIR__ . '/..' . '/laminas/laminas-diactoros/src/Exception/DeprecatedMethodException.php',
+ 'Laminas\\Diactoros\\Exception\\ExceptionInterface' => __DIR__ . '/..' . '/laminas/laminas-diactoros/src/Exception/ExceptionInterface.php',
+ 'Laminas\\Diactoros\\HeaderSecurity' => __DIR__ . '/..' . '/laminas/laminas-diactoros/src/HeaderSecurity.php',
+ 'Laminas\\Diactoros\\MessageTrait' => __DIR__ . '/..' . '/laminas/laminas-diactoros/src/MessageTrait.php',
+ 'Laminas\\Diactoros\\PhpInputStream' => __DIR__ . '/..' . '/laminas/laminas-diactoros/src/PhpInputStream.php',
+ 'Laminas\\Diactoros\\RelativeStream' => __DIR__ . '/..' . '/laminas/laminas-diactoros/src/RelativeStream.php',
+ 'Laminas\\Diactoros\\Request' => __DIR__ . '/..' . '/laminas/laminas-diactoros/src/Request.php',
+ 'Laminas\\Diactoros\\RequestTrait' => __DIR__ . '/..' . '/laminas/laminas-diactoros/src/RequestTrait.php',
+ 'Laminas\\Diactoros\\Request\\ArraySerializer' => __DIR__ . '/..' . '/laminas/laminas-diactoros/src/Request/ArraySerializer.php',
+ 'Laminas\\Diactoros\\Request\\Serializer' => __DIR__ . '/..' . '/laminas/laminas-diactoros/src/Request/Serializer.php',
+ 'Laminas\\Diactoros\\Response' => __DIR__ . '/..' . '/laminas/laminas-diactoros/src/Response.php',
+ 'Laminas\\Diactoros\\Response\\ArraySerializer' => __DIR__ . '/..' . '/laminas/laminas-diactoros/src/Response/ArraySerializer.php',
+ 'Laminas\\Diactoros\\Response\\EmitterInterface' => __DIR__ . '/..' . '/laminas/laminas-diactoros/src/Response/EmitterInterface.php',
+ 'Laminas\\Diactoros\\Response\\EmptyResponse' => __DIR__ . '/..' . '/laminas/laminas-diactoros/src/Response/EmptyResponse.php',
+ 'Laminas\\Diactoros\\Response\\HtmlResponse' => __DIR__ . '/..' . '/laminas/laminas-diactoros/src/Response/HtmlResponse.php',
+ 'Laminas\\Diactoros\\Response\\InjectContentTypeTrait' => __DIR__ . '/..' . '/laminas/laminas-diactoros/src/Response/InjectContentTypeTrait.php',
+ 'Laminas\\Diactoros\\Response\\JsonResponse' => __DIR__ . '/..' . '/laminas/laminas-diactoros/src/Response/JsonResponse.php',
+ 'Laminas\\Diactoros\\Response\\RedirectResponse' => __DIR__ . '/..' . '/laminas/laminas-diactoros/src/Response/RedirectResponse.php',
+ 'Laminas\\Diactoros\\Response\\SapiEmitter' => __DIR__ . '/..' . '/laminas/laminas-diactoros/src/Response/SapiEmitter.php',
+ 'Laminas\\Diactoros\\Response\\SapiEmitterTrait' => __DIR__ . '/..' . '/laminas/laminas-diactoros/src/Response/SapiEmitterTrait.php',
+ 'Laminas\\Diactoros\\Response\\SapiStreamEmitter' => __DIR__ . '/..' . '/laminas/laminas-diactoros/src/Response/SapiStreamEmitter.php',
+ 'Laminas\\Diactoros\\Response\\Serializer' => __DIR__ . '/..' . '/laminas/laminas-diactoros/src/Response/Serializer.php',
+ 'Laminas\\Diactoros\\Response\\TextResponse' => __DIR__ . '/..' . '/laminas/laminas-diactoros/src/Response/TextResponse.php',
+ 'Laminas\\Diactoros\\Response\\XmlResponse' => __DIR__ . '/..' . '/laminas/laminas-diactoros/src/Response/XmlResponse.php',
+ 'Laminas\\Diactoros\\Server' => __DIR__ . '/..' . '/laminas/laminas-diactoros/src/Server.php',
+ 'Laminas\\Diactoros\\ServerRequest' => __DIR__ . '/..' . '/laminas/laminas-diactoros/src/ServerRequest.php',
+ 'Laminas\\Diactoros\\ServerRequestFactory' => __DIR__ . '/..' . '/laminas/laminas-diactoros/src/ServerRequestFactory.php',
+ 'Laminas\\Diactoros\\Stream' => __DIR__ . '/..' . '/laminas/laminas-diactoros/src/Stream.php',
+ 'Laminas\\Diactoros\\UploadedFile' => __DIR__ . '/..' . '/laminas/laminas-diactoros/src/UploadedFile.php',
+ 'Laminas\\Diactoros\\Uri' => __DIR__ . '/..' . '/laminas/laminas-diactoros/src/Uri.php',
+ 'Laminas\\Escaper\\Escaper' => __DIR__ . '/..' . '/laminas/laminas-escaper/src/Escaper.php',
+ 'Laminas\\Escaper\\Exception\\ExceptionInterface' => __DIR__ . '/..' . '/laminas/laminas-escaper/src/Exception/ExceptionInterface.php',
+ 'Laminas\\Escaper\\Exception\\InvalidArgumentException' => __DIR__ . '/..' . '/laminas/laminas-escaper/src/Exception/InvalidArgumentException.php',
+ 'Laminas\\Escaper\\Exception\\RuntimeException' => __DIR__ . '/..' . '/laminas/laminas-escaper/src/Exception/RuntimeException.php',
+ 'Laminas\\Feed\\Exception\\BadMethodCallException' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Exception/BadMethodCallException.php',
+ 'Laminas\\Feed\\Exception\\ExceptionInterface' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Exception/ExceptionInterface.php',
+ 'Laminas\\Feed\\Exception\\InvalidArgumentException' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Exception/InvalidArgumentException.php',
+ 'Laminas\\Feed\\Exception\\RuntimeException' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Exception/RuntimeException.php',
+ 'Laminas\\Feed\\PubSubHubbub\\AbstractCallback' => __DIR__ . '/..' . '/laminas/laminas-feed/src/PubSubHubbub/AbstractCallback.php',
+ 'Laminas\\Feed\\PubSubHubbub\\CallbackInterface' => __DIR__ . '/..' . '/laminas/laminas-feed/src/PubSubHubbub/CallbackInterface.php',
+ 'Laminas\\Feed\\PubSubHubbub\\Exception\\ExceptionInterface' => __DIR__ . '/..' . '/laminas/laminas-feed/src/PubSubHubbub/Exception/ExceptionInterface.php',
+ 'Laminas\\Feed\\PubSubHubbub\\Exception\\InvalidArgumentException' => __DIR__ . '/..' . '/laminas/laminas-feed/src/PubSubHubbub/Exception/InvalidArgumentException.php',
+ 'Laminas\\Feed\\PubSubHubbub\\Exception\\RuntimeException' => __DIR__ . '/..' . '/laminas/laminas-feed/src/PubSubHubbub/Exception/RuntimeException.php',
+ 'Laminas\\Feed\\PubSubHubbub\\HttpResponse' => __DIR__ . '/..' . '/laminas/laminas-feed/src/PubSubHubbub/HttpResponse.php',
+ 'Laminas\\Feed\\PubSubHubbub\\Model\\AbstractModel' => __DIR__ . '/..' . '/laminas/laminas-feed/src/PubSubHubbub/Model/AbstractModel.php',
+ 'Laminas\\Feed\\PubSubHubbub\\Model\\Subscription' => __DIR__ . '/..' . '/laminas/laminas-feed/src/PubSubHubbub/Model/Subscription.php',
+ 'Laminas\\Feed\\PubSubHubbub\\Model\\SubscriptionPersistenceInterface' => __DIR__ . '/..' . '/laminas/laminas-feed/src/PubSubHubbub/Model/SubscriptionPersistenceInterface.php',
+ 'Laminas\\Feed\\PubSubHubbub\\PubSubHubbub' => __DIR__ . '/..' . '/laminas/laminas-feed/src/PubSubHubbub/PubSubHubbub.php',
+ 'Laminas\\Feed\\PubSubHubbub\\Publisher' => __DIR__ . '/..' . '/laminas/laminas-feed/src/PubSubHubbub/Publisher.php',
+ 'Laminas\\Feed\\PubSubHubbub\\Subscriber' => __DIR__ . '/..' . '/laminas/laminas-feed/src/PubSubHubbub/Subscriber.php',
+ 'Laminas\\Feed\\PubSubHubbub\\Subscriber\\Callback' => __DIR__ . '/..' . '/laminas/laminas-feed/src/PubSubHubbub/Subscriber/Callback.php',
+ 'Laminas\\Feed\\PubSubHubbub\\Version' => __DIR__ . '/..' . '/laminas/laminas-feed/src/PubSubHubbub/Version.php',
+ 'Laminas\\Feed\\Reader\\AbstractEntry' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Reader/AbstractEntry.php',
+ 'Laminas\\Feed\\Reader\\AbstractFeed' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Reader/AbstractFeed.php',
+ 'Laminas\\Feed\\Reader\\Collection' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Reader/Collection.php',
+ 'Laminas\\Feed\\Reader\\Collection\\AbstractCollection' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Reader/Collection/AbstractCollection.php',
+ 'Laminas\\Feed\\Reader\\Collection\\Author' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Reader/Collection/Author.php',
+ 'Laminas\\Feed\\Reader\\Collection\\Category' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Reader/Collection/Category.php',
+ 'Laminas\\Feed\\Reader\\Collection\\Collection' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Reader/Collection/Collection.php',
+ 'Laminas\\Feed\\Reader\\Entry\\AbstractEntry' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Reader/Entry/AbstractEntry.php',
+ 'Laminas\\Feed\\Reader\\Entry\\Atom' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Reader/Entry/Atom.php',
+ 'Laminas\\Feed\\Reader\\Entry\\EntryInterface' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Reader/Entry/EntryInterface.php',
+ 'Laminas\\Feed\\Reader\\Entry\\Rss' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Reader/Entry/Rss.php',
+ 'Laminas\\Feed\\Reader\\Exception\\BadMethodCallException' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Reader/Exception/BadMethodCallException.php',
+ 'Laminas\\Feed\\Reader\\Exception\\ExceptionInterface' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Reader/Exception/ExceptionInterface.php',
+ 'Laminas\\Feed\\Reader\\Exception\\InvalidArgumentException' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Reader/Exception/InvalidArgumentException.php',
+ 'Laminas\\Feed\\Reader\\Exception\\InvalidHttpClientException' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Reader/Exception/InvalidHttpClientException.php',
+ 'Laminas\\Feed\\Reader\\Exception\\RuntimeException' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Reader/Exception/RuntimeException.php',
+ 'Laminas\\Feed\\Reader\\ExtensionManager' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Reader/ExtensionManager.php',
+ 'Laminas\\Feed\\Reader\\ExtensionManagerInterface' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Reader/ExtensionManagerInterface.php',
+ 'Laminas\\Feed\\Reader\\ExtensionPluginManager' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Reader/ExtensionPluginManager.php',
+ 'Laminas\\Feed\\Reader\\Extension\\AbstractEntry' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Reader/Extension/AbstractEntry.php',
+ 'Laminas\\Feed\\Reader\\Extension\\AbstractFeed' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Reader/Extension/AbstractFeed.php',
+ 'Laminas\\Feed\\Reader\\Extension\\Atom\\Entry' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Reader/Extension/Atom/Entry.php',
+ 'Laminas\\Feed\\Reader\\Extension\\Atom\\Feed' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Reader/Extension/Atom/Feed.php',
+ 'Laminas\\Feed\\Reader\\Extension\\Content\\Entry' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Reader/Extension/Content/Entry.php',
+ 'Laminas\\Feed\\Reader\\Extension\\CreativeCommons\\Entry' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Reader/Extension/CreativeCommons/Entry.php',
+ 'Laminas\\Feed\\Reader\\Extension\\CreativeCommons\\Feed' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Reader/Extension/CreativeCommons/Feed.php',
+ 'Laminas\\Feed\\Reader\\Extension\\DublinCore\\Entry' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Reader/Extension/DublinCore/Entry.php',
+ 'Laminas\\Feed\\Reader\\Extension\\DublinCore\\Feed' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Reader/Extension/DublinCore/Feed.php',
+ 'Laminas\\Feed\\Reader\\Extension\\GooglePlayPodcast\\Entry' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Reader/Extension/GooglePlayPodcast/Entry.php',
+ 'Laminas\\Feed\\Reader\\Extension\\GooglePlayPodcast\\Feed' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Reader/Extension/GooglePlayPodcast/Feed.php',
+ 'Laminas\\Feed\\Reader\\Extension\\Podcast\\Entry' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Reader/Extension/Podcast/Entry.php',
+ 'Laminas\\Feed\\Reader\\Extension\\Podcast\\Feed' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Reader/Extension/Podcast/Feed.php',
+ 'Laminas\\Feed\\Reader\\Extension\\Slash\\Entry' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Reader/Extension/Slash/Entry.php',
+ 'Laminas\\Feed\\Reader\\Extension\\Syndication\\Feed' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Reader/Extension/Syndication/Feed.php',
+ 'Laminas\\Feed\\Reader\\Extension\\Thread\\Entry' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Reader/Extension/Thread/Entry.php',
+ 'Laminas\\Feed\\Reader\\Extension\\WellFormedWeb\\Entry' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Reader/Extension/WellFormedWeb/Entry.php',
+ 'Laminas\\Feed\\Reader\\FeedSet' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Reader/FeedSet.php',
+ 'Laminas\\Feed\\Reader\\Feed\\AbstractFeed' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Reader/Feed/AbstractFeed.php',
+ 'Laminas\\Feed\\Reader\\Feed\\Atom' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Reader/Feed/Atom.php',
+ 'Laminas\\Feed\\Reader\\Feed\\Atom\\Source' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Reader/Feed/Atom/Source.php',
+ 'Laminas\\Feed\\Reader\\Feed\\FeedInterface' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Reader/Feed/FeedInterface.php',
+ 'Laminas\\Feed\\Reader\\Feed\\Rss' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Reader/Feed/Rss.php',
+ 'Laminas\\Feed\\Reader\\Http\\ClientInterface' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Reader/Http/ClientInterface.php',
+ 'Laminas\\Feed\\Reader\\Http\\HeaderAwareClientInterface' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Reader/Http/HeaderAwareClientInterface.php',
+ 'Laminas\\Feed\\Reader\\Http\\HeaderAwareResponseInterface' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Reader/Http/HeaderAwareResponseInterface.php',
+ 'Laminas\\Feed\\Reader\\Http\\LaminasHttpClientDecorator' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Reader/Http/LaminasHttpClientDecorator.php',
+ 'Laminas\\Feed\\Reader\\Http\\Psr7ResponseDecorator' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Reader/Http/Psr7ResponseDecorator.php',
+ 'Laminas\\Feed\\Reader\\Http\\Response' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Reader/Http/Response.php',
+ 'Laminas\\Feed\\Reader\\Http\\ResponseInterface' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Reader/Http/ResponseInterface.php',
+ 'Laminas\\Feed\\Reader\\Reader' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Reader/Reader.php',
+ 'Laminas\\Feed\\Reader\\ReaderImportInterface' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Reader/ReaderImportInterface.php',
+ 'Laminas\\Feed\\Reader\\StandaloneExtensionManager' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Reader/StandaloneExtensionManager.php',
+ 'Laminas\\Feed\\Uri' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Uri.php',
+ 'Laminas\\Feed\\Writer\\AbstractFeed' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Writer/AbstractFeed.php',
+ 'Laminas\\Feed\\Writer\\Deleted' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Writer/Deleted.php',
+ 'Laminas\\Feed\\Writer\\Entry' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Writer/Entry.php',
+ 'Laminas\\Feed\\Writer\\Exception\\BadMethodCallException' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Writer/Exception/BadMethodCallException.php',
+ 'Laminas\\Feed\\Writer\\Exception\\ExceptionInterface' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Writer/Exception/ExceptionInterface.php',
+ 'Laminas\\Feed\\Writer\\Exception\\InvalidArgumentException' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Writer/Exception/InvalidArgumentException.php',
+ 'Laminas\\Feed\\Writer\\Exception\\RuntimeException' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Writer/Exception/RuntimeException.php',
+ 'Laminas\\Feed\\Writer\\ExtensionManager' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Writer/ExtensionManager.php',
+ 'Laminas\\Feed\\Writer\\ExtensionManagerInterface' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Writer/ExtensionManagerInterface.php',
+ 'Laminas\\Feed\\Writer\\ExtensionPluginManager' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Writer/ExtensionPluginManager.php',
+ 'Laminas\\Feed\\Writer\\Extension\\AbstractRenderer' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Writer/Extension/AbstractRenderer.php',
+ 'Laminas\\Feed\\Writer\\Extension\\Atom\\Renderer\\Feed' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Writer/Extension/Atom/Renderer/Feed.php',
+ 'Laminas\\Feed\\Writer\\Extension\\Content\\Renderer\\Entry' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Writer/Extension/Content/Renderer/Entry.php',
+ 'Laminas\\Feed\\Writer\\Extension\\DublinCore\\Renderer\\Entry' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Writer/Extension/DublinCore/Renderer/Entry.php',
+ 'Laminas\\Feed\\Writer\\Extension\\DublinCore\\Renderer\\Feed' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Writer/Extension/DublinCore/Renderer/Feed.php',
+ 'Laminas\\Feed\\Writer\\Extension\\GooglePlayPodcast\\Entry' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Writer/Extension/GooglePlayPodcast/Entry.php',
+ 'Laminas\\Feed\\Writer\\Extension\\GooglePlayPodcast\\Feed' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Writer/Extension/GooglePlayPodcast/Feed.php',
+ 'Laminas\\Feed\\Writer\\Extension\\GooglePlayPodcast\\Renderer\\Entry' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Writer/Extension/GooglePlayPodcast/Renderer/Entry.php',
+ 'Laminas\\Feed\\Writer\\Extension\\GooglePlayPodcast\\Renderer\\Feed' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Writer/Extension/GooglePlayPodcast/Renderer/Feed.php',
+ 'Laminas\\Feed\\Writer\\Extension\\ITunes\\Entry' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Writer/Extension/ITunes/Entry.php',
+ 'Laminas\\Feed\\Writer\\Extension\\ITunes\\Feed' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Writer/Extension/ITunes/Feed.php',
+ 'Laminas\\Feed\\Writer\\Extension\\ITunes\\Renderer\\Entry' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Writer/Extension/ITunes/Renderer/Entry.php',
+ 'Laminas\\Feed\\Writer\\Extension\\ITunes\\Renderer\\Feed' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Writer/Extension/ITunes/Renderer/Feed.php',
+ 'Laminas\\Feed\\Writer\\Extension\\RendererInterface' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Writer/Extension/RendererInterface.php',
+ 'Laminas\\Feed\\Writer\\Extension\\Slash\\Renderer\\Entry' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Writer/Extension/Slash/Renderer/Entry.php',
+ 'Laminas\\Feed\\Writer\\Extension\\Threading\\Renderer\\Entry' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Writer/Extension/Threading/Renderer/Entry.php',
+ 'Laminas\\Feed\\Writer\\Extension\\WellFormedWeb\\Renderer\\Entry' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Writer/Extension/WellFormedWeb/Renderer/Entry.php',
+ 'Laminas\\Feed\\Writer\\Feed' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Writer/Feed.php',
+ 'Laminas\\Feed\\Writer\\FeedFactory' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Writer/FeedFactory.php',
+ 'Laminas\\Feed\\Writer\\Renderer\\AbstractRenderer' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Writer/Renderer/AbstractRenderer.php',
+ 'Laminas\\Feed\\Writer\\Renderer\\Entry\\Atom' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Writer/Renderer/Entry/Atom.php',
+ 'Laminas\\Feed\\Writer\\Renderer\\Entry\\AtomDeleted' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Writer/Renderer/Entry/AtomDeleted.php',
+ 'Laminas\\Feed\\Writer\\Renderer\\Entry\\Atom\\Deleted' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Writer/Renderer/Entry/Atom/Deleted.php',
+ 'Laminas\\Feed\\Writer\\Renderer\\Entry\\Rss' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Writer/Renderer/Entry/Rss.php',
+ 'Laminas\\Feed\\Writer\\Renderer\\Feed\\AbstractAtom' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Writer/Renderer/Feed/AbstractAtom.php',
+ 'Laminas\\Feed\\Writer\\Renderer\\Feed\\Atom' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Writer/Renderer/Feed/Atom.php',
+ 'Laminas\\Feed\\Writer\\Renderer\\Feed\\AtomSource' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Writer/Renderer/Feed/AtomSource.php',
+ 'Laminas\\Feed\\Writer\\Renderer\\Feed\\Atom\\AbstractAtom' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Writer/Renderer/Feed/Atom/AbstractAtom.php',
+ 'Laminas\\Feed\\Writer\\Renderer\\Feed\\Atom\\Source' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Writer/Renderer/Feed/Atom/Source.php',
+ 'Laminas\\Feed\\Writer\\Renderer\\Feed\\Rss' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Writer/Renderer/Feed/Rss.php',
+ 'Laminas\\Feed\\Writer\\Renderer\\RendererInterface' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Writer/Renderer/RendererInterface.php',
+ 'Laminas\\Feed\\Writer\\Source' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Writer/Source.php',
+ 'Laminas\\Feed\\Writer\\StandaloneExtensionManager' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Writer/StandaloneExtensionManager.php',
+ 'Laminas\\Feed\\Writer\\Version' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Writer/Version.php',
+ 'Laminas\\Feed\\Writer\\Writer' => __DIR__ . '/..' . '/laminas/laminas-feed/src/Writer/Writer.php',
+ 'Laminas\\Stdlib\\AbstractOptions' => __DIR__ . '/..' . '/laminas/laminas-stdlib/src/AbstractOptions.php',
+ 'Laminas\\Stdlib\\ArrayObject' => __DIR__ . '/..' . '/laminas/laminas-stdlib/src/ArrayObject.php',
+ 'Laminas\\Stdlib\\ArraySerializableInterface' => __DIR__ . '/..' . '/laminas/laminas-stdlib/src/ArraySerializableInterface.php',
+ 'Laminas\\Stdlib\\ArrayStack' => __DIR__ . '/..' . '/laminas/laminas-stdlib/src/ArrayStack.php',
+ 'Laminas\\Stdlib\\ArrayUtils' => __DIR__ . '/..' . '/laminas/laminas-stdlib/src/ArrayUtils.php',
+ 'Laminas\\Stdlib\\ArrayUtils\\MergeRemoveKey' => __DIR__ . '/..' . '/laminas/laminas-stdlib/src/ArrayUtils/MergeRemoveKey.php',
+ 'Laminas\\Stdlib\\ArrayUtils\\MergeReplaceKey' => __DIR__ . '/..' . '/laminas/laminas-stdlib/src/ArrayUtils/MergeReplaceKey.php',
+ 'Laminas\\Stdlib\\ArrayUtils\\MergeReplaceKeyInterface' => __DIR__ . '/..' . '/laminas/laminas-stdlib/src/ArrayUtils/MergeReplaceKeyInterface.php',
+ 'Laminas\\Stdlib\\ConsoleHelper' => __DIR__ . '/..' . '/laminas/laminas-stdlib/src/ConsoleHelper.php',
+ 'Laminas\\Stdlib\\DispatchableInterface' => __DIR__ . '/..' . '/laminas/laminas-stdlib/src/DispatchableInterface.php',
+ 'Laminas\\Stdlib\\ErrorHandler' => __DIR__ . '/..' . '/laminas/laminas-stdlib/src/ErrorHandler.php',
+ 'Laminas\\Stdlib\\Exception\\BadMethodCallException' => __DIR__ . '/..' . '/laminas/laminas-stdlib/src/Exception/BadMethodCallException.php',
+ 'Laminas\\Stdlib\\Exception\\DomainException' => __DIR__ . '/..' . '/laminas/laminas-stdlib/src/Exception/DomainException.php',
+ 'Laminas\\Stdlib\\Exception\\ExceptionInterface' => __DIR__ . '/..' . '/laminas/laminas-stdlib/src/Exception/ExceptionInterface.php',
+ 'Laminas\\Stdlib\\Exception\\ExtensionNotLoadedException' => __DIR__ . '/..' . '/laminas/laminas-stdlib/src/Exception/ExtensionNotLoadedException.php',
+ 'Laminas\\Stdlib\\Exception\\InvalidArgumentException' => __DIR__ . '/..' . '/laminas/laminas-stdlib/src/Exception/InvalidArgumentException.php',
+ 'Laminas\\Stdlib\\Exception\\LogicException' => __DIR__ . '/..' . '/laminas/laminas-stdlib/src/Exception/LogicException.php',
+ 'Laminas\\Stdlib\\Exception\\RuntimeException' => __DIR__ . '/..' . '/laminas/laminas-stdlib/src/Exception/RuntimeException.php',
+ 'Laminas\\Stdlib\\FastPriorityQueue' => __DIR__ . '/..' . '/laminas/laminas-stdlib/src/FastPriorityQueue.php',
+ 'Laminas\\Stdlib\\Glob' => __DIR__ . '/..' . '/laminas/laminas-stdlib/src/Glob.php',
+ 'Laminas\\Stdlib\\Guard\\AllGuardsTrait' => __DIR__ . '/..' . '/laminas/laminas-stdlib/src/Guard/AllGuardsTrait.php',
+ 'Laminas\\Stdlib\\Guard\\ArrayOrTraversableGuardTrait' => __DIR__ . '/..' . '/laminas/laminas-stdlib/src/Guard/ArrayOrTraversableGuardTrait.php',
+ 'Laminas\\Stdlib\\Guard\\EmptyGuardTrait' => __DIR__ . '/..' . '/laminas/laminas-stdlib/src/Guard/EmptyGuardTrait.php',
+ 'Laminas\\Stdlib\\Guard\\NullGuardTrait' => __DIR__ . '/..' . '/laminas/laminas-stdlib/src/Guard/NullGuardTrait.php',
+ 'Laminas\\Stdlib\\InitializableInterface' => __DIR__ . '/..' . '/laminas/laminas-stdlib/src/InitializableInterface.php',
+ 'Laminas\\Stdlib\\JsonSerializable' => __DIR__ . '/..' . '/laminas/laminas-stdlib/src/JsonSerializable.php',
+ 'Laminas\\Stdlib\\Message' => __DIR__ . '/..' . '/laminas/laminas-stdlib/src/Message.php',
+ 'Laminas\\Stdlib\\MessageInterface' => __DIR__ . '/..' . '/laminas/laminas-stdlib/src/MessageInterface.php',
+ 'Laminas\\Stdlib\\ParameterObjectInterface' => __DIR__ . '/..' . '/laminas/laminas-stdlib/src/ParameterObjectInterface.php',
+ 'Laminas\\Stdlib\\Parameters' => __DIR__ . '/..' . '/laminas/laminas-stdlib/src/Parameters.php',
+ 'Laminas\\Stdlib\\ParametersInterface' => __DIR__ . '/..' . '/laminas/laminas-stdlib/src/ParametersInterface.php',
+ 'Laminas\\Stdlib\\PriorityList' => __DIR__ . '/..' . '/laminas/laminas-stdlib/src/PriorityList.php',
+ 'Laminas\\Stdlib\\PriorityQueue' => __DIR__ . '/..' . '/laminas/laminas-stdlib/src/PriorityQueue.php',
+ 'Laminas\\Stdlib\\Request' => __DIR__ . '/..' . '/laminas/laminas-stdlib/src/Request.php',
+ 'Laminas\\Stdlib\\RequestInterface' => __DIR__ . '/..' . '/laminas/laminas-stdlib/src/RequestInterface.php',
+ 'Laminas\\Stdlib\\Response' => __DIR__ . '/..' . '/laminas/laminas-stdlib/src/Response.php',
+ 'Laminas\\Stdlib\\ResponseInterface' => __DIR__ . '/..' . '/laminas/laminas-stdlib/src/ResponseInterface.php',
+ 'Laminas\\Stdlib\\SplPriorityQueue' => __DIR__ . '/..' . '/laminas/laminas-stdlib/src/SplPriorityQueue.php',
+ 'Laminas\\Stdlib\\SplQueue' => __DIR__ . '/..' . '/laminas/laminas-stdlib/src/SplQueue.php',
+ 'Laminas\\Stdlib\\SplStack' => __DIR__ . '/..' . '/laminas/laminas-stdlib/src/SplStack.php',
+ 'Laminas\\Stdlib\\StringUtils' => __DIR__ . '/..' . '/laminas/laminas-stdlib/src/StringUtils.php',
+ 'Laminas\\Stdlib\\StringWrapper\\AbstractStringWrapper' => __DIR__ . '/..' . '/laminas/laminas-stdlib/src/StringWrapper/AbstractStringWrapper.php',
+ 'Laminas\\Stdlib\\StringWrapper\\Iconv' => __DIR__ . '/..' . '/laminas/laminas-stdlib/src/StringWrapper/Iconv.php',
+ 'Laminas\\Stdlib\\StringWrapper\\Intl' => __DIR__ . '/..' . '/laminas/laminas-stdlib/src/StringWrapper/Intl.php',
+ 'Laminas\\Stdlib\\StringWrapper\\MbString' => __DIR__ . '/..' . '/laminas/laminas-stdlib/src/StringWrapper/MbString.php',
+ 'Laminas\\Stdlib\\StringWrapper\\Native' => __DIR__ . '/..' . '/laminas/laminas-stdlib/src/StringWrapper/Native.php',
+ 'Laminas\\Stdlib\\StringWrapper\\StringWrapperInterface' => __DIR__ . '/..' . '/laminas/laminas-stdlib/src/StringWrapper/StringWrapperInterface.php',
+ 'Laminas\\ZendFrameworkBridge\\Autoloader' => __DIR__ . '/..' . '/laminas/laminas-zendframework-bridge/src/Autoloader.php',
+ 'Laminas\\ZendFrameworkBridge\\ConfigPostProcessor' => __DIR__ . '/..' . '/laminas/laminas-zendframework-bridge/src/ConfigPostProcessor.php',
+ 'Laminas\\ZendFrameworkBridge\\Module' => __DIR__ . '/..' . '/laminas/laminas-zendframework-bridge/src/Module.php',
+ 'Laminas\\ZendFrameworkBridge\\Replacements' => __DIR__ . '/..' . '/laminas/laminas-zendframework-bridge/src/Replacements.php',
+ 'Laminas\\ZendFrameworkBridge\\RewriteRules' => __DIR__ . '/..' . '/laminas/laminas-zendframework-bridge/src/RewriteRules.php',
'League\\Container\\Argument\\ArgumentResolverInterface' => __DIR__ . '/..' . '/league/container/src/Argument/ArgumentResolverInterface.php',
'League\\Container\\Argument\\ArgumentResolverTrait' => __DIR__ . '/..' . '/league/container/src/Argument/ArgumentResolverTrait.php',
'League\\Container\\Argument\\RawArgument' => __DIR__ . '/..' . '/league/container/src/Argument/RawArgument.php',
@@ -3970,7 +4201,6 @@ class ComposerStaticInit5c689ffcd54b9e495ed983fdce09b530
'PEAR_Error' => __DIR__ . '/..' . '/pear/pear-core-minimal/src/PEAR.php',
'PEAR_ErrorStack' => __DIR__ . '/..' . '/pear/pear-core-minimal/src/PEAR/ErrorStack.php',
'PEAR_Exception' => __DIR__ . '/..' . '/pear/pear_exception/PEAR/Exception.php',
- 'PEAR_ExceptionTest' => __DIR__ . '/..' . '/pear/pear_exception/tests/PEAR/ExceptionTest.php',
'PantheonSystems\\CDNBehatHelpers\\AgeTracker' => __DIR__ . '/../..' . '/web/modules/pantheon_advanced_page_cache/tests/behat/helper_classes/AgeTracker.php',
'PantheonSystems\\CDNBehatHelpers\\Contexts\\FeatureContext' => __DIR__ . '/../..' . '/web/modules/pantheon_advanced_page_cache/tests/behat/helper_classes/Contexts/FeatureContext.php',
'PantheonSystems\\CDNBehatHelpers\\tests\\AgeTrackerTest' => __DIR__ . '/../..' . '/web/modules/pantheon_advanced_page_cache/tests/behat/helper_classes/tests/AgeTrackerTest.php',
@@ -4213,7 +4443,7 @@ class ComposerStaticInit5c689ffcd54b9e495ed983fdce09b530
'Psr\\Log\\LoggerInterface' => __DIR__ . '/..' . '/psr/log/Psr/Log/LoggerInterface.php',
'Psr\\Log\\LoggerTrait' => __DIR__ . '/..' . '/psr/log/Psr/Log/LoggerTrait.php',
'Psr\\Log\\NullLogger' => __DIR__ . '/..' . '/psr/log/Psr/Log/NullLogger.php',
- 'Psr\\Log\\Test\\DummyTest' => __DIR__ . '/..' . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php',
+ 'Psr\\Log\\Test\\DummyTest' => __DIR__ . '/..' . '/psr/log/Psr/Log/Test/DummyTest.php',
'Psr\\Log\\Test\\LoggerInterfaceTest' => __DIR__ . '/..' . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php',
'Psr\\Log\\Test\\TestLogger' => __DIR__ . '/..' . '/psr/log/Psr/Log/Test/TestLogger.php',
'Psy\\CodeCleaner' => __DIR__ . '/..' . '/psy/psysh/src/CodeCleaner.php',
@@ -5339,6 +5569,7 @@ class ComposerStaticInit5c689ffcd54b9e495ed983fdce09b530
'Symfony\\Component\\HttpFoundation\\Session\\SessionBagInterface' => __DIR__ . '/..' . '/symfony/http-foundation/Session/SessionBagInterface.php',
'Symfony\\Component\\HttpFoundation\\Session\\SessionBagProxy' => __DIR__ . '/..' . '/symfony/http-foundation/Session/SessionBagProxy.php',
'Symfony\\Component\\HttpFoundation\\Session\\SessionInterface' => __DIR__ . '/..' . '/symfony/http-foundation/Session/SessionInterface.php',
+ 'Symfony\\Component\\HttpFoundation\\Session\\SessionUtils' => __DIR__ . '/..' . '/symfony/http-foundation/Session/SessionUtils.php',
'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\AbstractSessionHandler' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Storage/Handler/AbstractSessionHandler.php',
'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\MemcacheSessionHandler' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Storage/Handler/MemcacheSessionHandler.php',
'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\MemcachedSessionHandler' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Storage/Handler/MemcachedSessionHandler.php',
@@ -5869,6 +6100,7 @@ class ComposerStaticInit5c689ffcd54b9e495ed983fdce09b530
'Symfony\\Component\\Validator\\ValidatorBuilder' => __DIR__ . '/..' . '/symfony/validator/ValidatorBuilder.php',
'Symfony\\Component\\Validator\\ValidatorBuilderInterface' => __DIR__ . '/..' . '/symfony/validator/ValidatorBuilderInterface.php',
'Symfony\\Component\\Validator\\Validator\\ContextualValidatorInterface' => __DIR__ . '/..' . '/symfony/validator/Validator/ContextualValidatorInterface.php',
+ 'Symfony\\Component\\Validator\\Validator\\LazyProperty' => __DIR__ . '/..' . '/symfony/validator/Validator/LazyProperty.php',
'Symfony\\Component\\Validator\\Validator\\RecursiveContextualValidator' => __DIR__ . '/..' . '/symfony/validator/Validator/RecursiveContextualValidator.php',
'Symfony\\Component\\Validator\\Validator\\RecursiveValidator' => __DIR__ . '/..' . '/symfony/validator/Validator/RecursiveValidator.php',
'Symfony\\Component\\Validator\\Validator\\TraceableValidator' => __DIR__ . '/..' . '/symfony/validator/Validator/TraceableValidator.php',
@@ -5929,9 +6161,11 @@ class ComposerStaticInit5c689ffcd54b9e495ed983fdce09b530
'Symfony\\Component\\Yaml\\Yaml' => __DIR__ . '/..' . '/symfony/yaml/Yaml.php',
'Symfony\\Polyfill\\Ctype\\Ctype' => __DIR__ . '/..' . '/symfony/polyfill-ctype/Ctype.php',
'Symfony\\Polyfill\\Iconv\\Iconv' => __DIR__ . '/..' . '/symfony/polyfill-iconv/Iconv.php',
+ 'Symfony\\Polyfill\\Intl\\Idn\\Idn' => __DIR__ . '/..' . '/symfony/polyfill-intl-idn/Idn.php',
'Symfony\\Polyfill\\Mbstring\\Mbstring' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/Mbstring.php',
'Symfony\\Polyfill\\Php56\\Php56' => __DIR__ . '/..' . '/symfony/polyfill-php56/Php56.php',
'Symfony\\Polyfill\\Php70\\Php70' => __DIR__ . '/..' . '/symfony/polyfill-php70/Php70.php',
+ 'Symfony\\Polyfill\\Php72\\Php72' => __DIR__ . '/..' . '/symfony/polyfill-php72/Php72.php',
'Symfony\\Polyfill\\Util\\Binary' => __DIR__ . '/..' . '/symfony/polyfill-util/Binary.php',
'Symfony\\Polyfill\\Util\\BinaryNoFuncOverload' => __DIR__ . '/..' . '/symfony/polyfill-util/BinaryNoFuncOverload.php',
'Symfony\\Polyfill\\Util\\BinaryOnFuncOverload' => __DIR__ . '/..' . '/symfony/polyfill-util/BinaryOnFuncOverload.php',
@@ -6374,205 +6608,6 @@ class ComposerStaticInit5c689ffcd54b9e495ed983fdce09b530
'Webmozart\\PathUtil\\Url' => __DIR__ . '/..' . '/webmozart/path-util/src/Url.php',
'WhiteHat101\\Crypt\\APR1_MD5' => __DIR__ . '/..' . '/whitehat101/apr1-md5/src/APR1_MD5.php',
'XdgBaseDir\\Xdg' => __DIR__ . '/..' . '/dnoegel/php-xdg-base-dir/src/Xdg.php',
- 'Zend\\Diactoros\\AbstractSerializer' => __DIR__ . '/..' . '/zendframework/zend-diactoros/src/AbstractSerializer.php',
- 'Zend\\Diactoros\\CallbackStream' => __DIR__ . '/..' . '/zendframework/zend-diactoros/src/CallbackStream.php',
- 'Zend\\Diactoros\\Exception\\DeprecatedMethodException' => __DIR__ . '/..' . '/zendframework/zend-diactoros/src/Exception/DeprecatedMethodException.php',
- 'Zend\\Diactoros\\Exception\\ExceptionInterface' => __DIR__ . '/..' . '/zendframework/zend-diactoros/src/Exception/ExceptionInterface.php',
- 'Zend\\Diactoros\\HeaderSecurity' => __DIR__ . '/..' . '/zendframework/zend-diactoros/src/HeaderSecurity.php',
- 'Zend\\Diactoros\\MessageTrait' => __DIR__ . '/..' . '/zendframework/zend-diactoros/src/MessageTrait.php',
- 'Zend\\Diactoros\\PhpInputStream' => __DIR__ . '/..' . '/zendframework/zend-diactoros/src/PhpInputStream.php',
- 'Zend\\Diactoros\\RelativeStream' => __DIR__ . '/..' . '/zendframework/zend-diactoros/src/RelativeStream.php',
- 'Zend\\Diactoros\\Request' => __DIR__ . '/..' . '/zendframework/zend-diactoros/src/Request.php',
- 'Zend\\Diactoros\\RequestTrait' => __DIR__ . '/..' . '/zendframework/zend-diactoros/src/RequestTrait.php',
- 'Zend\\Diactoros\\Request\\ArraySerializer' => __DIR__ . '/..' . '/zendframework/zend-diactoros/src/Request/ArraySerializer.php',
- 'Zend\\Diactoros\\Request\\Serializer' => __DIR__ . '/..' . '/zendframework/zend-diactoros/src/Request/Serializer.php',
- 'Zend\\Diactoros\\Response' => __DIR__ . '/..' . '/zendframework/zend-diactoros/src/Response.php',
- 'Zend\\Diactoros\\Response\\ArraySerializer' => __DIR__ . '/..' . '/zendframework/zend-diactoros/src/Response/ArraySerializer.php',
- 'Zend\\Diactoros\\Response\\EmitterInterface' => __DIR__ . '/..' . '/zendframework/zend-diactoros/src/Response/EmitterInterface.php',
- 'Zend\\Diactoros\\Response\\EmptyResponse' => __DIR__ . '/..' . '/zendframework/zend-diactoros/src/Response/EmptyResponse.php',
- 'Zend\\Diactoros\\Response\\HtmlResponse' => __DIR__ . '/..' . '/zendframework/zend-diactoros/src/Response/HtmlResponse.php',
- 'Zend\\Diactoros\\Response\\InjectContentTypeTrait' => __DIR__ . '/..' . '/zendframework/zend-diactoros/src/Response/InjectContentTypeTrait.php',
- 'Zend\\Diactoros\\Response\\JsonResponse' => __DIR__ . '/..' . '/zendframework/zend-diactoros/src/Response/JsonResponse.php',
- 'Zend\\Diactoros\\Response\\RedirectResponse' => __DIR__ . '/..' . '/zendframework/zend-diactoros/src/Response/RedirectResponse.php',
- 'Zend\\Diactoros\\Response\\SapiEmitter' => __DIR__ . '/..' . '/zendframework/zend-diactoros/src/Response/SapiEmitter.php',
- 'Zend\\Diactoros\\Response\\SapiEmitterTrait' => __DIR__ . '/..' . '/zendframework/zend-diactoros/src/Response/SapiEmitterTrait.php',
- 'Zend\\Diactoros\\Response\\SapiStreamEmitter' => __DIR__ . '/..' . '/zendframework/zend-diactoros/src/Response/SapiStreamEmitter.php',
- 'Zend\\Diactoros\\Response\\Serializer' => __DIR__ . '/..' . '/zendframework/zend-diactoros/src/Response/Serializer.php',
- 'Zend\\Diactoros\\Response\\TextResponse' => __DIR__ . '/..' . '/zendframework/zend-diactoros/src/Response/TextResponse.php',
- 'Zend\\Diactoros\\Response\\XmlResponse' => __DIR__ . '/..' . '/zendframework/zend-diactoros/src/Response/XmlResponse.php',
- 'Zend\\Diactoros\\Server' => __DIR__ . '/..' . '/zendframework/zend-diactoros/src/Server.php',
- 'Zend\\Diactoros\\ServerRequest' => __DIR__ . '/..' . '/zendframework/zend-diactoros/src/ServerRequest.php',
- 'Zend\\Diactoros\\ServerRequestFactory' => __DIR__ . '/..' . '/zendframework/zend-diactoros/src/ServerRequestFactory.php',
- 'Zend\\Diactoros\\Stream' => __DIR__ . '/..' . '/zendframework/zend-diactoros/src/Stream.php',
- 'Zend\\Diactoros\\UploadedFile' => __DIR__ . '/..' . '/zendframework/zend-diactoros/src/UploadedFile.php',
- 'Zend\\Diactoros\\Uri' => __DIR__ . '/..' . '/zendframework/zend-diactoros/src/Uri.php',
- 'Zend\\Escaper\\Escaper' => __DIR__ . '/..' . '/zendframework/zend-escaper/src/Escaper.php',
- 'Zend\\Escaper\\Exception\\ExceptionInterface' => __DIR__ . '/..' . '/zendframework/zend-escaper/src/Exception/ExceptionInterface.php',
- 'Zend\\Escaper\\Exception\\InvalidArgumentException' => __DIR__ . '/..' . '/zendframework/zend-escaper/src/Exception/InvalidArgumentException.php',
- 'Zend\\Escaper\\Exception\\RuntimeException' => __DIR__ . '/..' . '/zendframework/zend-escaper/src/Exception/RuntimeException.php',
- 'Zend\\Feed\\Exception\\BadMethodCallException' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Exception/BadMethodCallException.php',
- 'Zend\\Feed\\Exception\\ExceptionInterface' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Exception/ExceptionInterface.php',
- 'Zend\\Feed\\Exception\\InvalidArgumentException' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Exception/InvalidArgumentException.php',
- 'Zend\\Feed\\Exception\\RuntimeException' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Exception/RuntimeException.php',
- 'Zend\\Feed\\PubSubHubbub\\AbstractCallback' => __DIR__ . '/..' . '/zendframework/zend-feed/src/PubSubHubbub/AbstractCallback.php',
- 'Zend\\Feed\\PubSubHubbub\\CallbackInterface' => __DIR__ . '/..' . '/zendframework/zend-feed/src/PubSubHubbub/CallbackInterface.php',
- 'Zend\\Feed\\PubSubHubbub\\Exception\\ExceptionInterface' => __DIR__ . '/..' . '/zendframework/zend-feed/src/PubSubHubbub/Exception/ExceptionInterface.php',
- 'Zend\\Feed\\PubSubHubbub\\Exception\\InvalidArgumentException' => __DIR__ . '/..' . '/zendframework/zend-feed/src/PubSubHubbub/Exception/InvalidArgumentException.php',
- 'Zend\\Feed\\PubSubHubbub\\Exception\\RuntimeException' => __DIR__ . '/..' . '/zendframework/zend-feed/src/PubSubHubbub/Exception/RuntimeException.php',
- 'Zend\\Feed\\PubSubHubbub\\HttpResponse' => __DIR__ . '/..' . '/zendframework/zend-feed/src/PubSubHubbub/HttpResponse.php',
- 'Zend\\Feed\\PubSubHubbub\\Model\\AbstractModel' => __DIR__ . '/..' . '/zendframework/zend-feed/src/PubSubHubbub/Model/AbstractModel.php',
- 'Zend\\Feed\\PubSubHubbub\\Model\\Subscription' => __DIR__ . '/..' . '/zendframework/zend-feed/src/PubSubHubbub/Model/Subscription.php',
- 'Zend\\Feed\\PubSubHubbub\\Model\\SubscriptionPersistenceInterface' => __DIR__ . '/..' . '/zendframework/zend-feed/src/PubSubHubbub/Model/SubscriptionPersistenceInterface.php',
- 'Zend\\Feed\\PubSubHubbub\\PubSubHubbub' => __DIR__ . '/..' . '/zendframework/zend-feed/src/PubSubHubbub/PubSubHubbub.php',
- 'Zend\\Feed\\PubSubHubbub\\Publisher' => __DIR__ . '/..' . '/zendframework/zend-feed/src/PubSubHubbub/Publisher.php',
- 'Zend\\Feed\\PubSubHubbub\\Subscriber' => __DIR__ . '/..' . '/zendframework/zend-feed/src/PubSubHubbub/Subscriber.php',
- 'Zend\\Feed\\PubSubHubbub\\Subscriber\\Callback' => __DIR__ . '/..' . '/zendframework/zend-feed/src/PubSubHubbub/Subscriber/Callback.php',
- 'Zend\\Feed\\PubSubHubbub\\Version' => __DIR__ . '/..' . '/zendframework/zend-feed/src/PubSubHubbub/Version.php',
- 'Zend\\Feed\\Reader\\AbstractEntry' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Reader/AbstractEntry.php',
- 'Zend\\Feed\\Reader\\AbstractFeed' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Reader/AbstractFeed.php',
- 'Zend\\Feed\\Reader\\Collection' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Reader/Collection.php',
- 'Zend\\Feed\\Reader\\Collection\\AbstractCollection' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Reader/Collection/AbstractCollection.php',
- 'Zend\\Feed\\Reader\\Collection\\Author' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Reader/Collection/Author.php',
- 'Zend\\Feed\\Reader\\Collection\\Category' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Reader/Collection/Category.php',
- 'Zend\\Feed\\Reader\\Collection\\Collection' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Reader/Collection/Collection.php',
- 'Zend\\Feed\\Reader\\Entry\\AbstractEntry' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Reader/Entry/AbstractEntry.php',
- 'Zend\\Feed\\Reader\\Entry\\Atom' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Reader/Entry/Atom.php',
- 'Zend\\Feed\\Reader\\Entry\\EntryInterface' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Reader/Entry/EntryInterface.php',
- 'Zend\\Feed\\Reader\\Entry\\Rss' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Reader/Entry/Rss.php',
- 'Zend\\Feed\\Reader\\Exception\\BadMethodCallException' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Reader/Exception/BadMethodCallException.php',
- 'Zend\\Feed\\Reader\\Exception\\ExceptionInterface' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Reader/Exception/ExceptionInterface.php',
- 'Zend\\Feed\\Reader\\Exception\\InvalidArgumentException' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Reader/Exception/InvalidArgumentException.php',
- 'Zend\\Feed\\Reader\\Exception\\InvalidHttpClientException' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Reader/Exception/InvalidHttpClientException.php',
- 'Zend\\Feed\\Reader\\Exception\\RuntimeException' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Reader/Exception/RuntimeException.php',
- 'Zend\\Feed\\Reader\\ExtensionManager' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Reader/ExtensionManager.php',
- 'Zend\\Feed\\Reader\\ExtensionManagerInterface' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Reader/ExtensionManagerInterface.php',
- 'Zend\\Feed\\Reader\\ExtensionPluginManager' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Reader/ExtensionPluginManager.php',
- 'Zend\\Feed\\Reader\\Extension\\AbstractEntry' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Reader/Extension/AbstractEntry.php',
- 'Zend\\Feed\\Reader\\Extension\\AbstractFeed' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Reader/Extension/AbstractFeed.php',
- 'Zend\\Feed\\Reader\\Extension\\Atom\\Entry' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Reader/Extension/Atom/Entry.php',
- 'Zend\\Feed\\Reader\\Extension\\Atom\\Feed' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Reader/Extension/Atom/Feed.php',
- 'Zend\\Feed\\Reader\\Extension\\Content\\Entry' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Reader/Extension/Content/Entry.php',
- 'Zend\\Feed\\Reader\\Extension\\CreativeCommons\\Entry' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Reader/Extension/CreativeCommons/Entry.php',
- 'Zend\\Feed\\Reader\\Extension\\CreativeCommons\\Feed' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Reader/Extension/CreativeCommons/Feed.php',
- 'Zend\\Feed\\Reader\\Extension\\DublinCore\\Entry' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Reader/Extension/DublinCore/Entry.php',
- 'Zend\\Feed\\Reader\\Extension\\DublinCore\\Feed' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Reader/Extension/DublinCore/Feed.php',
- 'Zend\\Feed\\Reader\\Extension\\GooglePlayPodcast\\Entry' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Reader/Extension/GooglePlayPodcast/Entry.php',
- 'Zend\\Feed\\Reader\\Extension\\GooglePlayPodcast\\Feed' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Reader/Extension/GooglePlayPodcast/Feed.php',
- 'Zend\\Feed\\Reader\\Extension\\Podcast\\Entry' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Reader/Extension/Podcast/Entry.php',
- 'Zend\\Feed\\Reader\\Extension\\Podcast\\Feed' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Reader/Extension/Podcast/Feed.php',
- 'Zend\\Feed\\Reader\\Extension\\Slash\\Entry' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Reader/Extension/Slash/Entry.php',
- 'Zend\\Feed\\Reader\\Extension\\Syndication\\Feed' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Reader/Extension/Syndication/Feed.php',
- 'Zend\\Feed\\Reader\\Extension\\Thread\\Entry' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Reader/Extension/Thread/Entry.php',
- 'Zend\\Feed\\Reader\\Extension\\WellFormedWeb\\Entry' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Reader/Extension/WellFormedWeb/Entry.php',
- 'Zend\\Feed\\Reader\\FeedSet' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Reader/FeedSet.php',
- 'Zend\\Feed\\Reader\\Feed\\AbstractFeed' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Reader/Feed/AbstractFeed.php',
- 'Zend\\Feed\\Reader\\Feed\\Atom' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Reader/Feed/Atom.php',
- 'Zend\\Feed\\Reader\\Feed\\Atom\\Source' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Reader/Feed/Atom/Source.php',
- 'Zend\\Feed\\Reader\\Feed\\FeedInterface' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Reader/Feed/FeedInterface.php',
- 'Zend\\Feed\\Reader\\Feed\\Rss' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Reader/Feed/Rss.php',
- 'Zend\\Feed\\Reader\\Http\\ClientInterface' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Reader/Http/ClientInterface.php',
- 'Zend\\Feed\\Reader\\Http\\HeaderAwareClientInterface' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Reader/Http/HeaderAwareClientInterface.php',
- 'Zend\\Feed\\Reader\\Http\\HeaderAwareResponseInterface' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Reader/Http/HeaderAwareResponseInterface.php',
- 'Zend\\Feed\\Reader\\Http\\Psr7ResponseDecorator' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Reader/Http/Psr7ResponseDecorator.php',
- 'Zend\\Feed\\Reader\\Http\\Response' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Reader/Http/Response.php',
- 'Zend\\Feed\\Reader\\Http\\ResponseInterface' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Reader/Http/ResponseInterface.php',
- 'Zend\\Feed\\Reader\\Http\\ZendHttpClientDecorator' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Reader/Http/ZendHttpClientDecorator.php',
- 'Zend\\Feed\\Reader\\Reader' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Reader/Reader.php',
- 'Zend\\Feed\\Reader\\ReaderImportInterface' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Reader/ReaderImportInterface.php',
- 'Zend\\Feed\\Reader\\StandaloneExtensionManager' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Reader/StandaloneExtensionManager.php',
- 'Zend\\Feed\\Uri' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Uri.php',
- 'Zend\\Feed\\Writer\\AbstractFeed' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Writer/AbstractFeed.php',
- 'Zend\\Feed\\Writer\\Deleted' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Writer/Deleted.php',
- 'Zend\\Feed\\Writer\\Entry' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Writer/Entry.php',
- 'Zend\\Feed\\Writer\\Exception\\BadMethodCallException' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Writer/Exception/BadMethodCallException.php',
- 'Zend\\Feed\\Writer\\Exception\\ExceptionInterface' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Writer/Exception/ExceptionInterface.php',
- 'Zend\\Feed\\Writer\\Exception\\InvalidArgumentException' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Writer/Exception/InvalidArgumentException.php',
- 'Zend\\Feed\\Writer\\Exception\\RuntimeException' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Writer/Exception/RuntimeException.php',
- 'Zend\\Feed\\Writer\\ExtensionManager' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Writer/ExtensionManager.php',
- 'Zend\\Feed\\Writer\\ExtensionManagerInterface' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Writer/ExtensionManagerInterface.php',
- 'Zend\\Feed\\Writer\\ExtensionPluginManager' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Writer/ExtensionPluginManager.php',
- 'Zend\\Feed\\Writer\\Extension\\AbstractRenderer' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Writer/Extension/AbstractRenderer.php',
- 'Zend\\Feed\\Writer\\Extension\\Atom\\Renderer\\Feed' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Writer/Extension/Atom/Renderer/Feed.php',
- 'Zend\\Feed\\Writer\\Extension\\Content\\Renderer\\Entry' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Writer/Extension/Content/Renderer/Entry.php',
- 'Zend\\Feed\\Writer\\Extension\\DublinCore\\Renderer\\Entry' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Writer/Extension/DublinCore/Renderer/Entry.php',
- 'Zend\\Feed\\Writer\\Extension\\DublinCore\\Renderer\\Feed' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Writer/Extension/DublinCore/Renderer/Feed.php',
- 'Zend\\Feed\\Writer\\Extension\\GooglePlayPodcast\\Entry' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Writer/Extension/GooglePlayPodcast/Entry.php',
- 'Zend\\Feed\\Writer\\Extension\\GooglePlayPodcast\\Feed' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Writer/Extension/GooglePlayPodcast/Feed.php',
- 'Zend\\Feed\\Writer\\Extension\\GooglePlayPodcast\\Renderer\\Entry' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Writer/Extension/GooglePlayPodcast/Renderer/Entry.php',
- 'Zend\\Feed\\Writer\\Extension\\GooglePlayPodcast\\Renderer\\Feed' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Writer/Extension/GooglePlayPodcast/Renderer/Feed.php',
- 'Zend\\Feed\\Writer\\Extension\\ITunes\\Entry' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Writer/Extension/ITunes/Entry.php',
- 'Zend\\Feed\\Writer\\Extension\\ITunes\\Feed' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Writer/Extension/ITunes/Feed.php',
- 'Zend\\Feed\\Writer\\Extension\\ITunes\\Renderer\\Entry' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Writer/Extension/ITunes/Renderer/Entry.php',
- 'Zend\\Feed\\Writer\\Extension\\ITunes\\Renderer\\Feed' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Writer/Extension/ITunes/Renderer/Feed.php',
- 'Zend\\Feed\\Writer\\Extension\\RendererInterface' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Writer/Extension/RendererInterface.php',
- 'Zend\\Feed\\Writer\\Extension\\Slash\\Renderer\\Entry' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Writer/Extension/Slash/Renderer/Entry.php',
- 'Zend\\Feed\\Writer\\Extension\\Threading\\Renderer\\Entry' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Writer/Extension/Threading/Renderer/Entry.php',
- 'Zend\\Feed\\Writer\\Extension\\WellFormedWeb\\Renderer\\Entry' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Writer/Extension/WellFormedWeb/Renderer/Entry.php',
- 'Zend\\Feed\\Writer\\Feed' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Writer/Feed.php',
- 'Zend\\Feed\\Writer\\FeedFactory' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Writer/FeedFactory.php',
- 'Zend\\Feed\\Writer\\Renderer\\AbstractRenderer' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Writer/Renderer/AbstractRenderer.php',
- 'Zend\\Feed\\Writer\\Renderer\\Entry\\Atom' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Writer/Renderer/Entry/Atom.php',
- 'Zend\\Feed\\Writer\\Renderer\\Entry\\AtomDeleted' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Writer/Renderer/Entry/AtomDeleted.php',
- 'Zend\\Feed\\Writer\\Renderer\\Entry\\Atom\\Deleted' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Writer/Renderer/Entry/Atom/Deleted.php',
- 'Zend\\Feed\\Writer\\Renderer\\Entry\\Rss' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Writer/Renderer/Entry/Rss.php',
- 'Zend\\Feed\\Writer\\Renderer\\Feed\\AbstractAtom' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Writer/Renderer/Feed/AbstractAtom.php',
- 'Zend\\Feed\\Writer\\Renderer\\Feed\\Atom' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Writer/Renderer/Feed/Atom.php',
- 'Zend\\Feed\\Writer\\Renderer\\Feed\\AtomSource' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Writer/Renderer/Feed/AtomSource.php',
- 'Zend\\Feed\\Writer\\Renderer\\Feed\\Atom\\AbstractAtom' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Writer/Renderer/Feed/Atom/AbstractAtom.php',
- 'Zend\\Feed\\Writer\\Renderer\\Feed\\Atom\\Source' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Writer/Renderer/Feed/Atom/Source.php',
- 'Zend\\Feed\\Writer\\Renderer\\Feed\\Rss' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Writer/Renderer/Feed/Rss.php',
- 'Zend\\Feed\\Writer\\Renderer\\RendererInterface' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Writer/Renderer/RendererInterface.php',
- 'Zend\\Feed\\Writer\\Source' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Writer/Source.php',
- 'Zend\\Feed\\Writer\\StandaloneExtensionManager' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Writer/StandaloneExtensionManager.php',
- 'Zend\\Feed\\Writer\\Version' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Writer/Version.php',
- 'Zend\\Feed\\Writer\\Writer' => __DIR__ . '/..' . '/zendframework/zend-feed/src/Writer/Writer.php',
- 'Zend\\Stdlib\\AbstractOptions' => __DIR__ . '/..' . '/zendframework/zend-stdlib/src/AbstractOptions.php',
- 'Zend\\Stdlib\\ArrayObject' => __DIR__ . '/..' . '/zendframework/zend-stdlib/src/ArrayObject.php',
- 'Zend\\Stdlib\\ArraySerializableInterface' => __DIR__ . '/..' . '/zendframework/zend-stdlib/src/ArraySerializableInterface.php',
- 'Zend\\Stdlib\\ArrayStack' => __DIR__ . '/..' . '/zendframework/zend-stdlib/src/ArrayStack.php',
- 'Zend\\Stdlib\\ArrayUtils' => __DIR__ . '/..' . '/zendframework/zend-stdlib/src/ArrayUtils.php',
- 'Zend\\Stdlib\\ArrayUtils\\MergeRemoveKey' => __DIR__ . '/..' . '/zendframework/zend-stdlib/src/ArrayUtils/MergeRemoveKey.php',
- 'Zend\\Stdlib\\ArrayUtils\\MergeReplaceKey' => __DIR__ . '/..' . '/zendframework/zend-stdlib/src/ArrayUtils/MergeReplaceKey.php',
- 'Zend\\Stdlib\\ArrayUtils\\MergeReplaceKeyInterface' => __DIR__ . '/..' . '/zendframework/zend-stdlib/src/ArrayUtils/MergeReplaceKeyInterface.php',
- 'Zend\\Stdlib\\ConsoleHelper' => __DIR__ . '/..' . '/zendframework/zend-stdlib/src/ConsoleHelper.php',
- 'Zend\\Stdlib\\DispatchableInterface' => __DIR__ . '/..' . '/zendframework/zend-stdlib/src/DispatchableInterface.php',
- 'Zend\\Stdlib\\ErrorHandler' => __DIR__ . '/..' . '/zendframework/zend-stdlib/src/ErrorHandler.php',
- 'Zend\\Stdlib\\Exception\\BadMethodCallException' => __DIR__ . '/..' . '/zendframework/zend-stdlib/src/Exception/BadMethodCallException.php',
- 'Zend\\Stdlib\\Exception\\DomainException' => __DIR__ . '/..' . '/zendframework/zend-stdlib/src/Exception/DomainException.php',
- 'Zend\\Stdlib\\Exception\\ExceptionInterface' => __DIR__ . '/..' . '/zendframework/zend-stdlib/src/Exception/ExceptionInterface.php',
- 'Zend\\Stdlib\\Exception\\ExtensionNotLoadedException' => __DIR__ . '/..' . '/zendframework/zend-stdlib/src/Exception/ExtensionNotLoadedException.php',
- 'Zend\\Stdlib\\Exception\\InvalidArgumentException' => __DIR__ . '/..' . '/zendframework/zend-stdlib/src/Exception/InvalidArgumentException.php',
- 'Zend\\Stdlib\\Exception\\LogicException' => __DIR__ . '/..' . '/zendframework/zend-stdlib/src/Exception/LogicException.php',
- 'Zend\\Stdlib\\Exception\\RuntimeException' => __DIR__ . '/..' . '/zendframework/zend-stdlib/src/Exception/RuntimeException.php',
- 'Zend\\Stdlib\\FastPriorityQueue' => __DIR__ . '/..' . '/zendframework/zend-stdlib/src/FastPriorityQueue.php',
- 'Zend\\Stdlib\\Glob' => __DIR__ . '/..' . '/zendframework/zend-stdlib/src/Glob.php',
- 'Zend\\Stdlib\\Guard\\AllGuardsTrait' => __DIR__ . '/..' . '/zendframework/zend-stdlib/src/Guard/AllGuardsTrait.php',
- 'Zend\\Stdlib\\Guard\\ArrayOrTraversableGuardTrait' => __DIR__ . '/..' . '/zendframework/zend-stdlib/src/Guard/ArrayOrTraversableGuardTrait.php',
- 'Zend\\Stdlib\\Guard\\EmptyGuardTrait' => __DIR__ . '/..' . '/zendframework/zend-stdlib/src/Guard/EmptyGuardTrait.php',
- 'Zend\\Stdlib\\Guard\\NullGuardTrait' => __DIR__ . '/..' . '/zendframework/zend-stdlib/src/Guard/NullGuardTrait.php',
- 'Zend\\Stdlib\\InitializableInterface' => __DIR__ . '/..' . '/zendframework/zend-stdlib/src/InitializableInterface.php',
- 'Zend\\Stdlib\\JsonSerializable' => __DIR__ . '/..' . '/zendframework/zend-stdlib/src/JsonSerializable.php',
- 'Zend\\Stdlib\\Message' => __DIR__ . '/..' . '/zendframework/zend-stdlib/src/Message.php',
- 'Zend\\Stdlib\\MessageInterface' => __DIR__ . '/..' . '/zendframework/zend-stdlib/src/MessageInterface.php',
- 'Zend\\Stdlib\\ParameterObjectInterface' => __DIR__ . '/..' . '/zendframework/zend-stdlib/src/ParameterObjectInterface.php',
- 'Zend\\Stdlib\\Parameters' => __DIR__ . '/..' . '/zendframework/zend-stdlib/src/Parameters.php',
- 'Zend\\Stdlib\\ParametersInterface' => __DIR__ . '/..' . '/zendframework/zend-stdlib/src/ParametersInterface.php',
- 'Zend\\Stdlib\\PriorityList' => __DIR__ . '/..' . '/zendframework/zend-stdlib/src/PriorityList.php',
- 'Zend\\Stdlib\\PriorityQueue' => __DIR__ . '/..' . '/zendframework/zend-stdlib/src/PriorityQueue.php',
- 'Zend\\Stdlib\\Request' => __DIR__ . '/..' . '/zendframework/zend-stdlib/src/Request.php',
- 'Zend\\Stdlib\\RequestInterface' => __DIR__ . '/..' . '/zendframework/zend-stdlib/src/RequestInterface.php',
- 'Zend\\Stdlib\\Response' => __DIR__ . '/..' . '/zendframework/zend-stdlib/src/Response.php',
- 'Zend\\Stdlib\\ResponseInterface' => __DIR__ . '/..' . '/zendframework/zend-stdlib/src/ResponseInterface.php',
- 'Zend\\Stdlib\\SplPriorityQueue' => __DIR__ . '/..' . '/zendframework/zend-stdlib/src/SplPriorityQueue.php',
- 'Zend\\Stdlib\\SplQueue' => __DIR__ . '/..' . '/zendframework/zend-stdlib/src/SplQueue.php',
- 'Zend\\Stdlib\\SplStack' => __DIR__ . '/..' . '/zendframework/zend-stdlib/src/SplStack.php',
- 'Zend\\Stdlib\\StringUtils' => __DIR__ . '/..' . '/zendframework/zend-stdlib/src/StringUtils.php',
- 'Zend\\Stdlib\\StringWrapper\\AbstractStringWrapper' => __DIR__ . '/..' . '/zendframework/zend-stdlib/src/StringWrapper/AbstractStringWrapper.php',
- 'Zend\\Stdlib\\StringWrapper\\Iconv' => __DIR__ . '/..' . '/zendframework/zend-stdlib/src/StringWrapper/Iconv.php',
- 'Zend\\Stdlib\\StringWrapper\\Intl' => __DIR__ . '/..' . '/zendframework/zend-stdlib/src/StringWrapper/Intl.php',
- 'Zend\\Stdlib\\StringWrapper\\MbString' => __DIR__ . '/..' . '/zendframework/zend-stdlib/src/StringWrapper/MbString.php',
- 'Zend\\Stdlib\\StringWrapper\\Native' => __DIR__ . '/..' . '/zendframework/zend-stdlib/src/StringWrapper/Native.php',
- 'Zend\\Stdlib\\StringWrapper\\StringWrapperInterface' => __DIR__ . '/..' . '/zendframework/zend-stdlib/src/StringWrapper/StringWrapperInterface.php',
'cweagans\\Composer\\PatchEvent' => __DIR__ . '/..' . '/cweagans/composer-patches/src/PatchEvent.php',
'cweagans\\Composer\\PatchEvents' => __DIR__ . '/..' . '/cweagans/composer-patches/src/PatchEvents.php',
'cweagans\\Composer\\Patches' => __DIR__ . '/..' . '/cweagans/composer-patches/src/Patches.php',
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 1d4bcd340c..abf2dd8aa3 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -67,29 +67,29 @@
},
{
"name": "asm89/stack-cors",
- "version": "1.2.0",
- "version_normalized": "1.2.0.0",
+ "version": "1.3.0",
+ "version_normalized": "1.3.0.0",
"source": {
"type": "git",
"url": "https://github.com/asm89/stack-cors.git",
- "reference": "c163e2b614550aedcf71165db2473d936abbced6"
+ "reference": "b9c31def6a83f84b4d4a40d35996d375755f0e08"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/asm89/stack-cors/zipball/c163e2b614550aedcf71165db2473d936abbced6",
- "reference": "c163e2b614550aedcf71165db2473d936abbced6",
+ "url": "https://api.github.com/repos/asm89/stack-cors/zipball/b9c31def6a83f84b4d4a40d35996d375755f0e08",
+ "reference": "b9c31def6a83f84b4d4a40d35996d375755f0e08",
"shasum": ""
},
"require": {
"php": ">=5.5.9",
- "symfony/http-foundation": "~2.7|~3.0|~4.0",
- "symfony/http-kernel": "~2.7|~3.0|~4.0"
+ "symfony/http-foundation": "~2.7|~3.0|~4.0|~5.0",
+ "symfony/http-kernel": "~2.7|~3.0|~4.0|~5.0"
},
"require-dev": {
"phpunit/phpunit": "^5.0 || ^4.8.10",
"squizlabs/php_codesniffer": "^2.3"
},
- "time": "2017-12-20T14:37:45+00:00",
+ "time": "2019-12-24T22:41:47+00:00",
"type": "library",
"extra": {
"branch-alias": {
@@ -304,31 +304,34 @@
},
{
"name": "composer/installers",
- "version": "v1.7.0",
- "version_normalized": "1.7.0.0",
+ "version": "v1.9.0",
+ "version_normalized": "1.9.0.0",
"source": {
"type": "git",
"url": "https://github.com/composer/installers.git",
- "reference": "141b272484481432cda342727a427dc1e206bfa0"
+ "reference": "b93bcf0fa1fccb0b7d176b0967d969691cd74cca"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/installers/zipball/141b272484481432cda342727a427dc1e206bfa0",
- "reference": "141b272484481432cda342727a427dc1e206bfa0",
+ "url": "https://api.github.com/repos/composer/installers/zipball/b93bcf0fa1fccb0b7d176b0967d969691cd74cca",
+ "reference": "b93bcf0fa1fccb0b7d176b0967d969691cd74cca",
"shasum": ""
},
"require": {
- "composer-plugin-api": "^1.0"
+ "composer-plugin-api": "^1.0 || ^2.0"
},
"replace": {
"roundcube/plugin-installer": "*",
"shama/baton": "*"
},
"require-dev": {
- "composer/composer": "1.0.*@dev",
- "phpunit/phpunit": "^4.8.36"
+ "composer/composer": "1.6.* || 2.0.*@dev",
+ "composer/semver": "1.0.* || 2.0.*@dev",
+ "phpunit/phpunit": "^4.8.36",
+ "sebastian/comparator": "^1.2.4",
+ "symfony/process": "^2.3"
},
- "time": "2019-08-12T15:00:31+00:00",
+ "time": "2020-04-07T06:57:05+00:00",
"type": "composer-plugin",
"extra": {
"class": "Composer\\Installers\\Plugin",
@@ -364,6 +367,7 @@
"Kanboard",
"Lan Management System",
"MODX Evo",
+ "MantisBT",
"Mautic",
"Maya",
"OXID",
@@ -418,6 +422,7 @@
"shopware",
"silverstripe",
"sydes",
+ "sylius",
"symfony",
"typo3",
"wordpress",
@@ -428,27 +433,26 @@
},
{
"name": "composer/semver",
- "version": "1.5.0",
- "version_normalized": "1.5.0.0",
+ "version": "1.5.1",
+ "version_normalized": "1.5.1.0",
"source": {
"type": "git",
"url": "https://github.com/composer/semver.git",
- "reference": "46d9139568ccb8d9e7cdd4539cab7347568a5e2e"
+ "reference": "c6bea70230ef4dd483e6bbcab6005f682ed3a8de"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/semver/zipball/46d9139568ccb8d9e7cdd4539cab7347568a5e2e",
- "reference": "46d9139568ccb8d9e7cdd4539cab7347568a5e2e",
+ "url": "https://api.github.com/repos/composer/semver/zipball/c6bea70230ef4dd483e6bbcab6005f682ed3a8de",
+ "reference": "c6bea70230ef4dd483e6bbcab6005f682ed3a8de",
"shasum": ""
},
"require": {
"php": "^5.3.2 || ^7.0"
},
"require-dev": {
- "phpunit/phpunit": "^4.5 || ^5.0.5",
- "phpunit/phpunit-mock-objects": "2.3.0 || ^3.0"
+ "phpunit/phpunit": "^4.5 || ^5.0.5"
},
- "time": "2019-03-19T17:25:45+00:00",
+ "time": "2020-01-13T12:06:48+00:00",
"type": "library",
"extra": {
"branch-alias": {
@@ -3497,17 +3501,17 @@
},
{
"name": "drupal/core",
- "version": "8.8.6",
- "version_normalized": "8.8.6.0",
+ "version": "8.9.0",
+ "version_normalized": "8.9.0.0",
"source": {
"type": "git",
"url": "https://github.com/drupal/core.git",
- "reference": "a5daf2aa45bbc72da72e1e64d5261f746ffb508c"
+ "reference": "f90882ab0723becda2333e4d33e1a6ab27cb8f0c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/drupal/core/zipball/a5daf2aa45bbc72da72e1e64d5261f746ffb508c",
- "reference": "a5daf2aa45bbc72da72e1e64d5261f746ffb508c",
+ "url": "https://api.github.com/repos/drupal/core/zipball/f90882ab0723becda2333e4d33e1a6ab27cb8f0c",
+ "reference": "f90882ab0723becda2333e4d33e1a6ab27cb8f0c",
"shasum": ""
},
"require": {
@@ -3531,16 +3535,19 @@
"ext-tokenizer": "*",
"ext-xml": "*",
"guzzlehttp/guzzle": "^6.3",
+ "laminas/laminas-diactoros": "^1.8",
+ "laminas/laminas-feed": "^2.12",
"masterminds/html5": "^2.1",
"pear/archive_tar": "^1.4.9",
"php": ">=7.0.8",
+ "psr/log": "^1.0",
"stack/builder": "^1.0",
"symfony-cmf/routing": "^1.4",
"symfony/class-loader": "~3.4.0",
"symfony/console": "~3.4.0",
"symfony/dependency-injection": "~3.4.26",
"symfony/event-dispatcher": "~3.4.0",
- "symfony/http-foundation": "~3.4.27",
+ "symfony/http-foundation": "~3.4.35",
"symfony/http-kernel": "~3.4.14",
"symfony/polyfill-iconv": "^1.0",
"symfony/process": "~3.4.0",
@@ -3551,9 +3558,7 @@
"symfony/validator": "~3.4.0",
"symfony/yaml": "~3.4.5",
"twig/twig": "^1.38.2",
- "typo3/phar-stream-wrapper": "^3.1.3",
- "zendframework/zend-diactoros": "^1.8",
- "zendframework/zend-feed": "^2.12"
+ "typo3/phar-stream-wrapper": "^3.1.3"
},
"conflict": {
"drupal/pathauto": "<1.6",
@@ -3673,7 +3678,7 @@
"drupal/workflows": "self.version",
"drupal/workspaces": "self.version"
},
- "time": "2020-05-20T08:22:02+00:00",
+ "time": "2020-06-03T16:44:36+00:00",
"type": "drupal-core",
"extra": {
"drupal-scaffold": {
@@ -3734,78 +3739,80 @@
},
{
"name": "drupal/core-recommended",
- "version": "8.8.6",
- "version_normalized": "8.8.6.0",
+ "version": "8.9.0",
+ "version_normalized": "8.9.0.0",
"source": {
"type": "git",
"url": "https://github.com/drupal/core-recommended.git",
- "reference": "361d61f272767e0e34f8ac8c7a51e7c14e387714"
+ "reference": "1b87cf5dea633a66a1c4f22d635bc92c127071d9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/drupal/core-recommended/zipball/361d61f272767e0e34f8ac8c7a51e7c14e387714",
- "reference": "361d61f272767e0e34f8ac8c7a51e7c14e387714",
+ "url": "https://api.github.com/repos/drupal/core-recommended/zipball/1b87cf5dea633a66a1c4f22d635bc92c127071d9",
+ "reference": "1b87cf5dea633a66a1c4f22d635bc92c127071d9",
"shasum": ""
},
"require": {
- "asm89/stack-cors": "1.2.0",
- "composer/installers": "v1.7.0",
- "composer/semver": "1.5.0",
+ "asm89/stack-cors": "1.3.0",
+ "composer/semver": "1.5.1",
"doctrine/annotations": "v1.4.0",
"doctrine/cache": "v1.6.2",
"doctrine/collections": "v1.4.0",
"doctrine/common": "v2.7.3",
"doctrine/inflector": "v1.2.0",
"doctrine/lexer": "1.0.2",
- "drupal/core": "8.8.6",
+ "drupal/core": "8.9.0",
"easyrdf/easyrdf": "0.9.1",
- "egulias/email-validator": "2.1.11",
- "guzzlehttp/guzzle": "6.3.3",
+ "egulias/email-validator": "2.1.17",
+ "guzzlehttp/guzzle": "6.5.4",
"guzzlehttp/promises": "v1.3.1",
"guzzlehttp/psr7": "1.6.1",
+ "laminas/laminas-diactoros": "1.8.7p2",
+ "laminas/laminas-escaper": "2.6.1",
+ "laminas/laminas-feed": "2.12.2",
+ "laminas/laminas-stdlib": "3.2.1",
+ "laminas/laminas-zendframework-bridge": "1.0.4",
"masterminds/html5": "2.3.0",
"paragonie/random_compat": "v9.99.99",
"pear/archive_tar": "1.4.9",
- "pear/console_getopt": "v1.4.2",
- "pear/pear-core-minimal": "v1.10.9",
- "pear/pear_exception": "v1.0.0",
+ "pear/console_getopt": "v1.4.3",
+ "pear/pear-core-minimal": "v1.10.10",
+ "pear/pear_exception": "v1.0.1",
"psr/container": "1.0.0",
"psr/http-message": "1.0.1",
- "psr/log": "1.1.0",
+ "psr/log": "1.1.3",
"ralouphie/getallheaders": "3.0.3",
"stack/builder": "v1.0.5",
"symfony-cmf/routing": "1.4.1",
- "symfony/class-loader": "v3.4.35",
- "symfony/console": "v3.4.35",
- "symfony/debug": "v3.4.35",
- "symfony/dependency-injection": "v3.4.35",
- "symfony/event-dispatcher": "v3.4.35",
- "symfony/http-foundation": "v3.4.35",
- "symfony/http-kernel": "v3.4.35",
- "symfony/polyfill-ctype": "v1.12.0",
- "symfony/polyfill-iconv": "v1.12.0",
- "symfony/polyfill-mbstring": "v1.12.0",
- "symfony/polyfill-php56": "v1.12.0",
- "symfony/polyfill-php70": "v1.12.0",
- "symfony/polyfill-util": "v1.12.0",
- "symfony/process": "v3.4.35",
+ "symfony/class-loader": "v3.4.41",
+ "symfony/console": "v3.4.41",
+ "symfony/debug": "v3.4.41",
+ "symfony/dependency-injection": "v3.4.41",
+ "symfony/event-dispatcher": "v3.4.41",
+ "symfony/http-foundation": "v3.4.41",
+ "symfony/http-kernel": "v3.4.41",
+ "symfony/polyfill-ctype": "v1.17.0",
+ "symfony/polyfill-iconv": "v1.17.0",
+ "symfony/polyfill-intl-idn": "v1.17.0",
+ "symfony/polyfill-mbstring": "v1.17.0",
+ "symfony/polyfill-php56": "v1.17.0",
+ "symfony/polyfill-php70": "v1.17.0",
+ "symfony/polyfill-php72": "v1.17.0",
+ "symfony/polyfill-util": "v1.17.0",
+ "symfony/process": "v3.4.41",
"symfony/psr-http-message-bridge": "v1.1.2",
- "symfony/routing": "v3.4.35",
- "symfony/serializer": "v3.4.35",
- "symfony/translation": "v3.4.35",
- "symfony/validator": "v3.4.35",
- "symfony/yaml": "v3.4.35",
- "twig/twig": "v1.42.3",
- "typo3/phar-stream-wrapper": "v3.1.3",
- "zendframework/zend-diactoros": "1.8.7",
- "zendframework/zend-escaper": "2.6.1",
- "zendframework/zend-feed": "2.12.0",
- "zendframework/zend-stdlib": "3.2.1"
+ "symfony/routing": "v3.4.41",
+ "symfony/serializer": "v3.4.41",
+ "symfony/translation": "v3.4.41",
+ "symfony/validator": "v3.4.41",
+ "symfony/yaml": "v3.4.41",
+ "twig/twig": "v1.42.5",
+ "typo3/phar-stream-wrapper": "v3.1.4"
},
"conflict": {
"webflo/drupal-core-strict": "*"
},
- "time": "2020-05-20T08:22:02+00:00",
+ "time": "2020-06-03T16:44:36+00:00",
"type": "metapackage",
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -9086,12 +9093,12 @@
"version_normalized": "0.9.1.0",
"source": {
"type": "git",
- "url": "https://github.com/njh/easyrdf.git",
+ "url": "https://github.com/easyrdf/easyrdf.git",
"reference": "acd09dfe0555fbcfa254291e433c45fdd4652566"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/njh/easyrdf/zipball/acd09dfe0555fbcfa254291e433c45fdd4652566",
+ "url": "https://api.github.com/repos/easyrdf/easyrdf/zipball/acd09dfe0555fbcfa254291e433c45fdd4652566",
"reference": "acd09dfe0555fbcfa254291e433c45fdd4652566",
"shasum": ""
},
@@ -9146,33 +9153,33 @@
},
{
"name": "egulias/email-validator",
- "version": "2.1.11",
- "version_normalized": "2.1.11.0",
+ "version": "2.1.17",
+ "version_normalized": "2.1.17.0",
"source": {
"type": "git",
"url": "https://github.com/egulias/EmailValidator.git",
- "reference": "92dd169c32f6f55ba570c309d83f5209cefb5e23"
+ "reference": "ade6887fd9bd74177769645ab5c474824f8a418a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/92dd169c32f6f55ba570c309d83f5209cefb5e23",
- "reference": "92dd169c32f6f55ba570c309d83f5209cefb5e23",
+ "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/ade6887fd9bd74177769645ab5c474824f8a418a",
+ "reference": "ade6887fd9bd74177769645ab5c474824f8a418a",
"shasum": ""
},
"require": {
"doctrine/lexer": "^1.0.1",
- "php": ">= 5.5"
+ "php": ">=5.5",
+ "symfony/polyfill-intl-idn": "^1.10"
},
"require-dev": {
- "dominicsayers/isemail": "dev-master",
- "phpunit/phpunit": "^4.8.35||^5.7||^6.0",
- "satooshi/php-coveralls": "^1.0.1",
- "symfony/phpunit-bridge": "^4.4@dev"
+ "dominicsayers/isemail": "^3.0.7",
+ "phpunit/phpunit": "^4.8.36|^7.5.15",
+ "satooshi/php-coveralls": "^1.0.1"
},
"suggest": {
"ext-intl": "PHP Internationalization Libraries are required to use the SpoofChecking validation"
},
- "time": "2019-08-13T17:33:27+00:00",
+ "time": "2020-02-13T22:36:52+00:00",
"type": "library",
"extra": {
"branch-alias": {
@@ -9525,47 +9532,49 @@
},
{
"name": "guzzlehttp/guzzle",
- "version": "6.3.3",
- "version_normalized": "6.3.3.0",
+ "version": "6.5.4",
+ "version_normalized": "6.5.4.0",
"source": {
"type": "git",
"url": "https://github.com/guzzle/guzzle.git",
- "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba"
+ "reference": "a4a1b6930528a8f7ee03518e6442ec7a44155d9d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/guzzle/guzzle/zipball/407b0cb880ace85c9b63c5f9551db498cb2d50ba",
- "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba",
+ "url": "https://api.github.com/repos/guzzle/guzzle/zipball/a4a1b6930528a8f7ee03518e6442ec7a44155d9d",
+ "reference": "a4a1b6930528a8f7ee03518e6442ec7a44155d9d",
"shasum": ""
},
"require": {
+ "ext-json": "*",
"guzzlehttp/promises": "^1.0",
- "guzzlehttp/psr7": "^1.4",
- "php": ">=5.5"
+ "guzzlehttp/psr7": "^1.6.1",
+ "php": ">=5.5",
+ "symfony/polyfill-intl-idn": "1.17.0"
},
"require-dev": {
"ext-curl": "*",
"phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0",
- "psr/log": "^1.0"
+ "psr/log": "^1.1"
},
"suggest": {
"psr/log": "Required for using the Log middleware"
},
- "time": "2018-04-22T15:46:56+00:00",
+ "time": "2020-05-25T19:35:05+00:00",
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "6.3-dev"
+ "dev-master": "6.5-dev"
}
},
"installation-source": "dist",
"autoload": {
- "files": [
- "src/functions_include.php"
- ],
"psr-4": {
"GuzzleHttp\\": "src/"
- }
+ },
+ "files": [
+ "src/functions_include.php"
+ ]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -9913,6 +9922,309 @@
"description": "Highlight PHP code in terminal",
"abandoned": "php-parallel-lint/php-console-highlighter"
},
+ {
+ "name": "laminas/laminas-diactoros",
+ "version": "1.8.7p2",
+ "version_normalized": "1.8.7.0-patch2",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/laminas/laminas-diactoros.git",
+ "reference": "6991c1af7c8d2c8efee81b22ba97024781824aaa"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/6991c1af7c8d2c8efee81b22ba97024781824aaa",
+ "reference": "6991c1af7c8d2c8efee81b22ba97024781824aaa",
+ "shasum": ""
+ },
+ "require": {
+ "laminas/laminas-zendframework-bridge": "^1.0",
+ "php": "^5.6 || ^7.0",
+ "psr/http-message": "^1.0"
+ },
+ "provide": {
+ "psr/http-message-implementation": "1.0"
+ },
+ "replace": {
+ "zendframework/zend-diactoros": "~1.8.7.0"
+ },
+ "require-dev": {
+ "ext-dom": "*",
+ "ext-libxml": "*",
+ "laminas/laminas-coding-standard": "~1.0",
+ "php-http/psr7-integration-tests": "dev-master",
+ "phpunit/phpunit": "^5.7.16 || ^6.0.8 || ^7.2.7"
+ },
+ "time": "2020-03-23T15:28:28+00:00",
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-release-1.8": "1.8.x-dev"
+ }
+ },
+ "installation-source": "dist",
+ "autoload": {
+ "files": [
+ "src/functions/create_uploaded_file.php",
+ "src/functions/marshal_headers_from_sapi.php",
+ "src/functions/marshal_method_from_sapi.php",
+ "src/functions/marshal_protocol_version_from_sapi.php",
+ "src/functions/marshal_uri_from_sapi.php",
+ "src/functions/normalize_server.php",
+ "src/functions/normalize_uploaded_files.php",
+ "src/functions/parse_cookie_header.php",
+ "src/functions/create_uploaded_file.legacy.php",
+ "src/functions/marshal_headers_from_sapi.legacy.php",
+ "src/functions/marshal_method_from_sapi.legacy.php",
+ "src/functions/marshal_protocol_version_from_sapi.legacy.php",
+ "src/functions/marshal_uri_from_sapi.legacy.php",
+ "src/functions/normalize_server.legacy.php",
+ "src/functions/normalize_uploaded_files.legacy.php",
+ "src/functions/parse_cookie_header.legacy.php"
+ ],
+ "psr-4": {
+ "Laminas\\Diactoros\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "description": "PSR HTTP Message implementations",
+ "homepage": "https://laminas.dev",
+ "keywords": [
+ "http",
+ "laminas",
+ "psr",
+ "psr-7"
+ ]
+ },
+ {
+ "name": "laminas/laminas-escaper",
+ "version": "2.6.1",
+ "version_normalized": "2.6.1.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/laminas/laminas-escaper.git",
+ "reference": "25f2a053eadfa92ddacb609dcbbc39362610da70"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/laminas/laminas-escaper/zipball/25f2a053eadfa92ddacb609dcbbc39362610da70",
+ "reference": "25f2a053eadfa92ddacb609dcbbc39362610da70",
+ "shasum": ""
+ },
+ "require": {
+ "laminas/laminas-zendframework-bridge": "^1.0",
+ "php": "^5.6 || ^7.0"
+ },
+ "replace": {
+ "zendframework/zend-escaper": "self.version"
+ },
+ "require-dev": {
+ "laminas/laminas-coding-standard": "~1.0.0",
+ "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2"
+ },
+ "time": "2019-12-31T16:43:30+00:00",
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.6.x-dev",
+ "dev-develop": "2.7.x-dev"
+ }
+ },
+ "installation-source": "dist",
+ "autoload": {
+ "psr-4": {
+ "Laminas\\Escaper\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "description": "Securely and safely escape HTML, HTML attributes, JavaScript, CSS, and URLs",
+ "homepage": "https://laminas.dev",
+ "keywords": [
+ "escaper",
+ "laminas"
+ ]
+ },
+ {
+ "name": "laminas/laminas-feed",
+ "version": "2.12.2",
+ "version_normalized": "2.12.2.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/laminas/laminas-feed.git",
+ "reference": "8a193ac96ebcb3e16b6ee754ac2a889eefacb654"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/laminas/laminas-feed/zipball/8a193ac96ebcb3e16b6ee754ac2a889eefacb654",
+ "reference": "8a193ac96ebcb3e16b6ee754ac2a889eefacb654",
+ "shasum": ""
+ },
+ "require": {
+ "ext-dom": "*",
+ "ext-libxml": "*",
+ "laminas/laminas-escaper": "^2.5.2",
+ "laminas/laminas-stdlib": "^3.2.1",
+ "laminas/laminas-zendframework-bridge": "^1.0",
+ "php": "^5.6 || ^7.0"
+ },
+ "replace": {
+ "zendframework/zend-feed": "^2.12.0"
+ },
+ "require-dev": {
+ "laminas/laminas-cache": "^2.7.2",
+ "laminas/laminas-coding-standard": "~1.0.0",
+ "laminas/laminas-db": "^2.8.2",
+ "laminas/laminas-http": "^2.7",
+ "laminas/laminas-servicemanager": "^2.7.8 || ^3.3",
+ "laminas/laminas-validator": "^2.10.1",
+ "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.20",
+ "psr/http-message": "^1.0.1"
+ },
+ "suggest": {
+ "laminas/laminas-cache": "Laminas\\Cache component, for optionally caching feeds between requests",
+ "laminas/laminas-db": "Laminas\\Db component, for use with PubSubHubbub",
+ "laminas/laminas-http": "Laminas\\Http for PubSubHubbub, and optionally for use with Laminas\\Feed\\Reader",
+ "laminas/laminas-servicemanager": "Laminas\\ServiceManager component, for easily extending ExtensionManager implementations",
+ "laminas/laminas-validator": "Laminas\\Validator component, for validating email addresses used in Atom feeds and entries when using the Writer subcomponent",
+ "psr/http-message": "PSR-7 ^1.0.1, if you wish to use Laminas\\Feed\\Reader\\Http\\Psr7ResponseDecorator"
+ },
+ "time": "2020-03-29T12:36:29+00:00",
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.12.x-dev",
+ "dev-develop": "2.13.x-dev"
+ }
+ },
+ "installation-source": "dist",
+ "autoload": {
+ "psr-4": {
+ "Laminas\\Feed\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "description": "provides functionality for consuming RSS and Atom feeds",
+ "homepage": "https://laminas.dev",
+ "keywords": [
+ "feed",
+ "laminas"
+ ]
+ },
+ {
+ "name": "laminas/laminas-stdlib",
+ "version": "3.2.1",
+ "version_normalized": "3.2.1.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/laminas/laminas-stdlib.git",
+ "reference": "2b18347625a2f06a1a485acfbc870f699dbe51c6"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/laminas/laminas-stdlib/zipball/2b18347625a2f06a1a485acfbc870f699dbe51c6",
+ "reference": "2b18347625a2f06a1a485acfbc870f699dbe51c6",
+ "shasum": ""
+ },
+ "require": {
+ "laminas/laminas-zendframework-bridge": "^1.0",
+ "php": "^5.6 || ^7.0"
+ },
+ "replace": {
+ "zendframework/zend-stdlib": "self.version"
+ },
+ "require-dev": {
+ "laminas/laminas-coding-standard": "~1.0.0",
+ "phpbench/phpbench": "^0.13",
+ "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2"
+ },
+ "time": "2019-12-31T17:51:15+00:00",
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "3.2.x-dev",
+ "dev-develop": "3.3.x-dev"
+ }
+ },
+ "installation-source": "dist",
+ "autoload": {
+ "psr-4": {
+ "Laminas\\Stdlib\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "description": "SPL extensions, array utilities, error handlers, and more",
+ "homepage": "https://laminas.dev",
+ "keywords": [
+ "laminas",
+ "stdlib"
+ ]
+ },
+ {
+ "name": "laminas/laminas-zendframework-bridge",
+ "version": "1.0.4",
+ "version_normalized": "1.0.4.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/laminas/laminas-zendframework-bridge.git",
+ "reference": "fcd87520e4943d968557803919523772475e8ea3"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/laminas/laminas-zendframework-bridge/zipball/fcd87520e4943d968557803919523772475e8ea3",
+ "reference": "fcd87520e4943d968557803919523772475e8ea3",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^5.6 || ^7.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^5.7 || ^6.5 || ^7.5 || ^8.1",
+ "squizlabs/php_codesniffer": "^3.5"
+ },
+ "time": "2020-05-20T16:45:56+00:00",
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0.x-dev",
+ "dev-develop": "1.1.x-dev"
+ },
+ "laminas": {
+ "module": "Laminas\\ZendFrameworkBridge"
+ }
+ },
+ "installation-source": "dist",
+ "autoload": {
+ "files": [
+ "src/autoload.php"
+ ],
+ "psr-4": {
+ "Laminas\\ZendFrameworkBridge\\": "src//"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "description": "Alias legacy ZF class names to Laminas Project equivalents.",
+ "keywords": [
+ "ZendFramework",
+ "autoloading",
+ "laminas",
+ "zf"
+ ]
+ },
{
"name": "league/container",
"version": "2.4.1",
@@ -10376,20 +10688,20 @@
},
{
"name": "pear/console_getopt",
- "version": "v1.4.2",
- "version_normalized": "1.4.2.0",
+ "version": "v1.4.3",
+ "version_normalized": "1.4.3.0",
"source": {
"type": "git",
"url": "https://github.com/pear/Console_Getopt.git",
- "reference": "6c77aeb625b32bd752e89ee17972d103588b90c0"
+ "reference": "a41f8d3e668987609178c7c4a9fe48fecac53fa0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/pear/Console_Getopt/zipball/6c77aeb625b32bd752e89ee17972d103588b90c0",
- "reference": "6c77aeb625b32bd752e89ee17972d103588b90c0",
+ "url": "https://api.github.com/repos/pear/Console_Getopt/zipball/a41f8d3e668987609178c7c4a9fe48fecac53fa0",
+ "reference": "a41f8d3e668987609178c7c4a9fe48fecac53fa0",
"shasum": ""
},
- "time": "2019-02-06T16:52:33+00:00",
+ "time": "2019-11-20T18:27:48+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -10405,11 +10717,6 @@
"BSD-2-Clause"
],
"authors": [
- {
- "name": "Greg Beaver",
- "email": "cellog@php.net",
- "role": "Helper"
- },
{
"name": "Andrei Zmievski",
"email": "andrei@php.net",
@@ -10419,6 +10726,11 @@
"name": "Stig Bakken",
"email": "stig@php.net",
"role": "Developer"
+ },
+ {
+ "name": "Greg Beaver",
+ "email": "cellog@php.net",
+ "role": "Helper"
}
],
"description": "More info available on: http://pear.php.net/package/Console_Getopt"
@@ -10482,17 +10794,17 @@
},
{
"name": "pear/pear-core-minimal",
- "version": "v1.10.9",
- "version_normalized": "1.10.9.0",
+ "version": "v1.10.10",
+ "version_normalized": "1.10.10.0",
"source": {
"type": "git",
"url": "https://github.com/pear/pear-core-minimal.git",
- "reference": "742be8dd68c746a01e4b0a422258e9c9cae1c37f"
+ "reference": "625a3c429d9b2c1546438679074cac1b089116a7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/pear/pear-core-minimal/zipball/742be8dd68c746a01e4b0a422258e9c9cae1c37f",
- "reference": "742be8dd68c746a01e4b0a422258e9c9cae1c37f",
+ "url": "https://api.github.com/repos/pear/pear-core-minimal/zipball/625a3c429d9b2c1546438679074cac1b089116a7",
+ "reference": "625a3c429d9b2c1546438679074cac1b089116a7",
"shasum": ""
},
"require": {
@@ -10502,7 +10814,7 @@
"replace": {
"rsky/pear-core-min": "self.version"
},
- "time": "2019-03-13T18:15:44+00:00",
+ "time": "2019-11-19T19:00:24+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -10528,17 +10840,17 @@
},
{
"name": "pear/pear_exception",
- "version": "v1.0.0",
- "version_normalized": "1.0.0.0",
+ "version": "v1.0.1",
+ "version_normalized": "1.0.1.0",
"source": {
"type": "git",
"url": "https://github.com/pear/PEAR_Exception.git",
- "reference": "8c18719fdae000b690e3912be401c76e406dd13b"
+ "reference": "dbb42a5a0e45f3adcf99babfb2a1ba77b8ac36a7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/pear/PEAR_Exception/zipball/8c18719fdae000b690e3912be401c76e406dd13b",
- "reference": "8c18719fdae000b690e3912be401c76e406dd13b",
+ "url": "https://api.github.com/repos/pear/PEAR_Exception/zipball/dbb42a5a0e45f3adcf99babfb2a1ba77b8ac36a7",
+ "reference": "dbb42a5a0e45f3adcf99babfb2a1ba77b8ac36a7",
"shasum": ""
},
"require": {
@@ -10547,7 +10859,7 @@
"require-dev": {
"phpunit/phpunit": "*"
},
- "time": "2015-02-10T20:07:52+00:00",
+ "time": "2019-12-10T10:24:42+00:00",
"type": "class",
"extra": {
"branch-alias": {
@@ -10556,9 +10868,9 @@
},
"installation-source": "dist",
"autoload": {
- "psr-0": {
- "PEAR": ""
- }
+ "classmap": [
+ "PEAR/"
+ ]
},
"notification-url": "https://packagist.org/downloads/",
"include-path": [
@@ -10688,27 +11000,27 @@
},
{
"name": "psr/log",
- "version": "1.1.0",
- "version_normalized": "1.1.0.0",
+ "version": "1.1.3",
+ "version_normalized": "1.1.3.0",
"source": {
"type": "git",
"url": "https://github.com/php-fig/log.git",
- "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd"
+ "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-fig/log/zipball/6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
- "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
+ "url": "https://api.github.com/repos/php-fig/log/zipball/0f73288fd15629204f9d42b7055f72dacbe811fc",
+ "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc",
"shasum": ""
},
"require": {
"php": ">=5.3.0"
},
- "time": "2018-11-20T15:27:04+00:00",
+ "time": "2020-03-23T09:12:05+00:00",
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.0.x-dev"
+ "dev-master": "1.1.x-dev"
}
},
"installation-source": "dist",
@@ -11249,17 +11561,17 @@
},
{
"name": "symfony/class-loader",
- "version": "v3.4.35",
- "version_normalized": "3.4.35.0",
+ "version": "v3.4.41",
+ "version_normalized": "3.4.41.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/class-loader.git",
- "reference": "e212b06996819a2bce026a63da03b7182d05a690"
+ "reference": "e4636a4f23f157278a19e5db160c63de0da297d8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/class-loader/zipball/e212b06996819a2bce026a63da03b7182d05a690",
- "reference": "e212b06996819a2bce026a63da03b7182d05a690",
+ "url": "https://api.github.com/repos/symfony/class-loader/zipball/e4636a4f23f157278a19e5db160c63de0da297d8",
+ "reference": "e4636a4f23f157278a19e5db160c63de0da297d8",
"shasum": ""
},
"require": {
@@ -11272,7 +11584,7 @@
"suggest": {
"symfony/polyfill-apcu": "For using ApcClassLoader on HHVM"
},
- "time": "2019-08-20T13:31:17+00:00",
+ "time": "2020-03-15T09:38:08+00:00",
"type": "library",
"extra": {
"branch-alias": {
@@ -11373,17 +11685,17 @@
},
{
"name": "symfony/console",
- "version": "v3.4.35",
- "version_normalized": "3.4.35.0",
+ "version": "v3.4.41",
+ "version_normalized": "3.4.41.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
- "reference": "17b154f932c5874cdbda6d05796b6490eec9f9f7"
+ "reference": "bfe29ead7e7b1cc9ce74c6a40d06ad1f96fced13"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/17b154f932c5874cdbda6d05796b6490eec9f9f7",
- "reference": "17b154f932c5874cdbda6d05796b6490eec9f9f7",
+ "url": "https://api.github.com/repos/symfony/console/zipball/bfe29ead7e7b1cc9ce74c6a40d06ad1f96fced13",
+ "reference": "bfe29ead7e7b1cc9ce74c6a40d06ad1f96fced13",
"shasum": ""
},
"require": {
@@ -11412,7 +11724,7 @@
"symfony/lock": "",
"symfony/process": ""
},
- "time": "2019-11-13T07:12:39+00:00",
+ "time": "2020-05-30T18:58:05+00:00",
"type": "library",
"extra": {
"branch-alias": {
@@ -11502,17 +11814,17 @@
},
{
"name": "symfony/debug",
- "version": "v3.4.35",
- "version_normalized": "3.4.35.0",
+ "version": "v3.4.41",
+ "version_normalized": "3.4.41.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/debug.git",
- "reference": "f72e33fdb1170b326e72c3157f0cd456351dd086"
+ "reference": "518c6a00d0872da30bd06aee3ea59a0a5cf54d6d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/debug/zipball/f72e33fdb1170b326e72c3157f0cd456351dd086",
- "reference": "f72e33fdb1170b326e72c3157f0cd456351dd086",
+ "url": "https://api.github.com/repos/symfony/debug/zipball/518c6a00d0872da30bd06aee3ea59a0a5cf54d6d",
+ "reference": "518c6a00d0872da30bd06aee3ea59a0a5cf54d6d",
"shasum": ""
},
"require": {
@@ -11525,7 +11837,7 @@
"require-dev": {
"symfony/http-kernel": "~2.8|~3.0|~4.0"
},
- "time": "2019-10-24T15:33:53+00:00",
+ "time": "2020-05-22T18:25:20+00:00",
"type": "library",
"extra": {
"branch-alias": {
@@ -11560,17 +11872,17 @@
},
{
"name": "symfony/dependency-injection",
- "version": "v3.4.35",
- "version_normalized": "3.4.35.0",
+ "version": "v3.4.41",
+ "version_normalized": "3.4.41.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/dependency-injection.git",
- "reference": "0ea4d39ca82409a25a43b61ce828048a90000920"
+ "reference": "e39380b7104b0ec538a075ae919f00c7e5267bac"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/0ea4d39ca82409a25a43b61ce828048a90000920",
- "reference": "0ea4d39ca82409a25a43b61ce828048a90000920",
+ "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/e39380b7104b0ec538a075ae919f00c7e5267bac",
+ "reference": "e39380b7104b0ec538a075ae919f00c7e5267bac",
"shasum": ""
},
"require": {
@@ -11598,7 +11910,7 @@
"symfony/proxy-manager-bridge": "Generate service proxies to lazy load them",
"symfony/yaml": ""
},
- "time": "2019-11-08T16:18:30+00:00",
+ "time": "2020-05-30T21:06:01+00:00",
"type": "library",
"extra": {
"branch-alias": {
@@ -11692,17 +12004,17 @@
},
{
"name": "symfony/event-dispatcher",
- "version": "v3.4.35",
- "version_normalized": "3.4.35.0",
+ "version": "v3.4.41",
+ "version_normalized": "3.4.41.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
- "reference": "f9031c22ec127d4a2450760f81a8677fe8a10177"
+ "reference": "14d978f8e8555f2de719c00eb65376be7d2e9081"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/f9031c22ec127d4a2450760f81a8677fe8a10177",
- "reference": "f9031c22ec127d4a2450760f81a8677fe8a10177",
+ "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/14d978f8e8555f2de719c00eb65376be7d2e9081",
+ "reference": "14d978f8e8555f2de719c00eb65376be7d2e9081",
"shasum": ""
},
"require": {
@@ -11722,7 +12034,7 @@
"symfony/dependency-injection": "",
"symfony/http-kernel": ""
},
- "time": "2019-10-24T15:33:53+00:00",
+ "time": "2020-05-05T15:06:23+00:00",
"type": "library",
"extra": {
"branch-alias": {
@@ -11860,17 +12172,17 @@
},
{
"name": "symfony/http-foundation",
- "version": "v3.4.35",
- "version_normalized": "3.4.35.0",
+ "version": "v3.4.41",
+ "version_normalized": "3.4.41.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-foundation.git",
- "reference": "9e4b3ac8fa3348b4811674d23de32d201de225ce"
+ "reference": "fbd216d2304b1a3fe38d6392b04729c8dd356359"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-foundation/zipball/9e4b3ac8fa3348b4811674d23de32d201de225ce",
- "reference": "9e4b3ac8fa3348b4811674d23de32d201de225ce",
+ "url": "https://api.github.com/repos/symfony/http-foundation/zipball/fbd216d2304b1a3fe38d6392b04729c8dd356359",
+ "reference": "fbd216d2304b1a3fe38d6392b04729c8dd356359",
"shasum": ""
},
"require": {
@@ -11881,7 +12193,7 @@
"require-dev": {
"symfony/expression-language": "~2.8|~3.0|~4.0"
},
- "time": "2019-11-11T12:53:10+00:00",
+ "time": "2020-05-16T13:15:54+00:00",
"type": "library",
"extra": {
"branch-alias": {
@@ -11916,17 +12228,17 @@
},
{
"name": "symfony/http-kernel",
- "version": "v3.4.35",
- "version_normalized": "3.4.35.0",
+ "version": "v3.4.41",
+ "version_normalized": "3.4.41.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-kernel.git",
- "reference": "e1764b3de00ec5636dd03d02fd44bcb1147d70d9"
+ "reference": "e4e4ed6c008c983645b4eee6b67d8f258cde54df"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-kernel/zipball/e1764b3de00ec5636dd03d02fd44bcb1147d70d9",
- "reference": "e1764b3de00ec5636dd03d02fd44bcb1147d70d9",
+ "url": "https://api.github.com/repos/symfony/http-kernel/zipball/e4e4ed6c008c983645b4eee6b67d8f258cde54df",
+ "reference": "e4e4ed6c008c983645b4eee6b67d8f258cde54df",
"shasum": ""
},
"require": {
@@ -11973,7 +12285,7 @@
"symfony/finder": "",
"symfony/var-dumper": ""
},
- "time": "2019-11-13T08:44:50+00:00",
+ "time": "2020-05-31T05:14:17+00:00",
"type": "library",
"extra": {
"branch-alias": {
@@ -12008,17 +12320,17 @@
},
{
"name": "symfony/polyfill-ctype",
- "version": "v1.12.0",
- "version_normalized": "1.12.0.0",
+ "version": "v1.17.0",
+ "version_normalized": "1.17.0.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-ctype.git",
- "reference": "550ebaac289296ce228a706d0867afc34687e3f4"
+ "reference": "e94c8b1bbe2bc77507a1056cdb06451c75b427f9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/550ebaac289296ce228a706d0867afc34687e3f4",
- "reference": "550ebaac289296ce228a706d0867afc34687e3f4",
+ "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e94c8b1bbe2bc77507a1056cdb06451c75b427f9",
+ "reference": "e94c8b1bbe2bc77507a1056cdb06451c75b427f9",
"shasum": ""
},
"require": {
@@ -12027,11 +12339,11 @@
"suggest": {
"ext-ctype": "For best performance"
},
- "time": "2019-08-06T08:03:45+00:00",
+ "time": "2020-05-12T16:14:59+00:00",
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.12-dev"
+ "dev-master": "1.17-dev"
}
},
"installation-source": "dist",
@@ -12068,17 +12380,17 @@
},
{
"name": "symfony/polyfill-iconv",
- "version": "v1.12.0",
- "version_normalized": "1.12.0.0",
+ "version": "v1.17.0",
+ "version_normalized": "1.17.0.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-iconv.git",
- "reference": "685968b11e61a347c18bf25db32effa478be610f"
+ "reference": "c4de7601eefbf25f9d47190abe07f79fe0a27424"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/685968b11e61a347c18bf25db32effa478be610f",
- "reference": "685968b11e61a347c18bf25db32effa478be610f",
+ "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/c4de7601eefbf25f9d47190abe07f79fe0a27424",
+ "reference": "c4de7601eefbf25f9d47190abe07f79fe0a27424",
"shasum": ""
},
"require": {
@@ -12087,11 +12399,11 @@
"suggest": {
"ext-iconv": "For best performance"
},
- "time": "2019-08-06T08:03:45+00:00",
+ "time": "2020-05-12T16:47:27+00:00",
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.12-dev"
+ "dev-master": "1.17-dev"
}
},
"installation-source": "dist",
@@ -12127,19 +12439,83 @@
"shim"
]
},
+ {
+ "name": "symfony/polyfill-intl-idn",
+ "version": "v1.17.0",
+ "version_normalized": "1.17.0.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/polyfill-intl-idn.git",
+ "reference": "3bff59ea7047e925be6b7f2059d60af31bb46d6a"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/3bff59ea7047e925be6b7f2059d60af31bb46d6a",
+ "reference": "3bff59ea7047e925be6b7f2059d60af31bb46d6a",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.3",
+ "symfony/polyfill-mbstring": "^1.3",
+ "symfony/polyfill-php72": "^1.10"
+ },
+ "suggest": {
+ "ext-intl": "For best performance"
+ },
+ "time": "2020-05-12T16:47:27+00:00",
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.17-dev"
+ }
+ },
+ "installation-source": "dist",
+ "autoload": {
+ "psr-4": {
+ "Symfony\\Polyfill\\Intl\\Idn\\": ""
+ },
+ "files": [
+ "bootstrap.php"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Laurent Bassin",
+ "email": "laurent@bassin.info"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
+ }
+ ],
+ "description": "Symfony polyfill for intl's idn_to_ascii and idn_to_utf8 functions",
+ "homepage": "https://symfony.com",
+ "keywords": [
+ "compatibility",
+ "idn",
+ "intl",
+ "polyfill",
+ "portable",
+ "shim"
+ ]
+ },
{
"name": "symfony/polyfill-mbstring",
- "version": "v1.12.0",
- "version_normalized": "1.12.0.0",
+ "version": "v1.17.0",
+ "version_normalized": "1.17.0.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
- "reference": "b42a2f66e8f1b15ccf25652c3424265923eb4f17"
+ "reference": "fa79b11539418b02fc5e1897267673ba2c19419c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/b42a2f66e8f1b15ccf25652c3424265923eb4f17",
- "reference": "b42a2f66e8f1b15ccf25652c3424265923eb4f17",
+ "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fa79b11539418b02fc5e1897267673ba2c19419c",
+ "reference": "fa79b11539418b02fc5e1897267673ba2c19419c",
"shasum": ""
},
"require": {
@@ -12148,11 +12524,11 @@
"suggest": {
"ext-mbstring": "For best performance"
},
- "time": "2019-08-06T08:03:45+00:00",
+ "time": "2020-05-12T16:47:27+00:00",
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.12-dev"
+ "dev-master": "1.17-dev"
}
},
"installation-source": "dist",
@@ -12190,28 +12566,28 @@
},
{
"name": "symfony/polyfill-php56",
- "version": "v1.12.0",
- "version_normalized": "1.12.0.0",
+ "version": "v1.17.0",
+ "version_normalized": "1.17.0.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php56.git",
- "reference": "0e3b212e96a51338639d8ce175c046d7729c3403"
+ "reference": "e3c8c138280cdfe4b81488441555583aa1984e23"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/0e3b212e96a51338639d8ce175c046d7729c3403",
- "reference": "0e3b212e96a51338639d8ce175c046d7729c3403",
+ "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/e3c8c138280cdfe4b81488441555583aa1984e23",
+ "reference": "e3c8c138280cdfe4b81488441555583aa1984e23",
"shasum": ""
},
"require": {
"php": ">=5.3.3",
"symfony/polyfill-util": "~1.0"
},
- "time": "2019-08-06T08:03:45+00:00",
+ "time": "2020-05-12T16:47:27+00:00",
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.12-dev"
+ "dev-master": "1.17-dev"
}
},
"installation-source": "dist",
@@ -12248,28 +12624,28 @@
},
{
"name": "symfony/polyfill-php70",
- "version": "v1.12.0",
- "version_normalized": "1.12.0.0",
+ "version": "v1.17.0",
+ "version_normalized": "1.17.0.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php70.git",
- "reference": "54b4c428a0054e254223797d2713c31e08610831"
+ "reference": "82225c2d7d23d7e70515496d249c0152679b468e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/54b4c428a0054e254223797d2713c31e08610831",
- "reference": "54b4c428a0054e254223797d2713c31e08610831",
+ "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/82225c2d7d23d7e70515496d249c0152679b468e",
+ "reference": "82225c2d7d23d7e70515496d249c0152679b468e",
"shasum": ""
},
"require": {
"paragonie/random_compat": "~1.0|~2.0|~9.99",
"php": ">=5.3.3"
},
- "time": "2019-08-06T08:03:45+00:00",
+ "time": "2020-05-12T16:47:27+00:00",
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.12-dev"
+ "dev-master": "1.17-dev"
}
},
"installation-source": "dist",
@@ -12307,29 +12683,86 @@
"shim"
]
},
+ {
+ "name": "symfony/polyfill-php72",
+ "version": "v1.17.0",
+ "version_normalized": "1.17.0.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/polyfill-php72.git",
+ "reference": "f048e612a3905f34931127360bdd2def19a5e582"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/f048e612a3905f34931127360bdd2def19a5e582",
+ "reference": "f048e612a3905f34931127360bdd2def19a5e582",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.3"
+ },
+ "time": "2020-05-12T16:47:27+00:00",
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.17-dev"
+ }
+ },
+ "installation-source": "dist",
+ "autoload": {
+ "psr-4": {
+ "Symfony\\Polyfill\\Php72\\": ""
+ },
+ "files": [
+ "bootstrap.php"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Nicolas Grekas",
+ "email": "p@tchwork.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
+ }
+ ],
+ "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions",
+ "homepage": "https://symfony.com",
+ "keywords": [
+ "compatibility",
+ "polyfill",
+ "portable",
+ "shim"
+ ]
+ },
{
"name": "symfony/polyfill-util",
- "version": "v1.12.0",
- "version_normalized": "1.12.0.0",
+ "version": "v1.17.0",
+ "version_normalized": "1.17.0.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-util.git",
- "reference": "4317de1386717b4c22caed7725350a8887ab205c"
+ "reference": "4afb4110fc037752cf0ce9869f9ab8162c4e20d7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/4317de1386717b4c22caed7725350a8887ab205c",
- "reference": "4317de1386717b4c22caed7725350a8887ab205c",
+ "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/4afb4110fc037752cf0ce9869f9ab8162c4e20d7",
+ "reference": "4afb4110fc037752cf0ce9869f9ab8162c4e20d7",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
- "time": "2019-08-06T08:03:45+00:00",
+ "time": "2020-05-12T16:14:59+00:00",
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.12-dev"
+ "dev-master": "1.17-dev"
}
},
"installation-source": "dist",
@@ -12363,23 +12796,23 @@
},
{
"name": "symfony/process",
- "version": "v3.4.35",
- "version_normalized": "3.4.35.0",
+ "version": "v3.4.41",
+ "version_normalized": "3.4.41.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
- "reference": "c19da50bc3e8fa7d60628fdb4ab5d67de534cf3e"
+ "reference": "8a895f0c92a7c4b10db95139bcff71bdf66d4d21"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/process/zipball/c19da50bc3e8fa7d60628fdb4ab5d67de534cf3e",
- "reference": "c19da50bc3e8fa7d60628fdb4ab5d67de534cf3e",
+ "url": "https://api.github.com/repos/symfony/process/zipball/8a895f0c92a7c4b10db95139bcff71bdf66d4d21",
+ "reference": "8a895f0c92a7c4b10db95139bcff71bdf66d4d21",
"shasum": ""
},
"require": {
"php": "^5.5.9|>=7.0.8"
},
- "time": "2019-10-24T15:33:53+00:00",
+ "time": "2020-05-23T17:05:51+00:00",
"type": "library",
"extra": {
"branch-alias": {
@@ -12479,17 +12912,17 @@
},
{
"name": "symfony/routing",
- "version": "v3.4.35",
- "version_normalized": "3.4.35.0",
+ "version": "v3.4.41",
+ "version_normalized": "3.4.41.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/routing.git",
- "reference": "afc10b9c6b5196e0fecbc3bd373c7b4482e5b6b5"
+ "reference": "e0d43b6f9417ad59ecaa8e2f799b79eef417387f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/routing/zipball/afc10b9c6b5196e0fecbc3bd373c7b4482e5b6b5",
- "reference": "afc10b9c6b5196e0fecbc3bd373c7b4482e5b6b5",
+ "url": "https://api.github.com/repos/symfony/routing/zipball/e0d43b6f9417ad59ecaa8e2f799b79eef417387f",
+ "reference": "e0d43b6f9417ad59ecaa8e2f799b79eef417387f",
"shasum": ""
},
"require": {
@@ -12516,7 +12949,7 @@
"symfony/http-foundation": "For using a Symfony Request object",
"symfony/yaml": "For using the YAML loader"
},
- "time": "2019-11-08T17:25:00+00:00",
+ "time": "2020-05-30T19:50:06+00:00",
"type": "library",
"extra": {
"branch-alias": {
@@ -12557,17 +12990,17 @@
},
{
"name": "symfony/serializer",
- "version": "v3.4.35",
- "version_normalized": "3.4.35.0",
+ "version": "v3.4.41",
+ "version_normalized": "3.4.41.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/serializer.git",
- "reference": "9d14f7ff2c585a8a9f6f980253066285ddc2f675"
+ "reference": "0db90db012b1b0a04fbb2d64ae9160871cad9d4f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/serializer/zipball/9d14f7ff2c585a8a9f6f980253066285ddc2f675",
- "reference": "9d14f7ff2c585a8a9f6f980253066285ddc2f675",
+ "url": "https://api.github.com/repos/symfony/serializer/zipball/0db90db012b1b0a04fbb2d64ae9160871cad9d4f",
+ "reference": "0db90db012b1b0a04fbb2d64ae9160871cad9d4f",
"shasum": ""
},
"require": {
@@ -12603,7 +13036,7 @@
"symfony/property-info": "To deserialize relations.",
"symfony/yaml": "For using the default YAML mapping loader."
},
- "time": "2019-11-12T17:51:12+00:00",
+ "time": "2020-05-30T18:58:05+00:00",
"type": "library",
"extra": {
"branch-alias": {
@@ -12638,17 +13071,17 @@
},
{
"name": "symfony/translation",
- "version": "v3.4.35",
- "version_normalized": "3.4.35.0",
+ "version": "v3.4.41",
+ "version_normalized": "3.4.41.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation.git",
- "reference": "2031c895bc97ac1787d418d90bd1ed7d299f2772"
+ "reference": "b0cd62ef0ff7ec31b67d78d7fc818e2bda4e844f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/translation/zipball/2031c895bc97ac1787d418d90bd1ed7d299f2772",
- "reference": "2031c895bc97ac1787d418d90bd1ed7d299f2772",
+ "url": "https://api.github.com/repos/symfony/translation/zipball/b0cd62ef0ff7ec31b67d78d7fc818e2bda4e844f",
+ "reference": "b0cd62ef0ff7ec31b67d78d7fc818e2bda4e844f",
"shasum": ""
},
"require": {
@@ -12675,7 +13108,7 @@
"symfony/config": "",
"symfony/yaml": ""
},
- "time": "2019-10-30T12:43:22+00:00",
+ "time": "2020-05-30T18:58:05+00:00",
"type": "library",
"extra": {
"branch-alias": {
@@ -12710,17 +13143,17 @@
},
{
"name": "symfony/validator",
- "version": "v3.4.35",
- "version_normalized": "3.4.35.0",
+ "version": "v3.4.41",
+ "version_normalized": "3.4.41.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/validator.git",
- "reference": "b11f45742c5c9a228cedc46b70c6317780a1ac80"
+ "reference": "5fb88120a11a75e17b602103a893dd8b27804529"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/validator/zipball/b11f45742c5c9a228cedc46b70c6317780a1ac80",
- "reference": "b11f45742c5c9a228cedc46b70c6317780a1ac80",
+ "url": "https://api.github.com/repos/symfony/validator/zipball/5fb88120a11a75e17b602103a893dd8b27804529",
+ "reference": "5fb88120a11a75e17b602103a893dd8b27804529",
"shasum": ""
},
"require": {
@@ -12763,7 +13196,7 @@
"symfony/property-access": "For accessing properties within comparison constraints",
"symfony/yaml": ""
},
- "time": "2019-11-05T22:03:38+00:00",
+ "time": "2020-05-30T18:43:38+00:00",
"type": "library",
"extra": {
"branch-alias": {
@@ -12869,17 +13302,17 @@
},
{
"name": "symfony/yaml",
- "version": "v3.4.35",
- "version_normalized": "3.4.35.0",
+ "version": "v3.4.41",
+ "version_normalized": "3.4.41.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
- "reference": "dab657db15207879217fc81df4f875947bf68804"
+ "reference": "7233ac2bfdde24d672f5305f2b3f6b5d741ef8eb"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/yaml/zipball/dab657db15207879217fc81df4f875947bf68804",
- "reference": "dab657db15207879217fc81df4f875947bf68804",
+ "url": "https://api.github.com/repos/symfony/yaml/zipball/7233ac2bfdde24d672f5305f2b3f6b5d741ef8eb",
+ "reference": "7233ac2bfdde24d672f5305f2b3f6b5d741ef8eb",
"shasum": ""
},
"require": {
@@ -12895,7 +13328,7 @@
"suggest": {
"symfony/console": "For validating YAML files using the lint command"
},
- "time": "2019-10-24T15:33:53+00:00",
+ "time": "2020-05-11T07:51:54+00:00",
"type": "library",
"extra": {
"branch-alias": {
@@ -12987,17 +13420,17 @@
},
{
"name": "twig/twig",
- "version": "v1.42.3",
- "version_normalized": "1.42.3.0",
+ "version": "v1.42.5",
+ "version_normalized": "1.42.5.0",
"source": {
"type": "git",
"url": "https://github.com/twigphp/Twig.git",
- "reference": "201baee843e0ffe8b0b956f336dd42b2a92fae4e"
+ "reference": "87b2ea9d8f6fd014d0621ca089bb1b3769ea3f8e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/twigphp/Twig/zipball/201baee843e0ffe8b0b956f336dd42b2a92fae4e",
- "reference": "201baee843e0ffe8b0b956f336dd42b2a92fae4e",
+ "url": "https://api.github.com/repos/twigphp/Twig/zipball/87b2ea9d8f6fd014d0621ca089bb1b3769ea3f8e",
+ "reference": "87b2ea9d8f6fd014d0621ca089bb1b3769ea3f8e",
"shasum": ""
},
"require": {
@@ -13006,10 +13439,9 @@
},
"require-dev": {
"psr/container": "^1.0",
- "symfony/debug": "^3.4|^4.2",
- "symfony/phpunit-bridge": "^4.4@dev|^5.0"
+ "symfony/phpunit-bridge": "^4.4|^5.0"
},
- "time": "2019-08-24T12:51:03+00:00",
+ "time": "2020-02-11T05:59:23+00:00",
"type": "library",
"extra": {
"branch-alias": {
@@ -13038,7 +13470,6 @@
},
{
"name": "Twig Team",
- "homepage": "https://twig.symfony.com/contributors",
"role": "Contributors"
},
{
@@ -13055,17 +13486,17 @@
},
{
"name": "typo3/phar-stream-wrapper",
- "version": "v3.1.3",
- "version_normalized": "3.1.3.0",
+ "version": "v3.1.4",
+ "version_normalized": "3.1.4.0",
"source": {
"type": "git",
"url": "https://github.com/TYPO3/phar-stream-wrapper.git",
- "reference": "586ff60beea128e069a5dc271d3d8133a9bc460a"
+ "reference": "e0c1b495cfac064f4f5c4bcb6bf67bb7f345ed04"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/TYPO3/phar-stream-wrapper/zipball/586ff60beea128e069a5dc271d3d8133a9bc460a",
- "reference": "586ff60beea128e069a5dc271d3d8133a9bc460a",
+ "url": "https://api.github.com/repos/TYPO3/phar-stream-wrapper/zipball/e0c1b495cfac064f4f5c4bcb6bf67bb7f345ed04",
+ "reference": "e0c1b495cfac064f4f5c4bcb6bf67bb7f345ed04",
"shasum": ""
},
"require": {
@@ -13079,7 +13510,7 @@
"suggest": {
"ext-fileinfo": "For PHP builtin file type guessing, otherwise uses internal processing"
},
- "time": "2019-10-18T11:57:16+00:00",
+ "time": "2019-12-10T11:53:27+00:00",
"type": "library",
"extra": {
"branch-alias": {
@@ -13335,233 +13766,5 @@
}
],
"description": "Composer plugin to improve composer performance for Drupal projects"
- },
- {
- "name": "zendframework/zend-diactoros",
- "version": "1.8.7",
- "version_normalized": "1.8.7.0",
- "source": {
- "type": "git",
- "url": "https://github.com/zendframework/zend-diactoros.git",
- "reference": "a85e67b86e9b8520d07e6415fcbcb8391b44a75b"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/a85e67b86e9b8520d07e6415fcbcb8391b44a75b",
- "reference": "a85e67b86e9b8520d07e6415fcbcb8391b44a75b",
- "shasum": ""
- },
- "require": {
- "php": "^5.6 || ^7.0",
- "psr/http-message": "^1.0"
- },
- "provide": {
- "psr/http-message-implementation": "1.0"
- },
- "require-dev": {
- "ext-dom": "*",
- "ext-libxml": "*",
- "php-http/psr7-integration-tests": "dev-master",
- "phpunit/phpunit": "^5.7.16 || ^6.0.8 || ^7.2.7",
- "zendframework/zend-coding-standard": "~1.0"
- },
- "time": "2019-08-06T17:53:53+00:00",
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-release-1.8": "1.8.x-dev"
- }
- },
- "installation-source": "dist",
- "autoload": {
- "files": [
- "src/functions/create_uploaded_file.php",
- "src/functions/marshal_headers_from_sapi.php",
- "src/functions/marshal_method_from_sapi.php",
- "src/functions/marshal_protocol_version_from_sapi.php",
- "src/functions/marshal_uri_from_sapi.php",
- "src/functions/normalize_server.php",
- "src/functions/normalize_uploaded_files.php",
- "src/functions/parse_cookie_header.php"
- ],
- "psr-4": {
- "Zend\\Diactoros\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-2-Clause"
- ],
- "description": "PSR HTTP Message implementations",
- "homepage": "https://github.com/zendframework/zend-diactoros",
- "keywords": [
- "http",
- "psr",
- "psr-7"
- ],
- "abandoned": "laminas/laminas-diactoros"
- },
- {
- "name": "zendframework/zend-escaper",
- "version": "2.6.1",
- "version_normalized": "2.6.1.0",
- "source": {
- "type": "git",
- "url": "https://github.com/zendframework/zend-escaper.git",
- "reference": "3801caa21b0ca6aca57fa1c42b08d35c395ebd5f"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-escaper/zipball/3801caa21b0ca6aca57fa1c42b08d35c395ebd5f",
- "reference": "3801caa21b0ca6aca57fa1c42b08d35c395ebd5f",
- "shasum": ""
- },
- "require": {
- "php": "^5.6 || ^7.0"
- },
- "require-dev": {
- "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2",
- "zendframework/zend-coding-standard": "~1.0.0"
- },
- "time": "2019-09-05T20:03:20+00:00",
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.6.x-dev",
- "dev-develop": "2.7.x-dev"
- }
- },
- "installation-source": "dist",
- "autoload": {
- "psr-4": {
- "Zend\\Escaper\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "description": "Securely and safely escape HTML, HTML attributes, JavaScript, CSS, and URLs",
- "keywords": [
- "ZendFramework",
- "escaper",
- "zf"
- ],
- "abandoned": "laminas/laminas-escaper"
- },
- {
- "name": "zendframework/zend-feed",
- "version": "2.12.0",
- "version_normalized": "2.12.0.0",
- "source": {
- "type": "git",
- "url": "https://github.com/zendframework/zend-feed.git",
- "reference": "d926c5af34b93a0121d5e2641af34ddb1533d733"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-feed/zipball/d926c5af34b93a0121d5e2641af34ddb1533d733",
- "reference": "d926c5af34b93a0121d5e2641af34ddb1533d733",
- "shasum": ""
- },
- "require": {
- "ext-dom": "*",
- "ext-libxml": "*",
- "php": "^5.6 || ^7.0",
- "zendframework/zend-escaper": "^2.5.2",
- "zendframework/zend-stdlib": "^3.2.1"
- },
- "require-dev": {
- "phpunit/phpunit": "^5.7.23 || ^6.4.3",
- "psr/http-message": "^1.0.1",
- "zendframework/zend-cache": "^2.7.2",
- "zendframework/zend-coding-standard": "~1.0.0",
- "zendframework/zend-db": "^2.8.2",
- "zendframework/zend-http": "^2.7",
- "zendframework/zend-servicemanager": "^2.7.8 || ^3.3",
- "zendframework/zend-validator": "^2.10.1"
- },
- "suggest": {
- "psr/http-message": "PSR-7 ^1.0.1, if you wish to use Zend\\Feed\\Reader\\Http\\Psr7ResponseDecorator",
- "zendframework/zend-cache": "Zend\\Cache component, for optionally caching feeds between requests",
- "zendframework/zend-db": "Zend\\Db component, for use with PubSubHubbub",
- "zendframework/zend-http": "Zend\\Http for PubSubHubbub, and optionally for use with Zend\\Feed\\Reader",
- "zendframework/zend-servicemanager": "Zend\\ServiceManager component, for easily extending ExtensionManager implementations",
- "zendframework/zend-validator": "Zend\\Validator component, for validating email addresses used in Atom feeds and entries when using the Writer subcomponent"
- },
- "time": "2019-03-05T20:08:49+00:00",
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.12.x-dev",
- "dev-develop": "2.13.x-dev"
- }
- },
- "installation-source": "dist",
- "autoload": {
- "psr-4": {
- "Zend\\Feed\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "description": "provides functionality for consuming RSS and Atom feeds",
- "keywords": [
- "ZendFramework",
- "feed",
- "zf"
- ],
- "abandoned": "laminas/laminas-feed"
- },
- {
- "name": "zendframework/zend-stdlib",
- "version": "3.2.1",
- "version_normalized": "3.2.1.0",
- "source": {
- "type": "git",
- "url": "https://github.com/zendframework/zend-stdlib.git",
- "reference": "66536006722aff9e62d1b331025089b7ec71c065"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/66536006722aff9e62d1b331025089b7ec71c065",
- "reference": "66536006722aff9e62d1b331025089b7ec71c065",
- "shasum": ""
- },
- "require": {
- "php": "^5.6 || ^7.0"
- },
- "require-dev": {
- "phpbench/phpbench": "^0.13",
- "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2",
- "zendframework/zend-coding-standard": "~1.0.0"
- },
- "time": "2018-08-28T21:34:05+00:00",
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "3.2.x-dev",
- "dev-develop": "3.3.x-dev"
- }
- },
- "installation-source": "dist",
- "autoload": {
- "psr-4": {
- "Zend\\Stdlib\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "description": "SPL extensions, array utilities, error handlers, and more",
- "keywords": [
- "ZendFramework",
- "stdlib",
- "zf"
- ],
- "abandoned": "laminas/laminas-stdlib"
}
]
diff --git a/vendor/composer/installers/composer.json b/vendor/composer/installers/composer.json
index 1f68e72a57..c21715da3d 100644
--- a/vendor/composer/installers/composer.json
+++ b/vendor/composer/installers/composer.json
@@ -31,7 +31,7 @@
"iTop",
"Joomla",
"Kanboard",
- "Known",
+ "Known",
"Kohana",
"Lan Management System",
"Laravel",
@@ -40,6 +40,7 @@
"Magento",
"majima",
"Mako",
+ "MantisBT",
"Mautic",
"Maya",
"MODX",
@@ -63,6 +64,7 @@
"SilverStripe",
"SMF",
"SyDES",
+ "Sylius",
"symfony",
"Thelia",
"TYPO3",
@@ -95,11 +97,14 @@
"roundcube/plugin-installer": "*"
},
"require": {
- "composer-plugin-api": "^1.0"
+ "composer-plugin-api": "^1.0 || ^2.0"
},
"require-dev": {
- "composer/composer": "1.0.*@dev",
- "phpunit/phpunit": "^4.8.36"
+ "composer/composer": "1.6.* || 2.0.*@dev",
+ "composer/semver": "1.0.* || 2.0.*@dev",
+ "phpunit/phpunit": "^4.8.36",
+ "sebastian/comparator": "^1.2.4",
+ "symfony/process": "^2.3"
},
"scripts": {
"test": "phpunit"
diff --git a/vendor/composer/installers/src/Composer/Installers/BaseInstaller.php b/vendor/composer/installers/src/Composer/Installers/BaseInstaller.php
index 7082bf2cb0..d9d607355d 100644
--- a/vendor/composer/installers/src/Composer/Installers/BaseInstaller.php
+++ b/vendor/composer/installers/src/Composer/Installers/BaseInstaller.php
@@ -126,6 +126,7 @@ protected function templatePath($path, array $vars = array())
protected function mapCustomInstallPaths(array $paths, $name, $type, $vendor = NULL)
{
foreach ($paths as $path => $names) {
+ $names = (array) $names;
if (in_array($name, $names) || in_array('type:' . $type, $names) || in_array('vendor:' . $vendor, $names)) {
return $path;
}
diff --git a/vendor/composer/installers/src/Composer/Installers/CakePHPInstaller.php b/vendor/composer/installers/src/Composer/Installers/CakePHPInstaller.php
index 6352beb110..71ee2efc90 100644
--- a/vendor/composer/installers/src/Composer/Installers/CakePHPInstaller.php
+++ b/vendor/composer/installers/src/Composer/Installers/CakePHPInstaller.php
@@ -58,25 +58,15 @@ protected function matchesCakeVersion($matcher, $version)
}
$repositoryManager = $this->composer->getRepositoryManager();
- if ($repositoryManager) {
- $repos = $repositoryManager->getLocalRepository();
- if (!$repos) {
- return false;
- }
- $cake3 = new $multiClass(array(
- new $constraintClass($matcher, $version),
- new $constraintClass('!=', '9999999-dev'),
- ));
- $pool = new Pool('dev');
- $pool->addRepository($repos);
- $packages = $pool->whatProvides('cakephp/cakephp');
- foreach ($packages as $package) {
- $installed = new $constraintClass('=', $package->getVersion());
- if ($cake3->matches($installed)) {
- return true;
- }
- }
+ if (! $repositoryManager) {
+ return false;
}
- return false;
+
+ $repos = $repositoryManager->getLocalRepository();
+ if (!$repos) {
+ return false;
+ }
+
+ return $repos->findPackage('cakephp/cakephp', new $constraintClass($matcher, $version)) !== null;
}
}
diff --git a/vendor/composer/installers/src/Composer/Installers/DrupalInstaller.php b/vendor/composer/installers/src/Composer/Installers/DrupalInstaller.php
index f520bfe25e..7328239228 100644
--- a/vendor/composer/installers/src/Composer/Installers/DrupalInstaller.php
+++ b/vendor/composer/installers/src/Composer/Installers/DrupalInstaller.php
@@ -9,12 +9,14 @@ class DrupalInstaller extends BaseInstaller
'theme' => 'themes/{$name}/',
'library' => 'libraries/{$name}/',
'profile' => 'profiles/{$name}/',
+ 'database-driver' => 'drivers/lib/Drupal/Driver/Database/{$name}/',
'drush' => 'drush/{$name}/',
'custom-theme' => 'themes/custom/{$name}/',
'custom-module' => 'modules/custom/{$name}/',
'custom-profile' => 'profiles/custom/{$name}/',
'drupal-multisite' => 'sites/{$name}/',
- 'console' => 'console/{$name}/',
+ 'console' => 'console/{$name}/',
'console-language' => 'console/language/{$name}/',
+ 'config' => 'config/sync/',
);
}
diff --git a/vendor/composer/installers/src/Composer/Installers/Installer.php b/vendor/composer/installers/src/Composer/Installers/Installer.php
index 651c19043e..d1d43b943c 100644
--- a/vendor/composer/installers/src/Composer/Installers/Installer.php
+++ b/vendor/composer/installers/src/Composer/Installers/Installer.php
@@ -63,6 +63,7 @@ class Installer extends LibraryInstaller
'lithium' => 'LithiumInstaller',
'magento' => 'MagentoInstaller',
'majima' => 'MajimaInstaller',
+ 'mantisbt' => 'MantisBTInstaller',
'mako' => 'MakoInstaller',
'maya' => 'MayaInstaller',
'mautic' => 'MauticInstaller',
@@ -95,6 +96,7 @@ class Installer extends LibraryInstaller
'silverstripe' => 'SilverStripeInstaller',
'smf' => 'SMFInstaller',
'sydes' => 'SyDESInstaller',
+ 'sylius' => 'SyliusInstaller',
'symfony1' => 'Symfony1Installer',
'tao' => 'TaoInstaller',
'thelia' => 'TheliaInstaller',
diff --git a/vendor/composer/installers/src/Composer/Installers/MantisBTInstaller.php b/vendor/composer/installers/src/Composer/Installers/MantisBTInstaller.php
new file mode 100644
index 0000000000..dadb1dbbcf
--- /dev/null
+++ b/vendor/composer/installers/src/Composer/Installers/MantisBTInstaller.php
@@ -0,0 +1,23 @@
+<?php
+namespace Composer\Installers;
+
+use Composer\DependencyResolver\Pool;
+
+class MantisBTInstaller extends BaseInstaller
+{
+ protected $locations = array(
+ 'plugin' => 'plugins/{$name}/',
+ );
+
+ /**
+ * Format package name to CamelCase
+ */
+ public function inflectPackageVars($vars)
+ {
+ $vars['name'] = strtolower(preg_replace('/(?<=\\w)([A-Z])/', '_\\1', $vars['name']));
+ $vars['name'] = str_replace(array('-', '_'), ' ', $vars['name']);
+ $vars['name'] = str_replace(' ', '', ucwords($vars['name']));
+
+ return $vars;
+ }
+}
diff --git a/vendor/composer/installers/src/Composer/Installers/Plugin.php b/vendor/composer/installers/src/Composer/Installers/Plugin.php
index 5eb04af173..e60da0e7f1 100644
--- a/vendor/composer/installers/src/Composer/Installers/Plugin.php
+++ b/vendor/composer/installers/src/Composer/Installers/Plugin.php
@@ -8,10 +8,20 @@
class Plugin implements PluginInterface
{
+ private $installer;
public function activate(Composer $composer, IOInterface $io)
{
- $installer = new Installer($io, $composer);
- $composer->getInstallationManager()->addInstaller($installer);
+ $this->installer = new Installer($io, $composer);
+ $composer->getInstallationManager()->addInstaller($this->installer);
+ }
+
+ public function deactivate(Composer $composer, IOInterface $io)
+ {
+ $composer->getInstallationManager()->removeInstaller($this->installer);
+ }
+
+ public function uninstall(Composer $composer, IOInterface $io)
+ {
}
}
diff --git a/vendor/composer/installers/src/Composer/Installers/SyliusInstaller.php b/vendor/composer/installers/src/Composer/Installers/SyliusInstaller.php
new file mode 100644
index 0000000000..4357a35bb5
--- /dev/null
+++ b/vendor/composer/installers/src/Composer/Installers/SyliusInstaller.php
@@ -0,0 +1,9 @@
+<?php
+namespace Composer\Installers;
+
+class SyliusInstaller extends BaseInstaller
+{
+ protected $locations = array(
+ 'theme' => 'themes/{$name}/',
+ );
+}
diff --git a/vendor/composer/semver/CHANGELOG.md b/vendor/composer/semver/CHANGELOG.md
index e5009d7b62..ee0c2ef349 100644
--- a/vendor/composer/semver/CHANGELOG.md
+++ b/vendor/composer/semver/CHANGELOG.md
@@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).
+### [1.5.1] 2020-01-13
+
+ * Fixed: Parsing of aliased version was not validating the alias to be a valid version
+
### [1.5.0] 2019-03-19
* Added: some support for date versions (e.g. 201903) in `~` operator
@@ -62,6 +66,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- Namespace: `Composer\Test\Package\LinkConstraint` -> `Composer\Test\Semver\Constraint`
* Changed: code style using php-cs-fixer.
+[1.5.1]: https://github.com/composer/semver/compare/1.5.0...1.5.1
+[1.5.0]: https://github.com/composer/semver/compare/1.4.2...1.5.0
[1.4.2]: https://github.com/composer/semver/compare/1.4.1...1.4.2
[1.4.1]: https://github.com/composer/semver/compare/1.4.0...1.4.1
[1.4.0]: https://github.com/composer/semver/compare/1.3.0...1.4.0
diff --git a/vendor/composer/semver/composer.json b/vendor/composer/semver/composer.json
index b0400cd7b0..981e7d1552 100644
--- a/vendor/composer/semver/composer.json
+++ b/vendor/composer/semver/composer.json
@@ -34,8 +34,7 @@
"php": "^5.3.2 || ^7.0"
},
"require-dev": {
- "phpunit/phpunit": "^4.5 || ^5.0.5",
- "phpunit/phpunit-mock-objects": "2.3.0 || ^3.0"
+ "phpunit/phpunit": "^4.5 || ^5.0.5"
},
"autoload": {
"psr-4": {
diff --git a/vendor/composer/semver/src/Constraint/Constraint.php b/vendor/composer/semver/src/Constraint/Constraint.php
index 7a21eb47f5..c8c90f02e0 100644
--- a/vendor/composer/semver/src/Constraint/Constraint.php
+++ b/vendor/composer/semver/src/Constraint/Constraint.php
@@ -184,7 +184,7 @@ public function matchSpecific(Constraint $provider, $compareBranches = false)
// '!=' operator is match when other operator is not '==' operator or version is not match
// these kinds of comparisons always have a solution
if ($isNonEqualOp || $isProviderNonEqualOp) {
- return !$isEqualOp && !$isProviderEqualOp
+ return (!$isEqualOp && !$isProviderEqualOp)
|| $this->versionCompare($provider->version, $this->version, '!=', $compareBranches);
}
@@ -197,13 +197,9 @@ public function matchSpecific(Constraint $provider, $compareBranches = false)
if ($this->versionCompare($provider->version, $this->version, self::$transOpInt[$this->operator], $compareBranches)) {
// special case, e.g. require >= 1.0 and provide < 1.0
// 1.0 >= 1.0 but 1.0 is outside of the provided interval
- if ($provider->version === $this->version
+ return !($provider->version === $this->version
&& self::$transOpInt[$provider->operator] === $providerNoEqualOp
- && self::$transOpInt[$this->operator] !== $noEqualOp) {
- return false;
- }
-
- return true;
+ && self::$transOpInt[$this->operator] !== $noEqualOp);
}
return false;
diff --git a/vendor/composer/semver/src/Constraint/EmptyConstraint.php b/vendor/composer/semver/src/Constraint/EmptyConstraint.php
index faba56bf0c..cb89cd2645 100644
--- a/vendor/composer/semver/src/Constraint/EmptyConstraint.php
+++ b/vendor/composer/semver/src/Constraint/EmptyConstraint.php
@@ -46,7 +46,7 @@ public function getPrettyString()
return $this->prettyString;
}
- return $this->__toString();
+ return (string) $this;
}
/**
diff --git a/vendor/composer/semver/src/Constraint/MultiConstraint.php b/vendor/composer/semver/src/Constraint/MultiConstraint.php
index 0c547afd45..f8a60e4e13 100644
--- a/vendor/composer/semver/src/Constraint/MultiConstraint.php
+++ b/vendor/composer/semver/src/Constraint/MultiConstraint.php
@@ -102,7 +102,7 @@ public function getPrettyString()
return $this->prettyString;
}
- return $this->__toString();
+ return (string) $this;
}
/**
diff --git a/vendor/composer/semver/src/Semver.php b/vendor/composer/semver/src/Semver.php
index 0225bb55ad..3ab2b68ab4 100644
--- a/vendor/composer/semver/src/Semver.php
+++ b/vendor/composer/semver/src/Semver.php
@@ -37,9 +37,9 @@ public static function satisfies($version, $constraints)
$versionParser = self::$versionParser;
$provider = new Constraint('==', $versionParser->normalize($version));
- $constraints = $versionParser->parseConstraints($constraints);
+ $parsedConstraints = $versionParser->parseConstraints($constraints);
- return $constraints->matches($provider);
+ return $parsedConstraints->matches($provider);
}
/**
diff --git a/vendor/composer/semver/src/VersionParser.php b/vendor/composer/semver/src/VersionParser.php
index 475e9cc0f9..9a7d0dbb26 100644
--- a/vendor/composer/semver/src/VersionParser.php
+++ b/vendor/composer/semver/src/VersionParser.php
@@ -52,11 +52,12 @@ public static function parseStability($version)
{
$version = preg_replace('{#.+$}i', '', $version);
- if ('dev-' === substr($version, 0, 4) || '-dev' === substr($version, -4)) {
+ if (strpos($version, 'dev-') === 0 || '-dev' === substr($version, -4)) {
return 'dev';
}
preg_match('{' . self::$modifierRegex . '(?:\+.*)?$}i', strtolower($version), $match);
+
if (!empty($match[3])) {
return 'dev';
}
@@ -107,6 +108,9 @@ public function normalize($version, $fullVersion = null)
// strip off aliasing
if (preg_match('{^([^,\s]++) ++as ++([^,\s]++)$}', $version, $match)) {
+ // verify that the alias is a version without constraint
+ $this->normalize($match[2]);
+
$version = $match[1];
}
@@ -116,7 +120,7 @@ public function normalize($version, $fullVersion = null)
}
// if requirement is branch-like, use full name
- if ('dev-' === strtolower(substr($version, 0, 4))) {
+ if (stripos($version, 'dev-') === 0) {
return 'dev-' . substr($version, 4);
}
@@ -236,6 +240,7 @@ public function parseConstraints($constraints)
$orConstraints = preg_split('{\s*\|\|?\s*}', trim($constraints));
$orGroups = array();
+
foreach ($orConstraints as $constraints) {
$andConstraints = preg_split('{(?<!^|as|[=>< ,]) *(?<!-)[, ](?!-) *(?!,|as|$)}', $constraints);
if (count($andConstraints) > 1) {
@@ -268,9 +273,9 @@ public function parseConstraints($constraints)
&& 2 === count($orGroups[0]->getConstraints())
&& 2 === count($orGroups[1]->getConstraints())
&& ($a = (string) $orGroups[0])
- && substr($a, 0, 3) === '[>=' && (false !== ($posA = strpos($a, '<', 4)))
+ && strpos($a, '[>=') === 0 && (false !== ($posA = strpos($a, '<', 4)))
&& ($b = (string) $orGroups[1])
- && substr($b, 0, 3) === '[>=' && (false !== ($posB = strpos($b, '<', 4)))
+ && strpos($b, '[>=') === 0 && (false !== ($posB = strpos($b, '<', 4)))
&& substr($a, $posA + 2, -1) === substr($b, 4, $posB - 5)
) {
$constraint = new MultiConstraint(array(
@@ -314,7 +319,7 @@ private function parseConstraint($constraint)
// version, to ensure that unstable instances of the current version are allowed. However, if a stability
// suffix is added to the constraint, then a >= match on the current version is used instead.
if (preg_match('{^~>?' . $versionRegex . '$}i', $constraint, $matches)) {
- if (substr($constraint, 0, 2) === '~>') {
+ if (strpos($constraint, '~>') === 0) {
throw new \UnexpectedValueException(
'Could not parse version constraint ' . $constraint . ': ' .
'Invalid operator "~>", you probably meant to use the "~" operator'
@@ -454,11 +459,11 @@ private function parseConstraint($constraint)
try {
$version = $this->normalize($matches[2]);
- if (!empty($stabilityModifier) && $this->parseStability($version) === 'stable') {
+ if (!empty($stabilityModifier) && self::parseStability($version) === 'stable') {
$version .= '-' . $stabilityModifier;
} elseif ('<' === $matches[1] || '>=' === $matches[1]) {
if (!preg_match('/-' . self::$modifierRegex . '$/', strtolower($matches[2]))) {
- if (substr($matches[2], 0, 4) !== 'dev-') {
+ if (strpos($matches[2], 'dev-') !== 0) {
$version .= '-dev';
}
}
@@ -503,7 +508,7 @@ private function manipulateVersionString($matches, $position, $increment = 0, $p
// Return null on a carry overflow
if ($i === 1) {
- return;
+ return null;
}
}
}
diff --git a/vendor/egulias/email-validator/EmailValidator/EmailLexer.php b/vendor/egulias/email-validator/EmailValidator/EmailLexer.php
index 44857288dd..cb47c01e46 100644
--- a/vendor/egulias/email-validator/EmailValidator/EmailLexer.php
+++ b/vendor/egulias/email-validator/EmailValidator/EmailLexer.php
@@ -73,10 +73,37 @@ class EmailLexer extends AbstractLexer
'\0' => self::C_NUL,
);
+ /**
+ * @var bool
+ */
protected $hasInvalidTokens = false;
- protected $previous;
+ /**
+ * @var array
+ *
+ * @psalm-var array{value:string, type:null|int, position:int}|array<empty, empty>
+ */
+ protected $previous = [];
+
+ /**
+ * The last matched/seen token.
+ *
+ * @var array
+ *
+ * @psalm-var array{value:string, type:null|int, position:int}
+ */
+ public $token;
+ /**
+ * The next token in the input.
+ *
+ * @var array|null
+ */
+ public $lookahead;
+
+ /**
+ * @psalm-var array{value:'', type:null, position:0}
+ */
private static $nullToken = [
'value' => '',
'type' => null,
@@ -86,6 +113,7 @@ class EmailLexer extends AbstractLexer
public function __construct()
{
$this->previous = $this->token = self::$nullToken;
+ $this->lookahead = null;
}
/**
@@ -98,15 +126,20 @@ public function reset()
$this->previous = $this->token = self::$nullToken;
}
+ /**
+ * @return bool
+ */
public function hasInvalidTokens()
{
return $this->hasInvalidTokens;
}
/**
- * @param string $type
+ * @param int $type
* @throws \UnexpectedValueException
* @return boolean
+ *
+ * @psalm-suppress InvalidScalarArgument
*/
public function find($type)
{
@@ -122,7 +155,7 @@ public function find($type)
/**
* getPrevious
*
- * @return array token
+ * @return array
*/
public function getPrevious()
{
@@ -196,6 +229,11 @@ protected function getType(&$value)
return self::GENERIC;
}
+ /**
+ * @param string $value
+ *
+ * @return bool
+ */
protected function isValid($value)
{
if (isset($this->charValue[$value])) {
diff --git a/vendor/egulias/email-validator/EmailValidator/EmailParser.php b/vendor/egulias/email-validator/EmailValidator/EmailParser.php
index 5bf605ac2f..6b7bad6692 100644
--- a/vendor/egulias/email-validator/EmailValidator/EmailParser.php
+++ b/vendor/egulias/email-validator/EmailValidator/EmailParser.php
@@ -17,11 +17,33 @@ class EmailParser
{
const EMAIL_MAX_LENGTH = 254;
- protected $warnings;
+ /**
+ * @var array
+ */
+ protected $warnings = [];
+
+ /**
+ * @var string
+ */
protected $domainPart = '';
+
+ /**
+ * @var string
+ */
protected $localPart = '';
+ /**
+ * @var EmailLexer
+ */
protected $lexer;
+
+ /**
+ * @var LocalPart
+ */
protected $localPartParser;
+
+ /**
+ * @var DomainPart
+ */
protected $domainPartParser;
public function __construct(EmailLexer $lexer)
@@ -29,7 +51,6 @@ public function __construct(EmailLexer $lexer)
$this->lexer = $lexer;
$this->localPartParser = new LocalPart($this->lexer);
$this->domainPartParser = new DomainPart($this->lexer);
- $this->warnings = new \SplObjectStorage();
}
/**
@@ -57,6 +78,9 @@ public function parse($str)
return array('local' => $this->localPart, 'domain' => $this->domainPart);
}
+ /**
+ * @return Warning\Warning[]
+ */
public function getWarnings()
{
$localPartWarnings = $this->localPartParser->getWarnings();
@@ -68,11 +92,17 @@ public function getWarnings()
return $this->warnings;
}
+ /**
+ * @return string
+ */
public function getParsedDomainPart()
{
return $this->domainPart;
}
+ /**
+ * @param string $email
+ */
protected function setParts($email)
{
$parts = explode('@', $email);
@@ -80,6 +110,9 @@ protected function setParts($email)
$this->localPart = $parts[0];
}
+ /**
+ * @return bool
+ */
protected function hasAtToken()
{
$this->lexer->moveNext();
diff --git a/vendor/egulias/email-validator/EmailValidator/EmailValidator.php b/vendor/egulias/email-validator/EmailValidator/EmailValidator.php
index 1c2770721e..a30f21dcd3 100644
--- a/vendor/egulias/email-validator/EmailValidator/EmailValidator.php
+++ b/vendor/egulias/email-validator/EmailValidator/EmailValidator.php
@@ -13,12 +13,12 @@ class EmailValidator
private $lexer;
/**
- * @var array
+ * @var Warning\Warning[]
*/
- protected $warnings;
+ protected $warnings = [];
/**
- * @var InvalidEmail
+ * @var InvalidEmail|null
*/
protected $error;
@@ -58,7 +58,7 @@ public function getWarnings()
}
/**
- * @return InvalidEmail
+ * @return InvalidEmail|null
*/
public function getError()
{
diff --git a/vendor/egulias/email-validator/EmailValidator/Parser/DomainPart.php b/vendor/egulias/email-validator/EmailValidator/Parser/DomainPart.php
index 8ed240b393..0613e31d8c 100644
--- a/vendor/egulias/email-validator/EmailValidator/Parser/DomainPart.php
+++ b/vendor/egulias/email-validator/EmailValidator/Parser/DomainPart.php
@@ -35,6 +35,10 @@
class DomainPart extends Parser
{
const DOMAIN_MAX_LENGTH = 254;
+
+ /**
+ * @var string
+ */
protected $domainPart = '';
public function parse($domainPart)
@@ -95,11 +99,18 @@ private function checkInvalidTokensAfterAT()
}
}
+ /**
+ * @return string
+ */
public function getDomainPart()
{
return $this->domainPart;
}
+ /**
+ * @param string $addressLiteral
+ * @param int $maxGroups
+ */
public function checkIPV6Tag($addressLiteral, $maxGroups = 8)
{
$prev = $this->lexer->getPrevious();
@@ -143,6 +154,9 @@ public function checkIPV6Tag($addressLiteral, $maxGroups = 8)
}
}
+ /**
+ * @return string
+ */
protected function doParseDomainPart()
{
$domain = '';
@@ -189,7 +203,7 @@ protected function doParseDomainPart()
return $domain;
}
- private function checkNotAllowedChars($token)
+ private function checkNotAllowedChars(array $token)
{
$notAllowed = [EmailLexer::S_BACKSLASH => true, EmailLexer::S_SLASH=> true];
if (isset($notAllowed[$token['type']])) {
@@ -197,6 +211,9 @@ private function checkNotAllowedChars($token)
}
}
+ /**
+ * @return string|false
+ */
protected function parseDomainLiteral()
{
if ($this->lexer->isNextToken(EmailLexer::S_COLON)) {
@@ -213,6 +230,9 @@ protected function parseDomainLiteral()
return $this->doParseDomainLiteral();
}
+ /**
+ * @return string|false
+ */
protected function doParseDomainLiteral()
{
$IPv6TAG = false;
@@ -280,6 +300,11 @@ protected function doParseDomainLiteral()
return $addressLiteral;
}
+ /**
+ * @param string $addressLiteral
+ *
+ * @return string|false
+ */
protected function checkIPV4Tag($addressLiteral)
{
$matchesIP = array();
@@ -297,13 +322,13 @@ protected function checkIPV4Tag($addressLiteral)
return false;
}
// Convert IPv4 part to IPv6 format for further testing
- $addressLiteral = substr($addressLiteral, 0, $index) . '0:0';
+ $addressLiteral = substr($addressLiteral, 0, (int) $index) . '0:0';
}
return $addressLiteral;
}
- protected function checkDomainPartExceptions($prev)
+ protected function checkDomainPartExceptions(array $prev)
{
$invalidDomainTokens = array(
EmailLexer::S_DQUOTE => true,
@@ -338,6 +363,9 @@ protected function checkDomainPartExceptions($prev)
}
}
+ /**
+ * @return bool
+ */
protected function hasBrackets()
{
if ($this->lexer->token['type'] !== EmailLexer::S_OPENBRACKET) {
@@ -353,7 +381,7 @@ protected function hasBrackets()
return true;
}
- protected function checkLabelLength($prev)
+ protected function checkLabelLength(array $prev)
{
if ($this->lexer->token['type'] === EmailLexer::S_DOT &&
$prev['type'] === EmailLexer::GENERIC &&
diff --git a/vendor/egulias/email-validator/EmailValidator/Parser/LocalPart.php b/vendor/egulias/email-validator/EmailValidator/Parser/LocalPart.php
index fa1d17b7f4..3c21f34ac0 100644
--- a/vendor/egulias/email-validator/EmailValidator/Parser/LocalPart.php
+++ b/vendor/egulias/email-validator/EmailValidator/Parser/LocalPart.php
@@ -5,7 +5,6 @@
use Egulias\EmailValidator\Exception\DotAtEnd;
use Egulias\EmailValidator\Exception\DotAtStart;
use Egulias\EmailValidator\EmailLexer;
-use Egulias\EmailValidator\EmailValidator;
use Egulias\EmailValidator\Exception\ExpectingAT;
use Egulias\EmailValidator\Exception\ExpectingATEXT;
use Egulias\EmailValidator\Exception\UnclosedQuotedString;
@@ -20,6 +19,7 @@ public function parse($localPart)
$parseDQuote = true;
$closingQuote = false;
$openedParenthesis = 0;
+ $totalLength = 0;
while ($this->lexer->token['type'] !== EmailLexer::S_AT && null !== $this->lexer->token['type']) {
if ($this->lexer->token['type'] === EmailLexer::S_DOT && null === $this->lexer->getPrevious()['type']) {
@@ -35,12 +35,13 @@ public function parse($localPart)
$this->parseComments();
$openedParenthesis += $this->getOpenedParenthesis();
}
+
if ($this->lexer->token['type'] === EmailLexer::S_CLOSEPARENTHESIS) {
if ($openedParenthesis === 0) {
throw new UnopenedComment();
- } else {
- $openedParenthesis--;
}
+
+ $openedParenthesis--;
}
$this->checkConsecutiveDots();
@@ -58,15 +59,18 @@ public function parse($localPart)
$this->parseFWS();
}
+ $totalLength += strlen($this->lexer->token['value']);
$this->lexer->moveNext();
}
- $prev = $this->lexer->getPrevious();
- if (strlen($prev['value']) > LocalTooLong::LOCAL_PART_LENGTH) {
+ if ($totalLength > LocalTooLong::LOCAL_PART_LENGTH) {
$this->warnings[LocalTooLong::CODE] = new LocalTooLong();
}
}
+ /**
+ * @return bool
+ */
protected function parseDoubleQuote()
{
$parseAgain = true;
@@ -118,7 +122,10 @@ protected function parseDoubleQuote()
return $parseAgain;
}
- protected function isInvalidToken($token, $closingQuote)
+ /**
+ * @param bool $closingQuote
+ */
+ protected function isInvalidToken(array $token, $closingQuote)
{
$forbidden = array(
EmailLexer::S_COMMA,
diff --git a/vendor/egulias/email-validator/EmailValidator/Parser/Parser.php b/vendor/egulias/email-validator/EmailValidator/Parser/Parser.php
index fa7bd44b30..d0673b992e 100644
--- a/vendor/egulias/email-validator/EmailValidator/Parser/Parser.php
+++ b/vendor/egulias/email-validator/EmailValidator/Parser/Parser.php
@@ -21,8 +21,19 @@
abstract class Parser
{
+ /**
+ * @var \Egulias\EmailValidator\Warning\Warning[]
+ */
protected $warnings = [];
+
+ /**
+ * @var EmailLexer
+ */
protected $lexer;
+
+ /**
+ * @var int
+ */
protected $openedParenthesis = 0;
public function __construct(EmailLexer $lexer)
@@ -30,11 +41,17 @@ public function __construct(EmailLexer $lexer)
$this->lexer = $lexer;
}
+ /**
+ * @return \Egulias\EmailValidator\Warning\Warning[]
+ */
public function getWarnings()
{
return $this->warnings;
}
+ /**
+ * @param string $str
+ */
abstract public function parse($str);
/** @return int */
@@ -80,6 +97,9 @@ protected function parseComments()
}
}
+ /**
+ * @return bool
+ */
protected function isUnclosedComment()
{
try {
@@ -122,6 +142,9 @@ protected function checkConsecutiveDots()
}
}
+ /**
+ * @return bool
+ */
protected function isFWS()
{
if ($this->escaped()) {
@@ -140,11 +163,14 @@ protected function isFWS()
return false;
}
+ /**
+ * @return bool
+ */
protected function escaped()
{
$previous = $this->lexer->getPrevious();
- if ($previous['type'] === EmailLexer::S_BACKSLASH
+ if ($previous && $previous['type'] === EmailLexer::S_BACKSLASH
&&
$this->lexer->token['type'] !== EmailLexer::GENERIC
) {
@@ -154,6 +180,9 @@ protected function escaped()
return false;
}
+ /**
+ * @return bool
+ */
protected function warnEscaping()
{
if ($this->lexer->token['type'] !== EmailLexer::S_BACKSLASH) {
@@ -174,6 +203,11 @@ protected function warnEscaping()
}
+ /**
+ * @param bool $hasClosingQuote
+ *
+ * @return bool
+ */
protected function checkDQUOTE($hasClosingQuote)
{
if ($this->lexer->token['type'] !== EmailLexer::S_DQUOTE) {
diff --git a/vendor/egulias/email-validator/EmailValidator/Validation/DNSCheckValidation.php b/vendor/egulias/email-validator/EmailValidator/Validation/DNSCheckValidation.php
index e5c3e5df90..da13253eea 100644
--- a/vendor/egulias/email-validator/EmailValidator/Validation/DNSCheckValidation.php
+++ b/vendor/egulias/email-validator/EmailValidator/Validation/DNSCheckValidation.php
@@ -15,13 +15,13 @@ class DNSCheckValidation implements EmailValidation
private $warnings = [];
/**
- * @var InvalidEmail
+ * @var InvalidEmail|null
*/
private $error;
-
+
public function __construct()
{
- if (!extension_loaded('intl')) {
+ if (!function_exists('idn_to_ascii')) {
throw new \LogicException(sprintf('The %s class requires the Intl extension.', __CLASS__));
}
}
@@ -49,6 +49,11 @@ public function getWarnings()
return $this->warnings;
}
+ /**
+ * @param string $host
+ *
+ * @return bool
+ */
protected function checkDNS($host)
{
$variant = INTL_IDNA_VARIANT_2003;
diff --git a/vendor/egulias/email-validator/EmailValidator/Validation/Exception/EmptyValidationList.php b/vendor/egulias/email-validator/EmailValidator/Validation/Exception/EmptyValidationList.php
index 775ad16fb5..ee7c41aa03 100644
--- a/vendor/egulias/email-validator/EmailValidator/Validation/Exception/EmptyValidationList.php
+++ b/vendor/egulias/email-validator/EmailValidator/Validation/Exception/EmptyValidationList.php
@@ -6,6 +6,9 @@
class EmptyValidationList extends \InvalidArgumentException
{
+ /**
+ * @param int $code
+ */
public function __construct($code = 0, Exception $previous = null)
{
parent::__construct("Empty validation list is not allowed", $code, $previous);
diff --git a/vendor/egulias/email-validator/EmailValidator/Validation/MultipleErrors.php b/vendor/egulias/email-validator/EmailValidator/Validation/MultipleErrors.php
index d5e87d8ce0..3be5973266 100644
--- a/vendor/egulias/email-validator/EmailValidator/Validation/MultipleErrors.php
+++ b/vendor/egulias/email-validator/EmailValidator/Validation/MultipleErrors.php
@@ -9,16 +9,22 @@ class MultipleErrors extends InvalidEmail
const CODE = 999;
const REASON = "Accumulated errors for multiple validations";
/**
- * @var array
+ * @var InvalidEmail[]
*/
private $errors = [];
+ /**
+ * @param InvalidEmail[] $errors
+ */
public function __construct(array $errors)
{
$this->errors = $errors;
parent::__construct();
}
+ /**
+ * @return InvalidEmail[]
+ */
public function getErrors()
{
return $this->errors;
diff --git a/vendor/egulias/email-validator/EmailValidator/Validation/MultipleValidationWithAnd.php b/vendor/egulias/email-validator/EmailValidator/Validation/MultipleValidationWithAnd.php
index ce161ac848..feb224023d 100644
--- a/vendor/egulias/email-validator/EmailValidator/Validation/MultipleValidationWithAnd.php
+++ b/vendor/egulias/email-validator/EmailValidator/Validation/MultipleValidationWithAnd.php
@@ -30,12 +30,12 @@ class MultipleValidationWithAnd implements EmailValidation
private $warnings = [];
/**
- * @var MultipleErrors
+ * @var MultipleErrors|null
*/
private $error;
/**
- * @var bool
+ * @var int
*/
private $mode;
@@ -79,6 +79,12 @@ public function isValid($email, EmailLexer $emailLexer)
return $result;
}
+ /**
+ * @param \Egulias\EmailValidator\Exception\InvalidEmail|null $possibleError
+ * @param \Egulias\EmailValidator\Exception\InvalidEmail[] $errors
+ *
+ * @return \Egulias\EmailValidator\Exception\InvalidEmail[]
+ */
private function addNewError($possibleError, array $errors)
{
if (null !== $possibleError) {
@@ -88,13 +94,20 @@ private function addNewError($possibleError, array $errors)
return $errors;
}
+ /**
+ * @param bool $result
+ *
+ * @return bool
+ */
private function shouldStop($result)
{
return !$result && $this->mode === self::STOP_ON_ERROR;
}
/**
- * {@inheritdoc}
+ * Returns the validation errors.
+ *
+ * @return MultipleErrors|null
*/
public function getError()
{
diff --git a/vendor/egulias/email-validator/EmailValidator/Validation/NoRFCWarningsValidation.php b/vendor/egulias/email-validator/EmailValidator/Validation/NoRFCWarningsValidation.php
index e4bf0cc4df..6b31e5440e 100644
--- a/vendor/egulias/email-validator/EmailValidator/Validation/NoRFCWarningsValidation.php
+++ b/vendor/egulias/email-validator/EmailValidator/Validation/NoRFCWarningsValidation.php
@@ -9,7 +9,7 @@
class NoRFCWarningsValidation extends RFCValidation
{
/**
- * @var InvalidEmail
+ * @var InvalidEmail|null
*/
private $error;
diff --git a/vendor/egulias/email-validator/EmailValidator/Validation/RFCValidation.php b/vendor/egulias/email-validator/EmailValidator/Validation/RFCValidation.php
index c4ffe35034..8781e0b62d 100644
--- a/vendor/egulias/email-validator/EmailValidator/Validation/RFCValidation.php
+++ b/vendor/egulias/email-validator/EmailValidator/Validation/RFCValidation.php
@@ -9,7 +9,7 @@
class RFCValidation implements EmailValidation
{
/**
- * @var EmailParser
+ * @var EmailParser|null
*/
private $parser;
@@ -19,7 +19,7 @@ class RFCValidation implements EmailValidation
private $warnings = [];
/**
- * @var InvalidEmail
+ * @var InvalidEmail|null
*/
private $error;
diff --git a/vendor/egulias/email-validator/EmailValidator/Validation/SpoofCheckValidation.php b/vendor/egulias/email-validator/EmailValidator/Validation/SpoofCheckValidation.php
index 4721f0d8c9..e10bfabd92 100644
--- a/vendor/egulias/email-validator/EmailValidator/Validation/SpoofCheckValidation.php
+++ b/vendor/egulias/email-validator/EmailValidator/Validation/SpoofCheckValidation.php
@@ -10,7 +10,7 @@
class SpoofCheckValidation implements EmailValidation
{
/**
- * @var InvalidEmail
+ * @var InvalidEmail|null
*/
private $error;
@@ -21,6 +21,9 @@ public function __construct()
}
}
+ /**
+ * @psalm-suppress InvalidArgument
+ */
public function isValid($email, EmailLexer $emailLexer)
{
$checker = new Spoofchecker();
@@ -33,6 +36,9 @@ public function isValid($email, EmailLexer $emailLexer)
return $this->error === null;
}
+ /**
+ * @return InvalidEmail|null
+ */
public function getError()
{
return $this->error;
diff --git a/vendor/egulias/email-validator/EmailValidator/Warning/QuotedPart.php b/vendor/egulias/email-validator/EmailValidator/Warning/QuotedPart.php
index 7be9e6a3f2..36a4265a51 100644
--- a/vendor/egulias/email-validator/EmailValidator/Warning/QuotedPart.php
+++ b/vendor/egulias/email-validator/EmailValidator/Warning/QuotedPart.php
@@ -6,6 +6,10 @@ class QuotedPart extends Warning
{
const CODE = 36;
+ /**
+ * @param scalar $prevToken
+ * @param scalar $postToken
+ */
public function __construct($prevToken, $postToken)
{
$this->message = "Deprecated Quoted String found between $prevToken and $postToken";
diff --git a/vendor/egulias/email-validator/EmailValidator/Warning/QuotedString.php b/vendor/egulias/email-validator/EmailValidator/Warning/QuotedString.php
index e9d56e1e03..817e4e84b0 100644
--- a/vendor/egulias/email-validator/EmailValidator/Warning/QuotedString.php
+++ b/vendor/egulias/email-validator/EmailValidator/Warning/QuotedString.php
@@ -6,6 +6,10 @@ class QuotedString extends Warning
{
const CODE = 11;
+ /**
+ * @param scalar $prevToken
+ * @param scalar $postToken
+ */
public function __construct($prevToken, $postToken)
{
$this->message = "Quoted String found between $prevToken and $postToken";
diff --git a/vendor/egulias/email-validator/EmailValidator/Warning/Warning.php b/vendor/egulias/email-validator/EmailValidator/Warning/Warning.php
index ec6a365ffb..bce7e7a5ae 100644
--- a/vendor/egulias/email-validator/EmailValidator/Warning/Warning.php
+++ b/vendor/egulias/email-validator/EmailValidator/Warning/Warning.php
@@ -5,19 +5,36 @@
abstract class Warning
{
const CODE = 0;
- protected $message;
- protected $rfcNumber;
+ /**
+ * @var string
+ */
+ protected $message = '';
+
+ /**
+ * @var int
+ */
+ protected $rfcNumber = 0;
+
+ /**
+ * @return string
+ */
public function message()
{
return $this->message;
}
+ /**
+ * @return int
+ */
public function code()
{
return self::CODE;
}
+ /**
+ * @return int
+ */
public function RFCNumber()
{
return $this->rfcNumber;
diff --git a/vendor/egulias/email-validator/composer.json b/vendor/egulias/email-validator/composer.json
index 4956da9e00..595caff01f 100644
--- a/vendor/egulias/email-validator/composer.json
+++ b/vendor/egulias/email-validator/composer.json
@@ -2,7 +2,6 @@
"name": "egulias/email-validator",
"description": "A library for validating emails against several RFCs",
"homepage": "https://github.com/egulias/EmailValidator",
- "type": "Library",
"keywords": ["email", "validation", "validator", "emailvalidation", "emailvalidator"],
"license": "MIT",
"authors": [
@@ -13,21 +12,15 @@
"dev-master": "2.1.x-dev"
}
},
- "repositories": [
- {
- "type": "git",
- "url": "https://github.com/dominicsayers/isemail"
- }
- ],
- "require": {
- "php": ">= 5.5",
- "doctrine/lexer": "^1.0.1"
+ "require": {
+ "php": ">=5.5",
+ "doctrine/lexer": "^1.0.1",
+ "symfony/polyfill-intl-idn": "^1.10"
},
- "require-dev" : {
+ "require-dev": {
"satooshi/php-coveralls": "^1.0.1",
- "phpunit/phpunit": "^4.8.35||^5.7||^6.0",
- "symfony/phpunit-bridge": "^4.4@dev",
- "dominicsayers/isemail": "dev-master"
+ "phpunit/phpunit": "^4.8.36|^7.5.15",
+ "dominicsayers/isemail": "^3.0.7"
},
"suggest": {
"ext-intl": "PHP Internationalization Libraries are required to use the SpoofChecking validation"
@@ -39,7 +32,7 @@
},
"autoload-dev": {
"psr-4": {
- "Egulias\\Tests\\": "test"
+ "Egulias\\Tests\\": "Tests"
}
}
}
diff --git a/vendor/egulias/email-validator/phpunit.xml.dist b/vendor/egulias/email-validator/phpunit.xml.dist
index 754445a76d..1122406d96 100644
--- a/vendor/egulias/email-validator/phpunit.xml.dist
+++ b/vendor/egulias/email-validator/phpunit.xml.dist
@@ -22,8 +22,4 @@
<directory>./EmailValidator/</directory>
</whitelist>
</filter>
-
-<listeners>
- <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener" />
-</listeners>
</phpunit>
diff --git a/vendor/egulias/email-validator/psalm.baseline.xml b/vendor/egulias/email-validator/psalm.baseline.xml
new file mode 100644
index 0000000000..f81df72c96
--- /dev/null
+++ b/vendor/egulias/email-validator/psalm.baseline.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<files psalm-version="3.8.3@389af1bfc739bfdff3f9e3dc7bd6499aee51a831">
+ <file src="EmailValidator/EmailLexer.php">
+ <DocblockTypeContradiction occurrences="1">
+ <code>self::$nullToken</code>
+ </DocblockTypeContradiction>
+ </file>
+ <file src="EmailValidator/Parser/Parser.php">
+ <MissingReturnType occurrences="1">
+ <code>parse</code>
+ </MissingReturnType>
+ </file>
+ <file src="EmailValidator/Validation/SpoofCheckValidation.php">
+ <UndefinedClass occurrences="2">
+ <code>Spoofchecker</code>
+ <code>Spoofchecker</code>
+ </UndefinedClass>
+ </file>
+</files>
diff --git a/vendor/egulias/email-validator/psalm.xml b/vendor/egulias/email-validator/psalm.xml
new file mode 100644
index 0000000000..fb17dc852c
--- /dev/null
+++ b/vendor/egulias/email-validator/psalm.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<psalm
+ requireVoidReturnType="false"
+ totallyTyped="false"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="https://getpsalm.org/schema/config"
+ xsi:schemaLocation="https://getpsalm.org/schema/config ./vendor/vimeo/psalm/config.xsd"
+ errorBaseline="./psalm.baseline.xml"
+>
+ <projectFiles>
+ <directory name="EmailValidator" />
+ <ignoreFiles>
+ <directory name="vendor" />
+ </ignoreFiles>
+ </projectFiles>
+
+ <issueHandlers>
+ </issueHandlers>
+</psalm>
diff --git a/vendor/guzzlehttp/guzzle/.php_cs b/vendor/guzzlehttp/guzzle/.php_cs
new file mode 100644
index 0000000000..2dd5036c1f
--- /dev/null
+++ b/vendor/guzzlehttp/guzzle/.php_cs
@@ -0,0 +1,23 @@
+<?php
+
+$config = PhpCsFixer\Config::create()
+ ->setRiskyAllowed(true)
+ ->setRules([
+ '@PSR2' => true,
+ 'array_syntax' => ['syntax' => 'short'],
+ 'declare_strict_types' => false,
+ 'concat_space' => ['spacing'=>'one'],
+ 'php_unit_test_case_static_method_calls' => ['call_type' => 'self'],
+ 'ordered_imports' => true,
+ // 'phpdoc_align' => ['align'=>'vertical'],
+ // 'native_function_invocation' => true,
+ ])
+ ->setFinder(
+ PhpCsFixer\Finder::create()
+ ->in(__DIR__.'/src')
+ ->in(__DIR__.'/tests')
+ ->name('*.php')
+ )
+;
+
+return $config;
diff --git a/vendor/guzzlehttp/guzzle/CHANGELOG.md b/vendor/guzzlehttp/guzzle/CHANGELOG.md
index 17badd7560..f5b183a0c1 100644
--- a/vendor/guzzlehttp/guzzle/CHANGELOG.md
+++ b/vendor/guzzlehttp/guzzle/CHANGELOG.md
@@ -1,5 +1,52 @@
# Change Log
+## 6.5.4 - 2020-05-25
+
+* Fix various intl icu issues [#2626](https://github.com/guzzle/guzzle/pull/2626)
+
+## 6.5.3 - 2020-04-18
+
+* Use Symfony intl-idn polyfill [#2550](https://github.com/guzzle/guzzle/pull/2550)
+* Remove use of internal functions [#2548](https://github.com/guzzle/guzzle/pull/2548)
+
+## 6.5.2 - 2019-12-23
+
+* idn_to_ascii() fix for old PHP versions [#2489](https://github.com/guzzle/guzzle/pull/2489)
+
+## 6.5.1 - 2019-12-21
+
+* Better defaults for PHP installations with old ICU lib [#2454](https://github.com/guzzle/guzzle/pull/2454)
+* IDN support for redirects [#2424](https://github.com/guzzle/guzzle/pull/2424)
+
+## 6.5.0 - 2019-12-07
+
+* Improvement: Added support for reset internal queue in MockHandler. [#2143](https://github.com/guzzle/guzzle/pull/2143)
+* Improvement: Added support to pass arbitrary options to `curl_multi_init`. [#2287](https://github.com/guzzle/guzzle/pull/2287)
+* Fix: Gracefully handle passing `null` to the `header` option. [#2132](https://github.com/guzzle/guzzle/pull/2132)
+* Fix: `RetryMiddleware` did not do exponential delay between retries due unit mismatch. [#2132](https://github.com/guzzle/guzzle/pull/2132)
+ Previously, `RetryMiddleware` would sleep for 1 millisecond, then 2 milliseconds, then 4 milliseconds.
+ **After this change, `RetryMiddleware` will sleep for 1 second, then 2 seconds, then 4 seconds.**
+ `Middleware::retry()` accepts a second callback parameter to override the default timeouts if needed.
+* Fix: Prevent undefined offset when using array for ssl_key options. [#2348](https://github.com/guzzle/guzzle/pull/2348)
+* Deprecated `ClientInterface::VERSION`
+
+## 6.4.1 - 2019-10-23
+
+* No `guzzle.phar` was created in 6.4.0 due expired API token. This release will fix that
+* Added `parent::__construct()` to `FileCookieJar` and `SessionCookieJar`
+
+## 6.4.0 - 2019-10-23
+
+* Improvement: Improved error messages when using curl < 7.21.2 [#2108](https://github.com/guzzle/guzzle/pull/2108)
+* Fix: Test if response is readable before returning a summary in `RequestException::getResponseBodySummary()` [#2081](https://github.com/guzzle/guzzle/pull/2081)
+* Fix: Add support for GUZZLE_CURL_SELECT_TIMEOUT environment variable [#2161](https://github.com/guzzle/guzzle/pull/2161)
+* Improvement: Added `GuzzleHttp\Exception\InvalidArgumentException` [#2163](https://github.com/guzzle/guzzle/pull/2163)
+* Improvement: Added `GuzzleHttp\_current_time()` to use `hrtime()` if that function exists. [#2242](https://github.com/guzzle/guzzle/pull/2242)
+* Improvement: Added curl's `appconnect_time` in `TransferStats` [#2284](https://github.com/guzzle/guzzle/pull/2284)
+* Improvement: Make GuzzleException extend Throwable wherever it's available [#2273](https://github.com/guzzle/guzzle/pull/2273)
+* Fix: Prevent concurrent writes to file when saving `CookieJar` [#2335](https://github.com/guzzle/guzzle/pull/2335)
+* Improvement: Update `MockHandler` so we can test transfer time [#2362](https://github.com/guzzle/guzzle/pull/2362)
+
## 6.3.3 - 2018-04-22
* Fix: Default headers when decode_content is specified
diff --git a/vendor/guzzlehttp/guzzle/Dockerfile b/vendor/guzzlehttp/guzzle/Dockerfile
new file mode 100644
index 0000000000..f6a095230e
--- /dev/null
+++ b/vendor/guzzlehttp/guzzle/Dockerfile
@@ -0,0 +1,18 @@
+FROM composer:latest as setup
+
+RUN mkdir /guzzle
+
+WORKDIR /guzzle
+
+RUN set -xe \
+ && composer init --name=guzzlehttp/test --description="Simple project for testing Guzzle scripts" --author="Márk Sági-Kazár <mark.sagikazar@gmail.com>" --no-interaction \
+ && composer require guzzlehttp/guzzle
+
+
+FROM php:7.3
+
+RUN mkdir /guzzle
+
+WORKDIR /guzzle
+
+COPY --from=setup /guzzle /guzzle
diff --git a/vendor/guzzlehttp/guzzle/README.md b/vendor/guzzlehttp/guzzle/README.md
index bcd18b8e71..5fdb6c5f42 100644
--- a/vendor/guzzlehttp/guzzle/README.md
+++ b/vendor/guzzlehttp/guzzle/README.md
@@ -21,19 +21,18 @@ trivial to integrate with web services.
```php
$client = new \GuzzleHttp\Client();
-$res = $client->request('GET', 'https://api.github.com/repos/guzzle/guzzle');
-echo $res->getStatusCode();
-// 200
-echo $res->getHeaderLine('content-type');
-// 'application/json; charset=utf8'
-echo $res->getBody();
-// '{"id": 1420053, "name": "guzzle", ...}'
-
-// Send an asynchronous request.
+$response = $client->request('GET', 'https://api.github.com/repos/guzzle/guzzle');
+
+echo $response->getStatusCode(); # 200
+echo $response->getHeaderLine('content-type'); # 'application/json; charset=utf8'
+echo $response->getBody(); # '{"id": 1420053, "name": "guzzle", ...}'
+
+# Send an asynchronous request.
$request = new \GuzzleHttp\Psr7\Request('GET', 'http://httpbin.org');
$promise = $client->sendAsync($request)->then(function ($response) {
echo 'I completed! ' . $response->getBody();
});
+
$promise->wait();
```
@@ -57,7 +56,7 @@ curl -sS https://getcomposer.org/installer | php
Next, run the Composer command to install the latest stable version of Guzzle:
```bash
-php composer.phar require guzzlehttp/guzzle
+composer require guzzlehttp/guzzle
```
After installing, you need to require Composer's autoloader:
@@ -69,7 +68,7 @@ require 'vendor/autoload.php';
You can then later update Guzzle using composer:
```bash
-composer.phar update
+composer update
```
@@ -79,13 +78,13 @@ composer.phar update
|---------|------------|---------------------|--------------|---------------------|---------------------|-------|-------------|
| 3.x | EOL | `guzzle/guzzle` | `Guzzle` | [v3][guzzle-3-repo] | [v3][guzzle-3-docs] | No | >= 5.3.3 |
| 4.x | EOL | `guzzlehttp/guzzle` | `GuzzleHttp` | [v4][guzzle-4-repo] | N/A | No | >= 5.4 |
-| 5.x | Maintained | `guzzlehttp/guzzle` | `GuzzleHttp` | [v5][guzzle-5-repo] | [v5][guzzle-5-docs] | No | >= 5.4 |
+| 5.x | EOL | `guzzlehttp/guzzle` | `GuzzleHttp` | [v5][guzzle-5-repo] | [v5][guzzle-5-docs] | No | >= 5.4 |
| 6.x | Latest | `guzzlehttp/guzzle` | `GuzzleHttp` | [v6][guzzle-6-repo] | [v6][guzzle-6-docs] | Yes | >= 5.5 |
[guzzle-3-repo]: https://github.com/guzzle/guzzle3
[guzzle-4-repo]: https://github.com/guzzle/guzzle/tree/4.x
[guzzle-5-repo]: https://github.com/guzzle/guzzle/tree/5.3
[guzzle-6-repo]: https://github.com/guzzle/guzzle
-[guzzle-3-docs]: http://guzzle3.readthedocs.org/en/latest/
+[guzzle-3-docs]: http://guzzle3.readthedocs.org
[guzzle-5-docs]: http://guzzle.readthedocs.org/en/5.3/
[guzzle-6-docs]: http://guzzle.readthedocs.org/en/latest/
diff --git a/vendor/guzzlehttp/guzzle/composer.json b/vendor/guzzlehttp/guzzle/composer.json
index 1f328e308c..b7bff79a84 100644
--- a/vendor/guzzlehttp/guzzle/composer.json
+++ b/vendor/guzzlehttp/guzzle/composer.json
@@ -2,7 +2,15 @@
"name": "guzzlehttp/guzzle",
"type": "library",
"description": "Guzzle is a PHP HTTP client library",
- "keywords": ["framework", "http", "rest", "web service", "curl", "client", "HTTP client"],
+ "keywords": [
+ "framework",
+ "http",
+ "rest",
+ "web service",
+ "curl",
+ "client",
+ "HTTP client"
+ ],
"homepage": "http://guzzlephp.org/",
"license": "MIT",
"authors": [
@@ -14,31 +22,38 @@
],
"require": {
"php": ">=5.5",
- "guzzlehttp/psr7": "^1.4",
- "guzzlehttp/promises": "^1.0"
+ "ext-json": "*",
+ "symfony/polyfill-intl-idn": "1.17.0",
+ "guzzlehttp/promises": "^1.0",
+ "guzzlehttp/psr7": "^1.6.1"
},
"require-dev": {
"ext-curl": "*",
"phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0",
- "psr/log": "^1.0"
+ "psr/log": "^1.1"
+ },
+ "suggest": {
+ "psr/log": "Required for using the Log middleware"
+ },
+ "config": {
+ "sort-packages": true
+ },
+ "extra": {
+ "branch-alias": {
+ "dev-master": "6.5-dev"
+ }
},
"autoload": {
- "files": ["src/functions_include.php"],
"psr-4": {
"GuzzleHttp\\": "src/"
- }
+ },
+ "files": [
+ "src/functions_include.php"
+ ]
},
"autoload-dev": {
"psr-4": {
"GuzzleHttp\\Tests\\": "tests/"
}
- },
- "suggest": {
- "psr/log": "Required for using the Log middleware"
- },
- "extra": {
- "branch-alias": {
- "dev-master": "6.3-dev"
- }
}
}
diff --git a/vendor/guzzlehttp/guzzle/src/Client.php b/vendor/guzzlehttp/guzzle/src/Client.php
index 80417918d0..315a022cf4 100644
--- a/vendor/guzzlehttp/guzzle/src/Client.php
+++ b/vendor/guzzlehttp/guzzle/src/Client.php
@@ -2,11 +2,12 @@
namespace GuzzleHttp;
use GuzzleHttp\Cookie\CookieJar;
+use GuzzleHttp\Exception\GuzzleException;
use GuzzleHttp\Promise;
use GuzzleHttp\Psr7;
-use Psr\Http\Message\UriInterface;
use Psr\Http\Message\RequestInterface;
use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\UriInterface;
/**
* @method ResponseInterface get(string|UriInterface $uri, array $options = [])
@@ -46,9 +47,8 @@ class Client implements ClientInterface
* wire. The function is called with a Psr7\Http\Message\RequestInterface
* and array of transfer options, and must return a
* GuzzleHttp\Promise\PromiseInterface that is fulfilled with a
- * Psr7\Http\Message\ResponseInterface on success. "handler" is a
- * constructor only option that cannot be overridden in per/request
- * options. If no handler is provided, a default handler will be created
+ * Psr7\Http\Message\ResponseInterface on success.
+ * If no handler is provided, a default handler will be created
* that enables all of the request options below by attaching all of the
* default middleware to the handler.
* - base_uri: (string|UriInterface) Base URI of the client that is merged
@@ -75,6 +75,12 @@ public function __construct(array $config = [])
$this->configureDefaults($config);
}
+ /**
+ * @param string $method
+ * @param array $args
+ *
+ * @return Promise\PromiseInterface
+ */
public function __call($method, $args)
{
if (count($args) < 1) {
@@ -89,6 +95,14 @@ public function __call($method, $args)
: $this->request($method, $uri, $opts);
}
+ /**
+ * Asynchronously send an HTTP request.
+ *
+ * @param array $options Request options to apply to the given
+ * request and to the transfer. See \GuzzleHttp\RequestOptions.
+ *
+ * @return Promise\PromiseInterface
+ */
public function sendAsync(RequestInterface $request, array $options = [])
{
// Merge the base URI into the request URI if needed.
@@ -100,12 +114,35 @@ public function sendAsync(RequestInterface $request, array $options = [])
);
}
+ /**
+ * Send an HTTP request.
+ *
+ * @param array $options Request options to apply to the given
+ * request and to the transfer. See \GuzzleHttp\RequestOptions.
+ *
+ * @return ResponseInterface
+ * @throws GuzzleException
+ */
public function send(RequestInterface $request, array $options = [])
{
$options[RequestOptions::SYNCHRONOUS] = true;
return $this->sendAsync($request, $options)->wait();
}
+ /**
+ * Create and send an asynchronous HTTP request.
+ *
+ * Use an absolute path to override the base path of the client, or a
+ * relative path to append to the base path of the client. The URL can
+ * contain the query string as well. Use an array to provide a URL
+ * template and additional variables to use in the URL template expansion.
+ *
+ * @param string $method HTTP method
+ * @param string|UriInterface $uri URI object or string.
+ * @param array $options Request options to apply. See \GuzzleHttp\RequestOptions.
+ *
+ * @return Promise\PromiseInterface
+ */
public function requestAsync($method, $uri = '', array $options = [])
{
$options = $this->prepareDefaults($options);
@@ -125,12 +162,37 @@ public function requestAsync($method, $uri = '', array $options = [])
return $this->transfer($request, $options);
}
+ /**
+ * Create and send an HTTP request.
+ *
+ * Use an absolute path to override the base path of the client, or a
+ * relative path to append to the base path of the client. The URL can
+ * contain the query string as well.
+ *
+ * @param string $method HTTP method.
+ * @param string|UriInterface $uri URI object or string.
+ * @param array $options Request options to apply. See \GuzzleHttp\RequestOptions.
+ *
+ * @return ResponseInterface
+ * @throws GuzzleException
+ */
public function request($method, $uri = '', array $options = [])
{
$options[RequestOptions::SYNCHRONOUS] = true;
return $this->requestAsync($method, $uri, $options)->wait();
}
+ /**
+ * Get a client configuration option.
+ *
+ * These options include default request options of the client, a "handler"
+ * (if utilized by the concrete client), and a "base_uri" if utilized by
+ * the concrete client.
+ *
+ * @param string|null $option The config option to retrieve.
+ *
+ * @return mixed
+ */
public function getConfig($option = null)
{
return $option === null
@@ -138,6 +200,11 @@ public function getConfig($option = null)
: (isset($this->config[$option]) ? $this->config[$option] : null);
}
+ /**
+ * @param string|null $uri
+ *
+ * @return UriInterface
+ */
private function buildUri($uri, array $config)
{
// for BC we accept null which would otherwise fail in uri_for
@@ -147,6 +214,11 @@ private function buildUri($uri, array $config)
$uri = Psr7\UriResolver::resolve(Psr7\uri_for($config['base_uri']), $uri);
}
+ if (isset($config['idn_conversion']) && ($config['idn_conversion'] !== false)) {
+ $idnOptions = ($config['idn_conversion'] === true) ? IDNA_DEFAULT : $config['idn_conversion'];
+ $uri = Utils::idnUriConvert($uri, $idnOptions);
+ }
+
return $uri->getScheme() === '' && $uri->getHost() !== '' ? $uri->withScheme('http') : $uri;
}
@@ -154,6 +226,7 @@ private function buildUri($uri, array $config)
* Configures the default options for a client.
*
* @param array $config
+ * @return void
*/
private function configureDefaults(array $config)
{
@@ -162,7 +235,8 @@ private function configureDefaults(array $config)
'http_errors' => true,
'decode_content' => true,
'verify' => true,
- 'cookies' => false
+ 'cookies' => false,
+ 'idn_conversion' => true,
];
// Use the standard Linux HTTP_PROXY and HTTPS_PROXY if set.
@@ -170,7 +244,7 @@ private function configureDefaults(array $config)
// We can only trust the HTTP_PROXY environment variable in a CLI
// process due to the fact that PHP has no reliable mechanism to
// get environment variables that start with "HTTP_".
- if (php_sapi_name() == 'cli' && getenv('HTTP_PROXY')) {
+ if (php_sapi_name() === 'cli' && getenv('HTTP_PROXY')) {
$defaults['proxy']['http'] = getenv('HTTP_PROXY');
}
@@ -210,7 +284,7 @@ private function configureDefaults(array $config)
*
* @return array
*/
- private function prepareDefaults($options)
+ private function prepareDefaults(array $options)
{
$defaults = $this->config;
@@ -225,7 +299,7 @@ private function prepareDefaults($options)
if (array_key_exists('headers', $options)) {
// Allows default headers to be unset.
if ($options['headers'] === null) {
- $defaults['_conditional'] = null;
+ $defaults['_conditional'] = [];
unset($options['headers']);
} elseif (!is_array($options['headers'])) {
throw new \InvalidArgumentException('headers must be an array');
@@ -251,8 +325,7 @@ private function prepareDefaults($options)
* The URI of the request is not modified and the request options are used
* as-is without merging in default options.
*
- * @param RequestInterface $request
- * @param array $options
+ * @param array $options See \GuzzleHttp\RequestOptions.
*
* @return Promise\PromiseInterface
*/
@@ -271,6 +344,7 @@ private function transfer(RequestInterface $request, array $options)
}
$request = $this->applyOptions($request, $options);
+ /** @var HandlerStack $handler */
$handler = $options['handler'];
try {
@@ -411,6 +485,11 @@ private function applyOptions(RequestInterface $request, array &$options)
return $request;
}
+ /**
+ * Throw Exception with pre-set message.
+ * @return void
+ * @throws \InvalidArgumentException Invalid body.
+ */
private function invalidBody()
{
throw new \InvalidArgumentException('Passing in the "body" request '
diff --git a/vendor/guzzlehttp/guzzle/src/ClientInterface.php b/vendor/guzzlehttp/guzzle/src/ClientInterface.php
index 2dbcffa492..54c759b96b 100644
--- a/vendor/guzzlehttp/guzzle/src/ClientInterface.php
+++ b/vendor/guzzlehttp/guzzle/src/ClientInterface.php
@@ -1,8 +1,8 @@
<?php
namespace GuzzleHttp;
-use GuzzleHttp\Promise\PromiseInterface;
use GuzzleHttp\Exception\GuzzleException;
+use GuzzleHttp\Promise\PromiseInterface;
use Psr\Http\Message\RequestInterface;
use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\UriInterface;
@@ -12,7 +12,10 @@
*/
interface ClientInterface
{
- const VERSION = '6.3.3';
+ /**
+ * @deprecated Will be removed in Guzzle 7.0.0
+ */
+ const VERSION = '6.5.4';
/**
* Send an HTTP request.
diff --git a/vendor/guzzlehttp/guzzle/src/Cookie/CookieJar.php b/vendor/guzzlehttp/guzzle/src/Cookie/CookieJar.php
index 78f2b79fec..38f98ad7c0 100644
--- a/vendor/guzzlehttp/guzzle/src/Cookie/CookieJar.php
+++ b/vendor/guzzlehttp/guzzle/src/Cookie/CookieJar.php
@@ -94,8 +94,8 @@ public static function shouldPersist(
*/
public function getCookieByName($name)
{
- // don't allow a null name
- if ($name === null) {
+ // don't allow a non string name
+ if ($name === null || !is_scalar($name)) {
return null;
}
foreach ($this->cookies as $cookie) {
@@ -103,6 +103,8 @@ public function getCookieByName($name)
return $cookie;
}
}
+
+ return null;
}
public function toArray()
@@ -120,7 +122,7 @@ public function clear($domain = null, $path = null, $name = null)
} elseif (!$path) {
$this->cookies = array_filter(
$this->cookies,
- function (SetCookie $cookie) use ($path, $domain) {
+ function (SetCookie $cookie) use ($domain) {
return !$cookie->matchesDomain($domain);
}
);
diff --git a/vendor/guzzlehttp/guzzle/src/Cookie/CookieJarInterface.php b/vendor/guzzlehttp/guzzle/src/Cookie/CookieJarInterface.php
index 2cf298a867..6ee11885e1 100644
--- a/vendor/guzzlehttp/guzzle/src/Cookie/CookieJarInterface.php
+++ b/vendor/guzzlehttp/guzzle/src/Cookie/CookieJarInterface.php
@@ -58,9 +58,9 @@ public function setCookie(SetCookie $cookie);
* arguments, then the cookie with the specified name, path and domain is
* removed.
*
- * @param string $domain Clears cookies matching a domain
- * @param string $path Clears cookies matching a domain and path
- * @param string $name Clears cookies matching a domain, path, and name
+ * @param string|null $domain Clears cookies matching a domain
+ * @param string|null $path Clears cookies matching a domain and path
+ * @param string|null $name Clears cookies matching a domain, path, and name
*
* @return CookieJarInterface
*/
diff --git a/vendor/guzzlehttp/guzzle/src/Cookie/FileCookieJar.php b/vendor/guzzlehttp/guzzle/src/Cookie/FileCookieJar.php
index 9887c1d54b..3fb8600ef0 100644
--- a/vendor/guzzlehttp/guzzle/src/Cookie/FileCookieJar.php
+++ b/vendor/guzzlehttp/guzzle/src/Cookie/FileCookieJar.php
@@ -23,6 +23,7 @@ class FileCookieJar extends CookieJar
*/
public function __construct($cookieFile, $storeSessionCookies = false)
{
+ parent::__construct();
$this->filename = $cookieFile;
$this->storeSessionCookies = $storeSessionCookies;
@@ -56,7 +57,7 @@ public function save($filename)
}
$jsonStr = \GuzzleHttp\json_encode($json);
- if (false === file_put_contents($filename, $jsonStr)) {
+ if (false === file_put_contents($filename, $jsonStr, LOCK_EX)) {
throw new \RuntimeException("Unable to save file {$filename}");
}
}
diff --git a/vendor/guzzlehttp/guzzle/src/Cookie/SessionCookieJar.php b/vendor/guzzlehttp/guzzle/src/Cookie/SessionCookieJar.php
index 4497bcf03e..0224a2447b 100644
--- a/vendor/guzzlehttp/guzzle/src/Cookie/SessionCookieJar.php
+++ b/vendor/guzzlehttp/guzzle/src/Cookie/SessionCookieJar.php
@@ -22,6 +22,7 @@ class SessionCookieJar extends CookieJar
*/
public function __construct($sessionKey, $storeSessionCookies = false)
{
+ parent::__construct();
$this->sessionKey = $sessionKey;
$this->storeSessionCookies = $storeSessionCookies;
$this->load();
diff --git a/vendor/guzzlehttp/guzzle/src/Cookie/SetCookie.php b/vendor/guzzlehttp/guzzle/src/Cookie/SetCookie.php
index f6993943e7..3d776a70bc 100644
--- a/vendor/guzzlehttp/guzzle/src/Cookie/SetCookie.php
+++ b/vendor/guzzlehttp/guzzle/src/Cookie/SetCookie.php
@@ -227,7 +227,7 @@ public function setExpires($timestamp)
/**
* Get whether or not this is a secure cookie
*
- * @return null|bool
+ * @return bool|null
*/
public function getSecure()
{
@@ -247,7 +247,7 @@ public function setSecure($secure)
/**
* Get whether or not this is a session cookie
*
- * @return null|bool
+ * @return bool|null
*/
public function getDiscard()
{
diff --git a/vendor/guzzlehttp/guzzle/src/Exception/ClientException.php b/vendor/guzzlehttp/guzzle/src/Exception/ClientException.php
index f95c09f2b1..4cfd393cc1 100644
--- a/vendor/guzzlehttp/guzzle/src/Exception/ClientException.php
+++ b/vendor/guzzlehttp/guzzle/src/Exception/ClientException.php
@@ -4,4 +4,6 @@
/**
* Exception when a client error is encountered (4xx codes)
*/
-class ClientException extends BadResponseException {}
+class ClientException extends BadResponseException
+{
+}
diff --git a/vendor/guzzlehttp/guzzle/src/Exception/GuzzleException.php b/vendor/guzzlehttp/guzzle/src/Exception/GuzzleException.php
index 510778f6eb..27b2722b0b 100644
--- a/vendor/guzzlehttp/guzzle/src/Exception/GuzzleException.php
+++ b/vendor/guzzlehttp/guzzle/src/Exception/GuzzleException.php
@@ -1,13 +1,23 @@
<?php
namespace GuzzleHttp\Exception;
-/**
- * @method string getMessage()
- * @method \Throwable|null getPrevious()
- * @method mixed getCode()
- * @method string getFile()
- * @method int getLine()
- * @method array getTrace()
- * @method string getTraceAsString()
- */
-interface GuzzleException {}
+use Throwable;
+
+if (interface_exists(Throwable::class)) {
+ interface GuzzleException extends Throwable
+ {
+ }
+} else {
+ /**
+ * @method string getMessage()
+ * @method \Throwable|null getPrevious()
+ * @method mixed getCode()
+ * @method string getFile()
+ * @method int getLine()
+ * @method array getTrace()
+ * @method string getTraceAsString()
+ */
+ interface GuzzleException
+ {
+ }
+}
diff --git a/vendor/guzzlehttp/guzzle/src/Exception/InvalidArgumentException.php b/vendor/guzzlehttp/guzzle/src/Exception/InvalidArgumentException.php
new file mode 100644
index 0000000000..bfd20e232b
--- /dev/null
+++ b/vendor/guzzlehttp/guzzle/src/Exception/InvalidArgumentException.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace GuzzleHttp\Exception;
+
+final class InvalidArgumentException extends \InvalidArgumentException implements GuzzleException
+{
+}
diff --git a/vendor/guzzlehttp/guzzle/src/Exception/RequestException.php b/vendor/guzzlehttp/guzzle/src/Exception/RequestException.php
index 39de327e7b..12dd081eb6 100644
--- a/vendor/guzzlehttp/guzzle/src/Exception/RequestException.php
+++ b/vendor/guzzlehttp/guzzle/src/Exception/RequestException.php
@@ -1,9 +1,9 @@
<?php
namespace GuzzleHttp\Exception;
+use GuzzleHttp\Promise\PromiseInterface;
use Psr\Http\Message\RequestInterface;
use Psr\Http\Message\ResponseInterface;
-use GuzzleHttp\Promise\PromiseInterface;
use Psr\Http\Message\UriInterface;
/**
@@ -14,7 +14,7 @@ class RequestException extends TransferException
/** @var RequestInterface */
private $request;
- /** @var ResponseInterface */
+ /** @var ResponseInterface|null */
private $response;
/** @var array */
@@ -124,42 +124,17 @@ public static function create(
*/
public static function getResponseBodySummary(ResponseInterface $response)
{
- $body = $response->getBody();
-
- if (!$body->isSeekable()) {
- return null;
- }
-
- $size = $body->getSize();
-
- if ($size === 0) {
- return null;
- }
-
- $summary = $body->read(120);
- $body->rewind();
-
- if ($size > 120) {
- $summary .= ' (truncated...)';
- }
-
- // Matches any printable character, including unicode characters:
- // letters, marks, numbers, punctuation, spacing, and separators.
- if (preg_match('/[^\pL\pM\pN\pP\pS\pZ\n\r\t]/', $summary)) {
- return null;
- }
-
- return $summary;
+ return \GuzzleHttp\Psr7\get_message_body_summary($response);
}
/**
- * Obfuscates URI if there is an username and a password present
+ * Obfuscates URI if there is a username and a password present
*
* @param UriInterface $uri
*
* @return UriInterface
*/
- private static function obfuscateUri($uri)
+ private static function obfuscateUri(UriInterface $uri)
{
$userInfo = $uri->getUserInfo();
diff --git a/vendor/guzzlehttp/guzzle/src/Exception/ServerException.php b/vendor/guzzlehttp/guzzle/src/Exception/ServerException.php
index 7cdd340866..127094c149 100644
--- a/vendor/guzzlehttp/guzzle/src/Exception/ServerException.php
+++ b/vendor/guzzlehttp/guzzle/src/Exception/ServerException.php
@@ -4,4 +4,6 @@
/**
* Exception when a server error is encountered (5xx codes)
*/
-class ServerException extends BadResponseException {}
+class ServerException extends BadResponseException
+{
+}
diff --git a/vendor/guzzlehttp/guzzle/src/Exception/TooManyRedirectsException.php b/vendor/guzzlehttp/guzzle/src/Exception/TooManyRedirectsException.php
index b60a9678d6..fff05251d5 100644
--- a/vendor/guzzlehttp/guzzle/src/Exception/TooManyRedirectsException.php
+++ b/vendor/guzzlehttp/guzzle/src/Exception/TooManyRedirectsException.php
@@ -1,4 +1,6 @@
<?php
namespace GuzzleHttp\Exception;
-class TooManyRedirectsException extends RequestException {}
+class TooManyRedirectsException extends RequestException
+{
+}
diff --git a/vendor/guzzlehttp/guzzle/src/Exception/TransferException.php b/vendor/guzzlehttp/guzzle/src/Exception/TransferException.php
index b92071ca20..7c11db3abc 100644
--- a/vendor/guzzlehttp/guzzle/src/Exception/TransferException.php
+++ b/vendor/guzzlehttp/guzzle/src/Exception/TransferException.php
@@ -1,4 +1,6 @@
<?php
namespace GuzzleHttp\Exception;
-class TransferException extends \RuntimeException implements GuzzleException {}
+class TransferException extends \RuntimeException implements GuzzleException
+{
+}
diff --git a/vendor/guzzlehttp/guzzle/src/Handler/CurlFactory.php b/vendor/guzzlehttp/guzzle/src/Handler/CurlFactory.php
index e092371430..4a28a96ebc 100644
--- a/vendor/guzzlehttp/guzzle/src/Handler/CurlFactory.php
+++ b/vendor/guzzlehttp/guzzle/src/Handler/CurlFactory.php
@@ -1,8 +1,8 @@
<?php
namespace GuzzleHttp\Handler;
-use GuzzleHttp\Exception\RequestException;
use GuzzleHttp\Exception\ConnectException;
+use GuzzleHttp\Exception\RequestException;
use GuzzleHttp\Promise\FulfilledPromise;
use GuzzleHttp\Psr7;
use GuzzleHttp\Psr7\LazyOpenStream;
@@ -14,6 +14,9 @@
*/
class CurlFactory implements CurlFactoryInterface
{
+ const CURL_VERSION_STR = 'curl_version';
+ const LOW_CURL_VERSION_NUMBER = '7.21.2';
+
/** @var array */
private $handles = [];
@@ -117,6 +120,7 @@ public static function finish(
private static function invokeStats(EasyHandle $easy)
{
$curlStats = curl_getinfo($easy->handle);
+ $curlStats['appconnect_time'] = curl_getinfo($easy->handle, CURLINFO_APPCONNECT_TIME);
$stats = new TransferStats(
$easy->request,
$easy->response,
@@ -136,7 +140,9 @@ private static function finishError(
$ctx = [
'errno' => $easy->errno,
'error' => curl_error($easy->handle),
+ 'appconnect_time' => curl_getinfo($easy->handle, CURLINFO_APPCONNECT_TIME),
] + curl_getinfo($easy->handle);
+ $ctx[self::CURL_VERSION_STR] = curl_version()['version'];
$factory->release($easy);
// Retry when nothing is present or when curl failed to rewind.
@@ -172,13 +178,22 @@ private static function createRejection(EasyHandle $easy, array $ctx)
)
);
}
-
- $message = sprintf(
- 'cURL error %s: %s (%s)',
- $ctx['errno'],
- $ctx['error'],
- 'see http://curl.haxx.se/libcurl/c/libcurl-errors.html'
- );
+ if (version_compare($ctx[self::CURL_VERSION_STR], self::LOW_CURL_VERSION_NUMBER)) {
+ $message = sprintf(
+ 'cURL error %s: %s (%s)',
+ $ctx['errno'],
+ $ctx['error'],
+ 'see https://curl.haxx.se/libcurl/c/libcurl-errors.html'
+ );
+ } else {
+ $message = sprintf(
+ 'cURL error %s: %s (%s) for %s',
+ $ctx['errno'],
+ $ctx['error'],
+ 'see https://curl.haxx.se/libcurl/c/libcurl-errors.html',
+ $easy->request->getUri()
+ );
+ }
// Create a connection exception if it was a specific error code.
$error = isset($connectionErrors[$easy->errno])
@@ -439,11 +454,16 @@ private function applyHandlerOptions(EasyHandle $easy, array &$conf)
}
if (isset($options['ssl_key'])) {
- $sslKey = $options['ssl_key'];
- if (is_array($sslKey)) {
- $conf[CURLOPT_SSLKEYPASSWD] = $sslKey[1];
- $sslKey = $sslKey[0];
+ if (is_array($options['ssl_key'])) {
+ if (count($options['ssl_key']) === 2) {
+ list($sslKey, $conf[CURLOPT_SSLKEYPASSWD]) = $options['ssl_key'];
+ } else {
+ list($sslKey) = $options['ssl_key'];
+ }
}
+
+ $sslKey = isset($sslKey) ? $sslKey: $options['ssl_key'];
+
if (!file_exists($sslKey)) {
throw new \InvalidArgumentException(
"SSL private key not found: {$sslKey}"
diff --git a/vendor/guzzlehttp/guzzle/src/Handler/CurlMultiHandler.php b/vendor/guzzlehttp/guzzle/src/Handler/CurlMultiHandler.php
index 2754d8e437..564c95f481 100644
--- a/vendor/guzzlehttp/guzzle/src/Handler/CurlMultiHandler.php
+++ b/vendor/guzzlehttp/guzzle/src/Handler/CurlMultiHandler.php
@@ -3,7 +3,7 @@
use GuzzleHttp\Promise as P;
use GuzzleHttp\Promise\Promise;
-use GuzzleHttp\Psr7;
+use GuzzleHttp\Utils;
use Psr\Http\Message\RequestInterface;
/**
@@ -23,6 +23,7 @@ class CurlMultiHandler
private $active;
private $handles = [];
private $delays = [];
+ private $options = [];
/**
* This handler accepts the following options:
@@ -30,6 +31,8 @@ class CurlMultiHandler
* - handle_factory: An optional factory used to create curl handles
* - select_timeout: Optional timeout (in seconds) to block before timing
* out while selecting curl handles. Defaults to 1 second.
+ * - options: An associative array of CURLMOPT_* options and
+ * corresponding values for curl_multi_setopt()
*
* @param array $options
*/
@@ -37,14 +40,31 @@ public function __construct(array $options = [])
{
$this->factory = isset($options['handle_factory'])
? $options['handle_factory'] : new CurlFactory(50);
- $this->selectTimeout = isset($options['select_timeout'])
- ? $options['select_timeout'] : 1;
+
+ if (isset($options['select_timeout'])) {
+ $this->selectTimeout = $options['select_timeout'];
+ } elseif ($selectTimeout = getenv('GUZZLE_CURL_SELECT_TIMEOUT')) {
+ $this->selectTimeout = $selectTimeout;
+ } else {
+ $this->selectTimeout = 1;
+ }
+
+ $this->options = isset($options['options']) ? $options['options'] : [];
}
public function __get($name)
{
if ($name === '_mh') {
- return $this->_mh = curl_multi_init();
+ $this->_mh = curl_multi_init();
+
+ foreach ($this->options as $option => $value) {
+ // A warning is raised in case of a wrong option.
+ curl_multi_setopt($this->_mh, $option, $value);
+ }
+
+ // Further calls to _mh will return the value directly, without entering the
+ // __get() method at all.
+ return $this->_mh;
}
throw new \BadMethodCallException();
@@ -82,7 +102,7 @@ public function tick()
{
// Add any delayed handles if needed.
if ($this->delays) {
- $currentTime = microtime(true);
+ $currentTime = Utils::currentTime();
foreach ($this->delays as $id => $delay) {
if ($currentTime >= $delay) {
unset($this->delays[$id]);
@@ -134,7 +154,7 @@ private function addRequest(array $entry)
if (empty($easy->options['delay'])) {
curl_multi_add_handle($this->_mh, $easy->handle);
} else {
- $this->delays[$id] = microtime(true) + ($easy->options['delay'] / 1000);
+ $this->delays[$id] = Utils::currentTime() + ($easy->options['delay'] / 1000);
}
}
@@ -186,7 +206,7 @@ private function processMessages()
private function timeToNext()
{
- $currentTime = microtime(true);
+ $currentTime = Utils::currentTime();
$nextTime = PHP_INT_MAX;
foreach ($this->delays as $time) {
if ($time < $nextTime) {
diff --git a/vendor/guzzlehttp/guzzle/src/Handler/MockHandler.php b/vendor/guzzlehttp/guzzle/src/Handler/MockHandler.php
index d892061c7a..5b312bc042 100644
--- a/vendor/guzzlehttp/guzzle/src/Handler/MockHandler.php
+++ b/vendor/guzzlehttp/guzzle/src/Handler/MockHandler.php
@@ -66,7 +66,7 @@ public function __invoke(RequestInterface $request, array $options)
throw new \OutOfBoundsException('Mock queue is empty');
}
- if (isset($options['delay'])) {
+ if (isset($options['delay']) && is_numeric($options['delay'])) {
usleep($options['delay'] * 1000);
}
@@ -175,6 +175,11 @@ public function count()
return count($this->queue);
}
+ public function reset()
+ {
+ $this->queue = [];
+ }
+
private function invokeStats(
RequestInterface $request,
array $options,
@@ -182,7 +187,8 @@ private function invokeStats(
$reason = null
) {
if (isset($options['on_stats'])) {
- $stats = new TransferStats($request, $response, 0, $reason);
+ $transferTime = isset($options['transfer_time']) ? $options['transfer_time'] : 0;
+ $stats = new TransferStats($request, $response, $transferTime, $reason);
call_user_func($options['on_stats'], $stats);
}
}
diff --git a/vendor/guzzlehttp/guzzle/src/Handler/StreamHandler.php b/vendor/guzzlehttp/guzzle/src/Handler/StreamHandler.php
index b686545ea7..a15734a44d 100644
--- a/vendor/guzzlehttp/guzzle/src/Handler/StreamHandler.php
+++ b/vendor/guzzlehttp/guzzle/src/Handler/StreamHandler.php
@@ -1,12 +1,13 @@
<?php
namespace GuzzleHttp\Handler;
-use GuzzleHttp\Exception\RequestException;
use GuzzleHttp\Exception\ConnectException;
+use GuzzleHttp\Exception\RequestException;
use GuzzleHttp\Promise\FulfilledPromise;
use GuzzleHttp\Promise\PromiseInterface;
use GuzzleHttp\Psr7;
use GuzzleHttp\TransferStats;
+use GuzzleHttp\Utils;
use Psr\Http\Message\RequestInterface;
use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\StreamInterface;
@@ -33,7 +34,7 @@ public function __invoke(RequestInterface $request, array $options)
usleep($options['delay'] * 1000);
}
- $startTime = isset($options['on_stats']) ? microtime(true) : null;
+ $startTime = isset($options['on_stats']) ? Utils::currentTime() : null;
try {
// Does not support the expect header.
@@ -42,7 +43,7 @@ public function __invoke(RequestInterface $request, array $options)
// Append a content-length header if body size is zero to match
// cURL's behavior.
if (0 === $request->getBody()->getSize()) {
- $request = $request->withHeader('Content-Length', 0);
+ $request = $request->withHeader('Content-Length', '0');
}
return $this->createResponse(
@@ -82,7 +83,7 @@ private function invokeStats(
$stats = new TransferStats(
$request,
$response,
- microtime(true) - $startTime,
+ Utils::currentTime() - $startTime,
$error,
[]
);
@@ -343,13 +344,25 @@ private function resolveHost(RequestInterface $request, array $options)
if ('v4' === $options['force_ip_resolve']) {
$records = dns_get_record($uri->getHost(), DNS_A);
if (!isset($records[0]['ip'])) {
- throw new ConnectException(sprintf("Could not resolve IPv4 address for host '%s'", $uri->getHost()), $request);
+ throw new ConnectException(
+ sprintf(
+ "Could not resolve IPv4 address for host '%s'",
+ $uri->getHost()
+ ),
+ $request
+ );
}
$uri = $uri->withHost($records[0]['ip']);
} elseif ('v6' === $options['force_ip_resolve']) {
$records = dns_get_record($uri->getHost(), DNS_AAAA);
if (!isset($records[0]['ipv6'])) {
- throw new ConnectException(sprintf("Could not resolve IPv6 address for host '%s'", $uri->getHost()), $request);
+ throw new ConnectException(
+ sprintf(
+ "Could not resolve IPv6 address for host '%s'",
+ $uri->getHost()
+ ),
+ $request
+ );
}
$uri = $uri->withHost('[' . $records[0]['ipv6'] . ']');
}
diff --git a/vendor/guzzlehttp/guzzle/src/HandlerStack.php b/vendor/guzzlehttp/guzzle/src/HandlerStack.php
index 24c46fd9fe..6a49cc0690 100644
--- a/vendor/guzzlehttp/guzzle/src/HandlerStack.php
+++ b/vendor/guzzlehttp/guzzle/src/HandlerStack.php
@@ -1,7 +1,9 @@
<?php
namespace GuzzleHttp;
+use GuzzleHttp\Promise\PromiseInterface;
use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\ResponseInterface;
/**
* Creates a composed Guzzle handler function by stacking middlewares on top of
@@ -9,7 +11,7 @@
*/
class HandlerStack
{
- /** @var callable */
+ /** @var callable|null */
private $handler;
/** @var array */
@@ -59,6 +61,8 @@ public function __construct(callable $handler = null)
*
* @param RequestInterface $request
* @param array $options
+ *
+ * @return ResponseInterface|PromiseInterface
*/
public function __invoke(RequestInterface $request, array $options)
{
@@ -206,7 +210,7 @@ public function resolve()
}
/**
- * @param $name
+ * @param string $name
* @return int
*/
private function findByName($name)
@@ -223,10 +227,10 @@ private function findByName($name)
/**
* Splices a function into the middleware list at a specific position.
*
- * @param $findName
- * @param $withName
+ * @param string $findName
+ * @param string $withName
* @param callable $middleware
- * @param $before
+ * @param bool $before
*/
private function splice($findName, $withName, callable $middleware, $before)
{
diff --git a/vendor/guzzlehttp/guzzle/src/MessageFormatter.php b/vendor/guzzlehttp/guzzle/src/MessageFormatter.php
index 663ac73916..dc36bb524d 100644
--- a/vendor/guzzlehttp/guzzle/src/MessageFormatter.php
+++ b/vendor/guzzlehttp/guzzle/src/MessageFormatter.php
@@ -168,6 +168,11 @@ function (array $matches) use ($request, $response, $error, &$cache) {
);
}
+ /**
+ * Get headers from message as string
+ *
+ * @return string
+ */
private function headers(MessageInterface $message)
{
$result = '';
diff --git a/vendor/guzzlehttp/guzzle/src/Middleware.php b/vendor/guzzlehttp/guzzle/src/Middleware.php
index d4ad75c94f..bffc1974bb 100644
--- a/vendor/guzzlehttp/guzzle/src/Middleware.php
+++ b/vendor/guzzlehttp/guzzle/src/Middleware.php
@@ -7,7 +7,6 @@
use GuzzleHttp\Psr7;
use Psr\Http\Message\ResponseInterface;
use Psr\Log\LoggerInterface;
-use Psr\Log\LogLevel;
/**
* Functions used to create and wrap handlers with handler middleware.
@@ -39,7 +38,7 @@ function ($response) use ($cookieJar, $request) {
$cookieJar->extractCookies($request, $response);
return $response;
}
- );
+ );
};
};
}
@@ -58,7 +57,7 @@ public static function httpErrors()
return $handler($request, $options);
}
return $handler($request, $options)->then(
- function (ResponseInterface $response) use ($request, $handler) {
+ function (ResponseInterface $response) use ($request) {
$code = $response->getStatusCode();
if ($code < 400) {
return $response;
@@ -183,7 +182,7 @@ public static function retry(callable $decider, callable $delay = null)
*
* @return callable Returns a function that accepts the next handler.
*/
- public static function log(LoggerInterface $logger, MessageFormatter $formatter, $logLevel = LogLevel::INFO)
+ public static function log(LoggerInterface $logger, MessageFormatter $formatter, $logLevel = 'info' /* \Psr\Log\LogLevel::INFO */)
{
return function (callable $handler) use ($logger, $formatter, $logLevel) {
return function ($request, array $options) use ($handler, $logger, $formatter, $logLevel) {
diff --git a/vendor/guzzlehttp/guzzle/src/Pool.php b/vendor/guzzlehttp/guzzle/src/Pool.php
index 8f1be33cd3..5838db4f4c 100644
--- a/vendor/guzzlehttp/guzzle/src/Pool.php
+++ b/vendor/guzzlehttp/guzzle/src/Pool.php
@@ -1,12 +1,13 @@
<?php
namespace GuzzleHttp;
+use GuzzleHttp\Promise\EachPromise;
+use GuzzleHttp\Promise\PromiseInterface;
use GuzzleHttp\Promise\PromisorInterface;
use Psr\Http\Message\RequestInterface;
-use GuzzleHttp\Promise\EachPromise;
/**
- * Sends and iterator of requests concurrently using a capped pool size.
+ * Sends an iterator of requests concurrently using a capped pool size.
*
* The pool will read from an iterator until it is cancelled or until the
* iterator is consumed. When a request is yielded, the request is sent after
@@ -69,6 +70,11 @@ public function __construct(
$this->each = new EachPromise($requests(), $config);
}
+ /**
+ * Get promise
+ *
+ * @return PromiseInterface
+ */
public function promise()
{
return $this->each->promise();
@@ -106,6 +112,11 @@ public static function batch(
return $res;
}
+ /**
+ * Execute callback(s)
+ *
+ * @return void
+ */
private static function cmpCallback(array &$options, $name, array &$results)
{
if (!isset($options[$name])) {
diff --git a/vendor/guzzlehttp/guzzle/src/PrepareBodyMiddleware.php b/vendor/guzzlehttp/guzzle/src/PrepareBodyMiddleware.php
index 2eb95f9b2d..568a1e906c 100644
--- a/vendor/guzzlehttp/guzzle/src/PrepareBodyMiddleware.php
+++ b/vendor/guzzlehttp/guzzle/src/PrepareBodyMiddleware.php
@@ -66,6 +66,11 @@ public function __invoke(RequestInterface $request, array $options)
return $fn(Psr7\modify_request($request, $modify), $options);
}
+ /**
+ * Add expect header
+ *
+ * @return void
+ */
private function addExpectHeader(
RequestInterface $request,
array $options,
diff --git a/vendor/guzzlehttp/guzzle/src/RedirectMiddleware.php b/vendor/guzzlehttp/guzzle/src/RedirectMiddleware.php
index 131b77179a..e4644b7ac1 100644
--- a/vendor/guzzlehttp/guzzle/src/RedirectMiddleware.php
+++ b/vendor/guzzlehttp/guzzle/src/RedirectMiddleware.php
@@ -13,7 +13,7 @@
* Request redirect middleware.
*
* Apply this middleware like other middleware using
- * {@see GuzzleHttp\Middleware::redirect()}.
+ * {@see \GuzzleHttp\Middleware::redirect()}.
*/
class RedirectMiddleware
{
@@ -76,7 +76,7 @@ public function __invoke(RequestInterface $request, array $options)
/**
* @param RequestInterface $request
* @param array $options
- * @param ResponseInterface|PromiseInterface $response
+ * @param ResponseInterface $response
*
* @return ResponseInterface|PromiseInterface
*/
@@ -118,6 +118,11 @@ public function checkRedirect(
return $promise;
}
+ /**
+ * Enable tracking on promise.
+ *
+ * @return PromiseInterface
+ */
private function withTracking(PromiseInterface $promise, $uri, $statusCode)
{
return $promise->then(
@@ -135,6 +140,13 @@ function (ResponseInterface $response) use ($uri, $statusCode) {
);
}
+ /**
+ * Check for too many redirects
+ *
+ * @return void
+ *
+ * @throws TooManyRedirectsException Too many redirects.
+ */
private function guardMax(RequestInterface $request, array &$options)
{
$current = isset($options['__redirect_count'])
@@ -172,13 +184,19 @@ public function modifyRequest(
// would do.
$statusCode = $response->getStatusCode();
if ($statusCode == 303 ||
- ($statusCode <= 302 && $request->getBody() && !$options['allow_redirects']['strict'])
+ ($statusCode <= 302 && !$options['allow_redirects']['strict'])
) {
$modify['method'] = 'GET';
$modify['body'] = '';
}
- $modify['uri'] = $this->redirectUri($request, $response, $protocols);
+ $uri = $this->redirectUri($request, $response, $protocols);
+ if (isset($options['idn_conversion']) && ($options['idn_conversion'] !== false)) {
+ $idnOptions = ($options['idn_conversion'] === true) ? IDNA_DEFAULT : $options['idn_conversion'];
+ $uri = Utils::idnUriConvert($uri, $idnOptions);
+ }
+
+ $modify['uri'] = $uri;
Psr7\rewind_body($request);
// Add the Referer header if it is told to do so and only
@@ -186,7 +204,7 @@ public function modifyRequest(
if ($options['allow_redirects']['referer']
&& $modify['uri']->getScheme() === $request->getUri()->getScheme()
) {
- $uri = $request->getUri()->withUserInfo('', '');
+ $uri = $request->getUri()->withUserInfo('');
$modify['set_headers']['Referer'] = (string) $uri;
} else {
$modify['remove_headers'][] = 'Referer';
diff --git a/vendor/guzzlehttp/guzzle/src/RequestOptions.php b/vendor/guzzlehttp/guzzle/src/RequestOptions.php
index c6aacfb157..355f658f03 100644
--- a/vendor/guzzlehttp/guzzle/src/RequestOptions.php
+++ b/vendor/guzzlehttp/guzzle/src/RequestOptions.php
@@ -22,7 +22,7 @@ final class RequestOptions
* - strict: (bool, default=false) Set to true to use strict redirects
* meaning redirect POST requests with POST requests vs. doing what most
* browsers do which is redirect POST requests with GET requests
- * - referer: (bool, default=true) Set to false to disable the Referer
+ * - referer: (bool, default=false) Set to true to enable the Referer
* header.
* - protocols: (array, default=['http', 'https']) Allowed redirect
* protocols.
@@ -132,6 +132,14 @@ final class RequestOptions
*/
const HTTP_ERRORS = 'http_errors';
+ /**
+ * idn: (bool|int, default=true) A combination of IDNA_* constants for
+ * idn_to_ascii() PHP's function (see "options" parameter). Set to false to
+ * disable IDN support completely, or to true to use the default
+ * configuration (IDNA_DEFAULT constant).
+ */
+ const IDN_CONVERSION = 'idn_conversion';
+
/**
* json: (mixed) Adds JSON data to a request. The provided value is JSON
* encoded and a Content-Type header of application/json will be added to
diff --git a/vendor/guzzlehttp/guzzle/src/RetryMiddleware.php b/vendor/guzzlehttp/guzzle/src/RetryMiddleware.php
index f27090fd19..5acc8c5c39 100644
--- a/vendor/guzzlehttp/guzzle/src/RetryMiddleware.php
+++ b/vendor/guzzlehttp/guzzle/src/RetryMiddleware.php
@@ -19,6 +19,9 @@ class RetryMiddleware
/** @var callable */
private $decider;
+ /** @var callable */
+ private $delay;
+
/**
* @param callable $decider Function that accepts the number of retries,
* a request, [response], and [exception] and
@@ -42,13 +45,13 @@ public function __construct(
/**
* Default exponential backoff delay function.
*
- * @param $retries
+ * @param int $retries
*
- * @return int
+ * @return int milliseconds.
*/
public static function exponentialDelay($retries)
{
- return (int) pow(2, $retries - 1);
+ return (int) pow(2, $retries - 1) * 1000;
}
/**
@@ -71,6 +74,11 @@ public function __invoke(RequestInterface $request, array $options)
);
}
+ /**
+ * Execute fulfilled closure
+ *
+ * @return mixed
+ */
private function onFulfilled(RequestInterface $req, array $options)
{
return function ($value) use ($req, $options) {
@@ -87,6 +95,11 @@ private function onFulfilled(RequestInterface $req, array $options)
};
}
+ /**
+ * Execute rejected closure
+ *
+ * @return callable
+ */
private function onRejected(RequestInterface $req, array $options)
{
return function ($reason) use ($req, $options) {
@@ -103,6 +116,9 @@ private function onRejected(RequestInterface $req, array $options)
};
}
+ /**
+ * @return self
+ */
private function doRetry(RequestInterface $request, array $options, ResponseInterface $response = null)
{
$options['delay'] = call_user_func($this->delay, ++$options['retries'], $response);
diff --git a/vendor/guzzlehttp/guzzle/src/TransferStats.php b/vendor/guzzlehttp/guzzle/src/TransferStats.php
index 15f717e1ea..87fb3c0016 100644
--- a/vendor/guzzlehttp/guzzle/src/TransferStats.php
+++ b/vendor/guzzlehttp/guzzle/src/TransferStats.php
@@ -18,11 +18,11 @@ final class TransferStats
private $handlerErrorData;
/**
- * @param RequestInterface $request Request that was sent.
- * @param ResponseInterface $response Response received (if any)
- * @param null $transferTime Total handler transfer time.
- * @param mixed $handlerErrorData Handler error data.
- * @param array $handlerStats Handler specific stats.
+ * @param RequestInterface $request Request that was sent.
+ * @param ResponseInterface|null $response Response received (if any)
+ * @param float|null $transferTime Total handler transfer time.
+ * @param mixed $handlerErrorData Handler error data.
+ * @param array $handlerStats Handler specific stats.
*/
public function __construct(
RequestInterface $request,
@@ -93,7 +93,7 @@ public function getEffectiveUri()
/**
* Get the estimated time the request was being transferred by the handler.
*
- * @return float Time in seconds.
+ * @return float|null Time in seconds.
*/
public function getTransferTime()
{
diff --git a/vendor/guzzlehttp/guzzle/src/Utils.php b/vendor/guzzlehttp/guzzle/src/Utils.php
new file mode 100644
index 0000000000..dd90c2265e
--- /dev/null
+++ b/vendor/guzzlehttp/guzzle/src/Utils.php
@@ -0,0 +1,89 @@
+<?php
+namespace GuzzleHttp;
+
+use GuzzleHttp\Exception\InvalidArgumentException;
+use Psr\Http\Message\UriInterface;
+use Symfony\Polyfill\Intl\Idn\Idn;
+
+final class Utils
+{
+ /**
+ * Wrapper for the hrtime() or microtime() functions
+ * (depending on the PHP version, one of the two is used)
+ *
+ * @return float|mixed UNIX timestamp
+ *
+ * @internal
+ */
+ public static function currentTime()
+ {
+ return function_exists('hrtime') ? hrtime(true) / 1e9 : microtime(true);
+ }
+
+ /**
+ * @param int $options
+ *
+ * @return UriInterface
+ * @throws InvalidArgumentException
+ *
+ * @internal
+ */
+ public static function idnUriConvert(UriInterface $uri, $options = 0)
+ {
+ if ($uri->getHost()) {
+ $asciiHost = self::idnToAsci($uri->getHost(), $options, $info);
+ if ($asciiHost === false) {
+ $errorBitSet = isset($info['errors']) ? $info['errors'] : 0;
+
+ $errorConstants = array_filter(array_keys(get_defined_constants()), function ($name) {
+ return substr($name, 0, 11) === 'IDNA_ERROR_';
+ });
+
+ $errors = [];
+ foreach ($errorConstants as $errorConstant) {
+ if ($errorBitSet & constant($errorConstant)) {
+ $errors[] = $errorConstant;
+ }
+ }
+
+ $errorMessage = 'IDN conversion failed';
+ if ($errors) {
+ $errorMessage .= ' (errors: ' . implode(', ', $errors) . ')';
+ }
+
+ throw new InvalidArgumentException($errorMessage);
+ } else {
+ if ($uri->getHost() !== $asciiHost) {
+ // Replace URI only if the ASCII version is different
+ $uri = $uri->withHost($asciiHost);
+ }
+ }
+ }
+
+ return $uri;
+ }
+
+ /**
+ * @param string $domain
+ * @param int $options
+ * @param array $info
+ *
+ * @return string|false
+ */
+ private static function idnToAsci($domain, $options, &$info = [])
+ {
+ if (\preg_match('%^[ -~]+$%', $domain) === 1) {
+ return $domain;
+ }
+
+ if (\extension_loaded('intl') && defined('INTL_IDNA_VARIANT_UTS46')) {
+ return \idn_to_ascii($domain, $options, INTL_IDNA_VARIANT_UTS46, $info);
+ }
+
+ /*
+ * The Idn class is marked as @internal. We've locked the version to
+ * symfony/polyfill-intl-idn to avoid issues in the future.
+ */
+ return Idn::idn_to_ascii($domain, $options, Idn::INTL_IDNA_VARIANT_UTS46, $info);
+ }
+}
diff --git a/vendor/guzzlehttp/guzzle/src/functions.php b/vendor/guzzlehttp/guzzle/src/functions.php
index a3ac450db9..c2afd8c7bb 100644
--- a/vendor/guzzlehttp/guzzle/src/functions.php
+++ b/vendor/guzzlehttp/guzzle/src/functions.php
@@ -56,7 +56,7 @@ function describe_type($input)
/**
* Parses an array of header lines into an associative array of headers.
*
- * @param array $lines Header lines array of strings in the following
+ * @param iterable $lines Header lines array of strings in the following
* format: "Name: Value"
* @return array
*/
@@ -97,8 +97,8 @@ function debug_resource($value = null)
*
* The returned handler is not wrapped by any default middlewares.
*
- * @throws \RuntimeException if no viable Handler is available.
* @return callable Returns the best handler for the given system.
+ * @throws \RuntimeException if no viable Handler is available.
*/
function choose_handler()
{
@@ -196,7 +196,8 @@ function default_ca_bundle()
}
}
- throw new \RuntimeException(<<< EOT
+ throw new \RuntimeException(
+ <<< EOT
No system CA bundle could be found in any of the the common system locations.
PHP versions earlier than 5.6 are not properly configured to use the system's
CA bundle by default. In order to verify peer certificates, you will need to
@@ -294,14 +295,14 @@ function is_host_in_noproxy($host, array $noProxyArray)
* @param int $options Bitmask of JSON decode options.
*
* @return mixed
- * @throws \InvalidArgumentException if the JSON cannot be decoded.
+ * @throws Exception\InvalidArgumentException if the JSON cannot be decoded.
* @link http://www.php.net/manual/en/function.json-decode.php
*/
function json_decode($json, $assoc = false, $depth = 512, $options = 0)
{
$data = \json_decode($json, $assoc, $depth, $options);
if (JSON_ERROR_NONE !== json_last_error()) {
- throw new \InvalidArgumentException(
+ throw new Exception\InvalidArgumentException(
'json_decode error: ' . json_last_error_msg()
);
}
@@ -317,14 +318,14 @@ function json_decode($json, $assoc = false, $depth = 512, $options = 0)
* @param int $depth Set the maximum depth. Must be greater than zero.
*
* @return string
- * @throws \InvalidArgumentException if the JSON cannot be encoded.
+ * @throws Exception\InvalidArgumentException if the JSON cannot be encoded.
* @link http://www.php.net/manual/en/function.json-encode.php
*/
function json_encode($value, $options = 0, $depth = 512)
{
$json = \json_encode($value, $options, $depth);
if (JSON_ERROR_NONE !== json_last_error()) {
- throw new \InvalidArgumentException(
+ throw new Exception\InvalidArgumentException(
'json_encode error: ' . json_last_error_msg()
);
}
diff --git a/vendor/zendframework/zend-diactoros/CHANGELOG.md b/vendor/laminas/laminas-diactoros/CHANGELOG.md
similarity index 61%
rename from vendor/zendframework/zend-diactoros/CHANGELOG.md
rename to vendor/laminas/laminas-diactoros/CHANGELOG.md
index 1eb54beea0..c08e6fbdad 100644
--- a/vendor/zendframework/zend-diactoros/CHANGELOG.md
+++ b/vendor/laminas/laminas-diactoros/CHANGELOG.md
@@ -22,7 +22,7 @@ All notable changes to this project will be documented in this file, in reverse
### Fixed
-- [#364](https://github.com/zendframework/zend-diactoros/issues/364) modifies detection of HTTPS schemas via the `$_SERVER['HTTPS']` value
+- [zendframework/zend-diactoros#364](https://github.com/zendframework/zend-diactoros/issues/364) modifies detection of HTTPS schemas via the `$_SERVER['HTTPS']` value
such that an empty HTTPS-key will result in a scheme of `http` and not
`https`.
@@ -34,10 +34,10 @@ All notable changes to this project will be documented in this file, in reverse
### Changed
-- [#325](https://github.com/zendframework/zend-diactoros/pull/325) changes the behavior of `ServerRequest::withParsedBody()`. Per
+- [zendframework/zend-diactoros#325](https://github.com/zendframework/zend-diactoros/pull/325) changes the behavior of `ServerRequest::withParsedBody()`. Per
- PSR-7, it now no longer allows values other than `null`, arrays, or objects.
-- [#325](https://github.com/zendframework/zend-diactoros/pull/325) changes the behavior of each of `Request`, `ServerRequest`, and
+- [zendframework/zend-diactoros#325](https://github.com/zendframework/zend-diactoros/pull/325) changes the behavior of each of `Request`, `ServerRequest`, and
`Response` in relation to the validation of header values. Previously, we
allowed empty arrays to be provided via `withHeader()`; however, this was
contrary to the PSR-7 specification. Empty arrays are no longer allowed.
@@ -52,10 +52,10 @@ All notable changes to this project will be documented in this file, in reverse
### Fixed
-- [#325](https://github.com/zendframework/zend-diactoros/pull/325) ensures that `Uri::withUserInfo()` no longer ignores values of
+- [zendframework/zend-diactoros#325](https://github.com/zendframework/zend-diactoros/pull/325) ensures that `Uri::withUserInfo()` no longer ignores values of
`0` (numeric zero).
-- [#325](https://github.com/zendframework/zend-diactoros/pull/325) fixes how header values are merged when calling
+- [zendframework/zend-diactoros#325](https://github.com/zendframework/zend-diactoros/pull/325) fixes how header values are merged when calling
`withAddedHeader()`, ensuring that array keys are ignored.
## 1.8.5 - 2018-08-10
@@ -78,7 +78,7 @@ All notable changes to this project will be documented in this file, in reverse
### Fixed
-- [#324](https://github.com/zendframework/zend-diactoros/pull/324) fixes a reference
+- [zendframework/zend-diactoros#324](https://github.com/zendframework/zend-diactoros/pull/324) fixes a reference
to an undefined variable in the `ServerRequestFactory`, which made it
impossible to fetch a specific header by name.
@@ -105,7 +105,7 @@ All notable changes to this project will be documented in this file, in reverse
use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\ServerRequestInterface;
use Psr\Http\Server\RequestHandlerInterface;
- use Zend\Diactoros\Uri;
+ use Laminas\Diactoros\Uri;
public function process(ServerRequestInterface $request, RequestHandlerInterface $handler) : ResponseInterface
{
@@ -165,15 +165,15 @@ All notable changes to this project will be documented in this file, in reverse
### Fixed
-- [#321](https://github.com/zendframework/zend-diactoros/pull/321) updates the logic in `Uri::withPort()` to ensure that it checks that the
+- [zendframework/zend-diactoros#321](https://github.com/zendframework/zend-diactoros/pull/321) updates the logic in `Uri::withPort()` to ensure that it checks that the
value provided is either an integer or a string integer, as only those values
may be cast to integer without data loss.
-- [#320](https://github.com/zendframework/zend-diactoros/pull/320) adds checking within `Response` to ensure that the provided reason
+- [zendframework/zend-diactoros#320](https://github.com/zendframework/zend-diactoros/pull/320) adds checking within `Response` to ensure that the provided reason
phrase is a string; an `InvalidArgumentException` is now raised if it is not. This change
ensures the class adheres strictly to the PSR-7 specification.
-- [#319](https://github.com/zendframework/zend-diactoros/pull/319) provides a fix to `Zend\Diactoros\Response` that ensures that the status
+- [zendframework/zend-diactoros#319](https://github.com/zendframework/zend-diactoros/pull/319) provides a fix to `Laminas\Diactoros\Response` that ensures that the status
code returned is _always_ an integer (and never a string containing an
integer), thus ensuring it strictly adheres to the PSR-7 specification.
@@ -197,12 +197,12 @@ All notable changes to this project will be documented in this file, in reverse
### Fixed
-- [#318](https://github.com/zendframework/zend-diactoros/pull/318) fixes the logic for discovering whether an HTTPS scheme is in play
+- [zendframework/zend-diactoros#318](https://github.com/zendframework/zend-diactoros/pull/318) fixes the logic for discovering whether an HTTPS scheme is in play
to be case insensitive when comparing header and SAPI values, ensuring no
false negative lookups occur.
-- [#314](https://github.com/zendframework/zend-diactoros/pull/314) modifies error handling around opening a file resource within
- `Zend\Diactoros\Stream::setStream()` to no longer use the second argument to
+- [zendframework/zend-diactoros#314](https://github.com/zendframework/zend-diactoros/pull/314) modifies error handling around opening a file resource within
+ `Laminas\Diactoros\Stream::setStream()` to no longer use the second argument to
`set_error_handler()`, and instead check the error type in the handler itself;
this fixes an issue when the handler is nested inside another error handler,
which currently has buggy behavior within the PHP engine.
@@ -215,7 +215,7 @@ All notable changes to this project will be documented in this file, in reverse
### Changed
-- [#313](https://github.com/zendframework/zend-diactoros/pull/313) changes the reason phrase associated with the status code 425
+- [zendframework/zend-diactoros#313](https://github.com/zendframework/zend-diactoros/pull/313) changes the reason phrase associated with the status code 425
to "Too Early", corresponding to a new definition of the code as specified by the IANA.
### Deprecated
@@ -228,14 +228,14 @@ All notable changes to this project will be documented in this file, in reverse
### Fixed
-- [#312](https://github.com/zendframework/zend-diactoros/pull/312) fixes how the `normalizeUploadedFiles()` utility function handles nested trees of
+- [zendframework/zend-diactoros#312](https://github.com/zendframework/zend-diactoros/pull/312) fixes how the `normalizeUploadedFiles()` utility function handles nested trees of
uploaded files, ensuring it detects them properly.
## 1.8.0 - 2018-06-27
### Added
-- [#307](https://github.com/zendframework/zend-diactoros/pull/307) adds the following functions under the `Zend\Diactoros` namespace, each of
+- [zendframework/zend-diactoros#307](https://github.com/zendframework/zend-diactoros/pull/307) adds the following functions under the `Laminas\Diactoros` namespace, each of
which may be used to derive artifacts from SAPI supergloabls for the purposes
of generating a `ServerRequest` instance:
- `normalizeServer(array $server, callable $apacheRequestHeaderCallback = null) : array`
@@ -260,45 +260,45 @@ All notable changes to this project will be documented in this file, in reverse
### Deprecated
-- [#307](https://github.com/zendframework/zend-diactoros/pull/307) deprecates `ServerRequestFactory::normalizeServer()`; the method is
- no longer used internally, and users should instead use `Zend\Diactoros\normalizeServer()`,
+- [zendframework/zend-diactoros#307](https://github.com/zendframework/zend-diactoros/pull/307) deprecates `ServerRequestFactory::normalizeServer()`; the method is
+ no longer used internally, and users should instead use `Laminas\Diactoros\normalizeServer()`,
to which it proxies.
-- [#307](https://github.com/zendframework/zend-diactoros/pull/307) deprecates `ServerRequestFactory::marshalHeaders()`; the method is
- no longer used internally, and users should instead use `Zend\Diactoros\marshalHeadersFromSapi()`,
+- [zendframework/zend-diactoros#307](https://github.com/zendframework/zend-diactoros/pull/307) deprecates `ServerRequestFactory::marshalHeaders()`; the method is
+ no longer used internally, and users should instead use `Laminas\Diactoros\marshalHeadersFromSapi()`,
to which it proxies.
-- [#307](https://github.com/zendframework/zend-diactoros/pull/307) deprecates `ServerRequestFactory::marshalUriFromServer()`; the method
+- [zendframework/zend-diactoros#307](https://github.com/zendframework/zend-diactoros/pull/307) deprecates `ServerRequestFactory::marshalUriFromServer()`; the method
is no longer used internally. Users should use `marshalUriFromSapi()` instead.
-- [#307](https://github.com/zendframework/zend-diactoros/pull/307) deprecates `ServerRequestFactory::marshalRequestUri()`. the method is no longer
+- [zendframework/zend-diactoros#307](https://github.com/zendframework/zend-diactoros/pull/307) deprecates `ServerRequestFactory::marshalRequestUri()`. the method is no longer
used internally, and currently proxies to `marshalUriFromSapi()`, pulling the
discovered path from the `Uri` instance returned by that function. Users
should use `marshalUriFromSapi()` instead.
-- [#307](https://github.com/zendframework/zend-diactoros/pull/307) deprecates `ServerRequestFactory::marshalHostAndPortFromHeaders()`; the method
+- [zendframework/zend-diactoros#307](https://github.com/zendframework/zend-diactoros/pull/307) deprecates `ServerRequestFactory::marshalHostAndPortFromHeaders()`; the method
is no longer used internally, and currently proxies to `marshalUriFromSapi()`,
pulling the discovered host and port from the `Uri` instance returned by that
function. Users should use `marshalUriFromSapi()` instead.
-- [#307](https://github.com/zendframework/zend-diactoros/pull/307) deprecates `ServerRequestFactory::getHeader()`; the method is no longer
+- [zendframework/zend-diactoros#307](https://github.com/zendframework/zend-diactoros/pull/307) deprecates `ServerRequestFactory::getHeader()`; the method is no longer
used internally. Users should copy and paste the functionality into their own
applications if needed, or rely on headers from a fully-populated `Uri`
instance instead.
-- [#307](https://github.com/zendframework/zend-diactoros/pull/307) deprecates `ServerRequestFactory::stripQueryString()`; the method is no longer
+- [zendframework/zend-diactoros#307](https://github.com/zendframework/zend-diactoros/pull/307) deprecates `ServerRequestFactory::stripQueryString()`; the method is no longer
used internally, and users can mimic the functionality via the expression
`$path = explode('?', $path, 2)[0];`.
-- [#307](https://github.com/zendframework/zend-diactoros/pull/307) deprecates `ServerRequestFactory::normalizeFiles()`; the functionality
+- [zendframework/zend-diactoros#307](https://github.com/zendframework/zend-diactoros/pull/307) deprecates `ServerRequestFactory::normalizeFiles()`; the functionality
is no longer used internally, and users can use `normalizeUploadedFiles()` as
a replacement.
-- [#303](https://github.com/zendframework/zend-diactoros/pull/303) deprecates `Zend\Diactoros\Response\EmitterInterface` and its various implementations. These are now provided via the
- [zendframework/zend-httphandlerrunner](https://docs.zendframework.com/zend-httphandlerrunner) package as 1:1 substitutions.
+- [zendframework/zend-diactoros#303](https://github.com/zendframework/zend-diactoros/pull/303) deprecates `Laminas\Diactoros\Response\EmitterInterface` and its various implementations. These are now provided via the
+ [laminas/laminas-httphandlerrunner](https://docs.laminas.dev/laminas-httphandlerrunner) package as 1:1 substitutions.
-- [#303](https://github.com/zendframework/zend-diactoros/pull/303) deprecates the `Zend\Diactoros\Server` class. Users are directed to the `RequestHandlerRunner` class from the
- [zendframework/zend-httphandlerrunner](https://docs.zendframework.com/zend-httphandlerrunner) package as an alternative.
+- [zendframework/zend-diactoros#303](https://github.com/zendframework/zend-diactoros/pull/303) deprecates the `Laminas\Diactoros\Server` class. Users are directed to the `RequestHandlerRunner` class from the
+ [laminas/laminas-httphandlerrunner](https://docs.laminas.dev/laminas-httphandlerrunner) package as an alternative.
### Removed
@@ -328,7 +328,7 @@ All notable changes to this project will be documented in this file, in reverse
### Fixed
-- [#301](https://github.com/zendframework/zend-diactoros/pull/301) adds stricter comparisons within the `uri` class to ensure non-empty
+- [zendframework/zend-diactoros#301](https://github.com/zendframework/zend-diactoros/pull/301) adds stricter comparisons within the `uri` class to ensure non-empty
values are not treated as empty.
## 1.7.1 - 2018-02-26
@@ -339,7 +339,7 @@ All notable changes to this project will be documented in this file, in reverse
### Changed
-- [#293](https://github.com/zendframework/zend-diactoros/pull/293) updates
+- [zendframework/zend-diactoros#293](https://github.com/zendframework/zend-diactoros/pull/293) updates
`Uri::getHost()` to cast the value via `strtolower()` before returning it.
While this represents a change, it is fixing a bug in our implementation:
the PSR-7 specification for the method, which follows IETF RFC 3986 section
@@ -355,7 +355,7 @@ All notable changes to this project will be documented in this file, in reverse
### Fixed
-- [#290](https://github.com/zendframework/zend-diactoros/pull/290) fixes
+- [zendframework/zend-diactoros#290](https://github.com/zendframework/zend-diactoros/pull/290) fixes
`Stream::getSize()` such that it checks that the result of `fstat` was
succesful before attempting to return its `size` member; in the case of an
error, it now returns `null`.
@@ -364,18 +364,18 @@ All notable changes to this project will be documented in this file, in reverse
### Added
-- [#285](https://github.com/zendframework/zend-diactoros/pull/285) adds a new
- custom response type, `Zend\Diactoros\Response\XmlResponse`, for generating
+- [zendframework/zend-diactoros#285](https://github.com/zendframework/zend-diactoros/pull/285) adds a new
+ custom response type, `Laminas\Diactoros\Response\XmlResponse`, for generating
responses representing XML. Usage is the same as with the `HtmlResponse` or
`TextResponse`; the response generated will have a `Content-Type:
application/xml` header by default.
-- [#280](https://github.com/zendframework/zend-diactoros/pull/280) adds the
+- [zendframework/zend-diactoros#280](https://github.com/zendframework/zend-diactoros/pull/280) adds the
response status code/phrase pairing "103 Early Hints" to the
`Response::$phrases` property. This is a new status proposed via
[RFC 8297](https://datatracker.ietf.org/doc/rfc8297/).
-- [#279](https://github.com/zendframework/zend-diactoros/pull/279) adds explicit
+- [zendframework/zend-diactoros#279](https://github.com/zendframework/zend-diactoros/pull/279) adds explicit
support for PHP 7.2; previously, we'd allowed build failures, though none
occured; we now require PHP 7.2 builds to pass.
@@ -403,7 +403,7 @@ All notable changes to this project will be documented in this file, in reverse
### Changed
-- [#273](https://github.com/zendframework/zend-diactoros/pull/273) updates each
+- [zendframework/zend-diactoros#273](https://github.com/zendframework/zend-diactoros/pull/273) updates each
of the SAPI emitter implementations to emit the status line after emitting
other headers; this is done to ensure that the status line is not overridden
by PHP.
@@ -418,7 +418,7 @@ All notable changes to this project will be documented in this file, in reverse
### Fixed
-- [#273](https://github.com/zendframework/zend-diactoros/pull/273) modifies how
+- [zendframework/zend-diactoros#273](https://github.com/zendframework/zend-diactoros/pull/273) modifies how
the `SapiEmitterTrait` calls `header()` to ensure that a response code is
_always_ passed as the third argument; this is done to prevent PHP from
silently overriding it.
@@ -431,15 +431,15 @@ All notable changes to this project will be documented in this file, in reverse
### Changed
-- [#270](https://github.com/zendframework/zend-diactoros/pull/270) changes the
- behavior of `Zend\Diactoros\Server`: it no longer creates an output buffer.
+- [zendframework/zend-diactoros#270](https://github.com/zendframework/zend-diactoros/pull/270) changes the
+ behavior of `Laminas\Diactoros\Server`: it no longer creates an output buffer.
-- [#270](https://github.com/zendframework/zend-diactoros/pull/270) changes the
+- [zendframework/zend-diactoros#270](https://github.com/zendframework/zend-diactoros/pull/270) changes the
behavior of the two SAPI emitters in two backwards-incompatible ways:
- They no longer auto-inject a `Content-Length` header. If you need this
- functionality, zendframework/zend-expressive-helpers 4.1+ provides it via
- `Zend\Expressive\Helper\ContentLengthMiddleware`.
+ functionality, mezzio/mezzio-helpers 4.1+ provides it via
+ `Mezzio\Helper\ContentLengthMiddleware`.
- They no longer flush the output buffer. Instead, if headers have been sent,
or the output buffer exists and has a non-zero length, the emitters raise an
@@ -465,10 +465,10 @@ All notable changes to this project will be documented in this file, in reverse
### Added
-- [#205](https://github.com/zendframework/zend-diactoros/pull/205) adds support
+- [zendframework/zend-diactoros#205](https://github.com/zendframework/zend-diactoros/pull/205) adds support
for PHP 7.2.
-- [#250](https://github.com/zendframework/zend-diactoros/pull/250) adds a new
+- [zendframework/zend-diactoros#250](https://github.com/zendframework/zend-diactoros/pull/250) adds a new
API to `JsonResponse` to avoid the need for decoding the response body in
order to make changes to the underlying content. New methods include:
- `getPayload()`: retrieve the unencoded payload.
@@ -480,22 +480,22 @@ All notable changes to this project will be documented in this file, in reverse
### Changed
-- [#249](https://github.com/zendframework/zend-diactoros/pull/249) changes the
+- [zendframework/zend-diactoros#249](https://github.com/zendframework/zend-diactoros/pull/249) changes the
behavior of the various `Uri::with*()` methods slightly: if the value
represents no change, these methods will return the same instance instead of a
new one.
-- [#248](https://github.com/zendframework/zend-diactoros/pull/248) changes the
+- [zendframework/zend-diactoros#248](https://github.com/zendframework/zend-diactoros/pull/248) changes the
behavior of `Uri::getUserInfo()` slightly: it now (correctly) returns the
percent-encoded values for the user and/or password, per RFC 3986 Section
3.2.1. `withUserInfo()` will percent-encode values, using a mechanism that
prevents double-encoding.
-- [#243](https://github.com/zendframework/zend-diactoros/pull/243) changes the
+- [zendframework/zend-diactoros#243](https://github.com/zendframework/zend-diactoros/pull/243) changes the
exception messages thrown by `UploadedFile::getStream()` and `moveTo()` when
an upload error exists to include details about the upload error.
-- [#233](https://github.com/zendframework/zend-diactoros/pull/233) adds a new
+- [zendframework/zend-diactoros#233](https://github.com/zendframework/zend-diactoros/pull/233) adds a new
argument to `SapiStreamEmitter::emit`, `$maxBufferLevel` **between** the
`$response` and `$maxBufferLength` arguments. This was done because the
`Server::listen()` method passes only the response and `$maxBufferLevel` to
@@ -511,13 +511,13 @@ All notable changes to this project will be documented in this file, in reverse
### Removed
-- [#205](https://github.com/zendframework/zend-diactoros/pull/205) and
- [#243](https://github.com/zendframework/zend-diactoros/pull/243) **remove
+- [zendframework/zend-diactoros#205](https://github.com/zendframework/zend-diactoros/pull/205) and
+ [zendframework/zend-diactoros#243](https://github.com/zendframework/zend-diactoros/pull/243) **remove
support for PHP versions prior to 5.6 as well as HHVM**.
### Fixed
-- [#248](https://github.com/zendframework/zend-diactoros/pull/248) fixes how the
+- [zendframework/zend-diactoros#248](https://github.com/zendframework/zend-diactoros/pull/248) fixes how the
`Uri` class provides user-info within the URI authority; the value is now
correctly percent-encoded , per RFC 3986 Section 3.2.1.
@@ -533,27 +533,27 @@ All notable changes to this project will be documented in this file, in reverse
### Removed
-- [#260](https://github.com/zendframework/zend-diactoros/pull/260) removes
+- [zendframework/zend-diactoros#260](https://github.com/zendframework/zend-diactoros/pull/260) removes
support for HHVM, as tests have failed against it for some time.
### Fixed
-- [#247](https://github.com/zendframework/zend-diactoros/pull/247) fixes the
+- [zendframework/zend-diactoros#247](https://github.com/zendframework/zend-diactoros/pull/247) fixes the
`Stream` and `RelativeStream` `__toString()` method implementations to check
if the stream `isSeekable()` before attempting to `rewind()` it, ensuring that
the method does not raise exceptions (PHP does not allow exceptions in that
method). In particular, this fixes an issue when using AWS S3 streams.
-- [#252](https://github.com/zendframework/zend-diactoros/pull/252) provides a
+- [zendframework/zend-diactoros#252](https://github.com/zendframework/zend-diactoros/pull/252) provides a
fix to the `SapiEmitterTrait` to ensure that any `Set-Cookie` headers in the
response instance do not override those set by PHP when a session is created
and/or regenerated.
-- [#257](https://github.com/zendframework/zend-diactoros/pull/257) provides a
+- [zendframework/zend-diactoros#257](https://github.com/zendframework/zend-diactoros/pull/257) provides a
fix for the `PhpInputStream::read()` method to ensure string content that
evaluates as empty (including `0`) is still cached.
-- [#258](https://github.com/zendframework/zend-diactoros/pull/258) updates the
+- [zendframework/zend-diactoros#258](https://github.com/zendframework/zend-diactoros/pull/258) updates the
`Uri::filterPath()` method to allow parens within a URI path, per [RFC 3986
section 3.3](https://tools.ietf.org/html/rfc3986#section-3.3) (parens are
within the character set "sub-delims").
@@ -562,19 +562,19 @@ All notable changes to this project will be documented in this file, in reverse
### Added
-- [#219](https://github.com/zendframework/zend-diactoros/pull/219) adds two new
- classes, `Zend\Diactoros\Request\ArraySerializer` and
- `Zend\Diactoros\Response\ArraySerializer`. Each exposes the static methods
+- [zendframework/zend-diactoros#219](https://github.com/zendframework/zend-diactoros/pull/219) adds two new
+ classes, `Laminas\Diactoros\Request\ArraySerializer` and
+ `Laminas\Diactoros\Response\ArraySerializer`. Each exposes the static methods
`toArray()` and `fromArray()`, allowing de/serialization of messages from and
to arrays.
-- [#236](https://github.com/zendframework/zend-diactoros/pull/236) adds two new
+- [zendframework/zend-diactoros#236](https://github.com/zendframework/zend-diactoros/pull/236) adds two new
constants to the `Response` class: `MIN_STATUS_CODE_VALUE` and
`MAX_STATUS_CODE_VALUE`.
### Changes
-- [#240](https://github.com/zendframework/zend-diactoros/pull/240) changes the
+- [zendframework/zend-diactoros#240](https://github.com/zendframework/zend-diactoros/pull/240) changes the
behavior of `ServerRequestFactory::fromGlobals()` when no `$cookies` argument
is present. Previously, it would use `$_COOKIES`; now, if a `Cookie` header is
present, it will parse and use that to populate the instance instead.
@@ -583,7 +583,7 @@ All notable changes to this project will be documented in this file, in reverse
their names (PHP's built-in cookie handling renames these to replace `.` with
`_`, which can lead to synchronization issues with clients).
-- [#235](https://github.com/zendframework/zend-diactoros/pull/235) changes the
+- [zendframework/zend-diactoros#235](https://github.com/zendframework/zend-diactoros/pull/235) changes the
behavior of `Uri::__toString()` to better follow proscribed behavior in PSR-7.
In particular, prior to this release, if a scheme was missing but an authority
was present, the class was incorrectly returning a value that did not include
@@ -609,7 +609,7 @@ All notable changes to this project will be documented in this file, in reverse
### Changes
-- [#241](https://github.com/zendframework/zend-diactoros/pull/241) changes the
+- [zendframework/zend-diactoros#241](https://github.com/zendframework/zend-diactoros/pull/241) changes the
constraint by which the package provides `psr/http-message-implementation` to
simply `1.0` instead of `~1.0.0`, to follow how other implementations provide
PSR-7.
@@ -624,11 +624,11 @@ All notable changes to this project will be documented in this file, in reverse
### Fixed
-- [#161](https://github.com/zendframework/zend-diactoros/pull/161) adds
+- [zendframework/zend-diactoros#161](https://github.com/zendframework/zend-diactoros/pull/161) adds
additional validations to header names and values to ensure no malformed values
are provided.
-- [#234](https://github.com/zendframework/zend-diactoros/pull/234) fixes a
+- [zendframework/zend-diactoros#234](https://github.com/zendframework/zend-diactoros/pull/234) fixes a
number of reason phrases in the `Response` instance, and adds automation from
the canonical IANA sources to ensure any new phrases added are correct.
@@ -648,7 +648,7 @@ All notable changes to this project will be documented in this file, in reverse
### Fixed
-- [#226](https://github.com/zendframework/zend-diactoros/pull/226) fixed an
+- [zendframework/zend-diactoros#226](https://github.com/zendframework/zend-diactoros/pull/226) fixed an
issue with the `SapiStreamEmitter` causing the response body to be cast
to `(string)` and also be read as a readable stream, potentially producing
double output.
@@ -669,8 +669,8 @@ All notable changes to this project will be documented in this file, in reverse
### Fixed
-- [#223](https://github.com/zendframework/zend-diactoros/issues/223)
- [#224](https://github.com/zendframework/zend-diactoros/pull/224) fixed an issue
+- [zendframework/zend-diactoros#223](https://github.com/zendframework/zend-diactoros/issues/223)
+ [zendframework/zend-diactoros#224](https://github.com/zendframework/zend-diactoros/pull/224) fixed an issue
with the `SapiStreamEmitter` consuming too much memory when producing output
for readable bodies.
@@ -690,7 +690,7 @@ All notable changes to this project will be documented in this file, in reverse
### Fixed
-- [#222](https://github.com/zendframework/zend-diactoros/pull/222) fixes the
+- [zendframework/zend-diactoros#222](https://github.com/zendframework/zend-diactoros/pull/222) fixes the
`SapiStreamEmitter`'s handling of the `Content-Range` header to properly only
emit a range of bytes if the header value is in the form `bytes {first-last}/length`.
This allows using other range units, such as `items`, without incorrectly
@@ -700,16 +700,16 @@ All notable changes to this project will be documented in this file, in reverse
### Added
-- [#208](https://github.com/zendframework/zend-diactoros/pull/208) adds several
- missing response codes to `Zend\Diactoros\Response`, including:
+- [zendframework/zend-diactoros#208](https://github.com/zendframework/zend-diactoros/pull/208) adds several
+ missing response codes to `Laminas\Diactoros\Response`, including:
- 226 ('IM used')
- 308 ('Permanent Redirect')
- 444 ('Connection Closed Without Response')
- 499 ('Client Closed Request')
- 510 ('Not Extended')
- 599 ('Network Connect Timeout Error')
-- [#211](https://github.com/zendframework/zend-diactoros/pull/211) adds support
- for UTF-8 characters in query strings handled by `Zend\Diactoros\Uri`.
+- [zendframework/zend-diactoros#211](https://github.com/zendframework/zend-diactoros/pull/211) adds support
+ for UTF-8 characters in query strings handled by `Laminas\Diactoros\Uri`.
### Deprecated
@@ -727,13 +727,13 @@ All notable changes to this project will be documented in this file, in reverse
### Added
-- [#170](https://github.com/zendframework/zend-diactoros/pull/170) prepared
- documentation for publication at https://zendframework.github.io/zend-diactoros/
-- [#165](https://github.com/zendframework/zend-diactoros/pull/165) adds support
+- [zendframework/zend-diactoros#170](https://github.com/zendframework/zend-diactoros/pull/170) prepared
+ documentation for publication at https://docs.laminas.dev/laminas-diactoros/
+- [zendframework/zend-diactoros#165](https://github.com/zendframework/zend-diactoros/pull/165) adds support
for Apache `REDIRECT_HTTP_*` header detection in the `ServerRequestFactory`.
-- [#166](https://github.com/zendframework/zend-diactoros/pull/166) adds support
+- [zendframework/zend-diactoros#166](https://github.com/zendframework/zend-diactoros/pull/166) adds support
for UTF-8 characters in URI paths.
-- [#204](https://github.com/zendframework/zend-diactoros/pull/204) adds testing
+- [zendframework/zend-diactoros#204](https://github.com/zendframework/zend-diactoros/pull/204) adds testing
against PHP 7.1 release-candidate builds.
### Deprecated
@@ -746,20 +746,20 @@ All notable changes to this project will be documented in this file, in reverse
### Fixed
-- [#186](https://github.com/zendframework/zend-diactoros/pull/186) fixes a typo
+- [zendframework/zend-diactoros#186](https://github.com/zendframework/zend-diactoros/pull/186) fixes a typo
in a variable name within the `SapiStreamEmitter`.
-- [#200](https://github.com/zendframework/zend-diactoros/pull/200) updates the
+- [zendframework/zend-diactoros#200](https://github.com/zendframework/zend-diactoros/pull/200) updates the
`SapiStreamEmitter` to implement a check for `isSeekable()` prior to attempts
to rewind; this allows it to work with non-seekable streams such as the
`CallbackStream`.
-- [#169](https://github.com/zendframework/zend-diactoros/pull/169) ensures that
+- [zendframework/zend-diactoros#169](https://github.com/zendframework/zend-diactoros/pull/169) ensures that
response serialization always provides a `\r\n\r\n` sequence following the
headers, even when no message body is present, to ensure it conforms with RFC
7230.
-- [#175](https://github.com/zendframework/zend-diactoros/pull/175) updates the
+- [zendframework/zend-diactoros#175](https://github.com/zendframework/zend-diactoros/pull/175) updates the
`Request` class to set the `Host` header from the URI host if no header is
already present. (Ensures conformity with PSR-7 specification.)
-- [#197](https://github.com/zendframework/zend-diactoros/pull/197) updates the
+- [zendframework/zend-diactoros#197](https://github.com/zendframework/zend-diactoros/pull/197) updates the
`Uri` class to ensure that string serialization does not include a colon after
the host name if no port is present in the instance.
@@ -779,14 +779,14 @@ All notable changes to this project will be documented in this file, in reverse
### Fixed
-- [#160](https://github.com/zendframework/zend-diactoros/pull/160) fixes HTTP
+- [zendframework/zend-diactoros#160](https://github.com/zendframework/zend-diactoros/pull/160) fixes HTTP
protocol detection in the `ServerRequestFactory` to work correctly with HTTP/2.
## 1.3.4 - 2016-03-17
### Added
-- [#119](https://github.com/zendframework/zend-diactoros/pull/119) adds the 451
+- [zendframework/zend-diactoros#119](https://github.com/zendframework/zend-diactoros/pull/119) adds the 451
(Unavailable for Legal Reasons) status code to the `Response` class.
### Deprecated
@@ -799,19 +799,19 @@ All notable changes to this project will be documented in this file, in reverse
### Fixed
-- [#117](https://github.com/zendframework/zend-diactoros/pull/117) provides
+- [zendframework/zend-diactoros#117](https://github.com/zendframework/zend-diactoros/pull/117) provides
validation of the HTTP protocol version.
-- [#127](https://github.com/zendframework/zend-diactoros/pull/127) now properly
+- [zendframework/zend-diactoros#127](https://github.com/zendframework/zend-diactoros/pull/127) now properly
removes attributes with `null` values when calling `withoutAttribute()`.
-- [#132](https://github.com/zendframework/zend-diactoros/pull/132) updates the
+- [zendframework/zend-diactoros#132](https://github.com/zendframework/zend-diactoros/pull/132) updates the
`ServerRequestFactory` to marshal the request path fragment, if present.
-- [#142](https://github.com/zendframework/zend-diactoros/pull/142) updates the
+- [zendframework/zend-diactoros#142](https://github.com/zendframework/zend-diactoros/pull/142) updates the
exceptions thrown by `HeaderSecurity` to include the header name and/or
value.
-- [#148](https://github.com/zendframework/zend-diactoros/pull/148) fixes several
+- [zendframework/zend-diactoros#148](https://github.com/zendframework/zend-diactoros/pull/148) fixes several
stream operations to ensure they raise exceptions when the internal pointer
is at an invalid position.
-- [#151](https://github.com/zendframework/zend-diactoros/pull/151) ensures
+- [zendframework/zend-diactoros#151](https://github.com/zendframework/zend-diactoros/pull/151) ensures
URI fragments are properly encoded.
## 1.3.3 - 2016-01-04
@@ -830,7 +830,7 @@ All notable changes to this project will be documented in this file, in reverse
### Fixed
-- [#135](https://github.com/zendframework/zend-diactoros/pull/135) fixes the
+- [zendframework/zend-diactoros#135](https://github.com/zendframework/zend-diactoros/pull/135) fixes the
behavior of `ServerRequestFactory::marshalHeaders()` to no longer omit
`Cookie` headers from the aggregated headers. While the values are parsed and
injected into the cookie params, it's useful to have access to the raw headers
@@ -840,7 +840,7 @@ All notable changes to this project will be documented in this file, in reverse
### Added
-- [#124](https://github.com/zendframework/zend-diactoros/pull/124) adds four
+- [zendframework/zend-diactoros#124](https://github.com/zendframework/zend-diactoros/pull/124) adds four
more optional arguments to the `ServerRequest` constructor:
- `array $cookies`
- `array $queryParams`
@@ -860,7 +860,7 @@ All notable changes to this project will be documented in this file, in reverse
### Fixed
-- [#122](https://github.com/zendframework/zend-diactoros/pull/122) updates the
+- [zendframework/zend-diactoros#122](https://github.com/zendframework/zend-diactoros/pull/122) updates the
`ServerRequestFactory` to retrieve the HTTP protocol version and inject it in
the generated `ServerRequest`, which previously was not performed.
@@ -880,10 +880,10 @@ All notable changes to this project will be documented in this file, in reverse
### Fixed
-- [#113](https://github.com/zendframework/zend-diactoros/pull/113) fixes an
+- [zendframework/zend-diactoros#113](https://github.com/zendframework/zend-diactoros/pull/113) fixes an
issue in the response serializer, ensuring that the status code in the
deserialized response is an integer.
-- [#115](https://github.com/zendframework/zend-diactoros/pull/115) fixes an
+- [zendframework/zend-diactoros#115](https://github.com/zendframework/zend-diactoros/pull/115) fixes an
issue in the various text-basd response types (`TextResponse`, `HtmlResponse`,
and `JsonResponse`); due to the fact that the constructor was not
rewinding the message body stream, `getContents()` was thus returning `null`,
@@ -894,8 +894,8 @@ All notable changes to this project will be documented in this file, in reverse
### Added
-- [#110](https://github.com/zendframework/zend-diactoros/pull/110) adds
- `Zend\Diactoros\Response\SapiEmitterTrait`, which provides the following
+- [zendframework/zend-diactoros#110](https://github.com/zendframework/zend-diactoros/pull/110) adds
+ `Laminas\Diactoros\Response\SapiEmitterTrait`, which provides the following
private method definitions:
- `injectContentLength()`
- `emitStatusLine()`
@@ -904,7 +904,7 @@ All notable changes to this project will be documented in this file, in reverse
- `filterHeader()`
The `SapiEmitter` implementation has been updated to remove those methods and
instead compose the trait.
-- [#111](https://github.com/zendframework/zend-diactoros/pull/111) adds
+- [zendframework/zend-diactoros#111](https://github.com/zendframework/zend-diactoros/pull/111) adds
a new emitter implementation, `SapiStreamEmitter`; this emitter type will
loop through the stream instead of emitting it in one go, and supports content
ranges.
@@ -937,13 +937,13 @@ All notable changes to this project will be documented in this file, in reverse
### Fixed
-- [#101](https://github.com/zendframework/zend-diactoros/pull/101) fixes the
+- [zendframework/zend-diactoros#101](https://github.com/zendframework/zend-diactoros/pull/101) fixes the
`withHeader()` implementation to ensure that if the header existed previously
but using a different casing strategy, the previous version will be removed
in the cloned instance.
-- [#103](https://github.com/zendframework/zend-diactoros/pull/103) fixes the
+- [zendframework/zend-diactoros#103](https://github.com/zendframework/zend-diactoros/pull/103) fixes the
constructor of `Response` to ensure that null status codes are not possible.
-- [#99](https://github.com/zendframework/zend-diactoros/pull/99) fixes
+- [zendframework/zend-diactoros#99](https://github.com/zendframework/zend-diactoros/pull/99) fixes
validation of header values submitted via request and response constructors as
follows:
- numeric (integer and float) values are now properly allowed (this solves
@@ -957,17 +957,17 @@ All notable changes to this project will be documented in this file, in reverse
### Added
-- [#88](https://github.com/zendframework/zend-diactoros/pull/88) updates the
+- [zendframework/zend-diactoros#88](https://github.com/zendframework/zend-diactoros/pull/88) updates the
`SapiEmitter` to emit a `Content-Length` header with the content length as
reported by the response body stream, assuming that
`StreamInterface::getSize()` returns an integer.
-- [#77](https://github.com/zendframework/zend-diactoros/pull/77) adds a new
- response type, `Zend\Diactoros\Response\TextResponse`, for returning plain
+- [zendframework/zend-diactoros#77](https://github.com/zendframework/zend-diactoros/pull/77) adds a new
+ response type, `Laminas\Diactoros\Response\TextResponse`, for returning plain
text responses. By default, it sets the content type to `text/plain;
charset=utf-8`; per the other response types, the signature is `new
TextResponse($text, $status = 200, array $headers = [])`.
-- [#90](https://github.com/zendframework/zend-diactoros/pull/90) adds a new
- `Zend\Diactoros\CallbackStream`, allowing you to back a stream with a PHP
+- [zendframework/zend-diactoros#90](https://github.com/zendframework/zend-diactoros/pull/90) adds a new
+ `Laminas\Diactoros\CallbackStream`, allowing you to back a stream with a PHP
callable (such as a generator) to generate the message content. Its
constructor accepts the callable: `$stream = new CallbackStream($callable);`
@@ -981,7 +981,7 @@ All notable changes to this project will be documented in this file, in reverse
### Fixed
-- [#77](https://github.com/zendframework/zend-diactoros/pull/77) updates the
+- [zendframework/zend-diactoros#77](https://github.com/zendframework/zend-diactoros/pull/77) updates the
`HtmlResponse` to set the charset to utf-8 by default (if no content type
header is provided at instantiation).
@@ -989,9 +989,9 @@ All notable changes to this project will be documented in this file, in reverse
### Added
-- [#98](https://github.com/zendframework/zend-diactoros/pull/98) adds
+- [zendframework/zend-diactoros#98](https://github.com/zendframework/zend-diactoros/pull/98) adds
`JSON_UNESCAPED_SLASHES` to the default `json_encode` flags used by
- `Zend\Diactoros\Response\JsonResponse`.
+ `Laminas\Diactoros\Response\JsonResponse`.
### Deprecated
@@ -1003,10 +1003,10 @@ All notable changes to this project will be documented in this file, in reverse
### Fixed
-- [#96](https://github.com/zendframework/zend-diactoros/pull/96) updates
+- [zendframework/zend-diactoros#96](https://github.com/zendframework/zend-diactoros/pull/96) updates
`withPort()` to allow `null` port values (indicating usage of default for
the given scheme).
-- [#91](https://github.com/zendframework/zend-diactoros/pull/91) fixes the
+- [zendframework/zend-diactoros#91](https://github.com/zendframework/zend-diactoros/pull/91) fixes the
logic of `withUri()` to do a case-insensitive check for an existing `Host`
header, replacing it with the new one.
@@ -1014,7 +1014,7 @@ All notable changes to this project will be documented in this file, in reverse
### Added
-- [#73](https://github.com/zendframework/zend-diactoros/pull/73) adds caching of
+- [zendframework/zend-diactoros#73](https://github.com/zendframework/zend-diactoros/pull/73) adds caching of
the vendor directory to the Travis-CI configuration, to speed up builds.
### Deprecated
@@ -1027,19 +1027,19 @@ All notable changes to this project will be documented in this file, in reverse
### Fixed
-- [#71](https://github.com/zendframework/zend-diactoros/pull/71) fixes the
+- [zendframework/zend-diactoros#71](https://github.com/zendframework/zend-diactoros/pull/71) fixes the
docblock of the `JsonResponse` constructor to typehint the `$data` argument
as `mixed`.
-- [#73](https://github.com/zendframework/zend-diactoros/pull/73) changes the
+- [zendframework/zend-diactoros#73](https://github.com/zendframework/zend-diactoros/pull/73) changes the
behavior in `Request` such that if it marshals a stream during instantiation,
the stream is marked as writeable (specifically, mode `wb+`).
-- [#85](https://github.com/zendframework/zend-diactoros/pull/85) updates the
- behavior of `Zend\Diactoros\Uri`'s various `with*()` methods that are
+- [zendframework/zend-diactoros#85](https://github.com/zendframework/zend-diactoros/pull/85) updates the
+ behavior of `Laminas\Diactoros\Uri`'s various `with*()` methods that are
documented as accepting strings to raise exceptions on non-string input.
Previously, several simply passed non-string input on verbatim, others
normalized the input, and a few correctly raised the exceptions. Behavior is
now consistent across each.
-- [#87](https://github.com/zendframework/zend-diactoros/pull/87) fixes
+- [zendframework/zend-diactoros#87](https://github.com/zendframework/zend-diactoros/pull/87) fixes
`UploadedFile` to ensure that `moveTo()` works correctly in non-SAPI
environments when the file provided to the constructor is a path.
@@ -1059,7 +1059,7 @@ All notable changes to this project will be documented in this file, in reverse
### Fixed
-- [#67](https://github.com/zendframework/zend-diactoros/pull/67) ensures that
+- [zendframework/zend-diactoros#67](https://github.com/zendframework/zend-diactoros/pull/67) ensures that
the `Stream` class only accepts `stream` resources, not any resource.
## 1.1.1 - 2015-06-25
@@ -1078,7 +1078,7 @@ All notable changes to this project will be documented in this file, in reverse
### Fixed
-- [#64](https://github.com/zendframework/zend-diactoros/pull/64) fixes the
+- [zendframework/zend-diactoros#64](https://github.com/zendframework/zend-diactoros/pull/64) fixes the
behavior of `JsonResponse` with regards to serialization of `null` and scalar
values; the new behavior is to serialize them verbatim, without any casting.
@@ -1086,19 +1086,19 @@ All notable changes to this project will be documented in this file, in reverse
### Added
-- [#52](https://github.com/zendframework/zend-diactoros/pull/52),
- [#58](https://github.com/zendframework/zend-diactoros/pull/58),
- [#59](https://github.com/zendframework/zend-diactoros/pull/59), and
- [#61](https://github.com/zendframework/zend-diactoros/pull/61) create several
+- [zendframework/zend-diactoros#52](https://github.com/zendframework/zend-diactoros/pull/52),
+ [zendframework/zend-diactoros#58](https://github.com/zendframework/zend-diactoros/pull/58),
+ [zendframework/zend-diactoros#59](https://github.com/zendframework/zend-diactoros/pull/59), and
+ [zendframework/zend-diactoros#61](https://github.com/zendframework/zend-diactoros/pull/61) create several
custom response types for simplifying response creation:
- - `Zend\Diactoros\Response\HtmlResponse` accepts HTML content via its
+ - `Laminas\Diactoros\Response\HtmlResponse` accepts HTML content via its
constructor, and sets the `Content-Type` to `text/html`.
- - `Zend\Diactoros\Response\JsonResponse` accepts data to serialize to JSON via
+ - `Laminas\Diactoros\Response\JsonResponse` accepts data to serialize to JSON via
its constructor, and sets the `Content-Type` to `application/json`.
- - `Zend\Diactoros\Response\EmptyResponse` allows creating empty, read-only
+ - `Laminas\Diactoros\Response\EmptyResponse` allows creating empty, read-only
responses, with a default status code of 204.
- - `Zend\Diactoros\Response\RedirectResponse` allows specifying a URI for the
+ - `Laminas\Diactoros\Response\RedirectResponse` allows specifying a URI for the
`Location` header in the constructor, with a default status code of 302.
Each also accepts an optional status code, and optional headers (which can
@@ -1111,13 +1111,13 @@ All notable changes to this project will be documented in this file, in reverse
### Removed
-- [#43](https://github.com/zendframework/zend-diactoros/pull/43) removed both
+- [zendframework/zend-diactoros#43](https://github.com/zendframework/zend-diactoros/pull/43) removed both
`ServerRequestFactory::marshalUri()` and `ServerRequestFactory::marshalHostAndPort()`,
which were deprecated prior to the 1.0 release.
### Fixed
-- [#29](https://github.com/zendframework/zend-diactoros/pull/29) fixes request
+- [zendframework/zend-diactoros#29](https://github.com/zendframework/zend-diactoros/pull/29) fixes request
method validation to allow any valid token as defined by [RFC
7230](http://tools.ietf.org/html/rfc7230#appendix-B). This allows usage of
custom request methods, vs a static, hard-coded list.
@@ -1138,7 +1138,7 @@ All notable changes to this project will be documented in this file, in reverse
### Fixed
-- [#60](https://github.com/zendframework/zend-diactoros/pull/60) fixes
+- [zendframework/zend-diactoros#60](https://github.com/zendframework/zend-diactoros/pull/60) fixes
the behavior of `UploadedFile` when the `$errorStatus` provided at
instantiation is not `UPLOAD_ERR_OK`. Prior to the fix, an
`InvalidArgumentException` would occur at instantiation due to the fact that
@@ -1149,7 +1149,7 @@ All notable changes to this project will be documented in this file, in reverse
This is a security release.
-A patch has been applied to `Zend\Diactoros\Uri::filterPath()` that ensures that
+A patch has been applied to `Laminas\Diactoros\Uri::filterPath()` that ensures that
paths can only begin with a single leading slash. This prevents the following
potential security issues:
@@ -1163,13 +1163,13 @@ potential security issues:
do not prepend the scheme and authority. Again, preventing a double slash
corrects the vector.
-If you are using `Zend\Diactoros\Uri` for creating links, form targets, or
+If you are using `Laminas\Diactoros\Uri` for creating links, form targets, or
redirect paths, and only using the path segment, we recommend upgrading
immediately.
### Added
-- [#25](https://github.com/zendframework/zend-diactoros/pull/25) adds
+- [zendframework/zend-diactoros#25](https://github.com/zendframework/zend-diactoros/pull/25) adds
documentation. Documentation is written in markdown, and can be converted to
HTML using [bookdown](http://bookdown.io). New features now MUST include
documentation for acceptance.
@@ -1184,13 +1184,13 @@ immediately.
### Fixed
-- [#51](https://github.com/zendframework/zend-diactoros/pull/51) fixes
+- [zendframework/zend-diactoros#51](https://github.com/zendframework/zend-diactoros/pull/51) fixes
`MessageTrait::getHeaderLine()` to return an empty string instead of `null` if
the header is undefined (which is the behavior specified in PSR-7).
-- [#57](https://github.com/zendframework/zend-diactoros/pull/57) fixes the
+- [zendframework/zend-diactoros#57](https://github.com/zendframework/zend-diactoros/pull/57) fixes the
behavior of how the `ServerRequestFactory` marshals upload files when they are
represented as a nested associative array.
-- [#49](https://github.com/zendframework/zend-diactoros/pull/49) provides several
+- [zendframework/zend-diactoros#49](https://github.com/zendframework/zend-diactoros/pull/49) provides several
fixes that ensure that Diactoros complies with the PSR-7 specification:
- `MessageInterface::getHeaderLine()` MUST return a string (that string CAN be
empty). Previously, Diactoros would return `null`.
@@ -1202,7 +1202,7 @@ immediately.
- The request MUST return a `UriInterface` instance from `getUri()`; that
instance CAN be empty. Previously, Diactoros would return `null`; now it
lazy-instantiates an empty `Uri` instance on initialization.
-- [ZF2015-05](http://framework.zend.com/security/advisory/ZF2015-05) was
+- [ZF2015-05](https://getlaminas.org/security/advisory/ZF2015-05) was
addressed by altering `Uri::filterPath()` to prevent emitting a path prepended
with multiple slashes.
@@ -1210,7 +1210,7 @@ immediately.
### Added
-- [#48](https://github.com/zendframework/zend-diactoros/pull/48) drops the
+- [zendframework/zend-diactoros#48](https://github.com/zendframework/zend-diactoros/pull/48) drops the
minimum supported PHP version to 5.4, to allow an easier upgrade path for
Symfony 2.7 users, and potential Drupal 8 usage.
@@ -1230,10 +1230,10 @@ immediately.
### Added
-- [#27](https://github.com/zendframework/zend-diactoros/pull/27) adds phonetic
+- [zendframework/zend-diactoros#27](https://github.com/zendframework/zend-diactoros/pull/27) adds phonetic
pronunciation of "Diactoros" to the README file.
-- [#36](https://github.com/zendframework/zend-diactoros/pull/36) adds property
- annotations to the class-level docblock of `Zend\Diactoros\RequestTrait` to
+- [zendframework/zend-diactoros#36](https://github.com/zendframework/zend-diactoros/pull/36) adds property
+ annotations to the class-level docblock of `Laminas\Diactoros\RequestTrait` to
ensure properties inherited from the `MessageTrait` are inherited by
implementations.
@@ -1247,12 +1247,12 @@ immediately.
-
### Fixed
-- [#41](https://github.com/zendframework/zend-diactoros/pull/41) fixes the
- namespace for test files to begin with `ZendTest` instead of `Zend`.
-- [#46](https://github.com/zendframework/zend-diactoros/pull/46) ensures that
+- [zendframework/zend-diactoros#41](https://github.com/zendframework/zend-diactoros/pull/41) fixes the
+ namespace for test files to begin with `LaminasTest` instead of `Laminas`.
+- [zendframework/zend-diactoros#46](https://github.com/zendframework/zend-diactoros/pull/46) ensures that
the cookie and query params for the `ServerRequest` implementation are
initialized as arrays.
-- [#47](https://github.com/zendframework/zend-diactoros/pull/47) modifies the
+- [zendframework/zend-diactoros#47](https://github.com/zendframework/zend-diactoros/pull/47) modifies the
internal logic in `HeaderSecurity::isValid()` to use a regular expression
instead of character-by-character comparisons, improving performance.
@@ -1260,12 +1260,12 @@ immediately.
### Added
-- [#10](https://github.com/zendframework/zend-diactoros/pull/10) adds
- `Zend\Diactoros\RelativeStream`, which will return stream contents relative to
+- [zendframework/zend-diactoros#10](https://github.com/zendframework/zend-diactoros/pull/10) adds
+ `Laminas\Diactoros\RelativeStream`, which will return stream contents relative to
a given offset (i.e., a subset of the stream). `AbstractSerializer` was
updated to create a `RelativeStream` when creating the body of a message,
which will prevent duplication of the stream in-memory.
-- [#21](https://github.com/zendframework/zend-diactoros/pull/21) adds a
+- [zendframework/zend-diactoros#21](https://github.com/zendframework/zend-diactoros/pull/21) adds a
`.gitattributes` file that excludes directories and files not needed for
production; this will further minify the package for production use cases.
@@ -1279,20 +1279,20 @@ immediately.
### Fixed
-- [#9](https://github.com/zendframework/zend-diactoros/pull/9) ensures that
+- [zendframework/zend-diactoros#9](https://github.com/zendframework/zend-diactoros/pull/9) ensures that
attributes are initialized to an empty array, ensuring that attempts to
retrieve single attributes when none are defined will not produce errors.
-- [#14](https://github.com/zendframework/zend-diactoros/pull/14) updates
- `Zend\Diactoros\Request` to use a `php://temp` stream by default instead of
+- [zendframework/zend-diactoros#14](https://github.com/zendframework/zend-diactoros/pull/14) updates
+ `Laminas\Diactoros\Request` to use a `php://temp` stream by default instead of
`php://memory`, to ensure requests do not create an out-of-memory condition.
-- [#15](https://github.com/zendframework/zend-diactoros/pull/15) updates
- `Zend\Diactoros\Stream` to ensure that write operations trigger an exception
+- [zendframework/zend-diactoros#15](https://github.com/zendframework/zend-diactoros/pull/15) updates
+ `Laminas\Diactoros\Stream` to ensure that write operations trigger an exception
if the stream is not writeable. Additionally, it adds more robust logic for
determining if a stream is writeable.
## 1.0.0 - 2015-05-21
-First stable release, and first release as `zend-diactoros`.
+First stable release, and first release as `laminas-diactoros`.
### Added
diff --git a/vendor/laminas/laminas-diactoros/COPYRIGHT.md b/vendor/laminas/laminas-diactoros/COPYRIGHT.md
new file mode 100644
index 0000000000..c4fc4fee19
--- /dev/null
+++ b/vendor/laminas/laminas-diactoros/COPYRIGHT.md
@@ -0,0 +1,2 @@
+Copyright (c) 2019, Laminas Foundation.
+All rights reserved. (https://getlaminas.org/)
diff --git a/vendor/zendframework/zend-stdlib/LICENSE.md b/vendor/laminas/laminas-diactoros/LICENSE.md
similarity index 68%
rename from vendor/zendframework/zend-stdlib/LICENSE.md
rename to vendor/laminas/laminas-diactoros/LICENSE.md
index d44ab5dc72..09f53edc11 100644
--- a/vendor/zendframework/zend-stdlib/LICENSE.md
+++ b/vendor/laminas/laminas-diactoros/LICENSE.md
@@ -1,19 +1,19 @@
-Copyright (c) 2005-2018, Zend Technologies USA, Inc.
+Copyright (c) 2019, Laminas Foundation
All rights reserved.
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
- Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright notice, this
- list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
+- Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
-- Neither the name of Zend Technologies USA, Inc. nor the names of its
- contributors may be used to endorse or promote products derived from this
- software without specific prior written permission.
+- Neither the name of Laminas Foundation nor the names of its contributors may
+ be used to endorse or promote products derived from this software without
+ specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
diff --git a/vendor/laminas/laminas-diactoros/README.md b/vendor/laminas/laminas-diactoros/README.md
new file mode 100644
index 0000000000..e6e52e6f10
--- /dev/null
+++ b/vendor/laminas/laminas-diactoros/README.md
@@ -0,0 +1,34 @@
+# laminas-diactoros
+
+Master:
+[![Build status][Master image]][Master]
+[![Coverage Status][Master coverage image]][Master coverage]
+Develop:
+[![Build status][Develop image]][Develop]
+[![Coverage Status][Develop coverage image]][Develop coverage]
+
+> Diactoros (pronunciation: `/dɪʌktɒrɒs/`): an epithet for Hermes, meaning literally, "the messenger."
+
+This package supercedes and replaces [phly/http](https://github.com/phly/http).
+
+`laminas-diactoros` is a PHP package containing implementations of the [accepted PSR-7 HTTP message interfaces](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-7-http-message.md), as well as a "server" implementation similar to [node's http.Server](http://nodejs.org/api/http.html).
+
+* File issues at https://github.com/laminas/laminas-diactoros/issues
+* Issue patches to https://github.com/laminas/laminas-diactoros/pulls
+
+## Documentation
+
+Documentation is available at:
+
+- https://docs.laminas.dev/laminas-diactoros/
+
+Source files for documentation are [in the doc/ tree](doc/).
+
+ [Master]: https://travis-ci.org/laminas/laminas-diactoros
+ [Master image]: https://travis-ci.org/laminas/laminas-diactoros.svg?branch=master
+ [Master coverage image]: https://img.shields.io/coveralls/laminas/laminas-diactoros/master.svg
+ [Master coverage]: https://coveralls.io/r/laminas/laminas-diactoros?branch=master
+ [Develop]: https://github.com/laminas/laminas-diactoros/tree/develop
+ [Develop image]: https://travis-ci.org/laminas/laminas-diactoros.svg?branch=develop
+ [Develop coverage image]: https://coveralls.io/repos/laminas/laminas-diactoros/badge.svg?branch=develop
+ [Develop coverage]: https://coveralls.io/r/laminas/laminas-diactoros?branch=develop
diff --git a/vendor/laminas/laminas-diactoros/composer.json b/vendor/laminas/laminas-diactoros/composer.json
new file mode 100644
index 0000000000..3a1661f460
--- /dev/null
+++ b/vendor/laminas/laminas-diactoros/composer.json
@@ -0,0 +1,88 @@
+{
+ "name": "laminas/laminas-diactoros",
+ "description": "PSR HTTP Message implementations",
+ "license": "BSD-3-Clause",
+ "keywords": [
+ "laminas",
+ "http",
+ "psr",
+ "psr-7"
+ ],
+ "homepage": "https://laminas.dev",
+ "support": {
+ "docs": "https://docs.laminas.dev/laminas-diactoros/",
+ "issues": "https://github.com/laminas/laminas-diactoros/issues",
+ "source": "https://github.com/laminas/laminas-diactoros",
+ "rss": "https://github.com/laminas/laminas-diactoros/releases.atom",
+ "chat": "https://laminas.dev/chat",
+ "forum": "https://discourse.laminas.dev"
+ },
+ "config": {
+ "sort-packages": true
+ },
+ "extra": {
+ "branch-alias": {
+ "dev-release-1.8": "1.8.x-dev"
+ }
+ },
+ "require": {
+ "php": "^5.6 || ^7.0",
+ "laminas/laminas-zendframework-bridge": "^1.0",
+ "psr/http-message": "^1.0"
+ },
+ "require-dev": {
+ "ext-dom": "*",
+ "ext-libxml": "*",
+ "laminas/laminas-coding-standard": "~1.0",
+ "php-http/psr7-integration-tests": "dev-master",
+ "phpunit/phpunit": "^5.7.16 || ^6.0.8 || ^7.2.7"
+ },
+ "provide": {
+ "psr/http-message-implementation": "1.0"
+ },
+ "autoload": {
+ "files": [
+ "src/functions/create_uploaded_file.php",
+ "src/functions/marshal_headers_from_sapi.php",
+ "src/functions/marshal_method_from_sapi.php",
+ "src/functions/marshal_protocol_version_from_sapi.php",
+ "src/functions/marshal_uri_from_sapi.php",
+ "src/functions/normalize_server.php",
+ "src/functions/normalize_uploaded_files.php",
+ "src/functions/parse_cookie_header.php",
+ "src/functions/create_uploaded_file.legacy.php",
+ "src/functions/marshal_headers_from_sapi.legacy.php",
+ "src/functions/marshal_method_from_sapi.legacy.php",
+ "src/functions/marshal_protocol_version_from_sapi.legacy.php",
+ "src/functions/marshal_uri_from_sapi.legacy.php",
+ "src/functions/normalize_server.legacy.php",
+ "src/functions/normalize_uploaded_files.legacy.php",
+ "src/functions/parse_cookie_header.legacy.php"
+ ],
+ "psr-4": {
+ "Laminas\\Diactoros\\": "src/"
+ }
+ },
+ "autoload-dev": {
+ "psr-4": {
+ "LaminasTest\\Diactoros\\": "test/"
+ },
+ "files": [
+ "test/TestAsset/Functions.php",
+ "test/TestAsset/SapiResponse.php"
+ ]
+ },
+ "scripts": {
+ "check": [
+ "@cs-check",
+ "@test"
+ ],
+ "cs-check": "phpcs",
+ "cs-fix": "phpcbf",
+ "test": "phpunit --colors=always",
+ "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
+ },
+ "replace": {
+ "zendframework/zend-diactoros": "~1.8.7.0"
+ }
+}
diff --git a/vendor/zendframework/zend-diactoros/src/AbstractSerializer.php b/vendor/laminas/laminas-diactoros/src/AbstractSerializer.php
similarity index 92%
rename from vendor/zendframework/zend-diactoros/src/AbstractSerializer.php
rename to vendor/laminas/laminas-diactoros/src/AbstractSerializer.php
index cd07fa6df9..efd974000e 100644
--- a/vendor/zendframework/zend-diactoros/src/AbstractSerializer.php
+++ b/vendor/laminas/laminas-diactoros/src/AbstractSerializer.php
@@ -1,13 +1,12 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @see http://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015-2016 Zend Technologies USA Inc. (http://www.zend.com)
- * @license https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
+ * @see https://github.com/laminas/laminas-diactoros for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-diactoros/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-diactoros/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Diactoros;
+namespace Laminas\Diactoros;
use Psr\Http\Message\StreamInterface;
use UnexpectedValueException;
diff --git a/vendor/zendframework/zend-diactoros/src/CallbackStream.php b/vendor/laminas/laminas-diactoros/src/CallbackStream.php
similarity index 89%
rename from vendor/zendframework/zend-diactoros/src/CallbackStream.php
rename to vendor/laminas/laminas-diactoros/src/CallbackStream.php
index 9537a34967..02f173e9b0 100644
--- a/vendor/zendframework/zend-diactoros/src/CallbackStream.php
+++ b/vendor/laminas/laminas-diactoros/src/CallbackStream.php
@@ -1,13 +1,12 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @see http://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015-2016 Zend Technologies USA Inc. (http://www.zend.com)
- * @license https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
+ * @see https://github.com/laminas/laminas-diactoros for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-diactoros/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-diactoros/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Diactoros;
+namespace Laminas\Diactoros;
use InvalidArgumentException;
use Psr\Http\Message\StreamInterface;
diff --git a/vendor/laminas/laminas-diactoros/src/Exception/DeprecatedMethodException.php b/vendor/laminas/laminas-diactoros/src/Exception/DeprecatedMethodException.php
new file mode 100644
index 0000000000..6a3819a7b2
--- /dev/null
+++ b/vendor/laminas/laminas-diactoros/src/Exception/DeprecatedMethodException.php
@@ -0,0 +1,18 @@
+<?php
+
+/**
+ * @see https://github.com/laminas/laminas-diactoros for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-diactoros/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-diactoros/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Laminas\Diactoros\Exception;
+
+use BadMethodCallException;
+
+/**
+ * Exception indicating a deprecated method.
+ */
+class DeprecatedMethodException extends BadMethodCallException implements ExceptionInterface
+{
+}
diff --git a/vendor/laminas/laminas-diactoros/src/Exception/ExceptionInterface.php b/vendor/laminas/laminas-diactoros/src/Exception/ExceptionInterface.php
new file mode 100644
index 0000000000..8c687b36ec
--- /dev/null
+++ b/vendor/laminas/laminas-diactoros/src/Exception/ExceptionInterface.php
@@ -0,0 +1,16 @@
+<?php
+
+/**
+ * @see https://github.com/laminas/laminas-diactoros for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-diactoros/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-diactoros/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Laminas\Diactoros\Exception;
+
+/**
+ * Marker interface for package-specific exceptions.
+ */
+interface ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zend-diactoros/src/HeaderSecurity.php b/vendor/laminas/laminas-diactoros/src/HeaderSecurity.php
similarity index 88%
rename from vendor/zendframework/zend-diactoros/src/HeaderSecurity.php
rename to vendor/laminas/laminas-diactoros/src/HeaderSecurity.php
index 72e83e14a5..9f37e49763 100644
--- a/vendor/zendframework/zend-diactoros/src/HeaderSecurity.php
+++ b/vendor/laminas/laminas-diactoros/src/HeaderSecurity.php
@@ -1,11 +1,12 @@
<?php
+
/**
- * @see https://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015-2017 Zend Technologies USA Inc. (http://www.zend.com)
- * @license https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
+ * @see https://github.com/laminas/laminas-diactoros for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-diactoros/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-diactoros/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Diactoros;
+namespace Laminas\Diactoros;
use InvalidArgumentException;
@@ -23,11 +24,11 @@
/**
* Provide security tools around HTTP headers to prevent common injection vectors.
*
- * Code is largely lifted from the Zend\Http\Header\HeaderValue implementation in
- * Zend Framework, released with the copyright and license below.
+ * Code is largely lifted from the Laminas\Http\Header\HeaderValue implementation in
+ * Laminas, released with the copyright and license below.
*
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @copyright Copyright (c) 2005-2015 Laminas (https://www.zend.com)
+ * @license https://getlaminas.org/license/new-bsd New BSD License
*/
final class HeaderSecurity
{
diff --git a/vendor/zendframework/zend-diactoros/src/MessageTrait.php b/vendor/laminas/laminas-diactoros/src/MessageTrait.php
similarity index 97%
rename from vendor/zendframework/zend-diactoros/src/MessageTrait.php
rename to vendor/laminas/laminas-diactoros/src/MessageTrait.php
index 6b83be4655..6fc160cd5c 100644
--- a/vendor/zendframework/zend-diactoros/src/MessageTrait.php
+++ b/vendor/laminas/laminas-diactoros/src/MessageTrait.php
@@ -1,11 +1,12 @@
<?php
+
/**
- * @see https://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015-2017 Zend Technologies USA Inc. (http://www.zend.com)
- * @license https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
+ * @see https://github.com/laminas/laminas-diactoros for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-diactoros/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-diactoros/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Diactoros;
+namespace Laminas\Diactoros;
use InvalidArgumentException;
use Psr\Http\Message\StreamInterface;
diff --git a/vendor/zendframework/zend-diactoros/src/PhpInputStream.php b/vendor/laminas/laminas-diactoros/src/PhpInputStream.php
similarity index 82%
rename from vendor/zendframework/zend-diactoros/src/PhpInputStream.php
rename to vendor/laminas/laminas-diactoros/src/PhpInputStream.php
index 8713d02703..67e0f809ac 100644
--- a/vendor/zendframework/zend-diactoros/src/PhpInputStream.php
+++ b/vendor/laminas/laminas-diactoros/src/PhpInputStream.php
@@ -1,11 +1,12 @@
<?php
+
/**
- * @see https://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015-2017 Zend Technologies USA Inc. (http://www.zend.com)
- * @license https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
+ * @see https://github.com/laminas/laminas-diactoros for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-diactoros/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-diactoros/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Diactoros;
+namespace Laminas\Diactoros;
use function stream_get_contents;
diff --git a/vendor/zendframework/zend-diactoros/src/RelativeStream.php b/vendor/laminas/laminas-diactoros/src/RelativeStream.php
similarity index 89%
rename from vendor/zendframework/zend-diactoros/src/RelativeStream.php
rename to vendor/laminas/laminas-diactoros/src/RelativeStream.php
index 5f2eb915e1..6d81bbef38 100644
--- a/vendor/zendframework/zend-diactoros/src/RelativeStream.php
+++ b/vendor/laminas/laminas-diactoros/src/RelativeStream.php
@@ -1,11 +1,12 @@
<?php
+
/**
- * @see https://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015-2017 Zend Technologies USA Inc. (http://www.zend.com)
- * @license https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
+ * @see https://github.com/laminas/laminas-diactoros for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-diactoros/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-diactoros/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Diactoros;
+namespace Laminas\Diactoros;
use Psr\Http\Message\StreamInterface;
use RuntimeException;
@@ -17,7 +18,7 @@
*
* Wrapper for default Stream class, representing subpart (starting from given offset) of initial stream.
* It can be used to avoid copying full stream, conserving memory.
- * @example see Zend\Diactoros\AbstractSerializer::splitStream()
+ * @example see Laminas\Diactoros\AbstractSerializer::splitStream()
*/
final class RelativeStream implements StreamInterface
{
diff --git a/vendor/zendframework/zend-diactoros/src/Request.php b/vendor/laminas/laminas-diactoros/src/Request.php
similarity index 84%
rename from vendor/zendframework/zend-diactoros/src/Request.php
rename to vendor/laminas/laminas-diactoros/src/Request.php
index 422862ec69..094758813d 100644
--- a/vendor/zendframework/zend-diactoros/src/Request.php
+++ b/vendor/laminas/laminas-diactoros/src/Request.php
@@ -1,11 +1,12 @@
<?php
+
/**
- * @see https://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015-2017 Zend Technologies USA Inc. (http://www.zend.com)
- * @license https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
+ * @see https://github.com/laminas/laminas-diactoros for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-diactoros/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-diactoros/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Diactoros;
+namespace Laminas\Diactoros;
use Psr\Http\Message\RequestInterface;
use Psr\Http\Message\StreamInterface;
diff --git a/vendor/zendframework/zend-diactoros/src/Request/ArraySerializer.php b/vendor/laminas/laminas-diactoros/src/Request/ArraySerializer.php
similarity index 87%
rename from vendor/zendframework/zend-diactoros/src/Request/ArraySerializer.php
rename to vendor/laminas/laminas-diactoros/src/Request/ArraySerializer.php
index f5e25eba2b..eef3ff86ad 100644
--- a/vendor/zendframework/zend-diactoros/src/Request/ArraySerializer.php
+++ b/vendor/laminas/laminas-diactoros/src/Request/ArraySerializer.php
@@ -1,16 +1,17 @@
<?php
+
/**
- * @see http://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2017 Zend Technologies USA Inc. (http://www.zend.com)
- * @license https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
+ * @see https://github.com/laminas/laminas-diactoros for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-diactoros/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-diactoros/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Diactoros\Request;
+namespace Laminas\Diactoros\Request;
+use Laminas\Diactoros\Request;
+use Laminas\Diactoros\Stream;
use Psr\Http\Message\RequestInterface;
use UnexpectedValueException;
-use Zend\Diactoros\Request;
-use Zend\Diactoros\Stream;
use function sprintf;
diff --git a/vendor/zendframework/zend-diactoros/src/Request/Serializer.php b/vendor/laminas/laminas-diactoros/src/Request/Serializer.php
similarity index 89%
rename from vendor/zendframework/zend-diactoros/src/Request/Serializer.php
rename to vendor/laminas/laminas-diactoros/src/Request/Serializer.php
index 201486317d..61f5615594 100644
--- a/vendor/zendframework/zend-diactoros/src/Request/Serializer.php
+++ b/vendor/laminas/laminas-diactoros/src/Request/Serializer.php
@@ -1,22 +1,21 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @see http://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015-2016 Zend Technologies USA Inc. (http://www.zend.com)
- * @license https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
+ * @see https://github.com/laminas/laminas-diactoros for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-diactoros/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-diactoros/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Diactoros\Request;
+namespace Laminas\Diactoros\Request;
use InvalidArgumentException;
+use Laminas\Diactoros\AbstractSerializer;
+use Laminas\Diactoros\Request;
+use Laminas\Diactoros\Stream;
+use Laminas\Diactoros\Uri;
use Psr\Http\Message\RequestInterface;
use Psr\Http\Message\StreamInterface;
use UnexpectedValueException;
-use Zend\Diactoros\AbstractSerializer;
-use Zend\Diactoros\Request;
-use Zend\Diactoros\Stream;
-use Zend\Diactoros\Uri;
use function preg_match;
use function sprintf;
diff --git a/vendor/zendframework/zend-diactoros/src/RequestTrait.php b/vendor/laminas/laminas-diactoros/src/RequestTrait.php
similarity index 96%
rename from vendor/zendframework/zend-diactoros/src/RequestTrait.php
rename to vendor/laminas/laminas-diactoros/src/RequestTrait.php
index a1bdc3de0a..19c58ac311 100644
--- a/vendor/zendframework/zend-diactoros/src/RequestTrait.php
+++ b/vendor/laminas/laminas-diactoros/src/RequestTrait.php
@@ -1,11 +1,12 @@
<?php
+
/**
- * @see https://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015-2017 Zend Technologies USA Inc. (http://www.zend.com)
- * @license https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
+ * @see https://github.com/laminas/laminas-diactoros for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-diactoros/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-diactoros/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Diactoros;
+namespace Laminas\Diactoros;
use InvalidArgumentException;
use Psr\Http\Message\StreamInterface;
diff --git a/vendor/zendframework/zend-diactoros/src/Response.php b/vendor/laminas/laminas-diactoros/src/Response.php
similarity index 94%
rename from vendor/zendframework/zend-diactoros/src/Response.php
rename to vendor/laminas/laminas-diactoros/src/Response.php
index 17cae64e55..cdf90d8d7e 100644
--- a/vendor/zendframework/zend-diactoros/src/Response.php
+++ b/vendor/laminas/laminas-diactoros/src/Response.php
@@ -1,11 +1,12 @@
<?php
+
/**
- * @see https://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015-2018 Zend Technologies USA Inc. (http://www.zend.com)
- * @license https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
+ * @see https://github.com/laminas/laminas-diactoros for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-diactoros/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-diactoros/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Diactoros;
+namespace Laminas\Diactoros;
use InvalidArgumentException;
use Psr\Http\Message\ResponseInterface;
diff --git a/vendor/zendframework/zend-diactoros/src/Response/ArraySerializer.php b/vendor/laminas/laminas-diactoros/src/Response/ArraySerializer.php
similarity index 87%
rename from vendor/zendframework/zend-diactoros/src/Response/ArraySerializer.php
rename to vendor/laminas/laminas-diactoros/src/Response/ArraySerializer.php
index 7afe419473..bec5a10120 100644
--- a/vendor/zendframework/zend-diactoros/src/Response/ArraySerializer.php
+++ b/vendor/laminas/laminas-diactoros/src/Response/ArraySerializer.php
@@ -1,16 +1,17 @@
<?php
+
/**
- * @see http://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2017 Zend Technologies USA Inc. (http://www.zend.com)
- * @license https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
+ * @see https://github.com/laminas/laminas-diactoros for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-diactoros/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-diactoros/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Diactoros\Response;
+namespace Laminas\Diactoros\Response;
+use Laminas\Diactoros\Response;
+use Laminas\Diactoros\Stream;
use Psr\Http\Message\ResponseInterface;
use UnexpectedValueException;
-use Zend\Diactoros\Response;
-use Zend\Diactoros\Stream;
use function sprintf;
diff --git a/vendor/zendframework/zend-diactoros/src/Response/EmitterInterface.php b/vendor/laminas/laminas-diactoros/src/Response/EmitterInterface.php
similarity index 64%
rename from vendor/zendframework/zend-diactoros/src/Response/EmitterInterface.php
rename to vendor/laminas/laminas-diactoros/src/Response/EmitterInterface.php
index 0441486428..3bdf554823 100644
--- a/vendor/zendframework/zend-diactoros/src/Response/EmitterInterface.php
+++ b/vendor/laminas/laminas-diactoros/src/Response/EmitterInterface.php
@@ -1,16 +1,17 @@
<?php
+
/**
- * @see https://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015-2018 Zend Technologies USA Inc. (https://www.zend.com)
- * @license https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
+ * @see https://github.com/laminas/laminas-diactoros for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-diactoros/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-diactoros/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Diactoros\Response;
+namespace Laminas\Diactoros\Response;
use Psr\Http\Message\ResponseInterface;
/**
- * @deprecated since 1.8.0. The package zendframework/zend-httphandlerrunner
+ * @deprecated since 1.8.0. The package laminas/laminas-httphandlerrunner
* now provides this functionality.
*/
interface EmitterInterface
diff --git a/vendor/zendframework/zend-diactoros/src/Response/EmptyResponse.php b/vendor/laminas/laminas-diactoros/src/Response/EmptyResponse.php
similarity index 64%
rename from vendor/zendframework/zend-diactoros/src/Response/EmptyResponse.php
rename to vendor/laminas/laminas-diactoros/src/Response/EmptyResponse.php
index 010cb9d339..a0d6bfa0b7 100644
--- a/vendor/zendframework/zend-diactoros/src/Response/EmptyResponse.php
+++ b/vendor/laminas/laminas-diactoros/src/Response/EmptyResponse.php
@@ -1,16 +1,15 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @see http://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015-2016 Zend Technologies USA Inc. (http://www.zend.com)
- * @license https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
+ * @see https://github.com/laminas/laminas-diactoros for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-diactoros/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-diactoros/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Diactoros\Response;
+namespace Laminas\Diactoros\Response;
-use Zend\Diactoros\Response;
-use Zend\Diactoros\Stream;
+use Laminas\Diactoros\Response;
+use Laminas\Diactoros\Stream;
/**
* A class representing empty HTTP responses.
diff --git a/vendor/zendframework/zend-diactoros/src/Response/HtmlResponse.php b/vendor/laminas/laminas-diactoros/src/Response/HtmlResponse.php
similarity index 82%
rename from vendor/zendframework/zend-diactoros/src/Response/HtmlResponse.php
rename to vendor/laminas/laminas-diactoros/src/Response/HtmlResponse.php
index ad5ec8e19e..0627d13c29 100644
--- a/vendor/zendframework/zend-diactoros/src/Response/HtmlResponse.php
+++ b/vendor/laminas/laminas-diactoros/src/Response/HtmlResponse.php
@@ -1,18 +1,17 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @see http://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015-2016 Zend Technologies USA Inc. (http://www.zend.com)
- * @license https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
+ * @see https://github.com/laminas/laminas-diactoros for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-diactoros/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-diactoros/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Diactoros\Response;
+namespace Laminas\Diactoros\Response;
use InvalidArgumentException;
+use Laminas\Diactoros\Response;
+use Laminas\Diactoros\Stream;
use Psr\Http\Message\StreamInterface;
-use Zend\Diactoros\Response;
-use Zend\Diactoros\Stream;
use function get_class;
use function gettype;
diff --git a/vendor/zendframework/zend-diactoros/src/Response/InjectContentTypeTrait.php b/vendor/laminas/laminas-diactoros/src/Response/InjectContentTypeTrait.php
similarity index 66%
rename from vendor/zendframework/zend-diactoros/src/Response/InjectContentTypeTrait.php
rename to vendor/laminas/laminas-diactoros/src/Response/InjectContentTypeTrait.php
index 445e1324b3..e240166070 100644
--- a/vendor/zendframework/zend-diactoros/src/Response/InjectContentTypeTrait.php
+++ b/vendor/laminas/laminas-diactoros/src/Response/InjectContentTypeTrait.php
@@ -1,13 +1,12 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @see http://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015-2016 Zend Technologies USA Inc. (http://www.zend.com)
- * @license https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
+ * @see https://github.com/laminas/laminas-diactoros for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-diactoros/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-diactoros/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Diactoros\Response;
+namespace Laminas\Diactoros\Response;
use function array_keys;
use function array_reduce;
diff --git a/vendor/zendframework/zend-diactoros/src/Response/JsonResponse.php b/vendor/laminas/laminas-diactoros/src/Response/JsonResponse.php
similarity index 92%
rename from vendor/zendframework/zend-diactoros/src/Response/JsonResponse.php
rename to vendor/laminas/laminas-diactoros/src/Response/JsonResponse.php
index b8a032a3b2..448b541dae 100644
--- a/vendor/zendframework/zend-diactoros/src/Response/JsonResponse.php
+++ b/vendor/laminas/laminas-diactoros/src/Response/JsonResponse.php
@@ -1,15 +1,16 @@
<?php
+
/**
- * @see https://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015-2017 Zend Technologies USA Inc. (http://www.zend.com)
- * @license https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
+ * @see https://github.com/laminas/laminas-diactoros for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-diactoros/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-diactoros/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Diactoros\Response;
+namespace Laminas\Diactoros\Response;
use InvalidArgumentException;
-use Zend\Diactoros\Response;
-use Zend\Diactoros\Stream;
+use Laminas\Diactoros\Response;
+use Laminas\Diactoros\Stream;
use function is_object;
use function is_resource;
diff --git a/vendor/zendframework/zend-diactoros/src/Response/RedirectResponse.php b/vendor/laminas/laminas-diactoros/src/Response/RedirectResponse.php
similarity index 76%
rename from vendor/zendframework/zend-diactoros/src/Response/RedirectResponse.php
rename to vendor/laminas/laminas-diactoros/src/Response/RedirectResponse.php
index 800428cdb1..a3d48ffac5 100644
--- a/vendor/zendframework/zend-diactoros/src/Response/RedirectResponse.php
+++ b/vendor/laminas/laminas-diactoros/src/Response/RedirectResponse.php
@@ -1,17 +1,16 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @see http://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015-2016 Zend Technologies USA Inc. (http://www.zend.com)
- * @license https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
+ * @see https://github.com/laminas/laminas-diactoros for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-diactoros/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-diactoros/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Diactoros\Response;
+namespace Laminas\Diactoros\Response;
use InvalidArgumentException;
+use Laminas\Diactoros\Response;
use Psr\Http\Message\UriInterface;
-use Zend\Diactoros\Response;
use function get_class;
use function gettype;
diff --git a/vendor/zendframework/zend-diactoros/src/Response/SapiEmitter.php b/vendor/laminas/laminas-diactoros/src/Response/SapiEmitter.php
similarity index 68%
rename from vendor/zendframework/zend-diactoros/src/Response/SapiEmitter.php
rename to vendor/laminas/laminas-diactoros/src/Response/SapiEmitter.php
index 0db003f667..907ca96ead 100644
--- a/vendor/zendframework/zend-diactoros/src/Response/SapiEmitter.php
+++ b/vendor/laminas/laminas-diactoros/src/Response/SapiEmitter.php
@@ -1,16 +1,17 @@
<?php
+
/**
- * @see https://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015-2018 Zend Technologies USA Inc. (http://www.zend.com)
- * @license https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
+ * @see https://github.com/laminas/laminas-diactoros for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-diactoros/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-diactoros/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Diactoros\Response;
+namespace Laminas\Diactoros\Response;
use Psr\Http\Message\ResponseInterface;
/**
- * @deprecated since 1.8.0. The package zendframework/zend-httphandlerrunner
+ * @deprecated since 1.8.0. The package laminas/laminas-httphandlerrunner
* now provides this functionality.
*/
class SapiEmitter implements EmitterInterface
diff --git a/vendor/zendframework/zend-diactoros/src/Response/SapiEmitterTrait.php b/vendor/laminas/laminas-diactoros/src/Response/SapiEmitterTrait.php
similarity index 86%
rename from vendor/zendframework/zend-diactoros/src/Response/SapiEmitterTrait.php
rename to vendor/laminas/laminas-diactoros/src/Response/SapiEmitterTrait.php
index a0c1107bbd..c7387674de 100644
--- a/vendor/zendframework/zend-diactoros/src/Response/SapiEmitterTrait.php
+++ b/vendor/laminas/laminas-diactoros/src/Response/SapiEmitterTrait.php
@@ -1,11 +1,12 @@
<?php
+
/**
- * @see https://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015-2018 Zend Technologies USA Inc. (http://www.zend.com)
- * @license https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
+ * @see https://github.com/laminas/laminas-diactoros for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-diactoros/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-diactoros/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Diactoros\Response;
+namespace Laminas\Diactoros\Response;
use Psr\Http\Message\ResponseInterface;
use RuntimeException;
@@ -17,7 +18,7 @@
use function ucwords;
/**
- * @deprecated since 1.8.0. The package zendframework/zend-httphandlerrunner
+ * @deprecated since 1.8.0. The package laminas/laminas-httphandlerrunner
* now provides this functionality.
*/
trait SapiEmitterTrait
@@ -54,7 +55,7 @@ private function assertNoPreviousOutput()
*
* @param ResponseInterface $response
*
- * @see \Zend\Diactoros\Response\SapiEmitterTrait::emitHeaders()
+ * @see \Laminas\Diactoros\Response\SapiEmitterTrait::emitHeaders()
*/
private function emitStatusLine(ResponseInterface $response)
{
diff --git a/vendor/zendframework/zend-diactoros/src/Response/SapiStreamEmitter.php b/vendor/laminas/laminas-diactoros/src/Response/SapiStreamEmitter.php
similarity index 89%
rename from vendor/zendframework/zend-diactoros/src/Response/SapiStreamEmitter.php
rename to vendor/laminas/laminas-diactoros/src/Response/SapiStreamEmitter.php
index 9da36ff843..b3cae5060b 100644
--- a/vendor/zendframework/zend-diactoros/src/Response/SapiStreamEmitter.php
+++ b/vendor/laminas/laminas-diactoros/src/Response/SapiStreamEmitter.php
@@ -1,11 +1,12 @@
<?php
+
/**
- * @see https://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015-2018 Zend Technologies USA Inc. (http://www.zend.com)
- * @license https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
+ * @see https://github.com/laminas/laminas-diactoros for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-diactoros/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-diactoros/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Diactoros\Response;
+namespace Laminas\Diactoros\Response;
use Psr\Http\Message\ResponseInterface;
@@ -15,7 +16,7 @@
use function substr;
/**
- * @deprecated since 1.8.0. The package zendframework/zend-httphandlerrunner
+ * @deprecated since 1.8.0. The package laminas/laminas-httphandlerrunner
* now provides this functionality.
*/
class SapiStreamEmitter implements EmitterInterface
diff --git a/vendor/zendframework/zend-diactoros/src/Response/Serializer.php b/vendor/laminas/laminas-diactoros/src/Response/Serializer.php
similarity index 88%
rename from vendor/zendframework/zend-diactoros/src/Response/Serializer.php
rename to vendor/laminas/laminas-diactoros/src/Response/Serializer.php
index 918643c6b7..05cf7b0cee 100644
--- a/vendor/zendframework/zend-diactoros/src/Response/Serializer.php
+++ b/vendor/laminas/laminas-diactoros/src/Response/Serializer.php
@@ -1,19 +1,20 @@
<?php
+
/**
- * @see https://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015-2017 Zend Technologies USA Inc. (http://www.zend.com)
- * @license https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
+ * @see https://github.com/laminas/laminas-diactoros for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-diactoros/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-diactoros/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Diactoros\Response;
+namespace Laminas\Diactoros\Response;
use InvalidArgumentException;
+use Laminas\Diactoros\AbstractSerializer;
+use Laminas\Diactoros\Response;
+use Laminas\Diactoros\Stream;
use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\StreamInterface;
use UnexpectedValueException;
-use Zend\Diactoros\AbstractSerializer;
-use Zend\Diactoros\Response;
-use Zend\Diactoros\Stream;
use function preg_match;
use function sprintf;
diff --git a/vendor/zendframework/zend-diactoros/src/Response/TextResponse.php b/vendor/laminas/laminas-diactoros/src/Response/TextResponse.php
similarity index 82%
rename from vendor/zendframework/zend-diactoros/src/Response/TextResponse.php
rename to vendor/laminas/laminas-diactoros/src/Response/TextResponse.php
index 6ed2a601ee..5f9fb4a83c 100644
--- a/vendor/zendframework/zend-diactoros/src/Response/TextResponse.php
+++ b/vendor/laminas/laminas-diactoros/src/Response/TextResponse.php
@@ -1,18 +1,17 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @see http://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015-2016 Zend Technologies USA Inc. (http://www.zend.com)
- * @license https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
+ * @see https://github.com/laminas/laminas-diactoros for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-diactoros/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-diactoros/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Diactoros\Response;
+namespace Laminas\Diactoros\Response;
use InvalidArgumentException;
+use Laminas\Diactoros\Response;
+use Laminas\Diactoros\Stream;
use Psr\Http\Message\StreamInterface;
-use Zend\Diactoros\Response;
-use Zend\Diactoros\Stream;
use function get_class;
use function gettype;
diff --git a/vendor/zendframework/zend-diactoros/src/Response/XmlResponse.php b/vendor/laminas/laminas-diactoros/src/Response/XmlResponse.php
similarity index 83%
rename from vendor/zendframework/zend-diactoros/src/Response/XmlResponse.php
rename to vendor/laminas/laminas-diactoros/src/Response/XmlResponse.php
index 5f81e9eeb8..cb3a850d1d 100644
--- a/vendor/zendframework/zend-diactoros/src/Response/XmlResponse.php
+++ b/vendor/laminas/laminas-diactoros/src/Response/XmlResponse.php
@@ -1,16 +1,17 @@
<?php
+
/**
- * @see https://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015-2017 Zend Technologies USA Inc. (http://www.zend.com)
- * @license https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
+ * @see https://github.com/laminas/laminas-diactoros for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-diactoros/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-diactoros/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Diactoros\Response;
+namespace Laminas\Diactoros\Response;
use InvalidArgumentException;
+use Laminas\Diactoros\Response;
+use Laminas\Diactoros\Stream;
use Psr\Http\Message\StreamInterface;
-use Zend\Diactoros\Response;
-use Zend\Diactoros\Stream;
use function get_class;
use function gettype;
diff --git a/vendor/zendframework/zend-diactoros/src/Server.php b/vendor/laminas/laminas-diactoros/src/Server.php
similarity index 92%
rename from vendor/zendframework/zend-diactoros/src/Server.php
rename to vendor/laminas/laminas-diactoros/src/Server.php
index cca3917aa5..778051fc4a 100644
--- a/vendor/zendframework/zend-diactoros/src/Server.php
+++ b/vendor/laminas/laminas-diactoros/src/Server.php
@@ -1,11 +1,12 @@
<?php
+
/**
- * @see https://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015-2018 Zend Technologies USA Inc. (http://www.zend.com)
- * @license https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
+ * @see https://github.com/laminas/laminas-diactoros for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-diactoros/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-diactoros/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Diactoros;
+namespace Laminas\Diactoros;
use OutOfBoundsException;
use Psr\Http\Message\ResponseInterface;
@@ -20,7 +21,7 @@
* callback, and then sends a response.
*
* @deprecated since 1.8.0. We recommend using the `RequestHandlerRunner` class
- * from the zendframework/zend-httphandlerrunner package instead.
+ * from the laminas/laminas-httphandlerrunner package instead.
*/
class Server
{
diff --git a/vendor/zendframework/zend-diactoros/src/ServerRequest.php b/vendor/laminas/laminas-diactoros/src/ServerRequest.php
similarity index 95%
rename from vendor/zendframework/zend-diactoros/src/ServerRequest.php
rename to vendor/laminas/laminas-diactoros/src/ServerRequest.php
index 8523d59e1a..3cbb665e0b 100644
--- a/vendor/zendframework/zend-diactoros/src/ServerRequest.php
+++ b/vendor/laminas/laminas-diactoros/src/ServerRequest.php
@@ -1,11 +1,12 @@
<?php
+
/**
- * @see https://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015-2017 Zend Technologies USA Inc. (http://www.zend.com)
- * @license https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
+ * @see https://github.com/laminas/laminas-diactoros for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-diactoros/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-diactoros/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Diactoros;
+namespace Laminas\Diactoros;
use InvalidArgumentException;
use Psr\Http\Message\ServerRequestInterface;
diff --git a/vendor/zendframework/zend-diactoros/src/ServerRequestFactory.php b/vendor/laminas/laminas-diactoros/src/ServerRequestFactory.php
similarity index 85%
rename from vendor/zendframework/zend-diactoros/src/ServerRequestFactory.php
rename to vendor/laminas/laminas-diactoros/src/ServerRequestFactory.php
index b56a0deee5..4563eae269 100644
--- a/vendor/zendframework/zend-diactoros/src/ServerRequestFactory.php
+++ b/vendor/laminas/laminas-diactoros/src/ServerRequestFactory.php
@@ -1,11 +1,12 @@
<?php
+
/**
- * @see https://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015-2017 Zend Technologies USA Inc. (http://www.zend.com)
- * @license https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
+ * @see https://github.com/laminas/laminas-diactoros for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-diactoros/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-diactoros/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Diactoros;
+namespace Laminas\Diactoros;
use InvalidArgumentException;
use Psr\Http\Message\UploadedFileInterface;
@@ -25,10 +26,10 @@
/**
* Class for marshaling a request object from the current PHP environment.
*
- * Logic largely refactored from the ZF2 Zend\Http\PhpEnvironment\Request class.
+ * Logic largely refactored from the Laminas Laminas\Http\PhpEnvironment\Request class.
*
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @copyright Copyright (c) 2005-2015 Laminas (https://www.zend.com)
+ * @license https://getlaminas.org/license/new-bsd New BSD License
*/
abstract class ServerRequestFactory
{
@@ -139,7 +140,7 @@ public static function getHeader($header, array $headers, $default = null)
*
* Pre-processes and returns the $_SERVER superglobal.
*
- * @deprected since 1.8.0; use Zend\Diactoros\normalizeServer() instead.
+ * @deprected since 1.8.0; use Laminas\Diactoros\normalizeServer() instead.
* @param array $server
* @return array
*/
@@ -157,7 +158,7 @@ public static function normalizeServer(array $server)
* Transforms each value into an UploadedFileInterface instance, and ensures
* that nested arrays are normalized.
*
- * @deprecated since 1.8.0; use \Zend\Diactoros\normalizeUploadedFiles instead.
+ * @deprecated since 1.8.0; use \Laminas\Diactoros\normalizeUploadedFiles instead.
* @param array $files
* @return array
* @throws InvalidArgumentException for unrecognized values
@@ -170,7 +171,7 @@ public static function normalizeFiles(array $files)
/**
* Marshal headers from $_SERVER
*
- * @deprecated since 1.8.0; use Zend\Diactoros\marshalHeadersFromSapi().
+ * @deprecated since 1.8.0; use Laminas\Diactoros\marshalHeadersFromSapi().
* @param array $server
* @return array
*/
@@ -182,7 +183,7 @@ public static function marshalHeaders(array $server)
/**
* Marshal the URI from the $_SERVER array and headers
*
- * @deprecated since 1.8.0; use Zend\Diactoros\marshalUriFromSapi() instead.
+ * @deprecated since 1.8.0; use Laminas\Diactoros\marshalUriFromSapi() instead.
* @param array $server
* @param array $headers
* @return Uri
@@ -195,7 +196,7 @@ public static function marshalUriFromServer(array $server, array $headers)
/**
* Marshal the host and port from HTTP headers and/or the PHP environment
*
- * @deprecated since 1.8.0; use Zend\Diactoros\marshalUriFromSapi() instead,
+ * @deprecated since 1.8.0; use Laminas\Diactoros\marshalUriFromSapi() instead,
* and pull the host and port from the Uri instance that function
* returns.
* @param stdClass $accumulator
@@ -215,7 +216,7 @@ public static function marshalHostAndPortFromHeaders(stdClass $accumulator, arra
* Looks at a variety of criteria in order to attempt to autodetect a base
* URI, including rewrite URIs, proxy URIs, etc.
*
- * @deprecated since 1.8.0; use Zend\Diactoros\marshalUriFromSapi() instead,
+ * @deprecated since 1.8.0; use Laminas\Diactoros\marshalUriFromSapi() instead,
* and pull the path from the Uri instance that function returns.
* @param array $server
* @return string
diff --git a/vendor/zendframework/zend-diactoros/src/Stream.php b/vendor/laminas/laminas-diactoros/src/Stream.php
similarity index 96%
rename from vendor/zendframework/zend-diactoros/src/Stream.php
rename to vendor/laminas/laminas-diactoros/src/Stream.php
index 20ee0577a1..97fb460125 100644
--- a/vendor/zendframework/zend-diactoros/src/Stream.php
+++ b/vendor/laminas/laminas-diactoros/src/Stream.php
@@ -1,11 +1,12 @@
<?php
+
/**
- * @see https://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015-2017 Zend Technologies USA Inc. (http://www.zend.com)
- * @license https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
+ * @see https://github.com/laminas/laminas-diactoros for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-diactoros/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-diactoros/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Diactoros;
+namespace Laminas\Diactoros;
use InvalidArgumentException;
use Psr\Http\Message\StreamInterface;
diff --git a/vendor/zendframework/zend-diactoros/src/UploadedFile.php b/vendor/laminas/laminas-diactoros/src/UploadedFile.php
similarity index 96%
rename from vendor/zendframework/zend-diactoros/src/UploadedFile.php
rename to vendor/laminas/laminas-diactoros/src/UploadedFile.php
index c260b0c13c..14735b5f4f 100644
--- a/vendor/zendframework/zend-diactoros/src/UploadedFile.php
+++ b/vendor/laminas/laminas-diactoros/src/UploadedFile.php
@@ -1,11 +1,12 @@
<?php
+
/**
- * @see https://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015-2017 Zend Technologies USA Inc. (http://www.zend.com)
- * @license https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
+ * @see https://github.com/laminas/laminas-diactoros for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-diactoros/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-diactoros/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Diactoros;
+namespace Laminas\Diactoros;
use InvalidArgumentException;
use Psr\Http\Message\StreamInterface;
diff --git a/vendor/zendframework/zend-diactoros/src/Uri.php b/vendor/laminas/laminas-diactoros/src/Uri.php
similarity index 98%
rename from vendor/zendframework/zend-diactoros/src/Uri.php
rename to vendor/laminas/laminas-diactoros/src/Uri.php
index 5dcfb0e235..3c4ea33fd4 100644
--- a/vendor/zendframework/zend-diactoros/src/Uri.php
+++ b/vendor/laminas/laminas-diactoros/src/Uri.php
@@ -1,11 +1,12 @@
<?php
+
/**
- * @see https://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015-2017 Zend Technologies USA Inc. (http://www.zend.com)
- * @license https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
+ * @see https://github.com/laminas/laminas-diactoros for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-diactoros/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-diactoros/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Diactoros;
+namespace Laminas\Diactoros;
use InvalidArgumentException;
use Psr\Http\Message\UriInterface;
diff --git a/vendor/laminas/laminas-diactoros/src/functions/create_uploaded_file.legacy.php b/vendor/laminas/laminas-diactoros/src/functions/create_uploaded_file.legacy.php
new file mode 100644
index 0000000000..6029d9baa8
--- /dev/null
+++ b/vendor/laminas/laminas-diactoros/src/functions/create_uploaded_file.legacy.php
@@ -0,0 +1,19 @@
+<?php
+
+/**
+ * @see https://github.com/laminas/laminas-diactoros for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-diactoros/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-diactoros/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Zend\Diactoros;
+
+use function Laminas\Diactoros\createUploadedFile as laminas_createUploadedFile;
+
+/**
+ * @deprecated Use Laminas\Diactoros\createUploadedFile instead
+ */
+function createUploadedFile(array $spec)
+{
+ return laminas_createUploadedFile(...func_get_args());
+}
diff --git a/vendor/zendframework/zend-diactoros/src/functions/create_uploaded_file.php b/vendor/laminas/laminas-diactoros/src/functions/create_uploaded_file.php
similarity index 74%
rename from vendor/zendframework/zend-diactoros/src/functions/create_uploaded_file.php
rename to vendor/laminas/laminas-diactoros/src/functions/create_uploaded_file.php
index 7b41a425e5..38e70ec331 100644
--- a/vendor/zendframework/zend-diactoros/src/functions/create_uploaded_file.php
+++ b/vendor/laminas/laminas-diactoros/src/functions/create_uploaded_file.php
@@ -1,11 +1,12 @@
<?php
+
/**
- * @see https://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2018 Zend Technologies USA Inc. (https://www.zend.com)
- * @license https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
+ * @see https://github.com/laminas/laminas-diactoros for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-diactoros/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-diactoros/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Diactoros;
+namespace Laminas\Diactoros;
use InvalidArgumentException;
diff --git a/vendor/laminas/laminas-diactoros/src/functions/marshal_headers_from_sapi.legacy.php b/vendor/laminas/laminas-diactoros/src/functions/marshal_headers_from_sapi.legacy.php
new file mode 100644
index 0000000000..f4ea8d88f0
--- /dev/null
+++ b/vendor/laminas/laminas-diactoros/src/functions/marshal_headers_from_sapi.legacy.php
@@ -0,0 +1,19 @@
+<?php
+
+/**
+ * @see https://github.com/laminas/laminas-diactoros for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-diactoros/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-diactoros/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Zend\Diactoros;
+
+use function Laminas\Diactoros\marshalHeadersFromSapi as laminas_marshalHeadersFromSapi;
+
+/**
+ * @deprecated Use Laminas\Diactoros\marshalHeadersFromSapi instead
+ */
+function marshalHeadersFromSapi(array $server)
+{
+ return laminas_marshalHeadersFromSapi(...func_get_args());
+}
diff --git a/vendor/zendframework/zend-diactoros/src/functions/marshal_headers_from_sapi.php b/vendor/laminas/laminas-diactoros/src/functions/marshal_headers_from_sapi.php
similarity index 79%
rename from vendor/zendframework/zend-diactoros/src/functions/marshal_headers_from_sapi.php
rename to vendor/laminas/laminas-diactoros/src/functions/marshal_headers_from_sapi.php
index abb75afede..6bbb80f6a8 100644
--- a/vendor/zendframework/zend-diactoros/src/functions/marshal_headers_from_sapi.php
+++ b/vendor/laminas/laminas-diactoros/src/functions/marshal_headers_from_sapi.php
@@ -1,11 +1,12 @@
<?php
+
/**
- * @see https://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2018 Zend Technologies USA Inc. (https://www.zend.com)
- * @license https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
+ * @see https://github.com/laminas/laminas-diactoros for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-diactoros/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-diactoros/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Diactoros;
+namespace Laminas\Diactoros;
use function array_key_exists;
use function strpos;
diff --git a/vendor/laminas/laminas-diactoros/src/functions/marshal_method_from_sapi.legacy.php b/vendor/laminas/laminas-diactoros/src/functions/marshal_method_from_sapi.legacy.php
new file mode 100644
index 0000000000..e5bc7f8eae
--- /dev/null
+++ b/vendor/laminas/laminas-diactoros/src/functions/marshal_method_from_sapi.legacy.php
@@ -0,0 +1,19 @@
+<?php
+
+/**
+ * @see https://github.com/laminas/laminas-diactoros for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-diactoros/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-diactoros/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Zend\Diactoros;
+
+use function Laminas\Diactoros\marshalMethodFromSapi as laminas_marshalMethodFromSapi;
+
+/**
+ * @deprecated Use Laminas\Diactoros\marshalMethodFromSapi instead
+ */
+function marshalMethodFromSapi(array $server)
+{
+ return laminas_marshalMethodFromSapi(...func_get_args());
+}
diff --git a/vendor/laminas/laminas-diactoros/src/functions/marshal_method_from_sapi.php b/vendor/laminas/laminas-diactoros/src/functions/marshal_method_from_sapi.php
new file mode 100644
index 0000000000..0d3d05fc10
--- /dev/null
+++ b/vendor/laminas/laminas-diactoros/src/functions/marshal_method_from_sapi.php
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * @see https://github.com/laminas/laminas-diactoros for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-diactoros/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-diactoros/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Laminas\Diactoros;
+
+/**
+ * Retrieve the request method from the SAPI parameters.
+ *
+ * @param array $server
+ * @return string
+ */
+function marshalMethodFromSapi(array $server)
+{
+ return isset($server['REQUEST_METHOD']) ? $server['REQUEST_METHOD'] : 'GET';
+}
diff --git a/vendor/laminas/laminas-diactoros/src/functions/marshal_protocol_version_from_sapi.legacy.php b/vendor/laminas/laminas-diactoros/src/functions/marshal_protocol_version_from_sapi.legacy.php
new file mode 100644
index 0000000000..250e2d7de1
--- /dev/null
+++ b/vendor/laminas/laminas-diactoros/src/functions/marshal_protocol_version_from_sapi.legacy.php
@@ -0,0 +1,19 @@
+<?php
+
+/**
+ * @see https://github.com/laminas/laminas-diactoros for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-diactoros/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-diactoros/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Zend\Diactoros;
+
+use function Laminas\Diactoros\marshalProtocolVersionFromSapi as laminas_marshalProtocolVersionFromSapi;
+
+/**
+ * @deprecated Use Laminas\Diactoros\marshalProtocolVersionFromSapi instead
+ */
+function marshalProtocolVersionFromSapi(array $server)
+{
+ return laminas_marshalProtocolVersionFromSapi(...func_get_args());
+}
diff --git a/vendor/zendframework/zend-diactoros/src/functions/marshal_protocol_version_from_sapi.php b/vendor/laminas/laminas-diactoros/src/functions/marshal_protocol_version_from_sapi.php
similarity index 70%
rename from vendor/zendframework/zend-diactoros/src/functions/marshal_protocol_version_from_sapi.php
rename to vendor/laminas/laminas-diactoros/src/functions/marshal_protocol_version_from_sapi.php
index 915b6da287..50acf41788 100644
--- a/vendor/zendframework/zend-diactoros/src/functions/marshal_protocol_version_from_sapi.php
+++ b/vendor/laminas/laminas-diactoros/src/functions/marshal_protocol_version_from_sapi.php
@@ -1,11 +1,12 @@
<?php
+
/**
- * @see https://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2018 Zend Technologies USA Inc. (https://www.zend.com)
- * @license https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
+ * @see https://github.com/laminas/laminas-diactoros for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-diactoros/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-diactoros/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Diactoros;
+namespace Laminas\Diactoros;
use UnexpectedValueException;
diff --git a/vendor/laminas/laminas-diactoros/src/functions/marshal_uri_from_sapi.legacy.php b/vendor/laminas/laminas-diactoros/src/functions/marshal_uri_from_sapi.legacy.php
new file mode 100644
index 0000000000..7543b9e7e2
--- /dev/null
+++ b/vendor/laminas/laminas-diactoros/src/functions/marshal_uri_from_sapi.legacy.php
@@ -0,0 +1,19 @@
+<?php
+
+/**
+ * @see https://github.com/laminas/laminas-diactoros for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-diactoros/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-diactoros/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Zend\Diactoros;
+
+use function Laminas\Diactoros\marshalUriFromSapi as laminas_marshalUriFromSapi;
+
+/**
+ * @deprecated Use Laminas\Diactoros\marshalUriFromSapi instead
+ */
+function marshalUriFromSapi(array $server, array $headers)
+{
+ return laminas_marshalUriFromSapi(...func_get_args());
+}
diff --git a/vendor/zendframework/zend-diactoros/src/functions/marshal_uri_from_sapi.php b/vendor/laminas/laminas-diactoros/src/functions/marshal_uri_from_sapi.php
similarity index 92%
rename from vendor/zendframework/zend-diactoros/src/functions/marshal_uri_from_sapi.php
rename to vendor/laminas/laminas-diactoros/src/functions/marshal_uri_from_sapi.php
index eba3d1ec46..045e575fc7 100644
--- a/vendor/zendframework/zend-diactoros/src/functions/marshal_uri_from_sapi.php
+++ b/vendor/laminas/laminas-diactoros/src/functions/marshal_uri_from_sapi.php
@@ -1,11 +1,12 @@
<?php
+
/**
- * @see https://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2018 Zend Technologies USA Inc. (https://www.zend.com)
- * @license https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
+ * @see https://github.com/laminas/laminas-diactoros for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-diactoros/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-diactoros/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Diactoros;
+namespace Laminas\Diactoros;
use function array_change_key_case;
use function array_key_exists;
@@ -130,9 +131,7 @@ function marshalUriFromSapi(array $server, array $headers)
* - REQUEST_URI
* - ORIG_PATH_INFO
*
- * From ZF2's Zend\Http\PhpEnvironment\Request class
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * From Laminas\Http\PhpEnvironment\Request class
*
* @param array $server SAPI environment array (typically `$_SERVER`)
* @return string Discovered path
diff --git a/vendor/laminas/laminas-diactoros/src/functions/normalize_server.legacy.php b/vendor/laminas/laminas-diactoros/src/functions/normalize_server.legacy.php
new file mode 100644
index 0000000000..3115fd1d3a
--- /dev/null
+++ b/vendor/laminas/laminas-diactoros/src/functions/normalize_server.legacy.php
@@ -0,0 +1,19 @@
+<?php
+
+/**
+ * @see https://github.com/laminas/laminas-diactoros for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-diactoros/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-diactoros/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Zend\Diactoros;
+
+use function Laminas\Diactoros\normalizeServer as laminas_normalizeServer;
+
+/**
+ * @deprecated Use Laminas\Diactoros\normalizeServer instead
+ */
+function normalizeServer(array $server, callable $apacheRequestHeaderCallback = null)
+{
+ return laminas_normalizeServer(...func_get_args());
+}
diff --git a/vendor/zendframework/zend-diactoros/src/functions/normalize_server.php b/vendor/laminas/laminas-diactoros/src/functions/normalize_server.php
similarity index 83%
rename from vendor/zendframework/zend-diactoros/src/functions/normalize_server.php
rename to vendor/laminas/laminas-diactoros/src/functions/normalize_server.php
index 2db4a4a010..9a43b814da 100644
--- a/vendor/zendframework/zend-diactoros/src/functions/normalize_server.php
+++ b/vendor/laminas/laminas-diactoros/src/functions/normalize_server.php
@@ -1,11 +1,12 @@
<?php
+
/**
- * @see https://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2018 Zend Technologies USA Inc. (https://www.zend.com)
- * @license https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
+ * @see https://github.com/laminas/laminas-diactoros for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-diactoros/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-diactoros/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Diactoros;
+namespace Laminas\Diactoros;
use function is_callable;
diff --git a/vendor/laminas/laminas-diactoros/src/functions/normalize_uploaded_files.legacy.php b/vendor/laminas/laminas-diactoros/src/functions/normalize_uploaded_files.legacy.php
new file mode 100644
index 0000000000..7172a44547
--- /dev/null
+++ b/vendor/laminas/laminas-diactoros/src/functions/normalize_uploaded_files.legacy.php
@@ -0,0 +1,19 @@
+<?php
+
+/**
+ * @see https://github.com/laminas/laminas-diactoros for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-diactoros/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-diactoros/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Zend\Diactoros;
+
+use function Laminas\Diactoros\normalizeUploadedFiles as laminas_normalizeUploadedFiles;
+
+/**
+ * @deprecated Use Laminas\Diactoros\normalizeUploadedFiles instead
+ */
+function normalizeUploadedFiles(array $files)
+{
+ return laminas_normalizeUploadedFiles(...func_get_args());
+}
diff --git a/vendor/zendframework/zend-diactoros/src/functions/normalize_uploaded_files.php b/vendor/laminas/laminas-diactoros/src/functions/normalize_uploaded_files.php
similarity index 93%
rename from vendor/zendframework/zend-diactoros/src/functions/normalize_uploaded_files.php
rename to vendor/laminas/laminas-diactoros/src/functions/normalize_uploaded_files.php
index fb33500593..ce88b5d4cf 100644
--- a/vendor/zendframework/zend-diactoros/src/functions/normalize_uploaded_files.php
+++ b/vendor/laminas/laminas-diactoros/src/functions/normalize_uploaded_files.php
@@ -1,11 +1,12 @@
<?php
+
/**
- * @see https://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2018 Zend Technologies USA Inc. (https://www.zend.com)
- * @license https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
+ * @see https://github.com/laminas/laminas-diactoros for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-diactoros/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-diactoros/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Diactoros;
+namespace Laminas\Diactoros;
use InvalidArgumentException;
use Psr\Http\Message\UploadedFileInterface;
diff --git a/vendor/laminas/laminas-diactoros/src/functions/parse_cookie_header.legacy.php b/vendor/laminas/laminas-diactoros/src/functions/parse_cookie_header.legacy.php
new file mode 100644
index 0000000000..0fee5703f6
--- /dev/null
+++ b/vendor/laminas/laminas-diactoros/src/functions/parse_cookie_header.legacy.php
@@ -0,0 +1,19 @@
+<?php
+
+/**
+ * @see https://github.com/laminas/laminas-diactoros for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-diactoros/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-diactoros/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Zend\Diactoros;
+
+use function Laminas\Diactoros\parseCookieHeader as laminas_parseCookieHeader;
+
+/**
+ * @deprecated Use Laminas\Diactoros\parseCookieHeader instead
+ */
+function parseCookieHeader($cookieHeader)
+{
+ return laminas_parseCookieHeader(...func_get_args());
+}
diff --git a/vendor/zendframework/zend-diactoros/src/functions/parse_cookie_header.php b/vendor/laminas/laminas-diactoros/src/functions/parse_cookie_header.php
similarity index 75%
rename from vendor/zendframework/zend-diactoros/src/functions/parse_cookie_header.php
rename to vendor/laminas/laminas-diactoros/src/functions/parse_cookie_header.php
index b3b565147f..9a9365953c 100644
--- a/vendor/zendframework/zend-diactoros/src/functions/parse_cookie_header.php
+++ b/vendor/laminas/laminas-diactoros/src/functions/parse_cookie_header.php
@@ -1,11 +1,12 @@
<?php
+
/**
- * @see https://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2018 Zend Technologies USA Inc. (https://www.zend.com)
- * @license https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
+ * @see https://github.com/laminas/laminas-diactoros for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-diactoros/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-diactoros/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Diactoros;
+namespace Laminas\Diactoros;
use function preg_match_all;
use function urldecode;
diff --git a/vendor/laminas/laminas-escaper/CHANGELOG.md b/vendor/laminas/laminas-escaper/CHANGELOG.md
new file mode 100644
index 0000000000..086e889c4d
--- /dev/null
+++ b/vendor/laminas/laminas-escaper/CHANGELOG.md
@@ -0,0 +1,73 @@
+# Changelog
+
+All notable changes to this project will be documented in this file, in reverse chronological order by release.
+
+## 2.6.1 - 2019-09-05
+
+### Added
+
+- [zendframework/zend-escaper#32](https://github.com/zendframework/zend-escaper/pull/32) adds support for PHP 7.3.
+
+### Changed
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Nothing.
+
+## 2.6.0 - 2018-04-25
+
+### Added
+
+- [zendframework/zend-escaper#28](https://github.com/zendframework/zend-escaper/pull/28) adds support for PHP 7.1 and 7.2.
+
+### Changed
+
+- [zendframework/zend-escaper#25](https://github.com/zendframework/zend-escaper/pull/25) changes the behavior of the `Escaper` constructor; it now raises an
+ exception for non-null, non-string `$encoding` arguments.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- [zendframework/zend-escaper#28](https://github.com/zendframework/zend-escaper/pull/28) removes support for PHP 5.5.
+
+- [zendframework/zend-escaper#28](https://github.com/zendframework/zend-escaper/pull/28) removes support for HHVM.
+
+### Fixed
+
+- Nothing.
+
+## 2.5.2 - 2016-06-30
+
+### Added
+
+- [zendframework/zend-escaper#11](https://github.com/zendframework/zend-escaper/pull/11),
+ [zendframework/zend-escaper#12](https://github.com/zendframework/zend-escaper/pull/12), and
+ [zendframework/zend-escaper#13](https://github.com/zendframework/zend-escaper/pull/13) prepare and
+ publish documentation to https://docs.laminas.dev/laminas-escaper/
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [zendframework/zend-escaper#3](https://github.com/zendframework/zend-escaper/pull/3) updates the
+ the escaping mechanism to add support for escaping characters outside the Basic
+ Multilingual Plane when escaping for JS, CSS, or HTML attributes.
diff --git a/vendor/laminas/laminas-escaper/COPYRIGHT.md b/vendor/laminas/laminas-escaper/COPYRIGHT.md
new file mode 100644
index 0000000000..c4fc4fee19
--- /dev/null
+++ b/vendor/laminas/laminas-escaper/COPYRIGHT.md
@@ -0,0 +1,2 @@
+Copyright (c) 2019, Laminas Foundation.
+All rights reserved. (https://getlaminas.org/)
diff --git a/vendor/zendframework/zend-escaper/LICENSE.md b/vendor/laminas/laminas-escaper/LICENSE.md
similarity index 68%
rename from vendor/zendframework/zend-escaper/LICENSE.md
rename to vendor/laminas/laminas-escaper/LICENSE.md
index 4bc22a4a47..09f53edc11 100644
--- a/vendor/zendframework/zend-escaper/LICENSE.md
+++ b/vendor/laminas/laminas-escaper/LICENSE.md
@@ -1,19 +1,19 @@
-Copyright (c) 2005-2019, Zend Technologies USA, Inc.
+Copyright (c) 2019, Laminas Foundation
All rights reserved.
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
- Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright notice, this
- list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
+- Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
-- Neither the name of Zend Technologies USA, Inc. nor the names of its
- contributors may be used to endorse or promote products derived from this
- software without specific prior written permission.
+- Neither the name of Laminas Foundation nor the names of its contributors may
+ be used to endorse or promote products derived from this software without
+ specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
diff --git a/vendor/laminas/laminas-escaper/README.md b/vendor/laminas/laminas-escaper/README.md
new file mode 100644
index 0000000000..a779778a73
--- /dev/null
+++ b/vendor/laminas/laminas-escaper/README.md
@@ -0,0 +1,28 @@
+# laminas-escaper
+
+[](https://travis-ci.org/laminas/laminas-escaper)
+[](https://coveralls.io/github/laminas/laminas-escaper?branch=master)
+
+The OWASP Top 10 web security risks study lists Cross-Site Scripting (XSS) in
+second place. PHP’s sole functionality against XSS is limited to two functions
+of which one is commonly misapplied. Thus, the laminas-escaper component was written.
+It offers developers a way to escape output and defend from XSS and related
+vulnerabilities by introducing contextual escaping based on peer-reviewed rules.
+
+## Installation
+
+Run the following to install this library:
+
+```bash
+$ composer require laminas/laminas-escaper
+```
+
+## Documentation
+
+Browse the documentation online at https://docs.laminas.dev/laminas-escaper/
+
+## Support
+
+* [Issues](https://github.com/laminas/laminas-escaper/issues/)
+* [Chat](https://laminas.dev/chat/)
+* [Forum](https://discourse.laminas.dev/)
diff --git a/vendor/zendframework/zend-escaper/composer.json b/vendor/laminas/laminas-escaper/composer.json
similarity index 50%
rename from vendor/zendframework/zend-escaper/composer.json
rename to vendor/laminas/laminas-escaper/composer.json
index 890d03aded..c39174ff52 100644
--- a/vendor/zendframework/zend-escaper/composer.json
+++ b/vendor/laminas/laminas-escaper/composer.json
@@ -1,44 +1,45 @@
{
- "name": "zendframework/zend-escaper",
+ "name": "laminas/laminas-escaper",
"description": "Securely and safely escape HTML, HTML attributes, JavaScript, CSS, and URLs",
"license": "BSD-3-Clause",
"keywords": [
- "zf",
- "zendframework",
+ "laminas",
"escaper"
],
+ "homepage": "https://laminas.dev",
"support": {
- "docs": "https://docs.zendframework.com/zend-escaper/",
- "issues": "https://github.com/zendframework/zend-escaper/issues",
- "source": "https://github.com/zendframework/zend-escaper",
- "rss": "https://github.com/zendframework/zend-escaper/releases.atom",
- "chat": "https://zendframework-slack.herokuapp.com",
- "forum": "https://discourse.zendframework.com/c/questions/components"
+ "docs": "https://docs.laminas.dev/laminas-escaper/",
+ "issues": "https://github.com/laminas/laminas-escaper/issues",
+ "source": "https://github.com/laminas/laminas-escaper",
+ "rss": "https://github.com/laminas/laminas-escaper/releases.atom",
+ "chat": "https://laminas.dev/chat",
+ "forum": "https://discourse.laminas.dev"
+ },
+ "config": {
+ "sort-packages": true
+ },
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.6.x-dev",
+ "dev-develop": "2.7.x-dev"
+ }
},
"require": {
- "php": "^5.6 || ^7.0"
+ "php": "^5.6 || ^7.0",
+ "laminas/laminas-zendframework-bridge": "^1.0"
},
"require-dev": {
- "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2",
- "zendframework/zend-coding-standard": "~1.0.0"
+ "laminas/laminas-coding-standard": "~1.0.0",
+ "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2"
},
"autoload": {
"psr-4": {
- "Zend\\Escaper\\": "src/"
+ "Laminas\\Escaper\\": "src/"
}
},
"autoload-dev": {
"psr-4": {
- "ZendTest\\Escaper\\": "test/"
- }
- },
- "config": {
- "sort-packages": true
- },
- "extra": {
- "branch-alias": {
- "dev-master": "2.6.x-dev",
- "dev-develop": "2.7.x-dev"
+ "LaminasTest\\Escaper\\": "test/"
}
},
"scripts": {
@@ -50,5 +51,8 @@
"cs-fix": "phpcbf",
"test": "phpunit --colors=always",
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
+ },
+ "replace": {
+ "zendframework/zend-escaper": "self.version"
}
}
diff --git a/vendor/zendframework/zend-escaper/src/Escaper.php b/vendor/laminas/laminas-escaper/src/Escaper.php
similarity index 97%
rename from vendor/zendframework/zend-escaper/src/Escaper.php
rename to vendor/laminas/laminas-escaper/src/Escaper.php
index 5cec9684ef..9f903a5931 100644
--- a/vendor/zendframework/zend-escaper/src/Escaper.php
+++ b/vendor/laminas/laminas-escaper/src/Escaper.php
@@ -1,13 +1,12 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-escaper for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-escaper/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-escaper/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Escaper;
+namespace Laminas\Escaper;
/**
* Context specific methods for use in secure output escaping
diff --git a/vendor/laminas/laminas-escaper/src/Exception/ExceptionInterface.php b/vendor/laminas/laminas-escaper/src/Exception/ExceptionInterface.php
new file mode 100644
index 0000000000..7ebe04ef6b
--- /dev/null
+++ b/vendor/laminas/laminas-escaper/src/Exception/ExceptionInterface.php
@@ -0,0 +1,13 @@
+<?php
+
+/**
+ * @see https://github.com/laminas/laminas-escaper for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-escaper/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-escaper/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Laminas\Escaper\Exception;
+
+interface ExceptionInterface
+{
+}
diff --git a/vendor/laminas/laminas-escaper/src/Exception/InvalidArgumentException.php b/vendor/laminas/laminas-escaper/src/Exception/InvalidArgumentException.php
new file mode 100644
index 0000000000..f5bf1fa5c0
--- /dev/null
+++ b/vendor/laminas/laminas-escaper/src/Exception/InvalidArgumentException.php
@@ -0,0 +1,17 @@
+<?php
+
+/**
+ * @see https://github.com/laminas/laminas-escaper for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-escaper/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-escaper/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Laminas\Escaper\Exception;
+
+/**
+ * Invalid argument exception
+ */
+class InvalidArgumentException extends \InvalidArgumentException implements
+ ExceptionInterface
+{
+}
diff --git a/vendor/laminas/laminas-escaper/src/Exception/RuntimeException.php b/vendor/laminas/laminas-escaper/src/Exception/RuntimeException.php
new file mode 100644
index 0000000000..ab1903fd2b
--- /dev/null
+++ b/vendor/laminas/laminas-escaper/src/Exception/RuntimeException.php
@@ -0,0 +1,17 @@
+<?php
+
+/**
+ * @see https://github.com/laminas/laminas-escaper for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-escaper/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-escaper/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Laminas\Escaper\Exception;
+
+/**
+ * Invalid argument exception
+ */
+class RuntimeException extends \RuntimeException implements
+ ExceptionInterface
+{
+}
diff --git a/vendor/laminas/laminas-feed/CHANGELOG.md b/vendor/laminas/laminas-feed/CHANGELOG.md
new file mode 100644
index 0000000000..4ecd8832c3
--- /dev/null
+++ b/vendor/laminas/laminas-feed/CHANGELOG.md
@@ -0,0 +1,519 @@
+# Changelog
+
+All notable changes to this project will be documented in this file, in reverse chronological order by release.
+
+## 2.12.2 - 2020-03-29
+
+### Added
+
+- Nothing.
+
+### Changed
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Fixed `replace` version constraint in composer.json so repository can be used as replacement of `zendframework/zend-feed:^2.12.0`.
+
+## 2.12.1 - 2020-03-23
+
+### Added
+
+- Nothing.
+
+### Changed
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [#17](https://github.com/laminas/laminas-feed/pull/17) fixes regular expression to extract content from atom feeds.
+
+## 2.12.0 - 2019-03-05
+
+### Added
+
+- [zendframework/zend-feed#96](https://github.com/zendframework/zend-feed/pull/96) adds the methods `Laminas\Feed\Reader\Extension\Podcast\Entry::getTitle() : string`
+ and `Laminas\Feed\Writer\Extension\ITunes\Entry::setTitle(string $value)`; these
+ provide the ability to read and manipulate `<itunes:title>` tags in feeds.
+
+### Changed
+
+- Nothing.
+
+### Deprecated
+
+- [zendframework/zend-feed#101](https://github.com/zendframework/zend-feed/pull/101) deprecates the method `Laminas\Feed\Writer\Writer::lcfirst()`; use the PHP
+ built-in function instead.
+
+- [zendframework/zend-feed#97](https://github.com/zendframework/zend-feed/pull/97) deprecates the classes `Laminas\Feed\Reader\AbstractEntry` (use
+ `Laminas\Feed\Reader\Entry\AbstractEntry` instead), `Laminas\Feed\Reader\AbstractFeed` (use `Laminas\Feed\Reader\Feed\AbstractFeed` instead), and
+ `Laminas\Feed\Reader\Collection` (use Laminas\Feed\Reader\Collection\Author`, `Laminas\Feed\Reader\Collection\Category`, or
+ `Laminas\Feed\Reader\Collection\Collection` instead, based on context).
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Nothing.
+
+## 2.11.1 - 2019-03-05
+
+### Added
+
+- Nothing.
+
+### Changed
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [zendframework/zend-feed#99](https://github.com/zendframework/zend-feed/pull/99) provides a fix to `Laminas\Feed\Writer\Renderer\Entry\Rss` to ensure that
+ relative URIs provided for the feed disable the `isPermalink` flag.
+
+- [zendframework/zend-feed#100](https://github.com/zendframework/zend-feed/pull/100) fixes parameter and return value annotations for a number of classes to
+ specify the correct types.
+
+## 2.11.0 - 2019-01-29
+
+### Added
+
+- [zendframework/zend-feed#94](https://github.com/zendframework/zend-feed/pull/94) adds support for PHP 7.3.
+
+- [zendframework/zend-feed#91](https://github.com/zendframework/zend-feed/pull/91) adds explicit requirements for both ext-dom and ext-libxml to the package.
+
+### Changed
+
+- [zendframework/zend-feed#93](https://github.com/zendframework/zend-feed/pull/93) `Writer\Feed`, `Writer\Entry` and `Writer\Deleted` all now accept
+ `DateTimeImmutable` instances as an arguments to methods that previously only
+ accepted `DateTime` or Unix Timestamps, such as `Writer\Feed::setDateModified()`.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- [zendframework/zend-feed#94](https://github.com/zendframework/zend-feed/pull/94) removes support for laminas-stdlib v2 releases.
+
+### Fixed
+
+- Nothing.
+
+## 2.10.3 - 2018-08-01
+
+### Added
+
+- Nothing.
+
+### Changed
+
+- This release modifies how `Laminas\Feed\Pubsubhubbub\AbstractCallback::_detectCallbackUrl()`
+ marshals the request URI. In prior releases, we would attempt to inspect the
+ `X-Rewrite-Url` and `X-Original-Url` headers, using their values, if present.
+ These headers are issued by the ISAPI_Rewrite module for IIS (developed by
+ HeliconTech). However, we have no way of guaranteeing that the module is what
+ issued the headers, making it an unreliable source for discovering the URI. As
+ such, we have removed this feature in this release.
+
+ The method is not called internally. If you are calling the method from your
+ own extension and need support for ISAPI_Rewrite, you will need to override
+ the method as follows:
+
+ ```php
+ protected function _detectCallbackUrl()
+ {
+ $callbackUrl = null;
+ if (isset($_SERVER['HTTP_X_REWRITE_URL'])) {
+ $callbackUrl = $_SERVER['HTTP_X_REWRITE_URL'];
+ }
+ if (isset($_SERVER['HTTP_X_ORIGINAL_URL'])) {
+ $callbackUrl = $_SERVER['HTTP_X_ORIGINAL_URL'];
+ }
+
+ return $callbackUrl ?: parent::__detectCallbackUrl();
+ }
+ ```
+
+ If you use an approach such as the above, make sure you also instruct your web
+ server to strip any incoming headers of the same name so that you can
+ guarantee they are issued by the ISAPI_Rewrite module.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Nothing.
+
+## 2.10.2 - 2018-06-18
+
+### Added
+
+- Nothing.
+
+### Changed
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [zendframework/zend-feed#81](https://github.com/zendframework/zend-feed/pull/81) updates the `Laminas\Feed\Reader\Reader` and `Laminas\Feed\Writer\Writer` classes to
+ conditionally register their respective "GooglePlayPodcast" extensions only if
+ their extension managers are aware of it. This is done due to the fact that
+ existing `ExtensionManagerInterface` implementations may not register it by
+ default as the extension did not exist in releases prior to 2.10.0. By having
+ the registration conditional, we prevent an exception from being raised; users
+ are not impacted by its absence, as the extension features were not exposed
+ previously.
+
+ Both `Reader` and `Writer` emit an `E_USER_NOTICE` when the extension is not
+ found in the extension manager, indicating that the
+ `ExtensionManagerInterface` implementation should be updated to add entries
+ for the "GooglePlayPodcast" entry, feed, and/or renderer classes.
+
+## 2.10.1 - 2018-06-05
+
+### Added
+
+- Nothing.
+
+### Changed
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [zendframework/zend-feed#79](https://github.com/zendframework/zend-feed/pull/79) fixes an issue in the `setType()` method of the iTunes feed renderer whereby it was setting
+ the DOM content with an uninitialized variable.
+
+## 2.10.0 - 2018-05-24
+
+### Added
+
+- [zendframework/zend-feed#78](https://github.com/zendframework/zend-feed/pull/78) adds support for the Google Play Podcasts 1.0 DTD in both the Reader and
+ Writer subcomponents. The following new classes provide the support:
+
+ - `Laminas\Feed\Reader\Extension\GooglePlayPodcast\Entry`
+ - `Laminas\Feed\Reader\Extension\GooglePlayPodcast\Feed`
+ - `Laminas\Feed\Writer\Extension\GooglePlayPodcast\Entry`
+ - `Laminas\Feed\Writer\Extension\GooglePlayPodcast\Feed`
+ - `Laminas\Feed\Writer\Extension\GooglePlayPodcast\Renderer\Entry`
+ - `Laminas\Feed\Writer\Extension\GooglePlayPodcast\Renderer\Feed`
+
+ The extensions are registered by default with both `Laminas\Feed\Reader\Reader`
+ and `Laminas\Feed\Writer\Writer`.
+
+- [zendframework/zend-feed#77](https://github.com/zendframework/zend-feed/pull/77) adds support for `itunes:image` for each of:
+ - `Laminas\Feed\Reader\Extension\Podcast\Entry`, via `getItunesImage()`; previously only the `Feed` supported it.
+ - `Laminas\Feed\Writer\Extension\ITunes\Entry`, via `setItunesImage()`; previously only the `Feed` supported it.
+ - `Laminas\Feed\Writer\Extension\ITunes\Renderer\Entry`; previously on the `Feed` supported it.
+
+- [zendframework/zend-feed#75](https://github.com/zendframework/zend-feed/pull/75) adds `Laminas\Feed\Writer\Extension\ITunes\Entry::setItunesSeason()`, corresponding to the
+ `itunes:season` tag, and allowing setting the season number of the episode the
+ entry represents.
+
+- [zendframework/zend-feed#75](https://github.com/zendframework/zend-feed/pull/75) adds `Laminas\Feed\Writer\Extension\ITunes\Entry::setItunesIsClosedCaptioned()`, corresponding to the
+ `itunes:isClosedCaptioned` tag, and allowing setting the status of closed
+ captioning support in the episode the entry represents.
+
+- [zendframework/zend-feed#75](https://github.com/zendframework/zend-feed/pull/75) adds `Laminas\Feed\Writer\Extension\ITunes\Entry::setItunesEpisodeType()`, corresponding to the
+ `itunes:episodeType` tag, and allowing setting the type of episode the entry represents
+ (one of "full", "trailer", or "bonus", and defaulting to "full").
+
+- [zendframework/zend-feed#75](https://github.com/zendframework/zend-feed/pull/75) adds `Laminas\Feed\Writer\Extension\ITunes\Entry::setEpisode()`, corresponding to the
+ `itunes:episode` tag, and allowing setting the number of the episode the entry represents.
+
+- [zendframework/zend-feed#75](https://github.com/zendframework/zend-feed/pull/75) adds `Laminas\Feed\Writer\Extension\ITunes\Feed::setItunesComplete()`, corresponding to the
+ `itunes:complete` tag. It allows setting a boolean flag, indicating whether or not the
+ podcast is complete (will not air new episodes).
+
+- [zendframework/zend-feed#75](https://github.com/zendframework/zend-feed/pull/75) adds `Laminas\Feed\Writer\Extension\ITunes\Feed::setItunesType()`, corresponding to the
+ `itunes:type` tag, and allowing setting the podcast type (one of "serial" or "episodic").
+
+- [zendframework/zend-feed#75](https://github.com/zendframework/zend-feed/pull/75) adds `Laminas\Feed\Reader\Extension\Podcast\Entry::getEpisodeType()`, corresponding to the
+ `itunes:episodeType` tag, and returning the type of episode the entry represents
+ (one of "full", "trailer", or "bonus", and defaulting to "full").
+
+- [zendframework/zend-feed#75](https://github.com/zendframework/zend-feed/pull/75) adds `Laminas\Feed\Reader\Extension\Podcast\Entry::getSeason()`, corresponding to the
+ `itunes:season` tag, and returning the season number of the episode the entry represents.
+
+- [zendframework/zend-feed#75](https://github.com/zendframework/zend-feed/pull/75) adds `Laminas\Feed\Reader\Extension\Podcast\Entry::isClsoedCaptioned()`, corresponding to the
+ `itunes:isClosedCaptioned` tag, and returning the status of closed captioning
+ in the episode the entry represents.
+
+- [zendframework/zend-feed#75](https://github.com/zendframework/zend-feed/pull/75) adds `Laminas\Feed\Reader\Extension\Podcast\Entry::getEpisode()`, corresponding to the
+ `itunes:episode` tag, and returning the number of the episode the entry represents.
+
+- [zendframework/zend-feed#75](https://github.com/zendframework/zend-feed/pull/75) adds `Laminas\Feed\Reader\Extension\Podcast\Feed::isComplete()`, corresponding to the
+ `itunes:complete` tag. It returns a boolean, indicating whether or not the podcast is
+ complete (will not air new episodes).
+
+- [zendframework/zend-feed#75](https://github.com/zendframework/zend-feed/pull/75) adds `Laminas\Feed\Reader\Extension\Podcast\Feed::getPodcastType()`, corresponding to the
+ `itunes:type` tag, and providing the podcast type (one of "serial" or "episodic", defaulting
+ to the latter).
+
+### Changed
+
+- [zendframework/zend-feed#77](https://github.com/zendframework/zend-feed/pull/77) updates URI validation for `Laminas\Feed\Writer\Extension\ITunes\Feed::setItunesImage()` to
+ first check that we have received a string value before proceeding.
+
+### Deprecated
+
+- [zendframework/zend-feed#75](https://github.com/zendframework/zend-feed/pull/75) deprecates each of:
+ - `Laminas\Feed\Reader\Extension\Podcast\Entry::getKeywords()`
+ - `Laminas\Feed\Reader\Extension\Podcast\Feed::getKeywords()`
+ - `Laminas\Feed\Writer\Extension\ITunes\Entry::setKeywords()`
+ - `Laminas\Feed\Writer\Extension\ITunes\Feed::setKeywords()`
+ as the iTunes Podcast RSS specification no longer supports keywords.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Nothing.
+
+## 2.9.1 - 2018-05-14
+
+### Added
+
+- Nothing.
+
+### Changed
+
+- [zendframework/zend-feed#16](https://github.com/zendframework/zend-feed/pull/16) updates the `Laminas\Feed\Pubsubhubbub\AbstractCallback` to no longer use the
+ `$GLOBALS['HTTP_RAW_POST_DATA']` value as a fallback when `php://input` is
+ empty. The fallback existed because, prior to PHP 5.6, `php://input` could
+ only be read once. As we now require PHP 5.6, the fallback is unnecessary,
+ and best removed as the globals value is deprecated.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [zendframework/zend-feed#68](https://github.com/zendframework/zend-feed/pull/68) fixes the behavior of `Laminas\Feed\Writer\AbstractFeed::setTitle()` and
+ `Laminas\Feed\Writer\Entry::setTitle()` to accept the string `"0"`.
+
+- [zendframework/zend-feed#68](https://github.com/zendframework/zend-feed/pull/68) updates both `Laminas\Feed\Writer\AbstractFeed` and `Laminas\Feed\Writer\Entry`
+ to no longer throw an exception for entry titles which have a string value of `0`.
+
+## 2.9.0 - 2017-12-04
+
+### Added
+
+- [zendframework/zend-feed#52](https://github.com/zendframework/zend-feed/pull/52) adds support for PHP
+ 7.2
+
+- [zendframework/zend-feed#53](https://github.com/zendframework/zend-feed/pull/53) adds a number of
+ additional aliases to the `Writer\ExtensionPluginManager` to ensure plugins
+ will be pulled as expected.
+
+- [zendframework/zend-feed#63](https://github.com/zendframework/zend-feed/pull/63) adds the feed title
+ to the attributes incorporated in the `FeedSet` instance, per what was already
+ documented.
+
+- [zendframework/zend-feed#55](https://github.com/zendframework/zend-feed/pull/55) makes two API
+ additions to the `StandaloneExtensionManager` implementations of both the reader
+ and writer subcomponents:
+
+ - `$manager->add($name, $class)` will add an extension class using the
+ provided name.
+ - `$manager->remove($name)` will remove an existing extension by the provided
+ name.
+
+### Changed
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- [zendframework/zend-feed#52](https://github.com/zendframework/zend-feed/pull/52) removes support for
+ HHVM.
+
+### Fixed
+
+- [zendframework/zend-feed#50](https://github.com/zendframework/zend-feed/pull/50) fixes a few issues
+ in the PubSubHubbub `Subscription` model where counting was being performed on
+ uncountable data; this ensures the subcomponent will work correctly under PHP
+ 7.2.
+
+## 2.8.0 - 2017-04-02
+
+### Added
+
+- [zendframework/zend-feed#27](https://github.com/zendframework/zend-feed/pull/27) adds a documentation
+ chapter demonstrating wrapping a PSR-7 client to use with `Laminas\Feed\Reader`.
+- [zendframework/zend-feed#22](https://github.com/zendframework/zend-feed/pull/22) adds missing
+ ExtensionManagerInterface on Writer\ExtensionPluginManager.
+- [zendframework/zend-feed#32](https://github.com/zendframework/zend-feed/pull/32) adds missing
+ ExtensionManagerInterface on Reader\ExtensionPluginManager.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- [zendframework/zend-feed#38](https://github.com/zendframework/zend-feed/pull/38) dropped php 5.5
+ support
+
+### Fixed
+
+- [zendframework/zend-feed#35](https://github.com/zendframework/zend-feed/pull/35) fixed
+ "A non-numeric value encountered" in php 7.1
+- [zendframework/zend-feed#39](https://github.com/zendframework/zend-feed/pull/39) fixed protocol
+ relative link absolutisation
+- [zendframework/zend-feed#40](https://github.com/zendframework/zend-feed/pull/40) fixed service
+ manager v3 compatibility aliases in extension plugin managers
+
+## 2.7.0 - 2016-02-11
+
+### Added
+
+- [zendframework/zend-feed#21](https://github.com/zendframework/zend-feed/pull/21) edits, revises, and
+ prepares the documentation for publication at https://docs.laminas.dev/laminas-feed/
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [zendframework/zend-feed#20](https://github.com/zendframework/zend-feed/pull/20) makes the two
+ laminas-servicemanager extension manager implementations forwards compatible
+ with version 3, and the overall code base forwards compatible with laminas-stdlib
+ v3.
+
+## 2.6.0 - 2015-11-24
+
+### Added
+
+- [zendframework/zend-feed#13](https://github.com/zendframework/zend-feed/pull/13) introduces
+ `Laminas\Feed\Writer\StandaloneExtensionManager`, an implementation of
+ `Laminas\Feed\Writer\ExtensionManagerInterface` that has no dependencies.
+ `Laminas\Feed\Writer\ExtensionManager` now composes this by default, instead of
+ `Laminas\Feed\Writer\ExtensionPluginManager`, for managing the various feed and
+ entry extensions. If you relied on `ExtensionPluginManager` previously, you
+ will need to create an instance manually and inject it into the `Writer`
+ instance.
+- [zendframework/zend-feed#14](https://github.com/zendframework/zend-feed/pull/14) introduces:
+ - `Laminas\Feed\Reader\Http\HeaderAwareClientInterface`, which extends
+ `ClientInterface` and adds an optional argument to the `get()` method,
+ `array $headers = []`; this argument allows specifying request headers for
+ the client to send. `$headers` should have header names for keys, and the
+ values should be arrays of strings/numbers representing the header values
+ (if only a single value is necessary, it should be represented as an single
+ value array).
+ - `Laminas\Feed\Reader\Http\HeaderAwareResponseInterface`, which extends
+ `ResponseInterface` and adds the method `getHeader($name, $default = null)`.
+ Clients may return either a `ResponseInterface` or
+ `HeaderAwareResponseInterface` instance.
+ - `Laminas\Feed\Reader\Http\Response`, which is an implementation of
+ `HeaderAwareResponseInterface`. Its constructor accepts the status code,
+ body, and, optionally, headers.
+ - `Laminas\Feed\Reader\Http\Psr7ResponseDecorator`, which is an implementation of
+ `HeaderAwareResponseInterface`. Its constructor accepts a PSR-7 response
+ instance, and the various methdos then proxy to those methods. This should
+ make creating wrappers for PSR-7 HTTP clients trivial.
+ - `Laminas\Feed\Reader\Http\LaminasHttpClientDecorator`, which decorates a
+ `Laminas\Http\Client` instance, implements `HeaderAwareClientInterface`, and
+ returns a `Response` instance seeded from the laminas-http response upon
+ calling `get()`. The class exposes a `getDecoratedClient()` method to allow
+ retrieval of the decorated laminas-http client instance.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [zendframework/zend-feed#5](https://github.com/zendframework/zend-feed/pull/5) fixes the enclosure
+ length check to allow zero and integer strings.
+- [zendframework/zend-feed#2](https://github.com/zendframework/zend-feed/pull/2) ensures that the
+ routine for "absolutising" a link in `Reader\FeedSet` always generates a URI
+ with a scheme.
+- [zendframework/zend-feed#14](https://github.com/zendframework/zend-feed/pull/14) makes the following
+ changes to fix behavior around HTTP clients used within
+ `Laminas\Feed\Reader\Reader`:
+ - `setHttpClient()` now ensures that the passed client is either a
+ `Laminas\Feed\Reader\Http\ClientInterface` or `Laminas\Http\Client`, raising an
+ `InvalidArgumentException` if neither. If a `Laminas\Http\Client` is passed, it
+ is passed to the constructor of `Laminas\Feed\Reader\Http\LaminasHttpClientDecorator`,
+ and the decorator instance is used.
+ - `getHttpClient()` now *always* returns a `Laminas\Feed\Reader\Http\ClientInterface`
+ instance. If no instance is currently registered, it lazy loads a
+ `LaminasHttpClientDecorator` instance.
+ - `import()` was updated to consume a `ClientInterface` instance; when caches
+ are in play, it checks the client against `HeaderAwareClientInterface` to
+ determine if it can check for HTTP caching headers, and, if so, to retrieve
+ them.
+ - `findFeedLinks()` was updated to consume a `ClientInterface`.
diff --git a/vendor/laminas/laminas-feed/COPYRIGHT.md b/vendor/laminas/laminas-feed/COPYRIGHT.md
new file mode 100644
index 0000000000..f68704698d
--- /dev/null
+++ b/vendor/laminas/laminas-feed/COPYRIGHT.md
@@ -0,0 +1,2 @@
+Copyright (c) 2019-2020, Laminas Foundation.
+All rights reserved. (https://getlaminas.org/)
diff --git a/vendor/zendframework/zend-feed/LICENSE.md b/vendor/laminas/laminas-feed/LICENSE.md
similarity index 68%
rename from vendor/zendframework/zend-feed/LICENSE.md
rename to vendor/laminas/laminas-feed/LICENSE.md
index 63df4102cd..16fe8690cc 100644
--- a/vendor/zendframework/zend-feed/LICENSE.md
+++ b/vendor/laminas/laminas-feed/LICENSE.md
@@ -1,19 +1,19 @@
-Copyright (c) 2005-2017, Zend Technologies USA, Inc.
+Copyright (c) 2019-2020, Laminas Foundation
All rights reserved.
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
- Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.
-- Redistributions in binary form must reproduce the above copyright notice, this
- list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
+- Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
-- Neither the name of Zend Technologies USA, Inc. nor the names of its
- contributors may be used to endorse or promote products derived from this
- software without specific prior written permission.
+- Neither the name of Laminas Foundation nor the names of its contributors may
+ be used to endorse or promote products derived from this software without
+ specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
diff --git a/vendor/laminas/laminas-feed/README.md b/vendor/laminas/laminas-feed/README.md
new file mode 100644
index 0000000000..11ebe49ef9
--- /dev/null
+++ b/vendor/laminas/laminas-feed/README.md
@@ -0,0 +1,12 @@
+# laminas-feed
+
+[](https://travis-ci.com/laminas/laminas-feed)
+[](https://coveralls.io/github/laminas/laminas-feed?branch=master)
+
+`Laminas\Feed` provides functionality for consuming RSS and Atom feeds. It provides
+a natural syntax for accessing elements of feeds, feed attributes, and entry
+attributes. `Laminas\Feed` also has extensive support for modifying feed and entry
+structure with the same natural syntax, and turning the result back into XML.
+
+- File issues at https://github.com/laminas/laminas-feed/issues
+- Documentation is at https://docs.laminas.dev/laminas-feed/
diff --git a/vendor/laminas/laminas-feed/composer.json b/vendor/laminas/laminas-feed/composer.json
new file mode 100644
index 0000000000..0b0f8e9c06
--- /dev/null
+++ b/vendor/laminas/laminas-feed/composer.json
@@ -0,0 +1,76 @@
+{
+ "name": "laminas/laminas-feed",
+ "description": "provides functionality for consuming RSS and Atom feeds",
+ "license": "BSD-3-Clause",
+ "keywords": [
+ "laminas",
+ "feed"
+ ],
+ "homepage": "https://laminas.dev",
+ "support": {
+ "docs": "https://docs.laminas.dev/laminas-feed/",
+ "issues": "https://github.com/laminas/laminas-feed/issues",
+ "source": "https://github.com/laminas/laminas-feed",
+ "rss": "https://github.com/laminas/laminas-feed/releases.atom",
+ "chat": "https://laminas.dev/chat",
+ "forum": "https://discourse.laminas.dev"
+ },
+ "config": {
+ "sort-packages": true
+ },
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.12.x-dev",
+ "dev-develop": "2.13.x-dev"
+ }
+ },
+ "require": {
+ "php": "^5.6 || ^7.0",
+ "ext-dom": "*",
+ "ext-libxml": "*",
+ "laminas/laminas-escaper": "^2.5.2",
+ "laminas/laminas-stdlib": "^3.2.1",
+ "laminas/laminas-zendframework-bridge": "^1.0"
+ },
+ "require-dev": {
+ "laminas/laminas-cache": "^2.7.2",
+ "laminas/laminas-coding-standard": "~1.0.0",
+ "laminas/laminas-db": "^2.8.2",
+ "laminas/laminas-http": "^2.7",
+ "laminas/laminas-servicemanager": "^2.7.8 || ^3.3",
+ "laminas/laminas-validator": "^2.10.1",
+ "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.20",
+ "psr/http-message": "^1.0.1"
+ },
+ "suggest": {
+ "laminas/laminas-cache": "Laminas\\Cache component, for optionally caching feeds between requests",
+ "laminas/laminas-db": "Laminas\\Db component, for use with PubSubHubbub",
+ "laminas/laminas-http": "Laminas\\Http for PubSubHubbub, and optionally for use with Laminas\\Feed\\Reader",
+ "laminas/laminas-servicemanager": "Laminas\\ServiceManager component, for easily extending ExtensionManager implementations",
+ "laminas/laminas-validator": "Laminas\\Validator component, for validating email addresses used in Atom feeds and entries when using the Writer subcomponent",
+ "psr/http-message": "PSR-7 ^1.0.1, if you wish to use Laminas\\Feed\\Reader\\Http\\Psr7ResponseDecorator"
+ },
+ "autoload": {
+ "psr-4": {
+ "Laminas\\Feed\\": "src/"
+ }
+ },
+ "autoload-dev": {
+ "psr-4": {
+ "LaminasTest\\Feed\\": "test/"
+ }
+ },
+ "scripts": {
+ "check": [
+ "@cs-check",
+ "@test"
+ ],
+ "cs-check": "phpcs",
+ "cs-fix": "phpcbf",
+ "test": "phpunit --colors=always",
+ "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
+ },
+ "replace": {
+ "zendframework/zend-feed": "^2.12.0"
+ }
+}
diff --git a/vendor/laminas/laminas-feed/src/Exception/BadMethodCallException.php b/vendor/laminas/laminas-feed/src/Exception/BadMethodCallException.php
new file mode 100644
index 0000000000..3ed11ed8de
--- /dev/null
+++ b/vendor/laminas/laminas-feed/src/Exception/BadMethodCallException.php
@@ -0,0 +1,13 @@
+<?php
+
+/**
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Laminas\Feed\Exception;
+
+class BadMethodCallException extends \BadMethodCallException implements ExceptionInterface
+{
+}
diff --git a/vendor/laminas/laminas-feed/src/Exception/ExceptionInterface.php b/vendor/laminas/laminas-feed/src/Exception/ExceptionInterface.php
new file mode 100644
index 0000000000..03fe3eb6b3
--- /dev/null
+++ b/vendor/laminas/laminas-feed/src/Exception/ExceptionInterface.php
@@ -0,0 +1,13 @@
+<?php
+
+/**
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Laminas\Feed\Exception;
+
+interface ExceptionInterface
+{
+}
diff --git a/vendor/laminas/laminas-feed/src/Exception/InvalidArgumentException.php b/vendor/laminas/laminas-feed/src/Exception/InvalidArgumentException.php
new file mode 100644
index 0000000000..6acf51c7ef
--- /dev/null
+++ b/vendor/laminas/laminas-feed/src/Exception/InvalidArgumentException.php
@@ -0,0 +1,13 @@
+<?php
+
+/**
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Laminas\Feed\Exception;
+
+class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
+{
+}
diff --git a/vendor/laminas/laminas-feed/src/Exception/RuntimeException.php b/vendor/laminas/laminas-feed/src/Exception/RuntimeException.php
new file mode 100644
index 0000000000..41dbc73c5f
--- /dev/null
+++ b/vendor/laminas/laminas-feed/src/Exception/RuntimeException.php
@@ -0,0 +1,13 @@
+<?php
+
+/**
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Laminas\Feed\Exception;
+
+class RuntimeException extends \RuntimeException implements ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zend-feed/src/PubSubHubbub/AbstractCallback.php b/vendor/laminas/laminas-feed/src/PubSubHubbub/AbstractCallback.php
similarity index 76%
rename from vendor/zendframework/zend-feed/src/PubSubHubbub/AbstractCallback.php
rename to vendor/laminas/laminas-feed/src/PubSubHubbub/AbstractCallback.php
index 80624f7529..1805485cbf 100644
--- a/vendor/zendframework/zend-feed/src/PubSubHubbub/AbstractCallback.php
+++ b/vendor/laminas/laminas-feed/src/PubSubHubbub/AbstractCallback.php
@@ -1,37 +1,36 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\PubSubHubbub;
+namespace Laminas\Feed\PubSubHubbub;
+use Laminas\Http\PhpEnvironment\Response as PhpResponse;
+use Laminas\Stdlib\ArrayUtils;
use Traversable;
-use Zend\Http\PhpEnvironment\Response as PhpResponse;
-use Zend\Stdlib\ArrayUtils;
abstract class AbstractCallback implements CallbackInterface
{
/**
- * An instance of Zend\Feed\Pubsubhubbub\Model\SubscriptionPersistenceInterface
+ * An instance of Laminas\Feed\Pubsubhubbub\Model\SubscriptionPersistenceInterface
* used to background save any verification tokens associated with a subscription
* or other.
*
* @var Model\SubscriptionPersistenceInterface
*/
- protected $storage = null;
+ protected $storage;
/**
* An instance of a class handling Http Responses. This is implemented in
- * Zend\Feed\Pubsubhubbub\HttpResponse which shares an unenforced interface with
- * (i.e. not inherited from) Zend\Controller\Response\Http.
+ * Laminas\Feed\Pubsubhubbub\HttpResponse which shares an unenforced interface with
+ * (i.e. not inherited from) Laminas\Controller\Response\Http.
*
* @var HttpResponse|PhpResponse
*/
- protected $httpResponse = null;
+ protected $httpResponse;
/**
* The input stream to use when retrieving the request body. Defaults to
@@ -39,7 +38,7 @@ abstract class AbstractCallback implements CallbackInterface
* of another input method. This should primarily be used for testing
* purposes.
*
- * @var string|resource String indicates a filename or stream to open;
+ * @var resource|string String indicates a filename or stream to open;
* resource indicates an already created stream to use.
*/
protected $inputStream = 'php://input';
@@ -56,7 +55,7 @@ abstract class AbstractCallback implements CallbackInterface
* options for the Subscriber without calling all supported setter
* methods in turn.
*
- * @param array|Traversable $options Options array or Traversable object
+ * @param null|array|Traversable $options Options array or Traversable object
*/
public function __construct($options = null)
{
@@ -69,7 +68,7 @@ public function __construct($options = null)
* Process any injected configuration options
*
* @param array|Traversable $options Options array or Traversable object
- * @return AbstractCallback
+ * @return $this
* @throws Exception\InvalidArgumentException
*/
public function setOptions($options)
@@ -79,8 +78,9 @@ public function setOptions($options)
}
if (! is_array($options)) {
- throw new Exception\InvalidArgumentException('Array or Traversable object'
- . 'expected, got ' . gettype($options));
+ throw new Exception\InvalidArgumentException(
+ 'Array or Traversable object expected, got ' . gettype($options)
+ );
}
if (is_array($options)) {
@@ -95,7 +95,7 @@ public function setOptions($options)
/**
* Send the response, including all headers.
- * If you wish to handle this via Zend\Http, use the getter methods
+ * If you wish to handle this via Laminas\Http, use the getter methods
* to retrieve any data needed to be set on your HTTP Response object, or
* simply give this object the HTTP Response instance to work with for you!
*
@@ -107,12 +107,11 @@ public function sendResponse()
}
/**
- * Sets an instance of Zend\Feed\Pubsubhubbub\Model\SubscriptionPersistence used
+ * Sets an instance of Laminas\Feed\Pubsubhubbub\Model\SubscriptionPersistence used
* to background save any verification tokens associated with a subscription
* or other.
*
- * @param Model\SubscriptionPersistenceInterface $storage
- * @return AbstractCallback
+ * @return $this
*/
public function setStorage(Model\SubscriptionPersistenceInterface $storage)
{
@@ -121,7 +120,7 @@ public function setStorage(Model\SubscriptionPersistenceInterface $storage)
}
/**
- * Gets an instance of Zend\Feed\Pubsubhubbub\Model\SubscriptionPersistence used
+ * Gets an instance of Laminas\Feed\Pubsubhubbub\Model\SubscriptionPersistence used
* to background save any verification tokens associated with a subscription
* or other.
*
@@ -131,27 +130,31 @@ public function setStorage(Model\SubscriptionPersistenceInterface $storage)
public function getStorage()
{
if ($this->storage === null) {
- throw new Exception\RuntimeException('No storage object has been'
- . ' set that subclasses Zend\Feed\Pubsubhubbub\Model\SubscriptionPersistence');
+ throw new Exception\RuntimeException(
+ 'No storage object has been set that subclasses'
+ . ' Laminas\Feed\Pubsubhubbub\Model\SubscriptionPersistence'
+ );
}
return $this->storage;
}
/**
* An instance of a class handling Http Responses. This is implemented in
- * Zend\Feed\Pubsubhubbub\HttpResponse which shares an unenforced interface with
- * (i.e. not inherited from) Zend\Controller\Response\Http.
+ * Laminas\Feed\Pubsubhubbub\HttpResponse which shares an unenforced interface with
+ * (i.e. not inherited from) Laminas\Controller\Response\Http.
*
* @param HttpResponse|PhpResponse $httpResponse
- * @return AbstractCallback
+ * @return $this
* @throws Exception\InvalidArgumentException
*/
public function setHttpResponse($httpResponse)
{
if (! $httpResponse instanceof HttpResponse && ! $httpResponse instanceof PhpResponse) {
- throw new Exception\InvalidArgumentException('HTTP Response object must'
- . ' implement one of Zend\Feed\Pubsubhubbub\HttpResponse or'
- . ' Zend\Http\PhpEnvironment\Response');
+ throw new Exception\InvalidArgumentException(
+ 'HTTP Response object must'
+ . ' implement one of Laminas\Feed\Pubsubhubbub\HttpResponse or'
+ . ' Laminas\Http\PhpEnvironment\Response'
+ );
}
$this->httpResponse = $httpResponse;
return $this;
@@ -159,15 +162,15 @@ public function setHttpResponse($httpResponse)
/**
* An instance of a class handling Http Responses. This is implemented in
- * Zend\Feed\Pubsubhubbub\HttpResponse which shares an unenforced interface with
- * (i.e. not inherited from) Zend\Controller\Response\Http.
+ * Laminas\Feed\Pubsubhubbub\HttpResponse which shares an unenforced interface with
+ * (i.e. not inherited from) Laminas\Controller\Response\Http.
*
* @return HttpResponse|PhpResponse
*/
public function getHttpResponse()
{
if ($this->httpResponse === null) {
- $this->httpResponse = new HttpResponse;
+ $this->httpResponse = new HttpResponse();
}
return $this->httpResponse;
}
@@ -177,16 +180,18 @@ public function getHttpResponse()
* In other words, is this class serving one or more subscribers? How many?
* Defaults to 1 if left unchanged.
*
- * @param string|int $count
- * @return AbstractCallback
+ * @param int|string $count
+ * @return $this
* @throws Exception\InvalidArgumentException
*/
public function setSubscriberCount($count)
{
$count = intval($count);
if ($count <= 0) {
- throw new Exception\InvalidArgumentException('Subscriber count must be'
- . ' greater than zero');
+ throw new Exception\InvalidArgumentException(
+ 'Subscriber count must be'
+ . ' greater than zero'
+ );
}
$this->subscriberCount = $count;
return $this;
@@ -205,6 +210,7 @@ public function getSubscriberCount()
/**
* Attempt to detect the callback URL (specifically the path forward)
+ *
* @return string
*/
// @codingStandardsIgnoreStart
@@ -268,7 +274,7 @@ protected function _getHttpHost()
/**
* Retrieve a Header value from either $_SERVER or Apache
*
- * @param string $header
+ * @param string $header
* @return bool|string
*/
// @codingStandardsIgnoreStart
@@ -295,7 +301,7 @@ protected function _getHeader($header)
/**
* Return the raw body of the request
*
- * @return string|false Raw body, or false if not present
+ * @return false|string Raw body, or false if not present
*/
// @codingStandardsIgnoreStart
protected function _getRawBody()
@@ -316,8 +322,8 @@ protected function _getRawBody()
private function buildCallbackUrlFromRequestUri()
{
$callbackUrl = $_SERVER['REQUEST_URI'];
- $https = isset($_SERVER['HTTPS']) ? $_SERVER['HTTPS'] : null;
- $scheme = $https === 'on' ? 'https' : 'http';
+ $https = isset($_SERVER['HTTPS']) ? $_SERVER['HTTPS'] : null;
+ $scheme = $https === 'on' ? 'https' : 'http';
if ($https === 'on') {
$scheme = 'https';
}
diff --git a/vendor/zendframework/zend-feed/src/PubSubHubbub/CallbackInterface.php b/vendor/laminas/laminas-feed/src/PubSubHubbub/CallbackInterface.php
similarity index 51%
rename from vendor/zendframework/zend-feed/src/PubSubHubbub/CallbackInterface.php
rename to vendor/laminas/laminas-feed/src/PubSubHubbub/CallbackInterface.php
index c6b7412fd0..61a3ee9421 100644
--- a/vendor/zendframework/zend-feed/src/PubSubHubbub/CallbackInterface.php
+++ b/vendor/laminas/laminas-feed/src/PubSubHubbub/CallbackInterface.php
@@ -1,13 +1,12 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\PubSubHubbub;
+namespace Laminas\Feed\PubSubHubbub;
interface CallbackInterface
{
@@ -16,14 +15,14 @@ interface CallbackInterface
* unsubscription request. This should be the Hub Server confirming the
* the request prior to taking action on it.
*
- * @param array $httpData GET/POST data if available and not in $_GET/POST
+ * @param null|array $httpData GET/POST data if available and not in $_GET/POST
* @param bool $sendResponseNow Whether to send response now or when asked
*/
public function handle(array $httpData = null, $sendResponseNow = false);
/**
* Send the response, including all headers.
- * If you wish to handle this via Zend\Mvc\Controller, use the getter methods
+ * If you wish to handle this via Laminas\Mvc\Controller, use the getter methods
* to retrieve any data needed to be set on your HTTP Response object, or
* simply give this object the HTTP Response instance to work with for you!
*
@@ -33,19 +32,19 @@ public function sendResponse();
/**
* An instance of a class handling Http Responses. This is implemented in
- * Zend\Feed\Pubsubhubbub\HttpResponse which shares an unenforced interface with
- * (i.e. not inherited from) Zend\Feed\Pubsubhubbub\AbstractCallback.
+ * Laminas\Feed\Pubsubhubbub\HttpResponse which shares an unenforced interface with
+ * (i.e. not inherited from) Laminas\Feed\Pubsubhubbub\AbstractCallback.
*
- * @param HttpResponse|\Zend\Http\PhpEnvironment\Response $httpResponse
+ * @param HttpResponse|\Laminas\Http\PhpEnvironment\Response $httpResponse
*/
public function setHttpResponse($httpResponse);
/**
* An instance of a class handling Http Responses. This is implemented in
- * Zend\Feed\Pubsubhubbub\HttpResponse which shares an unenforced interface with
- * (i.e. not inherited from) Zend\Feed\Pubsubhubbub\AbstractCallback.
+ * Laminas\Feed\Pubsubhubbub\HttpResponse which shares an unenforced interface with
+ * (i.e. not inherited from) Laminas\Feed\Pubsubhubbub\AbstractCallback.
*
- * @return HttpResponse|\Zend\Http\PhpEnvironment\Response
+ * @return HttpResponse|\Laminas\Http\PhpEnvironment\Response
*/
public function getHttpResponse();
}
diff --git a/vendor/laminas/laminas-feed/src/PubSubHubbub/Exception/ExceptionInterface.php b/vendor/laminas/laminas-feed/src/PubSubHubbub/Exception/ExceptionInterface.php
new file mode 100644
index 0000000000..a633e604c9
--- /dev/null
+++ b/vendor/laminas/laminas-feed/src/PubSubHubbub/Exception/ExceptionInterface.php
@@ -0,0 +1,15 @@
+<?php
+
+/**
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Laminas\Feed\PubSubHubbub\Exception;
+
+use Laminas\Feed\Exception\ExceptionInterface as Exception;
+
+interface ExceptionInterface extends Exception
+{
+}
diff --git a/vendor/laminas/laminas-feed/src/PubSubHubbub/Exception/InvalidArgumentException.php b/vendor/laminas/laminas-feed/src/PubSubHubbub/Exception/InvalidArgumentException.php
new file mode 100644
index 0000000000..8f71189f51
--- /dev/null
+++ b/vendor/laminas/laminas-feed/src/PubSubHubbub/Exception/InvalidArgumentException.php
@@ -0,0 +1,15 @@
+<?php
+
+/**
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Laminas\Feed\PubSubHubbub\Exception;
+
+use Laminas\Feed\Exception;
+
+class InvalidArgumentException extends Exception\InvalidArgumentException implements ExceptionInterface
+{
+}
diff --git a/vendor/laminas/laminas-feed/src/PubSubHubbub/Exception/RuntimeException.php b/vendor/laminas/laminas-feed/src/PubSubHubbub/Exception/RuntimeException.php
new file mode 100644
index 0000000000..4da8a038f4
--- /dev/null
+++ b/vendor/laminas/laminas-feed/src/PubSubHubbub/Exception/RuntimeException.php
@@ -0,0 +1,15 @@
+<?php
+
+/**
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Laminas\Feed\PubSubHubbub\Exception;
+
+use Laminas\Feed\Exception;
+
+class RuntimeException extends Exception\RuntimeException implements ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zend-feed/src/PubSubHubbub/HttpResponse.php b/vendor/laminas/laminas-feed/src/PubSubHubbub/HttpResponse.php
similarity index 90%
rename from vendor/zendframework/zend-feed/src/PubSubHubbub/HttpResponse.php
rename to vendor/laminas/laminas-feed/src/PubSubHubbub/HttpResponse.php
index b658affada..9a0acc458e 100644
--- a/vendor/zendframework/zend-feed/src/PubSubHubbub/HttpResponse.php
+++ b/vendor/laminas/laminas-feed/src/PubSubHubbub/HttpResponse.php
@@ -1,13 +1,12 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\PubSubHubbub;
+namespace Laminas\Feed\PubSubHubbub;
class HttpResponse
{
@@ -81,7 +80,7 @@ public function sendHeaders()
* @param string $name
* @param string $value
* @param bool $replace
- * @return \Zend\Feed\PubSubHubbub\HttpResponse
+ * @return $this
*/
public function setHeader($name, $value, $replace = false)
{
@@ -151,14 +150,13 @@ public function canSendHeaders($throw = false)
* Set HTTP response code to use with headers
*
* @param int $code
- * @return HttpResponse
+ * @return $this
* @throws Exception\InvalidArgumentException
*/
public function setStatusCode($code)
{
if (! is_int($code) || (100 > $code) || (599 < $code)) {
- throw new Exception\InvalidArgumentException('Invalid HTTP response'
- . ' code:' . $code);
+ throw new Exception\InvalidArgumentException('Invalid HTTP response code: ' . $code);
}
$this->statusCode = $code;
return $this;
@@ -178,7 +176,7 @@ public function getStatusCode()
* Set body content
*
* @param string $content
- * @return \Zend\Feed\PubSubHubbub\HttpResponse
+ * @return $this
*/
public function setContent($content)
{
diff --git a/vendor/laminas/laminas-feed/src/PubSubHubbub/Model/AbstractModel.php b/vendor/laminas/laminas-feed/src/PubSubHubbub/Model/AbstractModel.php
new file mode 100644
index 0000000000..099dbc4d4b
--- /dev/null
+++ b/vendor/laminas/laminas-feed/src/PubSubHubbub/Model/AbstractModel.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Laminas\Feed\PubSubHubbub\Model;
+
+use Laminas\Db\TableGateway\TableGateway;
+use Laminas\Db\TableGateway\TableGatewayInterface;
+
+class AbstractModel
+{
+ /**
+ * Laminas\Db\TableGateway\TableGatewayInterface instance to host database methods
+ *
+ * @var TableGatewayInterface
+ */
+ protected $db;
+
+ public function __construct(TableGatewayInterface $tableGateway = null)
+ {
+ if ($tableGateway === null) {
+ $parts = explode('\\', get_class($this));
+ $table = strtolower(array_pop($parts));
+ $this->db = new TableGateway($table, null);
+ } else {
+ $this->db = $tableGateway;
+ }
+ }
+}
diff --git a/vendor/zendframework/zend-feed/src/PubSubHubbub/Model/Subscription.php b/vendor/laminas/laminas-feed/src/PubSubHubbub/Model/Subscription.php
similarity index 81%
rename from vendor/zendframework/zend-feed/src/PubSubHubbub/Model/Subscription.php
rename to vendor/laminas/laminas-feed/src/PubSubHubbub/Model/Subscription.php
index 9780b6a8d8..6bd8c74586 100644
--- a/vendor/zendframework/zend-feed/src/PubSubHubbub/Model/Subscription.php
+++ b/vendor/laminas/laminas-feed/src/PubSubHubbub/Model/Subscription.php
@@ -1,17 +1,16 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\PubSubHubbub\Model;
+namespace Laminas\Feed\PubSubHubbub\Model;
use DateInterval;
use DateTime;
-use Zend\Feed\PubSubHubbub;
+use Laminas\Feed\PubSubHubbub;
class Subscription extends AbstractModel implements SubscriptionPersistenceInterface
{
@@ -25,7 +24,6 @@ class Subscription extends AbstractModel implements SubscriptionPersistenceInter
/**
* Save subscription to RDMBS
*
- * @param array $data
* @return bool
* @throws PubSubHubbub\Exception\InvalidArgumentException
*/
@@ -39,7 +37,7 @@ public function setSubscription(array $data)
$result = $this->db->select(['id' => $data['id']]);
if ($result && (0 < count($result))) {
$data['created_time'] = $result->current()->created_time;
- $now = $this->getNow();
+ $now = $this->getNow();
if (array_key_exists('lease_seconds', $data)
&& $data['lease_seconds']
) {
@@ -67,8 +65,9 @@ public function setSubscription(array $data)
public function getSubscription($key)
{
if (empty($key) || ! is_string($key)) {
- throw new PubSubHubbub\Exception\InvalidArgumentException('Invalid parameter "key"'
- .' of "' . $key . '" must be a non-empty string');
+ throw new PubSubHubbub\Exception\InvalidArgumentException(
+ 'Invalid parameter "key" of "' . $key . '" must be a non-empty string'
+ );
}
$result = $this->db->select(['id' => $key]);
if ($result && count($result)) {
@@ -87,8 +86,9 @@ public function getSubscription($key)
public function hasSubscription($key)
{
if (empty($key) || ! is_string($key)) {
- throw new PubSubHubbub\Exception\InvalidArgumentException('Invalid parameter "key"'
- .' of "' . $key . '" must be a non-empty string');
+ throw new PubSubHubbub\Exception\InvalidArgumentException(
+ 'Invalid parameter "key" of "' . $key . '" must be a non-empty string'
+ );
}
$result = $this->db->select(['id' => $key]);
if ($result && count($result)) {
@@ -100,7 +100,7 @@ public function hasSubscription($key)
/**
* Delete a subscription
*
- * @param string $key
+ * @param string $key
* @return bool
*/
public function deleteSubscription($key)
@@ -131,8 +131,7 @@ public function getNow()
/**
* Set a DateTime instance for assisting with unit testing
*
- * @param DateTime $now
- * @return Subscription
+ * @return $this
*/
public function setNow(DateTime $now)
{
diff --git a/vendor/zendframework/zend-feed/src/PubSubHubbub/Model/SubscriptionPersistenceInterface.php b/vendor/laminas/laminas-feed/src/PubSubHubbub/Model/SubscriptionPersistenceInterface.php
similarity index 59%
rename from vendor/zendframework/zend-feed/src/PubSubHubbub/Model/SubscriptionPersistenceInterface.php
rename to vendor/laminas/laminas-feed/src/PubSubHubbub/Model/SubscriptionPersistenceInterface.php
index 09e7d7559f..2f0ea89e82 100644
--- a/vendor/zendframework/zend-feed/src/PubSubHubbub/Model/SubscriptionPersistenceInterface.php
+++ b/vendor/laminas/laminas-feed/src/PubSubHubbub/Model/SubscriptionPersistenceInterface.php
@@ -1,20 +1,19 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\PubSubHubbub\Model;
+namespace Laminas\Feed\PubSubHubbub\Model;
interface SubscriptionPersistenceInterface
{
/**
* Save subscription to RDMBS
*
- * @param array $data The key must be stored here as a $data['id'] entry
+ * @param array $data The key must be stored here as a $data['id'] entry
* @return bool
*/
public function setSubscription(array $data);
@@ -38,7 +37,7 @@ public function hasSubscription($key);
/**
* Delete a subscription
*
- * @param string $key
+ * @param string $key
* @return bool
*/
public function deleteSubscription($key);
diff --git a/vendor/zendframework/zend-feed/src/PubSubHubbub/PubSubHubbub.php b/vendor/laminas/laminas-feed/src/PubSubHubbub/PubSubHubbub.php
similarity index 74%
rename from vendor/zendframework/zend-feed/src/PubSubHubbub/PubSubHubbub.php
rename to vendor/laminas/laminas-feed/src/PubSubHubbub/PubSubHubbub.php
index d7922aca64..ca25b2d147 100644
--- a/vendor/zendframework/zend-feed/src/PubSubHubbub/PubSubHubbub.php
+++ b/vendor/laminas/laminas-feed/src/PubSubHubbub/PubSubHubbub.php
@@ -1,17 +1,16 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\PubSubHubbub;
+namespace Laminas\Feed\PubSubHubbub;
-use Zend\Escaper\Escaper;
-use Zend\Feed\Reader;
-use Zend\Http;
+use Laminas\Escaper\Escaper;
+use Laminas\Feed\Reader;
+use Laminas\Http;
class PubSubHubbub
{
@@ -38,15 +37,15 @@ class PubSubHubbub
*
* @var Http\Client
*/
- protected static $httpClient = null;
+ protected static $httpClient;
/**
* Simple utility function which imports any feed URL and
* determines the existence of Hub Server endpoints. This works
- * best if directly given an instance of Zend\Feed\Reader\Atom|Rss
+ * best if directly given an instance of Laminas\Feed\Reader\Atom|Rss
* to leverage off.
*
- * @param \Zend\Feed\Reader\Feed\AbstractFeed|string $source
+ * @param string|Reader\Feed\AbstractFeed $source
* @return array
* @throws Exception\InvalidArgumentException
*/
@@ -57,18 +56,19 @@ public static function detectHubs($source)
} elseif ($source instanceof Reader\Feed\AbstractFeed) {
$feed = $source;
} else {
- throw new Exception\InvalidArgumentException('The source parameter was'
- . ' invalid, i.e. not a URL string or an instance of type'
- . ' Zend\Feed\Reader\Feed\AbstractFeed');
+ throw new Exception\InvalidArgumentException(
+ 'The source parameter was'
+ . ' invalid, i.e. not a URL string or an instance of type'
+ . ' Laminas\Feed\Reader\Feed\AbstractFeed'
+ );
}
return $feed->getHubs();
}
/**
- * Allows the external environment to make ZendOAuth use a specific
+ * Allows the external environment to make laminas-oauth use a specific
* Client instance.
*
- * @param Http\Client $httpClient
* @return void
*/
public static function setHttpClient(Http\Client $httpClient)
@@ -86,7 +86,7 @@ public static function setHttpClient(Http\Client $httpClient)
public static function getHttpClient()
{
if (! isset(static::$httpClient)) {
- static::$httpClient = new Http\Client;
+ static::$httpClient = new Http\Client();
} else {
static::$httpClient->resetParameters();
}
@@ -108,8 +108,6 @@ public static function clearHttpClient()
* Set the Escaper instance
*
* If null, resets the instance
- *
- * @param null|Escaper $escaper
*/
public static function setEscaper(Escaper $escaper = null)
{
diff --git a/vendor/zendframework/zend-feed/src/PubSubHubbub/Publisher.php b/vendor/laminas/laminas-feed/src/PubSubHubbub/Publisher.php
similarity index 75%
rename from vendor/zendframework/zend-feed/src/PubSubHubbub/Publisher.php
rename to vendor/laminas/laminas-feed/src/PubSubHubbub/Publisher.php
index 1ebe2a6cd1..7eca3d3a05 100644
--- a/vendor/zendframework/zend-feed/src/PubSubHubbub/Publisher.php
+++ b/vendor/laminas/laminas-feed/src/PubSubHubbub/Publisher.php
@@ -1,18 +1,17 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\PubSubHubbub;
+namespace Laminas\Feed\PubSubHubbub;
+use Laminas\Feed\Uri;
+use Laminas\Http\Request as HttpRequest;
+use Laminas\Stdlib\ArrayUtils;
use Traversable;
-use Zend\Feed\Uri;
-use Zend\Http\Request as HttpRequest;
-use Zend\Stdlib\ArrayUtils;
class Publisher
{
@@ -34,7 +33,7 @@ class Publisher
/**
* An array of any errors including keys for 'response', 'hubUrl'.
- * The response is the actual Zend\Http\Response object.
+ * The response is the actual Laminas\Http\Response object.
*
* @var array
*/
@@ -49,11 +48,11 @@ class Publisher
protected $parameters = [];
/**
- * Constructor; accepts an array or Zend\Config\Config instance to preset
+ * Constructor; accepts an array or Laminas\Config\Config instance to preset
* options for the Publisher without calling all supported setter
* methods in turn.
*
- * @param array|Traversable $options
+ * @param null|array|Traversable $options
*/
public function __construct($options = null)
{
@@ -66,7 +65,7 @@ public function __construct($options = null)
* Process any injected configuration options
*
* @param array|Traversable $options Options array or Traversable object
- * @return Publisher
+ * @return $this
* @throws Exception\InvalidArgumentException
*/
public function setOptions($options)
@@ -76,8 +75,9 @@ public function setOptions($options)
}
if (! is_array($options)) {
- throw new Exception\InvalidArgumentException('Array or Traversable object'
- . 'expected, got ' . gettype($options));
+ throw new Exception\InvalidArgumentException(
+ 'Array or Traversable object expected, got ' . gettype($options)
+ );
}
if (array_key_exists('hubUrls', $options)) {
$this->addHubUrls($options['hubUrls']);
@@ -95,15 +95,15 @@ public function setOptions($options)
* Add a Hub Server URL supported by Publisher
*
* @param string $url
- * @return Publisher
+ * @return $this
* @throws Exception\InvalidArgumentException
*/
public function addHubUrl($url)
{
if (empty($url) || ! is_string($url) || ! Uri::factory($url)->isValid()) {
- throw new Exception\InvalidArgumentException('Invalid parameter "url"'
- . ' of "' . $url . '" must be a non-empty string and a valid'
- . 'URL');
+ throw new Exception\InvalidArgumentException(
+ 'Invalid parameter "url" of "' . $url . '" must be a non-empty string and a valid URL'
+ );
}
$this->hubUrls[] = $url;
return $this;
@@ -112,8 +112,7 @@ public function addHubUrl($url)
/**
* Add an array of Hub Server URLs supported by Publisher
*
- * @param array $urls
- * @return Publisher
+ * @return $this
*/
public function addHubUrls(array $urls)
{
@@ -127,7 +126,7 @@ public function addHubUrls(array $urls)
* Remove a Hub Server URL
*
* @param string $url
- * @return Publisher
+ * @return $this
*/
public function removeHubUrl($url)
{
@@ -154,15 +153,15 @@ public function getHubUrls()
* Add a URL to a topic (Atom or RSS feed) which has been updated
*
* @param string $url
- * @return Publisher
+ * @return $this
* @throws Exception\InvalidArgumentException
*/
public function addUpdatedTopicUrl($url)
{
if (empty($url) || ! is_string($url) || ! Uri::factory($url)->isValid()) {
- throw new Exception\InvalidArgumentException('Invalid parameter "url"'
- . ' of "' . $url . '" must be a non-empty string and a valid'
- . 'URL');
+ throw new Exception\InvalidArgumentException(
+ 'Invalid parameter "url" of "' . $url . '" must be a non-empty string and a valid URL'
+ );
}
$this->updatedTopicUrls[] = $url;
return $this;
@@ -171,8 +170,7 @@ public function addUpdatedTopicUrl($url)
/**
* Add an array of Topic URLs which have been updated
*
- * @param array $urls
- * @return Publisher
+ * @return $this
*/
public function addUpdatedTopicUrls(array $urls)
{
@@ -186,7 +184,7 @@ public function addUpdatedTopicUrls(array $urls)
* Remove an updated topic URL
*
* @param string $url
- * @return Publisher
+ * @return $this
*/
public function removeUpdatedTopicUrl($url)
{
@@ -220,18 +218,18 @@ public function getUpdatedTopicUrls()
public function notifyHub($url)
{
if (empty($url) || ! is_string($url) || ! Uri::factory($url)->isValid()) {
- throw new Exception\InvalidArgumentException('Invalid parameter "url"'
- . ' of "' . $url . '" must be a non-empty string and a valid'
- . 'URL');
+ throw new Exception\InvalidArgumentException(
+ 'Invalid parameter "url" of "' . $url . '" must be a non-empty string and a valid URL'
+ );
}
$client = $this->_getHttpClient();
$client->setUri($url);
$response = $client->getResponse();
if ($response->getStatusCode() !== 204) {
- throw new Exception\RuntimeException('Notification to Hub Server '
- . 'at "' . $url . '" appears to have failed with a status code of "'
- . $response->getStatusCode() . '" and message "'
- . $response->getContent() . '"');
+ throw new Exception\RuntimeException(
+ 'Notification to Hub Server at "' . $url . '" appears to have failed with a status code of'
+ . ' "' . $response->getStatusCode() . '" and message "' . $response->getContent() . '"'
+ );
}
}
@@ -241,7 +239,7 @@ public function notifyHub($url)
* If a Hub notification fails, certain data will be retained in an
* an array retrieved using getErrors(), if a failure occurs for any Hubs
* the isSuccess() check will return FALSE. This method is designed not
- * to needlessly fail with an Exception/Error unless from Zend\Http\Client.
+ * to needlessly fail with an Exception/Error unless from Laminas\Http\Client.
*
* @return void
* @throws Exception\RuntimeException
@@ -251,8 +249,9 @@ public function notifyAll()
$client = $this->_getHttpClient();
$hubs = $this->getHubUrls();
if (empty($hubs)) {
- throw new Exception\RuntimeException('No Hub Server URLs'
- . ' have been set so no notifications can be sent');
+ throw new Exception\RuntimeException(
+ 'No Hub Server URLs have been set so no notifications can be sent'
+ );
}
$this->errors = [];
foreach ($hubs as $url) {
@@ -261,7 +260,7 @@ public function notifyAll()
if ($response->getStatusCode() !== 204) {
$this->errors[] = [
'response' => $response,
- 'hubUrl' => $url
+ 'hubUrl' => $url,
];
}
}
@@ -271,8 +270,8 @@ public function notifyAll()
* Add an optional parameter to the update notification requests
*
* @param string $name
- * @param string|null $value
- * @return Publisher
+ * @param null|string $value
+ * @return $this
* @throws Exception\InvalidArgumentException
*/
public function setParameter($name, $value = null)
@@ -282,16 +281,18 @@ public function setParameter($name, $value = null)
return $this;
}
if (empty($name) || ! is_string($name)) {
- throw new Exception\InvalidArgumentException('Invalid parameter "name"'
- . ' of "' . $name . '" must be a non-empty string');
+ throw new Exception\InvalidArgumentException(
+ 'Invalid parameter "name" of "' . $name . '" must be a non-empty string'
+ );
}
if ($value === null) {
$this->removeParameter($name);
return $this;
}
if (empty($value) || (! is_string($value) && $value !== null)) {
- throw new Exception\InvalidArgumentException('Invalid parameter "value"'
- . ' of "' . $value . '" must be a non-empty string');
+ throw new Exception\InvalidArgumentException(
+ 'Invalid parameter "value" of "' . $value . '" must be a non-empty string'
+ );
}
$this->parameters[$name] = $value;
return $this;
@@ -300,8 +301,7 @@ public function setParameter($name, $value = null)
/**
* Add an optional parameter to the update notification requests
*
- * @param array $parameters
- * @return Publisher
+ * @return $this
*/
public function setParameters(array $parameters)
{
@@ -315,14 +315,15 @@ public function setParameters(array $parameters)
* Remove an optional parameter for the notification requests
*
* @param string $name
- * @return Publisher
+ * @return $this
* @throws Exception\InvalidArgumentException
*/
public function removeParameter($name)
{
if (empty($name) || ! is_string($name)) {
- throw new Exception\InvalidArgumentException('Invalid parameter "name"'
- . ' of "' . $name . '" must be a non-empty string');
+ throw new Exception\InvalidArgumentException(
+ 'Invalid parameter "name" of "' . $name . '" must be a non-empty string'
+ );
}
if (array_key_exists($name, $this->parameters)) {
unset($this->parameters[$name]);
@@ -353,7 +354,7 @@ public function isSuccess()
/**
* Return an array of errors met from any failures, including keys:
- * 'response' => the Zend\Http\Response object from the failure
+ * 'response' => the Laminas\Http\Response object from the failure
* 'hubUrl' => the URL of the Hub Server whose notification failed
*
* @return array
@@ -366,7 +367,7 @@ public function getErrors()
/**
* Get a basic prepared HTTP client for use
*
- * @return \Zend\Http\Client
+ * @return \Laminas\Http\Client
* @throws Exception\RuntimeException
*/
// @codingStandardsIgnoreStart
@@ -376,14 +377,13 @@ protected function _getHttpClient()
$client = PubSubHubbub::getHttpClient();
$client->setMethod(HttpRequest::METHOD_POST);
$client->setOptions([
- 'useragent' => 'Zend_Feed_Pubsubhubbub_Publisher/' . Version::VERSION,
+ 'useragent' => 'Laminas_Feed_Pubsubhubbub_Publisher/' . Version::VERSION,
]);
$params = [];
$params[] = 'hub.mode=publish';
$topics = $this->getUpdatedTopicUrls();
if (empty($topics)) {
- throw new Exception\RuntimeException('No updated topic URLs'
- . ' have been set');
+ throw new Exception\RuntimeException('No updated topic URLs have been set');
}
foreach ($topics as $topicUrl) {
$params[] = 'hub.url=' . urlencode($topicUrl);
diff --git a/vendor/zendframework/zend-feed/src/PubSubHubbub/Subscriber.php b/vendor/laminas/laminas-feed/src/PubSubHubbub/Subscriber.php
similarity index 77%
rename from vendor/zendframework/zend-feed/src/PubSubHubbub/Subscriber.php
rename to vendor/laminas/laminas-feed/src/PubSubHubbub/Subscriber.php
index 0f4cdfc69d..b2a4182e36 100644
--- a/vendor/zendframework/zend-feed/src/PubSubHubbub/Subscriber.php
+++ b/vendor/laminas/laminas-feed/src/PubSubHubbub/Subscriber.php
@@ -1,20 +1,19 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\PubSubHubbub;
+namespace Laminas\Feed\PubSubHubbub;
use DateInterval;
use DateTime;
+use Laminas\Feed\Uri;
+use Laminas\Http\Request as HttpRequest;
+use Laminas\Stdlib\ArrayUtils;
use Traversable;
-use Zend\Feed\Uri;
-use Zend\Http\Request as HttpRequest;
-use Zend\Stdlib\ArrayUtils;
class Subscriber
{
@@ -56,14 +55,14 @@ class Subscriber
*
* @var int
*/
- protected $leaseSeconds = null;
+ protected $leaseSeconds;
/**
* The preferred verification mode (sync or async). By default, this
* Subscriber prefers synchronous verification, but is considered
* desirable to support asynchronous verification if possible.
*
- * Zend\Feed\Pubsubhubbub\Subscriber will always send both modes, whose
+ * Laminas\Feed\Pubsubhubbub\Subscriber will always send both modes, whose
* order of occurrence in the parameter list determines this preference.
*
* @var string
@@ -72,7 +71,7 @@ class Subscriber
/**
* An array of any errors including keys for 'response', 'hubUrl'.
- * The response is the actual Zend\Http\Response object.
+ * The response is the actual Laminas\Http\Response object.
*
* @var array
*/
@@ -87,12 +86,12 @@ class Subscriber
protected $asyncHubs = [];
/**
- * An instance of Zend\Feed\Pubsubhubbub\Model\SubscriptionPersistence used to background
+ * An instance of Laminas\Feed\Pubsubhubbub\Model\SubscriptionPersistence used to background
* save any verification tokens associated with a subscription or other.
*
- * @var \Zend\Feed\PubSubHubbub\Model\SubscriptionPersistenceInterface
+ * @var Model\SubscriptionPersistenceInterface
*/
- protected $storage = null;
+ protected $storage;
/**
* An array of authentication credentials for HTTP Basic Authentication
@@ -111,9 +110,9 @@ class Subscriber
*
* This is required for all Hubs using the Pubsubhubbub 0.1 Specification.
* It should be manually intercepted and passed to the Callback class using
- * Zend\Feed\Pubsubhubbub\Subscriber\Callback::setSubscriptionKey(). Will
+ * Laminas\Feed\Pubsubhubbub\Subscriber\Callback::setSubscriptionKey(). Will
* require a route in the form "callback/:subkey" to allow the parameter be
- * retrieved from an action using the Zend\Controller\Action::\getParam()
+ * retrieved from an action using the Laminas\Controller\Action::\getParam()
* method.
*
* @var string
@@ -125,7 +124,7 @@ class Subscriber
* options for the Subscriber without calling all supported setter
* methods in turn.
*
- * @param array|Traversable $options
+ * @param null|array|Traversable $options
*/
public function __construct($options = null)
{
@@ -138,7 +137,7 @@ public function __construct($options = null)
* Process any injected configuration options
*
* @param array|Traversable $options
- * @return Subscriber
+ * @return $this
* @throws Exception\InvalidArgumentException
*/
public function setOptions($options)
@@ -148,8 +147,9 @@ public function setOptions($options)
}
if (! is_array($options)) {
- throw new Exception\InvalidArgumentException('Array or Traversable object'
- . 'expected, got ' . gettype($options));
+ throw new Exception\InvalidArgumentException(
+ 'Array or Traversable object expected, got ' . gettype($options)
+ );
}
if (array_key_exists('hubUrls', $options)) {
$this->addHubUrls($options['hubUrls']);
@@ -188,15 +188,15 @@ public function setOptions($options)
* event will relate
*
* @param string $url
- * @return Subscriber
+ * @return $this
* @throws Exception\InvalidArgumentException
*/
public function setTopicUrl($url)
{
if (empty($url) || ! is_string($url) || ! Uri::factory($url)->isValid()) {
- throw new Exception\InvalidArgumentException('Invalid parameter "url"'
- .' of "' . $url . '" must be a non-empty string and a valid'
- .' URL');
+ throw new Exception\InvalidArgumentException(
+ 'Invalid parameter "url" of "' . $url . '" must be a non-empty string and a valid URL'
+ );
}
$this->topicUrl = $url;
return $this;
@@ -212,8 +212,9 @@ public function setTopicUrl($url)
public function getTopicUrl()
{
if (empty($this->topicUrl)) {
- throw new Exception\RuntimeException('A valid Topic (RSS or Atom'
- . ' feed) URL MUST be set before attempting any operation');
+ throw new Exception\RuntimeException(
+ 'A valid Topic (RSS or Atom feed) URL MUST be set before attempting any operation'
+ );
}
return $this->topicUrl;
}
@@ -222,15 +223,16 @@ public function getTopicUrl()
* Set the number of seconds for which any subscription will remain valid
*
* @param int $seconds
- * @return Subscriber
+ * @return $this
* @throws Exception\InvalidArgumentException
*/
public function setLeaseSeconds($seconds)
{
$seconds = intval($seconds);
if ($seconds <= 0) {
- throw new Exception\InvalidArgumentException('Expected lease seconds'
- . ' must be an integer greater than zero');
+ throw new Exception\InvalidArgumentException(
+ 'Expected lease seconds must be an integer greater than zero'
+ );
}
$this->leaseSeconds = $seconds;
return $this;
@@ -251,15 +253,15 @@ public function getLeaseSeconds()
* this Subscriber
*
* @param string $url
- * @return Subscriber
+ * @return $this
* @throws Exception\InvalidArgumentException
*/
public function setCallbackUrl($url)
{
if (empty($url) || ! is_string($url) || ! Uri::factory($url)->isValid()) {
- throw new Exception\InvalidArgumentException('Invalid parameter "url"'
- . ' of "' . $url . '" must be a non-empty string and a valid'
- . ' URL');
+ throw new Exception\InvalidArgumentException(
+ 'Invalid parameter "url" of "' . $url . '" must be a non-empty string and a valid URL'
+ );
}
$this->callbackUrl = $url;
return $this;
@@ -275,8 +277,9 @@ public function setCallbackUrl($url)
public function getCallbackUrl()
{
if (empty($this->callbackUrl)) {
- throw new Exception\RuntimeException('A valid Callback URL MUST be'
- . ' set before attempting any operation');
+ throw new Exception\RuntimeException(
+ 'A valid Callback URL MUST be set before attempting any operation'
+ );
}
return $this->callbackUrl;
}
@@ -286,11 +289,11 @@ public function getCallbackUrl()
* Subscriber prefers synchronous verification, but does support
* asynchronous if that's the Hub Server's utilised mode.
*
- * Zend\Feed\Pubsubhubbub\Subscriber will always send both modes, whose
+ * Laminas\Feed\Pubsubhubbub\Subscriber will always send both modes, whose
* order of occurrence in the parameter list determines this preference.
*
* @param string $mode Should be 'sync' or 'async'
- * @return Subscriber
+ * @return $this
* @throws Exception\InvalidArgumentException
*/
public function setPreferredVerificationMode($mode)
@@ -298,10 +301,11 @@ public function setPreferredVerificationMode($mode)
if ($mode !== PubSubHubbub::VERIFICATION_MODE_SYNC
&& $mode !== PubSubHubbub::VERIFICATION_MODE_ASYNC
) {
- throw new Exception\InvalidArgumentException('Invalid preferred'
- . ' mode specified: "' . $mode . '" but should be one of'
- . ' Zend\Feed\Pubsubhubbub::VERIFICATION_MODE_SYNC or'
- . ' Zend\Feed\Pubsubhubbub::VERIFICATION_MODE_ASYNC');
+ throw new Exception\InvalidArgumentException(
+ 'Invalid preferred mode specified: "' . $mode . '" but should be one of'
+ . ' Laminas\Feed\Pubsubhubbub::VERIFICATION_MODE_SYNC or'
+ . ' Laminas\Feed\Pubsubhubbub::VERIFICATION_MODE_ASYNC'
+ );
}
$this->preferredVerificationMode = $mode;
return $this;
@@ -321,15 +325,15 @@ public function getPreferredVerificationMode()
* Add a Hub Server URL supported by Publisher
*
* @param string $url
- * @return Subscriber
+ * @return $this
* @throws Exception\InvalidArgumentException
*/
public function addHubUrl($url)
{
if (empty($url) || ! is_string($url) || ! Uri::factory($url)->isValid()) {
- throw new Exception\InvalidArgumentException('Invalid parameter "url"'
- . ' of "' . $url . '" must be a non-empty string and a valid'
- . ' URL');
+ throw new Exception\InvalidArgumentException(
+ 'Invalid parameter "url" of "' . $url . '" must be a non-empty string and a valid URL'
+ );
}
$this->hubUrls[] = $url;
return $this;
@@ -338,8 +342,7 @@ public function addHubUrl($url)
/**
* Add an array of Hub Server URLs supported by Publisher
*
- * @param array $urls
- * @return Subscriber
+ * @return $this
*/
public function addHubUrls(array $urls)
{
@@ -353,7 +356,7 @@ public function addHubUrls(array $urls)
* Remove a Hub Server URL
*
* @param string $url
- * @return Subscriber
+ * @return $this
*/
public function removeHubUrl($url)
{
@@ -380,16 +383,15 @@ public function getHubUrls()
* Add authentication credentials for a given URL
*
* @param string $url
- * @param array $authentication
- * @return Subscriber
+ * @return $this
* @throws Exception\InvalidArgumentException
*/
public function addAuthentication($url, array $authentication)
{
if (empty($url) || ! is_string($url) || ! Uri::factory($url)->isValid()) {
- throw new Exception\InvalidArgumentException('Invalid parameter "url"'
- . ' of "' . $url . '" must be a non-empty string and a valid'
- . ' URL');
+ throw new Exception\InvalidArgumentException(
+ 'Invalid parameter "url" of "' . $url . '" must be a non-empty string and a valid URL'
+ );
}
$this->authentications[$url] = $authentication;
return $this;
@@ -398,8 +400,7 @@ public function addAuthentication($url, array $authentication)
/**
* Add authentication credentials for hub URLs
*
- * @param array $authentications
- * @return Subscriber
+ * @return $this
*/
public function addAuthentications(array $authentications)
{
@@ -423,7 +424,7 @@ public function getAuthentications()
* Set flag indicating whether or not to use a path parameter
*
* @param bool $bool
- * @return Subscriber
+ * @return $this
*/
public function usePathParameter($bool = true)
{
@@ -434,9 +435,9 @@ public function usePathParameter($bool = true)
/**
* Add an optional parameter to the (un)subscribe requests
*
- * @param string $name
- * @param string|null $value
- * @return Subscriber
+ * @param string $name
+ * @param null|string $value
+ * @return $this
* @throws Exception\InvalidArgumentException
*/
public function setParameter($name, $value = null)
@@ -446,16 +447,18 @@ public function setParameter($name, $value = null)
return $this;
}
if (empty($name) || ! is_string($name)) {
- throw new Exception\InvalidArgumentException('Invalid parameter "name"'
- . ' of "' . $name . '" must be a non-empty string');
+ throw new Exception\InvalidArgumentException(
+ 'Invalid parameter "name" of "' . $name . '" must be a non-empty string'
+ );
}
if ($value === null) {
$this->removeParameter($name);
return $this;
}
if (empty($value) || (! is_string($value) && $value !== null)) {
- throw new Exception\InvalidArgumentException('Invalid parameter "value"'
- . ' of "' . $value . '" must be a non-empty string');
+ throw new Exception\InvalidArgumentException(
+ 'Invalid parameter "value" of "' . $value . '" must be a non-empty string'
+ );
}
$this->parameters[$name] = $value;
return $this;
@@ -464,8 +467,7 @@ public function setParameter($name, $value = null)
/**
* Add an optional parameter to the (un)subscribe requests
*
- * @param array $parameters
- * @return Subscriber
+ * @return $this
*/
public function setParameters(array $parameters)
{
@@ -479,14 +481,15 @@ public function setParameters(array $parameters)
* Remove an optional parameter for the (un)subscribe requests
*
* @param string $name
- * @return Subscriber
+ * @return $this
* @throws Exception\InvalidArgumentException
*/
public function removeParameter($name)
{
if (empty($name) || ! is_string($name)) {
- throw new Exception\InvalidArgumentException('Invalid parameter "name"'
- . ' of "' . $name . '" must be a non-empty string');
+ throw new Exception\InvalidArgumentException(
+ 'Invalid parameter "name" of "' . $name . '" must be a non-empty string'
+ );
}
if (array_key_exists($name, $this->parameters)) {
unset($this->parameters[$name]);
@@ -505,11 +508,10 @@ public function getParameters()
}
/**
- * Sets an instance of Zend\Feed\Pubsubhubbub\Model\SubscriptionPersistence used to background
+ * Sets an instance of Laminas\Feed\Pubsubhubbub\Model\SubscriptionPersistence used to background
* save any verification tokens associated with a subscription or other.
*
- * @param Model\SubscriptionPersistenceInterface $storage
- * @return Subscriber
+ * @return $this
*/
public function setStorage(Model\SubscriptionPersistenceInterface $storage)
{
@@ -518,7 +520,7 @@ public function setStorage(Model\SubscriptionPersistenceInterface $storage)
}
/**
- * Gets an instance of Zend\Feed\Pubsubhubbub\Storage\StoragePersistence used
+ * Gets an instance of Laminas\Feed\Pubsubhubbub\Storage\StoragePersistence used
* to background save any verification tokens associated with a subscription
* or other.
*
@@ -528,8 +530,7 @@ public function setStorage(Model\SubscriptionPersistenceInterface $storage)
public function getStorage()
{
if ($this->storage === null) {
- throw new Exception\RuntimeException('No storage vehicle '
- . 'has been set.');
+ throw new Exception\RuntimeException('No storage vehicle has been set.');
}
return $this->storage;
}
@@ -569,7 +570,7 @@ public function isSuccess()
/**
* Return an array of errors met from any failures, including keys:
- * 'response' => the Zend\Http\Response object from the failure
+ * 'response' => the Laminas\Http\Response object from the failure
* 'hubUrl' => the URL of the Hub Server whose notification failed
*
* @return array
@@ -606,10 +607,11 @@ protected function _doRequest($mode)
$client = $this->_getHttpClient();
$hubs = $this->getHubUrls();
if (empty($hubs)) {
- throw new Exception\RuntimeException('No Hub Server URLs'
- . ' have been set so no subscriptions can be attempted');
+ throw new Exception\RuntimeException(
+ 'No Hub Server URLs have been set so no subscriptions can be attempted'
+ );
}
- $this->errors = [];
+ $this->errors = [];
$this->asyncHubs = [];
foreach ($hubs as $url) {
if (array_key_exists($url, $this->authentications)) {
@@ -626,6 +628,7 @@ protected function _doRequest($mode)
'response' => $response,
'hubUrl' => $url,
];
+
/**
* At first I thought it was needed, but the backend storage will
* allow tracking async without any user interference. It's left
@@ -645,7 +648,7 @@ protected function _doRequest($mode)
/**
* Get a basic prepared HTTP client for use
*
- * @return \Zend\Http\Client
+ * @return \Laminas\Http\Client
*/
// @codingStandardsIgnoreStart
protected function _getHttpClient()
@@ -653,8 +656,9 @@ protected function _getHttpClient()
// @codingStandardsIgnoreEnd
$client = PubSubHubbub::getHttpClient();
$client->setMethod(HttpRequest::METHOD_POST);
- $client->setOptions(['useragent' => 'Zend_Feed_Pubsubhubbub_Subscriber/'
- . Version::VERSION]);
+ $client->setOptions([
+ 'useragent' => 'Laminas_Feed_Pubsubhubbub_Subscriber/' . Version::VERSION,
+ ]);
return $client;
}
@@ -664,7 +668,7 @@ protected function _getHttpClient()
*
* @param string $hubUrl
* @param string $mode
- * @return array
+ * @return string
* @throws Exception\InvalidArgumentException
*/
// @codingStandardsIgnoreStart
@@ -672,8 +676,9 @@ protected function _getRequestParameters($hubUrl, $mode)
{
// @codingStandardsIgnoreEnd
if (! in_array($mode, ['subscribe', 'unsubscribe'])) {
- throw new Exception\InvalidArgumentException('Invalid mode specified: "'
- . $mode . '" which should have been "subscribe" or "unsubscribe"');
+ throw new Exception\InvalidArgumentException(
+ 'Invalid mode specified: "' . $mode . '" which should have been "subscribe" or "unsubscribe"'
+ );
}
$params = [
@@ -681,9 +686,7 @@ protected function _getRequestParameters($hubUrl, $mode)
'hub.topic' => $this->getTopicUrl(),
];
- if ($this->getPreferredVerificationMode()
- == PubSubHubbub::VERIFICATION_MODE_SYNC
- ) {
+ if ($this->getPreferredVerificationMode() === PubSubHubbub::VERIFICATION_MODE_SYNC) {
$vmodes = [
PubSubHubbub::VERIFICATION_MODE_SYNC,
PubSubHubbub::VERIFICATION_MODE_ASYNC,
@@ -703,8 +706,8 @@ protected function _getRequestParameters($hubUrl, $mode)
* Establish a persistent verify_token and attach key to callback
* URL's path/query_string
*/
- $key = $this->_generateSubscriptionKey($params, $hubUrl);
- $token = $this->_generateVerifyToken();
+ $key = $this->_generateSubscriptionKey($params, $hubUrl);
+ $token = $this->_generateVerifyToken();
$params['hub.verify_token'] = $token;
// Note: query string only usable with PuSH 0.2 Hubs
@@ -715,7 +718,7 @@ protected function _getRequestParameters($hubUrl, $mode)
$params['hub.callback'] = rtrim($this->getCallbackUrl(), '/')
. '/' . PubSubHubbub::urlencode($key);
}
- if ($mode == 'subscribe' && $this->getLeaseSeconds() !== null) {
+ if ($mode === 'subscribe' && $this->getLeaseSeconds() !== null) {
$params['hub.lease_seconds'] = $this->getLeaseSeconds();
}
@@ -726,21 +729,21 @@ protected function _getRequestParameters($hubUrl, $mode)
}
// store subscription to storage
- $now = new DateTime();
+ $now = new DateTime();
$expires = null;
if (isset($params['hub.lease_seconds'])) {
$expires = $now->add(new DateInterval('PT' . $params['hub.lease_seconds'] . 'S'))
->format('Y-m-d H:i:s');
}
$data = [
- 'id' => $key,
- 'topic_url' => $params['hub.topic'],
- 'hub_url' => $hubUrl,
- 'created_time' => $now->format('Y-m-d H:i:s'),
- 'lease_seconds' => $params['hub.lease_seconds'],
- 'verify_token' => hash('sha256', $params['hub.verify_token']),
- 'secret' => null,
- 'expiration_time' => $expires,
+ 'id' => $key,
+ 'topic_url' => $params['hub.topic'],
+ 'hub_url' => $hubUrl,
+ 'created_time' => $now->format('Y-m-d H:i:s'),
+ 'lease_seconds' => $params['hub.lease_seconds'],
+ 'verify_token' => hash('sha256', $params['hub.verify_token']),
+ 'secret' => null,
+ 'expiration_time' => $expires,
// @codingStandardsIgnoreStart
'subscription_state' => ($mode == 'unsubscribe') ? PubSubHubbub::SUBSCRIPTION_TODELETE : PubSubHubbub::SUBSCRIPTION_NOTVERIFIED,
// @codingStandardsIgnoreEnd
@@ -773,8 +776,8 @@ protected function _generateVerifyToken()
* Simple helper to generate a verification token used in (un)subscribe
* requests to a Hub Server.
*
- * @param array $params
- * @param string $hubUrl The Hub Server URL for which this token will apply
+ * @param array $params
+ * @param string $hubUrl The Hub Server URL for which this token will apply
* @return string
*/
// @codingStandardsIgnoreStart
@@ -800,15 +803,13 @@ protected function _urlEncode(array $params)
$encoded = [];
foreach ($params as $key => $value) {
if (is_array($value)) {
- $ekey = PubSubHubbub::urlencode($key);
+ $ekey = PubSubHubbub::urlencode($key);
$encoded[$ekey] = [];
foreach ($value as $duplicateKey) {
- $encoded[$ekey][]
- = PubSubHubbub::urlencode($duplicateKey);
+ $encoded[$ekey][] = PubSubHubbub::urlencode($duplicateKey);
}
} else {
- $encoded[PubSubHubbub::urlencode($key)]
- = PubSubHubbub::urlencode($value);
+ $encoded[PubSubHubbub::urlencode($key)] = PubSubHubbub::urlencode($value);
}
}
return $encoded;
@@ -818,7 +819,7 @@ protected function _urlEncode(array $params)
* Order outgoing parameters
*
* @param array $params
- * @return array
+ * @return string
*/
// @codingStandardsIgnoreStart
protected function _toByteValueOrderedString(array $params)
@@ -841,7 +842,7 @@ protected function _toByteValueOrderedString(array $params)
/**
* This is STRICTLY for testing purposes only...
*/
- protected $testStaticToken = null;
+ protected $testStaticToken;
final public function setTestStaticToken($token)
{
diff --git a/vendor/zendframework/zend-feed/src/PubSubHubbub/Subscriber/Callback.php b/vendor/laminas/laminas-feed/src/PubSubHubbub/Subscriber/Callback.php
similarity index 88%
rename from vendor/zendframework/zend-feed/src/PubSubHubbub/Subscriber/Callback.php
rename to vendor/laminas/laminas-feed/src/PubSubHubbub/Subscriber/Callback.php
index a6bffef217..100506fe2c 100644
--- a/vendor/zendframework/zend-feed/src/PubSubHubbub/Subscriber/Callback.php
+++ b/vendor/laminas/laminas-feed/src/PubSubHubbub/Subscriber/Callback.php
@@ -1,17 +1,16 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\PubSubHubbub\Subscriber;
+namespace Laminas\Feed\PubSubHubbub\Subscriber;
-use Zend\Feed\PubSubHubbub;
-use Zend\Feed\PubSubHubbub\Exception;
-use Zend\Feed\Uri;
+use Laminas\Feed\PubSubHubbub;
+use Laminas\Feed\PubSubHubbub\Exception;
+use Laminas\Feed\Uri;
class Callback extends PubSubHubbub\AbstractCallback
{
@@ -20,31 +19,31 @@ class Callback extends PubSubHubbub\AbstractCallback
*
* @var string
*/
- protected $feedUpdate = null;
+ protected $feedUpdate;
/**
* Holds a manually set subscription key (i.e. identifies a unique
* subscription) which is typical when it is not passed in the query string
* but is part of the Callback URL path, requiring manual retrieval e.g.
- * using a route and the \Zend\Mvc\Router\RouteMatch::getParam() method.
+ * using a route and the \Laminas\Mvc\Router\RouteMatch::getParam() method.
*
* @var string
*/
- protected $subscriptionKey = null;
+ protected $subscriptionKey;
/**
* After verification, this is set to the verified subscription's data.
*
* @var array
*/
- protected $currentSubscriptionData = null;
+ protected $currentSubscriptionData;
/**
* Set a subscription key to use for the current callback request manually.
* Required if usePathParameter is enabled for the Subscriber.
*
* @param string $key
- * @return \Zend\Feed\PubSubHubbub\Subscriber\Callback
+ * @return $this
*/
public function setSubscriptionKey($key)
{
@@ -57,8 +56,8 @@ public function setSubscriptionKey($key)
* unsubscription request. This should be the Hub Server confirming the
* the request prior to taking action on it.
*
- * @param array $httpGetData GET data if available and not in $_GET
- * @param bool $sendResponseNow Whether to send response now or when asked
+ * @param null|array $httpGetData GET data if available and not in $_GET
+ * @param bool $sendResponseNow Whether to send response now or when asked
* @return void
*/
public function handle(array $httpGetData = null, $sendResponseNow = false)
@@ -75,7 +74,7 @@ public function handle(array $httpGetData = null, $sendResponseNow = false)
* to avoid holding up responses to the Hub.
*/
$contentType = $this->_getHeader('Content-Type');
- if (strtolower($_SERVER['REQUEST_METHOD']) == 'post'
+ if (strtolower($_SERVER['REQUEST_METHOD']) === 'post'
&& $this->_hasValidVerifyToken(null, false)
&& (stripos($contentType, 'application/atom+xml') === 0
|| stripos($contentType, 'application/rss+xml') === 0
@@ -93,7 +92,7 @@ public function handle(array $httpGetData = null, $sendResponseNow = false)
switch (strtolower($httpGetData['hub_mode'])) {
case 'subscribe':
- $data = $this->currentSubscriptionData;
+ $data = $this->currentSubscriptionData;
$data['subscription_state'] = PubSubHubbub\PubSubHubbub::SUBSCRIPTION_VERIFIED;
if (isset($httpGetData['hub_lease_seconds'])) {
$data['lease_seconds'] = $httpGetData['hub_lease_seconds'];
@@ -126,7 +125,6 @@ public function handle(array $httpGetData = null, $sendResponseNow = false)
* Checks validity of the request simply by making a quick pass and
* confirming the presence of all REQUIRED parameters.
*
- * @param array $httpGetData
* @return bool
*/
public function isValidHubVerification(array $httpGetData)
@@ -156,7 +154,7 @@ public function isValidHubVerification(array $httpGetData)
) {
return false;
}
- if ($httpGetData['hub_mode'] == 'subscribe'
+ if ($httpGetData['hub_mode'] === 'subscribe'
&& ! array_key_exists('hub_lease_seconds', $httpGetData)
) {
return false;
@@ -180,7 +178,7 @@ public function isValidHubVerification(array $httpGetData)
* Topic we've subscribed to.
*
* @param string $feed
- * @return \Zend\Feed\PubSubHubbub\Subscriber\Callback
+ * @return $this
*/
public function setFeedUpdate($feed)
{
@@ -233,7 +231,7 @@ protected function _hasValidVerifyToken(array $httpGetData = null, $checkValue =
return false;
}
if ($checkValue) {
- $data = $this->getStorage()->getSubscription($verifyTokenKey);
+ $data = $this->getStorage()->getSubscription($verifyTokenKey);
$verifyToken = $data['verify_token'];
if ($verifyToken !== hash('sha256', $httpGetData['hub_verify_token'])) {
return false;
diff --git a/vendor/laminas/laminas-feed/src/PubSubHubbub/Version.php b/vendor/laminas/laminas-feed/src/PubSubHubbub/Version.php
new file mode 100644
index 0000000000..4886980b3c
--- /dev/null
+++ b/vendor/laminas/laminas-feed/src/PubSubHubbub/Version.php
@@ -0,0 +1,14 @@
+<?php
+
+/**
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Laminas\Feed\PubSubHubbub;
+
+abstract class Version
+{
+ const VERSION = '2';
+}
diff --git a/vendor/zendframework/zend-feed/src/Reader/AbstractEntry.php b/vendor/laminas/laminas-feed/src/Reader/AbstractEntry.php
similarity index 75%
rename from vendor/zendframework/zend-feed/src/Reader/AbstractEntry.php
rename to vendor/laminas/laminas-feed/src/Reader/AbstractEntry.php
index 0e75da7bb5..23ec1f90b7 100644
--- a/vendor/zendframework/zend-feed/src/Reader/AbstractEntry.php
+++ b/vendor/laminas/laminas-feed/src/Reader/AbstractEntry.php
@@ -1,20 +1,19 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Reader;
+namespace Laminas\Feed\Reader;
use DOMDocument;
use DOMElement;
use DOMXPath;
/**
- * @deprecated This (abstract) class is deprecated. Use Zend\Feed\Reader\Entry\AbstractEntry instead.
+ * @deprecated This (abstract) class is deprecated. Use Laminas\Feed\Reader\Entry\AbstractEntry instead.
*/
abstract class AbstractEntry
{
@@ -30,14 +29,14 @@ abstract class AbstractEntry
*
* @var DOMDocument
*/
- protected $domDocument = null;
+ protected $domDocument;
/**
* Entry instance
*
* @var DOMElement
*/
- protected $entry = null;
+ protected $entry;
/**
* Pointer to the current entry
@@ -51,7 +50,7 @@ abstract class AbstractEntry
*
* @var DOMXPath
*/
- protected $xpath = null;
+ protected $xpath;
/**
* Registered extensions
@@ -61,11 +60,8 @@ abstract class AbstractEntry
protected $extensions = [];
/**
- * Constructor
- *
- * @param DOMElement $entry
- * @param int $entryKey
- * @param null|string $type
+ * @param int $entryKey
+ * @param null|string $type
*/
public function __construct(DOMElement $entry, $entryKey, $type = null)
{
@@ -121,7 +117,7 @@ public function getEncoding()
*/
public function saveXml()
{
- $dom = new DOMDocument('1.0', $this->getEncoding());
+ $dom = new DOMDocument('1.0', $this->getEncoding());
$entry = $dom->importNode($this->getElement(), true);
$dom->appendChild($entry);
return $dom->saveXML();
@@ -153,8 +149,7 @@ public function getXpath()
/**
* Set the XPath query
*
- * @param DOMXPath $xpath
- * @return \Zend\Feed\Reader\AbstractEntry
+ * @return $this
*/
public function setXpath(DOMXPath $xpath)
{
@@ -175,15 +170,16 @@ public function getExtensions()
/**
* Return an Extension object with the matching name (postfixed with _Entry)
*
- * @param string $name
- * @return \Zend\Feed\Reader\Extension\AbstractEntry
+ * @param string $name
+ * @return null|Extension\AbstractEntry
*/
public function getExtension($name)
{
if (array_key_exists($name . '\Entry', $this->extensions)) {
return $this->extensions[$name . '\Entry'];
}
- return;
+
+ return null;
}
/**
@@ -201,12 +197,13 @@ public function __call($method, $args)
return call_user_func_array([$extension, $method], $args);
}
}
- throw new Exception\BadMethodCallException('Method: ' . $method
- . 'does not exist and could not be located on a registered Extension');
+ throw new Exception\BadMethodCallException(
+ 'Method: ' . $method . ' does not exist and could not be located on a registered Extension'
+ );
}
/**
- * Load extensions from Zend\Feed\Reader\Reader
+ * Load extensions from Laminas\Feed\Reader\Reader
*
* @return void
*/
@@ -214,15 +211,17 @@ public function __call($method, $args)
protected function _loadExtensions()
{
// @codingStandardsIgnoreEnd
- $all = Reader::getExtensions();
+ $all = Reader::getExtensions();
$feed = $all['entry'];
foreach ($feed as $extension) {
if (in_array($extension, $all['core'])) {
continue;
}
- $className = Reader::getPluginLoader()->getClassName($extension);
+ $className = Reader::getPluginLoader()->getClassName($extension);
$this->extensions[$extension] = new $className(
- $this->getElement(), $this->entryKey, $this->data['type']
+ $this->getElement(),
+ $this->entryKey,
+ $this->data['type']
);
}
}
diff --git a/vendor/zendframework/zend-feed/src/Reader/AbstractFeed.php b/vendor/laminas/laminas-feed/src/Reader/AbstractFeed.php
similarity index 83%
rename from vendor/zendframework/zend-feed/src/Reader/AbstractFeed.php
rename to vendor/laminas/laminas-feed/src/Reader/AbstractFeed.php
index b2110d1c6b..8a60102982 100644
--- a/vendor/zendframework/zend-feed/src/Reader/AbstractFeed.php
+++ b/vendor/laminas/laminas-feed/src/Reader/AbstractFeed.php
@@ -1,20 +1,19 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Reader;
+namespace Laminas\Feed\Reader;
use DOMDocument;
use DOMElement;
use DOMXPath;
/**
- * @deprecated This (abstract) class is deprecated. Use \Zend\Feed\Reader\Feed\AbstractFeed instead.
+ * @deprecated This (abstract) class is deprecated. Use \Laminas\Feed\Reader\Feed\AbstractFeed instead.
*/
abstract class AbstractFeed implements Feed\FeedInterface
{
@@ -30,7 +29,7 @@ abstract class AbstractFeed implements Feed\FeedInterface
*
* @var DOMDocument
*/
- protected $domDocument = null;
+ protected $domDocument;
/**
* An array of parsed feed entries
@@ -51,7 +50,7 @@ abstract class AbstractFeed implements Feed\FeedInterface
*
* @var DOMXPath
*/
- protected $xpath = null;
+ protected $xpath;
/**
* Array of loaded extensions
@@ -65,18 +64,16 @@ abstract class AbstractFeed implements Feed\FeedInterface
*
* @var string
*/
- protected $originalSourceUri = null;
+ protected $originalSourceUri;
/**
- * Constructor
- *
- * @param DomDocument $domDocument The DOM object for the feed's XML
- * @param string $type Feed type
+ * @param DOMDocument $domDocument The DOM object for the feed's XML
+ * @param null|string $type Feed type
*/
public function __construct(DOMDocument $domDocument, $type = null)
{
$this->domDocument = $domDocument;
- $this->xpath = new DOMXPath($this->domDocument);
+ $this->xpath = new DOMXPath($this->domDocument);
if ($type !== null) {
$this->data['type'] = $type;
@@ -104,7 +101,7 @@ public function setOriginalSourceUri($uri)
* Get an original source URI for the feed being parsed. Returns null if
* unset or the feed was not imported from a URI.
*
- * @return string|null
+ * @return null|string
*/
public function getOriginalSourceUri()
{
@@ -125,12 +122,12 @@ public function count()
/**
* Return the current entry
*
- * @return \Zend\Feed\Reader\Entry\AbstractEntry
+ * @return Entry\AbstractEntry
*/
public function current()
{
if (0 === strpos($this->getType(), 'rss')) {
- $reader = new Entry\RSS($this->entries[$this->key()], $this->key(), $this->getType());
+ $reader = new Entry\Rss($this->entries[$this->key()], $this->key(), $this->getType());
} else {
$reader = new Entry\Atom($this->entries[$this->key()], $this->key(), $this->getType());
}
@@ -216,7 +213,6 @@ public function key()
/**
* Move the feed pointer forward
- *
*/
public function next()
{
@@ -225,7 +221,6 @@ public function next()
/**
* Reset the pointer in the feed object
- *
*/
public function rewind()
{
@@ -254,15 +249,16 @@ public function __call($method, $args)
return call_user_func_array([$extension, $method], $args);
}
}
- throw new Exception\BadMethodCallException('Method: ' . $method
- . 'does not exist and could not be located on a registered Extension');
+ throw new Exception\BadMethodCallException(
+ 'Method: ' . $method . ' does not exist and could not be located on a registered Extension'
+ );
}
/**
* Return an Extension object with the matching name (postfixed with _Feed)
*
- * @param string $name
- * @return \Zend\Feed\Reader\Extension\AbstractFeed
+ * @param string $name
+ * @return Extension\AbstractFeed
*/
public function getExtension($name)
{
@@ -291,13 +287,11 @@ protected function loadExtensions()
/**
* Read all entries to the internal entries array
- *
*/
abstract protected function indexEntries();
/**
* Register the default namespaces for the current feed format
- *
*/
abstract protected function registerNamespaces();
}
diff --git a/vendor/laminas/laminas-feed/src/Reader/Collection.php b/vendor/laminas/laminas-feed/src/Reader/Collection.php
new file mode 100644
index 0000000000..52f715bb8a
--- /dev/null
+++ b/vendor/laminas/laminas-feed/src/Reader/Collection.php
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Laminas\Feed\Reader;
+
+use ArrayObject;
+
+/**
+ * @deprecated This class is deprecated. Use the concrete collection classes
+ * \Laminas\Feed\Reader\Collection\Author and \Laminas\Feed\Reader\Collection\Category
+ * or the generic class \Laminas\Feed\Reader\Collection\Collection instead.
+ */
+class Collection extends ArrayObject
+{
+}
diff --git a/vendor/zendframework/zend-feed/src/Reader/Collection/AbstractCollection.php b/vendor/laminas/laminas-feed/src/Reader/Collection/AbstractCollection.php
similarity index 57%
rename from vendor/zendframework/zend-feed/src/Reader/Collection/AbstractCollection.php
rename to vendor/laminas/laminas-feed/src/Reader/Collection/AbstractCollection.php
index 749ff5c809..f63711a146 100644
--- a/vendor/zendframework/zend-feed/src/Reader/Collection/AbstractCollection.php
+++ b/vendor/laminas/laminas-feed/src/Reader/Collection/AbstractCollection.php
@@ -1,13 +1,12 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Reader\Collection;
+namespace Laminas\Feed\Reader\Collection;
use ArrayObject;
diff --git a/vendor/zendframework/zend-feed/src/Reader/Collection/Author.php b/vendor/laminas/laminas-feed/src/Reader/Collection/Author.php
similarity index 55%
rename from vendor/zendframework/zend-feed/src/Reader/Collection/Author.php
rename to vendor/laminas/laminas-feed/src/Reader/Collection/Author.php
index be956d47f2..7270ab2b2e 100644
--- a/vendor/zendframework/zend-feed/src/Reader/Collection/Author.php
+++ b/vendor/laminas/laminas-feed/src/Reader/Collection/Author.php
@@ -1,13 +1,12 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Reader\Collection;
+namespace Laminas\Feed\Reader\Collection;
class Author extends AbstractCollection
{
diff --git a/vendor/zendframework/zend-feed/src/Reader/Collection/Category.php b/vendor/laminas/laminas-feed/src/Reader/Collection/Category.php
similarity index 69%
rename from vendor/zendframework/zend-feed/src/Reader/Collection/Category.php
rename to vendor/laminas/laminas-feed/src/Reader/Collection/Category.php
index 46d64829f5..4f62310c7e 100644
--- a/vendor/zendframework/zend-feed/src/Reader/Collection/Category.php
+++ b/vendor/laminas/laminas-feed/src/Reader/Collection/Category.php
@@ -1,13 +1,12 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Reader\Collection;
+namespace Laminas\Feed\Reader\Collection;
class Category extends AbstractCollection
{
diff --git a/vendor/laminas/laminas-feed/src/Reader/Collection/Collection.php b/vendor/laminas/laminas-feed/src/Reader/Collection/Collection.php
new file mode 100644
index 0000000000..492248f892
--- /dev/null
+++ b/vendor/laminas/laminas-feed/src/Reader/Collection/Collection.php
@@ -0,0 +1,15 @@
+<?php
+
+/**
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Laminas\Feed\Reader\Collection;
+
+use ArrayObject;
+
+class Collection extends ArrayObject
+{
+}
diff --git a/vendor/zendframework/zend-feed/src/Reader/Entry/AbstractEntry.php b/vendor/laminas/laminas-feed/src/Reader/Entry/AbstractEntry.php
similarity index 86%
rename from vendor/zendframework/zend-feed/src/Reader/Entry/AbstractEntry.php
rename to vendor/laminas/laminas-feed/src/Reader/Entry/AbstractEntry.php
index fa8c3f0f01..31ebf9e046 100644
--- a/vendor/zendframework/zend-feed/src/Reader/Entry/AbstractEntry.php
+++ b/vendor/laminas/laminas-feed/src/Reader/Entry/AbstractEntry.php
@@ -1,19 +1,18 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Reader\Entry;
+namespace Laminas\Feed\Reader\Entry;
use DOMDocument;
use DOMElement;
use DOMXPath;
-use Zend\Feed\Reader;
-use Zend\Feed\Reader\Exception;
+use Laminas\Feed\Reader;
+use Laminas\Feed\Reader\Exception;
abstract class AbstractEntry
{
@@ -29,14 +28,14 @@ abstract class AbstractEntry
*
* @var DOMDocument
*/
- protected $domDocument = null;
+ protected $domDocument;
/**
* Entry instance
*
* @var DOMElement
*/
- protected $entry = null;
+ protected $entry;
/**
* Pointer to the current entry
@@ -50,7 +49,7 @@ abstract class AbstractEntry
*
* @var DOMXPath
*/
- protected $xpath = null;
+ protected $xpath;
/**
* Registered extensions
@@ -60,11 +59,8 @@ abstract class AbstractEntry
protected $extensions = [];
/**
- * Constructor
- *
- * @param DOMElement $entry
- * @param int $entryKey
- * @param string $type
+ * @param int $entryKey
+ * @param null|string $type
*/
public function __construct(DOMElement $entry, $entryKey, $type = null)
{
@@ -155,8 +151,7 @@ public function getXpath()
/**
* Set the XPath query
*
- * @param DOMXPath $xpath
- * @return AbstractEntry
+ * @return $this
*/
public function setXpath(DOMXPath $xpath)
{
@@ -177,7 +172,7 @@ public function getExtensions()
/**
* Return an Extension object with the matching name (postfixed with _Entry)
*
- * @param string $name
+ * @param string $name
* @return Reader\Extension\AbstractEntry
*/
public function getExtension($name)
@@ -210,7 +205,7 @@ public function __call($method, $args)
}
/**
- * Load extensions from Zend\Feed\Reader\Reader
+ * Load extensions from Laminas\Feed\Reader\Reader
*
* @return void
*/
diff --git a/vendor/zendframework/zend-feed/src/Reader/Entry/Atom.php b/vendor/laminas/laminas-feed/src/Reader/Entry/Atom.php
similarity index 92%
rename from vendor/zendframework/zend-feed/src/Reader/Entry/Atom.php
rename to vendor/laminas/laminas-feed/src/Reader/Entry/Atom.php
index b60126609f..fc7d0b3c70 100644
--- a/vendor/zendframework/zend-feed/src/Reader/Entry/Atom.php
+++ b/vendor/laminas/laminas-feed/src/Reader/Entry/Atom.php
@@ -1,17 +1,17 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Reader\Entry;
+namespace Laminas\Feed\Reader\Entry;
+use DateTime;
use DOMElement;
use DOMXPath;
-use Zend\Feed\Reader;
+use Laminas\Feed\Reader;
class Atom extends AbstractEntry implements EntryInterface
{
@@ -23,11 +23,8 @@ class Atom extends AbstractEntry implements EntryInterface
protected $xpathQuery = '';
/**
- * Constructor
- *
- * @param DOMElement $entry
- * @param int $entryKey
- * @param string $type
+ * @param int $entryKey
+ * @param null|string $type
*/
public function __construct(DOMElement $entry, $entryKey, $type = null)
{
@@ -101,7 +98,7 @@ public function getContent()
/**
* Get the entry creation date
*
- * @return \DateTime
+ * @return DateTime
*/
public function getDateCreated()
{
@@ -119,7 +116,7 @@ public function getDateCreated()
/**
* Get the entry modification date
*
- * @return \DateTime
+ * @return DateTime
*/
public function getDateModified()
{
@@ -324,7 +321,7 @@ public function getCategories()
$categoryCollection = $this->getExtension('Atom')->getCategories();
- if (count($categoryCollection) == 0) {
+ if (count($categoryCollection) === 0) {
$categoryCollection = $this->getExtension('DublinCore')->getCategories();
}
@@ -336,7 +333,7 @@ public function getCategories()
/**
* Get source feed metadata from the entry
*
- * @return Reader\Feed\Atom\Source|null
+ * @return null|Reader\Feed\Atom\Source
*/
public function getSource()
{
@@ -354,7 +351,6 @@ public function getSource()
/**
* Set the XPath query (incl. on all Extensions)
*
- * @param DOMXPath $xpath
* @return void
*/
public function setXpath(DOMXPath $xpath)
diff --git a/vendor/zendframework/zend-feed/src/Reader/Entry/EntryInterface.php b/vendor/laminas/laminas-feed/src/Reader/Entry/EntryInterface.php
similarity index 81%
rename from vendor/zendframework/zend-feed/src/Reader/Entry/EntryInterface.php
rename to vendor/laminas/laminas-feed/src/Reader/Entry/EntryInterface.php
index b0a445ba4b..3992d28ef7 100644
--- a/vendor/zendframework/zend-feed/src/Reader/Entry/EntryInterface.php
+++ b/vendor/laminas/laminas-feed/src/Reader/Entry/EntryInterface.php
@@ -1,15 +1,16 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Reader\Entry;
+namespace Laminas\Feed\Reader\Entry;
-use Zend\Feed\Reader\Collection\Category;
+use DateTime;
+use Laminas\Feed\Reader\Collection\Category;
+use stdClass;
interface EntryInterface
{
@@ -38,14 +39,14 @@ public function getContent();
/**
* Get the entry creation date
*
- * @return \DateTime
+ * @return DateTime
*/
public function getDateCreated();
/**
* Get the entry modification date
*
- * @return \DateTime
+ * @return DateTime
*/
public function getDateModified();
@@ -59,7 +60,7 @@ public function getDescription();
/**
* Get the entry enclosure
*
- * @return \stdClass
+ * @return stdClass
*/
public function getEnclosure();
diff --git a/vendor/zendframework/zend-feed/src/Reader/Entry/Rss.php b/vendor/laminas/laminas-feed/src/Reader/Entry/Rss.php
similarity index 88%
rename from vendor/zendframework/zend-feed/src/Reader/Entry/Rss.php
rename to vendor/laminas/laminas-feed/src/Reader/Entry/Rss.php
index 9094a13c57..b5cd39bc95 100644
--- a/vendor/zendframework/zend-feed/src/Reader/Entry/Rss.php
+++ b/vendor/laminas/laminas-feed/src/Reader/Entry/Rss.php
@@ -1,19 +1,19 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Reader\Entry;
+namespace Laminas\Feed\Reader\Entry;
use DateTime;
use DOMElement;
use DOMXPath;
-use Zend\Feed\Reader;
-use Zend\Feed\Reader\Exception;
+use Laminas\Feed\Reader;
+use Laminas\Feed\Reader\Exception;
+use stdClass;
class Rss extends AbstractEntry implements EntryInterface
{
@@ -32,11 +32,8 @@ class Rss extends AbstractEntry implements EntryInterface
protected $xpathQueryRss = '';
/**
- * Constructor
- *
- * @param DOMElement $entry
- * @param string $entryKey
- * @param string $type
+ * @param string $entryKey
+ * @param null|string $type
*/
public function __construct(DOMElement $entry, $entryKey, $type = null)
{
@@ -87,18 +84,19 @@ public function getAuthors()
return $this->data['authors'];
}
- $authors = [];
+ $authors = [];
$authorsDc = $this->getExtension('DublinCore')->getAuthors();
if (! empty($authorsDc)) {
foreach ($authorsDc as $author) {
$authors[] = [
- 'name' => $author['name']
+ 'name' => $author['name'],
];
}
}
if ($this->getType() !== Reader\Reader::TYPE_RSS_10
- && $this->getType() !== Reader\Reader::TYPE_RSS_090) {
+ && $this->getType() !== Reader\Reader::TYPE_RSS_090
+ ) {
$list = $this->xpath->query($this->xpathQueryRss . '//author');
} else {
$list = $this->xpath->query($this->xpathQueryRdf . '//rss:author');
@@ -106,11 +104,11 @@ public function getAuthors()
if ($list->length) {
foreach ($list as $author) {
$string = trim($author->nodeValue);
- $data = [];
+ $data = [];
// Pretty rough parsing - but it's a catchall
- if (preg_match("/^.*@[^ ]*/", $string, $matches)) {
+ if (preg_match('/^.*@[^ ]*/', $string, $matches)) {
$data['email'] = trim($matches[0]);
- if (preg_match("/\((.*)\)$/", $string, $matches)) {
+ if (preg_match('/\((.*)\)$/', $string, $matches)) {
$data['name'] = $matches[1];
}
$authors[] = $data;
@@ -118,7 +116,7 @@ public function getAuthors()
}
}
- if (count($authors) == 0) {
+ if (count($authors) === 0) {
$authors = $this->getExtension('Atom')->getAuthors();
} else {
$authors = new Reader\Collection\Author(
@@ -126,7 +124,7 @@ public function getAuthors()
);
}
- if (count($authors) == 0) {
+ if (count($authors) === 0) {
$authors = null;
}
@@ -164,7 +162,7 @@ public function getContent()
/**
* Get the entry's date of creation
*
- * @return \DateTime
+ * @return DateTime
*/
public function getDateCreated()
{
@@ -174,8 +172,8 @@ public function getDateCreated()
/**
* Get the entry's date of modification
*
+ * @return DateTime
* @throws Exception\RuntimeException
- * @return \DateTime
*/
public function getDateModified()
{
@@ -194,8 +192,12 @@ public function getDateModified()
if ($dateModifiedParsed) {
$date = new DateTime('@' . $dateModifiedParsed);
} else {
- $dateStandards = [DateTime::RSS, DateTime::RFC822,
- DateTime::RFC2822, null];
+ $dateStandards = [
+ DateTime::RSS,
+ DateTime::RFC822,
+ DateTime::RFC2822,
+ null,
+ ];
foreach ($dateStandards as $standard) {
try {
$date = date_create_from_format($standard, $dateModified);
@@ -203,9 +205,8 @@ public function getDateModified()
} catch (\Exception $e) {
if ($standard === null) {
throw new Exception\RuntimeException(
- 'Could not load date due to unrecognised'
- .' format (should follow RFC 822 or 2822):'
- . $e->getMessage(),
+ 'Could not load date due to unrecognised format'
+ . ' (should follow RFC 822 or 2822): ' . $e->getMessage(),
0,
$e
);
@@ -273,6 +274,7 @@ public function getDescription()
/**
* Get the entry enclosure
+ *
* @return string
*/
public function getEnclosure()
@@ -283,11 +285,11 @@ public function getEnclosure()
$enclosure = null;
- if ($this->getType() == Reader\Reader::TYPE_RSS_20) {
+ if ($this->getType() === Reader\Reader::TYPE_RSS_20) {
$nodeList = $this->xpath->query($this->xpathQueryRss . '/enclosure');
if ($nodeList->length > 0) {
- $enclosure = new \stdClass();
+ $enclosure = new stdClass();
$enclosure->url = $nodeList->item(0)->getAttribute('url');
$enclosure->length = $nodeList->item(0)->getAttribute('length');
$enclosure->type = $nodeList->item(0)->getAttribute('type');
@@ -377,8 +379,9 @@ public function getLinks()
$links = [];
- if ($this->getType() !== Reader\Reader::TYPE_RSS_10 &&
- $this->getType() !== Reader\Reader::TYPE_RSS_090) {
+ if ($this->getType() !== Reader\Reader::TYPE_RSS_10
+ && $this->getType() !== Reader\Reader::TYPE_RSS_090
+ ) {
$list = $this->xpath->query($this->xpathQueryRss . '//link');
} else {
$list = $this->xpath->query($this->xpathQueryRdf . '//rss:link');
@@ -408,27 +411,28 @@ public function getCategories()
return $this->data['categories'];
}
- if ($this->getType() !== Reader\Reader::TYPE_RSS_10 &&
- $this->getType() !== Reader\Reader::TYPE_RSS_090) {
+ if ($this->getType() !== Reader\Reader::TYPE_RSS_10
+ && $this->getType() !== Reader\Reader::TYPE_RSS_090
+ ) {
$list = $this->xpath->query($this->xpathQueryRss . '//category');
} else {
$list = $this->xpath->query($this->xpathQueryRdf . '//rss:category');
}
if ($list->length) {
- $categoryCollection = new Reader\Collection\Category;
+ $categoryCollection = new Reader\Collection\Category();
foreach ($list as $category) {
$categoryCollection[] = [
- 'term' => $category->nodeValue,
+ 'term' => $category->nodeValue,
'scheme' => $category->getAttribute('domain'),
- 'label' => $category->nodeValue,
+ 'label' => $category->nodeValue,
];
}
} else {
$categoryCollection = $this->getExtension('DublinCore')->getCategories();
}
- if (count($categoryCollection) == 0) {
+ if (count($categoryCollection) === 0) {
$categoryCollection = $this->getExtension('Atom')->getCategories();
}
@@ -488,7 +492,7 @@ public function getTitle()
/**
* Get the number of comments/replies for current entry
*
- * @return string|null
+ * @return null|string
*/
public function getCommentCount()
{
@@ -580,7 +584,6 @@ public function getCommentFeedLink()
/**
* Set the XPath query (incl. on all Extensions)
*
- * @param DOMXPath $xpath
* @return void
*/
public function setXpath(DOMXPath $xpath)
diff --git a/vendor/laminas/laminas-feed/src/Reader/Exception/BadMethodCallException.php b/vendor/laminas/laminas-feed/src/Reader/Exception/BadMethodCallException.php
new file mode 100644
index 0000000000..d79d24a38e
--- /dev/null
+++ b/vendor/laminas/laminas-feed/src/Reader/Exception/BadMethodCallException.php
@@ -0,0 +1,15 @@
+<?php
+
+/**
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Laminas\Feed\Reader\Exception;
+
+use Laminas\Feed\Exception;
+
+class BadMethodCallException extends Exception\BadMethodCallException implements ExceptionInterface
+{
+}
diff --git a/vendor/laminas/laminas-feed/src/Reader/Exception/ExceptionInterface.php b/vendor/laminas/laminas-feed/src/Reader/Exception/ExceptionInterface.php
new file mode 100644
index 0000000000..b1c990769e
--- /dev/null
+++ b/vendor/laminas/laminas-feed/src/Reader/Exception/ExceptionInterface.php
@@ -0,0 +1,15 @@
+<?php
+
+/**
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Laminas\Feed\Reader\Exception;
+
+use Laminas\Feed\Exception\ExceptionInterface as Exception;
+
+interface ExceptionInterface extends Exception
+{
+}
diff --git a/vendor/laminas/laminas-feed/src/Reader/Exception/InvalidArgumentException.php b/vendor/laminas/laminas-feed/src/Reader/Exception/InvalidArgumentException.php
new file mode 100644
index 0000000000..35be6f0ec2
--- /dev/null
+++ b/vendor/laminas/laminas-feed/src/Reader/Exception/InvalidArgumentException.php
@@ -0,0 +1,15 @@
+<?php
+
+/**
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Laminas\Feed\Reader\Exception;
+
+use Laminas\Feed\Exception;
+
+class InvalidArgumentException extends Exception\InvalidArgumentException implements ExceptionInterface
+{
+}
diff --git a/vendor/laminas/laminas-feed/src/Reader/Exception/InvalidHttpClientException.php b/vendor/laminas/laminas-feed/src/Reader/Exception/InvalidHttpClientException.php
new file mode 100644
index 0000000000..d996c05dae
--- /dev/null
+++ b/vendor/laminas/laminas-feed/src/Reader/Exception/InvalidHttpClientException.php
@@ -0,0 +1,15 @@
+<?php
+
+/**
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Laminas\Feed\Reader\Exception;
+
+use Laminas\Feed\Exception;
+
+class InvalidHttpClientException extends Exception\InvalidArgumentException implements ExceptionInterface
+{
+}
diff --git a/vendor/laminas/laminas-feed/src/Reader/Exception/RuntimeException.php b/vendor/laminas/laminas-feed/src/Reader/Exception/RuntimeException.php
new file mode 100644
index 0000000000..101a866dc1
--- /dev/null
+++ b/vendor/laminas/laminas-feed/src/Reader/Exception/RuntimeException.php
@@ -0,0 +1,15 @@
+<?php
+
+/**
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Laminas\Feed\Reader\Exception;
+
+use Laminas\Feed\Exception;
+
+class RuntimeException extends Exception\RuntimeException implements ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zend-feed/src/Reader/Extension/AbstractEntry.php b/vendor/laminas/laminas-feed/src/Reader/Extension/AbstractEntry.php
similarity index 79%
rename from vendor/zendframework/zend-feed/src/Reader/Extension/AbstractEntry.php
rename to vendor/laminas/laminas-feed/src/Reader/Extension/AbstractEntry.php
index 54df33e4c6..798f7e8e57 100644
--- a/vendor/zendframework/zend-feed/src/Reader/Extension/AbstractEntry.php
+++ b/vendor/laminas/laminas-feed/src/Reader/Extension/AbstractEntry.php
@@ -1,18 +1,17 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Reader\Extension;
+namespace Laminas\Feed\Reader\Extension;
use DOMDocument;
use DOMElement;
use DOMXPath;
-use Zend\Feed\Reader;
+use Laminas\Feed\Reader;
abstract class AbstractEntry
{
@@ -28,14 +27,14 @@ abstract class AbstractEntry
*
* @var DOMDocument
*/
- protected $domDocument = null;
+ protected $domDocument;
/**
* Entry instance
*
* @var DOMElement
*/
- protected $entry = null;
+ protected $entry;
/**
* Pointer to the current entry
@@ -49,7 +48,7 @@ abstract class AbstractEntry
*
* @var DOMXPath
*/
- protected $xpath = null;
+ protected $xpath;
/**
* XPath query
@@ -63,12 +62,11 @@ abstract class AbstractEntry
*
* Has side effect of setting the DOMDocument for the entry.
*
- * @param DOMElement $entry
- * @return AbstractEntry
+ * @return $this
*/
public function setEntryElement(DOMElement $entry)
{
- $this->entry = $entry;
+ $this->entry = $entry;
$this->domDocument = $entry->ownerDocument;
return $this;
}
@@ -87,7 +85,7 @@ public function getEntryElement()
* Set the entry key
*
* @param string $entryKey
- * @return AbstractEntry
+ * @return $this
*/
public function setEntryKey($entryKey)
{
@@ -122,7 +120,7 @@ public function getEncoding()
* Has side effect of setting xpath prefix
*
* @param string $type
- * @return AbstractEntry
+ * @return $this
*/
public function setType($type)
{
@@ -135,18 +133,18 @@ public function setType($type)
if ($type === Reader\Reader::TYPE_RSS_10
|| $type === Reader\Reader::TYPE_RSS_090
) {
- $this->setXpathPrefix('//rss:item[' . ((int)$this->entryKey + 1) . ']');
+ $this->setXpathPrefix('//rss:item[' . ((int) $this->entryKey + 1) . ']');
return $this;
}
if ($type === Reader\Reader::TYPE_ATOM_10
|| $type === Reader\Reader::TYPE_ATOM_03
) {
- $this->setXpathPrefix('//atom:entry[' . ((int)$this->entryKey + 1) . ']');
+ $this->setXpathPrefix('//atom:entry[' . ((int) $this->entryKey + 1) . ']');
return $this;
}
- $this->setXpathPrefix('//item[' . ((int)$this->entryKey + 1) . ']');
+ $this->setXpathPrefix('//item[' . ((int) $this->entryKey + 1) . ']');
return $this;
}
@@ -169,8 +167,7 @@ public function getType()
/**
* Set the XPath query
*
- * @param DOMXPath $xpath
- * @return AbstractEntry
+ * @return $this
*/
public function setXpath(DOMXPath $xpath)
{
@@ -216,7 +213,7 @@ public function getXpathPrefix()
* Set the XPath prefix
*
* @param string $prefix
- * @return AbstractEntry
+ * @return $this
*/
public function setXpathPrefix($prefix)
{
diff --git a/vendor/zendframework/zend-feed/src/Reader/Extension/AbstractFeed.php b/vendor/laminas/laminas-feed/src/Reader/Extension/AbstractFeed.php
similarity index 83%
rename from vendor/zendframework/zend-feed/src/Reader/Extension/AbstractFeed.php
rename to vendor/laminas/laminas-feed/src/Reader/Extension/AbstractFeed.php
index 1af1de2002..0e1034db40 100644
--- a/vendor/zendframework/zend-feed/src/Reader/Extension/AbstractFeed.php
+++ b/vendor/laminas/laminas-feed/src/Reader/Extension/AbstractFeed.php
@@ -1,17 +1,16 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Reader\Extension;
+namespace Laminas\Feed\Reader\Extension;
use DOMDocument;
use DOMXPath;
-use Zend\Feed\Reader;
+use Laminas\Feed\Reader;
abstract class AbstractFeed
{
@@ -27,14 +26,14 @@ abstract class AbstractFeed
*
* @var DOMDocument
*/
- protected $domDocument = null;
+ protected $domDocument;
/**
* The base XPath query used to retrieve feed data
*
* @var DOMXPath
*/
- protected $xpath = null;
+ protected $xpath;
/**
* The XPath prefix
@@ -46,8 +45,7 @@ abstract class AbstractFeed
/**
* Set the DOM document
*
- * @param DOMDocument $dom
- * @return AbstractFeed
+ * @return $this
*/
public function setDomDocument(DOMDocument $dom)
{
@@ -80,7 +78,7 @@ public function getEncoding()
* Set the feed type
*
* @param string $type
- * @return AbstractFeed
+ * @return $this
*/
public function setType($type)
{
@@ -118,8 +116,7 @@ public function toArray() // untested
/**
* Set the XPath query
*
- * @param DOMXPath $xpath
- * @return AbstractFeed
+ * @return $this
*/
public function setXpath(DOMXPath $xpath = null)
{
diff --git a/vendor/zendframework/zend-feed/src/Reader/Extension/Atom/Entry.php b/vendor/laminas/laminas-feed/src/Reader/Extension/Atom/Entry.php
similarity index 86%
rename from vendor/zendframework/zend-feed/src/Reader/Extension/Atom/Entry.php
rename to vendor/laminas/laminas-feed/src/Reader/Extension/Atom/Entry.php
index 9ded6aa98c..7b023589f8 100644
--- a/vendor/zendframework/zend-feed/src/Reader/Extension/Atom/Entry.php
+++ b/vendor/laminas/laminas-feed/src/Reader/Extension/Atom/Entry.php
@@ -1,22 +1,21 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Reader\Extension\Atom;
+namespace Laminas\Feed\Reader\Extension\Atom;
use DateTime;
use DOMDocument;
use DOMElement;
+use Laminas\Feed\Reader;
+use Laminas\Feed\Reader\Collection;
+use Laminas\Feed\Reader\Extension;
+use Laminas\Feed\Uri;
use stdClass;
-use Zend\Feed\Reader;
-use Zend\Feed\Reader\Collection;
-use Zend\Feed\Reader\Extension;
-use Zend\Feed\Uri;
class Entry extends Extension\AbstractEntry
{
@@ -24,7 +23,7 @@ class Entry extends Extension\AbstractEntry
* Get the specified author
*
* @param int $index
- * @return string|null
+ * @return null|string
*/
public function getAuthor($index = 0)
{
@@ -49,7 +48,7 @@ public function getAuthors()
}
$authors = [];
- $list = $this->getXpath()->query($this->getXpathPrefix() . '//atom:author');
+ $list = $this->getXpath()->query($this->getXpathPrefix() . '//atom:author');
if (! $list->length) {
/**
@@ -67,7 +66,7 @@ public function getAuthors()
}
}
- if (count($authors) == 0) {
+ if (count($authors) === 0) {
$authors = new Collection\Author();
} else {
$authors = new Collection\Author(
@@ -94,7 +93,7 @@ public function getContent()
$el = $this->getXpath()->query($this->getXpathPrefix() . '/atom:content');
if ($el->length > 0) {
- $el = $el->item(0);
+ $el = $el->item(0);
$type = $el->getAttribute('type');
switch ($type) {
case '':
@@ -106,11 +105,11 @@ public function getContent()
break;
case 'xhtml':
$this->getXpath()->registerNamespace('xhtml', 'http://www.w3.org/1999/xhtml');
- $xhtml = $this->getXpath()->query(
- $this->getXpathPrefix() . '/atom:content/xhtml:div'
- )->item(0);
- $d = new DOMDocument('1.0', $this->getEncoding());
- $deep = version_compare(PHP_VERSION, '7', 'ge') ? 1 : true;
+ $xhtml = $this->getXpath()
+ ->query($this->getXpathPrefix() . '/atom:content/xhtml:div')
+ ->item(0);
+ $d = new DOMDocument('1.0', $this->getEncoding());
+ $deep = version_compare(PHP_VERSION, '7', 'ge') ? 1 : true;
$xhtmls = $d->importNode($xhtml, $deep);
$d->appendChild($xhtmls);
$content = $this->collectXhtml(
@@ -133,8 +132,8 @@ public function getContent()
/**
* Parse out XHTML to remove the namespacing
*
- * @param $xhtml
- * @param $prefix
+ * @param string $xhtml
+ * @param string $prefix
* @return mixed
*/
protected function collectXhtml($xhtml, $prefix)
@@ -143,12 +142,12 @@ protected function collectXhtml($xhtml, $prefix)
$prefix = $prefix . ':';
}
$matches = [
- "/<\?xml[^<]*>[^<]*<" . $prefix . "div[^<]*/",
- "/<\/" . $prefix . "div>\s*$/"
+ '/<\?xml[^<]*>[^<]*<' . $prefix . 'div[^>]*>/',
+ '/<\/' . $prefix . 'div>\s*$/',
];
- $xhtml = preg_replace($matches, '', $xhtml);
+ $xhtml = preg_replace($matches, '', $xhtml);
if (! empty($prefix)) {
- $xhtml = preg_replace("/(<[\/]?)" . $prefix . "([a-zA-Z]+)/", '$1$2', $xhtml);
+ $xhtml = preg_replace('/(<[\/]?)' . $prefix . '([a-zA-Z]+)/', '$1$2', $xhtml);
}
return $xhtml;
}
@@ -289,7 +288,7 @@ public function getId()
/**
* Get the base URI of the feed (if set).
*
- * @return string|null
+ * @return null|string
*/
public function getBaseUrl()
{
@@ -298,10 +297,7 @@ public function getBaseUrl()
}
$baseUrl = $this->getXpath()->evaluate(
- 'string('
- . $this->getXpathPrefix()
- . '/@xml:base[1]'
- . ')'
+ 'string(' . $this->getXpathPrefix() . '/@xml:base[1])'
);
if (! $baseUrl) {
@@ -350,8 +346,8 @@ public function getLinks()
$links = [];
$list = $this->getXpath()->query(
- $this->getXpathPrefix() . '//atom:link[@rel="alternate"]/@href' . '|' .
- $this->getXpathPrefix() . '//atom:link[not(@rel)]/@href'
+ $this->getXpathPrefix() . '//atom:link[@rel="alternate"]/@href' . '|'
+ . $this->getXpathPrefix() . '//atom:link[not(@rel)]/@href'
);
if ($list->length) {
@@ -454,7 +450,7 @@ public function getCommentLink()
/**
* Returns a URI pointing to a feed of all comments for this entry
*
- * @param string $type
+ * @param string $type
* @return string
*/
public function getCommentFeedLink($type = 'atom')
@@ -466,7 +462,7 @@ public function getCommentFeedLink($type = 'atom')
$link = null;
$list = $this->getXpath()->query(
- $this->getXpathPrefix() . '//atom:link[@rel="replies" and @type="application/' . $type.'+xml"]/@href'
+ $this->getXpathPrefix() . '//atom:link[@rel="replies" and @type="application/' . $type . '+xml"]/@href'
);
if ($list->length) {
@@ -490,7 +486,7 @@ public function getCategories()
return $this->data['categories'];
}
- if ($this->getAtomType() == Reader\Reader::TYPE_ATOM_10) {
+ if ($this->getAtomType() === Reader\Reader::TYPE_ATOM_10) {
$list = $this->getXpath()->query($this->getXpathPrefix() . '//atom:category');
} else {
/**
@@ -503,16 +499,16 @@ public function getCategories()
}
if ($list->length) {
- $categoryCollection = new Collection\Category;
+ $categoryCollection = new Collection\Category();
foreach ($list as $category) {
$categoryCollection[] = [
- 'term' => $category->getAttribute('term'),
+ 'term' => $category->getAttribute('term'),
'scheme' => $category->getAttribute('scheme'),
- 'label' => $category->getAttribute('label')
+ 'label' => $category->getAttribute('label'),
];
}
} else {
- return new Collection\Category;
+ return new Collection\Category();
}
$this->data['categories'] = $categoryCollection;
@@ -523,7 +519,7 @@ public function getCategories()
/**
* Get source feed metadata from the entry
*
- * @return Reader\Feed\Atom\Source|null
+ * @return null|Reader\Feed\Atom\Source
*/
public function getSource()
{
@@ -533,11 +529,11 @@ public function getSource()
$source = null;
// TODO: Investigate why _getAtomType() fails here. Is it even needed?
- if ($this->getType() == Reader\Reader::TYPE_ATOM_10) {
+ if ($this->getType() === Reader\Reader::TYPE_ATOM_10) {
$list = $this->getXpath()->query($this->getXpathPrefix() . '/atom:source[1]');
if ($list->length) {
$element = $list->item(0);
- $source = new Reader\Feed\Atom\Source($element, $this->getXpathPrefix());
+ $source = new Reader\Feed\Atom\Source($element, $this->getXpathPrefix());
}
}
@@ -546,10 +542,10 @@ public function getSource()
}
/**
- * Attempt to absolutise the URI, i.e. if a relative URI apply the
+ * Attempt to absolutise the URI, i.e. if a relative URI apply the
* xml:base value as a prefix to turn into an absolute URI.
*
- * @param $link
+ * @param string $link
* @return string
*/
protected function absolutiseUri($link)
@@ -568,7 +564,6 @@ protected function absolutiseUri($link)
/**
* Get an author entry
*
- * @param DOMElement $element
* @return string
*/
protected function getAuthorFromElement(DOMElement $element)
@@ -619,15 +614,17 @@ protected function registerNamespaces()
*/
protected function getAtomType()
{
- $dom = $this->getDomDocument();
+ $dom = $this->getDomDocument();
$prefixAtom03 = $dom->lookupPrefix(Reader\Reader::NAMESPACE_ATOM_03);
$prefixAtom10 = $dom->lookupPrefix(Reader\Reader::NAMESPACE_ATOM_10);
if ($dom->isDefaultNamespace(Reader\Reader::NAMESPACE_ATOM_03)
- || ! empty($prefixAtom03)) {
+ || ! empty($prefixAtom03)
+ ) {
return Reader\Reader::TYPE_ATOM_03;
}
if ($dom->isDefaultNamespace(Reader\Reader::NAMESPACE_ATOM_10)
- || ! empty($prefixAtom10)) {
+ || ! empty($prefixAtom10)
+ ) {
return Reader\Reader::TYPE_ATOM_10;
}
}
diff --git a/vendor/zendframework/zend-feed/src/Reader/Extension/Atom/Feed.php b/vendor/laminas/laminas-feed/src/Reader/Extension/Atom/Feed.php
similarity index 88%
rename from vendor/zendframework/zend-feed/src/Reader/Extension/Atom/Feed.php
rename to vendor/laminas/laminas-feed/src/Reader/Extension/Atom/Feed.php
index a0783d3562..bca6bc9a3b 100644
--- a/vendor/zendframework/zend-feed/src/Reader/Extension/Atom/Feed.php
+++ b/vendor/laminas/laminas-feed/src/Reader/Extension/Atom/Feed.php
@@ -1,20 +1,19 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Reader\Extension\Atom;
+namespace Laminas\Feed\Reader\Extension\Atom;
use DateTime;
use DOMElement;
-use Zend\Feed\Reader;
-use Zend\Feed\Reader\Collection;
-use Zend\Feed\Reader\Extension;
-use Zend\Feed\Uri;
+use Laminas\Feed\Reader;
+use Laminas\Feed\Reader\Collection;
+use Laminas\Feed\Reader\Extension;
+use Laminas\Feed\Uri;
class Feed extends Extension\AbstractFeed
{
@@ -22,7 +21,7 @@ class Feed extends Extension\AbstractFeed
* Get a single author
*
* @param int $index
- * @return string|null
+ * @return null|string
*/
public function getAuthor($index = 0)
{
@@ -59,7 +58,7 @@ public function getAuthors()
}
}
- if (count($authors) == 0) {
+ if (count($authors) === 0) {
$authors = new Collection\Author();
} else {
$authors = new Collection\Author(
@@ -75,7 +74,7 @@ public function getAuthors()
/**
* Get the copyright entry
*
- * @return string|null
+ * @return null|string
*/
public function getCopyright()
{
@@ -103,7 +102,7 @@ public function getCopyright()
/**
* Get the feed creation date
*
- * @return DateTime|null
+ * @return null|DateTime
*/
public function getDateCreated()
{
@@ -131,7 +130,7 @@ public function getDateCreated()
/**
* Get the feed modification date
*
- * @return DateTime|null
+ * @return null|DateTime
*/
public function getDateModified()
{
@@ -159,7 +158,7 @@ public function getDateModified()
/**
* Get the feed description
*
- * @return string|null
+ * @return null|string
*/
public function getDescription()
{
@@ -187,7 +186,7 @@ public function getDescription()
/**
* Get the feed generator entry
*
- * @return string|null
+ * @return null|string
*/
public function getGenerator()
{
@@ -209,7 +208,7 @@ public function getGenerator()
/**
* Get the feed ID
*
- * @return string|null
+ * @return null|string
*/
public function getId()
{
@@ -237,7 +236,7 @@ public function getId()
/**
* Get the feed language
*
- * @return string|null
+ * @return null|string
*/
public function getLanguage()
{
@@ -263,7 +262,7 @@ public function getLanguage()
/**
* Get the feed image
*
- * @return array|null
+ * @return null|array
*/
public function getImage()
{
@@ -287,7 +286,7 @@ public function getImage()
/**
* Get the base URI of the feed (if set).
*
- * @return string|null
+ * @return null|string
*/
public function getBaseUrl()
{
@@ -308,7 +307,7 @@ public function getBaseUrl()
/**
* Get a link to the source website
*
- * @return string|null
+ * @return null|string
*/
public function getLink()
{
@@ -319,8 +318,8 @@ public function getLink()
$link = null;
$list = $this->xpath->query(
- $this->getXpathPrefix() . '/atom:link[@rel="alternate"]/@href' . '|' .
- $this->getXpathPrefix() . '/atom:link[not(@rel)]/@href'
+ $this->getXpathPrefix() . '/atom:link[@rel="alternate"]/@href' . '|'
+ . $this->getXpathPrefix() . '/atom:link[not(@rel)]/@href'
);
if ($list->length) {
@@ -336,7 +335,7 @@ public function getLink()
/**
* Get a link to the feed's XML Url
*
- * @return string|null
+ * @return null|string
*/
public function getFeedLink()
{
@@ -356,7 +355,7 @@ public function getFeedLink()
/**
* Get an array of any supported Pusubhubbub endpoints
*
- * @return array|null
+ * @return null|array
*/
public function getHubs()
{
@@ -365,8 +364,7 @@ public function getHubs()
}
$hubs = [];
- $list = $this->xpath->query($this->getXpathPrefix()
- . '//atom:link[@rel="hub"]/@href');
+ $list = $this->xpath->query($this->getXpathPrefix() . '//atom:link[@rel="hub"]/@href');
if ($list->length) {
foreach ($list as $uri) {
@@ -384,7 +382,7 @@ public function getHubs()
/**
* Get the feed title
*
- * @return string|null
+ * @return null|string
*/
public function getTitle()
{
@@ -414,7 +412,7 @@ public function getCategories()
return $this->data['categories'];
}
- if ($this->getType() == Reader\Reader::TYPE_ATOM_10) {
+ if ($this->getType() === Reader\Reader::TYPE_ATOM_10) {
$list = $this->xpath->query($this->getXpathPrefix() . '/atom:category');
} else {
/**
@@ -427,16 +425,16 @@ public function getCategories()
}
if ($list->length) {
- $categoryCollection = new Collection\Category;
+ $categoryCollection = new Collection\Category();
foreach ($list as $category) {
$categoryCollection[] = [
- 'term' => $category->getAttribute('term'),
+ 'term' => $category->getAttribute('term'),
'scheme' => $category->getAttribute('scheme'),
- 'label' => $category->getAttribute('label')
+ 'label' => $category->getAttribute('label'),
];
}
} else {
- return new Collection\Category;
+ return new Collection\Category();
}
$this->data['categories'] = $categoryCollection;
@@ -447,7 +445,6 @@ public function getCategories()
/**
* Get an author entry in RSS format
*
- * @param DOMElement $element
* @return string
*/
protected function getAuthorFromElement(DOMElement $element)
@@ -477,11 +474,11 @@ protected function getAuthorFromElement(DOMElement $element)
}
/**
- * Attempt to absolutise the URI, i.e. if a relative URI apply the
+ * Attempt to absolutise the URI, i.e. if a relative URI apply the
* xml:base value as a prefix to turn into an absolute URI.
*
- * @param string $link
- * @return string|null
+ * @param string $link
+ * @return null|string
*/
protected function absolutiseUri($link)
{
@@ -501,8 +498,8 @@ protected function absolutiseUri($link)
*/
protected function registerNamespaces()
{
- if ($this->getType() == Reader\Reader::TYPE_ATOM_10
- || $this->getType() == Reader\Reader::TYPE_ATOM_03
+ if ($this->getType() === Reader\Reader::TYPE_ATOM_10
+ || $this->getType() === Reader\Reader::TYPE_ATOM_03
) {
return; // pre-registered at Feed level
}
@@ -522,7 +519,7 @@ protected function registerNamespaces()
*/
protected function getAtomType()
{
- $dom = $this->getDomDocument();
+ $dom = $this->getDomDocument();
$prefixAtom03 = $dom->lookupPrefix(Reader\Reader::NAMESPACE_ATOM_03);
$prefixAtom10 = $dom->lookupPrefix(Reader\Reader::NAMESPACE_ATOM_10);
if ($dom->isDefaultNamespace(Reader\Reader::NAMESPACE_ATOM_10)
diff --git a/vendor/zendframework/zend-feed/src/Reader/Extension/Content/Entry.php b/vendor/laminas/laminas-feed/src/Reader/Extension/Content/Entry.php
similarity index 64%
rename from vendor/zendframework/zend-feed/src/Reader/Extension/Content/Entry.php
rename to vendor/laminas/laminas-feed/src/Reader/Extension/Content/Entry.php
index 539848f258..b05470b803 100644
--- a/vendor/zendframework/zend-feed/src/Reader/Extension/Content/Entry.php
+++ b/vendor/laminas/laminas-feed/src/Reader/Extension/Content/Entry.php
@@ -1,16 +1,15 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Reader\Extension\Content;
+namespace Laminas\Feed\Reader\Extension\Content;
-use Zend\Feed\Reader;
-use Zend\Feed\Reader\Extension;
+use Laminas\Feed\Reader;
+use Laminas\Feed\Reader\Extension;
class Entry extends Extension\AbstractEntry
{
diff --git a/vendor/zendframework/zend-feed/src/Reader/Extension/CreativeCommons/Entry.php b/vendor/laminas/laminas-feed/src/Reader/Extension/CreativeCommons/Entry.php
similarity index 67%
rename from vendor/zendframework/zend-feed/src/Reader/Extension/CreativeCommons/Entry.php
rename to vendor/laminas/laminas-feed/src/Reader/Extension/CreativeCommons/Entry.php
index a75a5c49a1..710cae4c7a 100644
--- a/vendor/zendframework/zend-feed/src/Reader/Extension/CreativeCommons/Entry.php
+++ b/vendor/laminas/laminas-feed/src/Reader/Extension/CreativeCommons/Entry.php
@@ -1,23 +1,22 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Reader\Extension\CreativeCommons;
+namespace Laminas\Feed\Reader\Extension\CreativeCommons;
-use Zend\Feed\Reader\Extension;
+use Laminas\Feed\Reader\Extension;
class Entry extends Extension\AbstractEntry
{
/**
* Get the entry license
*
- * @param int $index
- * @return string|null
+ * @param int $index
+ * @return null|string
*/
public function getLicense($index = 0)
{
@@ -43,7 +42,7 @@ public function getLicenses()
}
$licenses = [];
- $list = $this->xpath->evaluate($this->getXpathPrefix() . '//cc:license');
+ $list = $this->xpath->evaluate($this->getXpathPrefix() . '//cc:license');
if ($list->length) {
foreach ($list as $license) {
@@ -52,7 +51,7 @@ public function getLicenses()
$licenses = array_unique($licenses);
} else {
- $cc = new Feed();
+ $cc = new Feed();
$licenses = $cc->getLicenses();
}
@@ -63,7 +62,6 @@ public function getLicenses()
/**
* Register Creative Commons namespaces
- *
*/
protected function registerNamespaces()
{
diff --git a/vendor/zendframework/zend-feed/src/Reader/Extension/CreativeCommons/Feed.php b/vendor/laminas/laminas-feed/src/Reader/Extension/CreativeCommons/Feed.php
similarity index 69%
rename from vendor/zendframework/zend-feed/src/Reader/Extension/CreativeCommons/Feed.php
rename to vendor/laminas/laminas-feed/src/Reader/Extension/CreativeCommons/Feed.php
index 8532a88c0a..7ee982080c 100644
--- a/vendor/zendframework/zend-feed/src/Reader/Extension/CreativeCommons/Feed.php
+++ b/vendor/laminas/laminas-feed/src/Reader/Extension/CreativeCommons/Feed.php
@@ -1,23 +1,22 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Reader\Extension\CreativeCommons;
+namespace Laminas\Feed\Reader\Extension\CreativeCommons;
-use Zend\Feed\Reader\Extension;
+use Laminas\Feed\Reader\Extension;
class Feed extends Extension\AbstractFeed
{
/**
* Get the entry license
*
- * @param int $index
- * @return string|null
+ * @param int $index
+ * @return null|string
*/
public function getLicense($index = 0)
{
@@ -43,7 +42,7 @@ public function getLicenses()
}
$licenses = [];
- $list = $this->xpath->evaluate('channel/cc:license');
+ $list = $this->xpath->evaluate('channel/cc:license');
if ($list->length) {
foreach ($list as $license) {
diff --git a/vendor/zendframework/zend-feed/src/Reader/Extension/DublinCore/Entry.php b/vendor/laminas/laminas-feed/src/Reader/Extension/DublinCore/Entry.php
similarity index 85%
rename from vendor/zendframework/zend-feed/src/Reader/Extension/DublinCore/Entry.php
rename to vendor/laminas/laminas-feed/src/Reader/Extension/DublinCore/Entry.php
index 4da435b355..998d1a774e 100644
--- a/vendor/zendframework/zend-feed/src/Reader/Extension/DublinCore/Entry.php
+++ b/vendor/laminas/laminas-feed/src/Reader/Extension/DublinCore/Entry.php
@@ -1,25 +1,24 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Reader\Extension\DublinCore;
+namespace Laminas\Feed\Reader\Extension\DublinCore;
use DateTime;
-use Zend\Feed\Reader;
-use Zend\Feed\Reader\Collection;
-use Zend\Feed\Reader\Extension;
+use Laminas\Feed\Reader;
+use Laminas\Feed\Reader\Collection;
+use Laminas\Feed\Reader\Extension;
class Entry extends Extension\AbstractEntry
{
/**
* Get an author entry
*
- * @param int $index
+ * @param int $index
* @return string
*/
public function getAuthor($index = 0)
@@ -45,7 +44,7 @@ public function getAuthors()
}
$authors = [];
- $list = $this->getXpath()->evaluate($this->getXpathPrefix() . '//dc11:creator');
+ $list = $this->getXpath()->evaluate($this->getXpathPrefix() . '//dc11:creator');
if (! $list->length) {
$list = $this->getXpath()->evaluate($this->getXpathPrefix() . '//dc10:creator');
@@ -61,7 +60,7 @@ public function getAuthors()
if ($list->length) {
foreach ($list as $author) {
$authors[] = [
- 'name' => $author->nodeValue
+ 'name' => $author->nodeValue,
];
}
$authors = new Collection\Author(
@@ -94,16 +93,16 @@ public function getCategories()
}
if ($list->length) {
- $categoryCollection = new Collection\Category;
+ $categoryCollection = new Collection\Category();
foreach ($list as $category) {
$categoryCollection[] = [
- 'term' => $category->nodeValue,
+ 'term' => $category->nodeValue,
'scheme' => null,
- 'label' => $category->nodeValue,
+ 'label' => $category->nodeValue,
];
}
} else {
- $categoryCollection = new Collection\Category;
+ $categoryCollection = new Collection\Category();
}
$this->data['categories'] = $categoryCollection;
@@ -195,9 +194,7 @@ public function getTitle()
}
/**
- *
- *
- * @return DateTime|null
+ * @return null|DateTime
*/
public function getDate()
{
diff --git a/vendor/zendframework/zend-feed/src/Reader/Extension/DublinCore/Feed.php b/vendor/laminas/laminas-feed/src/Reader/Extension/DublinCore/Feed.php
similarity index 86%
rename from vendor/zendframework/zend-feed/src/Reader/Extension/DublinCore/Feed.php
rename to vendor/laminas/laminas-feed/src/Reader/Extension/DublinCore/Feed.php
index 11fc68d68d..7c4c3f5c67 100644
--- a/vendor/zendframework/zend-feed/src/Reader/Extension/DublinCore/Feed.php
+++ b/vendor/laminas/laminas-feed/src/Reader/Extension/DublinCore/Feed.php
@@ -1,18 +1,17 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Reader\Extension\DublinCore;
+namespace Laminas\Feed\Reader\Extension\DublinCore;
use DateTime;
-use Zend\Feed\Reader;
-use Zend\Feed\Reader\Collection;
-use Zend\Feed\Reader\Extension;
+use Laminas\Feed\Reader;
+use Laminas\Feed\Reader\Collection;
+use Laminas\Feed\Reader\Extension;
class Feed extends Extension\AbstractFeed
{
@@ -20,7 +19,7 @@ class Feed extends Extension\AbstractFeed
* Get a single author
*
* @param int $index
- * @return string|null
+ * @return null|string
*/
public function getAuthor($index = 0)
{
@@ -61,7 +60,7 @@ public function getAuthors()
if ($list->length) {
foreach ($list as $author) {
$authors[] = [
- 'name' => $author->nodeValue
+ 'name' => $author->nodeValue,
];
}
$authors = new Collection\Author(
@@ -79,7 +78,7 @@ public function getAuthors()
/**
* Get the copyright entry
*
- * @return string|null
+ * @return null|string
*/
public function getCopyright()
{
@@ -105,7 +104,7 @@ public function getCopyright()
/**
* Get the feed description
*
- * @return string|null
+ * @return null|string
*/
public function getDescription()
{
@@ -131,7 +130,7 @@ public function getDescription()
/**
* Get the feed ID
*
- * @return string|null
+ * @return null|string
*/
public function getId()
{
@@ -153,7 +152,7 @@ public function getId()
/**
* Get the feed language
*
- * @return string|null
+ * @return null|string
*/
public function getLanguage()
{
@@ -179,7 +178,7 @@ public function getLanguage()
/**
* Get the feed title
*
- * @return string|null
+ * @return null|string
*/
public function getTitle()
{
@@ -203,9 +202,7 @@ public function getTitle()
}
/**
- *
- *
- * @return DateTime|null
+ * @return null|DateTime
*/
public function getDate()
{
@@ -213,7 +210,7 @@ public function getDate()
return $this->data['date'];
}
- $d = null;
+ $d = null;
$date = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/dc11:date)');
if (! $date) {
@@ -247,16 +244,16 @@ public function getCategories()
}
if ($list->length) {
- $categoryCollection = new Collection\Category;
+ $categoryCollection = new Collection\Category();
foreach ($list as $category) {
$categoryCollection[] = [
- 'term' => $category->nodeValue,
+ 'term' => $category->nodeValue,
'scheme' => null,
- 'label' => $category->nodeValue,
+ 'label' => $category->nodeValue,
];
}
} else {
- $categoryCollection = new Collection\Category;
+ $categoryCollection = new Collection\Category();
}
$this->data['categories'] = $categoryCollection;
diff --git a/vendor/zendframework/zend-feed/src/Reader/Extension/GooglePlayPodcast/Entry.php b/vendor/laminas/laminas-feed/src/Reader/Extension/GooglePlayPodcast/Entry.php
similarity index 83%
rename from vendor/zendframework/zend-feed/src/Reader/Extension/GooglePlayPodcast/Entry.php
rename to vendor/laminas/laminas-feed/src/Reader/Extension/GooglePlayPodcast/Entry.php
index 0ce6cda7a8..723c1a1704 100644
--- a/vendor/zendframework/zend-feed/src/Reader/Extension/GooglePlayPodcast/Entry.php
+++ b/vendor/laminas/laminas-feed/src/Reader/Extension/GooglePlayPodcast/Entry.php
@@ -1,13 +1,14 @@
<?php
+
/**
- * @see https://github.com/zendframework/zend-feed for the canonical source repository
- * @copyright Copyright (c) 2018 Zend Technologies USA Inc. (https://www.zend.com)
- * @license https://github.com/zendframework/zend-feed/blob/master/LICENSE.md New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Reader\Extension\GooglePlayPodcast;
+namespace Laminas\Feed\Reader\Extension\GooglePlayPodcast;
-use Zend\Feed\Reader\Extension;
+use Laminas\Feed\Reader\Extension;
class Entry extends Extension\AbstractEntry
{
@@ -81,7 +82,6 @@ public function getPlayPodcastDescription()
/**
* Register googleplay namespace
- *
*/
protected function registerNamespaces()
{
diff --git a/vendor/zendframework/zend-feed/src/Reader/Extension/GooglePlayPodcast/Feed.php b/vendor/laminas/laminas-feed/src/Reader/Extension/GooglePlayPodcast/Feed.php
similarity index 89%
rename from vendor/zendframework/zend-feed/src/Reader/Extension/GooglePlayPodcast/Feed.php
rename to vendor/laminas/laminas-feed/src/Reader/Extension/GooglePlayPodcast/Feed.php
index 94fef58f9c..203ffc6fac 100644
--- a/vendor/zendframework/zend-feed/src/Reader/Extension/GooglePlayPodcast/Feed.php
+++ b/vendor/laminas/laminas-feed/src/Reader/Extension/GooglePlayPodcast/Feed.php
@@ -1,14 +1,15 @@
<?php
+
/**
- * @see https://github.com/zendframework/zend-feed for the canonical source repository
- * @copyright Copyright (c) 2018 Zend Technologies USA Inc. (https://www.zend.com)
- * @license https://github.com/zendframework/zend-feed/blob/master/LICENSE.md New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Reader\Extension\GooglePlayPodcast;
+namespace Laminas\Feed\Reader\Extension\GooglePlayPodcast;
use DOMText;
-use Zend\Feed\Reader\Extension;
+use Laminas\Feed\Reader\Extension;
class Feed extends Extension\AbstractFeed
{
@@ -59,7 +60,7 @@ public function getPlayPodcastBlock()
/**
* Get the entry category
*
- * @return array|null
+ * @return null|array
*/
public function getPlayPodcastCategories()
{
@@ -79,7 +80,7 @@ public function getPlayPodcastCategories()
$children = [];
foreach ($node->childNodes as $childNode) {
- if (! ($childNode instanceof DOMText)) {
+ if (! $childNode instanceof DOMText) {
$children[$childNode->getAttribute('text')] = null;
}
}
@@ -166,7 +167,6 @@ public function getPlayPodcastDescription()
/**
* Register googleplay namespace
- *
*/
protected function registerNamespaces()
{
diff --git a/vendor/zendframework/zend-feed/src/Reader/Extension/Podcast/Entry.php b/vendor/laminas/laminas-feed/src/Reader/Extension/Podcast/Entry.php
similarity index 95%
rename from vendor/zendframework/zend-feed/src/Reader/Extension/Podcast/Entry.php
rename to vendor/laminas/laminas-feed/src/Reader/Extension/Podcast/Entry.php
index 2a8c2aa6fc..428bfe27eb 100644
--- a/vendor/zendframework/zend-feed/src/Reader/Extension/Podcast/Entry.php
+++ b/vendor/laminas/laminas-feed/src/Reader/Extension/Podcast/Entry.php
@@ -1,13 +1,14 @@
<?php
+
/**
- * @see https://github.com/zendframework/zend-feed for the canonical source repository
- * @copyright Copyright (c) 2005-2018 Zend Technologies USA Inc. (https://www.zend.com)
- * @license https://github.com/zendframework/zend-feed/blob/master/LICENSE.md New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Reader\Extension\Podcast;
+namespace Laminas\Feed\Reader\Extension\Podcast;
-use Zend\Feed\Reader\Extension;
+use Laminas\Feed\Reader\Extension;
class Entry extends Extension\AbstractEntry
{
@@ -305,7 +306,6 @@ public function getSeason()
/**
* Register iTunes namespace
- *
*/
protected function registerNamespaces()
{
diff --git a/vendor/zendframework/zend-feed/src/Reader/Extension/Podcast/Feed.php b/vendor/laminas/laminas-feed/src/Reader/Extension/Podcast/Feed.php
similarity index 94%
rename from vendor/zendframework/zend-feed/src/Reader/Extension/Podcast/Feed.php
rename to vendor/laminas/laminas-feed/src/Reader/Extension/Podcast/Feed.php
index 987fc69271..0e66369d4d 100644
--- a/vendor/zendframework/zend-feed/src/Reader/Extension/Podcast/Feed.php
+++ b/vendor/laminas/laminas-feed/src/Reader/Extension/Podcast/Feed.php
@@ -1,14 +1,15 @@
<?php
+
/**
- * @see https://github.com/zendframework/zend-feed for the canonical source repository
- * @copyright Copyright (c) 2005-2018 Zend Technologies USA Inc. (https://www.zend.com)
- * @license https://github.com/zendframework/zend-feed/blob/master/LICENSE.md New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Reader\Extension\Podcast;
+namespace Laminas\Feed\Reader\Extension\Podcast;
use DOMText;
-use Zend\Feed\Reader\Extension;
+use Laminas\Feed\Reader\Extension;
class Feed extends Extension\AbstractFeed
{
@@ -59,7 +60,7 @@ public function getBlock()
/**
* Get the entry category
*
- * @return array|null
+ * @return null|array
*/
public function getItunesCategories()
{
@@ -79,7 +80,7 @@ public function getItunesCategories()
$children = [];
foreach ($node->childNodes as $childNode) {
- if (! ($childNode instanceof DOMText)) {
+ if (! $childNode instanceof DOMText) {
$children[$childNode->getAttribute('text')] = null;
}
}
@@ -316,7 +317,6 @@ public function isComplete()
/**
* Register iTunes namespace
- *
*/
protected function registerNamespaces()
{
diff --git a/vendor/zendframework/zend-feed/src/Reader/Extension/Slash/Entry.php b/vendor/laminas/laminas-feed/src/Reader/Extension/Slash/Entry.php
similarity index 80%
rename from vendor/zendframework/zend-feed/src/Reader/Extension/Slash/Entry.php
rename to vendor/laminas/laminas-feed/src/Reader/Extension/Slash/Entry.php
index 93cd54a15a..8c306ceeea 100644
--- a/vendor/zendframework/zend-feed/src/Reader/Extension/Slash/Entry.php
+++ b/vendor/laminas/laminas-feed/src/Reader/Extension/Slash/Entry.php
@@ -1,24 +1,21 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Reader\Extension\Slash;
+namespace Laminas\Feed\Reader\Extension\Slash;
-use Zend\Feed\Reader\Extension;
+use Laminas\Feed\Reader\Extension;
-/**
-*/
class Entry extends Extension\AbstractEntry
{
/**
* Get the entry section
*
- * @return string|null
+ * @return null|string
*/
public function getSection()
{
@@ -28,7 +25,7 @@ public function getSection()
/**
* Get the entry department
*
- * @return string|null
+ * @return null|string
*/
public function getDepartment()
{
@@ -88,10 +85,10 @@ public function getCommentCount()
/**
* Get the entry data specified by name
- * @param string $name
- * @param string $type
*
- * @return mixed|null
+ * @param string $name
+ * @param string $type
+ * @return null|mixed
*/
protected function getData($name, $type = 'string')
{
diff --git a/vendor/zendframework/zend-feed/src/Reader/Extension/Syndication/Feed.php b/vendor/laminas/laminas-feed/src/Reader/Extension/Syndication/Feed.php
similarity index 78%
rename from vendor/zendframework/zend-feed/src/Reader/Extension/Syndication/Feed.php
rename to vendor/laminas/laminas-feed/src/Reader/Extension/Syndication/Feed.php
index e126c6d082..b1de8c5e03 100644
--- a/vendor/zendframework/zend-feed/src/Reader/Extension/Syndication/Feed.php
+++ b/vendor/laminas/laminas-feed/src/Reader/Extension/Syndication/Feed.php
@@ -1,17 +1,16 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Reader\Extension\Syndication;
+namespace Laminas\Feed\Reader\Extension\Syndication;
use DateTime;
-use Zend\Feed\Reader;
-use Zend\Feed\Reader\Extension;
+use Laminas\Feed\Reader;
+use Laminas\Feed\Reader\Extension;
class Feed extends Extension\AbstractFeed
{
@@ -23,7 +22,7 @@ class Feed extends Extension\AbstractFeed
*/
public function getUpdatePeriod()
{
- $name = 'updatePeriod';
+ $name = 'updatePeriod';
$period = $this->getData($name);
if ($period === null) {
@@ -38,8 +37,10 @@ public function getUpdatePeriod()
case 'yearly':
return $period;
default:
- throw new Reader\Exception\InvalidArgumentException("Feed specified invalid update period: '$period'."
- . " Must be one of hourly, daily, weekly or yearly");
+ throw new Reader\Exception\InvalidArgumentException(
+ "Feed specified invalid update period: '$period'."
+ . ' Must be one of hourly, daily, weekly or yearly'
+ );
}
}
@@ -73,11 +74,11 @@ public function getUpdateFrequencyAsTicks()
if (! $freq || $freq < 1) {
$this->data[$name] = 1;
- $freq = 1;
+ $freq = 1;
}
$period = $this->getUpdatePeriod();
- $ticks = 1;
+ $ticks = 1;
switch ($period) {
case 'yearly':
@@ -102,12 +103,12 @@ public function getUpdateFrequencyAsTicks()
/**
* Get update base
*
- * @return DateTime|null
+ * @return null|DateTime
*/
public function getUpdateBase()
{
$updateBase = $this->getData('updateBase');
- $date = null;
+ $date = null;
if ($updateBase) {
$date = DateTime::createFromFormat(DateTime::W3C, $updateBase);
}
@@ -117,9 +118,9 @@ public function getUpdateBase()
/**
* Get the entry data specified by name
*
- * @param string $name
- * @param string $type
- * @return mixed|null
+ * @param string $name
+ * @param string $type
+ * @return null|mixed
*/
private function getData($name, $type = 'string')
{
diff --git a/vendor/zendframework/zend-feed/src/Reader/Extension/Thread/Entry.php b/vendor/laminas/laminas-feed/src/Reader/Extension/Thread/Entry.php
similarity index 73%
rename from vendor/zendframework/zend-feed/src/Reader/Extension/Thread/Entry.php
rename to vendor/laminas/laminas-feed/src/Reader/Extension/Thread/Entry.php
index e378d4b882..e085b7cba0 100644
--- a/vendor/zendframework/zend-feed/src/Reader/Extension/Thread/Entry.php
+++ b/vendor/laminas/laminas-feed/src/Reader/Extension/Thread/Entry.php
@@ -1,18 +1,15 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Reader\Extension\Thread;
+namespace Laminas\Feed\Reader\Extension\Thread;
-use Zend\Feed\Reader\Extension;
+use Laminas\Feed\Reader\Extension;
-/**
-*/
class Entry extends Extension\AbstractEntry
{
/**
@@ -30,7 +27,7 @@ public function getInReplyTo()
/**
* Get the total number of threaded responses (i.e comments)
*
- * @return int|null
+ * @return null|int
*/
public function getCommentCount()
{
@@ -41,7 +38,7 @@ public function getCommentCount()
* Get the entry data specified by name
*
* @param string $name
- * @return mixed|null
+ * @return null|mixed
*/
protected function getData($name)
{
diff --git a/vendor/zendframework/zend-feed/src/Reader/Extension/WellFormedWeb/Entry.php b/vendor/laminas/laminas-feed/src/Reader/Extension/WellFormedWeb/Entry.php
similarity index 64%
rename from vendor/zendframework/zend-feed/src/Reader/Extension/WellFormedWeb/Entry.php
rename to vendor/laminas/laminas-feed/src/Reader/Extension/WellFormedWeb/Entry.php
index ff19d0e167..2b093effa4 100644
--- a/vendor/zendframework/zend-feed/src/Reader/Extension/WellFormedWeb/Entry.php
+++ b/vendor/laminas/laminas-feed/src/Reader/Extension/WellFormedWeb/Entry.php
@@ -1,24 +1,21 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Reader\Extension\WellFormedWeb;
+namespace Laminas\Feed\Reader\Extension\WellFormedWeb;
-use Zend\Feed\Reader\Extension;
+use Laminas\Feed\Reader\Extension;
-/**
-*/
class Entry extends Extension\AbstractEntry
{
/**
* Get the entry comment Uri
*
- * @return string|null
+ * @return null|string
*/
public function getCommentFeedLink()
{
diff --git a/vendor/zendframework/zend-feed/src/Reader/ExtensionManager.php b/vendor/laminas/laminas-feed/src/Reader/ExtensionManager.php
similarity index 80%
rename from vendor/zendframework/zend-feed/src/Reader/ExtensionManager.php
rename to vendor/laminas/laminas-feed/src/Reader/ExtensionManager.php
index f7946b7914..43eef1a42d 100644
--- a/vendor/zendframework/zend-feed/src/Reader/ExtensionManager.php
+++ b/vendor/laminas/laminas-feed/src/Reader/ExtensionManager.php
@@ -1,13 +1,12 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Reader;
+namespace Laminas\Feed\Reader;
/**
* Default implementation of ExtensionManagerInterface
@@ -19,12 +18,8 @@ class ExtensionManager implements ExtensionManagerInterface
protected $pluginManager;
/**
- * Constructor
- *
* Seeds the extension manager with a plugin manager; if none provided,
* creates an instance.
- *
- * @param null|ExtensionPluginManager $pluginManager
*/
public function __construct(ExtensionPluginManager $pluginManager = null)
{
diff --git a/vendor/zendframework/zend-feed/src/Writer/ExtensionManagerInterface.php b/vendor/laminas/laminas-feed/src/Reader/ExtensionManagerInterface.php
similarity index 51%
rename from vendor/zendframework/zend-feed/src/Writer/ExtensionManagerInterface.php
rename to vendor/laminas/laminas-feed/src/Reader/ExtensionManagerInterface.php
index b0e28a08c4..f50fca48bf 100644
--- a/vendor/zendframework/zend-feed/src/Writer/ExtensionManagerInterface.php
+++ b/vendor/laminas/laminas-feed/src/Reader/ExtensionManagerInterface.php
@@ -1,13 +1,12 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Writer;
+namespace Laminas\Feed\Reader;
interface ExtensionManagerInterface
{
diff --git a/vendor/zendframework/zend-feed/src/Reader/ExtensionPluginManager.php b/vendor/laminas/laminas-feed/src/Reader/ExtensionPluginManager.php
similarity index 61%
rename from vendor/zendframework/zend-feed/src/Reader/ExtensionPluginManager.php
rename to vendor/laminas/laminas-feed/src/Reader/ExtensionPluginManager.php
index e09c317651..4634e71bcc 100644
--- a/vendor/zendframework/zend-feed/src/Reader/ExtensionPluginManager.php
+++ b/vendor/laminas/laminas-feed/src/Reader/ExtensionPluginManager.php
@@ -1,17 +1,16 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Reader;
+namespace Laminas\Feed\Reader;
-use Zend\ServiceManager\AbstractPluginManager;
-use Zend\ServiceManager\Exception\InvalidServiceException;
-use Zend\ServiceManager\Factory\InvokableFactory;
+use Laminas\ServiceManager\AbstractPluginManager;
+use Laminas\ServiceManager\Exception\InvalidServiceException;
+use Laminas\ServiceManager\Factory\InvokableFactory;
/**
* Plugin manager implementation for feed reader extensions based on the
@@ -88,6 +87,40 @@ class ExtensionPluginManager extends AbstractPluginManager implements ExtensionM
'wellFormedWebEntry' => Extension\WellFormedWeb\Entry::class,
'WellFormedWebEntry' => Extension\WellFormedWeb\Entry::class,
'WellFormedWeb\Entry' => Extension\WellFormedWeb\Entry::class,
+
+ // Legacy Zend Framework aliases
+ \Zend\Feed\Reader\Extension\Atom\Entry::class => Extension\Atom\Entry::class,
+ \Zend\Feed\Reader\Extension\Atom\Feed::class => Extension\Atom\Feed::class,
+ \Zend\Feed\Reader\Extension\Content\Entry::class => Extension\Content\Entry::class,
+ \Zend\Feed\Reader\Extension\CreativeCommons\Entry::class => Extension\CreativeCommons\Entry::class,
+ \Zend\Feed\Reader\Extension\CreativeCommons\Feed::class => Extension\CreativeCommons\Feed::class,
+ \Zend\Feed\Reader\Extension\DublinCore\Entry::class => Extension\DublinCore\Entry::class,
+ \Zend\Feed\Reader\Extension\DublinCore\Feed::class => Extension\DublinCore\Feed::class,
+ \Zend\Feed\Reader\Extension\GooglePlayPodcast\Entry::class => Extension\GooglePlayPodcast\Entry::class,
+ \Zend\Feed\Reader\Extension\GooglePlayPodcast\Feed::class => Extension\GooglePlayPodcast\Feed::class,
+ \Zend\Feed\Reader\Extension\Podcast\Entry::class => Extension\Podcast\Entry::class,
+ \Zend\Feed\Reader\Extension\Podcast\Feed::class => Extension\Podcast\Feed::class,
+ \Zend\Feed\Reader\Extension\Slash\Entry::class => Extension\Slash\Entry::class,
+ \Zend\Feed\Reader\Extension\Syndication\Feed::class => Extension\Syndication\Feed::class,
+ \Zend\Feed\Reader\Extension\Thread\Entry::class => Extension\Thread\Entry::class,
+ \Zend\Feed\Reader\Extension\WellFormedWeb\Entry::class => Extension\WellFormedWeb\Entry::class,
+
+ // v2 normalized FQCNs
+ 'zendfeedreaderextensionatomentry' => Extension\Atom\Entry::class,
+ 'zendfeedreaderextensionatomfeed' => Extension\Atom\Feed::class,
+ 'zendfeedreaderextensioncontententry' => Extension\Content\Entry::class,
+ 'zendfeedreaderextensioncreativecommonsentry' => Extension\CreativeCommons\Entry::class,
+ 'zendfeedreaderextensioncreativecommonsfeed' => Extension\CreativeCommons\Feed::class,
+ 'zendfeedreaderextensiondublincoreentry' => Extension\DublinCore\Entry::class,
+ 'zendfeedreaderextensiondublincorefeed' => Extension\DublinCore\Feed::class,
+ 'zendfeedreaderextensiongoogleplaypodcastentry' => Extension\GooglePlayPodcast\Entry::class,
+ 'zendfeedreaderextensiongoogleplaypodcastfeed' => Extension\GooglePlayPodcast\Feed::class,
+ 'zendfeedreaderextensionpodcastentry' => Extension\Podcast\Entry::class,
+ 'zendfeedreaderextensionpodcastfeed' => Extension\Podcast\Feed::class,
+ 'zendfeedreaderextensionslashentry' => Extension\Slash\Entry::class,
+ 'zendfeedreaderextensionsyndicationfeed' => Extension\Syndication\Feed::class,
+ 'zendfeedreaderextensionthreadentry' => Extension\Thread\Entry::class,
+ 'zendfeedreaderextensionwellformedwebentry' => Extension\WellFormedWeb\Entry::class,
];
/**
@@ -114,21 +147,21 @@ class ExtensionPluginManager extends AbstractPluginManager implements ExtensionM
// Legacy (v2) due to alias resolution; canonical form of resolved
// alias is used to look up the factory, while the non-normalized
// resolved alias is used as the requested name passed to the factory.
- 'zendfeedreaderextensionatomentry' => InvokableFactory::class,
- 'zendfeedreaderextensionatomfeed' => InvokableFactory::class,
- 'zendfeedreaderextensioncontententry' => InvokableFactory::class,
- 'zendfeedreaderextensioncreativecommonsentry' => InvokableFactory::class,
- 'zendfeedreaderextensioncreativecommonsfeed' => InvokableFactory::class,
- 'zendfeedreaderextensiondublincoreentry' => InvokableFactory::class,
- 'zendfeedreaderextensiondublincorefeed' => InvokableFactory::class,
- 'zendfeedreaderextensiongoogleplaypodcastentry' => InvokableFactory::class,
- 'zendfeedreaderextensiongoogleplaypodcastfeed' => InvokableFactory::class,
- 'zendfeedreaderextensionpodcastentry' => InvokableFactory::class,
- 'zendfeedreaderextensionpodcastfeed' => InvokableFactory::class,
- 'zendfeedreaderextensionslashentry' => InvokableFactory::class,
- 'zendfeedreaderextensionsyndicationfeed' => InvokableFactory::class,
- 'zendfeedreaderextensionthreadentry' => InvokableFactory::class,
- 'zendfeedreaderextensionwellformedwebentry' => InvokableFactory::class,
+ 'laminasfeedreaderextensionatomentry' => InvokableFactory::class,
+ 'laminasfeedreaderextensionatomfeed' => InvokableFactory::class,
+ 'laminasfeedreaderextensioncontententry' => InvokableFactory::class,
+ 'laminasfeedreaderextensioncreativecommonsentry' => InvokableFactory::class,
+ 'laminasfeedreaderextensioncreativecommonsfeed' => InvokableFactory::class,
+ 'laminasfeedreaderextensiondublincoreentry' => InvokableFactory::class,
+ 'laminasfeedreaderextensiondublincorefeed' => InvokableFactory::class,
+ 'laminasfeedreaderextensiongoogleplaypodcastentry' => InvokableFactory::class,
+ 'laminasfeedreaderextensiongoogleplaypodcastfeed' => InvokableFactory::class,
+ 'laminasfeedreaderextensionpodcastentry' => InvokableFactory::class,
+ 'laminasfeedreaderextensionpodcastfeed' => InvokableFactory::class,
+ 'laminasfeedreaderextensionslashentry' => InvokableFactory::class,
+ 'laminasfeedreaderextensionsyndicationfeed' => InvokableFactory::class,
+ 'laminasfeedreaderextensionthreadentry' => InvokableFactory::class,
+ 'laminasfeedreaderextensionwellformedwebentry' => InvokableFactory::class,
];
/**
@@ -166,7 +199,7 @@ public function validate($plugin)
throw new InvalidServiceException(sprintf(
'Plugin of type %s is invalid; must implement %s\Extension\AbstractFeed '
. 'or %s\Extension\AbstractEntry',
- (is_object($plugin) ? get_class($plugin) : gettype($plugin)),
+ is_object($plugin) ? get_class($plugin) : gettype($plugin),
__NAMESPACE__,
__NAMESPACE__
));
@@ -187,7 +220,7 @@ public function validatePlugin($plugin)
throw new Exception\InvalidArgumentException(sprintf(
'Plugin of type %s is invalid; must implement %s\Extension\AbstractFeed '
. 'or %s\Extension\AbstractEntry',
- (is_object($plugin) ? get_class($plugin) : gettype($plugin)),
+ is_object($plugin) ? get_class($plugin) : gettype($plugin),
__NAMESPACE__,
__NAMESPACE__
));
diff --git a/vendor/zendframework/zend-feed/src/Reader/Feed/AbstractFeed.php b/vendor/laminas/laminas-feed/src/Reader/Feed/AbstractFeed.php
similarity index 86%
rename from vendor/zendframework/zend-feed/src/Reader/Feed/AbstractFeed.php
rename to vendor/laminas/laminas-feed/src/Reader/Feed/AbstractFeed.php
index ea0a7a1cd2..b502509acc 100644
--- a/vendor/zendframework/zend-feed/src/Reader/Feed/AbstractFeed.php
+++ b/vendor/laminas/laminas-feed/src/Reader/Feed/AbstractFeed.php
@@ -1,22 +1,19 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Reader\Feed;
+namespace Laminas\Feed\Reader\Feed;
use DOMDocument;
use DOMElement;
use DOMXPath;
-use Zend\Feed\Reader;
-use Zend\Feed\Reader\Exception;
+use Laminas\Feed\Reader;
+use Laminas\Feed\Reader\Exception;
-/**
-*/
abstract class AbstractFeed implements FeedInterface
{
/**
@@ -31,7 +28,7 @@ abstract class AbstractFeed implements FeedInterface
*
* @var DOMDocument
*/
- protected $domDocument = null;
+ protected $domDocument;
/**
* An array of parsed feed entries
@@ -52,7 +49,7 @@ abstract class AbstractFeed implements FeedInterface
*
* @var DOMXPath
*/
- protected $xpath = null;
+ protected $xpath;
/**
* Array of loaded extensions
@@ -66,18 +63,16 @@ abstract class AbstractFeed implements FeedInterface
*
* @var string
*/
- protected $originalSourceUri = null;
+ protected $originalSourceUri;
/**
- * Constructor
- *
* @param DOMDocument $domDocument The DOM object for the feed's XML
- * @param string $type Feed type
+ * @param null|string $type Feed type
*/
public function __construct(DOMDocument $domDocument, $type = null)
{
$this->domDocument = $domDocument;
- $this->xpath = new DOMXPath($this->domDocument);
+ $this->xpath = new DOMXPath($this->domDocument);
if ($type !== null) {
$this->data['type'] = $type;
@@ -105,7 +100,7 @@ public function setOriginalSourceUri($uri)
* Get an original source URI for the feed being parsed. Returns null if
* unset or the feed was not imported from a URI.
*
- * @return string|null
+ * @return null|string
*/
public function getOriginalSourceUri()
{
@@ -126,7 +121,7 @@ public function count()
/**
* Return the current entry
*
- * @return \Zend\Feed\Reader\Entry\EntryInterface
+ * @return Reader\Entry\EntryInterface
*/
public function current()
{
@@ -217,7 +212,6 @@ public function key()
/**
* Move the feed pointer forward
- *
*/
public function next()
{
@@ -226,7 +220,6 @@ public function next()
/**
* Reset the pointer in the feed object
- *
*/
public function rewind()
{
@@ -255,22 +248,24 @@ public function __call($method, $args)
return call_user_func_array([$extension, $method], $args);
}
}
- throw new Exception\BadMethodCallException('Method: ' . $method
- . 'does not exist and could not be located on a registered Extension');
+ throw new Exception\BadMethodCallException(
+ 'Method: ' . $method . ' does not exist and could not be located on a registered Extension'
+ );
}
/**
* Return an Extension object with the matching name (postfixed with _Feed)
*
- * @param string $name
- * @return \Zend\Feed\Reader\Extension\AbstractFeed|null
+ * @param string $name
+ * @return null|Reader\Extension\AbstractFeed
*/
public function getExtension($name)
{
if (array_key_exists($name . '\\Feed', $this->extensions)) {
return $this->extensions[$name . '\\Feed'];
}
- return;
+
+ return null;
}
protected function loadExtensions()
@@ -297,13 +292,11 @@ protected function loadExtensions()
/**
* Read all entries to the internal entries array
- *
*/
abstract protected function indexEntries();
/**
* Register the default namespaces for the current feed format
- *
*/
abstract protected function registerNamespaces();
}
diff --git a/vendor/zendframework/zend-feed/src/Reader/Feed/Atom.php b/vendor/laminas/laminas-feed/src/Reader/Feed/Atom.php
similarity index 88%
rename from vendor/zendframework/zend-feed/src/Reader/Feed/Atom.php
rename to vendor/laminas/laminas-feed/src/Reader/Feed/Atom.php
index f0c5c2e917..a7ab4375ea 100644
--- a/vendor/zendframework/zend-feed/src/Reader/Feed/Atom.php
+++ b/vendor/laminas/laminas-feed/src/Reader/Feed/Atom.php
@@ -1,26 +1,21 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Reader\Feed;
+namespace Laminas\Feed\Reader\Feed;
+use DateTime;
use DOMDocument;
-use Zend\Feed\Reader;
+use Laminas\Feed\Reader;
-/**
-*/
class Atom extends AbstractFeed
{
/**
- * Constructor
- *
- * @param DOMDocument $dom
- * @param string $type
+ * @param null|string $type
*/
public function __construct(DOMDocument $dom, $type = null)
{
@@ -48,7 +43,7 @@ public function __construct(DOMDocument $dom, $type = null)
* Get a single author
*
* @param int $index
- * @return string|null
+ * @return null|string
*/
public function getAuthor($index = 0)
{
@@ -82,7 +77,7 @@ public function getAuthors()
/**
* Get the copyright entry
*
- * @return string|null
+ * @return null|string
*/
public function getCopyright()
{
@@ -104,7 +99,7 @@ public function getCopyright()
/**
* Get the feed creation date
*
- * @return \DateTime|null
+ * @return null|DateTime
*/
public function getDateCreated()
{
@@ -126,7 +121,7 @@ public function getDateCreated()
/**
* Get the feed modification date
*
- * @return \DateTime|null
+ * @return null|DateTime
*/
public function getDateModified()
{
@@ -148,7 +143,7 @@ public function getDateModified()
/**
* Get the feed lastBuild date. This is not implemented in Atom.
*
- * @return string|null
+ * @return null|string
*/
public function getLastBuildDate()
{
@@ -158,7 +153,7 @@ public function getLastBuildDate()
/**
* Get the feed description
*
- * @return string|null
+ * @return null|string
*/
public function getDescription()
{
@@ -180,7 +175,7 @@ public function getDescription()
/**
* Get the feed generator entry
*
- * @return string|null
+ * @return null|string
*/
public function getGenerator()
{
@@ -198,7 +193,7 @@ public function getGenerator()
/**
* Get the feed ID
*
- * @return string|null
+ * @return null|string
*/
public function getId()
{
@@ -216,7 +211,7 @@ public function getId()
/**
* Get the feed language
*
- * @return string|null
+ * @return null|string
*/
public function getLanguage()
{
@@ -242,7 +237,7 @@ public function getLanguage()
/**
* Get a link to the source website
*
- * @return string|null
+ * @return null|string
*/
public function getBaseUrl()
{
@@ -260,7 +255,7 @@ public function getBaseUrl()
/**
* Get a link to the source website
*
- * @return string|null
+ * @return null|string
*/
public function getLink()
{
@@ -278,7 +273,7 @@ public function getLink()
/**
* Get feed image data
*
- * @return array|null
+ * @return null|array
*/
public function getImage()
{
@@ -296,7 +291,7 @@ public function getImage()
/**
* Get a link to the feed's XML Url
*
- * @return string|null
+ * @return null|string
*/
public function getFeedLink()
{
@@ -318,7 +313,7 @@ public function getFeedLink()
/**
* Get the feed title
*
- * @return string|null
+ * @return null|string
*/
public function getTitle()
{
@@ -336,7 +331,7 @@ public function getTitle()
/**
* Get an array of any supported Pusubhubbub endpoints
*
- * @return array|null
+ * @return null|array
*/
public function getHubs()
{
@@ -364,7 +359,7 @@ public function getCategories()
$categoryCollection = $this->getExtension('Atom')->getCategories();
- if (count($categoryCollection) == 0) {
+ if (count($categoryCollection) === 0) {
$categoryCollection = $this->getExtension('DublinCore')->getCategories();
}
@@ -380,8 +375,9 @@ public function getCategories()
*/
protected function indexEntries()
{
- if ($this->getType() == Reader\Reader::TYPE_ATOM_10 ||
- $this->getType() == Reader\Reader::TYPE_ATOM_03) {
+ if ($this->getType() === Reader\Reader::TYPE_ATOM_10
+ || $this->getType() === Reader\Reader::TYPE_ATOM_03
+ ) {
$entries = $this->xpath->evaluate('//atom:entry');
foreach ($entries as $index => $entry) {
@@ -392,7 +388,6 @@ protected function indexEntries()
/**
* Register the default namespaces for the current feed format
- *
*/
protected function registerNamespaces()
{
diff --git a/vendor/zendframework/zend-feed/src/Reader/Feed/Atom/Source.php b/vendor/laminas/laminas-feed/src/Reader/Feed/Atom/Source.php
similarity index 72%
rename from vendor/zendframework/zend-feed/src/Reader/Feed/Atom/Source.php
rename to vendor/laminas/laminas-feed/src/Reader/Feed/Atom/Source.php
index 4f15b55c4e..de2666d01d 100644
--- a/vendor/zendframework/zend-feed/src/Reader/Feed/Atom/Source.php
+++ b/vendor/laminas/laminas-feed/src/Reader/Feed/Atom/Source.php
@@ -1,41 +1,37 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Reader\Feed\Atom;
+namespace Laminas\Feed\Reader\Feed\Atom;
use DOMElement;
use DOMXPath;
-use Zend\Feed\Reader;
-use Zend\Feed\Reader\Feed;
+use Laminas\Feed\Reader;
+use Laminas\Feed\Reader\Feed;
-/**
-*/
class Source extends Feed\Atom
{
/**
* Constructor: Create a Source object which is largely just a normal
- * Zend\Feed\Reader\AbstractFeed object only designed to retrieve feed level
+ * Laminas\Feed\Reader\AbstractFeed object only designed to retrieve feed level
* metadata from an Atom entry's source element.
*
- * @param DOMElement $source
* @param string $xpathPrefix Passed from parent Entry object
* @param string $type Nearly always Atom 1.0
*/
public function __construct(DOMElement $source, $xpathPrefix, $type = Reader\Reader::TYPE_ATOM_10)
{
- $this->domDocument = $source->ownerDocument;
- $this->xpath = new DOMXPath($this->domDocument);
+ $this->domDocument = $source->ownerDocument;
+ $this->xpath = new DOMXPath($this->domDocument);
$this->data['type'] = $type;
$this->registerNamespaces();
$this->loadExtensions();
- $manager = Reader\Reader::getExtensionManager();
+ $manager = Reader\Reader::getExtensionManager();
$extensions = ['Atom\Feed', 'DublinCore\Feed'];
foreach ($extensions as $name) {
diff --git a/vendor/zendframework/zend-feed/src/Reader/Feed/FeedInterface.php b/vendor/laminas/laminas-feed/src/Reader/Feed/FeedInterface.php
similarity index 65%
rename from vendor/zendframework/zend-feed/src/Reader/Feed/FeedInterface.php
rename to vendor/laminas/laminas-feed/src/Reader/Feed/FeedInterface.php
index 875482e266..7b3989e699 100644
--- a/vendor/zendframework/zend-feed/src/Reader/Feed/FeedInterface.php
+++ b/vendor/laminas/laminas-feed/src/Reader/Feed/FeedInterface.php
@@ -1,26 +1,25 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Reader\Feed;
+namespace Laminas\Feed\Reader\Feed;
use Countable;
+use DateTime;
use Iterator;
+use Laminas\Feed\Reader\Collection\Category;
-/**
-*/
interface FeedInterface extends Iterator, Countable
{
/**
* Get a single author
*
* @param int $index
- * @return string|null
+ * @return null|string
*/
public function getAuthor($index = 0);
@@ -34,77 +33,77 @@ public function getAuthors();
/**
* Get the copyright entry
*
- * @return string|null
+ * @return null|string
*/
public function getCopyright();
/**
* Get the feed creation date
*
- * @return \DateTime|null
+ * @return null|DateTime
*/
public function getDateCreated();
/**
* Get the feed modification date
*
- * @return \DateTime|null
+ * @return null|DateTime
*/
public function getDateModified();
/**
* Get the feed description
*
- * @return string|null
+ * @return null|string
*/
public function getDescription();
/**
* Get the feed generator entry
*
- * @return string|null
+ * @return null|string
*/
public function getGenerator();
/**
* Get the feed ID
*
- * @return string|null
+ * @return null|string
*/
public function getId();
/**
* Get the feed language
*
- * @return string|null
+ * @return null|string
*/
public function getLanguage();
/**
* Get a link to the HTML source
*
- * @return string|null
+ * @return null|string
*/
public function getLink();
/**
* Get a link to the XML feed
*
- * @return string|null
+ * @return null|string
*/
public function getFeedLink();
/**
* Get the feed title
*
- * @return string|null
+ * @return null|string
*/
public function getTitle();
/**
* Get all categories
*
- * @return \Zend\Feed\Reader\Collection\Category
+ * @return Category
*/
public function getCategories();
}
diff --git a/vendor/zendframework/zend-feed/src/Reader/Feed/Rss.php b/vendor/laminas/laminas-feed/src/Reader/Feed/Rss.php
similarity index 81%
rename from vendor/zendframework/zend-feed/src/Reader/Feed/Rss.php
rename to vendor/laminas/laminas-feed/src/Reader/Feed/Rss.php
index 1275bda544..ebb3f900cb 100644
--- a/vendor/zendframework/zend-feed/src/Reader/Feed/Rss.php
+++ b/vendor/laminas/laminas-feed/src/Reader/Feed/Rss.php
@@ -1,29 +1,23 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Reader\Feed;
+namespace Laminas\Feed\Reader\Feed;
use DateTime;
use DOMDocument;
-use Zend\Feed\Reader;
-use Zend\Feed\Reader\Collection;
-use Zend\Feed\Reader\Exception;
+use Laminas\Feed\Reader;
+use Laminas\Feed\Reader\Collection;
+use Laminas\Feed\Reader\Exception;
-/**
-*/
class Rss extends AbstractFeed
{
/**
- * Constructor
- *
- * @param DOMDocument $dom
- * @param string $type
+ * @param null|string $type
*/
public function __construct(DOMDocument $dom, $type = null)
{
@@ -59,7 +53,7 @@ public function __construct(DOMDocument $dom, $type = null)
* Get a single author
*
* @param int $index
- * @return string|null
+ * @return null|string
*/
public function getAuthor($index = 0)
{
@@ -83,12 +77,12 @@ public function getAuthors()
return $this->data['authors'];
}
- $authors = [];
+ $authors = [];
$authorsDc = $this->getExtension('DublinCore')->getAuthors();
if (! empty($authorsDc)) {
foreach ($authorsDc as $author) {
$authors[] = [
- 'name' => $author['name']
+ 'name' => $author['name'],
];
}
}
@@ -98,7 +92,8 @@ public function getAuthors()
* but it's supported on a "just in case" basis.
*/
if ($this->getType() !== Reader\Reader::TYPE_RSS_10
- && $this->getType() !== Reader\Reader::TYPE_RSS_090) {
+ && $this->getType() !== Reader\Reader::TYPE_RSS_090
+ ) {
$list = $this->xpath->query('//author');
} else {
$list = $this->xpath->query('//rss:author');
@@ -106,11 +101,11 @@ public function getAuthors()
if ($list->length) {
foreach ($list as $author) {
$string = trim($author->nodeValue);
- $data = [];
+ $data = [];
// Pretty rough parsing - but it's a catchall
- if (preg_match("/^.*@[^ ]*/", $string, $matches)) {
+ if (preg_match('/^.*@[^ ]*/', $string, $matches)) {
$data['email'] = trim($matches[0]);
- if (preg_match("/\((.*)\)$/", $string, $matches)) {
+ if (preg_match('/\((.*)\)$/', $string, $matches)) {
$data['name'] = $matches[1];
}
$authors[] = $data;
@@ -118,7 +113,7 @@ public function getAuthors()
}
}
- if (count($authors) == 0) {
+ if (count($authors) === 0) {
$authors = $this->getExtension('Atom')->getAuthors();
} else {
$authors = new Reader\Collection\Author(
@@ -126,7 +121,7 @@ public function getAuthors()
);
}
- if (count($authors) == 0) {
+ if (count($authors) === 0) {
$authors = null;
}
@@ -138,7 +133,7 @@ public function getAuthors()
/**
* Get the copyright entry
*
- * @return string|null
+ * @return null|string
*/
public function getCopyright()
{
@@ -148,8 +143,9 @@ public function getCopyright()
$copyright = null;
- if ($this->getType() !== Reader\Reader::TYPE_RSS_10 &&
- $this->getType() !== Reader\Reader::TYPE_RSS_090) {
+ if ($this->getType() !== Reader\Reader::TYPE_RSS_10
+ && $this->getType() !== Reader\Reader::TYPE_RSS_090
+ ) {
$copyright = $this->xpath->evaluate('string(/rss/channel/copyright)');
}
@@ -173,7 +169,7 @@ public function getCopyright()
/**
* Get the feed creation date
*
- * @return DateTime|null
+ * @return null|DateTime
*/
public function getDateCreated()
{
@@ -194,8 +190,9 @@ public function getDateModified()
$date = null;
- if ($this->getType() !== Reader\Reader::TYPE_RSS_10 &&
- $this->getType() !== Reader\Reader::TYPE_RSS_090) {
+ if ($this->getType() !== Reader\Reader::TYPE_RSS_10
+ && $this->getType() !== Reader\Reader::TYPE_RSS_090
+ ) {
$dateModified = $this->xpath->evaluate('string(/rss/channel/pubDate)');
if (! $dateModified) {
$dateModified = $this->xpath->evaluate('string(/rss/channel/lastBuildDate)');
@@ -205,8 +202,12 @@ public function getDateModified()
if ($dateModifiedParsed) {
$date = new DateTime('@' . $dateModifiedParsed);
} else {
- $dateStandards = [DateTime::RSS, DateTime::RFC822,
- DateTime::RFC2822, null];
+ $dateStandards = [
+ DateTime::RSS,
+ DateTime::RFC822,
+ DateTime::RFC2822,
+ null,
+ ];
foreach ($dateStandards as $standard) {
try {
$date = DateTime::createFromFormat($standard, $dateModified);
@@ -214,9 +215,8 @@ public function getDateModified()
} catch (\Exception $e) {
if ($standard === null) {
throw new Exception\RuntimeException(
- 'Could not load date due to unrecognised'
- .' format (should follow RFC 822 or 2822):'
- . $e->getMessage(),
+ 'Could not load date due to unrecognised format'
+ . ' (should follow RFC 822 or 2822): ' . $e->getMessage(),
0,
$e
);
@@ -247,8 +247,8 @@ public function getDateModified()
/**
* Get the feed lastBuild date
*
- * @throws Exception\RuntimeException
* @return DateTime
+ * @throws Exception\RuntimeException
*/
public function getLastBuildDate()
{
@@ -258,16 +258,21 @@ public function getLastBuildDate()
$date = null;
- if ($this->getType() !== Reader\Reader::TYPE_RSS_10 &&
- $this->getType() !== Reader\Reader::TYPE_RSS_090) {
+ if ($this->getType() !== Reader\Reader::TYPE_RSS_10
+ && $this->getType() !== Reader\Reader::TYPE_RSS_090
+ ) {
$lastBuildDate = $this->xpath->evaluate('string(/rss/channel/lastBuildDate)');
if ($lastBuildDate) {
$lastBuildDateParsed = strtotime($lastBuildDate);
if ($lastBuildDateParsed) {
$date = new DateTime('@' . $lastBuildDateParsed);
} else {
- $dateStandards = [DateTime::RSS, DateTime::RFC822,
- DateTime::RFC2822, null];
+ $dateStandards = [
+ DateTime::RSS,
+ DateTime::RFC822,
+ DateTime::RFC2822,
+ null,
+ ];
foreach ($dateStandards as $standard) {
try {
$date = DateTime::createFromFormat($standard, $lastBuildDateParsed);
@@ -275,9 +280,8 @@ public function getLastBuildDate()
} catch (\Exception $e) {
if ($standard === null) {
throw new Exception\RuntimeException(
- 'Could not load date due to unrecognised'
- .' format (should follow RFC 822 or 2822):'
- . $e->getMessage(),
+ 'Could not load date due to unrecognised format'
+ . ' (should follow RFC 822 or 2822): ' . $e->getMessage(),
0,
$e
);
@@ -300,7 +304,7 @@ public function getLastBuildDate()
/**
* Get the feed description
*
- * @return string|null
+ * @return null|string
*/
public function getDescription()
{
@@ -308,8 +312,9 @@ public function getDescription()
return $this->data['description'];
}
- if ($this->getType() !== Reader\Reader::TYPE_RSS_10 &&
- $this->getType() !== Reader\Reader::TYPE_RSS_090) {
+ if ($this->getType() !== Reader\Reader::TYPE_RSS_10
+ && $this->getType() !== Reader\Reader::TYPE_RSS_090
+ ) {
$description = $this->xpath->evaluate('string(/rss/channel/description)');
} else {
$description = $this->xpath->evaluate('string(/rdf:RDF/rss:channel/rss:description)');
@@ -335,7 +340,7 @@ public function getDescription()
/**
* Get the feed ID
*
- * @return string|null
+ * @return null|string
*/
public function getId()
{
@@ -345,8 +350,9 @@ public function getId()
$id = null;
- if ($this->getType() !== Reader\Reader::TYPE_RSS_10 &&
- $this->getType() !== Reader\Reader::TYPE_RSS_090) {
+ if ($this->getType() !== Reader\Reader::TYPE_RSS_10
+ && $this->getType() !== Reader\Reader::TYPE_RSS_090
+ ) {
$id = $this->xpath->evaluate('string(/rss/channel/guid)');
}
@@ -376,7 +382,7 @@ public function getId()
/**
* Get the feed image data
*
- * @return array|null
+ * @return null|array
*/
public function getImage()
{
@@ -384,12 +390,13 @@ public function getImage()
return $this->data['image'];
}
- if ($this->getType() !== Reader\Reader::TYPE_RSS_10 &&
- $this->getType() !== Reader\Reader::TYPE_RSS_090) {
- $list = $this->xpath->query('/rss/channel/image');
+ if ($this->getType() !== Reader\Reader::TYPE_RSS_10
+ && $this->getType() !== Reader\Reader::TYPE_RSS_090
+ ) {
+ $list = $this->xpath->query('/rss/channel/image');
$prefix = '/rss/channel/image[1]';
} else {
- $list = $this->xpath->query('/rdf:RDF/rss:channel/rss:image');
+ $list = $this->xpath->query('/rdf:RDF/rss:channel/rss:image');
$prefix = '/rdf:RDF/rss:channel/rss:image[1]';
}
if ($list->length > 0) {
@@ -430,7 +437,7 @@ public function getImage()
/**
* Get the feed language
*
- * @return string|null
+ * @return null|string
*/
public function getLanguage()
{
@@ -440,8 +447,9 @@ public function getLanguage()
$language = null;
- if ($this->getType() !== Reader\Reader::TYPE_RSS_10 &&
- $this->getType() !== Reader\Reader::TYPE_RSS_090) {
+ if ($this->getType() !== Reader\Reader::TYPE_RSS_10
+ && $this->getType() !== Reader\Reader::TYPE_RSS_090
+ ) {
$language = $this->xpath->evaluate('string(/rss/channel/language)');
}
@@ -469,7 +477,7 @@ public function getLanguage()
/**
* Get a link to the feed
*
- * @return string|null
+ * @return null|string
*/
public function getLink()
{
@@ -477,8 +485,9 @@ public function getLink()
return $this->data['link'];
}
- if ($this->getType() !== Reader\Reader::TYPE_RSS_10 &&
- $this->getType() !== Reader\Reader::TYPE_RSS_090) {
+ if ($this->getType() !== Reader\Reader::TYPE_RSS_10
+ && $this->getType() !== Reader\Reader::TYPE_RSS_090
+ ) {
$link = $this->xpath->evaluate('string(/rss/channel/link)');
} else {
$link = $this->xpath->evaluate('string(/rdf:RDF/rss:channel/rss:link)');
@@ -500,7 +509,7 @@ public function getLink()
/**
* Get a link to the feed XML
*
- * @return string|null
+ * @return null|string
*/
public function getFeedLink()
{
@@ -522,7 +531,7 @@ public function getFeedLink()
/**
* Get the feed generator entry
*
- * @return string|null
+ * @return null|string
*/
public function getGenerator()
{
@@ -532,14 +541,16 @@ public function getGenerator()
$generator = null;
- if ($this->getType() !== Reader\Reader::TYPE_RSS_10 &&
- $this->getType() !== Reader\Reader::TYPE_RSS_090) {
+ if ($this->getType() !== Reader\Reader::TYPE_RSS_10
+ && $this->getType() !== Reader\Reader::TYPE_RSS_090
+ ) {
$generator = $this->xpath->evaluate('string(/rss/channel/generator)');
}
if (! $generator) {
- if ($this->getType() !== Reader\Reader::TYPE_RSS_10 &&
- $this->getType() !== Reader\Reader::TYPE_RSS_090) {
+ if ($this->getType() !== Reader\Reader::TYPE_RSS_10
+ && $this->getType() !== Reader\Reader::TYPE_RSS_090
+ ) {
$generator = $this->xpath->evaluate('string(/rss/channel/atom:generator)');
} else {
$generator = $this->xpath->evaluate('string(/rdf:RDF/rss:channel/atom:generator)');
@@ -562,7 +573,7 @@ public function getGenerator()
/**
* Get the feed title
*
- * @return string|null
+ * @return null|string
*/
public function getTitle()
{
@@ -570,8 +581,9 @@ public function getTitle()
return $this->data['title'];
}
- if ($this->getType() !== Reader\Reader::TYPE_RSS_10 &&
- $this->getType() !== Reader\Reader::TYPE_RSS_090) {
+ if ($this->getType() !== Reader\Reader::TYPE_RSS_10
+ && $this->getType() !== Reader\Reader::TYPE_RSS_090
+ ) {
$title = $this->xpath->evaluate('string(/rss/channel/title)');
} else {
$title = $this->xpath->evaluate('string(/rdf:RDF/rss:channel/rss:title)');
@@ -597,7 +609,7 @@ public function getTitle()
/**
* Get an array of any supported Pusubhubbub endpoints
*
- * @return array|null
+ * @return null|array
*/
public function getHubs()
{
@@ -629,27 +641,28 @@ public function getCategories()
return $this->data['categories'];
}
- if ($this->getType() !== Reader\Reader::TYPE_RSS_10 &&
- $this->getType() !== Reader\Reader::TYPE_RSS_090) {
+ if ($this->getType() !== Reader\Reader::TYPE_RSS_10
+ && $this->getType() !== Reader\Reader::TYPE_RSS_090
+ ) {
$list = $this->xpath->query('/rss/channel//category');
} else {
$list = $this->xpath->query('/rdf:RDF/rss:channel//rss:category');
}
if ($list->length) {
- $categoryCollection = new Collection\Category;
+ $categoryCollection = new Collection\Category();
foreach ($list as $category) {
$categoryCollection[] = [
- 'term' => $category->nodeValue,
+ 'term' => $category->nodeValue,
'scheme' => $category->getAttribute('domain'),
- 'label' => $category->nodeValue,
+ 'label' => $category->nodeValue,
];
}
} else {
$categoryCollection = $this->getExtension('DublinCore')->getCategories();
}
- if (count($categoryCollection) == 0) {
+ if (count($categoryCollection) === 0) {
$categoryCollection = $this->getExtension('Atom')->getCategories();
}
@@ -660,7 +673,6 @@ public function getCategories()
/**
* Read all entries to the internal entries array
- *
*/
protected function indexEntries()
{
@@ -677,7 +689,6 @@ protected function indexEntries()
/**
* Register the default namespaces for the current feed format
- *
*/
protected function registerNamespaces()
{
diff --git a/vendor/zendframework/zend-feed/src/Reader/FeedSet.php b/vendor/laminas/laminas-feed/src/Reader/FeedSet.php
similarity index 71%
rename from vendor/zendframework/zend-feed/src/Reader/FeedSet.php
rename to vendor/laminas/laminas-feed/src/Reader/FeedSet.php
index ad5ac5b795..7b72da9ed5 100644
--- a/vendor/zendframework/zend-feed/src/Reader/FeedSet.php
+++ b/vendor/laminas/laminas-feed/src/Reader/FeedSet.php
@@ -1,25 +1,24 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Reader;
+namespace Laminas\Feed\Reader;
use ArrayObject;
use DOMNodeList;
-use Zend\Feed\Uri;
+use Laminas\Feed\Uri;
class FeedSet extends ArrayObject
{
- public $rss = null;
+ public $rss;
- public $rdf = null;
+ public $rdf;
- public $atom = null;
+ public $atom;
/**
* Import a DOMNodeList from any document containing a set of links
@@ -33,7 +32,6 @@ class FeedSet extends ArrayObject
* Note that feeds are not loaded at this point, but will be lazy
* loaded automatically when each links 'feed' array key is accessed.
*
- * @param DOMNodeList $links
* @param string $uri
* @return void
*/
@@ -41,31 +39,32 @@ public function addLinks(DOMNodeList $links, $uri)
{
foreach ($links as $link) {
if (strtolower($link->getAttribute('rel')) !== 'alternate'
- || ! $link->getAttribute('type') || ! $link->getAttribute('href')) {
+ || ! $link->getAttribute('type') || ! $link->getAttribute('href')
+ ) {
continue;
}
- if (! isset($this->rss) && $link->getAttribute('type') == 'application/rss+xml') {
+ if (! isset($this->rss) && $link->getAttribute('type') === 'application/rss+xml') {
$this->rss = $this->absolutiseUri(trim($link->getAttribute('href')), $uri);
- } elseif (! isset($this->atom) && $link->getAttribute('type') == 'application/atom+xml') {
+ } elseif (! isset($this->atom) && $link->getAttribute('type') === 'application/atom+xml') {
$this->atom = $this->absolutiseUri(trim($link->getAttribute('href')), $uri);
- } elseif (! isset($this->rdf) && $link->getAttribute('type') == 'application/rdf+xml') {
+ } elseif (! isset($this->rdf) && $link->getAttribute('type') === 'application/rdf+xml') {
$this->rdf = $this->absolutiseUri(trim($link->getAttribute('href')), $uri);
}
$this[] = new static([
- 'rel' => 'alternate',
- 'type' => $link->getAttribute('type'),
- 'href' => $this->absolutiseUri(trim($link->getAttribute('href')), $uri),
+ 'rel' => 'alternate',
+ 'type' => $link->getAttribute('type'),
+ 'href' => $this->absolutiseUri(trim($link->getAttribute('href')), $uri),
'title' => $link->getAttribute('title'),
]);
}
}
/**
- * Attempt to turn a relative URI into an absolute URI
+ * Attempt to turn a relative URI into an absolute URI
*
- * @param string $link
- * @param string $uri OPTIONAL
- * @return string|null absolutised link or null if invalid
+ * @param string $link
+ * @param null|string $uri OPTIONAL
+ * @return null|string absolutised link or null if invalid
*/
protected function absolutiseUri($link, $uri = null)
{
@@ -77,7 +76,7 @@ protected function absolutiseUri($link, $uri = null)
$scheme = 'http';
if ($uri !== null) {
- $uri = Uri::factory($uri);
+ $uri = Uri::factory($uri);
$scheme = $uri->getScheme() ?: $scheme;
}
@@ -97,8 +96,8 @@ protected function absolutiseUri($link, $uri = null)
/**
* Resolves scheme relative link to absolute
*
- * @param string $link
- * @param string $scheme
+ * @param string $link
+ * @param string $scheme
* @return string
*/
private function resolveSchemeRelativeUri($link, $scheme)
@@ -108,13 +107,13 @@ private function resolveSchemeRelativeUri($link, $scheme)
}
/**
- * Resolves relative link to absolute
+ * Resolves relative link to absolute
*
- * @param string $link
- * @param string $scheme
- * @param string $host
- * @param string $uriPath
- * @return string
+ * @param string $link
+ * @param string $scheme
+ * @param string $host
+ * @param string $uriPath
+ * @return string
*/
private function resolveRelativeUri($link, $scheme, $host, $uriPath)
{
@@ -130,20 +129,20 @@ private function resolveRelativeUri($link, $scheme, $host, $uriPath)
}
/**
- * Canonicalize relative path
+ * Canonicalize relative path
*
- * @param string $path
+ * @param string $path
* @return string
*/
protected function canonicalizePath($path)
{
- $parts = array_filter(explode('/', $path));
+ $parts = array_filter(explode('/', $path));
$absolutes = [];
foreach ($parts as $part) {
- if ('.' == $part) {
+ if ('.' === $part) {
continue;
}
- if ('..' == $part) {
+ if ('..' === $part) {
array_pop($absolutes);
} else {
$absolutes[] = $part;
@@ -156,12 +155,12 @@ protected function canonicalizePath($path)
* Supports lazy loading of feeds using Reader::import() but
* delegates any other operations to the parent class.
*
- * @param string $offset
+ * @param string $offset
* @return mixed
*/
public function offsetGet($offset)
{
- if ($offset == 'feed' && ! $this->offsetExists('feed')) {
+ if ($offset === 'feed' && ! $this->offsetExists('feed')) {
if (! $this->offsetExists('href')) {
return;
}
diff --git a/vendor/laminas/laminas-feed/src/Reader/Http/ClientInterface.php b/vendor/laminas/laminas-feed/src/Reader/Http/ClientInterface.php
new file mode 100644
index 0000000000..017d3fc2b7
--- /dev/null
+++ b/vendor/laminas/laminas-feed/src/Reader/Http/ClientInterface.php
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Laminas\Feed\Reader\Http;
+
+interface ClientInterface
+{
+ /**
+ * Make a GET request to a given URI
+ *
+ * @param string $uri
+ * @return ResponseInterface
+ */
+ public function get($uri);
+}
diff --git a/vendor/zendframework/zend-feed/src/Reader/Http/HeaderAwareClientInterface.php b/vendor/laminas/laminas-feed/src/Reader/Http/HeaderAwareClientInterface.php
similarity index 54%
rename from vendor/zendframework/zend-feed/src/Reader/Http/HeaderAwareClientInterface.php
rename to vendor/laminas/laminas-feed/src/Reader/Http/HeaderAwareClientInterface.php
index 5895b7cd2d..59c7dcfb76 100644
--- a/vendor/zendframework/zend-feed/src/Reader/Http/HeaderAwareClientInterface.php
+++ b/vendor/laminas/laminas-feed/src/Reader/Http/HeaderAwareClientInterface.php
@@ -1,13 +1,12 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Reader\Http;
+namespace Laminas\Feed\Reader\Http;
interface HeaderAwareClientInterface extends ClientInterface
{
@@ -25,8 +24,7 @@ interface HeaderAwareClientInterface extends ClientInterface
* ]
* </code>
*
- * @param string $uri
- * @param array $headers
+ * @param string $uri
* @return HeaderAwareResponseInterface
*/
public function get($uri, array $headers = []);
diff --git a/vendor/zendframework/zend-feed/src/Reader/Http/HeaderAwareResponseInterface.php b/vendor/laminas/laminas-feed/src/Reader/Http/HeaderAwareResponseInterface.php
similarity index 51%
rename from vendor/zendframework/zend-feed/src/Reader/Http/HeaderAwareResponseInterface.php
rename to vendor/laminas/laminas-feed/src/Reader/Http/HeaderAwareResponseInterface.php
index 509c5fd7ec..f618ba2d66 100644
--- a/vendor/zendframework/zend-feed/src/Reader/Http/HeaderAwareResponseInterface.php
+++ b/vendor/laminas/laminas-feed/src/Reader/Http/HeaderAwareResponseInterface.php
@@ -1,13 +1,12 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Reader\Http;
+namespace Laminas\Feed\Reader\Http;
interface HeaderAwareResponseInterface extends ResponseInterface
{
@@ -20,8 +19,8 @@ interface HeaderAwareResponseInterface extends ResponseInterface
* in nature, this method is expected to return a string, and not
* an array of values.
*
- * @param string $name Header name to retrieve.
- * @param mixed $default Default value to use if header is not present.
+ * @param string $name Header name to retrieve.
+ * @param null|mixed $default Default value to use if header is not present.
* @return string
*/
public function getHeaderLine($name, $default = null);
diff --git a/vendor/zendframework/zend-feed/src/Reader/Http/ZendHttpClientDecorator.php b/vendor/laminas/laminas-feed/src/Reader/Http/LaminasHttpClientDecorator.php
similarity index 74%
rename from vendor/zendframework/zend-feed/src/Reader/Http/ZendHttpClientDecorator.php
rename to vendor/laminas/laminas-feed/src/Reader/Http/LaminasHttpClientDecorator.php
index 6ff23cd139..b7f1630a8d 100644
--- a/vendor/zendframework/zend-feed/src/Reader/Http/ZendHttpClientDecorator.php
+++ b/vendor/laminas/laminas-feed/src/Reader/Http/LaminasHttpClientDecorator.php
@@ -1,35 +1,31 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Reader\Http;
+namespace Laminas\Feed\Reader\Http;
-use Zend\Feed\Reader\Exception;
-use Zend\Http\Client as ZendHttpClient;
-use Zend\Http\Headers;
+use Laminas\Feed\Reader\Exception;
+use Laminas\Http\Client as LaminasHttpClient;
+use Laminas\Http\Headers;
-class ZendHttpClientDecorator implements HeaderAwareClientInterface
+class LaminasHttpClientDecorator implements HeaderAwareClientInterface
{
/**
- * @var ZendHttpClient
+ * @var LaminasHttpClient
*/
private $client;
- /**
- * @param ZendHttpClient $client
- */
- public function __construct(ZendHttpClient $client)
+ public function __construct(LaminasHttpClient $client)
{
$this->client = $client;
}
/**
- * @return ZendHttpClient
+ * @return LaminasHttpClient
*/
public function getDecoratedClient()
{
@@ -59,8 +55,6 @@ public function get($uri, array $headers = [])
/**
* Inject header values into the client.
- *
- * @param array $headerValues
*/
private function injectHeaders(array $headerValues)
{
@@ -78,7 +72,7 @@ private function injectHeaders(array $headerValues)
throw new Exception\InvalidArgumentException(sprintf(
'Header values provided to %s::get must be arrays of values; received %s',
__CLASS__,
- (is_object($values) ? get_class($values) : gettype($values))
+ is_object($values) ? get_class($values) : gettype($values)
));
}
@@ -88,7 +82,7 @@ private function injectHeaders(array $headerValues)
'Individual header values provided to %s::get must be strings or numbers; '
. 'received %s for header %s',
__CLASS__,
- (is_object($value) ? get_class($value) : gettype($value)),
+ is_object($value) ? get_class($value) : gettype($value),
$name
));
}
@@ -104,7 +98,6 @@ private function injectHeaders(array $headerValues)
* Ensures multi-value headers are represented as a single string, via
* comma concatenation.
*
- * @param Headers $headers
* @return array
*/
private function prepareResponseHeaders(Headers $headers)
diff --git a/vendor/zendframework/zend-feed/src/Reader/Http/Psr7ResponseDecorator.php b/vendor/laminas/laminas-feed/src/Reader/Http/Psr7ResponseDecorator.php
similarity index 75%
rename from vendor/zendframework/zend-feed/src/Reader/Http/Psr7ResponseDecorator.php
rename to vendor/laminas/laminas-feed/src/Reader/Http/Psr7ResponseDecorator.php
index 7424fef6db..92879b4a1d 100644
--- a/vendor/zendframework/zend-feed/src/Reader/Http/Psr7ResponseDecorator.php
+++ b/vendor/laminas/laminas-feed/src/Reader/Http/Psr7ResponseDecorator.php
@@ -1,13 +1,12 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Reader\Http;
+namespace Laminas\Feed\Reader\Http;
use Psr\Http\Message\ResponseInterface as Psr7ResponseInterface;
@@ -21,9 +20,6 @@ class Psr7ResponseDecorator implements HeaderAwareResponseInterface
*/
private $decoratedResponse;
- /**
- * @param Psr7ResponseInterface $response
- */
public function __construct(Psr7ResponseInterface $response)
{
$this->decoratedResponse = $response;
diff --git a/vendor/zendframework/zend-feed/src/Reader/Http/Response.php b/vendor/laminas/laminas-feed/src/Reader/Http/Response.php
similarity index 83%
rename from vendor/zendframework/zend-feed/src/Reader/Http/Response.php
rename to vendor/laminas/laminas-feed/src/Reader/Http/Response.php
index ef8f1cfb46..a480a46b5e 100644
--- a/vendor/zendframework/zend-feed/src/Reader/Http/Response.php
+++ b/vendor/laminas/laminas-feed/src/Reader/Http/Response.php
@@ -1,15 +1,14 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Reader\Http;
+namespace Laminas\Feed\Reader\Http;
-use Zend\Feed\Reader\Exception;
+use Laminas\Feed\Reader\Exception;
class Response implements HeaderAwareResponseInterface
{
@@ -29,9 +28,8 @@ class Response implements HeaderAwareResponseInterface
private $statusCode;
/**
- * @param int $statusCode
- * @param string|object $body
- * @param array $headers
+ * @param int $statusCode
+ * @param object|string $body
* @throws Exception\InvalidArgumentException
*/
public function __construct($statusCode, $body = '', array $headers = [])
@@ -75,7 +73,7 @@ public function getHeaderLine($name, $default = null)
/**
* Validate that we have a status code argument that will work for our context.
*
- * @param int $statusCode
+ * @param int $statusCode
* @throws Exception\InvalidArgumentException for arguments not castable
* to integer HTTP status codes.
*/
@@ -85,7 +83,7 @@ private function validateStatusCode($statusCode)
throw new Exception\InvalidArgumentException(sprintf(
'%s expects a numeric status code; received %s',
__CLASS__,
- (is_object($statusCode) ? get_class($statusCode) : gettype($statusCode))
+ is_object($statusCode) ? get_class($statusCode) : gettype($statusCode)
));
}
@@ -109,7 +107,7 @@ private function validateStatusCode($statusCode)
/**
* Validate that we have a body argument that will work for our context.
*
- * @param mixed $body
+ * @param mixed $body
* @throws Exception\InvalidArgumentException for arguments not castable
* to strings.
*/
@@ -126,14 +124,13 @@ private function validateBody($body)
throw new Exception\InvalidArgumentException(sprintf(
'%s expects a string body, or an object that can cast to string; received %s',
__CLASS__,
- (is_object($body) ? get_class($body) : gettype($body))
+ is_object($body) ? get_class($body) : gettype($body)
));
}
/**
* Validate header values.
*
- * @param array $headers
* @throws Exception\InvalidArgumentException
*/
private function validateHeaders(array $headers)
@@ -151,7 +148,7 @@ private function validateHeaders(array $headers)
throw new Exception\InvalidArgumentException(sprintf(
'Individual header values provided to %s must be a string or numeric; received %s for header %s',
__CLASS__,
- (is_object($value) ? get_class($value) : gettype($value)),
+ is_object($value) ? get_class($value) : gettype($value),
$name
));
}
@@ -161,7 +158,6 @@ private function validateHeaders(array $headers)
/**
* Normalize header names to lowercase.
*
- * @param array $headers
* @return array
*/
private function normalizeHeaders(array $headers)
diff --git a/vendor/laminas/laminas-feed/src/Reader/Http/ResponseInterface.php b/vendor/laminas/laminas-feed/src/Reader/Http/ResponseInterface.php
new file mode 100644
index 0000000000..9d96a94cdc
--- /dev/null
+++ b/vendor/laminas/laminas-feed/src/Reader/Http/ResponseInterface.php
@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Laminas\Feed\Reader\Http;
+
+interface ResponseInterface
+{
+ /**
+ * Retrieve the response body
+ *
+ * @return string
+ */
+ public function getBody();
+
+ /**
+ * Retrieve the HTTP response status code
+ *
+ * @return int
+ */
+ public function getStatusCode();
+}
diff --git a/vendor/zendframework/zend-feed/src/Reader/Reader.php b/vendor/laminas/laminas-feed/src/Reader/Reader.php
similarity index 86%
rename from vendor/zendframework/zend-feed/src/Reader/Reader.php
rename to vendor/laminas/laminas-feed/src/Reader/Reader.php
index 8763ca1f2b..9cf813c662 100644
--- a/vendor/zendframework/zend-feed/src/Reader/Reader.php
+++ b/vendor/laminas/laminas-feed/src/Reader/Reader.php
@@ -1,33 +1,30 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Reader;
+namespace Laminas\Feed\Reader;
use DOMDocument;
use DOMXPath;
-use Zend\Cache\Storage\StorageInterface as CacheStorage;
-use Zend\Feed\Reader\Exception\InvalidHttpClientException;
-use Zend\Http as ZendHttp;
-use Zend\Stdlib\ErrorHandler;
+use Laminas\Cache\Storage\StorageInterface as CacheStorage;
+use Laminas\Feed\Reader\Exception\InvalidHttpClientException;
+use Laminas\Http as LaminasHttp;
+use Laminas\Stdlib\ErrorHandler;
-/**
-*/
class Reader implements ReaderImportInterface
{
/**
* Namespace constants
*/
- const NAMESPACE_ATOM_03 = 'http://purl.org/atom/ns#';
- const NAMESPACE_ATOM_10 = 'http://www.w3.org/2005/Atom';
- const NAMESPACE_RDF = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#';
- const NAMESPACE_RSS_090 = 'http://my.netscape.com/rdf/simple/0.9/';
- const NAMESPACE_RSS_10 = 'http://purl.org/rss/1.0/';
+ const NAMESPACE_ATOM_03 = 'http://purl.org/atom/ns#';
+ const NAMESPACE_ATOM_10 = 'http://www.w3.org/2005/Atom';
+ const NAMESPACE_RDF = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#';
+ const NAMESPACE_RSS_090 = 'http://my.netscape.com/rdf/simple/0.9/';
+ const NAMESPACE_RSS_10 = 'http://purl.org/rss/1.0/';
/**
* Feed type constants
@@ -53,14 +50,14 @@ class Reader implements ReaderImportInterface
*
* @var CacheStorage
*/
- protected static $cache = null;
+ protected static $cache;
/**
* HTTP client object to use for retrieving feeds
*
* @var Http\ClientInterface
*/
- protected static $httpClient = null;
+ protected static $httpClient;
/**
* Override HTTP PUT and DELETE request methods?
@@ -71,25 +68,25 @@ class Reader implements ReaderImportInterface
protected static $httpConditionalGet = false;
- protected static $extensionManager = null;
+ protected static $extensionManager;
protected static $extensions = [
- 'feed' => [
+ 'feed' => [
'DublinCore\Feed',
- 'Atom\Feed'
+ 'Atom\Feed',
],
'entry' => [
'Content\Entry',
'DublinCore\Entry',
- 'Atom\Entry'
+ 'Atom\Entry',
],
- 'core' => [
+ 'core' => [
'DublinCore\Feed',
'Atom\Feed',
'Content\Entry',
'DublinCore\Entry',
- 'Atom\Entry'
- ]
+ 'Atom\Entry',
+ ],
];
/**
@@ -105,7 +102,6 @@ public static function getCache()
/**
* Set the feed cache
*
- * @param CacheStorage $cache
* @return void
*/
public static function setCache(CacheStorage $cache)
@@ -118,13 +114,13 @@ public static function setCache(CacheStorage $cache)
*
* Sets the HTTP client object to use for retrieving the feeds.
*
- * @param ZendHttp\Client | Http\ClientInterface $httpClient
+ * @param Http\ClientInterface|LaminasHttp\Client $httpClient
* @return void
*/
public static function setHttpClient($httpClient)
{
- if ($httpClient instanceof ZendHttp\Client) {
- $httpClient = new Http\ZendHttpClientDecorator($httpClient);
+ if ($httpClient instanceof LaminasHttp\Client) {
+ $httpClient = new Http\LaminasHttpClientDecorator($httpClient);
}
if (! $httpClient instanceof Http\ClientInterface) {
@@ -134,14 +130,14 @@ public static function setHttpClient($httpClient)
}
/**
- * Gets the HTTP client object. If none is set, a new ZendHttp\Client will be used.
+ * Gets the HTTP client object. If none is set, a new LaminasHttp\Client will be used.
*
* @return Http\ClientInterface
*/
public static function getHttpClient()
{
if (! static::$httpClient) {
- static::$httpClient = new Http\ZendHttpClientDecorator(new ZendHttp\Client());
+ static::$httpClient = new Http\LaminasHttpClientDecorator(new LaminasHttp\Client());
}
return static::$httpClient;
@@ -190,8 +186,8 @@ public static function useHttpConditionalGet($bool = true)
* Import a feed by providing a URI
*
* @param string $uri The URI to the feed
- * @param string $etag OPTIONAL Last received ETag for this resource
- * @param string $lastModified OPTIONAL Last-Modified value for this resource
+ * @param null|string $etag OPTIONAL Last received ETag for this resource
+ * @param null|string $lastModified OPTIONAL Last-Modified value for this resource
* @return Feed\FeedInterface
* @throws Exception\RuntimeException
*/
@@ -199,7 +195,7 @@ public static function import($uri, $etag = null, $lastModified = null)
{
$cache = self::getCache();
$client = self::getHttpClient();
- $cacheId = 'Zend_Feed_Reader_' . md5($uri);
+ $cacheId = 'Laminas_Feed_Reader_' . md5($uri);
if (static::$httpConditionalGet && $cache) {
$headers = [];
@@ -279,7 +275,6 @@ public static function import($uri, $etag = null, $lastModified = null)
* HTTP client implementations.
*
* @param string $uri
- * @param Http\ClientInterface $client
* @return Feed\FeedInterface
* @throws Exception\RuntimeException if response is not an Http\ResponseInterface
*/
@@ -290,7 +285,7 @@ public static function importRemoteFeed($uri, Http\ClientInterface $client)
throw new Exception\RuntimeException(sprintf(
'Did not receive a %s\Http\ResponseInterface from the provided HTTP client; received "%s"',
__NAMESPACE__,
- (is_object($response) ? get_class($response) : gettype($response))
+ is_object($response) ? get_class($response) : gettype($response)
));
}
@@ -320,9 +315,9 @@ public static function importString($string)
}
$libxmlErrflag = libxml_use_internal_errors(true);
- $oldValue = libxml_disable_entity_loader(true);
- $dom = new DOMDocument;
- $status = $dom->loadXML(trim($string));
+ $oldValue = libxml_disable_entity_loader(true);
+ $dom = new DOMDocument();
+ $status = $dom->loadXML(trim($string));
foreach ($dom->childNodes as $child) {
if ($child->nodeType === XML_DOCUMENT_TYPE_NODE) {
throw new Exception\InvalidArgumentException(
@@ -338,7 +333,7 @@ public static function importString($string)
$error = libxml_get_last_error();
if ($error && $error->message) {
$error->message = trim($error->message);
- $errormsg = "DOMDocument cannot parse XML: {$error->message}";
+ $errormsg = "DOMDocument cannot parse XML: {$error->message}";
} else {
$errormsg = "DOMDocument cannot parse XML: Please check the XML document's validity";
}
@@ -356,8 +351,10 @@ public static function importString($string)
} elseif (0 === strpos($type, 'atom')) {
$reader = new Feed\Atom($dom, $type);
} else {
- throw new Exception\RuntimeException('The URI used does not point to a '
- . 'valid Atom, RSS or RDF feed that Zend\Feed\Reader can parse.');
+ throw new Exception\RuntimeException(
+ 'The URI used does not point to a '
+ . 'valid Atom, RSS or RDF feed that Laminas\Feed\Reader can parse.'
+ );
}
return $reader;
}
@@ -366,8 +363,8 @@ public static function importString($string)
* Imports a feed from a file located at $filename.
*
* @param string $filename
- * @throws Exception\RuntimeException
* @return Feed\FeedInterface
+ * @throws Exception\RuntimeException
*/
public static function importFile($filename)
{
@@ -383,7 +380,7 @@ public static function importFile($filename)
/**
* Find feed links
*
- * @param $uri
+ * @param string $uri
* @return FeedSet
* @throws Exception\RuntimeException
*/
@@ -396,11 +393,11 @@ public static function findFeedLinks($uri)
"Failed to access $uri, got response code " . $response->getStatusCode()
);
}
- $responseHtml = $response->getBody();
+ $responseHtml = $response->getBody();
$libxmlErrflag = libxml_use_internal_errors(true);
- $oldValue = libxml_disable_entity_loader(true);
- $dom = new DOMDocument;
- $status = $dom->loadHTML(trim($responseHtml));
+ $oldValue = libxml_disable_entity_loader(true);
+ $dom = new DOMDocument();
+ $status = $dom->loadHTML(trim($responseHtml));
libxml_disable_entity_loader($oldValue);
libxml_use_internal_errors($libxmlErrflag);
if (! $status) {
@@ -408,14 +405,14 @@ public static function findFeedLinks($uri)
$error = libxml_get_last_error();
if ($error && $error->message) {
$error->message = trim($error->message);
- $errormsg = "DOMDocument cannot parse HTML: {$error->message}";
+ $errormsg = "DOMDocument cannot parse HTML: {$error->message}";
} else {
$errormsg = "DOMDocument cannot parse HTML: Please check the XML document's validity";
}
throw new Exception\RuntimeException($errormsg);
}
- $feedSet = new FeedSet;
- $links = $dom->getElementsByTagName('link');
+ $feedSet = new FeedSet();
+ $links = $dom->getElementsByTagName('link');
$feedSet->addLinks($links, $uri);
return $feedSet;
}
@@ -423,7 +420,7 @@ public static function findFeedLinks($uri)
/**
* Detect the feed type of the provided feed
*
- * @param Feed\AbstractFeed|DOMDocument|string $feed
+ * @param string|DOMDocument|Feed\AbstractFeed $feed
* @param bool $specOnly
* @return string
* @throws Exception\InvalidArgumentException
@@ -439,8 +436,8 @@ public static function detectType($feed, $specOnly = false)
ErrorHandler::start(E_NOTICE | E_WARNING);
ini_set('track_errors', 1);
$oldValue = libxml_disable_entity_loader(true);
- $dom = new DOMDocument;
- $status = $dom->loadXML($feed);
+ $dom = new DOMDocument();
+ $status = $dom->loadXML($feed);
foreach ($dom->childNodes as $child) {
if ($child->nodeType === XML_DOCUMENT_TYPE_NODE) {
throw new Exception\InvalidArgumentException(
@@ -462,13 +459,15 @@ public static function detectType($feed, $specOnly = false)
throw new Exception\RuntimeException("DOMDocument cannot parse XML: $phpErrormsg");
}
} else {
- throw new Exception\InvalidArgumentException('Invalid object/scalar provided: must'
- . ' be of type Zend\Feed\Reader\Feed, DomDocument or string');
+ throw new Exception\InvalidArgumentException(
+ 'Invalid object/scalar provided: must'
+ . ' be of type Laminas\Feed\Reader\Feed, DomDocument or string'
+ );
}
$xpath = new DOMXPath($dom);
if ($xpath->query('/rss')->length) {
- $type = self::TYPE_RSS_ANY;
+ $type = self::TYPE_RSS_ANY;
$version = $xpath->evaluate('string(/rss/@version)');
if (strlen($version) > 0) {
@@ -547,8 +546,6 @@ public static function detectType($feed, $specOnly = false)
/**
* Set plugin manager for use with Extensions
- *
- * @param ExtensionManagerInterface $extensionManager
*/
public static function setExtensionManager(ExtensionManagerInterface $extensionManager)
{
@@ -590,7 +587,7 @@ public static function registerExtension($name)
return;
}
- $manager = static::getExtensionManager();
+ $manager = static::getExtensionManager();
$feedName = $name . '\Feed';
if ($manager->has($feedName)) {
@@ -644,22 +641,22 @@ public static function reset()
static::$httpConditionalGet = false;
static::$extensionManager = null;
static::$extensions = [
- 'feed' => [
+ 'feed' => [
'DublinCore\Feed',
- 'Atom\Feed'
+ 'Atom\Feed',
],
'entry' => [
'Content\Entry',
'DublinCore\Entry',
- 'Atom\Entry'
+ 'Atom\Entry',
],
- 'core' => [
+ 'core' => [
'DublinCore\Feed',
'Atom\Feed',
'Content\Entry',
'DublinCore\Entry',
- 'Atom\Entry'
- ]
+ 'Atom\Entry',
+ ],
];
}
@@ -695,7 +692,7 @@ protected static function registerCoreExtensions()
* Utility method to apply array_unique operation to a multidimensional
* array.
*
- * @param array
+ * @param array
* @return array
*/
public static function arrayUnique(array $array)
@@ -722,7 +719,7 @@ public static function arrayUnique(array $array)
* implementations may not yet have an entry for the extension, which would
* then otherwise cause registerExtension() to fail.
*
- * @param string $name
+ * @param string $name
* @return bool
*/
protected static function hasExtension($name)
diff --git a/vendor/zendframework/zend-feed/src/Reader/ReaderImportInterface.php b/vendor/laminas/laminas-feed/src/Reader/ReaderImportInterface.php
similarity index 72%
rename from vendor/zendframework/zend-feed/src/Reader/ReaderImportInterface.php
rename to vendor/laminas/laminas-feed/src/Reader/ReaderImportInterface.php
index 0a2edd14cc..5829275477 100644
--- a/vendor/zendframework/zend-feed/src/Reader/ReaderImportInterface.php
+++ b/vendor/laminas/laminas-feed/src/Reader/ReaderImportInterface.php
@@ -1,14 +1,12 @@
<?php
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Reader;
+namespace Laminas\Feed\Reader;
interface ReaderImportInterface
{
@@ -16,8 +14,8 @@ interface ReaderImportInterface
* Import a feed by providing a URI
*
* @param string $uri The URI to the feed
- * @param string $etag OPTIONAL Last received ETag for this resource
- * @param string $lastModified OPTIONAL Last-Modified value for this resource
+ * @param null|string $etag OPTIONAL Last received ETag for this resource
+ * @param null|string $lastModified OPTIONAL Last-Modified value for this resource
* @return Feed\FeedInterface
* @throws Exception\RuntimeException
*/
@@ -33,13 +31,11 @@ public static function import($uri, $etag = null, $lastModified = null);
* HTTP client implementations.
*
* @param string $uri
- * @param Http\ClientInterface $client
* @return self
* @throws Exception\RuntimeException if response is not an Http\ResponseInterface
*/
public static function importRemoteFeed($uri, Http\ClientInterface $client);
-
/**
* Import a feed from a string
*
@@ -50,13 +46,12 @@ public static function importRemoteFeed($uri, Http\ClientInterface $client);
*/
public static function importString($string);
-
/**
* Imports a feed from a file located at $filename.
*
* @param string $filename
- * @throws Exception\RuntimeException
* @return Feed\FeedInterface
+ * @throws Exception\RuntimeException
*/
public static function importFile($filename);
}
diff --git a/vendor/zendframework/zend-feed/src/Reader/StandaloneExtensionManager.php b/vendor/laminas/laminas-feed/src/Reader/StandaloneExtensionManager.php
similarity index 53%
rename from vendor/zendframework/zend-feed/src/Reader/StandaloneExtensionManager.php
rename to vendor/laminas/laminas-feed/src/Reader/StandaloneExtensionManager.php
index 3babc29583..6352539b46 100644
--- a/vendor/zendframework/zend-feed/src/Reader/StandaloneExtensionManager.php
+++ b/vendor/laminas/laminas-feed/src/Reader/StandaloneExtensionManager.php
@@ -1,34 +1,33 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Reader;
+namespace Laminas\Feed\Reader;
-use Zend\Feed\Reader\Exception\InvalidArgumentException;
+use Laminas\Feed\Reader\Exception\InvalidArgumentException;
class StandaloneExtensionManager implements ExtensionManagerInterface
{
private $extensions = [
- 'Atom\Entry' => Extension\Atom\Entry::class,
- 'Atom\Feed' => Extension\Atom\Feed::class,
- 'Content\Entry' => Extension\Content\Entry::class,
- 'CreativeCommons\Entry' => Extension\CreativeCommons\Entry::class,
- 'CreativeCommons\Feed' => Extension\CreativeCommons\Feed::class,
- 'DublinCore\Entry' => Extension\DublinCore\Entry::class,
- 'DublinCore\Feed' => Extension\DublinCore\Feed::class,
+ 'Atom\Entry' => Extension\Atom\Entry::class,
+ 'Atom\Feed' => Extension\Atom\Feed::class,
+ 'Content\Entry' => Extension\Content\Entry::class,
+ 'CreativeCommons\Entry' => Extension\CreativeCommons\Entry::class,
+ 'CreativeCommons\Feed' => Extension\CreativeCommons\Feed::class,
+ 'DublinCore\Entry' => Extension\DublinCore\Entry::class,
+ 'DublinCore\Feed' => Extension\DublinCore\Feed::class,
'GooglePlayPodcast\Entry' => Extension\GooglePlayPodcast\Entry::class,
'GooglePlayPodcast\Feed' => Extension\GooglePlayPodcast\Feed::class,
- 'Podcast\Entry' => Extension\Podcast\Entry::class,
- 'Podcast\Feed' => Extension\Podcast\Feed::class,
- 'Slash\Entry' => Extension\Slash\Entry::class,
- 'Syndication\Feed' => Extension\Syndication\Feed::class,
- 'Thread\Entry' => Extension\Thread\Entry::class,
- 'WellFormedWeb\Entry' => Extension\WellFormedWeb\Entry::class,
+ 'Podcast\Entry' => Extension\Podcast\Entry::class,
+ 'Podcast\Feed' => Extension\Podcast\Feed::class,
+ 'Slash\Entry' => Extension\Slash\Entry::class,
+ 'Syndication\Feed' => Extension\Syndication\Feed::class,
+ 'Thread\Entry' => Extension\Thread\Entry::class,
+ 'WellFormedWeb\Entry' => Extension\WellFormedWeb\Entry::class,
];
/**
@@ -63,10 +62,8 @@ public function get($extension)
public function add($name, $class)
{
if (is_string($class)
- && (
- is_a($class, Extension\AbstractEntry::class, true)
- || is_a($class, Extension\AbstractFeed::class, true)
- )
+ && (is_a($class, Extension\AbstractEntry::class, true)
+ || is_a($class, Extension\AbstractFeed::class, true))
) {
$this->extensions[$name] = $class;
return;
diff --git a/vendor/zendframework/zend-feed/src/Uri.php b/vendor/laminas/laminas-feed/src/Uri.php
similarity index 89%
rename from vendor/zendframework/zend-feed/src/Uri.php
rename to vendor/laminas/laminas-feed/src/Uri.php
index 5fe2f80b4d..d61ca8d540 100644
--- a/vendor/zendframework/zend-feed/src/Uri.php
+++ b/vendor/laminas/laminas-feed/src/Uri.php
@@ -1,13 +1,12 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed;
+namespace Laminas\Feed;
class Uri
{
@@ -66,7 +65,7 @@ class Uri
];
/**
- * @param string $uri
+ * @param string $uri
*/
public function __construct($uri)
{
@@ -179,6 +178,6 @@ public function isValid()
*/
public function isAbsolute()
{
- return ($this->scheme !== null);
+ return $this->scheme !== null;
}
}
diff --git a/vendor/zendframework/zend-feed/src/Writer/AbstractFeed.php b/vendor/laminas/laminas-feed/src/Writer/AbstractFeed.php
similarity index 81%
rename from vendor/zendframework/zend-feed/src/Writer/AbstractFeed.php
rename to vendor/laminas/laminas-feed/src/Writer/AbstractFeed.php
index 9d865bf986..eba390021d 100644
--- a/vendor/zendframework/zend-feed/src/Writer/AbstractFeed.php
+++ b/vendor/laminas/laminas-feed/src/Writer/AbstractFeed.php
@@ -1,18 +1,17 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Writer;
+namespace Laminas\Feed\Writer;
use DateTime;
use DateTimeInterface;
-use Zend\Feed\Uri;
-use Zend\Validator;
+use Laminas\Feed\Uri;
+use Laminas\Validator;
class AbstractFeed
{
@@ -29,17 +28,16 @@ class AbstractFeed
*
* @var string
*/
- protected $type = null;
+ protected $type;
/**
- * @var $extensions
+ * @var Extension\RendererInterface[]
*/
protected $extensions;
/**
* Constructor: Primarily triggers the registration of core extensions and
* loads those appropriate to this data container.
- *
*/
public function __construct()
{
@@ -55,9 +53,8 @@ public function __construct()
* 'email' => (string) An optional email
* 'uri' => (string) An optional and valid URI
*
- * @param array $author
+ * @return $this
* @throws Exception\InvalidArgumentException If any value of $author not follow the format.
- * @return AbstractFeed
*/
public function addAuthor(array $author)
{
@@ -79,8 +76,9 @@ public function addAuthor(array $author)
}
}
if (isset($author['uri'])) {
- if (empty($author['uri']) || ! is_string($author['uri']) ||
- ! Uri::factory($author['uri'])->isValid()
+ if (empty($author['uri'])
+ || ! is_string($author['uri'])
+ || ! Uri::factory($author['uri'])->isValid()
) {
throw new Exception\InvalidArgumentException(
'Invalid parameter: "uri" array value must be a non-empty string and valid URI/IRI'
@@ -97,8 +95,7 @@ public function addAuthor(array $author)
* Set an array with feed authors
*
* @see addAuthor
- * @param array $authors
- * @return AbstractFeed
+ * @return $this
*/
public function addAuthors(array $authors)
{
@@ -112,9 +109,9 @@ public function addAuthors(array $authors)
/**
* Set the copyright entry
*
- * @param string $copyright
+ * @param string $copyright
+ * @return $this
* @throws Exception\InvalidArgumentException
- * @return AbstractFeed
*/
public function setCopyright($copyright)
{
@@ -129,9 +126,9 @@ public function setCopyright($copyright)
/**
* Set the feed creation date
*
- * @param null|int|DateTimeInterface
+ * @param null|int|DateTimeInterface
+ * @return $this
* @throws Exception\InvalidArgumentException
- * @return AbstractFeed
*/
public function setDateCreated($date = null)
{
@@ -142,8 +139,9 @@ public function setDateCreated($date = null)
$date = new DateTime('@' . $date);
}
if (! $date instanceof DateTimeInterface) {
- throw new Exception\InvalidArgumentException('Invalid DateTime object or UNIX Timestamp'
- . ' passed as parameter');
+ throw new Exception\InvalidArgumentException(
+ 'Invalid DateTime object or UNIX Timestamp passed as parameter'
+ );
}
$this->data['dateCreated'] = $date;
@@ -153,9 +151,9 @@ public function setDateCreated($date = null)
/**
* Set the feed modification date
*
- * @param null|int|DateTimeInterface
+ * @param null|int|DateTimeInterface
+ * @return $this
* @throws Exception\InvalidArgumentException
- * @return AbstractFeed
*/
public function setDateModified($date = null)
{
@@ -166,8 +164,9 @@ public function setDateModified($date = null)
$date = new DateTime('@' . $date);
}
if (! $date instanceof DateTimeInterface) {
- throw new Exception\InvalidArgumentException('Invalid DateTime object or UNIX Timestamp'
- . ' passed as parameter');
+ throw new Exception\InvalidArgumentException(
+ 'Invalid DateTime object or UNIX Timestamp passed as parameter'
+ );
}
$this->data['dateModified'] = $date;
@@ -177,9 +176,9 @@ public function setDateModified($date = null)
/**
* Set the feed last-build date. Ignored for Atom 1.0.
*
- * @param null|int|DateTimeInterface
+ * @param null|int|DateTimeInterface
+ * @return $this
* @throws Exception\InvalidArgumentException
- * @return AbstractFeed
*/
public function setLastBuildDate($date = null)
{
@@ -190,8 +189,9 @@ public function setLastBuildDate($date = null)
$date = new DateTime('@' . $date);
}
if (! $date instanceof DateTimeInterface) {
- throw new Exception\InvalidArgumentException('Invalid DateTime object or UNIX Timestamp'
- . ' passed as parameter');
+ throw new Exception\InvalidArgumentException(
+ 'Invalid DateTime object or UNIX Timestamp passed as parameter'
+ );
}
$this->data['lastBuildDate'] = $date;
@@ -201,9 +201,9 @@ public function setLastBuildDate($date = null)
/**
* Set the feed description
*
- * @param string $description
+ * @param string $description
+ * @return $this
* @throws Exception\InvalidArgumentException
- * @return AbstractFeed
*/
public function setDescription($description)
{
@@ -218,11 +218,11 @@ public function setDescription($description)
/**
* Set the feed generator entry
*
- * @param array|string $name
- * @param null|string $version
- * @param null|string $uri
+ * @param array|string $name
+ * @param null|string $version
+ * @param null|string $uri
+ * @return $this
* @throws Exception\InvalidArgumentException
- * @return AbstractFeed
*/
public function setGenerator($name, $version = null, $uri = null)
{
@@ -278,9 +278,9 @@ public function setGenerator($name, $version = null, $uri = null)
/**
* Set the feed ID - URI or URN (via PCRE pattern) supported
*
- * @param string $id
+ * @param string $id
+ * @return $this
* @throws Exception\InvalidArgumentException
- * @return AbstractFeed
*/
public function setId($id)
{
@@ -302,7 +302,7 @@ public function setId($id)
/**
* Validate a URI using the tag scheme (RFC 4151)
*
- * @param string $id
+ * @param string $id
* @return bool
*/
// @codingStandardsIgnoreStart
@@ -315,16 +315,16 @@ protected function _validateTagUri($id)
$matches
)) {
$dvalid = false;
- $date = $matches['date'];
- $d6 = strtotime($date);
- if ((strlen($date) == 4) && $date <= date('Y')) {
+ $date = $matches['date'];
+ $d6 = strtotime($date);
+ if ((strlen($date) === 4) && $date <= date('Y')) {
$dvalid = true;
- } elseif ((strlen($date) == 7) && ($d6 < strtotime("now"))) {
+ } elseif ((strlen($date) === 7) && ($d6 < strtotime('now'))) {
$dvalid = true;
- } elseif ((strlen($date) == 10) && ($d6 < strtotime("now"))) {
+ } elseif ((strlen($date) === 10) && ($d6 < strtotime('now'))) {
$dvalid = true;
}
- $validator = new Validator\EmailAddress;
+ $validator = new Validator\EmailAddress();
if ($validator->isValid($matches['name'])) {
$nvalid = true;
} else {
@@ -341,17 +341,17 @@ protected function _validateTagUri($id)
* 'title' and 'link'. RSS also specifies three optional parameters 'width',
* 'height' and 'description'. Only 'uri' is required and used for Atom rendering.
*
- * @param array $data
+ * @return $this
* @throws Exception\InvalidArgumentException
- * @return AbstractFeed
*/
public function setImage(array $data)
{
if (empty($data['uri']) || ! is_string($data['uri'])
|| ! Uri::factory($data['uri'])->isValid()
) {
- throw new Exception\InvalidArgumentException('Invalid parameter: parameter \'uri\''
- . ' must be a non-empty string and valid URI/IRI');
+ throw new Exception\InvalidArgumentException(
+ 'Invalid parameter: parameter \'uri\' must be a non-empty string and valid URI/IRI'
+ );
}
$this->data['image'] = $data;
@@ -361,9 +361,9 @@ public function setImage(array $data)
/**
* Set the feed language
*
- * @param string $language
+ * @param string $language
+ * @return $this
* @throws Exception\InvalidArgumentException
- * @return AbstractFeed
*/
public function setLanguage($language)
{
@@ -378,9 +378,9 @@ public function setLanguage($language)
/**
* Set a link to the HTML source
*
- * @param string $link
+ * @param string $link
+ * @return $this
* @throws Exception\InvalidArgumentException
- * @return AbstractFeed
*/
public function setLink($link)
{
@@ -397,10 +397,10 @@ public function setLink($link)
/**
* Set a link to an XML feed for any feed type/version
*
- * @param string $link
- * @param string $type
+ * @param string $link
+ * @param string $type
+ * @return $this
* @throws Exception\InvalidArgumentException
- * @return AbstractFeed
*/
public function setFeedLink($link, $type)
{
@@ -422,9 +422,9 @@ public function setFeedLink($link, $type)
/**
* Set the feed title
*
- * @param string $title
+ * @param string $title
+ * @return $this
* @throws Exception\InvalidArgumentException
- * @return AbstractFeed
*/
public function setTitle($title)
{
@@ -439,9 +439,9 @@ public function setTitle($title)
/**
* Set the feed character encoding
*
- * @param string $encoding
+ * @param string $encoding
+ * @return $this
* @throws Exception\InvalidArgumentException
- * @return AbstractFeed
*/
public function setEncoding($encoding)
{
@@ -456,15 +456,16 @@ public function setEncoding($encoding)
/**
* Set the feed's base URL
*
- * @param string $url
+ * @param string $url
+ * @return $this
* @throws Exception\InvalidArgumentException
- * @return AbstractFeed
*/
public function setBaseUrl($url)
{
if (empty($url) || ! is_string($url) || ! Uri::factory($url)->isValid()) {
- throw new Exception\InvalidArgumentException('Invalid parameter: "url" array value'
- . ' must be a non-empty string and valid URI/IRI');
+ throw new Exception\InvalidArgumentException(
+ 'Invalid parameter: "url" array value must be a non-empty string and valid URI/IRI'
+ );
}
$this->data['baseUrl'] = $url;
@@ -474,15 +475,16 @@ public function setBaseUrl($url)
/**
* Add a Pubsubhubbub hub endpoint URL
*
- * @param string $url
+ * @param string $url
+ * @return $this
* @throws Exception\InvalidArgumentException
- * @return AbstractFeed
*/
public function addHub($url)
{
if (empty($url) || ! is_string($url) || ! Uri::factory($url)->isValid()) {
- throw new Exception\InvalidArgumentException('Invalid parameter: "url" array value'
- . ' must be a non-empty string and valid URI/IRI');
+ throw new Exception\InvalidArgumentException(
+ 'Invalid parameter: "url" array value must be a non-empty string and valid URI/IRI'
+ );
}
if (! isset($this->data['hubs'])) {
$this->data['hubs'] = [];
@@ -495,8 +497,7 @@ public function addHub($url)
/**
* Add Pubsubhubbub hub endpoint URLs
*
- * @param array $urls
- * @return AbstractFeed
+ * @return $this
*/
public function addHubs(array $urls)
{
@@ -510,24 +511,25 @@ public function addHubs(array $urls)
/**
* Add a feed category
*
- * @param array $category
+ * @return $this
* @throws Exception\InvalidArgumentException
- * @return AbstractFeed
*/
public function addCategory(array $category)
{
if (! isset($category['term'])) {
- throw new Exception\InvalidArgumentException('Each category must be an array and '
- . 'contain at least a "term" element containing the machine '
- . ' readable category name');
+ throw new Exception\InvalidArgumentException(
+ 'Each category must be an array and contain at least a "term" element'
+ . ' containing the machine readable category name'
+ );
}
if (isset($category['scheme'])) {
if (empty($category['scheme'])
|| ! is_string($category['scheme'])
|| ! Uri::factory($category['scheme'])->isValid()
) {
- throw new Exception\InvalidArgumentException('The Atom scheme or RSS domain of'
- . ' a category must be a valid URI');
+ throw new Exception\InvalidArgumentException(
+ 'The Atom scheme or RSS domain of a category must be a valid URI'
+ );
}
}
if (! isset($this->data['categories'])) {
@@ -541,8 +543,7 @@ public function addCategory(array $category)
/**
* Set an array of feed categories
*
- * @param array $categories
- * @return AbstractFeed
+ * @return $this
*/
public function addCategories(array $categories)
{
@@ -557,7 +558,7 @@ public function addCategories(array $categories)
* Get a single author
*
* @param int $index
- * @return string|null
+ * @return null|string
*/
public function getAuthor($index = 0)
{
@@ -565,161 +566,172 @@ public function getAuthor($index = 0)
return $this->data['authors'][$index];
}
- return;
+ return null;
}
/**
* Get an array with feed authors
*
- * @return array|null
+ * @return null|array
*/
public function getAuthors()
{
if (! array_key_exists('authors', $this->data)) {
- return;
+ return null;
}
+
return $this->data['authors'];
}
/**
* Get the copyright entry
*
- * @return string|null
+ * @return null|string
*/
public function getCopyright()
{
if (! array_key_exists('copyright', $this->data)) {
- return;
+ return null;
}
+
return $this->data['copyright'];
}
/**
* Get the feed creation date
*
- * @return string|null
+ * @return null|string
*/
public function getDateCreated()
{
if (! array_key_exists('dateCreated', $this->data)) {
- return;
+ return null;
}
+
return $this->data['dateCreated'];
}
/**
* Get the feed modification date
*
- * @return string|null
+ * @return null|string
*/
public function getDateModified()
{
if (! array_key_exists('dateModified', $this->data)) {
- return;
+ return null;
}
+
return $this->data['dateModified'];
}
/**
* Get the feed last-build date
*
- * @return string|null
+ * @return null|string
*/
public function getLastBuildDate()
{
if (! array_key_exists('lastBuildDate', $this->data)) {
- return;
+ return null;
}
+
return $this->data['lastBuildDate'];
}
/**
* Get the feed description
*
- * @return string|null
+ * @return null|string
*/
public function getDescription()
{
if (! array_key_exists('description', $this->data)) {
- return;
+ return null;
}
+
return $this->data['description'];
}
/**
* Get the feed generator entry
*
- * @return string|null
+ * @return null|string
*/
public function getGenerator()
{
if (! array_key_exists('generator', $this->data)) {
- return;
+ return null;
}
+
return $this->data['generator'];
}
/**
* Get the feed ID
*
- * @return string|null
+ * @return null|string
*/
public function getId()
{
if (! array_key_exists('id', $this->data)) {
- return;
+ return null;
}
+
return $this->data['id'];
}
/**
* Get the feed image URI
*
- * @return array
+ * @return null|array
*/
public function getImage()
{
if (! array_key_exists('image', $this->data)) {
- return;
+ return null;
}
+
return $this->data['image'];
}
/**
* Get the feed language
*
- * @return string|null
+ * @return null|string
*/
public function getLanguage()
{
if (! array_key_exists('language', $this->data)) {
- return;
+ return null;
}
+
return $this->data['language'];
}
/**
* Get a link to the HTML source
*
- * @return string|null
+ * @return null|string
*/
public function getLink()
{
if (! array_key_exists('link', $this->data)) {
- return;
+ return null;
}
+
return $this->data['link'];
}
/**
* Get a link to the XML feed
*
- * @return string|null
+ * @return null|string
*/
public function getFeedLinks()
{
if (! array_key_exists('feedLinks', $this->data)) {
- return;
+ return null;
}
return $this->data['feedLinks'];
}
@@ -727,65 +739,70 @@ public function getFeedLinks()
/**
* Get the feed title
*
- * @return string|null
+ * @return null|string
*/
public function getTitle()
{
if (! array_key_exists('title', $this->data)) {
- return;
+ return null;
}
+
return $this->data['title'];
}
/**
* Get the feed character encoding
*
- * @return string|null
+ * @return null|string
*/
public function getEncoding()
{
if (! array_key_exists('encoding', $this->data)) {
return 'UTF-8';
}
+
return $this->data['encoding'];
}
/**
* Get the feed's base url
*
- * @return string|null
+ * @return null|string
*/
public function getBaseUrl()
{
if (! array_key_exists('baseUrl', $this->data)) {
- return;
+ return null;
}
+
return $this->data['baseUrl'];
}
/**
* Get the URLs used as Pubsubhubbub hubs endpoints
*
- * @return string|null
+ * @return null|string
*/
public function getHubs()
{
if (! array_key_exists('hubs', $this->data)) {
- return;
+ return null;
}
+
return $this->data['hubs'];
}
/**
* Get the feed categories
*
- * @return string|null
+ * @return null|string
*/
public function getCategories()
{
if (! array_key_exists('categories', $this->data)) {
- return;
+ return null;
}
+
return $this->data['categories'];
}
@@ -804,8 +821,8 @@ public function reset()
* other objects to gracefully choose whether to execute or not, depending
* on their appropriateness for the current type, e.g. renderers.
*
- * @param string $type
- * @return AbstractFeed
+ * @param string $type
+ * @return $this
*/
public function setType($type)
{
@@ -826,8 +843,8 @@ public function getType()
/**
* Unset a specific data point
*
- * @param string $name
- * @return AbstractFeed
+ * @param string $name
+ * @return $this
*/
public function remove($name)
{
@@ -859,7 +876,7 @@ public function __call($method, $args)
}
/**
- * Load extensions from Zend\Feed\Writer\Writer
+ * Load extensions from Laminas\Feed\Writer\Writer
*
* @throws Exception\RuntimeException
* @return void
diff --git a/vendor/zendframework/zend-feed/src/Writer/Deleted.php b/vendor/laminas/laminas-feed/src/Writer/Deleted.php
similarity index 74%
rename from vendor/zendframework/zend-feed/src/Writer/Deleted.php
rename to vendor/laminas/laminas-feed/src/Writer/Deleted.php
index 118355f479..d0271e68ee 100644
--- a/vendor/zendframework/zend-feed/src/Writer/Deleted.php
+++ b/vendor/laminas/laminas-feed/src/Writer/Deleted.php
@@ -1,20 +1,17 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Writer;
+namespace Laminas\Feed\Writer;
use DateTime;
use DateTimeInterface;
-use Zend\Feed\Uri;
+use Laminas\Feed\Uri;
-/**
-*/
class Deleted
{
/**
@@ -30,15 +27,15 @@ class Deleted
*
* @var string
*/
- protected $type = null;
+ protected $type;
/**
* Set the feed character encoding
*
- * @param $encoding
- * @throws Exception\InvalidArgumentException
- * @return string|null
+ * @param string $encoding
+ * @return null|string
* @return Deleted
+ * @throws Exception\InvalidArgumentException
*/
public function setEncoding($encoding)
{
@@ -53,7 +50,7 @@ public function setEncoding($encoding)
/**
* Get the feed character encoding
*
- * @return string|null
+ * @return null|string
*/
public function getEncoding()
{
@@ -66,8 +63,8 @@ public function getEncoding()
/**
* Unset a specific data point
*
- * @param string $name
- * @return Deleted
+ * @param string $name
+ * @return $this
*/
public function remove($name)
{
@@ -83,8 +80,8 @@ public function remove($name)
* other objects to gracefully choose whether to execute or not, depending
* on their appropriateness for the current type, e.g. renderers.
*
- * @param string $type
- * @return Deleted
+ * @param string $type
+ * @return $this
*/
public function setType($type)
{
@@ -105,9 +102,9 @@ public function getType()
/**
* Set reference
*
- * @param $reference
+ * @param string $reference
+ * @return $this
* @throws Exception\InvalidArgumentException
- * @return Deleted
*/
public function setReference($reference)
{
@@ -133,9 +130,9 @@ public function getReference()
/**
* Set when
*
- * @param null|int|DateTimeInterface $date
+ * @param null|int|DateTimeInterface $date
+ * @return $this
* @throws Exception\InvalidArgumentException
- * @return Deleted
*/
public function setWhen($date = null)
{
@@ -146,8 +143,9 @@ public function setWhen($date = null)
$date = new DateTime('@' . $date);
}
if (! $date instanceof DateTimeInterface) {
- throw new Exception\InvalidArgumentException('Invalid DateTime object or UNIX Timestamp'
- . ' passed as parameter');
+ throw new Exception\InvalidArgumentException(
+ 'Invalid DateTime object or UNIX Timestamp passed as parameter'
+ );
}
$this->data['when'] = $date;
@@ -168,9 +166,8 @@ public function getWhen()
/**
* Set by
*
- * @param array $by
+ * @return $this
* @throws Exception\InvalidArgumentException
- * @return Deleted
*/
public function setBy(array $by)
{
@@ -179,14 +176,16 @@ public function setBy(array $by)
|| empty($by['name'])
|| ! is_string($by['name'])
) {
- throw new Exception\InvalidArgumentException('Invalid parameter: author array must include a'
- . ' "name" key with a non-empty string value');
+ throw new Exception\InvalidArgumentException(
+ 'Invalid parameter: author array must include a "name" key with a non-empty string value'
+ );
}
$author['name'] = $by['name'];
if (isset($by['email'])) {
if (empty($by['email']) || ! is_string($by['email'])) {
- throw new Exception\InvalidArgumentException('Invalid parameter: "email" array'
- . ' value must be a non-empty string');
+ throw new Exception\InvalidArgumentException(
+ 'Invalid parameter: "email" array value must be a non-empty string'
+ );
}
$author['email'] = $by['email'];
}
@@ -195,8 +194,9 @@ public function setBy(array $by)
|| ! is_string($by['uri'])
|| ! Uri::factory($by['uri'])->isValid()
) {
- throw new Exception\InvalidArgumentException('Invalid parameter: "uri" array value must'
- . ' be a non-empty string and valid URI/IRI');
+ throw new Exception\InvalidArgumentException(
+ 'Invalid parameter: "uri" array value must be a non-empty string and valid URI/IRI'
+ );
}
$author['uri'] = $by['uri'];
}
@@ -206,19 +206,20 @@ public function setBy(array $by)
}
/**
- * @return string
+ * @return null|string
*/
public function getBy()
{
if (! array_key_exists('by', $this->data)) {
- return;
+ return null;
}
+
return $this->data['by'];
}
/**
- * @param string $comment
- * @return Deleted
+ * @param string $comment
+ * @return $this
*/
public function setComment($comment)
{
@@ -227,13 +228,14 @@ public function setComment($comment)
}
/**
- * @return string
+ * @return null|string
*/
public function getComment()
{
if (! array_key_exists('comment', $this->data)) {
- return;
+ return null;
}
+
return $this->data['comment'];
}
}
diff --git a/vendor/zendframework/zend-feed/src/Writer/Entry.php b/vendor/laminas/laminas-feed/src/Writer/Entry.php
similarity index 87%
rename from vendor/zendframework/zend-feed/src/Writer/Entry.php
rename to vendor/laminas/laminas-feed/src/Writer/Entry.php
index b8ec25c708..79c9593e51 100644
--- a/vendor/zendframework/zend-feed/src/Writer/Entry.php
+++ b/vendor/laminas/laminas-feed/src/Writer/Entry.php
@@ -1,20 +1,17 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Writer;
+namespace Laminas\Feed\Writer;
use DateTime;
use DateTimeInterface;
-use Zend\Feed\Uri;
+use Laminas\Feed\Uri;
-/**
-*/
class Entry
{
/**
@@ -37,12 +34,11 @@ class Entry
*
* @var string
*/
- protected $type = null;
+ protected $type;
/**
* Constructor: Primarily triggers the registration of core extensions and
* loads those appropriate to this data container.
- *
*/
public function __construct()
{
@@ -58,9 +54,8 @@ public function __construct()
* 'email' => (string) An optional email
* 'uri' => (string) An optional and valid URI
*
- * @param array $author
+ * @return $this
* @throws Exception\InvalidArgumentException If any value of $author not follow the format.
- * @return Entry
*/
public function addAuthor(array $author)
{
@@ -82,8 +77,8 @@ public function addAuthor(array $author)
}
}
if (isset($author['uri'])) {
- if (empty($author['uri']) || ! is_string($author['uri']) ||
- ! Uri::factory($author['uri'])->isValid()
+ if (empty($author['uri']) || ! is_string($author['uri'])
+ || ! Uri::factory($author['uri'])->isValid()
) {
throw new Exception\InvalidArgumentException(
'Invalid parameter: "uri" array value must be a non-empty string and valid URI/IRI'
@@ -100,8 +95,7 @@ public function addAuthor(array $author)
* Set an array with feed authors
*
* @see addAuthor
- * @param array $authors
- * @return Entry
+ * @return $this
*/
public function addAuthors(array $authors)
{
@@ -115,9 +109,9 @@ public function addAuthors(array $authors)
/**
* Set the feed character encoding
*
- * @param string $encoding
+ * @param string $encoding
+ * @return $this
* @throws Exception\InvalidArgumentException
- * @return Entry
*/
public function setEncoding($encoding)
{
@@ -132,7 +126,7 @@ public function setEncoding($encoding)
/**
* Get the feed character encoding
*
- * @return string|null
+ * @return null|string
*/
public function getEncoding()
{
@@ -145,9 +139,9 @@ public function getEncoding()
/**
* Set the copyright entry
*
- * @param string $copyright
+ * @param string $copyright
+ * @return $this
* @throws Exception\InvalidArgumentException
- * @return Entry
*/
public function setCopyright($copyright)
{
@@ -162,9 +156,9 @@ public function setCopyright($copyright)
/**
* Set the entry's content
*
- * @param string $content
+ * @param string $content
+ * @return $this
* @throws Exception\InvalidArgumentException
- * @return Entry
*/
public function setContent($content)
{
@@ -179,9 +173,9 @@ public function setContent($content)
/**
* Set the feed creation date
*
- * @param null|int|DateTimeInterface $date
+ * @param null|int|DateTimeInterface $date
+ * @return $this
* @throws Exception\InvalidArgumentException
- * @return Entry
*/
public function setDateCreated($date = null)
{
@@ -204,9 +198,9 @@ public function setDateCreated($date = null)
/**
* Set the feed modification date
*
- * @param null|int|DateTimeInterface $date
+ * @param null|int|DateTimeInterface $date
+ * @return $this
* @throws Exception\InvalidArgumentException
- * @return Entry
*/
public function setDateModified($date = null)
{
@@ -229,9 +223,9 @@ public function setDateModified($date = null)
/**
* Set the feed description
*
- * @param string $description
+ * @param string $description
+ * @return $this
* @throws Exception\InvalidArgumentException
- * @return Entry
*/
public function setDescription($description)
{
@@ -246,9 +240,9 @@ public function setDescription($description)
/**
* Set the feed ID
*
- * @param string $id
+ * @param string $id
+ * @return $this
* @throws Exception\InvalidArgumentException
- * @return Entry
*/
public function setId($id)
{
@@ -263,9 +257,9 @@ public function setId($id)
/**
* Set a link to the HTML source of this entry
*
- * @param string $link
+ * @param string $link
+ * @return $this
* @throws Exception\InvalidArgumentException
- * @return Entry
*/
public function setLink($link)
{
@@ -282,9 +276,9 @@ public function setLink($link)
/**
* Set the number of comments associated with this entry
*
- * @param int $count
+ * @param int $count
+ * @return $this
* @throws Exception\InvalidArgumentException
- * @return Entry
*/
public function setCommentCount($count)
{
@@ -301,9 +295,9 @@ public function setCommentCount($count)
/**
* Set a link to a HTML page containing comments associated with this entry
*
- * @param string $link
+ * @param string $link
+ * @return $this
* @throws Exception\InvalidArgumentException
- * @return Entry
*/
public function setCommentLink($link)
{
@@ -320,9 +314,8 @@ public function setCommentLink($link)
/**
* Set a link to an XML feed for any comments associated with this entry
*
- * @param array $link
+ * @return $this
* @throws Exception\InvalidArgumentException
- * @return Entry
*/
public function setCommentFeedLink(array $link)
{
@@ -332,8 +325,9 @@ public function setCommentFeedLink(array $link)
);
}
if (! isset($link['type']) || ! in_array($link['type'], ['atom', 'rss', 'rdf'])) {
- throw new Exception\InvalidArgumentException('Invalid parameter: "type" must be one'
- . ' of "atom", "rss" or "rdf"');
+ throw new Exception\InvalidArgumentException(
+ 'Invalid parameter: "type" must be one of "atom", "rss" or "rdf"'
+ );
}
if (! isset($this->data['commentFeedLinks'])) {
$this->data['commentFeedLinks'] = [];
@@ -348,8 +342,7 @@ public function setCommentFeedLink(array $link)
* Each link is an array with keys "uri" and "type", where type is one of:
* "atom", "rss" or "rdf".
*
- * @param array $links
- * @return Entry
+ * @return $this
*/
public function setCommentFeedLinks(array $links)
{
@@ -363,9 +356,9 @@ public function setCommentFeedLinks(array $links)
/**
* Set the feed title
*
- * @param string $title
+ * @param string $title
+ * @return $this
* @throws Exception\InvalidArgumentException
- * @return Entry
*/
public function setTitle($title)
{
@@ -471,7 +464,7 @@ public function getId()
/**
* Get a link to the HTML source
*
- * @return string|null
+ * @return null|string
*/
public function getLink()
{
@@ -551,24 +544,25 @@ public function getCommentFeedLinks()
/**
* Add an entry category
*
- * @param array $category
+ * @return $this
* @throws Exception\InvalidArgumentException
- * @return Entry
*/
public function addCategory(array $category)
{
if (! isset($category['term'])) {
- throw new Exception\InvalidArgumentException('Each category must be an array and '
- . 'contain at least a "term" element containing the machine '
- . ' readable category name');
+ throw new Exception\InvalidArgumentException(
+ 'Each category must be an array and contain at least a "term" element'
+ . ' containing the machine readable category name'
+ );
}
if (isset($category['scheme'])) {
if (empty($category['scheme'])
|| ! is_string($category['scheme'])
|| ! Uri::factory($category['scheme'])->isValid()
) {
- throw new Exception\InvalidArgumentException('The Atom scheme or RSS domain of'
- . ' a category must be a valid URI');
+ throw new Exception\InvalidArgumentException(
+ 'The Atom scheme or RSS domain of a category must be a valid URI'
+ );
}
}
if (! isset($this->data['categories'])) {
@@ -582,8 +576,7 @@ public function addCategory(array $category)
/**
* Set an array of entry categories
*
- * @param array $categories
- * @return Entry
+ * @return $this
*/
public function addCategories(array $categories)
{
@@ -597,7 +590,7 @@ public function addCategories(array $categories)
/**
* Get the entry categories
*
- * @return string|null
+ * @return null|string
*/
public function getCategories()
{
@@ -613,9 +606,8 @@ public function getCategories()
* others must also be provided or RSS rendering (where they are required)
* will throw an Exception.
*
- * @param array $enclosure
+ * @return $this
* @throws Exception\InvalidArgumentException
- * @return Entry
*/
public function setEnclosure(array $enclosure)
{
@@ -646,8 +638,8 @@ public function getEnclosure()
/**
* Unset a specific data point
*
- * @param string $name
- * @return Entry
+ * @param string $name
+ * @return $this
*/
public function remove($name)
{
@@ -671,7 +663,7 @@ public function getExtensions()
/**
* Return an Extension object with the matching name (postfixed with _Entry)
*
- * @param string $name
+ * @param string $name
* @return object
*/
public function getExtension($name)
@@ -687,8 +679,8 @@ public function getExtension($name)
* other objects to gracefully choose whether to execute or not, depending
* on their appropriateness for the current type, e.g. renderers.
*
- * @param string $type
- * @return Entry
+ * @param string $type
+ * @return $this
*/
public function setType($type)
{
@@ -722,12 +714,13 @@ public function __call($method, $args)
} catch (\BadMethodCallException $e) {
}
}
- throw new Exception\BadMethodCallException('Method: ' . $method
- . ' does not exist and could not be located on a registered Extension');
+ throw new Exception\BadMethodCallException(
+ 'Method: ' . $method . ' does not exist and could not be located on a registered Extension'
+ );
}
/**
- * Creates a new Zend\Feed\Writer\Source data container for use. This is NOT
+ * Creates a new Laminas\Feed\Writer\Source data container for use. This is NOT
* added to the current feed automatically, but is necessary to create a
* container with some initial values preset based on the current feed data.
*
@@ -735,7 +728,7 @@ public function __call($method, $args)
*/
public function createSource()
{
- $source = new Source;
+ $source = new Source();
if ($this->getEncoding()) {
$source->setEncoding($this->getEncoding());
}
@@ -744,11 +737,10 @@ public function createSource()
}
/**
- * Appends a Zend\Feed\Writer\Entry object representing a new entry/item
+ * Appends a Laminas\Feed\Writer\Entry object representing a new entry/item
* the feed data container's internal group of entries.
*
- * @param Source $source
- * @return Entry
+ * @return $this
*/
public function setSource(Source $source)
{
@@ -768,7 +760,7 @@ public function getSource()
}
/**
- * Load extensions from Zend\Feed\Writer\Writer
+ * Load extensions from Laminas\Feed\Writer\Writer
*
* @return void
*/
diff --git a/vendor/laminas/laminas-feed/src/Writer/Exception/BadMethodCallException.php b/vendor/laminas/laminas-feed/src/Writer/Exception/BadMethodCallException.php
new file mode 100644
index 0000000000..54fb261a51
--- /dev/null
+++ b/vendor/laminas/laminas-feed/src/Writer/Exception/BadMethodCallException.php
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Laminas\Feed\Writer\Exception;
+
+use Laminas\Feed\Exception;
+
+/**
+ * Feed exceptions
+ *
+ * Class to represent exceptions that occur during Feed operations.
+ */
+class BadMethodCallException extends Exception\BadMethodCallException implements ExceptionInterface
+{
+}
diff --git a/vendor/laminas/laminas-feed/src/Writer/Exception/ExceptionInterface.php b/vendor/laminas/laminas-feed/src/Writer/Exception/ExceptionInterface.php
new file mode 100644
index 0000000000..60c12305a3
--- /dev/null
+++ b/vendor/laminas/laminas-feed/src/Writer/Exception/ExceptionInterface.php
@@ -0,0 +1,18 @@
+<?php
+
+/**
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Laminas\Feed\Writer\Exception;
+
+/**
+ * Feed exceptions
+ *
+ * Interface to represent exceptions that occur during Feed operations.
+ */
+interface ExceptionInterface
+{
+}
diff --git a/vendor/laminas/laminas-feed/src/Writer/Exception/InvalidArgumentException.php b/vendor/laminas/laminas-feed/src/Writer/Exception/InvalidArgumentException.php
new file mode 100644
index 0000000000..bd19cf1b35
--- /dev/null
+++ b/vendor/laminas/laminas-feed/src/Writer/Exception/InvalidArgumentException.php
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Laminas\Feed\Writer\Exception;
+
+use Laminas\Feed\Exception;
+
+/**
+ * Feed exceptions
+ *
+ * Class to represent exceptions that occur during Feed operations.
+ */
+class InvalidArgumentException extends Exception\InvalidArgumentException implements ExceptionInterface
+{
+}
diff --git a/vendor/laminas/laminas-feed/src/Writer/Exception/RuntimeException.php b/vendor/laminas/laminas-feed/src/Writer/Exception/RuntimeException.php
new file mode 100644
index 0000000000..85fc7e97fa
--- /dev/null
+++ b/vendor/laminas/laminas-feed/src/Writer/Exception/RuntimeException.php
@@ -0,0 +1,15 @@
+<?php
+
+/**
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Laminas\Feed\Writer\Exception;
+
+use Laminas\Feed\Exception;
+
+class RuntimeException extends Exception\RuntimeException implements ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zend-feed/src/Writer/Extension/AbstractRenderer.php b/vendor/laminas/laminas-feed/src/Writer/Extension/AbstractRenderer.php
similarity index 74%
rename from vendor/zendframework/zend-feed/src/Writer/Extension/AbstractRenderer.php
rename to vendor/laminas/laminas-feed/src/Writer/Extension/AbstractRenderer.php
index 856e714104..4fea93462a 100644
--- a/vendor/zendframework/zend-feed/src/Writer/Extension/AbstractRenderer.php
+++ b/vendor/laminas/laminas-feed/src/Writer/Extension/AbstractRenderer.php
@@ -1,50 +1,47 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Writer\Extension;
+namespace Laminas\Feed\Writer\Extension;
use DOMDocument;
use DOMElement;
-/**
-*/
abstract class AbstractRenderer implements RendererInterface
{
/**
* @var DOMDocument
*/
- protected $dom = null;
+ protected $dom;
/**
* @var mixed
*/
- protected $entry = null;
+ protected $entry;
/**
* @var DOMElement
*/
- protected $base = null;
+ protected $base;
/**
* @var mixed
*/
- protected $container = null;
+ protected $container;
/**
* @var string
*/
- protected $type = null;
+ protected $type;
/**
* @var DOMElement
*/
- protected $rootElement = null;
+ protected $rootElement;
/**
* Encoding of all text values
@@ -57,7 +54,7 @@ abstract class AbstractRenderer implements RendererInterface
* Set the data container
*
* @param mixed $container
- * @return AbstractRenderer
+ * @return $this
*/
public function setDataContainer($container)
{
@@ -69,7 +66,7 @@ public function setDataContainer($container)
* Set feed encoding
*
* @param string $enc
- * @return AbstractRenderer
+ * @return $this
*/
public function setEncoding($enc)
{
@@ -90,9 +87,7 @@ public function getEncoding()
/**
* Set DOMDocument and DOMElement on which to operate
*
- * @param DOMDocument $dom
- * @param DOMElement $base
- * @return AbstractRenderer
+ * @return $this
*/
public function setDomDocument(DOMDocument $dom, DOMElement $base)
{
@@ -115,7 +110,7 @@ public function getDataContainer()
* Set feed type
*
* @param string $type
- * @return AbstractRenderer
+ * @return $this
*/
public function setType($type)
{
@@ -136,8 +131,7 @@ public function getType()
/**
* Set root element of document
*
- * @param DOMElement $root
- * @return AbstractRenderer
+ * @return $this
*/
public function setRootElement(DOMElement $root)
{
diff --git a/vendor/zendframework/zend-feed/src/Writer/Extension/Atom/Renderer/Feed.php b/vendor/laminas/laminas-feed/src/Writer/Extension/Atom/Renderer/Feed.php
similarity index 86%
rename from vendor/zendframework/zend-feed/src/Writer/Extension/Atom/Renderer/Feed.php
rename to vendor/laminas/laminas-feed/src/Writer/Extension/Atom/Renderer/Feed.php
index e066ab8a09..d4d96cd7d9 100644
--- a/vendor/zendframework/zend-feed/src/Writer/Extension/Atom/Renderer/Feed.php
+++ b/vendor/laminas/laminas-feed/src/Writer/Extension/Atom/Renderer/Feed.php
@@ -1,20 +1,17 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Writer\Extension\Atom\Renderer;
+namespace Laminas\Feed\Writer\Extension\Atom\Renderer;
use DOMDocument;
use DOMElement;
-use Zend\Feed\Writer\Extension;
+use Laminas\Feed\Writer\Extension;
-/**
-*/
class Feed extends Extension\AbstractRenderer
{
/**
@@ -37,7 +34,7 @@ public function render()
* RSS 2.0 only. Used mainly to include Atom links and
* Pubsubhubbub Hub endpoint URIs under the Atom namespace
*/
- if (strtolower($this->getType()) == 'atom') {
+ if (strtolower($this->getType()) === 'atom') {
return;
}
$this->_setFeedLinks($this->dom, $this->base);
diff --git a/vendor/zendframework/zend-feed/src/Writer/Extension/Content/Renderer/Entry.php b/vendor/laminas/laminas-feed/src/Writer/Extension/Content/Renderer/Entry.php
similarity index 78%
rename from vendor/zendframework/zend-feed/src/Writer/Extension/Content/Renderer/Entry.php
rename to vendor/laminas/laminas-feed/src/Writer/Extension/Content/Renderer/Entry.php
index c7f44d4fa2..0a4971bcd3 100644
--- a/vendor/zendframework/zend-feed/src/Writer/Extension/Content/Renderer/Entry.php
+++ b/vendor/laminas/laminas-feed/src/Writer/Extension/Content/Renderer/Entry.php
@@ -1,20 +1,17 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Writer\Extension\Content\Renderer;
+namespace Laminas\Feed\Writer\Extension\Content\Renderer;
use DOMDocument;
use DOMElement;
-use Zend\Feed\Writer\Extension;
+use Laminas\Feed\Writer\Extension;
-/**
-*/
class Entry extends Extension\AbstractRenderer
{
/**
@@ -33,7 +30,7 @@ class Entry extends Extension\AbstractRenderer
*/
public function render()
{
- if (strtolower($this->getType()) == 'atom') {
+ if (strtolower($this->getType()) === 'atom') {
return;
}
$this->_setContent($this->dom, $this->base);
diff --git a/vendor/zendframework/zend-feed/src/Writer/Extension/DublinCore/Renderer/Entry.php b/vendor/laminas/laminas-feed/src/Writer/Extension/DublinCore/Renderer/Entry.php
similarity index 79%
rename from vendor/zendframework/zend-feed/src/Writer/Extension/DublinCore/Renderer/Entry.php
rename to vendor/laminas/laminas-feed/src/Writer/Extension/DublinCore/Renderer/Entry.php
index 598f228c87..c0d9f28e09 100644
--- a/vendor/zendframework/zend-feed/src/Writer/Extension/DublinCore/Renderer/Entry.php
+++ b/vendor/laminas/laminas-feed/src/Writer/Extension/DublinCore/Renderer/Entry.php
@@ -1,20 +1,17 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Writer\Extension\DublinCore\Renderer;
+namespace Laminas\Feed\Writer\Extension\DublinCore\Renderer;
use DOMDocument;
use DOMElement;
-use Zend\Feed\Writer\Extension;
+use Laminas\Feed\Writer\Extension;
-/**
-*/
class Entry extends Extension\AbstractRenderer
{
/**
@@ -33,7 +30,7 @@ class Entry extends Extension\AbstractRenderer
*/
public function render()
{
- if (strtolower($this->getType()) == 'atom') {
+ if (strtolower($this->getType()) === 'atom') {
return;
}
$this->_setAuthors($this->dom, $this->base);
diff --git a/vendor/zendframework/zend-feed/src/Writer/Extension/DublinCore/Renderer/Feed.php b/vendor/laminas/laminas-feed/src/Writer/Extension/DublinCore/Renderer/Feed.php
similarity index 79%
rename from vendor/zendframework/zend-feed/src/Writer/Extension/DublinCore/Renderer/Feed.php
rename to vendor/laminas/laminas-feed/src/Writer/Extension/DublinCore/Renderer/Feed.php
index e69f950560..0ca2795251 100644
--- a/vendor/zendframework/zend-feed/src/Writer/Extension/DublinCore/Renderer/Feed.php
+++ b/vendor/laminas/laminas-feed/src/Writer/Extension/DublinCore/Renderer/Feed.php
@@ -1,20 +1,17 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Writer\Extension\DublinCore\Renderer;
+namespace Laminas\Feed\Writer\Extension\DublinCore\Renderer;
use DOMDocument;
use DOMElement;
-use Zend\Feed\Writer\Extension;
+use Laminas\Feed\Writer\Extension;
-/**
-*/
class Feed extends Extension\AbstractRenderer
{
/**
@@ -33,7 +30,7 @@ class Feed extends Extension\AbstractRenderer
*/
public function render()
{
- if (strtolower($this->getType()) == 'atom') {
+ if (strtolower($this->getType()) === 'atom') {
return;
}
$this->_setAuthors($this->dom, $this->base);
diff --git a/vendor/zendframework/zend-feed/src/Writer/Extension/GooglePlayPodcast/Entry.php b/vendor/laminas/laminas-feed/src/Writer/Extension/GooglePlayPodcast/Entry.php
similarity index 86%
rename from vendor/zendframework/zend-feed/src/Writer/Extension/GooglePlayPodcast/Entry.php
rename to vendor/laminas/laminas-feed/src/Writer/Extension/GooglePlayPodcast/Entry.php
index f5b6a3af06..20583600ec 100644
--- a/vendor/zendframework/zend-feed/src/Writer/Extension/GooglePlayPodcast/Entry.php
+++ b/vendor/laminas/laminas-feed/src/Writer/Extension/GooglePlayPodcast/Entry.php
@@ -1,15 +1,16 @@
<?php
+
/**
- * @see https://github.com/zendframework/zend-feed for the canonical source repository
- * @copyright Copyright (c) 2018 Zend Technologies USA Inc. (https://www.zend.com)
- * @license https://github.com/zendframework/zend-feed/blob/master/LICENSE.md New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Writer\Extension\GooglePlayPodcast;
+namespace Laminas\Feed\Writer\Extension\GooglePlayPodcast;
-use Zend\Feed\Writer;
-use Zend\Stdlib\StringUtils;
-use Zend\Stdlib\StringWrapper\StringWrapperInterface;
+use Laminas\Feed\Writer;
+use Laminas\Stdlib\StringUtils;
+use Laminas\Stdlib\StringWrapper\StringWrapperInterface;
class Entry
{
@@ -43,7 +44,7 @@ public function __construct()
* Set feed encoding
*
* @param string $enc
- * @return Entry
+ * @return $this
*/
public function setEncoding($enc)
{
@@ -88,7 +89,7 @@ public function setPlayPodcastBlock($value)
* Set "explicit" flag
*
* @param bool $value
- * @return Entry
+ * @return $this
* @throws Writer\Exception\InvalidArgumentException
*/
public function setPlayPodcastExplicit($value)
@@ -106,7 +107,7 @@ public function setPlayPodcastExplicit($value)
* Set episode description
*
* @param string $value
- * @return Entry
+ * @return $this
* @throws Writer\Exception\InvalidArgumentException
*/
public function setPlayPodcastDescription($value)
@@ -124,9 +125,8 @@ public function setPlayPodcastDescription($value)
* Overloading to itunes specific setters
*
* @param string $method
- * @param array $params
- * @throws Writer\Exception\BadMethodCallException
* @return mixed
+ * @throws Writer\Exception\BadMethodCallException
*/
public function __call($method, array $params)
{
diff --git a/vendor/zendframework/zend-feed/src/Writer/Extension/GooglePlayPodcast/Feed.php b/vendor/laminas/laminas-feed/src/Writer/Extension/GooglePlayPodcast/Feed.php
similarity index 89%
rename from vendor/zendframework/zend-feed/src/Writer/Extension/GooglePlayPodcast/Feed.php
rename to vendor/laminas/laminas-feed/src/Writer/Extension/GooglePlayPodcast/Feed.php
index af9ef69086..33f5bf6df8 100644
--- a/vendor/zendframework/zend-feed/src/Writer/Extension/GooglePlayPodcast/Feed.php
+++ b/vendor/laminas/laminas-feed/src/Writer/Extension/GooglePlayPodcast/Feed.php
@@ -1,16 +1,17 @@
<?php
+
/**
- * @see https://github.com/zendframework/zend-zend-feed for the canonical source repository
- * @copyright Copyright (c) 2018 Zend Technologies USA Inc. (https://www.zend.com)
- * @license https://github.com/zendframework/zend-zend-feed/blob/master/LICENSE.md New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Writer\Extension\GooglePlayPodcast;
+namespace Laminas\Feed\Writer\Extension\GooglePlayPodcast;
-use Zend\Feed\Uri;
-use Zend\Feed\Writer;
-use Zend\Stdlib\StringUtils;
-use Zend\Stdlib\StringWrapper\StringWrapperInterface;
+use Laminas\Feed\Uri;
+use Laminas\Feed\Writer;
+use Laminas\Stdlib\StringUtils;
+use Laminas\Stdlib\StringWrapper\StringWrapperInterface;
class Feed
{
@@ -35,9 +36,6 @@ class Feed
*/
protected $stringWrapper;
- /**
- * Constructor
- */
public function __construct()
{
$this->stringWrapper = StringUtils::getWrapper($this->encoding);
@@ -47,7 +45,7 @@ public function __construct()
* Set feed encoding
*
* @param string $enc
- * @return Feed
+ * @return $this
*/
public function setEncoding($enc)
{
@@ -70,7 +68,7 @@ public function getEncoding()
* Set a block value of "yes" or "no". You may also set an empty string.
*
* @param string
- * @return Feed
+ * @return $this
* @throws Writer\Exception\InvalidArgumentException
*/
public function setPlayPodcastBlock($value)
@@ -92,8 +90,7 @@ public function setPlayPodcastBlock($value)
/**
* Add feed authors
*
- * @param array $values
- * @return Feed
+ * @return $this
*/
public function addPlayPodcastAuthors(array $values)
{
@@ -107,7 +104,7 @@ public function addPlayPodcastAuthors(array $values)
* Add feed author
*
* @param string $value
- * @return Feed
+ * @return $this
* @throws Writer\Exception\InvalidArgumentException
*/
public function addPlayPodcastAuthor($value)
@@ -127,8 +124,7 @@ public function addPlayPodcastAuthor($value)
/**
* Set feed categories
*
- * @param array $values
- * @return Feed
+ * @return $this
* @throws Writer\Exception\InvalidArgumentException
*/
public function setPlayPodcastCategories(array $values)
@@ -168,7 +164,7 @@ public function setPlayPodcastCategories(array $values)
* Set feed image (icon)
*
* @param string $value
- * @return Feed
+ * @return $this
* @throws Writer\Exception\InvalidArgumentException
*/
public function setPlayPodcastImage($value)
@@ -186,7 +182,7 @@ public function setPlayPodcastImage($value)
* Set "explicit" flag
*
* @param bool $value
- * @return Feed
+ * @return $this
* @throws Writer\Exception\InvalidArgumentException
*/
public function setPlayPodcastExplicit($value)
@@ -204,7 +200,7 @@ public function setPlayPodcastExplicit($value)
* Set podcast description
*
* @param string $value
- * @return Feed
+ * @return $this
* @throws Writer\Exception\InvalidArgumentException
*/
public function setPlayPodcastDescription($value)
@@ -222,7 +218,6 @@ public function setPlayPodcastDescription($value)
* Overloading: proxy to internal setters
*
* @param string $method
- * @param array $params
* @return mixed
* @throws Writer\Exception\BadMethodCallException
*/
diff --git a/vendor/zendframework/zend-feed/src/Writer/Extension/GooglePlayPodcast/Renderer/Entry.php b/vendor/laminas/laminas-feed/src/Writer/Extension/GooglePlayPodcast/Renderer/Entry.php
similarity index 83%
rename from vendor/zendframework/zend-feed/src/Writer/Extension/GooglePlayPodcast/Renderer/Entry.php
rename to vendor/laminas/laminas-feed/src/Writer/Extension/GooglePlayPodcast/Renderer/Entry.php
index b828402dbb..6078d6adec 100644
--- a/vendor/zendframework/zend-feed/src/Writer/Extension/GooglePlayPodcast/Renderer/Entry.php
+++ b/vendor/laminas/laminas-feed/src/Writer/Extension/GooglePlayPodcast/Renderer/Entry.php
@@ -1,15 +1,16 @@
<?php
+
/**
- * @see https://github.com/zendframework/zend-feed for the canonical source repository
- * @copyright Copyright (c) 2018 Zend Technologies USA Inc. (https://www.zend.com)
- * @license https://github.com/zendframework/zend-feed/blob/master/LICENSE.md New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Writer\Extension\GooglePlayPodcast\Renderer;
+namespace Laminas\Feed\Writer\Extension\GooglePlayPodcast\Renderer;
use DOMDocument;
use DOMElement;
-use Zend\Feed\Writer\Extension;
+use Laminas\Feed\Writer\Extension;
class Entry extends Extension\AbstractRenderer
{
@@ -67,7 +68,7 @@ protected function _setBlock(DOMDocument $dom, DOMElement $root)
if ($block === null) {
return;
}
- $el = $dom->createElement('googleplay:block');
+ $el = $dom->createElement('googleplay:block');
$text = $dom->createTextNode($block);
$el->appendChild($text);
$root->appendChild($el);
@@ -89,7 +90,7 @@ protected function _setExplicit(DOMDocument $dom, DOMElement $root)
if ($explicit === null) {
return;
}
- $el = $dom->createElement('googleplay:explicit');
+ $el = $dom->createElement('googleplay:explicit');
$text = $dom->createTextNode($explicit);
$el->appendChild($text);
$root->appendChild($el);
@@ -111,7 +112,7 @@ protected function _setDescription(DOMDocument $dom, DOMElement $root)
if (! $description) {
return;
}
- $el = $dom->createElement('googleplay:description');
+ $el = $dom->createElement('googleplay:description');
$text = $dom->createTextNode($description);
$el->appendChild($text);
$root->appendChild($el);
diff --git a/vendor/zendframework/zend-feed/src/Writer/Extension/GooglePlayPodcast/Renderer/Feed.php b/vendor/laminas/laminas-feed/src/Writer/Extension/GooglePlayPodcast/Renderer/Feed.php
similarity index 89%
rename from vendor/zendframework/zend-feed/src/Writer/Extension/GooglePlayPodcast/Renderer/Feed.php
rename to vendor/laminas/laminas-feed/src/Writer/Extension/GooglePlayPodcast/Renderer/Feed.php
index 167d9fbefc..3c116083ef 100644
--- a/vendor/zendframework/zend-feed/src/Writer/Extension/GooglePlayPodcast/Renderer/Feed.php
+++ b/vendor/laminas/laminas-feed/src/Writer/Extension/GooglePlayPodcast/Renderer/Feed.php
@@ -1,15 +1,16 @@
<?php
+
/**
- * @see https://github.com/zendframework/zend-feed for the canonical source repository
- * @copyright Copyright (c) 2018 Zend Technologies USA Inc. (https://www.zend.com)
- * @license https://github.com/zendframework/zend-feed/blob/master/LICENSE.md New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Writer\Extension\GooglePlayPodcast\Renderer;
+namespace Laminas\Feed\Writer\Extension\GooglePlayPodcast\Renderer;
use DOMDocument;
use DOMElement;
-use Zend\Feed\Writer\Extension;
+use Laminas\Feed\Writer\Extension;
class Feed extends Extension\AbstractRenderer
{
@@ -71,7 +72,7 @@ protected function _setAuthors(DOMDocument $dom, DOMElement $root)
return;
}
foreach ($authors as $author) {
- $el = $dom->createElement('googleplay:author');
+ $el = $dom->createElement('googleplay:author');
$text = $dom->createTextNode($author);
$el->appendChild($text);
$root->appendChild($el);
@@ -94,7 +95,7 @@ protected function _setBlock(DOMDocument $dom, DOMElement $root)
if ($block === null) {
return;
}
- $el = $dom->createElement('googleplay:block');
+ $el = $dom->createElement('googleplay:block');
$text = $dom->createTextNode($block);
$el->appendChild($text);
$root->appendChild($el);
@@ -171,7 +172,7 @@ protected function _setExplicit(DOMDocument $dom, DOMElement $root)
if ($explicit === null) {
return;
}
- $el = $dom->createElement('googleplay:explicit');
+ $el = $dom->createElement('googleplay:explicit');
$text = $dom->createTextNode($explicit);
$el->appendChild($text);
$root->appendChild($el);
@@ -193,7 +194,7 @@ protected function _setDescription(DOMDocument $dom, DOMElement $root)
if (! $description) {
return;
}
- $el = $dom->createElement('googleplay:description');
+ $el = $dom->createElement('googleplay:description');
$text = $dom->createTextNode($description);
$el->appendChild($text);
$root->appendChild($el);
diff --git a/vendor/zendframework/zend-feed/src/Writer/Extension/ITunes/Entry.php b/vendor/laminas/laminas-feed/src/Writer/Extension/ITunes/Entry.php
similarity index 80%
rename from vendor/zendframework/zend-feed/src/Writer/Extension/ITunes/Entry.php
rename to vendor/laminas/laminas-feed/src/Writer/Extension/ITunes/Entry.php
index eb219b54cb..30f65c6c22 100644
--- a/vendor/zendframework/zend-feed/src/Writer/Extension/ITunes/Entry.php
+++ b/vendor/laminas/laminas-feed/src/Writer/Extension/ITunes/Entry.php
@@ -1,21 +1,18 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Writer\Extension\ITunes;
+namespace Laminas\Feed\Writer\Extension\ITunes;
-use Zend\Feed\Uri;
-use Zend\Feed\Writer;
-use Zend\Stdlib\StringUtils;
-use Zend\Stdlib\StringWrapper\StringWrapperInterface;
+use Laminas\Feed\Uri;
+use Laminas\Feed\Writer;
+use Laminas\Stdlib\StringUtils;
+use Laminas\Stdlib\StringWrapper\StringWrapperInterface;
-/**
-*/
class Entry
{
/**
@@ -48,7 +45,7 @@ public function __construct()
* Set feed encoding
*
* @param string $enc
- * @return Entry
+ * @return $this
*/
public function setEncoding($enc)
{
@@ -76,13 +73,15 @@ public function getEncoding()
public function setItunesBlock($value)
{
if (! ctype_alpha($value) && strlen($value) > 0) {
- throw new Writer\Exception\InvalidArgumentException('invalid parameter: "block" may only'
- . ' contain alphabetic characters');
+ throw new Writer\Exception\InvalidArgumentException(
+ 'invalid parameter: "block" may only contain alphabetic characters'
+ );
}
if ($this->stringWrapper->strlen($value) > 255) {
- throw new Writer\Exception\InvalidArgumentException('invalid parameter: "block" may only'
- . ' contain a maximum of 255 characters');
+ throw new Writer\Exception\InvalidArgumentException(
+ 'invalid parameter: "block" may only contain a maximum of 255 characters'
+ );
}
$this->data['block'] = $value;
}
@@ -90,8 +89,7 @@ public function setItunesBlock($value)
/**
* Add authors to itunes entry
*
- * @param array $values
- * @return Entry
+ * @return $this
*/
public function addItunesAuthors(array $values)
{
@@ -105,14 +103,15 @@ public function addItunesAuthors(array $values)
* Add author to itunes entry
*
* @param string $value
- * @return Entry
+ * @return $this
* @throws Writer\Exception\InvalidArgumentException
*/
public function addItunesAuthor($value)
{
if ($this->stringWrapper->strlen($value) > 255) {
- throw new Writer\Exception\InvalidArgumentException('invalid parameter: any "author" may only'
- . ' contain a maximum of 255 characters each');
+ throw new Writer\Exception\InvalidArgumentException(
+ 'invalid parameter: any "author" may only contain a maximum of 255 characters each'
+ );
}
if (! isset($this->data['authors'])) {
$this->data['authors'] = [];
@@ -125,18 +124,19 @@ public function addItunesAuthor($value)
* Set duration
*
* @param int $value
- * @return Entry
+ * @return $this
* @throws Writer\Exception\InvalidArgumentException
*/
public function setItunesDuration($value)
{
$value = (string) $value;
if (! ctype_digit($value)
- && ! preg_match("/^\d+:[0-5]{1}[0-9]{1}$/", $value)
- && ! preg_match("/^\d+:[0-5]{1}[0-9]{1}:[0-5]{1}[0-9]{1}$/", $value)
+ && ! preg_match('/^\d+:[0-5]{1}[0-9]{1}$/', $value)
+ && ! preg_match('/^\d+:[0-5]{1}[0-9]{1}:[0-5]{1}[0-9]{1}$/', $value)
) {
- throw new Writer\Exception\InvalidArgumentException('invalid parameter: "duration" may only'
- . ' be of a specified [[HH:]MM:]SS format');
+ throw new Writer\Exception\InvalidArgumentException(
+ 'invalid parameter: "duration" may only be of a specified [[HH:]MM:]SS format'
+ );
}
$this->data['duration'] = $value;
return $this;
@@ -146,14 +146,15 @@ public function setItunesDuration($value)
* Set "explicit" flag
*
* @param bool $value
- * @return Entry
+ * @return $this
* @throws Writer\Exception\InvalidArgumentException
*/
public function setItunesExplicit($value)
{
if (! in_array($value, ['yes', 'no', 'clean'])) {
- throw new Writer\Exception\InvalidArgumentException('invalid parameter: "explicit" may only'
- . ' be one of "yes", "no" or "clean"');
+ throw new Writer\Exception\InvalidArgumentException(
+ 'invalid parameter: "explicit" may only be one of "yes", "no" or "clean"'
+ );
}
$this->data['explicit'] = $value;
return $this;
@@ -164,8 +165,7 @@ public function setItunesExplicit($value)
*
* @deprecated since 2.10.0; itunes:keywords is no longer part of the
* iTunes podcast RSS specification.
- * @param array $value
- * @return Entry
+ * @return $this
* @throws Writer\Exception\InvalidArgumentException
*/
public function setItunesKeywords(array $value)
@@ -177,15 +177,17 @@ public function setItunesKeywords(array $value)
);
if (count($value) > 12) {
- throw new Writer\Exception\InvalidArgumentException('invalid parameter: "keywords" may only'
- . ' contain a maximum of 12 terms');
+ throw new Writer\Exception\InvalidArgumentException(
+ 'invalid parameter: "keywords" may only contain a maximum of 12 terms'
+ );
}
$concat = implode(',', $value);
if ($this->stringWrapper->strlen($concat) > 255) {
- throw new Writer\Exception\InvalidArgumentException('invalid parameter: "keywords" may only'
- . ' have a concatenated length of 255 chars where terms are delimited'
- . ' by a comma');
+ throw new Writer\Exception\InvalidArgumentException(
+ 'invalid parameter: "keywords" may only have a concatenated length'
+ . ' of 255 chars where terms are delimited by a comma'
+ );
}
$this->data['keywords'] = $value;
return $this;
@@ -195,14 +197,15 @@ public function setItunesKeywords(array $value)
* Set title
*
* @param string $value
- * @return Entry
+ * @return $this
* @throws Writer\Exception\InvalidArgumentException
*/
public function setItunesTitle($value)
{
if ($this->stringWrapper->strlen($value) > 255) {
- throw new Writer\Exception\InvalidArgumentException('invalid parameter: "title" may only'
- . ' contain a maximum of 255 characters');
+ throw new Writer\Exception\InvalidArgumentException(
+ 'invalid parameter: "title" may only contain a maximum of 255 characters'
+ );
}
$this->data['title'] = $value;
return $this;
@@ -212,14 +215,15 @@ public function setItunesTitle($value)
* Set subtitle
*
* @param string $value
- * @return Entry
+ * @return $this
* @throws Writer\Exception\InvalidArgumentException
*/
public function setItunesSubtitle($value)
{
if ($this->stringWrapper->strlen($value) > 255) {
- throw new Writer\Exception\InvalidArgumentException('invalid parameter: "subtitle" may only'
- . ' contain a maximum of 255 characters');
+ throw new Writer\Exception\InvalidArgumentException(
+ 'invalid parameter: "subtitle" may only contain a maximum of 255 characters'
+ );
}
$this->data['subtitle'] = $value;
return $this;
@@ -229,14 +233,15 @@ public function setItunesSubtitle($value)
* Set summary
*
* @param string $value
- * @return Entry
+ * @return $this
* @throws Writer\Exception\InvalidArgumentException
*/
public function setItunesSummary($value)
{
if ($this->stringWrapper->strlen($value) > 4000) {
- throw new Writer\Exception\InvalidArgumentException('invalid parameter: "summary" may only'
- . ' contain a maximum of 4000 characters');
+ throw new Writer\Exception\InvalidArgumentException(
+ 'invalid parameter: "summary" may only contain a maximum of 4000 characters'
+ );
}
$this->data['summary'] = $value;
return $this;
@@ -246,7 +251,7 @@ public function setItunesSummary($value)
* Set entry image (icon)
*
* @param string $value
- * @return Entry
+ * @return $this
* @throws Writer\Exception\InvalidArgumentException
*/
public function setItunesImage($value)
@@ -272,8 +277,8 @@ public function setItunesImage($value)
/**
* Set the episode number
*
- * @param int $number
- * @return self
+ * @param int $number
+ * @return $this
* @throws Writer\Exception\InvalidArgumentException
*/
public function setItunesEpisode($number)
@@ -293,8 +298,8 @@ public function setItunesEpisode($number)
/**
* Set the episode type
*
- * @param string $type One of "full", "trailer", or "bonus".
- * @return self
+ * @param string $type One of "full", "trailer", or "bonus".
+ * @return $this
* @throws Writer\Exception\InvalidArgumentException
*/
public function setItunesEpisodeType($type)
@@ -316,8 +321,8 @@ public function setItunesEpisodeType($type)
/**
* Set the status of closed captioning
*
- * @param bool $status
- * @return self
+ * @param bool $status
+ * @return $this
* @throws Writer\Exception\InvalidArgumentException
*/
public function setItunesIsClosedCaptioned($status)
@@ -341,8 +346,8 @@ public function setItunesIsClosedCaptioned($status)
/**
* Set the season number to which the episode belongs
*
- * @param int $number
- * @return self
+ * @param int $number
+ * @return $this
* @throws Writer\Exception\InvalidArgumentException
*/
public function setItunesSeason($number)
@@ -363,9 +368,8 @@ public function setItunesSeason($number)
* Overloading to itunes specific setters
*
* @param string $method
- * @param array $params
- * @throws Writer\Exception\BadMethodCallException
* @return mixed
+ * @throws Writer\Exception\BadMethodCallException
*/
public function __call($method, array $params)
{
diff --git a/vendor/zendframework/zend-feed/src/Writer/Extension/ITunes/Feed.php b/vendor/laminas/laminas-feed/src/Writer/Extension/ITunes/Feed.php
similarity index 75%
rename from vendor/zendframework/zend-feed/src/Writer/Extension/ITunes/Feed.php
rename to vendor/laminas/laminas-feed/src/Writer/Extension/ITunes/Feed.php
index 3aa30995b0..22650113f7 100644
--- a/vendor/zendframework/zend-feed/src/Writer/Extension/ITunes/Feed.php
+++ b/vendor/laminas/laminas-feed/src/Writer/Extension/ITunes/Feed.php
@@ -1,18 +1,17 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Writer\Extension\ITunes;
+namespace Laminas\Feed\Writer\Extension\ITunes;
-use Zend\Feed\Uri;
-use Zend\Feed\Writer;
-use Zend\Stdlib\StringUtils;
-use Zend\Stdlib\StringWrapper\StringWrapperInterface;
+use Laminas\Feed\Uri;
+use Laminas\Feed\Writer;
+use Laminas\Stdlib\StringUtils;
+use Laminas\Stdlib\StringWrapper\StringWrapperInterface;
class Feed
{
@@ -37,9 +36,6 @@ class Feed
*/
protected $stringWrapper;
- /**
- * Constructor
- */
public function __construct()
{
$this->stringWrapper = StringUtils::getWrapper($this->encoding);
@@ -49,7 +45,7 @@ public function __construct()
* Set feed encoding
*
* @param string $enc
- * @return Feed
+ * @return $this
*/
public function setEncoding($enc)
{
@@ -72,18 +68,20 @@ public function getEncoding()
* Set a block value of "yes" or "no". You may also set an empty string.
*
* @param string
- * @return Feed
+ * @return $this
* @throws Writer\Exception\InvalidArgumentException
*/
public function setItunesBlock($value)
{
if (! ctype_alpha($value) && strlen($value) > 0) {
- throw new Writer\Exception\InvalidArgumentException('invalid parameter: "block" may only'
- . ' contain alphabetic characters');
+ throw new Writer\Exception\InvalidArgumentException(
+ 'invalid parameter: "block" may only contain alphabetic characters'
+ );
}
if ($this->stringWrapper->strlen($value) > 255) {
- throw new Writer\Exception\InvalidArgumentException('invalid parameter: "block" may only'
- . ' contain a maximum of 255 characters');
+ throw new Writer\Exception\InvalidArgumentException(
+ 'invalid parameter: "block" may only contain a maximum of 255 characters'
+ );
}
$this->data['block'] = $value;
return $this;
@@ -92,8 +90,7 @@ public function setItunesBlock($value)
/**
* Add feed authors
*
- * @param array $values
- * @return Feed
+ * @return $this
*/
public function addItunesAuthors(array $values)
{
@@ -107,14 +104,15 @@ public function addItunesAuthors(array $values)
* Add feed author
*
* @param string $value
- * @return Feed
+ * @return $this
* @throws Writer\Exception\InvalidArgumentException
*/
public function addItunesAuthor($value)
{
if ($this->stringWrapper->strlen($value) > 255) {
- throw new Writer\Exception\InvalidArgumentException('invalid parameter: any "author" may only'
- . ' contain a maximum of 255 characters each');
+ throw new Writer\Exception\InvalidArgumentException(
+ 'invalid parameter: any "author" may only contain a maximum of 255 characters each'
+ );
}
if (! isset($this->data['authors'])) {
$this->data['authors'] = [];
@@ -126,8 +124,7 @@ public function addItunesAuthor($value)
/**
* Set feed categories
*
- * @param array $values
- * @return Feed
+ * @return $this
* @throws Writer\Exception\InvalidArgumentException
*/
public function setItunesCategories(array $values)
@@ -138,20 +135,23 @@ public function setItunesCategories(array $values)
foreach ($values as $key => $value) {
if (! is_array($value)) {
if ($this->stringWrapper->strlen($value) > 255) {
- throw new Writer\Exception\InvalidArgumentException('invalid parameter: any "category" may only'
- . ' contain a maximum of 255 characters each');
+ throw new Writer\Exception\InvalidArgumentException(
+ 'invalid parameter: any "category" may only contain a maximum of 255 characters each'
+ );
}
$this->data['categories'][] = $value;
} else {
if ($this->stringWrapper->strlen($key) > 255) {
- throw new Writer\Exception\InvalidArgumentException('invalid parameter: any "category" may only'
- . ' contain a maximum of 255 characters each');
+ throw new Writer\Exception\InvalidArgumentException(
+ 'invalid parameter: any "category" may only contain a maximum of 255 characters each'
+ );
}
$this->data['categories'][$key] = [];
foreach ($value as $val) {
if ($this->stringWrapper->strlen($val) > 255) {
- throw new Writer\Exception\InvalidArgumentException('invalid parameter: any "category" may only'
- . ' contain a maximum of 255 characters each');
+ throw new Writer\Exception\InvalidArgumentException(
+ 'invalid parameter: any "category" may only contain a maximum of 255 characters each'
+ );
}
$this->data['categories'][$key][] = $val;
}
@@ -164,19 +164,22 @@ public function setItunesCategories(array $values)
* Set feed image (icon)
*
* @param string $value
- * @return Feed
+ * @return $this
* @throws Writer\Exception\InvalidArgumentException
*/
public function setItunesImage($value)
{
if (! is_string($value) || ! Uri::factory($value)->isValid()) {
- throw new Writer\Exception\InvalidArgumentException('invalid parameter: "image" may only'
- . ' be a valid URI/IRI');
+ throw new Writer\Exception\InvalidArgumentException(
+ 'invalid parameter: "image" may only be a valid URI/IRI'
+ );
}
if (! in_array(substr($value, -3), ['jpg', 'png'])) {
- throw new Writer\Exception\InvalidArgumentException('invalid parameter: "image" may only'
- . ' use file extension "jpg" or "png" which must be the last three'
- . ' characters of the URI (i.e. no query string or fragment)');
+ throw new Writer\Exception\InvalidArgumentException(
+ 'invalid parameter: "image" may only'
+ . ' use file extension "jpg" or "png" which must be the last three'
+ . ' characters of the URI (i.e. no query string or fragment)'
+ );
}
$this->data['image'] = $value;
return $this;
@@ -186,18 +189,19 @@ public function setItunesImage($value)
* Set feed cumulative duration
*
* @param string $value
- * @return Feed
+ * @return $this
* @throws Writer\Exception\InvalidArgumentException
*/
public function setItunesDuration($value)
{
$value = (string) $value;
if (! ctype_digit($value)
- && ! preg_match("/^\d+:[0-5]{1}[0-9]{1}$/", $value)
- && ! preg_match("/^\d+:[0-5]{1}[0-9]{1}:[0-5]{1}[0-9]{1}$/", $value)
+ && ! preg_match('/^\d+:[0-5]{1}[0-9]{1}$/', $value)
+ && ! preg_match('/^\d+:[0-5]{1}[0-9]{1}:[0-5]{1}[0-9]{1}$/', $value)
) {
- throw new Writer\Exception\InvalidArgumentException('invalid parameter: "duration" may only'
- . ' be of a specified [[HH:]MM:]SS format');
+ throw new Writer\Exception\InvalidArgumentException(
+ 'invalid parameter: "duration" may only be of a specified [[HH:]MM:]SS format'
+ );
}
$this->data['duration'] = $value;
return $this;
@@ -207,14 +211,15 @@ public function setItunesDuration($value)
* Set "explicit" flag
*
* @param bool $value
- * @return Feed
+ * @return $this
* @throws Writer\Exception\InvalidArgumentException
*/
public function setItunesExplicit($value)
{
if (! in_array($value, ['yes', 'no', 'clean'])) {
- throw new Writer\Exception\InvalidArgumentException('invalid parameter: "explicit" may only'
- . ' be one of "yes", "no" or "clean"');
+ throw new Writer\Exception\InvalidArgumentException(
+ 'invalid parameter: "explicit" may only be one of "yes", "no" or "clean"'
+ );
}
$this->data['explicit'] = $value;
return $this;
@@ -225,8 +230,7 @@ public function setItunesExplicit($value)
*
* @deprecated since 2.10.0; itunes:keywords is no longer part of the
* iTunes podcast RSS specification.
- * @param array $value
- * @return Feed
+ * @return $this
* @throws Writer\Exception\InvalidArgumentException
*/
public function setItunesKeywords(array $value)
@@ -238,14 +242,17 @@ public function setItunesKeywords(array $value)
);
if (count($value) > 12) {
- throw new Writer\Exception\InvalidArgumentException('invalid parameter: "keywords" may only'
- . ' contain a maximum of 12 terms');
+ throw new Writer\Exception\InvalidArgumentException(
+ 'invalid parameter: "keywords" may only contain a maximum of 12 terms'
+ );
}
$concat = implode(',', $value);
if ($this->stringWrapper->strlen($concat) > 255) {
- throw new Writer\Exception\InvalidArgumentException('invalid parameter: "keywords" may only'
- . ' have a concatenated length of 255 chars where terms are delimited'
- . ' by a comma');
+ throw new Writer\Exception\InvalidArgumentException(
+ 'invalid parameter: "keywords" may only'
+ . ' have a concatenated length of 255 chars where terms are delimited'
+ . ' by a comma'
+ );
}
$this->data['keywords'] = $value;
return $this;
@@ -255,14 +262,15 @@ public function setItunesKeywords(array $value)
* Set new feed URL
*
* @param string $value
- * @return Feed
+ * @return $this
* @throws Writer\Exception\InvalidArgumentException
*/
public function setItunesNewFeedUrl($value)
{
if (! Uri::factory($value)->isValid()) {
- throw new Writer\Exception\InvalidArgumentException('invalid parameter: "newFeedUrl" may only'
- . ' be a valid URI/IRI');
+ throw new Writer\Exception\InvalidArgumentException(
+ 'invalid parameter: "newFeedUrl" may only be a valid URI/IRI'
+ );
}
$this->data['newFeedUrl'] = $value;
return $this;
@@ -271,8 +279,7 @@ public function setItunesNewFeedUrl($value)
/**
* Add feed owners
*
- * @param array $values
- * @return Feed
+ * @return $this
*/
public function addItunesOwners(array $values)
{
@@ -285,21 +292,23 @@ public function addItunesOwners(array $values)
/**
* Add feed owner
*
- * @param array $value
- * @return Feed
+ * @return $this
* @throws Writer\Exception\InvalidArgumentException
*/
public function addItunesOwner(array $value)
{
if (! isset($value['name']) || ! isset($value['email'])) {
- throw new Writer\Exception\InvalidArgumentException('invalid parameter: any "owner" must'
- . ' be an array containing keys "name" and "email"');
+ throw new Writer\Exception\InvalidArgumentException(
+ 'invalid parameter: any "owner" must be an array containing keys "name" and "email"'
+ );
}
if ($this->stringWrapper->strlen($value['name']) > 255
|| $this->stringWrapper->strlen($value['email']) > 255
) {
- throw new Writer\Exception\InvalidArgumentException('invalid parameter: any "owner" may only'
- . ' contain a maximum of 255 characters each for "name" and "email"');
+ throw new Writer\Exception\InvalidArgumentException(
+ 'invalid parameter: any "owner" may only contain a maximum of 255 characters'
+ . ' each for "name" and "email"'
+ );
}
if (! isset($this->data['owners'])) {
$this->data['owners'] = [];
@@ -312,14 +321,15 @@ public function addItunesOwner(array $value)
* Set feed subtitle
*
* @param string $value
- * @return Feed
+ * @return $this
* @throws Writer\Exception\InvalidArgumentException
*/
public function setItunesSubtitle($value)
{
if ($this->stringWrapper->strlen($value) > 255) {
- throw new Writer\Exception\InvalidArgumentException('invalid parameter: "subtitle" may only'
- . ' contain a maximum of 255 characters');
+ throw new Writer\Exception\InvalidArgumentException(
+ 'invalid parameter: "subtitle" may only contain a maximum of 255 characters'
+ );
}
$this->data['subtitle'] = $value;
return $this;
@@ -329,14 +339,15 @@ public function setItunesSubtitle($value)
* Set feed summary
*
* @param string $value
- * @return Feed
+ * @return $this
* @throws Writer\Exception\InvalidArgumentException
*/
public function setItunesSummary($value)
{
if ($this->stringWrapper->strlen($value) > 4000) {
- throw new Writer\Exception\InvalidArgumentException('invalid parameter: "summary" may only'
- . ' contain a maximum of 4000 characters');
+ throw new Writer\Exception\InvalidArgumentException(
+ 'invalid parameter: "summary" may only contain a maximum of 4000 characters'
+ );
}
$this->data['summary'] = $value;
return $this;
@@ -346,7 +357,7 @@ public function setItunesSummary($value)
* Set podcast type
*
* @param string $type
- * @return Feed
+ * @return $this
* @throws Writer\Exception\InvalidArgumentException
*/
public function setItunesType($type)
@@ -367,7 +378,7 @@ public function setItunesType($type)
* Set "completion" status (whether more episodes will be released)
*
* @param bool $status
- * @return Feed
+ * @return $this
* @throws Writer\Exception\InvalidArgumentException
*/
public function setItunesComplete($status)
@@ -391,7 +402,6 @@ public function setItunesComplete($status)
* Overloading: proxy to internal setters
*
* @param string $method
- * @param array $params
* @return mixed
* @throws Writer\Exception\BadMethodCallException
*/
diff --git a/vendor/zendframework/zend-feed/src/Writer/Extension/ITunes/Renderer/Entry.php b/vendor/laminas/laminas-feed/src/Writer/Extension/ITunes/Renderer/Entry.php
similarity index 89%
rename from vendor/zendframework/zend-feed/src/Writer/Extension/ITunes/Renderer/Entry.php
rename to vendor/laminas/laminas-feed/src/Writer/Extension/ITunes/Renderer/Entry.php
index 699e6a528e..7c79326eec 100644
--- a/vendor/zendframework/zend-feed/src/Writer/Extension/ITunes/Renderer/Entry.php
+++ b/vendor/laminas/laminas-feed/src/Writer/Extension/ITunes/Renderer/Entry.php
@@ -1,20 +1,17 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Writer\Extension\ITunes\Renderer;
+namespace Laminas\Feed\Writer\Extension\ITunes\Renderer;
use DOMDocument;
use DOMElement;
-use Zend\Feed\Writer\Extension;
+use Laminas\Feed\Writer\Extension;
-/**
-*/
class Entry extends Extension\AbstractRenderer
{
/**
@@ -82,7 +79,7 @@ protected function _setAuthors(DOMDocument $dom, DOMElement $root)
return;
}
foreach ($authors as $author) {
- $el = $dom->createElement('itunes:author');
+ $el = $dom->createElement('itunes:author');
$text = $dom->createTextNode($author);
$el->appendChild($text);
$root->appendChild($el);
@@ -105,7 +102,7 @@ protected function _setBlock(DOMDocument $dom, DOMElement $root)
if ($block === null) {
return;
}
- $el = $dom->createElement('itunes:block');
+ $el = $dom->createElement('itunes:block');
$text = $dom->createTextNode($block);
$el->appendChild($text);
$root->appendChild($el);
@@ -127,7 +124,7 @@ protected function _setDuration(DOMDocument $dom, DOMElement $root)
if (! $duration) {
return;
}
- $el = $dom->createElement('itunes:duration');
+ $el = $dom->createElement('itunes:duration');
$text = $dom->createTextNode($duration);
$el->appendChild($text);
$root->appendChild($el);
@@ -170,7 +167,7 @@ protected function _setExplicit(DOMDocument $dom, DOMElement $root)
if ($explicit === null) {
return;
}
- $el = $dom->createElement('itunes:explicit');
+ $el = $dom->createElement('itunes:explicit');
$text = $dom->createTextNode($explicit);
$el->appendChild($text);
$root->appendChild($el);
@@ -192,7 +189,7 @@ protected function _setKeywords(DOMDocument $dom, DOMElement $root)
if (! $keywords || empty($keywords)) {
return;
}
- $el = $dom->createElement('itunes:keywords');
+ $el = $dom->createElement('itunes:keywords');
$text = $dom->createTextNode(implode(',', $keywords));
$el->appendChild($text);
$root->appendChild($el);
@@ -214,7 +211,7 @@ protected function _setTitle(DOMDocument $dom, DOMElement $root)
if (! $title) {
return;
}
- $el = $dom->createElement('itunes:title');
+ $el = $dom->createElement('itunes:title');
$text = $dom->createTextNode($title);
$el->appendChild($text);
$root->appendChild($el);
@@ -236,7 +233,7 @@ protected function _setSubtitle(DOMDocument $dom, DOMElement $root)
if (! $subtitle) {
return;
}
- $el = $dom->createElement('itunes:subtitle');
+ $el = $dom->createElement('itunes:subtitle');
$text = $dom->createTextNode($subtitle);
$el->appendChild($text);
$root->appendChild($el);
@@ -258,7 +255,7 @@ protected function _setSummary(DOMDocument $dom, DOMElement $root)
if (! $summary) {
return;
}
- $el = $dom->createElement('itunes:summary');
+ $el = $dom->createElement('itunes:summary');
$text = $dom->createTextNode($summary);
$el->appendChild($text);
$root->appendChild($el);
@@ -280,7 +277,7 @@ protected function _setEpisode(DOMDocument $dom, DOMElement $root)
if (! $episode) {
return;
}
- $el = $dom->createElement('itunes:episode');
+ $el = $dom->createElement('itunes:episode');
$text = $dom->createTextNode($episode);
$el->appendChild($text);
$root->appendChild($el);
@@ -302,7 +299,7 @@ protected function _setEpisodeType(DOMDocument $dom, DOMElement $root)
if (! $type) {
return;
}
- $el = $dom->createElement('itunes:episodeType');
+ $el = $dom->createElement('itunes:episodeType');
$text = $dom->createTextNode($type);
$el->appendChild($text);
$root->appendChild($el);
@@ -324,7 +321,7 @@ protected function _setClosedCaptioned(DOMDocument $dom, DOMElement $root)
if (! $status) {
return;
}
- $el = $dom->createElement('itunes:isClosedCaptioned');
+ $el = $dom->createElement('itunes:isClosedCaptioned');
$text = $dom->createTextNode('Yes');
$el->appendChild($text);
$root->appendChild($el);
@@ -346,7 +343,7 @@ protected function _setSeason(DOMDocument $dom, DOMElement $root)
if (! $season) {
return;
}
- $el = $dom->createElement('itunes:season');
+ $el = $dom->createElement('itunes:season');
$text = $dom->createTextNode($season);
$el->appendChild($text);
$root->appendChild($el);
diff --git a/vendor/zendframework/zend-feed/src/Writer/Extension/ITunes/Renderer/Feed.php b/vendor/laminas/laminas-feed/src/Writer/Extension/ITunes/Renderer/Feed.php
similarity index 90%
rename from vendor/zendframework/zend-feed/src/Writer/Extension/ITunes/Renderer/Feed.php
rename to vendor/laminas/laminas-feed/src/Writer/Extension/ITunes/Renderer/Feed.php
index 6614e3ffbd..40920ee644 100644
--- a/vendor/zendframework/zend-feed/src/Writer/Extension/ITunes/Renderer/Feed.php
+++ b/vendor/laminas/laminas-feed/src/Writer/Extension/ITunes/Renderer/Feed.php
@@ -1,20 +1,17 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Writer\Extension\ITunes\Renderer;
+namespace Laminas\Feed\Writer\Extension\ITunes\Renderer;
use DOMDocument;
use DOMElement;
-use Zend\Feed\Writer\Extension;
+use Laminas\Feed\Writer\Extension;
-/**
-*/
class Feed extends Extension\AbstractRenderer
{
/**
@@ -82,7 +79,7 @@ protected function _setAuthors(DOMDocument $dom, DOMElement $root)
return;
}
foreach ($authors as $author) {
- $el = $dom->createElement('itunes:author');
+ $el = $dom->createElement('itunes:author');
$text = $dom->createTextNode($author);
$el->appendChild($text);
$root->appendChild($el);
@@ -105,7 +102,7 @@ protected function _setBlock(DOMDocument $dom, DOMElement $root)
if ($block === null) {
return;
}
- $el = $dom->createElement('itunes:block');
+ $el = $dom->createElement('itunes:block');
$text = $dom->createTextNode($block);
$el->appendChild($text);
$root->appendChild($el);
@@ -182,7 +179,7 @@ protected function _setDuration(DOMDocument $dom, DOMElement $root)
if (! $duration) {
return;
}
- $el = $dom->createElement('itunes:duration');
+ $el = $dom->createElement('itunes:duration');
$text = $dom->createTextNode($duration);
$el->appendChild($text);
$root->appendChild($el);
@@ -204,7 +201,7 @@ protected function _setExplicit(DOMDocument $dom, DOMElement $root)
if ($explicit === null) {
return;
}
- $el = $dom->createElement('itunes:explicit');
+ $el = $dom->createElement('itunes:explicit');
$text = $dom->createTextNode($explicit);
$el->appendChild($text);
$root->appendChild($el);
@@ -226,7 +223,7 @@ protected function _setKeywords(DOMDocument $dom, DOMElement $root)
if (! $keywords || empty($keywords)) {
return;
}
- $el = $dom->createElement('itunes:keywords');
+ $el = $dom->createElement('itunes:keywords');
$text = $dom->createTextNode(implode(',', $keywords));
$el->appendChild($text);
$root->appendChild($el);
@@ -248,7 +245,7 @@ protected function _setNewFeedUrl(DOMDocument $dom, DOMElement $root)
if (! $url) {
return;
}
- $el = $dom->createElement('itunes:new-feed-url');
+ $el = $dom->createElement('itunes:new-feed-url');
$text = $dom->createTextNode($url);
$el->appendChild($text);
$root->appendChild($el);
@@ -271,12 +268,12 @@ protected function _setOwners(DOMDocument $dom, DOMElement $root)
return;
}
foreach ($owners as $owner) {
- $el = $dom->createElement('itunes:owner');
+ $el = $dom->createElement('itunes:owner');
$name = $dom->createElement('itunes:name');
$text = $dom->createTextNode($owner['name']);
$name->appendChild($text);
$email = $dom->createElement('itunes:email');
- $text = $dom->createTextNode($owner['email']);
+ $text = $dom->createTextNode($owner['email']);
$email->appendChild($text);
$root->appendChild($el);
$el->appendChild($name);
@@ -300,7 +297,7 @@ protected function _setSubtitle(DOMDocument $dom, DOMElement $root)
if (! $subtitle) {
return;
}
- $el = $dom->createElement('itunes:subtitle');
+ $el = $dom->createElement('itunes:subtitle');
$text = $dom->createTextNode($subtitle);
$el->appendChild($text);
$root->appendChild($el);
@@ -322,7 +319,7 @@ protected function _setSummary(DOMDocument $dom, DOMElement $root)
if (! $summary) {
return;
}
- $el = $dom->createElement('itunes:summary');
+ $el = $dom->createElement('itunes:summary');
$text = $dom->createTextNode($summary);
$el->appendChild($text);
$root->appendChild($el);
@@ -344,7 +341,7 @@ protected function _setType(DOMDocument $dom, DOMElement $root)
if (! $type) {
return;
}
- $el = $dom->createElement('itunes:type');
+ $el = $dom->createElement('itunes:type');
$text = $dom->createTextNode($type);
$el->appendChild($text);
$root->appendChild($el);
@@ -366,7 +363,7 @@ protected function _setComplete(DOMDocument $dom, DOMElement $root)
if (! $status) {
return;
}
- $el = $dom->createElement('itunes:complete');
+ $el = $dom->createElement('itunes:complete');
$text = $dom->createTextNode('Yes');
$el->appendChild($text);
$root->appendChild($el);
diff --git a/vendor/zendframework/zend-feed/src/Writer/Extension/RendererInterface.php b/vendor/laminas/laminas-feed/src/Writer/Extension/RendererInterface.php
similarity index 60%
rename from vendor/zendframework/zend-feed/src/Writer/Extension/RendererInterface.php
rename to vendor/laminas/laminas-feed/src/Writer/Extension/RendererInterface.php
index 9afe88b2a2..5ce9270eb7 100644
--- a/vendor/zendframework/zend-feed/src/Writer/Extension/RendererInterface.php
+++ b/vendor/laminas/laminas-feed/src/Writer/Extension/RendererInterface.php
@@ -1,19 +1,16 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Writer\Extension;
+namespace Laminas\Feed\Writer\Extension;
use DOMDocument;
use DOMElement;
-/**
-*/
interface RendererInterface
{
/**
@@ -34,8 +31,6 @@ public function getDataContainer();
/**
* Set DOMDocument and DOMElement on which to operate
*
- * @param DOMDocument $dom
- * @param DOMElement $base
* @return void
*/
public function setDomDocument(DOMDocument $dom, DOMElement $base);
diff --git a/vendor/zendframework/zend-feed/src/Writer/Extension/Slash/Renderer/Entry.php b/vendor/laminas/laminas-feed/src/Writer/Extension/Slash/Renderer/Entry.php
similarity index 75%
rename from vendor/zendframework/zend-feed/src/Writer/Extension/Slash/Renderer/Entry.php
rename to vendor/laminas/laminas-feed/src/Writer/Extension/Slash/Renderer/Entry.php
index 9d3e07c3b2..dfaea2d157 100644
--- a/vendor/zendframework/zend-feed/src/Writer/Extension/Slash/Renderer/Entry.php
+++ b/vendor/laminas/laminas-feed/src/Writer/Extension/Slash/Renderer/Entry.php
@@ -1,20 +1,17 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Writer\Extension\Slash\Renderer;
+namespace Laminas\Feed\Writer\Extension\Slash\Renderer;
use DOMDocument;
use DOMElement;
-use Zend\Feed\Writer\Extension;
+use Laminas\Feed\Writer\Extension;
-/**
-*/
class Entry extends Extension\AbstractRenderer
{
/**
@@ -33,7 +30,7 @@ class Entry extends Extension\AbstractRenderer
*/
public function render()
{
- if (strtolower($this->getType()) == 'atom') {
+ if (strtolower($this->getType()) === 'atom') {
return; // RSS 2.0 only
}
$this->_setCommentCount($this->dom, $this->base);
@@ -72,7 +69,7 @@ protected function _setCommentCount(DOMDocument $dom, DOMElement $root)
if (! $count) {
$count = 0;
}
- $tcount = $this->dom->createElement('slash:comments');
+ $tcount = $this->dom->createElement('slash:comments');
$tcount->nodeValue = $count;
$root->appendChild($tcount);
$this->called = true;
diff --git a/vendor/zendframework/zend-feed/src/Writer/Extension/Threading/Renderer/Entry.php b/vendor/laminas/laminas-feed/src/Writer/Extension/Threading/Renderer/Entry.php
similarity index 87%
rename from vendor/zendframework/zend-feed/src/Writer/Extension/Threading/Renderer/Entry.php
rename to vendor/laminas/laminas-feed/src/Writer/Extension/Threading/Renderer/Entry.php
index bf7cde51a4..3d0591328a 100644
--- a/vendor/zendframework/zend-feed/src/Writer/Extension/Threading/Renderer/Entry.php
+++ b/vendor/laminas/laminas-feed/src/Writer/Extension/Threading/Renderer/Entry.php
@@ -1,20 +1,17 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Writer\Extension\Threading\Renderer;
+namespace Laminas\Feed\Writer\Extension\Threading\Renderer;
use DOMDocument;
use DOMElement;
-use Zend\Feed\Writer\Extension;
+use Laminas\Feed\Writer\Extension;
-/**
-*/
class Entry extends Extension\AbstractRenderer
{
/**
@@ -33,7 +30,7 @@ class Entry extends Extension\AbstractRenderer
*/
public function render()
{
- if (strtolower($this->getType()) == 'rss') {
+ if (strtolower($this->getType()) === 'rss') {
return; // Atom 1.0 only
}
$this->_setCommentLink($this->dom, $this->base);
@@ -130,7 +127,7 @@ protected function _setCommentCount(DOMDocument $dom, DOMElement $root)
if ($count === null) {
return;
}
- $tcount = $this->dom->createElement('thr:total');
+ $tcount = $this->dom->createElement('thr:total');
$tcount->nodeValue = $count;
$root->appendChild($tcount);
$this->called = true;
diff --git a/vendor/zendframework/zend-feed/src/Writer/Extension/WellFormedWeb/Renderer/Entry.php b/vendor/laminas/laminas-feed/src/Writer/Extension/WellFormedWeb/Renderer/Entry.php
similarity index 75%
rename from vendor/zendframework/zend-feed/src/Writer/Extension/WellFormedWeb/Renderer/Entry.php
rename to vendor/laminas/laminas-feed/src/Writer/Extension/WellFormedWeb/Renderer/Entry.php
index cdb6e58de6..b4eccf1ff1 100644
--- a/vendor/zendframework/zend-feed/src/Writer/Extension/WellFormedWeb/Renderer/Entry.php
+++ b/vendor/laminas/laminas-feed/src/Writer/Extension/WellFormedWeb/Renderer/Entry.php
@@ -1,20 +1,17 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Writer\Extension\WellFormedWeb\Renderer;
+namespace Laminas\Feed\Writer\Extension\WellFormedWeb\Renderer;
use DOMDocument;
use DOMElement;
-use Zend\Feed\Writer\Extension;
+use Laminas\Feed\Writer\Extension;
-/**
-*/
class Entry extends Extension\AbstractRenderer
{
/**
@@ -33,7 +30,7 @@ class Entry extends Extension\AbstractRenderer
*/
public function render()
{
- if (strtolower($this->getType()) == 'atom') {
+ if (strtolower($this->getType()) === 'atom') {
return; // RSS 2.0 only
}
$this->_setCommentFeedLinks($this->dom, $this->base);
@@ -73,9 +70,9 @@ protected function _setCommentFeedLinks(DOMDocument $dom, DOMElement $root)
return;
}
foreach ($links as $link) {
- if ($link['type'] == 'rss') {
+ if ($link['type'] === 'rss') {
$flink = $this->dom->createElement('wfw:commentRss');
- $text = $dom->createTextNode($link['uri']);
+ $text = $dom->createTextNode($link['uri']);
$flink->appendChild($text);
$root->appendChild($flink);
}
diff --git a/vendor/zendframework/zend-feed/src/Writer/ExtensionManager.php b/vendor/laminas/laminas-feed/src/Writer/ExtensionManager.php
similarity index 80%
rename from vendor/zendframework/zend-feed/src/Writer/ExtensionManager.php
rename to vendor/laminas/laminas-feed/src/Writer/ExtensionManager.php
index 82bc73ab08..239a6e487b 100644
--- a/vendor/zendframework/zend-feed/src/Writer/ExtensionManager.php
+++ b/vendor/laminas/laminas-feed/src/Writer/ExtensionManager.php
@@ -1,13 +1,12 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Writer;
+namespace Laminas\Feed\Writer;
/**
* Default implementation of ExtensionManagerInterface
@@ -19,12 +18,8 @@ class ExtensionManager implements ExtensionManagerInterface
protected $pluginManager;
/**
- * Constructor
- *
* Seeds the extension manager with a plugin manager; if none provided,
* creates and decorates an instance of StandaloneExtensionManager.
- *
- * @param null|ExtensionManagerInterface $pluginManager
*/
public function __construct(ExtensionManagerInterface $pluginManager = null)
{
diff --git a/vendor/zendframework/zend-feed/src/Reader/ExtensionManagerInterface.php b/vendor/laminas/laminas-feed/src/Writer/ExtensionManagerInterface.php
similarity index 51%
rename from vendor/zendframework/zend-feed/src/Reader/ExtensionManagerInterface.php
rename to vendor/laminas/laminas-feed/src/Writer/ExtensionManagerInterface.php
index 70ec37d4c0..bcd8b557ef 100644
--- a/vendor/zendframework/zend-feed/src/Reader/ExtensionManagerInterface.php
+++ b/vendor/laminas/laminas-feed/src/Writer/ExtensionManagerInterface.php
@@ -1,13 +1,12 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Reader;
+namespace Laminas\Feed\Writer;
interface ExtensionManagerInterface
{
diff --git a/vendor/zendframework/zend-feed/src/Writer/ExtensionPluginManager.php b/vendor/laminas/laminas-feed/src/Writer/ExtensionPluginManager.php
similarity index 65%
rename from vendor/zendframework/zend-feed/src/Writer/ExtensionPluginManager.php
rename to vendor/laminas/laminas-feed/src/Writer/ExtensionPluginManager.php
index 7e2c4e42df..b37797f7fe 100644
--- a/vendor/zendframework/zend-feed/src/Writer/ExtensionPluginManager.php
+++ b/vendor/laminas/laminas-feed/src/Writer/ExtensionPluginManager.php
@@ -1,17 +1,16 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Writer;
+namespace Laminas\Feed\Writer;
-use Zend\ServiceManager\AbstractPluginManager;
-use Zend\ServiceManager\Exception\InvalidServiceException;
-use Zend\ServiceManager\Factory\InvokableFactory;
+use Laminas\ServiceManager\AbstractPluginManager;
+use Laminas\ServiceManager\Exception\InvalidServiceException;
+use Laminas\ServiceManager\Factory\InvokableFactory;
/**
* Plugin manager implementation for feed writer extensions
@@ -109,6 +108,42 @@ class ExtensionPluginManager extends AbstractPluginManager implements ExtensionM
'WellFormedWebRendererEntry' => Extension\WellFormedWeb\Renderer\Entry::class,
'WellFormedWebRenderer\Entry' => Extension\WellFormedWeb\Renderer\Entry::class,
'WellFormedWeb\Renderer\Entry' => Extension\WellFormedWeb\Renderer\Entry::class,
+
+ // Legacy Zend Framework aliases
+ // @codingStandardsIgnoreStart
+ \Zend\Feed\Writer\Extension\Atom\Renderer\Feed::class => Extension\Atom\Renderer\Feed::class,
+ \Zend\Feed\Writer\Extension\Content\Renderer\Entry::class => Extension\Content\Renderer\Entry::class,
+ \Zend\Feed\Writer\Extension\DublinCore\Renderer\Entry::class => Extension\DublinCore\Renderer\Entry::class,
+ \Zend\Feed\Writer\Extension\DublinCore\Renderer\Feed::class => Extension\DublinCore\Renderer\Feed::class,
+ \Zend\Feed\Writer\Extension\GooglePlayPodcast\Entry::class => Extension\GooglePlayPodcast\Entry::class,
+ \Zend\Feed\Writer\Extension\GooglePlayPodcast\Feed::class => Extension\GooglePlayPodcast\Feed::class,
+ \Zend\Feed\Writer\Extension\GooglePlayPodcast\Renderer\Entry::class => Extension\GooglePlayPodcast\Renderer\Entry::class,
+ \Zend\Feed\Writer\Extension\GooglePlayPodcast\Renderer\Feed::class => Extension\GooglePlayPodcast\Renderer\Feed::class,
+ \Zend\Feed\Writer\Extension\ITunes\Entry::class => Extension\ITunes\Entry::class,
+ \Zend\Feed\Writer\Extension\ITunes\Feed::class => Extension\ITunes\Feed::class,
+ \Zend\Feed\Writer\Extension\ITunes\Renderer\Entry::class => Extension\ITunes\Renderer\Entry::class,
+ \Zend\Feed\Writer\Extension\ITunes\Renderer\Feed::class => Extension\ITunes\Renderer\Feed::class,
+ \Zend\Feed\Writer\Extension\Slash\Renderer\Entry::class => Extension\Slash\Renderer\Entry::class,
+ \Zend\Feed\Writer\Extension\Threading\Renderer\Entry::class => Extension\Threading\Renderer\Entry::class,
+ \Zend\Feed\Writer\Extension\WellFormedWeb\Renderer\Entry::class => Extension\WellFormedWeb\Renderer\Entry::class,
+ // @codingStandardsIgnoreEnd
+
+ // v2 normalized FQCNs
+ 'zendfeedwriterextensionatomrendererfeed' => Extension\Atom\Renderer\Feed::class,
+ 'zendfeedwriterextensioncontentrendererentry' => Extension\Content\Renderer\Entry::class,
+ 'zendfeedwriterextensiondublincorerendererentry' => Extension\DublinCore\Renderer\Entry::class,
+ 'zendfeedwriterextensiondublincorerendererfeed' => Extension\DublinCore\Renderer\Feed::class,
+ 'zendfeedwriterextensiongoogleplaypodcastentry' => Extension\GooglePlayPodcast\Entry::class,
+ 'zendfeedwriterextensiongoogleplaypodcastfeed' => Extension\GooglePlayPodcast\Feed::class,
+ 'zendfeedwriterextensiongoogleplaypodcastrendererentry' => Extension\GooglePlayPodcast\Renderer\Entry::class,
+ 'zendfeedwriterextensiongoogleplaypodcastrendererfeed' => Extension\GooglePlayPodcast\Renderer\Feed::class,
+ 'zendfeedwriterextensionitunesentry' => Extension\ITunes\Entry::class,
+ 'zendfeedwriterextensionitunesfeed' => Extension\ITunes\Feed::class,
+ 'zendfeedwriterextensionitunesrendererentry' => Extension\ITunes\Renderer\Entry::class,
+ 'zendfeedwriterextensionitunesrendererfeed' => Extension\ITunes\Renderer\Feed::class,
+ 'zendfeedwriterextensionslashrendererentry' => Extension\Slash\Renderer\Entry::class,
+ 'zendfeedwriterextensionthreadingrendererentry' => Extension\Threading\Renderer\Entry::class,
+ 'zendfeedwriterextensionwellformedwebrendererentry' => Extension\WellFormedWeb\Renderer\Entry::class,
];
/**
@@ -135,22 +170,22 @@ class ExtensionPluginManager extends AbstractPluginManager implements ExtensionM
// Legacy (v2) due to alias resolution; canonical form of resolved
// alias is used to look up the factory, while the non-normalized
// resolved alias is used as the requested name passed to the factory.
- 'zendfeedwriterextensionatomrendererfeed' => InvokableFactory::class,
- 'zendfeedwriterextensioncontentrendererentry' => InvokableFactory::class,
- 'zendfeedwriterextensiondublincorerendererentry' => InvokableFactory::class,
- 'zendfeedwriterextensiondublincorerendererfeed' => InvokableFactory::class,
- 'zendfeedwriterextensiongoogleplaypodcastentry' => InvokableFactory::class,
- 'zendfeedwriterextensiongoogleplaypodcastfeed' => InvokableFactory::class,
- 'zendfeedwriterextensiongoogleplaypodcastrendererentry' => InvokableFactory::class,
- 'zendfeedwriterextensiongoogleplaypodcastrendererfeed' => InvokableFactory::class,
+ 'laminasfeedwriterextensionatomrendererfeed' => InvokableFactory::class,
+ 'laminasfeedwriterextensioncontentrendererentry' => InvokableFactory::class,
+ 'laminasfeedwriterextensiondublincorerendererentry' => InvokableFactory::class,
+ 'laminasfeedwriterextensiondublincorerendererfeed' => InvokableFactory::class,
+ 'laminasfeedwriterextensiongoogleplaypodcastentry' => InvokableFactory::class,
+ 'laminasfeedwriterextensiongoogleplaypodcastfeed' => InvokableFactory::class,
+ 'laminasfeedwriterextensiongoogleplaypodcastrendererentry' => InvokableFactory::class,
+ 'laminasfeedwriterextensiongoogleplaypodcastrendererfeed' => InvokableFactory::class,
- 'zendfeedwriterextensionitunesentry' => InvokableFactory::class,
- 'zendfeedwriterextensionitunesfeed' => InvokableFactory::class,
- 'zendfeedwriterextensionitunesrendererentry' => InvokableFactory::class,
- 'zendfeedwriterextensionitunesrendererfeed' => InvokableFactory::class,
- 'zendfeedwriterextensionslashrendererentry' => InvokableFactory::class,
- 'zendfeedwriterextensionthreadingrendererentry' => InvokableFactory::class,
- 'zendfeedwriterextensionwellformedwebrendererentry' => InvokableFactory::class,
+ 'laminasfeedwriterextensionitunesentry' => InvokableFactory::class,
+ 'laminasfeedwriterextensionitunesfeed' => InvokableFactory::class,
+ 'laminasfeedwriterextensionitunesrendererentry' => InvokableFactory::class,
+ 'laminasfeedwriterextensionitunesrendererfeed' => InvokableFactory::class,
+ 'laminasfeedwriterextensionslashrendererentry' => InvokableFactory::class,
+ 'laminasfeedwriterextensionthreadingrendererentry' => InvokableFactory::class,
+ 'laminasfeedwriterextensionwellformedwebrendererentry' => InvokableFactory::class,
];
/**
@@ -183,12 +218,12 @@ public function validate($plugin)
return;
}
- if ('Feed' == substr(get_class($plugin), -4)) {
+ if ('Feed' === substr(get_class($plugin), -4)) {
// we're okay
return;
}
- if ('Entry' == substr(get_class($plugin), -5)) {
+ if ('Entry' === substr(get_class($plugin), -5)) {
// we're okay
return;
}
@@ -196,7 +231,7 @@ public function validate($plugin)
throw new InvalidServiceException(sprintf(
'Plugin of type %s is invalid; must implement %s\Extension\RendererInterface '
. 'or the classname must end in "Feed" or "Entry"',
- (is_object($plugin) ? get_class($plugin) : gettype($plugin)),
+ is_object($plugin) ? get_class($plugin) : gettype($plugin),
__NAMESPACE__
));
}
@@ -204,7 +239,7 @@ public function validate($plugin)
/**
* Validate plugin (v2)
*
- * @param mixed $plugin
+ * @param mixed $plugin
* @return void
* @throws Exception\InvalidArgumentException when invalid
*/
@@ -216,7 +251,7 @@ public function validatePlugin($plugin)
throw new Exception\InvalidArgumentException(sprintf(
'Plugin of type %s is invalid; must implement %s\Extension\RendererInterface '
. 'or the classname must end in "Feed" or "Entry"',
- (is_object($plugin) ? get_class($plugin) : gettype($plugin)),
+ is_object($plugin) ? get_class($plugin) : gettype($plugin),
__NAMESPACE__
));
}
diff --git a/vendor/zendframework/zend-feed/src/Writer/Feed.php b/vendor/laminas/laminas-feed/src/Writer/Feed.php
similarity index 79%
rename from vendor/zendframework/zend-feed/src/Writer/Feed.php
rename to vendor/laminas/laminas-feed/src/Writer/Feed.php
index e8328ed60c..1f79b36580 100644
--- a/vendor/zendframework/zend-feed/src/Writer/Feed.php
+++ b/vendor/laminas/laminas-feed/src/Writer/Feed.php
@@ -1,19 +1,16 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Writer;
+namespace Laminas\Feed\Writer;
use Countable;
use Iterator;
-/**
-*/
class Feed extends AbstractFeed implements Iterator, Countable
{
/**
@@ -31,15 +28,15 @@ class Feed extends AbstractFeed implements Iterator, Countable
protected $entriesKey = 0;
/**
- * Creates a new Zend\Feed\Writer\Entry data container for use. This is NOT
+ * Creates a new Laminas\Feed\Writer\Entry data container for use. This is NOT
* added to the current feed automatically, but is necessary to create a
* container with some initial values preset based on the current feed data.
*
- * @return \Zend\Feed\Writer\Entry
+ * @return Entry
*/
public function createEntry()
{
- $entry = new Entry;
+ $entry = new Entry();
if ($this->getEncoding()) {
$entry->setEncoding($this->getEncoding());
}
@@ -48,10 +45,9 @@ public function createEntry()
}
/**
- * Appends a Zend\Feed\Writer\Deleted object representing a new entry tombstone
+ * Appends a Laminas\Feed\Writer\Deleted object representing a new entry tombstone
* to the feed data container's internal group of entries.
*
- * @param Deleted $deleted
* @return void
*/
public function addTombstone(Deleted $deleted)
@@ -60,7 +56,7 @@ public function addTombstone(Deleted $deleted)
}
/**
- * Creates a new Zend\Feed\Writer\Deleted data container for use. This is NOT
+ * Creates a new Laminas\Feed\Writer\Deleted data container for use. This is NOT
* added to the current feed automatically, but is necessary to create a
* container with some initial values preset based on the current feed data.
*
@@ -68,7 +64,7 @@ public function addTombstone(Deleted $deleted)
*/
public function createTombstone()
{
- $deleted = new Deleted;
+ $deleted = new Deleted();
if ($this->getEncoding()) {
$deleted->setEncoding($this->getEncoding());
}
@@ -77,11 +73,10 @@ public function createTombstone()
}
/**
- * Appends a Zend\Feed\Writer\Entry object representing a new entry/item
+ * Appends a Laminas\Feed\Writer\Entry object representing a new entry/item
* the feed data container's internal group of entries.
*
- * @param Entry $entry
- * @return Feed
+ * @return $this
*/
public function addEntry(Entry $entry)
{
@@ -93,9 +88,9 @@ public function addEntry(Entry $entry)
* Removes a specific indexed entry from the internal queue. Entries must be
* added to a feed container in order to be indexed.
*
- * @param int $index
+ * @param int $index
+ * @return $this
* @throws Exception\InvalidArgumentException
- * @return Feed
*/
public function removeEntry($index)
{
@@ -111,7 +106,7 @@ public function removeEntry($index)
* Retrieve a specific indexed entry from the internal queue. Entries must be
* added to a feed container in order to be indexed.
*
- * @param int $index
+ * @param int $index
* @return Entry
* @throws Exception\InvalidArgumentException
*/
@@ -130,7 +125,7 @@ public function getEntry($index = 0)
*
* Using this method will alter the original indexation.
*
- * @return Feed
+ * @return $this
*/
public function orderByDate()
{
@@ -138,7 +133,7 @@ public function orderByDate()
* Could do with some improvement for performance perhaps
*/
$timestamp = time();
- $entries = [];
+ $entries = [];
foreach ($this->entries as $entry) {
if ($entry->getDateModified()) {
$timestamp = (int) $entry->getDateModified()->getTimestamp();
@@ -217,21 +212,22 @@ public function valid()
/**
* Attempt to build and return the feed resulting from the data set
*
- * @param string $type The feed type "rss" or "atom" to export as
- * @param bool $ignoreExceptions
- * @throws Exception\InvalidArgumentException
+ * @param string $type The feed type "rss" or "atom" to export as
+ * @param bool $ignoreExceptions
* @return string
+ * @throws Exception\InvalidArgumentException
*/
public function export($type, $ignoreExceptions = false)
{
$this->setType(strtolower($type));
$type = ucfirst($this->getType());
if ($type !== 'Rss' && $type !== 'Atom') {
- throw new Exception\InvalidArgumentException('Invalid feed type specified: ' . $type . '.'
- . ' Should be one of "rss" or "atom".');
+ throw new Exception\InvalidArgumentException(
+ 'Invalid feed type specified: ' . $type . '. Should be one of "rss" or "atom".'
+ );
}
- $renderClass = 'Zend\\Feed\\Writer\\Renderer\\Feed\\' . $type;
- $renderer = new $renderClass($this);
+ $renderClass = 'Laminas\\Feed\\Writer\\Renderer\\Feed\\' . $type;
+ $renderer = new $renderClass($this);
if ($ignoreExceptions) {
$renderer->ignoreExceptions();
}
diff --git a/vendor/zendframework/zend-feed/src/Writer/FeedFactory.php b/vendor/laminas/laminas-feed/src/Writer/FeedFactory.php
similarity index 82%
rename from vendor/zendframework/zend-feed/src/Writer/FeedFactory.php
rename to vendor/laminas/laminas-feed/src/Writer/FeedFactory.php
index b321d70fc7..dc085b3ad4 100644
--- a/vendor/zendframework/zend-feed/src/Writer/FeedFactory.php
+++ b/vendor/laminas/laminas-feed/src/Writer/FeedFactory.php
@@ -1,13 +1,12 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Writer;
+namespace Laminas\Feed\Writer;
use Traversable;
@@ -17,8 +16,8 @@ abstract class FeedFactory
* Create and return a Feed based on data provided.
*
* @param array|Traversable $data
- * @throws Exception\InvalidArgumentException
* @return Feed
+ * @throws Exception\InvalidArgumentException
*/
public static function factory($data)
{
@@ -26,7 +25,7 @@ public static function factory($data)
throw new Exception\InvalidArgumentException(sprintf(
'%s expects an array or Traversable argument; received "%s"',
__METHOD__,
- (is_object($data) ? get_class($data) : gettype($data))
+ is_object($data) ? get_class($data) : gettype($data)
));
}
@@ -57,7 +56,7 @@ public static function factory($data)
}
// Entries
- if ('entries' == $key) {
+ if ('entries' === $key) {
static::createEntries($value, $feed);
continue;
}
@@ -82,9 +81,8 @@ protected static function convertKey($key)
* Create and attach entries to a feed
*
* @param array|Traversable $entries
- * @param Feed $feed
- * @throws Exception\InvalidArgumentException
* @return void
+ * @throws Exception\InvalidArgumentException
*/
protected static function createEntries($entries, Feed $feed)
{
@@ -92,16 +90,16 @@ protected static function createEntries($entries, Feed $feed)
throw new Exception\InvalidArgumentException(sprintf(
'%s::factory expects the "entries" value to be an array or Traversable; received "%s"',
get_called_class(),
- (is_object($entries) ? get_class($entries) : gettype($entries))
+ is_object($entries) ? get_class($entries) : gettype($entries)
));
}
foreach ($entries as $data) {
if (! is_array($data) && ! $data instanceof Traversable && ! $data instanceof Entry) {
throw new Exception\InvalidArgumentException(sprintf(
- '%s expects an array, Traversable, or Zend\Feed\Writer\Entry argument; received "%s"',
+ '%s expects an array, Traversable, or Laminas\Feed\Writer\Entry argument; received "%s"',
__METHOD__,
- (is_object($data) ? get_class($data) : gettype($data))
+ is_object($data) ? get_class($data) : gettype($data)
));
}
diff --git a/vendor/zendframework/zend-feed/src/Writer/Renderer/AbstractRenderer.php b/vendor/laminas/laminas-feed/src/Writer/Renderer/AbstractRenderer.php
similarity index 85%
rename from vendor/zendframework/zend-feed/src/Writer/Renderer/AbstractRenderer.php
rename to vendor/laminas/laminas-feed/src/Writer/Renderer/AbstractRenderer.php
index 1e5e728803..09d1ee5c1c 100644
--- a/vendor/zendframework/zend-feed/src/Writer/Renderer/AbstractRenderer.php
+++ b/vendor/laminas/laminas-feed/src/Writer/Renderer/AbstractRenderer.php
@@ -1,24 +1,22 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Writer\Renderer;
+namespace Laminas\Feed\Writer\Renderer;
use DOMDocument;
use DOMElement;
-use Zend\Feed\Writer;
+use Laminas\Feed\Writer;
-/**
-*/
class AbstractRenderer
{
/**
* Extensions
+ *
* @var array
*/
protected $extensions = [];
@@ -26,12 +24,12 @@ class AbstractRenderer
/**
* @var Writer\AbstractFeed
*/
- protected $container = null;
+ protected $container;
/**
* @var DOMDocument
*/
- protected $dom = null;
+ protected $dom;
/**
* @var bool
@@ -56,16 +54,14 @@ class AbstractRenderer
*
* @var string
*/
- protected $type = null;
+ protected $type;
/**
* @var DOMElement
*/
- protected $rootElement = null;
+ protected $rootElement;
/**
- * Constructor
- *
* @param Writer\AbstractFeed $container
*/
public function __construct($container)
@@ -119,7 +115,7 @@ public function getDataContainer()
* Set feed encoding
*
* @param string $enc
- * @return AbstractRenderer
+ * @return $this
*/
public function setEncoding($enc)
{
@@ -141,7 +137,7 @@ public function getEncoding()
* Indicate whether or not to ignore exceptions
*
* @param bool $bool
- * @return AbstractRenderer
+ * @return $this
* @throws Writer\Exception\InvalidArgumentException
*/
public function ignoreExceptions($bool = true)
@@ -192,8 +188,6 @@ public function getType()
* helps simplify the appending of namespace declarations, but also ensures
* namespaces are added to the root element - not scattered across the entire
* XML file - may assist namespace unsafe parsers and looks pretty ;).
- *
- * @param DOMElement $root
*/
public function setRootElement(DOMElement $root)
{
@@ -211,7 +205,7 @@ public function getRootElement()
}
/**
- * Load extensions from Zend\Feed\Writer\Writer
+ * Load extensions from Laminas\Feed\Writer\Writer
*
* @return void
*/
@@ -221,8 +215,8 @@ protected function _loadExtensions()
// @codingStandardsIgnoreEnd
Writer\Writer::registerCoreExtensions();
$manager = Writer\Writer::getExtensionManager();
- $all = Writer\Writer::getExtensions();
- $exts = stripos(get_class($this), 'entry')
+ $all = Writer\Writer::getExtensions();
+ $exts = stripos(get_class($this), 'entry')
? $all['entryRenderer']
: $all['feedRenderer'];
foreach ($exts as $extension) {
diff --git a/vendor/zendframework/zend-feed/src/Writer/Renderer/Entry/Atom.php b/vendor/laminas/laminas-feed/src/Writer/Renderer/Entry/Atom.php
similarity index 83%
rename from vendor/zendframework/zend-feed/src/Writer/Renderer/Entry/Atom.php
rename to vendor/laminas/laminas-feed/src/Writer/Renderer/Entry/Atom.php
index 9425f72b27..0a55253c1b 100644
--- a/vendor/zendframework/zend-feed/src/Writer/Renderer/Entry/Atom.php
+++ b/vendor/laminas/laminas-feed/src/Writer/Renderer/Entry/Atom.php
@@ -1,29 +1,23 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Writer\Renderer\Entry;
+namespace Laminas\Feed\Writer\Renderer\Entry;
use DateTime;
use DOMDocument;
use DOMElement;
-use Zend\Feed\Uri;
-use Zend\Feed\Writer;
-use Zend\Feed\Writer\Renderer;
-use Zend\Validator;
+use Laminas\Feed\Uri;
+use Laminas\Feed\Writer;
+use Laminas\Feed\Writer\Renderer;
+use Laminas\Validator;
class Atom extends Renderer\AbstractRenderer implements Renderer\RendererInterface
{
- /**
- * Constructor
- *
- * @param Writer\Entry $container
- */
public function __construct(Writer\Entry $container)
{
parent::__construct($container);
@@ -32,13 +26,13 @@ public function __construct(Writer\Entry $container)
/**
* Render atom entry
*
- * @return Atom
+ * @return $this
*/
public function render()
{
- $this->dom = new DOMDocument('1.0', $this->container->getEncoding());
+ $this->dom = new DOMDocument('1.0', $this->container->getEncoding());
$this->dom->formatOutput = true;
- $entry = $this->dom->createElementNS(Writer\Writer::NAMESPACE_ATOM_10, 'entry');
+ $entry = $this->dom->createElementNS(Writer\Writer::NAMESPACE_ATOM_10, 'entry');
$this->dom->appendChild($entry);
$this->_setSource($this->dom, $entry);
@@ -76,8 +70,8 @@ protected function _setTitle(DOMDocument $dom, DOMElement $root)
{
// @codingStandardsIgnoreEnd
if (! $this->getDataContainer()->getTitle()) {
- $message = 'Atom 1.0 entry elements MUST contain exactly one'
- . ' atom:title element but a title has not been set';
+ $message = 'Atom 1.0 entry elements MUST contain exactly one'
+ . ' atom:title element but a title has not been set';
$exception = new Writer\Exception\InvalidArgumentException($message);
if (! $this->ignoreExceptions) {
throw $exception;
@@ -129,8 +123,8 @@ protected function _setDateModified(DOMDocument $dom, DOMElement $root)
{
// @codingStandardsIgnoreEnd
if (! $this->getDataContainer()->getDateModified()) {
- $message = 'Atom 1.0 entry elements MUST contain exactly one'
- . ' atom:updated element but a modification date has not been set';
+ $message = 'Atom 1.0 entry elements MUST contain exactly one'
+ . ' atom:updated element but a modification date has not been set';
$exception = new Writer\Exception\InvalidArgumentException($message);
if (! $this->ignoreExceptions) {
throw $exception;
@@ -182,7 +176,7 @@ protected function _setAuthors(DOMDocument $dom, DOMElement $root)
{
// @codingStandardsIgnoreEnd
$authors = $this->container->getAuthors();
- if ((! $authors || empty($authors))) {
+ if (! $authors || empty($authors)) {
/**
* This will actually trigger an Exception at the feed level if
* a feed level author is not set.
@@ -191,7 +185,7 @@ protected function _setAuthors(DOMDocument $dom, DOMElement $root)
}
foreach ($authors as $data) {
$author = $this->dom->createElement('author');
- $name = $this->dom->createElement('name');
+ $name = $this->dom->createElement('name');
$author->appendChild($name);
$root->appendChild($author);
$text = $dom->createTextNode($data['name']);
@@ -223,7 +217,7 @@ protected function _setEnclosure(DOMDocument $dom, DOMElement $root)
{
// @codingStandardsIgnoreEnd
$data = $this->container->getEnclosure();
- if ((! $data || empty($data))) {
+ if (! $data || empty($data)) {
return;
}
$enclosure = $this->dom->createElement('link');
@@ -265,11 +259,12 @@ protected function _setId(DOMDocument $dom, DOMElement $root)
{
// @codingStandardsIgnoreEnd
if (! $this->getDataContainer()->getId()
- && ! $this->getDataContainer()->getLink()) {
- $message = 'Atom 1.0 entry elements MUST contain exactly one '
- . 'atom:id element, or as an alternative, we can use the same '
- . 'value as atom:link however neither a suitable link nor an '
- . 'id have been set';
+ && ! $this->getDataContainer()->getLink()
+ ) {
+ $message = 'Atom 1.0 entry elements MUST contain exactly one '
+ . 'atom:id element, or as an alternative, we can use the same '
+ . 'value as atom:link however neither a suitable link nor an '
+ . 'id have been set';
$exception = new Writer\Exception\InvalidArgumentException($message);
if (! $this->ignoreExceptions) {
throw $exception;
@@ -302,7 +297,7 @@ protected function _setId(DOMDocument $dom, DOMElement $root)
/**
* Validate a URI using the tag scheme (RFC 4151)
*
- * @param string $id
+ * @param string $id
* @return bool
*/
// @codingStandardsIgnoreStart
@@ -315,16 +310,16 @@ protected function _validateTagUri($id)
$matches
)) {
$dvalid = false;
- $date = $matches['date'];
- $d6 = strtotime($date);
- if ((strlen($date) == 4) && $date <= date('Y')) {
+ $date = $matches['date'];
+ $d6 = strtotime($date);
+ if ((strlen($date) === 4) && $date <= date('Y')) {
$dvalid = true;
- } elseif ((strlen($date) == 7) && ($d6 < strtotime("now"))) {
+ } elseif ((strlen($date) === 7) && ($d6 < strtotime('now'))) {
$dvalid = true;
- } elseif ((strlen($date) == 10) && ($d6 < strtotime("now"))) {
+ } elseif ((strlen($date) === 10) && ($d6 < strtotime('now'))) {
$dvalid = true;
}
- $validator = new Validator\EmailAddress;
+ $validator = new Validator\EmailAddress();
if ($validator->isValid($matches['name'])) {
$nvalid = true;
} else {
@@ -349,10 +344,10 @@ protected function _setContent(DOMDocument $dom, DOMElement $root)
// @codingStandardsIgnoreEnd
$content = $this->getDataContainer()->getContent();
if (! $content && ! $this->getDataContainer()->getLink()) {
- $message = 'Atom 1.0 entry elements MUST contain exactly one '
- . 'atom:content element, or as an alternative, at least one link '
- . 'with a rel attribute of "alternate" to indicate an alternate '
- . 'method to consume the content.';
+ $message = 'Atom 1.0 entry elements MUST contain exactly one '
+ . 'atom:content element, or as an alternative, at least one link '
+ . 'with a rel attribute of "alternate" to indicate an alternate '
+ . 'method to consume the content.';
$exception = new Writer\Exception\InvalidArgumentException($message);
if (! $this->ignoreExceptions) {
throw $exception;
@@ -367,8 +362,8 @@ protected function _setContent(DOMDocument $dom, DOMElement $root)
$element = $dom->createElement('content');
$element->setAttribute('type', 'xhtml');
$xhtmlElement = $this->_loadXhtml($content);
- $deep = version_compare(PHP_VERSION, '7', 'ge') ? 1 : true;
- $xhtml = $dom->importNode($xhtmlElement, $deep);
+ $deep = version_compare(PHP_VERSION, '7', 'ge') ? 1 : true;
+ $xhtml = $dom->importNode($xhtmlElement, $deep);
$element->appendChild($xhtml);
$root->appendChild($element);
}
@@ -385,10 +380,10 @@ protected function _loadXhtml($content)
// @codingStandardsIgnoreEnd
if (class_exists('tidy', false)) {
$tidy = new \tidy;
- $config = [
- 'output-xhtml' => true,
+ $config = [
+ 'output-xhtml' => true,
'show-body-only' => true,
- 'quote-nbsp' => false
+ 'quote-nbsp' => false,
];
$encoding = str_replace('-', '', $this->getEncoding());
$tidy->parseString($content, $config, $encoding);
@@ -398,9 +393,9 @@ protected function _loadXhtml($content)
$xhtml = $content;
}
$xhtml = preg_replace([
- "/(<[\/]?)([a-zA-Z]+)/"
+ '/(<[\/]?)([a-zA-Z]+)/',
], '$1xhtml:$2', $xhtml);
- $dom = new DOMDocument('1.0', $this->getEncoding());
+ $dom = new DOMDocument('1.0', $this->getEncoding());
$dom->loadXML(
'<xhtml:div xmlns:xhtml="http://www.w3.org/1999/xhtml">'
. $xhtml
@@ -456,7 +451,7 @@ protected function _setSource(DOMDocument $dom, DOMElement $root)
}
$renderer = new Renderer\Feed\AtomSource($source);
$renderer->setType($this->getType());
- $element = $renderer->render()->getElement();
+ $element = $renderer->render()->getElement();
$imported = $dom->importNode($element, true);
$root->appendChild($imported);
}
diff --git a/vendor/zendframework/zend-feed/src/Writer/Renderer/Entry/Atom/Deleted.php b/vendor/laminas/laminas-feed/src/Writer/Renderer/Entry/Atom/Deleted.php
similarity index 76%
rename from vendor/zendframework/zend-feed/src/Writer/Renderer/Entry/Atom/Deleted.php
rename to vendor/laminas/laminas-feed/src/Writer/Renderer/Entry/Atom/Deleted.php
index 717718c6ae..845d134de2 100644
--- a/vendor/zendframework/zend-feed/src/Writer/Renderer/Entry/Atom/Deleted.php
+++ b/vendor/laminas/laminas-feed/src/Writer/Renderer/Entry/Atom/Deleted.php
@@ -1,27 +1,21 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Writer\Renderer\Entry\Atom;
+namespace Laminas\Feed\Writer\Renderer\Entry\Atom;
use DateTime;
use DOMDocument;
use DOMElement;
-use Zend\Feed\Writer;
-use Zend\Feed\Writer\Renderer;
+use Laminas\Feed\Writer;
+use Laminas\Feed\Writer\Renderer;
class Deleted extends Renderer\AbstractRenderer implements Renderer\RendererInterface
{
- /**
- * Constructor
- *
- * @param Writer\Deleted $container
- */
public function __construct(Writer\Deleted $container)
{
parent::__construct($container);
@@ -30,13 +24,13 @@ public function __construct(Writer\Deleted $container)
/**
* Render atom entry
*
- * @return Writer\Renderer\Entry\Atom
+ * @return $this
*/
public function render()
{
- $this->dom = new DOMDocument('1.0', $this->container->getEncoding());
+ $this->dom = new DOMDocument('1.0', $this->container->getEncoding());
$this->dom->formatOutput = true;
- $entry = $this->dom->createElement('at:deleted-entry');
+ $entry = $this->dom->createElement('at:deleted-entry');
$this->dom->appendChild($entry);
$entry->setAttribute('ref', $this->container->getReference());
@@ -81,11 +75,11 @@ protected function _setBy(DOMDocument $dom, DOMElement $root)
{
// @codingStandardsIgnoreEnd
$data = $this->container->getBy();
- if ((! $data || empty($data))) {
+ if (! $data || empty($data)) {
return;
}
$author = $this->dom->createElement('at:by');
- $name = $this->dom->createElement('name');
+ $name = $this->dom->createElement('name');
$author->appendChild($name);
$root->appendChild($author);
$text = $dom->createTextNode($data['name']);
diff --git a/vendor/zendframework/zend-feed/src/Writer/Renderer/Entry/AtomDeleted.php b/vendor/laminas/laminas-feed/src/Writer/Renderer/Entry/AtomDeleted.php
similarity index 75%
rename from vendor/zendframework/zend-feed/src/Writer/Renderer/Entry/AtomDeleted.php
rename to vendor/laminas/laminas-feed/src/Writer/Renderer/Entry/AtomDeleted.php
index f36f30d99b..dceb5390a2 100644
--- a/vendor/zendframework/zend-feed/src/Writer/Renderer/Entry/AtomDeleted.php
+++ b/vendor/laminas/laminas-feed/src/Writer/Renderer/Entry/AtomDeleted.php
@@ -1,29 +1,21 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Writer\Renderer\Entry;
+namespace Laminas\Feed\Writer\Renderer\Entry;
use DateTime;
use DOMDocument;
use DOMElement;
-use Zend\Feed\Writer;
-use Zend\Feed\Writer\Renderer;
+use Laminas\Feed\Writer;
+use Laminas\Feed\Writer\Renderer;
-/**
-*/
class AtomDeleted extends Renderer\AbstractRenderer implements Renderer\RendererInterface
{
- /**
- * Constructor
- *
- * @param Writer\Deleted $container
- */
public function __construct(Writer\Deleted $container)
{
parent::__construct($container);
@@ -32,13 +24,13 @@ public function __construct(Writer\Deleted $container)
/**
* Render atom entry
*
- * @return \Zend\Feed\Writer\Renderer\Entry\AtomDeleted
+ * @return $this
*/
public function render()
{
- $this->dom = new DOMDocument('1.0', $this->container->getEncoding());
+ $this->dom = new DOMDocument('1.0', $this->container->getEncoding());
$this->dom->formatOutput = true;
- $entry = $this->dom->createElement('at:deleted-entry');
+ $entry = $this->dom->createElement('at:deleted-entry');
$this->dom->appendChild($entry);
$entry->setAttribute('ref', $this->container->getReference());
@@ -83,11 +75,11 @@ protected function _setBy(DOMDocument $dom, DOMElement $root)
{
// @codingStandardsIgnoreEnd
$data = $this->container->getBy();
- if ((! $data || empty($data))) {
+ if (! $data || empty($data)) {
return;
}
$author = $this->dom->createElement('at:by');
- $name = $this->dom->createElement('name');
+ $name = $this->dom->createElement('name');
$author->appendChild($name);
$root->appendChild($author);
$text = $dom->createTextNode($data['name']);
diff --git a/vendor/zendframework/zend-feed/src/Writer/Renderer/Entry/Rss.php b/vendor/laminas/laminas-feed/src/Writer/Renderer/Entry/Rss.php
similarity index 84%
rename from vendor/zendframework/zend-feed/src/Writer/Renderer/Entry/Rss.php
rename to vendor/laminas/laminas-feed/src/Writer/Renderer/Entry/Rss.php
index f1e2181708..cc9829f0fa 100644
--- a/vendor/zendframework/zend-feed/src/Writer/Renderer/Entry/Rss.php
+++ b/vendor/laminas/laminas-feed/src/Writer/Renderer/Entry/Rss.php
@@ -1,30 +1,22 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Writer\Renderer\Entry;
+namespace Laminas\Feed\Writer\Renderer\Entry;
use DateTime;
use DOMDocument;
use DOMElement;
-use Zend\Feed\Uri;
-use Zend\Feed\Writer;
-use Zend\Feed\Writer\Renderer;
+use Laminas\Feed\Uri;
+use Laminas\Feed\Writer;
+use Laminas\Feed\Writer\Renderer;
-/**
-*/
class Rss extends Renderer\AbstractRenderer implements Renderer\RendererInterface
{
- /**
- * Constructor
- *
- * @param Writer\Entry $container
- */
public function __construct(Writer\Entry $container)
{
parent::__construct($container);
@@ -33,14 +25,14 @@ public function __construct(Writer\Entry $container)
/**
* Render RSS entry
*
- * @return Rss
+ * @return $this
*/
public function render()
{
- $this->dom = new DOMDocument('1.0', $this->container->getEncoding());
- $this->dom->formatOutput = true;
+ $this->dom = new DOMDocument('1.0', $this->container->getEncoding());
+ $this->dom->formatOutput = true;
$this->dom->substituteEntities = false;
- $entry = $this->dom->createElement('item');
+ $entry = $this->dom->createElement('item');
$this->dom->appendChild($entry);
$this->_setTitle($this->dom, $entry);
@@ -76,10 +68,11 @@ protected function _setTitle(DOMDocument $dom, DOMElement $root)
{
// @codingStandardsIgnoreEnd
if (! $this->getDataContainer()->getDescription()
- && ! $this->getDataContainer()->getTitle()) {
- $message = 'RSS 2.0 entry elements SHOULD contain exactly one'
- . ' title element but a title has not been set. In addition, there'
- . ' is no description as required in the absence of a title.';
+ && ! $this->getDataContainer()->getTitle()
+ ) {
+ $message = 'RSS 2.0 entry elements SHOULD contain exactly one'
+ . ' title element but a title has not been set. In addition, there'
+ . ' is no description as required in the absence of a title.';
$exception = new Writer\Exception\InvalidArgumentException($message);
if (! $this->ignoreExceptions) {
throw $exception;
@@ -107,11 +100,12 @@ protected function _setDescription(DOMDocument $dom, DOMElement $root)
{
// @codingStandardsIgnoreEnd
if (! $this->getDataContainer()->getDescription()
- && ! $this->getDataContainer()->getTitle()) {
- $message = 'RSS 2.0 entry elements SHOULD contain exactly one'
- . ' description element but a description has not been set. In'
- . ' addition, there is no title element as required in the absence'
- . ' of a description.';
+ && ! $this->getDataContainer()->getTitle()
+ ) {
+ $message = 'RSS 2.0 entry elements SHOULD contain exactly one'
+ . ' description element but a description has not been set. In'
+ . ' addition, there is no title element as required in the absence'
+ . ' of a description.';
$exception = new Writer\Exception\InvalidArgumentException($message);
if (! $this->ignoreExceptions) {
throw $exception;
@@ -185,12 +179,12 @@ protected function _setAuthors(DOMDocument $dom, DOMElement $root)
{
// @codingStandardsIgnoreEnd
$authors = $this->container->getAuthors();
- if ((! $authors || empty($authors))) {
+ if (! $authors || empty($authors)) {
return;
}
foreach ($authors as $data) {
$author = $this->dom->createElement('author');
- $name = $data['name'];
+ $name = $data['name'];
if (array_key_exists('email', $data)) {
$name = $data['email'] . ' (' . $data['name'] . ')';
}
@@ -213,7 +207,7 @@ protected function _setEnclosure(DOMDocument $dom, DOMElement $root)
{
// @codingStandardsIgnoreEnd
$data = $this->container->getEnclosure();
- if ((! $data || empty($data))) {
+ if (! $data || empty($data)) {
return;
}
if (! isset($data['type'])) {
@@ -235,14 +229,15 @@ protected function _setEnclosure(DOMDocument $dom, DOMElement $root)
}
}
if ((int) $data['length'] < 0 || ! ctype_digit((string) $data['length'])) {
- $exception = new Writer\Exception\InvalidArgumentException('Enclosure "length" must be an integer'
- . ' indicating the content\'s length in bytes');
+ $exception = new Writer\Exception\InvalidArgumentException(
+ 'Enclosure "length" must be an integer indicating the content\'s length in bytes'
+ );
if (! $this->ignoreExceptions) {
throw $exception;
- } else {
- $this->exceptions[] = $exception;
- return;
}
+
+ $this->exceptions[] = $exception;
+ return;
}
$enclosure = $this->dom->createElement('enclosure');
$enclosure->setAttribute('type', $data['type']);
@@ -283,7 +278,8 @@ protected function _setId(DOMDocument $dom, DOMElement $root)
{
// @codingStandardsIgnoreEnd
if (! $this->getDataContainer()->getId()
- && ! $this->getDataContainer()->getLink()) {
+ && ! $this->getDataContainer()->getLink()
+ ) {
return;
}
@@ -320,7 +316,7 @@ protected function _setCommentLink(DOMDocument $dom, DOMElement $root)
return;
}
$clink = $this->dom->createElement('comments');
- $text = $dom->createTextNode($link);
+ $text = $dom->createTextNode($link);
$clink->appendChild($text);
$root->appendChild($clink);
}
diff --git a/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/AbstractAtom.php b/vendor/laminas/laminas-feed/src/Writer/Renderer/Feed/AbstractAtom.php
similarity index 87%
rename from vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/AbstractAtom.php
rename to vendor/laminas/laminas-feed/src/Writer/Renderer/Feed/AbstractAtom.php
index 349d65cd65..de7e83633f 100644
--- a/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/AbstractAtom.php
+++ b/vendor/laminas/laminas-feed/src/Writer/Renderer/Feed/AbstractAtom.php
@@ -1,29 +1,24 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Writer\Renderer\Feed;
+namespace Laminas\Feed\Writer\Renderer\Feed;
use DateTime;
use DOMDocument;
use DOMElement;
-use Zend\Feed\Writer;
-use Zend\Feed\Writer\Renderer;
-use Zend\Feed\Writer\Version;
+use Laminas\Feed\Writer;
+use Laminas\Feed\Writer\Renderer;
+use Laminas\Feed\Writer\Version;
-/**
-*/
class AbstractAtom extends Renderer\AbstractRenderer
{
/**
- * Constructor
- *
- * @param Writer\AbstractFeed $container
+ * @param Writer\AbstractFeed $container
*/
public function __construct($container)
{
@@ -42,8 +37,7 @@ protected function _setLanguage(DOMDocument $dom, DOMElement $root)
{
// @codingStandardsIgnoreEnd
if ($this->getDataContainer()->getLanguage()) {
- $root->setAttribute('xml:lang', $this->getDataContainer()
- ->getLanguage());
+ $root->setAttribute('xml:lang', $this->getDataContainer()->getLanguage());
}
}
@@ -60,8 +54,8 @@ protected function _setTitle(DOMDocument $dom, DOMElement $root)
{
// @codingStandardsIgnoreEnd
if (! $this->getDataContainer()->getTitle()) {
- $message = 'Atom 1.0 feed elements MUST contain exactly one'
- . ' atom:title element but a title has not been set';
+ $message = 'Atom 1.0 feed elements MUST contain exactly one'
+ . ' atom:title element but a title has not been set';
$exception = new Writer\Exception\InvalidArgumentException($message);
if (! $this->ignoreExceptions) {
throw $exception;
@@ -112,8 +106,8 @@ protected function _setDateModified(DOMDocument $dom, DOMElement $root)
{
// @codingStandardsIgnoreEnd
if (! $this->getDataContainer()->getDateModified()) {
- $message = 'Atom 1.0 feed elements MUST contain exactly one'
- . ' atom:updated element but a modification date has not been set';
+ $message = 'Atom 1.0 feed elements MUST contain exactly one'
+ . ' atom:updated element but a modification date has not been set';
$exception = new Writer\Exception\InvalidArgumentException($message);
if (! $this->ignoreExceptions) {
throw $exception;
@@ -144,13 +138,13 @@ protected function _setGenerator(DOMDocument $dom, DOMElement $root)
// @codingStandardsIgnoreEnd
if (! $this->getDataContainer()->getGenerator()) {
$this->getDataContainer()->setGenerator(
- 'Zend_Feed_Writer',
+ 'Laminas_Feed_Writer',
Version::VERSION,
- 'http://framework.zend.com'
+ 'https://getlaminas.org'
);
}
- $gdata = $this->getDataContainer()->getGenerator();
+ $gdata = $this->getDataContainer()->getGenerator();
$generator = $dom->createElement('generator');
$root->appendChild($generator);
$text = $dom->createTextNode($gdata['name']);
@@ -198,10 +192,10 @@ protected function _setFeedLinks(DOMDocument $dom, DOMElement $root)
// @codingStandardsIgnoreEnd
$flinks = $this->getDataContainer()->getFeedLinks();
if (! $flinks || ! array_key_exists('atom', $flinks)) {
- $message = 'Atom 1.0 feed elements SHOULD contain one atom:link '
- . 'element with a rel attribute value of "self". This is the '
- . 'preferred URI for retrieving Atom Feed Documents representing '
- . 'this Atom feed but a feed link has not been set';
+ $message = 'Atom 1.0 feed elements SHOULD contain one atom:link '
+ . 'element with a rel attribute value of "self". This is the '
+ . 'preferred URI for retrieving Atom Feed Documents representing '
+ . 'this Atom feed but a feed link has not been set';
$exception = new Writer\Exception\InvalidArgumentException($message);
if (! $this->ignoreExceptions) {
throw $exception;
@@ -212,7 +206,7 @@ protected function _setFeedLinks(DOMDocument $dom, DOMElement $root)
}
foreach ($flinks as $type => $href) {
- $mime = 'application/' . strtolower($type) . '+xml';
+ $mime = 'application/' . strtolower($type) . '+xml';
$flink = $dom->createElement('link');
$root->appendChild($flink);
$flink->setAttribute('rel', 'self');
@@ -243,7 +237,7 @@ protected function _setAuthors(DOMDocument $dom, DOMElement $root)
}
foreach ($authors as $data) {
$author = $this->dom->createElement('author');
- $name = $this->dom->createElement('name');
+ $name = $this->dom->createElement('name');
$author->appendChild($name);
$root->appendChild($author);
$text = $dom->createTextNode($data['name']);
@@ -276,11 +270,12 @@ protected function _setId(DOMDocument $dom, DOMElement $root)
{
// @codingStandardsIgnoreEnd
if (! $this->getDataContainer()->getId()
- && ! $this->getDataContainer()->getLink()) {
- $message = 'Atom 1.0 feed elements MUST contain exactly one '
- . 'atom:id element, or as an alternative, we can use the same '
- . 'value as atom:link however neither a suitable link nor an '
- . 'id have been set';
+ && ! $this->getDataContainer()->getLink()
+ ) {
+ $message = 'Atom 1.0 feed elements MUST contain exactly one '
+ . 'atom:id element, or as an alternative, we can use the same '
+ . 'value as atom:link however neither a suitable link nor an '
+ . 'id have been set';
$exception = new Writer\Exception\InvalidArgumentException($message);
if (! $this->ignoreExceptions) {
throw $exception;
diff --git a/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/Atom.php b/vendor/laminas/laminas-feed/src/Writer/Renderer/Feed/Atom.php
similarity index 78%
rename from vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/Atom.php
rename to vendor/laminas/laminas-feed/src/Writer/Renderer/Feed/Atom.php
index 1739f780f2..edb1409ce2 100644
--- a/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/Atom.php
+++ b/vendor/laminas/laminas-feed/src/Writer/Renderer/Feed/Atom.php
@@ -1,27 +1,19 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Writer\Renderer\Feed;
+namespace Laminas\Feed\Writer\Renderer\Feed;
use DOMDocument;
-use Zend\Feed\Writer;
-use Zend\Feed\Writer\Renderer;
+use Laminas\Feed\Writer;
+use Laminas\Feed\Writer\Renderer;
-/**
-*/
class Atom extends AbstractAtom implements Renderer\RendererInterface
{
- /**
- * Constructor
- *
- * @param Writer\Feed $container
- */
public function __construct(Writer\Feed $container)
{
parent::__construct($container);
@@ -30,16 +22,16 @@ public function __construct(Writer\Feed $container)
/**
* Render Atom feed
*
- * @return Atom
+ * @return $this
*/
public function render()
{
if (! $this->container->getEncoding()) {
$this->container->setEncoding('UTF-8');
}
- $this->dom = new DOMDocument('1.0', $this->container->getEncoding());
+ $this->dom = new DOMDocument('1.0', $this->container->getEncoding());
$this->dom->formatOutput = true;
- $root = $this->dom->createElementNS(
+ $root = $this->dom->createElementNS(
Writer\Writer::NAMESPACE_ATOM_10,
'feed'
);
@@ -89,8 +81,8 @@ public function render()
$renderer->setType($this->getType());
$renderer->setRootElement($this->dom->documentElement);
$renderer->render();
- $element = $renderer->getElement();
- $deep = version_compare(PHP_VERSION, '7', 'ge') ? 1 : true;
+ $element = $renderer->getElement();
+ $deep = version_compare(PHP_VERSION, '7', 'ge') ? 1 : true;
$imported = $this->dom->importNode($element, $deep);
$root->appendChild($imported);
}
diff --git a/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/Atom/AbstractAtom.php b/vendor/laminas/laminas-feed/src/Writer/Renderer/Feed/Atom/AbstractAtom.php
similarity index 91%
rename from vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/Atom/AbstractAtom.php
rename to vendor/laminas/laminas-feed/src/Writer/Renderer/Feed/Atom/AbstractAtom.php
index 2330057313..572cdda1f0 100644
--- a/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/Atom/AbstractAtom.php
+++ b/vendor/laminas/laminas-feed/src/Writer/Renderer/Feed/Atom/AbstractAtom.php
@@ -1,26 +1,23 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Writer\Renderer\Feed\Atom;
+namespace Laminas\Feed\Writer\Renderer\Feed\Atom;
-use Datetime;
+use DateTime;
use DOMDocument;
use DOMElement;
-use Zend\Feed;
-use Zend\Feed\Writer\Version;
+use Laminas\Feed;
+use Laminas\Feed\Writer\Version;
class AbstractAtom extends Feed\Writer\Renderer\AbstractRenderer
{
/**
- * Constructor
- *
- * @param \Zend\Feed\Writer\Feed $container
+ * @param Feed\Writer\Feed $container
*/
public function __construct($container)
{
@@ -39,8 +36,7 @@ protected function _setLanguage(DOMDocument $dom, DOMElement $root)
{
// @codingStandardsIgnoreEnd
if ($this->getDataContainer()->getLanguage()) {
- $root->setAttribute('xml:lang', $this->getDataContainer()
- ->getLanguage());
+ $root->setAttribute('xml:lang', $this->getDataContainer()->getLanguage());
}
}
@@ -57,7 +53,7 @@ protected function _setTitle(DOMDocument $dom, DOMElement $root)
{
// @codingStandardsIgnoreEnd
if (! $this->getDataContainer()->getTitle()) {
- $message = 'Atom 1.0 feed elements MUST contain exactly one'
+ $message = 'Atom 1.0 feed elements MUST contain exactly one'
. ' atom:title element but a title has not been set';
$exception = new Feed\Exception\InvalidArgumentException($message);
if (! $this->ignoreExceptions) {
@@ -109,7 +105,7 @@ protected function _setDateModified(DOMDocument $dom, DOMElement $root)
{
// @codingStandardsIgnoreEnd
if (! $this->getDataContainer()->getDateModified()) {
- $message = 'Atom 1.0 feed elements MUST contain exactly one'
+ $message = 'Atom 1.0 feed elements MUST contain exactly one'
. ' atom:updated element but a modification date has not been set';
$exception = new Feed\Exception\InvalidArgumentException($message);
if (! $this->ignoreExceptions) {
@@ -141,13 +137,13 @@ protected function _setGenerator(DOMDocument $dom, DOMElement $root)
// @codingStandardsIgnoreEnd
if (! $this->getDataContainer()->getGenerator()) {
$this->getDataContainer()->setGenerator(
- 'Zend_Feed_Writer',
+ 'Laminas_Feed_Writer',
Version::VERSION,
- 'http://framework.zend.com'
+ 'https://getlaminas.org'
);
}
- $gdata = $this->getDataContainer()->getGenerator();
+ $gdata = $this->getDataContainer()->getGenerator();
$generator = $dom->createElement('generator');
$root->appendChild($generator);
$text = $dom->createTextNode($gdata['name']);
@@ -195,7 +191,7 @@ protected function _setFeedLinks(DOMDocument $dom, DOMElement $root)
// @codingStandardsIgnoreEnd
$flinks = $this->getDataContainer()->getFeedLinks();
if (! $flinks || ! array_key_exists('atom', $flinks)) {
- $message = 'Atom 1.0 feed elements SHOULD contain one atom:link '
+ $message = 'Atom 1.0 feed elements SHOULD contain one atom:link '
. 'element with a rel attribute value of "self". This is the '
. 'preferred URI for retrieving Atom Feed Documents representing '
. 'this Atom feed but a feed link has not been set';
@@ -209,7 +205,7 @@ protected function _setFeedLinks(DOMDocument $dom, DOMElement $root)
}
foreach ($flinks as $type => $href) {
- $mime = 'application/' . strtolower($type) . '+xml';
+ $mime = 'application/' . strtolower($type) . '+xml';
$flink = $dom->createElement('link');
$root->appendChild($flink);
$flink->setAttribute('rel', 'self');
@@ -240,7 +236,7 @@ protected function _setAuthors(DOMDocument $dom, DOMElement $root)
}
foreach ($authors as $data) {
$author = $this->dom->createElement('author');
- $name = $this->dom->createElement('name');
+ $name = $this->dom->createElement('name');
$author->appendChild($name);
$root->appendChild($author);
$text = $dom->createTextNode($data['name']);
@@ -273,8 +269,9 @@ protected function _setId(DOMDocument $dom, DOMElement $root)
{
// @codingStandardsIgnoreEnd
if (! $this->getDataContainer()->getId()
- && ! $this->getDataContainer()->getLink()) {
- $message = 'Atom 1.0 feed elements MUST contain exactly one '
+ && ! $this->getDataContainer()->getLink()
+ ) {
+ $message = 'Atom 1.0 feed elements MUST contain exactly one '
. 'atom:id element, or as an alternative, we can use the same '
. 'value as atom:link however neither a suitable link nor an '
. 'id have been set';
diff --git a/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/Atom/Source.php b/vendor/laminas/laminas-feed/src/Writer/Renderer/Feed/Atom/Source.php
similarity index 76%
rename from vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/Atom/Source.php
rename to vendor/laminas/laminas-feed/src/Writer/Renderer/Feed/Atom/Source.php
index ac48fb859c..098a45e460 100644
--- a/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/Atom/Source.php
+++ b/vendor/laminas/laminas-feed/src/Writer/Renderer/Feed/Atom/Source.php
@@ -1,26 +1,20 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Writer\Renderer\Feed\Atom;
+namespace Laminas\Feed\Writer\Renderer\Feed\Atom;
use DOMDocument;
use DOMElement;
-use Zend\Feed\Writer;
-use Zend\Feed\Writer\Renderer;
+use Laminas\Feed\Writer;
+use Laminas\Feed\Writer\Renderer;
class Source extends AbstractAtom implements Renderer\RendererInterface
{
- /**
- * Constructor
- *
- * @param Writer\Source $container
- */
public function __construct(Writer\Source $container)
{
parent::__construct($container);
@@ -29,16 +23,16 @@ public function __construct(Writer\Source $container)
/**
* Render Atom Feed Metadata (Source element)
*
- * @return AbstractAtom
+ * @return $this
*/
public function render()
{
if (! $this->container->getEncoding()) {
$this->container->setEncoding('UTF-8');
}
- $this->dom = new DOMDocument('1.0', $this->container->getEncoding());
+ $this->dom = new DOMDocument('1.0', $this->container->getEncoding());
$this->dom->formatOutput = true;
- $root = $this->dom->createElement('source');
+ $root = $this->dom->createElement('source');
$this->setRootElement($root);
$this->dom->appendChild($root);
$this->_setLanguage($this->dom, $root);
@@ -79,7 +73,7 @@ protected function _setGenerator(DOMDocument $dom, DOMElement $root)
return;
}
- $gdata = $this->getDataContainer()->getGenerator();
+ $gdata = $this->getDataContainer()->getGenerator();
$generator = $dom->createElement('generator');
$root->appendChild($generator);
$text = $dom->createTextNode($gdata['name']);
diff --git a/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/AtomSource.php b/vendor/laminas/laminas-feed/src/Writer/Renderer/Feed/AtomSource.php
similarity index 75%
rename from vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/AtomSource.php
rename to vendor/laminas/laminas-feed/src/Writer/Renderer/Feed/AtomSource.php
index 0c00fa15b3..74b01d9b06 100644
--- a/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/AtomSource.php
+++ b/vendor/laminas/laminas-feed/src/Writer/Renderer/Feed/AtomSource.php
@@ -1,28 +1,20 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Writer\Renderer\Feed;
+namespace Laminas\Feed\Writer\Renderer\Feed;
use DOMDocument;
use DOMElement;
-use Zend\Feed\Writer;
-use Zend\Feed\Writer\Renderer;
+use Laminas\Feed\Writer;
+use Laminas\Feed\Writer\Renderer;
-/**
-*/
class AtomSource extends AbstractAtom implements Renderer\RendererInterface
{
- /**
- * Constructor
- *
- * @param Writer\Source $container
- */
public function __construct(Writer\Source $container)
{
parent::__construct($container);
@@ -31,16 +23,16 @@ public function __construct(Writer\Source $container)
/**
* Render Atom Feed Metadata (Source element)
*
- * @return \Zend\Feed\Writer\Renderer\Feed\AbstractAtom
+ * @return $this
*/
public function render()
{
if (! $this->container->getEncoding()) {
$this->container->setEncoding('UTF-8');
}
- $this->dom = new DOMDocument('1.0', $this->container->getEncoding());
+ $this->dom = new DOMDocument('1.0', $this->container->getEncoding());
$this->dom->formatOutput = true;
- $root = $this->dom->createElement('source');
+ $root = $this->dom->createElement('source');
$this->setRootElement($root);
$this->dom->appendChild($root);
$this->_setLanguage($this->dom, $root);
@@ -81,7 +73,7 @@ protected function _setGenerator(DOMDocument $dom, DOMElement $root)
return;
}
- $gdata = $this->getDataContainer()->getGenerator();
+ $gdata = $this->getDataContainer()->getGenerator();
$generator = $dom->createElement('generator');
$root->appendChild($generator);
$text = $dom->createTextNode($gdata['name']);
diff --git a/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/Rss.php b/vendor/laminas/laminas-feed/src/Writer/Renderer/Feed/Rss.php
similarity index 86%
rename from vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/Rss.php
rename to vendor/laminas/laminas-feed/src/Writer/Renderer/Feed/Rss.php
index 0f340b5294..c13bb3c548 100644
--- a/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/Rss.php
+++ b/vendor/laminas/laminas-feed/src/Writer/Renderer/Feed/Rss.php
@@ -1,31 +1,23 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Writer\Renderer\Feed;
+namespace Laminas\Feed\Writer\Renderer\Feed;
use DateTime;
use DOMDocument;
use DOMElement;
-use Zend\Feed\Uri;
-use Zend\Feed\Writer;
-use Zend\Feed\Writer\Renderer;
-use Zend\Feed\Writer\Version;
+use Laminas\Feed\Uri;
+use Laminas\Feed\Writer;
+use Laminas\Feed\Writer\Renderer;
+use Laminas\Feed\Writer\Version;
-/**
-*/
class Rss extends Renderer\AbstractRenderer implements Renderer\RendererInterface
{
- /**
- * Constructor
- *
- * @param Writer\Feed $container
- */
public function __construct(Writer\Feed $container)
{
parent::__construct($container);
@@ -34,14 +26,14 @@ public function __construct(Writer\Feed $container)
/**
* Render RSS feed
*
- * @return self
+ * @return $this
*/
public function render()
{
- $this->dom = new DOMDocument('1.0', $this->container->getEncoding());
- $this->dom->formatOutput = true;
+ $this->dom = new DOMDocument('1.0', $this->container->getEncoding());
+ $this->dom->formatOutput = true;
$this->dom->substituteEntities = false;
- $rss = $this->dom->createElement('rss');
+ $rss = $this->dom->createElement('rss');
$this->setRootElement($rss);
$rss->setAttribute('version', '2.0');
@@ -84,8 +76,8 @@ public function render()
$renderer->setType($this->getType());
$renderer->setRootElement($this->dom->documentElement);
$renderer->render();
- $element = $renderer->getElement();
- $deep = version_compare(PHP_VERSION, '7', 'ge') ? 1 : true;
+ $element = $renderer->getElement();
+ $deep = version_compare(PHP_VERSION, '7', 'ge') ? 1 : true;
$imported = $this->dom->importNode($element, $deep);
$channel->appendChild($imported);
}
@@ -125,8 +117,8 @@ protected function _setTitle(DOMDocument $dom, DOMElement $root)
{
// @codingStandardsIgnoreEnd
if (! $this->getDataContainer()->getTitle()) {
- $message = 'RSS 2.0 feed elements MUST contain exactly one'
- . ' title element but a title has not been set';
+ $message = 'RSS 2.0 feed elements MUST contain exactly one'
+ . ' title element but a title has not been set';
$exception = new Writer\Exception\InvalidArgumentException($message);
if (! $this->ignoreExceptions) {
throw $exception;
@@ -155,8 +147,8 @@ protected function _setDescription(DOMDocument $dom, DOMElement $root)
{
// @codingStandardsIgnoreEnd
if (! $this->getDataContainer()->getDescription()) {
- $message = 'RSS 2.0 feed elements MUST contain exactly one'
- . ' description element but one has not been set';
+ $message = 'RSS 2.0 feed elements MUST contain exactly one'
+ . ' description element but one has not been set';
$exception = new Writer\Exception\InvalidArgumentException($message);
if (! $this->ignoreExceptions) {
throw $exception;
@@ -207,13 +199,13 @@ protected function _setGenerator(DOMDocument $dom, DOMElement $root)
// @codingStandardsIgnoreEnd
if (! $this->getDataContainer()->getGenerator()) {
$this->getDataContainer()->setGenerator(
- 'Zend_Feed_Writer',
+ 'Laminas_Feed_Writer',
Version::VERSION,
- 'http://framework.zend.com'
+ 'https://getlaminas.org'
);
}
- $gdata = $this->getDataContainer()->getGenerator();
+ $gdata = $this->getDataContainer()->getGenerator();
$generator = $dom->createElement('generator');
$root->appendChild($generator);
$name = $gdata['name'];
@@ -241,8 +233,8 @@ protected function _setLink(DOMDocument $dom, DOMElement $root)
// @codingStandardsIgnoreEnd
$value = $this->getDataContainer()->getLink();
if (! $value) {
- $message = 'RSS 2.0 feed elements MUST contain exactly one'
- . ' link element but one has not been set';
+ $message = 'RSS 2.0 feed elements MUST contain exactly one'
+ . ' link element but one has not been set';
$exception = new Writer\Exception\InvalidArgumentException($message);
if (! $this->ignoreExceptions) {
throw $exception;
@@ -277,7 +269,7 @@ protected function _setAuthors(DOMDocument $dom, DOMElement $root)
}
foreach ($authors as $data) {
$author = $this->dom->createElement('author');
- $name = $data['name'];
+ $name = $data['name'];
if (array_key_exists('email', $data)) {
$name = $data['email'] . ' (' . $data['name'] . ')';
}
@@ -328,7 +320,7 @@ protected function _setImage(DOMDocument $dom, DOMElement $root)
if (! isset($image['title']) || empty($image['title'])
|| ! is_string($image['title'])
) {
- $message = 'RSS 2.0 feed images must include a title';
+ $message = 'RSS 2.0 feed images must include a title';
$exception = new Writer\Exception\InvalidArgumentException($message);
if (! $this->ignoreExceptions) {
throw $exception;
@@ -341,8 +333,8 @@ protected function _setImage(DOMDocument $dom, DOMElement $root)
if (empty($image['link']) || ! is_string($image['link'])
|| ! Uri::factory($image['link'])->isValid()
) {
- $message = 'Invalid parameter: parameter \'link\''
- . ' must be a non-empty string and valid URI/IRI';
+ $message = 'Invalid parameter: parameter \'link\''
+ . ' must be a non-empty string and valid URI/IRI';
$exception = new Writer\Exception\InvalidArgumentException($message);
if (! $this->ignoreExceptions) {
throw $exception;
@@ -352,19 +344,19 @@ protected function _setImage(DOMDocument $dom, DOMElement $root)
}
}
- $img = $dom->createElement('image');
+ $img = $dom->createElement('image');
$root->appendChild($img);
- $url = $dom->createElement('url');
- $text = $dom->createTextNode($image['uri']);
+ $url = $dom->createElement('url');
+ $text = $dom->createTextNode($image['uri']);
$url->appendChild($text);
$title = $dom->createElement('title');
$text = $dom->createTextNode($image['title']);
$title->appendChild($text);
- $link = $dom->createElement('link');
- $text = $dom->createTextNode($image['link']);
+ $link = $dom->createElement('link');
+ $text = $dom->createTextNode($image['link']);
$link->appendChild($text);
$img->appendChild($url);
@@ -373,8 +365,8 @@ protected function _setImage(DOMDocument $dom, DOMElement $root)
if (isset($image['height'])) {
if (! ctype_digit((string) $image['height']) || $image['height'] > 400) {
- $message = 'Invalid parameter: parameter \'height\''
- . ' must be an integer not exceeding 400';
+ $message = 'Invalid parameter: parameter \'height\''
+ . ' must be an integer not exceeding 400';
$exception = new Writer\Exception\InvalidArgumentException($message);
if (! $this->ignoreExceptions) {
throw $exception;
@@ -390,8 +382,8 @@ protected function _setImage(DOMDocument $dom, DOMElement $root)
}
if (isset($image['width'])) {
if (! ctype_digit((string) $image['width']) || $image['width'] > 144) {
- $message = 'Invalid parameter: parameter \'width\''
- . ' must be an integer not exceeding 144';
+ $message = 'Invalid parameter: parameter \'width\''
+ . ' must be an integer not exceeding 144';
$exception = new Writer\Exception\InvalidArgumentException($message);
if (! $this->ignoreExceptions) {
throw $exception;
@@ -407,8 +399,8 @@ protected function _setImage(DOMDocument $dom, DOMElement $root)
}
if (isset($image['description'])) {
if (empty($image['description']) || ! is_string($image['description'])) {
- $message = 'Invalid parameter: parameter \'description\''
- . ' must be a non-empty string';
+ $message = 'Invalid parameter: parameter \'description\''
+ . ' must be a non-empty string';
$exception = new Writer\Exception\InvalidArgumentException($message);
if (! $this->ignoreExceptions) {
throw $exception;
diff --git a/vendor/zendframework/zend-feed/src/Writer/Renderer/RendererInterface.php b/vendor/laminas/laminas-feed/src/Writer/Renderer/RendererInterface.php
similarity index 83%
rename from vendor/zendframework/zend-feed/src/Writer/Renderer/RendererInterface.php
rename to vendor/laminas/laminas-feed/src/Writer/Renderer/RendererInterface.php
index 24738efcab..bb573dc5e2 100644
--- a/vendor/zendframework/zend-feed/src/Writer/Renderer/RendererInterface.php
+++ b/vendor/laminas/laminas-feed/src/Writer/Renderer/RendererInterface.php
@@ -1,19 +1,16 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Writer\Renderer;
+namespace Laminas\Feed\Writer\Renderer;
use DOMDocument;
use DOMElement;
-/**
-*/
interface RendererInterface
{
/**
@@ -86,8 +83,6 @@ public function getType();
* helps simplify the appending of namespace declarations, but also ensures
* namespaces are added to the root element - not scattered across the entire
* XML file - may assist namespace unsafe parsers and looks pretty ;).
- *
- * @param DOMElement $root
*/
public function setRootElement(DOMElement $root);
diff --git a/vendor/laminas/laminas-feed/src/Writer/Source.php b/vendor/laminas/laminas-feed/src/Writer/Source.php
new file mode 100644
index 0000000000..214d470b27
--- /dev/null
+++ b/vendor/laminas/laminas-feed/src/Writer/Source.php
@@ -0,0 +1,13 @@
+<?php
+
+/**
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Laminas\Feed\Writer;
+
+class Source extends AbstractFeed
+{
+}
diff --git a/vendor/zendframework/zend-feed/src/Writer/StandaloneExtensionManager.php b/vendor/laminas/laminas-feed/src/Writer/StandaloneExtensionManager.php
similarity index 56%
rename from vendor/zendframework/zend-feed/src/Writer/StandaloneExtensionManager.php
rename to vendor/laminas/laminas-feed/src/Writer/StandaloneExtensionManager.php
index 1e6ae7d1b7..494f8531de 100644
--- a/vendor/zendframework/zend-feed/src/Writer/StandaloneExtensionManager.php
+++ b/vendor/laminas/laminas-feed/src/Writer/StandaloneExtensionManager.php
@@ -1,34 +1,33 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Writer;
+namespace Laminas\Feed\Writer;
-use Zend\Feed\Writer\Exception\InvalidArgumentException;
+use Laminas\Feed\Writer\Exception\InvalidArgumentException;
class StandaloneExtensionManager implements ExtensionManagerInterface
{
private $extensions = [
- 'Atom\Renderer\Feed' => Extension\Atom\Renderer\Feed::class,
- 'Content\Renderer\Entry' => Extension\Content\Renderer\Entry::class,
- 'DublinCore\Renderer\Entry' => Extension\DublinCore\Renderer\Entry::class,
- 'DublinCore\Renderer\Feed' => Extension\DublinCore\Renderer\Feed::class,
+ 'Atom\Renderer\Feed' => Extension\Atom\Renderer\Feed::class,
+ 'Content\Renderer\Entry' => Extension\Content\Renderer\Entry::class,
+ 'DublinCore\Renderer\Entry' => Extension\DublinCore\Renderer\Entry::class,
+ 'DublinCore\Renderer\Feed' => Extension\DublinCore\Renderer\Feed::class,
'GooglePlayPodcast\Entry' => Extension\GooglePlayPodcast\Entry::class,
'GooglePlayPodcast\Feed' => Extension\GooglePlayPodcast\Feed::class,
'GooglePlayPodcast\Renderer\Entry' => Extension\GooglePlayPodcast\Renderer\Entry::class,
'GooglePlayPodcast\Renderer\Feed' => Extension\GooglePlayPodcast\Renderer\Feed::class,
- 'ITunes\Entry' => Extension\ITunes\Entry::class,
- 'ITunes\Feed' => Extension\ITunes\Feed::class,
- 'ITunes\Renderer\Entry' => Extension\ITunes\Renderer\Entry::class,
- 'ITunes\Renderer\Feed' => Extension\ITunes\Renderer\Feed::class,
- 'Slash\Renderer\Entry' => Extension\Slash\Renderer\Entry::class,
- 'Threading\Renderer\Entry' => Extension\Threading\Renderer\Entry::class,
- 'WellFormedWeb\Renderer\Entry' => Extension\WellFormedWeb\Renderer\Entry::class,
+ 'ITunes\Entry' => Extension\ITunes\Entry::class,
+ 'ITunes\Feed' => Extension\ITunes\Feed::class,
+ 'ITunes\Renderer\Entry' => Extension\ITunes\Renderer\Entry::class,
+ 'ITunes\Renderer\Feed' => Extension\ITunes\Renderer\Feed::class,
+ 'Slash\Renderer\Entry' => Extension\Slash\Renderer\Entry::class,
+ 'Threading\Renderer\Entry' => Extension\Threading\Renderer\Entry::class,
+ 'WellFormedWeb\Renderer\Entry' => Extension\WellFormedWeb\Renderer\Entry::class,
];
/**
@@ -63,11 +62,9 @@ public function get($extension)
public function add($name, $class)
{
if (is_string($class)
- && ((
- is_a($class, Extension\AbstractRenderer::class, true)
+ && (is_a($class, Extension\AbstractRenderer::class, true)
|| 'Feed' === substr($class, -4)
- || 'Entry' === substr($class, -5)
- ))
+ || 'Entry' === substr($class, -5))
) {
$this->extensions[$name] = $class;
diff --git a/vendor/laminas/laminas-feed/src/Writer/Version.php b/vendor/laminas/laminas-feed/src/Writer/Version.php
new file mode 100644
index 0000000000..3d4c71ba56
--- /dev/null
+++ b/vendor/laminas/laminas-feed/src/Writer/Version.php
@@ -0,0 +1,14 @@
+<?php
+
+/**
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Laminas\Feed\Writer;
+
+abstract class Version
+{
+ const VERSION = '2';
+}
diff --git a/vendor/zendframework/zend-feed/src/Writer/Writer.php b/vendor/laminas/laminas-feed/src/Writer/Writer.php
similarity index 89%
rename from vendor/zendframework/zend-feed/src/Writer/Writer.php
rename to vendor/laminas/laminas-feed/src/Writer/Writer.php
index 4f5c1697a9..5a7bd2d034 100644
--- a/vendor/zendframework/zend-feed/src/Writer/Writer.php
+++ b/vendor/laminas/laminas-feed/src/Writer/Writer.php
@@ -1,26 +1,23 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-feed for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-feed/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-feed/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Feed\Writer;
+namespace Laminas\Feed\Writer;
-/**
-*/
class Writer
{
/**
* Namespace constants
*/
- const NAMESPACE_ATOM_03 = 'http://purl.org/atom/ns#';
- const NAMESPACE_ATOM_10 = 'http://www.w3.org/2005/Atom';
- const NAMESPACE_RDF = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#';
- const NAMESPACE_RSS_090 = 'http://my.netscape.com/rdf/simple/0.9/';
- const NAMESPACE_RSS_10 = 'http://purl.org/rss/1.0/';
+ const NAMESPACE_ATOM_03 = 'http://purl.org/atom/ns#';
+ const NAMESPACE_ATOM_10 = 'http://www.w3.org/2005/Atom';
+ const NAMESPACE_RDF = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#';
+ const NAMESPACE_RSS_090 = 'http://my.netscape.com/rdf/simple/0.9/';
+ const NAMESPACE_RSS_10 = 'http://purl.org/rss/1.0/';
/**
* Feed type constants
@@ -43,7 +40,7 @@ class Writer
/**
* @var ExtensionManagerInterface
*/
- protected static $extensionManager = null;
+ protected static $extensionManager;
/**
* Array of registered extensions by class postfix (after the base class
@@ -166,7 +163,7 @@ public static function getExtensions()
public static function reset()
{
static::$extensionManager = null;
- static::$extensions = [
+ static::$extensions = [
'entry' => [],
'feed' => [],
'entryRenderer' => [],
@@ -208,7 +205,8 @@ public static function registerCoreExtensions()
/**
* @deprecated This method is deprecated and will be removed with version 3.0
* Use PHP's lcfirst function instead. @see https://php.net/manual/function.lcfirst.php
- * @param string $str
+ *
+ * @param string $str
* @return string
*/
public static function lcfirst($str)
@@ -228,12 +226,12 @@ public static function lcfirst($str)
* implementations may not yet have an entry for the extension, which would
* then otherwise cause registerExtension() to fail.
*
- * @param string $name
+ * @param string $name
* @return bool
*/
protected static function hasExtension($name)
{
- $manager = static::getExtensionManager();
+ $manager = static::getExtensionManager();
$feedName = $name . '\Feed';
$entryName = $name . '\Entry';
diff --git a/vendor/laminas/laminas-stdlib/CHANGELOG.md b/vendor/laminas/laminas-stdlib/CHANGELOG.md
new file mode 100644
index 0000000000..57b79833fe
--- /dev/null
+++ b/vendor/laminas/laminas-stdlib/CHANGELOG.md
@@ -0,0 +1,385 @@
+# Changelog
+
+All notable changes to this project will be documented in this file, in reverse chronological order by release.
+
+## 3.2.1 - 2018-08-28
+
+### Added
+
+- Nothing.
+
+### Changed
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [zendframework/zend-stdlib#92](https://github.com/zendframework/zend-stdlib/pull/92) fixes serialization of `SplPriorityQueue` by ensuring its `$serial`
+ property is also serialized.
+
+- [zendframework/zend-stdlib#91](https://github.com/zendframework/zend-stdlib/pull/91) fixes behavior in the `ArrayObject` implementation that was not
+ compatible with PHP 7.3.
+
+## 3.2.0 - 2018-04-30
+
+### Added
+
+- [zendframework/zend-stdlib#87](https://github.com/zendframework/zend-stdlib/pull/87) adds support for PHP 7.2.
+
+### Changed
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- [zendframework/zend-stdlib#87](https://github.com/zendframework/zend-stdlib/pull/87) removes support for HHVM.
+
+### Fixed
+
+- Nothing.
+
+## 3.1.1 - 2018-04-12
+
+### Added
+
+- Nothing.
+
+### Changed
+
+- [zendframework/zend-stdlib#67](https://github.com/zendframework/zend-stdlib/pull/67) changes the typehint of the `$content` property
+ of the `Message` class to indicate it is a string. All known implementations
+ already assumed this.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [zendframework/zend-stdlib#60](https://github.com/zendframework/zend-stdlib/pull/60) fixes an issue whereby calling `remove()` would
+ incorrectly re-calculate the maximum priority stored in the queue.
+
+- [zendframework/zend-stdlib#60](https://github.com/zendframework/zend-stdlib/pull/60) fixes an infinite loop condition that can occur when
+ inserting an item at 0 priority.
+
+## 3.1.0 - 2016-09-13
+
+### Added
+
+- [zendframework/zend-stdlib#63](https://github.com/zendframework/zend-stdlib/pull/63) adds a new
+ `Laminas\Stdlib\ConsoleHelper` class, providing minimal support for writing
+ output to `STDOUT` and `STDERR`, with optional colorization, when the console
+ supports that feature.
+
+### Deprecated
+
+- [zendframework/zend-stdlib#38](https://github.com/zendframework/zend-stdlib/pull/38) deprecates
+ `Laminas\Stdlib\JsonSerializable`, as all supported version of PHP now support
+ it.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Nothing.
+
+## 3.0.1 - 2016-04-12
+
+### Added
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [zendframework/zend-stdlib#59](https://github.com/zendframework/zend-stdlib/pull/59) fixes a notice
+ when defining the `Laminas\Json\Json::GLOB_BRACE` constant on systems using
+ non-gcc glob implementations.
+
+## 3.0.0 - 2016-02-03
+
+### Added
+
+- [zendframework/zend-stdlib#51](https://github.com/zendframework/zend-stdlib/pull/51) adds PHP 7 as a
+ supported PHP version.
+- [zendframework/zend-stdlib#51](https://github.com/zendframework/zend-stdlib/pull/51) adds a migration
+ document from v2 to v3. Hint: if you use hydrators, you need to be using
+ laminas-hydrator instead!
+- [zendframework/zend-stdlib#51](https://github.com/zendframework/zend-stdlib/pull/51) adds automated
+ documentation builds to gh-pages.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- [zendframework/zend-stdlib#33](https://github.com/zendframework/zend-stdlib/pull/33) - removed
+ deprecated classes
+ - *All Hydrator classes* see zendframework/zend-stdlib#22.
+ - `Laminas\Stdlib\CallbackHandler` see zendframework/zend-stdlib#35
+- [zendframework/zend-stdlib#37](https://github.com/zendframework/zend-stdlib/pull/37) - removed
+ deprecated classes and polyfills:
+ - `Laminas\Stdlib\DateTime`; this had been deprecated since 2.5, and only
+ existed as a polyfill for the `createFromISO8601()` support, now standard
+ in all PHP versions we support.
+ - `Laminas\Stdlib\Exception\InvalidCallbackException`, which was unused since zendframework/zend-stdlib#33.
+ - `Laminas\Stdlib\Guard\GuardUtils`, which duplicated `Laminas\Stdlib\Guard\AllGuardsTrait`
+ to allow usage with pre-PHP 5.4 versions.
+ - `src/compatibility/autoload.php`, which has been dprecated since 2.5.
+- [zendframework/zend-stdlib#37](https://github.com/zendframework/zend-stdlib/pull/37) - removed
+ unneeded dependencies:
+ - laminas-config (used only in testing ArrayUtils, and the test was redundant)
+ - laminas-serializer (no longer used)
+- [zendframework/zend-stdlib#51](https://github.com/zendframework/zend-stdlib/pull/51) removes the
+ documentation for hydrators, as those are part of the laminas-hydrator
+ component.
+
+### Fixed
+
+- Nothing.
+
+## 2.7.4 - 2015-10-15
+
+### Added
+
+- Nothing.
+
+### Deprecated
+
+- [zendframework/zend-stdlib#35](https://github.com/zendframework/zend-stdlib/pull/35) deprecates
+ `Laminas\Stdlib\CallbackHandler`, as the one component that used it,
+ laminas-eventmanager, will no longer depend on it starting in v3.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Nothing.
+
+## 2.7.3 - 2015-09-24
+
+### Added
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [zendframework/zend-stdlib#27](https://github.com/zendframework/zend-stdlib/pull/27) fixes a race
+ condition in the `FastPriorityQueue::remove()` logic that occurs when removing
+ items iteratively from the same priority of a queue.
+
+## 2.7.2 - 2015-09-23
+
+### Added
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [zendframework/zend-stdlib#26](https://github.com/zendframework/zend-stdlib/pull/26) fixes a subtle
+ inheritance issue with deprecation in the hydrators, and updates the
+ `HydratorInterface` to also extend the laminas-hydrator `HydratorInterface` to
+ ensure LSP is preserved.
+
+## 2.7.1 - 2015-09-22
+
+### Added
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [zendframework/zend-stdlib#24](https://github.com/zendframework/zend-stdlib/pull/24) fixes an import in
+ `FastPriorityQueue` to alias `SplPriorityQueue` in order to disambiguate with
+ the local override present in the component.
+
+## 2.7.0 - 2015-09-22
+
+### Added
+
+- [zendframework/zend-stdlib#19](https://github.com/zendframework/zend-stdlib/pull/19) adds a new
+ `FastPriorityQueue` implementation. It follows the same signature as
+ `SplPriorityQueue`, but uses a performance-optimized algorithm:
+
+ - inserts are 2x faster than `SplPriorityQueue` and 3x faster than the
+ `Laminas\Stdlib\PriorityQueue` implementation.
+ - extracts are 4x faster than `SplPriorityQueue` and 4-5x faster than the
+ `Laminas\Stdlib\PriorityQueue` implementation.
+
+ The intention is to use this as a drop-in replacement in the
+ `laminas-eventmanager` component to provide performance benefits.
+
+### Deprecated
+
+- [zendframework/zend-stdlib#20](https://github.com/zendframework/zend-stdlib/pull/20) deprecates *all
+ hydrator* classes, in favor of the new [laminas-hydrator](https://github.com/laminas/laminas-hydrator)
+ component. All classes were updated to extend their laminas-hydrator equivalents,
+ and marked as `@deprecated`, indicating the equivalent class from the other
+ repository.
+
+ Users *should* immediately start changing their code to use the laminas-hydrator
+ equivalents; in most cases, this can be as easy as removing the `Stdlib`
+ namespace from import statements or hydrator configuration. Hydrators will be
+ removed entirely from laminas-stdlib in v3.0, and all future updates to hydrators
+ will occur in the laminas-hydrator library.
+
+ Changes with backwards compatibility implications:
+
+ - Users implementing `Laminas\Stdlib\Hydrator\HydratorAwareInterface` will need to
+ update their `setHydrator()` implementation to typehint on
+ `Laminas\Hydrator\HydratorInterface`. This can be done by changing the import
+ statement for that interface as follows:
+
+ ```php
+ // Replace this:
+ use Laminas\Stdlib\Hydrator\HydratorInterface;
+ // with this:
+ use Laminas\Hydrator\HydratorInterface;
+ ```
+
+ If you are not using imports, change the typehint within the signature itself:
+
+ ```php
+ // Replace this:
+ public function setHydrator(\Laminas\Stdlib\Hydrator\HydratorInterface $hydrator)
+ // with this:
+ public function setHydrator(\Laminas\Hydrator\HydratorInterface $hydrator)
+ ```
+
+ If you are using `Laminas\Stdlib\Hydrator\HydratorAwareTrait`, no changes are
+ necessary, unless you override that method.
+
+ - If you were catching hydrator-generated exceptions, these were previously in
+ the `Laminas\Stdlib\Exception` namespace. You will need to update your code to
+ catch exceptions in the `Laminas\Hydrator\Exception` namespace.
+
+ - Users who *do* migrate to laminas-hydrator may end up in a situation where
+ their code will not work with existing libraries that are still type-hinting
+ on the laminas-stdlib interfaces. We will be attempting to address that ASAP,
+ but the deprecation within laminas-stdlib is necessary as a first step.
+
+ In the meantime, you can write hydrators targeting laminas-stdlib still in
+ order to guarantee compatibility.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Nothing.
+
+## 2.6.0 - 2015-07-21
+
+### Added
+
+- [zendframework/zend-stdlib#13](https://github.com/zendframework/zend-stdlib/pull/13) adds
+ `Laminas\Stdlib\Hydrator\Iterator`, which provides mechanisms for hydrating
+ objects when iterating a traversable. This allows creating generic collection
+ resultsets; the original idea was pulled from
+ [PhlyMongo](https://github.com/phly/PhlyMongo), where it was used to hydrate
+ collections retrieved from MongoDB.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Nothing.
+
+## 2.5.2 - 2015-07-21
+
+### Added
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [zendframework/zend-stdlib#9](https://github.com/zendframework/zend-stdlib/pull/9) fixes an issue with
+ count incrementation during insert in PriorityList, ensuring that incrementation only
+ occurs when the item inserted was not previously present in the list.
+
+## 2.4.4 - 2015-07-21
+
+### Added
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [zendframework/zend-stdlib#9](https://github.com/zendframework/zend-stdlib/pull/9) fixes an issue with
+ count incrementation during insert in PriorityList, ensuring that incrementation only
+ occurs when the item inserted was not previously present in the list.
diff --git a/vendor/laminas/laminas-stdlib/COPYRIGHT.md b/vendor/laminas/laminas-stdlib/COPYRIGHT.md
new file mode 100644
index 0000000000..c4fc4fee19
--- /dev/null
+++ b/vendor/laminas/laminas-stdlib/COPYRIGHT.md
@@ -0,0 +1,2 @@
+Copyright (c) 2019, Laminas Foundation.
+All rights reserved. (https://getlaminas.org/)
diff --git a/vendor/laminas/laminas-stdlib/LICENSE.md b/vendor/laminas/laminas-stdlib/LICENSE.md
new file mode 100644
index 0000000000..09f53edc11
--- /dev/null
+++ b/vendor/laminas/laminas-stdlib/LICENSE.md
@@ -0,0 +1,27 @@
+Copyright (c) 2019, Laminas Foundation
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+- Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+
+- Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+
+- Neither the name of Laminas Foundation nor the names of its contributors may
+ be used to endorse or promote products derived from this software without
+ specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/laminas/laminas-stdlib/README.md b/vendor/laminas/laminas-stdlib/README.md
new file mode 100644
index 0000000000..103bb939e6
--- /dev/null
+++ b/vendor/laminas/laminas-stdlib/README.md
@@ -0,0 +1,29 @@
+# laminas-stdlib
+
+[](https://travis-ci.org/laminas/laminas-stdlib)
+[](https://coveralls.io/github/laminas/laminas-stdlib?branch=master)
+
+`Laminas\Stdlib` is a set of components that implements general purpose utility
+class for different scopes like:
+
+- array utilities functions;
+- general messaging systems;
+- string wrappers;
+- etc.
+
+---
+
+- File issues at https://github.com/laminas/laminas-stdlib/issues
+- Documentation is at https://docs.laminas.dev/laminas-stdlib/
+
+## Benchmarks
+
+We provide scripts for benchmarking laminas-stdlib using the
+[PHPBench](https://github.com/phpbench/phpbench) framework; these can be
+found in the `benchmark/` directory.
+
+To execute the benchmarks you can run the following command:
+
+```bash
+$ vendor/bin/phpbench run --report=aggregate
+```
diff --git a/vendor/laminas/laminas-stdlib/composer.json b/vendor/laminas/laminas-stdlib/composer.json
new file mode 100644
index 0000000000..b3745908e0
--- /dev/null
+++ b/vendor/laminas/laminas-stdlib/composer.json
@@ -0,0 +1,60 @@
+{
+ "name": "laminas/laminas-stdlib",
+ "description": "SPL extensions, array utilities, error handlers, and more",
+ "license": "BSD-3-Clause",
+ "keywords": [
+ "laminas",
+ "stdlib"
+ ],
+ "homepage": "https://laminas.dev",
+ "support": {
+ "docs": "https://docs.laminas.dev/laminas-stdlib/",
+ "issues": "https://github.com/laminas/laminas-stdlib/issues",
+ "source": "https://github.com/laminas/laminas-stdlib",
+ "rss": "https://github.com/laminas/laminas-stdlib/releases.atom",
+ "chat": "https://laminas.dev/chat",
+ "forum": "https://discourse.laminas.dev"
+ },
+ "config": {
+ "sort-packages": true
+ },
+ "extra": {
+ "branch-alias": {
+ "dev-master": "3.2.x-dev",
+ "dev-develop": "3.3.x-dev"
+ }
+ },
+ "require": {
+ "php": "^5.6 || ^7.0",
+ "laminas/laminas-zendframework-bridge": "^1.0"
+ },
+ "require-dev": {
+ "laminas/laminas-coding-standard": "~1.0.0",
+ "phpbench/phpbench": "^0.13",
+ "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2"
+ },
+ "autoload": {
+ "psr-4": {
+ "Laminas\\Stdlib\\": "src/"
+ }
+ },
+ "autoload-dev": {
+ "psr-4": {
+ "LaminasTest\\Stdlib\\": "test/",
+ "LaminasBench\\Stdlib\\": "benchmark/"
+ }
+ },
+ "scripts": {
+ "check": [
+ "@cs-check",
+ "@test"
+ ],
+ "cs-check": "phpcs",
+ "cs-fix": "phpcbf",
+ "test": "phpunit --colors=always",
+ "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
+ },
+ "replace": {
+ "zendframework/zend-stdlib": "self.version"
+ }
+}
diff --git a/vendor/zendframework/zend-stdlib/src/AbstractOptions.php b/vendor/laminas/laminas-stdlib/src/AbstractOptions.php
similarity index 92%
rename from vendor/zendframework/zend-stdlib/src/AbstractOptions.php
rename to vendor/laminas/laminas-stdlib/src/AbstractOptions.php
index 172f5d363f..c2b113e840 100644
--- a/vendor/zendframework/zend-stdlib/src/AbstractOptions.php
+++ b/vendor/laminas/laminas-stdlib/src/AbstractOptions.php
@@ -1,13 +1,12 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-stdlib for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-stdlib/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-stdlib/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Stdlib;
+namespace Laminas\Stdlib;
use Traversable;
@@ -55,7 +54,7 @@ public function setFromArray($options)
__METHOD__,
'array',
'Traversable',
- 'Zend\Stdlib\AbstractOptions'
+ 'Laminas\Stdlib\AbstractOptions'
)
);
}
diff --git a/vendor/zendframework/zend-stdlib/src/ArrayObject.php b/vendor/laminas/laminas-stdlib/src/ArrayObject.php
similarity index 96%
rename from vendor/zendframework/zend-stdlib/src/ArrayObject.php
rename to vendor/laminas/laminas-stdlib/src/ArrayObject.php
index 8c77c62097..9bbb07411e 100644
--- a/vendor/zendframework/zend-stdlib/src/ArrayObject.php
+++ b/vendor/laminas/laminas-stdlib/src/ArrayObject.php
@@ -1,13 +1,12 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-stdlib for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-stdlib/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-stdlib/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Stdlib;
+namespace Laminas\Stdlib;
use ArrayAccess;
use Countable;
diff --git a/vendor/zendframework/zend-stdlib/src/ArraySerializableInterface.php b/vendor/laminas/laminas-stdlib/src/ArraySerializableInterface.php
similarity index 53%
rename from vendor/zendframework/zend-stdlib/src/ArraySerializableInterface.php
rename to vendor/laminas/laminas-stdlib/src/ArraySerializableInterface.php
index dcf8471952..d0d95eef17 100644
--- a/vendor/zendframework/zend-stdlib/src/ArraySerializableInterface.php
+++ b/vendor/laminas/laminas-stdlib/src/ArraySerializableInterface.php
@@ -1,13 +1,12 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-stdlib for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-stdlib/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-stdlib/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Stdlib;
+namespace Laminas\Stdlib;
interface ArraySerializableInterface
{
diff --git a/vendor/zendframework/zend-stdlib/src/ArrayStack.php b/vendor/laminas/laminas-stdlib/src/ArrayStack.php
similarity index 62%
rename from vendor/zendframework/zend-stdlib/src/ArrayStack.php
rename to vendor/laminas/laminas-stdlib/src/ArrayStack.php
index 39d02aacac..f06d2ad7b8 100644
--- a/vendor/zendframework/zend-stdlib/src/ArrayStack.php
+++ b/vendor/laminas/laminas-stdlib/src/ArrayStack.php
@@ -1,13 +1,12 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-stdlib for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-stdlib/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-stdlib/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Stdlib;
+namespace Laminas\Stdlib;
use ArrayIterator;
use ArrayObject as PhpArrayObject;
diff --git a/vendor/zendframework/zend-stdlib/src/ArrayUtils.php b/vendor/laminas/laminas-stdlib/src/ArrayUtils.php
similarity index 95%
rename from vendor/zendframework/zend-stdlib/src/ArrayUtils.php
rename to vendor/laminas/laminas-stdlib/src/ArrayUtils.php
index 4edcacf119..13eb25d0d5 100644
--- a/vendor/zendframework/zend-stdlib/src/ArrayUtils.php
+++ b/vendor/laminas/laminas-stdlib/src/ArrayUtils.php
@@ -1,17 +1,16 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-stdlib for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-stdlib/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-stdlib/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Stdlib;
+namespace Laminas\Stdlib;
+use Laminas\Stdlib\ArrayUtils\MergeRemoveKey;
+use Laminas\Stdlib\ArrayUtils\MergeReplaceKeyInterface;
use Traversable;
-use Zend\Stdlib\ArrayUtils\MergeRemoveKey;
-use Zend\Stdlib\ArrayUtils\MergeReplaceKeyInterface;
/**
* Utility class for testing and manipulation of PHP arrays.
diff --git a/vendor/laminas/laminas-stdlib/src/ArrayUtils/MergeRemoveKey.php b/vendor/laminas/laminas-stdlib/src/ArrayUtils/MergeRemoveKey.php
new file mode 100644
index 0000000000..8c9d56e696
--- /dev/null
+++ b/vendor/laminas/laminas-stdlib/src/ArrayUtils/MergeRemoveKey.php
@@ -0,0 +1,13 @@
+<?php
+
+/**
+ * @see https://github.com/laminas/laminas-stdlib for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-stdlib/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-stdlib/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Laminas\Stdlib\ArrayUtils;
+
+final class MergeRemoveKey
+{
+}
diff --git a/vendor/zendframework/zend-stdlib/src/ArrayUtils/MergeReplaceKey.php b/vendor/laminas/laminas-stdlib/src/ArrayUtils/MergeReplaceKey.php
similarity index 52%
rename from vendor/zendframework/zend-stdlib/src/ArrayUtils/MergeReplaceKey.php
rename to vendor/laminas/laminas-stdlib/src/ArrayUtils/MergeReplaceKey.php
index 24c1df4d7a..2ab886c9cb 100644
--- a/vendor/zendframework/zend-stdlib/src/ArrayUtils/MergeReplaceKey.php
+++ b/vendor/laminas/laminas-stdlib/src/ArrayUtils/MergeReplaceKey.php
@@ -1,13 +1,12 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-stdlib for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-stdlib/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-stdlib/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Stdlib\ArrayUtils;
+namespace Laminas\Stdlib\ArrayUtils;
final class MergeReplaceKey implements MergeReplaceKeyInterface
{
diff --git a/vendor/laminas/laminas-stdlib/src/ArrayUtils/MergeReplaceKeyInterface.php b/vendor/laminas/laminas-stdlib/src/ArrayUtils/MergeReplaceKeyInterface.php
new file mode 100644
index 0000000000..54c244382c
--- /dev/null
+++ b/vendor/laminas/laminas-stdlib/src/ArrayUtils/MergeReplaceKeyInterface.php
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * @see https://github.com/laminas/laminas-stdlib for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-stdlib/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-stdlib/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Laminas\Stdlib\ArrayUtils;
+
+/**
+ * Marker interface: can be used to replace keys completely in {@see ArrayUtils::merge()} operations
+ */
+interface MergeReplaceKeyInterface
+{
+ /**
+ * @return mixed
+ */
+ public function getData();
+}
diff --git a/vendor/zendframework/zend-stdlib/src/ConsoleHelper.php b/vendor/laminas/laminas-stdlib/src/ConsoleHelper.php
similarity index 93%
rename from vendor/zendframework/zend-stdlib/src/ConsoleHelper.php
rename to vendor/laminas/laminas-stdlib/src/ConsoleHelper.php
index 79a65c803f..4dc3692119 100644
--- a/vendor/zendframework/zend-stdlib/src/ConsoleHelper.php
+++ b/vendor/laminas/laminas-stdlib/src/ConsoleHelper.php
@@ -1,11 +1,12 @@
<?php
+
/**
- * @link http://github.com/zendframework/zend-stdlib for the canonical source repository
- * @copyright Copyright (c) 2016 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-stdlib for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-stdlib/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-stdlib/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Stdlib;
+namespace Laminas\Stdlib;
/**
* Utilities for console tooling.
diff --git a/vendor/laminas/laminas-stdlib/src/DispatchableInterface.php b/vendor/laminas/laminas-stdlib/src/DispatchableInterface.php
new file mode 100644
index 0000000000..62b813af2a
--- /dev/null
+++ b/vendor/laminas/laminas-stdlib/src/DispatchableInterface.php
@@ -0,0 +1,21 @@
+<?php
+
+/**
+ * @see https://github.com/laminas/laminas-stdlib for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-stdlib/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-stdlib/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Laminas\Stdlib;
+
+interface DispatchableInterface
+{
+ /**
+ * Dispatch a request
+ *
+ * @param RequestInterface $request
+ * @param null|ResponseInterface $response
+ * @return Response|mixed
+ */
+ public function dispatch(RequestInterface $request, ResponseInterface $response = null);
+}
diff --git a/vendor/zendframework/zend-stdlib/src/ErrorHandler.php b/vendor/laminas/laminas-stdlib/src/ErrorHandler.php
similarity index 87%
rename from vendor/zendframework/zend-stdlib/src/ErrorHandler.php
rename to vendor/laminas/laminas-stdlib/src/ErrorHandler.php
index 405cdd799f..d5c88c3dee 100644
--- a/vendor/zendframework/zend-stdlib/src/ErrorHandler.php
+++ b/vendor/laminas/laminas-stdlib/src/ErrorHandler.php
@@ -1,13 +1,12 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-stdlib for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-stdlib/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-stdlib/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Stdlib;
+namespace Laminas\Stdlib;
use ErrorException;
diff --git a/vendor/laminas/laminas-stdlib/src/Exception/BadMethodCallException.php b/vendor/laminas/laminas-stdlib/src/Exception/BadMethodCallException.php
new file mode 100644
index 0000000000..5eb0389fa9
--- /dev/null
+++ b/vendor/laminas/laminas-stdlib/src/Exception/BadMethodCallException.php
@@ -0,0 +1,16 @@
+<?php
+
+/**
+ * @see https://github.com/laminas/laminas-stdlib for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-stdlib/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-stdlib/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Laminas\Stdlib\Exception;
+
+/**
+ * Bad method call exception
+ */
+class BadMethodCallException extends \BadMethodCallException implements ExceptionInterface
+{
+}
diff --git a/vendor/laminas/laminas-stdlib/src/Exception/DomainException.php b/vendor/laminas/laminas-stdlib/src/Exception/DomainException.php
new file mode 100644
index 0000000000..845a3b2fd6
--- /dev/null
+++ b/vendor/laminas/laminas-stdlib/src/Exception/DomainException.php
@@ -0,0 +1,16 @@
+<?php
+
+/**
+ * @see https://github.com/laminas/laminas-stdlib for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-stdlib/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-stdlib/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Laminas\Stdlib\Exception;
+
+/**
+ * Domain exception
+ */
+class DomainException extends \DomainException implements ExceptionInterface
+{
+}
diff --git a/vendor/laminas/laminas-stdlib/src/Exception/ExceptionInterface.php b/vendor/laminas/laminas-stdlib/src/Exception/ExceptionInterface.php
new file mode 100644
index 0000000000..ffb308aa24
--- /dev/null
+++ b/vendor/laminas/laminas-stdlib/src/Exception/ExceptionInterface.php
@@ -0,0 +1,16 @@
+<?php
+
+/**
+ * @see https://github.com/laminas/laminas-stdlib for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-stdlib/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-stdlib/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Laminas\Stdlib\Exception;
+
+/**
+ * Exception marker interface
+ */
+interface ExceptionInterface
+{
+}
diff --git a/vendor/laminas/laminas-stdlib/src/Exception/ExtensionNotLoadedException.php b/vendor/laminas/laminas-stdlib/src/Exception/ExtensionNotLoadedException.php
new file mode 100644
index 0000000000..90d8e4eaec
--- /dev/null
+++ b/vendor/laminas/laminas-stdlib/src/Exception/ExtensionNotLoadedException.php
@@ -0,0 +1,16 @@
+<?php
+
+/**
+ * @see https://github.com/laminas/laminas-stdlib for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-stdlib/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-stdlib/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Laminas\Stdlib\Exception;
+
+/**
+ * Extension not loaded exception
+ */
+class ExtensionNotLoadedException extends RuntimeException
+{
+}
diff --git a/vendor/laminas/laminas-stdlib/src/Exception/InvalidArgumentException.php b/vendor/laminas/laminas-stdlib/src/Exception/InvalidArgumentException.php
new file mode 100644
index 0000000000..a669c8cfe4
--- /dev/null
+++ b/vendor/laminas/laminas-stdlib/src/Exception/InvalidArgumentException.php
@@ -0,0 +1,16 @@
+<?php
+
+/**
+ * @see https://github.com/laminas/laminas-stdlib for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-stdlib/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-stdlib/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Laminas\Stdlib\Exception;
+
+/**
+ * Invalid Argument Exception
+ */
+class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
+{
+}
diff --git a/vendor/laminas/laminas-stdlib/src/Exception/LogicException.php b/vendor/laminas/laminas-stdlib/src/Exception/LogicException.php
new file mode 100644
index 0000000000..6b5b0b999a
--- /dev/null
+++ b/vendor/laminas/laminas-stdlib/src/Exception/LogicException.php
@@ -0,0 +1,16 @@
+<?php
+
+/**
+ * @see https://github.com/laminas/laminas-stdlib for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-stdlib/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-stdlib/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Laminas\Stdlib\Exception;
+
+/**
+ * Logic exception
+ */
+class LogicException extends \LogicException implements ExceptionInterface
+{
+}
diff --git a/vendor/laminas/laminas-stdlib/src/Exception/RuntimeException.php b/vendor/laminas/laminas-stdlib/src/Exception/RuntimeException.php
new file mode 100644
index 0000000000..eba4ee9d7b
--- /dev/null
+++ b/vendor/laminas/laminas-stdlib/src/Exception/RuntimeException.php
@@ -0,0 +1,16 @@
+<?php
+
+/**
+ * @see https://github.com/laminas/laminas-stdlib for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-stdlib/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-stdlib/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Laminas\Stdlib\Exception;
+
+/**
+ * Runtime exception
+ */
+class RuntimeException extends \RuntimeException implements ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zend-stdlib/src/FastPriorityQueue.php b/vendor/laminas/laminas-stdlib/src/FastPriorityQueue.php
similarity index 95%
rename from vendor/zendframework/zend-stdlib/src/FastPriorityQueue.php
rename to vendor/laminas/laminas-stdlib/src/FastPriorityQueue.php
index 883da06e42..7514a496e4 100644
--- a/vendor/zendframework/zend-stdlib/src/FastPriorityQueue.php
+++ b/vendor/laminas/laminas-stdlib/src/FastPriorityQueue.php
@@ -1,16 +1,15 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-stdlib for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-stdlib/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-stdlib/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Stdlib;
+namespace Laminas\Stdlib;
-use Iterator;
use Countable;
+use Iterator;
use Serializable;
use SplPriorityQueue as PhpSplPriorityQueue;
@@ -151,7 +150,7 @@ public function remove($datum)
// If the array is empty we need to destroy the unnecessary priority,
// otherwise we would end up with an incorrect value of `$this->count`
- // {@see \Zend\Stdlib\FastPriorityQueue::nextAndRemove()}.
+ // {@see \Laminas\Stdlib\FastPriorityQueue::nextAndRemove()}.
if (empty($this->values[$this->maxPriority])) {
unset($this->values[$this->maxPriority]);
unset($this->priorities[$this->maxPriority]);
diff --git a/vendor/zendframework/zend-stdlib/src/Glob.php b/vendor/laminas/laminas-stdlib/src/Glob.php
similarity index 94%
rename from vendor/zendframework/zend-stdlib/src/Glob.php
rename to vendor/laminas/laminas-stdlib/src/Glob.php
index ded3fc5330..f25d0b9d56 100644
--- a/vendor/zendframework/zend-stdlib/src/Glob.php
+++ b/vendor/laminas/laminas-stdlib/src/Glob.php
@@ -1,13 +1,12 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-stdlib for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-stdlib/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-stdlib/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Stdlib;
+namespace Laminas\Stdlib;
/**
* Wrapper for glob with fallback if GLOB_BRACE is not available.
diff --git a/vendor/laminas/laminas-stdlib/src/Guard/AllGuardsTrait.php b/vendor/laminas/laminas-stdlib/src/Guard/AllGuardsTrait.php
new file mode 100644
index 0000000000..e701c176be
--- /dev/null
+++ b/vendor/laminas/laminas-stdlib/src/Guard/AllGuardsTrait.php
@@ -0,0 +1,19 @@
+<?php
+
+/**
+ * @see https://github.com/laminas/laminas-stdlib for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-stdlib/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-stdlib/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Laminas\Stdlib\Guard;
+
+/**
+ * An aggregate for all guard traits
+ */
+trait AllGuardsTrait
+{
+ use ArrayOrTraversableGuardTrait;
+ use EmptyGuardTrait;
+ use NullGuardTrait;
+}
diff --git a/vendor/zendframework/zend-stdlib/src/Guard/ArrayOrTraversableGuardTrait.php b/vendor/laminas/laminas-stdlib/src/Guard/ArrayOrTraversableGuardTrait.php
similarity index 68%
rename from vendor/zendframework/zend-stdlib/src/Guard/ArrayOrTraversableGuardTrait.php
rename to vendor/laminas/laminas-stdlib/src/Guard/ArrayOrTraversableGuardTrait.php
index 116101f1b2..fbab8f1073 100644
--- a/vendor/zendframework/zend-stdlib/src/Guard/ArrayOrTraversableGuardTrait.php
+++ b/vendor/laminas/laminas-stdlib/src/Guard/ArrayOrTraversableGuardTrait.php
@@ -1,13 +1,12 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-stdlib for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-stdlib/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-stdlib/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Stdlib\Guard;
+namespace Laminas\Stdlib\Guard;
use Traversable;
@@ -27,7 +26,7 @@ trait ArrayOrTraversableGuardTrait
protected function guardForArrayOrTraversable(
$data,
$dataName = 'Argument',
- $exceptionClass = 'Zend\Stdlib\Exception\InvalidArgumentException'
+ $exceptionClass = 'Laminas\Stdlib\Exception\InvalidArgumentException'
) {
if (! is_array($data) && ! ($data instanceof Traversable)) {
$message = sprintf(
diff --git a/vendor/zendframework/zend-stdlib/src/Guard/EmptyGuardTrait.php b/vendor/laminas/laminas-stdlib/src/Guard/EmptyGuardTrait.php
similarity index 60%
rename from vendor/zendframework/zend-stdlib/src/Guard/EmptyGuardTrait.php
rename to vendor/laminas/laminas-stdlib/src/Guard/EmptyGuardTrait.php
index c6751cc35a..aa8422f96f 100644
--- a/vendor/zendframework/zend-stdlib/src/Guard/EmptyGuardTrait.php
+++ b/vendor/laminas/laminas-stdlib/src/Guard/EmptyGuardTrait.php
@@ -1,13 +1,12 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-stdlib for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-stdlib/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-stdlib/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Stdlib\Guard;
+namespace Laminas\Stdlib\Guard;
/**
* Provide a guard method against empty data
@@ -25,7 +24,7 @@ trait EmptyGuardTrait
protected function guardAgainstEmpty(
$data,
$dataName = 'Argument',
- $exceptionClass = 'Zend\Stdlib\Exception\InvalidArgumentException'
+ $exceptionClass = 'Laminas\Stdlib\Exception\InvalidArgumentException'
) {
if (empty($data)) {
$message = sprintf('%s cannot be empty', $dataName);
diff --git a/vendor/zendframework/zend-stdlib/src/Guard/NullGuardTrait.php b/vendor/laminas/laminas-stdlib/src/Guard/NullGuardTrait.php
similarity index 60%
rename from vendor/zendframework/zend-stdlib/src/Guard/NullGuardTrait.php
rename to vendor/laminas/laminas-stdlib/src/Guard/NullGuardTrait.php
index eac716281c..019f59c321 100644
--- a/vendor/zendframework/zend-stdlib/src/Guard/NullGuardTrait.php
+++ b/vendor/laminas/laminas-stdlib/src/Guard/NullGuardTrait.php
@@ -1,13 +1,12 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-stdlib for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-stdlib/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-stdlib/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Stdlib\Guard;
+namespace Laminas\Stdlib\Guard;
/**
* Provide a guard method against null data
@@ -25,7 +24,7 @@ trait NullGuardTrait
protected function guardAgainstNull(
$data,
$dataName = 'Argument',
- $exceptionClass = 'Zend\Stdlib\Exception\InvalidArgumentException'
+ $exceptionClass = 'Laminas\Stdlib\Exception\InvalidArgumentException'
) {
if (null === $data) {
$message = sprintf('%s cannot be null', $dataName);
diff --git a/vendor/laminas/laminas-stdlib/src/InitializableInterface.php b/vendor/laminas/laminas-stdlib/src/InitializableInterface.php
new file mode 100644
index 0000000000..0aedf338e8
--- /dev/null
+++ b/vendor/laminas/laminas-stdlib/src/InitializableInterface.php
@@ -0,0 +1,22 @@
+<?php
+
+/**
+ * @see https://github.com/laminas/laminas-stdlib for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-stdlib/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-stdlib/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Laminas\Stdlib;
+
+/**
+ * Interface to allow objects to have initialization logic
+ */
+interface InitializableInterface
+{
+ /**
+ * Init an object
+ *
+ * @return void
+ */
+ public function init();
+}
diff --git a/vendor/laminas/laminas-stdlib/src/JsonSerializable.php b/vendor/laminas/laminas-stdlib/src/JsonSerializable.php
new file mode 100644
index 0000000000..3ef86fa3e7
--- /dev/null
+++ b/vendor/laminas/laminas-stdlib/src/JsonSerializable.php
@@ -0,0 +1,16 @@
+<?php
+
+/**
+ * @see https://github.com/laminas/laminas-stdlib for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-stdlib/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-stdlib/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Laminas\Stdlib;
+
+/**
+ * @deprecated Since 3.1.0; use the native JsonSerializable interface
+ */
+interface JsonSerializable extends \JsonSerializable
+{
+}
diff --git a/vendor/zendframework/zend-stdlib/src/Message.php b/vendor/laminas/laminas-stdlib/src/Message.php
similarity index 89%
rename from vendor/zendframework/zend-stdlib/src/Message.php
rename to vendor/laminas/laminas-stdlib/src/Message.php
index 008e23f36a..4971f51a40 100644
--- a/vendor/zendframework/zend-stdlib/src/Message.php
+++ b/vendor/laminas/laminas-stdlib/src/Message.php
@@ -1,13 +1,12 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-stdlib for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-stdlib/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-stdlib/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Stdlib;
+namespace Laminas\Stdlib;
use Traversable;
diff --git a/vendor/zendframework/zend-stdlib/src/MessageInterface.php b/vendor/laminas/laminas-stdlib/src/MessageInterface.php
similarity index 65%
rename from vendor/zendframework/zend-stdlib/src/MessageInterface.php
rename to vendor/laminas/laminas-stdlib/src/MessageInterface.php
index 28d8857fcd..76f089a02f 100644
--- a/vendor/zendframework/zend-stdlib/src/MessageInterface.php
+++ b/vendor/laminas/laminas-stdlib/src/MessageInterface.php
@@ -1,13 +1,12 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-stdlib for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-stdlib/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-stdlib/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Stdlib;
+namespace Laminas\Stdlib;
interface MessageInterface
{
diff --git a/vendor/zendframework/zend-stdlib/src/ParameterObjectInterface.php b/vendor/laminas/laminas-stdlib/src/ParameterObjectInterface.php
similarity index 60%
rename from vendor/zendframework/zend-stdlib/src/ParameterObjectInterface.php
rename to vendor/laminas/laminas-stdlib/src/ParameterObjectInterface.php
index 676a6e2b99..9c0b7f144b 100644
--- a/vendor/zendframework/zend-stdlib/src/ParameterObjectInterface.php
+++ b/vendor/laminas/laminas-stdlib/src/ParameterObjectInterface.php
@@ -1,13 +1,12 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-stdlib for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-stdlib/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-stdlib/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Stdlib;
+namespace Laminas\Stdlib;
interface ParameterObjectInterface
{
diff --git a/vendor/zendframework/zend-stdlib/src/Parameters.php b/vendor/laminas/laminas-stdlib/src/Parameters.php
similarity index 86%
rename from vendor/zendframework/zend-stdlib/src/Parameters.php
rename to vendor/laminas/laminas-stdlib/src/Parameters.php
index e845fcdafe..f2cdb47d2d 100644
--- a/vendor/zendframework/zend-stdlib/src/Parameters.php
+++ b/vendor/laminas/laminas-stdlib/src/Parameters.php
@@ -1,13 +1,12 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-stdlib for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-stdlib/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-stdlib/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Stdlib;
+namespace Laminas\Stdlib;
use ArrayObject as PhpArrayObject;
diff --git a/vendor/zendframework/zend-stdlib/src/ParametersInterface.php b/vendor/laminas/laminas-stdlib/src/ParametersInterface.php
similarity index 82%
rename from vendor/zendframework/zend-stdlib/src/ParametersInterface.php
rename to vendor/laminas/laminas-stdlib/src/ParametersInterface.php
index feeda58073..0c62df3a5b 100644
--- a/vendor/zendframework/zend-stdlib/src/ParametersInterface.php
+++ b/vendor/laminas/laminas-stdlib/src/ParametersInterface.php
@@ -1,13 +1,12 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-stdlib for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-stdlib/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-stdlib/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Stdlib;
+namespace Laminas\Stdlib;
use ArrayAccess;
use Countable;
diff --git a/vendor/zendframework/zend-stdlib/src/PriorityList.php b/vendor/laminas/laminas-stdlib/src/PriorityList.php
similarity index 94%
rename from vendor/zendframework/zend-stdlib/src/PriorityList.php
rename to vendor/laminas/laminas-stdlib/src/PriorityList.php
index d5ca136bd3..aae19c7dc9 100644
--- a/vendor/zendframework/zend-stdlib/src/PriorityList.php
+++ b/vendor/laminas/laminas-stdlib/src/PriorityList.php
@@ -1,13 +1,12 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-stdlib for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-stdlib/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-stdlib/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Stdlib;
+namespace Laminas\Stdlib;
use Countable;
use Iterator;
diff --git a/vendor/zendframework/zend-stdlib/src/PriorityQueue.php b/vendor/laminas/laminas-stdlib/src/PriorityQueue.php
similarity index 94%
rename from vendor/zendframework/zend-stdlib/src/PriorityQueue.php
rename to vendor/laminas/laminas-stdlib/src/PriorityQueue.php
index 2a16287316..ab4b1b65a7 100644
--- a/vendor/zendframework/zend-stdlib/src/PriorityQueue.php
+++ b/vendor/laminas/laminas-stdlib/src/PriorityQueue.php
@@ -1,13 +1,12 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-stdlib for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-stdlib/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-stdlib/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Stdlib;
+namespace Laminas\Stdlib;
use Countable;
use IteratorAggregate;
@@ -35,7 +34,7 @@ class PriorityQueue implements Countable, IteratorAggregate, Serializable
* Inner queue class to use for iteration
* @var string
*/
- protected $queueClass = 'Zend\Stdlib\SplPriorityQueue';
+ protected $queueClass = 'Laminas\Stdlib\SplPriorityQueue';
/**
* Actual items aggregated in the priority queue. Each item is an array
@@ -181,7 +180,7 @@ public function serialize()
/**
* Unserialize a string into a PriorityQueue object
*
- * Serialization format is compatible with {@link Zend\Stdlib\SplPriorityQueue}
+ * Serialization format is compatible with {@link Laminas\Stdlib\SplPriorityQueue}
*
* @param string $data
* @return void
diff --git a/vendor/laminas/laminas-stdlib/src/Request.php b/vendor/laminas/laminas-stdlib/src/Request.php
new file mode 100644
index 0000000000..a593a480f5
--- /dev/null
+++ b/vendor/laminas/laminas-stdlib/src/Request.php
@@ -0,0 +1,14 @@
+<?php
+
+/**
+ * @see https://github.com/laminas/laminas-stdlib for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-stdlib/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-stdlib/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Laminas\Stdlib;
+
+class Request extends Message implements RequestInterface
+{
+ // generic request implementation
+}
diff --git a/vendor/laminas/laminas-stdlib/src/RequestInterface.php b/vendor/laminas/laminas-stdlib/src/RequestInterface.php
new file mode 100644
index 0000000000..a4b6b7b48d
--- /dev/null
+++ b/vendor/laminas/laminas-stdlib/src/RequestInterface.php
@@ -0,0 +1,13 @@
+<?php
+
+/**
+ * @see https://github.com/laminas/laminas-stdlib for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-stdlib/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-stdlib/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Laminas\Stdlib;
+
+interface RequestInterface extends MessageInterface
+{
+}
diff --git a/vendor/laminas/laminas-stdlib/src/Response.php b/vendor/laminas/laminas-stdlib/src/Response.php
new file mode 100644
index 0000000000..e18a3f8efe
--- /dev/null
+++ b/vendor/laminas/laminas-stdlib/src/Response.php
@@ -0,0 +1,14 @@
+<?php
+
+/**
+ * @see https://github.com/laminas/laminas-stdlib for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-stdlib/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-stdlib/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Laminas\Stdlib;
+
+class Response extends Message implements ResponseInterface
+{
+ // generic response implementation
+}
diff --git a/vendor/laminas/laminas-stdlib/src/ResponseInterface.php b/vendor/laminas/laminas-stdlib/src/ResponseInterface.php
new file mode 100644
index 0000000000..60472f1aa0
--- /dev/null
+++ b/vendor/laminas/laminas-stdlib/src/ResponseInterface.php
@@ -0,0 +1,13 @@
+<?php
+
+/**
+ * @see https://github.com/laminas/laminas-stdlib for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-stdlib/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-stdlib/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Laminas\Stdlib;
+
+interface ResponseInterface extends MessageInterface
+{
+}
diff --git a/vendor/zendframework/zend-stdlib/src/SplPriorityQueue.php b/vendor/laminas/laminas-stdlib/src/SplPriorityQueue.php
similarity index 85%
rename from vendor/zendframework/zend-stdlib/src/SplPriorityQueue.php
rename to vendor/laminas/laminas-stdlib/src/SplPriorityQueue.php
index c5952dd317..f7e0813c6d 100644
--- a/vendor/zendframework/zend-stdlib/src/SplPriorityQueue.php
+++ b/vendor/laminas/laminas-stdlib/src/SplPriorityQueue.php
@@ -1,13 +1,12 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-stdlib for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-stdlib/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-stdlib/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Stdlib;
+namespace Laminas\Stdlib;
use Serializable;
diff --git a/vendor/zendframework/zend-stdlib/src/SplQueue.php b/vendor/laminas/laminas-stdlib/src/SplQueue.php
similarity index 70%
rename from vendor/zendframework/zend-stdlib/src/SplQueue.php
rename to vendor/laminas/laminas-stdlib/src/SplQueue.php
index 51d8daf7cc..9eb2abb7f2 100644
--- a/vendor/zendframework/zend-stdlib/src/SplQueue.php
+++ b/vendor/laminas/laminas-stdlib/src/SplQueue.php
@@ -1,13 +1,12 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-stdlib for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-stdlib/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-stdlib/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Stdlib;
+namespace Laminas\Stdlib;
use Serializable;
diff --git a/vendor/zendframework/zend-stdlib/src/SplStack.php b/vendor/laminas/laminas-stdlib/src/SplStack.php
similarity index 71%
rename from vendor/zendframework/zend-stdlib/src/SplStack.php
rename to vendor/laminas/laminas-stdlib/src/SplStack.php
index 6ba27398d1..404203dd47 100644
--- a/vendor/zendframework/zend-stdlib/src/SplStack.php
+++ b/vendor/laminas/laminas-stdlib/src/SplStack.php
@@ -1,13 +1,12 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-stdlib for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-stdlib/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-stdlib/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Stdlib;
+namespace Laminas\Stdlib;
use Serializable;
diff --git a/vendor/zendframework/zend-stdlib/src/StringUtils.php b/vendor/laminas/laminas-stdlib/src/StringUtils.php
similarity index 87%
rename from vendor/zendframework/zend-stdlib/src/StringUtils.php
rename to vendor/laminas/laminas-stdlib/src/StringUtils.php
index 79a22a4c01..a52218c312 100644
--- a/vendor/zendframework/zend-stdlib/src/StringUtils.php
+++ b/vendor/laminas/laminas-stdlib/src/StringUtils.php
@@ -1,15 +1,14 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-stdlib for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-stdlib/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-stdlib/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Stdlib;
+namespace Laminas\Stdlib;
-use Zend\Stdlib\StringWrapper\StringWrapperInterface;
+use Laminas\Stdlib\StringWrapper\StringWrapperInterface;
/**
* Utility class for handling strings of different character encodings
@@ -58,18 +57,18 @@ public static function getRegisteredWrappers()
static::$wrapperRegistry = [];
if (extension_loaded('intl')) {
- static::$wrapperRegistry[] = 'Zend\Stdlib\StringWrapper\Intl';
+ static::$wrapperRegistry[] = 'Laminas\Stdlib\StringWrapper\Intl';
}
if (extension_loaded('mbstring')) {
- static::$wrapperRegistry[] = 'Zend\Stdlib\StringWrapper\MbString';
+ static::$wrapperRegistry[] = 'Laminas\Stdlib\StringWrapper\MbString';
}
if (extension_loaded('iconv')) {
- static::$wrapperRegistry[] = 'Zend\Stdlib\StringWrapper\Iconv';
+ static::$wrapperRegistry[] = 'Laminas\Stdlib\StringWrapper\Iconv';
}
- static::$wrapperRegistry[] = 'Zend\Stdlib\StringWrapper\Native';
+ static::$wrapperRegistry[] = 'Laminas\Stdlib\StringWrapper\Native';
}
return static::$wrapperRegistry;
diff --git a/vendor/zendframework/zend-stdlib/src/StringWrapper/AbstractStringWrapper.php b/vendor/laminas/laminas-stdlib/src/StringWrapper/AbstractStringWrapper.php
similarity index 95%
rename from vendor/zendframework/zend-stdlib/src/StringWrapper/AbstractStringWrapper.php
rename to vendor/laminas/laminas-stdlib/src/StringWrapper/AbstractStringWrapper.php
index cf2625079a..a3125f065a 100644
--- a/vendor/zendframework/zend-stdlib/src/StringWrapper/AbstractStringWrapper.php
+++ b/vendor/laminas/laminas-stdlib/src/StringWrapper/AbstractStringWrapper.php
@@ -1,16 +1,15 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-stdlib for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-stdlib/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-stdlib/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Stdlib\StringWrapper;
+namespace Laminas\Stdlib\StringWrapper;
-use Zend\Stdlib\Exception;
-use Zend\Stdlib\StringUtils;
+use Laminas\Stdlib\Exception;
+use Laminas\Stdlib\StringUtils;
abstract class AbstractStringWrapper implements StringWrapperInterface
{
diff --git a/vendor/zendframework/zend-stdlib/src/StringWrapper/Iconv.php b/vendor/laminas/laminas-stdlib/src/StringWrapper/Iconv.php
similarity index 94%
rename from vendor/zendframework/zend-stdlib/src/StringWrapper/Iconv.php
rename to vendor/laminas/laminas-stdlib/src/StringWrapper/Iconv.php
index bc791b893c..126b048545 100644
--- a/vendor/zendframework/zend-stdlib/src/StringWrapper/Iconv.php
+++ b/vendor/laminas/laminas-stdlib/src/StringWrapper/Iconv.php
@@ -1,15 +1,14 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-stdlib for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-stdlib/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-stdlib/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Stdlib\StringWrapper;
+namespace Laminas\Stdlib\StringWrapper;
-use Zend\Stdlib\Exception;
+use Laminas\Stdlib\Exception;
class Iconv extends AbstractStringWrapper
{
diff --git a/vendor/zendframework/zend-stdlib/src/StringWrapper/Intl.php b/vendor/laminas/laminas-stdlib/src/StringWrapper/Intl.php
similarity index 83%
rename from vendor/zendframework/zend-stdlib/src/StringWrapper/Intl.php
rename to vendor/laminas/laminas-stdlib/src/StringWrapper/Intl.php
index 4644db361d..217bd4fc30 100644
--- a/vendor/zendframework/zend-stdlib/src/StringWrapper/Intl.php
+++ b/vendor/laminas/laminas-stdlib/src/StringWrapper/Intl.php
@@ -1,15 +1,14 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-stdlib for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-stdlib/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-stdlib/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Stdlib\StringWrapper;
+namespace Laminas\Stdlib\StringWrapper;
-use Zend\Stdlib\Exception;
+use Laminas\Stdlib\Exception;
class Intl extends AbstractStringWrapper
{
diff --git a/vendor/zendframework/zend-stdlib/src/StringWrapper/MbString.php b/vendor/laminas/laminas-stdlib/src/StringWrapper/MbString.php
similarity index 89%
rename from vendor/zendframework/zend-stdlib/src/StringWrapper/MbString.php
rename to vendor/laminas/laminas-stdlib/src/StringWrapper/MbString.php
index a0f80f62ac..936ac12396 100644
--- a/vendor/zendframework/zend-stdlib/src/StringWrapper/MbString.php
+++ b/vendor/laminas/laminas-stdlib/src/StringWrapper/MbString.php
@@ -1,15 +1,14 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-stdlib for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-stdlib/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-stdlib/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Stdlib\StringWrapper;
+namespace Laminas\Stdlib\StringWrapper;
-use Zend\Stdlib\Exception;
+use Laminas\Stdlib\Exception;
class MbString extends AbstractStringWrapper
{
diff --git a/vendor/zendframework/zend-stdlib/src/StringWrapper/Native.php b/vendor/laminas/laminas-stdlib/src/StringWrapper/Native.php
similarity index 89%
rename from vendor/zendframework/zend-stdlib/src/StringWrapper/Native.php
rename to vendor/laminas/laminas-stdlib/src/StringWrapper/Native.php
index b01bb86cfa..0c37346666 100644
--- a/vendor/zendframework/zend-stdlib/src/StringWrapper/Native.php
+++ b/vendor/laminas/laminas-stdlib/src/StringWrapper/Native.php
@@ -1,16 +1,15 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-stdlib for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-stdlib/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-stdlib/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Stdlib\StringWrapper;
+namespace Laminas\Stdlib\StringWrapper;
-use Zend\Stdlib\Exception;
-use Zend\Stdlib\StringUtils;
+use Laminas\Stdlib\Exception;
+use Laminas\Stdlib\StringUtils;
class Native extends AbstractStringWrapper
{
diff --git a/vendor/zendframework/zend-stdlib/src/StringWrapper/StringWrapperInterface.php b/vendor/laminas/laminas-stdlib/src/StringWrapper/StringWrapperInterface.php
similarity index 89%
rename from vendor/zendframework/zend-stdlib/src/StringWrapper/StringWrapperInterface.php
rename to vendor/laminas/laminas-stdlib/src/StringWrapper/StringWrapperInterface.php
index f25b3253fc..5c10365be2 100644
--- a/vendor/zendframework/zend-stdlib/src/StringWrapper/StringWrapperInterface.php
+++ b/vendor/laminas/laminas-stdlib/src/StringWrapper/StringWrapperInterface.php
@@ -1,13 +1,12 @@
<?php
+
/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @see https://github.com/laminas/laminas-stdlib for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-stdlib/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-stdlib/blob/master/LICENSE.md New BSD License
*/
-namespace Zend\Stdlib\StringWrapper;
+namespace Laminas\Stdlib\StringWrapper;
interface StringWrapperInterface
{
diff --git a/vendor/laminas/laminas-zendframework-bridge/.github/FUNDING.yml b/vendor/laminas/laminas-zendframework-bridge/.github/FUNDING.yml
new file mode 100644
index 0000000000..6674aab603
--- /dev/null
+++ b/vendor/laminas/laminas-zendframework-bridge/.github/FUNDING.yml
@@ -0,0 +1 @@
+community_bridge: laminas-project
diff --git a/vendor/laminas/laminas-zendframework-bridge/CHANGELOG.md b/vendor/laminas/laminas-zendframework-bridge/CHANGELOG.md
new file mode 100644
index 0000000000..654a648f6a
--- /dev/null
+++ b/vendor/laminas/laminas-zendframework-bridge/CHANGELOG.md
@@ -0,0 +1,641 @@
+# Changelog
+
+All notable changes to this project will be documented in this file, in reverse chronological order by release.
+
+## 1.0.4 - 2020-05-20
+
+### Added
+
+- Nothing.
+
+### Changed
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [#66](https://github.com/laminas/laminas-zendframework-bridge/pull/66) ensures that references to BjyAuthorize templates are not rewritten, so that they can be resolved during runtime.
+
+## 1.0.3 - 2020-04-03
+
+### Added
+
+- Nothing.
+
+### Changed
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [#63](https://github.com/laminas/laminas-zendframework-bridge/pull/63) fixes handling of dependency configuration to ensure each of delegators, initializers, and abstract factories are properly handled during configuraiton post processing. The new approach should allow delegators to work post-migration to Laminas or Mezzio.
+
+- [#61](https://github.com/laminas/laminas-zendframework-bridge/pull/61) ensures configuration for delegator factories gets rewritten; the functionality broke in version 1.0.1.
+
+## 1.0.2 - 2020-03-26
+
+### Added
+
+- Nothing.
+
+### Changed
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [#55](https://github.com/laminas/laminas-zendframework-bridge/pull/55) adds provisions to ensure that references to legacy classes/interfaces in dependency configuration always create aliases from the legacy to the new classes. Previously, we did straight replacements in the configuration, which could lead to the legacy service no longer being available. Now it will remain available.
+
+- [#59](https://github.com/laminas/laminas-zendframework-bridge/pull/59) fixes the replacement rules such as to avoid replacing references to API Skeletons packages, classes, or configuration keys.
+
+- [#57](https://github.com/laminas/laminas-zendframework-bridge/pull/57) fixes how references to the "zf-apigility" key are replaced. Previously, they were rewritten to "laminas-api-tools", but the correct replacement is "api-tools".
+
+- [#56](https://github.com/laminas/laminas-zendframework-bridge/pull/56) provides a mechanism to add additional maps with multiple levels of namespace separator escaping, in order to ensure that all various known permutations are matched. The escaping is applied to both the original and target, to ensure that rewrites conform to the original escaping.
+
+- [#56](https://github.com/laminas/laminas-zendframework-bridge/pull/56) makes changes to the replacement rules to ensure we do not replace references to "Zend" or "ZF" if they occur as subnamespaces OR as class names (formerly, we only enforced subnamespaces). Additional rules were provided for cases where one or both occur within our own packages.
+
+- [#52](https://github.com/laminas/laminas-zendframework-bridge/pull/52) fixes a scenario whereby factory _values_ were not being rewritten during configuration post processing.
+
+- [#52](https://github.com/laminas/laminas-zendframework-bridge/pull/52) fixes an issue that occurs with the configuration post processor. Previously, when a service name used as a factory or invokable was encountered that referenced a legacy class, it would get rewritten. This would cause issues if the service was not exposed in the original legacy package, however, as there would now be no alias of the legacy service to the new one. This patch modifies the configuration post processor such that it now tests to see if a service name it will rename exists as an alias; if not, it also creates the alias.
+
+## 1.0.1 - 2020-01-07
+
+### Added
+
+- Nothing.
+
+### Changed
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [#47](https://github.com/laminas/laminas-zendframework-bridge/pull/47) adds entries for rewriting the various `::*Zend()` methods exposed in the psr7bridge to `::*Laminas()` during migrations.
+
+- [#46](https://github.com/laminas/laminas-zendframework-bridge/pull/46) adds a rule to rewrite the config key `use_zend_loader` to `use_laminas_loader`.
+
+- [#45](https://github.com/laminas/laminas-zendframework-bridge/pull/45) adds a rule to exclude rewriting of view paths provided by the various Doctrine modules targeting the developer tools.
+
+## 1.0.0 - 2019-12-31
+
+### Added
+
+- First stable release.
+
+### Changed
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Nothing.
+
+## 0.4.5 - 2019-12-23
+
+### Added
+
+- Nothing.
+
+### Changed
+
+- [#42](https://github.com/laminas/laminas-zendframework-bridge/pull/42) modifies the replacement rules to no longer rewrite zf-deploy; the package will not be coming to the new organizations.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Nothing.
+
+## 0.4.4 - 2019-12-18
+
+### Added
+
+- Nothing.
+
+### Changed
+
+- [#40](https://github.com/laminas/laminas-zendframework-bridge/pull/40) adds exclusion rules for subnamespaces that reference Zend, ZF, ZendService, or ZendOAuth to ensure they are not rewritten.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [#40](https://github.com/laminas/laminas-zendframework-bridge/pull/40) adds exclusions for classes referencing Zend Server product features to ensure they are not rewritten (e.g., `ZendServerDisk`, `ZendServerShm`, `ZendMonitor`).
+
+## 0.4.3 - 2019-12-17
+
+### Added
+
+- Nothing.
+
+### Changed
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [#39](https://github.com/laminas/laminas-zendframework-bridge/pull/39) fixes an issue when using the Auryn DI container. The class `Northwoods\Container\Zend\Config` was incorrectly being renamed to `Northwoods\Container\Laminas\Config` (which should not happen, as it is not a class under our control).
+
+## 0.4.2 - 2019-12-16
+
+### Added
+
+- Nothing.
+
+### Changed
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [#36](https://github.com/laminas/laminas-zendframework-bridge/pull/36) adds some cases for classes that contain the verbiage "Expressive" and "Apigility" ot ensure they are rewritten correctly.
+
+## 0.4.1 - 2019-12-10
+
+### Added
+
+- Nothing.
+
+### Changed
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [#35](https://github.com/laminas/laminas-zendframework-bridge/pull/35) removes zend-debug from the replacement list, as it is not being brought over to Laminas.
+
+## 0.4.0 - 2019-11-27
+
+### Added
+
+- Nothing.
+
+### Changed
+
+- [#32](https://github.com/laminas/laminas-zendframework-bridge/pull/32) changes all references to Expressive to instead reference Mezzio.
+
+- [#32](https://github.com/laminas/laminas-zendframework-bridge/pull/32) changes all references to Apigility to instead reference Laminas API Tools. The vendor becomes laminas-api-tools, the URL becomes api-tools.getlaminas.org, packages and repos are prefixed with api-tools, and namespaces become `Laminas\ApiTools`.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Nothing.
+
+## 0.3.8 - 2019-11-14
+
+### Added
+
+- [#29](https://github.com/laminas/laminas-zendframework-bridge/pull/29) adds entries to translate `ZendDeveloperTools` to `Laminas\DeveloperTools`, and vice-versa.
+
+### Changed
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Nothing.
+
+## 0.3.7 - 2019-11-12
+
+### Added
+
+- Nothing.
+
+### Changed
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [#28](https://github.com/laminas/laminas-zendframework-bridge/pull/28) updates the `zenddevelopertools` string to rewrite to `laminas-developer-tools` instead of `laminasdevelopertools`.
+
+## 0.3.6 - 2019-11-07
+
+### Added
+
+- Nothing.
+
+### Changed
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [#27](https://github.com/laminas/laminas-zendframework-bridge/pull/27) adds a rewrite rule for zend-framework.flf => laminas-project.flf.
+
+## 0.3.5 - 2019-11-06
+
+### Added
+
+- Nothing.
+
+### Changed
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [#25](https://github.com/laminas/laminas-zendframework-bridge/pull/25) adds entries for ZendHttp and ZendModule, which are file name segments in files from the zend-feed and zend-config-aggregator-module packages, respectively.
+
+## 0.3.4 - 2019-11-06
+
+### Added
+
+- Nothing.
+
+### Changed
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [#24](https://github.com/laminas/laminas-zendframework-bridge/pull/24) adds a rule to never rewrite the string `Doctrine\Zend`.
+
+- [#23](https://github.com/laminas/laminas-zendframework-bridge/pull/23) adds a missing map for each of ZendAcl and ZendRbac, which occur in the zend-expressive-authorization-acl and zend-expressive-authorization-rbac packages, respectively.
+
+## 0.3.3 - 2019-11-06
+
+### Added
+
+- [#22](https://github.com/laminas/laminas-zendframework-bridge/pull/22) adds configuration post-processing features, exposed both as a laminas-config-aggregator post processor (for use with Expressive applications) and as a laminas-modulemanager `EVENT_MERGE_CONFIG` listener (for use with MVC applications). When registered, it will post-process the configuration, replacing known Zend Framework-specific strings with their Laminas replacements. A ruleset is provided that ensures dependency configuration is rewritten in a safe manner, routing configuration is skipped, and certain top-level configuration keys are matched exactly (instead of potentially as substrings or word stems). A later release of laminas-migration will auto-register these tools in applications when possible.
+
+### Changed
+
+- [#22](https://github.com/laminas/laminas-zendframework-bridge/pull/22) removes support for PHP versions prior to PHP 5.6. We have decided to only support supported PHP versions, whether that support is via php.net or commercial. The lowest supported PHP version we have found is 5.6. Users wishing to migrate to Laminas must at least update to PHP 5.6 before doing so.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Nothing.
+
+## 0.3.2 - 2019-10-30
+
+### Added
+
+- Nothing.
+
+### Changed
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- [#21](https://github.com/laminas/laminas-zendframework-bridge/pull/21) removes rewriting of the Amazon library, as it is not moving to Laminas.
+
+- [#21](https://github.com/laminas/laminas-zendframework-bridge/pull/21) removes rewriting of the GCM and APNS libraries, as they are not moving to Laminas.
+
+### Fixed
+
+- [#21](https://github.com/laminas/laminas-zendframework-bridge/pull/21) fixes how the recaptcha and twitter library package and namespaces are rewritten.
+
+## 0.3.1 - 2019-04-25
+
+### Added
+
+- [#20](https://github.com/laminas/laminas-zendframework-bridge/pull/20) provides an additional autoloader that is _prepended_ to the autoloader
+ stack. This new autoloader will create class aliases for interfaces, classes,
+ and traits referenced in type hints and class declarations, ensuring PHP is
+ able to resolve them correctly during class_alias operations.
+
+### Changed
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Nothing.
+
+## 0.3.0 - 2019-04-12
+
+### Added
+
+- Nothing.
+
+### Changed
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- [#16](https://github.com/laminas/laminas-zendframework-bridge/pull/16) removes the `RewriteRules::classRewrite()` method, as it is no longer
+ needed due to internal refactoring.
+
+### Fixed
+
+- [#16](https://github.com/laminas/laminas-zendframework-bridge/pull/16) fixes how the rewrite rules detect the word `Zend` in subnamespaces and
+ class names to be both more robust and simpler.
+
+## 0.2.5 - 2019-04-11
+
+### Added
+
+- [#12](https://github.com/laminas/laminas-zendframework-bridge/pull/12) adds functionality for ensuring we alias namespaces and classes that
+ include the word `Zend` in them; e.g., `Zend\Expressive\ZendView\ZendViewRendererFactory`
+ will now alias to `Expressive\LaminasView\LaminasViewRendererFactory`.
+
+### Changed
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Nothing.
+
+## 0.2.4 - 2019-04-11
+
+### Added
+
+- [#11](https://github.com/laminas/laminas-zendframework-bridge/pull/11) adds maps for the Expressive router adapter packages.
+
+- [#10](https://github.com/laminas/laminas-zendframework-bridge/pull/10) adds a map for the Psr7Bridge package, as it used `Zend` within a subnamespace.
+
+### Changed
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Nothing.
+
+## 0.2.3 - 2019-04-10
+
+### Added
+
+- Nothing.
+
+### Changed
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [#9](https://github.com/laminas/laminas-zendframework-bridge/pull/9) fixes the mapping for the Problem Details package.
+
+## 0.2.2 - 2019-04-10
+
+### Added
+
+- Nothing.
+
+### Changed
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Added a check that the discovered alias exists as a class, interface, or trait
+ before attempting to call `class_alias()`.
+
+## 0.2.1 - 2019-04-10
+
+### Added
+
+- Nothing.
+
+### Changed
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [#8](https://github.com/laminas/laminas-zendframework-bridge/pull/8) fixes mappings for each of zend-expressive-authentication-zendauthentication,
+ zend-expressive-zendrouter, and zend-expressive-zendviewrenderer.
+
+## 0.2.0 - 2019-04-01
+
+### Added
+
+- Nothing.
+
+### Changed
+
+- [#4](https://github.com/laminas/laminas-zendframework-bridge/pull/4) rewrites the autoloader to be class-based, via the class
+ `Laminas\ZendFrameworkBridge\Autoloader`. Additionally, the new approach
+ provides a performance boost by using a balanced tree algorithm, ensuring
+ matches occur faster.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- [#4](https://github.com/laminas/laminas-zendframework-bridge/pull/4) removes function aliasing. Function aliasing will move to the packages that
+ provide functions.
+
+### Fixed
+
+- Nothing.
+
+## 0.1.0 - 2019-03-27
+
+### Added
+
+- Adds an autoloader file that registers with `spl_autoload_register` a routine
+ for aliasing legacy ZF class/interface/trait names to Laminas Project
+ equivalents.
+
+- Adds autoloader files for aliasing legacy ZF package functions to Laminas
+ Project equivalents.
+
+### Changed
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Nothing.
diff --git a/vendor/laminas/laminas-zendframework-bridge/COPYRIGHT.md b/vendor/laminas/laminas-zendframework-bridge/COPYRIGHT.md
new file mode 100644
index 0000000000..0a8cccc06b
--- /dev/null
+++ b/vendor/laminas/laminas-zendframework-bridge/COPYRIGHT.md
@@ -0,0 +1 @@
+Copyright (c) 2020 Laminas Project a Series of LF Projects, LLC. (https://getlaminas.org/)
diff --git a/vendor/laminas/laminas-zendframework-bridge/LICENSE.md b/vendor/laminas/laminas-zendframework-bridge/LICENSE.md
new file mode 100644
index 0000000000..10b40f1423
--- /dev/null
+++ b/vendor/laminas/laminas-zendframework-bridge/LICENSE.md
@@ -0,0 +1,26 @@
+Copyright (c) 2020 Laminas Project a Series of LF Projects, LLC.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+- Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+
+- Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+
+- Neither the name of Laminas Foundation nor the names of its contributors may
+ be used to endorse or promote products derived from this software without
+ specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/laminas/laminas-zendframework-bridge/README.md b/vendor/laminas/laminas-zendframework-bridge/README.md
new file mode 100644
index 0000000000..fd7953823b
--- /dev/null
+++ b/vendor/laminas/laminas-zendframework-bridge/README.md
@@ -0,0 +1,24 @@
+# laminas-zendframework-bridge
+
+[](https://travis-ci.com/laminas/laminas-zendframework-bridge)
+[](https://coveralls.io/github/laminas/laminas-zendframework-bridge?branch=master)
+
+This library provides a custom autoloader that aliases legacy Zend Framework,
+Apigility, and Expressive classes to their replacements under the Laminas
+Project.
+
+This package should be installed only if you are also using the composer plugin
+that installs Laminas packages to replace ZF/Apigility/Expressive packages.
+
+## Installation
+
+Run the following to install this library:
+
+```bash
+$ composer require laminas/laminas-zendframework-bridge
+```
+
+## Support
+
+* [Issues](https://github.com/laminas/laminas-zendframework-bridge/issues/)
+* [Forum](https://discourse.laminas.dev/)
diff --git a/vendor/laminas/laminas-zendframework-bridge/composer.json b/vendor/laminas/laminas-zendframework-bridge/composer.json
new file mode 100644
index 0000000000..e4c9941c33
--- /dev/null
+++ b/vendor/laminas/laminas-zendframework-bridge/composer.json
@@ -0,0 +1,62 @@
+{
+ "name": "laminas/laminas-zendframework-bridge",
+ "description": "Alias legacy ZF class names to Laminas Project equivalents.",
+ "license": "BSD-3-Clause",
+ "keywords": [
+ "autoloading",
+ "laminas",
+ "zf",
+ "zendframework"
+ ],
+ "support": {
+ "issues": "https://github.com/laminas/laminas-zendframework-bridge/issues",
+ "source": "https://github.com/laminas/laminas-zendframework-bridge",
+ "rss": "https://github.com/laminas/laminas-zendframework-bridge/releases.atom",
+ "forum": "https://discourse.laminas.dev/"
+ },
+ "require": {
+ "php": "^5.6 || ^7.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^5.7 || ^6.5 || ^7.5 || ^8.1",
+ "squizlabs/php_codesniffer": "^3.5"
+ },
+ "autoload": {
+ "files": [
+ "src/autoload.php"
+ ],
+ "psr-4": {
+ "Laminas\\ZendFrameworkBridge\\": "src//"
+ }
+ },
+ "autoload-dev": {
+ "files": [
+ "test/classes.php"
+ ],
+ "psr-4": {
+ "LaminasTest\\ZendFrameworkBridge\\": "test/",
+ "LaminasTest\\ZendFrameworkBridge\\TestAsset\\": "test/TestAsset/classes/",
+ "Laminas\\ApiTools\\": "test/TestAsset/LaminasApiTools/",
+ "Mezzio\\": "test/TestAsset/Mezzio/",
+ "Laminas\\": "test/TestAsset/Laminas/"
+ }
+ },
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0.x-dev",
+ "dev-develop": "1.1.x-dev"
+ },
+ "laminas": {
+ "module": "Laminas\\ZendFrameworkBridge"
+ }
+ },
+ "config": {
+ "sort-packages": true
+ },
+ "scripts": {
+ "cs-check": "phpcs",
+ "cs-fix": "phpcbf",
+ "test": "phpunit --colors=always",
+ "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
+ }
+}
diff --git a/vendor/laminas/laminas-zendframework-bridge/config/replacements.php b/vendor/laminas/laminas-zendframework-bridge/config/replacements.php
new file mode 100644
index 0000000000..f5344355f1
--- /dev/null
+++ b/vendor/laminas/laminas-zendframework-bridge/config/replacements.php
@@ -0,0 +1,372 @@
+<?php
+
+return [
+ // NEVER REWRITE
+ 'zendframework/zendframework' => 'zendframework/zendframework',
+ 'zend-developer-tools/toolbar/bjy' => 'zend-developer-tools/toolbar/bjy',
+ 'zend-developer-tools/toolbar/doctrine' => 'zend-developer-tools/toolbar/doctrine',
+
+ // NAMESPACES
+ // Zend Framework components
+ 'Zend\\AuraDi\\Config' => 'Laminas\\AuraDi\\Config',
+ 'Zend\\Authentication' => 'Laminas\\Authentication',
+ 'Zend\\Barcode' => 'Laminas\\Barcode',
+ 'Zend\\Cache' => 'Laminas\\Cache',
+ 'Zend\\Captcha' => 'Laminas\\Captcha',
+ 'Zend\\Code' => 'Laminas\\Code',
+ 'ZendCodingStandard\\Sniffs' => 'LaminasCodingStandard\\Sniffs',
+ 'ZendCodingStandard\\Utils' => 'LaminasCodingStandard\\Utils',
+ 'Zend\\ComponentInstaller' => 'Laminas\\ComponentInstaller',
+ 'Zend\\Config' => 'Laminas\\Config',
+ 'Zend\\ConfigAggregator' => 'Laminas\\ConfigAggregator',
+ 'Zend\\ConfigAggregatorModuleManager' => 'Laminas\\ConfigAggregatorModuleManager',
+ 'Zend\\ConfigAggregatorParameters' => 'Laminas\\ConfigAggregatorParameters',
+ 'Zend\\Console' => 'Laminas\\Console',
+ 'Zend\\ContainerConfigTest' => 'Laminas\\ContainerConfigTest',
+ 'Zend\\Crypt' => 'Laminas\\Crypt',
+ 'Zend\\Db' => 'Laminas\\Db',
+ 'ZendDeveloperTools' => 'Laminas\\DeveloperTools',
+ 'Zend\\Di' => 'Laminas\\Di',
+ 'Zend\\Diactoros' => 'Laminas\\Diactoros',
+ 'ZendDiagnostics\\Check' => 'Laminas\\Diagnostics\\Check',
+ 'ZendDiagnostics\\Result' => 'Laminas\\Diagnostics\\Result',
+ 'ZendDiagnostics\\Runner' => 'Laminas\\Diagnostics\\Runner',
+ 'Zend\\Dom' => 'Laminas\\Dom',
+ 'Zend\\Escaper' => 'Laminas\\Escaper',
+ 'Zend\\EventManager' => 'Laminas\\EventManager',
+ 'Zend\\Feed' => 'Laminas\\Feed',
+ 'Zend\\File' => 'Laminas\\File',
+ 'Zend\\Filter' => 'Laminas\\Filter',
+ 'Zend\\Form' => 'Laminas\\Form',
+ 'Zend\\Http' => 'Laminas\\Http',
+ 'Zend\\HttpHandlerRunner' => 'Laminas\\HttpHandlerRunner',
+ 'Zend\\Hydrator' => 'Laminas\\Hydrator',
+ 'Zend\\I18n' => 'Laminas\\I18n',
+ 'Zend\\InputFilter' => 'Laminas\\InputFilter',
+ 'Zend\\Json' => 'Laminas\\Json',
+ 'Zend\\Ldap' => 'Laminas\\Ldap',
+ 'Zend\\Loader' => 'Laminas\\Loader',
+ 'Zend\\Log' => 'Laminas\\Log',
+ 'Zend\\Mail' => 'Laminas\\Mail',
+ 'Zend\\Math' => 'Laminas\\Math',
+ 'Zend\\Memory' => 'Laminas\\Memory',
+ 'Zend\\Mime' => 'Laminas\\Mime',
+ 'Zend\\ModuleManager' => 'Laminas\\ModuleManager',
+ 'Zend\\Mvc' => 'Laminas\\Mvc',
+ 'Zend\\Navigation' => 'Laminas\\Navigation',
+ 'Zend\\Paginator' => 'Laminas\\Paginator',
+ 'Zend\\Permissions' => 'Laminas\\Permissions',
+ 'Zend\\Pimple\\Config' => 'Laminas\\Pimple\\Config',
+ 'Zend\\ProblemDetails' => 'Mezzio\\ProblemDetails',
+ 'Zend\\ProgressBar' => 'Laminas\\ProgressBar',
+ 'Zend\\Psr7Bridge' => 'Laminas\\Psr7Bridge',
+ 'Zend\\Router' => 'Laminas\\Router',
+ 'Zend\\Serializer' => 'Laminas\\Serializer',
+ 'Zend\\Server' => 'Laminas\\Server',
+ 'Zend\\ServiceManager' => 'Laminas\\ServiceManager',
+ 'ZendService\\ReCaptcha' => 'Laminas\\ReCaptcha',
+ 'ZendService\\Twitter' => 'Laminas\\Twitter',
+ 'Zend\\Session' => 'Laminas\\Session',
+ 'Zend\\SkeletonInstaller' => 'Laminas\\SkeletonInstaller',
+ 'Zend\\Soap' => 'Laminas\\Soap',
+ 'Zend\\Stdlib' => 'Laminas\\Stdlib',
+ 'Zend\\Stratigility' => 'Laminas\\Stratigility',
+ 'Zend\\Tag' => 'Laminas\\Tag',
+ 'Zend\\Test' => 'Laminas\\Test',
+ 'Zend\\Text' => 'Laminas\\Text',
+ 'Zend\\Uri' => 'Laminas\\Uri',
+ 'Zend\\Validator' => 'Laminas\\Validator',
+ 'Zend\\View' => 'Laminas\\View',
+ 'ZendXml' => 'Laminas\\Xml',
+ 'Zend\\Xml2Json' => 'Laminas\\Xml2Json',
+ 'Zend\\XmlRpc' => 'Laminas\\XmlRpc',
+ 'ZendOAuth' => 'Laminas\\OAuth',
+
+ // class ZendAcl in zend-expressive-authorization-acl
+ 'ZendAcl' => 'LaminasAcl',
+ 'Zend\\Expressive\\Authorization\\Acl\\ZendAcl' => 'Mezzio\\Authorization\\Acl\\LaminasAcl',
+ // class ZendHttpClientDecorator in zend-feed
+ 'ZendHttp' => 'LaminasHttp',
+ // class ZendModuleProvider in zend-config-aggregator-modulemanager
+ 'ZendModule' => 'LaminasModule',
+ // class ZendRbac in zend-expressive-authorization-rbac
+ 'ZendRbac' => 'LaminasRbac',
+ 'Zend\\Expressive\\Authorization\\Rbac\\ZendRbac' => 'Mezzio\\Authorization\\Rbac\\LaminasRbac',
+ // class ZendRouter in zend-expressive-router-zendrouter
+ 'ZendRouter' => 'LaminasRouter',
+ 'Zend\\Expressive\\Router\\ZendRouter' => 'Mezzio\\Router\\LaminasRouter',
+ // class ZendViewRenderer in zend-expressive-zendviewrenderer
+ 'ZendViewRenderer' => 'LaminasViewRenderer',
+ 'Zend\\Expressive\\ZendView\\ZendViewRenderer' => 'Mezzio\\LaminasView\\LaminasViewRenderer',
+ 'a\\Zend' => 'a\\Zend',
+ 'b\\Zend' => 'b\\Zend',
+ 'c\\Zend' => 'c\\Zend',
+ 'd\\Zend' => 'd\\Zend',
+ 'e\\Zend' => 'e\\Zend',
+ 'f\\Zend' => 'f\\Zend',
+ 'g\\Zend' => 'g\\Zend',
+ 'h\\Zend' => 'h\\Zend',
+ 'i\\Zend' => 'i\\Zend',
+ 'j\\Zend' => 'j\\Zend',
+ 'k\\Zend' => 'k\\Zend',
+ 'l\\Zend' => 'l\\Zend',
+ 'm\\Zend' => 'm\\Zend',
+ 'n\\Zend' => 'n\\Zend',
+ 'o\\Zend' => 'o\\Zend',
+ 'p\\Zend' => 'p\\Zend',
+ 'q\\Zend' => 'q\\Zend',
+ 'r\\Zend' => 'r\\Zend',
+ 's\\Zend' => 's\\Zend',
+ 't\\Zend' => 't\\Zend',
+ 'u\\Zend' => 'u\\Zend',
+ 'v\\Zend' => 'v\\Zend',
+ 'w\\Zend' => 'w\\Zend',
+ 'x\\Zend' => 'x\\Zend',
+ 'y\\Zend' => 'y\\Zend',
+ 'z\\Zend' => 'z\\Zend',
+
+ // Expressive
+ 'Zend\\Expressive' => 'Mezzio',
+ 'ZendAuthentication' => 'LaminasAuthentication',
+ 'ZendAcl' => 'LaminasAcl',
+ 'ZendRbac' => 'LaminasRbac',
+ 'ZendRouter' => 'LaminasRouter',
+ 'ExpressiveUrlGenerator' => 'MezzioUrlGenerator',
+ 'ExpressiveInstaller' => 'MezzioInstaller',
+
+ // Apigility
+ 'ZF\\Apigility' => 'Laminas\\ApiTools',
+ 'ZF\\ApiProblem' => 'Laminas\\ApiTools\\ApiProblem',
+ 'ZF\\AssetManager' => 'Laminas\\ApiTools\\AssetManager',
+ 'ZF\\ComposerAutoloading' => 'Laminas\\ComposerAutoloading',
+ 'ZF\\Configuration' => 'Laminas\\ApiTools\\Configuration',
+ 'ZF\\ContentNegotiation' => 'Laminas\\ApiTools\\ContentNegotiation',
+ 'ZF\\ContentValidation' => 'Laminas\\ApiTools\\ContentValidation',
+ 'ZF\\DevelopmentMode' => 'Laminas\\DevelopmentMode',
+ 'ZF\\Doctrine\\QueryBuilder' => 'Laminas\\ApiTools\\Doctrine\\QueryBuilder',
+ 'ZF\\Hal' => 'Laminas\\ApiTools\\Hal',
+ 'ZF\\HttpCache' => 'Laminas\\ApiTools\\HttpCache',
+ 'ZF\\MvcAuth' => 'Laminas\\ApiTools\\MvcAuth',
+ 'ZF\\OAuth2' => 'Laminas\\ApiTools\\OAuth2',
+ 'ZF\\Rest' => 'Laminas\\ApiTools\\Rest',
+ 'ZF\\Rpc' => 'Laminas\\ApiTools\\Rpc',
+ 'ZF\\Versioning' => 'Laminas\\ApiTools\\Versioning',
+ 'a\\ZF' => 'a\\ZF',
+ 'b\\ZF' => 'b\\ZF',
+ 'c\\ZF' => 'c\\ZF',
+ 'd\\ZF' => 'd\\ZF',
+ 'e\\ZF' => 'e\\ZF',
+ 'f\\ZF' => 'f\\ZF',
+ 'g\\ZF' => 'g\\ZF',
+ 'h\\ZF' => 'h\\ZF',
+ 'i\\ZF' => 'i\\ZF',
+ 'j\\ZF' => 'j\\ZF',
+ 'k\\ZF' => 'k\\ZF',
+ 'l\\ZF' => 'l\\ZF',
+ 'm\\ZF' => 'm\\ZF',
+ 'n\\ZF' => 'n\\ZF',
+ 'o\\ZF' => 'o\\ZF',
+ 'p\\ZF' => 'p\\ZF',
+ 'q\\ZF' => 'q\\ZF',
+ 'r\\ZF' => 'r\\ZF',
+ 's\\ZF' => 's\\ZF',
+ 't\\ZF' => 't\\ZF',
+ 'u\\ZF' => 'u\\ZF',
+ 'v\\ZF' => 'v\\ZF',
+ 'w\\ZF' => 'w\\ZF',
+ 'x\\ZF' => 'x\\ZF',
+ 'y\\ZF' => 'y\\ZF',
+ 'z\\ZF' => 'z\\ZF',
+
+ 'ApigilityModuleInterface' => 'ApiToolsModuleInterface',
+ 'ApigilityProviderInterface' => 'ApiToolsProviderInterface',
+ 'ApigilityVersionController' => 'ApiToolsVersionController',
+
+ // PACKAGES
+ // ZF components, MVC
+ 'zendframework/skeleton-application' => 'laminas/skeleton-application',
+ 'zendframework/zend-auradi-config' => 'laminas/laminas-auradi-config',
+ 'zendframework/zend-authentication' => 'laminas/laminas-authentication',
+ 'zendframework/zend-barcode' => 'laminas/laminas-barcode',
+ 'zendframework/zend-cache' => 'laminas/laminas-cache',
+ 'zendframework/zend-captcha' => 'laminas/laminas-captcha',
+ 'zendframework/zend-code' => 'laminas/laminas-code',
+ 'zendframework/zend-coding-standard' => 'laminas/laminas-coding-standard',
+ 'zendframework/zend-component-installer' => 'laminas/laminas-component-installer',
+ 'zendframework/zend-composer-autoloading' => 'laminas/laminas-composer-autoloading',
+ 'zendframework/zend-config-aggregator' => 'laminas/laminas-config-aggregator',
+ 'zendframework/zend-config' => 'laminas/laminas-config',
+ 'zendframework/zend-console' => 'laminas/laminas-console',
+ 'zendframework/zend-container-config-test' => 'laminas/laminas-container-config-test',
+ 'zendframework/zend-crypt' => 'laminas/laminas-crypt',
+ 'zendframework/zend-db' => 'laminas/laminas-db',
+ 'zendframework/zend-developer-tools' => 'laminas/laminas-developer-tools',
+ 'zendframework/zend-diactoros' => 'laminas/laminas-diactoros',
+ 'zendframework/zenddiagnostics' => 'laminas/laminas-diagnostics',
+ 'zendframework/zend-di' => 'laminas/laminas-di',
+ 'zendframework/zend-dom' => 'laminas/laminas-dom',
+ 'zendframework/zend-escaper' => 'laminas/laminas-escaper',
+ 'zendframework/zend-eventmanager' => 'laminas/laminas-eventmanager',
+ 'zendframework/zend-feed' => 'laminas/laminas-feed',
+ 'zendframework/zend-file' => 'laminas/laminas-file',
+ 'zendframework/zend-filter' => 'laminas/laminas-filter',
+ 'zendframework/zend-form' => 'laminas/laminas-form',
+ 'zendframework/zend-httphandlerrunner' => 'laminas/laminas-httphandlerrunner',
+ 'zendframework/zend-http' => 'laminas/laminas-http',
+ 'zendframework/zend-hydrator' => 'laminas/laminas-hydrator',
+ 'zendframework/zend-i18n' => 'laminas/laminas-i18n',
+ 'zendframework/zend-i18n-resources' => 'laminas/laminas-i18n-resources',
+ 'zendframework/zend-inputfilter' => 'laminas/laminas-inputfilter',
+ 'zendframework/zend-json' => 'laminas/laminas-json',
+ 'zendframework/zend-json-server' => 'laminas/laminas-json-server',
+ 'zendframework/zend-ldap' => 'laminas/laminas-ldap',
+ 'zendframework/zend-loader' => 'laminas/laminas-loader',
+ 'zendframework/zend-log' => 'laminas/laminas-log',
+ 'zendframework/zend-mail' => 'laminas/laminas-mail',
+ 'zendframework/zend-math' => 'laminas/laminas-math',
+ 'zendframework/zend-memory' => 'laminas/laminas-memory',
+ 'zendframework/zend-mime' => 'laminas/laminas-mime',
+ 'zendframework/zend-modulemanager' => 'laminas/laminas-modulemanager',
+ 'zendframework/zend-mvc' => 'laminas/laminas-mvc',
+ 'zendframework/zend-navigation' => 'laminas/laminas-navigation',
+ 'zendframework/zend-oauth' => 'laminas/laminas-oauth',
+ 'zendframework/zend-paginator' => 'laminas/laminas-paginator',
+ 'zendframework/zend-permissions-acl' => 'laminas/laminas-permissions-acl',
+ 'zendframework/zend-permissions-rbac' => 'laminas/laminas-permissions-rbac',
+ 'zendframework/zend-pimple-config' => 'laminas/laminas-pimple-config',
+ 'zendframework/zend-progressbar' => 'laminas/laminas-progressbar',
+ 'zendframework/zend-psr7bridge' => 'laminas/laminas-psr7bridge',
+ 'zendframework/zend-recaptcha' => 'laminas/laminas-recaptcha',
+ 'zendframework/zend-router' => 'laminas/laminas-router',
+ 'zendframework/zend-serializer' => 'laminas/laminas-serializer',
+ 'zendframework/zend-server' => 'laminas/laminas-server',
+ 'zendframework/zend-servicemanager' => 'laminas/laminas-servicemanager',
+ 'zendframework/zendservice-recaptcha' => 'laminas/laminas-recaptcha',
+ 'zendframework/zendservice-twitter' => 'laminas/laminas-twitter',
+ 'zendframework/zend-session' => 'laminas/laminas-session',
+ 'zendframework/zend-skeleton-installer' => 'laminas/laminas-skeleton-installer',
+ 'zendframework/zend-soap' => 'laminas/laminas-soap',
+ 'zendframework/zend-stdlib' => 'laminas/laminas-stdlib',
+ 'zendframework/zend-stratigility' => 'laminas/laminas-stratigility',
+ 'zendframework/zend-tag' => 'laminas/laminas-tag',
+ 'zendframework/zend-test' => 'laminas/laminas-test',
+ 'zendframework/zend-text' => 'laminas/laminas-text',
+ 'zendframework/zend-uri' => 'laminas/laminas-uri',
+ 'zendframework/zend-validator' => 'laminas/laminas-validator',
+ 'zendframework/zend-view' => 'laminas/laminas-view',
+ 'zendframework/zend-xml2json' => 'laminas/laminas-xml2json',
+ 'zendframework/zend-xml' => 'laminas/laminas-xml',
+ 'zendframework/zend-xmlrpc' => 'laminas/laminas-xmlrpc',
+
+ // Expressive packages
+ 'zendframework/zend-expressive' => 'mezzio/mezzio',
+ 'zendframework/zend-expressive-zendrouter' => 'mezzio/mezzio-laminasrouter',
+ 'zendframework/zend-problem-details' => 'mezzio/mezzio-problem-details',
+ 'zendframework/zend-expressive-zendviewrenderer' => 'mezzio/mezzio-laminasviewrenderer',
+
+ // Apigility packages
+ 'zfcampus/apigility-documentation' => 'laminas-api-tools/documentation',
+ 'zfcampus/statuslib-example' => 'laminas-api-tools/statuslib-example',
+ 'zfcampus/zf-apigility' => 'laminas-api-tools/api-tools',
+ 'zfcampus/zf-api-problem' => 'laminas-api-tools/api-tools-api-problem',
+ 'zfcampus/zf-asset-manager' => 'laminas-api-tools/api-tools-asset-manager',
+ 'zfcampus/zf-configuration' => 'laminas-api-tools/api-tools-configuration',
+ 'zfcampus/zf-content-negotiation' => 'laminas-api-tools/api-tools-content-negotiation',
+ 'zfcampus/zf-content-validation' => 'laminas-api-tools/api-tools-content-validation',
+ 'zfcampus/zf-development-mode' => 'laminas/laminas-development-mode',
+ 'zfcampus/zf-doctrine-querybuilder' => 'laminas-api-tools/api-tools-doctrine-querybuilder',
+ 'zfcampus/zf-hal' => 'laminas-api-tools/api-tools-hal',
+ 'zfcampus/zf-http-cache' => 'laminas-api-tools/api-tools-http-cache',
+ 'zfcampus/zf-mvc-auth' => 'laminas-api-tools/api-tools-mvc-auth',
+ 'zfcampus/zf-oauth2' => 'laminas-api-tools/api-tools-oauth2',
+ 'zfcampus/zf-rest' => 'laminas-api-tools/api-tools-rest',
+ 'zfcampus/zf-rpc' => 'laminas-api-tools/api-tools-rpc',
+ 'zfcampus/zf-versioning' => 'laminas-api-tools/api-tools-versioning',
+
+ // CONFIG KEYS, SCRIPT NAMES, ETC
+ // ZF components
+ '::fromZend' => '::fromLaminas', // psr7bridge
+ '::toZend' => '::toLaminas', // psr7bridge
+ 'use_zend_loader' => 'use_laminas_loader', // zend-modulemanager
+ 'zend-config' => 'laminas-config',
+ 'zend-developer-tools/' => 'laminas-developer-tools/',
+ 'zend-tag-cloud' => 'laminas-tag-cloud',
+ 'zenddevelopertools' => 'laminas-developer-tools',
+ 'zendbarcode' => 'laminasbarcode',
+ 'ZendBarcode' => 'LaminasBarcode',
+ 'zendcache' => 'laminascache',
+ 'ZendCache' => 'LaminasCache',
+ 'zendconfig' => 'laminasconfig',
+ 'ZendConfig' => 'LaminasConfig',
+ 'zendfeed' => 'laminasfeed',
+ 'ZendFeed' => 'LaminasFeed',
+ 'zendfilter' => 'laminasfilter',
+ 'ZendFilter' => 'LaminasFilter',
+ 'zendform' => 'laminasform',
+ 'ZendForm' => 'LaminasForm',
+ 'zendi18n' => 'laminasi18n',
+ 'ZendI18n' => 'LaminasI18n',
+ 'zendinputfilter' => 'laminasinputfilter',
+ 'ZendInputFilter' => 'LaminasInputFilter',
+ 'zendlog' => 'laminaslog',
+ 'ZendLog' => 'LaminasLog',
+ 'zendmail' => 'laminasmail',
+ 'ZendMail' => 'LaminasMail',
+ 'zendmvc' => 'laminasmvc',
+ 'ZendMvc' => 'LaminasMvc',
+ 'zendpaginator' => 'laminaspaginator',
+ 'ZendPaginator' => 'LaminasPaginator',
+ 'zendserializer' => 'laminasserializer',
+ 'ZendSerializer' => 'LaminasSerializer',
+ 'zendtag' => 'laminastag',
+ 'ZendTag' => 'LaminasTag',
+ 'zendtext' => 'laminastext',
+ 'ZendText' => 'LaminasText',
+ 'zendvalidator' => 'laminasvalidator',
+ 'ZendValidator' => 'LaminasValidator',
+ 'zendview' => 'laminasview',
+ 'ZendView' => 'LaminasView',
+ 'zend-framework.flf' => 'laminas-project.flf',
+
+ // Expressive-related
+ "'zend-expressive'" => "'mezzio'",
+ '"zend-expressive"' => '"mezzio"',
+ 'zend-expressive.' => 'mezzio.',
+ 'zend-expressive-authorization' => 'mezzio-authorization',
+ 'zend-expressive-hal' => 'mezzio-hal',
+ 'zend-expressive-session' => 'mezzio-session',
+ 'zend-expressive-swoole' => 'mezzio-swoole',
+ 'zend-expressive-tooling' => 'mezzio-tooling',
+
+ // Apigility-related
+ "'zf-apigility'" => "'api-tools'",
+ '"zf-apigility"' => '"api-tools"',
+ 'zf-apigility/' => 'api-tools/',
+ 'zf-apigility-admin' => 'api-tools-admin',
+ 'zf-content-negotiation' => 'api-tools-content-negotiation',
+ 'zf-hal' => 'api-tools-hal',
+ 'zf-rest' => 'api-tools-rest',
+ 'zf-rpc' => 'api-tools-rpc',
+ 'zf-content-validation' => 'api-tools-content-validation',
+ 'zf-apigility-ui' => 'api-tools-ui',
+ 'zf-apigility-documentation-blueprint' => 'api-tools-documentation-blueprint',
+ 'zf-apigility-documentation-swagger' => 'api-tools-documentation-swagger',
+ 'zf-apigility-welcome' => 'api-tools-welcome',
+ 'zf-api-problem' => 'api-tools-api-problem',
+ 'zf-configuration' => 'api-tools-configuration',
+ 'zf-http-cache' => 'api-tools-http-cache',
+ 'zf-mvc-auth' => 'api-tools-mvc-auth',
+ 'zf-oauth2' => 'api-tools-oauth2',
+ 'zf-versioning' => 'api-tools-versioning',
+ 'ZfApigilityDoctrineQueryProviderManager' => 'LaminasApiToolsDoctrineQueryProviderManager',
+ 'ZfApigilityDoctrineQueryCreateFilterManager' => 'LaminasApiToolsDoctrineQueryCreateFilterManager',
+ 'zf-apigility-doctrine' => 'api-tools-doctrine',
+ 'zf-development-mode' => 'laminas-development-mode',
+ 'zf-doctrine-querybuilder' => 'api-tools-doctrine-querybuilder',
+
+ // 3rd party Apigility packages
+ 'api-skeletons/zf-' => 'api-skeletons/zf-', // api-skeletons packages
+ 'zf-oauth2-' => 'zf-oauth2-', // api-skeletons OAuth2-related packages
+ 'ZF\\OAuth2\\Client' => 'ZF\\OAuth2\\Client', // api-skeletons/zf-oauth2-client
+ 'ZF\\OAuth2\\Doctrine' => 'ZF\\OAuth2\\Doctrine', // api-skeletons/zf-oauth2-doctrine
+];
diff --git a/vendor/laminas/laminas-zendframework-bridge/src/Autoloader.php b/vendor/laminas/laminas-zendframework-bridge/src/Autoloader.php
new file mode 100644
index 0000000000..d06acd7562
--- /dev/null
+++ b/vendor/laminas/laminas-zendframework-bridge/src/Autoloader.php
@@ -0,0 +1,168 @@
+<?php
+
+/**
+ * @see https://github.com/laminas/laminas-zendframework-bridge for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-zendframework-bridge/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-zendframework-bridge/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Laminas\ZendFrameworkBridge;
+
+use ArrayObject;
+use Composer\Autoload\ClassLoader;
+use RuntimeException;
+
+use function array_values;
+use function class_alias;
+use function class_exists;
+use function explode;
+use function file_exists;
+use function interface_exists;
+use function spl_autoload_register;
+use function strlen;
+use function strtr;
+use function substr;
+use function trait_exists;
+
+/**
+ * Alias legacy Zend Framework project classes/interfaces/traits to Laminas equivalents.
+ */
+class Autoloader
+{
+ /**
+ * Attach autoloaders for managing legacy ZF artifacts.
+ *
+ * We attach two autoloaders:
+ *
+ * - The first is _prepended_ to handle new classes and add aliases for
+ * legacy classes. PHP expects any interfaces implemented, classes
+ * extended, or traits used when declaring class_alias() to exist and/or
+ * be autoloadable already at the time of declaration. If not, it will
+ * raise a fatal error. This autoloader helps mitigate errors in such
+ * situations.
+ *
+ * - The second is _appended_ in order to create aliases for legacy
+ * classes.
+ */
+ public static function load()
+ {
+ $loaded = new ArrayObject([]);
+
+ spl_autoload_register(self::createPrependAutoloader(
+ RewriteRules::namespaceReverse(),
+ self::getClassLoader(),
+ $loaded
+ ), true, true);
+
+ spl_autoload_register(self::createAppendAutoloader(
+ RewriteRules::namespaceRewrite(),
+ $loaded
+ ));
+ }
+
+ /**
+ * @return ClassLoader
+ * @throws RuntimeException
+ */
+ private static function getClassLoader()
+ {
+ if (file_exists(__DIR__ . '/../../../autoload.php')) {
+ return include __DIR__ . '/../../../autoload.php';
+ }
+
+ if (file_exists(__DIR__ . '/../vendor/autoload.php')) {
+ return include __DIR__ . '/../vendor/autoload.php';
+ }
+
+ throw new RuntimeException('Cannot detect composer autoload. Please run composer install');
+ }
+
+ /**
+ * @return callable
+ */
+ private static function createPrependAutoloader(array $namespaces, ClassLoader $classLoader, ArrayObject $loaded)
+ {
+ /**
+ * @param string $class Class name to autoload
+ * @return void
+ */
+ return static function ($class) use ($namespaces, $classLoader, $loaded) {
+ if (isset($loaded[$class])) {
+ return;
+ }
+
+ $segments = explode('\\', $class);
+
+ $i = 0;
+ $check = '';
+
+ while (isset($segments[$i + 1], $namespaces[$check . $segments[$i] . '\\'])) {
+ $check .= $segments[$i] . '\\';
+ ++$i;
+ }
+
+ if ($check === '') {
+ return;
+ }
+
+ if ($classLoader->loadClass($class)) {
+ $legacy = $namespaces[$check]
+ . strtr(substr($class, strlen($check)), [
+ 'ApiTools' => 'Apigility',
+ 'Mezzio' => 'Expressive',
+ 'Laminas' => 'Zend',
+ ]);
+ class_alias($class, $legacy);
+ }
+ };
+ }
+
+ /**
+ * @return callable
+ */
+ private static function createAppendAutoloader(array $namespaces, ArrayObject $loaded)
+ {
+ /**
+ * @param string $class Class name to autoload
+ * @return void
+ */
+ return static function ($class) use ($namespaces, $loaded) {
+ $segments = explode('\\', $class);
+
+ if ($segments[0] === 'ZendService' && isset($segments[1])) {
+ $segments[0] .= '\\' . $segments[1];
+ unset($segments[1]);
+ $segments = array_values($segments);
+ }
+
+ $i = 0;
+ $check = '';
+
+ // We are checking segments of the namespace to match quicker
+ while (isset($segments[$i + 1], $namespaces[$check . $segments[$i] . '\\'])) {
+ $check .= $segments[$i] . '\\';
+ ++$i;
+ }
+
+ if ($check === '') {
+ return;
+ }
+
+ $alias = $namespaces[$check]
+ . strtr(substr($class, strlen($check)), [
+ 'Apigility' => 'ApiTools',
+ 'Expressive' => 'Mezzio',
+ 'Zend' => 'Laminas',
+ 'AbstractZendServer' => 'AbstractZendServer',
+ 'ZendServerDisk' => 'ZendServerDisk',
+ 'ZendServerShm' => 'ZendServerShm',
+ 'ZendMonitor' => 'ZendMonitor',
+ ]);
+
+ $loaded[$alias] = true;
+ if (class_exists($alias) || interface_exists($alias) || trait_exists($alias)) {
+ class_alias($alias, $class);
+ }
+ };
+ }
+}
diff --git a/vendor/laminas/laminas-zendframework-bridge/src/ConfigPostProcessor.php b/vendor/laminas/laminas-zendframework-bridge/src/ConfigPostProcessor.php
new file mode 100644
index 0000000000..bac7b97479
--- /dev/null
+++ b/vendor/laminas/laminas-zendframework-bridge/src/ConfigPostProcessor.php
@@ -0,0 +1,434 @@
+<?php
+
+/**
+ * @see https://github.com/laminas/laminas-zendframework-bridge for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-zendframework-bridge/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-zendframework-bridge/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Laminas\ZendFrameworkBridge;
+
+use function array_intersect_key;
+use function array_key_exists;
+use function array_pop;
+use function array_push;
+use function count;
+use function in_array;
+use function is_array;
+use function is_callable;
+use function is_int;
+use function is_string;
+
+class ConfigPostProcessor
+{
+ /** @internal */
+ const SERVICE_MANAGER_KEYS_OF_INTEREST = [
+ 'aliases' => true,
+ 'factories' => true,
+ 'invokables' => true,
+ 'services' => true,
+ ];
+
+ /** @var array String keys => string values */
+ private $exactReplacements = [
+ 'zend-expressive' => 'mezzio',
+ 'zf-apigility' => 'api-tools',
+ ];
+
+ /** @var Replacements */
+ private $replacements;
+
+ /** @var callable[] */
+ private $rulesets;
+
+ public function __construct()
+ {
+ $this->replacements = new Replacements();
+
+ /* Define the rulesets for replacements.
+ *
+ * Each ruleset has the following signature:
+ *
+ * @param mixed $value
+ * @param string[] $keys Full nested key hierarchy leading to the value
+ * @return null|callable
+ *
+ * If no match is made, a null is returned, allowing it to fallback to
+ * the next ruleset in the list. If a match is made, a callback is returned,
+ * and that will be used to perform the replacement on the value.
+ *
+ * The callback should have the following signature:
+ *
+ * @param mixed $value
+ * @param string[] $keys
+ * @return mixed The transformed value
+ */
+ $this->rulesets = [
+ // Exact values
+ function ($value) {
+ return is_string($value) && isset($this->exactReplacements[$value])
+ ? [$this, 'replaceExactValue']
+ : null;
+ },
+
+ // Router (MVC applications)
+ // We do not want to rewrite these.
+ function ($value, array $keys) {
+ $key = array_pop($keys);
+ // Only worried about a top-level "router" key.
+ return $key === 'router' && count($keys) === 0 && is_array($value)
+ ? [$this, 'noopReplacement']
+ : null;
+ },
+
+ // service- and pluginmanager handling
+ function ($value) {
+ return is_array($value) && array_intersect_key(self::SERVICE_MANAGER_KEYS_OF_INTEREST, $value) !== []
+ ? [$this, 'replaceDependencyConfiguration']
+ : null;
+ },
+
+ // Array values
+ function ($value, array $keys) {
+ return 0 !== count($keys) && is_array($value)
+ ? [$this, '__invoke']
+ : null;
+ },
+ ];
+ }
+
+ /**
+ * @param string[] $keys Hierarchy of keys, for determining location in
+ * nested configuration.
+ * @return array
+ */
+ public function __invoke(array $config, array $keys = [])
+ {
+ $rewritten = [];
+
+ foreach ($config as $key => $value) {
+ // Determine new key from replacements
+ $newKey = is_string($key) ? $this->replace($key, $keys) : $key;
+
+ // Keep original values with original key, if the key has changed, but only at the top-level.
+ if (empty($keys) && $newKey !== $key) {
+ $rewritten[$key] = $value;
+ }
+
+ // Perform value replacements, if any
+ $newValue = $this->replace($value, $keys, $newKey);
+
+ // Key does not already exist and/or is not an array value
+ if (! array_key_exists($newKey, $rewritten) || ! is_array($rewritten[$newKey])) {
+ // Do not overwrite existing values with null values
+ $rewritten[$newKey] = array_key_exists($newKey, $rewritten) && null === $newValue
+ ? $rewritten[$newKey]
+ : $newValue;
+ continue;
+ }
+
+ // New value is null; nothing to do.
+ if (null === $newValue) {
+ continue;
+ }
+
+ // Key already exists as an array value, but $value is not an array
+ if (! is_array($newValue)) {
+ $rewritten[$newKey][] = $newValue;
+ continue;
+ }
+
+ // Key already exists as an array value, and $value is also an array
+ $rewritten[$newKey] = static::merge($rewritten[$newKey], $newValue);
+ }
+
+ return $rewritten;
+ }
+
+ /**
+ * Perform substitutions as needed on an individual value.
+ *
+ * The $key is provided to allow fine-grained selection of rewrite rules.
+ *
+ * @param mixed $value
+ * @param string[] $keys Key hierarchy
+ * @param null|int|string $key
+ * @return mixed
+ */
+ private function replace($value, array $keys, $key = null)
+ {
+ // Add new key to the list of keys.
+ // We do not need to remove it later, as we are working on a copy of the array.
+ array_push($keys, $key);
+
+ // Identify rewrite strategy and perform replacements
+ $rewriteRule = $this->replacementRuleMatch($value, $keys);
+ return $rewriteRule($value, $keys);
+ }
+
+ /**
+ * Merge two arrays together.
+ *
+ * If an integer key exists in both arrays, the value from the second array
+ * will be appended to the first array. If both values are arrays, they are
+ * merged together, else the value of the second array overwrites the one
+ * of the first array.
+ *
+ * Based on zend-stdlib Zend\Stdlib\ArrayUtils::merge
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ *
+ * @return array
+ */
+ public static function merge(array $a, array $b)
+ {
+ foreach ($b as $key => $value) {
+ if (! isset($a[$key]) && ! array_key_exists($key, $a)) {
+ $a[$key] = $value;
+ continue;
+ }
+
+ if (null === $value && array_key_exists($key, $a)) {
+ // Leave as-is if value from $b is null
+ continue;
+ }
+
+ if (is_int($key)) {
+ $a[] = $value;
+ continue;
+ }
+
+ if (is_array($value) && is_array($a[$key])) {
+ $a[$key] = static::merge($a[$key], $value);
+ continue;
+ }
+
+ $a[$key] = $value;
+ }
+
+ return $a;
+ }
+
+ /**
+ * @param mixed $value
+ * @param null|int|string $key
+ * @return callable Callable to invoke with value
+ */
+ private function replacementRuleMatch($value, $key = null)
+ {
+ foreach ($this->rulesets as $ruleset) {
+ $result = $ruleset($value, $key);
+ if (is_callable($result)) {
+ return $result;
+ }
+ }
+ return [$this, 'fallbackReplacement'];
+ }
+
+ /**
+ * Replace a value using the translation table, if the value is a string.
+ *
+ * @param mixed $value
+ * @return mixed
+ */
+ private function fallbackReplacement($value)
+ {
+ return is_string($value)
+ ? $this->replacements->replace($value)
+ : $value;
+ }
+
+ /**
+ * Replace a value matched exactly.
+ *
+ * @param mixed $value
+ * @return mixed
+ */
+ private function replaceExactValue($value)
+ {
+ return $this->exactReplacements[$value];
+ }
+
+ private function replaceDependencyConfiguration(array $config)
+ {
+ $aliases = isset($config['aliases']) && is_array($config['aliases'])
+ ? $this->replaceDependencyAliases($config['aliases'])
+ : [];
+
+ if ($aliases) {
+ $config['aliases'] = $aliases;
+ }
+
+ $config = $this->replaceDependencyInvokables($config);
+ $config = $this->replaceDependencyFactories($config);
+ $config = $this->replaceDependencyServices($config);
+
+ $keys = self::SERVICE_MANAGER_KEYS_OF_INTEREST;
+ foreach ($config as $key => $data) {
+ if (isset($keys[$key])) {
+ continue;
+ }
+
+ $config[$key] = is_array($data) ? $this->__invoke($data, [$key]) : $data;
+ }
+
+ return $config;
+ }
+
+ /**
+ * Rewrite dependency aliases array
+ *
+ * In this case, we want to keep the alias as-is, but rewrite the target.
+ *
+ * We need also provide an additional alias if the alias key is a legacy class.
+ *
+ * @return array
+ */
+ private function replaceDependencyAliases(array $aliases)
+ {
+ foreach ($aliases as $alias => $target) {
+ if (! is_string($alias) || ! is_string($target)) {
+ continue;
+ }
+
+ $newTarget = $this->replacements->replace($target);
+ $newAlias = $this->replacements->replace($alias);
+
+ $notIn = [$newTarget];
+ $name = $newTarget;
+ while (isset($aliases[$name])) {
+ $notIn[] = $aliases[$name];
+ $name = $aliases[$name];
+ }
+
+ if ($newAlias === $alias && ! in_array($alias, $notIn, true)) {
+ $aliases[$alias] = $newTarget;
+ continue;
+ }
+
+ if (isset($aliases[$newAlias])) {
+ continue;
+ }
+
+ if (! in_array($newAlias, $notIn, true)) {
+ $aliases[$alias] = $newAlias;
+ $aliases[$newAlias] = $newTarget;
+ }
+ }
+
+ return $aliases;
+ }
+
+ /**
+ * Rewrite dependency invokables array
+ *
+ * In this case, we want to keep the alias as-is, but rewrite the target.
+ *
+ * We need also provide an additional alias if invokable is defined with
+ * an alias which is a legacy class.
+ *
+ * @return array
+ */
+ private function replaceDependencyInvokables(array $config)
+ {
+ if (empty($config['invokables']) || ! is_array($config['invokables'])) {
+ return $config;
+ }
+
+ foreach ($config['invokables'] as $alias => $target) {
+ if (! is_string($alias)) {
+ continue;
+ }
+
+ $newTarget = $this->replacements->replace($target);
+ $newAlias = $this->replacements->replace($alias);
+
+ if ($alias === $target || isset($config['aliases'][$newAlias])) {
+ $config['invokables'][$alias] = $newTarget;
+ continue;
+ }
+
+ $config['invokables'][$newAlias] = $newTarget;
+
+ if ($newAlias === $alias) {
+ continue;
+ }
+
+ $config['aliases'][$alias] = $newAlias;
+
+ unset($config['invokables'][$alias]);
+ }
+
+ return $config;
+ }
+
+ /**
+ * @param mixed $value
+ * @return mixed Returns $value verbatim.
+ */
+ private function noopReplacement($value)
+ {
+ return $value;
+ }
+
+ private function replaceDependencyFactories(array $config)
+ {
+ if (empty($config['factories']) || ! is_array($config['factories'])) {
+ return $config;
+ }
+
+ foreach ($config['factories'] as $service => $factory) {
+ if (! is_string($service)) {
+ continue;
+ }
+
+ $replacedService = $this->replacements->replace($service);
+ $factory = is_string($factory) ? $this->replacements->replace($factory) : $factory;
+ $config['factories'][$replacedService] = $factory;
+
+ if ($replacedService === $service) {
+ continue;
+ }
+
+ unset($config['factories'][$service]);
+ if (isset($config['aliases'][$service])) {
+ continue;
+ }
+
+ $config['aliases'][$service] = $replacedService;
+ }
+
+ return $config;
+ }
+
+ private function replaceDependencyServices(array $config)
+ {
+ if (empty($config['services']) || ! is_array($config['services'])) {
+ return $config;
+ }
+
+ foreach ($config['services'] as $service => $serviceInstance) {
+ if (! is_string($service)) {
+ continue;
+ }
+
+ $replacedService = $this->replacements->replace($service);
+ $serviceInstance = is_array($serviceInstance) ? $this->__invoke($serviceInstance) : $serviceInstance;
+
+ $config['services'][$replacedService] = $serviceInstance;
+
+ if ($service === $replacedService) {
+ continue;
+ }
+
+ unset($config['services'][$service]);
+
+ if (isset($config['aliases'][$service])) {
+ continue;
+ }
+
+ $config['aliases'][$service] = $replacedService;
+ }
+
+ return $config;
+ }
+}
diff --git a/vendor/laminas/laminas-zendframework-bridge/src/Module.php b/vendor/laminas/laminas-zendframework-bridge/src/Module.php
new file mode 100644
index 0000000000..d10cb43dd8
--- /dev/null
+++ b/vendor/laminas/laminas-zendframework-bridge/src/Module.php
@@ -0,0 +1,54 @@
+<?php
+
+/**
+ * @see https://github.com/laminas/laminas-zendframework-bridge for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-zendframework-bridge/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-zendframework-bridge/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Laminas\ZendFrameworkBridge;
+
+use Laminas\ModuleManager\Listener\ConfigMergerInterface;
+use Laminas\ModuleManager\ModuleEvent;
+use Laminas\ModuleManager\ModuleManager;
+
+class Module
+{
+ /**
+ * Initialize the module.
+ *
+ * Type-hinting deliberately omitted to allow unit testing
+ * without dependencies on packages that do not exist yet.
+ *
+ * @param ModuleManager $moduleManager
+ */
+ public function init($moduleManager)
+ {
+ $moduleManager
+ ->getEventManager()
+ ->attach('mergeConfig', [$this, 'onMergeConfig']);
+ }
+
+ /**
+ * Perform substitutions in the merged configuration.
+ *
+ * Rewrites keys and values matching known ZF classes, namespaces, and
+ * configuration keys to their Laminas equivalents.
+ *
+ * Type-hinting deliberately omitted to allow unit testing
+ * without dependencies on packages that do not exist yet.
+ *
+ * @param ModuleEvent $event
+ */
+ public function onMergeConfig($event)
+ {
+ /** @var ConfigMergerInterface */
+ $configMerger = $event->getConfigListener();
+ $processor = new ConfigPostProcessor();
+ $configMerger->setMergedConfig(
+ $processor(
+ $configMerger->getMergedConfig($returnAsObject = false)
+ )
+ );
+ }
+}
diff --git a/vendor/laminas/laminas-zendframework-bridge/src/Replacements.php b/vendor/laminas/laminas-zendframework-bridge/src/Replacements.php
new file mode 100644
index 0000000000..ca445c01f9
--- /dev/null
+++ b/vendor/laminas/laminas-zendframework-bridge/src/Replacements.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * @see https://github.com/laminas/laminas-zendframework-bridge for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-zendframework-bridge/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-zendframework-bridge/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Laminas\ZendFrameworkBridge;
+
+use function array_merge;
+use function str_replace;
+use function strpos;
+use function strtr;
+
+class Replacements
+{
+ /** @var string[] */
+ private $replacements;
+
+ public function __construct(array $additionalReplacements = [])
+ {
+ $this->replacements = array_merge(
+ require __DIR__ . '/../config/replacements.php',
+ $additionalReplacements
+ );
+
+ // Provide multiple variants of strings containing namespace separators
+ foreach ($this->replacements as $original => $replacement) {
+ if (false === strpos($original, '\\')) {
+ continue;
+ }
+ $this->replacements[str_replace('\\', '\\\\', $original)] = str_replace('\\', '\\\\', $replacement);
+ $this->replacements[str_replace('\\', '\\\\\\\\', $original)] = str_replace('\\', '\\\\\\\\', $replacement);
+ }
+ }
+
+ /**
+ * @param string $value
+ * @return string
+ */
+ public function replace($value)
+ {
+ return strtr($value, $this->replacements);
+ }
+}
diff --git a/vendor/laminas/laminas-zendframework-bridge/src/RewriteRules.php b/vendor/laminas/laminas-zendframework-bridge/src/RewriteRules.php
new file mode 100644
index 0000000000..8dc999f45e
--- /dev/null
+++ b/vendor/laminas/laminas-zendframework-bridge/src/RewriteRules.php
@@ -0,0 +1,79 @@
+<?php
+
+/**
+ * @see https://github.com/laminas/laminas-zendframework-bridge for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-zendframework-bridge/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-zendframework-bridge/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Laminas\ZendFrameworkBridge;
+
+class RewriteRules
+{
+ /**
+ * @return array
+ */
+ public static function namespaceRewrite()
+ {
+ return [
+ // Expressive
+ 'Zend\\ProblemDetails\\' => 'Mezzio\\ProblemDetails\\',
+ 'Zend\\Expressive\\' => 'Mezzio\\',
+
+ // Laminas
+ 'Zend\\' => 'Laminas\\',
+ 'ZF\\ComposerAutoloading\\' => 'Laminas\\ComposerAutoloading\\',
+ 'ZF\\DevelopmentMode\\' => 'Laminas\\DevelopmentMode\\',
+
+ // Apigility
+ 'ZF\\Apigility\\' => 'Laminas\\ApiTools\\',
+ 'ZF\\' => 'Laminas\\ApiTools\\',
+
+ // ZendXml, API wrappers, zend-http OAuth support, zend-diagnostics, ZendDeveloperTools
+ 'ZendXml\\' => 'Laminas\\Xml\\',
+ 'ZendOAuth\\' => 'Laminas\\OAuth\\',
+ 'ZendDiagnostics\\' => 'Laminas\\Diagnostics\\',
+ 'ZendService\\ReCaptcha\\' => 'Laminas\\ReCaptcha\\',
+ 'ZendService\\Twitter\\' => 'Laminas\\Twitter\\',
+ 'ZendDeveloperTools\\' => 'Laminas\\DeveloperTools\\',
+ ];
+ }
+
+ /**
+ * @return array
+ */
+ public static function namespaceReverse()
+ {
+ return [
+ // ZendXml, ZendOAuth, ZendDiagnostics, ZendDeveloperTools
+ 'Laminas\\Xml\\' => 'ZendXml\\',
+ 'Laminas\\OAuth\\' => 'ZendOAuth\\',
+ 'Laminas\\Diagnostics\\' => 'ZendDiagnostics\\',
+ 'Laminas\\DeveloperTools\\' => 'ZendDeveloperTools\\',
+
+ // Zend Service
+ 'Laminas\\ReCaptcha\\' => 'ZendService\\ReCaptcha\\',
+ 'Laminas\\Twitter\\' => 'ZendService\\Twitter\\',
+
+ // Zend
+ 'Laminas\\' => 'Zend\\',
+
+ // Expressive
+ 'Mezzio\\ProblemDetails\\' => 'Zend\\ProblemDetails\\',
+ 'Mezzio\\' => 'Zend\\Expressive\\',
+
+ // Laminas to ZfCampus
+ 'Laminas\\ComposerAutoloading\\' => 'ZF\\ComposerAutoloading\\',
+ 'Laminas\\DevelopmentMode\\' => 'ZF\\DevelopmentMode\\',
+
+ // Apigility
+ 'Laminas\\ApiTools\\Admin\\' => 'ZF\\Apigility\\Admin\\',
+ 'Laminas\\ApiTools\\Doctrine\\' => 'ZF\\Apigility\\Doctrine\\',
+ 'Laminas\\ApiTools\\Documentation\\' => 'ZF\\Apigility\\Documentation\\',
+ 'Laminas\\ApiTools\\Example\\' => 'ZF\\Apigility\\Example\\',
+ 'Laminas\\ApiTools\\Provider\\' => 'ZF\\Apigility\\Provider\\',
+ 'Laminas\\ApiTools\\Welcome\\' => 'ZF\\Apiglity\\Welcome\\',
+ 'Laminas\\ApiTools\\' => 'ZF\\',
+ ];
+ }
+}
diff --git a/vendor/laminas/laminas-zendframework-bridge/src/autoload.php b/vendor/laminas/laminas-zendframework-bridge/src/autoload.php
new file mode 100644
index 0000000000..9f2f2adf85
--- /dev/null
+++ b/vendor/laminas/laminas-zendframework-bridge/src/autoload.php
@@ -0,0 +1,9 @@
+<?php
+
+/**
+ * @see https://github.com/laminas/laminas-zendframework-bridge for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-zendframework-bridge/blob/master/COPYRIGHT.md
+ * @license https://github.com/laminas/laminas-zendframework-bridge/blob/master/LICENSE.md New BSD License
+ */
+
+Laminas\ZendFrameworkBridge\Autoloader::load();
diff --git a/vendor/pear/console_getopt/Console/Getopt.php b/vendor/pear/console_getopt/Console/Getopt.php
index f8df71ce59..e5793bbb18 100644
--- a/vendor/pear/console_getopt/Console/Getopt.php
+++ b/vendor/pear/console_getopt/Console/Getopt.php
@@ -123,7 +123,7 @@ public static function doGetopt($version, $args, $short_options, $long_options =
* erroneous POSIX fix.
*/
if ($version < 2) {
- if (isset($args[0]{0}) && $args[0]{0} != '-') {
+ if (isset($args[0][0]) && $args[0][0] != '-') {
array_shift($args);
}
}
@@ -138,10 +138,10 @@ public static function doGetopt($version, $args, $short_options, $long_options =
break;
}
- if ($arg{0} != '-' || (strlen($arg) > 1 && $arg{1} == '-' && !$long_options)) {
+ if ($arg[0] != '-' || (strlen($arg) > 1 && $arg[1] == '-' && !$long_options)) {
$non_opts = array_merge($non_opts, array_slice($args, $i));
break;
- } elseif (strlen($arg) > 1 && $arg{1} == '-') {
+ } elseif (strlen($arg) > 1 && $arg[1] == '-') {
$error = Console_Getopt::_parseLongOption(substr($arg, 2),
$long_options,
$opts,
@@ -186,11 +186,11 @@ public static function doGetopt($version, $args, $short_options, $long_options =
protected static function _parseShortOption($arg, $short_options, &$opts, &$argIdx, $args, $skip_unknown)
{
for ($i = 0; $i < strlen($arg); $i++) {
- $opt = $arg{$i};
+ $opt = $arg[$i];
$opt_arg = null;
/* Try to find the short option in the specifier string. */
- if (($spec = strstr($short_options, $opt)) === false || $arg{$i} == ':') {
+ if (($spec = strstr($short_options, $opt)) === false || $arg[$i] == ':') {
if ($skip_unknown === true) {
break;
}
@@ -199,8 +199,8 @@ protected static function _parseShortOption($arg, $short_options, &$opts, &$argI
return PEAR::raiseError($msg);
}
- if (strlen($spec) > 1 && $spec{1} == ':') {
- if (strlen($spec) > 2 && $spec{2} == ':') {
+ if (strlen($spec) > 1 && $spec[1] == ':') {
+ if (strlen($spec) > 2 && $spec[2] == ':') {
if ($i + 1 < strlen($arg)) {
/* Option takes an optional argument. Use the remainder of
the arg string if there is anything left. */
@@ -296,11 +296,11 @@ protected static function _parseLongOption($arg, $long_options, &$opts, &$argIdx
$next_option_rest = '';
}
- if ($opt_rest != '' && $opt{0} != '=' &&
+ if ($opt_rest != '' && $opt[0] != '=' &&
$i + 1 < count($long_options) &&
$opt == substr($long_options[$i+1], 0, $opt_len) &&
$next_option_rest != '' &&
- $next_option_rest{0} != '=') {
+ $next_option_rest[0] != '=') {
$msg = "Console_Getopt: option --$opt is ambiguous";
return PEAR::raiseError($msg);
diff --git a/vendor/pear/console_getopt/package.xml b/vendor/pear/console_getopt/package.xml
index 3c8da769d6..d3fd784029 100644
--- a/vendor/pear/console_getopt/package.xml
+++ b/vendor/pear/console_getopt/package.xml
@@ -24,9 +24,9 @@ short and long options.</description>
<active>no</active>
</helper>
- <date>2019-02-06</date>
+ <date>2019-11-20</date>
<version>
- <release>1.4.2</release>
+ <release>1.4.3</release>
<api>1.4.0</api>
</version>
<stability>
@@ -36,7 +36,8 @@ short and long options.</description>
<license uri="http://opensource.org/licenses/bsd-license.php">BSD-2-Clause</license>
<notes>
-* Remove use of each(), which is removed in PHP 8
+* PR #4: Fix PHP 7.4 deprecation: array/string curly braces access
+* PR #5: fix phplint warnings
</notes>
<contents>
@@ -75,6 +76,23 @@ short and long options.</description>
<changelog>
+ <release>
+ <date>2019-11-20</date>
+ <version>
+ <release>1.4.3</release>
+ <api>1.4.0</api>
+ </version>
+ <stability>
+ <release>stable</release>
+ <api>stable</api>
+ </stability>
+ <license uri="http://opensource.org/licenses/bsd-license.php">BSD-2-Clause</license>
+ <notes>
+ * PR #4: Fix PHP 7.4 deprecation: array/string curly braces access
+ * PR #5: fix phplint warnings
+ </notes>
+ </release>
+
<release>
<date>2019-02-06</date>
<version>
diff --git a/vendor/pear/pear-core-minimal/src/OS/Guess.php b/vendor/pear/pear-core-minimal/src/OS/Guess.php
index c45e84f155..d5aa295c3b 100644
--- a/vendor/pear/pear-core-minimal/src/OS/Guess.php
+++ b/vendor/pear/pear-core-minimal/src/OS/Guess.php
@@ -195,9 +195,22 @@ function _detectGlibcVersion()
}
$major = $minor = 0;
include_once "System.php";
+
+ if (@is_link('/lib64/libc.so.6')) {
+ // Let's try reading the libc.so.6 symlink
+ if (preg_match('/^libc-(.*)\.so$/', basename(readlink('/lib64/libc.so.6')), $matches)) {
+ list($major, $minor) = explode('.', $matches[1]);
+ }
+ } else if (@is_link('/lib/libc.so.6')) {
+ // Let's try reading the libc.so.6 symlink
+ if (preg_match('/^libc-(.*)\.so$/', basename(readlink('/lib/libc.so.6')), $matches)) {
+ list($major, $minor) = explode('.', $matches[1]);
+ }
+ }
// Use glibc's <features.h> header file to
// get major and minor version number:
- if (@file_exists('/usr/include/features.h') &&
+ if (!($major && $minor) &&
+ @file_exists('/usr/include/features.h') &&
@is_readable('/usr/include/features.h')) {
if (!@file_exists('/usr/bin/cpp') || !@is_executable('/usr/bin/cpp')) {
$features_file = fopen('/usr/include/features.h', 'rb');
@@ -240,7 +253,7 @@ function _detectGlibcVersion()
fclose($fp);
$cpp = popen("/usr/bin/cpp $tmpfile", "r");
while ($line = fgets($cpp, 1024)) {
- if ($line{0} == '#' || trim($line) == '') {
+ if ($line[0] == '#' || trim($line) == '') {
continue;
}
@@ -252,13 +265,6 @@ function _detectGlibcVersion()
unlink($tmpfile);
} // features.h
- if (!($major && $minor) && @is_link('/lib/libc.so.6')) {
- // Let's try reading the libc.so.6 symlink
- if (preg_match('/^libc-(.*)\.so$/', basename(readlink('/lib/libc.so.6')), $matches)) {
- list($major, $minor) = explode('.', $matches[1]);
- }
- }
-
if (!($major && $minor)) {
return $glibc = '';
}
diff --git a/vendor/pear/pear-core-minimal/src/PEAR.php b/vendor/pear/pear-core-minimal/src/PEAR.php
index cf9a02de2f..fee6638f44 100644
--- a/vendor/pear/pear-core-minimal/src/PEAR.php
+++ b/vendor/pear/pear-core-minimal/src/PEAR.php
@@ -766,6 +766,28 @@ function_exists('dl') === false ||
return @dl('php_'.$ext.$suffix) || @dl($ext.$suffix);
}
+
+ /**
+ * Get SOURCE_DATE_EPOCH environment variable
+ * See https://reproducible-builds.org/specs/source-date-epoch/
+ *
+ * @return int
+ * @access public
+ */
+ static function getSourceDateEpoch()
+ {
+ if ($source_date_epoch = getenv('SOURCE_DATE_EPOCH')) {
+ if (preg_match('/^\d+$/', $source_date_epoch)) {
+ return (int) $source_date_epoch;
+ } else {
+ // "If the value is malformed, the build process SHOULD exit with a non-zero error code."
+ self::raiseError("Invalid SOURCE_DATE_EPOCH: $source_date_epoch");
+ exit(1);
+ }
+ } else {
+ return time();
+ }
+ }
}
function _PEAR_call_destructors()
diff --git a/vendor/pear/pear-core-minimal/src/System.php b/vendor/pear/pear-core-minimal/src/System.php
index aefc85b3f9..cf8f379935 100644
--- a/vendor/pear/pear-core-minimal/src/System.php
+++ b/vendor/pear/pear-core-minimal/src/System.php
@@ -74,7 +74,7 @@ public static function _parseArgs($argv, $short_options, $long_options = null)
$offset = 0;
foreach ($av as $a) {
$b = trim($a[0]);
- if ($b{0} == '"' || $b{0} == "'") {
+ if ($b[0] == '"' || $b[0] == "'") {
continue;
}
@@ -265,7 +265,7 @@ public static function mkDir($args)
} elseif ($opt[0] == 'm') {
// if the mode is clearly an octal number (starts with 0)
// convert it to decimal
- if (strlen($opt[1]) && $opt[1]{0} == '0') {
+ if (strlen($opt[1]) && $opt[1][0] == '0') {
$opt[1] = octdec($opt[1]);
} else {
// convert to int
@@ -480,7 +480,7 @@ public static function tmpdir()
if ($var = isset($_ENV['TMPDIR']) ? $_ENV['TMPDIR'] : getenv('TMPDIR')) {
return $var;
}
- return realpath('/tmp');
+ return realpath(function_exists('sys_get_temp_dir') ? sys_get_temp_dir() : '/tmp');
}
/**
diff --git a/vendor/pear/pear_exception/composer.json b/vendor/pear/pear_exception/composer.json
index ce33ed1c80..b923cf7181 100644
--- a/vendor/pear/pear_exception/composer.json
+++ b/vendor/pear/pear_exception/composer.json
@@ -21,9 +21,7 @@
"php": ">=4.4.0"
},
"autoload": {
- "psr-0": {
- "PEAR": ""
- }
+ "classmap": ["PEAR/"]
},
"extra": {
"branch-alias": {
diff --git a/vendor/psr/log/.gitignore b/vendor/psr/log/.gitignore
deleted file mode 100644
index 22d0d82f80..0000000000
--- a/vendor/psr/log/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-vendor
diff --git a/vendor/psr/log/Psr/Log/LoggerInterface.php b/vendor/psr/log/Psr/Log/LoggerInterface.php
index 5ea72438b5..2206cfde41 100644
--- a/vendor/psr/log/Psr/Log/LoggerInterface.php
+++ b/vendor/psr/log/Psr/Log/LoggerInterface.php
@@ -22,8 +22,8 @@ interface LoggerInterface
/**
* System is unusable.
*
- * @param string $message
- * @param array $context
+ * @param string $message
+ * @param mixed[] $context
*
* @return void
*/
@@ -35,8 +35,8 @@ public function emergency($message, array $context = array());
* Example: Entire website down, database unavailable, etc. This should
* trigger the SMS alerts and wake you up.
*
- * @param string $message
- * @param array $context
+ * @param string $message
+ * @param mixed[] $context
*
* @return void
*/
@@ -47,8 +47,8 @@ public function alert($message, array $context = array());
*
* Example: Application component unavailable, unexpected exception.
*
- * @param string $message
- * @param array $context
+ * @param string $message
+ * @param mixed[] $context
*
* @return void
*/
@@ -58,8 +58,8 @@ public function critical($message, array $context = array());
* Runtime errors that do not require immediate action but should typically
* be logged and monitored.
*
- * @param string $message
- * @param array $context
+ * @param string $message
+ * @param mixed[] $context
*
* @return void
*/
@@ -71,8 +71,8 @@ public function error($message, array $context = array());
* Example: Use of deprecated APIs, poor use of an API, undesirable things
* that are not necessarily wrong.
*
- * @param string $message
- * @param array $context
+ * @param string $message
+ * @param mixed[] $context
*
* @return void
*/
@@ -81,8 +81,8 @@ public function warning($message, array $context = array());
/**
* Normal but significant events.
*
- * @param string $message
- * @param array $context
+ * @param string $message
+ * @param mixed[] $context
*
* @return void
*/
@@ -93,8 +93,8 @@ public function notice($message, array $context = array());
*
* Example: User logs in, SQL logs.
*
- * @param string $message
- * @param array $context
+ * @param string $message
+ * @param mixed[] $context
*
* @return void
*/
@@ -103,8 +103,8 @@ public function info($message, array $context = array());
/**
* Detailed debug information.
*
- * @param string $message
- * @param array $context
+ * @param string $message
+ * @param mixed[] $context
*
* @return void
*/
@@ -113,11 +113,13 @@ public function debug($message, array $context = array());
/**
* Logs with an arbitrary level.
*
- * @param mixed $level
- * @param string $message
- * @param array $context
+ * @param mixed $level
+ * @param string $message
+ * @param mixed[] $context
*
* @return void
+ *
+ * @throws \Psr\Log\InvalidArgumentException
*/
public function log($level, $message, array $context = array());
}
diff --git a/vendor/psr/log/Psr/Log/LoggerTrait.php b/vendor/psr/log/Psr/Log/LoggerTrait.php
index 867225df1d..e392fef0a0 100644
--- a/vendor/psr/log/Psr/Log/LoggerTrait.php
+++ b/vendor/psr/log/Psr/Log/LoggerTrait.php
@@ -135,6 +135,8 @@ public function debug($message, array $context = array())
* @param array $context
*
* @return void
+ *
+ * @throws \Psr\Log\InvalidArgumentException
*/
abstract public function log($level, $message, array $context = array());
}
diff --git a/vendor/psr/log/Psr/Log/NullLogger.php b/vendor/psr/log/Psr/Log/NullLogger.php
index d8cd682c8f..c8f7293b1c 100644
--- a/vendor/psr/log/Psr/Log/NullLogger.php
+++ b/vendor/psr/log/Psr/Log/NullLogger.php
@@ -20,6 +20,8 @@ class NullLogger extends AbstractLogger
* @param array $context
*
* @return void
+ *
+ * @throws \Psr\Log\InvalidArgumentException
*/
public function log($level, $message, array $context = array())
{
diff --git a/vendor/psr/log/Psr/Log/Test/DummyTest.php b/vendor/psr/log/Psr/Log/Test/DummyTest.php
new file mode 100644
index 0000000000..9638c11018
--- /dev/null
+++ b/vendor/psr/log/Psr/Log/Test/DummyTest.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Psr\Log\Test;
+
+/**
+ * This class is internal and does not follow the BC promise.
+ *
+ * Do NOT use this class in any way.
+ *
+ * @internal
+ */
+class DummyTest
+{
+ public function __toString()
+ {
+ return 'DummyTest';
+ }
+}
diff --git a/vendor/psr/log/Psr/Log/Test/LoggerInterfaceTest.php b/vendor/psr/log/Psr/Log/Test/LoggerInterfaceTest.php
index 4b861c3ef6..e1e5354d2c 100644
--- a/vendor/psr/log/Psr/Log/Test/LoggerInterfaceTest.php
+++ b/vendor/psr/log/Psr/Log/Test/LoggerInterfaceTest.php
@@ -4,6 +4,7 @@
use Psr\Log\LoggerInterface;
use Psr\Log\LogLevel;
+use PHPUnit\Framework\TestCase;
/**
* Provides a base test class for ensuring compliance with the LoggerInterface.
@@ -11,7 +12,7 @@
* Implementors can extend the class and implement abstract methods to run this
* as part of their test suite.
*/
-abstract class LoggerInterfaceTest extends \PHPUnit_Framework_TestCase
+abstract class LoggerInterfaceTest extends TestCase
{
/**
* @return LoggerInterface
@@ -135,10 +136,3 @@ public function testContextExceptionKeyCanBeExceptionOrOtherValues()
$this->assertEquals($expected, $this->getLogs());
}
}
-
-class DummyTest
-{
- public function __toString()
- {
- }
-}
diff --git a/vendor/psr/log/Psr/Log/Test/TestLogger.php b/vendor/psr/log/Psr/Log/Test/TestLogger.php
index 0cdffe4f92..1be3230496 100644
--- a/vendor/psr/log/Psr/Log/Test/TestLogger.php
+++ b/vendor/psr/log/Psr/Log/Test/TestLogger.php
@@ -142,5 +142,6 @@ public function __call($method, $args)
public function reset()
{
$this->records = [];
+ $this->recordsByLevel = [];
}
}
diff --git a/vendor/psr/log/README.md b/vendor/psr/log/README.md
index 5571a25e8d..a9f20c437b 100644
--- a/vendor/psr/log/README.md
+++ b/vendor/psr/log/README.md
@@ -38,6 +38,12 @@ class Foo
if ($this->logger) {
$this->logger->info('Doing work');
}
+
+ try {
+ $this->doSomethingElse();
+ } catch (Exception $exception) {
+ $this->logger->error('Oh no!', array('exception' => $exception));
+ }
// do something useful
}
diff --git a/vendor/psr/log/composer.json b/vendor/psr/log/composer.json
index 87934d707e..3f6d4eea4c 100644
--- a/vendor/psr/log/composer.json
+++ b/vendor/psr/log/composer.json
@@ -20,7 +20,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "1.0.x-dev"
+ "dev-master": "1.1.x-dev"
}
}
}
diff --git a/vendor/symfony/class-loader/ClassCollectionLoader.php b/vendor/symfony/class-loader/ClassCollectionLoader.php
index 5edab01cbd..61175debd4 100644
--- a/vendor/symfony/class-loader/ClassCollectionLoader.php
+++ b/vendor/symfony/class-loader/ClassCollectionLoader.php
@@ -63,7 +63,7 @@ public static function load($classes, $cacheDir, $name, $autoReload, $adaptive =
// cache the core classes
if (!is_dir($cacheDir) && !@mkdir($cacheDir, 0777, true) && !is_dir($cacheDir)) {
- throw new \RuntimeException(sprintf('Class Collection Loader was not able to create directory "%s"', $cacheDir));
+ throw new \RuntimeException(sprintf('Class Collection Loader was not able to create directory "%s".', $cacheDir));
}
$cacheDir = rtrim(realpath($cacheDir) ?: $cacheDir, '/'.\DIRECTORY_SEPARATOR);
$cache = $cacheDir.'/'.$name.$extension;
@@ -133,7 +133,7 @@ public static function inline($classes, $cache, array $excluded)
// cache the core classes
$cacheDir = \dirname($cache);
if (!is_dir($cacheDir) && !@mkdir($cacheDir, 0777, true) && !is_dir($cacheDir)) {
- throw new \RuntimeException(sprintf('Class Collection Loader was not able to create directory "%s"', $cacheDir));
+ throw new \RuntimeException(sprintf('Class Collection Loader was not able to create directory "%s".', $cacheDir));
}
$spacesRegex = '(?:\s*+(?:(?:\#|//)[^\n]*+\n|/\*(?:(?<!\*/).)++)?+)*+';
@@ -336,7 +336,7 @@ private static function getOrderedClasses(array $classes)
try {
$reflectionClass = new \ReflectionClass($class);
} catch (\ReflectionException $e) {
- throw new \InvalidArgumentException(sprintf('Unable to load class "%s"', $class));
+ throw new \InvalidArgumentException(sprintf('Unable to load class "%s".', $class));
}
$map = array_merge($map, self::getClassHierarchy($reflectionClass));
diff --git a/vendor/symfony/class-loader/LICENSE b/vendor/symfony/class-loader/LICENSE
index a677f43763..9e936ec044 100644
--- a/vendor/symfony/class-loader/LICENSE
+++ b/vendor/symfony/class-loader/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2019 Fabien Potencier
+Copyright (c) 2004-2020 Fabien Potencier
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/vendor/symfony/class-loader/README.md b/vendor/symfony/class-loader/README.md
index d61992b6a8..96d1e9fe5a 100644
--- a/vendor/symfony/class-loader/README.md
+++ b/vendor/symfony/class-loader/README.md
@@ -7,7 +7,7 @@ their locations for performance.
Resources
---------
- * [Documentation](https://symfony.com/doc/current/components/class_loader/index.html)
+ * [Documentation](https://symfony.com/doc/current/components/class_loader.html)
* [Contributing](https://symfony.com/doc/current/contributing/index.html)
* [Report issues](https://github.com/symfony/symfony/issues) and
[send Pull Requests](https://github.com/symfony/symfony/pulls)
diff --git a/vendor/symfony/console/Application.php b/vendor/symfony/console/Application.php
index d181e41e80..c576ec050a 100644
--- a/vendor/symfony/console/Application.php
+++ b/vendor/symfony/console/Application.php
@@ -576,7 +576,7 @@ public function findNamespace($namespace)
$exact = \in_array($namespace, $namespaces, true);
if (\count($namespaces) > 1 && !$exact) {
- throw new CommandNotFoundException(sprintf("The namespace \"%s\" is ambiguous.\nDid you mean one of these?\n%s", $namespace, $this->getAbbreviationSuggestions(array_values($namespaces))), array_values($namespaces));
+ throw new CommandNotFoundException(sprintf("The namespace \"%s\" is ambiguous.\nDid you mean one of these?\n%s.", $namespace, $this->getAbbreviationSuggestions(array_values($namespaces))), array_values($namespaces));
}
return $exact ? $namespace : reset($namespaces);
@@ -608,6 +608,10 @@ public function find($name)
}
}
+ if ($this->has($name)) {
+ return $this->get($name);
+ }
+
$allCommands = $this->commandLoader ? array_merge($this->commandLoader->getNames(), array_keys($this->commands)) : array_keys($this->commands);
$expr = preg_replace_callback('{([^:]+|)}', function ($matches) { return preg_quote($matches[1]).'[^:]*'; }, $name);
$commands = preg_grep('{^'.$expr.'}', $allCommands);
@@ -645,8 +649,13 @@ public function find($name)
// filter out aliases for commands which are already on the list
if (\count($commands) > 1) {
$commandList = $this->commandLoader ? array_merge(array_flip($this->commandLoader->getNames()), $this->commands) : $this->commands;
- $commands = array_unique(array_filter($commands, function ($nameOrAlias) use ($commandList, $commands, &$aliases) {
- $commandName = $commandList[$nameOrAlias] instanceof Command ? $commandList[$nameOrAlias]->getName() : $nameOrAlias;
+ $commands = array_unique(array_filter($commands, function ($nameOrAlias) use (&$commandList, $commands, &$aliases) {
+ if (!$commandList[$nameOrAlias] instanceof Command) {
+ $commandList[$nameOrAlias] = $this->commandLoader->get($nameOrAlias);
+ }
+
+ $commandName = $commandList[$nameOrAlias]->getName();
+
$aliases[$nameOrAlias] = $commandName;
return $commandName === $nameOrAlias || !\in_array($commandName, $commands);
@@ -662,10 +671,6 @@ public function find($name)
$maxLen = max(Helper::strlen($abbrev), $maxLen);
}
$abbrevs = array_map(function ($cmd) use ($commandList, $usableWidth, $maxLen) {
- if (!$commandList[$cmd] instanceof Command) {
- $commandList[$cmd] = $this->commandLoader->get($cmd);
- }
-
if ($commandList[$cmd]->isHidden()) {
return false;
}
@@ -676,7 +681,7 @@ public function find($name)
}, array_values($commands));
$suggestions = $this->getAbbreviationSuggestions(array_filter($abbrevs));
- throw new CommandNotFoundException(sprintf("Command \"%s\" is ambiguous.\nDid you mean one of these?\n%s", $name, $suggestions), array_values($commands));
+ throw new CommandNotFoundException(sprintf("Command \"%s\" is ambiguous.\nDid you mean one of these?\n%s.", $name, $suggestions), array_values($commands));
}
return $this->get($exact ? $name : reset($commands));
diff --git a/vendor/symfony/console/Command/Command.php b/vendor/symfony/console/Command/Command.php
index 493800b315..311fdb6a14 100644
--- a/vendor/symfony/console/Command/Command.php
+++ b/vendor/symfony/console/Command/Command.php
@@ -55,7 +55,7 @@ class Command
*/
public static function getDefaultName()
{
- $class = \get_called_class();
+ $class = static::class;
$r = new \ReflectionProperty($class, 'defaultName');
return $class === $r->class ? static::$defaultName : null;
@@ -348,7 +348,7 @@ public function setDefinition($definition)
public function getDefinition()
{
if (null === $this->definition) {
- throw new LogicException(sprintf('Command class "%s" is not correctly initialized. You probably forgot to call the parent constructor.', \get_class($this)));
+ throw new LogicException(sprintf('Command class "%s" is not correctly initialized. You probably forgot to call the parent constructor.', static::class));
}
return $this->definition;
@@ -563,7 +563,7 @@ public function getProcessedHelp()
public function setAliases($aliases)
{
if (!\is_array($aliases) && !$aliases instanceof \Traversable) {
- throw new InvalidArgumentException('$aliases must be an array or an instance of \Traversable');
+ throw new InvalidArgumentException('$aliases must be an array or an instance of \Traversable.');
}
foreach ($aliases as $alias) {
diff --git a/vendor/symfony/console/Descriptor/ApplicationDescription.php b/vendor/symfony/console/Descriptor/ApplicationDescription.php
index 442a569711..65b53084f1 100644
--- a/vendor/symfony/console/Descriptor/ApplicationDescription.php
+++ b/vendor/symfony/console/Descriptor/ApplicationDescription.php
@@ -88,7 +88,7 @@ public function getCommands()
public function getCommand($name)
{
if (!isset($this->commands[$name]) && !isset($this->aliases[$name])) {
- throw new CommandNotFoundException(sprintf('Command %s does not exist.', $name));
+ throw new CommandNotFoundException(sprintf('Command "%s" does not exist.', $name));
}
return isset($this->commands[$name]) ? $this->commands[$name] : $this->aliases[$name];
@@ -129,23 +129,29 @@ private function sortCommands(array $commands)
{
$namespacedCommands = [];
$globalCommands = [];
+ $sortedCommands = [];
foreach ($commands as $name => $command) {
$key = $this->application->extractNamespace($name, 1);
- if (!$key) {
- $globalCommands['_global'][$name] = $command;
+ if (\in_array($key, ['', self::GLOBAL_NAMESPACE], true)) {
+ $globalCommands[$name] = $command;
} else {
$namespacedCommands[$key][$name] = $command;
}
}
- ksort($namespacedCommands);
- $namespacedCommands = array_merge($globalCommands, $namespacedCommands);
- foreach ($namespacedCommands as &$commandsSet) {
- ksort($commandsSet);
+ if ($globalCommands) {
+ ksort($globalCommands);
+ $sortedCommands[self::GLOBAL_NAMESPACE] = $globalCommands;
}
- // unset reference to keep scope clear
- unset($commandsSet);
- return $namespacedCommands;
+ if ($namespacedCommands) {
+ ksort($namespacedCommands);
+ foreach ($namespacedCommands as $key => $commandsSet) {
+ ksort($commandsSet);
+ $sortedCommands[$key] = $commandsSet;
+ }
+ }
+
+ return $sortedCommands;
}
}
diff --git a/vendor/symfony/console/Formatter/OutputFormatter.php b/vendor/symfony/console/Formatter/OutputFormatter.php
index adfcdc8750..3202fc176e 100644
--- a/vendor/symfony/console/Formatter/OutputFormatter.php
+++ b/vendor/symfony/console/Formatter/OutputFormatter.php
@@ -119,7 +119,7 @@ public function hasStyle($name)
public function getStyle($name)
{
if (!$this->hasStyle($name)) {
- throw new InvalidArgumentException(sprintf('Undefined style: %s', $name));
+ throw new InvalidArgumentException(sprintf('Undefined style: "%s".', $name));
}
return $this->styles[strtolower($name)];
diff --git a/vendor/symfony/console/Formatter/OutputFormatterStyle.php b/vendor/symfony/console/Formatter/OutputFormatterStyle.php
index 477bd87f0c..7075c72110 100644
--- a/vendor/symfony/console/Formatter/OutputFormatterStyle.php
+++ b/vendor/symfony/console/Formatter/OutputFormatterStyle.php
@@ -86,7 +86,7 @@ public function setForeground($color = null)
}
if (!isset(static::$availableForegroundColors[$color])) {
- throw new InvalidArgumentException(sprintf('Invalid foreground color specified: "%s". Expected one of (%s)', $color, implode(', ', array_keys(static::$availableForegroundColors))));
+ throw new InvalidArgumentException(sprintf('Invalid foreground color specified: "%s". Expected one of (%s).', $color, implode(', ', array_keys(static::$availableForegroundColors))));
}
$this->foreground = static::$availableForegroundColors[$color];
@@ -104,7 +104,7 @@ public function setBackground($color = null)
}
if (!isset(static::$availableBackgroundColors[$color])) {
- throw new InvalidArgumentException(sprintf('Invalid background color specified: "%s". Expected one of (%s)', $color, implode(', ', array_keys(static::$availableBackgroundColors))));
+ throw new InvalidArgumentException(sprintf('Invalid background color specified: "%s". Expected one of (%s).', $color, implode(', ', array_keys(static::$availableBackgroundColors))));
}
$this->background = static::$availableBackgroundColors[$color];
@@ -116,7 +116,7 @@ public function setBackground($color = null)
public function setOption($option)
{
if (!isset(static::$availableOptions[$option])) {
- throw new InvalidArgumentException(sprintf('Invalid option specified: "%s". Expected one of (%s)', $option, implode(', ', array_keys(static::$availableOptions))));
+ throw new InvalidArgumentException(sprintf('Invalid option specified: "%s". Expected one of (%s).', $option, implode(', ', array_keys(static::$availableOptions))));
}
if (!\in_array(static::$availableOptions[$option], $this->options)) {
@@ -130,7 +130,7 @@ public function setOption($option)
public function unsetOption($option)
{
if (!isset(static::$availableOptions[$option])) {
- throw new InvalidArgumentException(sprintf('Invalid option specified: "%s". Expected one of (%s)', $option, implode(', ', array_keys(static::$availableOptions))));
+ throw new InvalidArgumentException(sprintf('Invalid option specified: "%s". Expected one of (%s).', $option, implode(', ', array_keys(static::$availableOptions))));
}
$pos = array_search(static::$availableOptions[$option], $this->options);
diff --git a/vendor/symfony/console/Helper/FormatterHelper.php b/vendor/symfony/console/Helper/FormatterHelper.php
index 4ad63856dc..d6eccee8e8 100644
--- a/vendor/symfony/console/Helper/FormatterHelper.php
+++ b/vendor/symfony/console/Helper/FormatterHelper.php
@@ -54,12 +54,12 @@ public function formatBlock($messages, $style, $large = false)
foreach ($messages as $message) {
$message = OutputFormatter::escape($message);
$lines[] = sprintf($large ? ' %s ' : ' %s ', $message);
- $len = max($this->strlen($message) + ($large ? 4 : 2), $len);
+ $len = max(self::strlen($message) + ($large ? 4 : 2), $len);
}
$messages = $large ? [str_repeat(' ', $len)] : [];
for ($i = 0; isset($lines[$i]); ++$i) {
- $messages[] = $lines[$i].str_repeat(' ', $len - $this->strlen($lines[$i]));
+ $messages[] = $lines[$i].str_repeat(' ', $len - self::strlen($lines[$i]));
}
if ($large) {
$messages[] = str_repeat(' ', $len);
@@ -83,17 +83,13 @@ public function formatBlock($messages, $style, $large = false)
*/
public function truncate($message, $length, $suffix = '...')
{
- $computedLength = $length - $this->strlen($suffix);
+ $computedLength = $length - self::strlen($suffix);
- if ($computedLength > $this->strlen($message)) {
+ if ($computedLength > self::strlen($message)) {
return $message;
}
- if (false === $encoding = mb_detect_encoding($message, null, true)) {
- return substr($message, 0, $length).$suffix;
- }
-
- return mb_substr($message, 0, $length, $encoding).$suffix;
+ return self::substr($message, 0, $length).$suffix;
}
/**
diff --git a/vendor/symfony/console/Helper/ProcessHelper.php b/vendor/symfony/console/Helper/ProcessHelper.php
index 666f114a23..6cafb1face 100644
--- a/vendor/symfony/console/Helper/ProcessHelper.php
+++ b/vendor/symfony/console/Helper/ProcessHelper.php
@@ -37,6 +37,10 @@ class ProcessHelper extends Helper
*/
public function run(OutputInterface $output, $cmd, $error = null, callable $callback = null, $verbosity = OutputInterface::VERBOSITY_VERY_VERBOSE)
{
+ if (!class_exists(Process::class)) {
+ throw new \LogicException('The ProcessHelper cannot be run as the Process component is not installed. Try running "compose require symfony/process".');
+ }
+
if ($output instanceof ConsoleOutputInterface) {
$output = $output->getErrorOutput();
}
diff --git a/vendor/symfony/console/Helper/QuestionHelper.php b/vendor/symfony/console/Helper/QuestionHelper.php
index af4d0b9cca..80f6048b80 100644
--- a/vendor/symfony/console/Helper/QuestionHelper.php
+++ b/vendor/symfony/console/Helper/QuestionHelper.php
@@ -32,7 +32,7 @@ class QuestionHelper extends Helper
{
private $inputStream;
private static $shell;
- private static $stty;
+ private static $stty = true;
/**
* Asks a question to the user.
@@ -158,7 +158,7 @@ private function doAsk(OutputInterface $output, Question $question)
$inputStream = $this->inputStream ?: STDIN;
$autocomplete = $question->getAutocompleterValues();
- if (null === $autocomplete || !Terminal::hasSttyAvailable()) {
+ if (null === $autocomplete || !self::$stty || !Terminal::hasSttyAvailable()) {
$ret = false;
if ($question->isHidden()) {
try {
@@ -198,15 +198,9 @@ protected function writePrompt(OutputInterface $output, Question $question)
$message = $question->getQuestion();
if ($question instanceof ChoiceQuestion) {
- $maxWidth = max(array_map([$this, 'strlen'], array_keys($question->getChoices())));
-
- $messages = (array) $question->getQuestion();
- foreach ($question->getChoices() as $key => $value) {
- $width = $maxWidth - $this->strlen($key);
- $messages[] = ' [<info>'.$key.str_repeat(' ', $width).'</info>] '.$value;
- }
-
- $output->writeln($messages);
+ $output->writeln(array_merge([
+ $question->getQuestion(),
+ ], $this->formatChoiceQuestionChoices($question, 'info')));
$message = $question->getPrompt();
}
@@ -214,6 +208,26 @@ protected function writePrompt(OutputInterface $output, Question $question)
$output->write($message);
}
+ /**
+ * @param string $tag
+ *
+ * @return string[]
+ */
+ protected function formatChoiceQuestionChoices(ChoiceQuestion $question, $tag)
+ {
+ $messages = [];
+
+ $maxWidth = max(array_map('self::strlen', array_keys($choices = $question->getChoices())));
+
+ foreach ($choices as $key => $value) {
+ $padding = str_repeat(' ', $maxWidth - self::strlen($key));
+
+ $messages[] = sprintf(" [<$tag>%s$padding</$tag>] %s", $key, $value);
+ }
+
+ return $messages;
+ }
+
/**
* Outputs an error message.
*/
@@ -264,7 +278,7 @@ private function autocomplete(OutputInterface $output, Question $question, $inpu
} elseif ("\177" === $c) { // Backspace Character
if (0 === $numMatches && 0 !== $i) {
--$i;
- $fullChoice = substr($fullChoice, 0, -1);
+ $fullChoice = self::substr($fullChoice, 0, $i);
// Move cursor backwards
$output->write("\033[1D");
}
@@ -278,7 +292,7 @@ private function autocomplete(OutputInterface $output, Question $question, $inpu
}
// Pop the last character off the end of our string
- $ret = substr($ret, 0, $i);
+ $ret = self::substr($ret, 0, $i);
} elseif ("\033" === $c) {
// Did we read an escape sequence?
$c .= fread($inputStream, 2);
@@ -304,7 +318,7 @@ private function autocomplete(OutputInterface $output, Question $question, $inpu
$remainingCharacters = substr($ret, \strlen(trim($this->mostRecentlyEnteredValue($fullChoice))));
$output->write($remainingCharacters);
$fullChoice .= $remainingCharacters;
- $i = \strlen($fullChoice);
+ $i = self::strlen($fullChoice);
}
if ("\n" === $c) {
@@ -410,7 +424,7 @@ private function getHiddenResponse(OutputInterface $output, $inputStream)
return $value;
}
- if (Terminal::hasSttyAvailable()) {
+ if (self::$stty && Terminal::hasSttyAvailable()) {
$sttyMode = shell_exec('stty -g');
shell_exec('stty -echo');
diff --git a/vendor/symfony/console/Helper/SymfonyQuestionHelper.php b/vendor/symfony/console/Helper/SymfonyQuestionHelper.php
index 5937741a2c..7cd050fee1 100644
--- a/vendor/symfony/console/Helper/SymfonyQuestionHelper.php
+++ b/vendor/symfony/console/Helper/SymfonyQuestionHelper.php
@@ -96,15 +96,15 @@ protected function writePrompt(OutputInterface $output, Question $question)
$output->writeln($text);
+ $prompt = ' > ';
+
if ($question instanceof ChoiceQuestion) {
- $width = max(array_map('strlen', array_keys($question->getChoices())));
+ $output->writeln($this->formatChoiceQuestionChoices($question, 'comment'));
- foreach ($question->getChoices() as $key => $value) {
- $output->writeln(sprintf(" [<comment>%-${width}s</comment>] %s", $key, $value));
- }
+ $prompt = $question->getPrompt();
}
- $output->write(' > ');
+ $output->write($prompt);
}
/**
diff --git a/vendor/symfony/console/Helper/Table.php b/vendor/symfony/console/Helper/Table.php
index 0f3d673586..e6dc6a8a5c 100644
--- a/vendor/symfony/console/Helper/Table.php
+++ b/vendor/symfony/console/Helper/Table.php
@@ -460,7 +460,7 @@ private function fillNextRows(array $rows, $line)
$unmergedRows = [];
foreach ($rows[$line] as $column => $cell) {
if (null !== $cell && !$cell instanceof TableCell && !is_scalar($cell) && !(\is_object($cell) && method_exists($cell, '__toString'))) {
- throw new InvalidArgumentException(sprintf('A cell must be a TableCell, a scalar or an object implementing __toString, %s given.', \gettype($cell)));
+ throw new InvalidArgumentException(sprintf('A cell must be a TableCell, a scalar or an object implementing "__toString()", "%s" given.', \gettype($cell)));
}
if ($cell instanceof TableCell && $cell->getRowspan() > 1) {
$nbLines = $cell->getRowspan() - 1;
diff --git a/vendor/symfony/console/Helper/TableStyle.php b/vendor/symfony/console/Helper/TableStyle.php
index bc9c7e94db..4213297f5f 100644
--- a/vendor/symfony/console/Helper/TableStyle.php
+++ b/vendor/symfony/console/Helper/TableStyle.php
@@ -42,7 +42,7 @@ class TableStyle
public function setPaddingChar($paddingChar)
{
if (!$paddingChar) {
- throw new LogicException('The padding char must not be empty');
+ throw new LogicException('The padding char must not be empty.');
}
$this->paddingChar = $paddingChar;
diff --git a/vendor/symfony/console/Input/ArrayInput.php b/vendor/symfony/console/Input/ArrayInput.php
index a04b6b68ea..b2ebc7c225 100644
--- a/vendor/symfony/console/Input/ArrayInput.php
+++ b/vendor/symfony/console/Input/ArrayInput.php
@@ -39,8 +39,8 @@ public function __construct(array $parameters, InputDefinition $definition = nul
*/
public function getFirstArgument()
{
- foreach ($this->parameters as $key => $value) {
- if ($key && '-' === $key[0]) {
+ foreach ($this->parameters as $param => $value) {
+ if ($param && \is_string($param) && '-' === $param[0]) {
continue;
}
@@ -107,7 +107,7 @@ public function __toString()
{
$params = [];
foreach ($this->parameters as $param => $val) {
- if ($param && '-' === $param[0]) {
+ if ($param && \is_string($param) && '-' === $param[0]) {
if (\is_array($val)) {
foreach ($val as $v) {
$params[] = $param.('' != $v ? '='.$this->escapeToken($v) : '');
diff --git a/vendor/symfony/console/Input/StringInput.php b/vendor/symfony/console/Input/StringInput.php
index 32d270faf1..5032b340a1 100644
--- a/vendor/symfony/console/Input/StringInput.php
+++ b/vendor/symfony/console/Input/StringInput.php
@@ -61,7 +61,7 @@ private function tokenize($input)
$tokens[] = stripcslashes($match[1]);
} else {
// should never happen
- throw new InvalidArgumentException(sprintf('Unable to parse input near "... %s ..."', substr($input, $cursor, 10)));
+ throw new InvalidArgumentException(sprintf('Unable to parse input near "... %s ...".', substr($input, $cursor, 10)));
}
$cursor += \strlen($match[0]);
diff --git a/vendor/symfony/console/LICENSE b/vendor/symfony/console/LICENSE
index a677f43763..9e936ec044 100644
--- a/vendor/symfony/console/LICENSE
+++ b/vendor/symfony/console/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2019 Fabien Potencier
+Copyright (c) 2004-2020 Fabien Potencier
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/vendor/symfony/console/Output/StreamOutput.php b/vendor/symfony/console/Output/StreamOutput.php
index 7ff602763e..74b9b54e86 100644
--- a/vendor/symfony/console/Output/StreamOutput.php
+++ b/vendor/symfony/console/Output/StreamOutput.php
@@ -12,7 +12,6 @@
namespace Symfony\Component\Console\Output;
use Symfony\Component\Console\Exception\InvalidArgumentException;
-use Symfony\Component\Console\Exception\RuntimeException;
use Symfony\Component\Console\Formatter\OutputFormatterInterface;
/**
@@ -74,10 +73,7 @@ protected function doWrite($message, $newline)
$message .= PHP_EOL;
}
- if (false === @fwrite($this->stream, $message)) {
- // should never happen
- throw new RuntimeException('Unable to write output.');
- }
+ @fwrite($this->stream, $message);
fflush($this->stream);
}
diff --git a/vendor/symfony/console/Question/ChoiceQuestion.php b/vendor/symfony/console/Question/ChoiceQuestion.php
index 3dca160049..62532844b2 100644
--- a/vendor/symfony/console/Question/ChoiceQuestion.php
+++ b/vendor/symfony/console/Question/ChoiceQuestion.php
@@ -155,7 +155,7 @@ private function getDefaultValidator()
}
if (\count($results) > 1) {
- throw new InvalidArgumentException(sprintf('The provided answer is ambiguous. Value should be one of %s.', implode(' or ', $results)));
+ throw new InvalidArgumentException(sprintf('The provided answer is ambiguous. Value should be one of "%s".', implode('" or "', $results)));
}
$result = array_search($value, $choices);
diff --git a/vendor/symfony/console/README.md b/vendor/symfony/console/README.md
index 664a37c0ee..3e2fc605e5 100644
--- a/vendor/symfony/console/README.md
+++ b/vendor/symfony/console/README.md
@@ -7,7 +7,7 @@ interfaces.
Resources
---------
- * [Documentation](https://symfony.com/doc/current/components/console/index.html)
+ * [Documentation](https://symfony.com/doc/current/components/console.html)
* [Contributing](https://symfony.com/doc/current/contributing/index.html)
* [Report issues](https://github.com/symfony/symfony/issues) and
[send Pull Requests](https://github.com/symfony/symfony/pulls)
diff --git a/vendor/symfony/console/Style/SymfonyStyle.php b/vendor/symfony/console/Style/SymfonyStyle.php
index 4291ada8f6..02e9b471b8 100644
--- a/vendor/symfony/console/Style/SymfonyStyle.php
+++ b/vendor/symfony/console/Style/SymfonyStyle.php
@@ -229,7 +229,7 @@ public function choice($question, array $choices, $default = null)
{
if (null !== $default) {
$values = array_flip($choices);
- $default = $values[$default];
+ $default = isset($values[$default]) ? $values[$default] : $default;
}
return $this->askQuestion(new ChoiceQuestion($question, $choices, $default));
diff --git a/vendor/symfony/console/Tests/ApplicationTest.php b/vendor/symfony/console/Tests/ApplicationTest.php
index 1ef2ed3d78..8288cfd326 100644
--- a/vendor/symfony/console/Tests/ApplicationTest.php
+++ b/vendor/symfony/console/Tests/ApplicationTest.php
@@ -558,7 +558,7 @@ public function testFindAlternativeCommands()
$this->assertRegExp(sprintf('/Command "%s" is not defined./', $commandName), $e->getMessage(), '->find() throws a CommandNotFoundException if command does not exist, with alternatives');
$this->assertRegExp('/afoobar1/', $e->getMessage(), '->find() throws a CommandNotFoundException if command does not exist, with alternative : "afoobar1"');
$this->assertRegExp('/foo:bar1/', $e->getMessage(), '->find() throws a CommandNotFoundException if command does not exist, with alternative : "foo:bar1"');
- $this->assertNotRegExp('/foo:bar(?>!1)/', $e->getMessage(), '->find() throws a CommandNotFoundException if command does not exist, without "foo:bar" alternative');
+ $this->assertNotRegExp('/foo:bar(?!1)/', $e->getMessage(), '->find() throws a CommandNotFoundException if command does not exist, without "foo:bar" alternative');
}
}
@@ -568,6 +568,9 @@ public function testFindAlternativeCommandsWithAnAlias()
$fooCommand->setAliases(['foo2']);
$application = new Application();
+ $application->setCommandLoader(new FactoryCommandLoader([
+ 'foo3' => static function () use ($fooCommand) { return $fooCommand; },
+ ]));
$application->add($fooCommand);
$result = $application->find('foo');
@@ -1639,6 +1642,31 @@ public function testAllExcludesDisabledLazyCommand()
$this->assertArrayNotHasKey('disabled', $application->all());
}
+ public function testFindAlternativesDoesNotLoadSameNamespaceCommandsOnExactMatch()
+ {
+ $application = new Application();
+ $application->setAutoExit(false);
+
+ $loaded = [];
+
+ $application->setCommandLoader(new FactoryCommandLoader([
+ 'foo:bar' => function () use (&$loaded) {
+ $loaded['foo:bar'] = true;
+
+ return (new Command('foo:bar'))->setCode(function () {});
+ },
+ 'foo' => function () use (&$loaded) {
+ $loaded['foo'] = true;
+
+ return (new Command('foo'))->setCode(function () {});
+ },
+ ]));
+
+ $application->run(new ArrayInput(['command' => 'foo']), new NullOutput());
+
+ $this->assertSame(['foo' => true], $loaded);
+ }
+
protected function getDispatcher($skipCommand = false)
{
$dispatcher = new EventDispatcher();
diff --git a/vendor/symfony/console/Tests/Descriptor/ApplicationDescriptionTest.php b/vendor/symfony/console/Tests/Descriptor/ApplicationDescriptionTest.php
new file mode 100644
index 0000000000..33d5c3840f
--- /dev/null
+++ b/vendor/symfony/console/Tests/Descriptor/ApplicationDescriptionTest.php
@@ -0,0 +1,53 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Console\Tests\Descriptor;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Console\Application;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Descriptor\ApplicationDescription;
+
+final class ApplicationDescriptionTest extends TestCase
+{
+ /**
+ * @dataProvider getNamespacesProvider
+ */
+ public function testGetNamespaces(array $expected, array $names)
+ {
+ $application = new TestApplication();
+ foreach ($names as $name) {
+ $application->add(new Command($name));
+ }
+
+ $this->assertSame($expected, array_keys((new ApplicationDescription($application))->getNamespaces()));
+ }
+
+ public function getNamespacesProvider()
+ {
+ return [
+ [['_global'], ['foobar']],
+ [['a', 'b'], ['b:foo', 'a:foo', 'b:bar']],
+ [['_global', 'b', 'z', 22, 33], ['z:foo', '1', '33:foo', 'b:foo', '22:foo:bar']],
+ ];
+ }
+}
+
+final class TestApplication extends Application
+{
+ /**
+ * {@inheritdoc}
+ */
+ protected function getDefaultCommands()
+ {
+ return [];
+ }
+}
diff --git a/vendor/symfony/console/Tests/Fixtures/stream_output_file.txt b/vendor/symfony/console/Tests/Fixtures/stream_output_file.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/vendor/symfony/console/Tests/Formatter/OutputFormatterTest.php b/vendor/symfony/console/Tests/Formatter/OutputFormatterTest.php
index c5c2daed25..940818930f 100644
--- a/vendor/symfony/console/Tests/Formatter/OutputFormatterTest.php
+++ b/vendor/symfony/console/Tests/Formatter/OutputFormatterTest.php
@@ -199,7 +199,7 @@ public function provideInlineStyleOptionsCases()
/**
* @group legacy
* @dataProvider provideInlineStyleTagsWithUnknownOptions
- * @expectedDeprecation Unknown style options are deprecated since Symfony 3.2 and will be removed in 4.0. Exception "Invalid option specified: "%s". Expected one of (bold, underscore, blink, reverse, conceal)".
+ * @expectedDeprecation Unknown style options are deprecated since Symfony 3.2 and will be removed in 4.0. Exception "Invalid option specified: "%s". Expected one of (bold, underscore, blink, reverse, conceal).".
*/
public function testInlineStyleOptionsUnknownAreDeprecated($tag, $option)
{
diff --git a/vendor/symfony/console/Tests/Helper/QuestionHelperTest.php b/vendor/symfony/console/Tests/Helper/QuestionHelperTest.php
index 02cc6ce7e0..93b762c261 100644
--- a/vendor/symfony/console/Tests/Helper/QuestionHelperTest.php
+++ b/vendor/symfony/console/Tests/Helper/QuestionHelperTest.php
@@ -11,6 +11,7 @@
namespace Symfony\Component\Console\Tests\Helper;
+use Symfony\Component\Console\Exception\InvalidArgumentException;
use Symfony\Component\Console\Formatter\OutputFormatter;
use Symfony\Component\Console\Helper\FormatterHelper;
use Symfony\Component\Console\Helper\HelperSet;
@@ -175,19 +176,20 @@ public function testAskWithAutocomplete()
// Acm<NEWLINE>
// Ac<BACKSPACE><BACKSPACE>s<TAB>Test<NEWLINE>
// <NEWLINE>
- // <UP ARROW><UP ARROW><NEWLINE>
- // <UP ARROW><UP ARROW><UP ARROW><UP ARROW><UP ARROW><TAB>Test<NEWLINE>
+ // <UP ARROW><UP ARROW><UP ARROW><NEWLINE>
+ // <UP ARROW><UP ARROW><UP ARROW><UP ARROW><UP ARROW><UP ARROW><UP ARROW><TAB>Test<NEWLINE>
// <DOWN ARROW><NEWLINE>
// S<BACKSPACE><BACKSPACE><DOWN ARROW><DOWN ARROW><NEWLINE>
// F00<BACKSPACE><BACKSPACE>oo<TAB><NEWLINE>
- $inputStream = $this->getInputStream("Acm\nAc\177\177s\tTest\n\n\033[A\033[A\n\033[A\033[A\033[A\033[A\033[A\tTest\n\033[B\nS\177\177\033[B\033[B\nF00\177\177oo\t\n");
+ // F⭐<TAB><BACKSPACE><BACKSPACE>⭐<TAB><NEWLINE>
+ $inputStream = $this->getInputStream("Acm\nAc\177\177s\tTest\n\n\033[A\033[A\033[A\n\033[A\033[A\033[A\033[A\033[A\033[A\033[A\tTest\n\033[B\nS\177\177\033[B\033[B\nF00\177\177oo\t\nF⭐\t\177\177⭐\t\n");
$dialog = new QuestionHelper();
$helperSet = new HelperSet([new FormatterHelper()]);
$dialog->setHelperSet($helperSet);
$question = new Question('Please select a bundle', 'FrameworkBundle');
- $question->setAutocompleterValues(['AcmeDemoBundle', 'AsseticBundle', 'SecurityBundle', 'FooBundle']);
+ $question->setAutocompleterValues(['AcmeDemoBundle', 'AsseticBundle', 'SecurityBundle', 'FooBundle', 'F⭐Y']);
$this->assertEquals('AcmeDemoBundle', $dialog->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question));
$this->assertEquals('AsseticBundleTest', $dialog->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question));
@@ -197,6 +199,7 @@ public function testAskWithAutocomplete()
$this->assertEquals('AcmeDemoBundle', $dialog->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question));
$this->assertEquals('AsseticBundle', $dialog->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question));
$this->assertEquals('FooBundle', $dialog->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question));
+ $this->assertEquals('F⭐Y', $dialog->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question));
}
public function testAskWithAutocompleteWithNonSequentialKeys()
@@ -522,7 +525,7 @@ public function testSelectChoiceFromChoiceList($providedAnswer, $expectedValue)
public function testAmbiguousChoiceFromChoicelist()
{
$this->expectException('InvalidArgumentException');
- $this->expectExceptionMessage('The provided answer is ambiguous. Value should be one of env_2 or env_3.');
+ $this->expectExceptionMessage('The provided answer is ambiguous. Value should be one of "env_2" or "env_3".');
$possibleChoices = [
'env_1' => 'My first environment',
'env_2' => 'My environment',
@@ -680,12 +683,13 @@ public function testLegacyAskWithAutocomplete()
// Acm<NEWLINE>
// Ac<BACKSPACE><BACKSPACE>s<TAB>Test<NEWLINE>
// <NEWLINE>
- // <UP ARROW><UP ARROW><NEWLINE>
- // <UP ARROW><UP ARROW><UP ARROW><UP ARROW><UP ARROW><TAB>Test<NEWLINE>
+ // <UP ARROW><UP ARROW><UP ARROW><NEWLINE>
+ // <UP ARROW><UP ARROW><UP ARROW><UP ARROW><UP ARROW><UP ARROW><UP ARROW><TAB>Test<NEWLINE>
// <DOWN ARROW><NEWLINE>
// S<BACKSPACE><BACKSPACE><DOWN ARROW><DOWN ARROW><NEWLINE>
// F00<BACKSPACE><BACKSPACE>oo<TAB><NEWLINE>
- $inputStream = $this->getInputStream("Acm\nAc\177\177s\tTest\n\n\033[A\033[A\n\033[A\033[A\033[A\033[A\033[A\tTest\n\033[B\nS\177\177\033[B\033[B\nF00\177\177oo\t\n");
+ // F⭐<TAB><BACKSPACE><BACKSPACE>⭐<TAB><NEWLINE>
+ $inputStream = $this->getInputStream("Acm\nAc\177\177s\tTest\n\n\033[A\033[A\033[A\n\033[A\033[A\033[A\033[A\033[A\033[A\033[A\tTest\n\033[B\nS\177\177\033[B\033[B\nF00\177\177oo\t\nF⭐\t⭐\t\n");
$dialog = new QuestionHelper();
$dialog->setInputStream($inputStream);
@@ -693,7 +697,7 @@ public function testLegacyAskWithAutocomplete()
$dialog->setHelperSet($helperSet);
$question = new Question('Please select a bundle', 'FrameworkBundle');
- $question->setAutocompleterValues(['AcmeDemoBundle', 'AsseticBundle', 'SecurityBundle', 'FooBundle']);
+ $question->setAutocompleterValues(['AcmeDemoBundle', 'AsseticBundle', 'SecurityBundle', 'FooBundle', 'F⭐Y']);
$this->assertEquals('AcmeDemoBundle', $dialog->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question));
$this->assertEquals('AsseticBundleTest', $dialog->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question));
@@ -703,6 +707,7 @@ public function testLegacyAskWithAutocomplete()
$this->assertEquals('AcmeDemoBundle', $dialog->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question));
$this->assertEquals('AsseticBundle', $dialog->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question));
$this->assertEquals('FooBundle', $dialog->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question));
+ $this->assertEquals('F⭐Y', $dialog->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question));
}
/**
@@ -887,7 +892,7 @@ public function testLegacySelectChoiceFromChoiceList($providedAnswer, $expectedV
public function testLegacyAmbiguousChoiceFromChoicelist()
{
$this->expectException('InvalidArgumentException');
- $this->expectExceptionMessage('The provided answer is ambiguous. Value should be one of env_2 or env_3.');
+ $this->expectExceptionMessage('The provided answer is ambiguous. Value should be one of "env_2" or "env_3".');
$possibleChoices = [
'env_1' => 'My first environment',
'env_2' => 'My environment',
@@ -1009,6 +1014,35 @@ public function testTraversableAutocomplete()
$this->assertEquals('FooBundle', $dialog->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question));
}
+ public function testDisableSttby()
+ {
+ if (!Terminal::hasSttyAvailable()) {
+ $this->markTestSkipped('`stty` is required to test autocomplete functionality');
+ }
+
+ $this->expectException(InvalidArgumentException::class);
+ $this->expectExceptionMessage('invalid');
+
+ QuestionHelper::disableStty();
+ $dialog = new QuestionHelper();
+ $dialog->setHelperSet(new HelperSet([new FormatterHelper()]));
+
+ $question = new ChoiceQuestion('Please select a bundle', [1 => 'AcmeDemoBundle', 4 => 'AsseticBundle']);
+ $question->setMaxAttempts(1);
+
+ // <UP ARROW><UP ARROW><NEWLINE><DOWN ARROW><DOWN ARROW><NEWLINE>
+ // Gives `AcmeDemoBundle` with stty
+ $inputStream = $this->getInputStream("\033[A\033[A\n\033[B\033[B\n");
+
+ try {
+ $dialog->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question);
+ } finally {
+ $reflection = new \ReflectionProperty(QuestionHelper::class, 'stty');
+ $reflection->setAccessible(true);
+ $reflection->setValue(null, true);
+ }
+ }
+
public function testTraversableMultiselectAutocomplete()
{
// <NEWLINE>
diff --git a/vendor/symfony/console/Tests/Helper/SymfonyQuestionHelperTest.php b/vendor/symfony/console/Tests/Helper/SymfonyQuestionHelperTest.php
index cbf3b957b3..467f38b6d4 100644
--- a/vendor/symfony/console/Tests/Helper/SymfonyQuestionHelperTest.php
+++ b/vendor/symfony/console/Tests/Helper/SymfonyQuestionHelperTest.php
@@ -130,6 +130,49 @@ public function testAskThrowsExceptionOnMissingInput()
$dialog->ask($this->createStreamableInputInterfaceMock($this->getInputStream('')), $this->createOutputInterface(), new Question('What\'s your name?'));
}
+ public function testChoiceQuestionPadding()
+ {
+ $choiceQuestion = new ChoiceQuestion('qqq', [
+ 'foo' => 'foo',
+ 'żółw' => 'bar',
+ 'łabądź' => 'baz',
+ ]);
+
+ (new SymfonyQuestionHelper())->ask(
+ $this->createStreamableInputInterfaceMock($this->getInputStream("foo\n")),
+ $output = $this->createOutputInterface(),
+ $choiceQuestion
+ );
+
+ $this->assertOutputContains(<<<EOT
+ qqq:
+ [foo ] foo
+ [żółw ] bar
+ [łabądź] baz
+ >
+EOT
+ , $output, true);
+ }
+
+ public function testChoiceQuestionCustomPrompt()
+ {
+ $choiceQuestion = new ChoiceQuestion('qqq', ['foo']);
+ $choiceQuestion->setPrompt(' >ccc> ');
+
+ (new SymfonyQuestionHelper())->ask(
+ $this->createStreamableInputInterfaceMock($this->getInputStream("foo\n")),
+ $output = $this->createOutputInterface(),
+ $choiceQuestion
+ );
+
+ $this->assertOutputContains(<<<EOT
+ qqq:
+ [0] foo
+ >ccc>
+EOT
+ , $output, true);
+ }
+
protected function getInputStream($input)
{
$stream = fopen('php://memory', 'r+', false);
@@ -157,10 +200,15 @@ protected function createInputInterfaceMock($interactive = true)
return $mock;
}
- private function assertOutputContains($expected, StreamOutput $output)
+ private function assertOutputContains($expected, StreamOutput $output, $normalize = false)
{
rewind($output->getStream());
$stream = stream_get_contents($output->getStream());
+
+ if ($normalize) {
+ $stream = str_replace(PHP_EOL, "\n", $stream);
+ }
+
$this->assertStringContainsString($expected, $stream);
}
}
diff --git a/vendor/symfony/console/Tests/Helper/TableTest.php b/vendor/symfony/console/Tests/Helper/TableTest.php
index 571cf0a6c4..7e2bd81013 100644
--- a/vendor/symfony/console/Tests/Helper/TableTest.php
+++ b/vendor/symfony/console/Tests/Helper/TableTest.php
@@ -729,7 +729,7 @@ public function testColumnStyle()
public function testThrowsWhenTheCellInAnArray()
{
$this->expectException('Symfony\Component\Console\Exception\InvalidArgumentException');
- $this->expectExceptionMessage('A cell must be a TableCell, a scalar or an object implementing __toString, array given.');
+ $this->expectExceptionMessage('A cell must be a TableCell, a scalar or an object implementing "__toString()", "array" given.');
$table = new Table($output = $this->getOutputStream());
$table
->setHeaders(['ISBN', 'Title', 'Author', 'Price'])
diff --git a/vendor/symfony/console/Tests/Output/StreamOutputTest.php b/vendor/symfony/console/Tests/Output/StreamOutputTest.php
index d843fa4a45..86d5038066 100644
--- a/vendor/symfony/console/Tests/Output/StreamOutputTest.php
+++ b/vendor/symfony/console/Tests/Output/StreamOutputTest.php
@@ -56,4 +56,12 @@ public function testDoWrite()
rewind($output->getStream());
$this->assertEquals('foo'.PHP_EOL, stream_get_contents($output->getStream()), '->doWrite() writes to the stream');
}
+
+ public function testDoWriteOnFailure()
+ {
+ $resource = fopen(__DIR__.'/../Fixtures/stream_output_file.txt', 'r', false);
+ $output = new StreamOutput($resource);
+ rewind($output->getStream());
+ $this->assertEquals('', stream_get_contents($output->getStream()));
+ }
}
diff --git a/vendor/symfony/console/Tests/TerminalTest.php b/vendor/symfony/console/Tests/TerminalTest.php
index 546d2214c4..cc2632dd18 100644
--- a/vendor/symfony/console/Tests/TerminalTest.php
+++ b/vendor/symfony/console/Tests/TerminalTest.php
@@ -60,7 +60,7 @@ public function test()
$this->assertSame(60, $terminal->getHeight());
}
- public function test_zero_values()
+ public function testZeroValues()
{
putenv('COLUMNS=0');
putenv('LINES=0');
diff --git a/vendor/symfony/debug/ErrorHandler.php b/vendor/symfony/debug/ErrorHandler.php
index 1b39fab5ca..40a4b1758c 100644
--- a/vendor/symfony/debug/ErrorHandler.php
+++ b/vendor/symfony/debug/ErrorHandler.php
@@ -223,14 +223,14 @@ public function setLoggers(array $loggers)
if (!\is_array($log)) {
$log = [$log];
} elseif (!\array_key_exists(0, $log)) {
- throw new \InvalidArgumentException('No logger provided');
+ throw new \InvalidArgumentException('No logger provided.');
}
if (null === $log[0]) {
$this->loggedErrors &= ~$type;
} elseif ($log[0] instanceof LoggerInterface) {
$this->loggedErrors |= $type;
} else {
- throw new \InvalidArgumentException('Invalid logger provided');
+ throw new \InvalidArgumentException('Invalid logger provided.');
}
$this->loggers[$type] = $log + $prev[$type];
@@ -521,7 +521,7 @@ public function handleError($type, $message, $file, $line)
$errorAsException ? ['exception' => $errorAsException] : [],
];
} else {
- if (!\defined('HHVM_VERSION')) {
+ if (\PHP_VERSION_ID < (\PHP_VERSION_ID < 70400 ? 70316 : 70404) && !\defined('HHVM_VERSION')) {
$currentErrorHandler = set_error_handler('var_dump');
restore_error_handler();
}
@@ -533,7 +533,7 @@ public function handleError($type, $message, $file, $line)
} finally {
$this->isRecursive = false;
- if (!\defined('HHVM_VERSION')) {
+ if (\PHP_VERSION_ID < (\PHP_VERSION_ID < 70400 ? 70316 : 70404) && !\defined('HHVM_VERSION')) {
set_error_handler($currentErrorHandler);
}
}
diff --git a/vendor/symfony/debug/LICENSE b/vendor/symfony/debug/LICENSE
index a677f43763..9e936ec044 100644
--- a/vendor/symfony/debug/LICENSE
+++ b/vendor/symfony/debug/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2019 Fabien Potencier
+Copyright (c) 2004-2020 Fabien Potencier
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/vendor/symfony/debug/README.md b/vendor/symfony/debug/README.md
index a1d16175c1..f0878df3fa 100644
--- a/vendor/symfony/debug/README.md
+++ b/vendor/symfony/debug/README.md
@@ -3,10 +3,22 @@ Debug Component
The Debug component provides tools to ease debugging PHP code.
+Getting Started
+---------------
+
+```
+$ composer install symfony/debug
+```
+
+```php
+use Symfony\Component\Debug\Debug;
+
+Debug::enable();
+```
+
Resources
---------
- * [Documentation](https://symfony.com/doc/current/components/debug/index.html)
* [Contributing](https://symfony.com/doc/current/contributing/index.html)
* [Report issues](https://github.com/symfony/symfony/issues) and
[send Pull Requests](https://github.com/symfony/symfony/pulls)
diff --git a/vendor/symfony/debug/Tests/DebugClassLoaderTest.php b/vendor/symfony/debug/Tests/DebugClassLoaderTest.php
index 0388acba02..3cde54b3cd 100644
--- a/vendor/symfony/debug/Tests/DebugClassLoaderTest.php
+++ b/vendor/symfony/debug/Tests/DebugClassLoaderTest.php
@@ -64,14 +64,14 @@ public function testThrowingClass()
$this->expectException('Exception');
$this->expectExceptionMessage('boo');
try {
- class_exists(__NAMESPACE__.'\Fixtures\Throwing');
+ class_exists(Fixtures\Throwing::class);
$this->fail('Exception expected');
} catch (\Exception $e) {
$this->assertSame('boo', $e->getMessage());
}
// the second call also should throw
- class_exists(__NAMESPACE__.'\Fixtures\Throwing');
+ class_exists(Fixtures\Throwing::class);
}
public function testUnsilencing()
@@ -90,13 +90,16 @@ public function testUnsilencing()
// See below: this will fail with parse error
// but this should not be @-silenced.
- @class_exists(__NAMESPACE__.'\TestingUnsilencing', true);
+ @class_exists(TestingUnsilencing::class, true);
$output = ob_get_clean();
$this->assertStringMatchesFormat('%aParse error%a', $output);
}
+ /**
+ * @requires PHP < 8.0
+ */
public function testStacking()
{
// the ContextErrorException must not be loaded to test the workaround
@@ -141,7 +144,7 @@ public function testNameCaseMismatch()
{
$this->expectException('RuntimeException');
$this->expectExceptionMessage('Case mismatch between loaded and declared class names');
- class_exists(__NAMESPACE__.'\TestingCaseMismatch', true);
+ class_exists(TestingCaseMismatch::class, true);
}
public function testFileCaseMismatch()
@@ -152,7 +155,7 @@ public function testFileCaseMismatch()
$this->markTestSkipped('Can only be run on case insensitive filesystems');
}
- class_exists(__NAMESPACE__.'\Fixtures\CaseMismatch', true);
+ class_exists(Fixtures\CaseMismatch::class, true);
}
public function testPsr4CaseMismatch()
@@ -174,7 +177,7 @@ public function testNotPsr0Bis()
public function testClassAlias()
{
- $this->assertTrue(class_exists(__NAMESPACE__.'\Fixtures\ClassAlias', true));
+ $this->assertTrue(class_exists(Fixtures\ClassAlias::class, true));
}
/**
@@ -216,7 +219,7 @@ public function testInterfaceExtendsDeprecatedInterface()
$e = error_reporting(0);
trigger_error('', E_USER_NOTICE);
- class_exists('Test\\'.__NAMESPACE__.'\\NonDeprecatedInterfaceClass', true);
+ class_exists('Test\\'.NonDeprecatedInterfaceClass::class, true);
error_reporting($e);
restore_error_handler();
@@ -264,7 +267,7 @@ public function testReservedForPhp7()
$e = error_reporting(0);
trigger_error('', E_USER_NOTICE);
- class_exists('Test\\'.__NAMESPACE__.'\\Float', true);
+ class_exists('Test\\'.Float::class, true);
error_reporting($e);
restore_error_handler();
@@ -289,7 +292,7 @@ public function testExtendedFinalClass()
require __DIR__.'/Fixtures/FinalClasses.php';
$i = 1;
- while (class_exists($finalClass = __NAMESPACE__.'\\Fixtures\\FinalClass'.$i++, false)) {
+ while (class_exists($finalClass = Fixtures\FinalClass::class.$i++, false)) {
spl_autoload_call($finalClass);
class_exists('Test\\'.__NAMESPACE__.'\\Extends'.substr($finalClass, strrpos($finalClass, '\\') + 1), true);
}
@@ -315,7 +318,7 @@ public function testExtendedFinalMethod()
set_error_handler(function ($type, $msg) use (&$deprecations) { $deprecations[] = $msg; });
$e = error_reporting(E_USER_DEPRECATED);
- class_exists(__NAMESPACE__.'\\Fixtures\\ExtendedFinalMethod', true);
+ class_exists(Fixtures\ExtendedFinalMethod::class, true);
error_reporting($e);
restore_error_handler();
@@ -334,7 +337,7 @@ public function testExtendedDeprecatedMethodDoesntTriggerAnyNotice()
$e = error_reporting(0);
trigger_error('', E_USER_NOTICE);
- class_exists('Test\\'.__NAMESPACE__.'\\ExtendsAnnotatedClass', true);
+ class_exists('Test\\'.ExtendsAnnotatedClass::class, true);
error_reporting($e);
restore_error_handler();
@@ -351,7 +354,7 @@ public function testInternalsUse()
set_error_handler(function ($type, $msg) use (&$deprecations) { $deprecations[] = $msg; });
$e = error_reporting(E_USER_DEPRECATED);
- class_exists('Test\\'.__NAMESPACE__.'\\ExtendsInternals', true);
+ class_exists('Test\\'.ExtendsInternals::class, true);
error_reporting($e);
restore_error_handler();
@@ -370,7 +373,7 @@ public function testUseTraitWithInternalMethod()
set_error_handler(function ($type, $msg) use (&$deprecations) { $deprecations[] = $msg; });
$e = error_reporting(E_USER_DEPRECATED);
- class_exists('Test\\'.__NAMESPACE__.'\\UseTraitWithInternalMethod', true);
+ class_exists('Test\\'.UseTraitWithInternalMethod::class, true);
error_reporting($e);
restore_error_handler();
@@ -380,7 +383,7 @@ class_exists('Test\\'.__NAMESPACE__.'\\UseTraitWithInternalMethod', true);
public function testEvaluatedCode()
{
- $this->assertTrue(class_exists(__NAMESPACE__.'\Fixtures\DefinitionInEvaluatedCode', true));
+ $this->assertTrue(class_exists(Fixtures\DefinitionInEvaluatedCode::class, true));
}
}
@@ -399,11 +402,11 @@ public function findFile($class)
{
$fixtureDir = __DIR__.\DIRECTORY_SEPARATOR.'Fixtures'.\DIRECTORY_SEPARATOR;
- if (__NAMESPACE__.'\TestingUnsilencing' === $class) {
+ if (TestingUnsilencing::class === $class) {
eval('-- parse error --');
- } elseif (__NAMESPACE__.'\TestingStacking' === $class) {
+ } elseif (TestingStacking::class === $class) {
eval('namespace '.__NAMESPACE__.'; class TestingStacking { function foo() {} }');
- } elseif (__NAMESPACE__.'\TestingCaseMismatch' === $class) {
+ } elseif (TestingCaseMismatch::class === $class) {
eval('namespace '.__NAMESPACE__.'; class TestingCaseMisMatch {}');
} elseif (__NAMESPACE__.'\Fixtures\Psr4CaseMismatch' === $class) {
return $fixtureDir.'psr4'.\DIRECTORY_SEPARATOR.'Psr4CaseMismatch.php';
@@ -413,30 +416,30 @@ public function findFile($class)
return $fixtureDir.'notPsr0Bis.php';
} elseif ('Symfony\Bridge\Debug\Tests\Fixtures\ExtendsDeprecatedParent' === $class) {
eval('namespace Symfony\Bridge\Debug\Tests\Fixtures; class ExtendsDeprecatedParent extends \\'.__NAMESPACE__.'\Fixtures\DeprecatedClass {}');
- } elseif ('Test\\'.__NAMESPACE__.'\DeprecatedParentClass' === $class) {
+ } elseif ('Test\\'.DeprecatedParentClass::class === $class) {
eval('namespace Test\\'.__NAMESPACE__.'; class DeprecatedParentClass extends \\'.__NAMESPACE__.'\Fixtures\DeprecatedClass {}');
- } elseif ('Test\\'.__NAMESPACE__.'\DeprecatedInterfaceClass' === $class) {
+ } elseif ('Test\\'.DeprecatedInterfaceClass::class === $class) {
eval('namespace Test\\'.__NAMESPACE__.'; class DeprecatedInterfaceClass implements \\'.__NAMESPACE__.'\Fixtures\DeprecatedInterface {}');
- } elseif ('Test\\'.__NAMESPACE__.'\NonDeprecatedInterfaceClass' === $class) {
+ } elseif ('Test\\'.NonDeprecatedInterfaceClass::class === $class) {
eval('namespace Test\\'.__NAMESPACE__.'; class NonDeprecatedInterfaceClass implements \\'.__NAMESPACE__.'\Fixtures\NonDeprecatedInterface {}');
- } elseif ('Test\\'.__NAMESPACE__.'\Float' === $class) {
+ } elseif ('Test\\'.Float::class === $class) {
eval('namespace Test\\'.__NAMESPACE__.'; class Float {}');
- } elseif (0 === strpos($class, 'Test\\'.__NAMESPACE__.'\ExtendsFinalClass')) {
+ } elseif (0 === strpos($class, 'Test\\'.ExtendsFinalClass::class)) {
$classShortName = substr($class, strrpos($class, '\\') + 1);
eval('namespace Test\\'.__NAMESPACE__.'; class '.$classShortName.' extends \\'.__NAMESPACE__.'\Fixtures\\'.substr($classShortName, 7).' {}');
- } elseif ('Test\\'.__NAMESPACE__.'\ExtendsAnnotatedClass' === $class) {
+ } elseif ('Test\\'.ExtendsAnnotatedClass::class === $class) {
eval('namespace Test\\'.__NAMESPACE__.'; class ExtendsAnnotatedClass extends \\'.__NAMESPACE__.'\Fixtures\AnnotatedClass {
public function deprecatedMethod() { }
}');
- } elseif ('Test\\'.__NAMESPACE__.'\ExtendsInternals' === $class) {
+ } elseif ('Test\\'.ExtendsInternals::class === $class) {
eval('namespace Test\\'.__NAMESPACE__.'; class ExtendsInternals extends ExtendsInternalsParent {
use \\'.__NAMESPACE__.'\Fixtures\InternalTrait;
public function internalMethod() { }
}');
- } elseif ('Test\\'.__NAMESPACE__.'\ExtendsInternalsParent' === $class) {
+ } elseif ('Test\\'.ExtendsInternalsParent::class === $class) {
eval('namespace Test\\'.__NAMESPACE__.'; class ExtendsInternalsParent extends \\'.__NAMESPACE__.'\Fixtures\InternalClass implements \\'.__NAMESPACE__.'\Fixtures\InternalInterface { }');
- } elseif ('Test\\'.__NAMESPACE__.'\UseTraitWithInternalMethod' === $class) {
+ } elseif ('Test\\'.UseTraitWithInternalMethod::class === $class) {
eval('namespace Test\\'.__NAMESPACE__.'; class UseTraitWithInternalMethod { use \\'.__NAMESPACE__.'\Fixtures\TraitWithInternalMethod; }');
}
diff --git a/vendor/symfony/debug/Tests/ErrorHandlerTest.php b/vendor/symfony/debug/Tests/ErrorHandlerTest.php
index 2cf75a0e8e..118935e769 100644
--- a/vendor/symfony/debug/Tests/ErrorHandlerTest.php
+++ b/vendor/symfony/debug/Tests/ErrorHandlerTest.php
@@ -101,9 +101,14 @@ public function testNotice()
$this->fail('ErrorException expected');
} catch (\ErrorException $exception) {
// if an exception is thrown, the test passed
- $this->assertEquals(E_NOTICE, $exception->getSeverity());
+ if (\PHP_VERSION_ID < 80000) {
+ $this->assertEquals(E_NOTICE, $exception->getSeverity());
+ $this->assertRegExp('/^Notice: Undefined variable: (foo|bar)/', $exception->getMessage());
+ } else {
+ $this->assertEquals(E_WARNING, $exception->getSeverity());
+ $this->assertRegExp('/^Warning: Undefined variable \$(foo|bar)/', $exception->getMessage());
+ }
$this->assertEquals(__FILE__, $exception->getFile());
- $this->assertRegExp('/^Notice: Undefined variable: (foo|bar)/', $exception->getMessage());
$trace = $exception->getTrace();
@@ -247,11 +252,17 @@ public function testHandleError()
$line = null;
$logArgCheck = function ($level, $message, $context) use (&$line) {
- $this->assertEquals('Notice: Undefined variable: undefVar', $message);
$this->assertArrayHasKey('exception', $context);
$exception = $context['exception'];
+
+ if (\PHP_VERSION_ID < 80000) {
+ $this->assertEquals('Notice: Undefined variable: undefVar', $message);
+ $this->assertSame(E_NOTICE, $exception->getSeverity());
+ } else {
+ $this->assertEquals('Warning: Undefined variable $undefVar', $message);
+ $this->assertSame(E_WARNING, $exception->getSeverity());
+ }
$this->assertInstanceOf(SilencedErrorContext::class, $exception);
- $this->assertSame(E_NOTICE, $exception->getSeverity());
$this->assertSame(__FILE__, $exception->getFile());
$this->assertSame($line, $exception->getLine());
$this->assertNotEmpty($exception->getTrace());
@@ -265,8 +276,13 @@ public function testHandleError()
;
$handler = ErrorHandler::register();
- $handler->setDefaultLogger($logger, E_NOTICE);
- $handler->screamAt(E_NOTICE);
+ if (\PHP_VERSION_ID < 80000) {
+ $handler->setDefaultLogger($logger, E_NOTICE);
+ $handler->screamAt(E_NOTICE);
+ } else {
+ $handler->setDefaultLogger($logger, E_WARNING);
+ $handler->screamAt(E_WARNING);
+ }
unset($undefVar);
$line = __LINE__ + 1;
@$undefVar++;
@@ -327,8 +343,6 @@ public function testHandleDeprecation()
$handler = new ErrorHandler();
$handler->setDefaultLogger($logger);
@$handler->handleError(E_USER_DEPRECATED, 'Foo deprecation', __FILE__, __LINE__, []);
-
- restore_error_handler();
}
/**
diff --git a/vendor/symfony/debug/Tests/Exception/FlattenExceptionTest.php b/vendor/symfony/debug/Tests/Exception/FlattenExceptionTest.php
index 0290b05bad..3d163eec77 100644
--- a/vendor/symfony/debug/Tests/Exception/FlattenExceptionTest.php
+++ b/vendor/symfony/debug/Tests/Exception/FlattenExceptionTest.php
@@ -199,6 +199,10 @@ public function flattenDataProvider()
public function testArguments()
{
+ if (\PHP_VERSION_ID >= 70400) {
+ $this->markTestSkipped('PHP 7.4 removes arguments from exception traces.');
+ }
+
$dh = opendir(__DIR__);
$fh = tmpfile();
@@ -261,6 +265,10 @@ function () {},
public function testRecursionInArguments()
{
+ if (\PHP_VERSION_ID >= 70400) {
+ $this->markTestSkipped('PHP 7.4 removes arguments from exception traces.');
+ }
+
$a = null;
$a = ['foo', [2, &$a]];
$exception = $this->createException($a);
@@ -272,6 +280,10 @@ public function testRecursionInArguments()
public function testTooBigArray()
{
+ if (\PHP_VERSION_ID >= 70400) {
+ $this->markTestSkipped('PHP 7.4 removes arguments from exception traces.');
+ }
+
$a = [];
for ($i = 0; $i < 20; ++$i) {
for ($j = 0; $j < 50; ++$j) {
diff --git a/vendor/symfony/debug/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php b/vendor/symfony/debug/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php
index 9a56b3b4ec..f356476201 100644
--- a/vendor/symfony/debug/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php
+++ b/vendor/symfony/debug/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php
@@ -29,6 +29,10 @@ public static function setUpBeforeClass()
// get class loaders wrapped by DebugClassLoader
if ($function[0] instanceof DebugClassLoader) {
$function = $function[0]->getClassLoader();
+
+ if (!\is_array($function)) {
+ continue;
+ }
}
if ($function[0] instanceof ComposerClassLoader) {
diff --git a/vendor/symfony/debug/Tests/Fixtures/ErrorHandlerThatUsesThePreviousOne.php b/vendor/symfony/debug/Tests/Fixtures/ErrorHandlerThatUsesThePreviousOne.php
index d449c40cc7..bb2fba51f0 100644
--- a/vendor/symfony/debug/Tests/Fixtures/ErrorHandlerThatUsesThePreviousOne.php
+++ b/vendor/symfony/debug/Tests/Fixtures/ErrorHandlerThatUsesThePreviousOne.php
@@ -15,8 +15,8 @@ public static function register()
return $handler;
}
- public function handleError($type, $message, $file, $line, $context)
+ public function handleError()
{
- return \call_user_func(self::$previous, $type, $message, $file, $line, $context);
+ return \call_user_func_array(self::$previous, \func_get_args());
}
}
diff --git a/vendor/symfony/dependency-injection/Compiler/AbstractRecursivePass.php b/vendor/symfony/dependency-injection/Compiler/AbstractRecursivePass.php
index 5ca2b2246b..863bab4731 100644
--- a/vendor/symfony/dependency-injection/Compiler/AbstractRecursivePass.php
+++ b/vendor/symfony/dependency-injection/Compiler/AbstractRecursivePass.php
@@ -126,14 +126,14 @@ protected function getConstructor(Definition $definition, $required)
throw new RuntimeException(sprintf('Invalid service "%s": class "%s" does not exist.', $this->currentId, $class));
}
} catch (\ReflectionException $e) {
- throw new RuntimeException(sprintf('Invalid service "%s": %s.', $this->currentId, lcfirst(rtrim($e->getMessage(), '.'))));
+ throw new RuntimeException(sprintf('Invalid service "%s": ', $this->currentId).lcfirst($e->getMessage()));
}
if (!$r = $r->getConstructor()) {
if ($required) {
throw new RuntimeException(sprintf('Invalid service "%s": class%s has no constructor.', $this->currentId, sprintf($class !== $this->currentId ? ' "%s"' : '', $class)));
}
} elseif (!$r->isPublic()) {
- throw new RuntimeException(sprintf('Invalid service "%s": %s must be public.', $this->currentId, sprintf($class !== $this->currentId ? 'constructor of class "%s"' : 'its constructor', $class)));
+ throw new RuntimeException(sprintf('Invalid service "%s": ', $this->currentId).sprintf($class !== $this->currentId ? 'constructor of class "%s"' : 'its constructor', $class).' must be public.');
}
return $r;
diff --git a/vendor/symfony/dependency-injection/Compiler/AutowirePass.php b/vendor/symfony/dependency-injection/Compiler/AutowirePass.php
index 91b279c77a..d97f121ab9 100644
--- a/vendor/symfony/dependency-injection/Compiler/AutowirePass.php
+++ b/vendor/symfony/dependency-injection/Compiler/AutowirePass.php
@@ -525,7 +525,16 @@ private static function getResourceMetadataForMethod(\ReflectionMethod $method)
$methodArgumentsMetadata = [];
foreach ($method->getParameters() as $parameter) {
try {
- $class = $parameter->getClass();
+ if (method_exists($parameter, 'getType')) {
+ $type = $parameter->getType();
+ if ($type && !$type->isBuiltin()) {
+ $class = new \ReflectionClass(method_exists($type, 'getName') ? $type->getName() : (string) $type);
+ } else {
+ $class = null;
+ }
+ } else {
+ $class = $parameter->getClass();
+ }
} catch (\ReflectionException $e) {
// type-hint is against a non-existent class
$class = false;
diff --git a/vendor/symfony/dependency-injection/Compiler/CheckDefinitionValidityPass.php b/vendor/symfony/dependency-injection/Compiler/CheckDefinitionValidityPass.php
index 0e9005415a..4b6d277fe9 100644
--- a/vendor/symfony/dependency-injection/Compiler/CheckDefinitionValidityPass.php
+++ b/vendor/symfony/dependency-injection/Compiler/CheckDefinitionValidityPass.php
@@ -49,21 +49,10 @@ public function process(ContainerBuilder $container)
}
if (class_exists($id) || interface_exists($id, false)) {
if (0 === strpos($id, '\\') && 1 < substr_count($id, '\\')) {
- throw new RuntimeException(sprintf(
- 'The definition for "%s" has no class attribute, and appears to reference a class or interface. '
- .'Please specify the class attribute explicitly or remove the leading backslash by renaming '
- .'the service to "%s" to get rid of this error.',
- $id, substr($id, 1)
- ));
+ throw new RuntimeException(sprintf('The definition for "%s" has no class attribute, and appears to reference a class or interface. Please specify the class attribute explicitly or remove the leading backslash by renaming the service to "%s" to get rid of this error.', $id, substr($id, 1)));
}
- throw new RuntimeException(sprintf(
- 'The definition for "%s" has no class attribute, and appears to reference a '
- .'class or interface in the global namespace. Leaving out the "class" attribute '
- .'is only allowed for namespaced classes. Please specify the class attribute '
- .'explicitly to get rid of this error.',
- $id
- ));
+ throw new RuntimeException(sprintf('The definition for "%s" has no class attribute, and appears to reference a class or interface in the global namespace. Leaving out the "class" attribute is only allowed for namespaced classes. Please specify the class attribute explicitly to get rid of this error.', $id));
}
throw new RuntimeException(sprintf('The definition for "%s" has no class. If you intend to inject this service dynamically at runtime, please mark it as synthetic=true. If this is an abstract definition solely used by child definitions, please add abstract=true, otherwise specify a class to get rid of this error.', $id));
diff --git a/vendor/symfony/dependency-injection/Compiler/Compiler.php b/vendor/symfony/dependency-injection/Compiler/Compiler.php
index bf0d9c3eab..c5f698b012 100644
--- a/vendor/symfony/dependency-injection/Compiler/Compiler.php
+++ b/vendor/symfony/dependency-injection/Compiler/Compiler.php
@@ -81,7 +81,7 @@ public function addPass(CompilerPassInterface $pass, $type = PassConfig::TYPE_BE
if (\func_num_args() >= 3) {
$priority = func_get_arg(2);
} else {
- if (__CLASS__ !== \get_class($this)) {
+ if (__CLASS__ !== static::class) {
$r = new \ReflectionMethod($this, __FUNCTION__);
if (__CLASS__ !== $r->getDeclaringClass()->getName()) {
@trigger_error(sprintf('Method %s() will have a third `int $priority = 0` argument in version 4.0. Not defining it is deprecated since Symfony 3.2.', __METHOD__), E_USER_DEPRECATED);
diff --git a/vendor/symfony/dependency-injection/Compiler/PassConfig.php b/vendor/symfony/dependency-injection/Compiler/PassConfig.php
index 323faad57f..e470cdec2d 100644
--- a/vendor/symfony/dependency-injection/Compiler/PassConfig.php
+++ b/vendor/symfony/dependency-injection/Compiler/PassConfig.php
@@ -53,7 +53,7 @@ public function __construct()
new ServiceLocatorTagPass(),
new RegisterServiceSubscribersPass(),
new DecoratorServicePass(),
- new ResolveParameterPlaceHoldersPass(false),
+ new ResolveParameterPlaceHoldersPass(false, false),
new ResolveFactoryClassPass(),
new FactoryReturnTypePass($resolveClassPass),
new CheckDefinitionValidityPass(),
@@ -123,7 +123,7 @@ public function addPass(CompilerPassInterface $pass, $type = self::TYPE_BEFORE_O
if (\func_num_args() >= 3) {
$priority = func_get_arg(2);
} else {
- if (__CLASS__ !== \get_class($this)) {
+ if (__CLASS__ !== static::class) {
$r = new \ReflectionMethod($this, __FUNCTION__);
if (__CLASS__ !== $r->getDeclaringClass()->getName()) {
@trigger_error(sprintf('Method %s() will have a third `int $priority = 0` argument in version 4.0. Not defining it is deprecated since Symfony 3.2.', __METHOD__), E_USER_DEPRECATED);
diff --git a/vendor/symfony/dependency-injection/Compiler/ResolveBindingsPass.php b/vendor/symfony/dependency-injection/Compiler/ResolveBindingsPass.php
index f3c4b593cc..065dbb4b40 100644
--- a/vendor/symfony/dependency-injection/Compiler/ResolveBindingsPass.php
+++ b/vendor/symfony/dependency-injection/Compiler/ResolveBindingsPass.php
@@ -90,7 +90,7 @@ protected function processValue($value, $isRoot = false)
}
if (null !== $bindingValue && !$bindingValue instanceof Reference && !$bindingValue instanceof Definition) {
- throw new InvalidArgumentException(sprintf('Invalid value for binding key "%s" for service "%s": expected null, an instance of %s or an instance of %s, %s given.', $key, $this->currentId, Reference::class, Definition::class, \gettype($bindingValue)));
+ throw new InvalidArgumentException(sprintf('Invalid value for binding key "%s" for service "%s": expected null, an instance of "%s" or an instance of "%s", "%s" given.', $key, $this->currentId, Reference::class, Definition::class, \gettype($bindingValue)));
}
}
diff --git a/vendor/symfony/dependency-injection/Compiler/ResolveInstanceofConditionalsPass.php b/vendor/symfony/dependency-injection/Compiler/ResolveInstanceofConditionalsPass.php
index 69e3796df0..6268ed9ed0 100644
--- a/vendor/symfony/dependency-injection/Compiler/ResolveInstanceofConditionalsPass.php
+++ b/vendor/symfony/dependency-injection/Compiler/ResolveInstanceofConditionalsPass.php
@@ -64,9 +64,10 @@ private function processDefinition(ContainerBuilder $container, $id, Definition
$definition->setInstanceofConditionals([]);
$parent = $shared = null;
$instanceofTags = [];
+ $reflectionClass = null;
foreach ($conditionals as $interface => $instanceofDefs) {
- if ($interface !== $class && (!$container->getReflectionClass($class, false))) {
+ if ($interface !== $class && !(null === $reflectionClass ? $reflectionClass = ($container->getReflectionClass($class, false) ?: false) : $reflectionClass)) {
continue;
}
diff --git a/vendor/symfony/dependency-injection/Compiler/ResolveNamedArgumentsPass.php b/vendor/symfony/dependency-injection/Compiler/ResolveNamedArgumentsPass.php
index 0b79280110..225014f1e4 100644
--- a/vendor/symfony/dependency-injection/Compiler/ResolveNamedArgumentsPass.php
+++ b/vendor/symfony/dependency-injection/Compiler/ResolveNamedArgumentsPass.php
@@ -66,7 +66,7 @@ protected function processValue($value, $isRoot = false)
}
if (null !== $argument && !$argument instanceof Reference && !$argument instanceof Definition) {
- throw new InvalidArgumentException(sprintf('Invalid service "%s": the value of argument "%s" of method "%s()" must be null, an instance of %s or an instance of %s, %s given.', $this->currentId, $key, $class !== $this->currentId ? $class.'::'.$method : $method, Reference::class, Definition::class, \gettype($argument)));
+ throw new InvalidArgumentException(sprintf('Invalid service "%s": the value of argument "%s" of method "%s()" must be null, an instance of "%s" or an instance of "%s", "%s" given.', $this->currentId, $key, $class !== $this->currentId ? $class.'::'.$method : $method, Reference::class, Definition::class, \gettype($argument)));
}
$typeFound = false;
diff --git a/vendor/symfony/dependency-injection/Compiler/ResolveParameterPlaceHoldersPass.php b/vendor/symfony/dependency-injection/Compiler/ResolveParameterPlaceHoldersPass.php
index 8c942b524e..32eb6a3a76 100644
--- a/vendor/symfony/dependency-injection/Compiler/ResolveParameterPlaceHoldersPass.php
+++ b/vendor/symfony/dependency-injection/Compiler/ResolveParameterPlaceHoldersPass.php
@@ -24,10 +24,12 @@ class ResolveParameterPlaceHoldersPass extends AbstractRecursivePass
{
private $bag;
private $resolveArrays;
+ private $throwOnResolveException;
- public function __construct($resolveArrays = true)
+ public function __construct($resolveArrays = true, $throwOnResolveException = true)
{
$this->resolveArrays = $resolveArrays;
+ $this->throwOnResolveException = $throwOnResolveException;
}
/**
@@ -61,7 +63,16 @@ public function process(ContainerBuilder $container)
protected function processValue($value, $isRoot = false)
{
if (\is_string($value)) {
- $v = $this->bag->resolveValue($value);
+ try {
+ $v = $this->bag->resolveValue($value);
+ } catch (ParameterNotFoundException $e) {
+ if ($this->throwOnResolveException) {
+ throw $e;
+ }
+
+ $v = null;
+ $this->container->getDefinition($this->currentId)->addError($e->getMessage());
+ }
return $this->resolveArrays || !$v || !\is_array($v) ? $v : $value;
}
diff --git a/vendor/symfony/dependency-injection/ContainerBuilder.php b/vendor/symfony/dependency-injection/ContainerBuilder.php
index f9bfcb5210..7c9860b4dc 100644
--- a/vendor/symfony/dependency-injection/ContainerBuilder.php
+++ b/vendor/symfony/dependency-injection/ContainerBuilder.php
@@ -213,7 +213,7 @@ public function getExtension($name)
return $this->extensionsByNs[$name];
}
- throw new LogicException(sprintf('Container extension "%s" is not registered', $name));
+ throw new LogicException(sprintf('Container extension "%s" is not registered.', $name));
}
/**
@@ -474,7 +474,7 @@ public function addCompilerPass(CompilerPassInterface $pass, $type = PassConfig:
if (\func_num_args() >= 3) {
$priority = func_get_arg(2);
} else {
- if (__CLASS__ !== \get_class($this)) {
+ if (__CLASS__ !== static::class) {
$r = new \ReflectionMethod($this, __FUNCTION__);
if (__CLASS__ !== $r->getDeclaringClass()->getName()) {
@trigger_error(sprintf('Method %s() will have a third `int $priority = 0` argument in version 4.0. Not defining it is deprecated since Symfony 3.2.', __METHOD__), E_USER_DEPRECATED);
@@ -866,7 +866,7 @@ public function setAlias($alias, $id)
$alias = $this->normalizeId($alias);
if ('' === $alias || '\\' === substr($alias, -1) || \strlen($alias) !== strcspn($alias, "\0\r\n'")) {
- throw new InvalidArgumentException(sprintf('Invalid alias id: "%s"', $alias));
+ throw new InvalidArgumentException(sprintf('Invalid alias id: "%s".', $alias));
}
if (\is_string($id)) {
@@ -1017,13 +1017,13 @@ public function getDefinitions()
public function setDefinition($id, Definition $definition)
{
if ($this->isCompiled()) {
- throw new BadMethodCallException('Adding definition to a compiled container is not allowed');
+ throw new BadMethodCallException('Adding definition to a compiled container is not allowed.');
}
$id = $this->normalizeId($id);
if ('' === $id || '\\' === substr($id, -1) || \strlen($id) !== strcspn($id, "\0\r\n'")) {
- throw new InvalidArgumentException(sprintf('Invalid service id: "%s"', $id));
+ throw new InvalidArgumentException(sprintf('Invalid service id: "%s".', $id));
}
unset($this->aliasDefinitions[$id], $this->removedIds[$id]);
@@ -1152,7 +1152,7 @@ private function createService(Definition $definition, array &$inlineServices, $
if (\is_array($factory)) {
$factory = [$this->doResolveServices($parameterBag->resolveValue($factory[0]), $inlineServices, $isConstructorArgument), $factory[1]];
} elseif (!\is_string($factory)) {
- throw new RuntimeException(sprintf('Cannot create service "%s" because of invalid factory', $id));
+ throw new RuntimeException(sprintf('Cannot create service "%s" because of invalid factory.', $id));
}
}
@@ -1439,7 +1439,7 @@ public function resolveEnvPlaceholders($value, $format = null, array &$usedEnvs
$completed = true;
} else {
if (!\is_string($resolved) && !is_numeric($resolved)) {
- throw new RuntimeException(sprintf('A string value must be composed of strings and/or numbers, but found parameter "env(%s)" of type %s inside string value "%s".', $env, \gettype($resolved), $this->resolveEnvPlaceholders($value)));
+ throw new RuntimeException(sprintf('A string value must be composed of strings and/or numbers, but found parameter "env(%s)" of type "%s" inside string value "%s".', $env, \gettype($resolved), $this->resolveEnvPlaceholders($value)));
}
$value = str_ireplace($placeholder, $resolved, $value);
}
diff --git a/vendor/symfony/dependency-injection/Dumper/GraphvizDumper.php b/vendor/symfony/dependency-injection/Dumper/GraphvizDumper.php
index f06e6e80d5..0591e024f5 100644
--- a/vendor/symfony/dependency-injection/Dumper/GraphvizDumper.php
+++ b/vendor/symfony/dependency-injection/Dumper/GraphvizDumper.php
@@ -32,10 +32,11 @@ class GraphvizDumper extends Dumper
{
private $nodes;
private $edges;
+ // All values should be strings
private $options = [
'graph' => ['ratio' => 'compress'],
- 'node' => ['fontsize' => 11, 'fontname' => 'Arial', 'shape' => 'record'],
- 'edge' => ['fontsize' => 9, 'fontname' => 'Arial', 'color' => 'grey', 'arrowhead' => 'open', 'arrowsize' => 0.5],
+ 'node' => ['fontsize' => '11', 'fontname' => 'Arial', 'shape' => 'record'],
+ 'edge' => ['fontsize' => '9', 'fontname' => 'Arial', 'color' => 'grey', 'arrowhead' => 'open', 'arrowsize' => '0.5'],
'node.instance' => ['fillcolor' => '#9999ff', 'style' => 'filled'],
'node.definition' => ['fillcolor' => '#eeeeee'],
'node.missing' => ['fillcolor' => '#ff9999', 'style' => 'filled'],
diff --git a/vendor/symfony/dependency-injection/Dumper/PhpDumper.php b/vendor/symfony/dependency-injection/Dumper/PhpDumper.php
index 7596b9953b..3bfa0c3188 100644
--- a/vendor/symfony/dependency-injection/Dumper/PhpDumper.php
+++ b/vendor/symfony/dependency-injection/Dumper/PhpDumper.php
@@ -173,14 +173,14 @@ public function dump(array $options = [])
if (!empty($options['file']) && is_dir($dir = \dirname($options['file']))) {
// Build a regexp where the first root dirs are mandatory,
// but every other sub-dir is optional up to the full path in $dir
- // Mandate at least 2 root dirs and not more that 5 optional dirs.
+ // Mandate at least 1 root dir and not more than 5 optional dirs.
$dir = explode(\DIRECTORY_SEPARATOR, realpath($dir));
$i = \count($dir);
- if (3 <= $i) {
+ if (2 + (int) ('\\' === \DIRECTORY_SEPARATOR) <= $i) {
$regex = '';
- $lastOptionalDir = $i > 8 ? $i - 5 : 3;
+ $lastOptionalDir = $i > 8 ? $i - 5 : (2 + (int) ('\\' === \DIRECTORY_SEPARATOR));
$this->targetDirMaxMatches = $i - $lastOptionalDir;
while (--$i >= $lastOptionalDir) {
@@ -895,7 +895,7 @@ private function addNewInstance(Definition $definition, $return, $instantiation,
$callable = $definition->getFactory();
if (\is_array($callable)) {
if (!preg_match('/^[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*$/', $callable[1])) {
- throw new RuntimeException(sprintf('Cannot dump definition because of invalid factory method (%s)', $callable[1] ?: 'n/a'));
+ throw new RuntimeException(sprintf('Cannot dump definition because of invalid factory method (%s).', $callable[1] ?: 'n/a'));
}
if ($callable[0] instanceof Reference
@@ -1306,7 +1306,7 @@ private function addDefaultParametersMethod()
foreach ($this->container->getParameterBag()->all() as $key => $value) {
if ($key !== $resolvedKey = $this->container->resolveEnvPlaceholders($key)) {
- throw new InvalidArgumentException(sprintf('Parameter name cannot use env parameters: %s.', $resolvedKey));
+ throw new InvalidArgumentException(sprintf('Parameter name cannot use env parameters: "%s".', $resolvedKey));
}
if ($key !== $lcKey = strtolower($key)) {
$normalizedParams[] = sprintf(' %s => %s,', $this->export($lcKey), $this->export($key));
@@ -1701,7 +1701,7 @@ private function dumpValue($value, $interpolate = true)
if (\is_array($factory)) {
if (!preg_match('/^[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*$/', $factory[1])) {
- throw new RuntimeException(sprintf('Cannot dump definition because of invalid factory method (%s)', $factory[1] ?: 'n/a'));
+ throw new RuntimeException(sprintf('Cannot dump definition because of invalid factory method (%s).', $factory[1] ?: 'n/a'));
}
$class = $this->dumpValue($factory[0]);
@@ -1722,7 +1722,7 @@ private function dumpValue($value, $interpolate = true)
}
}
- throw new RuntimeException('Cannot dump definition because of invalid factory');
+ throw new RuntimeException('Cannot dump definition because of invalid factory.');
}
$class = $value->getClass();
@@ -1785,7 +1785,7 @@ private function dumpLiteralClass($class)
return sprintf('${($_ = %s) && false ?: "_"}', $class);
}
if (0 !== strpos($class, "'") || !preg_match('/^\'(?:\\\{2})?[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*(?:\\\{2}[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)*\'$/', $class)) {
- throw new RuntimeException(sprintf('Cannot dump definition because of invalid class name (%s)', $class ?: 'n/a'));
+ throw new RuntimeException(sprintf('Cannot dump definition because of invalid class name (%s).', $class ?: 'n/a'));
}
$class = substr(str_replace('\\\\', '\\', $class), 1, -1);
diff --git a/vendor/symfony/dependency-injection/Dumper/XmlDumper.php b/vendor/symfony/dependency-injection/Dumper/XmlDumper.php
index cfc9328439..eff421ec4e 100644
--- a/vendor/symfony/dependency-injection/Dumper/XmlDumper.php
+++ b/vendor/symfony/dependency-injection/Dumper/XmlDumper.php
@@ -304,6 +304,11 @@ private function convertParameters(array $parameters, $type, \DOMElement $parent
if (\in_array($value, ['null', 'true', 'false'], true)) {
$element->setAttribute('type', 'string');
}
+
+ if (\is_string($value) && (is_numeric($value) || preg_match('/^0b[01]*$/', $value) || preg_match('/^0x[0-9a-f]++$/i', $value))) {
+ $element->setAttribute('type', 'string');
+ }
+
$text = $this->document->createTextNode(self::phpToXml($value));
$element->appendChild($text);
}
diff --git a/vendor/symfony/dependency-injection/EnvVarProcessor.php b/vendor/symfony/dependency-injection/EnvVarProcessor.php
index 8854080939..6b7ccf2e18 100644
--- a/vendor/symfony/dependency-injection/EnvVarProcessor.php
+++ b/vendor/symfony/dependency-injection/EnvVarProcessor.php
@@ -57,7 +57,7 @@ public function getEnv($prefix, $name, \Closure $getEnv)
throw new RuntimeException(sprintf('Invalid file name: env var "%s" is non-scalar.', $name));
}
if (!file_exists($file)) {
- throw new RuntimeException(sprintf('Env "file:%s" not found: %s does not exist.', $name, $file));
+ throw new RuntimeException(sprintf('Env "file:%s" not found: "%s" does not exist.', $name, $file));
}
return file_get_contents($file);
@@ -82,7 +82,7 @@ public function getEnv($prefix, $name, \Closure $getEnv)
}
if (!is_scalar($env)) {
- throw new RuntimeException(sprintf('Non-scalar env var "%s" cannot be cast to %s.', $name, $prefix));
+ throw new RuntimeException(sprintf('Non-scalar env var "%s" cannot be cast to "%s".', $name, $prefix));
}
if ('string' === $prefix) {
@@ -125,11 +125,11 @@ public function getEnv($prefix, $name, \Closure $getEnv)
$env = json_decode($env, true);
if (JSON_ERROR_NONE !== json_last_error()) {
- throw new RuntimeException(sprintf('Invalid JSON in env var "%s": '.json_last_error_msg(), $name));
+ throw new RuntimeException(sprintf('Invalid JSON in env var "%s": ', $name).json_last_error_msg());
}
if (!\is_array($env)) {
- throw new RuntimeException(sprintf('Invalid JSON env var "%s": array expected, %s given.', $name, \gettype($env)));
+ throw new RuntimeException(sprintf('Invalid JSON env var "%s": array expected, "%s" given.', $name, \gettype($env)));
}
return $env;
diff --git a/vendor/symfony/dependency-injection/Extension/Extension.php b/vendor/symfony/dependency-injection/Extension/Extension.php
index 7df483064f..00fa9dc8da 100644
--- a/vendor/symfony/dependency-injection/Extension/Extension.php
+++ b/vendor/symfony/dependency-injection/Extension/Extension.php
@@ -65,7 +65,7 @@ public function getNamespace()
*/
public function getAlias()
{
- $className = \get_class($this);
+ $className = static::class;
if ('Extension' != substr($className, -9)) {
throw new BadMethodCallException('This extension does not follow the naming convention; you must overwrite the getAlias() method.');
}
@@ -79,7 +79,12 @@ public function getAlias()
*/
public function getConfiguration(array $config, ContainerBuilder $container)
{
- $class = \get_class($this);
+ $class = static::class;
+
+ if (false !== strpos($class, "\0")) {
+ return null; // ignore anonymous classes
+ }
+
$class = substr_replace($class, '\Configuration', strrpos($class, '\\'));
$class = $container->getReflectionClass($class);
$constructor = $class ? $class->getConstructor() : null;
diff --git a/vendor/symfony/dependency-injection/LICENSE b/vendor/symfony/dependency-injection/LICENSE
index a677f43763..9e936ec044 100644
--- a/vendor/symfony/dependency-injection/LICENSE
+++ b/vendor/symfony/dependency-injection/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2019 Fabien Potencier
+Copyright (c) 2004-2020 Fabien Potencier
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/vendor/symfony/dependency-injection/Loader/Configurator/AbstractConfigurator.php b/vendor/symfony/dependency-injection/Loader/Configurator/AbstractConfigurator.php
index f7222d0ed5..428683ef4c 100644
--- a/vendor/symfony/dependency-injection/Loader/Configurator/AbstractConfigurator.php
+++ b/vendor/symfony/dependency-injection/Loader/Configurator/AbstractConfigurator.php
@@ -31,7 +31,7 @@ public function __call($method, $args)
return \call_user_func_array([$this, 'set'.$method], $args);
}
- throw new \BadMethodCallException(sprintf('Call to undefined method %s::%s()', \get_class($this), $method));
+ throw new \BadMethodCallException(sprintf('Call to undefined method "%s::%s()".', static::class, $method));
}
/**
diff --git a/vendor/symfony/dependency-injection/Loader/Configurator/ContainerConfigurator.php b/vendor/symfony/dependency-injection/Loader/Configurator/ContainerConfigurator.php
index 3b4b2a4830..f2e5ccf8b0 100644
--- a/vendor/symfony/dependency-injection/Loader/Configurator/ContainerConfigurator.php
+++ b/vendor/symfony/dependency-injection/Loader/Configurator/ContainerConfigurator.php
@@ -45,13 +45,7 @@ final public function extension($namespace, array $config)
{
if (!$this->container->hasExtension($namespace)) {
$extensions = array_filter(array_map(function ($ext) { return $ext->getAlias(); }, $this->container->getExtensions()));
- throw new InvalidArgumentException(sprintf(
- 'There is no extension able to load the configuration for "%s" (in %s). Looked for namespace "%s", found %s',
- $namespace,
- $this->file,
- $namespace,
- $extensions ? sprintf('"%s"', implode('", "', $extensions)) : 'none'
- ));
+ throw new InvalidArgumentException(sprintf('There is no extension able to load the configuration for "%s" (in "%s"). Looked for namespace "%s", found "%s".', $namespace, $this->file, $namespace, $extensions ? implode('", "', $extensions) : 'none'));
}
$this->container->loadFromExtension($namespace, static::processValue($config));
diff --git a/vendor/symfony/dependency-injection/Loader/Configurator/PrototypeConfigurator.php b/vendor/symfony/dependency-injection/Loader/Configurator/PrototypeConfigurator.php
index d80c8b1338..3d844798d4 100644
--- a/vendor/symfony/dependency-injection/Loader/Configurator/PrototypeConfigurator.php
+++ b/vendor/symfony/dependency-injection/Loader/Configurator/PrototypeConfigurator.php
@@ -45,10 +45,13 @@ class PrototypeConfigurator extends AbstractServiceConfigurator
public function __construct(ServicesConfigurator $parent, PhpFileLoader $loader, Definition $defaults, $namespace, $resource, $allowParent)
{
$definition = new Definition();
- $definition->setPublic($defaults->isPublic());
+ if (!$defaults->isPublic() || !$defaults->isPrivate()) {
+ $definition->setPublic($defaults->isPublic());
+ }
$definition->setAutowired($defaults->isAutowired());
$definition->setAutoconfigured($defaults->isAutoconfigured());
- $definition->setBindings($defaults->getBindings());
+ // deep clone, to avoid multiple process of the same instance in the passes
+ $definition->setBindings(unserialize(serialize($defaults->getBindings())));
$definition->setChanges([]);
$this->loader = $loader;
diff --git a/vendor/symfony/dependency-injection/Loader/Configurator/ServicesConfigurator.php b/vendor/symfony/dependency-injection/Loader/Configurator/ServicesConfigurator.php
index e7677eb5e6..b6ccbc63b4 100644
--- a/vendor/symfony/dependency-injection/Loader/Configurator/ServicesConfigurator.php
+++ b/vendor/symfony/dependency-injection/Loader/Configurator/ServicesConfigurator.php
@@ -79,10 +79,13 @@ final public function set($id, $class = null)
$allowParent = !$defaults->getChanges() && empty($this->instanceof);
$definition = new Definition();
- $definition->setPublic($defaults->isPublic());
+ if (!$defaults->isPublic() || !$defaults->isPrivate()) {
+ $definition->setPublic($defaults->isPublic() && !$defaults->isPrivate());
+ }
$definition->setAutowired($defaults->isAutowired());
$definition->setAutoconfigured($defaults->isAutoconfigured());
- $definition->setBindings($defaults->getBindings());
+ // deep clone, to avoid multiple process of the same instance in the passes
+ $definition->setBindings(unserialize(serialize($defaults->getBindings())));
$definition->setChanges([]);
$configurator = new ServiceConfigurator($this->container, $this->instanceof, $allowParent, $this, $definition, $id, $defaults->getTags());
@@ -101,7 +104,10 @@ final public function set($id, $class = null)
final public function alias($id, $referencedId)
{
$ref = static::processValue($referencedId, true);
- $alias = new Alias((string) $ref, $this->defaults->isPublic());
+ $alias = new Alias((string) $ref);
+ if (!$this->defaults->isPublic() || !$this->defaults->isPrivate()) {
+ $alias->setPublic($this->defaults->isPublic());
+ }
$this->container->setAlias($id, $alias);
return new AliasConfigurator($this, $alias);
diff --git a/vendor/symfony/dependency-injection/Loader/FileLoader.php b/vendor/symfony/dependency-injection/Loader/FileLoader.php
index 77cad3c046..749dd4d06b 100644
--- a/vendor/symfony/dependency-injection/Loader/FileLoader.php
+++ b/vendor/symfony/dependency-injection/Loader/FileLoader.php
@@ -48,10 +48,10 @@ public function __construct(ContainerBuilder $container, FileLocatorInterface $l
public function registerClasses(Definition $prototype, $namespace, $resource, $exclude = null)
{
if ('\\' !== substr($namespace, -1)) {
- throw new InvalidArgumentException(sprintf('Namespace prefix must end with a "\\": %s.', $namespace));
+ throw new InvalidArgumentException(sprintf('Namespace prefix must end with a "\\": "%s".', $namespace));
}
if (!preg_match('/^(?:[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*+\\\\)++$/', $namespace)) {
- throw new InvalidArgumentException(sprintf('Namespace is not a valid PSR-4 prefix: %s.', $namespace));
+ throw new InvalidArgumentException(sprintf('Namespace is not a valid PSR-4 prefix: "%s".', $namespace));
}
$classes = $this->findClasses($namespace, $resource, $exclude);
@@ -110,7 +110,7 @@ private function findClasses($namespace, $pattern, $excludePattern)
$excludePrefix = null;
if ($excludePattern) {
$excludePattern = $parameterBag->unescapeValue($parameterBag->resolveValue($excludePattern));
- foreach ($this->glob($excludePattern, true, $resource) as $path => $info) {
+ foreach ($this->glob($excludePattern, true, $resource, true) as $path => $info) {
if (null === $excludePrefix) {
$excludePrefix = $resource->getPrefix();
}
@@ -129,7 +129,7 @@ private function findClasses($namespace, $pattern, $excludePattern)
$prefixLen = \strlen($resource->getPrefix());
if ($excludePrefix && 0 !== strpos($excludePrefix, $resource->getPrefix())) {
- throw new InvalidArgumentException(sprintf('Invalid "exclude" pattern when importing classes for "%s": make sure your "exclude" pattern (%s) is a subset of the "resource" pattern (%s)', $namespace, $excludePattern, $pattern));
+ throw new InvalidArgumentException(sprintf('Invalid "exclude" pattern when importing classes for "%s": make sure your "exclude" pattern (%s) is a subset of the "resource" pattern (%s).', $namespace, $excludePattern, $pattern));
}
}
diff --git a/vendor/symfony/dependency-injection/Loader/XmlFileLoader.php b/vendor/symfony/dependency-injection/Loader/XmlFileLoader.php
index c4b9b69a03..cfc13429a1 100644
--- a/vendor/symfony/dependency-injection/Loader/XmlFileLoader.php
+++ b/vendor/symfony/dependency-injection/Loader/XmlFileLoader.php
@@ -170,7 +170,7 @@ private function getServiceDefaults(\DOMDocument $xml, $file)
foreach ($defaults['tags'] as $tag) {
if ('' === $tag->getAttribute('name')) {
- throw new InvalidArgumentException(sprintf('The tag name for tag "<defaults>" in %s must be a non-empty string.', $file));
+ throw new InvalidArgumentException(sprintf('The tag name for tag "<defaults>" in "%s" must be a non-empty string.', $file));
}
}
@@ -278,7 +278,7 @@ private function parseDefinition(\DOMElement $service, $file, array $defaults)
$definition->setDeprecated(true, $deprecated[0]->nodeValue ?: null);
}
- $definition->setArguments($this->getArgumentsAsPhp($service, 'argument', $file, false, $definition instanceof ChildDefinition));
+ $definition->setArguments($this->getArgumentsAsPhp($service, 'argument', $file, $definition instanceof ChildDefinition));
$definition->setProperties($this->getArgumentsAsPhp($service, 'property', $file));
if ($factories = $this->getChildren($service, 'factory')) {
@@ -336,7 +336,7 @@ private function parseDefinition(\DOMElement $service, $file, array $defaults)
}
if ('' === $tag->getAttribute('name')) {
- throw new InvalidArgumentException(sprintf('The tag name for service "%s" in %s must be a non-empty string.', (string) $service->getAttribute('id'), $file));
+ throw new InvalidArgumentException(sprintf('The tag name for service "%s" in "%s" must be a non-empty string.', (string) $service->getAttribute('id'), $file));
}
$definition->addTag($tag->getAttribute('name'), $parameters);
@@ -378,7 +378,7 @@ private function parseFileToDOM($file)
try {
$dom = XmlUtils::loadFile($file, [$this, 'validateSchema']);
} catch (\InvalidArgumentException $e) {
- throw new InvalidArgumentException(sprintf('Unable to parse file "%s": %s', $file, $e->getMessage()), $e->getCode(), $e);
+ throw new InvalidArgumentException(sprintf('Unable to parse file "%s": ', $file).$e->getMessage(), $e->getCode(), $e);
}
$this->validateExtensions($dom, $file);
@@ -452,11 +452,10 @@ private function processAnonymousServices(\DOMDocument $xml, $file, $defaults)
*
* @param string $name
* @param string $file
- * @param bool $lowercase
*
* @return mixed
*/
- private function getArgumentsAsPhp(\DOMElement $node, $name, $file, $lowercase = true, $isChildDefinition = false)
+ private function getArgumentsAsPhp(\DOMElement $node, $name, $file, $isChildDefinition = false)
{
$arguments = [];
foreach ($this->getChildren($node, $name) as $arg) {
@@ -506,10 +505,10 @@ private function getArgumentsAsPhp(\DOMElement $node, $name, $file, $lowercase =
$arguments[$key] = new Expression($arg->nodeValue);
break;
case 'collection':
- $arguments[$key] = $this->getArgumentsAsPhp($arg, $name, $file, false);
+ $arguments[$key] = $this->getArgumentsAsPhp($arg, $name, $file);
break;
case 'iterator':
- $arg = $this->getArgumentsAsPhp($arg, $name, $file, false);
+ $arg = $this->getArgumentsAsPhp($arg, $name, $file);
try {
$arguments[$key] = new IteratorArgument($arg);
} catch (InvalidArgumentException $e) {
@@ -578,7 +577,7 @@ public function validateSchema(\DOMDocument $dom)
$path = str_replace([$ns, str_replace('http://', 'https://', $ns)], str_replace('\\', '/', $extension->getXsdValidationBasePath()).'/', $items[$i + 1]);
if (!is_file($path)) {
- throw new RuntimeException(sprintf('Extension "%s" references a non-existent XSD file "%s"', \get_class($extension), $path));
+ throw new RuntimeException(sprintf('Extension "%s" references a non-existent XSD file "%s".', \get_class($extension), $path));
}
$schemaLocations[$items[$i]] = $path;
@@ -669,7 +668,7 @@ private function validateExtensions(\DOMDocument $dom, $file)
// can it be handled by an extension?
if (!$this->container->hasExtension($node->namespaceURI)) {
$extensionNamespaces = array_filter(array_map(function ($ext) { return $ext->getNamespace(); }, $this->container->getExtensions()));
- throw new InvalidArgumentException(sprintf('There is no extension able to load the configuration for "%s" (in %s). Looked for namespace "%s", found %s', $node->tagName, $file, $node->namespaceURI, $extensionNamespaces ? sprintf('"%s"', implode('", "', $extensionNamespaces)) : 'none'));
+ throw new InvalidArgumentException(sprintf('There is no extension able to load the configuration for "%s" (in "%s"). Looked for namespace "%s", found "%s".', $node->tagName, $file, $node->namespaceURI, $extensionNamespaces ? sprintf('"%s"', implode('", "', $extensionNamespaces)) : 'none'));
}
}
}
diff --git a/vendor/symfony/dependency-injection/Loader/YamlFileLoader.php b/vendor/symfony/dependency-injection/Loader/YamlFileLoader.php
index 891689bc16..2f9d3dffe7 100644
--- a/vendor/symfony/dependency-injection/Loader/YamlFileLoader.php
+++ b/vendor/symfony/dependency-injection/Loader/YamlFileLoader.php
@@ -129,7 +129,7 @@ public function load($resource, $type = null)
// parameters
if (isset($content['parameters'])) {
if (!\is_array($content['parameters'])) {
- throw new InvalidArgumentException(sprintf('The "parameters" key should contain an array in %s. Check your YAML syntax.', $path));
+ throw new InvalidArgumentException(sprintf('The "parameters" key should contain an array in "%s". Check your YAML syntax.', $path));
}
foreach ($content['parameters'] as $key => $value) {
@@ -179,7 +179,7 @@ private function parseImports(array $content, $file)
}
if (!\is_array($content['imports'])) {
- throw new InvalidArgumentException(sprintf('The "imports" key should contain an array in %s. Check your YAML syntax.', $file));
+ throw new InvalidArgumentException(sprintf('The "imports" key should contain an array in "%s". Check your YAML syntax.', $file));
}
$defaultDirectory = \dirname($file);
@@ -188,7 +188,7 @@ private function parseImports(array $content, $file)
$import = ['resource' => $import];
}
if (!isset($import['resource'])) {
- throw new InvalidArgumentException(sprintf('An import should provide a resource in %s. Check your YAML syntax.', $file));
+ throw new InvalidArgumentException(sprintf('An import should provide a resource in "%s". Check your YAML syntax.', $file));
}
$this->setCurrentDir($defaultDirectory);
@@ -208,7 +208,7 @@ private function parseDefinitions(array $content, $file)
}
if (!\is_array($content['services'])) {
- throw new InvalidArgumentException(sprintf('The "services" key should contain an array in %s. Check your YAML syntax.', $file));
+ throw new InvalidArgumentException(sprintf('The "services" key should contain an array in "%s". Check your YAML syntax.', $file));
}
if (\array_key_exists('_instanceof', $content['services'])) {
@@ -222,10 +222,10 @@ private function parseDefinitions(array $content, $file)
$this->isLoadingInstanceof = true;
foreach ($instanceof as $id => $service) {
if (!$service || !\is_array($service)) {
- throw new InvalidArgumentException(sprintf('Type definition "%s" must be a non-empty array within "_instanceof" in %s. Check your YAML syntax.', $id, $file));
+ throw new InvalidArgumentException(sprintf('Type definition "%s" must be a non-empty array within "_instanceof" in "%s". Check your YAML syntax.', $id, $file));
}
if (\is_string($service) && 0 === strpos($service, '@')) {
- throw new InvalidArgumentException(sprintf('Type definition "%s" cannot be an alias within "_instanceof" in %s. Check your YAML syntax.', $id, $file));
+ throw new InvalidArgumentException(sprintf('Type definition "%s" cannot be an alias within "_instanceof" in "%s". Check your YAML syntax.', $id, $file));
}
$this->parseDefinition($id, $service, $file, []);
}
@@ -265,7 +265,7 @@ private function parseDefaults(array &$content, $file)
if (isset($defaults['tags'])) {
if (!\is_array($tags = $defaults['tags'])) {
- throw new InvalidArgumentException(sprintf('Parameter "tags" in "_defaults" must be an array in %s. Check your YAML syntax.', $file));
+ throw new InvalidArgumentException(sprintf('Parameter "tags" in "_defaults" must be an array in "%s". Check your YAML syntax.', $file));
}
foreach ($tags as $tag) {
@@ -274,18 +274,18 @@ private function parseDefaults(array &$content, $file)
}
if (!isset($tag['name'])) {
- throw new InvalidArgumentException(sprintf('A "tags" entry in "_defaults" is missing a "name" key in %s.', $file));
+ throw new InvalidArgumentException(sprintf('A "tags" entry in "_defaults" is missing a "name" key in "%s".', $file));
}
$name = $tag['name'];
unset($tag['name']);
if (!\is_string($name) || '' === $name) {
- throw new InvalidArgumentException(sprintf('The tag name in "_defaults" must be a non-empty string in %s.', $file));
+ throw new InvalidArgumentException(sprintf('The tag name in "_defaults" must be a non-empty string in "%s".', $file));
}
foreach ($tag as $attribute => $value) {
if (!is_scalar($value) && null !== $value) {
- throw new InvalidArgumentException(sprintf('Tag "%s", attribute "%s" in "_defaults" must be of a scalar-type in %s. Check your YAML syntax.', $name, $attribute, $file));
+ throw new InvalidArgumentException(sprintf('Tag "%s", attribute "%s" in "_defaults" must be of a scalar-type in "%s". Check your YAML syntax.', $name, $attribute, $file));
}
}
}
@@ -293,7 +293,7 @@ private function parseDefaults(array &$content, $file)
if (isset($defaults['bind'])) {
if (!\is_array($defaults['bind'])) {
- throw new InvalidArgumentException(sprintf('Parameter "bind" in "_defaults" must be an array in %s. Check your YAML syntax.', $file));
+ throw new InvalidArgumentException(sprintf('Parameter "bind" in "_defaults" must be an array in "%s". Check your YAML syntax.', $file));
}
$defaults['bind'] = array_map(function ($v) { return new BoundArgument($v); }, $this->resolveServices($defaults['bind'], $file));
@@ -348,14 +348,14 @@ private function parseDefinition($id, $service, $file, array $defaults)
}
if (!\is_array($service)) {
- throw new InvalidArgumentException(sprintf('A service definition must be an array or a string starting with "@" but %s found for service "%s" in %s. Check your YAML syntax.', \gettype($service), $id, $file));
+ throw new InvalidArgumentException(sprintf('A service definition must be an array or a string starting with "@" but "%s" found for service "%s" in "%s". Check your YAML syntax.', \gettype($service), $id, $file));
}
$this->checkDefinition($id, $service, $file);
if (isset($service['alias'])) {
$this->container->setAlias($id, $alias = new Alias($service['alias']));
- if (\array_key_exists('public', $service)) {
+ if (isset($service['public'])) {
$alias->setPublic($service['public']);
} elseif (isset($defaults['public'])) {
$alias->setPublic($defaults['public']);
@@ -458,7 +458,7 @@ private function parseDefinition($id, $service, $file, array $defaults)
if (isset($service['calls'])) {
if (!\is_array($service['calls'])) {
- throw new InvalidArgumentException(sprintf('Parameter "calls" must be an array for service "%s" in %s. Check your YAML syntax.', $id, $file));
+ throw new InvalidArgumentException(sprintf('Parameter "calls" must be an array for service "%s" in "%s". Check your YAML syntax.', $id, $file));
}
foreach ($service['calls'] as $call) {
@@ -471,7 +471,7 @@ private function parseDefinition($id, $service, $file, array $defaults)
}
if (!\is_array($args)) {
- throw new InvalidArgumentException(sprintf('The second parameter for function call "%s" must be an array of its arguments for service "%s" in %s. Check your YAML syntax.', $method, $id, $file));
+ throw new InvalidArgumentException(sprintf('The second parameter for function call "%s" must be an array of its arguments for service "%s" in "%s". Check your YAML syntax.', $method, $id, $file));
}
$definition->addMethodCall($method, $args);
}
@@ -479,7 +479,7 @@ private function parseDefinition($id, $service, $file, array $defaults)
$tags = isset($service['tags']) ? $service['tags'] : [];
if (!\is_array($tags)) {
- throw new InvalidArgumentException(sprintf('Parameter "tags" must be an array for service "%s" in %s. Check your YAML syntax.', $id, $file));
+ throw new InvalidArgumentException(sprintf('Parameter "tags" must be an array for service "%s" in "%s". Check your YAML syntax.', $id, $file));
}
if (isset($defaults['tags'])) {
@@ -492,18 +492,18 @@ private function parseDefinition($id, $service, $file, array $defaults)
}
if (!isset($tag['name'])) {
- throw new InvalidArgumentException(sprintf('A "tags" entry is missing a "name" key for service "%s" in %s.', $id, $file));
+ throw new InvalidArgumentException(sprintf('A "tags" entry is missing a "name" key for service "%s" in "%s".', $id, $file));
}
$name = $tag['name'];
unset($tag['name']);
if (!\is_string($name) || '' === $name) {
- throw new InvalidArgumentException(sprintf('The tag name for service "%s" in %s must be a non-empty string.', $id, $file));
+ throw new InvalidArgumentException(sprintf('The tag name for service "%s" in "%s" must be a non-empty string.', $id, $file));
}
foreach ($tag as $attribute => $value) {
if (!is_scalar($value) && null !== $value) {
- throw new InvalidArgumentException(sprintf('A "tags" attribute must be of a scalar-type for service "%s", tag "%s", attribute "%s" in %s. Check your YAML syntax.', $id, $name, $attribute, $file));
+ throw new InvalidArgumentException(sprintf('A "tags" attribute must be of a scalar-type for service "%s", tag "%s", attribute "%s" in "%s". Check your YAML syntax.', $id, $name, $attribute, $file));
}
}
@@ -529,12 +529,12 @@ private function parseDefinition($id, $service, $file, array $defaults)
$definition->addAutowiringType($service['autowiring_types']);
} else {
if (!\is_array($service['autowiring_types'])) {
- throw new InvalidArgumentException(sprintf('Parameter "autowiring_types" must be a string or an array for service "%s" in %s. Check your YAML syntax.', $id, $file));
+ throw new InvalidArgumentException(sprintf('Parameter "autowiring_types" must be a string or an array for service "%s" in "%s". Check your YAML syntax.', $id, $file));
}
foreach ($service['autowiring_types'] as $autowiringType) {
if (!\is_string($autowiringType)) {
- throw new InvalidArgumentException(sprintf('A "autowiring_types" attribute must be of type string for service "%s" in %s. Check your YAML syntax.', $id, $file));
+ throw new InvalidArgumentException(sprintf('A "autowiring_types" attribute must be of type string for service "%s" in "%s". Check your YAML syntax.', $id, $file));
}
$definition->addAutowiringType($autowiringType);
@@ -548,7 +548,7 @@ private function parseDefinition($id, $service, $file, array $defaults)
if (isset($service['bind'])) {
if (!\is_array($service['bind'])) {
- throw new InvalidArgumentException(sprintf('Parameter "bind" must be an array for service "%s" in %s. Check your YAML syntax.', $id, $file));
+ throw new InvalidArgumentException(sprintf('Parameter "bind" must be an array for service "%s" in "%s". Check your YAML syntax.', $id, $file));
}
$bindings = array_merge($bindings, $this->resolveServices($service['bind'], $file));
@@ -566,12 +566,12 @@ private function parseDefinition($id, $service, $file, array $defaults)
}
if (\array_key_exists('namespace', $service) && !\array_key_exists('resource', $service)) {
- throw new InvalidArgumentException(sprintf('A "resource" attribute must be set when the "namespace" attribute is set for service "%s" in %s. Check your YAML syntax.', $id, $file));
+ throw new InvalidArgumentException(sprintf('A "resource" attribute must be set when the "namespace" attribute is set for service "%s" in "%s". Check your YAML syntax.', $id, $file));
}
if (\array_key_exists('resource', $service)) {
if (!\is_string($service['resource'])) {
- throw new InvalidArgumentException(sprintf('A "resource" attribute must be of type string for service "%s" in %s. Check your YAML syntax.', $id, $file));
+ throw new InvalidArgumentException(sprintf('A "resource" attribute must be of type string for service "%s" in "%s". Check your YAML syntax.', $id, $file));
}
$exclude = isset($service['exclude']) ? $service['exclude'] : null;
$namespace = isset($service['namespace']) ? $service['namespace'] : $id;
@@ -618,10 +618,10 @@ private function parseCallable($callable, $parameter, $id, $file)
return $callable;
}
- throw new InvalidArgumentException(sprintf('Parameter "%s" must contain an array with two elements for service "%s" in %s. Check your YAML syntax.', $parameter, $id, $file));
+ throw new InvalidArgumentException(sprintf('Parameter "%s" must contain an array with two elements for service "%s" in "%s". Check your YAML syntax.', $parameter, $id, $file));
}
- throw new InvalidArgumentException(sprintf('Parameter "%s" must be a string or an array for service "%s" in %s. Check your YAML syntax.', $parameter, $id, $file));
+ throw new InvalidArgumentException(sprintf('Parameter "%s" must be a string or an array for service "%s" in "%s". Check your YAML syntax.', $parameter, $id, $file));
}
/**
@@ -660,7 +660,7 @@ protected function loadFile($file)
try {
$configuration = $this->yamlParser->parseFile($file, Yaml::PARSE_CONSTANT | Yaml::PARSE_CUSTOM_TAGS);
} catch (ParseException $e) {
- throw new InvalidArgumentException(sprintf('The file "%s" does not contain valid YAML: %s', $file, $e->getMessage()), 0, $e);
+ throw new InvalidArgumentException(sprintf('The file "%s" does not contain valid YAML: ', $file).$e->getMessage(), 0, $e);
} finally {
restore_error_handler();
}
@@ -695,7 +695,7 @@ private function validate($content, $file)
if (!$this->container->hasExtension($namespace)) {
$extensionNamespaces = array_filter(array_map(function ($ext) { return $ext->getAlias(); }, $this->container->getExtensions()));
- throw new InvalidArgumentException(sprintf('There is no extension able to load the configuration for "%s" (in %s). Looked for namespace "%s", found %s', $namespace, $file, $namespace, $extensionNamespaces ? sprintf('"%s"', implode('", "', $extensionNamespaces)) : 'none'));
+ throw new InvalidArgumentException(sprintf('There is no extension able to load the configuration for "%s" (in "%s"). Looked for namespace "%s", found "%s".', $namespace, $file, $namespace, $extensionNamespaces ? sprintf('"%s"', implode('", "', $extensionNamespaces)) : 'none'));
}
}
diff --git a/vendor/symfony/dependency-injection/ParameterBag/EnvPlaceholderParameterBag.php b/vendor/symfony/dependency-injection/ParameterBag/EnvPlaceholderParameterBag.php
index e453a774e1..c4e369b010 100644
--- a/vendor/symfony/dependency-injection/ParameterBag/EnvPlaceholderParameterBag.php
+++ b/vendor/symfony/dependency-injection/ParameterBag/EnvPlaceholderParameterBag.php
@@ -36,7 +36,7 @@ public function get($name)
}
}
if (!preg_match('/^(?:\w++:)*+\w++$/', $env)) {
- throw new InvalidArgumentException(sprintf('Invalid %s name: only "word" characters are allowed.', $name));
+ throw new InvalidArgumentException(sprintf('Invalid "%s" name: only "word" characters are allowed.', $name));
}
if ($this->has($name)) {
@@ -116,7 +116,7 @@ public function resolve()
if (is_numeric($default = $this->parameters[$name])) {
$this->parameters[$name] = (string) $default;
} elseif (null !== $default && !is_scalar($default)) {
- throw new RuntimeException(sprintf('The default value of env parameter "%s" must be scalar or null, %s given.', $env, \gettype($default)));
+ throw new RuntimeException(sprintf('The default value of env parameter "%s" must be scalar or null, "%s" given.', $env, \gettype($default)));
}
}
}
diff --git a/vendor/symfony/dependency-injection/ParameterBag/ParameterBag.php b/vendor/symfony/dependency-injection/ParameterBag/ParameterBag.php
index e13d2824f5..539d56616d 100644
--- a/vendor/symfony/dependency-injection/ParameterBag/ParameterBag.php
+++ b/vendor/symfony/dependency-injection/ParameterBag/ParameterBag.php
@@ -234,7 +234,7 @@ public function resolveString($value, array $resolving = [])
$resolved = $this->get($key);
if (!\is_string($resolved) && !is_numeric($resolved)) {
- throw new RuntimeException(sprintf('A string value must be composed of strings and/or numbers, but found parameter "%s" of type %s inside string value "%s".', $key, \gettype($resolved), $value));
+ throw new RuntimeException(sprintf('A string value must be composed of strings and/or numbers, but found parameter "%s" of type "%s" inside string value "%s".', $key, \gettype($resolved), $value));
}
$resolved = (string) $resolved;
diff --git a/vendor/symfony/dependency-injection/README.md b/vendor/symfony/dependency-injection/README.md
index 932647f94a..cb2d4a11c5 100644
--- a/vendor/symfony/dependency-injection/README.md
+++ b/vendor/symfony/dependency-injection/README.md
@@ -7,7 +7,7 @@ way objects are constructed in your application.
Resources
---------
- * [Documentation](https://symfony.com/doc/current/components/dependency_injection/index.html)
+ * [Documentation](https://symfony.com/doc/current/components/dependency_injection.html)
* [Contributing](https://symfony.com/doc/current/contributing/index.html)
* [Report issues](https://github.com/symfony/symfony/issues) and
[send Pull Requests](https://github.com/symfony/symfony/pulls)
diff --git a/vendor/symfony/dependency-injection/Tests/Compiler/AutowirePassTest.php b/vendor/symfony/dependency-injection/Tests/Compiler/AutowirePassTest.php
index c5bcc660a5..e11154889c 100644
--- a/vendor/symfony/dependency-injection/Tests/Compiler/AutowirePassTest.php
+++ b/vendor/symfony/dependency-injection/Tests/Compiler/AutowirePassTest.php
@@ -23,6 +23,7 @@
use Symfony\Component\DependencyInjection\Reference;
use Symfony\Component\DependencyInjection\Tests\Fixtures\CaseSensitiveClass;
use Symfony\Component\DependencyInjection\Tests\Fixtures\includes\FooVariadic;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\includes\MultipleArgumentsOptionalScalarNotReallyOptional;
use Symfony\Component\DependencyInjection\TypedReference;
require_once __DIR__.'/../Fixtures/includes/autowiring_classes.php';
@@ -37,7 +38,7 @@ public function testProcess()
$container = new ContainerBuilder();
$container->register(Foo::class);
- $barDefinition = $container->register('bar', __NAMESPACE__.'\Bar');
+ $barDefinition = $container->register('bar', Bar::class);
$barDefinition->setAutowired(true);
(new ResolveClassPass())->process($container);
@@ -75,7 +76,7 @@ public function testProcessAutowireParent()
$container = new ContainerBuilder();
$container->register(B::class);
- $cDefinition = $container->register('c', __NAMESPACE__.'\C');
+ $cDefinition = $container->register('c', C::class);
$cDefinition->setAutowired(true);
(new ResolveClassPass())->process($container);
@@ -97,7 +98,7 @@ public function testProcessLegacyAutowireWithAvailableInterface()
$container->setAlias(AInterface::class, B::class);
$container->register(B::class);
- $cDefinition = $container->register('c', __NAMESPACE__.'\C');
+ $cDefinition = $container->register('c', C::class);
$cDefinition->setAutowired(true);
(new ResolveClassPass())->process($container);
@@ -118,7 +119,7 @@ public function testProcessAutowireInterface()
$container = new ContainerBuilder();
$container->register(F::class);
- $gDefinition = $container->register('g', __NAMESPACE__.'\G');
+ $gDefinition = $container->register('g', G::class);
$gDefinition->setAutowired(true);
(new ResolveClassPass())->process($container);
@@ -134,9 +135,9 @@ public function testCompleteExistingDefinition()
{
$container = new ContainerBuilder();
- $container->register('b', __NAMESPACE__.'\B');
+ $container->register('b', B::class);
$container->register(DInterface::class, F::class);
- $hDefinition = $container->register('h', __NAMESPACE__.'\H')->addArgument(new Reference('b'));
+ $hDefinition = $container->register('h', H::class)->addArgument(new Reference('b'));
$hDefinition->setAutowired(true);
(new ResolveClassPass())->process($container);
@@ -153,7 +154,7 @@ public function testCompleteExistingDefinitionWithNotDefinedArguments()
$container->register(B::class);
$container->register(DInterface::class, F::class);
- $hDefinition = $container->register('h', __NAMESPACE__.'\H')->addArgument('')->addArgument('');
+ $hDefinition = $container->register('h', H::class)->addArgument('')->addArgument('');
$hDefinition->setAutowired(true);
(new ResolveClassPass())->process($container);
@@ -171,10 +172,10 @@ public function testExceptionsAreStored()
{
$container = new ContainerBuilder();
- $container->register('c1', __NAMESPACE__.'\CollisionA');
- $container->register('c2', __NAMESPACE__.'\CollisionB');
- $container->register('c3', __NAMESPACE__.'\CollisionB');
- $aDefinition = $container->register('a', __NAMESPACE__.'\CannotBeAutowired');
+ $container->register('c1', CollisionA::class);
+ $container->register('c2', CollisionB::class);
+ $container->register('c3', CollisionB::class);
+ $aDefinition = $container->register('a', CannotBeAutowired::class);
$aDefinition->setAutowired(true);
$pass = new AutowirePass(false);
@@ -188,7 +189,7 @@ public function testPrivateConstructorThrowsAutowireException()
$this->expectExceptionMessage('Invalid service "private_service": constructor of class "Symfony\Component\DependencyInjection\Tests\Compiler\PrivateConstructor" must be public.');
$container = new ContainerBuilder();
- $container->autowire('private_service', __NAMESPACE__.'\PrivateConstructor');
+ $container->autowire('private_service', PrivateConstructor::class);
$pass = new AutowirePass(true);
$pass->process($container);
@@ -200,10 +201,10 @@ public function testTypeCollision()
$this->expectExceptionMessage('Cannot autowire service "a": argument "$collision" of method "Symfony\Component\DependencyInjection\Tests\Compiler\CannotBeAutowired::__construct()" references interface "Symfony\Component\DependencyInjection\Tests\Compiler\CollisionInterface" but no such service exists. You should maybe alias this interface to one of these existing services: "c1", "c2", "c3".');
$container = new ContainerBuilder();
- $container->register('c1', __NAMESPACE__.'\CollisionA');
- $container->register('c2', __NAMESPACE__.'\CollisionB');
- $container->register('c3', __NAMESPACE__.'\CollisionB');
- $aDefinition = $container->register('a', __NAMESPACE__.'\CannotBeAutowired');
+ $container->register('c1', CollisionA::class);
+ $container->register('c2', CollisionB::class);
+ $container->register('c3', CollisionB::class);
+ $aDefinition = $container->register('a', CannotBeAutowired::class);
$aDefinition->setAutowired(true);
$pass = new AutowirePass();
@@ -216,9 +217,9 @@ public function testTypeNotGuessable()
$this->expectExceptionMessage('Cannot autowire service "a": argument "$k" of method "Symfony\Component\DependencyInjection\Tests\Compiler\NotGuessableArgument::__construct()" references class "Symfony\Component\DependencyInjection\Tests\Compiler\Foo" but no such service exists. You should maybe alias this class to one of these existing services: "a1", "a2".');
$container = new ContainerBuilder();
- $container->register('a1', __NAMESPACE__.'\Foo');
- $container->register('a2', __NAMESPACE__.'\Foo');
- $aDefinition = $container->register('a', __NAMESPACE__.'\NotGuessableArgument');
+ $container->register('a1', Foo::class);
+ $container->register('a2', Foo::class);
+ $aDefinition = $container->register('a', NotGuessableArgument::class);
$aDefinition->setAutowired(true);
$pass = new AutowirePass();
@@ -231,9 +232,9 @@ public function testTypeNotGuessableWithSubclass()
$this->expectExceptionMessage('Cannot autowire service "a": argument "$k" of method "Symfony\Component\DependencyInjection\Tests\Compiler\NotGuessableArgumentForSubclass::__construct()" references class "Symfony\Component\DependencyInjection\Tests\Compiler\A" but no such service exists. You should maybe alias this class to one of these existing services: "a1", "a2".');
$container = new ContainerBuilder();
- $container->register('a1', __NAMESPACE__.'\B');
- $container->register('a2', __NAMESPACE__.'\B');
- $aDefinition = $container->register('a', __NAMESPACE__.'\NotGuessableArgumentForSubclass');
+ $container->register('a1', B::class);
+ $container->register('a2', B::class);
+ $aDefinition = $container->register('a', NotGuessableArgumentForSubclass::class);
$aDefinition->setAutowired(true);
$pass = new AutowirePass();
@@ -246,7 +247,7 @@ public function testTypeNotGuessableNoServicesFound()
$this->expectExceptionMessage('Cannot autowire service "a": argument "$collision" of method "Symfony\Component\DependencyInjection\Tests\Compiler\CannotBeAutowired::__construct()" references interface "Symfony\Component\DependencyInjection\Tests\Compiler\CollisionInterface" but no such service exists.');
$container = new ContainerBuilder();
- $aDefinition = $container->register('a', __NAMESPACE__.'\CannotBeAutowired');
+ $aDefinition = $container->register('a', CannotBeAutowired::class);
$aDefinition->setAutowired(true);
$pass = new AutowirePass();
@@ -257,10 +258,10 @@ public function testTypeNotGuessableWithTypeSet()
{
$container = new ContainerBuilder();
- $container->register('a1', __NAMESPACE__.'\Foo');
- $container->register('a2', __NAMESPACE__.'\Foo');
+ $container->register('a1', Foo::class);
+ $container->register('a2', Foo::class);
$container->register(Foo::class, Foo::class);
- $aDefinition = $container->register('a', __NAMESPACE__.'\NotGuessableArgument');
+ $aDefinition = $container->register('a', NotGuessableArgument::class);
$aDefinition->setAutowired(true);
$pass = new AutowirePass();
@@ -274,10 +275,10 @@ public function testWithTypeSet()
{
$container = new ContainerBuilder();
- $container->register('c1', __NAMESPACE__.'\CollisionA');
- $container->register('c2', __NAMESPACE__.'\CollisionB');
+ $container->register('c1', CollisionA::class);
+ $container->register('c2', CollisionB::class);
$container->setAlias(CollisionInterface::class, 'c2');
- $aDefinition = $container->register('a', __NAMESPACE__.'\CannotBeAutowired');
+ $aDefinition = $container->register('a', CannotBeAutowired::class);
$aDefinition->setAutowired(true);
$pass = new AutowirePass();
@@ -296,7 +297,7 @@ public function testCreateDefinition()
{
$container = new ContainerBuilder();
- $coopTilleulsDefinition = $container->register('coop_tilleuls', __NAMESPACE__.'\LesTilleuls');
+ $coopTilleulsDefinition = $container->register('coop_tilleuls', LesTilleuls::class);
$coopTilleulsDefinition->setAutowired(true);
$pass = new AutowirePass();
@@ -307,13 +308,13 @@ public function testCreateDefinition()
$this->assertEquals('autowired.Symfony\Component\DependencyInjection\Tests\Compiler\Dunglas', $container->getDefinition('coop_tilleuls')->getArgument(1));
$dunglasDefinition = $container->getDefinition('autowired.Symfony\Component\DependencyInjection\Tests\Compiler\Dunglas');
- $this->assertEquals(__NAMESPACE__.'\Dunglas', $dunglasDefinition->getClass());
+ $this->assertEquals(Dunglas::class, $dunglasDefinition->getClass());
$this->assertFalse($dunglasDefinition->isPublic());
$this->assertCount(1, $dunglasDefinition->getArguments());
$this->assertEquals('autowired.Symfony\Component\DependencyInjection\Tests\Compiler\Lille', $dunglasDefinition->getArgument(0));
$lilleDefinition = $container->getDefinition('autowired.Symfony\Component\DependencyInjection\Tests\Compiler\Lille');
- $this->assertEquals(__NAMESPACE__.'\Lille', $lilleDefinition->getClass());
+ $this->assertEquals(Lille::class, $lilleDefinition->getClass());
}
public function testResolveParameter()
@@ -337,7 +338,7 @@ public function testOptionalParameter()
$container->register(A::class);
$container->register(Foo::class);
- $optDefinition = $container->register('opt', __NAMESPACE__.'\OptionalParameter');
+ $optDefinition = $container->register('opt', OptionalParameter::class);
$optDefinition->setAutowired(true);
(new ResolveClassPass())->process($container);
@@ -354,7 +355,7 @@ public function testDontTriggerAutowiring()
$container = new ContainerBuilder();
$container->register(Foo::class);
- $container->register('bar', __NAMESPACE__.'\Bar');
+ $container->register('bar', Bar::class);
(new ResolveClassPass())->process($container);
(new AutowirePass())->process($container);
@@ -368,7 +369,7 @@ public function testClassNotFoundThrowsException()
$this->expectExceptionMessage('Cannot autowire service "a": argument "$r" of method "Symfony\Component\DependencyInjection\Tests\Compiler\BadTypeHintedArgument::__construct()" has type "Symfony\Component\DependencyInjection\Tests\Compiler\NotARealClass" but this class was not found.');
$container = new ContainerBuilder();
- $aDefinition = $container->register('a', __NAMESPACE__.'\BadTypeHintedArgument');
+ $aDefinition = $container->register('a', BadTypeHintedArgument::class);
$aDefinition->setAutowired(true);
$container->register(Dunglas::class, Dunglas::class);
@@ -384,7 +385,7 @@ public function testParentClassNotFoundThrowsException()
$container = new ContainerBuilder();
- $aDefinition = $container->register('a', __NAMESPACE__.'\BadParentTypeHintedArgument');
+ $aDefinition = $container->register('a', BadParentTypeHintedArgument::class);
$aDefinition->setAutowired(true);
$container->register(Dunglas::class, Dunglas::class);
@@ -404,8 +405,8 @@ public function testDontUseAbstractServices()
$container = new ContainerBuilder();
$container->register(Foo::class)->setAbstract(true);
- $container->register('foo', __NAMESPACE__.'\Foo');
- $container->register('bar', __NAMESPACE__.'\Bar')->setAutowired(true);
+ $container->register('foo', Foo::class);
+ $container->register('bar', Bar::class)->setAutowired(true);
(new ResolveClassPass())->process($container);
(new AutowirePass())->process($container);
@@ -418,7 +419,7 @@ public function testSomeSpecificArgumentsAreSet()
$container->register('foo', Foo::class);
$container->register(A::class);
$container->register(Dunglas::class);
- $container->register('multiple', __NAMESPACE__.'\MultipleArguments')
+ $container->register('multiple', MultipleArguments::class)
->setAutowired(true)
// set the 2nd (index 1) argument only: autowire the first and third
// args are: A, Foo, Dunglas
@@ -450,7 +451,7 @@ public function testScalarArgsCannotBeAutowired()
$container->register(A::class);
$container->register(Dunglas::class);
- $container->register('arg_no_type_hint', __NAMESPACE__.'\MultipleArguments')
+ $container->register('arg_no_type_hint', MultipleArguments::class)
->setArguments([1 => 'foo'])
->setAutowired(true);
@@ -466,20 +467,23 @@ public function testNoTypeArgsCannotBeAutowired()
$container->register(A::class);
$container->register(Dunglas::class);
- $container->register('arg_no_type_hint', __NAMESPACE__.'\MultipleArguments')
+ $container->register('arg_no_type_hint', MultipleArguments::class)
->setAutowired(true);
(new ResolveClassPass())->process($container);
(new AutowirePass())->process($container);
}
+ /**
+ * @requires PHP < 8
+ */
public function testOptionalScalarNotReallyOptionalUsesDefaultValue()
{
$container = new ContainerBuilder();
$container->register(A::class);
$container->register(Lille::class);
- $definition = $container->register('not_really_optional_scalar', __NAMESPACE__.'\MultipleArgumentsOptionalScalarNotReallyOptional')
+ $definition = $container->register('not_really_optional_scalar', MultipleArgumentsOptionalScalarNotReallyOptional::class)
->setAutowired(true);
(new ResolveClassPass())->process($container);
@@ -494,7 +498,7 @@ public function testOptionalScalarArgsDontMessUpOrder()
$container->register(A::class);
$container->register(Lille::class);
- $container->register('with_optional_scalar', __NAMESPACE__.'\MultipleArgumentsOptionalScalar')
+ $container->register('with_optional_scalar', MultipleArgumentsOptionalScalar::class)
->setAutowired(true);
(new ResolveClassPass())->process($container);
@@ -518,7 +522,7 @@ public function testOptionalScalarArgsNotPassedIfLast()
$container->register(A::class);
$container->register(Lille::class);
- $container->register('with_optional_scalar_last', __NAMESPACE__.'\MultipleArgumentsOptionalScalarLast')
+ $container->register('with_optional_scalar_last', MultipleArgumentsOptionalScalarLast::class)
->setAutowired(true);
(new ResolveClassPass())->process($container);
@@ -659,7 +663,7 @@ public function testTypedReference()
public function testCreateResourceForClass($className, $isEqual)
{
$startingResource = AutowirePass::createResourceForClass(
- new \ReflectionClass(__NAMESPACE__.'\ClassForResource')
+ new \ReflectionClass(ClassForResource::class)
);
$newResource = AutowirePass::createResourceForClass(
new \ReflectionClass(__NAMESPACE__.'\\'.$className)
@@ -690,9 +694,9 @@ public function testIgnoreServiceWithClassNotExisting()
{
$container = new ContainerBuilder();
- $container->register('class_not_exist', __NAMESPACE__.'\OptionalServiceClass');
+ $container->register('class_not_exist', OptionalServiceClass::class);
- $barDefinition = $container->register('bar', __NAMESPACE__.'\Bar');
+ $barDefinition = $container->register('bar', Bar::class);
$barDefinition->setAutowired(true);
$container->register(Foo::class, Foo::class);
@@ -750,8 +754,8 @@ public function testProcessDoesNotTriggerDeprecations()
{
$container = new ContainerBuilder();
$container->register('deprecated', 'Symfony\Component\DependencyInjection\Tests\Fixtures\DeprecatedClass')->setDeprecated(true);
- $container->register('foo', __NAMESPACE__.'\Foo');
- $container->register('bar', __NAMESPACE__.'\Bar')->setAutowired(true);
+ $container->register('foo', Foo::class);
+ $container->register('bar', Bar::class)->setAutowired(true);
$pass = new AutowirePass();
$pass->process($container);
@@ -767,7 +771,7 @@ public function testEmptyStringIsKept()
$container->register(A::class);
$container->register(Lille::class);
- $container->register('foo', __NAMESPACE__.'\MultipleArgumentsOptionalScalar')
+ $container->register('foo', MultipleArgumentsOptionalScalar::class)
->setAutowired(true)
->setArguments(['', '']);
diff --git a/vendor/symfony/dependency-injection/Tests/Compiler/ResolveBindingsPassTest.php b/vendor/symfony/dependency-injection/Tests/Compiler/ResolveBindingsPassTest.php
index fd526caa94..bfd3d67238 100644
--- a/vendor/symfony/dependency-injection/Tests/Compiler/ResolveBindingsPassTest.php
+++ b/vendor/symfony/dependency-injection/Tests/Compiler/ResolveBindingsPassTest.php
@@ -18,7 +18,6 @@
use Symfony\Component\DependencyInjection\Compiler\ResolveBindingsPass;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Definition;
-use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
use Symfony\Component\DependencyInjection\Reference;
use Symfony\Component\DependencyInjection\Tests\Fixtures\CaseSensitiveClass;
use Symfony\Component\DependencyInjection\Tests\Fixtures\NamedArgumentsDummy;
diff --git a/vendor/symfony/dependency-injection/Tests/Compiler/ResolveParameterPlaceHoldersPassTest.php b/vendor/symfony/dependency-injection/Tests/Compiler/ResolveParameterPlaceHoldersPassTest.php
index 5aa6471751..0639961439 100644
--- a/vendor/symfony/dependency-injection/Tests/Compiler/ResolveParameterPlaceHoldersPassTest.php
+++ b/vendor/symfony/dependency-injection/Tests/Compiler/ResolveParameterPlaceHoldersPassTest.php
@@ -14,6 +14,7 @@
use PHPUnit\Framework\TestCase;
use Symfony\Component\DependencyInjection\Compiler\ResolveParameterPlaceHoldersPass;
use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Exception\ParameterNotFoundException;
class ResolveParameterPlaceHoldersPassTest extends TestCase
{
@@ -71,6 +72,31 @@ public function testBindingsShouldBeResolved()
$this->assertSame($this->container->getParameterBag()->resolveValue('%env(BAZ)%'), $boundValue);
}
+ public function testParameterNotFoundExceptionsIsThrown()
+ {
+ $this->expectException(ParameterNotFoundException::class);
+ $this->expectExceptionMessage('The service "baz_service_id" has a dependency on a non-existent parameter "non_existent_param".');
+
+ $containerBuilder = new ContainerBuilder();
+ $definition = $containerBuilder->register('baz_service_id');
+ $definition->setArgument(0, '%non_existent_param%');
+
+ $pass = new ResolveParameterPlaceHoldersPass();
+ $pass->process($containerBuilder);
+ }
+
+ public function testParameterNotFoundExceptionsIsNotThrown()
+ {
+ $containerBuilder = new ContainerBuilder();
+ $definition = $containerBuilder->register('baz_service_id');
+ $definition->setArgument(0, '%non_existent_param%');
+
+ $pass = new ResolveParameterPlaceHoldersPass(true, false);
+ $pass->process($containerBuilder);
+
+ $this->assertCount(1, $definition->getErrors());
+ }
+
private function createContainerBuilder()
{
$containerBuilder = new ContainerBuilder();
diff --git a/vendor/symfony/dependency-injection/Tests/Config/AutowireServiceResourceTest.php b/vendor/symfony/dependency-injection/Tests/Config/AutowireServiceResourceTest.php
index 153e0807ef..990a9ad663 100644
--- a/vendor/symfony/dependency-injection/Tests/Config/AutowireServiceResourceTest.php
+++ b/vendor/symfony/dependency-injection/Tests/Config/AutowireServiceResourceTest.php
@@ -34,7 +34,7 @@ protected function setUp()
$this->time = time();
touch($this->file, $this->time);
- $this->class = __NAMESPACE__.'\Foo';
+ $this->class = Foo::class;
$this->resource = new AutowireServiceResource(
$this->class,
$this->file,
@@ -83,7 +83,7 @@ public function testIsNotFreshChangedResource()
public function testIsFreshSameConstructorArgs()
{
$oldResource = AutowirePass::createResourceForClass(
- new \ReflectionClass(__NAMESPACE__.'\Foo')
+ new \ReflectionClass(Foo::class)
);
// test with a stale file *but* the resource will not be changed
diff --git a/vendor/symfony/dependency-injection/Tests/ContainerBuilderTest.php b/vendor/symfony/dependency-injection/Tests/ContainerBuilderTest.php
index f2666ef962..4ccab66339 100644
--- a/vendor/symfony/dependency-injection/Tests/ContainerBuilderTest.php
+++ b/vendor/symfony/dependency-injection/Tests/ContainerBuilderTest.php
@@ -719,7 +719,7 @@ public function testCompileWithArrayAndAnotherResolveEnv()
public function testCompileWithArrayInStringResolveEnv()
{
$this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
- $this->expectExceptionMessage('A string value must be composed of strings and/or numbers, but found parameter "env(json:ARRAY)" of type array inside string value "ABC %env(json:ARRAY)%".');
+ $this->expectExceptionMessage('A string value must be composed of strings and/or numbers, but found parameter "env(json:ARRAY)" of type "array" inside string value "ABC %env(json:ARRAY)%".');
putenv('ARRAY={"foo":"bar"}');
$container = new ContainerBuilder();
@@ -1090,7 +1090,7 @@ public function testThrowsExceptionWhenSetServiceOnACompiledContainer()
$container->set('a', new \stdClass());
}
- public function testThrowsExceptionWhenAddServiceOnACompiledContainer()
+ public function testNoExceptionWhenAddServiceOnACompiledContainer()
{
$container = new ContainerBuilder();
$container->compile();
@@ -1238,7 +1238,7 @@ public function testAutowiring()
$container = new ContainerBuilder();
$container->register(A::class)->setPublic(true);
- $bDefinition = $container->register('b', __NAMESPACE__.'\B');
+ $bDefinition = $container->register('b', B::class);
$bDefinition->setAutowired(true);
$bDefinition->setPublic(true);
diff --git a/vendor/symfony/dependency-injection/Tests/Fixtures/config/basic.expected.yml b/vendor/symfony/dependency-injection/Tests/Fixtures/config/basic.expected.yml
index 1137961ade..39a3b631b9 100644
--- a/vendor/symfony/dependency-injection/Tests/Fixtures/config/basic.expected.yml
+++ b/vendor/symfony/dependency-injection/Tests/Fixtures/config/basic.expected.yml
@@ -6,5 +6,4 @@ services:
synthetic: true
App\BarService:
class: App\BarService
- public: true
arguments: [!service { class: FooClass }]
diff --git a/vendor/symfony/dependency-injection/Tests/Fixtures/config/child.expected.yml b/vendor/symfony/dependency-injection/Tests/Fixtures/config/child.expected.yml
index aaab7131c4..f60d6bb5b7 100644
--- a/vendor/symfony/dependency-injection/Tests/Fixtures/config/child.expected.yml
+++ b/vendor/symfony/dependency-injection/Tests/Fixtures/config/child.expected.yml
@@ -6,10 +6,7 @@ services:
synthetic: true
foo:
class: Class2
- public: true
file: file.php
lazy: true
arguments: [!service { class: Class1, public: false }]
- bar:
- alias: foo
- public: true
+ bar: '@foo'
diff --git a/vendor/symfony/dependency-injection/Tests/Fixtures/config/defaults.expected.yml b/vendor/symfony/dependency-injection/Tests/Fixtures/config/defaults.expected.yml
index a534f7267a..3f01b1099f 100644
--- a/vendor/symfony/dependency-injection/Tests/Fixtures/config/defaults.expected.yml
+++ b/vendor/symfony/dependency-injection/Tests/Fixtures/config/defaults.expected.yml
@@ -6,7 +6,6 @@ services:
synthetic: true
App\BarService:
class: App\BarService
- public: true
arguments: [!service { class: FooClass }]
Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Foo:
class: Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Foo
diff --git a/vendor/symfony/dependency-injection/Tests/Fixtures/config/instanceof.expected.yml b/vendor/symfony/dependency-injection/Tests/Fixtures/config/instanceof.expected.yml
index b12a304221..1238a7bda4 100644
--- a/vendor/symfony/dependency-injection/Tests/Fixtures/config/instanceof.expected.yml
+++ b/vendor/symfony/dependency-injection/Tests/Fixtures/config/instanceof.expected.yml
@@ -6,7 +6,6 @@ services:
synthetic: true
Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Foo:
class: Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Foo
- public: true
tags:
- { name: tag, k: v }
lazy: true
@@ -18,4 +17,3 @@ services:
configurator: c
foo:
class: App\FooService
- public: true
diff --git a/vendor/symfony/dependency-injection/Tests/Fixtures/config/php7.expected.yml b/vendor/symfony/dependency-injection/Tests/Fixtures/config/php7.expected.yml
index 7c5b714ffb..7cec320b2e 100644
--- a/vendor/symfony/dependency-injection/Tests/Fixtures/config/php7.expected.yml
+++ b/vendor/symfony/dependency-injection/Tests/Fixtures/config/php7.expected.yml
@@ -13,7 +13,6 @@ services:
arguments: ['@bar']
bar:
class: Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Foo
- public: true
calls:
- [setFoo, { }]
diff --git a/vendor/symfony/dependency-injection/Tests/Fixtures/config/prototype.expected.yml b/vendor/symfony/dependency-injection/Tests/Fixtures/config/prototype.expected.yml
index ebfe087d77..24a7940153 100644
--- a/vendor/symfony/dependency-injection/Tests/Fixtures/config/prototype.expected.yml
+++ b/vendor/symfony/dependency-injection/Tests/Fixtures/config/prototype.expected.yml
@@ -6,7 +6,6 @@ services:
synthetic: true
Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Foo:
class: Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Foo
- public: true
tags:
- { name: foo }
- { name: baz }
@@ -15,7 +14,6 @@ services:
factory: f
Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Sub\Bar:
class: Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Sub\Bar
- public: true
tags:
- { name: foo }
- { name: baz }
diff --git a/vendor/symfony/dependency-injection/Tests/Fixtures/config/services9.php b/vendor/symfony/dependency-injection/Tests/Fixtures/config/services9.php
index d9373a2a6f..ef39093768 100644
--- a/vendor/symfony/dependency-injection/Tests/Fixtures/config/services9.php
+++ b/vendor/symfony/dependency-injection/Tests/Fixtures/config/services9.php
@@ -14,7 +14,7 @@
$p->set('foo_class', FooClass::class)
->set('foo', 'bar');
- $s = $c->services();
+ $s = $c->services()->defaults()->public();
$s->set('foo')
->args(['foo', ref('foo.baz'), ['%foo%' => 'foo is %foo%', 'foobar' => '%foo%'], true, ref('service_container')])
->class(FooClass::class)
@@ -120,7 +120,6 @@
->tag('foo');
$s->set('tagged_iterator', 'Bar')
- ->public()
->args([tagged('foo')]);
$s->alias('alias_for_foo', 'foo')->private()->public();
diff --git a/vendor/symfony/dependency-injection/Tests/Fixtures/containers/container8.php b/vendor/symfony/dependency-injection/Tests/Fixtures/containers/container8.php
index 5b3c01c23c..edcd045eaa 100644
--- a/vendor/symfony/dependency-injection/Tests/Fixtures/containers/container8.php
+++ b/vendor/symfony/dependency-injection/Tests/Fixtures/containers/container8.php
@@ -9,6 +9,17 @@
'bar' => 'foo is %%foo bar',
'escape' => '@escapeme',
'values' => [true, false, null, 0, 1000.3, 'true', 'false', 'null'],
+ 'null string' => 'null',
+ 'string of digits' => '123',
+ 'string of digits prefixed with minus character' => '-123',
+ 'true string' => 'true',
+ 'false string' => 'false',
+ 'binary number string' => '0b0110',
+ 'numeric string' => '-1.2E2',
+ 'hexadecimal number string' => '0xFF',
+ 'float string' => '10100.1',
+ 'positive float string' => '+10100.1',
+ 'negative float string' => '-10100.1',
]));
return $container;
diff --git a/vendor/symfony/dependency-injection/Tests/Fixtures/includes/MultipleArgumentsOptionalScalarNotReallyOptional.php b/vendor/symfony/dependency-injection/Tests/Fixtures/includes/MultipleArgumentsOptionalScalarNotReallyOptional.php
new file mode 100644
index 0000000000..dcaaacc1f4
--- /dev/null
+++ b/vendor/symfony/dependency-injection/Tests/Fixtures/includes/MultipleArgumentsOptionalScalarNotReallyOptional.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures\includes;
+
+use Symfony\Component\DependencyInjection\Tests\Compiler\A;
+use Symfony\Component\DependencyInjection\Tests\Compiler\Lille;
+
+class MultipleArgumentsOptionalScalarNotReallyOptional
+{
+ public function __construct(A $a, $foo = 'default_val', Lille $lille)
+ {
+ }
+}
+
diff --git a/vendor/symfony/dependency-injection/Tests/Fixtures/includes/autowiring_classes.php b/vendor/symfony/dependency-injection/Tests/Fixtures/includes/autowiring_classes.php
index 5cf151ef84..8db7edf1a1 100644
--- a/vendor/symfony/dependency-injection/Tests/Fixtures/includes/autowiring_classes.php
+++ b/vendor/symfony/dependency-injection/Tests/Fixtures/includes/autowiring_classes.php
@@ -184,12 +184,6 @@ public function __construct(A $a, Lille $lille, $foo = 'some_val')
{
}
}
-class MultipleArgumentsOptionalScalarNotReallyOptional
-{
- public function __construct(A $a, $foo = 'default_val', Lille $lille)
- {
- }
-}
/*
* Classes used for testing createResourceForClass
diff --git a/vendor/symfony/dependency-injection/Tests/Fixtures/php/services8.php b/vendor/symfony/dependency-injection/Tests/Fixtures/php/services8.php
index ce4815ef81..e7a0214a10 100644
--- a/vendor/symfony/dependency-injection/Tests/Fixtures/php/services8.php
+++ b/vendor/symfony/dependency-injection/Tests/Fixtures/php/services8.php
@@ -151,6 +151,17 @@ protected function getDefaultParameters()
6 => 'false',
7 => 'null',
],
+ 'null string' => 'null',
+ 'string of digits' => '123',
+ 'string of digits prefixed with minus character' => '-123',
+ 'true string' => 'true',
+ 'false string' => 'false',
+ 'binary number string' => '0b0110',
+ 'numeric string' => '-1.2E2',
+ 'hexadecimal number string' => '0xFF',
+ 'float string' => '10100.1',
+ 'positive float string' => '+10100.1',
+ 'negative float string' => '-10100.1',
];
}
}
diff --git a/vendor/symfony/dependency-injection/Tests/Fixtures/xml/services8.xml b/vendor/symfony/dependency-injection/Tests/Fixtures/xml/services8.xml
index d0f9015c5a..4b07bbb7da 100644
--- a/vendor/symfony/dependency-injection/Tests/Fixtures/xml/services8.xml
+++ b/vendor/symfony/dependency-injection/Tests/Fixtures/xml/services8.xml
@@ -18,6 +18,17 @@
<parameter type="string">false</parameter>
<parameter type="string">null</parameter>
</parameter>
+ <parameter key="null string" type="string">null</parameter>
+ <parameter key="string of digits" type="string">123</parameter>
+ <parameter key="string of digits prefixed with minus character" type="string">-123</parameter>
+ <parameter key="true string" type="string">true</parameter>
+ <parameter key="false string" type="string">false</parameter>
+ <parameter key="binary number string" type="string">0b0110</parameter>
+ <parameter key="numeric string" type="string">-1.2E2</parameter>
+ <parameter key="hexadecimal number string" type="string">0xFF</parameter>
+ <parameter key="float string" type="string">10100.1</parameter>
+ <parameter key="positive float string" type="string">+10100.1</parameter>
+ <parameter key="negative float string" type="string">-10100.1</parameter>
</parameters>
<services>
<service id="service_container" class="Symfony\Component\DependencyInjection\ContainerInterface" public="true" synthetic="true"/>
diff --git a/vendor/symfony/dependency-injection/Tests/Fixtures/yaml/services8.yml b/vendor/symfony/dependency-injection/Tests/Fixtures/yaml/services8.yml
index 4e37bc9315..002b1d4bcd 100644
--- a/vendor/symfony/dependency-injection/Tests/Fixtures/yaml/services8.yml
+++ b/vendor/symfony/dependency-injection/Tests/Fixtures/yaml/services8.yml
@@ -4,6 +4,17 @@ parameters:
bar: 'foo is %%foo bar'
escape: '@@escapeme'
values: [true, false, null, 0, 1000.3, 'true', 'false', 'null']
+ null string: 'null'
+ string of digits: '123'
+ string of digits prefixed with minus character: '-123'
+ true string: 'true'
+ false string: 'false'
+ binary number string: '0b0110'
+ numeric string: '-1.2E2'
+ hexadecimal number string: '0xFF'
+ float string: '10100.1'
+ positive float string: '+10100.1'
+ negative float string: '-10100.1'
services:
service_container:
diff --git a/vendor/symfony/dependency-injection/Tests/Loader/FileLoaderTest.php b/vendor/symfony/dependency-injection/Tests/Loader/FileLoaderTest.php
index ffe58a67ef..9fe075d8f1 100644
--- a/vendor/symfony/dependency-injection/Tests/Loader/FileLoaderTest.php
+++ b/vendor/symfony/dependency-injection/Tests/Loader/FileLoaderTest.php
@@ -134,6 +134,13 @@ public function testRegisterClassesWithExclude()
],
array_keys($container->getAliases())
);
+
+ $loader->registerClasses(
+ new Definition(),
+ 'Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\\',
+ 'Prototype/*',
+ 'Prototype/NotExistingDir'
+ );
}
public function testNestedRegisterClasses()
@@ -212,7 +219,7 @@ public function testRegisterClassesWithIncompatibleExclude($resourcePattern, $ex
);
} catch (InvalidArgumentException $e) {
$this->assertEquals(
- sprintf('Invalid "exclude" pattern when importing classes for "Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\": make sure your "exclude" pattern (%s) is a subset of the "resource" pattern (%s)', $excludePattern, $resourcePattern),
+ sprintf('Invalid "exclude" pattern when importing classes for "Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\": make sure your "exclude" pattern (%s) is a subset of the "resource" pattern (%s).', $excludePattern, $resourcePattern),
$e->getMessage()
);
}
diff --git a/vendor/symfony/dependency-injection/Tests/Loader/YamlFileLoaderTest.php b/vendor/symfony/dependency-injection/Tests/Loader/YamlFileLoaderTest.php
index 1d187848b3..3059dd4d6c 100644
--- a/vendor/symfony/dependency-injection/Tests/Loader/YamlFileLoaderTest.php
+++ b/vendor/symfony/dependency-injection/Tests/Loader/YamlFileLoaderTest.php
@@ -349,6 +349,9 @@ public function testParsesIteratorArgument()
$lazyDefinition = $container->getDefinition('lazy_context');
$this->assertEquals([new IteratorArgument(['k1' => new Reference('foo.baz'), 'k2' => new Reference('service_container')]), new IteratorArgument([])], $lazyDefinition->getArguments(), '->load() parses lazy arguments');
+
+ $message = 'The "deprecated_service" service is deprecated. You should stop using it, as it will soon be removed.';
+ $this->assertSame($message, $container->getDefinition('deprecated_service')->getDeprecationMessage('deprecated_service'));
}
public function testAutowire()
@@ -533,7 +536,7 @@ public function testDecoratedServicesWithWrongSyntaxThrowsException()
public function testInvalidTagsWithDefaults()
{
$this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
- $this->expectExceptionMessageRegExp('/Parameter "tags" must be an array for service "Foo\\\Bar" in .+services31_invalid_tags\.yml\. Check your YAML syntax./');
+ $this->expectExceptionMessageRegExp('/Parameter "tags" must be an array for service "Foo\\\Bar" in ".+services31_invalid_tags\.yml"\. Check your YAML syntax./');
$loader = new YamlFileLoader(new ContainerBuilder(), new FileLocator(self::$fixturesPath.'/yaml'));
$loader->load('services31_invalid_tags.yml');
}
@@ -717,4 +720,17 @@ public function testOverriddenDefaultsBindings()
$this->assertSame('overridden', $container->get('bar')->quz);
}
+
+ /**
+ * @group legacy
+ * @expectedDeprecation The configuration key "factory" is unsupported for the service "foo" which is defined as an alias in %s.
+ * @expectedDeprecation The configuration key "parent" is unsupported for the service "foo" which is defined as an alias in %s.
+ */
+ public function testAliasDefinitionContainsUnsupportedElements()
+ {
+ $container = new ContainerBuilder();
+ $loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));
+ $loader->load('legacy_invalid_alias_definition.yml');
+ $this->assertTrue($container->has('foo'));
+ }
}
diff --git a/vendor/symfony/dependency-injection/Tests/ParameterBag/EnvPlaceholderParameterBagTest.php b/vendor/symfony/dependency-injection/Tests/ParameterBag/EnvPlaceholderParameterBagTest.php
index 4fcb2c8405..273072f941 100644
--- a/vendor/symfony/dependency-injection/Tests/ParameterBag/EnvPlaceholderParameterBagTest.php
+++ b/vendor/symfony/dependency-injection/Tests/ParameterBag/EnvPlaceholderParameterBagTest.php
@@ -130,7 +130,7 @@ public function testResolveEnvAllowsNull()
public function testResolveThrowsOnBadDefaultValue()
{
$this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
- $this->expectExceptionMessage('The default value of env parameter "ARRAY_VAR" must be scalar or null, array given.');
+ $this->expectExceptionMessage('The default value of env parameter "ARRAY_VAR" must be scalar or null, "array" given.');
$bag = new EnvPlaceholderParameterBag();
$bag->get('env(ARRAY_VAR)');
$bag->set('env(ARRAY_VAR)', []);
diff --git a/vendor/symfony/dependency-injection/Tests/ParameterBag/ParameterBagTest.php b/vendor/symfony/dependency-injection/Tests/ParameterBag/ParameterBagTest.php
index 0a75b445b9..9b39458c9d 100644
--- a/vendor/symfony/dependency-injection/Tests/ParameterBag/ParameterBagTest.php
+++ b/vendor/symfony/dependency-injection/Tests/ParameterBag/ParameterBagTest.php
@@ -170,7 +170,7 @@ public function testResolveValue()
$bag->resolveValue('%foo%');
$this->fail('->resolveValue() throws a RuntimeException when a parameter embeds another non-string parameter');
} catch (RuntimeException $e) {
- $this->assertEquals('A string value must be composed of strings and/or numbers, but found parameter "bar" of type array inside string value "a %bar%".', $e->getMessage(), '->resolveValue() throws a RuntimeException when a parameter embeds another non-string parameter');
+ $this->assertEquals('A string value must be composed of strings and/or numbers, but found parameter "bar" of type "array" inside string value "a %bar%".', $e->getMessage(), '->resolveValue() throws a RuntimeException when a parameter embeds another non-string parameter');
}
$bag = new ParameterBag(['foo' => '%bar%', 'bar' => '%foobar%', 'foobar' => '%foo%']);
diff --git a/vendor/symfony/event-dispatcher/ContainerAwareEventDispatcher.php b/vendor/symfony/event-dispatcher/ContainerAwareEventDispatcher.php
index 1b33e1cab3..8f53a9d06a 100644
--- a/vendor/symfony/event-dispatcher/ContainerAwareEventDispatcher.php
+++ b/vendor/symfony/event-dispatcher/ContainerAwareEventDispatcher.php
@@ -42,7 +42,7 @@ public function __construct(ContainerInterface $container)
{
$this->container = $container;
- $class = \get_class($this);
+ $class = static::class;
if ($this instanceof \PHPUnit_Framework_MockObject_MockObject || $this instanceof MockObject || $this instanceof \Prophecy\Doubler\DoubleInterface) {
$class = get_parent_class($class);
}
@@ -68,7 +68,7 @@ public function addListenerService($eventName, $callback, $priority = 0)
@trigger_error(sprintf('The %s class is deprecated since Symfony 3.3 and will be removed in 4.0. Use EventDispatcher with closure factories instead.', __CLASS__), E_USER_DEPRECATED);
if (!\is_array($callback) || 2 !== \count($callback)) {
- throw new \InvalidArgumentException('Expected an ["service", "method"] argument');
+ throw new \InvalidArgumentException('Expected an ["service", "method"] argument.');
}
$this->listenerIds[$eventName][] = [$callback[0], $callback[1], $priority];
diff --git a/vendor/symfony/event-dispatcher/EventSubscriberInterface.php b/vendor/symfony/event-dispatcher/EventSubscriberInterface.php
index 824f21599c..741590b1bf 100644
--- a/vendor/symfony/event-dispatcher/EventSubscriberInterface.php
+++ b/vendor/symfony/event-dispatcher/EventSubscriberInterface.php
@@ -40,6 +40,9 @@ interface EventSubscriberInterface
* * ['eventName' => ['methodName', $priority]]
* * ['eventName' => [['methodName1', $priority], ['methodName2']]]
*
+ * The code must not depend on runtime state as it will only be called at compile time.
+ * All logic depending on runtime state must be put into the individual methods handling the events.
+ *
* @return array The event names to listen to
*/
public static function getSubscribedEvents();
diff --git a/vendor/symfony/event-dispatcher/LICENSE b/vendor/symfony/event-dispatcher/LICENSE
index a677f43763..9e936ec044 100644
--- a/vendor/symfony/event-dispatcher/LICENSE
+++ b/vendor/symfony/event-dispatcher/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2019 Fabien Potencier
+Copyright (c) 2004-2020 Fabien Potencier
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/vendor/symfony/event-dispatcher/README.md b/vendor/symfony/event-dispatcher/README.md
index 185c3fecf8..e0d38eed01 100644
--- a/vendor/symfony/event-dispatcher/README.md
+++ b/vendor/symfony/event-dispatcher/README.md
@@ -8,7 +8,7 @@ them.
Resources
---------
- * [Documentation](https://symfony.com/doc/current/components/event_dispatcher/index.html)
+ * [Documentation](https://symfony.com/doc/current/components/event_dispatcher.html)
* [Contributing](https://symfony.com/doc/current/contributing/index.html)
* [Report issues](https://github.com/symfony/symfony/issues) and
[send Pull Requests](https://github.com/symfony/symfony/pulls)
diff --git a/vendor/symfony/http-foundation/BinaryFileResponse.php b/vendor/symfony/http-foundation/BinaryFileResponse.php
index f43114111b..c2f66d6952 100644
--- a/vendor/symfony/http-foundation/BinaryFileResponse.php
+++ b/vendor/symfony/http-foundation/BinaryFileResponse.php
@@ -217,7 +217,7 @@ public function prepare(Request $request)
}
if ('x-accel-redirect' === strtolower($type)) {
// Do X-Accel-Mapping substitutions.
- // @link http://wiki.nginx.org/X-accel#X-Accel-Redirect
+ // @link https://www.nginx.com/resources/wiki/start/topics/examples/x-accel/#x-accel-redirect
foreach (explode(',', $request->headers->get('X-Accel-Mapping', '')) as $mapping) {
$mapping = explode('=', $mapping, 2);
@@ -348,7 +348,7 @@ public static function trustXSendfileTypeHeader()
}
/**
- * If this is set to true, the file will be unlinked after the request is send
+ * If this is set to true, the file will be unlinked after the request is sent
* Note: If the X-Sendfile header is used, the deleteFileAfterSend setting will not be used.
*
* @param bool $shouldDelete
diff --git a/vendor/symfony/http-foundation/File/File.php b/vendor/symfony/http-foundation/File/File.php
index 34220588a4..309339e5cf 100644
--- a/vendor/symfony/http-foundation/File/File.php
+++ b/vendor/symfony/http-foundation/File/File.php
@@ -97,7 +97,7 @@ public function move($directory, $name = null)
$renamed = rename($this->getPathname(), $target);
restore_error_handler();
if (!$renamed) {
- throw new FileException(sprintf('Could not move the file "%s" to "%s" (%s)', $this->getPathname(), $target, strip_tags($error)));
+ throw new FileException(sprintf('Could not move the file "%s" to "%s" (%s).', $this->getPathname(), $target, strip_tags($error)));
}
@chmod($target, 0666 & ~umask());
@@ -109,10 +109,10 @@ protected function getTargetFile($directory, $name = null)
{
if (!is_dir($directory)) {
if (false === @mkdir($directory, 0777, true) && !is_dir($directory)) {
- throw new FileException(sprintf('Unable to create the "%s" directory', $directory));
+ throw new FileException(sprintf('Unable to create the "%s" directory.', $directory));
}
} elseif (!is_writable($directory)) {
- throw new FileException(sprintf('Unable to write in the "%s" directory', $directory));
+ throw new FileException(sprintf('Unable to write in the "%s" directory.', $directory));
}
$target = rtrim($directory, '/\\').\DIRECTORY_SEPARATOR.(null === $name ? $this->getBasename() : $this->getName($name));
diff --git a/vendor/symfony/http-foundation/File/MimeType/MimeTypeGuesser.php b/vendor/symfony/http-foundation/File/MimeType/MimeTypeGuesser.php
index e05269fc80..8d971ed677 100644
--- a/vendor/symfony/http-foundation/File/MimeType/MimeTypeGuesser.php
+++ b/vendor/symfony/http-foundation/File/MimeType/MimeTypeGuesser.php
@@ -127,7 +127,7 @@ public function guess($path)
}
if (2 === \count($this->guessers) && !FileBinaryMimeTypeGuesser::isSupported() && !FileinfoMimeTypeGuesser::isSupported()) {
- throw new \LogicException('Unable to guess the mime type as no guessers are available (Did you enable the php_fileinfo extension?)');
+ throw new \LogicException('Unable to guess the mime type as no guessers are available (Did you enable the php_fileinfo extension?).');
}
return null;
diff --git a/vendor/symfony/http-foundation/File/UploadedFile.php b/vendor/symfony/http-foundation/File/UploadedFile.php
index 86153ed49c..5206156032 100644
--- a/vendor/symfony/http-foundation/File/UploadedFile.php
+++ b/vendor/symfony/http-foundation/File/UploadedFile.php
@@ -24,7 +24,7 @@
*/
class UploadedFile extends File
{
- private $test = false;
+ private $test;
private $originalName;
private $mimeType;
private $size;
@@ -72,7 +72,7 @@ public function __construct($path, $originalName, $mimeType = null, $size = null
* It is extracted from the request from which the file has been uploaded.
* Then it should not be considered as a safe value.
*
- * @return string|null The original name
+ * @return string The original name
*/
public function getClientOriginalName()
{
@@ -101,7 +101,7 @@ public function getClientOriginalExtension()
* For a trusted mime type, use getMimeType() instead (which guesses the mime
* type based on the file content).
*
- * @return string|null The mime type
+ * @return string The mime type
*
* @see getMimeType()
*/
@@ -196,7 +196,7 @@ public function move($directory, $name = null)
$moved = move_uploaded_file($this->getPathname(), $target);
restore_error_handler();
if (!$moved) {
- throw new FileException(sprintf('Could not move the file "%s" to "%s" (%s)', $this->getPathname(), $target, strip_tags($error)));
+ throw new FileException(sprintf('Could not move the file "%s" to "%s" (%s).', $this->getPathname(), $target, strip_tags($error)));
}
@chmod($target, 0666 & ~umask());
diff --git a/vendor/symfony/http-foundation/HeaderBag.php b/vendor/symfony/http-foundation/HeaderBag.php
index 35bd6ad8fd..0b19faec51 100644
--- a/vendor/symfony/http-foundation/HeaderBag.php
+++ b/vendor/symfony/http-foundation/HeaderBag.php
@@ -225,7 +225,7 @@ public function getDate($key, \DateTime $default = null)
}
if (false === $date = \DateTime::createFromFormat(DATE_RFC2822, $value)) {
- throw new \RuntimeException(sprintf('The %s HTTP header is not parseable (%s).', $key, $value));
+ throw new \RuntimeException(sprintf('The "%s" HTTP header is not parseable (%s).', $key, $value));
}
return $date;
diff --git a/vendor/symfony/http-foundation/LICENSE b/vendor/symfony/http-foundation/LICENSE
index a677f43763..9e936ec044 100644
--- a/vendor/symfony/http-foundation/LICENSE
+++ b/vendor/symfony/http-foundation/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2019 Fabien Potencier
+Copyright (c) 2004-2020 Fabien Potencier
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/vendor/symfony/http-foundation/README.md b/vendor/symfony/http-foundation/README.md
index 8907f0b967..ac98f9b80a 100644
--- a/vendor/symfony/http-foundation/README.md
+++ b/vendor/symfony/http-foundation/README.md
@@ -7,7 +7,7 @@ specification.
Resources
---------
- * [Documentation](https://symfony.com/doc/current/components/http_foundation/index.html)
+ * [Documentation](https://symfony.com/doc/current/components/http_foundation.html)
* [Contributing](https://symfony.com/doc/current/contributing/index.html)
* [Report issues](https://github.com/symfony/symfony/issues) and
[send Pull Requests](https://github.com/symfony/symfony/pulls)
diff --git a/vendor/symfony/http-foundation/RedirectResponse.php b/vendor/symfony/http-foundation/RedirectResponse.php
index 4e3cb4f77b..71ba9f8251 100644
--- a/vendor/symfony/http-foundation/RedirectResponse.php
+++ b/vendor/symfony/http-foundation/RedirectResponse.php
@@ -42,7 +42,7 @@ public function __construct($url, $status = 302, $headers = [])
throw new \InvalidArgumentException(sprintf('The HTTP status code is not a redirect ("%s" given).', $status));
}
- if (301 == $status && !\array_key_exists('cache-control', array_change_key_case($headers, \CASE_LOWER))) {
+ if (301 == $status && !\array_key_exists('cache-control', array_change_key_case($headers, CASE_LOWER))) {
$this->headers->remove('cache-control');
}
}
@@ -93,7 +93,7 @@ public function setTargetUrl($url)
<html>
<head>
<meta charset="UTF-8" />
- <meta http-equiv="refresh" content="0;url=%1$s" />
+ <meta http-equiv="refresh" content="0;url=\'%1$s\'" />
<title>Redirecting to %1$s</title>
</head>
diff --git a/vendor/symfony/http-foundation/Response.php b/vendor/symfony/http-foundation/Response.php
index 26e3a3378e..0f361bac3d 100644
--- a/vendor/symfony/http-foundation/Response.php
+++ b/vendor/symfony/http-foundation/Response.php
@@ -649,7 +649,7 @@ public function isImmutable()
}
/**
- * Returns true if the response must be revalidated by caches.
+ * Returns true if the response must be revalidated by shared caches once it has become stale.
*
* This method indicates that the response must not be served stale by a
* cache in any circumstance without first revalidating with the origin.
diff --git a/vendor/symfony/http-foundation/ResponseHeaderBag.php b/vendor/symfony/http-foundation/ResponseHeaderBag.php
index 1dc8dc2c5f..9a6f87648f 100644
--- a/vendor/symfony/http-foundation/ResponseHeaderBag.php
+++ b/vendor/symfony/http-foundation/ResponseHeaderBag.php
@@ -244,10 +244,13 @@ public function getCookies($format = self::COOKIES_FLAT)
* @param string $domain
* @param bool $secure
* @param bool $httpOnly
+ * @param string $sameSite
*/
- public function clearCookie($name, $path = '/', $domain = null, $secure = false, $httpOnly = true)
+ public function clearCookie($name, $path = '/', $domain = null, $secure = false, $httpOnly = true/*, $sameSite = null*/)
{
- $this->setCookie(new Cookie($name, null, 1, $path, $domain, $secure, $httpOnly));
+ $sameSite = \func_num_args() > 5 ? func_get_arg(5) : null;
+
+ $this->setCookie(new Cookie($name, null, 1, $path, $domain, $secure, $httpOnly, false, $sameSite));
}
/**
@@ -309,13 +312,13 @@ public function makeDisposition($disposition, $filename, $filenameFallback = '')
*/
protected function computeCacheControlValue()
{
- if (!$this->cacheControl && !$this->has('ETag') && !$this->has('Last-Modified') && !$this->has('Expires')) {
- return 'no-cache, private';
- }
-
if (!$this->cacheControl) {
+ if ($this->has('Last-Modified') || $this->has('Expires')) {
+ return 'private, must-revalidate'; // allows for heuristic expiration (RFC 7234 Section 4.2.2) in the case of "Last-Modified"
+ }
+
// conservative by default
- return 'private, must-revalidate';
+ return 'no-cache, private';
}
$header = $this->getCacheControlHeader();
diff --git a/vendor/symfony/http-foundation/ServerBag.php b/vendor/symfony/http-foundation/ServerBag.php
index 4c82b17748..f3b6402348 100644
--- a/vendor/symfony/http-foundation/ServerBag.php
+++ b/vendor/symfony/http-foundation/ServerBag.php
@@ -46,13 +46,13 @@ public function getHeaders()
/*
* php-cgi under Apache does not pass HTTP Basic user/pass to PHP by default
* For this workaround to work, add these lines to your .htaccess file:
- * RewriteCond %{HTTP:Authorization} ^(.+)$
- * RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
+ * RewriteCond %{HTTP:Authorization} .+
+ * RewriteRule ^ - [E=HTTP_AUTHORIZATION:%0]
*
* A sample .htaccess file:
* RewriteEngine On
- * RewriteCond %{HTTP:Authorization} ^(.+)$
- * RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
+ * RewriteCond %{HTTP:Authorization} .+
+ * RewriteRule ^ - [E=HTTP_AUTHORIZATION:%0]
* RewriteCond %{REQUEST_FILENAME} !-f
* RewriteRule ^(.*)$ app.php [QSA,L]
*/
diff --git a/vendor/symfony/http-foundation/Session/SessionUtils.php b/vendor/symfony/http-foundation/Session/SessionUtils.php
new file mode 100644
index 0000000000..04a25f7165
--- /dev/null
+++ b/vendor/symfony/http-foundation/Session/SessionUtils.php
@@ -0,0 +1,59 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpFoundation\Session;
+
+/**
+ * Session utility functions.
+ *
+ * @author Nicolas Grekas <p@tchwork.com>
+ * @author Rémon van de Kamp <rpkamp@gmail.com>
+ *
+ * @internal
+ */
+final class SessionUtils
+{
+ /**
+ * Find the session header amongst the headers that are to be sent, remove it, and return
+ * it so the caller can process it further.
+ */
+ public static function popSessionCookie($sessionName, $sessionId)
+ {
+ $sessionCookie = null;
+ $sessionCookiePrefix = sprintf(' %s=', urlencode($sessionName));
+ $sessionCookieWithId = sprintf('%s%s;', $sessionCookiePrefix, urlencode($sessionId));
+ $otherCookies = [];
+ foreach (headers_list() as $h) {
+ if (0 !== stripos($h, 'Set-Cookie:')) {
+ continue;
+ }
+ if (11 === strpos($h, $sessionCookiePrefix, 11)) {
+ $sessionCookie = $h;
+
+ if (11 !== strpos($h, $sessionCookieWithId, 11)) {
+ $otherCookies[] = $h;
+ }
+ } else {
+ $otherCookies[] = $h;
+ }
+ }
+ if (null === $sessionCookie) {
+ return null;
+ }
+
+ header_remove('Set-Cookie');
+ foreach ($otherCookies as $h) {
+ header($h, false);
+ }
+
+ return $sessionCookie;
+ }
+}
diff --git a/vendor/symfony/http-foundation/Session/Storage/Handler/AbstractSessionHandler.php b/vendor/symfony/http-foundation/Session/Storage/Handler/AbstractSessionHandler.php
index eb09c0b54e..c80da20466 100644
--- a/vendor/symfony/http-foundation/Session/Storage/Handler/AbstractSessionHandler.php
+++ b/vendor/symfony/http-foundation/Session/Storage/Handler/AbstractSessionHandler.php
@@ -11,6 +11,8 @@
namespace Symfony\Component\HttpFoundation\Session\Storage\Handler;
+use Symfony\Component\HttpFoundation\Session\SessionUtils;
+
/**
* This abstract session handler provides a generic implementation
* of the PHP 7.0 SessionUpdateTimestampHandlerInterface,
@@ -27,7 +29,7 @@ abstract class AbstractSessionHandler implements \SessionHandlerInterface, \Sess
private $igbinaryEmptyData;
/**
- * {@inheritdoc}
+ * @return bool
*/
public function open($savePath, $sessionName)
{
@@ -62,18 +64,27 @@ abstract protected function doWrite($sessionId, $data);
abstract protected function doDestroy($sessionId);
/**
- * {@inheritdoc}
+ * @return bool
*/
public function validateId($sessionId)
{
$this->prefetchData = $this->read($sessionId);
$this->prefetchId = $sessionId;
+ if (\PHP_VERSION_ID < 70317 || (70400 <= \PHP_VERSION_ID && \PHP_VERSION_ID < 70405)) {
+ // work around https://bugs.php.net/79413
+ foreach (debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS) as $frame) {
+ if (!isset($frame['class']) && isset($frame['function']) && \in_array($frame['function'], ['session_regenerate_id', 'session_create_id'], true)) {
+ return '' === $this->prefetchData;
+ }
+ }
+ }
+
return '' !== $this->prefetchData;
}
/**
- * {@inheritdoc}
+ * @return string
*/
public function read($sessionId)
{
@@ -99,7 +110,7 @@ public function read($sessionId)
}
/**
- * {@inheritdoc}
+ * @return bool
*/
public function write($sessionId, $data)
{
@@ -124,7 +135,7 @@ public function write($sessionId, $data)
}
/**
- * {@inheritdoc}
+ * @return bool
*/
public function destroy($sessionId)
{
@@ -133,33 +144,25 @@ public function destroy($sessionId)
}
if (!headers_sent() && filter_var(ini_get('session.use_cookies'), FILTER_VALIDATE_BOOLEAN)) {
if (!$this->sessionName) {
- throw new \LogicException(sprintf('Session name cannot be empty, did you forget to call "parent::open()" in "%s"?.', \get_class($this)));
+ throw new \LogicException(sprintf('Session name cannot be empty, did you forget to call "parent::open()" in "%s"?.', static::class));
}
- $sessionCookie = sprintf(' %s=', urlencode($this->sessionName));
- $sessionCookieWithId = sprintf('%s%s;', $sessionCookie, urlencode($sessionId));
- $sessionCookieFound = false;
- $otherCookies = [];
- foreach (headers_list() as $h) {
- if (0 !== stripos($h, 'Set-Cookie:')) {
- continue;
- }
- if (11 === strpos($h, $sessionCookie, 11)) {
- $sessionCookieFound = true;
-
- if (11 !== strpos($h, $sessionCookieWithId, 11)) {
- $otherCookies[] = $h;
- }
+ $cookie = SessionUtils::popSessionCookie($this->sessionName, $sessionId);
+
+ /*
+ * We send an invalidation Set-Cookie header (zero lifetime)
+ * when either the session was started or a cookie with
+ * the session name was sent by the client (in which case
+ * we know it's invalid as a valid session cookie would've
+ * started the session).
+ */
+ if (null === $cookie || isset($_COOKIE[$this->sessionName])) {
+ if (\PHP_VERSION_ID < 70300) {
+ setcookie($this->sessionName, '', 0, ini_get('session.cookie_path'), ini_get('session.cookie_domain'), filter_var(ini_get('session.cookie_secure'), FILTER_VALIDATE_BOOLEAN), filter_var(ini_get('session.cookie_httponly'), FILTER_VALIDATE_BOOLEAN));
} else {
- $otherCookies[] = $h;
- }
- }
- if ($sessionCookieFound) {
- header_remove('Set-Cookie');
- foreach ($otherCookies as $h) {
- header($h, false);
+ $params = session_get_cookie_params();
+ unset($params['lifetime']);
+ setcookie($this->sessionName, '', $params);
}
- } else {
- setcookie($this->sessionName, '', 0, ini_get('session.cookie_path'), ini_get('session.cookie_domain'), filter_var(ini_get('session.cookie_secure'), FILTER_VALIDATE_BOOLEAN), filter_var(ini_get('session.cookie_httponly'), FILTER_VALIDATE_BOOLEAN));
}
}
diff --git a/vendor/symfony/http-foundation/Session/Storage/Handler/MemcacheSessionHandler.php b/vendor/symfony/http-foundation/Session/Storage/Handler/MemcacheSessionHandler.php
index 3abc33caa5..d4b68ae8b8 100644
--- a/vendor/symfony/http-foundation/Session/Storage/Handler/MemcacheSessionHandler.php
+++ b/vendor/symfony/http-foundation/Session/Storage/Handler/MemcacheSessionHandler.php
@@ -47,7 +47,7 @@ class MemcacheSessionHandler implements \SessionHandlerInterface
public function __construct(\Memcache $memcache, array $options = [])
{
if ($diff = array_diff(array_keys($options), ['prefix', 'expiretime'])) {
- throw new \InvalidArgumentException(sprintf('The following options are not supported "%s"', implode(', ', $diff)));
+ throw new \InvalidArgumentException(sprintf('The following options are not supported "%s".', implode(', ', $diff)));
}
$this->memcache = $memcache;
diff --git a/vendor/symfony/http-foundation/Session/Storage/Handler/MemcachedSessionHandler.php b/vendor/symfony/http-foundation/Session/Storage/Handler/MemcachedSessionHandler.php
index a399be5fd8..6711e0a55f 100644
--- a/vendor/symfony/http-foundation/Session/Storage/Handler/MemcachedSessionHandler.php
+++ b/vendor/symfony/http-foundation/Session/Storage/Handler/MemcachedSessionHandler.php
@@ -47,7 +47,7 @@ public function __construct(\Memcached $memcached, array $options = [])
$this->memcached = $memcached;
if ($diff = array_diff(array_keys($options), ['prefix', 'expiretime'])) {
- throw new \InvalidArgumentException(sprintf('The following options are not supported "%s"', implode(', ', $diff)));
+ throw new \InvalidArgumentException(sprintf('The following options are not supported "%s".', implode(', ', $diff)));
}
$this->ttl = isset($options['expiretime']) ? (int) $options['expiretime'] : 86400;
diff --git a/vendor/symfony/http-foundation/Session/Storage/Handler/MongoDbSessionHandler.php b/vendor/symfony/http-foundation/Session/Storage/Handler/MongoDbSessionHandler.php
index 1dd7240669..d84f2e9d0c 100644
--- a/vendor/symfony/http-foundation/Session/Storage/Handler/MongoDbSessionHandler.php
+++ b/vendor/symfony/http-foundation/Session/Storage/Handler/MongoDbSessionHandler.php
@@ -74,11 +74,11 @@ public function __construct($mongo, array $options)
}
if (!($mongo instanceof \MongoDB\Client || $mongo instanceof \MongoClient || $mongo instanceof \Mongo)) {
- throw new \InvalidArgumentException('MongoClient or Mongo instance required');
+ throw new \InvalidArgumentException('MongoClient or Mongo instance required.');
}
if (!isset($options['database']) || !isset($options['collection'])) {
- throw new \InvalidArgumentException('You must provide the "database" and "collection" option for MongoDBSessionHandler');
+ throw new \InvalidArgumentException('You must provide the "database" and "collection" option for MongoDBSessionHandler.');
}
$this->mongo = $mongo;
diff --git a/vendor/symfony/http-foundation/Session/Storage/Handler/NativeFileSessionHandler.php b/vendor/symfony/http-foundation/Session/Storage/Handler/NativeFileSessionHandler.php
index 8b7615ec10..f24271fbf5 100644
--- a/vendor/symfony/http-foundation/Session/Storage/Handler/NativeFileSessionHandler.php
+++ b/vendor/symfony/http-foundation/Session/Storage/Handler/NativeFileSessionHandler.php
@@ -38,7 +38,7 @@ public function __construct($savePath = null)
if ($count = substr_count($savePath, ';')) {
if ($count > 2) {
- throw new \InvalidArgumentException(sprintf('Invalid argument $savePath \'%s\'', $savePath));
+ throw new \InvalidArgumentException(sprintf('Invalid argument $savePath \'%s\'.', $savePath));
}
// characters after last ';' are the path
@@ -46,7 +46,7 @@ public function __construct($savePath = null)
}
if ($baseDir && !is_dir($baseDir) && !@mkdir($baseDir, 0777, true) && !is_dir($baseDir)) {
- throw new \RuntimeException(sprintf('Session Storage was not able to create directory "%s"', $baseDir));
+ throw new \RuntimeException(sprintf('Session Storage was not able to create directory "%s".', $baseDir));
}
ini_set('session.save_path', $savePath);
diff --git a/vendor/symfony/http-foundation/Session/Storage/Handler/PdoSessionHandler.php b/vendor/symfony/http-foundation/Session/Storage/Handler/PdoSessionHandler.php
index f9e5d1e8f0..d1cf622bdd 100644
--- a/vendor/symfony/http-foundation/Session/Storage/Handler/PdoSessionHandler.php
+++ b/vendor/symfony/http-foundation/Session/Storage/Handler/PdoSessionHandler.php
@@ -173,7 +173,7 @@ public function __construct($pdoOrDsn = null, array $options = [])
{
if ($pdoOrDsn instanceof \PDO) {
if (\PDO::ERRMODE_EXCEPTION !== $pdoOrDsn->getAttribute(\PDO::ATTR_ERRMODE)) {
- throw new \InvalidArgumentException(sprintf('"%s" requires PDO error mode attribute be set to throw Exceptions (i.e. $pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION))', __CLASS__));
+ throw new \InvalidArgumentException(sprintf('"%s" requires PDO error mode attribute be set to throw Exceptions (i.e. $pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION)).', __CLASS__));
}
$this->pdo = $pdoOrDsn;
@@ -218,7 +218,7 @@ public function createTable()
// - trailing space removal
// - case-insensitivity
// - language processing like é == e
- $sql = "CREATE TABLE $this->table ($this->idCol VARBINARY(128) NOT NULL PRIMARY KEY, $this->dataCol BLOB NOT NULL, $this->lifetimeCol MEDIUMINT NOT NULL, $this->timeCol INTEGER UNSIGNED NOT NULL) COLLATE utf8_bin, ENGINE = InnoDB";
+ $sql = "CREATE TABLE $this->table ($this->idCol VARBINARY(128) NOT NULL PRIMARY KEY, $this->dataCol BLOB NOT NULL, $this->lifetimeCol INTEGER UNSIGNED NOT NULL, $this->timeCol INTEGER UNSIGNED NOT NULL) COLLATE utf8mb4_bin, ENGINE = InnoDB";
break;
case 'sqlite':
$sql = "CREATE TABLE $this->table ($this->idCol TEXT NOT NULL PRIMARY KEY, $this->dataCol BLOB NOT NULL, $this->lifetimeCol INTEGER NOT NULL, $this->timeCol INTEGER NOT NULL)";
@@ -465,7 +465,7 @@ private function buildDsnFromUrl($dsnOrUrl)
}
if (!isset($params['scheme'])) {
- throw new \InvalidArgumentException('URLs without scheme are not supported to configure the PdoSessionHandler');
+ throw new \InvalidArgumentException('URLs without scheme are not supported to configure the PdoSessionHandler.');
}
$driverAliasMap = [
diff --git a/vendor/symfony/http-foundation/Session/Storage/MockArraySessionStorage.php b/vendor/symfony/http-foundation/Session/Storage/MockArraySessionStorage.php
index c1e7523c5e..5474d92e36 100644
--- a/vendor/symfony/http-foundation/Session/Storage/MockArraySessionStorage.php
+++ b/vendor/symfony/http-foundation/Session/Storage/MockArraySessionStorage.php
@@ -152,7 +152,7 @@ public function setName($name)
public function save()
{
if (!$this->started || $this->closed) {
- throw new \RuntimeException('Trying to save a session that was not started yet or was already closed');
+ throw new \RuntimeException('Trying to save a session that was not started yet or was already closed.');
}
// nothing to do since we don't persist the session data
$this->closed = false;
@@ -190,7 +190,7 @@ public function registerBag(SessionBagInterface $bag)
public function getBag($name)
{
if (!isset($this->bags[$name])) {
- throw new \InvalidArgumentException(sprintf('The SessionBagInterface %s is not registered.', $name));
+ throw new \InvalidArgumentException(sprintf('The SessionBagInterface "%s" is not registered.', $name));
}
if (!$this->started) {
diff --git a/vendor/symfony/http-foundation/Session/Storage/MockFileSessionStorage.php b/vendor/symfony/http-foundation/Session/Storage/MockFileSessionStorage.php
index 9bbd1baf2c..c5b1d1a360 100644
--- a/vendor/symfony/http-foundation/Session/Storage/MockFileSessionStorage.php
+++ b/vendor/symfony/http-foundation/Session/Storage/MockFileSessionStorage.php
@@ -38,7 +38,7 @@ public function __construct($savePath = null, $name = 'MOCKSESSID', MetadataBag
}
if (!is_dir($savePath) && !@mkdir($savePath, 0777, true) && !is_dir($savePath)) {
- throw new \RuntimeException(sprintf('Session Storage was not able to create directory "%s"', $savePath));
+ throw new \RuntimeException(sprintf('Session Storage was not able to create directory "%s".', $savePath));
}
$this->savePath = $savePath;
@@ -88,7 +88,7 @@ public function regenerate($destroy = false, $lifetime = null)
public function save()
{
if (!$this->started) {
- throw new \RuntimeException('Trying to save a session that was not started yet or was already closed');
+ throw new \RuntimeException('Trying to save a session that was not started yet or was already closed.');
}
$data = $this->data;
diff --git a/vendor/symfony/http-foundation/Session/Storage/NativeSessionStorage.php b/vendor/symfony/http-foundation/Session/Storage/NativeSessionStorage.php
index 4c5873728a..1f5a3322e1 100644
--- a/vendor/symfony/http-foundation/Session/Storage/NativeSessionStorage.php
+++ b/vendor/symfony/http-foundation/Session/Storage/NativeSessionStorage.php
@@ -12,6 +12,7 @@
namespace Symfony\Component\HttpFoundation\Session\Storage;
use Symfony\Component\HttpFoundation\Session\SessionBagInterface;
+use Symfony\Component\HttpFoundation\Session\SessionUtils;
use Symfony\Component\HttpFoundation\Session\Storage\Handler\StrictSessionHandler;
use Symfony\Component\HttpFoundation\Session\Storage\Proxy\AbstractProxy;
use Symfony\Component\HttpFoundation\Session\Storage\Proxy\SessionHandlerProxy;
@@ -48,6 +49,11 @@ class NativeSessionStorage implements SessionStorageInterface
*/
protected $metadataBag;
+ /**
+ * @var string|null
+ */
+ private $emulateSameSite;
+
/**
* Depending on how you want the storage driver to behave you probably
* want to override this constructor entirely.
@@ -67,6 +73,7 @@ class NativeSessionStorage implements SessionStorageInterface
* cookie_lifetime, "0"
* cookie_path, "/"
* cookie_secure, ""
+ * cookie_samesite, null
* entropy_file, ""
* entropy_length, "0"
* gc_divisor, "100"
@@ -94,9 +101,7 @@ class NativeSessionStorage implements SessionStorageInterface
* trans_sid_hosts, $_SERVER['HTTP_HOST']
* trans_sid_tags, "a=href,area=href,frame=src,form="
*
- * @param array $options Session configuration options
- * @param \SessionHandlerInterface|null $handler
- * @param MetadataBag $metaBag MetadataBag
+ * @param AbstractProxy|\SessionHandlerInterface|null $handler
*/
public function __construct(array $options = [], $handler = null, MetadataBag $metaBag = null)
{
@@ -137,7 +142,7 @@ public function start()
return true;
}
- if (\PHP_SESSION_ACTIVE === session_status()) {
+ if (PHP_SESSION_ACTIVE === session_status()) {
throw new \RuntimeException('Failed to start the session: already started by PHP.');
}
@@ -147,7 +152,14 @@ public function start()
// ok to try and start the session
if (!session_start()) {
- throw new \RuntimeException('Failed to start the session');
+ throw new \RuntimeException('Failed to start the session.');
+ }
+
+ if (null !== $this->emulateSameSite) {
+ $originalCookie = SessionUtils::popSessionCookie(session_name(), session_id());
+ if (null !== $originalCookie) {
+ header(sprintf('%s; SameSite=%s', $originalCookie, $this->emulateSameSite), false);
+ }
}
$this->loadSession();
@@ -193,7 +205,7 @@ public function setName($name)
public function regenerate($destroy = false, $lifetime = null)
{
// Cannot regenerate the session ID for non-active sessions.
- if (\PHP_SESSION_ACTIVE !== session_status()) {
+ if (PHP_SESSION_ACTIVE !== session_status()) {
return false;
}
@@ -201,8 +213,10 @@ public function regenerate($destroy = false, $lifetime = null)
return false;
}
- if (null !== $lifetime) {
+ if (null !== $lifetime && $lifetime != ini_get('session.cookie_lifetime')) {
+ $this->save();
ini_set('session.cookie_lifetime', $lifetime);
+ $this->start();
}
if ($destroy) {
@@ -211,9 +225,12 @@ public function regenerate($destroy = false, $lifetime = null)
$isRegenerated = session_regenerate_id($destroy);
- // The reference to $_SESSION in session bags is lost in PHP7 and we need to re-create it.
- // @see https://bugs.php.net/70013
- $this->loadSession();
+ if (null !== $this->emulateSameSite) {
+ $originalCookie = SessionUtils::popSessionCookie(session_name(), session_id());
+ if (null !== $originalCookie) {
+ header(sprintf('%s; SameSite=%s', $originalCookie, $this->emulateSameSite), false);
+ }
+ }
return $isRegenerated;
}
@@ -223,6 +240,7 @@ public function regenerate($destroy = false, $lifetime = null)
*/
public function save()
{
+ // Store a copy so we can restore the bags in case the session was not left empty
$session = $_SESSION;
foreach ($this->bags as $bag) {
@@ -248,7 +266,11 @@ public function save()
session_write_close();
} finally {
restore_error_handler();
- $_SESSION = $session;
+
+ // Restore only if not empty
+ if ($_SESSION) {
+ $_SESSION = $session;
+ }
}
$this->closed = true;
@@ -290,7 +312,7 @@ public function registerBag(SessionBagInterface $bag)
public function getBag($name)
{
if (!isset($this->bags[$name])) {
- throw new \InvalidArgumentException(sprintf('The SessionBagInterface %s is not registered.', $name));
+ throw new \InvalidArgumentException(sprintf('The SessionBagInterface "%s" is not registered.', $name));
}
if (!$this->started && $this->saveHandler->isActive()) {
@@ -341,13 +363,13 @@ public function isStarted()
*/
public function setOptions(array $options)
{
- if (headers_sent() || \PHP_SESSION_ACTIVE === session_status()) {
+ if (headers_sent() || PHP_SESSION_ACTIVE === session_status()) {
return;
}
$validOptions = array_flip([
'cache_expire', 'cache_limiter', 'cookie_domain', 'cookie_httponly',
- 'cookie_lifetime', 'cookie_path', 'cookie_secure',
+ 'cookie_lifetime', 'cookie_path', 'cookie_secure', 'cookie_samesite',
'entropy_file', 'entropy_length', 'gc_divisor',
'gc_maxlifetime', 'gc_probability', 'hash_bits_per_character',
'hash_function', 'lazy_write', 'name', 'referer_check',
@@ -360,6 +382,12 @@ public function setOptions(array $options)
foreach ($options as $key => $value) {
if (isset($validOptions[$key])) {
+ if ('cookie_samesite' === $key && \PHP_VERSION_ID < 70300) {
+ // PHP < 7.3 does not support same_site cookies. We will emulate it in
+ // the start() method instead.
+ $this->emulateSameSite = $value;
+ continue;
+ }
ini_set('url_rewriter.tags' !== $key ? 'session.'.$key : $key, $value);
}
}
@@ -375,15 +403,13 @@ public function setOptions(array $options)
* ini_set('session.save_path', '/tmp');
*
* or pass in a \SessionHandler instance which configures session.save_handler in the
- * constructor, for a template see NativeFileSessionHandler or use handlers in
- * composer package drak/native-session
+ * constructor, for a template see NativeFileSessionHandler.
*
* @see https://php.net/session-set-save-handler
* @see https://php.net/sessionhandlerinterface
* @see https://php.net/sessionhandler
- * @see https://github.com/zikula/NativeSession
*
- * @param \SessionHandlerInterface|null $saveHandler
+ * @param AbstractProxy|\SessionHandlerInterface|null $saveHandler
*
* @throws \InvalidArgumentException
*/
@@ -403,7 +429,7 @@ public function setSaveHandler($saveHandler = null)
}
$this->saveHandler = $saveHandler;
- if (headers_sent() || \PHP_SESSION_ACTIVE === session_status()) {
+ if (headers_sent() || PHP_SESSION_ACTIVE === session_status()) {
return;
}
diff --git a/vendor/symfony/http-foundation/Session/Storage/Proxy/AbstractProxy.php b/vendor/symfony/http-foundation/Session/Storage/Proxy/AbstractProxy.php
index 0303729e7b..b9c2682b3c 100644
--- a/vendor/symfony/http-foundation/Session/Storage/Proxy/AbstractProxy.php
+++ b/vendor/symfony/http-foundation/Session/Storage/Proxy/AbstractProxy.php
@@ -65,7 +65,7 @@ public function isWrapper()
*/
public function isActive()
{
- return \PHP_SESSION_ACTIVE === session_status();
+ return PHP_SESSION_ACTIVE === session_status();
}
/**
@@ -88,7 +88,7 @@ public function getId()
public function setId($id)
{
if ($this->isActive()) {
- throw new \LogicException('Cannot change the ID of an active session');
+ throw new \LogicException('Cannot change the ID of an active session.');
}
session_id($id);
@@ -114,7 +114,7 @@ public function getName()
public function setName($name)
{
if ($this->isActive()) {
- throw new \LogicException('Cannot change the name of an active session');
+ throw new \LogicException('Cannot change the name of an active session.');
}
session_name($name);
diff --git a/vendor/symfony/http-foundation/Tests/RedirectResponseTest.php b/vendor/symfony/http-foundation/Tests/RedirectResponseTest.php
index e1ff3bf2bd..2bbf5aa1ae 100644
--- a/vendor/symfony/http-foundation/Tests/RedirectResponseTest.php
+++ b/vendor/symfony/http-foundation/Tests/RedirectResponseTest.php
@@ -20,10 +20,7 @@ public function testGenerateMetaRedirect()
{
$response = new RedirectResponse('foo.bar');
- $this->assertEquals(1, preg_match(
- '#<meta http-equiv="refresh" content="\d+;url=foo\.bar" />#',
- preg_replace(['/\s+/', '/\'/'], [' ', '"'], $response->getContent())
- ));
+ $this->assertRegExp('#<meta http-equiv="refresh" content="\d+;url=\'foo\.bar\'" />#', preg_replace('/\s+/', ' ', $response->getContent()));
}
public function testRedirectResponseConstructorNullUrl()
diff --git a/vendor/symfony/http-foundation/Tests/ResponseHeaderBagTest.php b/vendor/symfony/http-foundation/Tests/ResponseHeaderBagTest.php
index d85f6e112f..632c96df52 100644
--- a/vendor/symfony/http-foundation/Tests/ResponseHeaderBagTest.php
+++ b/vendor/symfony/http-foundation/Tests/ResponseHeaderBagTest.php
@@ -51,9 +51,9 @@ public function testCacheControlHeader()
$this->assertTrue($bag->hasCacheControlDirective('public'));
$bag = new ResponseHeaderBag(['ETag' => 'abcde']);
- $this->assertEquals('private, must-revalidate', $bag->get('Cache-Control'));
+ $this->assertEquals('no-cache, private', $bag->get('Cache-Control'));
$this->assertTrue($bag->hasCacheControlDirective('private'));
- $this->assertTrue($bag->hasCacheControlDirective('must-revalidate'));
+ $this->assertTrue($bag->hasCacheControlDirective('no-cache'));
$this->assertFalse($bag->hasCacheControlDirective('max-age'));
$bag = new ResponseHeaderBag(['Expires' => 'Wed, 16 Feb 2011 14:17:43 GMT']);
@@ -128,6 +128,14 @@ public function testClearCookieSecureNotHttpOnly()
$this->assertSetCookieHeader('foo=deleted; expires='.gmdate('D, d-M-Y H:i:s T', time() - 31536001).'; Max-Age=0; path=/; secure', $bag);
}
+ public function testClearCookieSamesite()
+ {
+ $bag = new ResponseHeaderBag([]);
+
+ $bag->clearCookie('foo', '/', null, true, false, 'none');
+ $this->assertSetCookieHeader('foo=deleted; expires='.gmdate('D, d-M-Y H:i:s T', time() - 31536001).'; Max-Age=0; path=/; secure; samesite=none', $bag);
+ }
+
public function testReplace()
{
$bag = new ResponseHeaderBag([]);
diff --git a/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/Fixtures/regenerate.expected b/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/Fixtures/regenerate.expected
index baa5f2f6f5..d825f44f7c 100644
--- a/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/Fixtures/regenerate.expected
+++ b/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/Fixtures/regenerate.expected
@@ -11,6 +11,7 @@ validateId
read
doRead: abc|i:123;
read
+doRead: abc|i:123;
write
doWrite: abc|i:123;
diff --git a/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/Fixtures/storage.expected b/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/Fixtures/storage.expected
index 4533a10a1f..05a5d5d0b0 100644
--- a/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/Fixtures/storage.expected
+++ b/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/Fixtures/storage.expected
@@ -11,10 +11,11 @@ $_SESSION is not empty
write
destroy
close
-$_SESSION is not empty
+$_SESSION is empty
Array
(
[0] => Content-Type: text/plain; charset=utf-8
[1] => Cache-Control: max-age=0, private, must-revalidate
+ [2] => Set-Cookie: sid=deleted; expires=Thu, 01-Jan-1970 00:00:01 GMT; Max-Age=0; path=/; secure; HttpOnly
)
shutdown
diff --git a/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/Fixtures/with_cookie_and_session.expected b/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/Fixtures/with_cookie_and_session.expected
index 5de2d9e390..63078228df 100644
--- a/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/Fixtures/with_cookie_and_session.expected
+++ b/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/Fixtures/with_cookie_and_session.expected
@@ -20,5 +20,6 @@ Array
[0] => Content-Type: text/plain; charset=utf-8
[1] => Cache-Control: max-age=10800, private, must-revalidate
[2] => Set-Cookie: abc=def
+ [3] => Set-Cookie: sid=deleted; expires=Thu, 01-Jan-1970 00:00:01 GMT; Max-Age=0; path=/; secure; HttpOnly
)
shutdown
diff --git a/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/Fixtures/with_samesite.expected b/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/Fixtures/with_samesite.expected
new file mode 100644
index 0000000000..d20fb88ec0
--- /dev/null
+++ b/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/Fixtures/with_samesite.expected
@@ -0,0 +1,16 @@
+open
+validateId
+read
+doRead:
+read
+
+write
+doWrite: foo|s:3:"bar";
+close
+Array
+(
+ [0] => Content-Type: text/plain; charset=utf-8
+ [1] => Cache-Control: max-age=0, private, must-revalidate
+ [2] => Set-Cookie: sid=random_session_id; path=/; secure; HttpOnly; SameSite=lax
+)
+shutdown
diff --git a/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/Fixtures/with_samesite.php b/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/Fixtures/with_samesite.php
new file mode 100644
index 0000000000..fc2c418289
--- /dev/null
+++ b/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/Fixtures/with_samesite.php
@@ -0,0 +1,13 @@
+<?php
+
+require __DIR__.'/common.inc';
+
+use Symfony\Component\HttpFoundation\Session\Storage\NativeSessionStorage;
+
+$storage = new NativeSessionStorage(['cookie_samesite' => 'lax']);
+$storage->setSaveHandler(new TestSessionHandler());
+$storage->start();
+
+$_SESSION = ['foo' => 'bar'];
+
+ob_start(function ($buffer) { return str_replace(session_id(), 'random_session_id', $buffer); });
diff --git a/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/Fixtures/with_samesite_and_migration.expected b/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/Fixtures/with_samesite_and_migration.expected
new file mode 100644
index 0000000000..8b5fc08bd3
--- /dev/null
+++ b/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/Fixtures/with_samesite_and_migration.expected
@@ -0,0 +1,23 @@
+open
+validateId
+read
+doRead:
+read
+destroy
+close
+open
+validateId
+read
+doRead:
+read
+
+write
+doWrite: foo|s:3:"bar";
+close
+Array
+(
+ [0] => Content-Type: text/plain; charset=utf-8
+ [1] => Cache-Control: max-age=0, private, must-revalidate
+ [2] => Set-Cookie: sid=random_session_id; path=/; secure; HttpOnly; SameSite=lax
+)
+shutdown
diff --git a/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/Fixtures/with_samesite_and_migration.php b/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/Fixtures/with_samesite_and_migration.php
new file mode 100644
index 0000000000..a28b6fedfc
--- /dev/null
+++ b/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/Fixtures/with_samesite_and_migration.php
@@ -0,0 +1,15 @@
+<?php
+
+require __DIR__.'/common.inc';
+
+use Symfony\Component\HttpFoundation\Session\Storage\NativeSessionStorage;
+
+$storage = new NativeSessionStorage(['cookie_samesite' => 'lax']);
+$storage->setSaveHandler(new TestSessionHandler());
+$storage->start();
+
+$_SESSION = ['foo' => 'bar'];
+
+$storage->regenerate(true);
+
+ob_start(function ($buffer) { return preg_replace('~_sf2_meta.*$~m', '', str_replace(session_id(), 'random_session_id', $buffer)); });
diff --git a/vendor/symfony/http-foundation/Tests/Session/Storage/NativeSessionStorageTest.php b/vendor/symfony/http-foundation/Tests/Session/Storage/NativeSessionStorageTest.php
index 9ce8108dac..7cfcd223e0 100644
--- a/vendor/symfony/http-foundation/Tests/Session/Storage/NativeSessionStorageTest.php
+++ b/vendor/symfony/http-foundation/Tests/Session/Storage/NativeSessionStorageTest.php
@@ -36,7 +36,7 @@ class NativeSessionStorageTest extends TestCase
protected function setUp()
{
$this->iniSet('session.save_handler', 'files');
- $this->iniSet('session.save_path', $this->savePath = sys_get_temp_dir().'/sf2test');
+ $this->iniSet('session.save_path', $this->savePath = sys_get_temp_dir().'/sftest');
if (!is_dir($this->savePath)) {
mkdir($this->savePath);
}
@@ -123,6 +123,19 @@ public function testRegenerateDestroy()
$this->assertEquals(11, $storage->getBag('attributes')->get('legs'));
}
+ public function testRegenerateWithCustomLifetime()
+ {
+ $storage = $this->getStorage();
+ $storage->start();
+ $id = $storage->getId();
+ $lifetime = 999999;
+ $storage->getBag('attributes')->set('legs', 11);
+ $storage->regenerate(false, $lifetime);
+ $this->assertNotEquals($id, $storage->getId());
+ $this->assertEquals(11, $storage->getBag('attributes')->get('legs'));
+ $this->assertEquals($lifetime, ini_get('session.cookie_lifetime'));
+ }
+
public function testSessionGlobalIsUpToDateAfterIdRegeneration()
{
$storage = $this->getStorage();
@@ -167,6 +180,10 @@ public function testCookieOptions()
'cookie_httponly' => false,
];
+ if (\PHP_VERSION_ID >= 70300) {
+ $options['cookie_samesite'] = 'lax';
+ }
+
$this->getStorage($options);
$temp = session_get_cookie_params();
$gco = [];
@@ -175,8 +192,6 @@ public function testCookieOptions()
$gco['cookie_'.$key] = $value;
}
- unset($gco['cookie_samesite']);
-
$this->assertEquals($options, $gco);
}
diff --git a/vendor/symfony/http-kernel/Bundle/Bundle.php b/vendor/symfony/http-kernel/Bundle/Bundle.php
index 5bbed6bef1..530a2749d1 100644
--- a/vendor/symfony/http-kernel/Bundle/Bundle.php
+++ b/vendor/symfony/http-kernel/Bundle/Bundle.php
@@ -70,7 +70,7 @@ public function getContainerExtension()
if (null !== $extension) {
if (!$extension instanceof ExtensionInterface) {
- throw new \LogicException(sprintf('Extension %s must implement Symfony\Component\DependencyInjection\Extension\ExtensionInterface.', \get_class($extension)));
+ throw new \LogicException(sprintf('Extension "%s" must implement Symfony\Component\DependencyInjection\Extension\ExtensionInterface.', \get_class($extension)));
}
// check naming convention
diff --git a/vendor/symfony/http-kernel/CacheClearer/Psr6CacheClearer.php b/vendor/symfony/http-kernel/CacheClearer/Psr6CacheClearer.php
index 42add5a686..4b4aafa163 100644
--- a/vendor/symfony/http-kernel/CacheClearer/Psr6CacheClearer.php
+++ b/vendor/symfony/http-kernel/CacheClearer/Psr6CacheClearer.php
@@ -40,7 +40,7 @@ public function hasPool($name)
public function clearPool($name)
{
if (!isset($this->pools[$name])) {
- throw new \InvalidArgumentException(sprintf('Cache pool not found: %s.', $name));
+ throw new \InvalidArgumentException(sprintf('Cache pool not found: "%s".', $name));
}
return $this->pools[$name]->clear();
diff --git a/vendor/symfony/http-kernel/Controller/ArgumentResolver.php b/vendor/symfony/http-kernel/Controller/ArgumentResolver.php
index fc6f969a9e..9d5f96ed2c 100644
--- a/vendor/symfony/http-kernel/Controller/ArgumentResolver.php
+++ b/vendor/symfony/http-kernel/Controller/ArgumentResolver.php
@@ -56,7 +56,7 @@ public function getArguments(Request $request, $controller)
$resolved = $resolver->resolve($request, $metadata);
if (!$resolved instanceof \Generator) {
- throw new \InvalidArgumentException(sprintf('%s::resolve() must yield at least one value.', \get_class($resolver)));
+ throw new \InvalidArgumentException(sprintf('"%s::resolve()" must yield at least one value.', \get_class($resolver)));
}
foreach ($resolved as $append) {
diff --git a/vendor/symfony/http-kernel/Controller/ControllerResolver.php b/vendor/symfony/http-kernel/Controller/ControllerResolver.php
index c981642fee..015448b510 100644
--- a/vendor/symfony/http-kernel/Controller/ControllerResolver.php
+++ b/vendor/symfony/http-kernel/Controller/ControllerResolver.php
@@ -77,7 +77,7 @@ public function getController(Request $request)
throw new \InvalidArgumentException(sprintf('Controller "%s" for URI "%s" is not callable.', \get_class($controller), $request->getPathInfo()));
}
- if (false === strpos($controller, ':')) {
+ if (\is_string($controller) && false === strpos($controller, ':')) {
if (method_exists($controller, '__invoke')) {
return $this->instantiateController($controller);
} elseif (\function_exists($controller)) {
@@ -88,7 +88,7 @@ public function getController(Request $request)
try {
$callable = $this->createController($controller);
} catch (\InvalidArgumentException $e) {
- throw new \InvalidArgumentException(sprintf('The controller for URI "%s" is not callable. %s', $request->getPathInfo(), $e->getMessage()));
+ throw new \InvalidArgumentException(sprintf('The controller for URI "%s" is not callable: ', $request->getPathInfo()).$e->getMessage(), 0, $e);
}
return $callable;
@@ -136,7 +136,7 @@ protected function doGetArguments(Request $request, $controller, array $paramete
} else {
$arguments[] = $attributes[$param->name];
}
- } elseif ($param->getClass() && $param->getClass()->isInstance($request)) {
+ } elseif ($this->typeMatchesRequestClass($param, $request)) {
$arguments[] = $request;
} elseif ($param->isDefaultValueAvailable()) {
$arguments[] = $param->getDefaultValue();
@@ -260,4 +260,22 @@ private function getControllerError($callable)
return $message;
}
+
+ /**
+ * @return bool
+ */
+ private function typeMatchesRequestClass(\ReflectionParameter $param, Request $request)
+ {
+ if (!method_exists($param, 'getType')) {
+ return $param->getClass() && $param->getClass()->isInstance($request);
+ }
+
+ if (!($type = $param->getType()) || $type->isBuiltin()) {
+ return false;
+ }
+
+ $class = new \ReflectionClass(method_exists($type, 'getName') ? $type->getName() : (string) $type);
+
+ return $class && $class->isInstance($request);
+ }
}
diff --git a/vendor/symfony/http-kernel/ControllerMetadata/ArgumentMetadata.php b/vendor/symfony/http-kernel/ControllerMetadata/ArgumentMetadata.php
index 520e83b5fe..6df388d83a 100644
--- a/vendor/symfony/http-kernel/ControllerMetadata/ArgumentMetadata.php
+++ b/vendor/symfony/http-kernel/ControllerMetadata/ArgumentMetadata.php
@@ -107,7 +107,7 @@ public function isNullable()
public function getDefaultValue()
{
if (!$this->hasDefaultValue) {
- throw new \LogicException(sprintf('Argument $%s does not have a default value. Use %s::hasDefaultValue() to avoid this exception.', $this->name, __CLASS__));
+ throw new \LogicException(sprintf('Argument $%s does not have a default value. Use "%s::hasDefaultValue()" to avoid this exception.', $this->name, __CLASS__));
}
return $this->defaultValue;
diff --git a/vendor/symfony/http-kernel/DataCollector/DumpDataCollector.php b/vendor/symfony/http-kernel/DataCollector/DumpDataCollector.php
index 4266b22fec..280e1ddd08 100644
--- a/vendor/symfony/http-kernel/DataCollector/DumpDataCollector.php
+++ b/vendor/symfony/http-kernel/DataCollector/DumpDataCollector.php
@@ -217,7 +217,7 @@ public function getDumps($format, $maxDepthLimit = -1, $maxItemsPerDepth = -1)
$dumper = new HtmlDumper($data, $this->charset);
$dumper->setDisplayOptions(['fileLinkFormat' => $this->fileLinkFormat]);
} else {
- throw new \InvalidArgumentException(sprintf('Invalid dump format: %s', $format));
+ throw new \InvalidArgumentException(sprintf('Invalid dump format: "%s".', $format));
}
$dumps = [];
diff --git a/vendor/symfony/http-kernel/DataCollector/LoggerDataCollector.php b/vendor/symfony/http-kernel/DataCollector/LoggerDataCollector.php
index 99a9cf23e8..9c05daa36f 100644
--- a/vendor/symfony/http-kernel/DataCollector/LoggerDataCollector.php
+++ b/vendor/symfony/http-kernel/DataCollector/LoggerDataCollector.php
@@ -172,7 +172,7 @@ private function sanitizeLogs($logs)
continue;
}
- $message = $log['message'];
+ $message = '_'.$log['message'];
$exception = $log['context']['exception'];
if ($exception instanceof SilencedErrorContext) {
diff --git a/vendor/symfony/http-kernel/DependencyInjection/ResettableServicePass.php b/vendor/symfony/http-kernel/DependencyInjection/ResettableServicePass.php
index 28136be625..51a518dc28 100644
--- a/vendor/symfony/http-kernel/DependencyInjection/ResettableServicePass.php
+++ b/vendor/symfony/http-kernel/DependencyInjection/ResettableServicePass.php
@@ -46,7 +46,7 @@ public function process(ContainerBuilder $container)
$attributes = $tags[0];
if (!isset($attributes['method'])) {
- throw new RuntimeException(sprintf('Tag %s requires the "method" attribute to be set.', $this->tagName));
+ throw new RuntimeException(sprintf('Tag "%s" requires the "method" attribute to be set.', $this->tagName));
}
$methods[$id] = $attributes['method'];
diff --git a/vendor/symfony/http-kernel/EventListener/DebugHandlersListener.php b/vendor/symfony/http-kernel/EventListener/DebugHandlersListener.php
index df9df09c0b..957a3cdb0f 100644
--- a/vendor/symfony/http-kernel/EventListener/DebugHandlersListener.php
+++ b/vendor/symfony/http-kernel/EventListener/DebugHandlersListener.php
@@ -65,6 +65,9 @@ public function __construct(callable $exceptionHandler = null, LoggerInterface $
*/
public function configure(Event $event = null)
{
+ if ($event instanceof ConsoleEvent && !\in_array(\PHP_SAPI, ['cli', 'phpdbg'], true)) {
+ return;
+ }
if (!$event instanceof KernelEvent ? !$this->firstCall : !$event->isMasterRequest()) {
return;
}
@@ -148,7 +151,7 @@ public static function getSubscribedEvents()
{
$events = [KernelEvents::REQUEST => ['configure', 2048]];
- if ('cli' === \PHP_SAPI && \defined('Symfony\Component\Console\ConsoleEvents::COMMAND')) {
+ if (\defined('Symfony\Component\Console\ConsoleEvents::COMMAND')) {
$events[ConsoleEvents::COMMAND] = ['configure', 2048];
}
diff --git a/vendor/symfony/http-kernel/Fragment/FragmentHandler.php b/vendor/symfony/http-kernel/Fragment/FragmentHandler.php
index 9629cf7066..b98b1779ad 100644
--- a/vendor/symfony/http-kernel/Fragment/FragmentHandler.php
+++ b/vendor/symfony/http-kernel/Fragment/FragmentHandler.php
@@ -100,7 +100,7 @@ public function render($uri, $renderer = 'inline', array $options = [])
protected function deliver(Response $response)
{
if (!$response->isSuccessful()) {
- throw new \RuntimeException(sprintf('Error when rendering "%s" (Status code is %s).', $this->requestStack->getCurrentRequest()->getUri(), $response->getStatusCode()));
+ throw new \RuntimeException(sprintf('Error when rendering "%s" (Status code is %d).', $this->requestStack->getCurrentRequest()->getUri(), $response->getStatusCode()));
}
if (!$response instanceof StreamedResponse) {
diff --git a/vendor/symfony/http-kernel/Fragment/HIncludeFragmentRenderer.php b/vendor/symfony/http-kernel/Fragment/HIncludeFragmentRenderer.php
index f94a5c0760..4850e589da 100644
--- a/vendor/symfony/http-kernel/Fragment/HIncludeFragmentRenderer.php
+++ b/vendor/symfony/http-kernel/Fragment/HIncludeFragmentRenderer.php
@@ -57,7 +57,7 @@ public function __construct($templating = null, UriSigner $signer = null, $globa
public function setTemplating($templating)
{
if (null !== $templating && !$templating instanceof EngineInterface && !$templating instanceof Environment) {
- throw new \InvalidArgumentException('The hinclude rendering strategy needs an instance of Twig\Environment or Symfony\Component\Templating\EngineInterface');
+ throw new \InvalidArgumentException('The hinclude rendering strategy needs an instance of Twig\Environment or Symfony\Component\Templating\EngineInterface.');
}
$this->templating = $templating;
diff --git a/vendor/symfony/http-kernel/HttpCache/AbstractSurrogate.php b/vendor/symfony/http-kernel/HttpCache/AbstractSurrogate.php
index 9b4541793f..472d87e483 100644
--- a/vendor/symfony/http-kernel/HttpCache/AbstractSurrogate.php
+++ b/vendor/symfony/http-kernel/HttpCache/AbstractSurrogate.php
@@ -96,7 +96,7 @@ public function handle(HttpCache $cache, $uri, $alt, $ignoreErrors)
$response = $cache->handle($subRequest, HttpKernelInterface::SUB_REQUEST, true);
if (!$response->isSuccessful()) {
- throw new \RuntimeException(sprintf('Error when rendering "%s" (Status code is %s).', $subRequest->getUri(), $response->getStatusCode()));
+ throw new \RuntimeException(sprintf('Error when rendering "%s" (Status code is %d).', $subRequest->getUri(), $response->getStatusCode()));
}
return $response->getContent();
diff --git a/vendor/symfony/http-kernel/HttpCache/HttpCache.php b/vendor/symfony/http-kernel/HttpCache/HttpCache.php
index addeca8bae..3471758525 100644
--- a/vendor/symfony/http-kernel/HttpCache/HttpCache.php
+++ b/vendor/symfony/http-kernel/HttpCache/HttpCache.php
@@ -323,6 +323,10 @@ protected function lookup(Request $request, $catch = false)
return $this->validate($request, $entry, $catch);
}
+ if ($entry->headers->hasCacheControlDirective('no-cache')) {
+ return $this->validate($request, $entry, $catch);
+ }
+
$this->record($request, 'fresh');
$entry->headers->set('Age', $entry->getAge());
@@ -352,7 +356,9 @@ protected function validate(Request $request, Response $entry, $catch = false)
}
// add our cached last-modified validator
- $subRequest->headers->set('if_modified_since', $entry->headers->get('Last-Modified'));
+ if ($entry->headers->has('Last-Modified')) {
+ $subRequest->headers->set('if_modified_since', $entry->headers->get('Last-Modified'));
+ }
// Add our cached etag validator to the environment.
// We keep the etags from the client to handle the case when the client
@@ -446,13 +452,37 @@ protected function forward(Request $request, $catch = false, Response $entry = n
// always a "master" request (as the real master request can be in cache)
$response = SubRequestHandler::handle($this->kernel, $request, HttpKernelInterface::MASTER_REQUEST, $catch);
- // we don't implement the stale-if-error on Requests, which is nonetheless part of the RFC
- if (null !== $entry && \in_array($response->getStatusCode(), [500, 502, 503, 504])) {
+ /*
+ * Support stale-if-error given on Responses or as a config option.
+ * RFC 7234 summarizes in Section 4.2.4 (but also mentions with the individual
+ * Cache-Control directives) that
+ *
+ * A cache MUST NOT generate a stale response if it is prohibited by an
+ * explicit in-protocol directive (e.g., by a "no-store" or "no-cache"
+ * cache directive, a "must-revalidate" cache-response-directive, or an
+ * applicable "s-maxage" or "proxy-revalidate" cache-response-directive;
+ * see Section 5.2.2).
+ *
+ * https://tools.ietf.org/html/rfc7234#section-4.2.4
+ *
+ * We deviate from this in one detail, namely that we *do* serve entries in the
+ * stale-if-error case even if they have a `s-maxage` Cache-Control directive.
+ */
+ if (null !== $entry
+ && \in_array($response->getStatusCode(), [500, 502, 503, 504])
+ && !$entry->headers->hasCacheControlDirective('no-cache')
+ && !$entry->mustRevalidate()
+ ) {
if (null === $age = $entry->headers->getCacheControlDirective('stale-if-error')) {
$age = $this->options['stale_if_error'];
}
- if (abs($entry->getTtl()) < $age) {
+ /*
+ * stale-if-error gives the (extra) time that the Response may be used *after* it has become stale.
+ * So we compare the time the $entry has been sitting in the cache already with the
+ * time it was fresh plus the allowed grace period.
+ */
+ if ($entry->getAge() <= $entry->getMaxAge() + $age) {
$this->record($request, 'stale-if-error');
return $entry;
diff --git a/vendor/symfony/http-kernel/HttpCache/ResponseCacheStrategy.php b/vendor/symfony/http-kernel/HttpCache/ResponseCacheStrategy.php
index 3bdf0f5199..aee689e1ce 100644
--- a/vendor/symfony/http-kernel/HttpCache/ResponseCacheStrategy.php
+++ b/vendor/symfony/http-kernel/HttpCache/ResponseCacheStrategy.php
@@ -110,8 +110,6 @@ public function update(Response $response)
$response->headers->set('Age', $this->age);
if ($this->isNotCacheableResponseEmbedded) {
- $response->setExpires($response->getDate());
-
if ($this->flagDirectives['no-store']) {
$response->headers->set('Cache-Control', 'no-cache, no-store, must-revalidate');
} else {
diff --git a/vendor/symfony/http-kernel/HttpCache/Store.php b/vendor/symfony/http-kernel/HttpCache/Store.php
index c831ba2ac3..fd04a7b23d 100644
--- a/vendor/symfony/http-kernel/HttpCache/Store.php
+++ b/vendor/symfony/http-kernel/HttpCache/Store.php
@@ -177,19 +177,15 @@ public function write(Request $request, Response $response)
$key = $this->getCacheKey($request);
$storedEnv = $this->persistRequest($request);
- // write the response body to the entity store if this is the original response
- if (!$response->headers->has('X-Content-Digest')) {
- $digest = $this->generateContentDigest($response);
+ $digest = $this->generateContentDigest($response);
+ $response->headers->set('X-Content-Digest', $digest);
- if (!$this->save($digest, $response->getContent())) {
- throw new \RuntimeException('Unable to store the entity.');
- }
-
- $response->headers->set('X-Content-Digest', $digest);
+ if (!$this->save($digest, $response->getContent(), false)) {
+ throw new \RuntimeException('Unable to store the entity.');
+ }
- if (!$response->headers->has('Transfer-Encoding')) {
- $response->headers->set('Content-Length', \strlen($response->getContent()));
- }
+ if (!$response->headers->has('Transfer-Encoding')) {
+ $response->headers->set('Content-Length', \strlen($response->getContent()));
}
// read existing cache entries, remove non-varying, and add this one to the list
@@ -362,15 +358,20 @@ private function load($key)
/**
* Save data for the given key.
*
- * @param string $key The store key
- * @param string $data The data to store
+ * @param string $key The store key
+ * @param string $data The data to store
+ * @param bool $overwrite Whether existing data should be overwritten
*
* @return bool
*/
- private function save($key, $data)
+ private function save($key, $data, $overwrite = true)
{
$path = $this->getPath($key);
+ if (!$overwrite && file_exists($path)) {
+ return true;
+ }
+
if (isset($this->locks[$key])) {
$fp = $this->locks[$key];
@ftruncate($fp, 0);
diff --git a/vendor/symfony/http-kernel/HttpKernel.php b/vendor/symfony/http-kernel/HttpKernel.php
index bca2cd1688..9769d5e802 100644
--- a/vendor/symfony/http-kernel/HttpKernel.php
+++ b/vendor/symfony/http-kernel/HttpKernel.php
@@ -62,7 +62,7 @@ public function __construct(EventDispatcherInterface $dispatcher, ControllerReso
*/
public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQUEST, $catch = true)
{
- $request->headers->set('X-Php-Ob-Level', ob_get_level());
+ $request->headers->set('X-Php-Ob-Level', (string) ob_get_level());
try {
return $this->handleRaw($request, $type);
diff --git a/vendor/symfony/http-kernel/Kernel.php b/vendor/symfony/http-kernel/Kernel.php
index 05b11f3665..00382a95c1 100644
--- a/vendor/symfony/http-kernel/Kernel.php
+++ b/vendor/symfony/http-kernel/Kernel.php
@@ -67,11 +67,11 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
private $requestStackSize = 0;
private $resetServices = false;
- const VERSION = '3.4.35';
- const VERSION_ID = 30435;
+ const VERSION = '3.4.41';
+ const VERSION_ID = 30441;
const MAJOR_VERSION = 3;
const MINOR_VERSION = 4;
- const RELEASE_VERSION = 35;
+ const RELEASE_VERSION = 41;
const EXTRA_VERSION = '';
const END_OF_MAINTENANCE = '11/2020';
@@ -236,7 +236,7 @@ public function getBundle($name, $first = true/*, $noDeprecation = false */)
}
if (!isset($this->bundleMap[$name])) {
- throw new \InvalidArgumentException(sprintf('Bundle "%s" does not exist or it is not enabled. Maybe you forgot to add it in the registerBundles() method of your %s.php file?', $name, \get_class($this)));
+ throw new \InvalidArgumentException(sprintf('Bundle "%s" does not exist or it is not enabled. Maybe you forgot to add it in the registerBundles() method of your "%s.php" file?', $name, static::class));
}
if (true === $first) {
@@ -493,7 +493,7 @@ protected function initializeBundles()
foreach ($this->registerBundles() as $bundle) {
$name = $bundle->getName();
if (isset($this->bundles[$name])) {
- throw new \LogicException(sprintf('Trying to register two bundles with the same name "%s"', $name));
+ throw new \LogicException(sprintf('Trying to register two bundles with the same name "%s".', $name));
}
$this->bundles[$name] = $bundle;
@@ -583,7 +583,7 @@ protected function initializeContainer()
$oldContainer = null;
if ($fresh = $cache->isFresh()) {
// Silence E_WARNING to ignore "include" failures - don't use "@" to prevent silencing fatal errors
- $errorLevel = error_reporting(\E_ALL ^ \E_WARNING);
+ $errorLevel = error_reporting(E_ALL ^ E_WARNING);
$fresh = $oldContainer = false;
try {
if (file_exists($cache->getPath()) && \is_object($this->container = include $cache->getPath())) {
@@ -651,7 +651,7 @@ protected function initializeContainer()
}
if (null === $oldContainer && file_exists($cache->getPath())) {
- $errorLevel = error_reporting(\E_ALL ^ \E_WARNING);
+ $errorLevel = error_reporting(E_ALL ^ E_WARNING);
try {
$oldContainer = include $cache->getPath();
} catch (\Throwable $e) {
@@ -762,10 +762,10 @@ protected function buildContainer()
foreach (['cache' => $this->warmupDir ?: $this->getCacheDir(), 'logs' => $this->getLogDir()] as $name => $dir) {
if (!is_dir($dir)) {
if (false === @mkdir($dir, 0777, true) && !is_dir($dir)) {
- throw new \RuntimeException(sprintf("Unable to create the %s directory (%s)\n", $name, $dir));
+ throw new \RuntimeException(sprintf('Unable to create the "%s" directory (%s).', $name, $dir));
}
} elseif (!is_writable($dir)) {
- throw new \RuntimeException(sprintf("Unable to write in the %s directory (%s)\n", $name, $dir));
+ throw new \RuntimeException(sprintf('Unable to write in the "%s" directory (%s).', $name, $dir));
}
}
diff --git a/vendor/symfony/http-kernel/LICENSE b/vendor/symfony/http-kernel/LICENSE
index a677f43763..9e936ec044 100644
--- a/vendor/symfony/http-kernel/LICENSE
+++ b/vendor/symfony/http-kernel/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2019 Fabien Potencier
+Copyright (c) 2004-2020 Fabien Potencier
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/vendor/symfony/http-kernel/Log/Logger.php b/vendor/symfony/http-kernel/Log/Logger.php
index 50cbcd428f..bbdd101d7d 100644
--- a/vendor/symfony/http-kernel/Log/Logger.php
+++ b/vendor/symfony/http-kernel/Log/Logger.php
@@ -37,10 +37,10 @@ class Logger extends AbstractLogger
private $formatter;
private $handle;
- public function __construct($minLevel = null, $output = 'php://stderr', callable $formatter = null)
+ public function __construct($minLevel = null, $output = null, callable $formatter = null)
{
if (null === $minLevel) {
- $minLevel = 'php://stdout' === $output || 'php://stderr' === $output ? LogLevel::CRITICAL : LogLevel::WARNING;
+ $minLevel = null === $output || 'php://stdout' === $output || 'php://stderr' === $output ? LogLevel::ERROR : LogLevel::WARNING;
if (isset($_ENV['SHELL_VERBOSITY']) || isset($_SERVER['SHELL_VERBOSITY'])) {
switch ((int) (isset($_ENV['SHELL_VERBOSITY']) ? $_ENV['SHELL_VERBOSITY'] : $_SERVER['SHELL_VERBOSITY'])) {
@@ -58,7 +58,7 @@ public function __construct($minLevel = null, $output = 'php://stderr', callable
$this->minLevelIndex = self::$levels[$minLevel];
$this->formatter = $formatter ?: [$this, 'format'];
- if (false === $this->handle = \is_resource($output) ? $output : @fopen($output, 'a')) {
+ if ($output && false === $this->handle = \is_resource($output) ? $output : @fopen($output, 'a')) {
throw new InvalidArgumentException(sprintf('Unable to open "%s".', $output));
}
}
@@ -77,7 +77,11 @@ public function log($level, $message, array $context = [])
}
$formatter = $this->formatter;
- fwrite($this->handle, $formatter($level, $message, $context));
+ if ($this->handle) {
+ @fwrite($this->handle, $formatter($level, $message, $context));
+ } else {
+ error_log($formatter($level, $message, $context, false));
+ }
}
/**
@@ -86,7 +90,7 @@ public function log($level, $message, array $context = [])
*
* @return string
*/
- private function format($level, $message, array $context)
+ private function format($level, $message, array $context, $prefixDate = true)
{
if (false !== strpos($message, '{')) {
$replacements = [];
@@ -105,6 +109,11 @@ private function format($level, $message, array $context)
$message = strtr($message, $replacements);
}
- return sprintf('%s [%s] %s', date(\DateTime::RFC3339), $level, $message).\PHP_EOL;
+ $log = sprintf('[%s] %s', $level, $message).PHP_EOL;
+ if ($prefixDate) {
+ $log = date(\DateTime::RFC3339).' '.$log;
+ }
+
+ return $log;
}
}
diff --git a/vendor/symfony/http-kernel/README.md b/vendor/symfony/http-kernel/README.md
index cc5e74b6bc..abdaf513f9 100644
--- a/vendor/symfony/http-kernel/README.md
+++ b/vendor/symfony/http-kernel/README.md
@@ -9,7 +9,7 @@ an advanced CMS system (Drupal).
Resources
---------
- * [Documentation](https://symfony.com/doc/current/components/http_kernel/index.html)
+ * [Documentation](https://symfony.com/doc/current/components/http_kernel.html)
* [Contributing](https://symfony.com/doc/current/contributing/index.html)
* [Report issues](https://github.com/symfony/symfony/issues) and
[send Pull Requests](https://github.com/symfony/symfony/pulls)
diff --git a/vendor/symfony/http-kernel/Tests/CacheClearer/Psr6CacheClearerTest.php b/vendor/symfony/http-kernel/Tests/CacheClearer/Psr6CacheClearerTest.php
index 2fbce41d1c..4d46c91762 100644
--- a/vendor/symfony/http-kernel/Tests/CacheClearer/Psr6CacheClearerTest.php
+++ b/vendor/symfony/http-kernel/Tests/CacheClearer/Psr6CacheClearerTest.php
@@ -40,7 +40,7 @@ public function testClearPool()
public function testClearPoolThrowsExceptionOnUnreferencedPool()
{
$this->expectException('InvalidArgumentException');
- $this->expectExceptionMessage('Cache pool not found: unknown');
+ $this->expectExceptionMessage('Cache pool not found: "unknown"');
(new Psr6CacheClearer())->clearPool('unknown');
}
diff --git a/vendor/symfony/http-kernel/Tests/Controller/ArgumentResolverTest.php b/vendor/symfony/http-kernel/Tests/Controller/ArgumentResolverTest.php
index a964aaeb58..bf94728a43 100644
--- a/vendor/symfony/http-kernel/Tests/Controller/ArgumentResolverTest.php
+++ b/vendor/symfony/http-kernel/Tests/Controller/ArgumentResolverTest.php
@@ -216,10 +216,10 @@ public function testGetNullableArguments()
$request = Request::create('/');
$request->attributes->set('foo', 'foo');
$request->attributes->set('bar', new \stdClass());
- $request->attributes->set('mandatory', 'mandatory');
+ $request->attributes->set('last', 'last');
$controller = [new NullableController(), 'action'];
- $this->assertEquals(['foo', new \stdClass(), 'value', 'mandatory'], self::$resolver->getArguments($request, $controller));
+ $this->assertEquals(['foo', new \stdClass(), 'value', 'last'], self::$resolver->getArguments($request, $controller));
}
/**
@@ -228,10 +228,10 @@ public function testGetNullableArguments()
public function testGetNullableArgumentsWithDefaults()
{
$request = Request::create('/');
- $request->attributes->set('mandatory', 'mandatory');
+ $request->attributes->set('last', 'last');
$controller = [new NullableController(), 'action'];
- $this->assertEquals([null, null, 'value', 'mandatory'], self::$resolver->getArguments($request, $controller));
+ $this->assertEquals([null, null, 'value', 'last'], self::$resolver->getArguments($request, $controller));
}
public function testGetSessionArguments()
diff --git a/vendor/symfony/http-kernel/Tests/Controller/ContainerControllerResolverTest.php b/vendor/symfony/http-kernel/Tests/Controller/ContainerControllerResolverTest.php
index 1f8ddb8314..4c4abf5aa4 100644
--- a/vendor/symfony/http-kernel/Tests/Controller/ContainerControllerResolverTest.php
+++ b/vendor/symfony/http-kernel/Tests/Controller/ContainerControllerResolverTest.php
@@ -39,7 +39,7 @@ public function testGetControllerService()
$controller = $resolver->getController($request);
- $this->assertInstanceOf(\get_class($this), $controller[0]);
+ $this->assertInstanceOf(static::class, $controller[0]);
$this->assertSame('controllerMethod1', $controller[1]);
}
@@ -71,7 +71,7 @@ public function testGetControllerInvokableService()
public function testGetControllerInvokableServiceWithClassNameAsName()
{
$invokableController = new InvokableController('bar');
- $className = __NAMESPACE__.'\InvokableController';
+ $className = InvokableController::class;
$container = $this->createMockContainer();
$container->expects($this->once())
@@ -229,7 +229,7 @@ public function testExceptionWhenUsingControllerWithoutAnInvokeMethod()
*/
public function testGetControllerOnNonUndefinedFunction($controller, $exceptionName = null, $exceptionMessage = null)
{
- // All this logic needs to be duplicated, since calling parent::testGetControllerOnNonUndefinedFunction will override the expected excetion and not use the regex
+ // All this logic needs to be duplicated, since calling parent::testGetControllerOnNonUndefinedFunction will override the expected exception and not use the regex
$resolver = $this->createControllerResolver();
$this->expectException($exceptionName);
$this->expectExceptionMessageRegExp($exceptionMessage);
@@ -248,7 +248,7 @@ public function getUndefinedControllers()
[
'Symfony\Component\HttpKernel\Tests\Controller\ControllerResolverTest::bar',
\InvalidArgumentException::class,
- '/.?[cC]ontroller(.*?) for URI "\/" is not callable\.( Expected method(.*) Available methods)?/',
+ '/.?[cC]ontroller(.*?) for URI "\/" is not callable:( Expected method(.*) Available methods)?/',
],
];
}
diff --git a/vendor/symfony/http-kernel/Tests/Controller/ControllerResolverTest.php b/vendor/symfony/http-kernel/Tests/Controller/ControllerResolverTest.php
index e34427a32e..d249468e88 100644
--- a/vendor/symfony/http-kernel/Tests/Controller/ControllerResolverTest.php
+++ b/vendor/symfony/http-kernel/Tests/Controller/ControllerResolverTest.php
@@ -15,7 +15,7 @@
use Psr\Log\LoggerInterface;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpKernel\Controller\ControllerResolver;
-use Symfony\Component\HttpKernel\Tests\Fixtures\Controller\NullableController;
+use Symfony\Component\HttpKernel\Tests\Fixtures\Controller\LegacyNullableController;
use Symfony\Component\HttpKernel\Tests\Fixtures\Controller\VariadicController;
class ControllerResolverTest extends TestCase
@@ -131,10 +131,10 @@ public function getUndefinedControllers()
['foo', 'InvalidArgumentException', 'Unable to find controller "foo".'],
['oof::bar', 'InvalidArgumentException', 'Class "oof" does not exist.'],
['stdClass', 'InvalidArgumentException', 'Unable to find controller "stdClass".'],
- ['Symfony\Component\HttpKernel\Tests\Controller\ControllerTest::staticsAction', 'InvalidArgumentException', 'The controller for URI "/" is not callable. Expected method "staticsAction" on class "Symfony\Component\HttpKernel\Tests\Controller\ControllerTest", did you mean "staticAction"?'],
- ['Symfony\Component\HttpKernel\Tests\Controller\ControllerTest::privateAction', 'InvalidArgumentException', 'The controller for URI "/" is not callable. Method "privateAction" on class "Symfony\Component\HttpKernel\Tests\Controller\ControllerTest" should be public and non-abstract'],
- ['Symfony\Component\HttpKernel\Tests\Controller\ControllerTest::protectedAction', 'InvalidArgumentException', 'The controller for URI "/" is not callable. Method "protectedAction" on class "Symfony\Component\HttpKernel\Tests\Controller\ControllerTest" should be public and non-abstract'],
- ['Symfony\Component\HttpKernel\Tests\Controller\ControllerTest::undefinedAction', 'InvalidArgumentException', 'The controller for URI "/" is not callable. Expected method "undefinedAction" on class "Symfony\Component\HttpKernel\Tests\Controller\ControllerTest". Available methods: "publicAction", "staticAction"'],
+ ['Symfony\Component\HttpKernel\Tests\Controller\ControllerTest::staticsAction', 'InvalidArgumentException', 'The controller for URI "/" is not callable: Expected method "staticsAction" on class "Symfony\Component\HttpKernel\Tests\Controller\ControllerTest", did you mean "staticAction"?'],
+ ['Symfony\Component\HttpKernel\Tests\Controller\ControllerTest::privateAction', 'InvalidArgumentException', 'The controller for URI "/" is not callable: Method "privateAction" on class "Symfony\Component\HttpKernel\Tests\Controller\ControllerTest" should be public and non-abstract'],
+ ['Symfony\Component\HttpKernel\Tests\Controller\ControllerTest::protectedAction', 'InvalidArgumentException', 'The controller for URI "/" is not callable: Method "protectedAction" on class "Symfony\Component\HttpKernel\Tests\Controller\ControllerTest" should be public and non-abstract'],
+ ['Symfony\Component\HttpKernel\Tests\Controller\ControllerTest::undefinedAction', 'InvalidArgumentException', 'The controller for URI "/" is not callable: Expected method "undefinedAction" on class "Symfony\Component\HttpKernel\Tests\Controller\ControllerTest". Available methods: "publicAction", "staticAction"'],
];
}
@@ -247,13 +247,17 @@ public function testIfExceptionIsThrownWhenMissingAnArgument()
*/
public function testGetNullableArguments()
{
+ if (\PHP_VERSION_ID >= 80000) {
+ $this->markTestSkipped('PHP < 8 required.');
+ }
+
$resolver = new ControllerResolver();
$request = Request::create('/');
$request->attributes->set('foo', 'foo');
$request->attributes->set('bar', new \stdClass());
$request->attributes->set('mandatory', 'mandatory');
- $controller = [new NullableController(), 'action'];
+ $controller = [new LegacyNullableController(), 'action'];
$this->assertEquals(['foo', new \stdClass(), 'value', 'mandatory'], $resolver->getArguments($request, $controller));
}
@@ -263,11 +267,15 @@ public function testGetNullableArguments()
*/
public function testGetNullableArgumentsWithDefaults()
{
+ if (\PHP_VERSION_ID >= 80000) {
+ $this->markTestSkipped('PHP < 8 required.');
+ }
+
$resolver = new ControllerResolver();
$request = Request::create('/');
$request->attributes->set('mandatory', 'mandatory');
- $controller = [new NullableController(), 'action'];
+ $controller = [new LegacyNullableController(), 'action'];
$this->assertEquals([null, null, 'value', 'mandatory'], $resolver->getArguments($request, $controller));
}
diff --git a/vendor/symfony/http-kernel/Tests/ControllerMetadata/ArgumentMetadataFactoryTest.php b/vendor/symfony/http-kernel/Tests/ControllerMetadata/ArgumentMetadataFactoryTest.php
index 1c0c4648a0..00715462a2 100644
--- a/vendor/symfony/http-kernel/Tests/ControllerMetadata/ArgumentMetadataFactoryTest.php
+++ b/vendor/symfony/http-kernel/Tests/ControllerMetadata/ArgumentMetadataFactoryTest.php
@@ -48,7 +48,7 @@ public function testSignature2()
$this->assertEquals([
new ArgumentMetadata('foo', self::class, false, true, null, true),
- new ArgumentMetadata('bar', __NAMESPACE__.'\FakeClassThatDoesNotExist', false, true, null, true),
+ new ArgumentMetadata('bar', FakeClassThatDoesNotExist::class, false, true, null, true),
new ArgumentMetadata('baz', 'Fake\ImportedAndFake', false, true, null, true),
], $arguments);
}
@@ -58,7 +58,7 @@ public function testSignature3()
$arguments = $this->factory->createArgumentMetadata([$this, 'signature3']);
$this->assertEquals([
- new ArgumentMetadata('bar', __NAMESPACE__.'\FakeClassThatDoesNotExist', false, false, null),
+ new ArgumentMetadata('bar', FakeClassThatDoesNotExist::class, false, false, null),
new ArgumentMetadata('baz', 'Fake\ImportedAndFake', false, false, null),
], $arguments);
}
@@ -80,7 +80,7 @@ public function testSignature5()
$this->assertEquals([
new ArgumentMetadata('foo', 'array', false, true, null, true),
- new ArgumentMetadata('bar', null, false, false, null),
+ new ArgumentMetadata('bar', null, false, true, null, true),
], $arguments);
}
@@ -122,7 +122,7 @@ public function testNullableTypesSignature()
new ArgumentMetadata('foo', 'string', false, false, null, true),
new ArgumentMetadata('bar', \stdClass::class, false, false, null, true),
new ArgumentMetadata('baz', 'string', false, true, 'value', true),
- new ArgumentMetadata('mandatory', null, false, false, null, true),
+ new ArgumentMetadata('last', 'string', false, true, '', false),
], $arguments);
}
@@ -142,7 +142,7 @@ private function signature4($foo = 'default', $bar = 500, $baz = [])
{
}
- private function signature5(array $foo = null, $bar)
+ private function signature5(array $foo = null, $bar = null)
{
}
}
diff --git a/vendor/symfony/http-kernel/Tests/DataCollector/LoggerDataCollectorTest.php b/vendor/symfony/http-kernel/Tests/DataCollector/LoggerDataCollectorTest.php
index 8b7fbe2a19..b46357ed55 100644
--- a/vendor/symfony/http-kernel/Tests/DataCollector/LoggerDataCollectorTest.php
+++ b/vendor/symfony/http-kernel/Tests/DataCollector/LoggerDataCollectorTest.php
@@ -132,13 +132,15 @@ public function getCollectTestData()
[
['message' => 'foo3', 'context' => ['exception' => new \ErrorException('warning', 0, E_USER_WARNING)], 'priority' => 100, 'priorityName' => 'DEBUG'],
['message' => 'foo3', 'context' => ['exception' => new SilencedErrorContext(E_USER_WARNING, __FILE__, __LINE__)], 'priority' => 100, 'priorityName' => 'DEBUG'],
+ ['message' => '0', 'context' => ['exception' => new SilencedErrorContext(E_USER_WARNING, __FILE__, __LINE__)], 'priority' => 100, 'priorityName' => 'DEBUG'],
],
[
['message' => 'foo3', 'context' => ['exception' => ['warning', E_USER_WARNING]], 'priority' => 100, 'priorityName' => 'DEBUG'],
['message' => 'foo3', 'context' => ['exception' => [E_USER_WARNING]], 'priority' => 100, 'priorityName' => 'DEBUG', 'errorCount' => 1, 'scream' => true],
+ ['message' => '0', 'context' => ['exception' => [E_USER_WARNING]], 'priority' => 100, 'priorityName' => 'DEBUG', 'errorCount' => 1, 'scream' => true],
],
0,
- 1,
+ 2,
];
}
}
diff --git a/vendor/symfony/http-kernel/Tests/DataCollector/RequestDataCollectorTest.php b/vendor/symfony/http-kernel/Tests/DataCollector/RequestDataCollectorTest.php
index 5e97267da5..38979bba72 100644
--- a/vendor/symfony/http-kernel/Tests/DataCollector/RequestDataCollectorTest.php
+++ b/vendor/symfony/http-kernel/Tests/DataCollector/RequestDataCollectorTest.php
@@ -99,7 +99,7 @@ public function provideControllerCallables()
'"Regular" callable',
[$this, 'testControllerInspection'],
[
- 'class' => __NAMESPACE__.'\RequestDataCollectorTest',
+ 'class' => self::class,
'method' => 'testControllerInspection',
'file' => __FILE__,
'line' => $r1->getStartLine(),
diff --git a/vendor/symfony/http-kernel/Tests/DependencyInjection/ResettableServicePassTest.php b/vendor/symfony/http-kernel/Tests/DependencyInjection/ResettableServicePassTest.php
index d3c6869320..7ebe5dfb91 100644
--- a/vendor/symfony/http-kernel/Tests/DependencyInjection/ResettableServicePassTest.php
+++ b/vendor/symfony/http-kernel/Tests/DependencyInjection/ResettableServicePassTest.php
@@ -51,7 +51,7 @@ public function testCompilerPass()
public function testMissingMethod()
{
$this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
- $this->expectExceptionMessage('Tag kernel.reset requires the "method" attribute to be set.');
+ $this->expectExceptionMessage('Tag "kernel.reset" requires the "method" attribute to be set.');
$container = new ContainerBuilder();
$container->register(ResettableService::class)
->addTag('kernel.reset');
diff --git a/vendor/symfony/http-kernel/Tests/Fixtures/Controller/LegacyNullableController.php b/vendor/symfony/http-kernel/Tests/Fixtures/Controller/LegacyNullableController.php
new file mode 100644
index 0000000000..23dde69d48
--- /dev/null
+++ b/vendor/symfony/http-kernel/Tests/Fixtures/Controller/LegacyNullableController.php
@@ -0,0 +1,19 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpKernel\Tests\Fixtures\Controller;
+
+class LegacyNullableController
+{
+ public function action(?string $foo, ?\stdClass $bar, ?string $baz = 'value', $mandatory)
+ {
+ }
+}
diff --git a/vendor/symfony/http-kernel/Tests/Fixtures/Controller/NullableController.php b/vendor/symfony/http-kernel/Tests/Fixtures/Controller/NullableController.php
index 9db4df7b4c..aacae0e3e3 100644
--- a/vendor/symfony/http-kernel/Tests/Fixtures/Controller/NullableController.php
+++ b/vendor/symfony/http-kernel/Tests/Fixtures/Controller/NullableController.php
@@ -13,7 +13,7 @@
class NullableController
{
- public function action(?string $foo, ?\stdClass $bar, ?string $baz = 'value', $mandatory)
+ public function action(?string $foo, ?\stdClass $bar, ?string $baz = 'value', string $last = '')
{
}
}
diff --git a/vendor/symfony/http-kernel/Tests/HttpCache/HttpCacheTest.php b/vendor/symfony/http-kernel/Tests/HttpCache/HttpCacheTest.php
index a50e09fb14..cac06a80e5 100644
--- a/vendor/symfony/http-kernel/Tests/HttpCache/HttpCacheTest.php
+++ b/vendor/symfony/http-kernel/Tests/HttpCache/HttpCacheTest.php
@@ -443,6 +443,22 @@ public function testCachesResponsesWithExplicitNoCacheDirective()
$this->assertTrue($this->response->headers->has('Age'));
}
+ public function testRevalidatesResponsesWithNoCacheDirectiveEvenIfFresh()
+ {
+ $this->setNextResponse(200, ['Cache-Control' => 'public, no-cache, max-age=10', 'ETag' => 'some-etag'], 'OK');
+ $this->request('GET', '/'); // warm the cache
+
+ sleep(5);
+
+ $this->setNextResponse(304, ['Cache-Control' => 'public, no-cache, max-age=10', 'ETag' => 'some-etag']);
+ $this->request('GET', '/');
+
+ $this->assertHttpKernelIsCalled(); // no-cache -> MUST have revalidated at origin
+ $this->assertTraceContains('valid');
+ $this->assertEquals('OK', $this->response->getContent());
+ $this->assertEquals(0, $this->response->getAge());
+ }
+
public function testCachesResponsesWithAnExpirationHeader()
{
$time = \DateTime::createFromFormat('U', time() + 5);
@@ -859,6 +875,7 @@ public function testValidatesCachedResponsesUseSameHttpMethod()
public function testValidatesCachedResponsesWithETagAndNoFreshnessInformation()
{
$this->setNextResponse(200, [], 'Hello World', function ($request, $response) {
+ $this->assertFalse($request->headers->has('If-Modified-Since'));
$response->headers->set('Cache-Control', 'public');
$response->headers->set('ETag', '"12345"');
if ($response->getETag() == $request->headers->get('IF_NONE_MATCH')) {
@@ -1241,7 +1258,6 @@ public function testEsiCacheForceValidation()
$this->request('GET', '/', [], [], true);
$this->assertEquals('Hello World! My name is Bobby.', $this->response->getContent());
$this->assertNull($this->response->getTtl());
- $this->assertTrue($this->response->mustRevalidate());
$this->assertTrue($this->response->headers->hasCacheControlDirective('private'));
$this->assertTrue($this->response->headers->hasCacheControlDirective('no-cache'));
}
@@ -1272,7 +1288,6 @@ public function testEsiCacheForceValidationForHeadRequests()
// This can neither be cached nor revalidated, so it should be private/no cache
$this->assertEmpty($this->response->getContent());
$this->assertNull($this->response->getTtl());
- $this->assertTrue($this->response->mustRevalidate());
$this->assertTrue($this->response->headers->hasCacheControlDirective('private'));
$this->assertTrue($this->response->headers->hasCacheControlDirective('no-cache'));
}
@@ -1508,6 +1523,168 @@ public function testUsesOriginalRequestForSurrogate()
// Surrogate request
$cache->handle($request, HttpKernelInterface::SUB_REQUEST);
}
+
+ public function testStaleIfErrorMustNotResetLifetime()
+ {
+ // Make sure we don't accidentally treat the response as fresh (revalidated) again
+ // when stale-if-error handling kicks in.
+
+ $responses = [
+ [
+ 'status' => 200,
+ 'body' => 'OK',
+ // This is cacheable and can be used in stale-if-error cases:
+ 'headers' => ['Cache-Control' => 'public, max-age=10', 'ETag' => 'some-etag'],
+ ],
+ [
+ 'status' => 500,
+ 'body' => 'FAIL',
+ 'headers' => [],
+ ],
+ [
+ 'status' => 500,
+ 'body' => 'FAIL',
+ 'headers' => [],
+ ],
+ ];
+
+ $this->setNextResponses($responses);
+ $this->cacheConfig['stale_if_error'] = 10;
+
+ $this->request('GET', '/'); // warm cache
+
+ sleep(15); // now the entry is stale, but still within the grace period (10s max-age + 10s stale-if-error)
+
+ $this->request('GET', '/'); // hit backend error
+ $this->assertEquals(200, $this->response->getStatusCode()); // stale-if-error saved the day
+ $this->assertEquals(15, $this->response->getAge());
+
+ sleep(10); // now we're outside the grace period
+
+ $this->request('GET', '/'); // hit backend error
+ $this->assertEquals(500, $this->response->getStatusCode()); // fail
+ }
+
+ /**
+ * @dataProvider getResponseDataThatMayBeServedStaleIfError
+ */
+ public function testResponsesThatMayBeUsedStaleIfError($responseHeaders, $sleepBetweenRequests = null)
+ {
+ $responses = [
+ [
+ 'status' => 200,
+ 'body' => 'OK',
+ 'headers' => $responseHeaders,
+ ],
+ [
+ 'status' => 500,
+ 'body' => 'FAIL',
+ 'headers' => [],
+ ],
+ ];
+
+ $this->setNextResponses($responses);
+ $this->cacheConfig['stale_if_error'] = 10; // after stale, may be served for 10s
+
+ $this->request('GET', '/'); // warm cache
+
+ if ($sleepBetweenRequests) {
+ sleep($sleepBetweenRequests);
+ }
+
+ $this->request('GET', '/'); // hit backend error
+
+ $this->assertEquals(200, $this->response->getStatusCode());
+ $this->assertEquals('OK', $this->response->getContent());
+ $this->assertTraceContains('stale-if-error');
+ }
+
+ public function getResponseDataThatMayBeServedStaleIfError()
+ {
+ // All data sets assume that a 10s stale-if-error grace period has been configured
+ yield 'public, max-age expired' => [['Cache-Control' => 'public, max-age=60'], 65];
+ yield 'public, validateable with ETag, no TTL' => [['Cache-Control' => 'public', 'ETag' => 'some-etag'], 5];
+ yield 'public, validateable with Last-Modified, no TTL' => [['Cache-Control' => 'public', 'Last-Modified' => 'yesterday'], 5];
+ yield 'public, s-maxage will be served stale-if-error, even if the RFC mandates otherwise' => [['Cache-Control' => 'public, s-maxage=20'], 25];
+ }
+
+ /**
+ * @dataProvider getResponseDataThatMustNotBeServedStaleIfError
+ */
+ public function testResponsesThatMustNotBeUsedStaleIfError($responseHeaders, $sleepBetweenRequests = null)
+ {
+ $responses = [
+ [
+ 'status' => 200,
+ 'body' => 'OK',
+ 'headers' => $responseHeaders,
+ ],
+ [
+ 'status' => 500,
+ 'body' => 'FAIL',
+ 'headers' => [],
+ ],
+ ];
+
+ $this->setNextResponses($responses);
+ $this->cacheConfig['stale_if_error'] = 10; // after stale, may be served for 10s
+ $this->cacheConfig['strict_smaxage'] = true; // full RFC compliance for this feature
+
+ $this->request('GET', '/'); // warm cache
+
+ if ($sleepBetweenRequests) {
+ sleep($sleepBetweenRequests);
+ }
+
+ $this->request('GET', '/'); // hit backend error
+
+ $this->assertEquals(500, $this->response->getStatusCode());
+ }
+
+ public function getResponseDataThatMustNotBeServedStaleIfError()
+ {
+ // All data sets assume that a 10s stale-if-error grace period has been configured
+ yield 'public, no TTL but beyond grace period' => [['Cache-Control' => 'public'], 15];
+ yield 'public, validateable with ETag, no TTL but beyond grace period' => [['Cache-Control' => 'public', 'ETag' => 'some-etag'], 15];
+ yield 'public, validateable with Last-Modified, no TTL but beyond grace period' => [['Cache-Control' => 'public', 'Last-Modified' => 'yesterday'], 15];
+ yield 'public, stale beyond grace period' => [['Cache-Control' => 'public, max-age=10'], 30];
+
+ // Cache-control values that prohibit serving stale responses or responses without positive validation -
+ // see https://tools.ietf.org/html/rfc7234#section-4.2.4 and
+ // https://tools.ietf.org/html/rfc7234#section-5.2.2
+ yield 'no-cache requires positive validation' => [['Cache-Control' => 'public, no-cache', 'ETag' => 'some-etag']];
+ yield 'no-cache requires positive validation, even if fresh' => [['Cache-Control' => 'public, no-cache, max-age=10']];
+ yield 'must-revalidate requires positive validation once stale' => [['Cache-Control' => 'public, max-age=10, must-revalidate'], 15];
+ yield 'proxy-revalidate requires positive validation once stale' => [['Cache-Control' => 'public, max-age=10, proxy-revalidate'], 15];
+ }
+
+ public function testStaleIfErrorWhenStrictSmaxageDisabled()
+ {
+ $responses = [
+ [
+ 'status' => 200,
+ 'body' => 'OK',
+ 'headers' => ['Cache-Control' => 'public, s-maxage=20'],
+ ],
+ [
+ 'status' => 500,
+ 'body' => 'FAIL',
+ 'headers' => [],
+ ],
+ ];
+
+ $this->setNextResponses($responses);
+ $this->cacheConfig['stale_if_error'] = 10;
+ $this->cacheConfig['strict_smaxage'] = false;
+
+ $this->request('GET', '/'); // warm cache
+ sleep(25);
+ $this->request('GET', '/'); // hit backend error
+
+ $this->assertEquals(200, $this->response->getStatusCode());
+ $this->assertEquals('OK', $this->response->getContent());
+ $this->assertTraceContains('stale-if-error');
+ }
}
class TestKernel implements HttpKernelInterface
diff --git a/vendor/symfony/http-kernel/Tests/HttpCache/StoreTest.php b/vendor/symfony/http-kernel/Tests/HttpCache/StoreTest.php
index 77cb34cfa5..07c4154269 100644
--- a/vendor/symfony/http-kernel/Tests/HttpCache/StoreTest.php
+++ b/vendor/symfony/http-kernel/Tests/HttpCache/StoreTest.php
@@ -97,6 +97,27 @@ public function testSetsTheXContentDigestResponseHeaderBeforeStoring()
$this->assertEquals('en9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08', $res['x-content-digest'][0]);
}
+ public function testDoesNotTrustXContentDigestFromUpstream()
+ {
+ $response = new Response('test', 200, ['X-Content-Digest' => 'untrusted-from-elsewhere']);
+
+ $cacheKey = $this->store->write($this->request, $response);
+ $entries = $this->getStoreMetadata($cacheKey);
+ list(, $res) = $entries[0];
+
+ $this->assertEquals('en9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08', $res['x-content-digest'][0]);
+ $this->assertEquals('en9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08', $response->headers->get('X-Content-Digest'));
+ }
+
+ public function testWritesResponseEvenIfXContentDigestIsPresent()
+ {
+ // Prime the store
+ $this->store->write($this->request, new Response('test', 200, ['X-Content-Digest' => 'untrusted-from-elsewhere']));
+
+ $response = $this->store->lookup($this->request);
+ $this->assertNotNull($response);
+ }
+
public function testFindsAStoredEntryWithLookup()
{
$this->storeSimpleEntry();
diff --git a/vendor/symfony/http-kernel/Tests/Log/LoggerTest.php b/vendor/symfony/http-kernel/Tests/Log/LoggerTest.php
index 7439ae1376..79039c1c97 100644
--- a/vendor/symfony/http-kernel/Tests/Log/LoggerTest.php
+++ b/vendor/symfony/http-kernel/Tests/Log/LoggerTest.php
@@ -186,7 +186,7 @@ public function testContextExceptionKeyCanBeExceptionOrOtherValues()
public function testFormatter()
{
$this->logger = new Logger(LogLevel::DEBUG, $this->tmpFile, function ($level, $message, $context) {
- return json_encode(['level' => $level, 'message' => $message, 'context' => $context]).\PHP_EOL;
+ return json_encode(['level' => $level, 'message' => $message, 'context' => $context]).PHP_EOL;
});
$this->logger->error('An error', ['foo' => 'bar']);
diff --git a/vendor/symfony/polyfill-ctype/bootstrap.php b/vendor/symfony/polyfill-ctype/bootstrap.php
index 14d1d0faa3..8d6fc4becc 100644
--- a/vendor/symfony/polyfill-ctype/bootstrap.php
+++ b/vendor/symfony/polyfill-ctype/bootstrap.php
@@ -13,14 +13,34 @@
if (!function_exists('ctype_alnum')) {
function ctype_alnum($text) { return p\Ctype::ctype_alnum($text); }
+}
+if (!function_exists('ctype_alpha')) {
function ctype_alpha($text) { return p\Ctype::ctype_alpha($text); }
+}
+if (!function_exists('ctype_cntrl')) {
function ctype_cntrl($text) { return p\Ctype::ctype_cntrl($text); }
+}
+if (!function_exists('ctype_digit')) {
function ctype_digit($text) { return p\Ctype::ctype_digit($text); }
+}
+if (!function_exists('ctype_graph')) {
function ctype_graph($text) { return p\Ctype::ctype_graph($text); }
+}
+if (!function_exists('ctype_lower')) {
function ctype_lower($text) { return p\Ctype::ctype_lower($text); }
+}
+if (!function_exists('ctype_print')) {
function ctype_print($text) { return p\Ctype::ctype_print($text); }
+}
+if (!function_exists('ctype_punct')) {
function ctype_punct($text) { return p\Ctype::ctype_punct($text); }
+}
+if (!function_exists('ctype_space')) {
function ctype_space($text) { return p\Ctype::ctype_space($text); }
+}
+if (!function_exists('ctype_upper')) {
function ctype_upper($text) { return p\Ctype::ctype_upper($text); }
+}
+if (!function_exists('ctype_xdigit')) {
function ctype_xdigit($text) { return p\Ctype::ctype_xdigit($text); }
}
diff --git a/vendor/symfony/polyfill-ctype/composer.json b/vendor/symfony/polyfill-ctype/composer.json
index 090f923ef1..afb2a443e9 100644
--- a/vendor/symfony/polyfill-ctype/composer.json
+++ b/vendor/symfony/polyfill-ctype/composer.json
@@ -28,7 +28,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-master": "1.12-dev"
+ "dev-master": "1.17-dev"
}
}
}
diff --git a/vendor/symfony/polyfill-iconv/README.md b/vendor/symfony/polyfill-iconv/README.md
index 2421831c6b..b0c8984cd6 100644
--- a/vendor/symfony/polyfill-iconv/README.md
+++ b/vendor/symfony/polyfill-iconv/README.md
@@ -2,8 +2,8 @@ Symfony Polyfill / Iconv
========================
This component provides a native PHP implementation of the
-[php.net/iconv](http://php.net/iconv) functions
-(short of [`ob_iconv_handler`](http://php.net/manual/en/function.ob-iconv-handler.php)).
+[php.net/iconv](https://php.net/iconv) functions
+(short of [`ob_iconv_handler`](https://php.net/ob-iconv-handler)).
More information can be found in the
[main Polyfill README](https://github.com/symfony/polyfill/blob/master/README.md).
diff --git a/vendor/symfony/polyfill-iconv/Resources/charset/translit.php b/vendor/symfony/polyfill-iconv/Resources/charset/translit.php
index 829ea12759..ed59858dc4 100644
--- a/vendor/symfony/polyfill-iconv/Resources/charset/translit.php
+++ b/vendor/symfony/polyfill-iconv/Resources/charset/translit.php
@@ -866,6 +866,7 @@
'㋼' => '(ヰ)',
'㋽' => '(ヱ)',
'㋾' => '(ヲ)',
+ '㋿' => '令和',
'㌀' => 'アパート',
'㌁' => 'アルファ',
'㌂' => 'アンペア',
@@ -3133,6 +3134,7 @@
'🈸' => '申',
'🈹' => '割',
'🈺' => '営',
+ '🈻' => '配',
'🉀' => '〔本〕',
'🉁' => '〔三〕',
'🉂' => '〔二〕',
@@ -3878,6 +3880,104 @@
'ỽ' => 'v',
'Ỿ' => 'Y',
'ỿ' => 'y',
+ 'Ⱡ' => 'L',
+ 'ⱡ' => 'l',
+ 'Ɫ' => 'L',
+ 'Ᵽ' => 'P',
+ 'Ɽ' => 'R',
+ 'ⱥ' => 'a',
+ 'ⱦ' => 't',
+ 'Ⱨ' => 'H',
+ 'ⱨ' => 'h',
+ 'Ⱪ' => 'K',
+ 'ⱪ' => 'k',
+ 'Ⱬ' => 'Z',
+ 'ⱬ' => 'z',
+ 'Ɱ' => 'M',
+ 'ⱱ' => 'v',
+ 'Ⱳ' => 'W',
+ 'ⱳ' => 'w',
+ 'ⱴ' => 'v',
+ 'ⱸ' => 'e',
+ 'ⱺ' => 'o',
+ 'Ȿ' => 'S',
+ 'Ɀ' => 'Z',
+ 'ꜰ' => 'F',
+ 'ꜱ' => 'S',
+ 'Ꜳ' => 'AA',
+ 'ꜳ' => 'aa',
+ 'Ꜵ' => 'AO',
+ 'ꜵ' => 'ao',
+ 'Ꜷ' => 'AU',
+ 'ꜷ' => 'au',
+ 'Ꜹ' => 'AV',
+ 'ꜹ' => 'av',
+ 'Ꜻ' => 'AV',
+ 'ꜻ' => 'av',
+ 'Ꜽ' => 'AY',
+ 'ꜽ' => 'ay',
+ 'Ꝁ' => 'K',
+ 'ꝁ' => 'k',
+ 'Ꝃ' => 'K',
+ 'ꝃ' => 'k',
+ 'Ꝅ' => 'K',
+ 'ꝅ' => 'k',
+ 'Ꝇ' => 'L',
+ 'ꝇ' => 'l',
+ 'Ꝉ' => 'L',
+ 'ꝉ' => 'l',
+ 'Ꝋ' => 'O',
+ 'ꝋ' => 'o',
+ 'Ꝍ' => 'O',
+ 'ꝍ' => 'o',
+ 'Ꝏ' => 'OO',
+ 'ꝏ' => 'oo',
+ 'Ꝑ' => 'P',
+ 'ꝑ' => 'p',
+ 'Ꝓ' => 'P',
+ 'ꝓ' => 'p',
+ 'Ꝕ' => 'P',
+ 'ꝕ' => 'p',
+ 'Ꝗ' => 'Q',
+ 'ꝗ' => 'q',
+ 'Ꝙ' => 'Q',
+ 'ꝙ' => 'q',
+ 'Ꝟ' => 'V',
+ 'ꝟ' => 'v',
+ 'Ꝡ' => 'VY',
+ 'ꝡ' => 'vy',
+ 'Ꝥ' => 'TH',
+ 'ꝥ' => 'th',
+ 'Ꝧ' => 'TH',
+ 'ꝧ' => 'th',
+ 'ꝱ' => 'd',
+ 'ꝲ' => 'l',
+ 'ꝳ' => 'm',
+ 'ꝴ' => 'n',
+ 'ꝵ' => 'r',
+ 'ꝶ' => 'R',
+ 'ꝷ' => 't',
+ 'Ꝺ' => 'D',
+ 'ꝺ' => 'd',
+ 'Ꝼ' => 'F',
+ 'ꝼ' => 'f',
+ 'Ꞇ' => 'T',
+ 'ꞇ' => 't',
+ 'Ꞑ' => 'N',
+ 'ꞑ' => 'n',
+ 'Ꞓ' => 'C',
+ 'ꞓ' => 'c',
+ 'Ꞡ' => 'G',
+ 'ꞡ' => 'g',
+ 'Ꞣ' => 'K',
+ 'ꞣ' => 'k',
+ 'Ꞥ' => 'N',
+ 'ꞥ' => 'n',
+ 'Ꞧ' => 'R',
+ 'ꞧ' => 'r',
+ 'Ꞩ' => 'S',
+ 'ꞩ' => 's',
+ 'Ɦ' => 'H',
'©' => '(C)',
'®' => '(R)',
'₠' => 'CE',
@@ -3887,8 +3987,28 @@
'₧' => 'Pts',
'₺' => 'TL',
'₹' => 'Rs',
+ '℗' => '(P)',
+ '℘' => 'P',
'℞' => 'Rx',
'〇' => '0',
+ ' ' => ' ',
+ ' ' => ' ',
+ ' ' => ' ',
+ ' ' => ' ',
+ ' ' => ' ',
+ ' ' => ' ',
+ ' ' => ' ',
+ ' ' => ' ',
+ ' ' => ' ',
+ ' ' => ' ',
+ ' ' => ' ',
+ 'ʹ' => '\'',
+ 'ʺ' => '"',
+ 'ʻ' => '\'',
+ 'ʼ' => '\'',
+ 'ʽ' => '\'',
+ 'ˈ' => '\'',
+ 'ˋ' => '`',
'‘' => '\'',
'’' => '\'',
'‚' => ',',
@@ -3904,6 +4024,7 @@
'»' => '>>',
'‹' => '<',
'›' => '>',
+ '' => '-',
'‐' => '-',
'‑' => '-',
'‒' => '-',
@@ -3912,6 +4033,12 @@
'―' => '-',
'︱' => '-',
'︲' => '-',
+ '˂' => '<',
+ '˃' => '>',
+ '˄' => '^',
+ 'ˆ' => '^',
+ 'ː' => ':',
+ '˜' => '~',
'‖' => '||',
'⁄' => '/',
'⁅' => '[',
@@ -3952,6 +4079,8 @@
'﹈' => ']',
'×' => '*',
'÷' => '/',
+ '˖' => '+',
+ '˗' => '-',
'−' => '-',
'∕' => '/',
'∖' => '\\',
diff --git a/vendor/symfony/polyfill-iconv/bootstrap.php b/vendor/symfony/polyfill-iconv/bootstrap.php
index 52747329d1..14b5003a8b 100644
--- a/vendor/symfony/polyfill-iconv/bootstrap.php
+++ b/vendor/symfony/polyfill-iconv/bootstrap.php
@@ -11,34 +11,74 @@
use Symfony\Polyfill\Iconv as p;
-if (!function_exists('iconv')) {
+if (extension_loaded('iconv')) {
+ return;
+}
+
+if (!defined('ICONV_IMPL')) {
define('ICONV_IMPL', 'Symfony');
+}
+if (!defined('ICONV_VERSION')) {
define('ICONV_VERSION', '1.0');
+}
+if (!defined('ICONV_MIME_DECODE_STRICT')) {
define('ICONV_MIME_DECODE_STRICT', 1);
+}
+if (!defined('ICONV_MIME_DECODE_CONTINUE_ON_ERROR')) {
define('ICONV_MIME_DECODE_CONTINUE_ON_ERROR', 2);
+}
+if (!function_exists('iconv')) {
function iconv($from, $to, $s) { return p\Iconv::iconv($from, $to, $s); }
+}
+if (!function_exists('iconv_get_encoding')) {
function iconv_get_encoding($type = 'all') { return p\Iconv::iconv_get_encoding($type); }
+}
+if (!function_exists('iconv_set_encoding')) {
function iconv_set_encoding($type, $charset) { return p\Iconv::iconv_set_encoding($type, $charset); }
+}
+if (!function_exists('iconv_mime_encode')) {
function iconv_mime_encode($name, $value, $pref = null) { return p\Iconv::iconv_mime_encode($name, $value, $pref); }
+}
+if (!function_exists('iconv_mime_decode_headers')) {
function iconv_mime_decode_headers($encodedHeaders, $mode = 0, $enc = null) { return p\Iconv::iconv_mime_decode_headers($encodedHeaders, $mode, $enc); }
+}
- if (extension_loaded('mbstring')) {
+if (extension_loaded('mbstring')) {
+ if (!function_exists('iconv_strlen')) {
function iconv_strlen($s, $enc = null) { null === $enc and $enc = p\Iconv::$internalEncoding; return mb_strlen($s, $enc); }
+ }
+ if (!function_exists('iconv_strpos')) {
function iconv_strpos($s, $needle, $offset = 0, $enc = null) { null === $enc and $enc = p\Iconv::$internalEncoding; return mb_strpos($s, $needle, $offset, $enc); }
+ }
+ if (!function_exists('iconv_strrpos')) {
function iconv_strrpos($s, $needle, $enc = null) { null === $enc and $enc = p\Iconv::$internalEncoding; return mb_strrpos($s, $needle, 0, $enc); }
+ }
+ if (!function_exists('iconv_substr')) {
function iconv_substr($s, $start, $length = 2147483647, $enc = null) { null === $enc and $enc = p\Iconv::$internalEncoding; return mb_substr($s, $start, $length, $enc); }
+ }
+ if (!function_exists('iconv_mime_decode')) {
function iconv_mime_decode($encodedHeaders, $mode = 0, $enc = null) { null === $enc and $enc = p\Iconv::$internalEncoding; return mb_decode_mimeheader($encodedHeaders, $mode, $enc); }
- } else {
+ }
+} else {
+ if (!function_exists('iconv_strlen')) {
if (extension_loaded('xml')) {
function iconv_strlen($s, $enc = null) { return p\Iconv::strlen1($s, $enc); }
} else {
function iconv_strlen($s, $enc = null) { return p\Iconv::strlen2($s, $enc); }
}
+ }
+ if (!function_exists('iconv_strpos')) {
function iconv_strpos($s, $needle, $offset = 0, $enc = null) { return p\Iconv::iconv_strpos($s, $needle, $offset, $enc); }
+ }
+ if (!function_exists('iconv_strrpos')) {
function iconv_strrpos($s, $needle, $enc = null) { return p\Iconv::iconv_strrpos($s, $needle, $enc); }
+ }
+ if (!function_exists('iconv_substr')) {
function iconv_substr($s, $start, $length = 2147483647, $enc = null) { return p\Iconv::iconv_substr($s, $start, $length, $enc); }
+ }
+ if (!function_exists('iconv_mime_decode')) {
function iconv_mime_decode($encodedHeaders, $mode = 0, $enc = null) { return p\Iconv::iconv_mime_decode($encodedHeaders, $mode, $enc); }
}
}
diff --git a/vendor/symfony/polyfill-iconv/composer.json b/vendor/symfony/polyfill-iconv/composer.json
index 0c23267cbe..3df179e351 100644
--- a/vendor/symfony/polyfill-iconv/composer.json
+++ b/vendor/symfony/polyfill-iconv/composer.json
@@ -28,7 +28,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-master": "1.12-dev"
+ "dev-master": "1.17-dev"
}
}
}
diff --git a/vendor/symfony/polyfill-intl-idn/Idn.php b/vendor/symfony/polyfill-intl-idn/Idn.php
new file mode 100644
index 0000000000..f54ffd535c
--- /dev/null
+++ b/vendor/symfony/polyfill-intl-idn/Idn.php
@@ -0,0 +1,287 @@
+<?php
+
+/*
+ * Copyright (c) 2014 TrueServer B.V.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is furnished
+ * to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * Originally forked from
+ * https://github.com/true/php-punycode/blob/v2.1.1/src/Punycode.php
+ */
+
+namespace Symfony\Polyfill\Intl\Idn;
+
+/**
+ * Partial intl implementation in pure PHP.
+ *
+ * Implemented:
+ * - idn_to_ascii - Convert domain name to IDNA ASCII form
+ * - idn_to_utf8 - Convert domain name from IDNA ASCII to Unicode
+ *
+ * @author Renan Gonçalves <renan.saddam@gmail.com>
+ * @author Sebastian Kroczek <sk@xbug.de>
+ * @author Dmitry Lukashin <dmitry@lukashin.ru>
+ * @author Laurent Bassin <laurent@bassin.info>
+ *
+ * @internal
+ */
+final class Idn
+{
+ const INTL_IDNA_VARIANT_2003 = 0;
+ const INTL_IDNA_VARIANT_UTS46 = 1;
+
+ private static $encodeTable = array(
+ 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l',
+ 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x',
+ 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+ );
+
+ private static $decodeTable = array(
+ 'a' => 0, 'b' => 1, 'c' => 2, 'd' => 3, 'e' => 4, 'f' => 5,
+ 'g' => 6, 'h' => 7, 'i' => 8, 'j' => 9, 'k' => 10, 'l' => 11,
+ 'm' => 12, 'n' => 13, 'o' => 14, 'p' => 15, 'q' => 16, 'r' => 17,
+ 's' => 18, 't' => 19, 'u' => 20, 'v' => 21, 'w' => 22, 'x' => 23,
+ 'y' => 24, 'z' => 25, '0' => 26, '1' => 27, '2' => 28, '3' => 29,
+ '4' => 30, '5' => 31, '6' => 32, '7' => 33, '8' => 34, '9' => 35,
+ );
+
+ public static function idn_to_ascii($domain, $options, $variant, &$idna_info = array())
+ {
+ if (\PHP_VERSION_ID >= 70200 && self::INTL_IDNA_VARIANT_2003 === $variant) {
+ @trigger_error('idn_to_ascii(): INTL_IDNA_VARIANT_2003 is deprecated', E_USER_DEPRECATED);
+ }
+
+ if (self::INTL_IDNA_VARIANT_UTS46 === $variant) {
+ $domain = mb_strtolower($domain, 'utf-8');
+ }
+
+ $parts = explode('.', $domain);
+
+ foreach ($parts as $i => &$part) {
+ if ('' === $part && \count($parts) > 1 + $i) {
+ return false;
+ }
+ if (false === $part = self::encodePart($part)) {
+ return false;
+ }
+ }
+
+ $output = implode('.', $parts);
+
+ $idna_info = array(
+ 'result' => \strlen($output) > 255 ? false : $output,
+ 'isTransitionalDifferent' => false,
+ 'errors' => 0,
+ );
+
+ return $idna_info['result'];
+ }
+
+ public static function idn_to_utf8($domain, $options, $variant, &$idna_info = array())
+ {
+ if (\PHP_VERSION_ID >= 70200 && self::INTL_IDNA_VARIANT_2003 === $variant) {
+ @trigger_error('idn_to_utf8(): INTL_IDNA_VARIANT_2003 is deprecated', E_USER_DEPRECATED);
+ }
+
+ $parts = explode('.', $domain);
+
+ foreach ($parts as &$part) {
+ $length = \strlen($part);
+ if ($length < 1 || 63 < $length) {
+ continue;
+ }
+ if (0 !== strpos($part, 'xn--')) {
+ continue;
+ }
+
+ $part = substr($part, 4);
+ $part = self::decodePart($part);
+ }
+
+ $output = implode('.', $parts);
+
+ $idna_info = array(
+ 'result' => \strlen($output) > 255 ? false : $output,
+ 'isTransitionalDifferent' => false,
+ 'errors' => 0,
+ );
+
+ return $idna_info['result'];
+ }
+
+ private static function encodePart($input)
+ {
+ if (\substr($input, 0, 1) === '-' || \substr($input, -1) === '-') {
+ return false;
+ }
+
+ $codePoints = self::listCodePoints($input);
+
+ $n = 128;
+ $bias = 72;
+ $delta = 0;
+ $h = $b = \count($codePoints['basic']);
+
+ $output = '';
+ foreach ($codePoints['basic'] as $code) {
+ $output .= mb_chr($code, 'utf-8');
+ }
+ if ($input === $output) {
+ return $output;
+ }
+ if ($b > 0) {
+ $output .= '-';
+ }
+
+ $codePoints['nonBasic'] = array_unique($codePoints['nonBasic']);
+ sort($codePoints['nonBasic']);
+
+ $i = 0;
+ $length = mb_strlen($input, 'utf-8');
+ while ($h < $length) {
+ $m = $codePoints['nonBasic'][$i++];
+ $delta += ($m - $n) * ($h + 1);
+ $n = $m;
+
+ foreach ($codePoints['all'] as $c) {
+ if ($c < $n || $c < 128) {
+ ++$delta;
+ }
+ if ($c === $n) {
+ $q = $delta;
+ for ($k = 36;; $k += 36) {
+ $t = self::calculateThreshold($k, $bias);
+ if ($q < $t) {
+ break;
+ }
+
+ $code = $t + (($q - $t) % (36 - $t));
+ $output .= self::$encodeTable[$code];
+
+ $q = ($q - $t) / (36 - $t);
+ }
+
+ $output .= self::$encodeTable[$q];
+ $bias = self::adapt($delta, $h + 1, ($h === $b));
+ $delta = 0;
+ ++$h;
+ }
+ }
+
+ ++$delta;
+ ++$n;
+ }
+
+ $output = 'xn--'.$output;
+
+ return \strlen($output) < 1 || 63 < \strlen($output) ? false : strtolower($output);
+ }
+
+ private static function listCodePoints($input)
+ {
+ $codePoints = array(
+ 'all' => array(),
+ 'basic' => array(),
+ 'nonBasic' => array(),
+ );
+
+ $length = mb_strlen($input, 'utf-8');
+ for ($i = 0; $i < $length; ++$i) {
+ $char = mb_substr($input, $i, 1, 'utf-8');
+ $code = mb_ord($char, 'utf-8');
+ if ($code < 128) {
+ $codePoints['all'][] = $codePoints['basic'][] = $code;
+ } else {
+ $codePoints['all'][] = $codePoints['nonBasic'][] = $code;
+ }
+ }
+
+ return $codePoints;
+ }
+
+ private static function calculateThreshold($k, $bias)
+ {
+ if ($k <= $bias + 1) {
+ return 1;
+ }
+ if ($k >= $bias + 26) {
+ return 26;
+ }
+
+ return $k - $bias;
+ }
+
+ private static function adapt($delta, $numPoints, $firstTime)
+ {
+ $delta = (int) ($firstTime ? $delta / 700 : $delta / 2);
+ $delta += (int) ($delta / $numPoints);
+
+ $k = 0;
+ while ($delta > 35 * 13) {
+ $delta = (int) ($delta / 35);
+ $k = $k + 36;
+ }
+
+ return $k + (int) (36 * $delta / ($delta + 38));
+ }
+
+ private static function decodePart($input)
+ {
+ $n = 128;
+ $i = 0;
+ $bias = 72;
+ $output = '';
+
+ $pos = strrpos($input, '-');
+ if (false !== $pos) {
+ $output = substr($input, 0, $pos++);
+ } else {
+ $pos = 0;
+ }
+
+ $outputLength = \strlen($output);
+ $inputLength = \strlen($input);
+
+ while ($pos < $inputLength) {
+ $oldi = $i;
+ $w = 1;
+
+ for ($k = 36;; $k += 36) {
+ $digit = self::$decodeTable[$input[$pos++]];
+ $i += $digit * $w;
+ $t = self::calculateThreshold($k, $bias);
+
+ if ($digit < $t) {
+ break;
+ }
+
+ $w *= 36 - $t;
+ }
+
+ $bias = self::adapt($i - $oldi, ++$outputLength, 0 === $oldi);
+ $n = $n + (int) ($i / $outputLength);
+ $i = $i % $outputLength;
+ $output = mb_substr($output, 0, $i, 'utf-8').mb_chr($n, 'utf-8').mb_substr($output, $i, $outputLength - 1, 'utf-8');
+
+ ++$i;
+ }
+
+ return $output;
+ }
+}
diff --git a/vendor/symfony/polyfill-intl-idn/LICENSE b/vendor/symfony/polyfill-intl-idn/LICENSE
new file mode 100644
index 0000000000..3f853aaf35
--- /dev/null
+++ b/vendor/symfony/polyfill-intl-idn/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2018-2019 Fabien Potencier
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/vendor/symfony/polyfill-intl-idn/README.md b/vendor/symfony/polyfill-intl-idn/README.md
new file mode 100644
index 0000000000..2e75f2e520
--- /dev/null
+++ b/vendor/symfony/polyfill-intl-idn/README.md
@@ -0,0 +1,12 @@
+Symfony Polyfill / Intl: Idn
+============================
+
+This component provides [`idn_to_ascii`](https://php.net/idn-to-ascii) and [`idn_to_utf8`](https://php.net/idn-to-utf8) functions to users who run php versions without the [Intl](https://php.net/intl) extension.
+
+More information can be found in the
+[main Polyfill README](https://github.com/symfony/polyfill/blob/master/README.md).
+
+License
+=======
+
+This library is released under the [MIT license](LICENSE).
diff --git a/vendor/symfony/polyfill-intl-idn/bootstrap.php b/vendor/symfony/polyfill-intl-idn/bootstrap.php
new file mode 100644
index 0000000000..f02d5de73d
--- /dev/null
+++ b/vendor/symfony/polyfill-intl-idn/bootstrap.php
@@ -0,0 +1,141 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Symfony\Polyfill\Intl\Idn as p;
+
+if (extension_loaded('intl')) {
+ return;
+}
+
+if (!defined('U_IDNA_PROHIBITED_ERROR')) {
+ define('U_IDNA_PROHIBITED_ERROR', 66560);
+}
+if (!defined('U_IDNA_ERROR_START')) {
+ define('U_IDNA_ERROR_START', 66560);
+}
+if (!defined('U_IDNA_UNASSIGNED_ERROR')) {
+ define('U_IDNA_UNASSIGNED_ERROR', 66561);
+}
+if (!defined('U_IDNA_CHECK_BIDI_ERROR')) {
+ define('U_IDNA_CHECK_BIDI_ERROR', 66562);
+}
+if (!defined('U_IDNA_STD3_ASCII_RULES_ERROR')) {
+ define('U_IDNA_STD3_ASCII_RULES_ERROR', 66563);
+}
+if (!defined('U_IDNA_ACE_PREFIX_ERROR')) {
+ define('U_IDNA_ACE_PREFIX_ERROR', 66564);
+}
+if (!defined('U_IDNA_VERIFICATION_ERROR')) {
+ define('U_IDNA_VERIFICATION_ERROR', 66565);
+}
+if (!defined('U_IDNA_LABEL_TOO_LONG_ERROR')) {
+ define('U_IDNA_LABEL_TOO_LONG_ERROR', 66566);
+}
+if (!defined('U_IDNA_ZERO_LENGTH_LABEL_ERROR')) {
+ define('U_IDNA_ZERO_LENGTH_LABEL_ERROR', 66567);
+}
+if (!defined('U_IDNA_DOMAIN_NAME_TOO_LONG_ERROR')) {
+ define('U_IDNA_DOMAIN_NAME_TOO_LONG_ERROR', 66568);
+}
+if (!defined('U_IDNA_ERROR_LIMIT')) {
+ define('U_IDNA_ERROR_LIMIT', 66569);
+}
+if (!defined('U_STRINGPREP_PROHIBITED_ERROR')) {
+ define('U_STRINGPREP_PROHIBITED_ERROR', 66560);
+}
+if (!defined('U_STRINGPREP_UNASSIGNED_ERROR')) {
+ define('U_STRINGPREP_UNASSIGNED_ERROR', 66561);
+}
+if (!defined('U_STRINGPREP_CHECK_BIDI_ERROR')) {
+ define('U_STRINGPREP_CHECK_BIDI_ERROR', 66562);
+}
+if (!defined('IDNA_DEFAULT')) {
+ define('IDNA_DEFAULT', 0);
+}
+if (!defined('IDNA_ALLOW_UNASSIGNED')) {
+ define('IDNA_ALLOW_UNASSIGNED', 1);
+}
+if (!defined('IDNA_USE_STD3_RULES')) {
+ define('IDNA_USE_STD3_RULES', 2);
+}
+if (!defined('IDNA_CHECK_BIDI')) {
+ define('IDNA_CHECK_BIDI', 4);
+}
+if (!defined('IDNA_CHECK_CONTEXTJ')) {
+ define('IDNA_CHECK_CONTEXTJ', 8);
+}
+if (!defined('IDNA_NONTRANSITIONAL_TO_ASCII')) {
+ define('IDNA_NONTRANSITIONAL_TO_ASCII', 16);
+}
+if (!defined('IDNA_NONTRANSITIONAL_TO_UNICODE')) {
+ define('IDNA_NONTRANSITIONAL_TO_UNICODE', 32);
+}
+if (!defined('INTL_IDNA_VARIANT_2003')) {
+ define('INTL_IDNA_VARIANT_2003', 0);
+}
+if (!defined('INTL_IDNA_VARIANT_UTS46')) {
+ define('INTL_IDNA_VARIANT_UTS46', 1);
+}
+if (!defined('IDNA_ERROR_EMPTY_LABEL')) {
+ define('IDNA_ERROR_EMPTY_LABEL', 1);
+}
+if (!defined('IDNA_ERROR_LABEL_TOO_LONG')) {
+ define('IDNA_ERROR_LABEL_TOO_LONG', 2);
+}
+if (!defined('IDNA_ERROR_DOMAIN_NAME_TOO_LONG')) {
+ define('IDNA_ERROR_DOMAIN_NAME_TOO_LONG', 4);
+}
+if (!defined('IDNA_ERROR_LEADING_HYPHEN')) {
+ define('IDNA_ERROR_LEADING_HYPHEN', 8);
+}
+if (!defined('IDNA_ERROR_TRAILING_HYPHEN')) {
+ define('IDNA_ERROR_TRAILING_HYPHEN', 16);
+}
+if (!defined('IDNA_ERROR_HYPHEN_3_4')) {
+ define('IDNA_ERROR_HYPHEN_3_4', 32);
+}
+if (!defined('IDNA_ERROR_LEADING_COMBINING_MARK')) {
+ define('IDNA_ERROR_LEADING_COMBINING_MARK', 64);
+}
+if (!defined('IDNA_ERROR_DISALLOWED')) {
+ define('IDNA_ERROR_DISALLOWED', 128);
+}
+if (!defined('IDNA_ERROR_PUNYCODE')) {
+ define('IDNA_ERROR_PUNYCODE', 256);
+}
+if (!defined('IDNA_ERROR_LABEL_HAS_DOT')) {
+ define('IDNA_ERROR_LABEL_HAS_DOT', 512);
+}
+if (!defined('IDNA_ERROR_INVALID_ACE_LABEL')) {
+ define('IDNA_ERROR_INVALID_ACE_LABEL', 1024);
+}
+if (!defined('IDNA_ERROR_BIDI')) {
+ define('IDNA_ERROR_BIDI', 2048);
+}
+if (!defined('IDNA_ERROR_CONTEXTJ')) {
+ define('IDNA_ERROR_CONTEXTJ', 4096);
+}
+
+if (PHP_VERSION_ID < 70400) {
+ if (!function_exists('idn_to_ascii')) {
+ function idn_to_ascii($domain, $options = IDNA_DEFAULT, $variant = INTL_IDNA_VARIANT_2003, &$idna_info = array()) { return p\Idn::idn_to_ascii($domain, $options, $variant, $idna_info); }
+ }
+ if (!function_exists('idn_to_utf8')) {
+ function idn_to_utf8($domain, $options = IDNA_DEFAULT, $variant = INTL_IDNA_VARIANT_2003, &$idna_info = array()) { return p\Idn::idn_to_utf8($domain, $options, $variant, $idna_info); }
+ }
+} else {
+ if (!function_exists('idn_to_ascii')) {
+ function idn_to_ascii($domain, $options = IDNA_DEFAULT, $variant = INTL_IDNA_VARIANT_UTS46, &$idna_info = array()) { return p\Idn::idn_to_ascii($domain, $options, $variant, $idna_info); }
+ }
+ if (!function_exists('idn_to_utf8')) {
+ function idn_to_utf8($domain, $options = IDNA_DEFAULT, $variant = INTL_IDNA_VARIANT_UTS46, &$idna_info = array()) { return p\Idn::idn_to_utf8($domain, $options, $variant, $idna_info); }
+ }
+}
diff --git a/vendor/symfony/polyfill-intl-idn/composer.json b/vendor/symfony/polyfill-intl-idn/composer.json
new file mode 100644
index 0000000000..550bdc2a86
--- /dev/null
+++ b/vendor/symfony/polyfill-intl-idn/composer.json
@@ -0,0 +1,36 @@
+{
+ "name": "symfony/polyfill-intl-idn",
+ "type": "library",
+ "description": "Symfony polyfill for intl's idn_to_ascii and idn_to_utf8 functions",
+ "keywords": ["polyfill", "shim", "compatibility", "portable", "intl", "idn"],
+ "homepage": "https://symfony.com",
+ "license": "MIT",
+ "authors": [
+ {
+ "name": "Laurent Bassin",
+ "email": "laurent@bassin.info"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
+ }
+ ],
+ "require": {
+ "php": ">=5.3.3",
+ "symfony/polyfill-mbstring": "^1.3",
+ "symfony/polyfill-php72": "^1.10"
+ },
+ "autoload": {
+ "psr-4": { "Symfony\\Polyfill\\Intl\\Idn\\": "" },
+ "files": [ "bootstrap.php" ]
+ },
+ "suggest": {
+ "ext-intl": "For best performance"
+ },
+ "minimum-stability": "dev",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.17-dev"
+ }
+ }
+}
diff --git a/vendor/symfony/polyfill-mbstring/Mbstring.php b/vendor/symfony/polyfill-mbstring/Mbstring.php
index 1fc4feea72..15503bc9dd 100644
--- a/vendor/symfony/polyfill-mbstring/Mbstring.php
+++ b/vendor/symfony/polyfill-mbstring/Mbstring.php
@@ -512,7 +512,9 @@ public static function mb_strrpos($haystack, $needle, $offset = 0, $encoding = n
$offset = 0;
} elseif ($offset = (int) $offset) {
if ($offset < 0) {
- $haystack = self::mb_substr($haystack, 0, $offset, $encoding);
+ if (0 > $offset += self::mb_strlen($needle)) {
+ $haystack = self::mb_substr($haystack, 0, $offset, $encoding);
+ }
$offset = 0;
} else {
$haystack = self::mb_substr($haystack, $offset, 2147483647, $encoding);
@@ -532,7 +534,7 @@ public static function mb_str_split($string, $split_length = 1, $encoding = null
return null;
}
- if ($split_length < 1) {
+ if (1 > $split_length = (int) $split_length) {
trigger_error('The length of each segment must be greater than zero', E_USER_WARNING);
return false;
@@ -542,6 +544,17 @@ public static function mb_str_split($string, $split_length = 1, $encoding = null
$encoding = mb_internal_encoding();
}
+ if ('UTF-8' === $encoding = self::getEncoding($encoding)) {
+ $rx = '/(';
+ while (65535 < $split_length) {
+ $rx .= '.{65535}';
+ $split_length -= 65535;
+ }
+ $rx .= '.{'.$split_length.'})/us';
+
+ return preg_split($rx, $string, null, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
+ }
+
$result = array();
$length = mb_strlen($string, $encoding);
@@ -815,11 +828,16 @@ private static function getEncoding($encoding)
return self::$internalEncoding;
}
+ if ('UTF-8' === $encoding) {
+ return 'UTF-8';
+ }
+
$encoding = strtoupper($encoding);
if ('8BIT' === $encoding || 'BINARY' === $encoding) {
return 'CP850';
}
+
if ('UTF8' === $encoding) {
return 'UTF-8';
}
diff --git a/vendor/symfony/polyfill-mbstring/README.md b/vendor/symfony/polyfill-mbstring/README.md
index 342e8286db..4efb599d81 100644
--- a/vendor/symfony/polyfill-mbstring/README.md
+++ b/vendor/symfony/polyfill-mbstring/README.md
@@ -2,7 +2,7 @@ Symfony Polyfill / Mbstring
===========================
This component provides a partial, native PHP implementation for the
-[Mbstring](http://php.net/mbstring) extension.
+[Mbstring](https://php.net/mbstring) extension.
More information can be found in the
[main Polyfill README](https://github.com/symfony/polyfill/blob/master/README.md).
diff --git a/vendor/symfony/polyfill-mbstring/bootstrap.php b/vendor/symfony/polyfill-mbstring/bootstrap.php
index 204a41ba27..b36a0926f2 100644
--- a/vendor/symfony/polyfill-mbstring/bootstrap.php
+++ b/vendor/symfony/polyfill-mbstring/bootstrap.php
@@ -11,52 +11,131 @@
use Symfony\Polyfill\Mbstring as p;
-if (!function_exists('mb_strlen')) {
- define('MB_CASE_UPPER', 0);
- define('MB_CASE_LOWER', 1);
- define('MB_CASE_TITLE', 2);
-
+if (!function_exists('mb_convert_encoding')) {
function mb_convert_encoding($s, $to, $from = null) { return p\Mbstring::mb_convert_encoding($s, $to, $from); }
+}
+if (!function_exists('mb_decode_mimeheader')) {
function mb_decode_mimeheader($s) { return p\Mbstring::mb_decode_mimeheader($s); }
+}
+if (!function_exists('mb_encode_mimeheader')) {
function mb_encode_mimeheader($s, $charset = null, $transferEnc = null, $lf = null, $indent = null) { return p\Mbstring::mb_encode_mimeheader($s, $charset, $transferEnc, $lf, $indent); }
+}
+if (!function_exists('mb_decode_numericentity')) {
function mb_decode_numericentity($s, $convmap, $enc = null) { return p\Mbstring::mb_decode_numericentity($s, $convmap, $enc); }
+}
+if (!function_exists('mb_encode_numericentity')) {
function mb_encode_numericentity($s, $convmap, $enc = null, $is_hex = false) { return p\Mbstring::mb_encode_numericentity($s, $convmap, $enc, $is_hex); }
+}
+if (!function_exists('mb_convert_case')) {
function mb_convert_case($s, $mode, $enc = null) { return p\Mbstring::mb_convert_case($s, $mode, $enc); }
+}
+if (!function_exists('mb_internal_encoding')) {
function mb_internal_encoding($enc = null) { return p\Mbstring::mb_internal_encoding($enc); }
+}
+if (!function_exists('mb_language')) {
function mb_language($lang = null) { return p\Mbstring::mb_language($lang); }
+}
+if (!function_exists('mb_list_encodings')) {
function mb_list_encodings() { return p\Mbstring::mb_list_encodings(); }
+}
+if (!function_exists('mb_encoding_aliases')) {
function mb_encoding_aliases($encoding) { return p\Mbstring::mb_encoding_aliases($encoding); }
+}
+if (!function_exists('mb_check_encoding')) {
function mb_check_encoding($var = null, $encoding = null) { return p\Mbstring::mb_check_encoding($var, $encoding); }
+}
+if (!function_exists('mb_detect_encoding')) {
function mb_detect_encoding($str, $encodingList = null, $strict = false) { return p\Mbstring::mb_detect_encoding($str, $encodingList, $strict); }
+}
+if (!function_exists('mb_detect_order')) {
function mb_detect_order($encodingList = null) { return p\Mbstring::mb_detect_order($encodingList); }
+}
+if (!function_exists('mb_parse_str')) {
function mb_parse_str($s, &$result = array()) { parse_str($s, $result); }
+}
+if (!function_exists('mb_strlen')) {
function mb_strlen($s, $enc = null) { return p\Mbstring::mb_strlen($s, $enc); }
+}
+if (!function_exists('mb_strpos')) {
function mb_strpos($s, $needle, $offset = 0, $enc = null) { return p\Mbstring::mb_strpos($s, $needle, $offset, $enc); }
+}
+if (!function_exists('mb_strtolower')) {
function mb_strtolower($s, $enc = null) { return p\Mbstring::mb_strtolower($s, $enc); }
+}
+if (!function_exists('mb_strtoupper')) {
function mb_strtoupper($s, $enc = null) { return p\Mbstring::mb_strtoupper($s, $enc); }
+}
+if (!function_exists('mb_substitute_character')) {
function mb_substitute_character($char = null) { return p\Mbstring::mb_substitute_character($char); }
+}
+if (!function_exists('mb_substr')) {
function mb_substr($s, $start, $length = 2147483647, $enc = null) { return p\Mbstring::mb_substr($s, $start, $length, $enc); }
+}
+if (!function_exists('mb_stripos')) {
function mb_stripos($s, $needle, $offset = 0, $enc = null) { return p\Mbstring::mb_stripos($s, $needle, $offset, $enc); }
+}
+if (!function_exists('mb_stristr')) {
function mb_stristr($s, $needle, $part = false, $enc = null) { return p\Mbstring::mb_stristr($s, $needle, $part, $enc); }
+}
+if (!function_exists('mb_strrchr')) {
function mb_strrchr($s, $needle, $part = false, $enc = null) { return p\Mbstring::mb_strrchr($s, $needle, $part, $enc); }
+}
+if (!function_exists('mb_strrichr')) {
function mb_strrichr($s, $needle, $part = false, $enc = null) { return p\Mbstring::mb_strrichr($s, $needle, $part, $enc); }
+}
+if (!function_exists('mb_strripos')) {
function mb_strripos($s, $needle, $offset = 0, $enc = null) { return p\Mbstring::mb_strripos($s, $needle, $offset, $enc); }
+}
+if (!function_exists('mb_strrpos')) {
function mb_strrpos($s, $needle, $offset = 0, $enc = null) { return p\Mbstring::mb_strrpos($s, $needle, $offset, $enc); }
+}
+if (!function_exists('mb_strstr')) {
function mb_strstr($s, $needle, $part = false, $enc = null) { return p\Mbstring::mb_strstr($s, $needle, $part, $enc); }
+}
+if (!function_exists('mb_get_info')) {
function mb_get_info($type = 'all') { return p\Mbstring::mb_get_info($type); }
+}
+if (!function_exists('mb_http_output')) {
function mb_http_output($enc = null) { return p\Mbstring::mb_http_output($enc); }
+}
+if (!function_exists('mb_strwidth')) {
function mb_strwidth($s, $enc = null) { return p\Mbstring::mb_strwidth($s, $enc); }
+}
+if (!function_exists('mb_substr_count')) {
function mb_substr_count($haystack, $needle, $enc = null) { return p\Mbstring::mb_substr_count($haystack, $needle, $enc); }
+}
+if (!function_exists('mb_output_handler')) {
function mb_output_handler($contents, $status) { return p\Mbstring::mb_output_handler($contents, $status); }
+}
+if (!function_exists('mb_http_input')) {
function mb_http_input($type = '') { return p\Mbstring::mb_http_input($type); }
+}
+if (!function_exists('mb_convert_variables')) {
function mb_convert_variables($toEncoding, $fromEncoding, &$a = null, &$b = null, &$c = null, &$d = null, &$e = null, &$f = null) { return p\Mbstring::mb_convert_variables($toEncoding, $fromEncoding, $a, $b, $c, $d, $e, $f); }
}
-if (!function_exists('mb_chr')) {
+if (!function_exists('mb_ord')) {
function mb_ord($s, $enc = null) { return p\Mbstring::mb_ord($s, $enc); }
+}
+if (!function_exists('mb_chr')) {
function mb_chr($code, $enc = null) { return p\Mbstring::mb_chr($code, $enc); }
+}
+if (!function_exists('mb_scrub')) {
function mb_scrub($s, $enc = null) { $enc = null === $enc ? mb_internal_encoding() : $enc; return mb_convert_encoding($s, $enc, $enc); }
}
-
if (!function_exists('mb_str_split')) {
function mb_str_split($string, $split_length = 1, $encoding = null) { return p\Mbstring::mb_str_split($string, $split_length, $encoding); }
}
+
+if (extension_loaded('mbstring')) {
+ return;
+}
+
+if (!defined('MB_CASE_UPPER')) {
+ define('MB_CASE_UPPER', 0);
+}
+if (!defined('MB_CASE_LOWER')) {
+ define('MB_CASE_LOWER', 1);
+}
+if (!defined('MB_CASE_TITLE')) {
+ define('MB_CASE_TITLE', 2);
+}
diff --git a/vendor/symfony/polyfill-mbstring/composer.json b/vendor/symfony/polyfill-mbstring/composer.json
index 308f009a10..d3dcc244c3 100644
--- a/vendor/symfony/polyfill-mbstring/composer.json
+++ b/vendor/symfony/polyfill-mbstring/composer.json
@@ -28,7 +28,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-master": "1.12-dev"
+ "dev-master": "1.17-dev"
}
}
}
diff --git a/vendor/symfony/polyfill-php56/README.md b/vendor/symfony/polyfill-php56/README.md
index 307ce5bc5c..5ad570be32 100644
--- a/vendor/symfony/polyfill-php56/README.md
+++ b/vendor/symfony/polyfill-php56/README.md
@@ -3,8 +3,8 @@ Symfony Polyfill / Php56
This component provides functions unavailable in releases prior to PHP 5.6:
-- [`hash_equals`](http://php.net/hash_equals) (part of [hash](http://php.net/hash) extension)
-- [`ldap_escape`](http://php.net/ldap_escape) (part of [ldap](http://php.net/ldap) extension)
+- [`hash_equals`](https://php.net/hash_equals) (part of [hash](https://php.net/hash) extension)
+- [`ldap_escape`](https://php.net/ldap_escape) (part of [ldap](https://php.net/ldap) extension)
More information can be found in the
[main Polyfill README](https://github.com/symfony/polyfill/blob/master/README.md).
diff --git a/vendor/symfony/polyfill-php56/bootstrap.php b/vendor/symfony/polyfill-php56/bootstrap.php
index 587c2a81c5..427dd2e4c8 100644
--- a/vendor/symfony/polyfill-php56/bootstrap.php
+++ b/vendor/symfony/polyfill-php56/bootstrap.php
@@ -11,28 +11,34 @@
use Symfony\Polyfill\Php56 as p;
-if (PHP_VERSION_ID < 50600) {
- if (!function_exists('hash_equals')) {
- function hash_equals($knownString, $userInput) { return p\Php56::hash_equals($knownString, $userInput); }
- }
- if (extension_loaded('ldap') && !function_exists('ldap_escape')) {
- define('LDAP_ESCAPE_FILTER', 1);
- define('LDAP_ESCAPE_DN', 2);
+if (PHP_VERSION_ID >= 50600) {
+ return;
+}
- function ldap_escape($subject, $ignore = '', $flags = 0) { return p\Php56::ldap_escape($subject, $ignore, $flags); }
- }
+if (!function_exists('hash_equals')) {
+ function hash_equals($knownString, $userInput) { return p\Php56::hash_equals($knownString, $userInput); }
+}
+if (extension_loaded('ldap') && !defined('LDAP_ESCAPE_FILTER')) {
+ define('LDAP_ESCAPE_FILTER', 1);
+}
+if (extension_loaded('ldap') && !defined('LDAP_ESCAPE_DN')) {
+ define('LDAP_ESCAPE_DN', 2);
+}
+
+if (extension_loaded('ldap') && !function_exists('ldap_escape')) {
+ function ldap_escape($subject, $ignore = '', $flags = 0) { return p\Php56::ldap_escape($subject, $ignore, $flags); }
+}
- if (50509 === PHP_VERSION_ID && 4 === PHP_INT_SIZE) {
- // Missing functions in PHP 5.5.9 - affects 32 bit builds of Ubuntu 14.04LTS
- // See https://bugs.launchpad.net/ubuntu/+source/php5/+bug/1315888
- if (!function_exists('gzopen') && function_exists('gzopen64')) {
- function gzopen($filename, $mode, $use_include_path = 0) { return gzopen64($filename, $mode, $use_include_path); }
- }
- if (!function_exists('gzseek') && function_exists('gzseek64')) {
- function gzseek($zp, $offset, $whence = SEEK_SET) { return gzseek64($zp, $offset, $whence); }
- }
- if (!function_exists('gztell') && function_exists('gztell64')) {
- function gztell($zp) { return gztell64($zp); }
- }
+if (50509 === PHP_VERSION_ID && 4 === PHP_INT_SIZE) {
+ // Missing functions in PHP 5.5.9 - affects 32 bit builds of Ubuntu 14.04LTS
+ // See https://bugs.launchpad.net/ubuntu/+source/php5/+bug/1315888
+ if (!function_exists('gzopen') && function_exists('gzopen64')) {
+ function gzopen($filename, $mode, $use_include_path = 0) { return gzopen64($filename, $mode, $use_include_path); }
+ }
+ if (!function_exists('gzseek') && function_exists('gzseek64')) {
+ function gzseek($zp, $offset, $whence = SEEK_SET) { return gzseek64($zp, $offset, $whence); }
+ }
+ if (!function_exists('gztell') && function_exists('gztell64')) {
+ function gztell($zp) { return gztell64($zp); }
}
}
diff --git a/vendor/symfony/polyfill-php56/composer.json b/vendor/symfony/polyfill-php56/composer.json
index 81f58fb462..e1e969fb60 100644
--- a/vendor/symfony/polyfill-php56/composer.json
+++ b/vendor/symfony/polyfill-php56/composer.json
@@ -26,7 +26,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-master": "1.12-dev"
+ "dev-master": "1.17-dev"
}
}
}
diff --git a/vendor/symfony/polyfill-php70/README.md b/vendor/symfony/polyfill-php70/README.md
index 04988c6f93..abd5488237 100644
--- a/vendor/symfony/polyfill-php70/README.md
+++ b/vendor/symfony/polyfill-php70/README.md
@@ -3,12 +3,12 @@ Symfony Polyfill / Php70
This component provides features unavailable in releases prior to PHP 7.0:
-- [`intdiv`](http://php.net/intdiv)
-- [`preg_replace_callback_array`](http://php.net/preg_replace_callback_array)
-- [`error_clear_last`](http://php.net/error_clear_last)
+- [`intdiv`](https://php.net/intdiv)
+- [`preg_replace_callback_array`](https://php.net/preg_replace_callback_array)
+- [`error_clear_last`](https://php.net/error_clear_last)
- `random_bytes` and `random_int` (from [paragonie/random_compat](https://github.com/paragonie/random_compat))
-- [`*Error` throwable classes](http://php.net/Error)
-- [`PHP_INT_MIN`](http://php.net/manual/en/reserved.constants.php#constant.php-int-min)
+- [`*Error` throwable classes](https://php.net/Error)
+- [`PHP_INT_MIN`](https://php.net/reserved.constants#constant.php-int-min)
- `SessionUpdateTimestampHandlerInterface`
More information can be found in the
diff --git a/vendor/symfony/polyfill-php70/bootstrap.php b/vendor/symfony/polyfill-php70/bootstrap.php
index 445c39839c..a11f80da65 100644
--- a/vendor/symfony/polyfill-php70/bootstrap.php
+++ b/vendor/symfony/polyfill-php70/bootstrap.php
@@ -11,17 +11,20 @@
use Symfony\Polyfill\Php70 as p;
-if (PHP_VERSION_ID < 70000) {
- if (!defined('PHP_INT_MIN')) {
- define('PHP_INT_MIN', ~PHP_INT_MAX);
- }
- if (!function_exists('intdiv')) {
- function intdiv($dividend, $divisor) { return p\Php70::intdiv($dividend, $divisor); }
- }
- if (!function_exists('preg_replace_callback_array')) {
- function preg_replace_callback_array(array $patterns, $subject, $limit = -1, &$count = 0) { return p\Php70::preg_replace_callback_array($patterns, $subject, $limit, $count); }
- }
- if (!function_exists('error_clear_last')) {
- function error_clear_last() { return p\Php70::error_clear_last(); }
- }
+if (PHP_VERSION_ID >= 70000) {
+ return;
+}
+
+if (!defined('PHP_INT_MIN')) {
+ define('PHP_INT_MIN', ~PHP_INT_MAX);
+}
+
+if (!function_exists('intdiv')) {
+ function intdiv($dividend, $divisor) { return p\Php70::intdiv($dividend, $divisor); }
+}
+if (!function_exists('preg_replace_callback_array')) {
+ function preg_replace_callback_array(array $patterns, $subject, $limit = -1, &$count = 0) { return p\Php70::preg_replace_callback_array($patterns, $subject, $limit, $count); }
+}
+if (!function_exists('error_clear_last')) {
+ function error_clear_last() { return p\Php70::error_clear_last(); }
}
diff --git a/vendor/symfony/polyfill-php70/composer.json b/vendor/symfony/polyfill-php70/composer.json
index 4f10a7226c..2bd0d462e9 100644
--- a/vendor/symfony/polyfill-php70/composer.json
+++ b/vendor/symfony/polyfill-php70/composer.json
@@ -27,7 +27,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-master": "1.12-dev"
+ "dev-master": "1.17-dev"
}
}
}
diff --git a/vendor/symfony/polyfill-php72/LICENSE b/vendor/symfony/polyfill-php72/LICENSE
new file mode 100644
index 0000000000..4cd8bdd300
--- /dev/null
+++ b/vendor/symfony/polyfill-php72/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2015-2019 Fabien Potencier
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/vendor/symfony/polyfill-php72/Php72.php b/vendor/symfony/polyfill-php72/Php72.php
new file mode 100644
index 0000000000..9b3edc7c79
--- /dev/null
+++ b/vendor/symfony/polyfill-php72/Php72.php
@@ -0,0 +1,217 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Polyfill\Php72;
+
+/**
+ * @author Nicolas Grekas <p@tchwork.com>
+ * @author Dariusz Rumiński <dariusz.ruminski@gmail.com>
+ *
+ * @internal
+ */
+final class Php72
+{
+ private static $hashMask;
+
+ public static function utf8_encode($s)
+ {
+ $s .= $s;
+ $len = \strlen($s);
+
+ for ($i = $len >> 1, $j = 0; $i < $len; ++$i, ++$j) {
+ switch (true) {
+ case $s[$i] < "\x80": $s[$j] = $s[$i]; break;
+ case $s[$i] < "\xC0": $s[$j] = "\xC2"; $s[++$j] = $s[$i]; break;
+ default: $s[$j] = "\xC3"; $s[++$j] = \chr(\ord($s[$i]) - 64); break;
+ }
+ }
+
+ return substr($s, 0, $j);
+ }
+
+ public static function utf8_decode($s)
+ {
+ $s = (string) $s;
+ $len = \strlen($s);
+
+ for ($i = 0, $j = 0; $i < $len; ++$i, ++$j) {
+ switch ($s[$i] & "\xF0") {
+ case "\xC0":
+ case "\xD0":
+ $c = (\ord($s[$i] & "\x1F") << 6) | \ord($s[++$i] & "\x3F");
+ $s[$j] = $c < 256 ? \chr($c) : '?';
+ break;
+
+ case "\xF0":
+ ++$i;
+ // no break
+
+ case "\xE0":
+ $s[$j] = '?';
+ $i += 2;
+ break;
+
+ default:
+ $s[$j] = $s[$i];
+ }
+ }
+
+ return substr($s, 0, $j);
+ }
+
+ public static function php_os_family()
+ {
+ if ('\\' === \DIRECTORY_SEPARATOR) {
+ return 'Windows';
+ }
+
+ $map = array(
+ 'Darwin' => 'Darwin',
+ 'DragonFly' => 'BSD',
+ 'FreeBSD' => 'BSD',
+ 'NetBSD' => 'BSD',
+ 'OpenBSD' => 'BSD',
+ 'Linux' => 'Linux',
+ 'SunOS' => 'Solaris',
+ );
+
+ return isset($map[PHP_OS]) ? $map[PHP_OS] : 'Unknown';
+ }
+
+ public static function spl_object_id($object)
+ {
+ if (null === self::$hashMask) {
+ self::initHashMask();
+ }
+ if (null === $hash = spl_object_hash($object)) {
+ return;
+ }
+
+ // On 32-bit systems, PHP_INT_SIZE is 4,
+ return self::$hashMask ^ hexdec(substr($hash, 16 - (\PHP_INT_SIZE * 2 - 1), (\PHP_INT_SIZE * 2 - 1)));
+ }
+
+ public static function sapi_windows_vt100_support($stream, $enable = null)
+ {
+ if (!\is_resource($stream)) {
+ trigger_error('sapi_windows_vt100_support() expects parameter 1 to be resource, '.\gettype($stream).' given', E_USER_WARNING);
+
+ return false;
+ }
+
+ $meta = stream_get_meta_data($stream);
+
+ if ('STDIO' !== $meta['stream_type']) {
+ trigger_error('sapi_windows_vt100_support() was not able to analyze the specified stream', E_USER_WARNING);
+
+ return false;
+ }
+
+ // We cannot actually disable vt100 support if it is set
+ if (false === $enable || !self::stream_isatty($stream)) {
+ return false;
+ }
+
+ // The native function does not apply to stdin
+ $meta = array_map('strtolower', $meta);
+ $stdin = 'php://stdin' === $meta['uri'] || 'php://fd/0' === $meta['uri'];
+
+ return !$stdin
+ && (false !== getenv('ANSICON')
+ || 'ON' === getenv('ConEmuANSI')
+ || 'xterm' === getenv('TERM')
+ || 'Hyper' === getenv('TERM_PROGRAM'));
+ }
+
+ public static function stream_isatty($stream)
+ {
+ if (!\is_resource($stream)) {
+ trigger_error('stream_isatty() expects parameter 1 to be resource, '.\gettype($stream).' given', E_USER_WARNING);
+
+ return false;
+ }
+
+ if ('\\' === \DIRECTORY_SEPARATOR) {
+ $stat = @fstat($stream);
+ // Check if formatted mode is S_IFCHR
+ return $stat ? 0020000 === ($stat['mode'] & 0170000) : false;
+ }
+
+ return \function_exists('posix_isatty') && @posix_isatty($stream);
+ }
+
+ private static function initHashMask()
+ {
+ $obj = (object) array();
+ self::$hashMask = -1;
+
+ // check if we are nested in an output buffering handler to prevent a fatal error with ob_start() below
+ $obFuncs = array('ob_clean', 'ob_end_clean', 'ob_flush', 'ob_end_flush', 'ob_get_contents', 'ob_get_flush');
+ foreach (debug_backtrace(\PHP_VERSION_ID >= 50400 ? DEBUG_BACKTRACE_IGNORE_ARGS : false) as $frame) {
+ if (isset($frame['function'][0]) && !isset($frame['class']) && 'o' === $frame['function'][0] && \in_array($frame['function'], $obFuncs)) {
+ $frame['line'] = 0;
+ break;
+ }
+ }
+ if (!empty($frame['line'])) {
+ ob_start();
+ debug_zval_dump($obj);
+ self::$hashMask = (int) substr(ob_get_clean(), 17);
+ }
+
+ self::$hashMask ^= hexdec(substr(spl_object_hash($obj), 16 - (\PHP_INT_SIZE * 2 - 1), (\PHP_INT_SIZE * 2 - 1)));
+ }
+
+ public static function mb_chr($code, $encoding = null)
+ {
+ if (0x80 > $code %= 0x200000) {
+ $s = \chr($code);
+ } elseif (0x800 > $code) {
+ $s = \chr(0xC0 | $code >> 6).\chr(0x80 | $code & 0x3F);
+ } elseif (0x10000 > $code) {
+ $s = \chr(0xE0 | $code >> 12).\chr(0x80 | $code >> 6 & 0x3F).\chr(0x80 | $code & 0x3F);
+ } else {
+ $s = \chr(0xF0 | $code >> 18).\chr(0x80 | $code >> 12 & 0x3F).\chr(0x80 | $code >> 6 & 0x3F).\chr(0x80 | $code & 0x3F);
+ }
+
+ if ('UTF-8' !== $encoding) {
+ $s = mb_convert_encoding($s, $encoding, 'UTF-8');
+ }
+
+ return $s;
+ }
+
+ public static function mb_ord($s, $encoding = null)
+ {
+ if (null == $encoding) {
+ $s = mb_convert_encoding($s, 'UTF-8');
+ } elseif ('UTF-8' !== $encoding) {
+ $s = mb_convert_encoding($s, 'UTF-8', $encoding);
+ }
+
+ if (1 === \strlen($s)) {
+ return \ord($s);
+ }
+
+ $code = ($s = unpack('C*', substr($s, 0, 4))) ? $s[1] : 0;
+ if (0xF0 <= $code) {
+ return (($code - 0xF0) << 18) + (($s[2] - 0x80) << 12) + (($s[3] - 0x80) << 6) + $s[4] - 0x80;
+ }
+ if (0xE0 <= $code) {
+ return (($code - 0xE0) << 12) + (($s[2] - 0x80) << 6) + $s[3] - 0x80;
+ }
+ if (0xC0 <= $code) {
+ return (($code - 0xC0) << 6) + $s[2] - 0x80;
+ }
+
+ return $code;
+ }
+}
diff --git a/vendor/symfony/polyfill-php72/README.md b/vendor/symfony/polyfill-php72/README.md
new file mode 100644
index 0000000000..59dec8a237
--- /dev/null
+++ b/vendor/symfony/polyfill-php72/README.md
@@ -0,0 +1,28 @@
+Symfony Polyfill / Php72
+========================
+
+This component provides functions added to PHP 7.2 core:
+
+- [`spl_object_id`](https://php.net/spl_object_id)
+- [`stream_isatty`](https://php.net/stream_isatty)
+
+On Windows only:
+
+- [`sapi_windows_vt100_support`](https://php.net/sapi_windows_vt100_support)
+
+Moved to core since 7.2 (was in the optional XML extension earlier):
+
+- [`utf8_encode`](https://php.net/utf8_encode)
+- [`utf8_decode`](https://php.net/utf8_decode)
+
+Also, it provides constants added to PHP 7.2:
+- [`PHP_FLOAT_*`](https://php.net/reserved.constants#constant.php-float-dig)
+- [`PHP_OS_FAMILY`](https://php.net/reserved.constants#constant.php-os-family)
+
+More information can be found in the
+[main Polyfill README](https://github.com/symfony/polyfill/blob/master/README.md).
+
+License
+=======
+
+This library is released under the [MIT license](LICENSE).
diff --git a/vendor/symfony/polyfill-php72/bootstrap.php b/vendor/symfony/polyfill-php72/bootstrap.php
new file mode 100644
index 0000000000..a27a900a4f
--- /dev/null
+++ b/vendor/symfony/polyfill-php72/bootstrap.php
@@ -0,0 +1,57 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Symfony\Polyfill\Php72 as p;
+
+if (PHP_VERSION_ID >= 70200) {
+ return;
+}
+
+if (!defined('PHP_FLOAT_DIG')) {
+ define('PHP_FLOAT_DIG', 15);
+}
+if (!defined('PHP_FLOAT_EPSILON')) {
+ define('PHP_FLOAT_EPSILON', 2.2204460492503E-16);
+}
+if (!defined('PHP_FLOAT_MIN')) {
+ define('PHP_FLOAT_MIN', 2.2250738585072E-308);
+}
+if (!defined('PHP_FLOAT_MAX')) {
+ define('PHP_FLOAT_MAX', 1.7976931348623157E+308);
+}
+if (!defined('PHP_OS_FAMILY')) {
+ define('PHP_OS_FAMILY', p\Php72::php_os_family());
+}
+
+if ('\\' === DIRECTORY_SEPARATOR && !function_exists('sapi_windows_vt100_support')) {
+ function sapi_windows_vt100_support($stream, $enable = null) { return p\Php72::sapi_windows_vt100_support($stream, $enable); }
+}
+if (!function_exists('stream_isatty')) {
+ function stream_isatty($stream) { return p\Php72::stream_isatty($stream); }
+}
+if (!function_exists('utf8_encode')) {
+ function utf8_encode($s) { return p\Php72::utf8_encode($s); }
+}
+if (!function_exists('utf8_decode')) {
+ function utf8_decode($s) { return p\Php72::utf8_decode($s); }
+}
+if (!function_exists('spl_object_id')) {
+ function spl_object_id($s) { return p\Php72::spl_object_id($s); }
+}
+if (!function_exists('mb_ord')) {
+ function mb_ord($s, $enc = null) { return p\Php72::mb_ord($s, $enc); }
+}
+if (!function_exists('mb_chr')) {
+ function mb_chr($code, $enc = null) { return p\Php72::mb_chr($code, $enc); }
+}
+if (!function_exists('mb_scrub')) {
+ function mb_scrub($s, $enc = null) { $enc = null === $enc ? mb_internal_encoding() : $enc; return mb_convert_encoding($s, $enc, $enc); }
+}
diff --git a/vendor/symfony/polyfill-php72/composer.json b/vendor/symfony/polyfill-php72/composer.json
new file mode 100644
index 0000000000..314d713624
--- /dev/null
+++ b/vendor/symfony/polyfill-php72/composer.json
@@ -0,0 +1,31 @@
+{
+ "name": "symfony/polyfill-php72",
+ "type": "library",
+ "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions",
+ "keywords": ["polyfill", "shim", "compatibility", "portable"],
+ "homepage": "https://symfony.com",
+ "license": "MIT",
+ "authors": [
+ {
+ "name": "Nicolas Grekas",
+ "email": "p@tchwork.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
+ }
+ ],
+ "require": {
+ "php": ">=5.3.3"
+ },
+ "autoload": {
+ "psr-4": { "Symfony\\Polyfill\\Php72\\": "" },
+ "files": [ "bootstrap.php" ]
+ },
+ "minimum-stability": "dev",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.17-dev"
+ }
+ }
+}
diff --git a/vendor/symfony/polyfill-util/TestListenerForV7.php b/vendor/symfony/polyfill-util/TestListenerForV7.php
index b304bfaeac..a5c3759b22 100644
--- a/vendor/symfony/polyfill-util/TestListenerForV7.php
+++ b/vendor/symfony/polyfill-util/TestListenerForV7.php
@@ -81,7 +81,7 @@ public function endTest(Test $test, float $time): void
public static function warning($message): WarningTestCase
{
- return parent::warning($message);
+ return new WarningTestCase($message);
}
protected function setUp(): void
diff --git a/vendor/symfony/polyfill-util/TestListenerTrait.php b/vendor/symfony/polyfill-util/TestListenerTrait.php
index d8047a0ccc..777fb48439 100644
--- a/vendor/symfony/polyfill-util/TestListenerTrait.php
+++ b/vendor/symfony/polyfill-util/TestListenerTrait.php
@@ -31,6 +31,10 @@ public function startTestSuite($mainSuite)
if (!$tests = $suite->tests()) {
continue;
}
+ $testedClass = new \ReflectionClass($testClass);
+ if (preg_match('{^ \* @requires PHP (.*)}mi', $testedClass->getDocComment(), $m) && version_compare($m[1], \PHP_VERSION, '>')) {
+ continue;
+ }
if (!preg_match('/^(.+)\\\\Tests(\\\\.*)Test$/', $testClass, $m)) {
$mainSuite->addTest(TestListener::warning('Unknown naming convention for '.$testClass));
continue;
@@ -61,7 +65,7 @@ public function startTestSuite($mainSuite)
$bootstrap->rewind();
foreach (new \RegexIterator($bootstrap, '/return p\\\\'.$testedClass->getShortName().'::/') as $defLine) {
- if (!preg_match('/^\s*function (?P<name>[^\(]++)(?P<signature>\(.*\)) \{ (?<return>return p\\\\'.$testedClass->getShortName().'::[^\(]++)(?P<args>\([^\)]*+\)); \}$/', $defLine, $f)) {
+ if (!preg_match('/^\s*function (?P<name>[^\(]++)(?P<signature>\(.*\)(?: ?: [^ ]++)?) \{ (?<return>return p\\\\'.$testedClass->getShortName().'::[^\(]++)(?P<args>\([^\)]*+\)); \}$/', $defLine, $f)) {
$warnings[] = TestListener::warning('Invalid line in bootstrap.php: '.trim($defLine));
continue;
}
diff --git a/vendor/symfony/polyfill-util/composer.json b/vendor/symfony/polyfill-util/composer.json
index fa9132bd72..1ab79ac46c 100644
--- a/vendor/symfony/polyfill-util/composer.json
+++ b/vendor/symfony/polyfill-util/composer.json
@@ -24,7 +24,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-master": "1.12-dev"
+ "dev-master": "1.17-dev"
}
}
}
diff --git a/vendor/symfony/process/InputStream.php b/vendor/symfony/process/InputStream.php
index 757d629455..ef38dd7bfd 100644
--- a/vendor/symfony/process/InputStream.php
+++ b/vendor/symfony/process/InputStream.php
@@ -45,7 +45,7 @@ public function write($input)
return;
}
if ($this->isClosed()) {
- throw new RuntimeException(sprintf('%s is closed', static::class));
+ throw new RuntimeException(sprintf('"%s" is closed.', static::class));
}
$this->input[] = ProcessUtils::validateInput(__METHOD__, $input);
}
diff --git a/vendor/symfony/process/LICENSE b/vendor/symfony/process/LICENSE
index a677f43763..9e936ec044 100644
--- a/vendor/symfony/process/LICENSE
+++ b/vendor/symfony/process/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2019 Fabien Potencier
+Copyright (c) 2004-2020 Fabien Potencier
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/vendor/symfony/process/Pipes/AbstractPipes.php b/vendor/symfony/process/Pipes/AbstractPipes.php
index 9dd415d5c9..cdffaaffe4 100644
--- a/vendor/symfony/process/Pipes/AbstractPipes.php
+++ b/vendor/symfony/process/Pipes/AbstractPipes.php
@@ -107,7 +107,7 @@ protected function write()
} elseif (!isset($this->inputBuffer[0])) {
if (!\is_string($input)) {
if (!is_scalar($input)) {
- throw new InvalidArgumentException(sprintf('%s yielded a value of type "%s", but only scalars and stream resources are supported', \get_class($this->input), \gettype($input)));
+ throw new InvalidArgumentException(sprintf('"%s" yielded a value of type "%s", but only scalars and stream resources are supported.', \get_class($this->input), \gettype($input)));
}
$input = (string) $input;
}
diff --git a/vendor/symfony/process/Pipes/UnixPipes.php b/vendor/symfony/process/Pipes/UnixPipes.php
index 1ebf2138a5..5784a315bd 100644
--- a/vendor/symfony/process/Pipes/UnixPipes.php
+++ b/vendor/symfony/process/Pipes/UnixPipes.php
@@ -118,7 +118,7 @@ public function readAndWrite($blocking, $close = false)
$read[$type = array_search($pipe, $this->pipes, true)] = '';
do {
- $data = fread($pipe, self::CHUNK_SIZE);
+ $data = @fread($pipe, self::CHUNK_SIZE);
$read[$type] .= $data;
} while (isset($data[0]) && ($close || isset($data[self::CHUNK_SIZE - 1])));
diff --git a/vendor/symfony/process/Pipes/WindowsPipes.php b/vendor/symfony/process/Pipes/WindowsPipes.php
index e8e6f139e5..302b0509a8 100644
--- a/vendor/symfony/process/Pipes/WindowsPipes.php
+++ b/vendor/symfony/process/Pipes/WindowsPipes.php
@@ -57,7 +57,7 @@ public function __construct($input, $haveReadSupport)
if (!$h = fopen($file.'.lock', 'w')) {
restore_error_handler();
- throw new RuntimeException(sprintf('A temporary file could not be opened to write the process output: %s', $lastError));
+ throw new RuntimeException('A temporary file could not be opened to write the process output: '.$lastError);
}
if (!flock($h, LOCK_EX | LOCK_NB)) {
continue 2;
diff --git a/vendor/symfony/process/Process.php b/vendor/symfony/process/Process.php
index c0c1fdaf69..68d52512ed 100644
--- a/vendor/symfony/process/Process.php
+++ b/vendor/symfony/process/Process.php
@@ -260,7 +260,7 @@ public function mustRun(callable $callback = null/*, array $env = []*/)
public function start(callable $callback = null/*, array $env = [*/)
{
if ($this->isRunning()) {
- throw new RuntimeException('Process is already running');
+ throw new RuntimeException('Process is already running.');
}
if (2 <= \func_num_args()) {
$env = func_get_arg(1);
@@ -336,7 +336,7 @@ public function start(callable $callback = null/*, array $env = [*/)
@trigger_error('The provided cwd does not exist. Command is currently ran against getcwd(). This behavior is deprecated since Symfony 3.4 and will be removed in 4.0.', E_USER_DEPRECATED);
}
- $this->process = proc_open($commandline, $descriptors, $this->processPipes->pipes, $this->cwd, $envPairs, $this->options);
+ $this->process = @proc_open($commandline, $descriptors, $this->processPipes->pipes, $this->cwd, $envPairs, $this->options);
if (!\is_resource($this->process)) {
throw new RuntimeException('Unable to launch a new process.');
@@ -375,7 +375,7 @@ public function start(callable $callback = null/*, array $env = [*/)
public function restart(callable $callback = null/*, array $env = []*/)
{
if ($this->isRunning()) {
- throw new RuntimeException('Process is already running');
+ throw new RuntimeException('Process is already running.');
}
$env = 1 < \func_num_args() ? func_get_arg(1) : null;
@@ -409,7 +409,7 @@ public function wait(callable $callback = null)
if (null !== $callback) {
if (!$this->processPipes->haveReadSupport()) {
$this->stop(0);
- throw new \LogicException('Pass the callback to the Process::start method or enableOutput to use a callback with Process::wait');
+ throw new \LogicException('Pass the callback to the Process::start method or enableOutput to use a callback with Process::wait.');
}
$this->callback = $this->buildCallback($callback);
}
@@ -1681,7 +1681,7 @@ function ($m) use (&$env, &$varCache, &$varCount, $uid) {
private function requireProcessIsStarted($functionName)
{
if (!$this->isStarted()) {
- throw new LogicException(sprintf('Process must be started before calling %s.', $functionName));
+ throw new LogicException(sprintf('Process must be started before calling "%s()".', $functionName));
}
}
@@ -1695,7 +1695,7 @@ private function requireProcessIsStarted($functionName)
private function requireProcessIsTerminated($functionName)
{
if (!$this->isTerminated()) {
- throw new LogicException(sprintf('Process must be terminated before calling %s.', $functionName));
+ throw new LogicException(sprintf('Process must be terminated before calling "%s()".', $functionName));
}
}
diff --git a/vendor/symfony/process/ProcessUtils.php b/vendor/symfony/process/ProcessUtils.php
index 00acde0a19..74f2d8654a 100644
--- a/vendor/symfony/process/ProcessUtils.php
+++ b/vendor/symfony/process/ProcessUtils.php
@@ -110,7 +110,7 @@ public static function validateInput($caller, $input)
return new \IteratorIterator($input);
}
- throw new InvalidArgumentException(sprintf('%s only accepts strings, Traversable objects or stream resources.', $caller));
+ throw new InvalidArgumentException(sprintf('"%s" only accepts strings, Traversable objects or stream resources.', $caller));
}
return $input;
diff --git a/vendor/symfony/process/Tests/PipeStdinInStdoutStdErrStreamSelect.php b/vendor/symfony/process/Tests/PipeStdinInStdoutStdErrStreamSelect.php
index 9ea8981e19..2e7716de7f 100644
--- a/vendor/symfony/process/Tests/PipeStdinInStdoutStdErrStreamSelect.php
+++ b/vendor/symfony/process/Tests/PipeStdinInStdoutStdErrStreamSelect.php
@@ -29,15 +29,15 @@
$n = stream_select($r, $w, $e, 5);
if (false === $n) {
- die(ERR_SELECT_FAILED);
+ exit(ERR_SELECT_FAILED);
} elseif ($n < 1) {
- die(ERR_TIMEOUT);
+ exit(ERR_TIMEOUT);
}
if (in_array(STDOUT, $w) && strlen($out) > 0) {
$written = fwrite(STDOUT, (string) $out, 32768);
if (false === $written) {
- die(ERR_WRITE_FAILED);
+ exit(ERR_WRITE_FAILED);
}
$out = (string) substr($out, $written);
}
@@ -48,7 +48,7 @@
if (in_array(STDERR, $w) && strlen($err) > 0) {
$written = fwrite(STDERR, (string) $err, 32768);
if (false === $written) {
- die(ERR_WRITE_FAILED);
+ exit(ERR_WRITE_FAILED);
}
$err = (string) substr($err, $written);
}
@@ -65,7 +65,7 @@
if (false === $str || feof(STDIN)) {
$read = null;
if (!feof(STDIN)) {
- die(ERR_READ_FAILED);
+ exit(ERR_READ_FAILED);
}
}
}
diff --git a/vendor/symfony/process/Tests/ProcessBuilderTest.php b/vendor/symfony/process/Tests/ProcessBuilderTest.php
index 7ab74402ac..c2851357d7 100644
--- a/vendor/symfony/process/Tests/ProcessBuilderTest.php
+++ b/vendor/symfony/process/Tests/ProcessBuilderTest.php
@@ -200,7 +200,7 @@ public function testShouldReturnProcessWithEnabledOutput()
public function testInvalidInput()
{
$this->expectException('Symfony\Component\Process\Exception\InvalidArgumentException');
- $this->expectExceptionMessage('Symfony\Component\Process\ProcessBuilder::setInput only accepts strings, Traversable objects or stream resources.');
+ $this->expectExceptionMessage('"Symfony\Component\Process\ProcessBuilder::setInput" only accepts strings, Traversable objects or stream resources.');
$builder = ProcessBuilder::create();
$builder->setInput([]);
}
diff --git a/vendor/symfony/process/Tests/ProcessTest.php b/vendor/symfony/process/Tests/ProcessTest.php
index 9a7c515e8a..2a58852351 100644
--- a/vendor/symfony/process/Tests/ProcessTest.php
+++ b/vendor/symfony/process/Tests/ProcessTest.php
@@ -263,7 +263,7 @@ public function testSetInputWhileRunningThrowsAnException()
public function testInvalidInput($value)
{
$this->expectException('Symfony\Component\Process\Exception\InvalidArgumentException');
- $this->expectExceptionMessage('Symfony\Component\Process\Process::setInput only accepts strings, Traversable objects or stream resources.');
+ $this->expectExceptionMessage('"Symfony\Component\Process\Process::setInput" only accepts strings, Traversable objects or stream resources.');
$process = $this->getProcess('foo');
$process->setInput($value);
}
@@ -936,7 +936,7 @@ public function testMethodsThatNeedARunningProcess($method)
$process = $this->getProcess('foo');
$this->expectException('Symfony\Component\Process\Exception\LogicException');
- $this->expectExceptionMessage(sprintf('Process must be started before calling %s.', $method));
+ $this->expectExceptionMessage(sprintf('Process must be started before calling "%s()".', $method));
$process->{$method}();
}
@@ -987,16 +987,23 @@ public function provideMethodsThatNeedATerminatedProcess()
*/
public function testWrongSignal($signal)
{
- $this->expectException('Symfony\Component\Process\Exception\RuntimeException');
if ('\\' === \DIRECTORY_SEPARATOR) {
$this->markTestSkipped('POSIX signals do not work on Windows');
}
+ if (\PHP_VERSION_ID < 80000 || \is_int($signal)) {
+ $this->expectException(RuntimeException::class);
+ } else {
+ $this->expectException('TypeError');
+ }
+
$process = $this->getProcessForCode('sleep(38);');
$process->start();
try {
$process->signal($signal);
$this->fail('A RuntimeException must have been thrown');
+ } catch (\TypeError $e) {
+ $process->stop(0);
} catch (RuntimeException $e) {
$process->stop(0);
}
diff --git a/vendor/symfony/routing/Annotation/Route.php b/vendor/symfony/routing/Annotation/Route.php
index 338ba512df..42edbbcb22 100644
--- a/vendor/symfony/routing/Annotation/Route.php
+++ b/vendor/symfony/routing/Annotation/Route.php
@@ -46,7 +46,7 @@ public function __construct(array $data)
foreach ($data as $key => $value) {
$method = 'set'.str_replace('_', '', $key);
if (!method_exists($this, $method)) {
- throw new \BadMethodCallException(sprintf('Unknown property "%s" on annotation "%s".', $key, \get_class($this)));
+ throw new \BadMethodCallException(sprintf('Unknown property "%s" on annotation "%s".', $key, static::class));
}
$this->$method($value);
}
diff --git a/vendor/symfony/routing/LICENSE b/vendor/symfony/routing/LICENSE
index a677f43763..9e936ec044 100644
--- a/vendor/symfony/routing/LICENSE
+++ b/vendor/symfony/routing/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2019 Fabien Potencier
+Copyright (c) 2004-2020 Fabien Potencier
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/vendor/symfony/routing/Loader/AnnotationClassLoader.php b/vendor/symfony/routing/Loader/AnnotationClassLoader.php
index 2a715e35d7..10bddfbc94 100644
--- a/vendor/symfony/routing/Loader/AnnotationClassLoader.php
+++ b/vendor/symfony/routing/Loader/AnnotationClassLoader.php
@@ -22,7 +22,7 @@
/**
* AnnotationClassLoader loads routing information from a PHP class and its methods.
*
- * You need to define an implementation for the getRouteDefaults() method. Most of the
+ * You need to define an implementation for the configureRoute() method. Most of the
* time, this method should define some PHP callable to be called for the route
* (a controller in MVC speak).
*
diff --git a/vendor/symfony/routing/Loader/ObjectRouteLoader.php b/vendor/symfony/routing/Loader/ObjectRouteLoader.php
index ce58dc7da4..65633ca075 100644
--- a/vendor/symfony/routing/Loader/ObjectRouteLoader.php
+++ b/vendor/symfony/routing/Loader/ObjectRouteLoader.php
@@ -46,7 +46,7 @@ public function load($resource, $type = null)
{
$parts = explode(':', $resource);
if (2 != \count($parts)) {
- throw new \InvalidArgumentException(sprintf('Invalid resource "%s" passed to the "service" route loader: use the format "service_name:methodName"', $resource));
+ throw new \InvalidArgumentException(sprintf('Invalid resource "%s" passed to the "service" route loader: use the format "service_name:methodName".', $resource));
}
$serviceString = $parts[0];
@@ -55,11 +55,11 @@ public function load($resource, $type = null)
$loaderObject = $this->getServiceObject($serviceString);
if (!\is_object($loaderObject)) {
- throw new \LogicException(sprintf('%s:getServiceObject() must return an object: %s returned', \get_class($this), \gettype($loaderObject)));
+ throw new \LogicException(sprintf('"%s:getServiceObject()" must return an object: "%s" returned.', static::class, \gettype($loaderObject)));
}
if (!method_exists($loaderObject, $method)) {
- throw new \BadMethodCallException(sprintf('Method "%s" not found on "%s" when importing routing resource "%s"', $method, \get_class($loaderObject), $resource));
+ throw new \BadMethodCallException(sprintf('Method "%s" not found on "%s" when importing routing resource "%s".', $method, \get_class($loaderObject), $resource));
}
$routeCollection = \call_user_func([$loaderObject, $method], $this);
@@ -67,7 +67,7 @@ public function load($resource, $type = null)
if (!$routeCollection instanceof RouteCollection) {
$type = \is_object($routeCollection) ? \get_class($routeCollection) : \gettype($routeCollection);
- throw new \LogicException(sprintf('The %s::%s method must return a RouteCollection: %s returned', \get_class($loaderObject), $method, $type));
+ throw new \LogicException(sprintf('The "%s::%s()" method must return a RouteCollection: "%s" returned.', \get_class($loaderObject), $method, $type));
}
// make the service file tracked so that if it changes, the cache rebuilds
diff --git a/vendor/symfony/routing/Loader/XmlFileLoader.php b/vendor/symfony/routing/Loader/XmlFileLoader.php
index 29dfdb1665..a9a9d09e08 100644
--- a/vendor/symfony/routing/Loader/XmlFileLoader.php
+++ b/vendor/symfony/routing/Loader/XmlFileLoader.php
@@ -240,9 +240,9 @@ private function parseConfigs(\DOMElement $node, $path)
if ($controller = $node->getAttribute('controller')) {
if (isset($defaults['_controller'])) {
- $name = $node->hasAttribute('id') ? sprintf('"%s"', $node->getAttribute('id')) : sprintf('the "%s" tag', $node->tagName);
+ $name = $node->hasAttribute('id') ? sprintf('"%s".', $node->getAttribute('id')) : sprintf('the "%s" tag.', $node->tagName);
- throw new \InvalidArgumentException(sprintf('The routing file "%s" must not specify both the "controller" attribute and the defaults key "_controller" for %s.', $path, $name));
+ throw new \InvalidArgumentException(sprintf('The routing file "%s" must not specify both the "controller" attribute and the defaults key "_controller" for ', $path).$name);
}
$defaults['_controller'] = $controller;
diff --git a/vendor/symfony/routing/Loader/YamlFileLoader.php b/vendor/symfony/routing/Loader/YamlFileLoader.php
index 568827695b..f527c755b7 100644
--- a/vendor/symfony/routing/Loader/YamlFileLoader.php
+++ b/vendor/symfony/routing/Loader/YamlFileLoader.php
@@ -66,7 +66,7 @@ public function load($file, $type = null)
try {
$parsedConfig = $this->yamlParser->parseFile($path);
} catch (ParseException $e) {
- throw new \InvalidArgumentException(sprintf('The file "%s" does not contain valid YAML.', $path), 0, $e);
+ throw new \InvalidArgumentException(sprintf('The file "%s" does not contain valid YAML: ', $path).$e->getMessage(), 0, $e);
} finally {
restore_error_handler();
}
diff --git a/vendor/symfony/routing/Matcher/Dumper/PhpMatcherDumper.php b/vendor/symfony/routing/Matcher/Dumper/PhpMatcherDumper.php
index 0a830b64d5..335d6507ed 100644
--- a/vendor/symfony/routing/Matcher/Dumper/PhpMatcherDumper.php
+++ b/vendor/symfony/routing/Matcher/Dumper/PhpMatcherDumper.php
@@ -278,7 +278,7 @@ private function compileRoute(Route $route, $name, $supportsRedirections, $paren
$gotoname = 'not_'.preg_replace('/[^A-Za-z0-9_]/', '', $name);
- // the offset where the return value is appended below, with indendation
+ // the offset where the return value is appended below, with indentation
$retOffset = 12 + \strlen($code);
// optimize parameters array
diff --git a/vendor/symfony/routing/Matcher/UrlMatcher.php b/vendor/symfony/routing/Matcher/UrlMatcher.php
index 663ebcbefa..b8599b23ad 100644
--- a/vendor/symfony/routing/Matcher/UrlMatcher.php
+++ b/vendor/symfony/routing/Matcher/UrlMatcher.php
@@ -80,9 +80,7 @@ public function match($pathinfo)
throw new NoConfigurationException();
}
- throw 0 < \count($this->allow)
- ? new MethodNotAllowedException(array_unique($this->allow))
- : new ResourceNotFoundException(sprintf('No routes found for "%s".', $pathinfo));
+ throw 0 < \count($this->allow) ? new MethodNotAllowedException(array_unique($this->allow)) : new ResourceNotFoundException(sprintf('No routes found for "%s".', $pathinfo));
}
/**
diff --git a/vendor/symfony/routing/README.md b/vendor/symfony/routing/README.md
index 88fb1fde5a..a16d9d7fcb 100644
--- a/vendor/symfony/routing/README.md
+++ b/vendor/symfony/routing/README.md
@@ -6,7 +6,7 @@ The Routing component maps an HTTP request to a set of configuration variables.
Resources
---------
- * [Documentation](https://symfony.com/doc/current/components/routing/index.html)
+ * [Documentation](https://symfony.com/doc/current/components/routing.html)
* [Contributing](https://symfony.com/doc/current/contributing/index.html)
* [Report issues](https://github.com/symfony/symfony/issues) and
[send Pull Requests](https://github.com/symfony/symfony/pulls)
diff --git a/vendor/symfony/routing/RequestContext.php b/vendor/symfony/routing/RequestContext.php
index 8ebad8e253..ed50cd70d8 100644
--- a/vendor/symfony/routing/RequestContext.php
+++ b/vendor/symfony/routing/RequestContext.php
@@ -67,8 +67,8 @@ public function fromRequest(Request $request)
$this->setMethod($request->getMethod());
$this->setHost($request->getHost());
$this->setScheme($request->getScheme());
- $this->setHttpPort($request->isSecure() ? $this->httpPort : $request->getPort());
- $this->setHttpsPort($request->isSecure() ? $request->getPort() : $this->httpsPort);
+ $this->setHttpPort($request->isSecure() || null === $request->getPort() ? $this->httpPort : $request->getPort());
+ $this->setHttpsPort($request->isSecure() && null !== $request->getPort() ? $request->getPort() : $this->httpsPort);
$this->setQueryString($request->server->get('QUERY_STRING', ''));
return $this;
diff --git a/vendor/symfony/routing/RouteCompiler.php b/vendor/symfony/routing/RouteCompiler.php
index 391fa82903..40fc6d9fef 100644
--- a/vendor/symfony/routing/RouteCompiler.php
+++ b/vendor/symfony/routing/RouteCompiler.php
@@ -139,7 +139,7 @@ private static function compilePattern(Route $route, $pattern, $isHost)
}
if (\strlen($varName) > self::VARIABLE_MAXIMUM_LENGTH) {
- throw new \DomainException(sprintf('Variable name "%s" cannot be longer than %s characters in route pattern "%s". Please use a shorter name.', $varName, self::VARIABLE_MAXIMUM_LENGTH, $pattern));
+ throw new \DomainException(sprintf('Variable name "%s" cannot be longer than %d characters in route pattern "%s". Please use a shorter name.', $varName, self::VARIABLE_MAXIMUM_LENGTH, $pattern));
}
if ($isSeparator && $precedingText !== $precedingChar) {
diff --git a/vendor/symfony/routing/Tests/RouteCollectionBuilderTest.php b/vendor/symfony/routing/Tests/RouteCollectionBuilderTest.php
index f5042749e2..395f4ab97a 100644
--- a/vendor/symfony/routing/Tests/RouteCollectionBuilderTest.php
+++ b/vendor/symfony/routing/Tests/RouteCollectionBuilderTest.php
@@ -256,7 +256,7 @@ public function providePrefixTests()
// shows that a prefix will always be given the starting slash
$tests[] = ['0', '/foo', '/0/foo'];
- // spaces are ok, and double slahses at the end are cleaned
+ // spaces are ok, and double slashes at the end are cleaned
$tests[] = ['/ /', '/foo', '/ /foo'];
return $tests;
diff --git a/vendor/symfony/serializer/Annotation/Groups.php b/vendor/symfony/serializer/Annotation/Groups.php
index 7a9b0bd2c1..4358a3e26d 100644
--- a/vendor/symfony/serializer/Annotation/Groups.php
+++ b/vendor/symfony/serializer/Annotation/Groups.php
@@ -34,13 +34,13 @@ class Groups
public function __construct(array $data)
{
if (!isset($data['value']) || !$data['value']) {
- throw new InvalidArgumentException(sprintf('Parameter of annotation "%s" cannot be empty.', \get_class($this)));
+ throw new InvalidArgumentException(sprintf('Parameter of annotation "%s" cannot be empty.', static::class));
}
$value = (array) $data['value'];
foreach ($value as $group) {
if (!\is_string($group)) {
- throw new InvalidArgumentException(sprintf('Parameter of annotation "%s" must be a string or an array of strings.', \get_class($this)));
+ throw new InvalidArgumentException(sprintf('Parameter of annotation "%s" must be a string or an array of strings.', static::class));
}
}
diff --git a/vendor/symfony/serializer/Annotation/MaxDepth.php b/vendor/symfony/serializer/Annotation/MaxDepth.php
index a274c20d85..9939fdab1c 100644
--- a/vendor/symfony/serializer/Annotation/MaxDepth.php
+++ b/vendor/symfony/serializer/Annotation/MaxDepth.php
@@ -31,11 +31,11 @@ class MaxDepth
public function __construct(array $data)
{
if (!isset($data['value'])) {
- throw new InvalidArgumentException(sprintf('Parameter of annotation "%s" should be set.', \get_class($this)));
+ throw new InvalidArgumentException(sprintf('Parameter of annotation "%s" should be set.', static::class));
}
if (!\is_int($data['value']) || $data['value'] <= 0) {
- throw new InvalidArgumentException(sprintf('Parameter of annotation "%s" must be a positive integer.', \get_class($this)));
+ throw new InvalidArgumentException(sprintf('Parameter of annotation "%s" must be a positive integer.', static::class));
}
$this->maxDepth = $data['value'];
diff --git a/vendor/symfony/serializer/Encoder/XmlEncoder.php b/vendor/symfony/serializer/Encoder/XmlEncoder.php
index c1e1109130..dc932222e9 100644
--- a/vendor/symfony/serializer/Encoder/XmlEncoder.php
+++ b/vendor/symfony/serializer/Encoder/XmlEncoder.php
@@ -11,6 +11,7 @@
namespace Symfony\Component\Serializer\Encoder;
+use Symfony\Component\Serializer\Exception\BadMethodCallException;
use Symfony\Component\Serializer\Exception\NotEncodableValueException;
/**
@@ -375,7 +376,7 @@ private function buildXml(\DOMNode $parentNode, $data, $xmlRootNodeName = null)
{
$append = true;
- if (\is_array($data) || ($data instanceof \Traversable && !$this->serializer->supportsNormalization($data, $this->format))) {
+ if (\is_array($data) || ($data instanceof \Traversable && (null === $this->serializer || !$this->serializer->supportsNormalization($data, $this->format)))) {
foreach ($data as $key => $data) {
//Ah this is the magic @ attribute types.
if (0 === strpos($key, '@') && $this->isElementNameValid($attributeName = substr($key, 1))) {
@@ -410,6 +411,10 @@ private function buildXml(\DOMNode $parentNode, $data, $xmlRootNodeName = null)
}
if (\is_object($data)) {
+ if (null === $this->serializer) {
+ throw new BadMethodCallException(sprintf('The serializer needs to be set to allow "%s()" to be used with object data.', __METHOD__));
+ }
+
$data = $this->serializer->normalize($data, $this->format, $this->context);
if (null !== $data && !is_scalar($data)) {
return $this->buildXml($parentNode, $data, $xmlRootNodeName);
@@ -426,7 +431,7 @@ private function buildXml(\DOMNode $parentNode, $data, $xmlRootNodeName = null)
return $this->appendNode($parentNode, $data, 'data');
}
- throw new NotEncodableValueException(sprintf('An unexpected value could not be serialized: %s', !\is_resource($data) ? var_export($data, true) : sprintf('%s resource', get_resource_type($data))));
+ throw new NotEncodableValueException('An unexpected value could not be serialized: '.(!\is_resource($data) ? var_export($data, true) : sprintf('%s resource', get_resource_type($data))));
}
/**
@@ -484,6 +489,10 @@ private function selectNodeType(\DOMNode $node, $val)
} elseif ($val instanceof \Traversable) {
$this->buildXml($node, $val);
} elseif (\is_object($val)) {
+ if (null === $this->serializer) {
+ throw new BadMethodCallException(sprintf('The serializer needs to be set to allow "%s()" to be used with object data.', __METHOD__));
+ }
+
return $this->selectNodeType($node, $this->serializer->normalize($val, $this->format, $this->context));
} elseif (is_numeric($val)) {
return $this->appendText($node, (string) $val);
diff --git a/vendor/symfony/serializer/LICENSE b/vendor/symfony/serializer/LICENSE
index a677f43763..9e936ec044 100644
--- a/vendor/symfony/serializer/LICENSE
+++ b/vendor/symfony/serializer/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2019 Fabien Potencier
+Copyright (c) 2004-2020 Fabien Potencier
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/vendor/symfony/serializer/Mapping/Factory/ClassResolverTrait.php b/vendor/symfony/serializer/Mapping/Factory/ClassResolverTrait.php
index 73c02a647c..9baa969da4 100644
--- a/vendor/symfony/serializer/Mapping/Factory/ClassResolverTrait.php
+++ b/vendor/symfony/serializer/Mapping/Factory/ClassResolverTrait.php
@@ -29,7 +29,7 @@ trait ClassResolverTrait
*
* @return string
*
- * @throws InvalidArgumentException If the class does not exists
+ * @throws InvalidArgumentException If the class does not exist
*/
private function getClass($value)
{
@@ -42,7 +42,7 @@ private function getClass($value)
}
if (!\is_object($value)) {
- throw new InvalidArgumentException(sprintf('Cannot create metadata for non-objects. Got: "%s"', \gettype($value)));
+ throw new InvalidArgumentException(sprintf('Cannot create metadata for non-objects. Got: "%s".', \gettype($value)));
}
return \get_class($value);
diff --git a/vendor/symfony/serializer/Mapping/Loader/FileLoader.php b/vendor/symfony/serializer/Mapping/Loader/FileLoader.php
index d1b0dee93e..20f9e4886a 100644
--- a/vendor/symfony/serializer/Mapping/Loader/FileLoader.php
+++ b/vendor/symfony/serializer/Mapping/Loader/FileLoader.php
@@ -30,11 +30,11 @@ abstract class FileLoader implements LoaderInterface
public function __construct($file)
{
if (!is_file($file)) {
- throw new MappingException(sprintf('The mapping file %s does not exist', $file));
+ throw new MappingException(sprintf('The mapping file "%s" does not exist.', $file));
}
if (!is_readable($file)) {
- throw new MappingException(sprintf('The mapping file %s is not readable', $file));
+ throw new MappingException(sprintf('The mapping file "%s" is not readable.', $file));
}
$this->file = $file;
diff --git a/vendor/symfony/serializer/Mapping/Loader/LoaderChain.php b/vendor/symfony/serializer/Mapping/Loader/LoaderChain.php
index 1890a9d84c..f422f11c7d 100644
--- a/vendor/symfony/serializer/Mapping/Loader/LoaderChain.php
+++ b/vendor/symfony/serializer/Mapping/Loader/LoaderChain.php
@@ -40,7 +40,7 @@ public function __construct(array $loaders)
{
foreach ($loaders as $loader) {
if (!$loader instanceof LoaderInterface) {
- throw new MappingException(sprintf('Class %s is expected to implement LoaderInterface', \get_class($loader)));
+ throw new MappingException(sprintf('Class "%s" is expected to implement LoaderInterface.', \get_class($loader)));
}
}
diff --git a/vendor/symfony/serializer/Normalizer/AbstractNormalizer.php b/vendor/symfony/serializer/Normalizer/AbstractNormalizer.php
index bf9afb701e..71b1e38d37 100644
--- a/vendor/symfony/serializer/Normalizer/AbstractNormalizer.php
+++ b/vendor/symfony/serializer/Normalizer/AbstractNormalizer.php
@@ -185,7 +185,7 @@ protected function handleCircularReference($object)
return \call_user_func($this->circularReferenceHandler, $object);
}
- throw new CircularReferenceException(sprintf('A circular reference has been detected when serializing the object of class "%s" (configured limit: %d)', \get_class($object), $this->circularReferenceLimit));
+ throw new CircularReferenceException(sprintf('A circular reference has been detected when serializing the object of class "%s" (configured limit: %d).', \get_class($object), $this->circularReferenceLimit));
}
/**
@@ -304,10 +304,10 @@ protected function instantiateObject(array &$data, $class, array &$context, \Ref
if (\func_num_args() >= 6) {
$format = func_get_arg(5);
} else {
- if (__CLASS__ !== \get_class($this)) {
+ if (__CLASS__ !== static::class) {
$r = new \ReflectionMethod($this, __FUNCTION__);
if (__CLASS__ !== $r->getDeclaringClass()->getName()) {
- @trigger_error(sprintf('Method %s::%s() will have a 6th `string $format = null` argument in version 4.0. Not defining it is deprecated since Symfony 3.2.', \get_class($this), __FUNCTION__), E_USER_DEPRECATED);
+ @trigger_error(sprintf('Method %s::%s() will have a 6th `string $format = null` argument in version 4.0. Not defining it is deprecated since Symfony 3.2.', static::class, __FUNCTION__), E_USER_DEPRECATED);
}
}
@@ -340,7 +340,7 @@ protected function instantiateObject(array &$data, $class, array &$context, \Ref
if (method_exists($constructorParameter, 'isVariadic') && $constructorParameter->isVariadic()) {
if ($allowed && !$ignored && (isset($data[$key]) || \array_key_exists($key, $data))) {
if (!\is_array($data[$paramName])) {
- throw new RuntimeException(sprintf('Cannot create an instance of %s from serialized data because the variadic parameter %s can only accept an array.', $class, $constructorParameter->name));
+ throw new RuntimeException(sprintf('Cannot create an instance of "%s" from serialized data because the variadic parameter "%s" can only accept an array.', $class, $constructorParameter->name));
}
$variadicParameters = [];
@@ -366,7 +366,7 @@ protected function instantiateObject(array &$data, $class, array &$context, \Ref
} elseif ($constructorParameter->isDefaultValueAvailable()) {
$params[] = $constructorParameter->getDefaultValue();
} else {
- throw new RuntimeException(sprintf('Cannot create an instance of %s from serialized data because its constructor requires parameter "%s" to be present.', $class, $constructorParameter->name));
+ throw new RuntimeException(sprintf('Cannot create an instance of "%s" from serialized data because its constructor requires parameter "%s" to be present.', $class, $constructorParameter->name));
}
}
@@ -386,11 +386,19 @@ protected function instantiateObject(array &$data, $class, array &$context, \Ref
protected function denormalizeParameter(\ReflectionClass $class, \ReflectionParameter $parameter, $parameterName, $parameterData, array $context, $format = null)
{
try {
- if (null !== $parameter->getClass()) {
+ if (\PHP_VERSION_ID < 70100 && null !== $parameterClass = $parameter->getClass()) {
+ $parameterClass = $parameterClass->name;
+ } elseif (\PHP_VERSION_ID >= 70100 && ($parameterType = $parameter->getType()) && !$parameterType->isBuiltin()) {
+ $parameterClass = $parameterType->getName();
+ new \ReflectionClass($parameterClass); // throws a \ReflectionException if the class doesn't exist
+ } else {
+ $parameterClass = null;
+ }
+
+ if (null !== $parameterClass) {
if (!$this->serializer instanceof DenormalizerInterface) {
- throw new LogicException(sprintf('Cannot create an instance of %s from serialized data because the serializer inject in "%s" is not a denormalizer', $parameter->getClass(), static::class));
+ throw new LogicException(sprintf('Cannot create an instance of "%s" from serialized data because the serializer inject in "%s" is not a denormalizer.', $parameterClass, static::class));
}
- $parameterClass = $parameter->getClass()->getName();
return $this->serializer->denormalize($parameterData, $parameterClass, $format, $this->createChildContext($context, $parameterName, $format));
}
diff --git a/vendor/symfony/serializer/Normalizer/AbstractObjectNormalizer.php b/vendor/symfony/serializer/Normalizer/AbstractObjectNormalizer.php
index 6cb6ec5013..78a297b347 100644
--- a/vendor/symfony/serializer/Normalizer/AbstractObjectNormalizer.php
+++ b/vendor/symfony/serializer/Normalizer/AbstractObjectNormalizer.php
@@ -91,7 +91,7 @@ public function normalize($object, $format = null, array $context = [])
foreach ($stack as $attribute => $attributeValue) {
if (!$this->serializer instanceof NormalizerInterface) {
- throw new LogicException(sprintf('Cannot normalize attribute "%s" because the injected serializer is not a normalizer', $attribute));
+ throw new LogicException(sprintf('Cannot normalize attribute "%s" because the injected serializer is not a normalizer.', $attribute));
}
$data = $this->updateData($data, $attribute, $this->serializer->normalize($attributeValue, $format, $this->createChildContext($context, $attribute, $format)));
@@ -108,7 +108,7 @@ public function normalize($object, $format = null, array $context = [])
*
* @return string[]
*/
- protected function getAttributes($object, $format = null, array $context)
+ protected function getAttributes($object, $format, array $context)
{
$class = \get_class($object);
$key = $class.'-'.$context['cache_key'];
@@ -268,7 +268,7 @@ private function validateAndDenormalize($currentClass, $attribute, $data, $forma
if (Type::BUILTIN_TYPE_OBJECT === $builtinType) {
if (!$this->serializer instanceof DenormalizerInterface) {
- throw new LogicException(sprintf('Cannot denormalize attribute "%s" for class "%s" because injected serializer is not a denormalizer', $attribute, $class));
+ throw new LogicException(sprintf('Cannot denormalize attribute "%s" for class "%s" because injected serializer is not a denormalizer.', $attribute, $class));
}
$childContext = $this->createChildContext($context, $attribute, $format);
@@ -304,7 +304,7 @@ private function validateAndDenormalize($currentClass, $attribute, $data, $forma
*/
protected function denormalizeParameter(\ReflectionClass $class, \ReflectionParameter $parameter, $parameterName, $parameterData, array $context, $format = null)
{
- if (null === $this->propertyTypeExtractor || null === $types = $this->propertyTypeExtractor->getTypes($class->getName(), $parameterName)) {
+ if (null === $this->propertyTypeExtractor || null === $this->propertyTypeExtractor->getTypes($class->getName(), $parameterName)) {
return parent::denormalizeParameter($class, $parameter, $parameterName, $parameterData, $context, $format);
}
@@ -400,6 +400,7 @@ protected function createChildContext(array $parentContext, $attribute/*, string
*/
private function getCacheKey($format, array $context)
{
+ unset($context[self::OBJECT_TO_POPULATE]);
unset($context['cache_key']); // avoid artificially different keys
try {
return md5($format.serialize([
diff --git a/vendor/symfony/serializer/Normalizer/ArrayDenormalizer.php b/vendor/symfony/serializer/Normalizer/ArrayDenormalizer.php
index 93d6fc009b..af331d30f7 100644
--- a/vendor/symfony/serializer/Normalizer/ArrayDenormalizer.php
+++ b/vendor/symfony/serializer/Normalizer/ArrayDenormalizer.php
@@ -68,6 +68,10 @@ public function denormalize($data, $type, $format = null, array $context = [])
*/
public function supportsDenormalization($data, $type, $format = null/*, array $context = []*/)
{
+ if (null === $this->serializer) {
+ throw new BadMethodCallException(sprintf('The serializer needs to be set to allow "%s()" to be used.', __METHOD__));
+ }
+
$context = \func_num_args() > 3 ? func_get_arg(3) : [];
return '[]' === substr($type, -2)
diff --git a/vendor/symfony/serializer/Normalizer/DateIntervalNormalizer.php b/vendor/symfony/serializer/Normalizer/DateIntervalNormalizer.php
index 83d9312b01..8b5cde30f5 100644
--- a/vendor/symfony/serializer/Normalizer/DateIntervalNormalizer.php
+++ b/vendor/symfony/serializer/Normalizer/DateIntervalNormalizer.php
@@ -67,7 +67,7 @@ public function supportsNormalization($data, $format = null)
public function denormalize($data, $type, $format = null, array $context = [])
{
if (!\is_string($data)) {
- throw new InvalidArgumentException(sprintf('Data expected to be a string, %s given.', \gettype($data)));
+ throw new InvalidArgumentException(sprintf('Data expected to be a string, "%s" given.', \gettype($data)));
}
if (!$this->isISO8601($data)) {
diff --git a/vendor/symfony/serializer/Normalizer/DateTimeNormalizer.php b/vendor/symfony/serializer/Normalizer/DateTimeNormalizer.php
index 39c31f00f1..fef57d120d 100644
--- a/vendor/symfony/serializer/Normalizer/DateTimeNormalizer.php
+++ b/vendor/symfony/serializer/Normalizer/DateTimeNormalizer.php
@@ -101,13 +101,7 @@ public function denormalize($data, $type, $format = null, array $context = [])
$dateTimeErrors = \DateTime::class === $type ? \DateTime::getLastErrors() : \DateTimeImmutable::getLastErrors();
- throw new NotNormalizableValueException(sprintf(
- 'Parsing datetime string "%s" using format "%s" resulted in %d errors:'."\n".'%s',
- $data,
- $dateTimeFormat,
- $dateTimeErrors['error_count'],
- implode("\n", $this->formatDateTimeErrors($dateTimeErrors['errors']))
- ));
+ throw new NotNormalizableValueException(sprintf('Parsing datetime string "%s" using format "%s" resulted in %d errors: ', $data, $dateTimeFormat, $dateTimeErrors['error_count'])."\n".implode("\n", $this->formatDateTimeErrors($dateTimeErrors['errors'])));
}
try {
diff --git a/vendor/symfony/serializer/Normalizer/JsonSerializableNormalizer.php b/vendor/symfony/serializer/Normalizer/JsonSerializableNormalizer.php
index f4080e524c..85e6e1c8b6 100644
--- a/vendor/symfony/serializer/Normalizer/JsonSerializableNormalizer.php
+++ b/vendor/symfony/serializer/Normalizer/JsonSerializableNormalizer.php
@@ -35,7 +35,7 @@ public function normalize($object, $format = null, array $context = [])
}
if (!$this->serializer instanceof NormalizerInterface) {
- throw new LogicException('Cannot normalize object because injected serializer is not a normalizer');
+ throw new LogicException('Cannot normalize object because injected serializer is not a normalizer.');
}
return $this->serializer->normalize($object->jsonSerialize(), $format, $context);
diff --git a/vendor/symfony/serializer/Normalizer/ObjectNormalizer.php b/vendor/symfony/serializer/Normalizer/ObjectNormalizer.php
index c1b3dd260e..5c2cd7af1c 100644
--- a/vendor/symfony/serializer/Normalizer/ObjectNormalizer.php
+++ b/vendor/symfony/serializer/Normalizer/ObjectNormalizer.php
@@ -83,8 +83,14 @@ protected function extractAttributes($object, $format = null, array $context = [
}
}
+ $checkPropertyInitialization = \PHP_VERSION_ID >= 70400;
+
// properties
foreach ($reflClass->getProperties(\ReflectionProperty::IS_PUBLIC) as $reflProperty) {
+ if ($checkPropertyInitialization && !$reflProperty->isInitialized($object)) {
+ continue;
+ }
+
if ($reflProperty->isStatic() || !$this->isAllowedAttribute($object, $reflProperty->name, $format, $context)) {
continue;
}
diff --git a/vendor/symfony/serializer/Normalizer/PropertyNormalizer.php b/vendor/symfony/serializer/Normalizer/PropertyNormalizer.php
index 46faa1e7e9..be6634b493 100644
--- a/vendor/symfony/serializer/Normalizer/PropertyNormalizer.php
+++ b/vendor/symfony/serializer/Normalizer/PropertyNormalizer.php
@@ -99,9 +99,20 @@ protected function extractAttributes($object, $format = null, array $context = [
{
$reflectionObject = new \ReflectionObject($object);
$attributes = [];
+ $checkPropertyInitialization = \PHP_VERSION_ID >= 70400;
do {
foreach ($reflectionObject->getProperties() as $property) {
+ if ($checkPropertyInitialization) {
+ if (!$property->isPublic()) {
+ $property->setAccessible(true);
+ }
+
+ if (!$property->isInitialized($object)) {
+ continue;
+ }
+ }
+
if (!$this->isAllowedAttribute($reflectionObject->getName(), $property->name, $format, $context)) {
continue;
}
diff --git a/vendor/symfony/serializer/Serializer.php b/vendor/symfony/serializer/Serializer.php
index a29a1482dd..87b32a6ca5 100644
--- a/vendor/symfony/serializer/Serializer.php
+++ b/vendor/symfony/serializer/Serializer.php
@@ -109,7 +109,7 @@ public function __construct(array $normalizers = [], array $encoders = [])
final public function serialize($data, $format, array $context = [])
{
if (!$this->supportsEncoding($format, $context)) {
- throw new NotEncodableValueException(sprintf('Serialization for the format %s is not supported', $format));
+ throw new NotEncodableValueException(sprintf('Serialization for the format "%s" is not supported.', $format));
}
if ($this->encoder->needsNormalization($format, $context)) {
@@ -125,7 +125,7 @@ final public function serialize($data, $format, array $context = [])
final public function deserialize($data, $type, $format, array $context = [])
{
if (!$this->supportsDecoding($format, $context)) {
- throw new NotEncodableValueException(sprintf('Deserialization for the format %s is not supported', $format));
+ throw new NotEncodableValueException(sprintf('Deserialization for the format "%s" is not supported.', $format));
}
$data = $this->decode($data, $format, $context);
@@ -161,10 +161,10 @@ public function normalize($data, $format = null, array $context = [])
throw new LogicException('You must register at least one normalizer to be able to normalize objects.');
}
- throw new NotNormalizableValueException(sprintf('Could not normalize object of type %s, no supporting normalizer found.', \get_class($data)));
+ throw new NotNormalizableValueException(sprintf('Could not normalize object of type "%s", no supporting normalizer found.', \get_class($data)));
}
- throw new NotNormalizableValueException(sprintf('An unexpected value could not be normalized: %s', !\is_resource($data) ? var_export($data, true) : sprintf('%s resource', get_resource_type($data))));
+ throw new NotNormalizableValueException('An unexpected value could not be normalized: '.(!\is_resource($data) ? var_export($data, true) : sprintf('%s resource', get_resource_type($data))));
}
/**
@@ -182,7 +182,7 @@ public function denormalize($data, $type, $format = null, array $context = [])
return $normalizer->denormalize($data, $type, $format, $context);
}
- throw new NotNormalizableValueException(sprintf('Could not denormalize object of type %s, no supporting normalizer found.', $type));
+ throw new NotNormalizableValueException(sprintf('Could not denormalize object of type "%s", no supporting normalizer found.', $type));
}
/**
@@ -193,7 +193,7 @@ public function supportsNormalization($data, $format = null/*, array $context =
if (\func_num_args() > 2) {
$context = func_get_arg(2);
} else {
- if (__CLASS__ !== \get_class($this)) {
+ if (__CLASS__ !== static::class) {
$r = new \ReflectionMethod($this, __FUNCTION__);
if (__CLASS__ !== $r->getDeclaringClass()->getName()) {
@trigger_error(sprintf('The "%s()" method will have a third `$context = []` argument in version 4.0. Not defining it is deprecated since Symfony 3.3.', __METHOD__), E_USER_DEPRECATED);
@@ -214,7 +214,7 @@ public function supportsDenormalization($data, $type, $format = null/*, array $c
if (\func_num_args() > 3) {
$context = func_get_arg(3);
} else {
- if (__CLASS__ !== \get_class($this)) {
+ if (__CLASS__ !== static::class) {
$r = new \ReflectionMethod($this, __FUNCTION__);
if (__CLASS__ !== $r->getDeclaringClass()->getName()) {
@trigger_error(sprintf('The "%s()" method will have a fourth `$context = []` argument in version 4.0. Not defining it is deprecated since Symfony 3.3.', __METHOD__), E_USER_DEPRECATED);
@@ -292,7 +292,7 @@ public function supportsEncoding($format/*, array $context = []*/)
if (\func_num_args() > 1) {
$context = func_get_arg(1);
} else {
- if (__CLASS__ !== \get_class($this)) {
+ if (__CLASS__ !== static::class) {
$r = new \ReflectionMethod($this, __FUNCTION__);
if (__CLASS__ !== $r->getDeclaringClass()->getName()) {
@trigger_error(sprintf('The "%s()" method will have a second `$context = []` argument in version 4.0. Not defining it is deprecated since Symfony 3.3.', __METHOD__), E_USER_DEPRECATED);
@@ -313,7 +313,7 @@ public function supportsDecoding($format/*, array $context = []*/)
if (\func_num_args() > 1) {
$context = func_get_arg(1);
} else {
- if (__CLASS__ !== \get_class($this)) {
+ if (__CLASS__ !== static::class) {
$r = new \ReflectionMethod($this, __FUNCTION__);
if (__CLASS__ !== $r->getDeclaringClass()->getName()) {
@trigger_error(sprintf('The "%s()" method will have a second `$context = []` argument in version 4.0. Not defining it is deprecated since Symfony 3.3.', __METHOD__), E_USER_DEPRECATED);
diff --git a/vendor/symfony/serializer/Tests/Fixtures/Php74Dummy.php b/vendor/symfony/serializer/Tests/Fixtures/Php74Dummy.php
new file mode 100644
index 0000000000..e8cebd9b45
--- /dev/null
+++ b/vendor/symfony/serializer/Tests/Fixtures/Php74Dummy.php
@@ -0,0 +1,22 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Tests\Fixtures;
+
+/**
+ * @author Valentin Udaltsov <udaltsov.valentin@gmail.com>
+ */
+final class Php74Dummy
+{
+ public string $uninitializedProperty;
+
+ public string $initializedProperty = 'defaultValue';
+}
diff --git a/vendor/symfony/serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php b/vendor/symfony/serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php
index 4895526c45..d269da27e8 100644
--- a/vendor/symfony/serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php
+++ b/vendor/symfony/serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php
@@ -29,7 +29,7 @@ class AbstractObjectNormalizerTest extends TestCase
public function testDenormalize()
{
$normalizer = new AbstractObjectNormalizerDummy();
- $normalizedData = $normalizer->denormalize(['foo' => 'foo', 'bar' => 'bar', 'baz' => 'baz'], __NAMESPACE__.'\Dummy');
+ $normalizedData = $normalizer->denormalize(['foo' => 'foo', 'bar' => 'bar', 'baz' => 'baz'], Dummy::class);
$this->assertSame('foo', $normalizedData->foo);
$this->assertNull($normalizedData->bar);
@@ -39,12 +39,12 @@ public function testDenormalize()
public function testInstantiateObjectDenormalizer()
{
$data = ['foo' => 'foo', 'bar' => 'bar', 'baz' => 'baz'];
- $class = __NAMESPACE__.'\Dummy';
+ $class = Dummy::class;
$context = [];
$normalizer = new AbstractObjectNormalizerDummy();
- $this->assertInstanceOf(__NAMESPACE__.'\Dummy', $normalizer->instantiateObject($data, $class, $context, new \ReflectionClass($class), []));
+ $this->assertInstanceOf(Dummy::class, $normalizer->instantiateObject($data, $class, $context, new \ReflectionClass($class), []));
}
public function testDenormalizeWithExtraAttributes()
@@ -55,7 +55,7 @@ public function testDenormalizeWithExtraAttributes()
$normalizer = new AbstractObjectNormalizerDummy($factory);
$normalizer->denormalize(
['fooFoo' => 'foo', 'fooBar' => 'bar'],
- __NAMESPACE__.'\Dummy',
+ Dummy::class,
'any',
['allow_extra_attributes' => false]
);
@@ -163,6 +163,14 @@ public function testDenormalizeStringCollectionDecodedFromXmlWithTwoChildren()
$this->assertEquals('bar', $stringCollection->children[1]);
}
+ public function testDenormalizeNotSerializableObjectToPopulate()
+ {
+ $normalizer = new AbstractObjectNormalizerDummy();
+ $normalizedData = $normalizer->denormalize(['foo' => 'foo'], Dummy::class, null, [AbstractObjectNormalizer::OBJECT_TO_POPULATE => new NotSerializable()]);
+
+ $this->assertSame('foo', $normalizedData->foo);
+ }
+
private function getDenormalizerForStringCollection()
{
$extractor = $this->getMockBuilder(PhpDocExtractor::class)->getMock();
@@ -379,3 +387,15 @@ public function setSerializer(SerializerInterface $serializer)
$this->serializer = $serializer;
}
}
+
+class NotSerializable
+{
+ public function __sleep()
+ {
+ if (class_exists(\Error::class)) {
+ throw new \Error('not serializable');
+ }
+
+ throw new \Exception('not serializable');
+ }
+}
diff --git a/vendor/symfony/serializer/Tests/Normalizer/ArrayDenormalizerTest.php b/vendor/symfony/serializer/Tests/Normalizer/ArrayDenormalizerTest.php
index 27bd361d3a..825ebd20b6 100644
--- a/vendor/symfony/serializer/Tests/Normalizer/ArrayDenormalizerTest.php
+++ b/vendor/symfony/serializer/Tests/Normalizer/ArrayDenormalizerTest.php
@@ -68,7 +68,7 @@ public function testSupportsValidArray()
{
$this->serializer->expects($this->once())
->method('supportsDenormalization')
- ->with($this->anything(), __NAMESPACE__.'\ArrayDummy', $this->anything())
+ ->with($this->anything(), ArrayDummy::class, $this->anything())
->willReturn(true);
$this->assertTrue(
@@ -104,7 +104,7 @@ public function testSupportsNoArray()
$this->assertFalse(
$this->denormalizer->supportsDenormalization(
['foo' => 'one', 'bar' => 'two'],
- __NAMESPACE__.'\ArrayDummy'
+ ArrayDummy::class
)
);
}
diff --git a/vendor/symfony/serializer/Tests/Normalizer/GetSetMethodNormalizerTest.php b/vendor/symfony/serializer/Tests/Normalizer/GetSetMethodNormalizerTest.php
index 13a244e72e..e18bc6d1d3 100644
--- a/vendor/symfony/serializer/Tests/Normalizer/GetSetMethodNormalizerTest.php
+++ b/vendor/symfony/serializer/Tests/Normalizer/GetSetMethodNormalizerTest.php
@@ -38,7 +38,7 @@ class GetSetMethodNormalizerTest extends TestCase
protected function setUp()
{
- $this->serializer = $this->getMockBuilder(__NAMESPACE__.'\SerializerNormalizer')->getMock();
+ $this->serializer = $this->getMockBuilder(SerializerNormalizer::class)->getMock();
$this->normalizer = new GetSetMethodNormalizer();
$this->normalizer->setSerializer($this->serializer);
}
@@ -83,7 +83,7 @@ public function testDenormalize()
{
$obj = $this->normalizer->denormalize(
['foo' => 'foo', 'bar' => 'bar', 'baz' => true, 'fooBar' => 'foobar'],
- __NAMESPACE__.'\GetSetDummy',
+ GetSetDummy::class,
'any'
);
$this->assertEquals('foo', $obj->getFoo());
@@ -114,21 +114,21 @@ public function testDenormalizeWithObject()
$data->foo = 'foo';
$data->bar = 'bar';
$data->fooBar = 'foobar';
- $obj = $this->normalizer->denormalize($data, __NAMESPACE__.'\GetSetDummy', 'any');
+ $obj = $this->normalizer->denormalize($data, GetSetDummy::class, 'any');
$this->assertEquals('foo', $obj->getFoo());
$this->assertEquals('bar', $obj->getBar());
}
public function testDenormalizeNull()
{
- $this->assertEquals(new GetSetDummy(), $this->normalizer->denormalize(null, __NAMESPACE__.'\GetSetDummy'));
+ $this->assertEquals(new GetSetDummy(), $this->normalizer->denormalize(null, GetSetDummy::class));
}
public function testConstructorDenormalize()
{
$obj = $this->normalizer->denormalize(
['foo' => 'foo', 'bar' => 'bar', 'baz' => true, 'fooBar' => 'foobar'],
- __NAMESPACE__.'\GetConstructorDummy', 'any');
+ GetConstructorDummy::class, 'any');
$this->assertEquals('foo', $obj->getFoo());
$this->assertEquals('bar', $obj->getBar());
$this->assertTrue($obj->isBaz());
@@ -138,7 +138,7 @@ public function testConstructorDenormalizeWithNullArgument()
{
$obj = $this->normalizer->denormalize(
['foo' => 'foo', 'bar' => null, 'baz' => true],
- __NAMESPACE__.'\GetConstructorDummy', 'any');
+ GetConstructorDummy::class, 'any');
$this->assertEquals('foo', $obj->getFoo());
$this->assertNull($obj->getBar());
$this->assertTrue($obj->isBaz());
@@ -148,7 +148,7 @@ public function testConstructorDenormalizeWithMissingOptionalArgument()
{
$obj = $this->normalizer->denormalize(
['foo' => 'test', 'baz' => [1, 2, 3]],
- __NAMESPACE__.'\GetConstructorOptionalArgsDummy', 'any');
+ GetConstructorOptionalArgsDummy::class, 'any');
$this->assertEquals('test', $obj->getFoo());
$this->assertEquals([], $obj->getBar());
$this->assertEquals([1, 2, 3], $obj->getBaz());
@@ -158,7 +158,7 @@ public function testConstructorDenormalizeWithOptionalDefaultArgument()
{
$obj = $this->normalizer->denormalize(
['bar' => 'test'],
- __NAMESPACE__.'\GetConstructorArgsWithDefaultValueDummy', 'any');
+ GetConstructorArgsWithDefaultValueDummy::class, 'any');
$this->assertEquals([], $obj->getFoo());
$this->assertEquals('test', $obj->getBar());
}
@@ -192,14 +192,14 @@ public function testConstructorWithObjectDenormalize()
$data->bar = 'bar';
$data->baz = true;
$data->fooBar = 'foobar';
- $obj = $this->normalizer->denormalize($data, __NAMESPACE__.'\GetConstructorDummy', 'any');
+ $obj = $this->normalizer->denormalize($data, GetConstructorDummy::class, 'any');
$this->assertEquals('foo', $obj->getFoo());
$this->assertEquals('bar', $obj->getBar());
}
public function testConstructorWArgWithPrivateMutator()
{
- $obj = $this->normalizer->denormalize(['foo' => 'bar'], __NAMESPACE__.'\ObjectConstructorArgsWithPrivateMutatorDummy', 'any');
+ $obj = $this->normalizer->denormalize(['foo' => 'bar'], ObjectConstructorArgsWithPrivateMutatorDummy::class, 'any');
$this->assertEquals('bar', $obj->getFoo());
}
@@ -466,7 +466,7 @@ public function testObjectToPopulate()
$obj = $this->normalizer->denormalize(
['bar' => 'bar'],
- __NAMESPACE__.'\GetSetDummy',
+ GetSetDummy::class,
null,
[GetSetMethodNormalizer::OBJECT_TO_POPULATE => $dummy]
);
@@ -480,13 +480,13 @@ public function testDenormalizeNonExistingAttribute()
{
$this->assertEquals(
new GetSetDummy(),
- $this->normalizer->denormalize(['non_existing' => true], __NAMESPACE__.'\GetSetDummy')
+ $this->normalizer->denormalize(['non_existing' => true], GetSetDummy::class)
);
}
public function testDenormalizeShouldNotSetStaticAttribute()
{
- $obj = $this->normalizer->denormalize(['staticObject' => true], __NAMESPACE__.'\GetSetDummy');
+ $obj = $this->normalizer->denormalize(['staticObject' => true], GetSetDummy::class);
$this->assertEquals(new GetSetDummy(), $obj);
$this->assertNull(GetSetDummy::getStaticObject());
@@ -504,7 +504,7 @@ public function testNoStaticGetSetSupport()
public function testPrivateSetter()
{
- $obj = $this->normalizer->denormalize(['foo' => 'foobar'], __NAMESPACE__.'\ObjectWithPrivateSetterDummy');
+ $obj = $this->normalizer->denormalize(['foo' => 'foobar'], ObjectWithPrivateSetterDummy::class);
$this->assertEquals('bar', $obj->getFoo());
}
@@ -728,7 +728,7 @@ class GetConstructorArgsWithDefaultValueDummy
protected $foo;
protected $bar;
- public function __construct($foo = [], $bar)
+ public function __construct($foo = [], $bar = null)
{
$this->foo = $foo;
$this->bar = $bar;
diff --git a/vendor/symfony/serializer/Tests/Normalizer/ObjectNormalizerTest.php b/vendor/symfony/serializer/Tests/Normalizer/ObjectNormalizerTest.php
index 765db4c82b..e27f1ac12a 100644
--- a/vendor/symfony/serializer/Tests/Normalizer/ObjectNormalizerTest.php
+++ b/vendor/symfony/serializer/Tests/Normalizer/ObjectNormalizerTest.php
@@ -28,6 +28,7 @@
use Symfony\Component\Serializer\Tests\Fixtures\CircularReferenceDummy;
use Symfony\Component\Serializer\Tests\Fixtures\GroupDummy;
use Symfony\Component\Serializer\Tests\Fixtures\MaxDepthDummy;
+use Symfony\Component\Serializer\Tests\Fixtures\Php74Dummy;
use Symfony\Component\Serializer\Tests\Fixtures\SiblingHolder;
/**
@@ -46,7 +47,7 @@ class ObjectNormalizerTest extends TestCase
protected function setUp()
{
- $this->serializer = $this->getMockBuilder(__NAMESPACE__.'\ObjectSerializerNormalizer')->getMock();
+ $this->serializer = $this->getMockBuilder(ObjectSerializerNormalizer::class)->getMock();
$this->normalizer = new ObjectNormalizer();
$this->normalizer->setSerializer($this->serializer);
}
@@ -81,11 +82,23 @@ public function testNormalize()
);
}
+ /**
+ * @requires PHP 7.4
+ */
+ public function testNormalizeObjectWithUninitializedProperties()
+ {
+ $obj = new Php74Dummy();
+ $this->assertEquals(
+ ['initializedProperty' => 'defaultValue'],
+ $this->normalizer->normalize($obj, 'any')
+ );
+ }
+
public function testDenormalize()
{
$obj = $this->normalizer->denormalize(
['foo' => 'foo', 'bar' => 'bar', 'baz' => true, 'fooBar' => 'foobar'],
- __NAMESPACE__.'\ObjectDummy',
+ ObjectDummy::class,
'any'
);
$this->assertEquals('foo', $obj->getFoo());
@@ -99,21 +112,21 @@ public function testDenormalizeWithObject()
$data->foo = 'foo';
$data->bar = 'bar';
$data->fooBar = 'foobar';
- $obj = $this->normalizer->denormalize($data, __NAMESPACE__.'\ObjectDummy', 'any');
+ $obj = $this->normalizer->denormalize($data, ObjectDummy::class, 'any');
$this->assertEquals('foo', $obj->getFoo());
$this->assertEquals('bar', $obj->bar);
}
public function testDenormalizeNull()
{
- $this->assertEquals(new ObjectDummy(), $this->normalizer->denormalize(null, __NAMESPACE__.'\ObjectDummy'));
+ $this->assertEquals(new ObjectDummy(), $this->normalizer->denormalize(null, ObjectDummy::class));
}
public function testConstructorDenormalize()
{
$obj = $this->normalizer->denormalize(
['foo' => 'foo', 'bar' => 'bar', 'baz' => true, 'fooBar' => 'foobar'],
- __NAMESPACE__.'\ObjectConstructorDummy', 'any');
+ ObjectConstructorDummy::class, 'any');
$this->assertEquals('foo', $obj->getFoo());
$this->assertEquals('bar', $obj->bar);
$this->assertTrue($obj->isBaz());
@@ -123,7 +136,7 @@ public function testConstructorDenormalizeWithNullArgument()
{
$obj = $this->normalizer->denormalize(
['foo' => 'foo', 'bar' => null, 'baz' => true],
- __NAMESPACE__.'\ObjectConstructorDummy', 'any');
+ ObjectConstructorDummy::class, 'any');
$this->assertEquals('foo', $obj->getFoo());
$this->assertNull($obj->bar);
$this->assertTrue($obj->isBaz());
@@ -133,7 +146,7 @@ public function testConstructorDenormalizeWithMissingOptionalArgument()
{
$obj = $this->normalizer->denormalize(
['foo' => 'test', 'baz' => [1, 2, 3]],
- __NAMESPACE__.'\ObjectConstructorOptionalArgsDummy', 'any');
+ ObjectConstructorOptionalArgsDummy::class, 'any');
$this->assertEquals('test', $obj->getFoo());
$this->assertEquals([], $obj->bar);
$this->assertEquals([1, 2, 3], $obj->getBaz());
@@ -143,7 +156,7 @@ public function testConstructorDenormalizeWithOptionalDefaultArgument()
{
$obj = $this->normalizer->denormalize(
['bar' => 'test'],
- __NAMESPACE__.'\ObjectConstructorArgsWithDefaultValueDummy', 'any');
+ ObjectConstructorArgsWithDefaultValueDummy::class, 'any');
$this->assertEquals([], $obj->getFoo());
$this->assertEquals('test', $obj->getBar());
}
@@ -155,7 +168,7 @@ public function testConstructorWithObjectDenormalize()
$data->bar = 'bar';
$data->baz = true;
$data->fooBar = 'foobar';
- $obj = $this->normalizer->denormalize($data, __NAMESPACE__.'\ObjectConstructorDummy', 'any');
+ $obj = $this->normalizer->denormalize($data, ObjectConstructorDummy::class, 'any');
$this->assertEquals('foo', $obj->getFoo());
$this->assertEquals('bar', $obj->bar);
}
@@ -397,7 +410,7 @@ public function testIgnoredAttributesDenormalize()
$this->assertEquals(
$obj,
- $this->normalizer->denormalize(['fooBar' => 'fooBar', 'foo' => 'foo', 'baz' => 'baz'], __NAMESPACE__.'\ObjectDummy')
+ $this->normalizer->denormalize(['fooBar' => 'fooBar', 'foo' => 'foo', 'baz' => 'baz'], ObjectDummy::class)
);
}
@@ -521,7 +534,7 @@ public function testDenormalizeNonExistingAttribute()
{
$this->assertEquals(
new ObjectDummy(),
- $this->normalizer->denormalize(['non_existing' => true], __NAMESPACE__.'\ObjectDummy')
+ $this->normalizer->denormalize(['non_existing' => true], ObjectDummy::class)
);
}
@@ -912,7 +925,7 @@ class ObjectConstructorArgsWithDefaultValueDummy
protected $foo;
protected $bar;
- public function __construct($foo = [], $bar)
+ public function __construct($foo = [], $bar = null)
{
$this->foo = $foo;
$this->bar = $bar;
@@ -1062,7 +1075,7 @@ class DummyWithConstructorObjectAndDefaultValue
private $foo;
private $inner;
- public function __construct($foo = 'a', ObjectInner $inner)
+ public function __construct($foo = 'a', ObjectInner $inner = null)
{
$this->foo = $foo;
$this->inner = $inner;
diff --git a/vendor/symfony/serializer/Tests/Normalizer/PropertyNormalizerTest.php b/vendor/symfony/serializer/Tests/Normalizer/PropertyNormalizerTest.php
index 4b138fca7b..d0e31ab4df 100644
--- a/vendor/symfony/serializer/Tests/Normalizer/PropertyNormalizerTest.php
+++ b/vendor/symfony/serializer/Tests/Normalizer/PropertyNormalizerTest.php
@@ -22,6 +22,7 @@
use Symfony\Component\Serializer\Tests\Fixtures\GroupDummy;
use Symfony\Component\Serializer\Tests\Fixtures\GroupDummyChild;
use Symfony\Component\Serializer\Tests\Fixtures\MaxDepthDummy;
+use Symfony\Component\Serializer\Tests\Fixtures\Php74Dummy;
use Symfony\Component\Serializer\Tests\Fixtures\PropertyCircularReferenceDummy;
use Symfony\Component\Serializer\Tests\Fixtures\PropertySiblingHolder;
@@ -55,11 +56,23 @@ public function testNormalize()
);
}
+ /**
+ * @requires PHP 7.4
+ */
+ public function testNormalizeObjectWithUninitializedProperties()
+ {
+ $obj = new Php74Dummy();
+ $this->assertEquals(
+ ['initializedProperty' => 'defaultValue'],
+ $this->normalizer->normalize($obj, 'any')
+ );
+ }
+
public function testDenormalize()
{
$obj = $this->normalizer->denormalize(
['foo' => 'foo', 'bar' => 'bar'],
- __NAMESPACE__.'\PropertyDummy',
+ PropertyDummy::class,
'any'
);
$this->assertEquals('foo', $obj->foo);
@@ -98,7 +111,7 @@ public function testConstructorDenormalize()
{
$obj = $this->normalizer->denormalize(
['foo' => 'foo', 'bar' => 'bar'],
- __NAMESPACE__.'\PropertyConstructorDummy',
+ PropertyConstructorDummy::class,
'any'
);
$this->assertEquals('foo', $obj->getFoo());
@@ -109,7 +122,7 @@ public function testConstructorDenormalizeWithNullArgument()
{
$obj = $this->normalizer->denormalize(
['foo' => null, 'bar' => 'bar'],
- __NAMESPACE__.'\PropertyConstructorDummy', '
+ PropertyConstructorDummy::class, '
any'
);
$this->assertNull($obj->getFoo());
@@ -363,13 +376,13 @@ public function testDenormalizeNonExistingAttribute()
{
$this->assertEquals(
new PropertyDummy(),
- $this->normalizer->denormalize(['non_existing' => true], __NAMESPACE__.'\PropertyDummy')
+ $this->normalizer->denormalize(['non_existing' => true], PropertyDummy::class)
);
}
public function testDenormalizeShouldIgnoreStaticProperty()
{
- $obj = $this->normalizer->denormalize(['outOfScope' => true], __NAMESPACE__.'\PropertyDummy');
+ $obj = $this->normalizer->denormalize(['outOfScope' => true], PropertyDummy::class);
$this->assertEquals(new PropertyDummy(), $obj);
$this->assertEquals('out_of_scope', PropertyDummy::$outOfScope);
diff --git a/vendor/symfony/translation/Catalogue/AbstractOperation.php b/vendor/symfony/translation/Catalogue/AbstractOperation.php
index 919bab8fff..4953563dbb 100644
--- a/vendor/symfony/translation/Catalogue/AbstractOperation.php
+++ b/vendor/symfony/translation/Catalogue/AbstractOperation.php
@@ -91,7 +91,7 @@ public function getDomains()
public function getMessages($domain)
{
if (!\in_array($domain, $this->getDomains())) {
- throw new InvalidArgumentException(sprintf('Invalid domain: %s.', $domain));
+ throw new InvalidArgumentException(sprintf('Invalid domain: "%s".', $domain));
}
if (!isset($this->messages[$domain]['all'])) {
@@ -107,7 +107,7 @@ public function getMessages($domain)
public function getNewMessages($domain)
{
if (!\in_array($domain, $this->getDomains())) {
- throw new InvalidArgumentException(sprintf('Invalid domain: %s.', $domain));
+ throw new InvalidArgumentException(sprintf('Invalid domain: "%s".', $domain));
}
if (!isset($this->messages[$domain]['new'])) {
@@ -123,7 +123,7 @@ public function getNewMessages($domain)
public function getObsoleteMessages($domain)
{
if (!\in_array($domain, $this->getDomains())) {
- throw new InvalidArgumentException(sprintf('Invalid domain: %s.', $domain));
+ throw new InvalidArgumentException(sprintf('Invalid domain: "%s".', $domain));
}
if (!isset($this->messages[$domain]['obsolete'])) {
diff --git a/vendor/symfony/translation/Command/XliffLintCommand.php b/vendor/symfony/translation/Command/XliffLintCommand.php
index 922e026c48..6b1976dc6b 100644
--- a/vendor/symfony/translation/Command/XliffLintCommand.php
+++ b/vendor/symfony/translation/Command/XliffLintCommand.php
@@ -17,6 +17,7 @@
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Style\SymfonyStyle;
+use Symfony\Component\Translation\Exception\InvalidArgumentException;
/**
* Validates XLIFF files syntax and outputs encountered errors.
diff --git a/vendor/symfony/translation/DataCollector/TranslationDataCollector.php b/vendor/symfony/translation/DataCollector/TranslationDataCollector.php
index fc713463a0..5b96a22f35 100644
--- a/vendor/symfony/translation/DataCollector/TranslationDataCollector.php
+++ b/vendor/symfony/translation/DataCollector/TranslationDataCollector.php
@@ -16,6 +16,7 @@
use Symfony\Component\HttpKernel\DataCollector\DataCollector;
use Symfony\Component\HttpKernel\DataCollector\LateDataCollectorInterface;
use Symfony\Component\Translation\DataCollectorTranslator;
+use Symfony\Component\VarDumper\Cloner\Data;
/**
* @author Abdellatif Ait boudad <a.aitboudad@gmail.com>
diff --git a/vendor/symfony/translation/Dumper/JsonFileDumper.php b/vendor/symfony/translation/Dumper/JsonFileDumper.php
index 3ee446dc73..15e065acec 100644
--- a/vendor/symfony/translation/Dumper/JsonFileDumper.php
+++ b/vendor/symfony/translation/Dumper/JsonFileDumper.php
@@ -28,7 +28,7 @@ public function formatCatalogue(MessageCatalogue $messages, $domain, array $opti
if (isset($options['json_encoding'])) {
$flags = $options['json_encoding'];
} else {
- $flags = \defined('JSON_PRETTY_PRINT') ? JSON_PRETTY_PRINT : 0;
+ $flags = JSON_PRETTY_PRINT;
}
return json_encode($messages->all($domain), $flags);
diff --git a/vendor/symfony/translation/Dumper/XliffFileDumper.php b/vendor/symfony/translation/Dumper/XliffFileDumper.php
index cd867b0967..f933be8b25 100644
--- a/vendor/symfony/translation/Dumper/XliffFileDumper.php
+++ b/vendor/symfony/translation/Dumper/XliffFileDumper.php
@@ -41,7 +41,7 @@ public function formatCatalogue(MessageCatalogue $messages, $domain, array $opti
return $this->dumpXliff1($defaultLocale, $messages, $domain, $options);
}
if ('2.0' === $xliffVersion) {
- return $this->dumpXliff2($defaultLocale, $messages, $domain, $options);
+ return $this->dumpXliff2($defaultLocale, $messages, $domain);
}
throw new InvalidArgumentException(sprintf('No support implemented for dumping XLIFF version "%s".', $xliffVersion));
@@ -129,7 +129,7 @@ private function dumpXliff1($defaultLocale, MessageCatalogue $messages, $domain,
return $dom->saveXML();
}
- private function dumpXliff2($defaultLocale, MessageCatalogue $messages, $domain, array $options = [])
+ private function dumpXliff2($defaultLocale, MessageCatalogue $messages, $domain)
{
$dom = new \DOMDocument('1.0', 'utf-8');
$dom->formatOutput = true;
diff --git a/vendor/symfony/translation/LICENSE b/vendor/symfony/translation/LICENSE
index a677f43763..9e936ec044 100644
--- a/vendor/symfony/translation/LICENSE
+++ b/vendor/symfony/translation/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2019 Fabien Potencier
+Copyright (c) 2004-2020 Fabien Potencier
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/vendor/symfony/translation/Loader/IcuDatFileLoader.php b/vendor/symfony/translation/Loader/IcuDatFileLoader.php
index 83b5043d35..7d15aecb6e 100644
--- a/vendor/symfony/translation/Loader/IcuDatFileLoader.php
+++ b/vendor/symfony/translation/Loader/IcuDatFileLoader.php
@@ -44,7 +44,7 @@ public function load($resource, $locale, $domain = 'messages')
}
if (!$rb) {
- throw new InvalidResourceException(sprintf('Cannot load resource "%s"', $resource));
+ throw new InvalidResourceException(sprintf('Cannot load resource "%s".', $resource));
} elseif (intl_is_failure($rb->getErrorCode())) {
throw new InvalidResourceException($rb->getErrorMessage(), $rb->getErrorCode());
}
diff --git a/vendor/symfony/translation/Loader/IcuResFileLoader.php b/vendor/symfony/translation/Loader/IcuResFileLoader.php
index b59c021469..d5fe99603b 100644
--- a/vendor/symfony/translation/Loader/IcuResFileLoader.php
+++ b/vendor/symfony/translation/Loader/IcuResFileLoader.php
@@ -44,7 +44,7 @@ public function load($resource, $locale, $domain = 'messages')
}
if (!$rb) {
- throw new InvalidResourceException(sprintf('Cannot load resource "%s"', $resource));
+ throw new InvalidResourceException(sprintf('Cannot load resource "%s".', $resource));
} elseif (intl_is_failure($rb->getErrorCode())) {
throw new InvalidResourceException($rb->getErrorMessage(), $rb->getErrorCode());
}
diff --git a/vendor/symfony/translation/Loader/JsonFileLoader.php b/vendor/symfony/translation/Loader/JsonFileLoader.php
index 526721277d..a02732e8d8 100644
--- a/vendor/symfony/translation/Loader/JsonFileLoader.php
+++ b/vendor/symfony/translation/Loader/JsonFileLoader.php
@@ -30,7 +30,7 @@ protected function loadResource($resource)
$messages = json_decode($data, true);
if (0 < $errorCode = json_last_error()) {
- throw new InvalidResourceException(sprintf('Error parsing JSON - %s', $this->getJSONErrorMessage($errorCode)));
+ throw new InvalidResourceException('Error parsing JSON: '.$this->getJSONErrorMessage($errorCode));
}
}
diff --git a/vendor/symfony/translation/Loader/PhpFileLoader.php b/vendor/symfony/translation/Loader/PhpFileLoader.php
index a0050e8db1..0991c3d3a2 100644
--- a/vendor/symfony/translation/Loader/PhpFileLoader.php
+++ b/vendor/symfony/translation/Loader/PhpFileLoader.php
@@ -18,11 +18,25 @@
*/
class PhpFileLoader extends FileLoader
{
+ private static $cache = [];
+
/**
* {@inheritdoc}
*/
protected function loadResource($resource)
{
- return require $resource;
+ if ([] === self::$cache && \function_exists('opcache_invalidate') && filter_var(ini_get('opcache.enable'), FILTER_VALIDATE_BOOLEAN) && (!\in_array(\PHP_SAPI, ['cli', 'phpdbg'], true) || filter_var(ini_get('opcache.enable_cli'), FILTER_VALIDATE_BOOLEAN))) {
+ self::$cache = null;
+ }
+
+ if (null === self::$cache) {
+ return require $resource;
+ }
+
+ if (isset(self::$cache[$resource])) {
+ return self::$cache[$resource];
+ }
+
+ return self::$cache[$resource] = require $resource;
}
}
diff --git a/vendor/symfony/translation/Loader/XliffFileLoader.php b/vendor/symfony/translation/Loader/XliffFileLoader.php
index 9d7a83ab84..14a2668c27 100644
--- a/vendor/symfony/translation/Loader/XliffFileLoader.php
+++ b/vendor/symfony/translation/Loader/XliffFileLoader.php
@@ -53,7 +53,7 @@ private function extract($resource, MessageCatalogue $catalogue, $domain)
try {
$dom = XmlUtils::loadFile($resource);
} catch (\InvalidArgumentException $e) {
- throw new InvalidResourceException(sprintf('Unable to load "%s": %s', $resource, $e->getMessage()), $e->getCode(), $e);
+ throw new InvalidResourceException(sprintf('Unable to load "%s": ', $resource).$e->getMessage(), $e->getCode(), $e);
}
$xliffVersion = $this->getVersionNumber($dom);
@@ -194,7 +194,7 @@ private function validateSchema($file, \DOMDocument $dom, $schema)
if (!@$dom->schemaValidateSource($schema)) {
libxml_disable_entity_loader($disableEntities);
- throw new InvalidResourceException(sprintf('Invalid resource provided: "%s"; Errors: %s', $file, implode("\n", $this->getXmlErrors($internalErrors))));
+ throw new InvalidResourceException(sprintf('Invalid resource provided: "%s"; Errors: ', $file).implode("\n", $this->getXmlErrors($internalErrors)));
}
libxml_disable_entity_loader($disableEntities);
@@ -297,7 +297,7 @@ private function getVersionNumber(\DOMDocument $dom)
$namespace = $xliff->attributes->getNamedItem('xmlns');
if ($namespace) {
if (0 !== substr_compare('urn:oasis:names:tc:xliff:document:', $namespace->nodeValue, 0, 34)) {
- throw new InvalidArgumentException(sprintf('Not a valid XLIFF namespace "%s"', $namespace));
+ throw new InvalidArgumentException(sprintf('Not a valid XLIFF namespace "%s".', $namespace));
}
return substr($namespace, 34);
diff --git a/vendor/symfony/translation/Loader/YamlFileLoader.php b/vendor/symfony/translation/Loader/YamlFileLoader.php
index 8d9aa6f72a..b867c2113e 100644
--- a/vendor/symfony/translation/Loader/YamlFileLoader.php
+++ b/vendor/symfony/translation/Loader/YamlFileLoader.php
@@ -47,7 +47,7 @@ protected function loadResource($resource)
try {
$messages = $this->yamlParser->parseFile($resource);
} catch (ParseException $e) {
- throw new InvalidResourceException(sprintf('Error parsing YAML, invalid file "%s"', $resource), 0, $e);
+ throw new InvalidResourceException(sprintf('The file "%s" does not contain valid YAML: ', $resource).$e->getMessage(), 0, $e);
} finally {
restore_error_handler();
}
diff --git a/vendor/symfony/translation/MessageCatalogue.php b/vendor/symfony/translation/MessageCatalogue.php
index 9b59c87d2f..a9a24b12a2 100644
--- a/vendor/symfony/translation/MessageCatalogue.php
+++ b/vendor/symfony/translation/MessageCatalogue.php
@@ -130,7 +130,9 @@ public function add($messages, $domain = 'messages')
if (!isset($this->messages[$domain])) {
$this->messages[$domain] = $messages;
} else {
- $this->messages[$domain] = array_replace($this->messages[$domain], $messages);
+ foreach ($messages as $id => $message) {
+ $this->messages[$domain][$id] = $message;
+ }
}
}
@@ -140,7 +142,7 @@ public function add($messages, $domain = 'messages')
public function addCatalogue(MessageCatalogueInterface $catalogue)
{
if ($catalogue->getLocale() !== $this->locale) {
- throw new LogicException(sprintf('Cannot add a catalogue for locale "%s" as the current locale for this catalogue is "%s"', $catalogue->getLocale(), $this->locale));
+ throw new LogicException(sprintf('Cannot add a catalogue for locale "%s" as the current locale for this catalogue is "%s".', $catalogue->getLocale(), $this->locale));
}
foreach ($catalogue->all() as $domain => $messages) {
diff --git a/vendor/symfony/translation/README.md b/vendor/symfony/translation/README.md
index 46f3d1f2f2..f4f1706675 100644
--- a/vendor/symfony/translation/README.md
+++ b/vendor/symfony/translation/README.md
@@ -3,10 +3,28 @@ Translation Component
The Translation component provides tools to internationalize your application.
+Getting Started
+---------------
+
+```
+$ composer require symfony/translation
+```
+
+```php
+use Symfony\Component\Translation\Translator;
+
+$translator = new Translator('fr_FR');
+$translator->addResource('array', [
+ 'Hello World!' => 'Bonjour !',
+], 'fr_FR');
+
+echo $translator->trans('Hello World!'); // outputs « Bonjour ! »
+```
+
Resources
---------
- * [Documentation](https://symfony.com/doc/current/components/translation/index.html)
+ * [Documentation](https://symfony.com/doc/current/translation.html)
* [Contributing](https://symfony.com/doc/current/contributing/index.html)
* [Report issues](https://github.com/symfony/symfony/issues) and
[send Pull Requests](https://github.com/symfony/symfony/pulls)
diff --git a/vendor/symfony/translation/Tests/Loader/JsonFileLoaderTest.php b/vendor/symfony/translation/Tests/Loader/JsonFileLoaderTest.php
index d264bb16b2..c5a9ca64d4 100644
--- a/vendor/symfony/translation/Tests/Loader/JsonFileLoaderTest.php
+++ b/vendor/symfony/translation/Tests/Loader/JsonFileLoaderTest.php
@@ -50,7 +50,7 @@ public function testLoadNonExistingResource()
public function testParseException()
{
$this->expectException('Symfony\Component\Translation\Exception\InvalidResourceException');
- $this->expectExceptionMessage('Error parsing JSON - Syntax error, malformed JSON');
+ $this->expectExceptionMessage('Error parsing JSON: Syntax error, malformed JSON');
$loader = new JsonFileLoader();
$resource = __DIR__.'/../fixtures/malformed.json';
$loader->load($resource, 'en', 'domain1');
diff --git a/vendor/symfony/translation/Tests/TranslatorTest.php b/vendor/symfony/translation/Tests/TranslatorTest.php
index 77af7de33e..f0d87773ba 100644
--- a/vendor/symfony/translation/Tests/TranslatorTest.php
+++ b/vendor/symfony/translation/Tests/TranslatorTest.php
@@ -12,6 +12,7 @@
namespace Symfony\Component\Translation\Tests;
use PHPUnit\Framework\TestCase;
+use Symfony\Component\Translation\Exception\RuntimeException;
use Symfony\Component\Translation\Loader\ArrayLoader;
use Symfony\Component\Translation\MessageCatalogue;
use Symfony\Component\Translation\Translator;
@@ -234,15 +235,38 @@ public function testTransWithFallbackLocaleFile($format, $loader)
$this->assertEquals('bar', $translator->trans('foo', [], 'resources'));
}
- public function testTransWithFallbackLocaleBis()
+ /**
+ * @dataProvider getFallbackLocales
+ */
+ public function testTransWithFallbackLocaleBis($expectedLocale, $locale)
{
- $translator = new Translator('en_US');
+ $translator = new Translator($locale);
$translator->addLoader('array', new ArrayLoader());
- $translator->addResource('array', ['foo' => 'foofoo'], 'en_US');
- $translator->addResource('array', ['bar' => 'foobar'], 'en');
+ $translator->addResource('array', ['foo' => 'foofoo'], $locale);
+ $translator->addResource('array', ['bar' => 'foobar'], $expectedLocale);
$this->assertEquals('foobar', $translator->trans('bar'));
}
+ public function getFallbackLocales()
+ {
+ $locales = [
+ ['en', 'en_US'],
+ ['en', 'en-US'],
+ ['sl_Latn_IT', 'sl_Latn_IT_nedis'],
+ ['sl_Latn', 'sl_Latn_IT'],
+ ];
+
+ if (\function_exists('locale_parse')) {
+ $locales[] = ['sl_Latn_IT', 'sl-Latn-IT-nedis'];
+ $locales[] = ['sl_Latn', 'sl-Latn-IT'];
+ } else {
+ $locales[] = ['sl-Latn-IT', 'sl-Latn-IT-nedis'];
+ $locales[] = ['sl-Latn', 'sl-Latn-IT'];
+ }
+
+ return $locales;
+ }
+
public function testTransWithFallbackLocaleTer()
{
$translator = new Translator('fr_FR');
@@ -529,6 +553,16 @@ public function testTransChoiceFallbackWithNoTranslation()
// unchanged if it can't be found
$this->assertEquals('some_message2', $translator->transChoice('some_message2', 10, ['%count%' => 10]));
}
+
+ public function testMissingLoaderForResourceError()
+ {
+ $this->expectException(RuntimeException::class);
+ $this->expectExceptionMessage('No loader is registered for the "twig" format when loading the "messages.en.twig" resource.');
+
+ $translator = new Translator('en');
+ $translator->addResource('twig', 'messages.en.twig', 'en');
+ $translator->getCatalogue('en');
+ }
}
class StringClass
diff --git a/vendor/symfony/translation/Translator.php b/vendor/symfony/translation/Translator.php
index e72d20a86f..131459c6e3 100644
--- a/vendor/symfony/translation/Translator.php
+++ b/vendor/symfony/translation/Translator.php
@@ -376,7 +376,11 @@ private function doLoadCatalogue($locale)
if (isset($this->resources[$locale])) {
foreach ($this->resources[$locale] as $resource) {
if (!isset($this->loaders[$resource[0]])) {
- throw new RuntimeException(sprintf('The "%s" translation loader is not registered.', $resource[0]));
+ if (\is_string($resource[1])) {
+ throw new RuntimeException(sprintf('No loader is registered for the "%s" format when loading the "%s" resource.', $resource[0], $resource[1]));
+ }
+
+ throw new RuntimeException(sprintf('No loader is registered for the "%s" format.', $resource[0]));
}
$this->catalogues[$locale]->addCatalogue($this->loaders[$resource[0]]->load($resource[1], $locale, $resource[2]));
}
@@ -412,8 +416,19 @@ protected function computeFallbackLocales($locale)
$locales[] = $fallback;
}
- if (false !== strrchr($locale, '_')) {
+ if (\function_exists('locale_parse')) {
+ $localeSubTags = locale_parse($locale);
+ if (1 < \count($localeSubTags)) {
+ array_pop($localeSubTags);
+ $fallback = locale_compose($localeSubTags);
+ if (false !== $fallback) {
+ array_unshift($locales, $fallback);
+ }
+ }
+ } elseif (false !== strrchr($locale, '_')) {
array_unshift($locales, substr($locale, 0, -\strlen(strrchr($locale, '_'))));
+ } elseif (false !== strrchr($locale, '-')) {
+ array_unshift($locales, substr($locale, 0, -\strlen(strrchr($locale, '-'))));
}
return array_unique($locales);
diff --git a/vendor/symfony/translation/Writer/TranslationWriter.php b/vendor/symfony/translation/Writer/TranslationWriter.php
index aad6aad3e8..4b56484842 100644
--- a/vendor/symfony/translation/Writer/TranslationWriter.php
+++ b/vendor/symfony/translation/Writer/TranslationWriter.php
@@ -77,7 +77,7 @@ public function write(MessageCatalogue $catalogue, $format, $options = [])
$dumper = $this->dumpers[$format];
if (isset($options['path']) && !is_dir($options['path']) && !@mkdir($options['path'], 0777, true) && !is_dir($options['path'])) {
- throw new RuntimeException(sprintf('Translation Writer was not able to create directory "%s"', $options['path']));
+ throw new RuntimeException(sprintf('Translation Writer was not able to create directory "%s".', $options['path']));
}
// save
diff --git a/vendor/symfony/validator/Constraint.php b/vendor/symfony/validator/Constraint.php
index 349698eb1a..693689b912 100644
--- a/vendor/symfony/validator/Constraint.php
+++ b/vendor/symfony/validator/Constraint.php
@@ -70,7 +70,7 @@ abstract class Constraint
public static function getErrorName($errorCode)
{
if (!isset(static::$errorNames[$errorCode])) {
- throw new InvalidArgumentException(sprintf('The error code "%s" does not exist for constraint of type "%s".', $errorCode, \get_called_class()));
+ throw new InvalidArgumentException(sprintf('The error code "%s" does not exist for constraint of type "%s".', $errorCode, static::class));
}
return static::$errorNames[$errorCode];
@@ -115,7 +115,7 @@ public function __construct($options = null)
if (\is_array($options) && isset($options['value']) && !property_exists($this, 'value')) {
if (null === $defaultOption) {
- throw new ConstraintDefinitionException(sprintf('No default option is configured for constraint "%s".', \get_class($this)));
+ throw new ConstraintDefinitionException(sprintf('No default option is configured for constraint "%s".', static::class));
}
$options[$defaultOption] = $options['value'];
@@ -136,7 +136,7 @@ public function __construct($options = null)
}
} elseif (null !== $options && !(\is_array($options) && 0 === \count($options))) {
if (null === $defaultOption) {
- throw new ConstraintDefinitionException(sprintf('No default option is configured for constraint "%s".', \get_class($this)));
+ throw new ConstraintDefinitionException(sprintf('No default option is configured for constraint "%s".', static::class));
}
if (\array_key_exists($defaultOption, $knownOptions)) {
@@ -148,11 +148,11 @@ public function __construct($options = null)
}
if (\count($invalidOptions) > 0) {
- throw new InvalidOptionsException(sprintf('The options "%s" do not exist in constraint "%s".', implode('", "', $invalidOptions), \get_class($this)), $invalidOptions);
+ throw new InvalidOptionsException(sprintf('The options "%s" do not exist in constraint "%s".', implode('", "', $invalidOptions), static::class), $invalidOptions);
}
if (\count($missingOptions) > 0) {
- throw new MissingOptionsException(sprintf('The options "%s" must be set for constraint "%s".', implode('", "', array_keys($missingOptions)), \get_class($this)), array_keys($missingOptions));
+ throw new MissingOptionsException(sprintf('The options "%s" must be set for constraint "%s".', implode('", "', array_keys($missingOptions)), static::class), array_keys($missingOptions));
}
}
@@ -176,7 +176,7 @@ public function __set($option, $value)
return;
}
- throw new InvalidOptionsException(sprintf('The option "%s" does not exist in constraint "%s".', $option, \get_class($this)), [$option]);
+ throw new InvalidOptionsException(sprintf('The option "%s" does not exist in constraint "%s".', $option, static::class), [$option]);
}
/**
@@ -202,7 +202,7 @@ public function __get($option)
return $this->groups;
}
- throw new InvalidOptionsException(sprintf('The option "%s" does not exist in constraint "%s".', $option, \get_class($this)), [$option]);
+ throw new InvalidOptionsException(sprintf('The option "%s" does not exist in constraint "%s".', $option, static::class), [$option]);
}
/**
@@ -266,7 +266,7 @@ public function getRequiredOptions()
*/
public function validatedBy()
{
- return \get_class($this).'Validator';
+ return static::class.'Validator';
}
/**
diff --git a/vendor/symfony/validator/ConstraintValidator.php b/vendor/symfony/validator/ConstraintValidator.php
index 93cca2ea74..db0ccb60a8 100644
--- a/vendor/symfony/validator/ConstraintValidator.php
+++ b/vendor/symfony/validator/ConstraintValidator.php
@@ -21,8 +21,8 @@
abstract class ConstraintValidator implements ConstraintValidatorInterface
{
/**
- * Whether to format {@link \DateTime} objects as RFC-3339 dates
- * ("Y-m-d H:i:s").
+ * Whether to format {@link \DateTime} objects, either with the {@link \IntlDateFormatter}
+ * (if it is available) or as RFC-3339 dates ("Y-m-d H:i:s").
*/
const PRETTY_DATE = 1;
@@ -69,7 +69,8 @@ protected function formatTypeOf($value)
* in double quotes ("). Objects, arrays and resources are formatted as
* "object", "array" and "resource". If the $format bitmask contains
* the PRETTY_DATE bit, then {@link \DateTime} objects will be formatted
- * as RFC-3339 dates ("Y-m-d H:i:s").
+ * with the {@link \IntlDateFormatter}. If it is not available, they will be
+ * formatted as RFC-3339 dates ("Y-m-d H:i:s").
*
* Be careful when passing message parameters to a constraint violation
* that (may) contain objects, arrays or resources. These parameters
@@ -87,19 +88,12 @@ protected function formatValue($value, $format = 0)
{
if (($format & self::PRETTY_DATE) && $value instanceof \DateTimeInterface) {
if (class_exists('IntlDateFormatter')) {
- $locale = \Locale::getDefault();
- $formatter = new \IntlDateFormatter($locale, \IntlDateFormatter::MEDIUM, \IntlDateFormatter::SHORT, $value->getTimezone());
-
- // neither the native nor the stub IntlDateFormatter support
- // DateTimeImmutable as of yet
- if (!$value instanceof \DateTime) {
- $value = new \DateTime(
- $value->format('Y-m-d H:i:s.u e'),
- $value->getTimezone()
- );
- }
-
- return $formatter->format($value);
+ $formatter = new \IntlDateFormatter(\Locale::getDefault(), \IntlDateFormatter::MEDIUM, \IntlDateFormatter::SHORT, 'UTC');
+
+ return $formatter->format(new \DateTime(
+ $value->format('Y-m-d H:i:s.u'),
+ new \DateTimeZone('UTC')
+ ));
}
return $value->format('Y-m-d H:i:s');
diff --git a/vendor/symfony/validator/ConstraintViolation.php b/vendor/symfony/validator/ConstraintViolation.php
index ae9ff89eb5..a90a7a0bd8 100644
--- a/vendor/symfony/validator/ConstraintViolation.php
+++ b/vendor/symfony/validator/ConstraintViolation.php
@@ -32,22 +32,22 @@ class ConstraintViolation implements ConstraintViolationInterface
/**
* Creates a new constraint violation.
*
- * @param string $message The violation message
- * @param string $messageTemplate The raw violation message
- * @param array $parameters The parameters to substitute in the
- * raw violation message
- * @param mixed $root The value originally passed to the
- * validator
- * @param string $propertyPath The property path from the root
- * value to the invalid value
- * @param mixed $invalidValue The invalid value that caused this
- * violation
- * @param int|null $plural The number for determining the plural
- * form when translating the message
- * @param mixed $code The error code of the violation
- * @param Constraint|null $constraint The constraint whose validation
- * caused the violation
- * @param mixed $cause The cause of the violation
+ * @param string|\Stringable $message The violation message as a string or a stringable object
+ * @param string $messageTemplate The raw violation message
+ * @param array $parameters The parameters to substitute in the
+ * raw violation message
+ * @param mixed $root The value originally passed to the
+ * validator
+ * @param string $propertyPath The property path from the root
+ * value to the invalid value
+ * @param mixed $invalidValue The invalid value that caused this
+ * violation
+ * @param int|null $plural The number for determining the plural
+ * form when translating the message
+ * @param mixed $code The error code of the violation
+ * @param Constraint|null $constraint The constraint whose validation
+ * caused the violation
+ * @param mixed $cause The cause of the violation
*/
public function __construct($message, $messageTemplate, array $parameters, $root, $propertyPath, $invalidValue, $plural = null, $code = null, Constraint $constraint = null, $cause = null)
{
diff --git a/vendor/symfony/validator/ConstraintViolationInterface.php b/vendor/symfony/validator/ConstraintViolationInterface.php
index 5ac25cf9ba..137d7015bf 100644
--- a/vendor/symfony/validator/ConstraintViolationInterface.php
+++ b/vendor/symfony/validator/ConstraintViolationInterface.php
@@ -36,7 +36,7 @@ interface ConstraintViolationInterface
/**
* Returns the violation message.
*
- * @return string The violation message
+ * @return string|\Stringable The violation message as a string or a stringable object
*/
public function getMessage();
diff --git a/vendor/symfony/validator/Constraints/AbstractComparison.php b/vendor/symfony/validator/Constraints/AbstractComparison.php
index 89c2690c08..01c8be31cb 100644
--- a/vendor/symfony/validator/Constraints/AbstractComparison.php
+++ b/vendor/symfony/validator/Constraints/AbstractComparison.php
@@ -38,15 +38,15 @@ public function __construct($options = null)
if (\is_array($options)) {
if (!isset($options['value']) && !isset($options['propertyPath'])) {
- throw new ConstraintDefinitionException(sprintf('The "%s" constraint requires either the "value" or "propertyPath" option to be set.', \get_class($this)));
+ throw new ConstraintDefinitionException(sprintf('The "%s" constraint requires either the "value" or "propertyPath" option to be set.', static::class));
}
if (isset($options['value']) && isset($options['propertyPath'])) {
- throw new ConstraintDefinitionException(sprintf('The "%s" constraint requires only one of the "value" or "propertyPath" options to be set, not both.', \get_class($this)));
+ throw new ConstraintDefinitionException(sprintf('The "%s" constraint requires only one of the "value" or "propertyPath" options to be set, not both.', static::class));
}
if (isset($options['propertyPath']) && !class_exists(PropertyAccess::class)) {
- throw new ConstraintDefinitionException(sprintf('The "%s" constraint requires the Symfony PropertyAccess component to use the "propertyPath" option.', \get_class($this)));
+ throw new ConstraintDefinitionException(sprintf('The "%s" constraint requires the Symfony PropertyAccess component to use the "propertyPath" option.', static::class));
}
}
diff --git a/vendor/symfony/validator/Constraints/AbstractComparisonValidator.php b/vendor/symfony/validator/Constraints/AbstractComparisonValidator.php
index cd96bc9df7..3e8b10b01b 100644
--- a/vendor/symfony/validator/Constraints/AbstractComparisonValidator.php
+++ b/vendor/symfony/validator/Constraints/AbstractComparisonValidator.php
@@ -40,7 +40,7 @@ public function __construct(PropertyAccessorInterface $propertyAccessor = null)
public function validate($value, Constraint $constraint)
{
if (!$constraint instanceof AbstractComparison) {
- throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\AbstractComparison');
+ throw new UnexpectedTypeException($constraint, AbstractComparison::class);
}
if (null === $value) {
@@ -55,7 +55,7 @@ public function validate($value, Constraint $constraint)
try {
$comparedValue = $this->getPropertyAccessor()->getValue($object, $path);
} catch (NoSuchPropertyException $e) {
- throw new ConstraintDefinitionException(sprintf('Invalid property path "%s" provided to "%s" constraint: %s', $path, \get_class($constraint), $e->getMessage()), 0, $e);
+ throw new ConstraintDefinitionException(sprintf('Invalid property path "%s" provided to "%s" constraint: ', $path, \get_class($constraint)).$e->getMessage(), 0, $e);
}
} else {
$comparedValue = $constraint->value;
diff --git a/vendor/symfony/validator/Constraints/AllValidator.php b/vendor/symfony/validator/Constraints/AllValidator.php
index 97de37058f..cd539104ad 100644
--- a/vendor/symfony/validator/Constraints/AllValidator.php
+++ b/vendor/symfony/validator/Constraints/AllValidator.php
@@ -26,7 +26,7 @@ class AllValidator extends ConstraintValidator
public function validate($value, Constraint $constraint)
{
if (!$constraint instanceof All) {
- throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\All');
+ throw new UnexpectedTypeException($constraint, All::class);
}
if (null === $value) {
diff --git a/vendor/symfony/validator/Constraints/BicValidator.php b/vendor/symfony/validator/Constraints/BicValidator.php
index fc36346158..fe6e83a203 100644
--- a/vendor/symfony/validator/Constraints/BicValidator.php
+++ b/vendor/symfony/validator/Constraints/BicValidator.php
@@ -28,7 +28,7 @@ class BicValidator extends ConstraintValidator
public function validate($value, Constraint $constraint)
{
if (!$constraint instanceof Bic) {
- throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Bic');
+ throw new UnexpectedTypeException($constraint, Bic::class);
}
if (null === $value || '' === $value) {
diff --git a/vendor/symfony/validator/Constraints/BlankValidator.php b/vendor/symfony/validator/Constraints/BlankValidator.php
index ca999b5aa3..3fd7fcc9fe 100644
--- a/vendor/symfony/validator/Constraints/BlankValidator.php
+++ b/vendor/symfony/validator/Constraints/BlankValidator.php
@@ -26,7 +26,7 @@ class BlankValidator extends ConstraintValidator
public function validate($value, Constraint $constraint)
{
if (!$constraint instanceof Blank) {
- throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Blank');
+ throw new UnexpectedTypeException($constraint, Blank::class);
}
if ('' !== $value && null !== $value) {
diff --git a/vendor/symfony/validator/Constraints/CallbackValidator.php b/vendor/symfony/validator/Constraints/CallbackValidator.php
index a66840eae1..3accd2f9d6 100644
--- a/vendor/symfony/validator/Constraints/CallbackValidator.php
+++ b/vendor/symfony/validator/Constraints/CallbackValidator.php
@@ -29,7 +29,7 @@ class CallbackValidator extends ConstraintValidator
public function validate($object, Constraint $constraint)
{
if (!$constraint instanceof Callback) {
- throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Callback');
+ throw new UnexpectedTypeException($constraint, Callback::class);
}
$method = $constraint->callback;
@@ -40,13 +40,13 @@ public function validate($object, Constraint $constraint)
if (isset($method[0]) && \is_object($method[0])) {
$method[0] = \get_class($method[0]);
}
- throw new ConstraintDefinitionException(sprintf('%s targeted by Callback constraint is not a valid callable', json_encode($method)));
+ throw new ConstraintDefinitionException(json_encode($method).' targeted by Callback constraint is not a valid callable.');
}
\call_user_func($method, $object, $this->context, $constraint->payload);
} elseif (null !== $object) {
if (!method_exists($object, $method)) {
- throw new ConstraintDefinitionException(sprintf('Method "%s" targeted by Callback constraint does not exist in class %s', $method, \get_class($object)));
+ throw new ConstraintDefinitionException(sprintf('Method "%s" targeted by Callback constraint does not exist in class "%s".', $method, \get_class($object)));
}
$reflMethod = new \ReflectionMethod($object, $method);
diff --git a/vendor/symfony/validator/Constraints/CardSchemeValidator.php b/vendor/symfony/validator/Constraints/CardSchemeValidator.php
index d39c87319a..a4cb9f5c1f 100644
--- a/vendor/symfony/validator/Constraints/CardSchemeValidator.php
+++ b/vendor/symfony/validator/Constraints/CardSchemeValidator.php
@@ -91,7 +91,7 @@ class CardSchemeValidator extends ConstraintValidator
public function validate($value, Constraint $constraint)
{
if (!$constraint instanceof CardScheme) {
- throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\CardScheme');
+ throw new UnexpectedTypeException($constraint, CardScheme::class);
}
if (null === $value || '' === $value) {
diff --git a/vendor/symfony/validator/Constraints/ChoiceValidator.php b/vendor/symfony/validator/Constraints/ChoiceValidator.php
index 00577ef462..4a6114dcb3 100644
--- a/vendor/symfony/validator/Constraints/ChoiceValidator.php
+++ b/vendor/symfony/validator/Constraints/ChoiceValidator.php
@@ -31,11 +31,11 @@ class ChoiceValidator extends ConstraintValidator
public function validate($value, Constraint $constraint)
{
if (!$constraint instanceof Choice) {
- throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Choice');
+ throw new UnexpectedTypeException($constraint, Choice::class);
}
if (!\is_array($constraint->choices) && !$constraint->callback) {
- throw new ConstraintDefinitionException('Either "choices" or "callback" must be specified on constraint Choice');
+ throw new ConstraintDefinitionException('Either "choices" or "callback" must be specified on constraint Choice.');
}
if (null === $value) {
@@ -51,7 +51,7 @@ public function validate($value, Constraint $constraint)
&& !\is_callable($choices = [$this->context->getClassName(), $constraint->callback])
&& !\is_callable($choices = $constraint->callback)
) {
- throw new ConstraintDefinitionException('The Choice constraint expects a valid callback');
+ throw new ConstraintDefinitionException('The Choice constraint expects a valid callback.');
}
$choices = \call_user_func($choices);
} else {
diff --git a/vendor/symfony/validator/Constraints/Collection.php b/vendor/symfony/validator/Constraints/Collection.php
index 86418690b8..605d4b9dbb 100644
--- a/vendor/symfony/validator/Constraints/Collection.php
+++ b/vendor/symfony/validator/Constraints/Collection.php
@@ -57,7 +57,7 @@ protected function initializeNestedConstraints()
parent::initializeNestedConstraints();
if (!\is_array($this->fields)) {
- throw new ConstraintDefinitionException(sprintf('The option "fields" is expected to be an array in constraint %s', __CLASS__));
+ throw new ConstraintDefinitionException(sprintf('The option "fields" is expected to be an array in constraint "%s".', __CLASS__));
}
foreach ($this->fields as $fieldName => $field) {
diff --git a/vendor/symfony/validator/Constraints/CollectionValidator.php b/vendor/symfony/validator/Constraints/CollectionValidator.php
index 3b67e40a5c..f8859b48eb 100644
--- a/vendor/symfony/validator/Constraints/CollectionValidator.php
+++ b/vendor/symfony/validator/Constraints/CollectionValidator.php
@@ -26,7 +26,7 @@ class CollectionValidator extends ConstraintValidator
public function validate($value, Constraint $constraint)
{
if (!$constraint instanceof Collection) {
- throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Collection');
+ throw new UnexpectedTypeException($constraint, Collection::class);
}
if (null === $value) {
diff --git a/vendor/symfony/validator/Constraints/Composite.php b/vendor/symfony/validator/Constraints/Composite.php
index 18ea5e319f..b14276c3bb 100644
--- a/vendor/symfony/validator/Constraints/Composite.php
+++ b/vendor/symfony/validator/Constraints/Composite.php
@@ -71,11 +71,11 @@ public function __construct($options = null)
$constraint = \get_class($constraint);
}
- throw new ConstraintDefinitionException(sprintf('The value %s is not an instance of Constraint in constraint %s', $constraint, \get_class($this)));
+ throw new ConstraintDefinitionException(sprintf('The value "%s" is not an instance of Constraint in constraint "%s".', $constraint, static::class));
}
if ($constraint instanceof Valid) {
- throw new ConstraintDefinitionException(sprintf('The constraint Valid cannot be nested inside constraint %s. You can only declare the Valid constraint directly on a field or method.', \get_class($this)));
+ throw new ConstraintDefinitionException(sprintf('The constraint Valid cannot be nested inside constraint "%s". You can only declare the Valid constraint directly on a field or method.', static::class));
}
}
@@ -88,7 +88,8 @@ public function __construct($options = null)
}
}
- $this->groups = array_keys($mergedGroups);
+ // prevent empty composite constraint to have empty groups
+ $this->groups = array_keys($mergedGroups) ?: [self::DEFAULT_GROUP];
$this->$compositeOption = $nestedConstraints;
return;
@@ -99,7 +100,7 @@ public function __construct($options = null)
$excessGroups = array_diff($constraint->groups, $this->groups);
if (\count($excessGroups) > 0) {
- throw new ConstraintDefinitionException(sprintf('The group(s) "%s" passed to the constraint %s should also be passed to its containing constraint %s', implode('", "', $excessGroups), \get_class($constraint), \get_class($this)));
+ throw new ConstraintDefinitionException(sprintf('The group(s) "%s" passed to the constraint "%s" should also be passed to its containing constraint "%s".', implode('", "', $excessGroups), \get_class($constraint), static::class));
}
} else {
$constraint->groups = $this->groups;
diff --git a/vendor/symfony/validator/Constraints/Count.php b/vendor/symfony/validator/Constraints/Count.php
index b11f994f58..11ea0eca11 100644
--- a/vendor/symfony/validator/Constraints/Count.php
+++ b/vendor/symfony/validator/Constraints/Count.php
@@ -51,7 +51,7 @@ public function __construct($options = null)
parent::__construct($options);
if (null === $this->min && null === $this->max) {
- throw new MissingOptionsException(sprintf('Either option "min" or "max" must be given for constraint %s', __CLASS__), ['min', 'max']);
+ throw new MissingOptionsException(sprintf('Either option "min" or "max" must be given for constraint "%s".', __CLASS__), ['min', 'max']);
}
}
}
diff --git a/vendor/symfony/validator/Constraints/CountValidator.php b/vendor/symfony/validator/Constraints/CountValidator.php
index 01f82a3466..a81419bae6 100644
--- a/vendor/symfony/validator/Constraints/CountValidator.php
+++ b/vendor/symfony/validator/Constraints/CountValidator.php
@@ -26,7 +26,7 @@ class CountValidator extends ConstraintValidator
public function validate($value, Constraint $constraint)
{
if (!$constraint instanceof Count) {
- throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Count');
+ throw new UnexpectedTypeException($constraint, Count::class);
}
if (null === $value) {
diff --git a/vendor/symfony/validator/Constraints/CountryValidator.php b/vendor/symfony/validator/Constraints/CountryValidator.php
index 46585da8b9..8116495f2e 100644
--- a/vendor/symfony/validator/Constraints/CountryValidator.php
+++ b/vendor/symfony/validator/Constraints/CountryValidator.php
@@ -29,7 +29,7 @@ class CountryValidator extends ConstraintValidator
public function validate($value, Constraint $constraint)
{
if (!$constraint instanceof Country) {
- throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Country');
+ throw new UnexpectedTypeException($constraint, Country::class);
}
if (null === $value || '' === $value) {
diff --git a/vendor/symfony/validator/Constraints/CurrencyValidator.php b/vendor/symfony/validator/Constraints/CurrencyValidator.php
index 42fa8cfa45..de9d12cb19 100644
--- a/vendor/symfony/validator/Constraints/CurrencyValidator.php
+++ b/vendor/symfony/validator/Constraints/CurrencyValidator.php
@@ -30,7 +30,7 @@ class CurrencyValidator extends ConstraintValidator
public function validate($value, Constraint $constraint)
{
if (!$constraint instanceof Currency) {
- throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Currency');
+ throw new UnexpectedTypeException($constraint, Currency::class);
}
if (null === $value || '' === $value) {
diff --git a/vendor/symfony/validator/Constraints/DateTimeValidator.php b/vendor/symfony/validator/Constraints/DateTimeValidator.php
index a632a34e43..bad043f20e 100644
--- a/vendor/symfony/validator/Constraints/DateTimeValidator.php
+++ b/vendor/symfony/validator/Constraints/DateTimeValidator.php
@@ -31,7 +31,7 @@ class DateTimeValidator extends DateValidator
public function validate($value, Constraint $constraint)
{
if (!$constraint instanceof DateTime) {
- throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\DateTime');
+ throw new UnexpectedTypeException($constraint, DateTime::class);
}
if (null === $value || '' === $value || $value instanceof \DateTimeInterface) {
diff --git a/vendor/symfony/validator/Constraints/DateValidator.php b/vendor/symfony/validator/Constraints/DateValidator.php
index a1492c54c9..c1c3bc9f89 100644
--- a/vendor/symfony/validator/Constraints/DateValidator.php
+++ b/vendor/symfony/validator/Constraints/DateValidator.php
@@ -44,7 +44,7 @@ public static function checkDate($year, $month, $day)
public function validate($value, Constraint $constraint)
{
if (!$constraint instanceof Date) {
- throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Date');
+ throw new UnexpectedTypeException($constraint, Date::class);
}
if (null === $value || '' === $value || $value instanceof \DateTimeInterface) {
diff --git a/vendor/symfony/validator/Constraints/EmailValidator.php b/vendor/symfony/validator/Constraints/EmailValidator.php
index 8fb4b88672..58b372d988 100644
--- a/vendor/symfony/validator/Constraints/EmailValidator.php
+++ b/vendor/symfony/validator/Constraints/EmailValidator.php
@@ -39,7 +39,7 @@ public function __construct($strict = false)
public function validate($value, Constraint $constraint)
{
if (!$constraint instanceof Email) {
- throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Email');
+ throw new UnexpectedTypeException($constraint, Email::class);
}
if (null === $value || '' === $value) {
@@ -51,6 +51,9 @@ public function validate($value, Constraint $constraint)
}
$value = (string) $value;
+ if ('' === $value) {
+ return;
+ }
if (null === $constraint->strict) {
$constraint->strict = $this->isStrict;
@@ -58,7 +61,7 @@ public function validate($value, Constraint $constraint)
if ($constraint->strict) {
if (!class_exists('\Egulias\EmailValidator\EmailValidator')) {
- throw new RuntimeException('Strict email validation requires egulias/email-validator ~1.2|~2.0');
+ throw new RuntimeException('Strict email validation requires egulias/email-validator ~1.2|~2.0.');
}
$strictValidator = new \Egulias\EmailValidator\EmailValidator();
diff --git a/vendor/symfony/validator/Constraints/ExpressionValidator.php b/vendor/symfony/validator/Constraints/ExpressionValidator.php
index a4dfadbfc0..7ef552dd40 100644
--- a/vendor/symfony/validator/Constraints/ExpressionValidator.php
+++ b/vendor/symfony/validator/Constraints/ExpressionValidator.php
@@ -36,7 +36,7 @@ public function __construct($propertyAccessor = null, ExpressionLanguage $expres
public function validate($value, Constraint $constraint)
{
if (!$constraint instanceof Expression) {
- throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Expression');
+ throw new UnexpectedTypeException($constraint, Expression::class);
}
$variables = [];
diff --git a/vendor/symfony/validator/Constraints/File.php b/vendor/symfony/validator/Constraints/File.php
index c70db0a74c..7a620f6a2a 100644
--- a/vendor/symfony/validator/Constraints/File.php
+++ b/vendor/symfony/validator/Constraints/File.php
@@ -114,7 +114,7 @@ private function normalizeBinaryFormat($maxSize)
$this->maxSize = $matches[1] * $factors[$unit = strtolower($matches[2])];
$this->binaryFormat = null === $this->binaryFormat ? 2 === \strlen($unit) : $this->binaryFormat;
} else {
- throw new ConstraintDefinitionException(sprintf('"%s" is not a valid maximum size', $this->maxSize));
+ throw new ConstraintDefinitionException(sprintf('"%s" is not a valid maximum size.', $this->maxSize));
}
}
}
diff --git a/vendor/symfony/validator/Constraints/FileValidator.php b/vendor/symfony/validator/Constraints/FileValidator.php
index 0a58cd2d68..199d7676a6 100644
--- a/vendor/symfony/validator/Constraints/FileValidator.php
+++ b/vendor/symfony/validator/Constraints/FileValidator.php
@@ -41,7 +41,7 @@ class FileValidator extends ConstraintValidator
public function validate($value, Constraint $constraint)
{
if (!$constraint instanceof File) {
- throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\File');
+ throw new UnexpectedTypeException($constraint, File::class);
}
if (null === $value || '' === $value) {
diff --git a/vendor/symfony/validator/Constraints/GreaterThanOrEqualValidator.php b/vendor/symfony/validator/Constraints/GreaterThanOrEqualValidator.php
index e196e688f3..290408ac0c 100644
--- a/vendor/symfony/validator/Constraints/GreaterThanOrEqualValidator.php
+++ b/vendor/symfony/validator/Constraints/GreaterThanOrEqualValidator.php
@@ -24,7 +24,7 @@ class GreaterThanOrEqualValidator extends AbstractComparisonValidator
*/
protected function compareValues($value1, $value2)
{
- return $value1 >= $value2;
+ return null === $value2 || $value1 >= $value2;
}
/**
diff --git a/vendor/symfony/validator/Constraints/GreaterThanValidator.php b/vendor/symfony/validator/Constraints/GreaterThanValidator.php
index 9029e8fc46..062503ab3f 100644
--- a/vendor/symfony/validator/Constraints/GreaterThanValidator.php
+++ b/vendor/symfony/validator/Constraints/GreaterThanValidator.php
@@ -24,7 +24,7 @@ class GreaterThanValidator extends AbstractComparisonValidator
*/
protected function compareValues($value1, $value2)
{
- return $value1 > $value2;
+ return null === $value2 || $value1 > $value2;
}
/**
diff --git a/vendor/symfony/validator/Constraints/IbanValidator.php b/vendor/symfony/validator/Constraints/IbanValidator.php
index 3dcedb47dc..d4f8455bb7 100644
--- a/vendor/symfony/validator/Constraints/IbanValidator.php
+++ b/vendor/symfony/validator/Constraints/IbanValidator.php
@@ -142,7 +142,7 @@ class IbanValidator extends ConstraintValidator
public function validate($value, Constraint $constraint)
{
if (!$constraint instanceof Iban) {
- throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Iban');
+ throw new UnexpectedTypeException($constraint, Iban::class);
}
if (null === $value || '' === $value) {
diff --git a/vendor/symfony/validator/Constraints/ImageValidator.php b/vendor/symfony/validator/Constraints/ImageValidator.php
index 4b6a6f3b20..9b4ecfd973 100644
--- a/vendor/symfony/validator/Constraints/ImageValidator.php
+++ b/vendor/symfony/validator/Constraints/ImageValidator.php
@@ -31,7 +31,7 @@ class ImageValidator extends FileValidator
public function validate($value, Constraint $constraint)
{
if (!$constraint instanceof Image) {
- throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Image');
+ throw new UnexpectedTypeException($constraint, Image::class);
}
$violations = \count($this->context->getViolations());
@@ -100,7 +100,7 @@ public function validate($value, Constraint $constraint)
if ($constraint->minHeight) {
if (!ctype_digit((string) $constraint->minHeight)) {
- throw new ConstraintDefinitionException(sprintf('"%s" is not a valid minimum height', $constraint->minHeight));
+ throw new ConstraintDefinitionException(sprintf('"%s" is not a valid minimum height.', $constraint->minHeight));
}
if ($height < $constraint->minHeight) {
@@ -116,7 +116,7 @@ public function validate($value, Constraint $constraint)
if ($constraint->maxHeight) {
if (!ctype_digit((string) $constraint->maxHeight)) {
- throw new ConstraintDefinitionException(sprintf('"%s" is not a valid maximum height', $constraint->maxHeight));
+ throw new ConstraintDefinitionException(sprintf('"%s" is not a valid maximum height.', $constraint->maxHeight));
}
if ($height > $constraint->maxHeight) {
@@ -132,7 +132,7 @@ public function validate($value, Constraint $constraint)
if (null !== $constraint->minPixels) {
if (!ctype_digit((string) $constraint->minPixels)) {
- throw new ConstraintDefinitionException(sprintf('"%s" is not a valid minimum amount of pixels', $constraint->minPixels));
+ throw new ConstraintDefinitionException(sprintf('"%s" is not a valid minimum amount of pixels.', $constraint->minPixels));
}
if ($pixels < $constraint->minPixels) {
@@ -148,7 +148,7 @@ public function validate($value, Constraint $constraint)
if (null !== $constraint->maxPixels) {
if (!ctype_digit((string) $constraint->maxPixels)) {
- throw new ConstraintDefinitionException(sprintf('"%s" is not a valid maximum amount of pixels', $constraint->maxPixels));
+ throw new ConstraintDefinitionException(sprintf('"%s" is not a valid maximum amount of pixels.', $constraint->maxPixels));
}
if ($pixels > $constraint->maxPixels) {
@@ -166,7 +166,7 @@ public function validate($value, Constraint $constraint)
if (null !== $constraint->minRatio) {
if (!is_numeric((string) $constraint->minRatio)) {
- throw new ConstraintDefinitionException(sprintf('"%s" is not a valid minimum ratio', $constraint->minRatio));
+ throw new ConstraintDefinitionException(sprintf('"%s" is not a valid minimum ratio.', $constraint->minRatio));
}
if ($ratio < $constraint->minRatio) {
@@ -180,7 +180,7 @@ public function validate($value, Constraint $constraint)
if (null !== $constraint->maxRatio) {
if (!is_numeric((string) $constraint->maxRatio)) {
- throw new ConstraintDefinitionException(sprintf('"%s" is not a valid maximum ratio', $constraint->maxRatio));
+ throw new ConstraintDefinitionException(sprintf('"%s" is not a valid maximum ratio.', $constraint->maxRatio));
}
if ($ratio > $constraint->maxRatio) {
@@ -218,7 +218,7 @@ public function validate($value, Constraint $constraint)
if ($constraint->detectCorrupted) {
if (!\function_exists('imagecreatefromstring')) {
- throw new RuntimeException('Corrupted images detection requires installed and enabled GD extension');
+ throw new RuntimeException('Corrupted images detection requires installed and enabled GD extension.');
}
$resource = @imagecreatefromstring(file_get_contents($value));
diff --git a/vendor/symfony/validator/Constraints/Ip.php b/vendor/symfony/validator/Constraints/Ip.php
index aff99d4672..57c674dc0e 100644
--- a/vendor/symfony/validator/Constraints/Ip.php
+++ b/vendor/symfony/validator/Constraints/Ip.php
@@ -80,7 +80,7 @@ public function __construct($options = null)
parent::__construct($options);
if (!\in_array($this->version, self::$versions)) {
- throw new ConstraintDefinitionException(sprintf('The option "version" must be one of "%s"', implode('", "', self::$versions)));
+ throw new ConstraintDefinitionException(sprintf('The option "version" must be one of "%s".', implode('", "', self::$versions)));
}
}
}
diff --git a/vendor/symfony/validator/Constraints/IpValidator.php b/vendor/symfony/validator/Constraints/IpValidator.php
index 5c687b900f..b978d1daae 100644
--- a/vendor/symfony/validator/Constraints/IpValidator.php
+++ b/vendor/symfony/validator/Constraints/IpValidator.php
@@ -29,7 +29,7 @@ class IpValidator extends ConstraintValidator
public function validate($value, Constraint $constraint)
{
if (!$constraint instanceof Ip) {
- throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Ip');
+ throw new UnexpectedTypeException($constraint, Ip::class);
}
if (null === $value || '' === $value) {
diff --git a/vendor/symfony/validator/Constraints/IsFalseValidator.php b/vendor/symfony/validator/Constraints/IsFalseValidator.php
index 95245fb97b..79c42348fe 100644
--- a/vendor/symfony/validator/Constraints/IsFalseValidator.php
+++ b/vendor/symfony/validator/Constraints/IsFalseValidator.php
@@ -26,7 +26,7 @@ class IsFalseValidator extends ConstraintValidator
public function validate($value, Constraint $constraint)
{
if (!$constraint instanceof IsFalse) {
- throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\IsFalse');
+ throw new UnexpectedTypeException($constraint, IsFalse::class);
}
if (null === $value || false === $value || 0 === $value || '0' === $value) {
diff --git a/vendor/symfony/validator/Constraints/IsNullValidator.php b/vendor/symfony/validator/Constraints/IsNullValidator.php
index 01b9d1e40a..b6e78170f9 100644
--- a/vendor/symfony/validator/Constraints/IsNullValidator.php
+++ b/vendor/symfony/validator/Constraints/IsNullValidator.php
@@ -26,7 +26,7 @@ class IsNullValidator extends ConstraintValidator
public function validate($value, Constraint $constraint)
{
if (!$constraint instanceof IsNull) {
- throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\IsNull');
+ throw new UnexpectedTypeException($constraint, IsNull::class);
}
if (null !== $value) {
diff --git a/vendor/symfony/validator/Constraints/IsTrueValidator.php b/vendor/symfony/validator/Constraints/IsTrueValidator.php
index 89aa337d2c..6088f6d7a7 100644
--- a/vendor/symfony/validator/Constraints/IsTrueValidator.php
+++ b/vendor/symfony/validator/Constraints/IsTrueValidator.php
@@ -26,7 +26,7 @@ class IsTrueValidator extends ConstraintValidator
public function validate($value, Constraint $constraint)
{
if (!$constraint instanceof IsTrue) {
- throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\IsTrue');
+ throw new UnexpectedTypeException($constraint, IsTrue::class);
}
if (null === $value) {
diff --git a/vendor/symfony/validator/Constraints/IsbnValidator.php b/vendor/symfony/validator/Constraints/IsbnValidator.php
index 9f0d1fa1a3..5810c4df69 100644
--- a/vendor/symfony/validator/Constraints/IsbnValidator.php
+++ b/vendor/symfony/validator/Constraints/IsbnValidator.php
@@ -32,7 +32,7 @@ class IsbnValidator extends ConstraintValidator
public function validate($value, Constraint $constraint)
{
if (!$constraint instanceof Isbn) {
- throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Isbn');
+ throw new UnexpectedTypeException($constraint, Isbn::class);
}
if (null === $value || '' === $value) {
diff --git a/vendor/symfony/validator/Constraints/IssnValidator.php b/vendor/symfony/validator/Constraints/IssnValidator.php
index 41da39ebd8..50818d7bac 100644
--- a/vendor/symfony/validator/Constraints/IssnValidator.php
+++ b/vendor/symfony/validator/Constraints/IssnValidator.php
@@ -31,7 +31,7 @@ class IssnValidator extends ConstraintValidator
public function validate($value, Constraint $constraint)
{
if (!$constraint instanceof Issn) {
- throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Issn');
+ throw new UnexpectedTypeException($constraint, Issn::class);
}
if (null === $value || '' === $value) {
diff --git a/vendor/symfony/validator/Constraints/LanguageValidator.php b/vendor/symfony/validator/Constraints/LanguageValidator.php
index 1722034720..971e3c795f 100644
--- a/vendor/symfony/validator/Constraints/LanguageValidator.php
+++ b/vendor/symfony/validator/Constraints/LanguageValidator.php
@@ -29,7 +29,7 @@ class LanguageValidator extends ConstraintValidator
public function validate($value, Constraint $constraint)
{
if (!$constraint instanceof Language) {
- throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Language');
+ throw new UnexpectedTypeException($constraint, Language::class);
}
if (null === $value || '' === $value) {
diff --git a/vendor/symfony/validator/Constraints/Length.php b/vendor/symfony/validator/Constraints/Length.php
index 996a1e479f..cca6b8c315 100644
--- a/vendor/symfony/validator/Constraints/Length.php
+++ b/vendor/symfony/validator/Constraints/Length.php
@@ -55,7 +55,7 @@ public function __construct($options = null)
parent::__construct($options);
if (null === $this->min && null === $this->max) {
- throw new MissingOptionsException(sprintf('Either option "min" or "max" must be given for constraint %s', __CLASS__), ['min', 'max']);
+ throw new MissingOptionsException(sprintf('Either option "min" or "max" must be given for constraint "%s".', __CLASS__), ['min', 'max']);
}
}
}
diff --git a/vendor/symfony/validator/Constraints/LengthValidator.php b/vendor/symfony/validator/Constraints/LengthValidator.php
index d8cb09ccb6..0c11dfca84 100644
--- a/vendor/symfony/validator/Constraints/LengthValidator.php
+++ b/vendor/symfony/validator/Constraints/LengthValidator.php
@@ -26,7 +26,7 @@ class LengthValidator extends ConstraintValidator
public function validate($value, Constraint $constraint)
{
if (!$constraint instanceof Length) {
- throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Length');
+ throw new UnexpectedTypeException($constraint, Length::class);
}
if (null === $value || '' === $value) {
@@ -39,8 +39,14 @@ public function validate($value, Constraint $constraint)
$stringValue = (string) $value;
- if (!$invalidCharset = !@mb_check_encoding($stringValue, $constraint->charset)) {
- $length = mb_strlen($stringValue, $constraint->charset);
+ try {
+ $invalidCharset = !@mb_check_encoding($stringValue, $constraint->charset);
+ } catch (\ValueError $e) {
+ if (!str_starts_with($e->getMessage(), 'mb_check_encoding(): Argument #2 ($encoding) must be a valid encoding')) {
+ throw $e;
+ }
+
+ $invalidCharset = true;
}
if ($invalidCharset) {
@@ -54,6 +60,8 @@ public function validate($value, Constraint $constraint)
return;
}
+ $length = mb_strlen($stringValue, $constraint->charset);
+
if (null !== $constraint->max && $length > $constraint->max) {
$this->context->buildViolation($constraint->min == $constraint->max ? $constraint->exactMessage : $constraint->maxMessage)
->setParameter('{{ value }}', $this->formatValue($stringValue))
diff --git a/vendor/symfony/validator/Constraints/LessThanOrEqualValidator.php b/vendor/symfony/validator/Constraints/LessThanOrEqualValidator.php
index 54281eef5a..f7f4c8be5f 100644
--- a/vendor/symfony/validator/Constraints/LessThanOrEqualValidator.php
+++ b/vendor/symfony/validator/Constraints/LessThanOrEqualValidator.php
@@ -24,7 +24,7 @@ class LessThanOrEqualValidator extends AbstractComparisonValidator
*/
protected function compareValues($value1, $value2)
{
- return $value1 <= $value2;
+ return null === $value2 || $value1 <= $value2;
}
/**
diff --git a/vendor/symfony/validator/Constraints/LessThanValidator.php b/vendor/symfony/validator/Constraints/LessThanValidator.php
index ef7535fc99..64e107547a 100644
--- a/vendor/symfony/validator/Constraints/LessThanValidator.php
+++ b/vendor/symfony/validator/Constraints/LessThanValidator.php
@@ -24,7 +24,7 @@ class LessThanValidator extends AbstractComparisonValidator
*/
protected function compareValues($value1, $value2)
{
- return $value1 < $value2;
+ return null === $value2 || $value1 < $value2;
}
/**
diff --git a/vendor/symfony/validator/Constraints/LocaleValidator.php b/vendor/symfony/validator/Constraints/LocaleValidator.php
index 40d63970e2..29c569c288 100644
--- a/vendor/symfony/validator/Constraints/LocaleValidator.php
+++ b/vendor/symfony/validator/Constraints/LocaleValidator.php
@@ -29,7 +29,7 @@ class LocaleValidator extends ConstraintValidator
public function validate($value, Constraint $constraint)
{
if (!$constraint instanceof Locale) {
- throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Locale');
+ throw new UnexpectedTypeException($constraint, Locale::class);
}
if (null === $value || '' === $value) {
diff --git a/vendor/symfony/validator/Constraints/LuhnValidator.php b/vendor/symfony/validator/Constraints/LuhnValidator.php
index 89ebfdcc5c..2f652b3f6b 100644
--- a/vendor/symfony/validator/Constraints/LuhnValidator.php
+++ b/vendor/symfony/validator/Constraints/LuhnValidator.php
@@ -39,7 +39,7 @@ class LuhnValidator extends ConstraintValidator
public function validate($value, Constraint $constraint)
{
if (!$constraint instanceof Luhn) {
- throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Luhn');
+ throw new UnexpectedTypeException($constraint, Luhn::class);
}
if (null === $value || '' === $value) {
diff --git a/vendor/symfony/validator/Constraints/NotBlankValidator.php b/vendor/symfony/validator/Constraints/NotBlankValidator.php
index 1d6c5bc983..f862da1ec1 100644
--- a/vendor/symfony/validator/Constraints/NotBlankValidator.php
+++ b/vendor/symfony/validator/Constraints/NotBlankValidator.php
@@ -26,7 +26,7 @@ class NotBlankValidator extends ConstraintValidator
public function validate($value, Constraint $constraint)
{
if (!$constraint instanceof NotBlank) {
- throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\NotBlank');
+ throw new UnexpectedTypeException($constraint, NotBlank::class);
}
if (false === $value || (empty($value) && '0' != $value)) {
diff --git a/vendor/symfony/validator/Constraints/NotNullValidator.php b/vendor/symfony/validator/Constraints/NotNullValidator.php
index d6f620713e..d02fcc4398 100644
--- a/vendor/symfony/validator/Constraints/NotNullValidator.php
+++ b/vendor/symfony/validator/Constraints/NotNullValidator.php
@@ -26,7 +26,7 @@ class NotNullValidator extends ConstraintValidator
public function validate($value, Constraint $constraint)
{
if (!$constraint instanceof NotNull) {
- throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\NotNull');
+ throw new UnexpectedTypeException($constraint, NotNull::class);
}
if (null === $value) {
diff --git a/vendor/symfony/validator/Constraints/Range.php b/vendor/symfony/validator/Constraints/Range.php
index 65ece5d832..c67a6daa8e 100644
--- a/vendor/symfony/validator/Constraints/Range.php
+++ b/vendor/symfony/validator/Constraints/Range.php
@@ -43,7 +43,7 @@ public function __construct($options = null)
parent::__construct($options);
if (null === $this->min && null === $this->max) {
- throw new MissingOptionsException(sprintf('Either option "min" or "max" must be given for constraint %s', __CLASS__), ['min', 'max']);
+ throw new MissingOptionsException(sprintf('Either option "min" or "max" must be given for constraint "%s".', __CLASS__), ['min', 'max']);
}
}
}
diff --git a/vendor/symfony/validator/Constraints/RangeValidator.php b/vendor/symfony/validator/Constraints/RangeValidator.php
index ea7d277808..43394601d7 100644
--- a/vendor/symfony/validator/Constraints/RangeValidator.php
+++ b/vendor/symfony/validator/Constraints/RangeValidator.php
@@ -27,7 +27,7 @@ class RangeValidator extends ConstraintValidator
public function validate($value, Constraint $constraint)
{
if (!$constraint instanceof Range) {
- throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Range');
+ throw new UnexpectedTypeException($constraint, Range::class);
}
if (null === $value) {
diff --git a/vendor/symfony/validator/Constraints/RegexValidator.php b/vendor/symfony/validator/Constraints/RegexValidator.php
index c6b70feb7f..62829ec5d0 100644
--- a/vendor/symfony/validator/Constraints/RegexValidator.php
+++ b/vendor/symfony/validator/Constraints/RegexValidator.php
@@ -29,7 +29,7 @@ class RegexValidator extends ConstraintValidator
public function validate($value, Constraint $constraint)
{
if (!$constraint instanceof Regex) {
- throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Regex');
+ throw new UnexpectedTypeException($constraint, Regex::class);
}
if (null === $value || '' === $value) {
diff --git a/vendor/symfony/validator/Constraints/TimeValidator.php b/vendor/symfony/validator/Constraints/TimeValidator.php
index b1ee40c530..1c59d9e5e5 100644
--- a/vendor/symfony/validator/Constraints/TimeValidator.php
+++ b/vendor/symfony/validator/Constraints/TimeValidator.php
@@ -44,7 +44,7 @@ public static function checkTime($hour, $minute, $second)
public function validate($value, Constraint $constraint)
{
if (!$constraint instanceof Time) {
- throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Time');
+ throw new UnexpectedTypeException($constraint, Time::class);
}
if (null === $value || '' === $value || $value instanceof \DateTimeInterface) {
diff --git a/vendor/symfony/validator/Constraints/Traverse.php b/vendor/symfony/validator/Constraints/Traverse.php
index 78d115fdbb..f5f66f53ff 100644
--- a/vendor/symfony/validator/Constraints/Traverse.php
+++ b/vendor/symfony/validator/Constraints/Traverse.php
@@ -26,7 +26,7 @@ class Traverse extends Constraint
public function __construct($options = null)
{
if (\is_array($options) && \array_key_exists('groups', $options)) {
- throw new ConstraintDefinitionException(sprintf('The option "groups" is not supported by the constraint %s', __CLASS__));
+ throw new ConstraintDefinitionException(sprintf('The option "groups" is not supported by the constraint "%s".', __CLASS__));
}
parent::__construct($options);
diff --git a/vendor/symfony/validator/Constraints/TypeValidator.php b/vendor/symfony/validator/Constraints/TypeValidator.php
index 206836d361..ecd7cd8cf7 100644
--- a/vendor/symfony/validator/Constraints/TypeValidator.php
+++ b/vendor/symfony/validator/Constraints/TypeValidator.php
@@ -26,7 +26,7 @@ class TypeValidator extends ConstraintValidator
public function validate($value, Constraint $constraint)
{
if (!$constraint instanceof Type) {
- throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Type');
+ throw new UnexpectedTypeException($constraint, Type::class);
}
if (null === $value) {
diff --git a/vendor/symfony/validator/Constraints/UrlValidator.php b/vendor/symfony/validator/Constraints/UrlValidator.php
index b77701dd7e..97a0545075 100644
--- a/vendor/symfony/validator/Constraints/UrlValidator.php
+++ b/vendor/symfony/validator/Constraints/UrlValidator.php
@@ -23,7 +23,7 @@ class UrlValidator extends ConstraintValidator
{
const PATTERN = '~^
(%s):// # protocol
- (([\.\pL\pN-]+:)?([\.\pL\pN-]+)@)? # basic auth
+ (((?:[\_\.\pL\pN-]|%%[0-9A-Fa-f]{2})+:)?((?:[\_\.\pL\pN-]|%%[0-9A-Fa-f]{2})+)@)? # basic auth
(
([\pL\pN\pS\-\_\.])+(\.?([\pL\pN]|xn\-\-[\pL\pN-]+)+\.?) # a domain name
| # or
@@ -45,7 +45,7 @@ class UrlValidator extends ConstraintValidator
public function validate($value, Constraint $constraint)
{
if (!$constraint instanceof Url) {
- throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Url');
+ throw new UnexpectedTypeException($constraint, Url::class);
}
if (null === $value || '' === $value) {
@@ -93,7 +93,7 @@ public function validate($value, Constraint $constraint)
Url::CHECK_DNS_TYPE_SRV,
Url::CHECK_DNS_TYPE_TXT,
], true)) {
- throw new InvalidOptionsException(sprintf('Invalid value for option "checkDNS" in constraint %s', \get_class($constraint)), ['checkDNS']);
+ throw new InvalidOptionsException(sprintf('Invalid value for option "checkDNS" in constraint "%s".', \get_class($constraint)), ['checkDNS']);
}
$host = parse_url($value, PHP_URL_HOST);
diff --git a/vendor/symfony/validator/Constraints/UuidValidator.php b/vendor/symfony/validator/Constraints/UuidValidator.php
index 26de4614f3..a1f5e7fb52 100644
--- a/vendor/symfony/validator/Constraints/UuidValidator.php
+++ b/vendor/symfony/validator/Constraints/UuidValidator.php
@@ -67,7 +67,7 @@ class UuidValidator extends ConstraintValidator
public function validate($value, Constraint $constraint)
{
if (!$constraint instanceof Uuid) {
- throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Uuid');
+ throw new UnexpectedTypeException($constraint, Uuid::class);
}
if (null === $value || '' === $value) {
diff --git a/vendor/symfony/validator/Constraints/ValidValidator.php b/vendor/symfony/validator/Constraints/ValidValidator.php
index 695ec82254..85eabb80ae 100644
--- a/vendor/symfony/validator/Constraints/ValidValidator.php
+++ b/vendor/symfony/validator/Constraints/ValidValidator.php
@@ -23,7 +23,7 @@ class ValidValidator extends ConstraintValidator
public function validate($value, Constraint $constraint)
{
if (!$constraint instanceof Valid) {
- throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Valid');
+ throw new UnexpectedTypeException($constraint, Valid::class);
}
if (null === $value) {
diff --git a/vendor/symfony/validator/Context/ExecutionContext.php b/vendor/symfony/validator/Context/ExecutionContext.php
index 7ca9caa80f..44427c8489 100644
--- a/vendor/symfony/validator/Context/ExecutionContext.php
+++ b/vendor/symfony/validator/Context/ExecutionContext.php
@@ -20,6 +20,7 @@
use Symfony\Component\Validator\Mapping\MetadataInterface;
use Symfony\Component\Validator\Mapping\PropertyMetadataInterface;
use Symfony\Component\Validator\Util\PropertyPath;
+use Symfony\Component\Validator\Validator\LazyProperty;
use Symfony\Component\Validator\Validator\ValidatorInterface;
use Symfony\Component\Validator\Violation\ConstraintViolationBuilder;
@@ -187,7 +188,7 @@ public function addViolation($message, array $parameters = [])
$parameters,
$this->root,
$this->propertyPath,
- $this->value,
+ $this->getValue(),
null,
null,
$this->constraint
@@ -206,7 +207,7 @@ public function buildViolation($message, array $parameters = [])
$parameters,
$this->root,
$this->propertyPath,
- $this->value,
+ $this->getValue(),
$this->translator,
$this->translationDomain
);
@@ -241,6 +242,10 @@ public function getRoot()
*/
public function getValue()
{
+ if ($this->value instanceof LazyProperty) {
+ return $this->value->getPropertyValue();
+ }
+
return $this->value;
}
diff --git a/vendor/symfony/validator/Context/ExecutionContextInterface.php b/vendor/symfony/validator/Context/ExecutionContextInterface.php
index 09137f8511..3d7925b471 100644
--- a/vendor/symfony/validator/Context/ExecutionContextInterface.php
+++ b/vendor/symfony/validator/Context/ExecutionContextInterface.php
@@ -64,8 +64,8 @@ interface ExecutionContextInterface
/**
* Adds a violation at the current node of the validation graph.
*
- * @param string $message The error message
- * @param array $params The parameters substituted in the error message
+ * @param string|\Stringable $message The error message as a string or a stringable object
+ * @param array $params The parameters substituted in the error message
*/
public function addViolation($message, array $params = []);
@@ -81,8 +81,8 @@ public function addViolation($message, array $params = []);
* ->setTranslationDomain('number_validation')
* ->addViolation();
*
- * @param string $message The error message
- * @param array $parameters The parameters substituted in the error message
+ * @param string|\Stringable $message The error message as a string or a stringable object
+ * @param array $parameters The parameters substituted in the error message
*
* @return ConstraintViolationBuilderInterface The violation builder
*/
diff --git a/vendor/symfony/validator/LICENSE b/vendor/symfony/validator/LICENSE
index a677f43763..9e936ec044 100644
--- a/vendor/symfony/validator/LICENSE
+++ b/vendor/symfony/validator/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2019 Fabien Potencier
+Copyright (c) 2004-2020 Fabien Potencier
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/vendor/symfony/validator/Mapping/ClassMetadata.php b/vendor/symfony/validator/Mapping/ClassMetadata.php
index 03b0ae6d8f..572bbc6d55 100644
--- a/vendor/symfony/validator/Mapping/ClassMetadata.php
+++ b/vendor/symfony/validator/Mapping/ClassMetadata.php
@@ -14,7 +14,6 @@
use Symfony\Component\Validator\Constraint;
use Symfony\Component\Validator\Constraints\GroupSequence;
use Symfony\Component\Validator\Constraints\Traverse;
-use Symfony\Component\Validator\Constraints\Valid;
use Symfony\Component\Validator\Exception\ConstraintDefinitionException;
use Symfony\Component\Validator\Exception\GroupDefinitionException;
@@ -183,10 +182,6 @@ public function addConstraint(Constraint $constraint)
throw new ConstraintDefinitionException(sprintf('The constraint "%s" cannot be put on classes.', \get_class($constraint)));
}
- if ($constraint instanceof Valid) {
- throw new ConstraintDefinitionException(sprintf('The constraint "%s" cannot be put on classes.', \get_class($constraint)));
- }
-
if ($constraint instanceof Traverse) {
if ($constraint->traverse) {
// If traverse is true, traversal should be explicitly enabled
@@ -406,7 +401,7 @@ public function getConstrainedProperties()
public function setGroupSequence($groupSequence)
{
if ($this->isGroupSequenceProvider()) {
- throw new GroupDefinitionException('Defining a static group sequence is not allowed with a group sequence provider');
+ throw new GroupDefinitionException('Defining a static group sequence is not allowed with a group sequence provider.');
}
if (\is_array($groupSequence)) {
@@ -414,11 +409,11 @@ public function setGroupSequence($groupSequence)
}
if (\in_array(Constraint::DEFAULT_GROUP, $groupSequence->groups, true)) {
- throw new GroupDefinitionException(sprintf('The group "%s" is not allowed in group sequences', Constraint::DEFAULT_GROUP));
+ throw new GroupDefinitionException(sprintf('The group "%s" is not allowed in group sequences.', Constraint::DEFAULT_GROUP));
}
if (!\in_array($this->getDefaultGroup(), $groupSequence->groups, true)) {
- throw new GroupDefinitionException(sprintf('The group "%s" is missing in the group sequence', $this->getDefaultGroup()));
+ throw new GroupDefinitionException(sprintf('The group "%s" is missing in the group sequence.', $this->getDefaultGroup()));
}
$this->groupSequence = $groupSequence;
@@ -466,11 +461,11 @@ public function getReflectionClass()
public function setGroupSequenceProvider($active)
{
if ($this->hasGroupSequence()) {
- throw new GroupDefinitionException('Defining a group sequence provider is not allowed with a static group sequence');
+ throw new GroupDefinitionException('Defining a group sequence provider is not allowed with a static group sequence.');
}
if (!$this->getReflectionClass()->implementsInterface('Symfony\Component\Validator\GroupSequenceProviderInterface')) {
- throw new GroupDefinitionException(sprintf('Class "%s" must implement GroupSequenceProviderInterface', $this->name));
+ throw new GroupDefinitionException(sprintf('Class "%s" must implement GroupSequenceProviderInterface.', $this->name));
}
$this->groupSequenceProvider = $active;
diff --git a/vendor/symfony/validator/Mapping/Factory/LazyLoadingMetadataFactory.php b/vendor/symfony/validator/Mapping/Factory/LazyLoadingMetadataFactory.php
index cf0d08acce..b17ff691fb 100644
--- a/vendor/symfony/validator/Mapping/Factory/LazyLoadingMetadataFactory.php
+++ b/vendor/symfony/validator/Mapping/Factory/LazyLoadingMetadataFactory.php
@@ -79,7 +79,7 @@ public function __construct(LoaderInterface $loader = null, CacheInterface $cach
public function getMetadataFor($value)
{
if (!\is_object($value) && !\is_string($value)) {
- throw new NoSuchMetadataException(sprintf('Cannot create metadata for non-objects. Got: %s', \gettype($value)));
+ throw new NoSuchMetadataException(sprintf('Cannot create metadata for non-objects. Got: "%s".', \gettype($value)));
}
$class = ltrim(\is_object($value) ? \get_class($value) : $value, '\\');
@@ -117,34 +117,25 @@ public function getMetadataFor($value)
private function mergeConstraints(ClassMetadata $metadata)
{
+ if ($metadata->getReflectionClass()->isInterface()) {
+ return;
+ }
+
// Include constraints from the parent class
if ($parent = $metadata->getReflectionClass()->getParentClass()) {
$metadata->mergeConstraints($this->getMetadataFor($parent->name));
}
- $interfaces = $metadata->getReflectionClass()->getInterfaces();
-
- $interfaces = array_filter($interfaces, function ($interface) use ($parent, $interfaces) {
- $interfaceName = $interface->getName();
-
- if ($parent && $parent->implementsInterface($interfaceName)) {
- return false;
- }
-
- foreach ($interfaces as $i) {
- if ($i !== $interface && $i->implementsInterface($interfaceName)) {
- return false;
- }
- }
-
- return true;
- });
-
// Include constraints from all directly implemented interfaces
- foreach ($interfaces as $interface) {
+ foreach ($metadata->getReflectionClass()->getInterfaces() as $interface) {
if ('Symfony\Component\Validator\GroupSequenceProviderInterface' === $interface->name) {
continue;
}
+
+ if ($parent && \in_array($interface->getName(), $parent->getInterfaceNames(), true)) {
+ continue;
+ }
+
$metadata->mergeConstraints($this->getMetadataFor($interface->name));
}
}
diff --git a/vendor/symfony/validator/Mapping/GetterMetadata.php b/vendor/symfony/validator/Mapping/GetterMetadata.php
index 5a72bd84b7..6ab88b05bd 100644
--- a/vendor/symfony/validator/Mapping/GetterMetadata.php
+++ b/vendor/symfony/validator/Mapping/GetterMetadata.php
@@ -53,10 +53,10 @@ public function __construct($class, $property, $method = null)
} elseif (method_exists($class, $hasMethod)) {
$method = $hasMethod;
} else {
- throw new ValidatorException(sprintf('Neither of these methods exist in class %s: %s, %s, %s', $class, $getMethod, $isMethod, $hasMethod));
+ throw new ValidatorException(sprintf('Neither of these methods exist in class "%s": "%s", "%s", "%s".', $class, $getMethod, $isMethod, $hasMethod));
}
} elseif (!method_exists($class, $method)) {
- throw new ValidatorException(sprintf('The %s() method does not exist in class %s.', $method, $class));
+ throw new ValidatorException(sprintf('The "%s()" method does not exist in class "%s".', $method, $class));
}
parent::__construct($class, $method, $property);
diff --git a/vendor/symfony/validator/Mapping/Loader/AbstractLoader.php b/vendor/symfony/validator/Mapping/Loader/AbstractLoader.php
index ae2e1e04cd..1d3d90132b 100644
--- a/vendor/symfony/validator/Mapping/Loader/AbstractLoader.php
+++ b/vendor/symfony/validator/Mapping/Loader/AbstractLoader.php
@@ -75,7 +75,7 @@ protected function newConstraint($name, $options = null)
list($prefix, $className) = explode(':', $name, 2);
if (!isset($this->namespaces[$prefix])) {
- throw new MappingException(sprintf('Undefined namespace prefix "%s"', $prefix));
+ throw new MappingException(sprintf('Undefined namespace prefix "%s".', $prefix));
}
$className = $this->namespaces[$prefix].$className;
diff --git a/vendor/symfony/validator/Mapping/Loader/FileLoader.php b/vendor/symfony/validator/Mapping/Loader/FileLoader.php
index b8f9490379..3b1c036e71 100644
--- a/vendor/symfony/validator/Mapping/Loader/FileLoader.php
+++ b/vendor/symfony/validator/Mapping/Loader/FileLoader.php
@@ -35,15 +35,15 @@ abstract class FileLoader extends AbstractLoader
public function __construct($file)
{
if (!is_file($file)) {
- throw new MappingException(sprintf('The mapping file "%s" does not exist', $file));
+ throw new MappingException(sprintf('The mapping file "%s" does not exist.', $file));
}
if (!is_readable($file)) {
- throw new MappingException(sprintf('The mapping file "%s" is not readable', $file));
+ throw new MappingException(sprintf('The mapping file "%s" is not readable.', $file));
}
if (!stream_is_local($this->file)) {
- throw new MappingException(sprintf('The mapping file "%s" is not a local file', $file));
+ throw new MappingException(sprintf('The mapping file "%s" is not a local file.', $file));
}
$this->file = $file;
diff --git a/vendor/symfony/validator/Mapping/Loader/LoaderChain.php b/vendor/symfony/validator/Mapping/Loader/LoaderChain.php
index de80dcd8ad..5eb17ee375 100644
--- a/vendor/symfony/validator/Mapping/Loader/LoaderChain.php
+++ b/vendor/symfony/validator/Mapping/Loader/LoaderChain.php
@@ -36,7 +36,7 @@ public function __construct(array $loaders)
{
foreach ($loaders as $loader) {
if (!$loader instanceof LoaderInterface) {
- throw new MappingException(sprintf('Class %s is expected to implement LoaderInterface', \get_class($loader)));
+ throw new MappingException(sprintf('Class "%s" is expected to implement LoaderInterface.', \get_class($loader)));
}
}
diff --git a/vendor/symfony/validator/Mapping/Loader/StaticMethodLoader.php b/vendor/symfony/validator/Mapping/Loader/StaticMethodLoader.php
index 95fc578eb4..5ed1f993e8 100644
--- a/vendor/symfony/validator/Mapping/Loader/StaticMethodLoader.php
+++ b/vendor/symfony/validator/Mapping/Loader/StaticMethodLoader.php
@@ -49,7 +49,7 @@ public function loadClassMetadata(ClassMetadata $metadata)
}
if (!$reflMethod->isStatic()) {
- throw new MappingException(sprintf('The method %s::%s should be static', $reflClass->name, $this->methodName));
+ throw new MappingException(sprintf('The method "%s::%s()" should be static.', $reflClass->name, $this->methodName));
}
if ($reflMethod->getDeclaringClass()->name != $reflClass->name) {
diff --git a/vendor/symfony/validator/Mapping/Loader/YamlFileLoader.php b/vendor/symfony/validator/Mapping/Loader/YamlFileLoader.php
index 0f6166674d..d317ecf9e9 100644
--- a/vendor/symfony/validator/Mapping/Loader/YamlFileLoader.php
+++ b/vendor/symfony/validator/Mapping/Loader/YamlFileLoader.php
@@ -124,7 +124,7 @@ private function parseFile($path)
try {
$classes = $this->yamlParser->parseFile($path, Yaml::PARSE_CONSTANT);
} catch (ParseException $e) {
- throw new \InvalidArgumentException(sprintf('The file "%s" does not contain valid YAML.', $path), 0, $e);
+ throw new \InvalidArgumentException(sprintf('The file "%s" does not contain valid YAML: ', $path).$e->getMessage(), 0, $e);
} finally {
restore_error_handler();
}
diff --git a/vendor/symfony/validator/Mapping/MemberMetadata.php b/vendor/symfony/validator/Mapping/MemberMetadata.php
index 11bd54d33c..fb2fcb439f 100644
--- a/vendor/symfony/validator/Mapping/MemberMetadata.php
+++ b/vendor/symfony/validator/Mapping/MemberMetadata.php
@@ -72,7 +72,7 @@ public function __construct($class, $name, $property)
public function addConstraint(Constraint $constraint)
{
if (!\in_array(Constraint::PROPERTY_CONSTRAINT, (array) $constraint->getTargets())) {
- throw new ConstraintDefinitionException(sprintf('The constraint %s cannot be put on properties or getters', \get_class($constraint)));
+ throw new ConstraintDefinitionException(sprintf('The constraint "%s" cannot be put on properties or getters.', \get_class($constraint)));
}
parent::addConstraint($constraint);
diff --git a/vendor/symfony/validator/Mapping/PropertyMetadata.php b/vendor/symfony/validator/Mapping/PropertyMetadata.php
index b03a059f84..5e535dd27f 100644
--- a/vendor/symfony/validator/Mapping/PropertyMetadata.php
+++ b/vendor/symfony/validator/Mapping/PropertyMetadata.php
@@ -37,7 +37,7 @@ class PropertyMetadata extends MemberMetadata
public function __construct($class, $name)
{
if (!property_exists($class, $name)) {
- throw new ValidatorException(sprintf('Property "%s" does not exist in class "%s"', $name, $class));
+ throw new ValidatorException(sprintf('Property "%s" does not exist in class "%s".', $name, $class));
}
parent::__construct($class, $name, $name);
@@ -48,7 +48,26 @@ public function __construct($class, $name)
*/
public function getPropertyValue($object)
{
- return $this->getReflectionMember($object)->getValue($object);
+ $reflProperty = $this->getReflectionMember($object);
+
+ if (\PHP_VERSION_ID >= 70400 && $reflProperty->hasType() && !$reflProperty->isInitialized($object)) {
+ // There is no way to check if a property has been unset or if it is uninitialized.
+ // When trying to access an uninitialized property, __get method is triggered.
+
+ // If __get method is not present, no fallback is possible
+ // Otherwise we need to catch an Error in case we are trying to access an uninitialized but set property.
+ if (!method_exists($object, '__get')) {
+ return null;
+ }
+
+ try {
+ return $reflProperty->getValue($object);
+ } catch (\Error $e) {
+ return null;
+ }
+ }
+
+ return $reflProperty->getValue($object);
}
/**
diff --git a/vendor/symfony/validator/Resources/translations/validators.ar.xlf b/vendor/symfony/validator/Resources/translations/validators.ar.xlf
index 12f26fdc88..46a6498480 100644
--- a/vendor/symfony/validator/Resources/translations/validators.ar.xlf
+++ b/vendor/symfony/validator/Resources/translations/validators.ar.xlf
@@ -334,6 +334,54 @@
<source>This value should be valid JSON.</source>
<target>هذه القيمة يجب أن تكون صالحة ل JSON.</target>
</trans-unit>
+ <trans-unit id="87">
+ <source>This collection should contain only unique elements.</source>
+ <target>يجب أن تحتوي هذه المجموعة علي عناصر فريدة فقط.</target>
+ </trans-unit>
+ <trans-unit id="88">
+ <source>This value should be positive.</source>
+ <target>يجب أن تكون هذه القيمة موجبة.</target>
+ </trans-unit>
+ <trans-unit id="89">
+ <source>This value should be either positive or zero.</source>
+ <target>يجب أن تكون هذه القيمة إما موجبة او صفر.</target>
+ </trans-unit>
+ <trans-unit id="90">
+ <source>This value should be negative.</source>
+ <target>يجب أن تكون هذه القيمة سالبة.</target>
+ </trans-unit>
+ <trans-unit id="91">
+ <source>This value should be either negative or zero.</source>
+ <target>يجب أن تكون هذه القيمة إما سالبة او صفر.</target>
+ </trans-unit>
+ <trans-unit id="92">
+ <source>This value is not a valid timezone.</source>
+ <target>هذه القيمة ليست منطقة زمنية صحيحة.</target>
+ </trans-unit>
+ <trans-unit id="93">
+ <source>This password has been leaked in a data breach, it must not be used. Please use another password.</source>
+ <target>تم تسريب كلمة المرور هذه في خرق للبيانات، ويجب عدم استخدامها. يرجي استخدام كلمة مرور أخري.</target>
+ </trans-unit>
+ <trans-unit id="94">
+ <source>This value should be between {{ min }} and {{ max }}.</source>
+ <target>يجب أن تكون هذه القيمة بين {{ min }} و {{ max }}.</target>
+ </trans-unit>
+ <trans-unit id="95">
+ <source>This value is not a valid hostname.</source>
+ <target>هذه القيمة ليست اسم مضيف صالح.</target>
+ </trans-unit>
+ <trans-unit id="96">
+ <source>The number of elements in this collection should be a multiple of {{ compared_value }}.</source>
+ <target>يجب أن يكون عدد العناصر في هذه المجموعة مضاعف {{ compared_value }}.</target>
+ </trans-unit>
+ <trans-unit id="97">
+ <source>This value should satisfy at least one of the following constraints:</source>
+ <target>يجب أن تستوفي هذه القيمة واحدة من القيود التالية:</target>
+ </trans-unit>
+ <trans-unit id="98">
+ <source>Each element of this collection should satisfy its own set of constraints.</source>
+ <target>يجب أن يفي كل عنصر من عناصر هذه المجموعة بمجموعة القيود الخاصة به.</target>
+ </trans-unit>
</body>
</file>
</xliff>
diff --git a/vendor/symfony/validator/Resources/translations/validators.cs.xlf b/vendor/symfony/validator/Resources/translations/validators.cs.xlf
index e637d09aa9..ce32f1368d 100644
--- a/vendor/symfony/validator/Resources/translations/validators.cs.xlf
+++ b/vendor/symfony/validator/Resources/translations/validators.cs.xlf
@@ -334,6 +334,54 @@
<source>This value should be valid JSON.</source>
<target>Tato hodnota musí být validní JSON.</target>
</trans-unit>
+ <trans-unit id="87">
+ <source>This collection should contain only unique elements.</source>
+ <target>Tato kolekce musí obsahovat pouze unikátní prvky.</target>
+ </trans-unit>
+ <trans-unit id="88">
+ <source>This value should be positive.</source>
+ <target>Tato hodnota musí být kladná.</target>
+ </trans-unit>
+ <trans-unit id="89">
+ <source>This value should be either positive or zero.</source>
+ <target>Tato hodnota musí být buď kladná nebo nula.</target>
+ </trans-unit>
+ <trans-unit id="90">
+ <source>This value should be negative.</source>
+ <target>Tato hodnota musí být záporná.</target>
+ </trans-unit>
+ <trans-unit id="91">
+ <source>This value should be either negative or zero.</source>
+ <target>Tato hodnota musí být buď záporná nebo nula.</target>
+ </trans-unit>
+ <trans-unit id="92">
+ <source>This value is not a valid timezone.</source>
+ <target>Tato časová zóna neexistuje.</target>
+ </trans-unit>
+ <trans-unit id="93">
+ <source>This password has been leaked in a data breach, it must not be used. Please use another password.</source>
+ <target>Zadané heslo bylo součástí úniku dat, takže ho není možné použít. Použijte prosím jiné heslo.</target>
+ </trans-unit>
+ <trans-unit id="94">
+ <source>This value should be between {{ min }} and {{ max }}.</source>
+ <target>Hodnota musí být mezi {{ min }} a {{ max }}.</target>
+ </trans-unit>
+ <trans-unit id="95">
+ <source>This value is not a valid hostname.</source>
+ <target>Tato hodnota není platný hostname.</target>
+ </trans-unit>
+ <trans-unit id="96">
+ <source>The number of elements in this collection should be a multiple of {{ compared_value }}.</source>
+ <target>Počet prvků v této kolekci musí být násobek {{ compared_value }}.</target>
+ </trans-unit>
+ <trans-unit id="97">
+ <source>This value should satisfy at least one of the following constraints:</source>
+ <target>Tato hodnota musí splňovat alespoň jedno z následujících omezení:</target>
+ </trans-unit>
+ <trans-unit id="98">
+ <source>Each element of this collection should satisfy its own set of constraints.</source>
+ <target>Každý prvek v této kolekci musí splňovat svá vlastní omezení.</target>
+ </trans-unit>
</body>
</file>
</xliff>
diff --git a/vendor/symfony/validator/Resources/translations/validators.de.xlf b/vendor/symfony/validator/Resources/translations/validators.de.xlf
index 8ee3120482..c5d1fe0cf1 100644
--- a/vendor/symfony/validator/Resources/translations/validators.de.xlf
+++ b/vendor/symfony/validator/Resources/translations/validators.de.xlf
@@ -366,6 +366,22 @@
<source>This value should be between {{ min }} and {{ max }}.</source>
<target>Dieser Wert sollte zwischen {{ min }} und {{ max }} sein.</target>
</trans-unit>
+ <trans-unit id="95">
+ <source>This value is not a valid hostname.</source>
+ <target>Dieser Wert ist kein gültiger Hostname.</target>
+ </trans-unit>
+ <trans-unit id="96">
+ <source>The number of elements in this collection should be a multiple of {{ compared_value }}.</source>
+ <target>Die Anzahl an Elementen in dieser Sammlung sollte ein Vielfaches von {{ compared_value }} sein.</target>
+ </trans-unit>
+ <trans-unit id="97">
+ <source>This value should satisfy at least one of the following constraints:</source>
+ <target>Dieser Wert sollte eine der folgenden Bedingungen erfüllen:</target>
+ </trans-unit>
+ <trans-unit id="98">
+ <source>Each element of this collection should satisfy its own set of constraints.</source>
+ <target>Jedes Element dieser Sammlung sollte seine eigene Menge an Bedingungen erfüllen.</target>
+ </trans-unit>
</body>
</file>
</xliff>
diff --git a/vendor/symfony/validator/Resources/translations/validators.en.xlf b/vendor/symfony/validator/Resources/translations/validators.en.xlf
index 100d552076..674ccf5c30 100644
--- a/vendor/symfony/validator/Resources/translations/validators.en.xlf
+++ b/vendor/symfony/validator/Resources/translations/validators.en.xlf
@@ -366,6 +366,22 @@
<source>This value should be between {{ min }} and {{ max }}.</source>
<target>This value should be between {{ min }} and {{ max }}.</target>
</trans-unit>
+ <trans-unit id="95">
+ <source>This value is not a valid hostname.</source>
+ <target>This value is not a valid hostname.</target>
+ </trans-unit>
+ <trans-unit id="96">
+ <source>The number of elements in this collection should be a multiple of {{ compared_value }}.</source>
+ <target>The number of elements in this collection should be a multiple of {{ compared_value }}.</target>
+ </trans-unit>
+ <trans-unit id="97">
+ <source>This value should satisfy at least one of the following constraints:</source>
+ <target>This value should satisfy at least one of the following constraints:</target>
+ </trans-unit>
+ <trans-unit id="98">
+ <source>Each element of this collection should satisfy its own set of constraints.</source>
+ <target>Each element of this collection should satisfy its own set of constraints.</target>
+ </trans-unit>
</body>
</file>
</xliff>
diff --git a/vendor/symfony/validator/Resources/translations/validators.es.xlf b/vendor/symfony/validator/Resources/translations/validators.es.xlf
index 75cb60605a..57b07b2b55 100644
--- a/vendor/symfony/validator/Resources/translations/validators.es.xlf
+++ b/vendor/symfony/validator/Resources/translations/validators.es.xlf
@@ -192,7 +192,7 @@
</trans-unit>
<trans-unit id="51">
<source>No temporary folder was configured in php.ini.</source>
- <target>Ninguna carpeta temporal fue configurada en php.ini.</target>
+ <target>Ninguna carpeta temporal fue configurada en php.ini o la carpeta configurada no existe.</target>
</trans-unit>
<trans-unit id="52">
<source>Cannot write temporary file to disk.</source>
@@ -364,7 +364,23 @@
</trans-unit>
<trans-unit id="94">
<source>This value should be between {{ min }} and {{ max }}.</source>
- <target>Este valor debe estar entre {{ min }} y {{ max }}.</target>
+ <target>Este valor debería estar entre {{ min }} y {{ max }}.</target>
+ </trans-unit>
+ <trans-unit id="95">
+ <source>This value is not a valid hostname.</source>
+ <target>Este valor no es un nombre de host válido.</target>
+ </trans-unit>
+ <trans-unit id="96">
+ <source>The number of elements in this collection should be a multiple of {{ compared_value }}.</source>
+ <target>El número de elementos en esta colección debería ser múltiplo de {{ compared_value }}.</target>
+ </trans-unit>
+ <trans-unit id="97">
+ <source>This value should satisfy at least one of the following constraints:</source>
+ <target>Este valor debería satisfacer al menos una de las siguientes restricciones:</target>
+ </trans-unit>
+ <trans-unit id="98">
+ <source>Each element of this collection should satisfy its own set of constraints.</source>
+ <target>Cada elemento de esta colección debería satisfacer su propio conjunto de restricciones.</target>
</trans-unit>
</body>
</file>
diff --git a/vendor/symfony/validator/Resources/translations/validators.fr.xlf b/vendor/symfony/validator/Resources/translations/validators.fr.xlf
index dc7e73e3c7..c44ade69e0 100644
--- a/vendor/symfony/validator/Resources/translations/validators.fr.xlf
+++ b/vendor/symfony/validator/Resources/translations/validators.fr.xlf
@@ -366,6 +366,22 @@
<source>This value should be between {{ min }} and {{ max }}.</source>
<target>Cette valeur doit être comprise entre {{ min }} et {{ max }}.</target>
</trans-unit>
+ <trans-unit id="95">
+ <source>This value is not a valid hostname.</source>
+ <target>Cette valeur n'est pas un nom d'hôte valide.</target>
+ </trans-unit>
+ <trans-unit id="96">
+ <source>The number of elements in this collection should be a multiple of {{ compared_value }}.</source>
+ <target>Le nombre d'éléments de cette collection doit être un multiple de {{ compared_value }}.</target>
+ </trans-unit>
+ <trans-unit id="97">
+ <source>This value should satisfy at least one of the following constraints:</source>
+ <target>Cette valeur doit satisfaire à au moins une des contraintes suivantes :</target>
+ </trans-unit>
+ <trans-unit id="98">
+ <source>Each element of this collection should satisfy its own set of constraints.</source>
+ <target>Chaque élément de cette collection doit satisfaire à son propre jeu de contraintes.</target>
+ </trans-unit>
</body>
</file>
</xliff>
diff --git a/vendor/symfony/validator/Resources/translations/validators.hu.xlf b/vendor/symfony/validator/Resources/translations/validators.hu.xlf
index 96ae6fe54e..23ca561809 100644
--- a/vendor/symfony/validator/Resources/translations/validators.hu.xlf
+++ b/vendor/symfony/validator/Resources/translations/validators.hu.xlf
@@ -366,6 +366,22 @@
<source>This value should be between {{ min }} and {{ max }}.</source>
<target>Ennek az értéknek {{ min }} és {{ max }} között kell lennie.</target>
</trans-unit>
+ <trans-unit id="95">
+ <source>This value is not a valid hostname.</source>
+ <target>Ez az érték nem egy érvényes állomásnév (hosztnév).</target>
+ </trans-unit>
+ <trans-unit id="96">
+ <source>The number of elements in this collection should be a multiple of {{ compared_value }}.</source>
+ <target>A gyűjteményben lévő elemek számának oszthatónak kell lennie a következővel: {{ compared_value }}.</target>
+ </trans-unit>
+ <trans-unit id="97">
+ <source>This value should satisfy at least one of the following constraints:</source>
+ <target>Ennek az értéknek meg kell felelni legalább egynek a következő feltételek közül:</target>
+ </trans-unit>
+ <trans-unit id="98">
+ <source>Each element of this collection should satisfy its own set of constraints.</source>
+ <target>A gyűjtemény minden elemének meg kell felelni a saját feltételeinek.</target>
+ </trans-unit>
</body>
</file>
</xliff>
diff --git a/vendor/symfony/validator/Resources/translations/validators.it.xlf b/vendor/symfony/validator/Resources/translations/validators.it.xlf
index 3ec620ad6d..9a5768c30a 100644
--- a/vendor/symfony/validator/Resources/translations/validators.it.xlf
+++ b/vendor/symfony/validator/Resources/translations/validators.it.xlf
@@ -366,6 +366,22 @@
<source>This value should be between {{ min }} and {{ max }}.</source>
<target>Questo valore dovrebbe essere compreso tra {{ min }} e {{ max }}.</target>
</trans-unit>
+ <trans-unit id="95">
+ <source>This value is not a valid hostname.</source>
+ <target>Questo valore non è un nome di host valido.</target>
+ </trans-unit>
+ <trans-unit id="96">
+ <source>The number of elements in this collection should be a multiple of {{ compared_value }}.</source>
+ <target>Il numero di elementi in questa collezione dovrebbe essere un multiplo di {{ compared_value }}.</target>
+ </trans-unit>
+ <trans-unit id="97">
+ <source>This value should satisfy at least one of the following constraints:</source>
+ <target>Questo valore dovrebbe soddisfare almeno uno dei vincoli seguenti:</target>
+ </trans-unit>
+ <trans-unit id="98">
+ <source>Each element of this collection should satisfy its own set of constraints.</source>
+ <target>Ciascun elemento di questa collezione dovrebbe soddisfare il suo insieme di vincoli.</target>
+ </trans-unit>
</body>
</file>
</xliff>
diff --git a/vendor/symfony/validator/Resources/translations/validators.ja.xlf b/vendor/symfony/validator/Resources/translations/validators.ja.xlf
index 5a391a2e66..8bff68b1ee 100644
--- a/vendor/symfony/validator/Resources/translations/validators.ja.xlf
+++ b/vendor/symfony/validator/Resources/translations/validators.ja.xlf
@@ -362,6 +362,18 @@
<source>This password has been leaked in a data breach, it must not be used. Please use another password.</source>
<target>このパスワードは漏洩している為使用できません。</target>
</trans-unit>
+ <trans-unit id="94">
+ <source>This value should be between {{ min }} and {{ max }}.</source>
+ <target>{{ min }}以上{{ max }}以下でなければなりません。</target>
+ </trans-unit>
+ <trans-unit id="95">
+ <source>This value is not a valid hostname.</source>
+ <target>有効なホスト名ではありません。</target>
+ </trans-unit>
+ <trans-unit id="96">
+ <source>The number of elements in this collection should be a multiple of {{ compared_value }}.</source>
+ <target>要素の数は{{ compared_value }}の倍数でなければなりません。</target>
+ </trans-unit>
</body>
</file>
</xliff>
diff --git a/vendor/symfony/validator/Resources/translations/validators.lt.xlf b/vendor/symfony/validator/Resources/translations/validators.lt.xlf
index 2a079aacbf..ccb58818c4 100644
--- a/vendor/symfony/validator/Resources/translations/validators.lt.xlf
+++ b/vendor/symfony/validator/Resources/translations/validators.lt.xlf
@@ -366,6 +366,22 @@
<source>This value should be between {{ min }} and {{ max }}.</source>
<target>Ši reikšmė turi būti tarp {{ min }} ir {{ max }}.</target>
</trans-unit>
+ <trans-unit id="95">
+ <source>This value is not a valid hostname.</source>
+ <target>Ši reikšmė nėra tinkamas svetainės adresas.</target>
+ </trans-unit>
+ <trans-unit id="96">
+ <source>The number of elements in this collection should be a multiple of {{ compared_value }}.</source>
+ <target>Šio sąrašo elementų skaičius turėtų būti skaičiaus {{ compared_value }} kartotinis.</target>
+ </trans-unit>
+ <trans-unit id="97">
+ <source>This value should satisfy at least one of the following constraints:</source>
+ <target>Ši reikšmė turėtų atitikti bent vieną iš šių nurodymų:</target>
+ </trans-unit>
+ <trans-unit id="98">
+ <source>Each element of this collection should satisfy its own set of constraints.</source>
+ <target>Kiekvienas šio sąrašo elementas turi atitikti savo nurodymų rinkinį.</target>
+ </trans-unit>
</body>
</file>
</xliff>
diff --git a/vendor/symfony/validator/Resources/translations/validators.mn.xlf b/vendor/symfony/validator/Resources/translations/validators.mn.xlf
index 4be2198aa3..b1458eee1a 100644
--- a/vendor/symfony/validator/Resources/translations/validators.mn.xlf
+++ b/vendor/symfony/validator/Resources/translations/validators.mn.xlf
@@ -146,6 +146,226 @@
<source>This value is not a valid language.</source>
<target>Энэ утга үнэн зөв хэл биш байна .</target>
</trans-unit>
+ <trans-unit id="40">
+ <source>This value is not a valid country.</source>
+ <target>Энэ утга үнэн бодит улс биш байна.</target>
+ </trans-unit>
+ <trans-unit id="41">
+ <source>This value is already used.</source>
+ <target>Энэ утга аль хэдийнээ хэрэглэгдсэн байна.</target>
+ </trans-unit>
+ <trans-unit id="42">
+ <source>The size of the image could not be detected.</source>
+ <target>Зургийн хэмжээ тогтоогдож чадсангүй.</target>
+ </trans-unit>
+ <trans-unit id="43">
+ <source>The image width is too big ({{ width }}px). Allowed maximum width is {{ max_width }}px.</source>
+ <target>Зургийн өргөн хэтэрхий том байна ({{ width }}px). Өргөн нь хамгийн ихдээ {{ max_width }}px байх боломжтой.</target>
+ </trans-unit>
+ <trans-unit id="44">
+ <source>The image width is too small ({{ width }}px). Minimum width expected is {{ min_width }}px.</source>
+ <target>Зургийн өргөн хэтэрхий жижиг байна ({{ width }}px). Өргөн нь хамгийн багадаа {{ min_width }}px байх боломжтой.</target>
+ </trans-unit>
+ <trans-unit id="45">
+ <source>The image height is too big ({{ height }}px). Allowed maximum height is {{ max_height }}px.</source>
+ <target>Зургийн өндөр хэтэрхий том байна ({{ height }}px). Өндөр нь хамгийн ихдээ {{ max_height }}px байх боломжтой.</target>
+ </trans-unit>
+ <trans-unit id="46">
+ <source>The image height is too small ({{ height }}px). Minimum height expected is {{ min_height }}px.</source>
+ <target>Зургийн өндөр хэтэрхий жижиг байна ({{ height }}px). Өндөр нь хамгийн багадаа {{ min_height }}px байх боломжтой.</target>
+ </trans-unit>
+ <trans-unit id="47">
+ <source>This value should be the user's current password.</source>
+ <target>Энэ утга хэрэглэгчийн одоогийн нууц үг байх ёстой.</target>
+ </trans-unit>
+ <trans-unit id="48">
+ <source>This value should have exactly {{ limit }} character.|This value should have exactly {{ limit }} characters.</source>
+ <target>Энэ утга яг {{ limit }} тэмдэгт байх ёстой.|Энэ утга яг {{ limit }} тэмдэгт байх ёстой.</target>
+ </trans-unit>
+ <trans-unit id="49">
+ <source>The file was only partially uploaded.</source>
+ <target>Файлын зөвхөн хагас нь upload хийгдсэн.</target>
+ </trans-unit>
+ <trans-unit id="50">
+ <source>No file was uploaded.</source>
+ <target>Ямар ч файл upload хийгдсэнгүй.</target>
+ </trans-unit>
+ <trans-unit id="51">
+ <source>No temporary folder was configured in php.ini.</source>
+ <target>php.ini дээр түр зуурын хавтсыг тохируулаагүй байна, эсвэл тохируулсан хавтас байхгүй байна.</target>
+ </trans-unit>
+ <trans-unit id="52">
+ <source>Cannot write temporary file to disk.</source>
+ <target>Түр зуурын файлыг диск руу бичиж болохгүй байна.</target>
+ </trans-unit>
+ <trans-unit id="53">
+ <source>A PHP extension caused the upload to fail.</source>
+ <target>PHP extension нь upload -г амжилтгүй болгоод байна.</target>
+ </trans-unit>
+ <trans-unit id="54">
+ <source>This collection should contain {{ limit }} element or more.|This collection should contain {{ limit }} elements or more.</source>
+ <target>Энэ коллекц {{ limit }} ба түүнээс дээш тооны элемент агуулах ёстой.|Энэ коллекц {{ limit }} ба түүнээс дээш тооны элемент агуулах ёстой.</target>
+ </trans-unit>
+ <trans-unit id="55">
+ <source>This collection should contain {{ limit }} element or less.|This collection should contain {{ limit }} elements or less.</source>
+ <target>Энэ коллекц {{ limit }} ба түүнээс доош тооны элемент агуулах ёстой.|Энэ коллекц {{ limit }} ба түүнээс доош тооны элемент агуулах ёстой.</target>
+ </trans-unit>
+ <trans-unit id="56">
+ <source>This collection should contain exactly {{ limit }} element.|This collection should contain exactly {{ limit }} elements.</source>
+ <target>Энэ коллекц яг {{ limit }} элемент агуулах ёстой.|Энэ коллекц яг {{ limit }} элемент агуулах ёстой.</target>
+ </trans-unit>
+ <trans-unit id="57">
+ <source>Invalid card number.</source>
+ <target>Картын дугаар буруу байна.</target>
+ </trans-unit>
+ <trans-unit id="58">
+ <source>Unsupported card type or invalid card number.</source>
+ <target>Дэмжигдээгүй картын төрөл эсвэл картын дугаар буруу байна.</target>
+ </trans-unit>
+ <trans-unit id="59">
+ <source>This is not a valid International Bank Account Number (IBAN).</source>
+ <target>Энэ утга үнэн зөв Олон Улсын Банкны Дансны Дугаар (IBAN) биш байна.</target>
+ </trans-unit>
+ <trans-unit id="60">
+ <source>This value is not a valid ISBN-10.</source>
+ <target>Энэ утга үнэн зөв ISBN-10 биш байна.</target>
+ </trans-unit>
+ <trans-unit id="61">
+ <source>This value is not a valid ISBN-13.</source>
+ <target>Энэ утга үнэн зөв ISBN-13 биш байна.</target>
+ </trans-unit>
+ <trans-unit id="62">
+ <source>This value is neither a valid ISBN-10 nor a valid ISBN-13.</source>
+ <target>Энэ утга үнэн зөв ISBN-10 юмуу ISBN-13 биш байна.</target>
+ </trans-unit>
+ <trans-unit id="63">
+ <source>This value is not a valid ISSN.</source>
+ <target>Энэ утга үнэн зөв ISSN биш байна.</target>
+ </trans-unit>
+ <trans-unit id="64">
+ <source>This value is not a valid currency.</source>
+ <target>Энэ утга үнэн бодит валют биш байна.</target>
+ </trans-unit>
+ <trans-unit id="65">
+ <source>This value should be equal to {{ compared_value }}.</source>
+ <target>Энэ утга {{ compared_value }} -тaй тэнцүү байх ёстой.</target>
+ </trans-unit>
+ <trans-unit id="66">
+ <source>This value should be greater than {{ compared_value }}.</source>
+ <target>Энэ утга {{ compared_value }} -с их байх ёстой.</target>
+ </trans-unit>
+ <trans-unit id="67">
+ <source>This value should be greater than or equal to {{ compared_value }}.</source>
+ <target>Энэ утга {{ compared_value }} -тай тэнцүү юмуу эсвэл их байх ёстой.</target>
+ </trans-unit>
+ <trans-unit id="68">
+ <source>This value should be identical to {{ compared_value_type }} {{ compared_value }}.</source>
+ <target>Энэ утга {{ compared_value_type }} {{ compared_value }} -тай яг ижил байх ёстой.</target>
+ </trans-unit>
+ <trans-unit id="69">
+ <source>This value should be less than {{ compared_value }}.</source>
+ <target>Энэ утга {{ compared_value }} -с бага байх ёстой.</target>
+ </trans-unit>
+ <trans-unit id="70">
+ <source>This value should be less than or equal to {{ compared_value }}.</source>
+ <target>Энэ утга {{ compared_value }} -тай ижил юмуу эсвэл бага байх ёстой.</target>
+ </trans-unit>
+ <trans-unit id="71">
+ <source>This value should not be equal to {{ compared_value }}.</source>
+ <target>Энэ утга {{ compared_value }} -тай тэнцүү байх ёсгүй.</target>
+ </trans-unit>
+ <trans-unit id="72">
+ <source>This value should not be identical to {{ compared_value_type }} {{ compared_value }}.</source>
+ <target>Энэ утга {{ compared_value_type }} {{ compared_value }} -тай яг ижил байх ёсгүй.</target>
+ </trans-unit>
+ <trans-unit id="73">
+ <source>The image ratio is too big ({{ ratio }}). Allowed maximum ratio is {{ max_ratio }}.</source>
+ <target>Зургийн харьцаа хэтэрхий том байна ({{ ratio }}). Харьцаа нь хамгийн ихдээ {{ max_ratio }} байна.</target>
+ </trans-unit>
+ <trans-unit id="74">
+ <source>The image ratio is too small ({{ ratio }}). Minimum ratio expected is {{ min_ratio }}.</source>
+ <target>Зургийн харьцаа хэтэрхий жижиг байна ({{ ratio }}). Харьцаа нь хамгийн багадаа {{ min_ratio }} байна.</target>
+ </trans-unit>
+ <trans-unit id="75">
+ <source>The image is square ({{ width }}x{{ height }}px). Square images are not allowed.</source>
+ <target>Зураг дөрвөлжин хэлбэртэй байна ({{ width }}x{{ height }}px). Дөрвөлжин зургууд оруулах боломжгүй.</target>
+ </trans-unit>
+ <trans-unit id="76">
+ <source>The image is landscape oriented ({{ width }}x{{ height }}px). Landscape oriented images are not allowed.</source>
+ <target>Зураг хэвтээ байрлалтай байна ({{ width }}x{{ height }}px). Хэвтээ байрлалтай зургууд оруулах боломжгүй.</target>
+ </trans-unit>
+ <trans-unit id="77">
+ <source>The image is portrait oriented ({{ width }}x{{ height }}px). Portrait oriented images are not allowed.</source>
+ <target>Зургууд босоо байрлалтай байна ({{ width }}x{{ height }}px). Босоо байрлалтай зургууд оруулах боломжгүй.</target>
+ </trans-unit>
+ <trans-unit id="78">
+ <source>An empty file is not allowed.</source>
+ <target>Хоосон файл оруулах боломжгүй.</target>
+ </trans-unit>
+ <trans-unit id="79">
+ <source>The host could not be resolved.</source>
+ <target>Хост зөв тохирогдоогүй байна.</target>
+ </trans-unit>
+ <trans-unit id="80">
+ <source>This value does not match the expected {{ charset }} charset.</source>
+ <target>Энэ утга тооцоолсон {{ charset }} тэмдэгттэй таарахгүй байна.</target>
+ </trans-unit>
+ <trans-unit id="81">
+ <source>This is not a valid Business Identifier Code (BIC).</source>
+ <target>Энэ утга үнэн зөв Business Identifier Code (BIC) биш байна.</target>
+ </trans-unit>
+ <trans-unit id="82">
+ <source>Error</source>
+ <target>Алдаа</target>
+ </trans-unit>
+ <trans-unit id="83">
+ <source>This is not a valid UUID.</source>
+ <target>Энэ утга үнэн зөв UUID биш байна.</target>
+ </trans-unit>
+ <trans-unit id="84">
+ <source>This value should be a multiple of {{ compared_value }}.</source>
+ <target>Энэ утга {{ compared_value }} -н үржвэр байх ёстой.</target>
+ </trans-unit>
+ <trans-unit id="85">
+ <source>This Business Identifier Code (BIC) is not associated with IBAN {{ iban }}.</source>
+ <target>Энэ Business Identifier Code (BIC) код нь IBAN {{ iban }} -тай холбоогүй байна.</target>
+ </trans-unit>
+ <trans-unit id="86">
+ <source>This value should be valid JSON.</source>
+ <target>Энэ утга JSON байх ёстой.</target>
+ </trans-unit>
+ <trans-unit id="87">
+ <source>This collection should contain only unique elements.</source>
+ <target>Энэ коллекц зөвхөн давтагдахгүй элементүүд агуулах ёстой.</target>
+ </trans-unit>
+ <trans-unit id="88">
+ <source>This value should be positive.</source>
+ <target>Энэ утга эерэг байх ёстой.</target>
+ </trans-unit>
+ <trans-unit id="89">
+ <source>This value should be either positive or zero.</source>
+ <target>Энэ утга тэг эсвэл эерэг байх ёстой.</target>
+ </trans-unit>
+ <trans-unit id="90">
+ <source>This value should be negative.</source>
+ <target>Энэ утга сөрөг байх ёстой.</target>
+ </trans-unit>
+ <trans-unit id="91">
+ <source>This value should be either negative or zero.</source>
+ <target>Энэ утга сөрөг эсвэл тэг байх ёстой.</target>
+ </trans-unit>
+ <trans-unit id="92">
+ <source>This value is not a valid timezone.</source>
+ <target>Энэ утга үнэн зөв цагийн бүс биш байна.</target>
+ </trans-unit>
+ <trans-unit id="93">
+ <source>This password has been leaked in a data breach, it must not be used. Please use another password.</source>
+ <target>Энэ нууц үгийн мэдээлэл алдагдсан байх магадлалтай учраас дахин ашиглагдах ёсгүй. Өөр нууц үг ашиглана уу.</target>
+ </trans-unit>
+ <trans-unit id="94">
+ <source>This value should be between {{ min }} and {{ max }}.</source>
+ <target>Энэ утга {{ min }} -с {{ max }} хооронд байх ёстой.</target>
+ </trans-unit>
</body>
</file>
</xliff>
diff --git a/vendor/symfony/validator/Resources/translations/validators.nn.xlf b/vendor/symfony/validator/Resources/translations/validators.nn.xlf
index e5881330e8..db804d3b68 100644
--- a/vendor/symfony/validator/Resources/translations/validators.nn.xlf
+++ b/vendor/symfony/validator/Resources/translations/validators.nn.xlf
@@ -222,6 +222,166 @@
<source>Unsupported card type or invalid card number.</source>
<target>Korttypen er ikkje støtta, eller kortnummeret er ugyldig.</target>
</trans-unit>
+ <trans-unit id="59">
+ <source>This is not a valid International Bank Account Number (IBAN).</source>
+ <target>Dette er ikkje eit gyldig internasjonalt bankkontonummer (IBAN).</target>
+ </trans-unit>
+ <trans-unit id="60">
+ <source>This value is not a valid ISBN-10.</source>
+ <target>Verdien er ikkje eit gyldig ISBN-10.</target>
+ </trans-unit>
+ <trans-unit id="61">
+ <source>This value is not a valid ISBN-13.</source>
+ <target>Verdien er ikkje eit gyldig ISBN-13.</target>
+ </trans-unit>
+ <trans-unit id="62">
+ <source>This value is neither a valid ISBN-10 nor a valid ISBN-13.</source>
+ <target>Verdien er verken eit gyldig ISBN-10 eller eit gyldig ISBN-13.</target>
+ </trans-unit>
+ <trans-unit id="63">
+ <source>This value is not a valid ISSN.</source>
+ <target>Verdien er ikkje eit gyldig ISSN.</target>
+ </trans-unit>
+ <trans-unit id="64">
+ <source>This value is not a valid currency.</source>
+ <target>Verdien er ikkje ein gyldig valuta.</target>
+ </trans-unit>
+ <trans-unit id="65">
+ <source>This value should be equal to {{ compared_value }}.</source>
+ <target>Verdien bør vera like med {{ compared_value }}.</target>
+ </trans-unit>
+ <trans-unit id="66">
+ <source>This value should be greater than {{ compared_value }}.</source>
+ <target>Verdien bør vera større enn {{ compared_value }}.</target>
+ </trans-unit>
+ <trans-unit id="67">
+ <source>This value should be greater than or equal to {{ compared_value }}.</source>
+ <target>Verdien bør vera større enn eller så med {{ compared_value }}.</target>
+ </trans-unit>
+ <trans-unit id="68">
+ <source>This value should be identical to {{ compared_value_type }} {{ compared_value }}.</source>
+ <target>Verdien bør vera identisk med {{ compared_value_type }} {{ compared_value }}.</target>
+ </trans-unit>
+ <trans-unit id="69">
+ <source>This value should be less than {{ compared_value }}.</source>
+ <target>Verdien bør vera mindre enn {{ compared_value }}.</target>
+ </trans-unit>
+ <trans-unit id="70">
+ <source>This value should be less than or equal to {{ compared_value }}.</source>
+ <target>Verdi bør vera mindre enn eller så med {{ compared_value }}.</target>
+ </trans-unit>
+ <trans-unit id="71">
+ <source>This value should not be equal to {{ compared_value }}.</source>
+ <target>Verdi bør ikkje vera så med {{ compared_value }}.</target>
+ </trans-unit>
+ <trans-unit id="72">
+ <source>This value should not be identical to {{ compared_value_type }} {{ compared_value }}.</source>
+ <target>Dette verdi bør ikkje vera identisk med {{ compared_value_type }} {{ compared_value }}.</target>
+ </trans-unit>
+ <trans-unit id="73">
+ <source>The image ratio is too big ({{ ratio }}). Allowed maximum ratio is {{ max_ratio }}.</source>
+ <target>Bildetilhøvet er for stort ({{ ratio }}). Det tillatne maksimale tilhøvet er {{ max_ratio }}.</target>
+ </trans-unit>
+ <trans-unit id="74">
+ <source>The image ratio is too small ({{ ratio }}). Minimum ratio expected is {{ min_ratio }}.</source>
+ <target>Bildetilhøvet er for lite ({{ ratio }}). Forventa minimikvot er {{ min_ratio }}.</target>
+ </trans-unit>
+ <trans-unit id="75">
+ <source>The image is square ({{ width }}x{{ height }}px). Square images are not allowed.</source>
+ <target>Bildet er firkanta ({{ width }}x{{ height }}px). Fyrkantiga bilde er ikkje tillatne.</target>
+ </trans-unit>
+ <trans-unit id="76">
+ <source>The image is landscape oriented ({{ width }}x{{ height }}px). Landscape oriented images are not allowed.</source>
+ <target>Bildet er liggande orientert ({{ width }}x{{ height }}px). Landskapsorienterade bilde er ikkje tillatne.</target>
+ </trans-unit>
+ <trans-unit id="77">
+ <source>The image is portrait oriented ({{ width }}x{{ height }}px). Portrait oriented images are not allowed.</source>
+ <target>Bildet er porträttorienterad ({{ width }}x{{ height }}px). Porträttorienterade bilde er ikkje tillatne.</target>
+ </trans-unit>
+ <trans-unit id="78">
+ <source>An empty file is not allowed.</source>
+ <target>Ein tom fil er ikkje tillaten.</target>
+ </trans-unit>
+ <trans-unit id="79">
+ <source>The host could not be resolved.</source>
+ <target>Verdiar kunne ikkje løysast.</target>
+ </trans-unit>
+ <trans-unit id="80">
+ <source>This value does not match the expected {{ charset }} charset.</source>
+ <target>Verdi stemmer ikkje med forventa {{ charset }} charset.</target>
+ </trans-unit>
+ <trans-unit id="81">
+ <source>This is not a valid Business Identifier Code (BIC).</source>
+ <target>Dette er ikkje ein gyldig Business Identifier Code (BIC).</target>
+ </trans-unit>
+ <trans-unit id="82">
+ <source>Error</source>
+ <target>Feil</target>
+ </trans-unit>
+ <trans-unit id="83">
+ <source>This is not a valid UUID.</source>
+ <target>Dette er ikkje ein gyldig UUID.</target>
+ </trans-unit>
+ <trans-unit id="84">
+ <source>This value should be a multiple of {{ compared_value }}.</source>
+ <target>Verdi bør vera eit multipel av {{ compared_value }}.</target>
+ </trans-unit>
+ <trans-unit id="85">
+ <source>This Business Identifier Code (BIC) is not associated with IBAN {{ iban }}.</source>
+ <target>Denne Business Identifier Code (BIC) er ikkje kopla til IBAN {{ iban }}.</target>
+ </trans-unit>
+ <trans-unit id="86">
+ <source>This value should be valid JSON.</source>
+ <target>Verdi bør vera gyldig JSON.</target>
+ </trans-unit>
+ <trans-unit id="87">
+ <source>This collection should contain only unique elements.</source>
+ <target>Denne samlinga bør berre innehalda unike element.</target>
+ </trans-unit>
+ <trans-unit id="88">
+ <source>This value should be positive.</source>
+ <target>Verdi bør vera positivt.</target>
+ </trans-unit>
+ <trans-unit id="89">
+ <source>This value should be either positive or zero.</source>
+ <target>Verdi bør vera enten positivt eller noll.</target>
+ </trans-unit>
+ <trans-unit id="90">
+ <source>This value should be negative.</source>
+ <target>Verdi bør vera negativt.</target>
+ </trans-unit>
+ <trans-unit id="91">
+ <source>This value should be either negative or zero.</source>
+ <target>Verdi bør vera negativt eller noll.</target>
+ </trans-unit>
+ <trans-unit id="92">
+ <source>This value is not a valid timezone.</source>
+ <target>Verdi er ikkje ei gyldig tidssone.</target>
+ </trans-unit>
+ <trans-unit id="93">
+ <source>This password has been leaked in a data breach, it must not be used. Please use another password.</source>
+ <target>Det her passordet har lekt ut ved eit datainnbrot, det får ikkje nyttast. Nytt eit anna passord.</target>
+ </trans-unit>
+ <trans-unit id="94">
+ <source>This value should be between {{ min }} and {{ max }}.</source>
+ <target>Dette verdi bør ligga mellom {{ min }} og {{ max }}.</target>
+ </trans-unit>
+ <trans-unit id="95">
+ <source>This value is not a valid hostname.</source>
+ <target>Verdien er ikkje eit gyldig vertsnamn.</target>
+ </trans-unit>
+ <trans-unit id="96">
+ <source>The number of elements in this collection should be a multiple of {{ compared_value }}.</source>
+ <target>Talet på element i denne samlinga bør vera eit multipel av {{ compared_value }}.</target>
+ </trans-unit>
+ <trans-unit id="97">
+ <source>This value should satisfy at least one of the following constraints:</source>
+ <target>Verdien burde oppfylla minst ein av følgjande begränsningar:</target>
+ </trans-unit>
+ <trans-unit id="98">
+ <source>Each element of this collection should satisfy its own set of constraints.</source>
+ <target>Kvart element i denne samlinga bør oppfylla sine eigne begränsningar.</target>
+ </trans-unit>
</body>
</file>
</xliff>
diff --git a/vendor/symfony/validator/Resources/translations/validators.pl.xlf b/vendor/symfony/validator/Resources/translations/validators.pl.xlf
index f1910c99d5..afd3f73263 100644
--- a/vendor/symfony/validator/Resources/translations/validators.pl.xlf
+++ b/vendor/symfony/validator/Resources/translations/validators.pl.xlf
@@ -192,7 +192,7 @@
</trans-unit>
<trans-unit id="51">
<source>No temporary folder was configured in php.ini.</source>
- <target>Nie skonfigurowano folderu tymczasowego w php.ini, lub skonfigurowany folder nie istnieje.</target>
+ <target>Nie skonfigurowano folderu tymczasowego w php.ini lub skonfigurowany folder nie istnieje.</target>
</trans-unit>
<trans-unit id="52">
<source>Cannot write temporary file to disk.</source>
@@ -330,10 +330,58 @@
<source>This Business Identifier Code (BIC) is not associated with IBAN {{ iban }}.</source>
<target>Ten kod BIC (Business Identifier Code) nie jest powiązany z międzynarodowym numerem rachunku bankowego (IBAN) {{ iban }}.</target>
</trans-unit>
+ <trans-unit id="86">
+ <source>This value should be valid JSON.</source>
+ <target>Ta wartość powinna być prawidłowym formatem JSON.</target>
+ </trans-unit>
+ <trans-unit id="87">
+ <source>This collection should contain only unique elements.</source>
+ <target>Ten zbiór powinien zawierać tylko unikalne elementy.</target>
+ </trans-unit>
+ <trans-unit id="88">
+ <source>This value should be positive.</source>
+ <target>Ta wartość powinna być dodatnia.</target>
+ </trans-unit>
+ <trans-unit id="89">
+ <source>This value should be either positive or zero.</source>
+ <target>Ta wartość powinna być dodatnia lub równa zero.</target>
+ </trans-unit>
+ <trans-unit id="90">
+ <source>This value should be negative.</source>
+ <target>Ta wartość powinna być ujemna.</target>
+ </trans-unit>
+ <trans-unit id="91">
+ <source>This value should be either negative or zero.</source>
+ <target>Ta wartość powinna być ujemna lub równa zero.</target>
+ </trans-unit>
+ <trans-unit id="92">
+ <source>This value is not a valid timezone.</source>
+ <target>Ta wartość nie jest prawidłową strefą czasową.</target>
+ </trans-unit>
+ <trans-unit id="93">
+ <source>This password has been leaked in a data breach, it must not be used. Please use another password.</source>
+ <target>To hasło wyciekło w wyniku naruszenia danych i nie może być użyte. Proszę użyć innego hasła.</target>
+ </trans-unit>
<trans-unit id="94">
<source>This value should be between {{ min }} and {{ max }}.</source>
<target>Ta wartość powinna być pomiędzy {{ min }} a {{ max }}.</target>
</trans-unit>
+ <trans-unit id="95">
+ <source>This value is not a valid hostname.</source>
+ <target>Ta wartość nie jest prawidłową nazwą hosta.</target>
+ </trans-unit>
+ <trans-unit id="96">
+ <source>The number of elements in this collection should be a multiple of {{ compared_value }}.</source>
+ <target>Liczba elementów w tym zbiorze powinna być wielokrotnością {{ compared_value }}.</target>
+ </trans-unit>
+ <trans-unit id="97">
+ <source>This value should satisfy at least one of the following constraints:</source>
+ <target>Ta wartość powinna spełniać co najmniej jedną z następujących reguł:</target>
+ </trans-unit>
+ <trans-unit id="98">
+ <source>Each element of this collection should satisfy its own set of constraints.</source>
+ <target>Każdy element w tym zbiorze powinien spełniać własny zestaw reguł.</target>
+ </trans-unit>
</body>
</file>
</xliff>
diff --git a/vendor/symfony/validator/Resources/translations/validators.ru.xlf b/vendor/symfony/validator/Resources/translations/validators.ru.xlf
index 361be20f79..3c03fd8525 100644
--- a/vendor/symfony/validator/Resources/translations/validators.ru.xlf
+++ b/vendor/symfony/validator/Resources/translations/validators.ru.xlf
@@ -366,6 +366,22 @@
<source>This value should be between {{ min }} and {{ max }}.</source>
<target>Значение должно быть между {{ min }} и {{ max }}.</target>
</trans-unit>
+ <trans-unit id="95">
+ <source>This value is not a valid hostname.</source>
+ <target>Значение не является корректным именем хоста.</target>
+ </trans-unit>
+ <trans-unit id="96">
+ <source>The number of elements in this collection should be a multiple of {{ compared_value }}.</source>
+ <target>Количество элементов в этой коллекции должно быть кратным {{ compared_value }}.</target>
+ </trans-unit>
+ <trans-unit id="97">
+ <source>This value should satisfy at least one of the following constraints:</source>
+ <target>Значение должно удовлетворять как минимум одному из следующих ограничений:</target>
+ </trans-unit>
+ <trans-unit id="98">
+ <source>Each element of this collection should satisfy its own set of constraints.</source>
+ <target>Каждый элемент этой коллекции должен удовлетворять своему собственному набору ограничений.</target>
+ </trans-unit>
</body>
</file>
</xliff>
diff --git a/vendor/symfony/validator/Resources/translations/validators.sl.xlf b/vendor/symfony/validator/Resources/translations/validators.sl.xlf
index 6f5fd98ca1..cb12a8a9da 100644
--- a/vendor/symfony/validator/Resources/translations/validators.sl.xlf
+++ b/vendor/symfony/validator/Resources/translations/validators.sl.xlf
@@ -318,6 +318,54 @@
<source>Error</source>
<target>Napaka</target>
</trans-unit>
+ <trans-unit id="83">
+ <source>This is not a valid UUID.</source>
+ <target>To ni veljaven UUID.</target>
+ </trans-unit>
+ <trans-unit id="84">
+ <source>This value should be a multiple of {{ compared_value }}.</source>
+ <target>Ta vrednost bi morala biti večkratnik od {{ compared_value }}.</target>
+ </trans-unit>
+ <trans-unit id="85">
+ <source>This Business Identifier Code (BIC) is not associated with IBAN {{ iban }}.</source>
+ <target>Ta poslovna identifikacijska koda (BIC) ni povezana z IBAN {{ iban }}.</target>
+ </trans-unit>
+ <trans-unit id="86">
+ <source>This value should be valid JSON.</source>
+ <target>Ta vrednost bi morala biti veljaven JSON.</target>
+ </trans-unit>
+ <trans-unit id="87">
+ <source>This collection should contain only unique elements.</source>
+ <target>Ta zbirka bi morala vsebovati samo edinstvene elemente.</target>
+ </trans-unit>
+ <trans-unit id="88">
+ <source>This value should be positive.</source>
+ <target>Ta vrednost bi morala biti pozitivna.</target>
+ </trans-unit>
+ <trans-unit id="89">
+ <source>This value should be either positive or zero.</source>
+ <target>Ta vrednost bi morala biti pozitivna ali enaka nič.</target>
+ </trans-unit>
+ <trans-unit id="90">
+ <source>This value should be negative.</source>
+ <target>Ta vrednost bi morala biti negativna.</target>
+ </trans-unit>
+ <trans-unit id="91">
+ <source>This value should be either negative or zero.</source>
+ <target>Ta vrednost bi morala biti negativna ali enaka nič.</target>
+ </trans-unit>
+ <trans-unit id="92">
+ <source>This value is not a valid timezone.</source>
+ <target>Ta vrednost ni veljaven časovni pas.</target>
+ </trans-unit>
+ <trans-unit id="93">
+ <source>This password has been leaked in a data breach, it must not be used. Please use another password.</source>
+ <target>To geslo je ušlo pri kršitvi varnosti podatkov in ga ne smete uporabljati. Prosimo, uporabite drugo geslo.</target>
+ </trans-unit>
+ <trans-unit id="94">
+ <source>This value should be between {{ min }} and {{ max }}.</source>
+ <target>Ta vrednost bi morala biti med {{ min }} in {{ max }}.</target>
+ </trans-unit>
</body>
</file>
</xliff>
diff --git a/vendor/symfony/validator/Resources/translations/validators.sr_Latn.xlf b/vendor/symfony/validator/Resources/translations/validators.sr_Latn.xlf
index 018dd1233a..43d2070ab7 100644
--- a/vendor/symfony/validator/Resources/translations/validators.sr_Latn.xlf
+++ b/vendor/symfony/validator/Resources/translations/validators.sr_Latn.xlf
@@ -24,11 +24,11 @@
</trans-unit>
<trans-unit id="6">
<source>You must select at least {{ limit }} choice.|You must select at least {{ limit }} choices.</source>
- <target>Morate odabrati bar {{ limit }} mogućnost.|Morate odabrati bar {{ limit }} mogućnosti.</target>
+ <target>Morate odabrati bar {{ limit }} mogućnost.|Morate odabrati bar {{ limit }} mogućnosti.|Morate odabrati bar {{ limit }} mogućnosti.</target>
</trans-unit>
<trans-unit id="7">
<source>You must select at most {{ limit }} choice.|You must select at most {{ limit }} choices.</source>
- <target>Morate odabrati najviše {{ limit }} mogućnost.|Morate odabrati najviše {{ limit }} mogućnosti.</target>
+ <target>Morate odabrati najviše {{ limit }} mogućnost.|Morate odabrati najviše {{ limit }} mogućnosti.|Morate odabrati najviše {{ limit }} mogućnosti.</target>
</trans-unit>
<trans-unit id="8">
<source>One or more of the given values is invalid.</source>
@@ -76,7 +76,7 @@
</trans-unit>
<trans-unit id="19">
<source>This value is too long. It should have {{ limit }} character or less.|This value is too long. It should have {{ limit }} characters or less.</source>
- <target>Vrednost je predugačka. Trebalo bi da ima {{ limit }} karakter ili manje.|Vrednost je predugačka. Trebalo bi da ima {{ limit }} karaktera ili manje.</target>
+ <target>Vrednost je predugačka. Trebalo bi da ima {{ limit }} karakter ili manje.|Vrednost je predugačka. Trebalo bi da ima {{ limit }} karaktera ili manje.|Vrednost je predugačka. Trebalo bi da ima {{ limit }} karaktera ili manje.</target>
</trans-unit>
<trans-unit id="20">
<source>This value should be {{ limit }} or more.</source>
@@ -84,7 +84,7 @@
</trans-unit>
<trans-unit id="21">
<source>This value is too short. It should have {{ limit }} character or more.|This value is too short. It should have {{ limit }} characters or more.</source>
- <target>Vrednost je prekratka. Trebalo bi da ima {{ limit }} karakter ili više.|Vrednost je prekratka. Trebalo bi da ima {{ limit }} karaktera ili više.</target>
+ <target>Vrednost je prekratka. Trebalo bi da ima {{ limit }} karakter ili više.|Vrednost je prekratka. Trebalo bi da ima {{ limit }} karaktera ili više.|Vrednost je prekratka. Trebalo bi da ima {{ limit }} karaktera ili više.</target>
</trans-unit>
<trans-unit id="22">
<source>This value should not be blank.</source>
@@ -180,7 +180,7 @@
</trans-unit>
<trans-unit id="48">
<source>This value should have exactly {{ limit }} character.|This value should have exactly {{ limit }} characters.</source>
- <target>Vrednost bi trebalo da ima tačno {{ limit }} karakter.|Vrednost bi trebalo da ima tačno {{ limit }} karaktera.</target>
+ <target>Vrednost bi trebalo da ima tačno {{ limit }} karakter.|Vrednost bi trebalo da ima tačno {{ limit }} karaktera.|Vrednost bi trebalo da ima tačno {{ limit }} karaktera.</target>
</trans-unit>
<trans-unit id="49">
<source>The file was only partially uploaded.</source>
@@ -204,15 +204,15 @@
</trans-unit>
<trans-unit id="54">
<source>This collection should contain {{ limit }} element or more.|This collection should contain {{ limit }} elements or more.</source>
- <target>Ova kolekcija bi trebalo da sadrži {{ limit }} ili više elemenata.|Ova kolekcija bi trebalo da sadrži {{ limit }} ili više elemenata.</target>
+ <target>Ova kolekcija bi trebalo da sadrži {{ limit }} ili više elemenata.|Ova kolekcija bi trebalo da sadrži {{ limit }} ili više elemenata.|Ova kolekcija bi trebalo da sadrži {{ limit }} ili više elemenata.</target>
</trans-unit>
<trans-unit id="55">
<source>This collection should contain {{ limit }} element or less.|This collection should contain {{ limit }} elements or less.</source>
- <target>Ova kolekcija bi trebalo da sadrži {{ limit }} ili manje elemenata.|Ova kolekcija bi trebalo da sadrži {{ limit }} ili manje elemenata.</target>
+ <target>Ova kolekcija bi trebalo da sadrži {{ limit }} ili manje elemenata.|Ova kolekcija bi trebalo da sadrži {{ limit }} ili manje elemenata.|Ova kolekcija bi trebalo da sadrži {{ limit }} ili manje elemenata.</target>
</trans-unit>
<trans-unit id="56">
<source>This collection should contain exactly {{ limit }} element.|This collection should contain exactly {{ limit }} elements.</source>
- <target>Ova kolekcija bi trebalo da sadrži tačno {{ limit }} element.|Ova kolekcija bi trebalo da sadrži tačno {{ limit }} elemenata.</target>
+ <target>Ova kolekcija bi trebalo da sadrži tačno {{ limit }} element.|Ova kolekcija bi trebalo da sadrži tačno {{ limit }} elementa.|Ova kolekcija bi trebalo da sadrži tačno {{ limit }} elemenata.</target>
</trans-unit>
<trans-unit id="57">
<source>Invalid card number.</source>
@@ -352,7 +352,7 @@
</trans-unit>
<trans-unit id="91">
<source>This value should be either negative or zero.</source>
- <target>Ova vrednost bi trebala biti pozitivna ili nula.</target>
+ <target>Ova vrednost bi trebala biti negativna ili nula.</target>
</trans-unit>
<trans-unit id="92">
<source>This value is not a valid timezone.</source>
diff --git a/vendor/symfony/validator/Resources/translations/validators.uk.xlf b/vendor/symfony/validator/Resources/translations/validators.uk.xlf
index cba6191554..688e11fbe9 100644
--- a/vendor/symfony/validator/Resources/translations/validators.uk.xlf
+++ b/vendor/symfony/validator/Resources/translations/validators.uk.xlf
@@ -366,6 +366,22 @@
<source>This value should be between {{ min }} and {{ max }}.</source>
<target>Значення має бути між {{ min }} та {{ max }}.</target>
</trans-unit>
+ <trans-unit id="95">
+ <source>This value is not a valid hostname.</source>
+ <target>Значення не є дійсним іменем хоста.</target>
+ </trans-unit>
+ <trans-unit id="96">
+ <source>The number of elements in this collection should be a multiple of {{ compared_value }}.</source>
+ <target>Кількість елементів у цій колекції повинна бути кратною {{ compared_value }}.</target>
+ </trans-unit>
+ <trans-unit id="97">
+ <source>This value should satisfy at least one of the following constraints:</source>
+ <target>Значення повинно задовольняти хоча б одному з наступних обмежень:</target>
+ </trans-unit>
+ <trans-unit id="98">
+ <source>Each element of this collection should satisfy its own set of constraints.</source>
+ <target>Кожен елемент цієї колекції повинен задовольняти власному набору обмежень.</target>
+ </trans-unit>
</body>
</file>
</xliff>
diff --git a/vendor/symfony/validator/Resources/translations/validators.vi.xlf b/vendor/symfony/validator/Resources/translations/validators.vi.xlf
index 95dd7d6665..f4286d25ef 100644
--- a/vendor/symfony/validator/Resources/translations/validators.vi.xlf
+++ b/vendor/symfony/validator/Resources/translations/validators.vi.xlf
@@ -362,6 +362,26 @@
<source>This password has been leaked in a data breach, it must not be used. Please use another password.</source>
<target>Mật khẩu này đã bị rò rỉ dữ liệu, không được sử dụng nữa. Xin vui lòng sử dụng mật khẩu khác.</target>
</trans-unit>
+ <trans-unit id="94">
+ <source>This value should be between {{ min }} and {{ max }}.</source>
+ <target>Giá trị này nên thuộc giữa {{ min }} và {{ max }}.</target>
+ </trans-unit>
+ <trans-unit id="95">
+ <source>This value is not a valid hostname.</source>
+ <target>Giá trị này không phải là tên máy chủ hợp lệ.</target>
+ </trans-unit>
+ <trans-unit id="96">
+ <source>The number of elements in this collection should be a multiple of {{ compared_value }}.</source>
+ <target>Số lượng các phần tử trong bộ sưu tập này nên là bội số của {{ compared_value }}.</target>
+ </trans-unit>
+ <trans-unit id="97">
+ <source>This value should satisfy at least one of the following constraints:</source>
+ <target>Giá trị này nên thỏa mãn ít nhất một trong những ràng buộc sau:</target>
+ </trans-unit>
+ <trans-unit id="98">
+ <source>Each element of this collection should satisfy its own set of constraints.</source>
+ <target>Mỗi phần tử trong bộ sưu tập này nên thỏa mãn những ràng buộc của nó.</target>
+ </trans-unit>
</body>
</file>
</xliff>
diff --git a/vendor/symfony/validator/Resources/translations/validators.zh_TW.xlf b/vendor/symfony/validator/Resources/translations/validators.zh_TW.xlf
index d9d5f2f622..7cef875f58 100644
--- a/vendor/symfony/validator/Resources/translations/validators.zh_TW.xlf
+++ b/vendor/symfony/validator/Resources/translations/validators.zh_TW.xlf
@@ -278,6 +278,94 @@
<source>This value should not be identical to {{ compared_value_type }} {{ compared_value }}.</source>
<target>該值不應與 {{ compared_value_type }} {{ compared_value }} 相同。</target>
</trans-unit>
+ <trans-unit id="73">
+ <source>The image ratio is too big ({{ ratio }}). Allowed maximum ratio is {{ max_ratio }}.</source>
+ <target>圖像格式過大 ({{ ratio }})。 最大允許尺寸 {{ max_ratio }}。</target>
+ </trans-unit>
+ <trans-unit id="74">
+ <source>The image ratio is too small ({{ ratio }}). Minimum ratio expected is {{ min_ratio }}.</source>
+ <target>圖像格式過小 ({{ ratio }})。最小尺寸 {{ min_ratio }}。</target>
+ </trans-unit>
+ <trans-unit id="75">
+ <source>The image is square ({{ width }}x{{ height }}px). Square images are not allowed.</source>
+ <target>方形圖像 ({{ width }}x{{ height }}px)。不接受方形圖像。</target>
+ </trans-unit>
+ <trans-unit id="76">
+ <source>The image is landscape oriented ({{ width }}x{{ height }}px). Landscape oriented images are not allowed.</source>
+ <target>紀念冊布局圖像 ({{ width }}x{{ height }}px)。 不接受紀念冊布局圖像。</target>
+ </trans-unit>
+ <trans-unit id="77">
+ <source>The image is portrait oriented ({{ width }}x{{ height }}px). Portrait oriented images are not allowed.</source>
+ <target>書籍布局圖像 ({{ width }}x{{ height }}px)。不接受圖像書籍布局。</target>
+ </trans-unit>
+ <trans-unit id="78">
+ <source>An empty file is not allowed.</source>
+ <target>不接受空白文件。</target>
+ </trans-unit>
+ <trans-unit id="79">
+ <source>The host could not be resolved.</source>
+ <target>未找到服務器。</target>
+ </trans-unit>
+ <trans-unit id="80">
+ <source>This value does not match the expected {{ charset }} charset.</source>
+ <target>該數值不符合預期 {{ charset }} 符號編碼。</target>
+ </trans-unit>
+ <trans-unit id="81">
+ <source>This is not a valid Business Identifier Code (BIC).</source>
+ <target>無效企業識別碼 (BIC)。</target>
+ </trans-unit>
+ <trans-unit id="82">
+ <source>Error.</source>
+ <target>錯誤。</target>
+ </trans-unit>
+ <trans-unit id="83">
+ <source>This is not a valid UUID.</source>
+ <target>無效的通用唯壹標識符 (UUID)。</target>
+ </trans-unit>
+ <trans-unit id="84">
+ <source>This value should be a multiple of {{ compared_value }}.</source>
+ <target>該值必須是倍數 {{ compared_value }}。</target>
+ </trans-unit>
+ <trans-unit id="85">
+ <source>This Business Identifier Code (BIC) is not associated with IBAN {{ iban }}.</source>
+ <target>該企業識別碼 (BIC) 與銀行賬戶國際編號不壹致 (IBAN) {{ iban }}。</target>
+ </trans-unit>
+ <trans-unit id="86">
+ <source>This value should be valid JSON.</source>
+ <target>該數值必須序列化為JSON格式。</target>
+ </trans-unit>
+ <trans-unit id="87">
+ <source>This collection should contain only unique elements.</source>
+ <target>該集合應僅包含唯壹元素。</target>
+ </trans-unit>
+ <trans-unit id="88">
+ <source>This value should be positive.</source>
+ <target>數值應為正數。</target>
+ </trans-unit>
+ <trans-unit id="89">
+ <source>This value should be either positive or zero.</source>
+ <target>數值應或未正數，或為零。</target>
+ </trans-unit>
+ <trans-unit id="90">
+ <source>This value should be negative.</source>
+ <target>數值應為負數。</target>
+ </trans-unit>
+ <trans-unit id="91">
+ <source>This value should be either negative or zero.</source>
+ <target>數值應或未負數，或為零。</target>
+ </trans-unit>
+ <trans-unit id="92">
+ <source>This value is not a valid timezone.</source>
+ <target>無效時區。</target>
+ </trans-unit>
+ <trans-unit id="93">
+ <source>This password has been leaked in a data breach, it must not be used. Please use another password.</source>
+ <target>依據您的密碼，發生數據泄露，請勿使用改密碼。請更換密碼。</target>
+ </trans-unit>
+ <trans-unit id="94">
+ <source>This value should be between {{ min }} and {{ max }}.</source>
+ <target>該數值應在 {{ min }} 和 {{ max }} 之間。</target>
+ </trans-unit>
</body>
</file>
</xliff>
diff --git a/vendor/symfony/validator/Test/ConstraintValidatorTestCase.php b/vendor/symfony/validator/Test/ConstraintValidatorTestCase.php
index 18705b7987..ed57d396ae 100644
--- a/vendor/symfony/validator/Test/ConstraintValidatorTestCase.php
+++ b/vendor/symfony/validator/Test/ConstraintValidatorTestCase.php
@@ -177,7 +177,8 @@ protected function expectValidateAt($i, $propertyPath, $value, $group)
->willReturn($validator);
$validator->expects($this->at(2 * $i + 1))
->method('validate')
- ->with($value, $this->logicalOr(null, [], $this->isInstanceOf('\Symfony\Component\Validator\Constraints\Valid')), $group);
+ ->with($value, $this->logicalOr(null, [], $this->isInstanceOf('\Symfony\Component\Validator\Constraints\Valid')), $group)
+ ->willReturn($validator);
}
protected function expectValidateValueAt($i, $propertyPath, $value, $constraints, $group = null)
@@ -189,7 +190,8 @@ protected function expectValidateValueAt($i, $propertyPath, $value, $constraints
->willReturn($contextualValidator);
$contextualValidator->expects($this->at(2 * $i + 1))
->method('validate')
- ->with($value, $constraints, $group);
+ ->with($value, $constraints, $group)
+ ->willReturn($contextualValidator);
}
protected function assertNoViolation()
diff --git a/vendor/symfony/validator/Tests/ConstraintValidatorTest.php b/vendor/symfony/validator/Tests/ConstraintValidatorTest.php
index 96af6f13eb..6ca3eab41f 100644
--- a/vendor/symfony/validator/Tests/ConstraintValidatorTest.php
+++ b/vendor/symfony/validator/Tests/ConstraintValidatorTest.php
@@ -27,6 +27,9 @@ public function testFormatValue($expected, $value, $format = 0)
public function formatValueProvider()
{
+ $defaultTimezone = date_default_timezone_get();
+ date_default_timezone_set('Europe/Moscow'); // GMT+3
+
$data = [
['true', true],
['false', false],
@@ -36,10 +39,15 @@ public function formatValueProvider()
['array', []],
['object', $toString = new TestToStringObject()],
['ccc', $toString, ConstraintValidator::OBJECT_TO_STRING],
- ['object', $dateTime = (new \DateTimeImmutable('@0'))->setTimezone(new \DateTimeZone('UTC'))],
- [class_exists(\IntlDateFormatter::class) ? 'Jan 1, 1970, 12:00 AM' : '1970-01-01 00:00:00', $dateTime, ConstraintValidator::PRETTY_DATE],
+ ['object', $dateTime = new \DateTimeImmutable('1971-02-02T08:00:00UTC')],
+ [class_exists(\IntlDateFormatter::class) ? 'Oct 4, 2019, 11:02 AM' : '2019-10-04 11:02:03', new \DateTimeImmutable('2019-10-04T11:02:03+09:00'), ConstraintValidator::PRETTY_DATE],
+ [class_exists(\IntlDateFormatter::class) ? 'Feb 2, 1971, 8:00 AM' : '1971-02-02 08:00:00', $dateTime, ConstraintValidator::PRETTY_DATE],
+ [class_exists(\IntlDateFormatter::class) ? 'Jan 1, 1970, 6:00 AM' : '1970-01-01 06:00:00', new \DateTimeImmutable('1970-01-01T06:00:00Z'), ConstraintValidator::PRETTY_DATE],
+ [class_exists(\IntlDateFormatter::class) ? 'Jan 1, 1970, 3:00 PM' : '1970-01-01 15:00:00', (new \DateTimeImmutable('1970-01-01T23:00:00'))->setTimezone(new \DateTimeZone('America/New_York')), ConstraintValidator::PRETTY_DATE],
];
+ date_default_timezone_set($defaultTimezone);
+
return $data;
}
}
diff --git a/vendor/symfony/validator/Tests/Constraints/AbstractComparisonValidatorTestCase.php b/vendor/symfony/validator/Tests/Constraints/AbstractComparisonValidatorTestCase.php
index b02e57cfa2..3e8a9dcd7b 100644
--- a/vendor/symfony/validator/Tests/Constraints/AbstractComparisonValidatorTestCase.php
+++ b/vendor/symfony/validator/Tests/Constraints/AbstractComparisonValidatorTestCase.php
@@ -53,10 +53,7 @@ protected static function addPhp5Dot5Comparisons(array $comparisons)
foreach ($comparison as $i => $value) {
if ($value instanceof \DateTime) {
- $comparison[$i] = new \DateTimeImmutable(
- $value->format('Y-m-d H:i:s.u e'),
- $value->getTimezone()
- );
+ $comparison[$i] = new \DateTimeImmutable($value->format('Y-m-d H:i:s.u e'));
$add = true;
} elseif ('DateTime' === $value) {
$comparison[$i] = 'DateTimeImmutable';
@@ -237,6 +234,31 @@ public function throwsOnInvalidStringDatesProvider()
];
}
+ /**
+ * @dataProvider provideComparisonsToNullValueAtPropertyPath
+ */
+ public function testCompareWithNullValueAtPropertyAt($dirtyValue, $dirtyValueAsString, $isValid)
+ {
+ $constraint = $this->createConstraint(['propertyPath' => 'value']);
+ $constraint->message = 'Constraint Message';
+
+ $object = new ComparisonTest_Class(null);
+ $this->setObject($object);
+
+ $this->validator->validate($dirtyValue, $constraint);
+
+ if ($isValid) {
+ $this->assertNoViolation();
+ } else {
+ $this->buildViolation('Constraint Message')
+ ->setParameter('{{ value }}', $dirtyValueAsString)
+ ->setParameter('{{ compared_value }}', 'null')
+ ->setParameter('{{ compared_value_type }}', 'NULL')
+ ->setCode($this->getErrorCode())
+ ->assertRaised();
+ }
+ }
+
/**
* @return array
*/
@@ -258,6 +280,8 @@ public function provideAllInvalidComparisons()
*/
abstract public function provideInvalidComparisons();
+ abstract public function provideComparisonsToNullValueAtPropertyPath();
+
/**
* @param array|null $options Options for the constraint
*
diff --git a/vendor/symfony/validator/Tests/Constraints/CollectionTest.php b/vendor/symfony/validator/Tests/Constraints/CollectionTest.php
index fef129cfa7..254154dae7 100644
--- a/vendor/symfony/validator/Tests/Constraints/CollectionTest.php
+++ b/vendor/symfony/validator/Tests/Constraints/CollectionTest.php
@@ -100,4 +100,16 @@ public function testAcceptRequiredConstraintAsOneElementArray()
$this->assertEquals($collection1, $collection2);
}
+
+ public function testConstraintHasDefaultGroupWithOptionalValues()
+ {
+ $constraint = new Collection([
+ 'foo' => new Required(),
+ 'bar' => new Optional(),
+ ]);
+
+ $this->assertEquals(['Default'], $constraint->groups);
+ $this->assertEquals(['Default'], $constraint->fields['foo']->groups);
+ $this->assertEquals(['Default'], $constraint->fields['bar']->groups);
+ }
}
diff --git a/vendor/symfony/validator/Tests/Constraints/CollectionValidatorTest.php b/vendor/symfony/validator/Tests/Constraints/CollectionValidatorTest.php
index e0ccdba754..11913eb230 100644
--- a/vendor/symfony/validator/Tests/Constraints/CollectionValidatorTest.php
+++ b/vendor/symfony/validator/Tests/Constraints/CollectionValidatorTest.php
@@ -143,6 +143,29 @@ public function testExtraFieldsDisallowed()
->assertRaised();
}
+ public function testExtraFieldsDisallowedWithOptionalValues()
+ {
+ $constraint = new Optional();
+
+ $data = $this->prepareTestData([
+ 'baz' => 6,
+ ]);
+
+ $this->validator->validate($data, new Collection([
+ 'fields' => [
+ 'foo' => $constraint,
+ ],
+ 'extraFieldsMessage' => 'myMessage',
+ ]));
+
+ $this->buildViolation('myMessage')
+ ->setParameter('{{ field }}', '"baz"')
+ ->atPath('property.path[baz]')
+ ->setInvalidValue(6)
+ ->setCode(Collection::NO_SUCH_FIELD_ERROR)
+ ->assertRaised();
+ }
+
// bug fix
public function testNullNotConsideredExtraField()
{
diff --git a/vendor/symfony/validator/Tests/Constraints/CompositeTest.php b/vendor/symfony/validator/Tests/Constraints/CompositeTest.php
index 2d42807821..287fd6d668 100644
--- a/vendor/symfony/validator/Tests/Constraints/CompositeTest.php
+++ b/vendor/symfony/validator/Tests/Constraints/CompositeTest.php
@@ -19,7 +19,7 @@
class ConcreteComposite extends Composite
{
- public $constraints;
+ public $constraints = [];
protected function getCompositeOption()
{
@@ -37,6 +37,30 @@ public function getDefaultOption()
*/
class CompositeTest extends TestCase
{
+ public function testConstraintHasDefaultGroup()
+ {
+ $constraint = new ConcreteComposite([
+ new NotNull(),
+ new NotBlank(),
+ ]);
+
+ $this->assertEquals(['Default'], $constraint->groups);
+ $this->assertEquals(['Default'], $constraint->constraints[0]->groups);
+ $this->assertEquals(['Default'], $constraint->constraints[1]->groups);
+ }
+
+ public function testNestedCompositeConstraintHasDefaultGroup()
+ {
+ $constraint = new ConcreteComposite([
+ new ConcreteComposite(),
+ new ConcreteComposite(),
+ ]);
+
+ $this->assertEquals(['Default'], $constraint->groups);
+ $this->assertEquals(['Default'], $constraint->constraints[0]->groups);
+ $this->assertEquals(['Default'], $constraint->constraints[1]->groups);
+ }
+
public function testMergeNestedGroupsIfNoExplicitParentGroup()
{
$constraint = new ConcreteComposite([
diff --git a/vendor/symfony/validator/Tests/Constraints/EmailValidatorTest.php b/vendor/symfony/validator/Tests/Constraints/EmailValidatorTest.php
index 344139a44f..9299c7efad 100644
--- a/vendor/symfony/validator/Tests/Constraints/EmailValidatorTest.php
+++ b/vendor/symfony/validator/Tests/Constraints/EmailValidatorTest.php
@@ -40,6 +40,13 @@ public function testEmptyStringIsValid()
$this->assertNoViolation();
}
+ public function testObjectEmptyStringIsValid()
+ {
+ $this->validator->validate(new EmptyEmailObject(), new Email());
+
+ $this->assertNoViolation();
+ }
+
public function testExpectsStringCompatibleType()
{
$this->expectException('Symfony\Component\Validator\Exception\UnexpectedTypeException');
@@ -256,3 +263,11 @@ public function provideCheckTypes()
];
}
}
+
+class EmptyEmailObject
+{
+ public function __toString()
+ {
+ return '';
+ }
+}
diff --git a/vendor/symfony/validator/Tests/Constraints/EqualToValidatorTest.php b/vendor/symfony/validator/Tests/Constraints/EqualToValidatorTest.php
index c1eb2f93ad..880dbd7795 100644
--- a/vendor/symfony/validator/Tests/Constraints/EqualToValidatorTest.php
+++ b/vendor/symfony/validator/Tests/Constraints/EqualToValidatorTest.php
@@ -75,4 +75,11 @@ public function provideInvalidComparisons()
[new ComparisonTest_Class(4), '4', new ComparisonTest_Class(5), '5', __NAMESPACE__.'\ComparisonTest_Class'],
];
}
+
+ public function provideComparisonsToNullValueAtPropertyPath()
+ {
+ return [
+ [5, '5', false],
+ ];
+ }
}
diff --git a/vendor/symfony/validator/Tests/Constraints/GreaterThanOrEqualValidatorTest.php b/vendor/symfony/validator/Tests/Constraints/GreaterThanOrEqualValidatorTest.php
index d8d8eab8bd..043c02e7a7 100644
--- a/vendor/symfony/validator/Tests/Constraints/GreaterThanOrEqualValidatorTest.php
+++ b/vendor/symfony/validator/Tests/Constraints/GreaterThanOrEqualValidatorTest.php
@@ -78,4 +78,11 @@ public function provideInvalidComparisons()
['b', '"b"', 'c', '"c"', 'string'],
];
}
+
+ public function provideComparisonsToNullValueAtPropertyPath()
+ {
+ return [
+ [5, '5', true],
+ ];
+ }
}
diff --git a/vendor/symfony/validator/Tests/Constraints/GreaterThanValidatorTest.php b/vendor/symfony/validator/Tests/Constraints/GreaterThanValidatorTest.php
index e678496c41..119c162edb 100644
--- a/vendor/symfony/validator/Tests/Constraints/GreaterThanValidatorTest.php
+++ b/vendor/symfony/validator/Tests/Constraints/GreaterThanValidatorTest.php
@@ -80,4 +80,11 @@ public function provideInvalidComparisons()
['22', '"22"', '22', '"22"', 'string'],
];
}
+
+ public function provideComparisonsToNullValueAtPropertyPath()
+ {
+ return [
+ [5, '5', true],
+ ];
+ }
}
diff --git a/vendor/symfony/validator/Tests/Constraints/IdenticalToValidatorTest.php b/vendor/symfony/validator/Tests/Constraints/IdenticalToValidatorTest.php
index c96ac16a91..1d3662f49a 100644
--- a/vendor/symfony/validator/Tests/Constraints/IdenticalToValidatorTest.php
+++ b/vendor/symfony/validator/Tests/Constraints/IdenticalToValidatorTest.php
@@ -93,4 +93,11 @@ public function provideInvalidComparisons()
[new ComparisonTest_Class(4), '4', new ComparisonTest_Class(5), '5', __NAMESPACE__.'\ComparisonTest_Class'],
];
}
+
+ public function provideComparisonsToNullValueAtPropertyPath()
+ {
+ return [
+ [5, '5', false],
+ ];
+ }
}
diff --git a/vendor/symfony/validator/Tests/Constraints/LessThanOrEqualValidatorTest.php b/vendor/symfony/validator/Tests/Constraints/LessThanOrEqualValidatorTest.php
index b77deff616..9311706e7d 100644
--- a/vendor/symfony/validator/Tests/Constraints/LessThanOrEqualValidatorTest.php
+++ b/vendor/symfony/validator/Tests/Constraints/LessThanOrEqualValidatorTest.php
@@ -81,4 +81,11 @@ public function provideInvalidComparisons()
['c', '"c"', 'b', '"b"', 'string'],
];
}
+
+ public function provideComparisonsToNullValueAtPropertyPath()
+ {
+ return [
+ [5, '5', true],
+ ];
+ }
}
diff --git a/vendor/symfony/validator/Tests/Constraints/LessThanValidatorTest.php b/vendor/symfony/validator/Tests/Constraints/LessThanValidatorTest.php
index 7d209ed5d4..c40389440d 100644
--- a/vendor/symfony/validator/Tests/Constraints/LessThanValidatorTest.php
+++ b/vendor/symfony/validator/Tests/Constraints/LessThanValidatorTest.php
@@ -79,4 +79,11 @@ public function provideInvalidComparisons()
['333', '"333"', '22', '"22"', 'string'],
];
}
+
+ public function provideComparisonsToNullValueAtPropertyPath()
+ {
+ return [
+ [5, '5', true],
+ ];
+ }
}
diff --git a/vendor/symfony/validator/Tests/Constraints/NotEqualToValidatorTest.php b/vendor/symfony/validator/Tests/Constraints/NotEqualToValidatorTest.php
index 810f7a175f..8577159583 100644
--- a/vendor/symfony/validator/Tests/Constraints/NotEqualToValidatorTest.php
+++ b/vendor/symfony/validator/Tests/Constraints/NotEqualToValidatorTest.php
@@ -75,4 +75,11 @@ public function provideInvalidComparisons()
[new ComparisonTest_Class(5), '5', new ComparisonTest_Class(5), '5', __NAMESPACE__.'\ComparisonTest_Class'],
];
}
+
+ public function provideComparisonsToNullValueAtPropertyPath()
+ {
+ return [
+ [5, '5', true],
+ ];
+ }
}
diff --git a/vendor/symfony/validator/Tests/Constraints/NotIdenticalToValidatorTest.php b/vendor/symfony/validator/Tests/Constraints/NotIdenticalToValidatorTest.php
index 0cb9ec5431..f14c5bd0dc 100644
--- a/vendor/symfony/validator/Tests/Constraints/NotIdenticalToValidatorTest.php
+++ b/vendor/symfony/validator/Tests/Constraints/NotIdenticalToValidatorTest.php
@@ -93,4 +93,11 @@ public function provideInvalidComparisons()
return $comparisons;
}
+
+ public function provideComparisonsToNullValueAtPropertyPath()
+ {
+ return [
+ [5, '5', true],
+ ];
+ }
}
diff --git a/vendor/symfony/validator/Tests/Constraints/UrlValidatorTest.php b/vendor/symfony/validator/Tests/Constraints/UrlValidatorTest.php
index f04dd44bc9..6bcc5c54c5 100644
--- a/vendor/symfony/validator/Tests/Constraints/UrlValidatorTest.php
+++ b/vendor/symfony/validator/Tests/Constraints/UrlValidatorTest.php
@@ -117,9 +117,13 @@ public function getValidUrls()
['http://☎.com/'],
['http://username:password@symfony.com'],
['http://user.name:password@symfony.com'],
+ ['http://user_name:pass_word@symfony.com'],
['http://username:pass.word@symfony.com'],
['http://user.name:pass.word@symfony.com'],
['http://user-name@symfony.com'],
+ ['http://user_name@symfony.com'],
+ ['http://u%24er:password@symfony.com'],
+ ['http://user:pa%24%24word@symfony.com'],
['http://symfony.com?'],
['http://symfony.com?query=1'],
['http://symfony.com/?query=1'],
@@ -166,6 +170,8 @@ public function getInvalidUrls()
['http://:password@@symfony.com'],
['http://username:passwordsymfony.com'],
['http://usern@me:password@symfony.com'],
+ ['http://nota%hex:password@symfony.com'],
+ ['http://username:nota%hex@symfony.com'],
['http://example.com/exploit.html?<script>alert(1);</script>'],
['http://example.com/exploit.html?hel lo'],
['http://example.com/exploit.html?not_a%hex'],
diff --git a/vendor/symfony/validator/Tests/Fixtures/AbstractPropertyGetter.php b/vendor/symfony/validator/Tests/Fixtures/AbstractPropertyGetter.php
new file mode 100644
index 0000000000..3df0b9469d
--- /dev/null
+++ b/vendor/symfony/validator/Tests/Fixtures/AbstractPropertyGetter.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Symfony\Component\Validator\Tests\Fixtures;
+
+abstract class AbstractPropertyGetter implements PropertyGetterInterface
+{
+ private $property;
+
+ public function getProperty()
+ {
+ return $this->property;
+ }
+}
diff --git a/vendor/symfony/validator/Tests/Fixtures/ChildGetterInterface.php b/vendor/symfony/validator/Tests/Fixtures/ChildGetterInterface.php
new file mode 100644
index 0000000000..65c144bbea
--- /dev/null
+++ b/vendor/symfony/validator/Tests/Fixtures/ChildGetterInterface.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Symfony\Component\Validator\Tests\Fixtures;
+
+interface ChildGetterInterface extends PropertyGetterInterface
+{
+}
diff --git a/vendor/symfony/validator/Tests/Fixtures/Entity.php b/vendor/symfony/validator/Tests/Fixtures/Entity.php
index 16ba8a718e..673e62bae7 100644
--- a/vendor/symfony/validator/Tests/Fixtures/Entity.php
+++ b/vendor/symfony/validator/Tests/Fixtures/Entity.php
@@ -53,6 +53,11 @@ public function __construct($internal = null)
$this->internal = $internal;
}
+ public function getFirstName()
+ {
+ return $this->firstName;
+ }
+
public function getInternal()
{
return $this->internal.' from getter';
@@ -141,4 +146,9 @@ public function setChildB($childB)
{
$this->childB = $childB;
}
+
+ public function getReference()
+ {
+ return $this->reference;
+ }
}
diff --git a/vendor/symfony/validator/Tests/Fixtures/EntityWithGroupedConstraintOnMethods.php b/vendor/symfony/validator/Tests/Fixtures/EntityWithGroupedConstraintOnMethods.php
new file mode 100644
index 0000000000..89cae29f05
--- /dev/null
+++ b/vendor/symfony/validator/Tests/Fixtures/EntityWithGroupedConstraintOnMethods.php
@@ -0,0 +1,27 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Validator\Tests\Fixtures;
+
+class EntityWithGroupedConstraintOnMethods
+{
+ public $bar;
+
+ public function isValidInFoo()
+ {
+ return false;
+ }
+
+ public function getBar()
+ {
+ throw new \Exception('Should not be called');
+ }
+}
diff --git a/vendor/symfony/validator/Tests/Fixtures/Entity_74.php b/vendor/symfony/validator/Tests/Fixtures/Entity_74.php
new file mode 100644
index 0000000000..cb22fb7f72
--- /dev/null
+++ b/vendor/symfony/validator/Tests/Fixtures/Entity_74.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Symfony\Component\Validator\Tests\Fixtures;
+
+class Entity_74
+{
+ public int $uninitialized;
+}
diff --git a/vendor/symfony/validator/Tests/Fixtures/Entity_74_Proxy.php b/vendor/symfony/validator/Tests/Fixtures/Entity_74_Proxy.php
new file mode 100644
index 0000000000..d74badc7d7
--- /dev/null
+++ b/vendor/symfony/validator/Tests/Fixtures/Entity_74_Proxy.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Symfony\Component\Validator\Tests\Fixtures;
+
+class Entity_74_Proxy extends Entity_74
+{
+ public string $notUnset;
+
+ public function __construct()
+ {
+ unset($this->uninitialized);
+ }
+
+ public function __get($name)
+ {
+ return 42;
+ }
+}
diff --git a/vendor/symfony/validator/Tests/Fixtures/FakeMetadataFactory.php b/vendor/symfony/validator/Tests/Fixtures/FakeMetadataFactory.php
index 5e34929be3..953e979f56 100644
--- a/vendor/symfony/validator/Tests/Fixtures/FakeMetadataFactory.php
+++ b/vendor/symfony/validator/Tests/Fixtures/FakeMetadataFactory.php
@@ -29,7 +29,7 @@ public function getMetadataFor($class)
}
if (!\is_string($class)) {
- throw new NoSuchMetadataException(sprintf('No metadata for type %s', \gettype($class)));
+ throw new NoSuchMetadataException(sprintf('No metadata for type "%s".', \gettype($class)));
}
if (!isset($this->metadatas[$class])) {
diff --git a/vendor/symfony/validator/Tests/Fixtures/PropertyGetter.php b/vendor/symfony/validator/Tests/Fixtures/PropertyGetter.php
new file mode 100644
index 0000000000..e1e14bb007
--- /dev/null
+++ b/vendor/symfony/validator/Tests/Fixtures/PropertyGetter.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Symfony\Component\Validator\Tests\Fixtures;
+
+/**
+ * This class has two paths to PropertyGetterInterface:
+ * PropertyGetterInterface <- AbstractPropertyGetter <- PropertyGetter
+ * PropertyGetterInterface <- ChildGetterInterface <- PropertyGetter
+ */
+class PropertyGetter extends AbstractPropertyGetter implements ChildGetterInterface
+{
+}
diff --git a/vendor/symfony/validator/Tests/Fixtures/PropertyGetterInterface.php b/vendor/symfony/validator/Tests/Fixtures/PropertyGetterInterface.php
new file mode 100644
index 0000000000..fa02db8974
--- /dev/null
+++ b/vendor/symfony/validator/Tests/Fixtures/PropertyGetterInterface.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Symfony\Component\Validator\Tests\Fixtures;
+
+interface PropertyGetterInterface
+{
+ public function getProperty();
+}
diff --git a/vendor/symfony/validator/Tests/Mapping/Factory/LazyLoadingMetadataFactoryTest.php b/vendor/symfony/validator/Tests/Mapping/Factory/LazyLoadingMetadataFactoryTest.php
index 6a89ef1c30..127b727c39 100644
--- a/vendor/symfony/validator/Tests/Mapping/Factory/LazyLoadingMetadataFactoryTest.php
+++ b/vendor/symfony/validator/Tests/Mapping/Factory/LazyLoadingMetadataFactoryTest.php
@@ -14,11 +14,14 @@
use PHPUnit\Framework\TestCase;
use Symfony\Component\Cache\Adapter\ArrayAdapter;
use Symfony\Component\Validator\Constraints\Callback;
+use Symfony\Component\Validator\Constraints\NotBlank;
use Symfony\Component\Validator\Mapping\Cache\Psr6Cache;
use Symfony\Component\Validator\Mapping\ClassMetadata;
use Symfony\Component\Validator\Mapping\Factory\LazyLoadingMetadataFactory;
use Symfony\Component\Validator\Mapping\Loader\LoaderInterface;
use Symfony\Component\Validator\Tests\Fixtures\ConstraintA;
+use Symfony\Component\Validator\Tests\Fixtures\PropertyGetter;
+use Symfony\Component\Validator\Tests\Fixtures\PropertyGetterInterface;
class LazyLoadingMetadataFactoryTest extends TestCase
{
@@ -70,7 +73,6 @@ public function testMergeParentConstraints()
new ConstraintA(['groups' => [
'Default',
'EntityParentInterface',
- 'EntityInterfaceB',
'Entity',
]]),
];
@@ -186,6 +188,15 @@ public function testGroupsFromParent()
$this->assertContains('EntityStaticCar', $groups);
$this->assertContains('EntityStaticVehicle', $groups);
}
+
+ public function testMultipathInterfaceConstraint()
+ {
+ $factory = new LazyLoadingMetadataFactory(new PropertyGetterInterfaceConstraintLoader());
+ $metadata = $factory->getMetadataFor(PropertyGetter::class);
+ $constraints = $metadata->getPropertyMetadata('property');
+
+ $this->assertCount(1, $constraints);
+ }
}
class TestLoader implements LoaderInterface
@@ -195,3 +206,15 @@ public function loadClassMetadata(ClassMetadata $metadata)
$metadata->addConstraint(new ConstraintA());
}
}
+
+class PropertyGetterInterfaceConstraintLoader implements LoaderInterface
+{
+ public function loadClassMetadata(ClassMetadata $metadata)
+ {
+ if (PropertyGetterInterface::class === $metadata->getClassName()) {
+ $metadata->addGetterConstraint('property', new NotBlank());
+ }
+
+ return true;
+ }
+}
diff --git a/vendor/symfony/validator/Tests/Mapping/GetterMetadataTest.php b/vendor/symfony/validator/Tests/Mapping/GetterMetadataTest.php
index 63d127c67a..127bd5a164 100644
--- a/vendor/symfony/validator/Tests/Mapping/GetterMetadataTest.php
+++ b/vendor/symfony/validator/Tests/Mapping/GetterMetadataTest.php
@@ -64,7 +64,7 @@ public function testGetPropertyValueFromHasser()
public function testUndefinedMethodNameThrowsException()
{
$this->expectException('Symfony\Component\Validator\Exception\ValidatorException');
- $this->expectExceptionMessage('The hasLastName() method does not exist in class Symfony\Component\Validator\Tests\Fixtures\Entity.');
+ $this->expectExceptionMessage('The "hasLastName()" method does not exist in class "Symfony\Component\Validator\Tests\Fixtures\Entity".');
new GetterMetadata(self::CLASSNAME, 'lastName', 'hasLastName');
}
}
diff --git a/vendor/symfony/validator/Tests/Mapping/Loader/StaticMethodLoaderTest.php b/vendor/symfony/validator/Tests/Mapping/Loader/StaticMethodLoaderTest.php
index 069ccd3229..c5c3b4e196 100644
--- a/vendor/symfony/validator/Tests/Mapping/Loader/StaticMethodLoaderTest.php
+++ b/vendor/symfony/validator/Tests/Mapping/Loader/StaticMethodLoaderTest.php
@@ -33,7 +33,7 @@ protected function tearDown()
public function testLoadClassMetadataReturnsTrueIfSuccessful()
{
$loader = new StaticMethodLoader('loadMetadata');
- $metadata = new ClassMetadata(__NAMESPACE__.'\StaticLoaderEntity');
+ $metadata = new ClassMetadata(StaticLoaderEntity::class);
$this->assertTrue($loader->loadClassMetadata($metadata));
}
@@ -49,7 +49,7 @@ public function testLoadClassMetadataReturnsFalseIfNotSuccessful()
public function testLoadClassMetadata()
{
$loader = new StaticMethodLoader('loadMetadata');
- $metadata = new ClassMetadata(__NAMESPACE__.'\StaticLoaderEntity');
+ $metadata = new ClassMetadata(StaticLoaderEntity::class);
$loader->loadClassMetadata($metadata);
@@ -59,12 +59,12 @@ public function testLoadClassMetadata()
public function testLoadClassMetadataDoesNotRepeatLoadWithParentClasses()
{
$loader = new StaticMethodLoader('loadMetadata');
- $metadata = new ClassMetadata(__NAMESPACE__.'\StaticLoaderDocument');
+ $metadata = new ClassMetadata(StaticLoaderDocument::class);
$loader->loadClassMetadata($metadata);
$this->assertCount(0, $metadata->getConstraints());
$loader = new StaticMethodLoader('loadMetadata');
- $metadata = new ClassMetadata(__NAMESPACE__.'\BaseStaticLoaderDocument');
+ $metadata = new ClassMetadata(BaseStaticLoaderDocument::class);
$loader->loadClassMetadata($metadata);
$this->assertCount(1, $metadata->getConstraints());
}
@@ -72,7 +72,7 @@ public function testLoadClassMetadataDoesNotRepeatLoadWithParentClasses()
public function testLoadClassMetadataIgnoresInterfaces()
{
$loader = new StaticMethodLoader('loadMetadata');
- $metadata = new ClassMetadata(__NAMESPACE__.'\StaticLoaderInterface');
+ $metadata = new ClassMetadata(StaticLoaderInterface::class);
$loader->loadClassMetadata($metadata);
@@ -82,7 +82,7 @@ public function testLoadClassMetadataIgnoresInterfaces()
public function testLoadClassMetadataInAbstractClasses()
{
$loader = new StaticMethodLoader('loadMetadata');
- $metadata = new ClassMetadata(__NAMESPACE__.'\AbstractStaticLoader');
+ $metadata = new ClassMetadata(AbstractStaticLoader::class);
$loader->loadClassMetadata($metadata);
@@ -95,7 +95,7 @@ public function testLoadClassMetadataIgnoresAbstractMethods()
// strict standards error
error_reporting(0);
- $metadata = new ClassMetadata(__NAMESPACE__.'\AbstractStaticMethodLoader');
+ $metadata = new ClassMetadata(AbstractStaticMethodLoader::class);
$loader = new StaticMethodLoader('loadMetadata');
$loader->loadClassMetadata($metadata);
diff --git a/vendor/symfony/validator/Tests/Mapping/PropertyMetadataTest.php b/vendor/symfony/validator/Tests/Mapping/PropertyMetadataTest.php
index 7902625219..8868ec64aa 100644
--- a/vendor/symfony/validator/Tests/Mapping/PropertyMetadataTest.php
+++ b/vendor/symfony/validator/Tests/Mapping/PropertyMetadataTest.php
@@ -14,10 +14,14 @@
use PHPUnit\Framework\TestCase;
use Symfony\Component\Validator\Mapping\PropertyMetadata;
use Symfony\Component\Validator\Tests\Fixtures\Entity;
+use Symfony\Component\Validator\Tests\Fixtures\Entity_74;
+use Symfony\Component\Validator\Tests\Fixtures\Entity_74_Proxy;
class PropertyMetadataTest extends TestCase
{
const CLASSNAME = 'Symfony\Component\Validator\Tests\Fixtures\Entity';
+ const CLASSNAME_74 = 'Symfony\Component\Validator\Tests\Fixtures\Entity_74';
+ const CLASSNAME_74_PROXY = 'Symfony\Component\Validator\Tests\Fixtures\Entity_74_Proxy';
const PARENTCLASS = 'Symfony\Component\Validator\Tests\Fixtures\EntityParent';
public function testInvalidPropertyName()
@@ -53,4 +57,28 @@ public function testGetPropertyValueFromRemovedProperty()
$this->expectException('Symfony\Component\Validator\Exception\ValidatorException');
$metadata->getPropertyValue($entity);
}
+
+ /**
+ * @requires PHP 7.4
+ */
+ public function testGetPropertyValueFromUninitializedProperty()
+ {
+ $entity = new Entity_74();
+ $metadata = new PropertyMetadata(self::CLASSNAME_74, 'uninitialized');
+
+ $this->assertNull($metadata->getPropertyValue($entity));
+ }
+
+ /**
+ * @requires PHP 7.4
+ */
+ public function testGetPropertyValueFromUninitializedPropertyShouldNotReturnNullIfMagicGetIsPresent()
+ {
+ $entity = new Entity_74_Proxy();
+ $metadata = new PropertyMetadata(self::CLASSNAME_74_PROXY, 'uninitialized');
+ $notUnsetMetadata = new PropertyMetadata(self::CLASSNAME_74_PROXY, 'notUnset');
+
+ $this->assertNull($notUnsetMetadata->getPropertyValue($entity));
+ $this->assertEquals(42, $metadata->getPropertyValue($entity));
+ }
}
diff --git a/vendor/symfony/validator/Tests/Validator/AbstractTest.php b/vendor/symfony/validator/Tests/Validator/AbstractTest.php
index 697be6edc6..cfd0de6ead 100644
--- a/vendor/symfony/validator/Tests/Validator/AbstractTest.php
+++ b/vendor/symfony/validator/Tests/Validator/AbstractTest.php
@@ -701,4 +701,25 @@ public function testNestedObjectIsValidatedIfGroupInValidConstraintIsValidated()
$this->assertCount(2, $violations);
}
+
+ public function testNestedObjectIsValidatedInMultipleGroupsIfGroupInValidConstraintIsValidated()
+ {
+ $entity = new Entity();
+ $entity->firstName = null;
+
+ $reference = new Reference();
+ $reference->value = null;
+
+ $entity->childA = $reference;
+
+ $this->metadata->addPropertyConstraint('firstName', new NotBlank());
+ $this->metadata->addPropertyConstraint('childA', new Valid(['groups' => ['group1', 'group2']]));
+
+ $this->referenceMetadata->addPropertyConstraint('value', new NotBlank(['groups' => 'group1']));
+ $this->referenceMetadata->addPropertyConstraint('value', new NotNull(['groups' => 'group2']));
+
+ $violations = $this->validator->validate($entity, null, ['Default', 'group1', 'group2']);
+
+ $this->assertCount(3, $violations);
+ }
}
diff --git a/vendor/symfony/validator/Tests/Validator/AbstractValidatorTest.php b/vendor/symfony/validator/Tests/Validator/AbstractValidatorTest.php
index 07e45f47eb..8482a71a38 100644
--- a/vendor/symfony/validator/Tests/Validator/AbstractValidatorTest.php
+++ b/vendor/symfony/validator/Tests/Validator/AbstractValidatorTest.php
@@ -32,6 +32,8 @@ abstract class AbstractValidatorTest extends TestCase
const REFERENCE_CLASS = 'Symfony\Component\Validator\Tests\Fixtures\Reference';
+ const LAZY_PROPERTY = 'Symfony\Component\Validator\Validator\LazyProperty';
+
/**
* @var FakeMetadataFactory
*/
@@ -54,6 +56,7 @@ protected function setUp()
$this->referenceMetadata = new ClassMetadata(self::REFERENCE_CLASS);
$this->metadataFactory->addMetadata($this->metadata);
$this->metadataFactory->addMetadata($this->referenceMetadata);
+ $this->metadataFactory->addMetadata(new ClassMetadata(self::LAZY_PROPERTY));
}
protected function tearDown()
@@ -510,7 +513,10 @@ public function testFailOnScalarReferences()
$this->validate($entity);
}
- public function testArrayReference()
+ /**
+ * @dataProvider getConstraintMethods
+ */
+ public function testArrayReference($constraintMethod)
{
$entity = new Entity();
$entity->reference = ['key' => new Reference()];
@@ -528,7 +534,7 @@ public function testArrayReference()
$context->addViolation('Message %param%', ['%param%' => 'value']);
};
- $this->metadata->addPropertyConstraint('reference', new Valid());
+ $this->metadata->$constraintMethod('reference', new Valid());
$this->referenceMetadata->addConstraint(new Callback([
'callback' => $callback,
'groups' => 'Group',
@@ -548,8 +554,10 @@ public function testArrayReference()
$this->assertNull($violations[0]->getCode());
}
- // https://github.com/symfony/symfony/issues/6246
- public function testRecursiveArrayReference()
+ /**
+ * @dataProvider getConstraintMethods
+ */
+ public function testRecursiveArrayReference($constraintMethod)
{
$entity = new Entity();
$entity->reference = [2 => ['key' => new Reference()]];
@@ -567,7 +575,7 @@ public function testRecursiveArrayReference()
$context->addViolation('Message %param%', ['%param%' => 'value']);
};
- $this->metadata->addPropertyConstraint('reference', new Valid());
+ $this->metadata->$constraintMethod('reference', new Valid());
$this->referenceMetadata->addConstraint(new Callback([
'callback' => $callback,
'groups' => 'Group',
@@ -611,7 +619,10 @@ public function testOnlyCascadedArraysAreTraversed()
$this->assertCount(0, $violations);
}
- public function testArrayTraversalCannotBeDisabled()
+ /**
+ * @dataProvider getConstraintMethods
+ */
+ public function testArrayTraversalCannotBeDisabled($constraintMethod)
{
$entity = new Entity();
$entity->reference = ['key' => new Reference()];
@@ -620,7 +631,7 @@ public function testArrayTraversalCannotBeDisabled()
$context->addViolation('Message %param%', ['%param%' => 'value']);
};
- $this->metadata->addPropertyConstraint('reference', new Valid([
+ $this->metadata->$constraintMethod('reference', new Valid([
'traverse' => false,
]));
$this->referenceMetadata->addConstraint(new Callback($callback));
@@ -631,7 +642,10 @@ public function testArrayTraversalCannotBeDisabled()
$this->assertCount(1, $violations);
}
- public function testRecursiveArrayTraversalCannotBeDisabled()
+ /**
+ * @dataProvider getConstraintMethods
+ */
+ public function testRecursiveArrayTraversalCannotBeDisabled($constraintMethod)
{
$entity = new Entity();
$entity->reference = [2 => ['key' => new Reference()]];
@@ -640,9 +654,10 @@ public function testRecursiveArrayTraversalCannotBeDisabled()
$context->addViolation('Message %param%', ['%param%' => 'value']);
};
- $this->metadata->addPropertyConstraint('reference', new Valid([
+ $this->metadata->$constraintMethod('reference', new Valid([
'traverse' => false,
]));
+
$this->referenceMetadata->addConstraint(new Callback($callback));
$violations = $this->validate($entity);
@@ -651,12 +666,15 @@ public function testRecursiveArrayTraversalCannotBeDisabled()
$this->assertCount(1, $violations);
}
- public function testIgnoreScalarsDuringArrayTraversal()
+ /**
+ * @dataProvider getConstraintMethods
+ */
+ public function testIgnoreScalarsDuringArrayTraversal($constraintMethod)
{
$entity = new Entity();
$entity->reference = ['string', 1234];
- $this->metadata->addPropertyConstraint('reference', new Valid());
+ $this->metadata->$constraintMethod('reference', new Valid());
$violations = $this->validate($entity);
@@ -664,12 +682,15 @@ public function testIgnoreScalarsDuringArrayTraversal()
$this->assertCount(0, $violations);
}
- public function testIgnoreNullDuringArrayTraversal()
+ /**
+ * @dataProvider getConstraintMethods
+ */
+ public function testIgnoreNullDuringArrayTraversal($constraintMethod)
{
$entity = new Entity();
$entity->reference = [null];
- $this->metadata->addPropertyConstraint('reference', new Valid());
+ $this->metadata->$constraintMethod('reference', new Valid());
$violations = $this->validate($entity);
@@ -1218,6 +1239,14 @@ public function testReplaceDefaultGroup($sequence, array $assertViolations)
}
}
+ public function getConstraintMethods()
+ {
+ return [
+ ['addPropertyConstraint'],
+ ['addGetterConstraint'],
+ ];
+ }
+
public function getTestReplaceDefaultGroup()
{
return [
diff --git a/vendor/symfony/validator/Tests/Validator/RecursiveValidatorTest.php b/vendor/symfony/validator/Tests/Validator/RecursiveValidatorTest.php
index 8109b6b9bf..484236241c 100644
--- a/vendor/symfony/validator/Tests/Validator/RecursiveValidatorTest.php
+++ b/vendor/symfony/validator/Tests/Validator/RecursiveValidatorTest.php
@@ -14,14 +14,21 @@
use Symfony\Component\Translation\IdentityTranslator;
use Symfony\Component\Validator\Constraints\All;
use Symfony\Component\Validator\Constraints\Collection;
+use Symfony\Component\Validator\Constraints\GroupSequence;
+use Symfony\Component\Validator\Constraints\IsTrue;
use Symfony\Component\Validator\Constraints\Length;
use Symfony\Component\Validator\Constraints\NotBlank;
+use Symfony\Component\Validator\Constraints\NotNull;
+use Symfony\Component\Validator\Constraints\Optional;
+use Symfony\Component\Validator\Constraints\Required;
use Symfony\Component\Validator\ConstraintValidatorFactory;
use Symfony\Component\Validator\Context\ExecutionContextFactory;
+use Symfony\Component\Validator\Mapping\ClassMetadata;
use Symfony\Component\Validator\Mapping\Factory\MetadataFactoryInterface;
use Symfony\Component\Validator\Tests\Constraints\Fixtures\ChildA;
use Symfony\Component\Validator\Tests\Constraints\Fixtures\ChildB;
use Symfony\Component\Validator\Tests\Fixtures\Entity;
+use Symfony\Component\Validator\Tests\Fixtures\EntityWithGroupedConstraintOnMethods;
use Symfony\Component\Validator\Validator\RecursiveValidator;
class RecursiveValidatorTest extends AbstractTest
@@ -117,6 +124,25 @@ public function testCollectionConstraintValidateAllGroupsForNestedConstraints()
$this->assertInstanceOf(NotBlank::class, $violations->get(1)->getConstraint());
}
+ public function testGroupedMethodConstraintValidateInSequence()
+ {
+ $metadata = new ClassMetadata(EntityWithGroupedConstraintOnMethods::class);
+ $metadata->addPropertyConstraint('bar', new NotNull(['groups' => 'Foo']));
+ $metadata->addGetterMethodConstraint('validInFoo', 'isValidInFoo', new IsTrue(['groups' => 'Foo']));
+ $metadata->addGetterMethodConstraint('bar', 'getBar', new NotNull(['groups' => 'Bar']));
+
+ $this->metadataFactory->addMetadata($metadata);
+
+ $entity = new EntityWithGroupedConstraintOnMethods();
+ $groups = new GroupSequence(['EntityWithGroupedConstraintOnMethods', 'Foo', 'Bar']);
+
+ $violations = $this->validator->validate($entity, null, $groups);
+
+ $this->assertCount(2, $violations);
+ $this->assertInstanceOf(NotNull::class, $violations->get(0)->getConstraint());
+ $this->assertInstanceOf(IsTrue::class, $violations->get(1)->getConstraint());
+ }
+
public function testAllConstraintValidateAllGroupsForNestedConstraints()
{
$this->metadata->addPropertyConstraint('data', new All(['constraints' => [
@@ -133,4 +159,18 @@ public function testAllConstraintValidateAllGroupsForNestedConstraints()
$this->assertInstanceOf(NotBlank::class, $violations->get(0)->getConstraint());
$this->assertInstanceOf(Length::class, $violations->get(1)->getConstraint());
}
+
+ public function testRequiredConstraintIsIgnored()
+ {
+ $violations = $this->validator->validate([], new Required());
+
+ $this->assertCount(0, $violations);
+ }
+
+ public function testOptionalConstraintIsIgnored()
+ {
+ $violations = $this->validator->validate([], new Optional());
+
+ $this->assertCount(0, $violations);
+ }
}
diff --git a/vendor/symfony/validator/Tests/Violation/ConstraintViolationBuilderTest.php b/vendor/symfony/validator/Tests/Violation/ConstraintViolationBuilderTest.php
new file mode 100644
index 0000000000..4121dc2622
--- /dev/null
+++ b/vendor/symfony/validator/Tests/Violation/ConstraintViolationBuilderTest.php
@@ -0,0 +1,106 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Validator\Tests\Violation;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Translation\IdentityTranslator;
+use Symfony\Component\Validator\Constraints\Valid;
+use Symfony\Component\Validator\ConstraintViolation;
+use Symfony\Component\Validator\ConstraintViolationList;
+use Symfony\Component\Validator\Test\ForwardCompatTestTrait;
+use Symfony\Component\Validator\Violation\ConstraintViolationBuilder;
+
+class ConstraintViolationBuilderTest extends TestCase
+{
+ use ForwardCompatTestTrait;
+
+ private $root;
+ private $violations;
+ private $messageTemplate = '%value% is invalid';
+ private $builder;
+
+ private function doSetUp()
+ {
+ $this->root = [
+ 'data' => [
+ 'foo' => 'bar',
+ 'baz' => 'foobar',
+ ],
+ ];
+ $this->violations = new ConstraintViolationList();
+ $this->builder = new ConstraintViolationBuilder($this->violations, new Valid(), $this->messageTemplate, [], $this->root, 'data', 'foo', new IdentityTranslator());
+ }
+
+ public function testAddViolation()
+ {
+ $this->builder->addViolation();
+
+ $this->assertViolationEquals(new ConstraintViolation($this->messageTemplate, $this->messageTemplate, [], $this->root, 'data', 'foo', null, null, new Valid()));
+ }
+
+ public function testAppendPropertyPath()
+ {
+ $this->builder
+ ->atPath('foo')
+ ->addViolation();
+
+ $this->assertViolationEquals(new ConstraintViolation($this->messageTemplate, $this->messageTemplate, [], $this->root, 'data.foo', 'foo', null, null, new Valid()));
+ }
+
+ public function testAppendMultiplePropertyPaths()
+ {
+ $this->builder
+ ->atPath('foo')
+ ->atPath('bar')
+ ->addViolation();
+
+ $this->assertViolationEquals(new ConstraintViolation($this->messageTemplate, $this->messageTemplate, [], $this->root, 'data.foo.bar', 'foo', null, null, new Valid()));
+ }
+
+ public function testCodeCanBeSet()
+ {
+ $this->builder
+ ->setCode(5)
+ ->addViolation();
+
+ $this->assertViolationEquals(new ConstraintViolation($this->messageTemplate, $this->messageTemplate, [], $this->root, 'data', 'foo', null, 5, new Valid()));
+ }
+
+ public function testCauseCanBeSet()
+ {
+ $cause = new \LogicException();
+
+ $this->builder
+ ->setCause($cause)
+ ->addViolation();
+
+ $this->assertViolationEquals(new ConstraintViolation($this->messageTemplate, $this->messageTemplate, [], $this->root, 'data', 'foo', null, null, new Valid(), $cause));
+ }
+
+ private function assertViolationEquals(ConstraintViolation $expectedViolation)
+ {
+ $this->assertCount(1, $this->violations);
+
+ $violation = $this->violations->get(0);
+
+ $this->assertSame($expectedViolation->getMessage(), $violation->getMessage());
+ $this->assertSame($expectedViolation->getMessageTemplate(), $violation->getMessageTemplate());
+ $this->assertSame($expectedViolation->getParameters(), $violation->getParameters());
+ $this->assertSame($expectedViolation->getPlural(), $violation->getPlural());
+ $this->assertSame($expectedViolation->getRoot(), $violation->getRoot());
+ $this->assertSame($expectedViolation->getPropertyPath(), $violation->getPropertyPath());
+ $this->assertSame($expectedViolation->getInvalidValue(), $violation->getInvalidValue());
+ $this->assertSame($expectedViolation->getCode(), $violation->getCode());
+ $this->assertEquals($expectedViolation->getConstraint(), $violation->getConstraint());
+ $this->assertSame($expectedViolation->getCause(), $violation->getCause());
+ }
+}
diff --git a/vendor/symfony/validator/Validator/LazyProperty.php b/vendor/symfony/validator/Validator/LazyProperty.php
new file mode 100644
index 0000000000..a0799963c1
--- /dev/null
+++ b/vendor/symfony/validator/Validator/LazyProperty.php
@@ -0,0 +1,32 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Validator\Validator;
+
+/**
+ * A wrapper for a callable initializing a property from a getter.
+ *
+ * @internal
+ */
+class LazyProperty
+{
+ private $propertyValueCallback;
+
+ public function __construct(\Closure $propertyValueCallback)
+ {
+ $this->propertyValueCallback = $propertyValueCallback;
+ }
+
+ public function getPropertyValue()
+ {
+ return \call_user_func($this->propertyValueCallback);
+ }
+}
diff --git a/vendor/symfony/validator/Validator/RecursiveContextualValidator.php b/vendor/symfony/validator/Validator/RecursiveContextualValidator.php
index dc139c36d4..24206bfc27 100644
--- a/vendor/symfony/validator/Validator/RecursiveContextualValidator.php
+++ b/vendor/symfony/validator/Validator/RecursiveContextualValidator.php
@@ -13,7 +13,9 @@
use Symfony\Component\Validator\Constraint;
use Symfony\Component\Validator\Constraints\Composite;
+use Symfony\Component\Validator\Constraints\Existence;
use Symfony\Component\Validator\Constraints\GroupSequence;
+use Symfony\Component\Validator\Constraints\Valid;
use Symfony\Component\Validator\ConstraintValidatorFactoryInterface;
use Symfony\Component\Validator\Context\ExecutionContext;
use Symfony\Component\Validator\Context\ExecutionContextInterface;
@@ -26,6 +28,7 @@
use Symfony\Component\Validator\Mapping\ClassMetadataInterface;
use Symfony\Component\Validator\Mapping\Factory\MetadataFactoryInterface;
use Symfony\Component\Validator\Mapping\GenericMetadata;
+use Symfony\Component\Validator\Mapping\GetterMetadata;
use Symfony\Component\Validator\Mapping\MetadataInterface;
use Symfony\Component\Validator\Mapping\PropertyMetadataInterface;
use Symfony\Component\Validator\Mapping\TraversalStrategy;
@@ -534,7 +537,13 @@ private function validateClassNode($object, $cacheKey, ClassMetadataInterface $m
throw new UnsupportedMetadataException(sprintf('The property metadata instances should implement "Symfony\Component\Validator\Mapping\PropertyMetadataInterface", got: "%s".', \is_object($propertyMetadata) ? \get_class($propertyMetadata) : \gettype($propertyMetadata)));
}
- $propertyValue = $propertyMetadata->getPropertyValue($object);
+ if ($propertyMetadata instanceof GetterMetadata) {
+ $propertyValue = new LazyProperty(static function () use ($propertyMetadata, $object) {
+ return $propertyMetadata->getPropertyValue($object);
+ });
+ } else {
+ $propertyValue = $propertyMetadata->getPropertyValue($object);
+ }
$this->validateGenericNode(
$propertyValue,
@@ -669,6 +678,10 @@ private function validateGenericNode($value, $object, $cacheKey, MetadataInterfa
// See validateClassNode()
$cascadedGroups = null !== $cascadedGroups && \count($cascadedGroups) > 0 ? $cascadedGroups : $groups;
+ if ($value instanceof LazyProperty) {
+ $value = $value->getPropertyValue();
+ }
+
if (\is_array($value)) {
// Arrays are always traversed, independent of the specified
// traversal strategy
@@ -778,12 +791,17 @@ private function validateInGroup($value, $cacheKey, MetadataInterface $metadata,
$context->setGroup($group);
foreach ($metadata->findConstraints($group) as $constraint) {
+ if ($constraint instanceof Existence) {
+ continue;
+ }
+
// Prevent duplicate validation of constraints, in the case
// that constraints belong to multiple validated groups
if (null !== $cacheKey) {
$constraintHash = spl_object_hash($constraint);
-
- if ($constraint instanceof Composite) {
+ // instanceof Valid: In case of using a Valid constraint with many groups
+ // it makes a reference object get validated by each group
+ if ($constraint instanceof Composite || $constraint instanceof Valid) {
$constraintHash .= $group;
}
@@ -798,6 +816,11 @@ private function validateInGroup($value, $cacheKey, MetadataInterface $metadata,
$validator = $this->validatorFactory->getInstance($constraint);
$validator->initialize($context);
+
+ if ($value instanceof LazyProperty) {
+ $value = $value->getPropertyValue();
+ }
+
$validator->validate($value, $constraint);
}
}
diff --git a/vendor/symfony/yaml/Dumper.php b/vendor/symfony/yaml/Dumper.php
index a496dcc88e..1f54b14db5 100644
--- a/vendor/symfony/yaml/Dumper.php
+++ b/vendor/symfony/yaml/Dumper.php
@@ -99,13 +99,13 @@ public function dump($input, $inline = 0, $indent = 0, $flags = 0)
$dumpAsMap = Inline::isHash($input);
foreach ($input as $key => $value) {
- if ($inline >= 1 && Yaml::DUMP_MULTI_LINE_LITERAL_BLOCK & $flags && \is_string($value) && false !== strpos($value, "\n") && false === strpos($value, "\r\n")) {
+ if ($inline >= 1 && Yaml::DUMP_MULTI_LINE_LITERAL_BLOCK & $flags && \is_string($value) && false !== strpos($value, "\n") && false === strpos($value, "\r")) {
// If the first line starts with a space character, the spec requires a blockIndicationIndicator
// http://www.yaml.org/spec/1.2/spec.html#id2793979
$blockIndentationIndicator = (' ' === substr($value, 0, 1)) ? (string) $this->indentation : '';
$output .= sprintf("%s%s%s |%s\n", $prefix, $dumpAsMap ? Inline::dump($key, $flags).':' : '-', '', $blockIndentationIndicator);
- foreach (preg_split('/\n|\r\n/', $value) as $row) {
+ foreach (explode("\n", $value) as $row) {
$output .= sprintf("%s%s%s\n", $prefix, str_repeat(' ', $this->indentation), $row);
}
@@ -115,6 +115,19 @@ public function dump($input, $inline = 0, $indent = 0, $flags = 0)
if ($value instanceof TaggedValue) {
$output .= sprintf('%s%s !%s', $prefix, $dumpAsMap ? Inline::dump($key, $flags).':' : '-', $value->getTag());
+ if ($inline >= 1 && Yaml::DUMP_MULTI_LINE_LITERAL_BLOCK & $flags && \is_string($value->getValue()) && false !== strpos($value->getValue(), "\n") && false === strpos($value->getValue(), "\r\n")) {
+ // If the first line starts with a space character, the spec requires a blockIndicationIndicator
+ // http://www.yaml.org/spec/1.2/spec.html#id2793979
+ $blockIndentationIndicator = (' ' === substr($value->getValue(), 0, 1)) ? (string) $this->indentation : '';
+ $output .= sprintf(" |%s\n", $blockIndentationIndicator);
+
+ foreach (explode("\n", $value->getValue()) as $row) {
+ $output .= sprintf("%s%s%s\n", $prefix, str_repeat(' ', $this->indentation), $row);
+ }
+
+ continue;
+ }
+
if ($inline - 1 <= 0 || null === $value->getValue() || is_scalar($value->getValue())) {
$output .= ' '.$this->dump($value->getValue(), $inline - 1, 0, $flags)."\n";
} else {
diff --git a/vendor/symfony/yaml/Escaper.php b/vendor/symfony/yaml/Escaper.php
index 4d3ce244c2..9413d7a2c4 100644
--- a/vendor/symfony/yaml/Escaper.php
+++ b/vendor/symfony/yaml/Escaper.php
@@ -22,7 +22,7 @@
class Escaper
{
// Characters that would cause a dumped string to require double quoting.
- const REGEX_CHARACTER_TO_ESCAPE = "[\\x00-\\x1f]|\xc2\x85|\xc2\xa0|\xe2\x80\xa8|\xe2\x80\xa9";
+ const REGEX_CHARACTER_TO_ESCAPE = "[\\x00-\\x1f]|\x7f|\xc2\x85|\xc2\xa0|\xe2\x80\xa8|\xe2\x80\xa9";
// Mapping arrays for escaping a double quoted string. The backslash is
// first to ensure proper escaping because str_replace operates iteratively
@@ -33,6 +33,7 @@ class Escaper
"\x08", "\x09", "\x0a", "\x0b", "\x0c", "\x0d", "\x0e", "\x0f",
"\x10", "\x11", "\x12", "\x13", "\x14", "\x15", "\x16", "\x17",
"\x18", "\x19", "\x1a", "\x1b", "\x1c", "\x1d", "\x1e", "\x1f",
+ "\x7f",
"\xc2\x85", "\xc2\xa0", "\xe2\x80\xa8", "\xe2\x80\xa9",
];
private static $escaped = ['\\\\', '\\"', '\\\\', '\\"',
@@ -40,6 +41,7 @@ class Escaper
'\\b', '\\t', '\\n', '\\v', '\\f', '\\r', '\\x0e', '\\x0f',
'\\x10', '\\x11', '\\x12', '\\x13', '\\x14', '\\x15', '\\x16', '\\x17',
'\\x18', '\\x19', '\\x1a', '\\e', '\\x1c', '\\x1d', '\\x1e', '\\x1f',
+ '\\x7f',
'\\N', '\\_', '\\L', '\\P',
];
diff --git a/vendor/symfony/yaml/Inline.php b/vendor/symfony/yaml/Inline.php
index 7d3218a35e..341482746e 100644
--- a/vendor/symfony/yaml/Inline.php
+++ b/vendor/symfony/yaml/Inline.php
@@ -347,7 +347,7 @@ public static function parseScalar($scalar, $flags = 0, $delimiters = null, &$i
$output = $match[1];
$i += \strlen($output);
} else {
- throw new ParseException(sprintf('Malformed inline YAML string: %s.', $scalar), self::$parsedLineNumber + 1, null, self::$parsedFilename);
+ throw new ParseException(sprintf('Malformed inline YAML string: "%s".', $scalar), self::$parsedLineNumber + 1, null, self::$parsedFilename);
}
// a non-quoted string cannot start with @ or ` (reserved) nor with a scalar indicator (| or >)
@@ -380,7 +380,7 @@ public static function parseScalar($scalar, $flags = 0, $delimiters = null, &$i
private static function parseQuotedScalar($scalar, &$i)
{
if (!Parser::preg_match('/'.self::REGEX_QUOTED_STRING.'/Au', substr($scalar, $i), $match)) {
- throw new ParseException(sprintf('Malformed inline YAML string: %s.', substr($scalar, $i)), self::$parsedLineNumber + 1, $scalar, self::$parsedFilename);
+ throw new ParseException(sprintf('Malformed inline YAML string: "%s".', substr($scalar, $i)), self::$parsedLineNumber + 1, $scalar, self::$parsedFilename);
}
$output = substr($match[0], 1, \strlen($match[0]) - 2);
@@ -463,7 +463,7 @@ private static function parseSequence($sequence, $flags, &$i = 0, $references =
++$i;
}
- throw new ParseException(sprintf('Malformed inline YAML string: %s.', $sequence), self::$parsedLineNumber + 1, null, self::$parsedFilename);
+ throw new ParseException(sprintf('Malformed inline YAML string: "%s".', $sequence), self::$parsedLineNumber + 1, null, self::$parsedFilename);
}
/**
@@ -504,6 +504,16 @@ private static function parseMapping($mapping, $flags, &$i = 0, $references = []
$isKeyQuoted = \in_array($mapping[$i], ['"', "'"], true);
$key = self::parseScalar($mapping, $flags, [':', ' '], $i, false, [], true);
+ if ('!php/const' === $key) {
+ $key .= self::parseScalar($mapping, $flags, [':', ' '], $i, false, [], true);
+ if ('!php/const:' === $key && ':' !== $mapping[$i]) {
+ $key = '';
+ --$i;
+ } else {
+ $key = self::evaluateScalar($key, $flags);
+ }
+ }
+
if (':' !== $key && false === $i = strpos($mapping, ':', $i)) {
break;
}
@@ -602,7 +612,7 @@ private static function parseMapping($mapping, $flags, &$i = 0, $references = []
}
}
- throw new ParseException(sprintf('Malformed inline YAML string: %s.', $mapping), self::$parsedLineNumber + 1, null, self::$parsedFilename);
+ throw new ParseException(sprintf('Malformed inline YAML string: "%s".', $mapping), self::$parsedLineNumber + 1, null, self::$parsedFilename);
}
/**
@@ -687,6 +697,10 @@ private static function evaluateScalar($scalar, $flags, $references = [])
return null;
case 0 === strpos($scalar, '!php/object'):
if (self::$objectSupport) {
+ if (!isset($scalar[12])) {
+ return false;
+ }
+
return unserialize(self::parseScalar(substr($scalar, 12)));
}
@@ -706,12 +720,16 @@ private static function evaluateScalar($scalar, $flags, $references = [])
throw new ParseException(sprintf('The constant "%s" is not defined.', $const), self::$parsedLineNumber + 1, $scalar, self::$parsedFilename);
}
if (self::$exceptionOnInvalidType) {
- throw new ParseException(sprintf('The string "%s" could not be parsed as a constant. Have you forgotten to pass the "Yaml::PARSE_CONSTANT" flag to the parser?', $scalar), self::$parsedLineNumber + 1, $scalar, self::$parsedFilename);
+ throw new ParseException(sprintf('The string "%s" could not be parsed as a constant. Did you forget to pass the "Yaml::PARSE_CONSTANT" flag to the parser?', $scalar), self::$parsedLineNumber + 1, $scalar, self::$parsedFilename);
}
return null;
case 0 === strpos($scalar, '!php/const'):
if (self::$constantSupport) {
+ if (!isset($scalar[11])) {
+ return '';
+ }
+
$i = 0;
if (\defined($const = self::parseScalar(substr($scalar, 11), 0, null, $i, false))) {
return \constant($const);
@@ -720,7 +738,7 @@ private static function evaluateScalar($scalar, $flags, $references = [])
throw new ParseException(sprintf('The constant "%s" is not defined.', $const), self::$parsedLineNumber + 1, $scalar, self::$parsedFilename);
}
if (self::$exceptionOnInvalidType) {
- throw new ParseException(sprintf('The string "%s" could not be parsed as a constant. Have you forgotten to pass the "Yaml::PARSE_CONSTANT" flag to the parser?', $scalar), self::$parsedLineNumber + 1, $scalar, self::$parsedFilename);
+ throw new ParseException(sprintf('The string "%s" could not be parsed as a constant. Did you forget to pass the "Yaml::PARSE_CONSTANT" flag to the parser?', $scalar), self::$parsedLineNumber + 1, $scalar, self::$parsedFilename);
}
return null;
@@ -735,21 +753,27 @@ private static function evaluateScalar($scalar, $flags, $references = [])
// Optimize for returning strings.
// no break
case '+' === $scalar[0] || '-' === $scalar[0] || '.' === $scalar[0] || is_numeric($scalar[0]):
+ if (Parser::preg_match('{^[+-]?[0-9][0-9_]*$}', $scalar)) {
+ $scalar = str_replace('_', '', (string) $scalar);
+ }
+
switch (true) {
- case Parser::preg_match('{^[+-]?[0-9][0-9_]*$}', $scalar):
- $scalar = str_replace('_', '', (string) $scalar);
- // omitting the break / return as integers are handled in the next case
- // no break
case ctype_digit($scalar):
- $raw = $scalar;
+ if ('0' === $scalar[0]) {
+ return octdec(preg_replace('/[^0-7]/', '', $scalar));
+ }
+
$cast = (int) $scalar;
- return '0' == $scalar[0] ? octdec($scalar) : (((string) $raw == (string) $cast) ? $cast : $raw);
+ return ($scalar === (string) $cast) ? $cast : $scalar;
case '-' === $scalar[0] && ctype_digit(substr($scalar, 1)):
- $raw = $scalar;
+ if ('0' === $scalar[1]) {
+ return -octdec(preg_replace('/[^0-7]/', '', substr($scalar, 1)));
+ }
+
$cast = (int) $scalar;
- return '0' == $scalar[1] ? octdec($scalar) : (((string) $raw === (string) $cast) ? $cast : $raw);
+ return ($scalar === (string) $cast) ? $cast : $scalar;
case is_numeric($scalar):
case Parser::preg_match(self::getHexRegex(), $scalar):
$scalar = str_replace('_', '', $scalar);
diff --git a/vendor/symfony/yaml/LICENSE b/vendor/symfony/yaml/LICENSE
index a677f43763..9e936ec044 100644
--- a/vendor/symfony/yaml/LICENSE
+++ b/vendor/symfony/yaml/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2019 Fabien Potencier
+Copyright (c) 2004-2020 Fabien Potencier
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/vendor/symfony/yaml/Parser.php b/vendor/symfony/yaml/Parser.php
index 7d6112e3b9..e859766f97 100644
--- a/vendor/symfony/yaml/Parser.php
+++ b/vendor/symfony/yaml/Parser.php
@@ -207,7 +207,7 @@ private function doParse($value, $flags)
$isRef = $mergeNode = false;
if (self::preg_match('#^\-((?P<leadspaces>\s+)(?P<value>.+))?$#u', rtrim($this->currentLine), $values)) {
if ($context && 'mapping' == $context) {
- throw new ParseException('You cannot define a sequence item when in a mapping', $this->getRealCurrentLineNb() + 1, $this->currentLine, $this->filename);
+ throw new ParseException('You cannot define a sequence item when in a mapping.', $this->getRealCurrentLineNb() + 1, $this->currentLine, $this->filename);
}
$context = 'sequence';
@@ -253,7 +253,7 @@ private function doParse($value, $flags)
&& (false === strpos($values['key'], ' #') || \in_array($values['key'][0], ['"', "'"]))
) {
if ($context && 'sequence' == $context) {
- throw new ParseException('You cannot define a mapping item when in a sequence', $this->currentLineNb + 1, $this->currentLine, $this->filename);
+ throw new ParseException('You cannot define a mapping item when in a sequence.', $this->currentLineNb + 1, $this->currentLine, $this->filename);
}
$context = 'mapping';
@@ -619,8 +619,14 @@ private function getNextEmbedBlock($indentation = null, $inSequence = false)
}
$isItUnindentedCollection = $this->isStringUnIndentedCollectionItem();
+ $isItComment = $this->isCurrentLineComment();
while ($this->moveToNextLine()) {
+ if ($isItComment && !$isItUnindentedCollection) {
+ $isItUnindentedCollection = $this->isStringUnIndentedCollectionItem();
+ $isItComment = $this->isCurrentLineComment();
+ }
+
$indent = $this->getCurrentLineIndentation();
if ($isItUnindentedCollection && !$this->isCurrentLineEmpty() && !$this->isStringUnIndentedCollectionItem() && $newIndent === $indent) {
@@ -751,7 +757,8 @@ private function parseValue($value, $flags, $context)
$lines[] = trim($this->currentLine);
// quoted string values end with a line that is terminated with the quotation character
- if ('' !== $this->currentLine && substr($this->currentLine, -1) === $quotation) {
+ $escapedLine = str_replace(['\\\\', '\\"'], '', $this->currentLine);
+ if ('' !== $escapedLine && substr($escapedLine, -1) === $quotation) {
break;
}
}
diff --git a/vendor/symfony/yaml/README.md b/vendor/symfony/yaml/README.md
index 0d324881ce..b914e7836c 100644
--- a/vendor/symfony/yaml/README.md
+++ b/vendor/symfony/yaml/README.md
@@ -6,7 +6,7 @@ The Yaml component loads and dumps YAML files.
Resources
---------
- * [Documentation](https://symfony.com/doc/current/components/yaml/index.html)
+ * [Documentation](https://symfony.com/doc/current/components/yaml.html)
* [Contributing](https://symfony.com/doc/current/contributing/index.html)
* [Report issues](https://github.com/symfony/symfony/issues) and
[send Pull Requests](https://github.com/symfony/symfony/pulls)
diff --git a/vendor/symfony/yaml/Tests/DumperTest.php b/vendor/symfony/yaml/Tests/DumperTest.php
index 1a1ef25a5a..e4dc49f331 100644
--- a/vendor/symfony/yaml/Tests/DumperTest.php
+++ b/vendor/symfony/yaml/Tests/DumperTest.php
@@ -289,6 +289,7 @@ public function getEscapeSequences()
'double-quote' => ['"', "'\"'"],
'slash' => ['/', '/'],
'backslash' => ['\\', '\\'],
+ 'del' => ["\x7f", '"\x7f"'],
'next-line' => ["\xC2\x85", '"\\N"'],
'non-breaking-space' => ["\xc2\xa0", '"\\_"'],
'line-separator' => ["\xE2\x80\xA8", '"\\L"'],
@@ -553,6 +554,39 @@ public function testDumpingNotInlinedNullTaggedValue()
$this->assertSame($expected, $this->dumper->dump($data, 2));
}
+ public function testDumpingMultiLineStringAsScalarBlockTaggedValue()
+ {
+ $data = [
+ 'foo' => new TaggedValue('bar', "foo\nline with trailing spaces:\n \nbar\ninteger like line:\n123456789\nempty line:\n\nbaz"),
+ ];
+ $expected = <<<YAML
+foo: !bar |
+ foo
+ line with trailing spaces:
+
+ bar
+ integer like line:
+ 123456789
+ empty line:
+
+ baz
+
+YAML;
+
+ $this->assertSame($expected, $this->dumper->dump($data, 2, 0, Yaml::DUMP_MULTI_LINE_LITERAL_BLOCK));
+ }
+
+ public function testDumpingInlinedMultiLineIfRnBreakLineInTaggedValue()
+ {
+ $data = [
+ 'data' => [
+ 'foo' => new TaggedValue('bar', "foo\r\nline with trailing spaces:\n \nbar\ninteger like line:\n123456789\nempty line:\n\nbaz"),
+ ],
+ ];
+
+ $this->assertSame(file_get_contents(__DIR__.'/Fixtures/multiple_lines_as_literal_block_for_tagged_values.yml'), $this->dumper->dump($data, 2, 0, Yaml::DUMP_MULTI_LINE_LITERAL_BLOCK));
+ }
+
public function testDumpMultiLineStringAsScalarBlock()
{
$data = [
@@ -580,11 +614,26 @@ public function testDumpMultiLineStringAsScalarBlockWhenFirstLineHasLeadingSpace
$this->assertSame(file_get_contents(__DIR__.'/Fixtures/multiple_lines_as_literal_block_leading_space_in_first_line.yml'), $this->dumper->dump($data, 2, 0, Yaml::DUMP_MULTI_LINE_LITERAL_BLOCK));
}
- public function testCarriageReturnIsMaintainedWhenDumpingAsMultiLineLiteralBlock()
+ public function testCarriageReturnFollowedByNewlineIsMaintainedWhenDumpingAsMultiLineLiteralBlock()
{
$this->assertSame("- \"a\\r\\nb\\nc\"\n", $this->dumper->dump(["a\r\nb\nc"], 2, 0, Yaml::DUMP_MULTI_LINE_LITERAL_BLOCK));
}
+ public function testCarriageReturnNotFollowedByNewlineIsPreservedWhenDumpingAsMultiLineLiteralBlock()
+ {
+ $expected = <<<'YAML'
+parent:
+ foo: "bar\n\rbaz: qux"
+
+YAML;
+
+ $this->assertSame($expected, $this->dumper->dump([
+ 'parent' => [
+ 'foo' => "bar\n\rbaz: qux",
+ ],
+ ], 4, 0, Yaml::DUMP_MULTI_LINE_LITERAL_BLOCK));
+ }
+
public function testZeroIndentationThrowsException()
{
$this->expectException('InvalidArgumentException');
diff --git a/vendor/symfony/yaml/Tests/Fixtures/multiple_lines_as_literal_block_for_tagged_values.yml b/vendor/symfony/yaml/Tests/Fixtures/multiple_lines_as_literal_block_for_tagged_values.yml
new file mode 100644
index 0000000000..f8c9112fd5
--- /dev/null
+++ b/vendor/symfony/yaml/Tests/Fixtures/multiple_lines_as_literal_block_for_tagged_values.yml
@@ -0,0 +1,2 @@
+data:
+ foo: !bar "foo\r\nline with trailing spaces:\n \nbar\ninteger like line:\n123456789\nempty line:\n\nbaz"
diff --git a/vendor/symfony/yaml/Tests/Fixtures/sfComments.yml b/vendor/symfony/yaml/Tests/Fixtures/sfComments.yml
index af3ab38597..4b0c91c9b1 100644
--- a/vendor/symfony/yaml/Tests/Fixtures/sfComments.yml
+++ b/vendor/symfony/yaml/Tests/Fixtures/sfComments.yml
@@ -74,3 +74,17 @@ yaml: |
'foo #': baz
php: |
['foo #' => 'baz']
+---
+test: Comment before first item in unindented collection
+brief: >
+ Comment directly before unindented collection is allowed
+yaml: |
+ collection1:
+ # comment
+ - a
+ - b
+ collection2:
+ - a
+ - b
+php: |
+ ['collection1' => ['a', 'b'], 'collection2' => ['a', 'b']]
diff --git a/vendor/symfony/yaml/Tests/InlineTest.php b/vendor/symfony/yaml/Tests/InlineTest.php
index 014a12a706..0c6d509381 100644
--- a/vendor/symfony/yaml/Tests/InlineTest.php
+++ b/vendor/symfony/yaml/Tests/InlineTest.php
@@ -58,6 +58,7 @@ public function getTestsForParsePhpConstants()
['!php/const PHP_INT_MAX', PHP_INT_MAX],
['[!php/const PHP_INT_MAX]', [PHP_INT_MAX]],
['{ foo: !php/const PHP_INT_MAX }', ['foo' => PHP_INT_MAX]],
+ ['{ !php/const PHP_INT_MAX: foo }', [PHP_INT_MAX => 'foo']],
['!php/const NULL', null],
];
}
@@ -93,6 +94,7 @@ public function getTestsForParseLegacyPhpConstants()
['!php/const:PHP_INT_MAX', PHP_INT_MAX],
['[!php/const:PHP_INT_MAX]', [PHP_INT_MAX]],
['{ foo: !php/const:PHP_INT_MAX }', ['foo' => PHP_INT_MAX]],
+ ['{ !php/const:PHP_INT_MAX: foo }', [PHP_INT_MAX => 'foo']],
['!php/const:NULL', null],
];
}
@@ -691,7 +693,7 @@ public function getInvalidBinaryData()
public function testNotSupportedMissingValue()
{
$this->expectException('Symfony\Component\Yaml\Exception\ParseException');
- $this->expectExceptionMessage('Malformed inline YAML string: {this, is not, supported} at line 1.');
+ $this->expectExceptionMessage('Malformed inline YAML string: "{this, is not, supported}" at line 1.');
Inline::parse('{this, is not, supported}');
}
@@ -781,4 +783,73 @@ public function testUnfinishedInlineMap()
$this->expectExceptionMessage('Unexpected end of line, expected one of ",}" at line 1 (near "{abc: \'def\'").');
Inline::parse("{abc: 'def'");
}
+
+ /**
+ * @dataProvider getTestsForOctalNumbers
+ */
+ public function testParseOctalNumbers($expected, $yaml)
+ {
+ self::assertSame($expected, Inline::parse($yaml));
+ }
+
+ public function getTestsForOctalNumbers()
+ {
+ return [
+ 'positive octal number' => [28, '034'],
+ 'negative octal number' => [-28, '-034'],
+ ];
+ }
+
+ /**
+ * @dataProvider phpObjectTagWithEmptyValueProvider
+ */
+ public function testPhpObjectWithEmptyValue($expected, $value)
+ {
+ $this->assertSame($expected, Inline::parse($value, Yaml::PARSE_OBJECT));
+ }
+
+ public function phpObjectTagWithEmptyValueProvider()
+ {
+ return [
+ [false, '!php/object'],
+ [false, '!php/object '],
+ [false, '!php/object '],
+ [[false], '[!php/object]'],
+ [[false], '[!php/object ]'],
+ [[false, 'foo'], '[!php/object , foo]'],
+ ];
+ }
+
+ /**
+ * @dataProvider phpConstTagWithEmptyValueProvider
+ */
+ public function testPhpConstTagWithEmptyValue($expected, $value)
+ {
+ $this->assertSame($expected, Inline::parse($value, Yaml::PARSE_CONSTANT));
+ }
+
+ public function phpConstTagWithEmptyValueProvider()
+ {
+ return [
+ ['', '!php/const'],
+ ['', '!php/const '],
+ ['', '!php/const '],
+ [[''], '[!php/const]'],
+ [[''], '[!php/const ]'],
+ [['', 'foo'], '[!php/const , foo]'],
+ [['' => 'foo'], '{!php/const: foo}'],
+ [['' => 'foo'], '{!php/const : foo}'],
+ [['' => 'foo', 'bar' => 'ccc'], '{!php/const : foo, bar: ccc}'],
+ ];
+ }
+
+ public function testParsePositiveOctalNumberContainingInvalidDigits()
+ {
+ self::assertSame(342391, Inline::parse('0123456789'));
+ }
+
+ public function testParseNegativeOctalNumberContainingInvalidDigits()
+ {
+ self::assertSame(-342391, Inline::parse('-0123456789'));
+ }
}
diff --git a/vendor/symfony/yaml/Tests/ParserTest.php b/vendor/symfony/yaml/Tests/ParserTest.php
index dc7c122d59..6393b321fc 100644
--- a/vendor/symfony/yaml/Tests/ParserTest.php
+++ b/vendor/symfony/yaml/Tests/ParserTest.php
@@ -1650,6 +1650,33 @@ public function testBlankLinesInQuotedMultiLineString()
$this->assertSame($expected, $this->parser->parse($yaml));
}
+ public function testEscapedQuoteInQuotedMultiLineString()
+ {
+ $yaml = <<<YAML
+foobar: "foo
+ \\"bar\\"
+ baz"
+YAML;
+ $expected = [
+ 'foobar' => 'foo "bar" baz',
+ ];
+
+ $this->assertSame($expected, $this->parser->parse($yaml));
+ }
+
+ public function testBackslashInQuotedMultiLineString()
+ {
+ $yaml = <<<YAML
+foobar: "foo
+ bar\\\\"
+YAML;
+ $expected = [
+ 'foobar' => 'foo bar\\',
+ ];
+
+ $this->assertSame($expected, $this->parser->parse($yaml));
+ }
+
public function testParseMultiLineUnquotedString()
{
$yaml = <<<EOT
@@ -1794,7 +1821,7 @@ public function testUnsupportedTagWithScalar()
$this->assertEquals('!iterator foo', $this->parser->parse('!iterator foo'));
}
- public function testExceptionWhenUsingUnsuportedBuiltInTags()
+ public function testExceptionWhenUsingUnsupportedBuiltInTags()
{
$this->expectException('Symfony\Component\Yaml\Exception\ParseException');
$this->expectExceptionMessage('The built-in tag "!!foo" is not implemented at line 1 (near "!!foo").');
diff --git a/vendor/twig/twig/.gitattributes b/vendor/twig/twig/.gitattributes
new file mode 100644
index 0000000000..3a3ce6e7ce
--- /dev/null
+++ b/vendor/twig/twig/.gitattributes
@@ -0,0 +1,2 @@
+/tests export-ignore
+/phpunit.xml.dist export-ignore
diff --git a/vendor/twig/twig/CHANGELOG b/vendor/twig/twig/CHANGELOG
index 6ca3d45a1c..e549c93072 100644
--- a/vendor/twig/twig/CHANGELOG
+++ b/vendor/twig/twig/CHANGELOG
@@ -1,3 +1,12 @@
+* 1.42.5 (2020-02-11)
+
+ * Fix implementation of case-insensitivity for method names
+
+* 1.42.4 (2019-11-11)
+
+ * optimized "block('foo') ?? 'bar"
+ * added supported for exponential numbers
+
* 1.42.3 (2019-08-24)
* fixed the "split" filter when the delimiter is "0"
diff --git a/vendor/twig/twig/LICENSE b/vendor/twig/twig/LICENSE
index d06ced2a39..5e8a0b8b9f 100644
--- a/vendor/twig/twig/LICENSE
+++ b/vendor/twig/twig/LICENSE
@@ -1,6 +1,4 @@
-Copyright (c) 2009-2019 by the Twig Team.
-
-Some rights reserved.
+Copyright (c) 2009-2020 by the Twig Team.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
diff --git a/vendor/twig/twig/composer.json b/vendor/twig/twig/composer.json
index 9807aa7711..c306353a9d 100644
--- a/vendor/twig/twig/composer.json
+++ b/vendor/twig/twig/composer.json
@@ -14,7 +14,6 @@
},
{
"name": "Twig Team",
- "homepage": "https://twig.symfony.com/contributors",
"role": "Contributors"
},
{
@@ -28,8 +27,7 @@
"symfony/polyfill-ctype": "^1.8"
},
"require-dev": {
- "symfony/phpunit-bridge": "^4.4@dev|^5.0",
- "symfony/debug": "^3.4|^4.2",
+ "symfony/phpunit-bridge": "^4.4|^5.0",
"psr/container": "^1.0"
},
"autoload": {
diff --git a/vendor/twig/twig/doc/advanced.rst b/vendor/twig/twig/doc/advanced.rst
index e253294191..2b0053b6ef 100644
--- a/vendor/twig/twig/doc/advanced.rst
+++ b/vendor/twig/twig/doc/advanced.rst
@@ -584,11 +584,6 @@ to host all the specific tags and filters you want to add to Twig.
recompile your templates whenever you make a change to it (when
``auto_reload`` is enabled).
-.. note::
-
- Before writing your own extensions, have a look at the Twig official
- extension repository: https://github.com/twigphp/Twig-extensions.
-
An extension is a class that implements the following interface::
interface Twig_ExtensionInterface
@@ -665,7 +660,7 @@ An extension is a class that implements the following interface::
To keep your extension class clean and lean, inherit from the built-in
``\Twig\Extension\AbstractExtension`` class instead of implementing the interface as it provides
-empty implementations for all methods:
+empty implementations for all methods::
class Project_Twig_Extension extends \Twig\Extension\AbstractExtension
{
diff --git a/vendor/twig/twig/doc/advanced_legacy.rst b/vendor/twig/twig/doc/advanced_legacy.rst
index cc87b9c9e8..409b914405 100644
--- a/vendor/twig/twig/doc/advanced_legacy.rst
+++ b/vendor/twig/twig/doc/advanced_legacy.rst
@@ -524,11 +524,6 @@ to host all the specific tags and filters you want to add to Twig.
recompile your templates whenever you make a change to it (when the
``auto_reload`` is enabled).
-.. note::
-
- Before writing your own extensions, have a look at the Twig official
- extension repository: https://github.com/twigphp/Twig-extensions.
-
An extension is a class that implements the following interface::
interface Twig_ExtensionInterface
diff --git a/vendor/twig/twig/doc/api.rst b/vendor/twig/twig/doc/api.rst
index b96b0d4e7f..40ccd6992e 100644
--- a/vendor/twig/twig/doc/api.rst
+++ b/vendor/twig/twig/doc/api.rst
@@ -19,8 +19,7 @@ to have multiple environments side by side, with different configurations.
The typical way to configure Twig to load templates for an application looks
roughly like this::
- require_once '/path/to/lib/Twig/Autoloader.php';
- Twig_Autoloader::register();
+ require_once '/path/to/vendor/autoload.php';
$loader = new \Twig\Loader\FilesystemLoader('/path/to/templates');
$twig = new \Twig\Environment($loader, [
@@ -357,8 +356,8 @@ This section describes the features added by the built-in extensions.
.. tip::
- Read the chapter about extending Twig to learn how to create your own
- extensions.
+ Read the chapter about :doc:`extending Twig <advanced>` to learn how to
+ create your own extensions.
Core Extension
~~~~~~~~~~~~~~
@@ -417,7 +416,7 @@ The escaping rules are implemented as follows:
{% set text = "Twig<br />" %}
{{ text }} {# will be escaped #}
-* Expressions which the result is always a literal or a variable marked safe
+* Expressions which the result is a literal or a variable marked safe
are never automatically escaped:
.. code-block:: twig
@@ -425,14 +424,12 @@ The escaping rules are implemented as follows:
{{ foo ? "Twig<br />" : "<br />Twig" }} {# won't be escaped #}
{% set text = "Twig<br />" %}
- {{ foo ? text : "<br />Twig" }} {# will be escaped #}
+ {{ true ? text : "<br />Twig" }} {# will be escaped #}
+ {{ false ? text : "<br />Twig" }} {# won't be escaped #}
{% set text = "Twig<br />" %}
{{ foo ? text|raw : "<br />Twig" }} {# won't be escaped #}
- {% set text = "Twig<br />" %}
- {{ foo ? text|escape : "<br />Twig" }} {# the result of the expression won't be escaped #}
-
* Escaping is applied before printing, after any other filter is applied:
.. code-block:: twig
diff --git a/vendor/twig/twig/doc/filters/batch.rst b/vendor/twig/twig/doc/filters/batch.rst
index cc50ec8e85..a1271735e4 100644
--- a/vendor/twig/twig/doc/filters/batch.rst
+++ b/vendor/twig/twig/doc/filters/batch.rst
@@ -49,3 +49,4 @@ Arguments
* ``size``: The size of the batch; fractional numbers will be rounded up
* ``fill``: Used to fill in missing items
+* ``preserve_keys``: Whether to preserve keys or not
diff --git a/vendor/twig/twig/doc/filters/filter.rst b/vendor/twig/twig/doc/filters/filter.rst
index 310e63a73e..e9f968290f 100644
--- a/vendor/twig/twig/doc/filters/filter.rst
+++ b/vendor/twig/twig/doc/filters/filter.rst
@@ -1,5 +1,5 @@
``filter``
-=========
+==========
.. versionadded:: 1.41
The ``filter`` filter was added in Twig 1.41 and 2.10.
diff --git a/vendor/twig/twig/doc/filters/map.rst b/vendor/twig/twig/doc/filters/map.rst
index 9b1f5d738e..e983e33b48 100644
--- a/vendor/twig/twig/doc/filters/map.rst
+++ b/vendor/twig/twig/doc/filters/map.rst
@@ -34,5 +34,4 @@ Note that the arrow function has access to the current context.
Arguments
---------
-* ``array``: The sequence or mapping
* ``arrow``: The arrow function
diff --git a/vendor/twig/twig/doc/filters/reduce.rst b/vendor/twig/twig/doc/filters/reduce.rst
index 7d04d6c7b0..af6164a95f 100644
--- a/vendor/twig/twig/doc/filters/reduce.rst
+++ b/vendor/twig/twig/doc/filters/reduce.rst
@@ -1,5 +1,5 @@
``reduce``
-=========
+==========
.. versionadded:: 1.41
The ``reduce`` filter was added in Twig 1.41 and 2.10.
@@ -28,6 +28,5 @@ Note that the arrow function has access to the current context.
Arguments
---------
-* ``array``: The sequence or mapping
* ``arrow``: The arrow function
* ``initial``: The initial value
diff --git a/vendor/twig/twig/doc/functions/block.rst b/vendor/twig/twig/doc/functions/block.rst
index c62614822a..927fc321ff 100644
--- a/vendor/twig/twig/doc/functions/block.rst
+++ b/vendor/twig/twig/doc/functions/block.rst
@@ -1,10 +1,10 @@
``block``
=========
-.. versionadded: 1.28
+.. versionadded:: 1.28
Using ``block`` with the ``defined`` test was added in Twig 1.28.
-.. versionadded: 1.28
+.. versionadded:: 1.28
Support for the template argument was added in Twig 1.28.
When a template uses inheritance and if you want to print a block multiple
diff --git a/vendor/twig/twig/doc/functions/constant.rst b/vendor/twig/twig/doc/functions/constant.rst
index f9d836cd1c..bb19858c22 100644
--- a/vendor/twig/twig/doc/functions/constant.rst
+++ b/vendor/twig/twig/doc/functions/constant.rst
@@ -1,10 +1,10 @@
``constant``
============
-.. versionadded: 1.12.1
+.. versionadded:: 1.12.1
constant now accepts object instances as the second argument.
-.. versionadded: 1.28
+.. versionadded:: 1.28
Using ``constant`` with the ``defined`` test was added in Twig 1.28.
``constant`` returns the constant value for a given string:
diff --git a/vendor/twig/twig/doc/templates.rst b/vendor/twig/twig/doc/templates.rst
index 168a8f7085..adf2b5395d 100644
--- a/vendor/twig/twig/doc/templates.rst
+++ b/vendor/twig/twig/doc/templates.rst
@@ -865,11 +865,8 @@ the modifiers on one side of a tag or on both sides:
Extensions
----------
-Twig can be extended. If you are looking for new tags, filters, or functions,
-have a look at the Twig official `extension repository`_.
-
-If you want to create your own, read the :ref:`Creating an
-Extension<creating_extensions>` chapter.
+Twig can be extended. If you want to create your own extensions, read the
+:ref:`Creating an Extension <creating_extensions>` chapter.
.. _`Twig bundle`: https://github.com/Anomareh/PHP-Twig.tmbundle
.. _`Jinja syntax plugin`: http://jinja.pocoo.org/docs/integration/#vim
@@ -877,7 +874,6 @@ Extension<creating_extensions>` chapter.
.. _`Twig syntax plugin`: http://plugins.netbeans.org/plugin/37069/php-twig
.. _`Twig plugin`: https://github.com/pulse00/Twig-Eclipse-Plugin
.. _`Twig language definition`: https://github.com/gabrielcorpse/gedit-twig-template-language
-.. _`extension repository`: https://github.com/twigphp/Twig-extensions
.. _`Twig syntax mode`: https://github.com/bobthecow/Twig-HTML.mode
.. _`other Twig syntax mode`: https://github.com/muxx/Twig-HTML.mode
.. _`Notepad++ Twig Highlighter`: https://github.com/Banane9/notepadplusplus-twig
diff --git a/vendor/twig/twig/doc/tests/constant.rst b/vendor/twig/twig/doc/tests/constant.rst
index 98abf4d45d..5dc87e3ecd 100644
--- a/vendor/twig/twig/doc/tests/constant.rst
+++ b/vendor/twig/twig/doc/tests/constant.rst
@@ -1,7 +1,7 @@
``constant``
============
-.. versionadded: 1.13.1
+.. versionadded:: 1.13.1
constant now accepts object instances as the second argument.
``constant`` checks if a variable has the exact same value as a constant. You
diff --git a/vendor/twig/twig/doc/tests/sameas.rst b/vendor/twig/twig/doc/tests/sameas.rst
index 4fc267dbcb..b400b89c55 100644
--- a/vendor/twig/twig/doc/tests/sameas.rst
+++ b/vendor/twig/twig/doc/tests/sameas.rst
@@ -5,7 +5,7 @@
The ``same as`` test was added in Twig 1.14.2 as an alias for ``sameas``.
``same as`` checks if a variable is the same as another variable.
-This is the equivalent to ``===`` in PHP:
+This is equivalent to ``===`` in PHP:
.. code-block:: twig
diff --git a/vendor/twig/twig/drupal_test.sh b/vendor/twig/twig/drupal_test.sh
index 0374593c20..d71aad8daf 100755
--- a/vendor/twig/twig/drupal_test.sh
+++ b/vendor/twig/twig/drupal_test.sh
@@ -17,7 +17,6 @@
wget https://get.symfony.com/cli/installer -O - | bash
export PATH="$HOME/.symfony/bin:$PATH"
symfony server:start -d --no-tls
-ENDPOINT=`symfony server:status -no-ansi | sed -E 's/^.+ http/http/'`
curl -OLsS https://get.blackfire.io/blackfire-player.phar
chmod +x blackfire-player.phar
@@ -47,5 +46,5 @@
click link('Structure')
expect status_code() == 200
EOF
-./blackfire-player.phar run drupal-tests.bkf --endpoint=$ENDPOINT --variable name=$DRUPAL_Username --variable pass=$DRUPAL_Password
+./blackfire-player.phar run drupal-tests.bkf --endpoint=`symfony var:export SYMFONY_DEFAULT_ROUTE_URL` --variable name=$DRUPAL_Username --variable pass=$DRUPAL_Password
symfony server:stop
diff --git a/vendor/twig/twig/ext/twig/php_twig.h b/vendor/twig/twig/ext/twig/php_twig.h
index 79ac938df5..344539abaa 100644
--- a/vendor/twig/twig/ext/twig/php_twig.h
+++ b/vendor/twig/twig/ext/twig/php_twig.h
@@ -15,7 +15,7 @@
#ifndef PHP_TWIG_H
#define PHP_TWIG_H
-#define PHP_TWIG_VERSION "1.42.3"
+#define PHP_TWIG_VERSION "1.42.5-DEV"
#include "php.h"
diff --git a/vendor/twig/twig/phpunit.xml.dist b/vendor/twig/twig/phpunit.xml.dist
deleted file mode 100644
index 391f244a7f..0000000000
--- a/vendor/twig/twig/phpunit.xml.dist
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit backupGlobals="false"
- backupStaticAttributes="false"
- colors="true"
- convertErrorsToExceptions="true"
- convertNoticesToExceptions="true"
- convertWarningsToExceptions="true"
- processIsolation="false"
- stopOnFailure="false"
- bootstrap="vendor/autoload.php"
->
- <testsuites>
- <testsuite name="Twig Test Suite">
- <directory>./tests/</directory>
- </testsuite>
- </testsuites>
-
- <php>
- <ini name="error_reporting" value="-1" />
- <ini name="xdebug.overload_var_dump" value="0" />
- </php>
-
- <listeners>
- <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener" />
- </listeners>
-
- <filter>
- <whitelist>
- <directory suffix=".php">./src/</directory>
- </whitelist>
- </filter>
-</phpunit>
diff --git a/vendor/twig/twig/src/Environment.php b/vendor/twig/twig/src/Environment.php
index acd8233a7f..97fa4c4db9 100644
--- a/vendor/twig/twig/src/Environment.php
+++ b/vendor/twig/twig/src/Environment.php
@@ -41,11 +41,11 @@
*/
class Environment
{
- const VERSION = '1.42.3';
- const VERSION_ID = 14203;
+ const VERSION = '1.42.5';
+ const VERSION_ID = 14205;
const MAJOR_VERSION = 1;
const MINOR_VERSION = 42;
- const RELEASE_VERSION = 3;
+ const RELEASE_VERSION = 5;
const EXTRA_VERSION = '';
protected $charset;
@@ -515,7 +515,7 @@ public function loadClass($cls, $name, $index = null)
*
* This method should not be used as a generic way to load templates.
*
- * @param string $template The template name
+ * @param string $template The template source
* @param string $name An optional name of the template to be used in error messages
*
* @return TemplateWrapper A template instance representing the given template name
diff --git a/vendor/twig/twig/src/ExpressionParser.php b/vendor/twig/twig/src/ExpressionParser.php
index 9066ade169..a3ff72530b 100644
--- a/vendor/twig/twig/src/ExpressionParser.php
+++ b/vendor/twig/twig/src/ExpressionParser.php
@@ -657,7 +657,7 @@ public function parseAssignmentExpression()
$stream->expect(Token::NAME_TYPE, null, 'Only variables can be assigned to');
}
$value = $token->getValue();
- if (\in_array(strtolower($value), ['true', 'false', 'none', 'null'])) {
+ if (\in_array(strtr($value, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz'), ['true', 'false', 'none', 'null'])) {
throw new SyntaxError(sprintf('You cannot assign a value to "%s".', $value), $token->getLine(), $stream->getSourceContext());
}
$targets[] = new AssignNameExpression($value, $token->getLine());
diff --git a/vendor/twig/twig/src/Extension/CoreExtension.php b/vendor/twig/twig/src/Extension/CoreExtension.php
index 5f3cc24a19..5ff1e39ee6 100644
--- a/vendor/twig/twig/src/Extension/CoreExtension.php
+++ b/vendor/twig/twig/src/Extension/CoreExtension.php
@@ -459,7 +459,7 @@ function twig_date_modify_filter(Environment $env, $date, $modifier)
* @param \DateTime|\DateTimeInterface|string|null $date A date
* @param \DateTimeZone|string|false|null $timezone The target timezone, null to use the default, false to leave unchanged
*
- * @return \DateTime
+ * @return \DateTimeInterface
*/
function twig_date_converter(Environment $env, $date = null, $timezone = null)
{
diff --git a/vendor/twig/twig/src/Lexer.php b/vendor/twig/twig/src/Lexer.php
index 8cae3597f1..697a6cfa1d 100644
--- a/vendor/twig/twig/src/Lexer.php
+++ b/vendor/twig/twig/src/Lexer.php
@@ -47,7 +47,7 @@ class Lexer implements \Twig_LexerInterface
const STATE_INTERPOLATION = 4;
const REGEX_NAME = '/[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/A';
- const REGEX_NUMBER = '/[0-9]+(?:\.[0-9]+)?/A';
+ const REGEX_NUMBER = '/[0-9]+(?:\.[0-9]+)?([Ee][\+\-][0-9]+)?/A';
const REGEX_STRING = '/"([^#"\\\\]*(?:\\\\.[^#"\\\\]*)*)"|\'([^\'\\\\]*(?:\\\\.[^\'\\\\]*)*)\'/As';
const REGEX_DQ_STRING_DELIM = '/"/A';
const REGEX_DQ_STRING_PART = '/[^#"\\\\]*(?:(?:\\\\.|#(?!\{))[^#"\\\\]*)*/As';
diff --git a/vendor/twig/twig/src/Node/Expression/NullCoalesceExpression.php b/vendor/twig/twig/src/Node/Expression/NullCoalesceExpression.php
index 49326d467d..917d31a3b2 100644
--- a/vendor/twig/twig/src/Node/Expression/NullCoalesceExpression.php
+++ b/vendor/twig/twig/src/Node/Expression/NullCoalesceExpression.php
@@ -22,11 +22,15 @@ class NullCoalesceExpression extends ConditionalExpression
{
public function __construct(\Twig_NodeInterface $left, \Twig_NodeInterface $right, $lineno)
{
- $test = new AndBinary(
- new DefinedTest(clone $left, 'defined', new Node(), $left->getTemplateLine()),
- new NotUnary(new NullTest($left, 'null', new Node(), $left->getTemplateLine()), $left->getTemplateLine()),
- $left->getTemplateLine()
- );
+ $test = new DefinedTest(clone $left, 'defined', new Node(), $left->getTemplateLine());
+ // for "block()", we don't need the null test as the return value is always a string
+ if (!$left instanceof BlockReferenceExpression) {
+ $test = new AndBinary(
+ $test,
+ new NotUnary(new NullTest($left, 'null', new Node(), $left->getTemplateLine()), $left->getTemplateLine()),
+ $left->getTemplateLine()
+ );
+ }
parent::__construct($test, $left, $right, $lineno);
}
diff --git a/vendor/twig/twig/src/Parser.php b/vendor/twig/twig/src/Parser.php
index 0ea102cc81..9fb6a83a4e 100644
--- a/vendor/twig/twig/src/Parser.php
+++ b/vendor/twig/twig/src/Parser.php
@@ -299,7 +299,7 @@ public function isReservedMacroName($name)
$this->reservedMacroNames = [];
$r = new \ReflectionClass($this->env->getBaseTemplateClass());
foreach ($r->getMethods() as $method) {
- $methodName = strtolower($method->getName());
+ $methodName = strtr($method->getName(), 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz');
if ('get' === substr($methodName, 0, 3) && isset($methodName[3])) {
$this->reservedMacroNames[] = substr($methodName, 3);
@@ -307,7 +307,7 @@ public function isReservedMacroName($name)
}
}
- return \in_array(strtolower($name), $this->reservedMacroNames);
+ return \in_array(strtr($name, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz'), $this->reservedMacroNames);
}
public function addTrait($trait)
diff --git a/vendor/twig/twig/src/Sandbox/SecurityPolicy.php b/vendor/twig/twig/src/Sandbox/SecurityPolicy.php
index 31b6c34833..603843591a 100644
--- a/vendor/twig/twig/src/Sandbox/SecurityPolicy.php
+++ b/vendor/twig/twig/src/Sandbox/SecurityPolicy.php
@@ -51,7 +51,7 @@ public function setAllowedMethods(array $methods)
{
$this->allowedMethods = [];
foreach ($methods as $class => $m) {
- $this->allowedMethods[$class] = array_map('strtolower', \is_array($m) ? $m : [$m]);
+ $this->allowedMethods[$class] = array_map(function ($value) { return strtr($value, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz'); }, \is_array($m) ? $m : [$m]);
}
}
@@ -93,7 +93,7 @@ public function checkMethodAllowed($obj, $method)
}
$allowed = false;
- $method = strtolower($method);
+ $method = strtr($method, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz');
foreach ($this->allowedMethods as $class => $methods) {
if ($obj instanceof $class) {
$allowed = \in_array($method, $methods);
diff --git a/vendor/twig/twig/src/Template.php b/vendor/twig/twig/src/Template.php
index 3f7447c126..704125e538 100644
--- a/vendor/twig/twig/src/Template.php
+++ b/vendor/twig/twig/src/Template.php
@@ -628,7 +628,7 @@ protected function getAttribute($object, $item, array $arguments = [], $type = s
foreach ($ref->getMethods(\ReflectionMethod::IS_PUBLIC) as $refMethod) {
// Accessing the environment from templates is forbidden to prevent untrusted changes to the environment
- if ('getenvironment' !== strtolower($refMethod->name)) {
+ if ('getenvironment' !== strtr($refMethod->name, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz')) {
$methods[] = $refMethod->name;
}
}
@@ -642,7 +642,7 @@ protected function getAttribute($object, $item, array $arguments = [], $type = s
foreach ($methods as $method) {
$cache[$method] = $method;
- $cache[$lcName = strtolower($method)] = $method;
+ $cache[$lcName = strtr($method, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz')] = $method;
if ('g' === $lcName[0] && 0 === strpos($lcName, 'get')) {
$name = substr($method, 3);
@@ -670,7 +670,7 @@ protected function getAttribute($object, $item, array $arguments = [], $type = s
$call = false;
if (isset(self::$cache[$class][$item])) {
$method = self::$cache[$class][$item];
- } elseif (isset(self::$cache[$class][$lcItem = strtolower($item)])) {
+ } elseif (isset(self::$cache[$class][$lcItem = strtr($item, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz')])) {
$method = self::$cache[$class][$lcItem];
} elseif (isset(self::$cache[$class]['__call'])) {
$method = $item;
diff --git a/vendor/twig/twig/tests/AutoloaderTest.php b/vendor/twig/twig/tests/AutoloaderTest.php
deleted file mode 100644
index 9bf538aee2..0000000000
--- a/vendor/twig/twig/tests/AutoloaderTest.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-namespace Twig\Tests;
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-class AutoloaderTest extends \PHPUnit\Framework\TestCase
-{
- /**
- * @group legacy
- */
- public function testAutoload()
- {
- $this->assertFalse(class_exists('FooBarFoo'), '->autoload() does not try to load classes that does not begin with Twig');
-
- $autoloader = new \Twig_Autoloader();
- $this->assertNull($autoloader->autoload('Foo'), '->autoload() returns false if it is not able to load a class');
- }
-}
diff --git a/vendor/twig/twig/tests/Cache/FilesystemTest.php b/vendor/twig/twig/tests/Cache/FilesystemTest.php
deleted file mode 100644
index c810caed98..0000000000
--- a/vendor/twig/twig/tests/Cache/FilesystemTest.php
+++ /dev/null
@@ -1,193 +0,0 @@
-<?php
-
-namespace Twig\Tests\Cache;
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Twig\Cache\FilesystemCache;
-use Twig\Tests\FilesystemHelper;
-
-class FilesystemTest extends \PHPUnit\Framework\TestCase
-{
- private $classname;
- private $directory;
- private $cache;
-
- protected function setUp()
- {
- $nonce = hash('sha256', uniqid(mt_rand(), true));
- $this->classname = '__Twig_Tests_Cache_FilesystemTest_Template_'.$nonce;
- $this->directory = sys_get_temp_dir().'/twig-test';
- $this->cache = new FilesystemCache($this->directory);
- }
-
- protected function tearDown()
- {
- if (file_exists($this->directory)) {
- FilesystemHelper::removeDir($this->directory);
- }
- }
-
- public function testLoad()
- {
- $key = $this->directory.'/cache/cachefile.php';
-
- $dir = \dirname($key);
- @mkdir($dir, 0777, true);
- $this->assertDirectoryExists($dir);
- $this->assertFalse(class_exists($this->classname, false));
-
- $content = $this->generateSource();
- file_put_contents($key, $content);
-
- $this->cache->load($key);
-
- $this->assertTrue(class_exists($this->classname, false));
- }
-
- public function testLoadMissing()
- {
- $key = $this->directory.'/cache/cachefile.php';
-
- $this->assertFalse(class_exists($this->classname, false));
-
- $this->cache->load($key);
-
- $this->assertFalse(class_exists($this->classname, false));
- }
-
- public function testWrite()
- {
- $key = $this->directory.'/cache/cachefile.php';
- $content = $this->generateSource();
-
- $this->assertFileNotExists($key);
- $this->assertFileNotExists($this->directory);
-
- $this->cache->write($key, $content);
-
- $this->assertFileExists($this->directory);
- $this->assertFileExists($key);
- $this->assertSame(file_get_contents($key), $content);
- }
-
- public function testWriteFailMkdir()
- {
- $this->expectException('\RuntimeException');
- $this->expectExceptionMessage('Unable to create the cache directory');
-
- if (\defined('PHP_WINDOWS_VERSION_BUILD')) {
- $this->markTestSkipped('Read-only directories not possible on Windows.');
- }
-
- $key = $this->directory.'/cache/cachefile.php';
- $content = $this->generateSource();
-
- $this->assertFileNotExists($key);
-
- // Create read-only root directory.
- @mkdir($this->directory, 0555, true);
- $this->assertDirectoryExists($this->directory);
-
- $this->cache->write($key, $content);
- }
-
- public function testWriteFailDirWritable()
- {
- $this->expectException('\RuntimeException');
- $this->expectExceptionMessage('Unable to write in the cache directory');
-
- if (\defined('PHP_WINDOWS_VERSION_BUILD')) {
- $this->markTestSkipped('Read-only directories not possible on Windows.');
- }
-
- $key = $this->directory.'/cache/cachefile.php';
- $content = $this->generateSource();
-
- $this->assertFileNotExists($key);
-
- // Create root directory.
- @mkdir($this->directory, 0777, true);
- // Create read-only subdirectory.
- @mkdir($this->directory.'/cache', 0555);
- $this->assertDirectoryExists($this->directory.'/cache');
-
- $this->cache->write($key, $content);
- }
-
- public function testWriteFailWriteFile()
- {
- $this->expectException('\RuntimeException');
- $this->expectExceptionMessage('Failed to write cache file');
-
- $key = $this->directory.'/cache/cachefile.php';
- $content = $this->generateSource();
-
- $this->assertFileNotExists($key);
-
- // Create a directory in the place of the cache file.
- @mkdir($key, 0777, true);
- $this->assertDirectoryExists($key);
-
- $this->cache->write($key, $content);
- }
-
- public function testGetTimestamp()
- {
- $key = $this->directory.'/cache/cachefile.php';
-
- $dir = \dirname($key);
- @mkdir($dir, 0777, true);
- $this->assertDirectoryExists($dir);
-
- // Create the file with a specific modification time.
- touch($key, 1234567890);
-
- $this->assertSame(1234567890, $this->cache->getTimestamp($key));
- }
-
- public function testGetTimestampMissingFile()
- {
- $key = $this->directory.'/cache/cachefile.php';
- $this->assertSame(0, $this->cache->getTimestamp($key));
- }
-
- /**
- * Test file cache is tolerant towards trailing (back)slashes on the configured cache directory.
- *
- * @dataProvider provideDirectories
- */
- public function testGenerateKey($expected, $input)
- {
- $cache = new FilesystemCache($input);
- $this->assertRegExp($expected, $cache->generateKey('_test_', \get_class($this)));
- }
-
- public function provideDirectories()
- {
- $pattern = '#a/b/[a-zA-Z0-9]+/[a-zA-Z0-9]+.php$#';
-
- return [
- [$pattern, 'a/b'],
- [$pattern, 'a/b/'],
- [$pattern, 'a/b\\'],
- [$pattern, 'a/b\\/'],
- [$pattern, 'a/b\\//'],
- ['#/'.substr($pattern, 1), '/a/b'],
- ];
- }
-
- private function generateSource()
- {
- return strtr('<?php class {{classname}} {}', [
- '{{classname}}' => $this->classname,
- ]);
- }
-}
diff --git a/vendor/twig/twig/tests/CompilerTest.php b/vendor/twig/twig/tests/CompilerTest.php
deleted file mode 100644
index cc462c2519..0000000000
--- a/vendor/twig/twig/tests/CompilerTest.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-namespace Twig\Tests;
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Twig\Compiler;
-use Twig\Environment;
-
-class CompilerTest extends \PHPUnit\Framework\TestCase
-{
- public function testReprNumericValueWithLocale()
- {
- $compiler = new Compiler(new Environment($this->createMock('\Twig\Loader\LoaderInterface')));
-
- $locale = setlocale(LC_NUMERIC, 0);
- if (false === $locale) {
- $this->markTestSkipped('Your platform does not support locales.');
- }
-
- $required_locales = ['fr_FR.UTF-8', 'fr_FR.UTF8', 'fr_FR.utf-8', 'fr_FR.utf8', 'French_France.1252'];
- if (false === setlocale(LC_NUMERIC, $required_locales)) {
- $this->markTestSkipped('Could not set any of required locales: '.implode(', ', $required_locales));
- }
-
- $this->assertEquals('1.2', $compiler->repr(1.2)->getSource());
- $this->assertStringContainsString('fr', strtolower(setlocale(LC_NUMERIC, 0)));
-
- setlocale(LC_NUMERIC, $locale);
- }
-}
diff --git a/vendor/twig/twig/tests/ContainerRuntimeLoaderTest.php b/vendor/twig/twig/tests/ContainerRuntimeLoaderTest.php
deleted file mode 100644
index c85648342f..0000000000
--- a/vendor/twig/twig/tests/ContainerRuntimeLoaderTest.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-namespace Twig\Tests;
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Twig\RuntimeLoader\ContainerRuntimeLoader;
-
-class ContainerRuntimeLoaderTest extends \PHPUnit\Framework\TestCase
-{
- /**
- * @requires PHP 5.3
- */
- public function testLoad()
- {
- $container = $this->createMock('Psr\Container\ContainerInterface');
- $container->expects($this->once())->method('has')->with('stdClass')->willReturn(true);
- $container->expects($this->once())->method('get')->with('stdClass')->willReturn(new \stdClass());
-
- $loader = new ContainerRuntimeLoader($container);
-
- $this->assertInstanceOf('stdClass', $loader->load('stdClass'));
- }
-
- /**
- * @requires PHP 5.3
- */
- public function testLoadUnknownRuntimeReturnsNull()
- {
- $container = $this->createMock('Psr\Container\ContainerInterface');
- $container->expects($this->once())->method('has')->with('Foo');
- $container->expects($this->never())->method('get');
-
- $loader = new ContainerRuntimeLoader($container);
- $this->assertNull($loader->load('Foo'));
- }
-}
diff --git a/vendor/twig/twig/tests/CustomExtensionTest.php b/vendor/twig/twig/tests/CustomExtensionTest.php
deleted file mode 100644
index b45e1434f2..0000000000
--- a/vendor/twig/twig/tests/CustomExtensionTest.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-
-namespace Twig\Tests;
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Twig\Environment;
-use Twig\Extension\ExtensionInterface;
-
-class CustomExtensionTest extends \PHPUnit\Framework\TestCase
-{
- /**
- * @requires PHP 5.3
- * @dataProvider provideInvalidExtensions
- */
- public function testGetInvalidOperators(ExtensionInterface $extension, $expectedExceptionMessage)
- {
- $this->expectException('InvalidArgumentException');
- $this->expectExceptionMessage($expectedExceptionMessage);
-
- $env = new Environment($this->createMock('\Twig\Loader\LoaderInterface'));
- $env->addExtension($extension);
- $env->getUnaryOperators();
- }
-
- public function provideInvalidExtensions()
- {
- return [
- [new InvalidOperatorExtension(new \stdClass()), '"Twig\Tests\InvalidOperatorExtension::getOperators()" must return an array with operators, got "stdClass".'],
- [new InvalidOperatorExtension([1, 2, 3]), '"Twig\Tests\InvalidOperatorExtension::getOperators()" must return an array of 2 elements, got 3.'],
- ];
- }
-}
-
-class InvalidOperatorExtension implements ExtensionInterface
-{
- private $operators;
-
- public function __construct($operators)
- {
- $this->operators = $operators;
- }
-
- public function initRuntime(Environment $environment)
- {
- }
-
- public function getTokenParsers()
- {
- return [];
- }
-
- public function getNodeVisitors()
- {
- return [];
- }
-
- public function getFilters()
- {
- return [];
- }
-
- public function getTests()
- {
- return [];
- }
-
- public function getFunctions()
- {
- return [];
- }
-
- public function getGlobals()
- {
- return [];
- }
-
- public function getOperators()
- {
- return $this->operators;
- }
-
- public function getName()
- {
- return __CLASS__;
- }
-}
diff --git a/vendor/twig/twig/tests/EnvironmentTest.php b/vendor/twig/twig/tests/EnvironmentTest.php
deleted file mode 100644
index 54a894506c..0000000000
--- a/vendor/twig/twig/tests/EnvironmentTest.php
+++ /dev/null
@@ -1,678 +0,0 @@
-<?php
-
-namespace Twig\Tests;
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Twig\Cache\FilesystemCache;
-use Twig\Environment;
-use Twig\Extension\AbstractExtension;
-use Twig\Extension\GlobalsInterface;
-use Twig\Extension\InitRuntimeInterface;
-use Twig\Loader\ArrayLoader;
-use Twig\Loader\LoaderInterface;
-use Twig\Loader\SourceContextLoaderInterface;
-use Twig\NodeVisitor\NodeVisitorInterface;
-use Twig\Source;
-use Twig\Token;
-use Twig\TokenParser\AbstractTokenParser;
-use Twig\TwigFilter;
-use Twig\TwigFunction;
-use Twig\TwigTest;
-
-class EnvironmentTest extends \PHPUnit\Framework\TestCase
-{
- private $deprecations = [];
-
- /**
- * @group legacy
- */
- public function testLegacyTokenizeSignature()
- {
- $env = new Environment();
- $stream = $env->tokenize('{{ foo }}', 'foo');
- $this->assertEquals('{{ foo }}', $stream->getSource());
- $this->assertEquals('foo', $stream->getFilename());
- }
-
- /**
- * @group legacy
- */
- public function testLegacyCompileSourceSignature()
- {
- $loader = new ArrayLoader(['foo' => '{{ foo }}']);
- $env = new Environment($loader);
- $this->assertStringContainsString('getTemplateName', $env->compileSource('{{ foo }}', 'foo'));
- }
-
- /**
- * @group legacy
- */
- public function testRenderNoLoader()
- {
- $this->expectException('\LogicException');
- $this->expectExceptionMessage('You must set a loader first.');
-
- $env = new Environment();
- $env->render('test');
- }
-
- public function testAutoescapeOption()
- {
- $loader = new ArrayLoader([
- 'html' => '{{ foo }} {{ foo }}',
- 'js' => '{{ bar }} {{ bar }}',
- ]);
-
- $twig = new Environment($loader, [
- 'debug' => true,
- 'cache' => false,
- 'autoescape' => [$this, 'escapingStrategyCallback'],
- ]);
-
- $this->assertEquals('foo<br/ > foo<br/ >', $twig->render('html', ['foo' => 'foo<br/ >']));
- $this->assertEquals('foo\u003Cbr\/\u0020\u003E foo\u003Cbr\/\u0020\u003E', $twig->render('js', ['bar' => 'foo<br/ >']));
- }
-
- public function escapingStrategyCallback($name)
- {
- return $name;
- }
-
- public function testGlobals()
- {
- // to be removed in 2.0
- $loader = $this->createMock('\Twig\Tests\EnvironmentTestLoaderInterface');
- //$loader = $this->createMock(['\Twig\Loader\LoaderInterface', '\Twig\Loader\SourceContextLoaderInterface']);
- $loader->expects($this->any())->method('getSourceContext')->willReturn(new Source('', ''));
-
- // globals can be added after calling getGlobals
-
- $twig = new Environment($loader);
- $twig->addGlobal('foo', 'foo');
- $twig->getGlobals();
- $twig->addGlobal('foo', 'bar');
- $globals = $twig->getGlobals();
- $this->assertEquals('bar', $globals['foo']);
-
- // globals can be modified after a template has been loaded
- $twig = new Environment($loader);
- $twig->addGlobal('foo', 'foo');
- $twig->getGlobals();
- $twig->load('index');
- $twig->addGlobal('foo', 'bar');
- $globals = $twig->getGlobals();
- $this->assertEquals('bar', $globals['foo']);
-
- // globals can be modified after extensions init
- $twig = new Environment($loader);
- $twig->addGlobal('foo', 'foo');
- $twig->getGlobals();
- $twig->getFunctions();
- $twig->addGlobal('foo', 'bar');
- $globals = $twig->getGlobals();
- $this->assertEquals('bar', $globals['foo']);
-
- // globals can be modified after extensions and a template has been loaded
- $arrayLoader = new ArrayLoader(['index' => '{{foo}}']);
- $twig = new Environment($arrayLoader);
- $twig->addGlobal('foo', 'foo');
- $twig->getGlobals();
- $twig->getFunctions();
- $twig->load('index');
- $twig->addGlobal('foo', 'bar');
- $globals = $twig->getGlobals();
- $this->assertEquals('bar', $globals['foo']);
-
- $twig = new Environment($arrayLoader);
- $twig->getGlobals();
- $twig->addGlobal('foo', 'bar');
- $template = $twig->load('index');
- $this->assertEquals('bar', $template->render([]));
-
- /* to be uncomment in Twig 2.0
- // globals cannot be added after a template has been loaded
- $twig = new Environment($loader);
- $twig->addGlobal('foo', 'foo');
- $twig->getGlobals();
- $twig->load('index');
- try {
- $twig->addGlobal('bar', 'bar');
- $this->fail();
- } catch (\LogicException $e) {
- $this->assertFalse(array_key_exists('bar', $twig->getGlobals()));
- }
-
- // globals cannot be added after extensions init
- $twig = new Environment($loader);
- $twig->addGlobal('foo', 'foo');
- $twig->getGlobals();
- $twig->getFunctions();
- try {
- $twig->addGlobal('bar', 'bar');
- $this->fail();
- } catch (\LogicException $e) {
- $this->assertFalse(array_key_exists('bar', $twig->getGlobals()));
- }
-
- // globals cannot be added after extensions and a template has been loaded
- $twig = new Environment($loader);
- $twig->addGlobal('foo', 'foo');
- $twig->getGlobals();
- $twig->getFunctions();
- $twig->load('index');
- try {
- $twig->addGlobal('bar', 'bar');
- $this->fail();
- } catch (\LogicException $e) {
- $this->assertFalse(array_key_exists('bar', $twig->getGlobals()));
- }
-
- // test adding globals after a template has been loaded without call to getGlobals
- $twig = new Environment($loader);
- $twig->load('index');
- try {
- $twig->addGlobal('bar', 'bar');
- $this->fail();
- } catch (\LogicException $e) {
- $this->assertFalse(array_key_exists('bar', $twig->getGlobals()));
- }
- */
- }
-
- public function testExtensionsAreNotInitializedWhenRenderingACompiledTemplate()
- {
- $cache = new FilesystemCache($dir = sys_get_temp_dir().'/twig');
- $options = ['cache' => $cache, 'auto_reload' => false, 'debug' => false];
-
- // force compilation
- $twig = new Environment($loader = new ArrayLoader(['index' => '{{ foo }}']), $options);
-
- $key = $cache->generateKey('index', $twig->getTemplateClass('index'));
- $cache->write($key, $twig->compileSource(new Source('{{ foo }}', 'index')));
-
- // check that extensions won't be initialized when rendering a template that is already in the cache
- $twig = $this
- ->getMockBuilder('\Twig\Environment')
- ->setConstructorArgs([$loader, $options])
- ->setMethods(['initExtensions'])
- ->getMock()
- ;
-
- $twig->expects($this->never())->method('initExtensions');
-
- // render template
- $output = $twig->render('index', ['foo' => 'bar']);
- $this->assertEquals('bar', $output);
-
- FilesystemHelper::removeDir($dir);
- }
-
- public function testAutoReloadCacheMiss()
- {
- $templateName = __FUNCTION__;
- $templateContent = __FUNCTION__;
-
- $cache = $this->createMock('\Twig\Cache\CacheInterface');
- $loader = $this->getMockLoader($templateName, $templateContent);
- $twig = new Environment($loader, ['cache' => $cache, 'auto_reload' => true, 'debug' => false]);
-
- // Cache miss: getTimestamp returns 0 and as a result the load() is
- // skipped.
- $cache->expects($this->once())
- ->method('generateKey')
- ->willReturn('key');
- $cache->expects($this->once())
- ->method('getTimestamp')
- ->willReturn(0);
- $loader->expects($this->never())
- ->method('isFresh');
- $cache->expects($this->once())
- ->method('write');
- $cache->expects($this->once())
- ->method('load');
-
- $twig->load($templateName);
- }
-
- public function testAutoReloadCacheHit()
- {
- $templateName = __FUNCTION__;
- $templateContent = __FUNCTION__;
-
- $cache = $this->createMock('\Twig\Cache\CacheInterface');
- $loader = $this->getMockLoader($templateName, $templateContent);
- $twig = new Environment($loader, ['cache' => $cache, 'auto_reload' => true, 'debug' => false]);
-
- $now = time();
-
- // Cache hit: getTimestamp returns something > extension timestamps and
- // the loader returns true for isFresh().
- $cache->expects($this->once())
- ->method('generateKey')
- ->willReturn('key');
- $cache->expects($this->once())
- ->method('getTimestamp')
- ->willReturn($now);
- $loader->expects($this->once())
- ->method('isFresh')
- ->willReturn(true);
- $cache->expects($this->atLeastOnce())
- ->method('load');
-
- $twig->load($templateName);
- }
-
- public function testAutoReloadOutdatedCacheHit()
- {
- $templateName = __FUNCTION__;
- $templateContent = __FUNCTION__;
-
- $cache = $this->createMock('\Twig\Cache\CacheInterface');
- $loader = $this->getMockLoader($templateName, $templateContent);
- $twig = new Environment($loader, ['cache' => $cache, 'auto_reload' => true, 'debug' => false]);
-
- $now = time();
-
- $cache->expects($this->once())
- ->method('generateKey')
- ->willReturn('key');
- $cache->expects($this->once())
- ->method('getTimestamp')
- ->willReturn($now);
- $loader->expects($this->once())
- ->method('isFresh')
- ->willReturn(false);
- $cache->expects($this->once())
- ->method('write');
- $cache->expects($this->once())
- ->method('load');
-
- $twig->load($templateName);
- }
-
- /**
- * @group legacy
- */
- public function testHasGetExtensionWithDynamicName()
- {
- $twig = new Environment($this->createMock('\Twig\Loader\LoaderInterface'));
-
- $ext1 = new EnvironmentTest_Extension_DynamicWithDeprecatedName('ext1');
- $ext2 = new EnvironmentTest_Extension_DynamicWithDeprecatedName('ext2');
- $twig->addExtension($ext1);
- $twig->addExtension($ext2);
-
- $this->assertTrue($twig->hasExtension('ext1'));
- $this->assertTrue($twig->hasExtension('ext2'));
-
- $this->assertTrue($twig->hasExtension('Twig\Tests\EnvironmentTest_Extension_DynamicWithDeprecatedName'));
-
- $this->assertSame($ext1, $twig->getExtension('ext1'));
- $this->assertSame($ext2, $twig->getExtension('ext2'));
- }
-
- public function testHasGetExtensionByClassName()
- {
- $twig = new Environment($this->createMock('\Twig\Loader\LoaderInterface'));
- $twig->addExtension($ext = new EnvironmentTest_Extension());
- $this->assertTrue($twig->hasExtension('Twig\Tests\EnvironmentTest_Extension'));
- $this->assertTrue($twig->hasExtension('\Twig\Tests\EnvironmentTest_Extension'));
-
- $this->assertSame($ext, $twig->getExtension('Twig\Tests\EnvironmentTest_Extension'));
- $this->assertSame($ext, $twig->getExtension('\Twig\Tests\EnvironmentTest_Extension'));
-
- $this->assertTrue($twig->hasExtension('Twig\Tests\EnvironmentTest\Extension'));
- $this->assertSame($ext, $twig->getExtension('Twig\Tests\EnvironmentTest\Extension'));
- }
-
- public function testAddExtension()
- {
- $twig = new Environment($this->createMock('\Twig\Loader\LoaderInterface'));
- $twig->addExtension(new EnvironmentTest_Extension());
-
- $this->assertArrayHasKey('test', $twig->getTags());
- $this->assertArrayHasKey('foo_filter', $twig->getFilters());
- $this->assertArrayHasKey('foo_function', $twig->getFunctions());
- $this->assertArrayHasKey('foo_test', $twig->getTests());
- $this->assertArrayHasKey('foo_unary', $twig->getUnaryOperators());
- $this->assertArrayHasKey('foo_binary', $twig->getBinaryOperators());
- $this->assertArrayHasKey('foo_global', $twig->getGlobals());
- $visitors = $twig->getNodeVisitors();
- $found = false;
- foreach ($visitors as $visitor) {
- if ($visitor instanceof EnvironmentTest_NodeVisitor) {
- $found = true;
- }
- }
- $this->assertTrue($found);
- }
-
- /**
- * @requires PHP 5.3
- */
- public function testAddExtensionWithDeprecatedGetGlobals()
- {
- $twig = new Environment($this->createMock('\Twig\Loader\LoaderInterface'));
- $twig->addExtension(new EnvironmentTest_Extension_WithGlobals());
-
- $this->deprecations = [];
- set_error_handler([$this, 'handleError']);
-
- $this->assertArrayHasKey('foo_global', $twig->getGlobals());
-
- $this->assertCount(1, $this->deprecations);
- $this->assertStringContainsString('Defining the getGlobals() method in the "Twig\Tests\EnvironmentTest_Extension_WithGlobals" extension ', $this->deprecations[0]);
-
- restore_error_handler();
- }
-
- /**
- * @group legacy
- */
- public function testRemoveExtension()
- {
- $twig = new Environment($this->createMock('\Twig\Loader\LoaderInterface'));
- $twig->addExtension(new EnvironmentTest_Extension_WithDeprecatedName());
- $twig->removeExtension('environment_test');
-
- $this->assertArrayNotHasKey('test', $twig->getTags());
- $this->assertArrayNotHasKey('foo_filter', $twig->getFilters());
- $this->assertArrayNotHasKey('foo_function', $twig->getFunctions());
- $this->assertArrayNotHasKey('foo_test', $twig->getTests());
- $this->assertArrayNotHasKey('foo_unary', $twig->getUnaryOperators());
- $this->assertArrayNotHasKey('foo_binary', $twig->getBinaryOperators());
- $this->assertArrayNotHasKey('foo_global', $twig->getGlobals());
- $this->assertCount(2, $twig->getNodeVisitors());
- }
-
- public function testAddMockExtension()
- {
- // should be replaced by the following in 2.0 (this current code is just to avoid a dep notice)
- // $extension = $this->createMock('\Twig\Extension\AbstractExtension');
- $extension = eval(<<<EOF
-use Twig\Extension\AbstractExtension;
-
-class EnvironmentTest_ExtensionInEval extends AbstractExtension
-{
-}
-EOF
- );
- $extension = new \EnvironmentTest_ExtensionInEval();
-
- $loader = new ArrayLoader(['page' => 'hey']);
-
- $twig = new Environment($loader);
- $twig->addExtension($extension);
-
- $this->assertInstanceOf('\Twig\Extension\ExtensionInterface', $twig->getExtension(\get_class($extension)));
- $this->assertTrue($twig->isTemplateFresh('page', time()));
- }
-
- public function testInitRuntimeWithAnExtensionUsingInitRuntimeNoDeprecation()
- {
- $twig = new Environment($this->createMock('\Twig\Loader\LoaderInterface'));
- $twig->addExtension(new EnvironmentTest_ExtensionWithoutDeprecationInitRuntime());
- $twig->initRuntime();
-
- // add a dummy assertion here to satisfy PHPUnit, the only thing we want to test is that the code above
- // can be executed without throwing any deprecations
- $this->addToAssertionCount(1);
- }
-
- /**
- * @requires PHP 5.3
- */
- public function testInitRuntimeWithAnExtensionUsingInitRuntimeDeprecation()
- {
- $twig = new Environment($this->createMock('\Twig\Loader\LoaderInterface'));
- $twig->addExtension(new EnvironmentTest_ExtensionWithDeprecationInitRuntime());
-
- $this->deprecations = [];
- set_error_handler([$this, 'handleError']);
-
- $twig->initRuntime();
-
- $this->assertCount(1, $this->deprecations);
- $this->assertStringContainsString('Defining the initRuntime() method in the "Twig\Tests\EnvironmentTest_ExtensionWithDeprecationInitRuntime" extension is deprecated since version 1.23.', $this->deprecations[0]);
-
- restore_error_handler();
- }
-
- public function handleError($type, $msg)
- {
- if (E_USER_DEPRECATED === $type) {
- $this->deprecations[] = $msg;
- }
- }
-
- /**
- * @requires PHP 5.3
- */
- public function testOverrideExtension()
- {
- $twig = new Environment($this->createMock('\Twig\Loader\LoaderInterface'));
- $twig->addExtension(new EnvironmentTest_ExtensionWithDeprecationInitRuntime());
-
- $this->deprecations = [];
- set_error_handler([$this, 'handleError']);
-
- $twig->addExtension(new EnvironmentTest_Extension_WithDeprecatedName());
- $twig->addExtension(new EnvironmentTest_Extension_WithDeprecatedName());
-
- $this->assertCount(1, $this->deprecations);
- $this->assertStringContainsString('The possibility to register the same extension twice', $this->deprecations[0]);
-
- restore_error_handler();
- }
-
- public function testAddRuntimeLoader()
- {
- $runtimeLoader = $this->createMock('\Twig\RuntimeLoader\RuntimeLoaderInterface');
- $runtimeLoader->expects($this->any())->method('load')->willReturn(new EnvironmentTest_Runtime());
-
- $loader = new ArrayLoader([
- 'func_array' => '{{ from_runtime_array("foo") }}',
- 'func_array_default' => '{{ from_runtime_array() }}',
- 'func_array_named_args' => '{{ from_runtime_array(name="foo") }}',
- 'func_string' => '{{ from_runtime_string("foo") }}',
- 'func_string_default' => '{{ from_runtime_string() }}',
- 'func_string_named_args' => '{{ from_runtime_string(name="foo") }}',
- ]);
-
- $twig = new Environment($loader);
- $twig->addExtension(new EnvironmentTest_ExtensionWithoutRuntime());
- $twig->addRuntimeLoader($runtimeLoader);
-
- $this->assertEquals('foo', $twig->render('func_array'));
- $this->assertEquals('bar', $twig->render('func_array_default'));
- $this->assertEquals('foo', $twig->render('func_array_named_args'));
- $this->assertEquals('foo', $twig->render('func_string'));
- $this->assertEquals('bar', $twig->render('func_string_default'));
- $this->assertEquals('foo', $twig->render('func_string_named_args'));
- }
-
- protected function getMockLoader($templateName, $templateContent)
- {
- // to be removed in 2.0
- $loader = $this->createMock('Twig\Tests\EnvironmentTestLoaderInterface');
- //$loader = $this->createMock(['\Twig\Loader\LoaderInterface', '\Twig\Loader\SourceContextLoaderInterface']);
- $loader->expects($this->any())
- ->method('getSourceContext')
- ->with($templateName)
- ->willReturn(new Source($templateContent, $templateName));
- $loader->expects($this->any())
- ->method('getCacheKey')
- ->with($templateName)
- ->willReturn($templateName);
-
- return $loader;
- }
-}
-
-class EnvironmentTest_Extension_WithGlobals extends AbstractExtension
-{
- public function getGlobals()
- {
- return [
- 'foo_global' => 'foo_global',
- ];
- }
-}
-
-class EnvironmentTest_Extension extends AbstractExtension implements GlobalsInterface
-{
- public function getTokenParsers()
- {
- return [
- new EnvironmentTest_TokenParser(),
- ];
- }
-
- public function getNodeVisitors()
- {
- return [
- new EnvironmentTest_NodeVisitor(),
- ];
- }
-
- public function getFilters()
- {
- return [
- new TwigFilter('foo_filter', 'foo_filter'),
- ];
- }
-
- public function getTests()
- {
- return [
- new TwigTest('foo_test', 'foo_test'),
- ];
- }
-
- public function getFunctions()
- {
- return [
- new TwigFunction('foo_function', 'foo_function'),
- ];
- }
-
- public function getOperators()
- {
- return [
- ['foo_unary' => []],
- ['foo_binary' => []],
- ];
- }
-
- public function getGlobals()
- {
- return [
- 'foo_global' => 'foo_global',
- ];
- }
-}
-class_alias('\Twig\Tests\EnvironmentTest_Extension', 'Twig\Tests\EnvironmentTest\Extension', false);
-
-class EnvironmentTest_Extension_WithDeprecatedName extends AbstractExtension
-{
- public function getName()
- {
- return 'environment_test';
- }
-}
-
-class EnvironmentTest_Extension_DynamicWithDeprecatedName extends AbstractExtension
-{
- private $name;
-
- public function __construct($name)
- {
- $this->name = $name;
- }
-
- public function getName()
- {
- return $this->name;
- }
-}
-
-class EnvironmentTest_TokenParser extends AbstractTokenParser
-{
- public function parse(Token $token)
- {
- }
-
- public function getTag()
- {
- return 'test';
- }
-}
-
-class EnvironmentTest_NodeVisitor implements NodeVisitorInterface
-{
- public function enterNode(\Twig_NodeInterface $node, Environment $env)
- {
- return $node;
- }
-
- public function leaveNode(\Twig_NodeInterface $node, Environment $env)
- {
- return $node;
- }
-
- public function getPriority()
- {
- return 0;
- }
-}
-
-class EnvironmentTest_ExtensionWithDeprecationInitRuntime extends AbstractExtension
-{
- public function initRuntime(Environment $env)
- {
- }
-}
-
-class EnvironmentTest_ExtensionWithoutDeprecationInitRuntime extends AbstractExtension implements InitRuntimeInterface
-{
- public function initRuntime(Environment $env)
- {
- }
-}
-
-class EnvironmentTest_ExtensionWithoutRuntime extends AbstractExtension
-{
- public function getFunctions()
- {
- return [
- new TwigFunction('from_runtime_array', ['Twig\Tests\EnvironmentTest_Runtime', 'fromRuntime']),
- new TwigFunction('from_runtime_string', 'Twig\Tests\EnvironmentTest_Runtime::fromRuntime'),
- ];
- }
-
- public function getName()
- {
- return 'from_runtime';
- }
-}
-
-class EnvironmentTest_Runtime
-{
- public function fromRuntime($name = 'bar')
- {
- return $name;
- }
-}
-
-// to be removed in 2.0
-interface EnvironmentTestLoaderInterface extends LoaderInterface, SourceContextLoaderInterface
-{
-}
diff --git a/vendor/twig/twig/tests/ErrorTest.php b/vendor/twig/twig/tests/ErrorTest.php
deleted file mode 100644
index a84da2eea6..0000000000
--- a/vendor/twig/twig/tests/ErrorTest.php
+++ /dev/null
@@ -1,234 +0,0 @@
-<?php
-
-namespace Twig\Tests;
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Twig\Environment;
-use Twig\Error\Error;
-use Twig\Error\RuntimeError;
-use Twig\Loader\ArrayLoader;
-use Twig\Loader\FilesystemLoader;
-use Twig\Source;
-
-class ErrorTest extends \PHPUnit\Framework\TestCase
-{
- public function testErrorWithObjectFilename()
- {
- $error = new Error('foo');
- $error->setSourceContext(new Source('', new \SplFileInfo(__FILE__)));
-
- $this->assertStringContainsString('tests'.\DIRECTORY_SEPARATOR.'ErrorTest.php', $error->getMessage());
- }
-
- public function testErrorWithArrayFilename()
- {
- $error = new Error('foo');
- $error->setSourceContext(new Source('', ['foo' => 'bar']));
-
- $this->assertEquals('foo in {"foo":"bar"}', $error->getMessage());
- }
-
- public function testTwigExceptionGuessWithMissingVarAndArrayLoader()
- {
- $loader = new ArrayLoader([
- 'base.html' => '{% block content %}{% endblock %}',
- 'index.html' => <<<EOHTML
-{% extends 'base.html' %}
-{% block content %}
- {{ foo.bar }}
-{% endblock %}
-{% block foo %}
- {{ foo.bar }}
-{% endblock %}
-EOHTML
- ]);
- $twig = new Environment($loader, ['strict_variables' => true, 'debug' => true, 'cache' => false]);
-
- $template = $twig->load('index.html');
- try {
- $template->render([]);
-
- $this->fail();
- } catch (RuntimeError $e) {
- $this->assertEquals('Variable "foo" does not exist in "index.html" at line 3.', $e->getMessage());
- $this->assertEquals(3, $e->getTemplateLine());
- $this->assertEquals('index.html', $e->getSourceContext()->getName());
- }
- }
-
- public function testTwigExceptionGuessWithExceptionAndArrayLoader()
- {
- $loader = new ArrayLoader([
- 'base.html' => '{% block content %}{% endblock %}',
- 'index.html' => <<<EOHTML
-{% extends 'base.html' %}
-{% block content %}
- {{ foo.bar }}
-{% endblock %}
-{% block foo %}
- {{ foo.bar }}
-{% endblock %}
-EOHTML
- ]);
- $twig = new Environment($loader, ['strict_variables' => true, 'debug' => true, 'cache' => false]);
-
- $template = $twig->load('index.html');
- try {
- $template->render(['foo' => new ErrorTest_Foo()]);
-
- $this->fail();
- } catch (RuntimeError $e) {
- $this->assertEquals('An exception has been thrown during the rendering of a template ("Runtime error...") in "index.html" at line 3.', $e->getMessage());
- $this->assertEquals(3, $e->getTemplateLine());
- $this->assertEquals('index.html', $e->getSourceContext()->getName());
- }
- }
-
- public function testTwigExceptionGuessWithMissingVarAndFilesystemLoader()
- {
- $loader = new FilesystemLoader(__DIR__.'/Fixtures/errors');
- $twig = new Environment($loader, ['strict_variables' => true, 'debug' => true, 'cache' => false]);
-
- $template = $twig->load('index.html');
- try {
- $template->render([]);
-
- $this->fail();
- } catch (RuntimeError $e) {
- $this->assertEquals('Variable "foo" does not exist.', $e->getMessage());
- $this->assertEquals(3, $e->getTemplateLine());
- $this->assertEquals('index.html', $e->getSourceContext()->getName());
- $this->assertEquals(3, $e->getLine());
- $this->assertEquals(strtr(__DIR__.'/Fixtures/errors/index.html', '/', \DIRECTORY_SEPARATOR), $e->getFile());
- }
- }
-
- public function testTwigExceptionGuessWithExceptionAndFilesystemLoader()
- {
- $loader = new FilesystemLoader(__DIR__.'/Fixtures/errors');
- $twig = new Environment($loader, ['strict_variables' => true, 'debug' => true, 'cache' => false]);
-
- $template = $twig->load('index.html');
- try {
- $template->render(['foo' => new ErrorTest_Foo()]);
-
- $this->fail();
- } catch (RuntimeError $e) {
- $this->assertEquals('An exception has been thrown during the rendering of a template ("Runtime error...").', $e->getMessage());
- $this->assertEquals(3, $e->getTemplateLine());
- $this->assertEquals('index.html', $e->getSourceContext()->getName());
- $this->assertEquals(3, $e->getLine());
- $this->assertEquals(strtr(__DIR__.'/Fixtures/errors/index.html', '/', \DIRECTORY_SEPARATOR), $e->getFile());
- }
- }
-
- /**
- * @dataProvider getErroredTemplates
- */
- public function testTwigExceptionAddsFileAndLine($templates, $name, $line)
- {
- $loader = new ArrayLoader($templates);
- $twig = new Environment($loader, ['strict_variables' => true, 'debug' => true, 'cache' => false]);
-
- $template = $twig->load('index');
-
- try {
- $template->render([]);
-
- $this->fail();
- } catch (RuntimeError $e) {
- $this->assertEquals(sprintf('Variable "foo" does not exist in "%s" at line %d.', $name, $line), $e->getMessage());
- $this->assertEquals($line, $e->getTemplateLine());
- $this->assertEquals($name, $e->getSourceContext()->getName());
- }
-
- try {
- $template->render(['foo' => new ErrorTest_Foo()]);
-
- $this->fail();
- } catch (RuntimeError $e) {
- $this->assertEquals(sprintf('An exception has been thrown during the rendering of a template ("Runtime error...") in "%s" at line %d.', $name, $line), $e->getMessage());
- $this->assertEquals($line, $e->getTemplateLine());
- $this->assertEquals($name, $e->getSourceContext()->getName());
- }
- }
-
- public function getErroredTemplates()
- {
- return [
- // error occurs in a template
- [
- [
- 'index' => "\n\n{{ foo.bar }}\n\n\n{{ 'foo' }}",
- ],
- 'index', 3,
- ],
-
- // error occurs in an included template
- [
- [
- 'index' => "{% include 'partial' %}",
- 'partial' => '{{ foo.bar }}',
- ],
- 'partial', 1,
- ],
-
- // error occurs in a parent block when called via parent()
- [
- [
- 'index' => "{% extends 'base' %}
- {% block content %}
- {{ parent() }}
- {% endblock %}",
- 'base' => '{% block content %}{{ foo.bar }}{% endblock %}',
- ],
- 'base', 1,
- ],
-
- // error occurs in a block from the child
- [
- [
- 'index' => "{% extends 'base' %}
- {% block content %}
- {{ foo.bar }}
- {% endblock %}
- {% block foo %}
- {{ foo.bar }}
- {% endblock %}",
- 'base' => '{% block content %}{% endblock %}',
- ],
- 'index', 3,
- ],
- ];
- }
-
- public function testTwigLeakOutputInDebugMode()
- {
- $output = exec(sprintf('%s %s debug', \PHP_BINARY, escapeshellarg(__DIR__.'/Fixtures/errors/leak-output.php')));
-
- $this->assertSame('Hello OOPS', $output);
- }
-
- public function testDoesNotTwigLeakOutput()
- {
- $output = exec(sprintf('%s %s', \PHP_BINARY, escapeshellarg(__DIR__.'/Fixtures/errors/leak-output.php')));
-
- $this->assertSame('', $output);
- }
-}
-
-class ErrorTest_Foo
-{
- public function bar()
- {
- throw new \Exception('Runtime error...');
- }
-}
diff --git a/vendor/twig/twig/tests/ExpressionParserTest.php b/vendor/twig/twig/tests/ExpressionParserTest.php
deleted file mode 100644
index ef31fd7152..0000000000
--- a/vendor/twig/twig/tests/ExpressionParserTest.php
+++ /dev/null
@@ -1,382 +0,0 @@
-<?php
-
-namespace Twig\Tests;
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Twig\Environment;
-use Twig\Node\Expression\ArrayExpression;
-use Twig\Node\Expression\Binary\ConcatBinary;
-use Twig\Node\Expression\ConstantExpression;
-use Twig\Node\Expression\NameExpression;
-use Twig\Parser;
-use Twig\Source;
-
-class ExpressionParserTest extends \PHPUnit\Framework\TestCase
-{
- /**
- * @dataProvider getFailingTestsForAssignment
- */
- public function testCanOnlyAssignToNames($template)
- {
- $this->expectException('\Twig\Error\SyntaxError');
-
- $env = new Environment($this->createMock('\Twig\Loader\LoaderInterface'), ['cache' => false, 'autoescape' => false]);
- $parser = new Parser($env);
-
- $parser->parse($env->tokenize(new Source($template, 'index')));
- }
-
- public function getFailingTestsForAssignment()
- {
- return [
- ['{% set false = "foo" %}'],
- ['{% set FALSE = "foo" %}'],
- ['{% set true = "foo" %}'],
- ['{% set TRUE = "foo" %}'],
- ['{% set none = "foo" %}'],
- ['{% set NONE = "foo" %}'],
- ['{% set null = "foo" %}'],
- ['{% set NULL = "foo" %}'],
- ['{% set 3 = "foo" %}'],
- ['{% set 1 + 2 = "foo" %}'],
- ['{% set "bar" = "foo" %}'],
- ['{% set %}{% endset %}'],
- ];
- }
-
- /**
- * @dataProvider getTestsForArray
- */
- public function testArrayExpression($template, $expected)
- {
- $env = new Environment($this->createMock('\Twig\Loader\LoaderInterface'), ['cache' => false, 'autoescape' => false]);
- $stream = $env->tokenize($source = new Source($template, ''));
- $parser = new Parser($env);
- $expected->setSourceContext($source);
-
- $this->assertEquals($expected, $parser->parse($stream)->getNode('body')->getNode(0)->getNode('expr'));
- }
-
- /**
- * @dataProvider getFailingTestsForArray
- */
- public function testArraySyntaxError($template)
- {
- $this->expectException('\Twig\Error\SyntaxError');
-
- $env = new Environment($this->createMock('\Twig\Loader\LoaderInterface'), ['cache' => false, 'autoescape' => false]);
- $parser = new Parser($env);
-
- $parser->parse($env->tokenize(new Source($template, 'index')));
- }
-
- public function getFailingTestsForArray()
- {
- return [
- ['{{ [1, "a": "b"] }}'],
- ['{{ {"a": "b", 2} }}'],
- ];
- }
-
- public function getTestsForArray()
- {
- return [
- // simple array
- ['{{ [1, 2] }}', new ArrayExpression([
- new ConstantExpression(0, 1),
- new ConstantExpression(1, 1),
-
- new ConstantExpression(1, 1),
- new ConstantExpression(2, 1),
- ], 1),
- ],
-
- // array with trailing ,
- ['{{ [1, 2, ] }}', new ArrayExpression([
- new ConstantExpression(0, 1),
- new ConstantExpression(1, 1),
-
- new ConstantExpression(1, 1),
- new ConstantExpression(2, 1),
- ], 1),
- ],
-
- // simple hash
- ['{{ {"a": "b", "b": "c"} }}', new ArrayExpression([
- new ConstantExpression('a', 1),
- new ConstantExpression('b', 1),
-
- new ConstantExpression('b', 1),
- new ConstantExpression('c', 1),
- ], 1),
- ],
-
- // hash with trailing ,
- ['{{ {"a": "b", "b": "c", } }}', new ArrayExpression([
- new ConstantExpression('a', 1),
- new ConstantExpression('b', 1),
-
- new ConstantExpression('b', 1),
- new ConstantExpression('c', 1),
- ], 1),
- ],
-
- // hash in an array
- ['{{ [1, {"a": "b", "b": "c"}] }}', new ArrayExpression([
- new ConstantExpression(0, 1),
- new ConstantExpression(1, 1),
-
- new ConstantExpression(1, 1),
- new ArrayExpression([
- new ConstantExpression('a', 1),
- new ConstantExpression('b', 1),
-
- new ConstantExpression('b', 1),
- new ConstantExpression('c', 1),
- ], 1),
- ], 1),
- ],
-
- // array in a hash
- ['{{ {"a": [1, 2], "b": "c"} }}', new ArrayExpression([
- new ConstantExpression('a', 1),
- new ArrayExpression([
- new ConstantExpression(0, 1),
- new ConstantExpression(1, 1),
-
- new ConstantExpression(1, 1),
- new ConstantExpression(2, 1),
- ], 1),
- new ConstantExpression('b', 1),
- new ConstantExpression('c', 1),
- ], 1),
- ],
- ];
- }
-
- public function testStringExpressionDoesNotConcatenateTwoConsecutiveStrings()
- {
- $this->expectException('\Twig\Error\SyntaxError');
-
- $env = new Environment($this->createMock('\Twig\Loader\LoaderInterface'), ['cache' => false, 'autoescape' => false, 'optimizations' => 0]);
- $stream = $env->tokenize(new Source('{{ "a" "b" }}', 'index'));
- $parser = new Parser($env);
-
- $parser->parse($stream);
- }
-
- /**
- * @dataProvider getTestsForString
- */
- public function testStringExpression($template, $expected)
- {
- $env = new Environment($this->createMock('\Twig\Loader\LoaderInterface'), ['cache' => false, 'autoescape' => false, 'optimizations' => 0]);
- $stream = $env->tokenize($source = new Source($template, ''));
- $parser = new Parser($env);
- $expected->setSourceContext($source);
-
- $this->assertEquals($expected, $parser->parse($stream)->getNode('body')->getNode(0)->getNode('expr'));
- }
-
- public function getTestsForString()
- {
- return [
- [
- '{{ "foo" }}', new ConstantExpression('foo', 1),
- ],
- [
- '{{ "foo #{bar}" }}', new ConcatBinary(
- new ConstantExpression('foo ', 1),
- new NameExpression('bar', 1),
- 1
- ),
- ],
- [
- '{{ "foo #{bar} baz" }}', new ConcatBinary(
- new ConcatBinary(
- new ConstantExpression('foo ', 1),
- new NameExpression('bar', 1),
- 1
- ),
- new ConstantExpression(' baz', 1),
- 1
- ),
- ],
-
- [
- '{{ "foo #{"foo #{bar} baz"} baz" }}', new ConcatBinary(
- new ConcatBinary(
- new ConstantExpression('foo ', 1),
- new ConcatBinary(
- new ConcatBinary(
- new ConstantExpression('foo ', 1),
- new NameExpression('bar', 1),
- 1
- ),
- new ConstantExpression(' baz', 1),
- 1
- ),
- 1
- ),
- new ConstantExpression(' baz', 1),
- 1
- ),
- ],
- ];
- }
-
- public function testAttributeCallDoesNotSupportNamedArguments()
- {
- $this->expectException('\Twig\Error\SyntaxError');
-
- $env = new Environment($this->createMock('\Twig\Loader\LoaderInterface'), ['cache' => false, 'autoescape' => false]);
- $parser = new Parser($env);
-
- $parser->parse($env->tokenize(new Source('{{ foo.bar(name="Foo") }}', 'index')));
- }
-
- public function testMacroCallDoesNotSupportNamedArguments()
- {
- $this->expectException('\Twig\Error\SyntaxError');
-
- $env = new Environment($this->createMock('\Twig\Loader\LoaderInterface'), ['cache' => false, 'autoescape' => false]);
- $parser = new Parser($env);
-
- $parser->parse($env->tokenize(new Source('{% from _self import foo %}{% macro foo() %}{% endmacro %}{{ foo(name="Foo") }}', 'index')));
- }
-
- public function testMacroDefinitionDoesNotSupportNonNameVariableName()
- {
- $this->expectException('\Twig\Error\SyntaxError');
- $this->expectExceptionMessage('An argument must be a name. Unexpected token "string" of value "a" ("name" expected) in "index" at line 1.');
-
- $env = new Environment($this->createMock('\Twig\Loader\LoaderInterface'), ['cache' => false, 'autoescape' => false]);
- $parser = new Parser($env);
-
- $parser->parse($env->tokenize(new Source('{% macro foo("a") %}{% endmacro %}', 'index')));
- }
-
- /**
- * @dataProvider getMacroDefinitionDoesNotSupportNonConstantDefaultValues
- */
- public function testMacroDefinitionDoesNotSupportNonConstantDefaultValues($template)
- {
- $this->expectException('\Twig\Error\SyntaxError');
- $this->expectExceptionMessage('A default value for an argument must be a constant (a boolean, a string, a number, or an array) in "index" at line 1');
-
- $env = new Environment($this->createMock('\Twig\Loader\LoaderInterface'), ['cache' => false, 'autoescape' => false]);
- $parser = new Parser($env);
-
- $parser->parse($env->tokenize(new Source($template, 'index')));
- }
-
- public function getMacroDefinitionDoesNotSupportNonConstantDefaultValues()
- {
- return [
- ['{% macro foo(name = "a #{foo} a") %}{% endmacro %}'],
- ['{% macro foo(name = [["b", "a #{foo} a"]]) %}{% endmacro %}'],
- ];
- }
-
- /**
- * @dataProvider getMacroDefinitionSupportsConstantDefaultValues
- */
- public function testMacroDefinitionSupportsConstantDefaultValues($template)
- {
- $env = new Environment($this->createMock('\Twig\Loader\LoaderInterface'), ['cache' => false, 'autoescape' => false]);
- $parser = new Parser($env);
-
- $parser->parse($env->tokenize(new Source($template, 'index')));
-
- // add a dummy assertion here to satisfy PHPUnit, the only thing we want to test is that the code above
- // can be executed without throwing any exceptions
- $this->addToAssertionCount(1);
- }
-
- public function getMacroDefinitionSupportsConstantDefaultValues()
- {
- return [
- ['{% macro foo(name = "aa") %}{% endmacro %}'],
- ['{% macro foo(name = 12) %}{% endmacro %}'],
- ['{% macro foo(name = true) %}{% endmacro %}'],
- ['{% macro foo(name = ["a"]) %}{% endmacro %}'],
- ['{% macro foo(name = [["a"]]) %}{% endmacro %}'],
- ['{% macro foo(name = {a: "a"}) %}{% endmacro %}'],
- ['{% macro foo(name = {a: {b: "a"}}) %}{% endmacro %}'],
- ];
- }
-
- public function testUnknownFunction()
- {
- $this->expectException('\Twig\Error\SyntaxError');
- $this->expectExceptionMessage('Unknown "cycl" function. Did you mean "cycle" in "index" at line 1?');
-
- $env = new Environment($this->createMock('\Twig\Loader\LoaderInterface'), ['cache' => false, 'autoescape' => false]);
- $parser = new Parser($env);
-
- $parser->parse($env->tokenize(new Source('{{ cycl() }}', 'index')));
- }
-
- public function testUnknownFunctionWithoutSuggestions()
- {
- $this->expectException('\Twig\Error\SyntaxError');
- $this->expectExceptionMessage('Unknown "foobar" function in "index" at line 1.');
-
- $env = new Environment($this->createMock('\Twig\Loader\LoaderInterface'), ['cache' => false, 'autoescape' => false]);
- $parser = new Parser($env);
-
- $parser->parse($env->tokenize(new Source('{{ foobar() }}', 'index')));
- }
-
- public function testUnknownFilter()
- {
- $this->expectException('\Twig\Error\SyntaxError');
- $this->expectExceptionMessage('Unknown "lowe" filter. Did you mean "lower" in "index" at line 1?');
-
- $env = new Environment($this->createMock('\Twig\Loader\LoaderInterface'), ['cache' => false, 'autoescape' => false]);
- $parser = new Parser($env);
-
- $parser->parse($env->tokenize(new Source('{{ 1|lowe }}', 'index')));
- }
-
- public function testUnknownFilterWithoutSuggestions()
- {
- $this->expectException('\Twig\Error\SyntaxError');
- $this->expectExceptionMessage('Unknown "foobar" filter in "index" at line 1.');
-
- $env = new Environment($this->createMock('\Twig\Loader\LoaderInterface'), ['cache' => false, 'autoescape' => false]);
- $parser = new Parser($env);
-
- $parser->parse($env->tokenize(new Source('{{ 1|foobar }}', 'index')));
- }
-
- public function testUnknownTest()
- {
- $this->expectException('\Twig\Error\SyntaxError');
- $this->expectExceptionMessage('Unknown "nul" test. Did you mean "null" in "index" at line 1');
-
- $env = new Environment($this->createMock('\Twig\Loader\LoaderInterface'), ['cache' => false, 'autoescape' => false]);
- $parser = new Parser($env);
- $stream = $env->tokenize(new Source('{{ 1 is nul }}', 'index'));
- $parser->parse($stream);
- }
-
- public function testUnknownTestWithoutSuggestions()
- {
- $this->expectException('\Twig\Error\SyntaxError');
- $this->expectExceptionMessage('Unknown "foobar" test in "index" at line 1.');
-
- $env = new Environment($this->createMock('\Twig\Loader\LoaderInterface'), ['cache' => false, 'autoescape' => false]);
- $parser = new Parser($env);
-
- $parser->parse($env->tokenize(new Source('{{ 1 is foobar }}', 'index')));
- }
-}
diff --git a/vendor/twig/twig/tests/Extension/CoreTest.php b/vendor/twig/twig/tests/Extension/CoreTest.php
deleted file mode 100644
index 66c32ff150..0000000000
--- a/vendor/twig/twig/tests/Extension/CoreTest.php
+++ /dev/null
@@ -1,371 +0,0 @@
-<?php
-
-namespace Twig\Tests\Extension;
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Twig\Environment;
-
-class CoreTest extends \PHPUnit\Framework\TestCase
-{
- /**
- * @dataProvider getRandomFunctionTestData
- */
- public function testRandomFunction(array $expectedInArray, $value1, $value2 = null)
- {
- $env = new Environment($this->createMock('Twig_LoaderInterface'));
- for ($i = 0; $i < 100; ++$i) {
- $this->assertTrue(\in_array(twig_random($env, $value1, $value2), $expectedInArray, true)); // assertContains() would not consider the type
- }
- }
-
- public function getRandomFunctionTestData()
- {
- return [
- 'array' => [
- ['apple', 'orange', 'citrus'],
- ['apple', 'orange', 'citrus'],
- ],
- 'Traversable' => [
- ['apple', 'orange', 'citrus'],
- new \ArrayObject(['apple', 'orange', 'citrus']),
- ],
- 'unicode string' => [
- ['Ä', '€', 'é'],
- 'Ä€é',
- ],
- 'numeric but string' => [
- ['1', '2', '3'],
- '123',
- ],
- 'integer' => [
- range(0, 5, 1),
- 5,
- ],
- 'float' => [
- range(0, 5, 1),
- 5.9,
- ],
- 'negative' => [
- [0, -1, -2],
- -2,
- ],
- 'min max int' => [
- range(50, 100),
- 50,
- 100,
- ],
- 'min max float' => [
- range(-10, 10),
- -9.5,
- 9.5,
- ],
- 'min null' => [
- range(0, 100),
- null,
- 100,
- ],
- ];
- }
-
- public function testRandomFunctionWithoutParameter()
- {
- $max = mt_getrandmax();
-
- for ($i = 0; $i < 100; ++$i) {
- $val = twig_random(new Environment($this->createMock('\Twig\Loader\LoaderInterface')));
- $this->assertTrue(\is_int($val) && $val >= 0 && $val <= $max);
- }
- }
-
- public function testRandomFunctionReturnsAsIs()
- {
- $this->assertSame('', twig_random(new Environment($this->createMock('\Twig\Loader\LoaderInterface')), ''));
- $this->assertSame('', twig_random(new Environment($this->createMock('\Twig\Loader\LoaderInterface'), ['charset' => null]), ''));
-
- $instance = new \stdClass();
- $this->assertSame($instance, twig_random(new Environment($this->createMock('\Twig\Loader\LoaderInterface')), $instance));
- }
-
- public function testRandomFunctionOfEmptyArrayThrowsException()
- {
- $this->expectException('\Twig\Error\RuntimeError');
-
- twig_random(new Environment($this->createMock('\Twig\Loader\LoaderInterface')), []);
- }
-
- public function testRandomFunctionOnNonUTF8String()
- {
- if (!\function_exists('iconv') && !\function_exists('mb_convert_encoding')) {
- $this->markTestSkipped('needs iconv or mbstring');
- }
-
- $twig = new Environment($this->createMock('\Twig\Loader\LoaderInterface'));
- $twig->setCharset('ISO-8859-1');
-
- $text = twig_convert_encoding('Äé', 'ISO-8859-1', 'UTF-8');
- for ($i = 0; $i < 30; ++$i) {
- $rand = twig_random($twig, $text);
- $this->assertTrue(\in_array(twig_convert_encoding($rand, 'UTF-8', 'ISO-8859-1'), ['Ä', 'é'], true));
- }
- }
-
- public function testReverseFilterOnNonUTF8String()
- {
- if (!\function_exists('iconv') && !\function_exists('mb_convert_encoding')) {
- $this->markTestSkipped('needs iconv or mbstring');
- }
-
- $twig = new Environment($this->createMock('\Twig\Loader\LoaderInterface'));
- $twig->setCharset('ISO-8859-1');
-
- $input = twig_convert_encoding('Äé', 'ISO-8859-1', 'UTF-8');
- $output = twig_convert_encoding(twig_reverse_filter($twig, $input), 'UTF-8', 'ISO-8859-1');
-
- $this->assertEquals($output, 'éÄ');
- }
-
- /**
- * @dataProvider provideCustomEscaperCases
- */
- public function testCustomEscaper($expected, $string, $strategy)
- {
- $twig = new Environment($this->createMock('\Twig\Loader\LoaderInterface'));
- $twig->getExtension('\Twig\Extension\CoreExtension')->setEscaper('foo', '\Twig\Tests\Extension\foo_escaper_for_test');
-
- $this->assertSame($expected, twig_escape_filter($twig, $string, $strategy));
- }
-
- public function provideCustomEscaperCases()
- {
- return [
- ['fooUTF-8', 'foo', 'foo'],
- ['UTF-8', null, 'foo'],
- ['42UTF-8', 42, 'foo'],
- ];
- }
-
- public function testUnknownCustomEscaper()
- {
- $this->expectException('\Twig\Error\RuntimeError');
-
- twig_escape_filter(new Environment($this->createMock('\Twig\Loader\LoaderInterface')), 'foo', 'bar');
- }
-
- /**
- * @dataProvider provideTwigFirstCases
- */
- public function testTwigFirst($expected, $input)
- {
- $twig = new Environment($this->createMock('\Twig\Loader\LoaderInterface'));
- $this->assertSame($expected, twig_first($twig, $input));
- }
-
- public function provideTwigFirstCases()
- {
- $i = [1 => 'a', 2 => 'b', 3 => 'c'];
-
- return [
- ['a', 'abc'],
- [1, [1, 2, 3]],
- ['', null],
- ['', ''],
- ['a', new CoreTestIterator($i, array_keys($i), true, 3)],
- ];
- }
-
- /**
- * @dataProvider provideTwigLastCases
- */
- public function testTwigLast($expected, $input)
- {
- $twig = new Environment($this->createMock('\Twig\Loader\LoaderInterface'));
- $this->assertSame($expected, twig_last($twig, $input));
- }
-
- public function provideTwigLastCases()
- {
- $i = [1 => 'a', 2 => 'b', 3 => 'c'];
-
- return [
- ['c', 'abc'],
- [3, [1, 2, 3]],
- ['', null],
- ['', ''],
- ['c', new CoreTestIterator($i, array_keys($i), true)],
- ];
- }
-
- /**
- * @dataProvider provideArrayKeyCases
- */
- public function testArrayKeysFilter(array $expected, $input)
- {
- $this->assertSame($expected, twig_get_array_keys_filter($input));
- }
-
- public function provideArrayKeyCases()
- {
- $array = ['a' => 'a1', 'b' => 'b1', 'c' => 'c1'];
- $keys = array_keys($array);
-
- return [
- [$keys, $array],
- [$keys, new CoreTestIterator($array, $keys)],
- [$keys, new CoreTestIteratorAggregate($array, $keys)],
- [$keys, new CoreTestIteratorAggregateAggregate($array, $keys)],
- [[], null],
- [['a'], new \SimpleXMLElement('<xml><a></a></xml>')],
- ];
- }
-
- /**
- * @dataProvider provideInFilterCases
- */
- public function testInFilter($expected, $value, $compare)
- {
- $this->assertSame($expected, twig_in_filter($value, $compare));
- }
-
- public function provideInFilterCases()
- {
- $array = [1, 2, 'a' => 3, 5, 6, 7];
- $keys = array_keys($array);
-
- return [
- [true, 1, $array],
- [true, '3', $array],
- [true, '3', 'abc3def'],
- [true, 1, new CoreTestIterator($array, $keys, true, 1)],
- [true, '3', new CoreTestIterator($array, $keys, true, 3)],
- [true, '3', new CoreTestIteratorAggregateAggregate($array, $keys, true, 3)],
- [false, 4, $array],
- [false, 4, new CoreTestIterator($array, $keys, true)],
- [false, 4, new CoreTestIteratorAggregateAggregate($array, $keys, true)],
- [false, 1, 1],
- [true, 'b', new \SimpleXMLElement('<xml><a>b</a></xml>')],
- ];
- }
-
- /**
- * @dataProvider provideSliceFilterCases
- */
- public function testSliceFilter($expected, $input, $start, $length = null, $preserveKeys = false)
- {
- $twig = new Environment($this->createMock('\Twig\Loader\LoaderInterface'));
- $this->assertSame($expected, twig_slice($twig, $input, $start, $length, $preserveKeys));
- }
-
- public function provideSliceFilterCases()
- {
- $i = ['a' => 1, 'b' => 2, 'c' => 3, 'd' => 4];
- $keys = array_keys($i);
-
- return [
- [['a' => 1], $i, 0, 1, true],
- [['a' => 1], $i, 0, 1, false],
- [['b' => 2, 'c' => 3], $i, 1, 2],
- [[1], [1, 2, 3, 4], 0, 1],
- [[2, 3], [1, 2, 3, 4], 1, 2],
- [[2, 3], new CoreTestIterator($i, $keys, true), 1, 2],
- [['c' => 3, 'd' => 4], new CoreTestIteratorAggregate($i, $keys, true), 2, null, true],
- [$i, new CoreTestIterator($i, $keys, true), 0, \count($keys) + 10, true],
- [[], new CoreTestIterator($i, $keys, true), \count($keys) + 10],
- ['de', 'abcdef', 3, 2],
- [[], new \SimpleXMLElement('<items><item>1</item><item>2</item></items>'), 3],
- [[], new \ArrayIterator([1, 2]), 3],
- ];
- }
-}
-
-function foo_escaper_for_test(Environment $env, $string, $charset)
-{
- return $string.$charset;
-}
-
-final class CoreTestIteratorAggregate implements \IteratorAggregate
-{
- private $iterator;
-
- public function __construct(array $array, array $keys, $allowAccess = false, $maxPosition = false)
- {
- $this->iterator = new CoreTestIterator($array, $keys, $allowAccess, $maxPosition);
- }
-
- public function getIterator()
- {
- return $this->iterator;
- }
-}
-
-final class CoreTestIteratorAggregateAggregate implements \IteratorAggregate
-{
- private $iterator;
-
- public function __construct(array $array, array $keys, $allowValueAccess = false, $maxPosition = false)
- {
- $this->iterator = new CoreTestIteratorAggregate($array, $keys, $allowValueAccess, $maxPosition);
- }
-
- public function getIterator()
- {
- return $this->iterator;
- }
-}
-
-final class CoreTestIterator implements \Iterator
-{
- private $position;
- private $array;
- private $arrayKeys;
- private $allowValueAccess;
- private $maxPosition;
-
- public function __construct(array $values, array $keys, $allowValueAccess = false, $maxPosition = false)
- {
- $this->array = $values;
- $this->arrayKeys = $keys;
- $this->position = 0;
- $this->allowValueAccess = $allowValueAccess;
- $this->maxPosition = false === $maxPosition ? \count($values) + 1 : $maxPosition;
- }
-
- public function rewind()
- {
- $this->position = 0;
- }
-
- public function current()
- {
- if ($this->allowValueAccess) {
- return $this->array[$this->key()];
- }
-
- throw new \LogicException('Code should only use the keys, not the values provided by iterator.');
- }
-
- public function key()
- {
- return $this->arrayKeys[$this->position];
- }
-
- public function next()
- {
- ++$this->position;
- if ($this->position === $this->maxPosition) {
- throw new \LogicException(sprintf('Code should not iterate beyond %d.', $this->maxPosition));
- }
- }
-
- public function valid()
- {
- return isset($this->arrayKeys[$this->position]);
- }
-}
diff --git a/vendor/twig/twig/tests/Extension/SandboxTest.php b/vendor/twig/twig/tests/Extension/SandboxTest.php
deleted file mode 100644
index fe0f32ff55..0000000000
--- a/vendor/twig/twig/tests/Extension/SandboxTest.php
+++ /dev/null
@@ -1,365 +0,0 @@
-<?php
-
-namespace Twig\Tests\Extension;
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Twig\Environment;
-use Twig\Extension\SandboxExtension;
-use Twig\Loader\ArrayLoader;
-use Twig\Sandbox\SecurityError;
-use Twig\Sandbox\SecurityPolicy;
-
-class SandboxTest extends \PHPUnit\Framework\TestCase
-{
- protected static $params;
- protected static $templates;
-
- protected function setUp()
- {
- self::$params = [
- 'name' => 'Fabien',
- 'obj' => new FooObject(),
- 'arr' => ['obj' => new FooObject()],
- ];
-
- self::$templates = [
- '1_basic1' => '{{ obj.foo }}',
- '1_basic2' => '{{ name|upper }}',
- '1_basic3' => '{% if name %}foo{% endif %}',
- '1_basic4' => '{{ obj.bar }}',
- '1_basic5' => '{{ obj }}',
- '1_basic7' => '{{ cycle(["foo","bar"], 1) }}',
- '1_basic8' => '{{ obj.getfoobar }}{{ obj.getFooBar }}',
- '1_basic9' => '{{ obj.foobar }}{{ obj.fooBar }}',
- '1_basic' => '{% if obj.foo %}{{ obj.foo|upper }}{% endif %}',
- '1_layout' => '{% block content %}{% endblock %}',
- '1_child' => "{% extends \"1_layout\" %}\n{% block content %}\n{{ \"a\"|json_encode }}\n{% endblock %}",
- '1_include' => '{{ include("1_basic1", sandboxed=true) }}',
- '1_range_operator' => '{{ (1..2)[0] }}',
- ];
- }
-
- public function testSandboxWithInheritance()
- {
- $this->expectException('\Twig\Sandbox\SecurityError');
- $this->expectExceptionMessage('Filter "json_encode" is not allowed in "1_child" at line 3.');
-
- $twig = $this->getEnvironment(true, [], self::$templates, ['block']);
- $twig->load('1_child')->render([]);
- }
-
- public function testSandboxGloballySet()
- {
- $twig = $this->getEnvironment(false, [], self::$templates);
- $this->assertEquals('FOO', $twig->load('1_basic')->render(self::$params), 'Sandbox does nothing if it is disabled globally');
- }
-
- public function testSandboxUnallowedMethodAccessor()
- {
- $twig = $this->getEnvironment(true, [], self::$templates);
- try {
- $twig->load('1_basic1')->render(self::$params);
- $this->fail('Sandbox throws a SecurityError exception if an unallowed method is called');
- } catch (SecurityError $e) {
- $this->assertInstanceOf('\Twig\Sandbox\SecurityNotAllowedMethodError', $e, 'Exception should be an instance of Twig_Sandbox_SecurityNotAllowedMethodError');
- $this->assertEquals('Twig\Tests\Extension\FooObject', $e->getClassName(), 'Exception should be raised on the "Twig\Tests\Extension\FooObject" class');
- $this->assertEquals('foo', $e->getMethodName(), 'Exception should be raised on the "foo" method');
- }
- }
-
- public function testSandboxUnallowedFilter()
- {
- $twig = $this->getEnvironment(true, [], self::$templates);
- try {
- $twig->load('1_basic2')->render(self::$params);
- $this->fail('Sandbox throws a SecurityError exception if an unallowed filter is called');
- } catch (SecurityError $e) {
- $this->assertInstanceOf('\Twig\Sandbox\SecurityNotAllowedFilterError', $e, 'Exception should be an instance of Twig_Sandbox_SecurityNotAllowedFilterError');
- $this->assertEquals('upper', $e->getFilterName(), 'Exception should be raised on the "upper" filter');
- }
- }
-
- public function testSandboxUnallowedTag()
- {
- $twig = $this->getEnvironment(true, [], self::$templates);
- try {
- $twig->load('1_basic3')->render(self::$params);
- $this->fail('Sandbox throws a SecurityError exception if an unallowed tag is used in the template');
- } catch (SecurityError $e) {
- $this->assertInstanceOf('\Twig\Sandbox\SecurityNotAllowedTagError', $e, 'Exception should be an instance of Twig_Sandbox_SecurityNotAllowedTagError');
- $this->assertEquals('if', $e->getTagName(), 'Exception should be raised on the "if" tag');
- }
- }
-
- public function testSandboxUnallowedProperty()
- {
- $twig = $this->getEnvironment(true, [], self::$templates);
- try {
- $twig->load('1_basic4')->render(self::$params);
- $this->fail('Sandbox throws a SecurityError exception if an unallowed property is called in the template');
- } catch (SecurityError $e) {
- $this->assertInstanceOf('\Twig\Sandbox\SecurityNotAllowedPropertyError', $e, 'Exception should be an instance of Twig_Sandbox_SecurityNotAllowedPropertyError');
- $this->assertEquals('Twig\Tests\Extension\FooObject', $e->getClassName(), 'Exception should be raised on the "Twig\Tests\Extension\FooObject" class');
- $this->assertEquals('bar', $e->getPropertyName(), 'Exception should be raised on the "bar" property');
- }
- }
-
- /**
- * @dataProvider getSandboxUnallowedToStringTests
- */
- public function testSandboxUnallowedToString($template)
- {
- $twig = $this->getEnvironment(true, [], ['index' => $template], [], ['upper'], ['Twig\Tests\Extension\FooObject' => 'getAnotherFooObject'], [], ['random']);
- try {
- $twig->load('index')->render(self::$params);
- $this->fail('Sandbox throws a SecurityError exception if an unallowed method (__toString()) is called in the template');
- } catch (SecurityError $e) {
- $this->assertInstanceOf('\Twig\Sandbox\SecurityNotAllowedMethodError', $e, 'Exception should be an instance of Twig_Sandbox_SecurityNotAllowedMethodError');
- $this->assertEquals('Twig\Tests\Extension\FooObject', $e->getClassName(), 'Exception should be raised on the "Twig\Tests\Extension\FooObject" class');
- $this->assertEquals('__tostring', $e->getMethodName(), 'Exception should be raised on the "__toString" method');
- }
- }
-
- public function getSandboxUnallowedToStringTests()
- {
- return [
- 'simple' => ['{{ obj }}'],
- 'object_from_array' => ['{{ arr.obj }}'],
- 'object_chain' => ['{{ obj.anotherFooObject }}'],
- 'filter' => ['{{ obj|upper }}'],
- 'filter_from_array' => ['{{ arr.obj|upper }}'],
- 'function' => ['{{ random(obj) }}'],
- 'function_from_array' => ['{{ random(arr.obj) }}'],
- 'function_and_filter' => ['{{ random(obj|upper) }}'],
- 'function_and_filter_from_array' => ['{{ random(arr.obj|upper) }}'],
- 'object_chain_and_filter' => ['{{ obj.anotherFooObject|upper }}'],
- 'object_chain_and_function' => ['{{ random(obj.anotherFooObject) }}'],
- 'concat' => ['{{ obj ~ "" }}'],
- 'concat_again' => ['{{ "" ~ obj }}'],
- ];
- }
-
- /**
- * @dataProvider getSandboxAllowedToStringTests
- */
- public function testSandboxAllowedToString($template, $output)
- {
- $twig = $this->getEnvironment(true, [], ['index' => $template], ['set'], [], ['Twig\Tests\Extension\FooObject' => ['foo', 'getAnotherFooObject']]);
- $this->assertEquals($output, $twig->load('index')->render(self::$params));
- }
-
- public function getSandboxAllowedToStringTests()
- {
- return [
- 'constant_test' => ['{{ obj is constant("PHP_INT_MAX") }}', ''],
- 'set_object' => ['{% set a = obj.anotherFooObject %}{{ a.foo }}', 'foo'],
- 'is_defined' => ['{{ obj.anotherFooObject is defined }}', '1'],
- 'is_null' => ['{{ obj is null }}', ''],
- 'is_sameas' => ['{{ obj is same as(obj) }}', '1'],
- 'is_sameas_from_array' => ['{{ arr.obj is same as(arr.obj) }}', '1'],
- 'is_sameas_from_another_method' => ['{{ obj.anotherFooObject is same as(obj.anotherFooObject) }}', ''],
- ];
- }
-
- public function testSandboxAllowMethodToString()
- {
- $twig = $this->getEnvironment(true, [], self::$templates, [], [], ['Twig\Tests\Extension\FooObject' => '__toString']);
- FooObject::reset();
- $this->assertEquals('foo', $twig->load('1_basic5')->render(self::$params), 'Sandbox allow some methods');
- $this->assertEquals(1, FooObject::$called['__toString'], 'Sandbox only calls method once');
- }
-
- public function testSandboxAllowMethodToStringDisabled()
- {
- $twig = $this->getEnvironment(false, [], self::$templates);
- FooObject::reset();
- $this->assertEquals('foo', $twig->load('1_basic5')->render(self::$params), 'Sandbox allows __toString when sandbox disabled');
- $this->assertEquals(1, FooObject::$called['__toString'], 'Sandbox only calls method once');
- }
-
- public function testSandboxUnallowedFunction()
- {
- $twig = $this->getEnvironment(true, [], self::$templates);
- try {
- $twig->load('1_basic7')->render(self::$params);
- $this->fail('Sandbox throws a SecurityError exception if an unallowed function is called in the template');
- } catch (SecurityError $e) {
- $this->assertInstanceOf('\Twig\Sandbox\SecurityNotAllowedFunctionError', $e, 'Exception should be an instance of Twig_Sandbox_SecurityNotAllowedFunctionError');
- $this->assertEquals('cycle', $e->getFunctionName(), 'Exception should be raised on the "cycle" function');
- }
- }
-
- public function testSandboxUnallowedRangeOperator()
- {
- $twig = $this->getEnvironment(true, [], self::$templates);
- try {
- $twig->load('1_range_operator')->render(self::$params);
- $this->fail('Sandbox throws a SecurityError exception if the unallowed range operator is called');
- } catch (SecurityError $e) {
- $this->assertInstanceOf('\Twig\Sandbox\SecurityNotAllowedFunctionError', $e, 'Exception should be an instance of Twig_Sandbox_SecurityNotAllowedFunctionError');
- $this->assertEquals('range', $e->getFunctionName(), 'Exception should be raised on the "range" function');
- }
- }
-
- public function testSandboxAllowMethodFoo()
- {
- $twig = $this->getEnvironment(true, [], self::$templates, [], [], ['Twig\Tests\Extension\FooObject' => 'foo']);
- FooObject::reset();
- $this->assertEquals('foo', $twig->load('1_basic1')->render(self::$params), 'Sandbox allow some methods');
- $this->assertEquals(1, FooObject::$called['foo'], 'Sandbox only calls method once');
- }
-
- public function testSandboxAllowFilter()
- {
- $twig = $this->getEnvironment(true, [], self::$templates, [], ['upper']);
- $this->assertEquals('FABIEN', $twig->load('1_basic2')->render(self::$params), 'Sandbox allow some filters');
- }
-
- public function testSandboxAllowTag()
- {
- $twig = $this->getEnvironment(true, [], self::$templates, ['if']);
- $this->assertEquals('foo', $twig->load('1_basic3')->render(self::$params), 'Sandbox allow some tags');
- }
-
- public function testSandboxAllowProperty()
- {
- $twig = $this->getEnvironment(true, [], self::$templates, [], [], [], ['Twig\Tests\Extension\FooObject' => 'bar']);
- $this->assertEquals('bar', $twig->load('1_basic4')->render(self::$params), 'Sandbox allow some properties');
- }
-
- public function testSandboxAllowFunction()
- {
- $twig = $this->getEnvironment(true, [], self::$templates, [], [], [], [], ['cycle']);
- $this->assertEquals('bar', $twig->load('1_basic7')->render(self::$params), 'Sandbox allow some functions');
- }
-
- public function testSandboxAllowRangeOperator()
- {
- $twig = $this->getEnvironment(true, [], self::$templates, [], [], [], [], ['range']);
- $this->assertEquals('1', $twig->load('1_range_operator')->render(self::$params), 'Sandbox allow the range operator');
- }
-
- public function testSandboxAllowFunctionsCaseInsensitive()
- {
- foreach (['getfoobar', 'getFoobar', 'getFooBar'] as $name) {
- $twig = $this->getEnvironment(true, [], self::$templates, [], [], ['Twig\Tests\Extension\FooObject' => $name]);
- FooObject::reset();
- $this->assertEquals('foobarfoobar', $twig->load('1_basic8')->render(self::$params), 'Sandbox allow methods in a case-insensitive way');
- $this->assertEquals(2, FooObject::$called['getFooBar'], 'Sandbox only calls method once');
-
- $this->assertEquals('foobarfoobar', $twig->load('1_basic9')->render(self::$params), 'Sandbox allow methods via shortcut names (ie. without get/set)');
- }
- }
-
- public function testSandboxLocallySetForAnInclude()
- {
- self::$templates = [
- '2_basic' => '{{ obj.foo }}{% include "2_included" %}{{ obj.foo }}',
- '2_included' => '{% if obj.foo %}{{ obj.foo|upper }}{% endif %}',
- ];
-
- $twig = $this->getEnvironment(false, [], self::$templates);
- $this->assertEquals('fooFOOfoo', $twig->load('2_basic')->render(self::$params), 'Sandbox does nothing if disabled globally and sandboxed not used for the include');
-
- self::$templates = [
- '3_basic' => '{{ obj.foo }}{% sandbox %}{% include "3_included" %}{% endsandbox %}{{ obj.foo }}',
- '3_included' => '{% if obj.foo %}{{ obj.foo|upper }}{% endif %}',
- ];
-
- $twig = $this->getEnvironment(true, [], self::$templates);
- try {
- $twig->load('3_basic')->render(self::$params);
- $this->fail('Sandbox throws a SecurityError exception when the included file is sandboxed');
- } catch (SecurityError $e) {
- $this->assertInstanceOf('\Twig\Sandbox\SecurityNotAllowedTagError', $e, 'Exception should be an instance of Twig_Sandbox_SecurityNotAllowedTagError');
- $this->assertEquals('sandbox', $e->getTagName());
- }
- }
-
- public function testMacrosInASandbox()
- {
- $twig = $this->getEnvironment(true, ['autoescape' => 'html'], ['index' => <<<EOF
-{%- import _self as macros %}
-
-{%- macro test(text) %}<p>{{ text }}</p>{% endmacro %}
-
-{{- macros.test('username') }}
-EOF
- ], ['macro', 'import'], ['escape']);
-
- $this->assertEquals('<p>username</p>', $twig->load('index')->render([]));
- }
-
- public function testSandboxDisabledAfterIncludeFunctionError()
- {
- $twig = $this->getEnvironment(false, [], self::$templates);
-
- $e = null;
- try {
- $twig->load('1_include')->render(self::$params);
- } catch (\Throwable $e) {
- } catch (\Exception $e) {
- }
- if (null === $e) {
- $this->fail('An exception should be thrown for this test to be valid.');
- }
-
- $this->assertFalse($twig->getExtension('\Twig\Extension\SandboxExtension')->isSandboxed(), 'Sandboxed include() function call should not leave Sandbox enabled when an error occurs.');
- }
-
- protected function getEnvironment($sandboxed, $options, $templates, $tags = [], $filters = [], $methods = [], $properties = [], $functions = [])
- {
- $loader = new ArrayLoader($templates);
- $twig = new Environment($loader, array_merge(['debug' => true, 'cache' => false, 'autoescape' => false], $options));
- $policy = new SecurityPolicy($tags, $filters, $methods, $properties, $functions);
- $twig->addExtension(new SandboxExtension($policy, $sandboxed));
-
- return $twig;
- }
-}
-
-class FooObject
-{
- public static $called = ['__toString' => 0, 'foo' => 0, 'getFooBar' => 0];
-
- public $bar = 'bar';
-
- public static function reset()
- {
- self::$called = ['__toString' => 0, 'foo' => 0, 'getFooBar' => 0];
- }
-
- public function __toString()
- {
- ++self::$called['__toString'];
-
- return 'foo';
- }
-
- public function foo()
- {
- ++self::$called['foo'];
-
- return 'foo';
- }
-
- public function getFooBar()
- {
- ++self::$called['getFooBar'];
-
- return 'foobar';
- }
-
- public function getAnotherFooObject()
- {
- return new self();
- }
-}
diff --git a/vendor/twig/twig/tests/FactoryRuntimeLoaderTest.php b/vendor/twig/twig/tests/FactoryRuntimeLoaderTest.php
deleted file mode 100644
index 32e61d1520..0000000000
--- a/vendor/twig/twig/tests/FactoryRuntimeLoaderTest.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-namespace Twig\Tests;
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Twig\RuntimeLoader\FactoryRuntimeLoader;
-
-class FactoryRuntimeLoaderTest extends \PHPUnit\Framework\TestCase
-{
- public function testLoad()
- {
- $loader = new FactoryRuntimeLoader(['stdClass' => '\Twig\Tests\getRuntime']);
-
- $this->assertInstanceOf('stdClass', $loader->load('stdClass'));
- }
-
- public function testLoadReturnsNullForUnmappedRuntime()
- {
- $loader = new FactoryRuntimeLoader();
-
- $this->assertNull($loader->load('stdClass'));
- }
-}
-
-function getRuntime()
-{
- return new \stdClass();
-}
diff --git a/vendor/twig/twig/tests/FileCachingTest.php b/vendor/twig/twig/tests/FileCachingTest.php
deleted file mode 100644
index e1fa3a4b52..0000000000
--- a/vendor/twig/twig/tests/FileCachingTest.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-
-namespace Twig\Tests;
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Twig\Environment;
-use Twig\Loader\ArrayLoader;
-
-class FileCachingTest extends \PHPUnit\Framework\TestCase
-{
- private $env;
- private $tmpDir;
-
- protected function setUp()
- {
- $this->tmpDir = sys_get_temp_dir().'/TwigTests';
- if (!file_exists($this->tmpDir)) {
- @mkdir($this->tmpDir, 0777, true);
- }
-
- if (!is_writable($this->tmpDir)) {
- $this->markTestSkipped(sprintf('Unable to run the tests as "%s" is not writable.', $this->tmpDir));
- }
-
- $this->env = new Environment(new ArrayLoader(['index' => 'index', 'index2' => 'index2']), ['cache' => $this->tmpDir]);
- }
-
- protected function tearDown()
- {
- FilesystemHelper::removeDir($this->tmpDir);
- }
-
- /**
- * @group legacy
- */
- public function testWritingCacheFiles()
- {
- $name = 'index';
- $this->env->load($name);
- $cacheFileName = $this->env->getCacheFilename($name);
-
- $this->assertFileExists($cacheFileName, 'Cache file does not exist.');
- }
-
- /**
- * @group legacy
- */
- public function testClearingCacheFiles()
- {
- $name = 'index2';
- $this->env->load($name);
- $cacheFileName = $this->env->getCacheFilename($name);
-
- $this->assertFileExists($cacheFileName, 'Cache file does not exist.');
- $this->env->clearCacheFiles();
- $this->assertFileNotExists($cacheFileName, 'Cache file was not cleared.');
- }
-}
diff --git a/vendor/twig/twig/tests/FileExtensionEscapingStrategyTest.php b/vendor/twig/twig/tests/FileExtensionEscapingStrategyTest.php
deleted file mode 100644
index 26e1413501..0000000000
--- a/vendor/twig/twig/tests/FileExtensionEscapingStrategyTest.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-namespace Twig\Tests;
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Twig\FileExtensionEscapingStrategy;
-
-class FileExtensionEscapingStrategyTest extends \PHPUnit\Framework\TestCase
-{
- /**
- * @dataProvider getGuessData
- */
- public function testGuess($strategy, $filename)
- {
- $this->assertSame($strategy, FileExtensionEscapingStrategy::guess($filename));
- }
-
- public function getGuessData()
- {
- return [
- // default
- ['html', 'foo.html'],
- ['html', 'foo.html.twig'],
- ['html', 'foo'],
- ['html', 'foo.bar.twig'],
- ['html', 'foo.txt/foo'],
- ['html', 'foo.txt/foo.js/'],
-
- // css
- ['css', 'foo.css'],
- ['css', 'foo.css.twig'],
- ['css', 'foo.twig.css'],
- ['css', 'foo.js.css'],
- ['css', 'foo.js.css.twig'],
-
- // js
- ['js', 'foo.js'],
- ['js', 'foo.js.twig'],
- ['js', 'foo.txt/foo.js'],
- ['js', 'foo.txt.twig/foo.js'],
-
- // txt
- [false, 'foo.txt'],
- [false, 'foo.txt.twig'],
- ];
- }
-}
diff --git a/vendor/twig/twig/tests/FilesystemHelper.php b/vendor/twig/twig/tests/FilesystemHelper.php
deleted file mode 100644
index 76f75afc73..0000000000
--- a/vendor/twig/twig/tests/FilesystemHelper.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-namespace Twig\Tests;
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-class FilesystemHelper
-{
- public static function removeDir($dir)
- {
- $iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($dir, \PHP_VERSION_ID < 50300 ? 0 : \FilesystemIterator::SKIP_DOTS), \RecursiveIteratorIterator::CHILD_FIRST);
- foreach ($iterator as $filename => $fileInfo) {
- if ($iterator->isDot()) {
- continue;
- }
-
- if ($fileInfo->isDir()) {
- rmdir($filename);
- } else {
- unlink($filename);
- }
- }
- rmdir($dir);
- }
-}
diff --git a/vendor/twig/twig/tests/Fixtures/autoescape/block.test b/vendor/twig/twig/tests/Fixtures/autoescape/block.test
deleted file mode 100644
index a80b80c376..0000000000
--- a/vendor/twig/twig/tests/Fixtures/autoescape/block.test
+++ /dev/null
@@ -1,21 +0,0 @@
---TEST--
-blocks and autoescape
---TEMPLATE--
-{{ include('unrelated.txt.twig') -}}
-{{ include('template.html.twig') -}}
---TEMPLATE(unrelated.txt.twig)--
-{% block content %}{% endblock %}
---TEMPLATE(template.html.twig)--
-{% extends 'parent.html.twig' %}
-{% block content %}
-{{ br -}}
-{% endblock %}
---TEMPLATE(parent.html.twig)--
-{% set _content = block('content')|raw %}
-{{ _content|raw }}
---DATA--
-return ['br' => '<br />']
---CONFIG--
-return ['autoescape' => 'name']
---EXPECT--
-<br />
diff --git a/vendor/twig/twig/tests/Fixtures/autoescape/name.test b/vendor/twig/twig/tests/Fixtures/autoescape/name.test
deleted file mode 100644
index 5ad573cf0a..0000000000
--- a/vendor/twig/twig/tests/Fixtures/autoescape/name.test
+++ /dev/null
@@ -1,22 +0,0 @@
---TEST--
-"name" autoescape strategy
---TEMPLATE--
-{{ br -}}
-{{ include('index.js.twig') -}}
-{{ include('index.html.twig') -}}
-{{ include('index.txt.twig') -}}
---TEMPLATE(index.js.twig)--
-{{ br -}}
---TEMPLATE(index.html.twig)--
-{{ br -}}
---TEMPLATE(index.txt.twig)--
-{{ br -}}
---DATA--
-return ['br' => '<br />']
---CONFIG--
-return ['autoescape' => 'name']
---EXPECT--
-<br />
-\u003Cbr\u0020\/\u003E
-<br />
-<br />
diff --git a/vendor/twig/twig/tests/Fixtures/errors/base.html b/vendor/twig/twig/tests/Fixtures/errors/base.html
deleted file mode 100644
index cb0dbe444b..0000000000
--- a/vendor/twig/twig/tests/Fixtures/errors/base.html
+++ /dev/null
@@ -1 +0,0 @@
-{% block content %}{% endblock %}
diff --git a/vendor/twig/twig/tests/Fixtures/errors/index.html b/vendor/twig/twig/tests/Fixtures/errors/index.html
deleted file mode 100644
index df57c822f9..0000000000
--- a/vendor/twig/twig/tests/Fixtures/errors/index.html
+++ /dev/null
@@ -1,7 +0,0 @@
-{% extends 'base.html' %}
-{% block content %}
- {{ foo.bar }}
-{% endblock %}
-{% block foo %}
- {{ foo.bar }}
-{% endblock %}
diff --git a/vendor/twig/twig/tests/Fixtures/errors/leak-output.php b/vendor/twig/twig/tests/Fixtures/errors/leak-output.php
deleted file mode 100644
index 985c39a8eb..0000000000
--- a/vendor/twig/twig/tests/Fixtures/errors/leak-output.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-namespace Twig\Tests\Fixtures\errors;
-
-require __DIR__.'/../../../vendor/autoload.php';
-
-use Twig\Environment;
-use Twig\Extension\AbstractExtension;
-use Twig\Loader\ArrayLoader;
-use Twig\TwigFilter;
-
-class BrokenExtension extends AbstractExtension
-{
- public function getFilters()
- {
- return [
- new TwigFilter('broken', [$this, 'broken']),
- ];
- }
-
- public function broken()
- {
- die('OOPS');
- }
-}
-
-$loader = new ArrayLoader([
- 'index.html.twig' => 'Hello {{ "world"|broken }}',
-]);
-$twig = new Environment($loader, ['debug' => isset($argv[1])]);
-$twig->addExtension(new BrokenExtension());
-
-echo $twig->render('index.html.twig');
diff --git a/vendor/twig/twig/tests/Fixtures/exceptions/child_contents_outside_blocks.test b/vendor/twig/twig/tests/Fixtures/exceptions/child_contents_outside_blocks.test
deleted file mode 100644
index 74a1cc2833..0000000000
--- a/vendor/twig/twig/tests/Fixtures/exceptions/child_contents_outside_blocks.test
+++ /dev/null
@@ -1,15 +0,0 @@
---TEST--
-Exception for child templates defining content outside blocks defined by parent
---TEMPLATE--
-{% extends 'base.twig' %}
-
-Content outside a block.
-
-{% block sidebar %}
- Content inside a block.
-{% endblock %}
---TEMPLATE(base.twig)--
-{% block sidebar %}
-{% endblock %}
---EXCEPTION--
-Twig\Error\SyntaxError: A template that extends another one cannot include content outside Twig blocks. Did you forget to put the content inside a {% block %} tag in "index.twig" at line 3?
diff --git a/vendor/twig/twig/tests/Fixtures/exceptions/exception_in_extension_extends.test b/vendor/twig/twig/tests/Fixtures/exceptions/exception_in_extension_extends.test
deleted file mode 100644
index 2ab298059d..0000000000
--- a/vendor/twig/twig/tests/Fixtures/exceptions/exception_in_extension_extends.test
+++ /dev/null
@@ -1,12 +0,0 @@
---TEST--
-Exception thrown from a child for an extension error
---TEMPLATE--
-{% extends 'base.twig' %}
---TEMPLATE(base.twig)--
-
-
-{{ random([]) }}
---DATA--
-return []
---EXCEPTION--
-Twig\Error\RuntimeError: The random function cannot pick from an empty array in "base.twig" at line 4.
diff --git a/vendor/twig/twig/tests/Fixtures/exceptions/exception_in_extension_include.test b/vendor/twig/twig/tests/Fixtures/exceptions/exception_in_extension_include.test
deleted file mode 100644
index e2281b2903..0000000000
--- a/vendor/twig/twig/tests/Fixtures/exceptions/exception_in_extension_include.test
+++ /dev/null
@@ -1,12 +0,0 @@
---TEST--
-Exception thrown from an include for an extension error
---TEMPLATE--
-{% include 'content.twig' %}
---TEMPLATE(content.twig)--
-
-
-{{ random([]) }}
---DATA--
-return []
---EXCEPTION--
-Twig\Error\RuntimeError: The random function cannot pick from an empty array in "content.twig" at line 4.
diff --git a/vendor/twig/twig/tests/Fixtures/exceptions/multiline_array_with_undefined_variable.test b/vendor/twig/twig/tests/Fixtures/exceptions/multiline_array_with_undefined_variable.test
deleted file mode 100644
index 66784292c9..0000000000
--- a/vendor/twig/twig/tests/Fixtures/exceptions/multiline_array_with_undefined_variable.test
+++ /dev/null
@@ -1,18 +0,0 @@
---TEST--
-Exception for multiline array with undefined variable
---TEMPLATE--
-{% set foo = {
- foo: 'foo',
- bar: 'bar',
-
-
- foobar: foobar,
-
-
-
- foo2: foo2,
-} %}
---DATA--
-return ['foobar' => 'foobar']
---EXCEPTION--
-Twig\Error\RuntimeError: Variable "foo2" does not exist in "index.twig" at line 11.
diff --git a/vendor/twig/twig/tests/Fixtures/exceptions/multiline_array_with_undefined_variable_again.test b/vendor/twig/twig/tests/Fixtures/exceptions/multiline_array_with_undefined_variable_again.test
deleted file mode 100644
index 7f5e96b049..0000000000
--- a/vendor/twig/twig/tests/Fixtures/exceptions/multiline_array_with_undefined_variable_again.test
+++ /dev/null
@@ -1,18 +0,0 @@
---TEST--
-Exception for multiline array with undefined variable
---TEMPLATE--
-{% set foo = {
- foo: 'foo',
- bar: 'bar',
-
-
- foobar: foobar,
-
-
-
- foo2: foo2,
-} %}
---DATA--
-return []
---EXCEPTION--
-Twig\Error\RuntimeError: Variable "foobar" does not exist in "index.twig" at line 7.
diff --git a/vendor/twig/twig/tests/Fixtures/exceptions/multiline_function_with_undefined_variable.test b/vendor/twig/twig/tests/Fixtures/exceptions/multiline_function_with_undefined_variable.test
deleted file mode 100644
index 8bc524ef18..0000000000
--- a/vendor/twig/twig/tests/Fixtures/exceptions/multiline_function_with_undefined_variable.test
+++ /dev/null
@@ -1,12 +0,0 @@
---TEST--
-Exception for multile function with undefined variable
---TEMPLATE--
-{{ include('foo',
- with_context=with_context
-) }}
---TEMPLATE(foo)--
-Foo
---DATA--
-return []
---EXCEPTION--
-Twig\Error\RuntimeError: Variable "with_context" does not exist in "index.twig" at line 3.
diff --git a/vendor/twig/twig/tests/Fixtures/exceptions/multiline_function_with_unknown_argument.test b/vendor/twig/twig/tests/Fixtures/exceptions/multiline_function_with_unknown_argument.test
deleted file mode 100644
index 5f413d406a..0000000000
--- a/vendor/twig/twig/tests/Fixtures/exceptions/multiline_function_with_unknown_argument.test
+++ /dev/null
@@ -1,9 +0,0 @@
---TEST--
-Exception for multiline function with unknown argument
---TEMPLATE--
-{{ include('foo',
- with_context=True,
- invalid=False
-) }}
---EXCEPTION--
-Twig\Error\SyntaxError: Unknown argument "invalid" for function "include(template, variables, with_context, ignore_missing, sandboxed)" in "index.twig" at line 4.
diff --git a/vendor/twig/twig/tests/Fixtures/exceptions/multiline_tag_with_undefined_variable.test b/vendor/twig/twig/tests/Fixtures/exceptions/multiline_tag_with_undefined_variable.test
deleted file mode 100644
index 032ad831ec..0000000000
--- a/vendor/twig/twig/tests/Fixtures/exceptions/multiline_tag_with_undefined_variable.test
+++ /dev/null
@@ -1,12 +0,0 @@
---TEST--
-Exception for multiline tag with undefined variable
---TEMPLATE--
-{% include 'foo'
- with vars
-%}
---TEMPLATE(foo)--
-Foo
---DATA--
-return []
---EXCEPTION--
-Twig\Error\RuntimeError: Variable "vars" does not exist in "index.twig" at line 3.
diff --git a/vendor/twig/twig/tests/Fixtures/exceptions/strict_comparison_operator.test b/vendor/twig/twig/tests/Fixtures/exceptions/strict_comparison_operator.test
deleted file mode 100644
index e14beb672d..0000000000
--- a/vendor/twig/twig/tests/Fixtures/exceptions/strict_comparison_operator.test
+++ /dev/null
@@ -1,6 +0,0 @@
---TEST--
-The PHP === strict comparison operator is not supported
---TEMPLATE--
-{{ 1 === 2 }}
---EXCEPTION--
-Twig\Error\SyntaxError: Unexpected operator of value "=". Did you try to use "===" or "!==" for strict comparison? Use "is same as(value)" instead in "index.twig" at line 2.
diff --git a/vendor/twig/twig/tests/Fixtures/exceptions/syntax_error_in_reused_template.test b/vendor/twig/twig/tests/Fixtures/exceptions/syntax_error_in_reused_template.test
deleted file mode 100644
index 4ce06854fb..0000000000
--- a/vendor/twig/twig/tests/Fixtures/exceptions/syntax_error_in_reused_template.test
+++ /dev/null
@@ -1,10 +0,0 @@
---TEST--
-Exception for syntax error in reused template
---TEMPLATE--
-{% use 'foo.twig' %}
---TEMPLATE(foo.twig)--
-{% block bar %}
- {% do node.data = 5 %}
-{% endblock %}
---EXCEPTION--
-Twig\Error\SyntaxError: Unexpected token "operator" of value "=" ("end of statement block" expected) in "foo.twig" at line 3.
diff --git a/vendor/twig/twig/tests/Fixtures/exceptions/unclosed_tag.test b/vendor/twig/twig/tests/Fixtures/exceptions/unclosed_tag.test
deleted file mode 100644
index b4fc169167..0000000000
--- a/vendor/twig/twig/tests/Fixtures/exceptions/unclosed_tag.test
+++ /dev/null
@@ -1,20 +0,0 @@
---TEST--
-Exception for an unclosed tag
---TEMPLATE--
-{% block foo %}
- {% if foo %}
-
-
-
-
- {% for i in fo %}
-
-
-
- {% endfor %}
-
-
-
-{% endblock %}
---EXCEPTION--
-Twig\Error\SyntaxError: Unexpected "endblock" tag (expecting closing tag for the "if" tag defined near line 4) in "index.twig" at line 16.
diff --git a/vendor/twig/twig/tests/Fixtures/exceptions/undefined_parent.test b/vendor/twig/twig/tests/Fixtures/exceptions/undefined_parent.test
deleted file mode 100644
index 07f855a3fe..0000000000
--- a/vendor/twig/twig/tests/Fixtures/exceptions/undefined_parent.test
+++ /dev/null
@@ -1,10 +0,0 @@
---TEST--
-Exception for an undefined parent
---TEMPLATE--
-{% extends 'foo.html' %}
-
-{% set foo = "foo" %}
---DATA--
-return []
---EXCEPTION--
-Twig\Error\LoaderError: Template "foo.html" is not defined in "index.twig" at line 2.
diff --git a/vendor/twig/twig/tests/Fixtures/exceptions/undefined_template_in_child_template.test b/vendor/twig/twig/tests/Fixtures/exceptions/undefined_template_in_child_template.test
deleted file mode 100644
index 904faa50ad..0000000000
--- a/vendor/twig/twig/tests/Fixtures/exceptions/undefined_template_in_child_template.test
+++ /dev/null
@@ -1,15 +0,0 @@
---TEST--
-Exception for an undefined template in a child template
---TEMPLATE--
-{% extends 'base.twig' %}
-
-{% block sidebar %}
- {{ include('include.twig') }}
-{% endblock %}
---TEMPLATE(base.twig)--
-{% block sidebar %}
-{% endblock %}
---DATA--
-return []
---EXCEPTION--
-Twig\Error\LoaderError: Template "include.twig" is not defined in "index.twig" at line 5.
diff --git a/vendor/twig/twig/tests/Fixtures/exceptions/undefined_trait.test b/vendor/twig/twig/tests/Fixtures/exceptions/undefined_trait.test
deleted file mode 100644
index 5bfdd07e61..0000000000
--- a/vendor/twig/twig/tests/Fixtures/exceptions/undefined_trait.test
+++ /dev/null
@@ -1,9 +0,0 @@
---TEST--
-Exception for an undefined trait
---TEMPLATE--
-{% use 'foo' with foobar as bar %}
---TEMPLATE(foo)--
-{% block bar %}
-{% endblock %}
---EXCEPTION--
-Twig\Error\RuntimeError: Block "foobar" is not defined in trait "foo" in "index.twig" at line 2.
diff --git a/vendor/twig/twig/tests/Fixtures/expressions/_self.test b/vendor/twig/twig/tests/Fixtures/expressions/_self.test
deleted file mode 100644
index fb88f4c859..0000000000
--- a/vendor/twig/twig/tests/Fixtures/expressions/_self.test
+++ /dev/null
@@ -1,8 +0,0 @@
---TEST--
-_self returns the template name
---TEMPLATE--
-{{ _self }}
---DATA--
-return []
---EXPECT--
-index.twig
diff --git a/vendor/twig/twig/tests/Fixtures/expressions/array.test b/vendor/twig/twig/tests/Fixtures/expressions/array.test
deleted file mode 100644
index bf6033356a..0000000000
--- a/vendor/twig/twig/tests/Fixtures/expressions/array.test
+++ /dev/null
@@ -1,61 +0,0 @@
---TEST--
-Twig supports array notation
---TEMPLATE--
-{# empty array #}
-{{ []|join(',') }}
-
-{{ [1, 2]|join(',') }}
-{{ ['foo', "bar"]|join(',') }}
-{{ {0: 1, 'foo': 'bar'}|join(',') }}
-{{ {0: 1, 'foo': 'bar'}|keys|join(',') }}
-
-{{ {0: 1, foo: 'bar'}|join(',') }}
-{{ {0: 1, foo: 'bar'}|keys|join(',') }}
-
-{# nested arrays #}
-{% set a = [1, 2, [1, 2], {'foo': {'foo': 'bar'}}] %}
-{{ a[2]|join(',') }}
-{{ a[3]["foo"]|join(',') }}
-
-{# works even if [] is used inside the array #}
-{{ [foo[bar]]|join(',') }}
-
-{# elements can be any expression #}
-{{ ['foo'|upper, bar|upper, bar == foo]|join(',') }}
-
-{# arrays can have a trailing , like in PHP #}
-{{
- [
- 1,
- 2,
- ]|join(',')
-}}
-
-{# keys can be any expression #}
-{% set a = 1 %}
-{% set b = "foo" %}
-{% set ary = { (a): 'a', (b): 'b', 'c': 'c', (a ~ b): 'd' } %}
-{{ ary|keys|join(',') }}
-{{ ary|join(',') }}
---DATA--
-return ['bar' => 'bar', 'foo' => ['bar' => 'bar']]
---EXPECT--
-1,2
-foo,bar
-1,bar
-0,foo
-
-1,bar
-0,foo
-
-1,2
-bar
-
-bar
-
-FOO,BAR,
-
-1,2
-
-1,foo,c,1foo
-a,b,c,d
diff --git a/vendor/twig/twig/tests/Fixtures/expressions/array_call.test b/vendor/twig/twig/tests/Fixtures/expressions/array_call.test
deleted file mode 100644
index 8c7a2ee7cb..0000000000
--- a/vendor/twig/twig/tests/Fixtures/expressions/array_call.test
+++ /dev/null
@@ -1,14 +0,0 @@
---TEST--
-Twig supports method calls
---TEMPLATE--
-{{ items.foo }}
-{{ items['foo'] }}
-{{ items[foo] }}
-{{ items[items[foo]] }}
---DATA--
-return ['foo' => 'bar', 'items' => ['foo' => 'bar', 'bar' => 'foo']]
---EXPECT--
-bar
-bar
-foo
-bar
diff --git a/vendor/twig/twig/tests/Fixtures/expressions/binary.test b/vendor/twig/twig/tests/Fixtures/expressions/binary.test
deleted file mode 100644
index b4e8be58d3..0000000000
--- a/vendor/twig/twig/tests/Fixtures/expressions/binary.test
+++ /dev/null
@@ -1,46 +0,0 @@
---TEST--
-Twig supports binary operations (+, -, *, /, ~, %, and, or)
---TEMPLATE--
-{{ 1 + 1 }}
-{{ 2 - 1 }}
-{{ 2 * 2 }}
-{{ 2 / 2 }}
-{{ 3 % 2 }}
-{{ 1 and 1 }}
-{{ 1 and 0 }}
-{{ 0 and 1 }}
-{{ 0 and 0 }}
-{{ 1 or 1 }}
-{{ 1 or 0 }}
-{{ 0 or 1 }}
-{{ 0 or 0 }}
-{{ 0 or 1 and 0 }}
-{{ 1 or 0 and 1 }}
-{{ "foo" ~ "bar" }}
-{{ foo ~ "bar" }}
-{{ "foo" ~ bar }}
-{{ foo ~ bar }}
-{{ 20 // 7 }}
---DATA--
-return ['foo' => 'bar', 'bar' => 'foo']
---EXPECT--
-2
-1
-4
-1
-1
-1
-
-
-
-1
-1
-1
-
-
-1
-foobar
-barbar
-foofoo
-barfoo
-2
diff --git a/vendor/twig/twig/tests/Fixtures/expressions/bitwise.test b/vendor/twig/twig/tests/Fixtures/expressions/bitwise.test
deleted file mode 100644
index c2bda1cc6b..0000000000
--- a/vendor/twig/twig/tests/Fixtures/expressions/bitwise.test
+++ /dev/null
@@ -1,14 +0,0 @@
---TEST--
-Twig supports bitwise operations
---TEMPLATE--
-{{ 1 b-and 5 }}
-{{ 1 b-or 5 }}
-{{ 1 b-xor 5 }}
-{{ (1 and 0 b-or 0) is same as(1 and (0 b-or 0)) ? 'ok' : 'ko' }}
---DATA--
-return []
---EXPECT--
-1
-5
-4
-ok
diff --git a/vendor/twig/twig/tests/Fixtures/expressions/call_argument_defined_twice.test b/vendor/twig/twig/tests/Fixtures/expressions/call_argument_defined_twice.test
deleted file mode 100644
index 36539a6d13..0000000000
--- a/vendor/twig/twig/tests/Fixtures/expressions/call_argument_defined_twice.test
+++ /dev/null
@@ -1,8 +0,0 @@
---TEST--
-Argument is defined twice in a call
---TEMPLATE--
-{{ date(987654, date = 123456) }}
---DATA--
-return []
---EXCEPTION--
-Twig\Error\SyntaxError: Argument "date" is defined twice for function "date" in "index.twig" at line 2.
diff --git a/vendor/twig/twig/tests/Fixtures/expressions/call_positional_arg_after_named_arg.test b/vendor/twig/twig/tests/Fixtures/expressions/call_positional_arg_after_named_arg.test
deleted file mode 100644
index 729c674859..0000000000
--- a/vendor/twig/twig/tests/Fixtures/expressions/call_positional_arg_after_named_arg.test
+++ /dev/null
@@ -1,8 +0,0 @@
---TEST--
-Positional arguments after named arguments in a call
---TEMPLATE--
-{{ date(date = 123456, 'Y-m-d') }}
---DATA--
-return []
---EXCEPTION--
-Twig\Error\SyntaxError: Positional arguments cannot be used after named arguments for function "date" in "index.twig" at line 2.
diff --git a/vendor/twig/twig/tests/Fixtures/expressions/comparison.test b/vendor/twig/twig/tests/Fixtures/expressions/comparison.test
deleted file mode 100644
index 2811634f76..0000000000
--- a/vendor/twig/twig/tests/Fixtures/expressions/comparison.test
+++ /dev/null
@@ -1,14 +0,0 @@
---TEST--
-Twig supports comparison operators (==, !=, <, >, >=, <=)
---TEMPLATE--
-{{ 1 > 2 }}/{{ 1 > 1 }}/{{ 1 >= 2 }}/{{ 1 >= 1 }}
-{{ 1 < 2 }}/{{ 1 < 1 }}/{{ 1 <= 2 }}/{{ 1 <= 1 }}
-{{ 1 == 1 }}/{{ 1 == 2 }}
-{{ 1 != 1 }}/{{ 1 != 2 }}
---DATA--
-return []
---EXPECT--
-///1
-1//1/1
-1/
-/1
diff --git a/vendor/twig/twig/tests/Fixtures/expressions/divisibleby.test b/vendor/twig/twig/tests/Fixtures/expressions/divisibleby.test
deleted file mode 100644
index f1bf5681e5..0000000000
--- a/vendor/twig/twig/tests/Fixtures/expressions/divisibleby.test
+++ /dev/null
@@ -1,17 +0,0 @@
---TEST--
-Twig supports the "divisible by" operator
---TEMPLATE--
-{{ 8 is divisible by(2) ? 'OK' }}
-{{ 8 is not divisible by(3) ? 'OK' }}
-{{ 8 is divisible by (2) ? 'OK' }}
-{{ 8 is not
- divisible
- by
- (3) ? 'OK' }}
---DATA--
-return []
---EXPECT--
-OK
-OK
-OK
-OK
diff --git a/vendor/twig/twig/tests/Fixtures/expressions/dotdot.test b/vendor/twig/twig/tests/Fixtures/expressions/dotdot.test
deleted file mode 100644
index 0efa930569..0000000000
--- a/vendor/twig/twig/tests/Fixtures/expressions/dotdot.test
+++ /dev/null
@@ -1,20 +0,0 @@
---TEST--
-Twig supports the .. operator
---TEMPLATE--
-{% for i in 0..10 %}{{ i }} {% endfor %}
-
-{% for letter in 'a'..'z' %}{{ letter }} {% endfor %}
-
-{% for letter in 'a'|upper..'z'|upper %}{{ letter }} {% endfor %}
-
-{% for i in foo[0]..foo[1] %}{{ i }} {% endfor %}
-
-{% for i in 0 + 1 .. 10 - 1 %}{{ i }} {% endfor %}
---DATA--
-return ['foo' => [1, 10]]
---EXPECT--
-0 1 2 3 4 5 6 7 8 9 10
-a b c d e f g h i j k l m n o p q r s t u v w x y z
-A B C D E F G H I J K L M N O P Q R S T U V W X Y Z
-1 2 3 4 5 6 7 8 9 10
-1 2 3 4 5 6 7 8 9
diff --git a/vendor/twig/twig/tests/Fixtures/expressions/ends_with.test b/vendor/twig/twig/tests/Fixtures/expressions/ends_with.test
deleted file mode 100644
index c8086d6d4c..0000000000
--- a/vendor/twig/twig/tests/Fixtures/expressions/ends_with.test
+++ /dev/null
@@ -1,26 +0,0 @@
---TEST--
-Twig supports the "ends with" operator
---TEMPLATE--
-{{ 'foo' ends with 'o' ? 'OK' : 'KO' }}
-{{ not ('foo' ends with 'f') ? 'OK' : 'KO' }}
-{{ not ('foo' ends with 'foowaytoolong') ? 'OK' : 'KO' }}
-{{ 'foo' ends with '' ? 'OK' : 'KO' }}
-{{ '1' ends with true ? 'OK' : 'KO' }}
-{{ 1 ends with true ? 'OK' : 'KO' }}
-{{ 0 ends with false ? 'OK' : 'KO' }}
-{{ '' ends with false ? 'OK' : 'KO' }}
-{{ false ends with false ? 'OK' : 'KO' }}
-{{ false ends with '' ? 'OK' : 'KO' }}
---DATA--
-return []
---EXPECT--
-OK
-OK
-OK
-OK
-KO
-KO
-KO
-KO
-KO
-KO
diff --git a/vendor/twig/twig/tests/Fixtures/expressions/floats.test b/vendor/twig/twig/tests/Fixtures/expressions/floats.test
deleted file mode 100644
index cdf871cde1..0000000000
--- a/vendor/twig/twig/tests/Fixtures/expressions/floats.test
+++ /dev/null
@@ -1,16 +0,0 @@
---TEST--
-Twig compiles floats properly
---CONDITION--
-version_compare(phpversion(), '7.0.0', '>=')
---TEMPLATE--
-{% set val2 = 0.0 %}
-
-{{ val is same as (0.0) ? 'Yes' : 'No' }}
-{{ val2 is same as (0.0) ? 'Yes' : 'No' }}
-{{ val is same as (val2) ? 'Yes' : 'No' }}
---DATA--
-return ['val' => 0.0]
---EXPECT--
-Yes
-Yes
-Yes
diff --git a/vendor/twig/twig/tests/Fixtures/expressions/grouping.test b/vendor/twig/twig/tests/Fixtures/expressions/grouping.test
deleted file mode 100644
index 069ebf793d..0000000000
--- a/vendor/twig/twig/tests/Fixtures/expressions/grouping.test
+++ /dev/null
@@ -1,8 +0,0 @@
---TEST--
-Twig supports grouping of expressions
---TEMPLATE--
-{{ (2 + 2) / 2 }}
---DATA--
-return []
---EXPECT--
-2
diff --git a/vendor/twig/twig/tests/Fixtures/expressions/literals.test b/vendor/twig/twig/tests/Fixtures/expressions/literals.test
deleted file mode 100644
index 308e8df2ac..0000000000
--- a/vendor/twig/twig/tests/Fixtures/expressions/literals.test
+++ /dev/null
@@ -1,22 +0,0 @@
---TEST--
-Twig supports literals
---TEMPLATE--
-1 {{ true }}
-2 {{ TRUE }}
-3 {{ false }}
-4 {{ FALSE }}
-5 {{ none }}
-6 {{ NONE }}
-7 {{ null }}
-8 {{ NULL }}
---DATA--
-return []
---EXPECT--
-1 1
-2 1
-3
-4
-5
-6
-7
-8
diff --git a/vendor/twig/twig/tests/Fixtures/expressions/magic_call.test b/vendor/twig/twig/tests/Fixtures/expressions/magic_call.test
deleted file mode 100644
index 60417e04ff..0000000000
--- a/vendor/twig/twig/tests/Fixtures/expressions/magic_call.test
+++ /dev/null
@@ -1,27 +0,0 @@
---TEST--
-Twig supports __call() for attributes
---TEMPLATE--
-{{ foo.foo }}
-{{ foo.bar }}
---DATA--
-class TestClassForMagicCallAttributes
-{
- public function getBar()
- {
- return 'bar_from_getbar';
- }
-
- public function __call($method, $arguments)
- {
- if ('foo' === $method) {
- return 'foo_from_call';
- }
-
- return false;
- }
-}
-
-return ['foo' => new TestClassForMagicCallAttributes()]
---EXPECT--
-foo_from_call
-bar_from_getbar
diff --git a/vendor/twig/twig/tests/Fixtures/expressions/matches.test b/vendor/twig/twig/tests/Fixtures/expressions/matches.test
deleted file mode 100644
index 95459c3b0f..0000000000
--- a/vendor/twig/twig/tests/Fixtures/expressions/matches.test
+++ /dev/null
@@ -1,12 +0,0 @@
---TEST--
-Twig supports the "matches" operator
---TEMPLATE--
-{{ 'foo' matches '/o/' ? 'OK' : 'KO' }}
-{{ 'foo' matches '/^fo/' ? 'OK' : 'KO' }}
-{{ 'foo' matches '/O/i' ? 'OK' : 'KO' }}
---DATA--
-return []
---EXPECT--
-OK
-OK
-OK
diff --git a/vendor/twig/twig/tests/Fixtures/expressions/method_call.test b/vendor/twig/twig/tests/Fixtures/expressions/method_call.test
deleted file mode 100644
index bf49f389e0..0000000000
--- a/vendor/twig/twig/tests/Fixtures/expressions/method_call.test
+++ /dev/null
@@ -1,28 +0,0 @@
---TEST--
-Twig supports method calls
---TEMPLATE--
-{{ items.foo.foo }}
-{{ items.foo.getFoo() }}
-{{ items.foo.bar }}
-{{ items.foo['bar'] }}
-{{ items.foo.bar('a', 43) }}
-{{ items.foo.bar(foo) }}
-{{ items.foo.self.foo() }}
-{{ items.foo.is }}
-{{ items.foo.in }}
-{{ items.foo.not }}
---DATA--
-return ['foo' => 'bar', 'items' => ['foo' => new Twig\Tests\TwigTestFoo(), 'bar' => 'foo']]
---CONFIG--
-return ['strict_variables' => false]
---EXPECT--
-foo
-foo
-bar
-
-bar_a-43
-bar_bar
-foo
-is
-in
-not
diff --git a/vendor/twig/twig/tests/Fixtures/expressions/negative_numbers.test b/vendor/twig/twig/tests/Fixtures/expressions/negative_numbers.test
deleted file mode 100644
index c2a6e34024..0000000000
--- a/vendor/twig/twig/tests/Fixtures/expressions/negative_numbers.test
+++ /dev/null
@@ -1,18 +0,0 @@
---TEST--
-Twig manages negative numbers correctly
---TEMPLATE--
-{{ -1 }}
-{{ - 1 }}
-{{ 5 - 1 }}
-{{ 5-1 }}
-{{ 5 + -1 }}
-{{ 5 + - 1 }}
---DATA--
-return []
---EXPECT--
--1
--1
-4
-4
-4
-4
diff --git a/vendor/twig/twig/tests/Fixtures/expressions/not_arrow_fn.test b/vendor/twig/twig/tests/Fixtures/expressions/not_arrow_fn.test
deleted file mode 100644
index af82c47cf5..0000000000
--- a/vendor/twig/twig/tests/Fixtures/expressions/not_arrow_fn.test
+++ /dev/null
@@ -1,8 +0,0 @@
---TEST--
-A string in parentheses cannot be confused with an arrow function
---TEMPLATE--
-{{ ["foo", "bar"]|join(("f")) }}
---DATA--
-return []
---EXPECT--
-foofbar
diff --git a/vendor/twig/twig/tests/Fixtures/expressions/operators_as_variables.test b/vendor/twig/twig/tests/Fixtures/expressions/operators_as_variables.test
deleted file mode 100644
index fa9a843c0f..0000000000
--- a/vendor/twig/twig/tests/Fixtures/expressions/operators_as_variables.test
+++ /dev/null
@@ -1,16 +0,0 @@
---TEST--
-Twig allows to use named operators as variable names
---TEMPLATE--
-{% for match in matches %}
- {{- match }}
-{% endfor %}
-{{ in }}
-{{ is }}
---DATA--
-return ['matches' => [1, 2, 3], 'in' => 'in', 'is' => 'is']
---EXPECT--
-1
-2
-3
-in
-is
diff --git a/vendor/twig/twig/tests/Fixtures/expressions/postfix.test b/vendor/twig/twig/tests/Fixtures/expressions/postfix.test
deleted file mode 100644
index 276cbf197d..0000000000
--- a/vendor/twig/twig/tests/Fixtures/expressions/postfix.test
+++ /dev/null
@@ -1,22 +0,0 @@
---TEST--
-Twig parses postfix expressions
---TEMPLATE--
-{% import _self as macros %}
-
-{% macro foo() %}foo{% endmacro %}
-
-{{ 'a' }}
-{{ 'a'|upper }}
-{{ ('a')|upper }}
-{{ -1|upper }}
-{{ macros.foo() }}
-{{ (macros).foo() }}
---DATA--
-return []
---EXPECT--
-a
-A
-A
--1
-foo
-foo
diff --git a/vendor/twig/twig/tests/Fixtures/expressions/power.test b/vendor/twig/twig/tests/Fixtures/expressions/power.test
deleted file mode 100644
index 84fd23692c..0000000000
--- a/vendor/twig/twig/tests/Fixtures/expressions/power.test
+++ /dev/null
@@ -1,20 +0,0 @@
---TEST--
-Twig parses power expressions
---TEMPLATE--
-{{ 2**3 }}
-{{ (-2)**3 }}
-{{ (-2)**(-3) }}
-{{ a ** a }}
-{{ a ** b }}
-{{ b ** a }}
-{{ b ** b }}
---DATA--
-return ['a' => 4, 'b' => -2]
---EXPECT--
-8
--8
--0.125
-256
-0.0625
-16
-0.25
diff --git a/vendor/twig/twig/tests/Fixtures/expressions/sameas.test b/vendor/twig/twig/tests/Fixtures/expressions/sameas.test
deleted file mode 100644
index 83f3691f97..0000000000
--- a/vendor/twig/twig/tests/Fixtures/expressions/sameas.test
+++ /dev/null
@@ -1,21 +0,0 @@
---TEST--
-Twig supports the "same as" operator
---TEMPLATE--
-{{ 1 is same as(1) ? 'OK' }}
-{{ 1 is not same as(true) ? 'OK' }}
-{{ 1 is same as(1) ? 'OK' }}
-{{ 1 is not same as(true) ? 'OK' }}
-{{ 1 is same as (1) ? 'OK' }}
-{{ 1 is not
- same
- as
- (true) ? 'OK' }}
---DATA--
-return []
---EXPECT--
-OK
-OK
-OK
-OK
-OK
-OK
diff --git a/vendor/twig/twig/tests/Fixtures/expressions/starts_with.test b/vendor/twig/twig/tests/Fixtures/expressions/starts_with.test
deleted file mode 100644
index a78ff1eac7..0000000000
--- a/vendor/twig/twig/tests/Fixtures/expressions/starts_with.test
+++ /dev/null
@@ -1,27 +0,0 @@
---TEST--
-Twig supports the "starts with" operator
---TEMPLATE--
-{{ 'foo' starts with 'f' ? 'OK' : 'KO' }}
-{{ not ('foo' starts with 'oo') ? 'OK' : 'KO' }}
-{{ not ('foo' starts with 'foowaytoolong') ? 'OK' : 'KO' }}
-{{ 'foo' starts with 'f' ? 'OK' : 'KO' }}
-{{ 'foo' starts
-with 'f' ? 'OK' : 'KO' }}
-{{ 'foo' starts with '' ? 'OK' : 'KO' }}
-{{ '1' starts with true ? 'OK' : 'KO' }}
-{{ '' starts with false ? 'OK' : 'KO' }}
-{{ 'a' starts with false ? 'OK' : 'KO' }}
-{{ false starts with '' ? 'OK' : 'KO' }}
---DATA--
-return []
---EXPECT--
-OK
-OK
-OK
-OK
-OK
-OK
-KO
-KO
-KO
-KO
diff --git a/vendor/twig/twig/tests/Fixtures/expressions/string_operator_as_var_assignment.test b/vendor/twig/twig/tests/Fixtures/expressions/string_operator_as_var_assignment.test
deleted file mode 100644
index 478d4eb5e5..0000000000
--- a/vendor/twig/twig/tests/Fixtures/expressions/string_operator_as_var_assignment.test
+++ /dev/null
@@ -1,18 +0,0 @@
---TEST--
-Twig supports the string operators as variable names in assignments
---TEMPLATE--
-{% for matches in [1, 2] %}
- {{- matches }}
-{% endfor %}
-
-{% set matches = [1, 2] %}
-
-OK
---DATA--
-return []
---EXPECT--
-1
-2
-
-
-OK
diff --git a/vendor/twig/twig/tests/Fixtures/expressions/strings.test b/vendor/twig/twig/tests/Fixtures/expressions/strings.test
deleted file mode 100644
index f402c89399..0000000000
--- a/vendor/twig/twig/tests/Fixtures/expressions/strings.test
+++ /dev/null
@@ -1,10 +0,0 @@
---TEST--
-Twig supports string interpolation
---TEMPLATE--
-{{ "foo #{"foo #{bar} baz"} baz" }}
-{{ "foo #{bar}#{bar} baz" }}
---DATA--
-return ['bar' => 'BAR']
---EXPECT--
-foo foo BAR baz baz
-foo BARBAR baz
diff --git a/vendor/twig/twig/tests/Fixtures/expressions/ternary_operator.test b/vendor/twig/twig/tests/Fixtures/expressions/ternary_operator.test
deleted file mode 100644
index 37eccc0f54..0000000000
--- a/vendor/twig/twig/tests/Fixtures/expressions/ternary_operator.test
+++ /dev/null
@@ -1,18 +0,0 @@
---TEST--
-Twig supports the ternary operator
---TEMPLATE--
-{{ 1 ? 'YES' : 'NO' }}
-{{ 0 ? 'YES' : 'NO' }}
-{{ 0 ? 'YES' : (1 ? 'YES1' : 'NO1') }}
-{{ 0 ? 'YES' : (0 ? 'YES1' : 'NO1') }}
-{{ 1 == 1 ? 'foo<br />':'' }}
-{{ foo ~ (bar ? ('-' ~ bar) : '') }}
---DATA--
-return ['foo' => 'foo', 'bar' => 'bar']
---EXPECT--
-YES
-NO
-YES1
-NO1
-foo<br />
-foo-bar
diff --git a/vendor/twig/twig/tests/Fixtures/expressions/ternary_operator_noelse.test b/vendor/twig/twig/tests/Fixtures/expressions/ternary_operator_noelse.test
deleted file mode 100644
index 8b0f7284b9..0000000000
--- a/vendor/twig/twig/tests/Fixtures/expressions/ternary_operator_noelse.test
+++ /dev/null
@@ -1,10 +0,0 @@
---TEST--
-Twig supports the ternary operator
---TEMPLATE--
-{{ 1 ? 'YES' }}
-{{ 0 ? 'YES' }}
---DATA--
-return []
---EXPECT--
-YES
-
diff --git a/vendor/twig/twig/tests/Fixtures/expressions/ternary_operator_nothen.test b/vendor/twig/twig/tests/Fixtures/expressions/ternary_operator_nothen.test
deleted file mode 100644
index ecd6b75465..0000000000
--- a/vendor/twig/twig/tests/Fixtures/expressions/ternary_operator_nothen.test
+++ /dev/null
@@ -1,10 +0,0 @@
---TEST--
-Twig supports the ternary operator
---TEMPLATE--
-{{ 'YES' ?: 'NO' }}
-{{ 0 ?: 'NO' }}
---DATA--
-return []
---EXPECT--
-YES
-NO
diff --git a/vendor/twig/twig/tests/Fixtures/expressions/two_word_operators_as_variables.test b/vendor/twig/twig/tests/Fixtures/expressions/two_word_operators_as_variables.test
deleted file mode 100644
index eca3b285bb..0000000000
--- a/vendor/twig/twig/tests/Fixtures/expressions/two_word_operators_as_variables.test
+++ /dev/null
@@ -1,8 +0,0 @@
---TEST--
-Twig does not allow to use two-word named operators as variable names
---TEMPLATE--
-{{ starts with }}
---DATA--
-return []
---EXCEPTION--
-Twig\Error\SyntaxError: Unexpected token "operator" of value "starts with" in "index.twig" at line 2.
diff --git a/vendor/twig/twig/tests/Fixtures/expressions/unary.test b/vendor/twig/twig/tests/Fixtures/expressions/unary.test
deleted file mode 100644
index 5422531190..0000000000
--- a/vendor/twig/twig/tests/Fixtures/expressions/unary.test
+++ /dev/null
@@ -1,12 +0,0 @@
---TEST--
-Twig supports unary operators (not, -, +)
---TEMPLATE--
-{{ not 1 }}/{{ not 0 }}
-{{ +1 + 1 }}/{{ -1 - 1 }}
-{{ not (false or true) }}
---DATA--
-return []
---EXPECT--
-/1
-2/-2
-
diff --git a/vendor/twig/twig/tests/Fixtures/expressions/unary_macro_arguments.test b/vendor/twig/twig/tests/Fixtures/expressions/unary_macro_arguments.test
deleted file mode 100644
index 27deba3ef5..0000000000
--- a/vendor/twig/twig/tests/Fixtures/expressions/unary_macro_arguments.test
+++ /dev/null
@@ -1,22 +0,0 @@
---TEST--
-Twig manages negative numbers as default parameters
---TEMPLATE--
-{% import _self as macros %}
-{{ macros.negative_number1() }}
-{{ macros.negative_number2() }}
-{{ macros.negative_number3() }}
-{{ macros.positive_number1() }}
-{{ macros.positive_number2() }}
-{% macro negative_number1(nb=-1) %}{{ nb }}{% endmacro %}
-{% macro negative_number2(nb = --1) %}{{ nb }}{% endmacro %}
-{% macro negative_number3(nb = - 1) %}{{ nb }}{% endmacro %}
-{% macro positive_number1(nb = +1) %}{{ nb }}{% endmacro %}
-{% macro positive_number2(nb = ++1) %}{{ nb }}{% endmacro %}
---DATA--
-return []
---EXPECT--
--1
-1
--1
-1
-1
diff --git a/vendor/twig/twig/tests/Fixtures/expressions/unary_precedence.test b/vendor/twig/twig/tests/Fixtures/expressions/unary_precedence.test
deleted file mode 100644
index 9c56ab12c0..0000000000
--- a/vendor/twig/twig/tests/Fixtures/expressions/unary_precedence.test
+++ /dev/null
@@ -1,14 +0,0 @@
---TEST--
-Twig unary operators precedence
---TEMPLATE--
-{{ -1 - 1 }}
-{{ -1 - -1 }}
-{{ -1 * -1 }}
-{{ 4 / -1 * 5 }}
---DATA--
-return []
---EXPECT--
--2
-0
-1
--20
diff --git a/vendor/twig/twig/tests/Fixtures/filters/abs.test b/vendor/twig/twig/tests/Fixtures/filters/abs.test
deleted file mode 100644
index 7518769d4a..0000000000
--- a/vendor/twig/twig/tests/Fixtures/filters/abs.test
+++ /dev/null
@@ -1,30 +0,0 @@
---TEST--
-"abs" filter
---TEMPLATE--
-{{ (-5.5)|abs }}
-{{ (-5)|abs }}
-{{ (-0)|abs }}
-{{ 0|abs }}
-{{ 5|abs }}
-{{ 5.5|abs }}
-{{ number1|abs }}
-{{ number2|abs }}
-{{ number3|abs }}
-{{ number4|abs }}
-{{ number5|abs }}
-{{ number6|abs }}
---DATA--
-return ['number1' => -5.5, 'number2' => -5, 'number3' => -0, 'number4' => 0, 'number5' => 5, 'number6' => 5.5]
---EXPECT--
-5.5
-5
-0
-0
-5
-5.5
-5.5
-5
-0
-0
-5
-5.5
diff --git a/vendor/twig/twig/tests/Fixtures/filters/batch.test b/vendor/twig/twig/tests/Fixtures/filters/batch.test
deleted file mode 100644
index 0acf25bd61..0000000000
--- a/vendor/twig/twig/tests/Fixtures/filters/batch.test
+++ /dev/null
@@ -1,31 +0,0 @@
---TEST--
-"batch" filter
---TEMPLATE--
-{% for row in items|batch(3) %}
- <div class=row>
- {% for column in row %}
- <div class=item>{{ column }}</div>
- {% endfor %}
- </div>
-{% endfor %}
---DATA--
-return ['items' => ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j']]
---EXPECT--
-<div class=row>
- <div class=item>a</div>
- <div class=item>b</div>
- <div class=item>c</div>
- </div>
- <div class=row>
- <div class=item>d</div>
- <div class=item>e</div>
- <div class=item>f</div>
- </div>
- <div class=row>
- <div class=item>g</div>
- <div class=item>h</div>
- <div class=item>i</div>
- </div>
- <div class=row>
- <div class=item>j</div>
- </div>
diff --git a/vendor/twig/twig/tests/Fixtures/filters/batch_float.test b/vendor/twig/twig/tests/Fixtures/filters/batch_float.test
deleted file mode 100644
index dad004ec2c..0000000000
--- a/vendor/twig/twig/tests/Fixtures/filters/batch_float.test
+++ /dev/null
@@ -1,29 +0,0 @@
---TEST--
-"batch" filter
---TEMPLATE--
-{% for row in items|batch(3.1) %}
- <div class=row>
- {% for column in row %}
- <div class=item>{{ column }}</div>
- {% endfor %}
- </div>
-{% endfor %}
---DATA--
-return ['items' => ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j']]
---EXPECT--
-<div class=row>
- <div class=item>a</div>
- <div class=item>b</div>
- <div class=item>c</div>
- <div class=item>d</div>
- </div>
- <div class=row>
- <div class=item>e</div>
- <div class=item>f</div>
- <div class=item>g</div>
- <div class=item>h</div>
- </div>
- <div class=row>
- <div class=item>i</div>
- <div class=item>j</div>
- </div>
diff --git a/vendor/twig/twig/tests/Fixtures/filters/batch_with_empty_fill.test b/vendor/twig/twig/tests/Fixtures/filters/batch_with_empty_fill.test
deleted file mode 100644
index 411b4fc749..0000000000
--- a/vendor/twig/twig/tests/Fixtures/filters/batch_with_empty_fill.test
+++ /dev/null
@@ -1,37 +0,0 @@
---TEST--
-"batch" filter
---TEMPLATE--
-<table>
-{% for row in items|batch(3, '') %}
- <tr>
- {% for column in row %}
- <td>{{ column }}</td>
- {% endfor %}
- </tr>
-{% endfor %}
-</table>
---DATA--
-return ['items' => ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j']]
---EXPECT--
-<table>
- <tr>
- <td>a</td>
- <td>b</td>
- <td>c</td>
- </tr>
- <tr>
- <td>d</td>
- <td>e</td>
- <td>f</td>
- </tr>
- <tr>
- <td>g</td>
- <td>h</td>
- <td>i</td>
- </tr>
- <tr>
- <td>j</td>
- <td></td>
- <td></td>
- </tr>
-</table>
diff --git a/vendor/twig/twig/tests/Fixtures/filters/batch_with_exact_elements.test b/vendor/twig/twig/tests/Fixtures/filters/batch_with_exact_elements.test
deleted file mode 100644
index 750d1557aa..0000000000
--- a/vendor/twig/twig/tests/Fixtures/filters/batch_with_exact_elements.test
+++ /dev/null
@@ -1,33 +0,0 @@
---TEST--
-"batch" filter
---TEMPLATE--
-{% for row in items|batch(3, 'fill') %}
- <div class=row>
- {% for column in row %}
- <div class=item>{{ column }}</div>
- {% endfor %}
- </div>
-{% endfor %}
---DATA--
-return ['items' => ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l']]
---EXPECT--
-<div class=row>
- <div class=item>a</div>
- <div class=item>b</div>
- <div class=item>c</div>
- </div>
- <div class=row>
- <div class=item>d</div>
- <div class=item>e</div>
- <div class=item>f</div>
- </div>
- <div class=row>
- <div class=item>g</div>
- <div class=item>h</div>
- <div class=item>i</div>
- </div>
- <div class=row>
- <div class=item>j</div>
- <div class=item>k</div>
- <div class=item>l</div>
- </div>
diff --git a/vendor/twig/twig/tests/Fixtures/filters/batch_with_fill.test b/vendor/twig/twig/tests/Fixtures/filters/batch_with_fill.test
deleted file mode 100644
index 5d470d005b..0000000000
--- a/vendor/twig/twig/tests/Fixtures/filters/batch_with_fill.test
+++ /dev/null
@@ -1,37 +0,0 @@
---TEST--
-"batch" filter
---TEMPLATE--
-<table>
-{% for row in items|batch(3, 'fill') %}
- <tr>
- {% for column in row %}
- <td>{{ column }}</td>
- {% endfor %}
- </tr>
-{% endfor %}
-</table>
---DATA--
-return ['items' => ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j']]
---EXPECT--
-<table>
- <tr>
- <td>a</td>
- <td>b</td>
- <td>c</td>
- </tr>
- <tr>
- <td>d</td>
- <td>e</td>
- <td>f</td>
- </tr>
- <tr>
- <td>g</td>
- <td>h</td>
- <td>i</td>
- </tr>
- <tr>
- <td>j</td>
- <td>fill</td>
- <td>fill</td>
- </tr>
-</table>
diff --git a/vendor/twig/twig/tests/Fixtures/filters/batch_with_keys.test b/vendor/twig/twig/tests/Fixtures/filters/batch_with_keys.test
deleted file mode 100644
index e56cd79bbc..0000000000
--- a/vendor/twig/twig/tests/Fixtures/filters/batch_with_keys.test
+++ /dev/null
@@ -1,10 +0,0 @@
---TEST--
-"batch" filter preserves array keys
---TEMPLATE--
-{{ {'foo': 'bar', 'key': 'value'}|batch(4)|first|keys|join(',') }}
-{{ {'foo': 'bar', 'key': 'value'}|batch(4, 'fill')|first|keys|join(',') }}
---DATA--
-return []
---EXPECT--
-foo,key
-foo,key,0,1
diff --git a/vendor/twig/twig/tests/Fixtures/filters/batch_with_more_elements.test b/vendor/twig/twig/tests/Fixtures/filters/batch_with_more_elements.test
deleted file mode 100644
index 90f4de6859..0000000000
--- a/vendor/twig/twig/tests/Fixtures/filters/batch_with_more_elements.test
+++ /dev/null
@@ -1,23 +0,0 @@
---TEST--
-"batch" filter
---TEMPLATE--
-{% for row in items|batch(3, 'fill') %}
- <div class=row>
- {% for key, column in row %}
- <div class={{ key }}>{{ column }}</div>
- {% endfor %}
- </div>
-{% endfor %}
---DATA--
-return ['items' => ['a' => 'a', 'b' => 'b', 'c' => 'c', 'd' => 'd', '123' => 'e']]
---EXPECT--
-<div class=row>
- <div class=a>a</div>
- <div class=b>b</div>
- <div class=c>c</div>
- </div>
- <div class=row>
- <div class=d>d</div>
- <div class=123>e</div>
- <div class=124>fill</div>
- </div>
diff --git a/vendor/twig/twig/tests/Fixtures/filters/batch_with_zero_elements.test b/vendor/twig/twig/tests/Fixtures/filters/batch_with_zero_elements.test
deleted file mode 100644
index bc303da8ab..0000000000
--- a/vendor/twig/twig/tests/Fixtures/filters/batch_with_zero_elements.test
+++ /dev/null
@@ -1,10 +0,0 @@
---TEST--
-"batch" filter with zero elements
---TEMPLATE--
-{{ []|batch(3)|length }}
-{{ []|batch(3, 'fill')|length }}
---DATA--
-return []
---EXPECT--
-0
-0
diff --git a/vendor/twig/twig/tests/Fixtures/filters/convert_encoding.test b/vendor/twig/twig/tests/Fixtures/filters/convert_encoding.test
deleted file mode 100644
index db8acedef5..0000000000
--- a/vendor/twig/twig/tests/Fixtures/filters/convert_encoding.test
+++ /dev/null
@@ -1,10 +0,0 @@
---TEST--
-"convert_encoding" filter
---CONDITION--
-function_exists('iconv') || function_exists('mb_convert_encoding')
---TEMPLATE--
-{{ "愛していますか？"|convert_encoding('ISO-2022-JP', 'UTF-8')|convert_encoding('UTF-8', 'ISO-2022-JP') }}
---DATA--
-return []
---EXPECT--
-愛していますか？
diff --git a/vendor/twig/twig/tests/Fixtures/filters/date.test b/vendor/twig/twig/tests/Fixtures/filters/date.test
deleted file mode 100644
index 16816aa994..0000000000
--- a/vendor/twig/twig/tests/Fixtures/filters/date.test
+++ /dev/null
@@ -1,90 +0,0 @@
---TEST--
-"date" filter
---TEMPLATE--
-{{ date1|date }}
-{{ date1|date('d/m/Y') }}
-{{ date1|date('d/m/Y H:i:s', 'Asia/Hong_Kong') }}
-{{ date1|date('d/m/Y H:i:s P', 'Asia/Hong_Kong') }}
-{{ date1|date('d/m/Y H:i:s P', 'America/Chicago') }}
-{{ date1|date('e') }}
-{{ date1|date('d/m/Y H:i:s') }}
-
-{{ date2|date }}
-{{ date2|date('d/m/Y') }}
-{{ date2|date('d/m/Y H:i:s', 'Asia/Hong_Kong') }}
-{{ date2|date('d/m/Y H:i:s', timezone1) }}
-{{ date2|date('d/m/Y H:i:s') }}
-
-{{ date3|date }}
-{{ date3|date('d/m/Y') }}
-
-{{ date4|date }}
-{{ date4|date('d/m/Y') }}
-
-{{ date5|date }}
-{{ date5|date('d/m/Y') }}
-
-{{ date6|date('d/m/Y H:i:s P', 'Europe/Paris') }}
-{{ date6|date('d/m/Y H:i:s P', 'Asia/Hong_Kong') }}
-{{ date6|date('d/m/Y H:i:s P', false) }}
-{{ date6|date('e', 'Europe/Paris') }}
-{{ date6|date('e', false) }}
-
-{{ date7|date }}
-{{ date7|date(timezone='Europe/Paris') }}
-{{ date7|date(timezone='Asia/Hong_Kong') }}
-{{ date7|date(timezone=false) }}
-{{ date7|date(timezone='Indian/Mauritius') }}
-
-{{ '2010-01-28 15:00:00'|date(timezone="Europe/Paris") }}
-{{ '2010-01-28 15:00:00'|date(timezone="Asia/Hong_Kong") }}
---DATA--
-date_default_timezone_set('Europe/Paris');
-return [
- 'date1' => mktime(13, 45, 0, 10, 4, 2010),
- 'date2' => new \DateTime('2010-10-04 13:45'),
- 'date3' => '2010-10-04 13:45',
- 'date4' => 1286199900, // \DateTime::createFromFormat('Y-m-d H:i', '2010-10-04 13:45', new \DateTimeZone('UTC'))->getTimestamp() -- A unixtimestamp is always GMT
- 'date5' => -189291360, // \DateTime::createFromFormat('Y-m-d H:i', '1964-01-02 03:04', new \DateTimeZone('UTC'))->getTimestamp(),
- 'date6' => new \DateTime('2010-10-04 13:45', new \DateTimeZone('America/New_York')),
- 'date7' => '2010-01-28T15:00:00+04:00',
- 'timezone1' => new \DateTimeZone('America/New_York'),
-]
---EXPECT--
-October 4, 2010 13:45
-04/10/2010
-04/10/2010 19:45:00
-04/10/2010 19:45:00 +08:00
-04/10/2010 06:45:00 -05:00
-Europe/Paris
-04/10/2010 13:45:00
-
-October 4, 2010 13:45
-04/10/2010
-04/10/2010 19:45:00
-04/10/2010 07:45:00
-04/10/2010 13:45:00
-
-October 4, 2010 13:45
-04/10/2010
-
-October 4, 2010 15:45
-04/10/2010
-
-January 2, 1964 04:04
-02/01/1964
-
-04/10/2010 19:45:00 +02:00
-05/10/2010 01:45:00 +08:00
-04/10/2010 13:45:00 -04:00
-Europe/Paris
-America/New_York
-
-January 28, 2010 12:00
-January 28, 2010 12:00
-January 28, 2010 19:00
-January 28, 2010 15:00
-January 28, 2010 15:00
-
-January 28, 2010 15:00
-January 28, 2010 22:00
diff --git a/vendor/twig/twig/tests/Fixtures/filters/date_default_format.test b/vendor/twig/twig/tests/Fixtures/filters/date_default_format.test
deleted file mode 100644
index c6e81302df..0000000000
--- a/vendor/twig/twig/tests/Fixtures/filters/date_default_format.test
+++ /dev/null
@@ -1,14 +0,0 @@
---TEST--
-"date" filter
---TEMPLATE--
-{{ date1|date }}
-{{ date1|date('d/m/Y') }}
---DATA--
-date_default_timezone_set('UTC');
-$twig->getExtension('\Twig\Extension\CoreExtension')->setDateFormat('Y-m-d', '%d days %h hours');
-return [
- 'date1' => mktime(13, 45, 0, 10, 4, 2010),
-]
---EXPECT--
-2010-10-04
-04/10/2010
diff --git a/vendor/twig/twig/tests/Fixtures/filters/date_default_format_interval.test b/vendor/twig/twig/tests/Fixtures/filters/date_default_format_interval.test
deleted file mode 100644
index a72fb81d62..0000000000
--- a/vendor/twig/twig/tests/Fixtures/filters/date_default_format_interval.test
+++ /dev/null
@@ -1,16 +0,0 @@
---TEST--
-"date" filter (interval support as of PHP 5.3)
---CONDITION--
-version_compare(phpversion(), '5.3.0', '>=')
---TEMPLATE--
-{{ date2|date }}
-{{ date2|date('%d days') }}
---DATA--
-date_default_timezone_set('UTC');
-$twig->getExtension('\Twig\Extension\CoreExtension')->setDateFormat('Y-m-d', '%d days %h hours');
-return [
- 'date2' => new \DateInterval('P2D'),
-]
---EXPECT--
-2 days 0 hours
-2 days
diff --git a/vendor/twig/twig/tests/Fixtures/filters/date_immutable.test b/vendor/twig/twig/tests/Fixtures/filters/date_immutable.test
deleted file mode 100644
index 2414db5015..0000000000
--- a/vendor/twig/twig/tests/Fixtures/filters/date_immutable.test
+++ /dev/null
@@ -1,37 +0,0 @@
---TEST--
-"date" filter
---CONDITION--
-version_compare(phpversion(), '5.5.0', '>=')
---TEMPLATE--
-{{ date1|date }}
-{{ date1|date('d/m/Y') }}
-{{ date1|date('d/m/Y H:i:s', 'Asia/Hong_Kong') }}
-{{ date1|date('d/m/Y H:i:s', timezone1) }}
-{{ date1|date('d/m/Y H:i:s') }}
-{{ date1|date_modify('+1 hour')|date('d/m/Y H:i:s') }}
-
-{{ date2|date('d/m/Y H:i:s P', 'Europe/Paris') }}
-{{ date2|date('d/m/Y H:i:s P', 'Asia/Hong_Kong') }}
-{{ date2|date('d/m/Y H:i:s P', false) }}
-{{ date2|date('e', 'Europe/Paris') }}
-{{ date2|date('e', false) }}
---DATA--
-date_default_timezone_set('Europe/Paris');
-return [
- 'date1' => new \DateTimeImmutable('2010-10-04 13:45'),
- 'date2' => new \DateTimeImmutable('2010-10-04 13:45', new \DateTimeZone('America/New_York')),
- 'timezone1' => new \DateTimeZone('America/New_York'),
-]
---EXPECT--
-October 4, 2010 13:45
-04/10/2010
-04/10/2010 19:45:00
-04/10/2010 07:45:00
-04/10/2010 13:45:00
-04/10/2010 14:45:00
-
-04/10/2010 19:45:00 +02:00
-05/10/2010 01:45:00 +08:00
-04/10/2010 13:45:00 -04:00
-Europe/Paris
-America/New_York
diff --git a/vendor/twig/twig/tests/Fixtures/filters/date_interval.test b/vendor/twig/twig/tests/Fixtures/filters/date_interval.test
deleted file mode 100644
index c3333f565b..0000000000
--- a/vendor/twig/twig/tests/Fixtures/filters/date_interval.test
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-"date" filter (interval support as of PHP 5.3)
---CONDITION--
-version_compare(phpversion(), '5.3.0', '>=')
---TEMPLATE--
-{{ date1|date }}
-{{ date1|date('%d days %h hours') }}
-{{ date1|date('%d days %h hours', timezone1) }}
---DATA--
-date_default_timezone_set('UTC');
-return [
- 'date1' => new \DateInterval('P2D'),
- // This should have no effect on \DateInterval formatting
- 'timezone1' => new \DateTimeZone('America/New_York'),
-]
---EXPECT--
-2 days
-2 days 0 hours
-2 days 0 hours
diff --git a/vendor/twig/twig/tests/Fixtures/filters/date_modify.test b/vendor/twig/twig/tests/Fixtures/filters/date_modify.test
deleted file mode 100644
index d7f8fdf42a..0000000000
--- a/vendor/twig/twig/tests/Fixtures/filters/date_modify.test
+++ /dev/null
@@ -1,14 +0,0 @@
---TEST--
-"date_modify" filter
---TEMPLATE--
-{{ date1|date_modify('-1day')|date('Y-m-d H:i:s') }}
-{{ date2|date_modify('-1day')|date('Y-m-d H:i:s') }}
---DATA--
-date_default_timezone_set('UTC');
-return [
- 'date1' => '2010-10-04 13:45',
- 'date2' => new \DateTime('2010-10-04 13:45'),
-]
---EXPECT--
-2010-10-03 13:45:00
-2010-10-03 13:45:00
diff --git a/vendor/twig/twig/tests/Fixtures/filters/date_namedargs.test b/vendor/twig/twig/tests/Fixtures/filters/date_namedargs.test
deleted file mode 100644
index 2d1aa13449..0000000000
--- a/vendor/twig/twig/tests/Fixtures/filters/date_namedargs.test
+++ /dev/null
@@ -1,13 +0,0 @@
---TEST--
-"date" filter
---TEMPLATE--
-{{ date|date(format='d/m/Y H:i:s P', timezone='America/Chicago') }}
-{{ date|date(timezone='America/Chicago', format='d/m/Y H:i:s P') }}
-{{ date|date('d/m/Y H:i:s P', timezone='America/Chicago') }}
---DATA--
-date_default_timezone_set('UTC');
-return ['date' => mktime(13, 45, 0, 10, 4, 2010)]
---EXPECT--
-04/10/2010 08:45:00 -05:00
-04/10/2010 08:45:00 -05:00
-04/10/2010 08:45:00 -05:00
diff --git a/vendor/twig/twig/tests/Fixtures/filters/default.test b/vendor/twig/twig/tests/Fixtures/filters/default.test
deleted file mode 100644
index b01a62d2fb..0000000000
--- a/vendor/twig/twig/tests/Fixtures/filters/default.test
+++ /dev/null
@@ -1,150 +0,0 @@
---TEST--
-"default" filter
---TEMPLATE--
-Variable:
-{{ definedVar |default('default') is same as('default') ? 'ko' : 'ok' }}
-{{ zeroVar |default('default') is same as('default') ? 'ko' : 'ok' }}
-{{ emptyVar |default('default') is same as('default') ? 'ok' : 'ko' }}
-{{ nullVar |default('default') is same as('default') ? 'ok' : 'ko' }}
-{{ undefinedVar |default('default') is same as('default') ? 'ok' : 'ko' }}
-Array access:
-{{ nested.definedVar |default('default') is same as('default') ? 'ko' : 'ok' }}
-{{ nested['definedVar'] |default('default') is same as('default') ? 'ko' : 'ok' }}
-{{ nested.zeroVar |default('default') is same as('default') ? 'ko' : 'ok' }}
-{{ nested.emptyVar |default('default') is same as('default') ? 'ok' : 'ko' }}
-{{ nested.nullVar |default('default') is same as('default') ? 'ok' : 'ko' }}
-{{ nested.undefinedVar |default('default') is same as('default') ? 'ok' : 'ko' }}
-{{ nested['undefinedVar'] |default('default') is same as('default') ? 'ok' : 'ko' }}
-{{ undefinedVar.foo |default('default') is same as('default') ? 'ok' : 'ko' }}
-Plain values:
-{{ 'defined' |default('default') is same as('default') ? 'ko' : 'ok' }}
-{{ 0 |default('default') is same as('default') ? 'ko' : 'ok' }}
-{{ '' |default('default') is same as('default') ? 'ok' : 'ko' }}
-{{ null |default('default') is same as('default') ? 'ok' : 'ko' }}
-Precedence:
-{{ 'o' ~ nullVar |default('k') }}
-{{ 'o' ~ nested.nullVar |default('k') }}
-Object methods:
-{{ object.foo |default('default') is same as('default') ? 'ko' : 'ok' }}
-{{ object.undefinedMethod |default('default') is same as('default') ? 'ok' : 'ko' }}
-{{ object.getFoo() |default('default') is same as('default') ? 'ko' : 'ok' }}
-{{ object.getFoo('a') |default('default') is same as('default') ? 'ko' : 'ok' }}
-{{ object.undefinedMethod() |default('default') is same as('default') ? 'ok' : 'ko' }}
-{{ object.undefinedMethod('a') |default('default') is same as('default') ? 'ok' : 'ko' }}
-Deep nested:
-{{ nested.undefinedVar.foo.bar |default('default') is same as('default') ? 'ok' : 'ko' }}
-{{ nested.definedArray.0 |default('default') is same as('default') ? 'ko' : 'ok' }}
-{{ nested['definedArray'][0] |default('default') is same as('default') ? 'ko' : 'ok' }}
-{{ object.self.foo |default('default') is same as('default') ? 'ko' : 'ok' }}
-{{ object.self.undefinedMethod |default('default') is same as('default') ? 'ok' : 'ko' }}
-{{ object.undefinedMethod.self |default('default') is same as('default') ? 'ok' : 'ko' }}
---DATA--
-return [
- 'definedVar' => 'defined',
- 'zeroVar' => 0,
- 'emptyVar' => '',
- 'nullVar' => null,
- 'nested' => [
- 'definedVar' => 'defined',
- 'zeroVar' => 0,
- 'emptyVar' => '',
- 'nullVar' => null,
- 'definedArray' => [0],
- ],
- 'object' => new Twig\Tests\TwigTestFoo(),
-]
---CONFIG--
-return ['strict_variables' => false]
---EXPECT--
-Variable:
-ok
-ok
-ok
-ok
-ok
-Array access:
-ok
-ok
-ok
-ok
-ok
-ok
-ok
-ok
-Plain values:
-ok
-ok
-ok
-ok
-Precedence:
-ok
-ok
-Object methods:
-ok
-ok
-ok
-ok
-ok
-ok
-Deep nested:
-ok
-ok
-ok
-ok
-ok
-ok
---DATA--
-return [
- 'definedVar' => 'defined',
- 'zeroVar' => 0,
- 'emptyVar' => '',
- 'nullVar' => null,
- 'nested' => [
- 'definedVar' => 'defined',
- 'zeroVar' => 0,
- 'emptyVar' => '',
- 'nullVar' => null,
- 'definedArray' => [0],
- ],
- 'object' => new Twig\Tests\TwigTestFoo(),
-]
---CONFIG--
-return ['strict_variables' => true]
---EXPECT--
-Variable:
-ok
-ok
-ok
-ok
-ok
-Array access:
-ok
-ok
-ok
-ok
-ok
-ok
-ok
-ok
-Plain values:
-ok
-ok
-ok
-ok
-Precedence:
-ok
-ok
-Object methods:
-ok
-ok
-ok
-ok
-ok
-ok
-Deep nested:
-ok
-ok
-ok
-ok
-ok
-ok
diff --git a/vendor/twig/twig/tests/Fixtures/filters/dynamic_filter.test b/vendor/twig/twig/tests/Fixtures/filters/dynamic_filter.test
deleted file mode 100644
index 27dc8784c6..0000000000
--- a/vendor/twig/twig/tests/Fixtures/filters/dynamic_filter.test
+++ /dev/null
@@ -1,10 +0,0 @@
---TEST--
-dynamic filter
---TEMPLATE--
-{{ 'bar'|foo_path }}
-{{ 'bar'|a_foo_b_bar }}
---DATA--
-return []
---EXPECT--
-foo/bar
-a/b/bar
diff --git a/vendor/twig/twig/tests/Fixtures/filters/escape.test b/vendor/twig/twig/tests/Fixtures/filters/escape.test
deleted file mode 100644
index 131f5b4e72..0000000000
--- a/vendor/twig/twig/tests/Fixtures/filters/escape.test
+++ /dev/null
@@ -1,8 +0,0 @@
---TEST--
-"escape" filter
---TEMPLATE--
-{{ "foo <br />"|e }}
---DATA--
-return []
---EXPECT--
-foo <br />
diff --git a/vendor/twig/twig/tests/Fixtures/filters/escape_html_attr.test b/vendor/twig/twig/tests/Fixtures/filters/escape_html_attr.test
deleted file mode 100644
index 10e3275542..0000000000
--- a/vendor/twig/twig/tests/Fixtures/filters/escape_html_attr.test
+++ /dev/null
@@ -1,8 +0,0 @@
---TEST--
-"escape" filter does not escape with the html strategy when using the html_attr strategy
---TEMPLATE--
-{{ '<br />'|escape('html_attr') }}
---DATA--
-return []
---EXPECT--
-<br />
diff --git a/vendor/twig/twig/tests/Fixtures/filters/escape_javascript.test b/vendor/twig/twig/tests/Fixtures/filters/escape_javascript.test
deleted file mode 100644
index 4c2fb7a366..0000000000
--- a/vendor/twig/twig/tests/Fixtures/filters/escape_javascript.test
+++ /dev/null
@@ -1,8 +0,0 @@
---TEST--
-"escape" filter
---TEMPLATE--
-{{ "é ♜ 𝌆"|e('js') }}
---DATA--
-return []
---EXPECT--
-\u00E9\u0020\u265C\u0020\uD834\uDF06
diff --git a/vendor/twig/twig/tests/Fixtures/filters/escape_non_supported_charset.test b/vendor/twig/twig/tests/Fixtures/filters/escape_non_supported_charset.test
deleted file mode 100644
index 93f34297b0..0000000000
--- a/vendor/twig/twig/tests/Fixtures/filters/escape_non_supported_charset.test
+++ /dev/null
@@ -1,8 +0,0 @@
---TEST--
-"escape" filter
---TEMPLATE--
-{{ "愛していますか？ <br />"|e }}
---DATA--
-return []
---EXPECT--
-愛していますか？ <br />
diff --git a/vendor/twig/twig/tests/Fixtures/filters/filter.test b/vendor/twig/twig/tests/Fixtures/filters/filter.test
deleted file mode 100644
index fe44d80ed7..0000000000
--- a/vendor/twig/twig/tests/Fixtures/filters/filter.test
+++ /dev/null
@@ -1,46 +0,0 @@
---TEST--
-"filter" filter
---TEMPLATE--
-{% set offset = 3 %}
-
-{% for k, v in [1, 5, 3, 4, 5]|filter((v) => v > offset) -%}
- {{ k }} = {{ v }}
-{% endfor %}
-
-{% for k, v in {a: 1, b: 2, c: 5, d: 8}|filter(v => v > offset) -%}
- {{ k }} = {{ v }}
-{% endfor %}
-
-{% for k, v in [1, 5, 3, 4, 5]|filter(v => v > offset) -%}
- {{ k }} = {{ v }}
-{% endfor %}
-
-{% for k, v in it|filter((v) => v > offset) -%}
- {{ k }} = {{ v }}
-{% endfor %}
-
-{% for k, v in ita|filter(v => v > offset) -%}
- {{ k }} = {{ v }}
-{% endfor %}
---DATA--
-return [
- 'it' => new \ArrayIterator(['a' => 1, 'b' => 2, 'c' => 5, 'd' => 8]),
- 'ita' => new Twig\Tests\IteratorAggregateStub(['a' => 1, 'b' => 2, 'c' => 5, 'd' => 8]),
-]
---EXPECT--
-1 = 5
-3 = 4
-4 = 5
-
-c = 5
-d = 8
-
-1 = 5
-3 = 4
-4 = 5
-
-c = 5
-d = 8
-
-c = 5
-d = 8
diff --git a/vendor/twig/twig/tests/Fixtures/filters/filter_php_55.test b/vendor/twig/twig/tests/Fixtures/filters/filter_php_55.test
deleted file mode 100644
index 6684139a1a..0000000000
--- a/vendor/twig/twig/tests/Fixtures/filters/filter_php_55.test
+++ /dev/null
@@ -1,23 +0,0 @@
---TEST--
-"filter" filter (PHP 5.5 required)
---CONDITION--
-version_compare(phpversion(), '5.5.0', '>=')
---TEMPLATE--
-{% for k, v in xml|filter(x => true) %}
-{{ k }}/{{ v }}
-{% endfor %}
-
-{# we can iterate more than once #}
-{% for k, v in xml|filter(x => true) %}
-{{ k }}/{{ v }}
-{% endfor %}
---DATA--
-return ['xml' => new \SimpleXMLElement('<?xml version="1.0" encoding="UTF-8"?><doc><elem>foo</elem><elem>bar</elem><elem>baz</elem></doc>')]
---EXPECT--
-elem/foo
-elem/bar
-elem/baz
-
-elem/foo
-elem/bar
-elem/baz
diff --git a/vendor/twig/twig/tests/Fixtures/filters/filter_php_56.test b/vendor/twig/twig/tests/Fixtures/filters/filter_php_56.test
deleted file mode 100644
index 0daf4083ad..0000000000
--- a/vendor/twig/twig/tests/Fixtures/filters/filter_php_56.test
+++ /dev/null
@@ -1,27 +0,0 @@
---TEST--
-"filter" filter (PHP 5.6 required)
---CONDITION--
-version_compare(phpversion(), '5.6.0', '>=')
---TEMPLATE--
-{% set offset = 3 %}
-
-{% for k, v in {a: 1, b: 2, c: 5, d: 8}|filter((v, k) => (v > offset) and (k != "d")) -%}
- {{ k }} = {{ v }}
-{% endfor %}
-
-{% for k, v in it|filter((v, k) => (v > offset) and (k != "d")) -%}
- {{ k }} = {{ v }}
-{% endfor %}
-
-{# we can iterate more than once #}
-{% for k, v in it|filter((v, k) => (v > offset) and (k != "d")) -%}
- {{ k }} = {{ v }}
-{% endfor %}
---DATA--
-return ['it' => new \ArrayIterator(['a' => 1, 'b' => 2, 'c' => 5, 'd' => 8])]
---EXPECT--
-c = 5
-
-c = 5
-
-c = 5
diff --git a/vendor/twig/twig/tests/Fixtures/filters/first.test b/vendor/twig/twig/tests/Fixtures/filters/first.test
deleted file mode 100644
index b19f2eed7b..0000000000
--- a/vendor/twig/twig/tests/Fixtures/filters/first.test
+++ /dev/null
@@ -1,17 +0,0 @@
---TEST--
-"first" filter
---TEMPLATE--
-{{ [1, 2, 3, 4]|first }}
-{{ {a: 1, b: 2, c: 3, d: 4}|first }}
-{{ '1234'|first }}
-{{ arr|first }}
-{{ 'Ä€é'|first }}
-{{ ''|first }}
---DATA--
-return ['arr' => new \ArrayObject([1, 2, 3, 4])]
---EXPECT--
-1
-1
-1
-1
-Ä
diff --git a/vendor/twig/twig/tests/Fixtures/filters/force_escape.test b/vendor/twig/twig/tests/Fixtures/filters/force_escape.test
deleted file mode 100644
index 7efbe3200a..0000000000
--- a/vendor/twig/twig/tests/Fixtures/filters/force_escape.test
+++ /dev/null
@@ -1,18 +0,0 @@
---TEST--
-"escape" filter
---TEMPLATE--
-{% set foo %}
- foo<br />
-{% endset %}
-
-{{ foo|e('html') -}}
-{{ foo|e('js') }}
-{% autoescape true %}
- {{ foo }}
-{% endautoescape %}
---DATA--
-return []
---EXPECT--
- foo<br />
-\u0020\u0020\u0020\u0020foo\u003Cbr\u0020\/\u003E\n
- foo<br />
diff --git a/vendor/twig/twig/tests/Fixtures/filters/format.test b/vendor/twig/twig/tests/Fixtures/filters/format.test
deleted file mode 100644
index efaf8317a3..0000000000
--- a/vendor/twig/twig/tests/Fixtures/filters/format.test
+++ /dev/null
@@ -1,8 +0,0 @@
---TEST--
-"format" filter
---TEMPLATE--
-{{ string|format(foo, 3) }}
---DATA--
-return ['string' => '%s/%d', 'foo' => 'bar']
---EXPECT--
-bar/3
diff --git a/vendor/twig/twig/tests/Fixtures/filters/join.test b/vendor/twig/twig/tests/Fixtures/filters/join.test
deleted file mode 100644
index 3127ea1a71..0000000000
--- a/vendor/twig/twig/tests/Fixtures/filters/join.test
+++ /dev/null
@@ -1,38 +0,0 @@
---TEST--
-"join" filter
---TEMPLATE--
-{{ ["foo", "bar"]|join(', ') }}
-{{ foo|join(', ') }}
-{{ bar|join(', ') }}
-
-{{ ["foo", "bar"]|join(', ', ' and ') }}
-{{ foo|join(', ', ' and ') }}
-{{ bar|join(', ', ' and ') }}
-{{ ["one", "two", "three"]|join(', ', ' and ') }}
-{{ ["a", "b", "c"]|join('','-') }}
-{{ ["a", "b", "c"]|join('-','-') }}
-{{ ["a", "b", "c"]|join('-','') }}
-{{ ["hello"]|join('|','-') }}
-
-{{ {"a": "w", "b": "x", "c": "y", "d": "z"}|join }}
-{{ {"a": "w", "b": "x", "c": "y", "d": "z"}|join(',') }}
-{{ {"a": "w", "b": "x", "c": "y", "d": "z"}|join(',','-') }}
---DATA--
-return ['foo' => new Twig\Tests\TwigTestFoo(), 'bar' => new \ArrayObject([3, 4])]
---EXPECT--
-foo, bar
-1, 2
-3, 4
-
-foo and bar
-1 and 2
-3 and 4
-one, two and three
-ab-c
-a-b-c
-a-bc
-hello
-
-wxyz
-w,x,y,z
-w,x,y-z
diff --git a/vendor/twig/twig/tests/Fixtures/filters/json_encode.test b/vendor/twig/twig/tests/Fixtures/filters/json_encode.test
deleted file mode 100644
index 902f90b337..0000000000
--- a/vendor/twig/twig/tests/Fixtures/filters/json_encode.test
+++ /dev/null
@@ -1,12 +0,0 @@
---TEST--
-"json_encode" filter
---TEMPLATE--
-{{ "foo"|json_encode|raw }}
-{{ foo|json_encode|raw }}
-{{ [foo, "foo"]|json_encode|raw }}
---DATA--
-return ['foo' => new \Twig\Markup('foo', 'UTF-8')]
---EXPECT--
-"foo"
-"foo"
-["foo","foo"]
diff --git a/vendor/twig/twig/tests/Fixtures/filters/last.test b/vendor/twig/twig/tests/Fixtures/filters/last.test
deleted file mode 100644
index f71896c77f..0000000000
--- a/vendor/twig/twig/tests/Fixtures/filters/last.test
+++ /dev/null
@@ -1,17 +0,0 @@
---TEST--
-"last" filter
---TEMPLATE--
-{{ [1, 2, 3, 4]|last }}
-{{ {a: 1, b: 2, c: 3, d: 4}|last }}
-{{ '1234'|last }}
-{{ arr|last }}
-{{ 'Ä€é'|last }}
-{{ ''|last }}
---DATA--
-return ['arr' => new \ArrayObject([1, 2, 3, 4])]
---EXPECT--
-4
-4
-4
-4
-é
diff --git a/vendor/twig/twig/tests/Fixtures/filters/length.test b/vendor/twig/twig/tests/Fixtures/filters/length.test
deleted file mode 100644
index eb3f02334f..0000000000
--- a/vendor/twig/twig/tests/Fixtures/filters/length.test
+++ /dev/null
@@ -1,40 +0,0 @@
---TEST--
-"length" filter
---TEMPLATE--
-{{ array|length }}
-{{ string|length }}
-{{ number|length }}
-{{ to_string_able|length }}
-{{ countable|length }}
-{{ iterator_aggregate|length }}
-{{ null|length }}
-{{ magic|length }}
-{{ non_countable|length }}
-{{ simple_xml_element|length }}
-{{ iterator|length }}
---DATA--
-return [
- 'array' => [1, 4],
- 'string' => 'foo',
- 'number' => 1000,
- 'to_string_able' => new Twig\Tests\ToStringStub('foobar'),
- 'countable' => new Twig\Tests\CountableStub(42), /* also asserts we do *not* call __toString() */
- 'iterator_aggregate' => new Twig\Tests\IteratorAggregateStub(['a', 'b', 'c']), /* also asserts we do *not* call __toString() */
- 'null' => null,
- 'magic' => new Twig\Tests\MagicCallStub(), /* used to assert we do *not* call __call */
- 'non_countable' => new \StdClass(),
- 'simple_xml_element' => new \SimpleXMLElement('<?xml version="1.0" encoding="UTF-8"?><doc><elem/><elem/></doc>'),
- 'iterator' => new Twig\Tests\SimpleIteratorForTesting()
-]
---EXPECT--
-2
-3
-4
-6
-42
-3
-0
-1
-1
-2
-7
diff --git a/vendor/twig/twig/tests/Fixtures/filters/length_utf8.test b/vendor/twig/twig/tests/Fixtures/filters/length_utf8.test
deleted file mode 100644
index b1e9681a5d..0000000000
--- a/vendor/twig/twig/tests/Fixtures/filters/length_utf8.test
+++ /dev/null
@@ -1,12 +0,0 @@
---TEST--
-"length" filter
---CONDITION--
-function_exists('mb_get_info')
---TEMPLATE--
-{{ string|length }}
-{{ markup|length }}
---DATA--
-return ['string' => 'été', 'markup' => new \Twig\Markup('foo', 'UTF-8')]
---EXPECT--
-3
-3
diff --git a/vendor/twig/twig/tests/Fixtures/filters/map.test b/vendor/twig/twig/tests/Fixtures/filters/map.test
deleted file mode 100644
index 5552f81668..0000000000
--- a/vendor/twig/twig/tests/Fixtures/filters/map.test
+++ /dev/null
@@ -1,41 +0,0 @@
---TEST--
-"map" filter
---TEMPLATE--
-{% set offset = 3 %}
-
-{% for k, v in [1, 2]|map((item) => item + 2 ) -%}
- {{ k }} = {{ v }}
-{% endfor %}
-
-{% for k, v in {a: 1, b: 2}|map((item) => item ~ "*" ) -%}
- {{ k }} = {{ v }}
-{% endfor %}
-
-{% for k, v in {a: 1, b: 2}|map((item, k) => item ~ "*" ~ k ) -%}
- {{ k }} = {{ v }}
-{% endfor %}
-
-{% for k, v in [1, 2]|map(item => item + 2 ) -%}
- {{ k }} = {{ v }}
-{% endfor %}
-
-{% for k, v in it|map(item => item + 2 ) -%}
- {{ k }} = {{ v }}
-{% endfor %}
---DATA--
-return ['it' => new \ArrayIterator([1, 2])]
---EXPECT--
-0 = 3
-1 = 4
-
-a = 1*
-b = 2*
-
-a = 1*a
-b = 2*b
-
-0 = 3
-1 = 4
-
-0 = 3
-1 = 4
diff --git a/vendor/twig/twig/tests/Fixtures/filters/merge.test b/vendor/twig/twig/tests/Fixtures/filters/merge.test
deleted file mode 100644
index 8877501d4c..0000000000
--- a/vendor/twig/twig/tests/Fixtures/filters/merge.test
+++ /dev/null
@@ -1,25 +0,0 @@
---TEST--
-"merge" filter
---TEMPLATE--
-{{ items|merge({'bar': 'foo'})|join }}
-{{ items|merge({'bar': 'foo'})|keys|join }}
-{{ {'bar': 'foo'}|merge(items)|join }}
-{{ {'bar': 'foo'}|merge(items)|keys|join }}
-{{ numerics|merge([4, 5, 6])|join }}
-{{ traversable.a|merge(traversable.b)|join }}
---DATA--
-return [
- 'items' => ['foo' => 'bar'],
- 'numerics' => [1, 2, 3],
- 'traversable' => [
- 'a' => new \ArrayObject([0 => 1, 1 => 2, 2 => 3]),
- 'b' => new \ArrayObject(['a' => 'b'])
- ]
-]
---EXPECT--
-barfoo
-foobar
-foobar
-barfoo
-123456
-123b
diff --git a/vendor/twig/twig/tests/Fixtures/filters/nl2br.test b/vendor/twig/twig/tests/Fixtures/filters/nl2br.test
deleted file mode 100644
index 524ec45f96..0000000000
--- a/vendor/twig/twig/tests/Fixtures/filters/nl2br.test
+++ /dev/null
@@ -1,14 +0,0 @@
---TEST--
-"nl2br" filter
---TEMPLATE--
-{{ "I like Twig.\nYou will like it too.\n\nEverybody like it!"|nl2br }}
-{{ text|nl2br }}
---DATA--
-return ['text' => "If you have some <strong>HTML</strong>\nit will be escaped."]
---EXPECT--
-I like Twig.<br />
-You will like it too.<br />
-<br />
-Everybody like it!
-If you have some <strong>HTML</strong><br />
-it will be escaped.
diff --git a/vendor/twig/twig/tests/Fixtures/filters/number_format.test b/vendor/twig/twig/tests/Fixtures/filters/number_format.test
deleted file mode 100644
index 7f1e2e16a2..0000000000
--- a/vendor/twig/twig/tests/Fixtures/filters/number_format.test
+++ /dev/null
@@ -1,18 +0,0 @@
---TEST--
-"number_format" filter
---TEMPLATE--
-{{ 20|number_format }}
-{{ 20.25|number_format }}
-{{ 20.25|number_format(2) }}
-{{ 20.25|number_format(2, ',') }}
-{{ 1020.25|number_format(2, ',') }}
-{{ 1020.25|number_format(2, ',', '.') }}
---DATA--
-return []
---EXPECT--
-20
-20
-20.25
-20,25
-1,020,25
-1.020,25
diff --git a/vendor/twig/twig/tests/Fixtures/filters/number_format_default.test b/vendor/twig/twig/tests/Fixtures/filters/number_format_default.test
deleted file mode 100644
index beedd901a0..0000000000
--- a/vendor/twig/twig/tests/Fixtures/filters/number_format_default.test
+++ /dev/null
@@ -1,21 +0,0 @@
---TEST--
-"number_format" filter with defaults.
---TEMPLATE--
-{{ 20|number_format }}
-{{ 20.25|number_format }}
-{{ 20.25|number_format(1) }}
-{{ 20.25|number_format(2, ',') }}
-{{ 1020.25|number_format }}
-{{ 1020.25|number_format(2, ',') }}
-{{ 1020.25|number_format(2, ',', '.') }}
---DATA--
-$twig->getExtension('\Twig\Extension\CoreExtension')->setNumberFormat(2, '!', '=');
-return []
---EXPECT--
-20!00
-20!25
-20!3
-20,25
-1=020!25
-1=020,25
-1.020,25
diff --git a/vendor/twig/twig/tests/Fixtures/filters/reduce.test b/vendor/twig/twig/tests/Fixtures/filters/reduce.test
deleted file mode 100644
index 73cad41686..0000000000
--- a/vendor/twig/twig/tests/Fixtures/filters/reduce.test
+++ /dev/null
@@ -1,14 +0,0 @@
---TEST--
-"reduce" filter
---TEMPLATE--
-{% set offset = 3 %}
-
-{{ [1, -1, 4]|reduce((carry, item) => carry + item + offset, 10) }}
-
-{{ it|reduce((carry, item) => carry + item + offset, 10) }}
---DATA--
-return ['it' => new \ArrayIterator([1, -1, 4])]
---EXPECT--
-23
-
-23
diff --git a/vendor/twig/twig/tests/Fixtures/filters/replace.test b/vendor/twig/twig/tests/Fixtures/filters/replace.test
deleted file mode 100644
index 1b9670a17b..0000000000
--- a/vendor/twig/twig/tests/Fixtures/filters/replace.test
+++ /dev/null
@@ -1,12 +0,0 @@
---TEST--
-"replace" filter
---TEMPLATE--
-{{ "I liké %this% and %that%."|replace({'%this%': "foo", '%that%': "bar"}) }}
-{{ 'I like single replace operation only %that%'|replace({'%that%' : '%that%1'}) }}
-{{ 'I like %this% and %that%.'|replace(traversable) }}
---DATA--
-return ['traversable' => new \ArrayObject(['%this%' => 'foo', '%that%' => 'bar'])]
---EXPECT--
-I liké foo and bar.
-I like single replace operation only %that%1
-I like foo and bar.
diff --git a/vendor/twig/twig/tests/Fixtures/filters/replace_invalid_arg.test b/vendor/twig/twig/tests/Fixtures/filters/replace_invalid_arg.test
deleted file mode 100644
index ba6fea4125..0000000000
--- a/vendor/twig/twig/tests/Fixtures/filters/replace_invalid_arg.test
+++ /dev/null
@@ -1,8 +0,0 @@
---TEST--
-Exception for invalid argument type in replace call
---TEMPLATE--
-{{ 'test %foo%'|replace(stdClass) }}
---DATA--
-return ['stdClass' => new \stdClass()]
---EXCEPTION--
-Twig\Error\RuntimeError: The "replace" filter expects an array or "Traversable" as replace values, got "stdClass" in "index.twig" at line 2.
diff --git a/vendor/twig/twig/tests/Fixtures/filters/reverse.test b/vendor/twig/twig/tests/Fixtures/filters/reverse.test
deleted file mode 100644
index 904e5839b0..0000000000
--- a/vendor/twig/twig/tests/Fixtures/filters/reverse.test
+++ /dev/null
@@ -1,18 +0,0 @@
---TEST--
-"reverse" filter
---TEMPLATE--
-{{ [1, 2, 3, 4]|reverse|join('') }}
-{{ '1234évènement'|reverse }}
-{{ arr|reverse|join('') }}
-{{ {'a': 'c', 'b': 'a'}|reverse()|join(',') }}
-{{ {'a': 'c', 'b': 'a'}|reverse(preserveKeys=true)|join(glue=',') }}
-{{ {'a': 'c', 'b': 'a'}|reverse(preserve_keys=true)|join(glue=',') }}
---DATA--
-return ['arr' => new \ArrayObject([1, 2, 3, 4])]
---EXPECT--
-4321
-tnemenèvé4321
-4321
-a,c
-a,c
-a,c
diff --git a/vendor/twig/twig/tests/Fixtures/filters/round.test b/vendor/twig/twig/tests/Fixtures/filters/round.test
deleted file mode 100644
index 709237543a..0000000000
--- a/vendor/twig/twig/tests/Fixtures/filters/round.test
+++ /dev/null
@@ -1,22 +0,0 @@
---TEST--
-"round" filter
---TEMPLATE--
-{{ 2.7|round }}
-{{ 2.1|round }}
-{{ 2.1234|round(3, 'floor') }}
-{{ 2.1|round(0, 'ceil') }}
-
-{{ 21.3|round(-1)}}
-{{ 21.3|round(-1, 'ceil')}}
-{{ 21.3|round(-1, 'floor')}}
---DATA--
-return []
---EXPECT--
-3
-2
-2.123
-3
-
-20
-30
-20
diff --git a/vendor/twig/twig/tests/Fixtures/filters/slice.test b/vendor/twig/twig/tests/Fixtures/filters/slice.test
deleted file mode 100644
index fc975d7bb1..0000000000
--- a/vendor/twig/twig/tests/Fixtures/filters/slice.test
+++ /dev/null
@@ -1,54 +0,0 @@
---TEST--
-"slice" filter
---TEMPLATE--
-{{ [1, 2, 3, 4][1:2]|join('') }}
-{{ {a: 1, b: 2, c: 3, d: 4}[1:2]|join('') }}
-{{ [1, 2, 3, 4][start:length]|join('') }}
-{{ [1, 2, 3, 4]|slice(1, 2)|join('') }}
-{{ [1, 2, 3, 4]|slice(1, 2)|keys|join('') }}
-{{ [1, 2, 3, 4]|slice(1, 2, true)|keys|join('') }}
-{{ {a: 1, b: 2, c: 3, d: 4}|slice(1, 2)|join('') }}
-{{ {a: 1, b: 2, c: 3, d: 4}|slice(1, 2)|keys|join('') }}
-{{ '1234'|slice(1, 2) }}
-{{ '1234'[1:2] }}
-{{ arr|slice(1, 2)|join('') }}
-{{ arr[1:2]|join('') }}
-{{ arr[4:1]|join('') }}
-{{ arr[3:2]|join('') }}
-
-{{ [1, 2, 3, 4]|slice(1)|join('') }}
-{{ [1, 2, 3, 4][1:]|join('') }}
-{{ '1234'|slice(1) }}
-{{ '1234'[1:] }}
-{{ '1234'[:1] }}
-
-{{ arr|slice(3)|join('') }}
-{{ arr[2:]|join('') }}
-{{ xml|slice(1)|join('')}}
---DATA--
-return ['start' => 1, 'length' => 2, 'arr' => new \ArrayObject([1, 2, 3, 4]), 'xml' => new \SimpleXMLElement('<items><item>1</item><item>2</item></items>')]
---EXPECT--
-23
-23
-23
-23
-01
-12
-23
-bc
-23
-23
-23
-23
-
-4
-
-234
-234
-234
-234
-1
-
-4
-34
-2
diff --git a/vendor/twig/twig/tests/Fixtures/filters/sort.test b/vendor/twig/twig/tests/Fixtures/filters/sort.test
deleted file mode 100644
index c3b2c70dd4..0000000000
--- a/vendor/twig/twig/tests/Fixtures/filters/sort.test
+++ /dev/null
@@ -1,12 +0,0 @@
---TEST--
-"sort" filter
---TEMPLATE--
-{{ array1|sort|join }}
-{{ array2|sort|join }}
-{{ traversable|sort|join }}
---DATA--
-return ['array1' => [4, 1], 'array2' => ['foo', 'bar'], 'traversable' => new \ArrayObject([0 => 3, 1 => 2, 2 => 1])]
---EXPECT--
-14
-barfoo
-123
diff --git a/vendor/twig/twig/tests/Fixtures/filters/spaceless.test b/vendor/twig/twig/tests/Fixtures/filters/spaceless.test
deleted file mode 100644
index eadc1d4962..0000000000
--- a/vendor/twig/twig/tests/Fixtures/filters/spaceless.test
+++ /dev/null
@@ -1,8 +0,0 @@
---TEST--
-"spaceless" filter
---TEMPLATE--
-{{ " <div> <div> foo </div> </div>"|spaceless }}
---DATA--
-return []
---EXPECT--
-<div><div> foo </div></div>
diff --git a/vendor/twig/twig/tests/Fixtures/filters/special_chars.test b/vendor/twig/twig/tests/Fixtures/filters/special_chars.test
deleted file mode 100644
index 9869ec91c3..0000000000
--- a/vendor/twig/twig/tests/Fixtures/filters/special_chars.test
+++ /dev/null
@@ -1,8 +0,0 @@
---TEST--
-"§" custom filter
---TEMPLATE--
-{{ 'foo'|§ }}
---DATA--
-return []
---EXPECT--
-§foo§
diff --git a/vendor/twig/twig/tests/Fixtures/filters/split.test b/vendor/twig/twig/tests/Fixtures/filters/split.test
deleted file mode 100644
index 2bd46afa36..0000000000
--- a/vendor/twig/twig/tests/Fixtures/filters/split.test
+++ /dev/null
@@ -1,22 +0,0 @@
---TEST--
-"split" filter
---TEMPLATE--
-{{ "one,two,three,four,five"|split(',')|join('-') }}
-{{ foo|split(',')|join('-') }}
-{{ foo|split(',', 3)|join('-') }}
-{{ baz|split('')|join('-') }}
-{{ baz|split('', 1)|join('-') }}
-{{ baz|split('', 2)|join('-') }}
-{{ foo|split(',', -2)|join('-') }}
-{{ "hello0world"|split('0')|join('-') }}
---DATA--
-return ['foo' => "one,two,three,four,five", 'baz' => '12345',]
---EXPECT--
-one-two-three-four-five
-one-two-three-four-five
-one-two-three,four,five
-1-2-3-4-5
-1-2-3-4-5
-12-34-5
-one-two-three
-hello-world
\ No newline at end of file
diff --git a/vendor/twig/twig/tests/Fixtures/filters/split_utf8.test b/vendor/twig/twig/tests/Fixtures/filters/split_utf8.test
deleted file mode 100644
index bf52e6df76..0000000000
--- a/vendor/twig/twig/tests/Fixtures/filters/split_utf8.test
+++ /dev/null
@@ -1,24 +0,0 @@
---TEST--
-"split" filter
---CONDITION--
-function_exists('mb_get_info')
---TEMPLATE--
-{{ "é"|split('', 10)|join('-') }}
-{{ foo|split(',')|join('-') }}
-{{ foo|split(',', 1)|join('-') }}
-{{ foo|split(',', 2)|join('-') }}
-{{ foo|split(',', 3)|join('-') }}
-{{ baz|split('')|join('-') }}
-{{ baz|split('', 1)|join('-') }}
-{{ baz|split('', 2)|join('-') }}
---DATA--
-return ['foo' => 'Ä,é,Äほ', 'baz' => 'éÄßごa',]
---EXPECT--
-é
-Ä-é-Äほ
-Ä,é,Äほ
-Ä-é,Äほ
-Ä-é-Äほ
-é-Ä-ß-ご-a
-é-Ä-ß-ご-a
-éÄ-ßご-a
\ No newline at end of file
diff --git a/vendor/twig/twig/tests/Fixtures/filters/static_calls.test b/vendor/twig/twig/tests/Fixtures/filters/static_calls.test
deleted file mode 100644
index 1626db0c97..0000000000
--- a/vendor/twig/twig/tests/Fixtures/filters/static_calls.test
+++ /dev/null
@@ -1,10 +0,0 @@
---TEST--
-Filters as static method calls
---TEMPLATE--
-{{ 'foo'|static_call_string }}
-{{ 'foo'|static_call_array }}
---DATA--
-return ['foo' => 'foo']
---EXPECT--
-*foo*
-*foo*
diff --git a/vendor/twig/twig/tests/Fixtures/filters/trim.test b/vendor/twig/twig/tests/Fixtures/filters/trim.test
deleted file mode 100644
index 432989ff16..0000000000
--- a/vendor/twig/twig/tests/Fixtures/filters/trim.test
+++ /dev/null
@@ -1,24 +0,0 @@
---TEST--
-"trim" filter
---TEMPLATE--
-{{ " I like Twig. "|trim }}
-{{ text|trim }}
-{{ " foo/"|trim("/") }}
-{{ "xxxI like Twig.xxx"|trim(character_mask="x", side="left") }}
-{{ "xxxI like Twig.xxx"|trim(side="right", character_mask="x") }}
-{{ "xxxI like Twig.xxx"|trim("x", "right") }}
-{{ "/ foo/"|trim("/", "left") }}
-{{ "/ foo/"|trim(character_mask="/", side="left") }}
-{{ " do nothing. "|trim("", "right") }}
---DATA--
-return ['text' => " If you have some <strong>HTML</strong> it will be escaped. "]
---EXPECT--
-I like Twig.
-If you have some <strong>HTML</strong> it will be escaped.
- foo
-I like Twig.xxx
-xxxI like Twig.
-xxxI like Twig.
- foo/
- foo/
- do nothing.
diff --git a/vendor/twig/twig/tests/Fixtures/filters/urlencode.test b/vendor/twig/twig/tests/Fixtures/filters/urlencode.test
deleted file mode 100644
index 66a682dd39..0000000000
--- a/vendor/twig/twig/tests/Fixtures/filters/urlencode.test
+++ /dev/null
@@ -1,16 +0,0 @@
---TEST--
-"url_encode" filter
---CONDITION--
-defined('PHP_QUERY_RFC3986')
---TEMPLATE--
-{{ {foo: "bar", number: 3, "spéßi%l": "e%c0d@d", "spa ce": ""}|url_encode }}
-{{ {foo: "bar", number: 3, "spéßi%l": "e%c0d@d", "spa ce": ""}|url_encode|raw }}
-{{ {}|url_encode|default("default") }}
-{{ 'spéßi%le%c0d@dspa ce'|url_encode }}
---DATA--
-return []
---EXPECT--
-foo=bar&number=3&sp%C3%A9%C3%9Fi%25l=e%25c0d%40d&spa%20ce=
-foo=bar&number=3&sp%C3%A9%C3%9Fi%25l=e%25c0d%40d&spa%20ce=
-default
-sp%C3%A9%C3%9Fi%25le%25c0d%40dspa%20ce
diff --git a/vendor/twig/twig/tests/Fixtures/filters/urlencode_deprecated.test b/vendor/twig/twig/tests/Fixtures/filters/urlencode_deprecated.test
deleted file mode 100644
index 38d726492a..0000000000
--- a/vendor/twig/twig/tests/Fixtures/filters/urlencode_deprecated.test
+++ /dev/null
@@ -1,16 +0,0 @@
---TEST--
-"url_encode" filter for PHP < 5.4
---CONDITION--
-defined('PHP_QUERY_RFC3986')
---TEMPLATE--
-{{ {foo: "bar", number: 3, "spéßi%l": "e%c0d@d", "spa ce": ""}|url_encode }}
-{{ {foo: "bar", number: 3, "spéßi%l": "e%c0d@d", "spa ce": ""}|url_encode|raw }}
-{{ {}|url_encode|default("default") }}
-{{ 'spéßi%le%c0d@dspa ce'|url_encode }}
---DATA--
-return []
---EXPECT--
-foo=bar&number=3&sp%C3%A9%C3%9Fi%25l=e%25c0d%40d&spa%20ce=
-foo=bar&number=3&sp%C3%A9%C3%9Fi%25l=e%25c0d%40d&spa%20ce=
-default
-sp%C3%A9%C3%9Fi%25le%25c0d%40dspa%20ce
diff --git a/vendor/twig/twig/tests/Fixtures/functions/attribute.test b/vendor/twig/twig/tests/Fixtures/functions/attribute.test
deleted file mode 100644
index 4499ad4bde..0000000000
--- a/vendor/twig/twig/tests/Fixtures/functions/attribute.test
+++ /dev/null
@@ -1,18 +0,0 @@
---TEST--
-"attribute" function
---TEMPLATE--
-{{ attribute(obj, method) }}
-{{ attribute(array, item) }}
-{{ attribute(obj, "bar", ["a", "b"]) }}
-{{ attribute(obj, "bar", arguments) }}
-{{ attribute(obj, method) is defined ? 'ok' : 'ko' }}
-{{ attribute(obj, nonmethod) is defined ? 'ok' : 'ko' }}
---DATA--
-return ['obj' => new Twig\Tests\TwigTestFoo(), 'method' => 'foo', 'array' => ['foo' => 'bar'], 'item' => 'foo', 'nonmethod' => 'xxx', 'arguments' => ['a', 'b']]
---EXPECT--
-foo
-bar
-bar_a-b
-bar_a-b
-ok
-ko
diff --git a/vendor/twig/twig/tests/Fixtures/functions/block.test b/vendor/twig/twig/tests/Fixtures/functions/block.test
deleted file mode 100644
index 1a4fd5492f..0000000000
--- a/vendor/twig/twig/tests/Fixtures/functions/block.test
+++ /dev/null
@@ -1,12 +0,0 @@
---TEST--
-"block" function
---TEMPLATE--
-{% extends 'base.twig' %}
-{% block bar %}BAR{% endblock %}
---TEMPLATE(base.twig)--
-{% block foo %}{{ block('bar') }}{% endblock %}
-{% block bar %}BAR_BASE{% endblock %}
---DATA--
-return []
---EXPECT--
-BARBAR
diff --git a/vendor/twig/twig/tests/Fixtures/functions/block_with_template.test b/vendor/twig/twig/tests/Fixtures/functions/block_with_template.test
deleted file mode 100644
index 37cb7a4813..0000000000
--- a/vendor/twig/twig/tests/Fixtures/functions/block_with_template.test
+++ /dev/null
@@ -1,22 +0,0 @@
---TEST--
-"block" function with a template argument
---TEMPLATE--
-{{ block('foo', 'included.twig') }}
-{{ block('foo', included_loaded) }}
-{{ block('foo', included_loaded_internal) }}
-{% set output = block('foo', 'included.twig') %}
-{{ output }}
-{% block foo %}NOT FOO{% endblock %}
---TEMPLATE(included.twig)--
-{% block foo %}FOO{% endblock %}
---DATA--
-return [
- 'included_loaded' => $twig->load('included.twig'),
- 'included_loaded_internal' => $twig->load('included.twig'),
-]
---EXPECT--
-FOO
-FOO
-FOO
-FOO
-NOT FOO
diff --git a/vendor/twig/twig/tests/Fixtures/functions/block_without_name.test b/vendor/twig/twig/tests/Fixtures/functions/block_without_name.test
deleted file mode 100644
index 236df94510..0000000000
--- a/vendor/twig/twig/tests/Fixtures/functions/block_without_name.test
+++ /dev/null
@@ -1,12 +0,0 @@
---TEST--
-"block" function without arguments
---TEMPLATE--
-{% extends 'base.twig' %}
-{% block bar %}BAR{% endblock %}
---TEMPLATE(base.twig)--
-{% block foo %}{{ block() }}{% endblock %}
-{% block bar %}BAR_BASE{% endblock %}
---DATA--
-return []
---EXCEPTION--
-Twig\Error\SyntaxError: The "block" function takes one argument (the block name) in "base.twig" at line 2.
diff --git a/vendor/twig/twig/tests/Fixtures/functions/constant.test b/vendor/twig/twig/tests/Fixtures/functions/constant.test
deleted file mode 100644
index fd6dd06111..0000000000
--- a/vendor/twig/twig/tests/Fixtures/functions/constant.test
+++ /dev/null
@@ -1,10 +0,0 @@
---TEST--
-"constant" function
---TEMPLATE--
-{{ constant('DATE_W3C') == expect ? 'true' : 'false' }}
-{{ constant('ARRAY_AS_PROPS', object) }}
---DATA--
-return ['expect' => DATE_W3C, 'object' => new \ArrayObject(['hi'])]
---EXPECT--
-true
-2
diff --git a/vendor/twig/twig/tests/Fixtures/functions/cycle.test b/vendor/twig/twig/tests/Fixtures/functions/cycle.test
deleted file mode 100644
index 0ac6dccd3a..0000000000
--- a/vendor/twig/twig/tests/Fixtures/functions/cycle.test
+++ /dev/null
@@ -1,16 +0,0 @@
---TEST--
-"cycle" function
---TEMPLATE--
-{% for i in 0..6 %}
-{{ cycle(array1, i) }}-{{ cycle(array2, i) }}
-{% endfor %}
---DATA--
-return ['array1' => ['odd', 'even'], 'array2' => ['apple', 'orange', 'citrus']]
---EXPECT--
-odd-apple
-even-orange
-odd-citrus
-even-apple
-odd-orange
-even-citrus
-odd-apple
diff --git a/vendor/twig/twig/tests/Fixtures/functions/date.test b/vendor/twig/twig/tests/Fixtures/functions/date.test
deleted file mode 100644
index c879da3cfd..0000000000
--- a/vendor/twig/twig/tests/Fixtures/functions/date.test
+++ /dev/null
@@ -1,27 +0,0 @@
---TEST--
-"date" function
---TEMPLATE--
-{{ date().format('r') == date('now').format('r') ? 'OK' : 'KO' }}
-{{ date(date1) == date('2010-10-04 13:45') ? 'OK' : 'KO' }}
-{{ date(date2) == date('2010-10-04 13:45') ? 'OK' : 'KO' }}
-{{ date(date3) == date('2010-10-04 13:45') ? 'OK' : 'KO' }}
-{{ date(date4) == date('2010-10-04 13:45') ? 'OK' : 'KO' }}
-{{ date(date5) == date('1964-01-02 03:04') ? 'OK' : 'KO' }}
-{{ date() > date('-1day') ? 'OK' : 'KO' }}
---DATA--
-date_default_timezone_set('UTC');
-return [
- 'date1' => mktime(13, 45, 0, 10, 4, 2010),
- 'date2' => new \DateTime('2010-10-04 13:45'),
- 'date3' => '2010-10-04 13:45',
- 'date4' => 1286199900, // \DateTime::createFromFormat('Y-m-d H:i', '2010-10-04 13:45', new \DateTimeZone('UTC'))->getTimestamp() -- A unixtimestamp is always GMT
- 'date5' => -189291360, // \DateTime::createFromFormat('Y-m-d H:i', '1964-01-02 03:04', new \DateTimeZone('UTC'))->getTimestamp(),
-]
---EXPECT--
-OK
-OK
-OK
-OK
-OK
-OK
-OK
diff --git a/vendor/twig/twig/tests/Fixtures/functions/date_namedargs.test b/vendor/twig/twig/tests/Fixtures/functions/date_namedargs.test
deleted file mode 100644
index 11f60ee8bf..0000000000
--- a/vendor/twig/twig/tests/Fixtures/functions/date_namedargs.test
+++ /dev/null
@@ -1,11 +0,0 @@
---TEST--
-"date" function
---TEMPLATE--
-{{ date(date, "America/New_York")|date('d/m/Y H:i:s P', false) }}
-{{ date(timezone="America/New_York", date=date)|date('d/m/Y H:i:s P', false) }}
---DATA--
-date_default_timezone_set('UTC');
-return ['date' => mktime(13, 45, 0, 10, 4, 2010)]
---EXPECT--
-04/10/2010 09:45:00 -04:00
-04/10/2010 09:45:00 -04:00
diff --git a/vendor/twig/twig/tests/Fixtures/functions/dump.test b/vendor/twig/twig/tests/Fixtures/functions/dump.test
deleted file mode 100644
index 691a3abea9..0000000000
--- a/vendor/twig/twig/tests/Fixtures/functions/dump.test
+++ /dev/null
@@ -1,16 +0,0 @@
---TEST--
-"dump" function
---CONDITION--
-!extension_loaded('xdebug')
---TEMPLATE--
-{{ dump('foo') }}
-{{ dump('foo', 'bar') }}
---DATA--
-return ['foo' => 'foo', 'bar' => 'bar']
---CONFIG--
-return ['debug' => true, 'autoescape' => false]
---EXPECT--
-string(3) "foo"
-
-string(3) "foo"
-string(3) "bar"
diff --git a/vendor/twig/twig/tests/Fixtures/functions/dump_array.test b/vendor/twig/twig/tests/Fixtures/functions/dump_array.test
deleted file mode 100644
index 5fd9383cd6..0000000000
--- a/vendor/twig/twig/tests/Fixtures/functions/dump_array.test
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-"dump" function, xdebug is not loaded or xdebug <2.2-dev is loaded
---CONDITION--
-!extension_loaded('xdebug') || (($r = new \ReflectionExtension('xdebug')) && version_compare($r->getVersion(), '2.2-dev', '<'))
---TEMPLATE--
-{{ dump() }}
---DATA--
-return ['foo' => 'foo', 'bar' => 'bar']
---CONFIG--
-return ['debug' => true, 'autoescape' => false]
---EXPECT--
-array(3) {
- ["foo"]=>
- string(3) "foo"
- ["bar"]=>
- string(3) "bar"
- ["global"]=>
- string(6) "global"
-}
diff --git a/vendor/twig/twig/tests/Fixtures/functions/dynamic_function.test b/vendor/twig/twig/tests/Fixtures/functions/dynamic_function.test
deleted file mode 100644
index c7b3539c40..0000000000
--- a/vendor/twig/twig/tests/Fixtures/functions/dynamic_function.test
+++ /dev/null
@@ -1,10 +0,0 @@
---TEST--
-dynamic function
---TEMPLATE--
-{{ foo_path('bar') }}
-{{ a_foo_b_bar('bar') }}
---DATA--
-return []
---EXPECT--
-foo/bar
-a/b/bar
diff --git a/vendor/twig/twig/tests/Fixtures/functions/include/assignment.test b/vendor/twig/twig/tests/Fixtures/functions/include/assignment.test
deleted file mode 100644
index c9ce8123fe..0000000000
--- a/vendor/twig/twig/tests/Fixtures/functions/include/assignment.test
+++ /dev/null
@@ -1,13 +0,0 @@
---TEST--
-"include" function
---TEMPLATE--
-{% set tmp = include("foo.twig") %}
-
-FOO{{ tmp }}BAR
---TEMPLATE(foo.twig)--
-FOOBAR
---DATA--
-return []
---EXPECT--
-FOO
-FOOBARBAR
diff --git a/vendor/twig/twig/tests/Fixtures/functions/include/autoescaping.test b/vendor/twig/twig/tests/Fixtures/functions/include/autoescaping.test
deleted file mode 100644
index a3666261f3..0000000000
--- a/vendor/twig/twig/tests/Fixtures/functions/include/autoescaping.test
+++ /dev/null
@@ -1,10 +0,0 @@
---TEST--
-"include" function is safe for auto-escaping
---TEMPLATE--
-{{ include("foo.twig") }}
---TEMPLATE(foo.twig)--
-<p>Test</p>
---DATA--
-return []
---EXPECT--
-<p>Test</p>
diff --git a/vendor/twig/twig/tests/Fixtures/functions/include/basic.test b/vendor/twig/twig/tests/Fixtures/functions/include/basic.test
deleted file mode 100644
index f90983c02f..0000000000
--- a/vendor/twig/twig/tests/Fixtures/functions/include/basic.test
+++ /dev/null
@@ -1,17 +0,0 @@
---TEST--
-"include" function
---TEMPLATE--
-FOO
-{{ include("foo.twig") }}
-
-BAR
---TEMPLATE(foo.twig)--
-FOOBAR
---DATA--
-return []
---EXPECT--
-FOO
-
-FOOBAR
-
-BAR
diff --git a/vendor/twig/twig/tests/Fixtures/functions/include/expression.test b/vendor/twig/twig/tests/Fixtures/functions/include/expression.test
deleted file mode 100644
index c6d3d1c533..0000000000
--- a/vendor/twig/twig/tests/Fixtures/functions/include/expression.test
+++ /dev/null
@@ -1,17 +0,0 @@
---TEST--
-"include" function allows expressions for the template to include
---TEMPLATE--
-FOO
-{{ include(foo) }}
-
-BAR
---TEMPLATE(foo.twig)--
-FOOBAR
---DATA--
-return ['foo' => 'foo.twig']
---EXPECT--
-FOO
-
-FOOBAR
-
-BAR
diff --git a/vendor/twig/twig/tests/Fixtures/functions/include/ignore_missing.test b/vendor/twig/twig/tests/Fixtures/functions/include/ignore_missing.test
deleted file mode 100644
index c05b43e140..0000000000
--- a/vendor/twig/twig/tests/Fixtures/functions/include/ignore_missing.test
+++ /dev/null
@@ -1,10 +0,0 @@
---TEST--
-"include" function
---TEMPLATE--
-{{ include(["foo.twig", "bar.twig"], ignore_missing = true) }}
-{{ include("foo.twig", ignore_missing = true) }}
-{{ include("foo.twig", ignore_missing = true, variables = {}) }}
-{{ include("foo.twig", ignore_missing = true, variables = {}, with_context = true) }}
---DATA--
-return []
---EXPECT--
diff --git a/vendor/twig/twig/tests/Fixtures/functions/include/ignore_missing_exists.test b/vendor/twig/twig/tests/Fixtures/functions/include/ignore_missing_exists.test
deleted file mode 100644
index fc2d211ad8..0000000000
--- a/vendor/twig/twig/tests/Fixtures/functions/include/ignore_missing_exists.test
+++ /dev/null
@@ -1,11 +0,0 @@
---TEST--
-"include" function
---TEMPLATE--
-{{ include("included.twig", ignore_missing = true) }}
-NOT DISPLAYED
---TEMPLATE(included.twig)--
-{{ include("DOES NOT EXIST") }}
---DATA--
-return []
---EXCEPTION--
-Twig\Error\LoaderError: Template "DOES NOT EXIST" is not defined in "included.twig" at line 2.
diff --git a/vendor/twig/twig/tests/Fixtures/functions/include/include_missing_extends.test b/vendor/twig/twig/tests/Fixtures/functions/include/include_missing_extends.test
deleted file mode 100644
index 810ae82480..0000000000
--- a/vendor/twig/twig/tests/Fixtures/functions/include/include_missing_extends.test
+++ /dev/null
@@ -1,13 +0,0 @@
---TEST--
-"include" function
---TEMPLATE--
-{{ include(['bad.twig', 'good.twig'], ignore_missing = true) }}
-NOT DISPLAYED
---TEMPLATE(bad.twig)--
-{% extends 'DOES NOT EXIST' %}
---TEMPLATE(good.twig)--
-NOT DISPLAYED
---DATA--
-return []
---EXCEPTION--
-Twig\Error\LoaderError: Template "DOES NOT EXIST" is not defined in "bad.twig" at line 2.
diff --git a/vendor/twig/twig/tests/Fixtures/functions/include/missing.test b/vendor/twig/twig/tests/Fixtures/functions/include/missing.test
deleted file mode 100644
index 1d50f7ac2f..0000000000
--- a/vendor/twig/twig/tests/Fixtures/functions/include/missing.test
+++ /dev/null
@@ -1,8 +0,0 @@
---TEST--
-"include" function
---TEMPLATE--
-{{ include("foo.twig") }}
---DATA--
-return []
---EXCEPTION--
-Twig\Error\LoaderError: Template "foo.twig" is not defined in "index.twig" at line 2.
diff --git a/vendor/twig/twig/tests/Fixtures/functions/include/missing_nested.test b/vendor/twig/twig/tests/Fixtures/functions/include/missing_nested.test
deleted file mode 100644
index 9ae8c9ee75..0000000000
--- a/vendor/twig/twig/tests/Fixtures/functions/include/missing_nested.test
+++ /dev/null
@@ -1,16 +0,0 @@
---TEST--
-"include" function
---TEMPLATE--
-{% extends "base.twig" %}
-
-{% block content %}
- {{ parent() }}
-{% endblock %}
---TEMPLATE(base.twig)--
-{% block content %}
- {{ include("foo.twig") }}
-{% endblock %}
---DATA--
-return []
---EXCEPTION--
-Twig\Error\LoaderError: Template "foo.twig" is not defined in "base.twig" at line 3.
diff --git a/vendor/twig/twig/tests/Fixtures/functions/include/sandbox.test b/vendor/twig/twig/tests/Fixtures/functions/include/sandbox.test
deleted file mode 100644
index ebfdb1eb8f..0000000000
--- a/vendor/twig/twig/tests/Fixtures/functions/include/sandbox.test
+++ /dev/null
@@ -1,13 +0,0 @@
---TEST--
-"include" tag sandboxed
---TEMPLATE--
-{{ include("foo.twig", sandboxed = true) }}
---TEMPLATE(foo.twig)--
-
-
-{{ foo|e }}
-{{ foo|e }}
---DATA--
-return []
---EXCEPTION--
-Twig\Sandbox\SecurityNotAllowedFilterError: Filter "e" is not allowed in "foo.twig" at line 4.
diff --git a/vendor/twig/twig/tests/Fixtures/functions/include/sandbox_disabling.test b/vendor/twig/twig/tests/Fixtures/functions/include/sandbox_disabling.test
deleted file mode 100644
index 1206b67fe3..0000000000
--- a/vendor/twig/twig/tests/Fixtures/functions/include/sandbox_disabling.test
+++ /dev/null
@@ -1,16 +0,0 @@
---TEST--
-"include" tag sandboxed
---TEMPLATE--
-{{ include("foo.twig", sandboxed = true) }}
-{{ include("bar.twig") }}
---TEMPLATE(foo.twig)--
-foo
---TEMPLATE(bar.twig)--
-{{ foo|e }}
---DATA--
-return ['foo' => 'bar<br />']
---EXPECT--
-foo
-
-
-bar<br />
diff --git a/vendor/twig/twig/tests/Fixtures/functions/include/sandbox_disabling_ignore_missing.test b/vendor/twig/twig/tests/Fixtures/functions/include/sandbox_disabling_ignore_missing.test
deleted file mode 100644
index c5be0088af..0000000000
--- a/vendor/twig/twig/tests/Fixtures/functions/include/sandbox_disabling_ignore_missing.test
+++ /dev/null
@@ -1,13 +0,0 @@
---TEST--
-"include" tag sandboxed
---TEMPLATE--
-{{ include("unknown.twig", sandboxed = true, ignore_missing = true) }}
-{{ include("bar.twig") }}
---TEMPLATE(bar.twig)--
-{{ foo|e }}
---DATA--
-return ['foo' => 'bar<br />']
---EXPECT--
-
-
-bar<br />
diff --git a/vendor/twig/twig/tests/Fixtures/functions/include/template_instance.test b/vendor/twig/twig/tests/Fixtures/functions/include/template_instance.test
deleted file mode 100644
index 4c8b450835..0000000000
--- a/vendor/twig/twig/tests/Fixtures/functions/include/template_instance.test
+++ /dev/null
@@ -1,10 +0,0 @@
---TEST--
-"include" function accepts Twig_Template instance
---TEMPLATE--
-{{ include(foo) }} FOO
---TEMPLATE(foo.twig)--
-BAR
---DATA--
-return ['foo' => $twig->load('foo.twig')]
---EXPECT--
-BAR FOO
diff --git a/vendor/twig/twig/tests/Fixtures/functions/include/templates_as_array.test b/vendor/twig/twig/tests/Fixtures/functions/include/templates_as_array.test
deleted file mode 100644
index 21e5bb2efd..0000000000
--- a/vendor/twig/twig/tests/Fixtures/functions/include/templates_as_array.test
+++ /dev/null
@@ -1,12 +0,0 @@
---TEST--
-"include" function
---TEMPLATE--
-{{ include(["foo.twig", "bar.twig"]) }}
-{{- include(["bar.twig", "foo.twig"]) }}
---TEMPLATE(foo.twig)--
-foo
---DATA--
-return []
---EXPECT--
-foo
-foo
diff --git a/vendor/twig/twig/tests/Fixtures/functions/include/with_context.test b/vendor/twig/twig/tests/Fixtures/functions/include/with_context.test
deleted file mode 100644
index 46ac8c79bd..0000000000
--- a/vendor/twig/twig/tests/Fixtures/functions/include/with_context.test
+++ /dev/null
@@ -1,16 +0,0 @@
---TEST--
-"include" function accept variables and with_context
---TEMPLATE--
-{{ include("foo.twig") }}
-{{- include("foo.twig", with_context = false) }}
-{{- include("foo.twig", {'foo1': 'bar'}) }}
-{{- include("foo.twig", {'foo1': 'bar'}, with_context = false) }}
---TEMPLATE(foo.twig)--
-{% for k, v in _context %}{{ k }},{% endfor %}
---DATA--
-return ['foo' => 'bar']
---EXPECT--
-foo,global,_parent,
-global,_parent,
-foo,global,foo1,_parent,
-foo1,global,_parent,
diff --git a/vendor/twig/twig/tests/Fixtures/functions/include/with_variables.test b/vendor/twig/twig/tests/Fixtures/functions/include/with_variables.test
deleted file mode 100644
index 0ed98fed02..0000000000
--- a/vendor/twig/twig/tests/Fixtures/functions/include/with_variables.test
+++ /dev/null
@@ -1,12 +0,0 @@
---TEST--
-"include" function accept variables
---TEMPLATE--
-{{ include("foo.twig", {'foo': 'bar'}) }}
-{{- include("foo.twig", vars) }}
---TEMPLATE(foo.twig)--
-{{ foo }}
---DATA--
-return ['vars' => ['foo' => 'bar']]
---EXPECT--
-bar
-bar
diff --git a/vendor/twig/twig/tests/Fixtures/functions/include_template_from_string.test b/vendor/twig/twig/tests/Fixtures/functions/include_template_from_string.test
deleted file mode 100644
index 8d9ba60ce6..0000000000
--- a/vendor/twig/twig/tests/Fixtures/functions/include_template_from_string.test
+++ /dev/null
@@ -1,11 +0,0 @@
---TEST--
-"template_from_string" function works in an "include"
---TEMPLATE--
-{% set embed = '{% embed "embed.twig" %}{% endembed %}' %}
-{{ include(template_from_string(embed)) }}
---TEMPLATE(embed.twig)--
-Cool
---DATA--
-return []
---EXPECT--
-Cool
diff --git a/vendor/twig/twig/tests/Fixtures/functions/magic_call.test b/vendor/twig/twig/tests/Fixtures/functions/magic_call.test
deleted file mode 100644
index 4dd5e27042..0000000000
--- a/vendor/twig/twig/tests/Fixtures/functions/magic_call.test
+++ /dev/null
@@ -1,8 +0,0 @@
---TEST--
-__call calls
---TEMPLATE--
-{{ 'foo'|magic_call }}
---DATA--
-return []
---EXPECT--
-magic_foo
diff --git a/vendor/twig/twig/tests/Fixtures/functions/magic_call53.test b/vendor/twig/twig/tests/Fixtures/functions/magic_call53.test
deleted file mode 100644
index a7c65bf676..0000000000
--- a/vendor/twig/twig/tests/Fixtures/functions/magic_call53.test
+++ /dev/null
@@ -1,12 +0,0 @@
---TEST--
-__staticCall calls
---CONDITION--
-version_compare(phpversion(), '5.3.0', '>=')
---TEMPLATE--
-{{ 'foo'|magic_call_string }}
-{{ 'foo'|magic_call_array }}
---DATA--
-return []
---EXPECT--
-static_magic_foo
-static_magic_foo
diff --git a/vendor/twig/twig/tests/Fixtures/functions/max.test b/vendor/twig/twig/tests/Fixtures/functions/max.test
deleted file mode 100644
index 6d2de000d5..0000000000
--- a/vendor/twig/twig/tests/Fixtures/functions/max.test
+++ /dev/null
@@ -1,12 +0,0 @@
---TEST--
-"max" function
---TEMPLATE--
-{{ max([2, 1, 3, 5, 4]) }}
-{{ max(2, 1, 3, 5, 4) }}
-{{ max({2:"two", 1:"one", 3:"three", 5:"five", 4:"for"}) }}
---DATA--
-return []
---EXPECT--
-5
-5
-two
diff --git a/vendor/twig/twig/tests/Fixtures/functions/min.test b/vendor/twig/twig/tests/Fixtures/functions/min.test
deleted file mode 100644
index 1fe5446b7c..0000000000
--- a/vendor/twig/twig/tests/Fixtures/functions/min.test
+++ /dev/null
@@ -1,12 +0,0 @@
---TEST--
-"min" function
---TEMPLATE--
-{{ min(2, 1, 3, 5, 4) }}
-{{ min([2, 1, 3, 5, 4]) }}
-{{ min({2:"two", 1:"one", 3:"three", 5:"five", 4:"for"}) }}
---DATA--
-return []
---EXPECT--
-1
-1
-five
diff --git a/vendor/twig/twig/tests/Fixtures/functions/range.test b/vendor/twig/twig/tests/Fixtures/functions/range.test
deleted file mode 100644
index 2927333b97..0000000000
--- a/vendor/twig/twig/tests/Fixtures/functions/range.test
+++ /dev/null
@@ -1,8 +0,0 @@
---TEST--
-"range" function
---TEMPLATE--
-{{ range(low=0+1, high=10+0, step=2)|join(',') }}
---DATA--
-return []
---EXPECT--
-1,3,5,7,9
diff --git a/vendor/twig/twig/tests/Fixtures/functions/recursive_block_with_inheritance.test b/vendor/twig/twig/tests/Fixtures/functions/recursive_block_with_inheritance.test
deleted file mode 100644
index 1c3fffb5da..0000000000
--- a/vendor/twig/twig/tests/Fixtures/functions/recursive_block_with_inheritance.test
+++ /dev/null
@@ -1,21 +0,0 @@
---TEST--
-"block" function recursively called in a parent template
---TEMPLATE--
-{% extends "ordered_menu.twig" %}
-{% block label %}"{{ parent() }}"{% endblock %}
-{% block list %}{% set class = 'b' %}{{ parent() }}{% endblock %}
---TEMPLATE(ordered_menu.twig)--
-{% extends "menu.twig" %}
-{% block list %}{% set class = class|default('a') %}<ol class="{{ class }}">{{ block('children') }}</ol>{% endblock %}
---TEMPLATE(menu.twig)--
-{% extends "base.twig" %}
-{% block list %}<ul>{{ block('children') }}</ul>{% endblock %}
-{% block children %}{% set currentItem = item %}{% for item in currentItem %}{{ block('item') }}{% endfor %}{% set item = currentItem %}{% endblock %}
-{% block item %}<li>{% if item is not iterable %}{{ block('label') }}{% else %}{{ block('list') }}{% endif %}</li>{% endblock %}
-{% block label %}{{ item }}{% endblock %}
---TEMPLATE(base.twig)--
-{{ block('list') }}
---DATA--
-return ['item' => ['1', '2', ['3.1', ['3.2.1', '3.2.2'], '3.4']]]
---EXPECT--
-<ol class="b"><li>"1"</li><li>"2"</li><li><ol class="b"><li>"3.1"</li><li><ol class="b"><li>"3.2.1"</li><li>"3.2.2"</li></ol></li><li>"3.4"</li></ol></li></ol>
diff --git a/vendor/twig/twig/tests/Fixtures/functions/source.test b/vendor/twig/twig/tests/Fixtures/functions/source.test
deleted file mode 100644
index b691ce7bcd..0000000000
--- a/vendor/twig/twig/tests/Fixtures/functions/source.test
+++ /dev/null
@@ -1,17 +0,0 @@
---TEST--
-"source" function
---TEMPLATE--
-FOO
-{{ source("foo.twig") }}
-
-BAR
---TEMPLATE(foo.twig)--
-{{ foo }}<br />
---DATA--
-return []
---EXPECT--
-FOO
-
-{{ foo }}<br />
-
-BAR
diff --git a/vendor/twig/twig/tests/Fixtures/functions/special_chars.test b/vendor/twig/twig/tests/Fixtures/functions/special_chars.test
deleted file mode 100644
index 9c9e249455..0000000000
--- a/vendor/twig/twig/tests/Fixtures/functions/special_chars.test
+++ /dev/null
@@ -1,8 +0,0 @@
---TEST--
-"§" custom function
---TEMPLATE--
-{{ §('foo') }}
---DATA--
-return []
---EXPECT--
-§foo§
diff --git a/vendor/twig/twig/tests/Fixtures/functions/static_calls.test b/vendor/twig/twig/tests/Fixtures/functions/static_calls.test
deleted file mode 100644
index dd13abb0bc..0000000000
--- a/vendor/twig/twig/tests/Fixtures/functions/static_calls.test
+++ /dev/null
@@ -1,10 +0,0 @@
---TEST--
-Functions as static method calls
---TEMPLATE--
-{{ static_call_string('foo') }}
-{{ static_call_array('foo') }}
---DATA--
-return ['foo' => 'foo']
---EXPECT--
-*foo*
-*foo*
diff --git a/vendor/twig/twig/tests/Fixtures/functions/template_from_string.test b/vendor/twig/twig/tests/Fixtures/functions/template_from_string.test
deleted file mode 100644
index 33b0e40d7c..0000000000
--- a/vendor/twig/twig/tests/Fixtures/functions/template_from_string.test
+++ /dev/null
@@ -1,15 +0,0 @@
---TEST--
-"template_from_string" function
---TEMPLATE--
-{% include template_from_string(template) %}
-
-{% include template_from_string("Hello {{ name }}") %}
-{% include template_from_string('{% extends "parent.twig" %}{% block content %}Hello {{ name }}{% endblock %}') %}
---TEMPLATE(parent.twig)--
-{% block content %}{% endblock %}
---DATA--
-return ['name' => 'Fabien', 'template' => "Hello {{ name }}"]
---EXPECT--
-Hello Fabien
-Hello Fabien
-Hello Fabien
diff --git a/vendor/twig/twig/tests/Fixtures/functions/template_from_string_error.test b/vendor/twig/twig/tests/Fixtures/functions/template_from_string_error.test
deleted file mode 100644
index 900d238bd2..0000000000
--- a/vendor/twig/twig/tests/Fixtures/functions/template_from_string_error.test
+++ /dev/null
@@ -1,8 +0,0 @@
---TEST--
-"template_from_string" function
---TEMPLATE--
-{% include template_from_string("{{ not a Twig template ", "foo.twig") %}
---DATA--
-return []
---EXCEPTION--
-Twig\Error\SyntaxError: Unclosed "variable" in "foo.twig (string template 4900163d56b1af4b704c6b0afee7f98ba53418ce7a93d37a3af1882735baf9cd)" at line 1.
diff --git a/vendor/twig/twig/tests/Fixtures/macros/default_values.test b/vendor/twig/twig/tests/Fixtures/macros/default_values.test
deleted file mode 100644
index 18bba524ad..0000000000
--- a/vendor/twig/twig/tests/Fixtures/macros/default_values.test
+++ /dev/null
@@ -1,16 +0,0 @@
---TEST--
-macro
---TEMPLATE--
-{% from _self import test %}
-
-{% macro test(a, b = 'bar') -%}
-{{ a }}{{ b }}
-{%- endmacro %}
-
-{{ test('foo') }}
-{{ test('bar', 'foo') }}
---DATA--
-return []
---EXPECT--
-foobar
-barfoo
diff --git a/vendor/twig/twig/tests/Fixtures/macros/nested_calls.test b/vendor/twig/twig/tests/Fixtures/macros/nested_calls.test
deleted file mode 100644
index 4577286d0c..0000000000
--- a/vendor/twig/twig/tests/Fixtures/macros/nested_calls.test
+++ /dev/null
@@ -1,18 +0,0 @@
---TEST--
-macro
---TEMPLATE--
-{% import _self as macros %}
-
-{% macro foo(data) %}
- {{ data }}
-{% endmacro %}
-
-{% macro bar() %}
- <br />
-{% endmacro %}
-
-{{ macros.foo(macros.bar()) }}
---DATA--
-return []
---EXPECT--
-<br />
diff --git a/vendor/twig/twig/tests/Fixtures/macros/reserved_variables.test b/vendor/twig/twig/tests/Fixtures/macros/reserved_variables.test
deleted file mode 100644
index 05dd921300..0000000000
--- a/vendor/twig/twig/tests/Fixtures/macros/reserved_variables.test
+++ /dev/null
@@ -1,14 +0,0 @@
---TEST--
-macro
---TEMPLATE--
-{% from _self import test %}
-
-{% macro test(this) -%}
- {{ this }}
-{%- endmacro %}
-
-{{ test(this) }}
---DATA--
-return ['this' => 'foo']
---EXPECT--
-foo
diff --git a/vendor/twig/twig/tests/Fixtures/macros/simple.test b/vendor/twig/twig/tests/Fixtures/macros/simple.test
deleted file mode 100644
index 8fc6b477fb..0000000000
--- a/vendor/twig/twig/tests/Fixtures/macros/simple.test
+++ /dev/null
@@ -1,22 +0,0 @@
---TEST--
-macro
---TEMPLATE--
-{% import _self as test %}
-{% from _self import test %}
-
-{% macro test(a, b) -%}
- {{ a|default('a') }}<br />
- {{- b|default('b') }}<br />
-{%- endmacro %}
-
-{{ test.test() }}
-{{ test() }}
-{{ test.test(1, "c") }}
-{{ test(1, "c") }}
---DATA--
-return []
---EXPECT--
-a<br />b<br />
-a<br />b<br />
-1<br />c<br />
-1<br />c<br />
diff --git a/vendor/twig/twig/tests/Fixtures/macros/varargs.test b/vendor/twig/twig/tests/Fixtures/macros/varargs.test
deleted file mode 100644
index dd4b5c9f47..0000000000
--- a/vendor/twig/twig/tests/Fixtures/macros/varargs.test
+++ /dev/null
@@ -1,21 +0,0 @@
---TEST--
-macro with arbitrary arguments
---TEMPLATE--
-{% from _self import test1, test2 %}
-
-{% macro test1(var) %}
- {{- var }}: {{ varargs|join(", ") }}
-{% endmacro %}
-
-{% macro test2() %}
- {{- varargs|join(", ") }}
-{% endmacro %}
-
-{{ test1("foo", "bar", "foobar") }}
-{{ test2("foo", "bar", "foobar") }}
---DATA--
-return []
---EXPECT--
-foo: bar, foobar
-
-foo, bar, foobar
diff --git a/vendor/twig/twig/tests/Fixtures/macros/varargs_argument.test b/vendor/twig/twig/tests/Fixtures/macros/varargs_argument.test
deleted file mode 100644
index 1ad368bf1e..0000000000
--- a/vendor/twig/twig/tests/Fixtures/macros/varargs_argument.test
+++ /dev/null
@@ -1,7 +0,0 @@
---TEST--
-macro with varargs argument
---TEMPLATE--
-{% macro test(varargs) %}
-{% endmacro %}
---EXCEPTION--
-Twig\Error\SyntaxError: The argument "varargs" in macro "test" cannot be defined because the variable "varargs" is reserved for arbitrary arguments in "index.twig" at line 2.
diff --git a/vendor/twig/twig/tests/Fixtures/macros/with_filters.test b/vendor/twig/twig/tests/Fixtures/macros/with_filters.test
deleted file mode 100644
index 96064ba012..0000000000
--- a/vendor/twig/twig/tests/Fixtures/macros/with_filters.test
+++ /dev/null
@@ -1,14 +0,0 @@
---TEST--
-macro with a filter
---TEMPLATE--
-{% import _self as test %}
-
-{% macro test() %}
- {% filter escape %}foo<br />{% endfilter %}
-{% endmacro %}
-
-{{ test.test() }}
---DATA--
-return []
---EXPECT--
-foo<br />
diff --git a/vendor/twig/twig/tests/Fixtures/regression/block_names_unicity.test b/vendor/twig/twig/tests/Fixtures/regression/block_names_unicity.test
deleted file mode 100644
index df07470724..0000000000
--- a/vendor/twig/twig/tests/Fixtures/regression/block_names_unicity.test
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-Block names are unique per template
---TEMPLATE--
-{% extends 'layout' %}
-{% block content -%}
- {% filter title -%}
- second
- {% endfilter %}
-{% endblock %}
---TEMPLATE(layout)--
-{% filter title -%}
- first
-{% endfilter %}
-{% block content %}{% endblock %}
---DATA--
-return []
---EXPECT--
-First
-Second
diff --git a/vendor/twig/twig/tests/Fixtures/regression/combined_debug_info.test b/vendor/twig/twig/tests/Fixtures/regression/combined_debug_info.test
deleted file mode 100644
index 6426d2c1d8..0000000000
--- a/vendor/twig/twig/tests/Fixtures/regression/combined_debug_info.test
+++ /dev/null
@@ -1,15 +0,0 @@
---TEST--
-Exception with bad line number
---TEMPLATE--
-{% block content %}
- {{ foo }}
- {{ include("foo") }}
-{% endblock %}
-index
---TEMPLATE(foo)--
-foo
-{{ foo.bar }}
---DATA--
-return ['foo' => 'foo']
---EXCEPTION--
-Twig\Error\RuntimeError: Impossible to access an attribute ("bar") on a string variable ("foo") in "foo" at line 3.
diff --git a/vendor/twig/twig/tests/Fixtures/regression/empty_token.test b/vendor/twig/twig/tests/Fixtures/regression/empty_token.test
deleted file mode 100644
index 25bdc9e407..0000000000
--- a/vendor/twig/twig/tests/Fixtures/regression/empty_token.test
+++ /dev/null
@@ -1,8 +0,0 @@
---TEST--
-Twig outputs 0 nodes correctly
---TEMPLATE--
-{{ foo }}0{{ foo }}
---DATA--
-return ['foo' => 'foo']
---EXPECT--
-foo0foo
diff --git a/vendor/twig/twig/tests/Fixtures/regression/issue_1143.test b/vendor/twig/twig/tests/Fixtures/regression/issue_1143.test
deleted file mode 100644
index e2ab950e18..0000000000
--- a/vendor/twig/twig/tests/Fixtures/regression/issue_1143.test
+++ /dev/null
@@ -1,23 +0,0 @@
---TEST--
-error in twig extension
---TEMPLATE--
-{{ object.region is not null ? object.regionChoices[object.region] }}
---DATA--
-class House
-{
- const REGION_S = 1;
- const REGION_P = 2;
-
- public static $regionChoices = [self::REGION_S => 'house.region.s', self::REGION_P => 'house.region.p'];
-
- public function getRegionChoices()
- {
- return self::$regionChoices;
- }
-}
-
-$object = new House();
-$object->region = 1;
-return ['object' => $object]
---EXPECT--
-house.region.s
diff --git a/vendor/twig/twig/tests/Fixtures/regression/multi_word_tests.test b/vendor/twig/twig/tests/Fixtures/regression/multi_word_tests.test
deleted file mode 100644
index 96ca5517a1..0000000000
--- a/vendor/twig/twig/tests/Fixtures/regression/multi_word_tests.test
+++ /dev/null
@@ -1,10 +0,0 @@
---TEST--
-Twig allows multi-word tests without a custom node class
---TEMPLATE--
-{{ 'foo' is multi word ? 'yes' : 'no' }}
-{{ 'foo bar' is multi word ? 'yes' : 'no' }}
---DATA--
-return []
---EXPECT--
-no
-yes
diff --git a/vendor/twig/twig/tests/Fixtures/regression/simple_xml_element.test b/vendor/twig/twig/tests/Fixtures/regression/simple_xml_element.test
deleted file mode 100644
index b6e62c8d7e..0000000000
--- a/vendor/twig/twig/tests/Fixtures/regression/simple_xml_element.test
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-Twig is able to deal with SimpleXMLElement instances as variables
---CONDITION--
-version_compare(phpversion(), '5.3.0', '>=')
---TEMPLATE--
-Hello '{{ images.image.0.group }}'!
-{{ images.image.0.group.attributes.myattr }}
-{{ images.children().image.count() }}
-{% for image in images %}
- - {{ image.group }}
-{% endfor %}
---DATA--
-return ['images' => new \SimpleXMLElement('<images><image><group myattr="example">foo</group></image><image><group>bar</group></image></images>')]
---EXPECT--
-Hello 'foo'!
-example
-2
- - foo
- - bar
diff --git a/vendor/twig/twig/tests/Fixtures/regression/strings_like_numbers.test b/vendor/twig/twig/tests/Fixtures/regression/strings_like_numbers.test
deleted file mode 100644
index 62fe884858..0000000000
--- a/vendor/twig/twig/tests/Fixtures/regression/strings_like_numbers.test
+++ /dev/null
@@ -1,8 +0,0 @@
---TEST--
-Twig does not confuse strings with integers in getAttribute()
---TEMPLATE--
-{{ hash['2e2'] }}
---DATA--
-return ['hash' => ['2e2' => 'works']]
---EXPECT--
-works
diff --git a/vendor/twig/twig/tests/Fixtures/tags/apply/basic.test b/vendor/twig/twig/tests/Fixtures/tags/apply/basic.test
deleted file mode 100644
index 4848ee0259..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/apply/basic.test
+++ /dev/null
@@ -1,10 +0,0 @@
---TEST--
-"apply" tag applies a filter on its children
---TEMPLATE--
-{% apply upper %}
-Some text with a {{ var }}
-{% endapply %}
---DATA--
-return ['var' => 'var']
---EXPECT--
-SOME TEXT WITH A VAR
diff --git a/vendor/twig/twig/tests/Fixtures/tags/apply/json_encode.test b/vendor/twig/twig/tests/Fixtures/tags/apply/json_encode.test
deleted file mode 100644
index 8a590b44ac..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/apply/json_encode.test
+++ /dev/null
@@ -1,8 +0,0 @@
---TEST--
-"apply" tag applies a filter on its children
---TEMPLATE--
-{% apply json_encode|raw %}test{% endapply %}
---DATA--
-return []
---EXPECT--
-"test"
diff --git a/vendor/twig/twig/tests/Fixtures/tags/apply/multiple.test b/vendor/twig/twig/tests/Fixtures/tags/apply/multiple.test
deleted file mode 100644
index e16998a526..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/apply/multiple.test
+++ /dev/null
@@ -1,10 +0,0 @@
---TEST--
-"apply" tags accept multiple chained filters
---TEMPLATE--
-{% apply lower|title %}
- {{ var }}
-{% endapply %}
---DATA--
-return ['var' => 'VAR']
---EXPECT--
- Var
diff --git a/vendor/twig/twig/tests/Fixtures/tags/apply/nested.test b/vendor/twig/twig/tests/Fixtures/tags/apply/nested.test
deleted file mode 100644
index b64a6914c5..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/apply/nested.test
+++ /dev/null
@@ -1,16 +0,0 @@
---TEST--
-"apply" tags can be nested at will
---TEMPLATE--
-{% apply lower|title %}
- {{ var }}
- {% apply upper %}
- {{ var }}
- {% endapply %}
- {{ var }}
-{% endapply %}
---DATA--
-return ['var' => 'var']
---EXPECT--
- Var
- Var
- Var
diff --git a/vendor/twig/twig/tests/Fixtures/tags/apply/scope.test b/vendor/twig/twig/tests/Fixtures/tags/apply/scope.test
deleted file mode 100644
index a87ff9116b..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/apply/scope.test
+++ /dev/null
@@ -1,15 +0,0 @@
---TEST--
-"apply" tag does not create a new scope
---TEMPLATE--
-{% set foo = 'baz' %}
-{% apply spaceless %}
- {% set foo = 'foo' %}
- {% set bar = 'bar' %}
-{% endapply %}
-{{ 'foo' == foo ? 'OK ' ~ foo : 'KO' }}
-{{ 'bar' == bar ? 'OK ' ~ bar : 'KO' }}
---DATA--
-return []
---EXPECT--
-OK foo
-OK bar
diff --git a/vendor/twig/twig/tests/Fixtures/tags/apply/with_for_tag.test b/vendor/twig/twig/tests/Fixtures/tags/apply/with_for_tag.test
deleted file mode 100644
index 4453880b59..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/apply/with_for_tag.test
+++ /dev/null
@@ -1,13 +0,0 @@
---TEST--
-"apply" tag applies the filter on "for" tags
---TEMPLATE--
-{% apply upper %}
-{% for item in items %}
-{{ item }}
-{% endfor %}
-{% endapply %}
---DATA--
-return ['items' => ['a', 'b']]
---EXPECT--
-A
-B
diff --git a/vendor/twig/twig/tests/Fixtures/tags/apply/with_if_tag.test b/vendor/twig/twig/tests/Fixtures/tags/apply/with_if_tag.test
deleted file mode 100644
index ca7a592cba..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/apply/with_if_tag.test
+++ /dev/null
@@ -1,29 +0,0 @@
---TEST--
-"apply" tag applies the filter on "if" tags
---TEMPLATE--
-{% apply upper %}
-{% if items %}
-{{ items|join(', ') }}
-{% endif %}
-
-{% if items.3 is defined %}
-FOO
-{% else %}
-{{ items.1 }}
-{% endif %}
-
-{% if items.3 is defined %}
-FOO
-{% elseif items.1 %}
-{{ items.0 }}
-{% endif %}
-
-{% endapply %}
---DATA--
-return ['items' => ['a', 'b']]
---EXPECT--
-A, B
-
-B
-
-A
diff --git a/vendor/twig/twig/tests/Fixtures/tags/autoescape/basic.test b/vendor/twig/twig/tests/Fixtures/tags/autoescape/basic.test
deleted file mode 100644
index 5979725e38..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/autoescape/basic.test
+++ /dev/null
@@ -1,26 +0,0 @@
---TEST--
-"autoescape" tag applies escaping on its children
---TEMPLATE--
-{% autoescape %}
-{{ var }}<br />
-{% endautoescape %}
-{% autoescape 'html' %}
-{{ var }}<br />
-{% endautoescape %}
-{% autoescape false %}
-{{ var }}<br />
-{% endautoescape %}
-{% autoescape true %}
-{{ var }}<br />
-{% endautoescape %}
-{% autoescape false %}
-{{ var }}<br />
-{% endautoescape %}
---DATA--
-return ['var' => '<br />']
---EXPECT--
-<br /><br />
-<br /><br />
-<br /><br />
-<br /><br />
-<br /><br />
diff --git a/vendor/twig/twig/tests/Fixtures/tags/autoescape/blocks.test b/vendor/twig/twig/tests/Fixtures/tags/autoescape/blocks.test
deleted file mode 100644
index 292e1b4167..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/autoescape/blocks.test
+++ /dev/null
@@ -1,12 +0,0 @@
---TEST--
-"autoescape" tag applies escaping on embedded blocks
---TEMPLATE--
-{% autoescape 'html' %}
- {% block foo %}
- {{ var }}
- {% endblock %}
-{% endautoescape %}
---DATA--
-return ['var' => '<br />']
---EXPECT--
-<br />
diff --git a/vendor/twig/twig/tests/Fixtures/tags/autoescape/double_escaping.test b/vendor/twig/twig/tests/Fixtures/tags/autoescape/double_escaping.test
deleted file mode 100644
index 1724b48787..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/autoescape/double_escaping.test
+++ /dev/null
@@ -1,10 +0,0 @@
---TEST--
-"autoescape" tag does not double-escape
---TEMPLATE--
-{% autoescape 'html' %}
-{{ var|escape }}
-{% endautoescape %}
---DATA--
-return ['var' => '<br />']
---EXPECT--
-<br />
diff --git a/vendor/twig/twig/tests/Fixtures/tags/autoescape/functions.test b/vendor/twig/twig/tests/Fixtures/tags/autoescape/functions.test
deleted file mode 100644
index 170e7074ed..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/autoescape/functions.test
+++ /dev/null
@@ -1,83 +0,0 @@
---TEST--
-"autoescape" tag applies escaping after calling functions
---TEMPLATE--
-
-autoescape false
-{% autoescape false %}
-
-safe_br
-{{ safe_br() }}
-
-unsafe_br
-{{ unsafe_br() }}
-
-{% endautoescape %}
-
-autoescape 'html'
-{% autoescape 'html' %}
-
-safe_br
-{{ safe_br() }}
-
-unsafe_br
-{{ unsafe_br() }}
-
-unsafe_br()|raw
-{{ (unsafe_br())|raw }}
-
-safe_br()|escape
-{{ (safe_br())|escape }}
-
-safe_br()|raw
-{{ (safe_br())|raw }}
-
-unsafe_br()|escape
-{{ (unsafe_br())|escape }}
-
-{% endautoescape %}
-
-autoescape js
-{% autoescape 'js' %}
-
-safe_br
-{{ safe_br() }}
-
-{% endautoescape %}
---DATA--
-return []
---EXPECT--
-
-autoescape false
-
-safe_br
-<br />
-
-unsafe_br
-<br />
-
-
-autoescape 'html'
-
-safe_br
-<br />
-
-unsafe_br
-<br />
-
-unsafe_br()|raw
-<br />
-
-safe_br()|escape
-<br />
-
-safe_br()|raw
-<br />
-
-unsafe_br()|escape
-<br />
-
-
-autoescape js
-
-safe_br
-\u003Cbr\u0020\/\u003E
diff --git a/vendor/twig/twig/tests/Fixtures/tags/autoescape/literal.test b/vendor/twig/twig/tests/Fixtures/tags/autoescape/literal.test
deleted file mode 100644
index 3d8d4f8fdd..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/autoescape/literal.test
+++ /dev/null
@@ -1,87 +0,0 @@
---TEST--
-"autoescape" tag does not apply escaping on literals
---TEMPLATE--
-{% autoescape 'html' %}
-
-1. Simple literal
-{{ "<br />" }}
-
-2. Conditional expression with only literals
-{{ true ? "<br />" : "<br>" }}
-
-3. Conditional expression with a variable
-{{ true ? "<br />" : someVar }}
-{{ false ? "<br />" : someVar }}
-{{ true ? someVar : "<br />" }}
-{{ false ? someVar : "<br />" }}
-
-4. Nested conditionals with only literals
-{{ true ? (true ? "<br />" : "<br>") : "\n" }}
-
-5. Nested conditionals with a variable
-{{ true ? (true ? "<br />" : someVar) : "\n" }}
-{{ true ? (false ? "<br />" : someVar) : "\n" }}
-{{ true ? (true ? someVar : "<br />") : "\n" }}
-{{ true ? (false ? someVar : "<br />") : "\n" }}
-{{ false ? "\n" : (true ? someVar : "<br />") }}
-{{ false ? "\n" : (false ? someVar : "<br />") }}
-
-6. Nested conditionals with a variable marked safe
-{{ true ? (true ? "<br />" : someVar|raw) : "\n" }}
-{{ true ? (false ? "<br />" : someVar|raw) : "\n" }}
-{{ true ? (true ? someVar|raw : "<br />") : "\n" }}
-{{ true ? (false ? someVar|raw : "<br />") : "\n" }}
-{{ false ? "\n" : (true ? someVar|raw : "<br />") }}
-{{ false ? "\n" : (false ? someVar|raw : "<br />") }}
-
-7. Without then clause
-{{ "<br />" ?: someVar }}
-{{ someFalseVar ?: "<br />" }}
-
-8. NullCoalesce
-{{ aaaa ?? "<br />" }}
-{{ "<br />" ?? someVar }}
-
-{% endautoescape %}
---DATA--
-return ['someVar' => '<br />', 'someFalseVar' => false]
---EXPECT--
-
-1. Simple literal
-<br />
-
-2. Conditional expression with only literals
-<br />
-
-3. Conditional expression with a variable
-<br />
-<br />
-<br />
-<br />
-
-4. Nested conditionals with only literals
-<br />
-
-5. Nested conditionals with a variable
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-
-6. Nested conditionals with a variable marked safe
-<br />
-<br />
-<br />
-<br />
-<br />
-<br />
-
-7. Without then clause
-<br />
-<br />
-
-8. NullCoalesce
-<br />
-<br />
diff --git a/vendor/twig/twig/tests/Fixtures/tags/autoescape/nested.test b/vendor/twig/twig/tests/Fixtures/tags/autoescape/nested.test
deleted file mode 100644
index 0d88c7e3a2..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/autoescape/nested.test
+++ /dev/null
@@ -1,26 +0,0 @@
---TEST--
-"autoescape" tags can be nested at will
---TEMPLATE--
-{{ var }}
-{% autoescape 'html' %}
- {{ var }}
- {% autoescape false %}
- {{ var }}
- {% autoescape 'html' %}
- {{ var }}
- {% endautoescape %}
- {{ var }}
- {% endautoescape %}
- {{ var }}
-{% endautoescape %}
-{{ var }}
---DATA--
-return ['var' => '<br />']
---EXPECT--
-<br />
- <br />
- <br />
- <br />
- <br />
- <br />
-<br />
diff --git a/vendor/twig/twig/tests/Fixtures/tags/autoescape/objects.test b/vendor/twig/twig/tests/Fixtures/tags/autoescape/objects.test
deleted file mode 100644
index 9d959b22b4..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/autoescape/objects.test
+++ /dev/null
@@ -1,26 +0,0 @@
---TEST--
-"autoescape" tag applies escaping to object method calls
---TEMPLATE--
-{% autoescape 'html' %}
-{{ user.name }}
-{{ user.name|lower }}
-{{ user }}
-{% endautoescape %}
---DATA--
-class UserForAutoEscapeTest
-{
- public function getName()
- {
- return 'Fabien<br />';
- }
-
- public function __toString()
- {
- return 'Fabien<br />';
- }
-}
-return ['user' => new UserForAutoEscapeTest()]
---EXPECT--
-Fabien<br />
-fabien<br />
-Fabien<br />
diff --git a/vendor/twig/twig/tests/Fixtures/tags/autoescape/raw.test b/vendor/twig/twig/tests/Fixtures/tags/autoescape/raw.test
deleted file mode 100644
index 187327c801..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/autoescape/raw.test
+++ /dev/null
@@ -1,10 +0,0 @@
---TEST--
-"autoescape" tag does not escape when raw is used as a filter
---TEMPLATE--
-{% autoescape 'html' %}
-{{ var|raw }}
-{% endautoescape %}
---DATA--
-return ['var' => '<br />']
---EXPECT--
-<br />
diff --git a/vendor/twig/twig/tests/Fixtures/tags/autoescape/strategy.legacy.test b/vendor/twig/twig/tests/Fixtures/tags/autoescape/strategy.legacy.test
deleted file mode 100644
index 289f2b1743..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/autoescape/strategy.legacy.test
+++ /dev/null
@@ -1,11 +0,0 @@
---TEST--
-"autoescape" tag accepts an escaping strategy
---TEMPLATE--
-{% autoescape true js %}{{ var }}{% endautoescape %}
-
-{% autoescape true html %}{{ var }}{% endautoescape %}
---DATA--
-return ['var' => '<br />"']
---EXPECT--
-\u003Cbr\u0020\/\u003E\u0022
-<br />"
diff --git a/vendor/twig/twig/tests/Fixtures/tags/autoescape/strategy.test b/vendor/twig/twig/tests/Fixtures/tags/autoescape/strategy.test
deleted file mode 100644
index 9a0137ee27..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/autoescape/strategy.test
+++ /dev/null
@@ -1,11 +0,0 @@
---TEST--
-"autoescape" tag accepts an escaping strategy
---TEMPLATE--
-{% autoescape 'js' %}{{ var }}{% endautoescape %}
-
-{% autoescape 'html' %}{{ var }}{% endautoescape %}
---DATA--
-return ['var' => '<br />"']
---EXPECT--
-\u003Cbr\u0020\/\u003E\u0022
-<br />"
diff --git a/vendor/twig/twig/tests/Fixtures/tags/autoescape/type.test b/vendor/twig/twig/tests/Fixtures/tags/autoescape/type.test
deleted file mode 100644
index 9ae8d7bf99..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/autoescape/type.test
+++ /dev/null
@@ -1,69 +0,0 @@
---TEST--
-escape types
---TEMPLATE--
-
-1. autoescape 'html' |escape('js')
-
-{% autoescape 'html' %}
-<a onclick="alert("{{ msg|escape('js') }}")"></a>
-{% endautoescape %}
-
-2. autoescape 'html' |escape('js')
-
-{% autoescape 'html' %}
-<a onclick="alert("{{ msg|escape('js') }}")"></a>
-{% endautoescape %}
-
-3. autoescape 'js' |escape('js')
-
-{% autoescape 'js' %}
-<a onclick="alert("{{ msg|escape('js') }}")"></a>
-{% endautoescape %}
-
-4. no escape
-
-{% autoescape false %}
-<a onclick="alert("{{ msg }}")"></a>
-{% endautoescape %}
-
-5. |escape('js')|escape('html')
-
-{% autoescape false %}
-<a onclick="alert("{{ msg|escape('js')|escape('html') }}")"></a>
-{% endautoescape %}
-
-6. autoescape 'html' |escape('js')|escape('html')
-
-{% autoescape 'html' %}
-<a onclick="alert("{{ msg|escape('js')|escape('html') }}")"></a>
-{% endautoescape %}
-
---DATA--
-return ['msg' => "<>\n'\""]
---EXPECT--
-
-1. autoescape 'html' |escape('js')
-
-<a onclick="alert("\u003C\u003E\n\u0027\u0022")"></a>
-
-2. autoescape 'html' |escape('js')
-
-<a onclick="alert("\u003C\u003E\n\u0027\u0022")"></a>
-
-3. autoescape 'js' |escape('js')
-
-<a onclick="alert("\u003C\u003E\n\u0027\u0022")"></a>
-
-4. no escape
-
-<a onclick="alert("<>
-'"")"></a>
-
-5. |escape('js')|escape('html')
-
-<a onclick="alert("\u003C\u003E\n\u0027\u0022")"></a>
-
-6. autoescape 'html' |escape('js')|escape('html')
-
-<a onclick="alert("\u003C\u003E\n\u0027\u0022")"></a>
-
diff --git a/vendor/twig/twig/tests/Fixtures/tags/autoescape/with_filters.test b/vendor/twig/twig/tests/Fixtures/tags/autoescape/with_filters.test
deleted file mode 100644
index f97105bbd1..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/autoescape/with_filters.test
+++ /dev/null
@@ -1,131 +0,0 @@
---TEST--
-"autoescape" tag applies escaping after calling filters
---TEMPLATE--
-{% autoescape 'html' %}
-
-(escape_and_nl2br is an escaper filter)
-
-1. Don't escape escaper filter output
-( var is escaped by |escape_and_nl2br, line-breaks are added,
- the output is not escaped )
-{{ var|escape_and_nl2br }}
-
-2. Don't escape escaper filter output
-( var is escaped by |escape_and_nl2br, line-breaks are added,
- the output is not escaped, |raw is redundant )
-{{ var|escape_and_nl2br|raw }}
-
-3. Explicit escape
-( var is escaped by |escape_and_nl2br, line-breaks are added,
- the output is explicitly escaped by |escape )
-{{ var|escape_and_nl2br|escape }}
-
-4. Escape non-escaper filter output
-( var is upper-cased by |upper,
- the output is auto-escaped )
-{{ var|upper }}
-
-5. Escape if last filter is not an escaper
-( var is escaped by |escape_and_nl2br, line-breaks are added,
- the output is upper-cased by |upper,
- the output is auto-escaped as |upper is not an escaper )
-{{ var|escape_and_nl2br|upper }}
-
-6. Don't escape escaper filter output
-( var is upper cased by upper,
- the output is escaped by |escape_and_nl2br, line-breaks are added,
- the output is not escaped as |escape_and_nl2br is an escaper )
-{{ var|upper|escape_and_nl2br }}
-
-7. Escape if last filter is not an escaper
-( the output of |format is "<b>" ~ var ~ "</b>",
- the output is auto-escaped )
-{{ "<b>%s</b>"|format(var) }}
-
-8. Escape if last filter is not an escaper
-( the output of |format is "<b>" ~ var ~ "</b>",
- |raw is redundant,
- the output is auto-escaped )
-{{ "<b>%s</b>"|raw|format(var) }}
-
-9. Don't escape escaper filter output
-( the output of |format is "<b>" ~ var ~ "</b>",
- the output is not escaped due to |raw filter at the end )
-{{ "<b>%s</b>"|format(var)|raw }}
-
-10. Don't escape escaper filter output
-( the output of |format is "<b>" ~ var ~ "</b>",
- the output is not escaped due to |raw filter at the end,
- the |raw filter on var is redundant )
-{{ "<b>%s</b>"|format(var|raw)|raw }}
-
-{% endautoescape %}
---DATA--
-return ['var' => "<Fabien>\nTwig"]
---EXPECT--
-
-(escape_and_nl2br is an escaper filter)
-
-1. Don't escape escaper filter output
-( var is escaped by |escape_and_nl2br, line-breaks are added,
- the output is not escaped )
-<Fabien><br />
-Twig
-
-2. Don't escape escaper filter output
-( var is escaped by |escape_and_nl2br, line-breaks are added,
- the output is not escaped, |raw is redundant )
-<Fabien><br />
-Twig
-
-3. Explicit escape
-( var is escaped by |escape_and_nl2br, line-breaks are added,
- the output is explicitly escaped by |escape )
-&lt;Fabien&gt;<br />
-Twig
-
-4. Escape non-escaper filter output
-( var is upper-cased by |upper,
- the output is auto-escaped )
-<FABIEN>
-TWIG
-
-5. Escape if last filter is not an escaper
-( var is escaped by |escape_and_nl2br, line-breaks are added,
- the output is upper-cased by |upper,
- the output is auto-escaped as |upper is not an escaper )
-&LT;FABIEN&GT;<BR />
-TWIG
-
-6. Don't escape escaper filter output
-( var is upper cased by upper,
- the output is escaped by |escape_and_nl2br, line-breaks are added,
- the output is not escaped as |escape_and_nl2br is an escaper )
-<FABIEN><br />
-TWIG
-
-7. Escape if last filter is not an escaper
-( the output of |format is "<b>" ~ var ~ "</b>",
- the output is auto-escaped )
-<b><Fabien>
-Twig</b>
-
-8. Escape if last filter is not an escaper
-( the output of |format is "<b>" ~ var ~ "</b>",
- |raw is redundant,
- the output is auto-escaped )
-<b><Fabien>
-Twig</b>
-
-9. Don't escape escaper filter output
-( the output of |format is "<b>" ~ var ~ "</b>",
- the output is not escaped due to |raw filter at the end )
-<b><Fabien>
-Twig</b>
-
-10. Don't escape escaper filter output
-( the output of |format is "<b>" ~ var ~ "</b>",
- the output is not escaped due to |raw filter at the end,
- the |raw filter on var is redundant )
-<b><Fabien>
-Twig</b>
diff --git a/vendor/twig/twig/tests/Fixtures/tags/autoescape/with_filters_arguments.test b/vendor/twig/twig/tests/Fixtures/tags/autoescape/with_filters_arguments.test
deleted file mode 100644
index 50f72d83a1..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/autoescape/with_filters_arguments.test
+++ /dev/null
@@ -1,23 +0,0 @@
---TEST--
-"autoescape" tag do not applies escaping on filter arguments
---TEMPLATE--
-{% autoescape 'html' %}
-{{ var|nl2br("<br />") }}
-{{ var|nl2br("<br />"|escape) }}
-{{ var|nl2br(sep) }}
-{{ var|nl2br(sep|raw) }}
-{{ var|nl2br(sep|escape) }}
-{% endautoescape %}
---DATA--
-return ['var' => "<Fabien>\nTwig", 'sep' => '<br />']
---EXPECT--
-<Fabien><br />
-Twig
-<Fabien><br />
-Twig
-<Fabien><br />
-Twig
-<Fabien><br />
-Twig
-<Fabien><br />
-Twig
diff --git a/vendor/twig/twig/tests/Fixtures/tags/autoescape/with_pre_escape_filters.test b/vendor/twig/twig/tests/Fixtures/tags/autoescape/with_pre_escape_filters.test
deleted file mode 100644
index c9c738055d..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/autoescape/with_pre_escape_filters.test
+++ /dev/null
@@ -1,68 +0,0 @@
---TEST--
-"autoescape" tag applies escaping after calling filters, and before calling pre_escape filters
---TEMPLATE--
-{% autoescape 'html' %}
-
-(nl2br is pre_escaped for "html" and declared safe for "html")
-
-1. Pre-escape and don't post-escape
-( var|escape|nl2br )
-{{ var|nl2br }}
-
-2. Don't double-pre-escape
-( var|escape|nl2br )
-{{ var|escape|nl2br }}
-
-3. Don't escape safe values
-( var|raw|nl2br )
-{{ var|raw|nl2br }}
-
-4. Don't escape safe values
-( var|escape|nl2br|nl2br )
-{{ var|nl2br|nl2br }}
-
-5. Re-escape values that are escaped for an other contexts
-( var|escape_something|escape|nl2br )
-{{ var|escape_something|nl2br }}
-
-6. Still escape when using filters not declared safe
-( var|escape|nl2br|upper|escape )
-{{ var|nl2br|upper }}
-
-{% endautoescape %}
---DATA--
-return ['var' => "<Fabien>\nTwig"]
---EXPECT--
-
-(nl2br is pre_escaped for "html" and declared safe for "html")
-
-1. Pre-escape and don't post-escape
-( var|escape|nl2br )
-<Fabien><br />
-Twig
-
-2. Don't double-pre-escape
-( var|escape|nl2br )
-<Fabien><br />
-Twig
-
-3. Don't escape safe values
-( var|raw|nl2br )
-<Fabien><br />
-Twig
-
-4. Don't escape safe values
-( var|escape|nl2br|nl2br )
-<Fabien><br /><br />
-Twig
-
-5. Re-escape values that are escaped for an other contexts
-( var|escape_something|escape|nl2br )
-<FABIEN><br />
-TWIG
-
-6. Still escape when using filters not declared safe
-( var|escape|nl2br|upper|escape )
-&LT;FABIEN&GT;<BR />
-TWIG
-
diff --git a/vendor/twig/twig/tests/Fixtures/tags/autoescape/with_preserves_safety_filters.test b/vendor/twig/twig/tests/Fixtures/tags/autoescape/with_preserves_safety_filters.test
deleted file mode 100644
index c764d434b0..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/autoescape/with_preserves_safety_filters.test
+++ /dev/null
@@ -1,50 +0,0 @@
---TEST--
-"autoescape" tag handles filters preserving the safety
---TEMPLATE--
-{% autoescape 'html' %}
-
-(preserves_safety is preserving safety for "html")
-
-1. Unsafe values are still unsafe
-( var|preserves_safety|escape )
-{{ var|preserves_safety }}
-
-2. Safe values are still safe
-( var|escape|preserves_safety )
-{{ var|escape|preserves_safety }}
-
-3. Re-escape values that are escaped for an other contexts
-( var|escape_something|preserves_safety|escape )
-{{ var|escape_something|preserves_safety }}
-
-4. Still escape when using filters not declared safe
-( var|escape|preserves_safety|replace({'FABIEN': 'FABPOT'})|escape )
-{{ var|escape|preserves_safety|replace({'FABIEN': 'FABPOT'}) }}
-
-{% endautoescape %}
---DATA--
-return ['var' => "<Fabien>\nTwig"]
---EXPECT--
-
-(preserves_safety is preserving safety for "html")
-
-1. Unsafe values are still unsafe
-( var|preserves_safety|escape )
-<FABIEN>
-TWIG
-
-2. Safe values are still safe
-( var|escape|preserves_safety )
-<FABIEN>
-TWIG
-
-3. Re-escape values that are escaped for an other contexts
-( var|escape_something|preserves_safety|escape )
-<FABIEN>
-TWIG
-
-4. Still escape when using filters not declared safe
-( var|escape|preserves_safety|replace({'FABIEN': 'FABPOT'})|escape )
-&LT;FABPOT&GT;
-TWIG
-
diff --git a/vendor/twig/twig/tests/Fixtures/tags/block/basic.test b/vendor/twig/twig/tests/Fixtures/tags/block/basic.test
deleted file mode 100644
index 988b09ce86..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/block/basic.test
+++ /dev/null
@@ -1,11 +0,0 @@
---TEST--
-"block" tag
---TEMPLATE--
-{% block title1 %}FOO{% endblock %}
-{% block title2 foo|lower %}
---TEMPLATE(foo.twig)--
-{% block content %}{% endblock %}
---DATA--
-return ['foo' => 'bar']
---EXPECT--
-FOObar
diff --git a/vendor/twig/twig/tests/Fixtures/tags/block/block_unique_name.test b/vendor/twig/twig/tests/Fixtures/tags/block/block_unique_name.test
deleted file mode 100644
index 3009f8b420..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/block/block_unique_name.test
+++ /dev/null
@@ -1,11 +0,0 @@
---TEST--
-"block" tag
---TEMPLATE--
-{% block content %}
- {% block content %}
- {% endblock %}
-{% endblock %}
---DATA--
-return []
---EXCEPTION--
-Twig\Error\SyntaxError: The block 'content' has already been defined line 2 in "index.twig" at line 3.
diff --git a/vendor/twig/twig/tests/Fixtures/tags/block/special_chars.test b/vendor/twig/twig/tests/Fixtures/tags/block/special_chars.test
deleted file mode 100644
index e8e240eb77..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/block/special_chars.test
+++ /dev/null
@@ -1,10 +0,0 @@
---TEST--
-"§" special chars in a block name
---TEMPLATE--
-{% block § %}
-§
-{% endblock § %}
---DATA--
-return []
---EXPECT--
-§
diff --git a/vendor/twig/twig/tests/Fixtures/tags/deprecated/block.legacy.test b/vendor/twig/twig/tests/Fixtures/tags/deprecated/block.legacy.test
deleted file mode 100644
index 53729dd1f7..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/deprecated/block.legacy.test
+++ /dev/null
@@ -1,20 +0,0 @@
---TEST--
-Deprecating a block with "deprecated" tag
---TEMPLATE--
-{% use 'greeting.twig' %}
-
-{{ block('welcome') }}
-
---TEMPLATE(greeting.twig)--
-{% block welcome %}
- {% deprecated 'The "welcome" block is deprecated, use "hello" instead.' %}
- {{ block('hello') }}
-{% endblock %}
-
-{% block hello %}
-Hello Fabien
-{% endblock %}
---DATA--
-return []
---EXPECT--
- Hello Fabien
diff --git a/vendor/twig/twig/tests/Fixtures/tags/deprecated/macro.legacy.test b/vendor/twig/twig/tests/Fixtures/tags/deprecated/macro.legacy.test
deleted file mode 100644
index 5cc48dd873..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/deprecated/macro.legacy.test
+++ /dev/null
@@ -1,21 +0,0 @@
---TEST--
-Deprecating a macro with "deprecated" tag
---TEMPLATE--
-{% import 'greeting.twig' as greeting %}
-
-{{ greeting.welcome('Fabien') }}
-
---TEMPLATE(greeting.twig)--
-{% macro welcome(name) %}
- {% deprecated 'The "welcome" macro is deprecated, use "hello" instead.' %}
- {% import _self as self %}
- {{ self.hello(name) }}
-{% endmacro %}
-
-{% macro hello(name) %}
-Hello {{ name }}
-{% endmacro %}
---DATA--
-return []
---EXPECT--
- Hello Fabien
diff --git a/vendor/twig/twig/tests/Fixtures/tags/deprecated/template.legacy.test b/vendor/twig/twig/tests/Fixtures/tags/deprecated/template.legacy.test
deleted file mode 100644
index 7f786d57fc..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/deprecated/template.legacy.test
+++ /dev/null
@@ -1,12 +0,0 @@
---TEST--
-Deprecating a template with "deprecated" tag
---TEMPLATE--
-{% extends 'greeting.twig' %}
-
-{% deprecated 'The "index.twig" template is deprecated, use "greeting.twig" instead.' %}
---TEMPLATE(greeting.twig)--
-Hello Fabien
---DATA--
-return []
---EXPECT--
-Hello Fabien
diff --git a/vendor/twig/twig/tests/Fixtures/tags/embed/basic.test b/vendor/twig/twig/tests/Fixtures/tags/embed/basic.test
deleted file mode 100644
index 16781e4186..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/embed/basic.test
+++ /dev/null
@@ -1,35 +0,0 @@
---TEST--
-"embed" tag
---TEMPLATE--
-FOO
-{% embed "foo.twig" %}
- {% block c1 %}
- {{ parent() }}
- block1extended
- {% endblock %}
-{% endembed %}
-
-BAR
---TEMPLATE(foo.twig)--
-A
-{% block c1 %}
- block1
-{% endblock %}
-B
-{% block c2 %}
- block2
-{% endblock %}
-C
---DATA--
-return []
---EXPECT--
-FOO
-
-A
- block1
-
- block1extended
- B
- block2
-C
-BAR
diff --git a/vendor/twig/twig/tests/Fixtures/tags/embed/complex_dynamic_parent.test b/vendor/twig/twig/tests/Fixtures/tags/embed/complex_dynamic_parent.test
deleted file mode 100644
index b799a8c95f..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/embed/complex_dynamic_parent.test
+++ /dev/null
@@ -1,35 +0,0 @@
---TEST--
-"embed" tag
---TEMPLATE--
-FOO
-{% embed foo ~ ".twig" %}
- {% block c1 %}
- {{ parent() }}
- block1extended
- {% endblock %}
-{% endembed %}
-
-BAR
---TEMPLATE(foo.twig)--
-A
-{% block c1 %}
- block1
-{% endblock %}
-B
-{% block c2 %}
- block2
-{% endblock %}
-C
---DATA--
-return ['foo' => 'foo']
---EXPECT--
-FOO
-
-A
- block1
-
- block1extended
- B
- block2
-C
-BAR
diff --git a/vendor/twig/twig/tests/Fixtures/tags/embed/dynamic_parent.test b/vendor/twig/twig/tests/Fixtures/tags/embed/dynamic_parent.test
deleted file mode 100644
index 6f0879e28d..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/embed/dynamic_parent.test
+++ /dev/null
@@ -1,35 +0,0 @@
---TEST--
-"embed" tag
---TEMPLATE--
-FOO
-{% embed foo %}
- {% block c1 %}
- {{ parent() }}
- block1extended
- {% endblock %}
-{% endembed %}
-
-BAR
---TEMPLATE(foo.twig)--
-A
-{% block c1 %}
- block1
-{% endblock %}
-B
-{% block c2 %}
- block2
-{% endblock %}
-C
---DATA--
-return ['foo' => 'foo.twig']
---EXPECT--
-FOO
-
-A
- block1
-
- block1extended
- B
- block2
-C
-BAR
diff --git a/vendor/twig/twig/tests/Fixtures/tags/embed/error_line.test b/vendor/twig/twig/tests/Fixtures/tags/embed/error_line.test
deleted file mode 100644
index b1c6c85e61..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/embed/error_line.test
+++ /dev/null
@@ -1,16 +0,0 @@
---TEST--
-"embed" tag
---TEMPLATE(index.twig)--
-FOO
-{% embed "foo.twig" %}
- {% block c1 %}
- {{ nothing }}
- {% endblock %}
-{% endembed %}
-BAR
---TEMPLATE(foo.twig)--
-{% block c1 %}{% endblock %}
---DATA--
-return []
---EXCEPTION--
-Twig\Error\RuntimeError: Variable "nothing" does not exist in "index.twig" at line 5.
diff --git a/vendor/twig/twig/tests/Fixtures/tags/embed/multiple.test b/vendor/twig/twig/tests/Fixtures/tags/embed/multiple.test
deleted file mode 100644
index 9f7b52f1d8..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/embed/multiple.test
+++ /dev/null
@@ -1,50 +0,0 @@
---TEST--
-"embed" tag
---TEMPLATE--
-FOO
-{% embed "foo.twig" %}
- {% block c1 %}
- {{ parent() }}
- block1extended
- {% endblock %}
-{% endembed %}
-
-{% embed "foo.twig" %}
- {% block c1 %}
- {{ parent() }}
- block1extended
- {% endblock %}
-{% endembed %}
-
-BAR
---TEMPLATE(foo.twig)--
-A
-{% block c1 %}
- block1
-{% endblock %}
-B
-{% block c2 %}
- block2
-{% endblock %}
-C
---DATA--
-return []
---EXPECT--
-FOO
-
-A
- block1
-
- block1extended
- B
- block2
-C
-
-A
- block1
-
- block1extended
- B
- block2
-C
-BAR
diff --git a/vendor/twig/twig/tests/Fixtures/tags/embed/nested.test b/vendor/twig/twig/tests/Fixtures/tags/embed/nested.test
deleted file mode 100644
index 9f33723366..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/embed/nested.test
+++ /dev/null
@@ -1,42 +0,0 @@
---TEST--
-"embed" tag
---TEMPLATE--
-{% embed "foo.twig" %}
- {% block c1 %}
- {{ parent() }}
- {% embed "foo.twig" %}
- {% block c1 %}
- {{ parent() }}
- block1extended
- {% endblock %}
- {% endembed %}
-
- {% endblock %}
-{% endembed %}
---TEMPLATE(foo.twig)--
-A
-{% block c1 %}
- block1
-{% endblock %}
-B
-{% block c2 %}
- block2
-{% endblock %}
-C
---DATA--
-return []
---EXPECT--
-A
- block1
-
-
-A
- block1
-
- block1extended
- B
- block2
-C
- B
- block2
-C
diff --git a/vendor/twig/twig/tests/Fixtures/tags/embed/with_extends.test b/vendor/twig/twig/tests/Fixtures/tags/embed/with_extends.test
deleted file mode 100644
index ce726ac009..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/embed/with_extends.test
+++ /dev/null
@@ -1,60 +0,0 @@
---TEST--
-"embed" tag
---TEMPLATE--
-{% extends "base.twig" %}
-
-{% block c1 %}
- {{ parent() }}
- blockc1baseextended
-{% endblock %}
-
-{% block c2 %}
- {{ parent() }}
-
- {% embed "foo.twig" %}
- {% block c1 %}
- {{ parent() }}
- block1extended
- {% endblock %}
- {% endembed %}
- {{ parent() }}
-{% endblock %}
---TEMPLATE(base.twig)--
-A
-{% block c1 %}
- blockc1base
-{% endblock %}
-{% block c2 %}
- blockc2base
-{% endblock %}
-B
---TEMPLATE(foo.twig)--
-A
-{% block c1 %}
- block1
-{% endblock %}
-B
-{% block c2 %}
- block2
-{% endblock %}
-C
---DATA--
-return []
---EXPECT--
-A
- blockc1base
-
- blockc1baseextended
- blockc2base
-
-
-
-A
- block1
-
- block1extended
- B
- block2
-C blockc2base
-
-B
\ No newline at end of file
diff --git a/vendor/twig/twig/tests/Fixtures/tags/filter/basic.test b/vendor/twig/twig/tests/Fixtures/tags/filter/basic.test
deleted file mode 100644
index 866171ecc5..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/filter/basic.test
+++ /dev/null
@@ -1,10 +0,0 @@
---TEST--
-"filter" tag applies a filter on its children
---TEMPLATE--
-{% filter upper %}
-Some text with a {{ var }}
-{% endfilter %}
---DATA--
-return ['var' => 'var']
---EXPECT--
-SOME TEXT WITH A VAR
diff --git a/vendor/twig/twig/tests/Fixtures/tags/filter/json_encode.test b/vendor/twig/twig/tests/Fixtures/tags/filter/json_encode.test
deleted file mode 100644
index a2562b995b..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/filter/json_encode.test
+++ /dev/null
@@ -1,8 +0,0 @@
---TEST--
-"filter" tag applies a filter on its children
---TEMPLATE--
-{% filter json_encode|raw %}test{% endfilter %}
---DATA--
-return []
---EXPECT--
-"test"
diff --git a/vendor/twig/twig/tests/Fixtures/tags/filter/multiple.test b/vendor/twig/twig/tests/Fixtures/tags/filter/multiple.test
deleted file mode 100644
index 8eb3cbdd7d..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/filter/multiple.test
+++ /dev/null
@@ -1,10 +0,0 @@
---TEST--
-"filter" tags accept multiple chained filters
---TEMPLATE--
-{% filter lower|title %}
- {{ var }}
-{% endfilter %}
---DATA--
-return ['var' => 'VAR']
---EXPECT--
- Var
diff --git a/vendor/twig/twig/tests/Fixtures/tags/filter/nested.test b/vendor/twig/twig/tests/Fixtures/tags/filter/nested.test
deleted file mode 100644
index 6d18e1af08..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/filter/nested.test
+++ /dev/null
@@ -1,16 +0,0 @@
---TEST--
-"filter" tags can be nested at will
---TEMPLATE--
-{% filter lower|title %}
- {{ var }}
- {% filter upper %}
- {{ var }}
- {% endfilter %}
- {{ var }}
-{% endfilter %}
---DATA--
-return ['var' => 'var']
---EXPECT--
- Var
- Var
- Var
diff --git a/vendor/twig/twig/tests/Fixtures/tags/filter/scope.test b/vendor/twig/twig/tests/Fixtures/tags/filter/scope.test
deleted file mode 100644
index 889a46f6a2..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/filter/scope.test
+++ /dev/null
@@ -1,11 +0,0 @@
---TEST--
-"scope" tag creates a new scope
---TEMPLATE--
-{% filter spaceless %}
-{% set item = 'foo' %}
-{% endfilter %}
-{{ item }}
---DATA--
-return []
---EXCEPTION--
-Twig\Error\RuntimeError: Variable "item" does not exist in "index.twig" at line 5.
diff --git a/vendor/twig/twig/tests/Fixtures/tags/filter/with_for_tag.test b/vendor/twig/twig/tests/Fixtures/tags/filter/with_for_tag.test
deleted file mode 100644
index d2d87cfda3..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/filter/with_for_tag.test
+++ /dev/null
@@ -1,13 +0,0 @@
---TEST--
-"filter" tag applies the filter on "for" tags
---TEMPLATE--
-{% filter upper %}
-{% for item in items %}
-{{ item }}
-{% endfor %}
-{% endfilter %}
---DATA--
-return ['items' => ['a', 'b']]
---EXPECT--
-A
-B
diff --git a/vendor/twig/twig/tests/Fixtures/tags/filter/with_if_tag.test b/vendor/twig/twig/tests/Fixtures/tags/filter/with_if_tag.test
deleted file mode 100644
index f2e804bfb1..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/filter/with_if_tag.test
+++ /dev/null
@@ -1,29 +0,0 @@
---TEST--
-"filter" tag applies the filter on "if" tags
---TEMPLATE--
-{% filter upper %}
-{% if items %}
-{{ items|join(', ') }}
-{% endif %}
-
-{% if items.3 is defined %}
-FOO
-{% else %}
-{{ items.1 }}
-{% endif %}
-
-{% if items.3 is defined %}
-FOO
-{% elseif items.1 %}
-{{ items.0 }}
-{% endif %}
-
-{% endfilter %}
---DATA--
-return ['items' => ['a', 'b']]
---EXPECT--
-A, B
-
-B
-
-A
diff --git a/vendor/twig/twig/tests/Fixtures/tags/for/condition.test b/vendor/twig/twig/tests/Fixtures/tags/for/condition.test
deleted file mode 100644
index b1ad22fd53..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/for/condition.test
+++ /dev/null
@@ -1,14 +0,0 @@
---TEST--
-"for" tag takes a condition
---TEMPLATE--
-{% for i in 1..5 if i is odd -%}
- {{ loop.index }}.{{ i }}{{ foo.bar }}
-{% endfor %}
---DATA--
-return ['foo' => ['bar' => 'X']]
---CONFIG--
-return ['strict_variables' => false]
---EXPECT--
-1.1X
-2.3X
-3.5X
diff --git a/vendor/twig/twig/tests/Fixtures/tags/for/context.test b/vendor/twig/twig/tests/Fixtures/tags/for/context.test
deleted file mode 100644
index 3cdd575c83..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/for/context.test
+++ /dev/null
@@ -1,18 +0,0 @@
---TEST--
-"for" tag keeps the context safe
---TEMPLATE--
-{% for item in items %}
- {% for item in items %}
- * {{ item }}
- {% endfor %}
- * {{ item }}
-{% endfor %}
---DATA--
-return ['items' => ['a', 'b']]
---EXPECT--
- * a
- * b
- * a
- * a
- * b
- * b
diff --git a/vendor/twig/twig/tests/Fixtures/tags/for/else.test b/vendor/twig/twig/tests/Fixtures/tags/for/else.test
deleted file mode 100644
index 86ec9c28d3..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/for/else.test
+++ /dev/null
@@ -1,23 +0,0 @@
---TEST--
-"for" tag can use an "else" clause
---TEMPLATE--
-{% for item in items %}
- * {{ item }}
-{% else %}
- no item
-{% endfor %}
---DATA--
-return ['items' => ['a', 'b']]
---EXPECT--
- * a
- * b
---DATA--
-return ['items' => []]
---EXPECT--
- no item
---DATA--
-return []
---CONFIG--
-return ['strict_variables' => false]
---EXPECT--
- no item
diff --git a/vendor/twig/twig/tests/Fixtures/tags/for/inner_variables.test b/vendor/twig/twig/tests/Fixtures/tags/for/inner_variables.test
deleted file mode 100644
index e1ad3c7356..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/for/inner_variables.test
+++ /dev/null
@@ -1,17 +0,0 @@
---TEST--
-"for" tag does not reset inner variables
---TEMPLATE--
-{% for i in 1..2 %}
- {% for j in 0..2 %}
- {{k}}{% set k = k+1 %} {{ loop.parent.loop.index }}
- {% endfor %}
-{% endfor %}
---DATA--
-return ['k' => 0]
---EXPECT--
- 0 1
- 1 1
- 2 1
- 3 2
- 4 2
- 5 2
diff --git a/vendor/twig/twig/tests/Fixtures/tags/for/keys.test b/vendor/twig/twig/tests/Fixtures/tags/for/keys.test
deleted file mode 100644
index 92135575f6..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/for/keys.test
+++ /dev/null
@@ -1,11 +0,0 @@
---TEST--
-"for" tag can iterate over keys
---TEMPLATE--
-{% for key in items|keys %}
- * {{ key }}
-{% endfor %}
---DATA--
-return ['items' => ['a', 'b']]
---EXPECT--
- * 0
- * 1
diff --git a/vendor/twig/twig/tests/Fixtures/tags/for/keys_and_values.test b/vendor/twig/twig/tests/Fixtures/tags/for/keys_and_values.test
deleted file mode 100644
index ab39ddf210..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/for/keys_and_values.test
+++ /dev/null
@@ -1,11 +0,0 @@
---TEST--
-"for" tag can iterate over keys and values
---TEMPLATE--
-{% for key, item in items %}
- * {{ key }}/{{ item }}
-{% endfor %}
---DATA--
-return ['items' => ['a', 'b']]
---EXPECT--
- * 0/a
- * 1/b
diff --git a/vendor/twig/twig/tests/Fixtures/tags/for/loop_context.test b/vendor/twig/twig/tests/Fixtures/tags/for/loop_context.test
deleted file mode 100644
index 56a60c2e6e..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/for/loop_context.test
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-"for" tag adds a loop variable to the context
---TEMPLATE--
-{% for item in items %}
- * {{ loop.index }}/{{ loop.index0 }}
- * {{ loop.revindex }}/{{ loop.revindex0 }}
- * {{ loop.first }}/{{ loop.last }}/{{ loop.length }}
-
-{% endfor %}
---DATA--
-return ['items' => ['a', 'b']]
---EXPECT--
- * 1/0
- * 2/1
- * 1//2
-
- * 2/1
- * 1/0
- * /1/2
diff --git a/vendor/twig/twig/tests/Fixtures/tags/for/loop_context_local.test b/vendor/twig/twig/tests/Fixtures/tags/for/loop_context_local.test
deleted file mode 100644
index 58e5a9b345..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/for/loop_context_local.test
+++ /dev/null
@@ -1,10 +0,0 @@
---TEST--
-"for" tag adds a loop variable to the context locally
---TEMPLATE--
-{% for item in items %}
-{% endfor %}
-{% if loop is not defined %}WORKS{% endif %}
---DATA--
-return ['items' => []]
---EXPECT--
-WORKS
diff --git a/vendor/twig/twig/tests/Fixtures/tags/for/loop_not_defined.test b/vendor/twig/twig/tests/Fixtures/tags/for/loop_not_defined.test
deleted file mode 100644
index 2d8c0b8738..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/for/loop_not_defined.test
+++ /dev/null
@@ -1,10 +0,0 @@
---TEST--
-"for" tag
---TEMPLATE--
-{% for i, item in items if i > 0 %}
- {{ loop.last }}
-{% endfor %}
---DATA--
-return ['items' => ['a', 'b']]
---EXCEPTION--
-Twig\Error\SyntaxError: The "loop.last" variable is not defined when looping with a condition in "index.twig" at line 3.
diff --git a/vendor/twig/twig/tests/Fixtures/tags/for/loop_not_defined_cond.test b/vendor/twig/twig/tests/Fixtures/tags/for/loop_not_defined_cond.test
deleted file mode 100644
index e90e96b4ae..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/for/loop_not_defined_cond.test
+++ /dev/null
@@ -1,9 +0,0 @@
---TEST--
-"for" tag
---TEMPLATE--
-{% for i, item in items if loop.last > 0 %}
-{% endfor %}
---DATA--
-return ['items' => ['a', 'b']]
---EXCEPTION--
-Twig\Error\SyntaxError: The "loop" variable cannot be used in a looping condition in "index.twig" at line 2.
diff --git a/vendor/twig/twig/tests/Fixtures/tags/for/nested_else.test b/vendor/twig/twig/tests/Fixtures/tags/for/nested_else.test
deleted file mode 100644
index df1bb07ac0..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/for/nested_else.test
+++ /dev/null
@@ -1,17 +0,0 @@
---TEST--
-"for" tag can use an "else" clause
---TEMPLATE--
-{% for item in items %}
- {% for item in items1 %}
- * {{ item }}
- {% else %}
- no {{ item }}
- {% endfor %}
-{% else %}
- no item1
-{% endfor %}
---DATA--
-return ['items' => ['a', 'b'], 'items1' => []]
---EXPECT--
-no a
- no b
diff --git a/vendor/twig/twig/tests/Fixtures/tags/for/objects.test b/vendor/twig/twig/tests/Fixtures/tags/for/objects.test
deleted file mode 100644
index 2ba2d92c2c..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/for/objects.test
+++ /dev/null
@@ -1,43 +0,0 @@
---TEST--
-"for" tag iterates over iterable objects
---TEMPLATE--
-{% for item in items %}
- * {{ item }}
- * {{ loop.index }}/{{ loop.index0 }}
- * {{ loop.first }}
-
-{% endfor %}
-
-{% for key, value in items %}
- * {{ key }}/{{ value }}
-{% endfor %}
-
-{% for key in items|keys %}
- * {{ key }}
-{% endfor %}
---DATA--
-class ItemsIterator implements Iterator
-{
- protected $values = ['foo' => 'bar', 'bar' => 'foo'];
- public function current() { return current($this->values); }
- public function key() { return key($this->values); }
- public function next() { return next($this->values); }
- public function rewind() { return reset($this->values); }
- public function valid() { return false !== current($this->values); }
-}
-return ['items' => new ItemsIterator()]
---EXPECT--
- * bar
- * 1/0
- * 1
-
- * foo
- * 2/1
- *
-
-
- * foo/bar
- * bar/foo
-
- * foo
- * bar
diff --git a/vendor/twig/twig/tests/Fixtures/tags/for/objects_countable.test b/vendor/twig/twig/tests/Fixtures/tags/for/objects_countable.test
deleted file mode 100644
index 99146bde36..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/for/objects_countable.test
+++ /dev/null
@@ -1,47 +0,0 @@
---TEST--
-"for" tag iterates over iterable and countable objects
---TEMPLATE--
-{% for item in items %}
- * {{ item }}
- * {{ loop.index }}/{{ loop.index0 }}
- * {{ loop.revindex }}/{{ loop.revindex0 }}
- * {{ loop.first }}/{{ loop.last }}/{{ loop.length }}
-
-{% endfor %}
-
-{% for key, value in items %}
- * {{ key }}/{{ value }}
-{% endfor %}
-
-{% for key in items|keys %}
- * {{ key }}
-{% endfor %}
---DATA--
-class ItemsIteratorCountable implements Iterator, \Countable
-{
- protected $values = ['foo' => 'bar', 'bar' => 'foo'];
- public function current() { return current($this->values); }
- public function key() { return key($this->values); }
- public function next() { return next($this->values); }
- public function rewind() { return reset($this->values); }
- public function valid() { return false !== current($this->values); }
- public function count() { return count($this->values); }
-}
-return ['items' => new ItemsIteratorCountable()]
---EXPECT--
- * bar
- * 1/0
- * 2/1
- * 1//2
-
- * foo
- * 2/1
- * 1/0
- * /1/2
-
-
- * foo/bar
- * bar/foo
-
- * foo
- * bar
diff --git a/vendor/twig/twig/tests/Fixtures/tags/for/recursive.test b/vendor/twig/twig/tests/Fixtures/tags/for/recursive.test
deleted file mode 100644
index 3b677d60ff..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/for/recursive.test
+++ /dev/null
@@ -1,18 +0,0 @@
---TEST--
-"for" tags can be nested
---TEMPLATE--
-{% for key, item in items %}
-* {{ key }} ({{ loop.length }}):
-{% for value in item %}
- * {{ value }} ({{ loop.length }})
-{% endfor %}
-{% endfor %}
---DATA--
-return ['items' => ['a' => ['a1', 'a2', 'a3'], 'b' => ['b1']]]
---EXPECT--
-* a (2):
- * a1 (3)
- * a2 (3)
- * a3 (3)
-* b (2):
- * b1 (1)
diff --git a/vendor/twig/twig/tests/Fixtures/tags/for/values.test b/vendor/twig/twig/tests/Fixtures/tags/for/values.test
deleted file mode 100644
index 384c41b288..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/for/values.test
+++ /dev/null
@@ -1,11 +0,0 @@
---TEST--
-"for" tag iterates over item values
---TEMPLATE--
-{% for item in items %}
- * {{ item }}
-{% endfor %}
---DATA--
-return ['items' => ['a', 'b']]
---EXPECT--
- * a
- * b
diff --git a/vendor/twig/twig/tests/Fixtures/tags/from.test b/vendor/twig/twig/tests/Fixtures/tags/from.test
deleted file mode 100644
index 1d3c9e2b58..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/from.test
+++ /dev/null
@@ -1,14 +0,0 @@
---TEST--
-global variables
---TEMPLATE--
-{% include "included.twig" %}
-{% from "included.twig" import foobar %}
-{{ foobar() }}
---TEMPLATE(included.twig)--
-{% macro foobar() %}
-called foobar
-{% endmacro %}
---DATA--
-return []
---EXPECT--
-called foobar
diff --git a/vendor/twig/twig/tests/Fixtures/tags/if/basic.test b/vendor/twig/twig/tests/Fixtures/tags/if/basic.test
deleted file mode 100644
index a02165e539..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/if/basic.test
+++ /dev/null
@@ -1,22 +0,0 @@
---TEST--
-"if" creates a condition
---TEMPLATE--
-{% if a is defined %}
- {{ a }}
-{% elseif b is defined %}
- {{ b }}
-{% else %}
- NOTHING
-{% endif %}
---DATA--
-return ['a' => 'a']
---EXPECT--
- a
---DATA--
-return ['b' => 'b']
---EXPECT--
- b
---DATA--
-return []
---EXPECT--
- NOTHING
diff --git a/vendor/twig/twig/tests/Fixtures/tags/if/expression.test b/vendor/twig/twig/tests/Fixtures/tags/if/expression.test
deleted file mode 100644
index eb65083c61..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/if/expression.test
+++ /dev/null
@@ -1,22 +0,0 @@
---TEST--
-"if" takes an expression as a test
---TEMPLATE--
-{% if a < 2 %}
- A1
-{% elseif a > 10 %}
- A2
-{% else %}
- A3
-{% endif %}
---DATA--
-return ['a' => 1]
---EXPECT--
- A1
---DATA--
-return ['a' => 12]
---EXPECT--
- A2
---DATA--
-return ['a' => 7]
---EXPECT--
- A3
diff --git a/vendor/twig/twig/tests/Fixtures/tags/include/basic.test b/vendor/twig/twig/tests/Fixtures/tags/include/basic.test
deleted file mode 100644
index 9982b039d0..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/include/basic.test
+++ /dev/null
@@ -1,16 +0,0 @@
---TEST--
-"include" tag
---TEMPLATE--
-FOO
-{% include "foo.twig" %}
-
-BAR
---TEMPLATE(foo.twig)--
-FOOBAR
---DATA--
-return []
---EXPECT--
-FOO
-
-FOOBAR
-BAR
diff --git a/vendor/twig/twig/tests/Fixtures/tags/include/expression.test b/vendor/twig/twig/tests/Fixtures/tags/include/expression.test
deleted file mode 100644
index 23db181238..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/include/expression.test
+++ /dev/null
@@ -1,16 +0,0 @@
---TEST--
-"include" tag allows expressions for the template to include
---TEMPLATE--
-FOO
-{% include foo %}
-
-BAR
---TEMPLATE(foo.twig)--
-FOOBAR
---DATA--
-return ['foo' => 'foo.twig']
---EXPECT--
-FOO
-
-FOOBAR
-BAR
diff --git a/vendor/twig/twig/tests/Fixtures/tags/include/ignore_missing.test b/vendor/twig/twig/tests/Fixtures/tags/include/ignore_missing.test
deleted file mode 100644
index 6c8bdb1e92..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/include/ignore_missing.test
+++ /dev/null
@@ -1,10 +0,0 @@
---TEST--
-"include" tag
---TEMPLATE--
-{% include ["foo.twig", "bar.twig"] ignore missing %}
-{% include "foo.twig" ignore missing %}
-{% include "foo.twig" ignore missing with {} %}
-{% include "foo.twig" ignore missing with {} only %}
---DATA--
-return []
---EXPECT--
diff --git a/vendor/twig/twig/tests/Fixtures/tags/include/ignore_missing_exists.test b/vendor/twig/twig/tests/Fixtures/tags/include/ignore_missing_exists.test
deleted file mode 100644
index 1af012210e..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/include/ignore_missing_exists.test
+++ /dev/null
@@ -1,11 +0,0 @@
---TEST--
-"include" tag
---TEMPLATE--
-{% include "included.twig" ignore missing %}
-NOT DISPLAYED
---TEMPLATE(included.twig)--
-{% include "DOES NOT EXIST" %}
---DATA--
-return []
---EXCEPTION--
-Twig\Error\LoaderError: Template "DOES NOT EXIST" is not defined in "included.twig" at line 2.
diff --git a/vendor/twig/twig/tests/Fixtures/tags/include/include_missing_extends.test b/vendor/twig/twig/tests/Fixtures/tags/include/include_missing_extends.test
deleted file mode 100644
index d0d1bfe590..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/include/include_missing_extends.test
+++ /dev/null
@@ -1,13 +0,0 @@
---TEST--
-"include" tag
---TEMPLATE--
-{% include ['bad.twig', 'good.twig'] ignore missing %}
-NOT DISPLAYED
---TEMPLATE(bad.twig)--
-{% extends 'DOES NOT EXIST' %}
---TEMPLATE(good.twig)--
-NOT DISPLAYED
---DATA--
-return []
---EXCEPTION--
-Twig\Error\LoaderError: Template "DOES NOT EXIST" is not defined in "bad.twig" at line 2.
diff --git a/vendor/twig/twig/tests/Fixtures/tags/include/missing.test b/vendor/twig/twig/tests/Fixtures/tags/include/missing.test
deleted file mode 100644
index ac72838e84..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/include/missing.test
+++ /dev/null
@@ -1,8 +0,0 @@
---TEST--
-"include" tag
---TEMPLATE--
-{% include "foo.twig" %}
---DATA--
-return []
---EXCEPTION--
-Twig\Error\LoaderError: Template "foo.twig" is not defined in "index.twig" at line 2.
diff --git a/vendor/twig/twig/tests/Fixtures/tags/include/missing_nested.test b/vendor/twig/twig/tests/Fixtures/tags/include/missing_nested.test
deleted file mode 100644
index 0ee51b7862..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/include/missing_nested.test
+++ /dev/null
@@ -1,16 +0,0 @@
---TEST--
-"include" tag
---TEMPLATE--
-{% extends "base.twig" %}
-
-{% block content %}
- {{ parent() }}
-{% endblock %}
---TEMPLATE(base.twig)--
-{% block content %}
- {% include "foo.twig" %}
-{% endblock %}
---DATA--
-return []
---EXCEPTION--
-Twig\Error\LoaderError: Template "foo.twig" is not defined in "base.twig" at line 3.
diff --git a/vendor/twig/twig/tests/Fixtures/tags/include/only.test b/vendor/twig/twig/tests/Fixtures/tags/include/only.test
deleted file mode 100644
index 8da402f7a8..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/include/only.test
+++ /dev/null
@@ -1,20 +0,0 @@
---TEST--
-"include" tag accept variables and only
---TEMPLATE--
-{% include "foo.twig" %}
-{% include "foo.twig" only %}
-{% include "foo.twig" with vars1 %}
-{% include "foo.twig" with vars1 only %}
-{% include "foo.twig" with vars2 %}
-{% include "foo.twig" with vars2 only %}
---TEMPLATE(foo.twig)--
-{% for k, v in _context %}{{ k }},{% endfor %}
---DATA--
-return ['vars1' => ['foo1' => 'bar'], 'vars2' => new ArrayObject(['foo2' => 'bar'])]
---EXPECT--
-vars1,vars2,global,_parent,
-global,_parent,
-vars1,vars2,global,foo1,_parent,
-foo1,global,_parent,
-vars1,vars2,global,foo2,_parent,
-foo2,global,_parent,
diff --git a/vendor/twig/twig/tests/Fixtures/tags/include/template_instance.test b/vendor/twig/twig/tests/Fixtures/tags/include/template_instance.test
deleted file mode 100644
index 4fb862a175..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/include/template_instance.test
+++ /dev/null
@@ -1,10 +0,0 @@
---TEST--
-"include" tag accepts \Twig\TemplateWrapper instance
---TEMPLATE--
-{% include foo %} FOO
---TEMPLATE(foo.twig)--
-BAR
---DATA--
-return ['foo' => $twig->load('foo.twig')]
---EXPECT--
-BAR FOO
diff --git a/vendor/twig/twig/tests/Fixtures/tags/include/templates_as_array.test b/vendor/twig/twig/tests/Fixtures/tags/include/templates_as_array.test
deleted file mode 100644
index 38063952d4..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/include/templates_as_array.test
+++ /dev/null
@@ -1,12 +0,0 @@
---TEST--
-"include" tag
---TEMPLATE--
-{% include ["foo.twig", "bar.twig"] %}
-{% include ["bar.twig", "foo.twig"] %}
---TEMPLATE(foo.twig)--
-foo
---DATA--
-return []
---EXPECT--
-foo
-foo
diff --git a/vendor/twig/twig/tests/Fixtures/tags/include/with_variables.test b/vendor/twig/twig/tests/Fixtures/tags/include/with_variables.test
deleted file mode 100644
index 45a05199ec..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/include/with_variables.test
+++ /dev/null
@@ -1,14 +0,0 @@
---TEST--
-"include" tag accept variables
---TEMPLATE--
-{% include "foo.twig" with {'foo': 'bar'} %}
-{% include "foo.twig" with vars1 %}
-{% include "foo.twig" with vars2 %}
---TEMPLATE(foo.twig)--
-{{ foo }}
---DATA--
-return ['vars1' => ['foo' => 'bar'], 'vars2' => new ArrayObject(['foo' => 'bar'])]
---EXPECT--
-bar
-bar
-bar
diff --git a/vendor/twig/twig/tests/Fixtures/tags/inheritance/basic.test b/vendor/twig/twig/tests/Fixtures/tags/inheritance/basic.test
deleted file mode 100644
index 703b61be17..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/inheritance/basic.test
+++ /dev/null
@@ -1,14 +0,0 @@
---TEST--
-"extends" tag
---TEMPLATE--
-{% extends "foo.twig" %}
-
-{% block content %}
-FOO
-{% endblock %}
---TEMPLATE(foo.twig)--
-{% block content %}{% endblock %}
---DATA--
-return []
---EXPECT--
-FOO
diff --git a/vendor/twig/twig/tests/Fixtures/tags/inheritance/block_expr.test b/vendor/twig/twig/tests/Fixtures/tags/inheritance/block_expr.test
deleted file mode 100644
index 0b82d4cf2d..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/inheritance/block_expr.test
+++ /dev/null
@@ -1,30 +0,0 @@
---TEST--
-block_expr
---TEMPLATE--
-{% extends "base.twig" %}
-
-{% block element -%}
- Element:
- {{- parent() -}}
-{% endblock %}
---TEMPLATE(base.twig)--
-{% block element -%}
- <div>
- {%- if item.children is defined %}
- {%- for item in item.children %}
- {{- block('element') -}}
- {% endfor %}
- {%- endif -%}
- </div>
-{%- endblock %}
---DATA--
-return [
- 'item' => [
- 'children' => [
- null,
- null,
- ]
- ]
-]
---EXPECT--
-Element:<div>Element:<div></div>Element:<div></div></div>
diff --git a/vendor/twig/twig/tests/Fixtures/tags/inheritance/block_expr2.test b/vendor/twig/twig/tests/Fixtures/tags/inheritance/block_expr2.test
deleted file mode 100644
index 18f6604113..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/inheritance/block_expr2.test
+++ /dev/null
@@ -1,32 +0,0 @@
---TEST--
-block_expr2
---TEMPLATE--
-{% extends "base2.twig" %}
-
-{% block element -%}
- Element:
- {{- parent() -}}
-{% endblock %}
---TEMPLATE(base2.twig)--
-{% extends "base.twig" %}
---TEMPLATE(base.twig)--
-{% block element -%}
- <div>
- {%- if item.children is defined %}
- {%- for item in item.children %}
- {{- block('element') -}}
- {% endfor %}
- {%- endif -%}
- </div>
-{%- endblock %}
---DATA--
-return [
- 'item' => [
- 'children' => [
- null,
- null,
- ]
- ]
-]
---EXPECT--
-Element:<div>Element:<div></div>Element:<div></div></div>
diff --git a/vendor/twig/twig/tests/Fixtures/tags/inheritance/conditional.test b/vendor/twig/twig/tests/Fixtures/tags/inheritance/conditional.test
deleted file mode 100644
index bd28248d13..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/inheritance/conditional.test
+++ /dev/null
@@ -1,14 +0,0 @@
---TEST--
-"extends" tag
---TEMPLATE--
-{% extends standalone ? foo : 'bar.twig' %}
-
-{% block content %}{{ parent() }}FOO{% endblock %}
---TEMPLATE(foo.twig)--
-{% block content %}FOO{% endblock %}
---TEMPLATE(bar.twig)--
-{% block content %}BAR{% endblock %}
---DATA--
-return ['foo' => 'foo.twig', 'standalone' => true]
---EXPECT--
-FOOFOO
diff --git a/vendor/twig/twig/tests/Fixtures/tags/inheritance/dynamic.test b/vendor/twig/twig/tests/Fixtures/tags/inheritance/dynamic.test
deleted file mode 100644
index e6a0f01728..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/inheritance/dynamic.test
+++ /dev/null
@@ -1,14 +0,0 @@
---TEST--
-"extends" tag
---TEMPLATE--
-{% extends foo %}
-
-{% block content %}
-FOO
-{% endblock %}
---TEMPLATE(foo.twig)--
-{% block content %}{% endblock %}
---DATA--
-return ['foo' => 'foo.twig']
---EXPECT--
-FOO
diff --git a/vendor/twig/twig/tests/Fixtures/tags/inheritance/empty.test b/vendor/twig/twig/tests/Fixtures/tags/inheritance/empty.test
deleted file mode 100644
index ca11bf20d1..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/inheritance/empty.test
+++ /dev/null
@@ -1,10 +0,0 @@
---TEST--
-"extends" tag
---TEMPLATE--
-{% extends "foo.twig" %}
---TEMPLATE(foo.twig)--
-{% block content %}FOO{% endblock %}
---DATA--
-return []
---EXPECT--
-FOO
diff --git a/vendor/twig/twig/tests/Fixtures/tags/inheritance/extends_as_array.test b/vendor/twig/twig/tests/Fixtures/tags/inheritance/extends_as_array.test
deleted file mode 100644
index 4d2cb6c657..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/inheritance/extends_as_array.test
+++ /dev/null
@@ -1,12 +0,0 @@
---TEST--
-"extends" tag
---TEMPLATE--
-{% extends ["foo.twig", "bar.twig"] %}
---TEMPLATE(bar.twig)--
-{% block content %}
-foo
-{% endblock %}
---DATA--
-return []
---EXPECT--
-foo
diff --git a/vendor/twig/twig/tests/Fixtures/tags/inheritance/extends_as_array_with_empty_name.test b/vendor/twig/twig/tests/Fixtures/tags/inheritance/extends_as_array_with_empty_name.test
deleted file mode 100644
index 5108651103..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/inheritance/extends_as_array_with_empty_name.test
+++ /dev/null
@@ -1,12 +0,0 @@
---TEST--
-"extends" tag
---TEMPLATE--
-{% extends ["", "bar.twig"] %}
---TEMPLATE(bar.twig)--
-{% block content %}
-foo
-{% endblock %}
---DATA--
-return []
---EXPECT--
-foo
diff --git a/vendor/twig/twig/tests/Fixtures/tags/inheritance/extends_as_array_with_null_name.test b/vendor/twig/twig/tests/Fixtures/tags/inheritance/extends_as_array_with_null_name.test
deleted file mode 100644
index c5ee6f193b..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/inheritance/extends_as_array_with_null_name.test
+++ /dev/null
@@ -1,12 +0,0 @@
---TEST--
-"extends" tag
---TEMPLATE--
-{% extends [null, "bar.twig"] %}
---TEMPLATE(bar.twig)--
-{% block content %}
-foo
-{% endblock %}
---DATA--
-return []
---EXPECT--
-foo
diff --git a/vendor/twig/twig/tests/Fixtures/tags/inheritance/extends_in_block.test b/vendor/twig/twig/tests/Fixtures/tags/inheritance/extends_in_block.test
deleted file mode 100644
index a372ea1c81..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/inheritance/extends_in_block.test
+++ /dev/null
@@ -1,10 +0,0 @@
---TEST--
-"extends" tag in a block
---TEMPLATE--
-{% block foo %}
- {% extends "foo.twig" %}
-{% endblock %}
---DATA--
-return []
---EXCEPTION--
-Twig\Error\SyntaxError: Cannot use "extend" in a block in "index.twig" at line 3.
diff --git a/vendor/twig/twig/tests/Fixtures/tags/inheritance/extends_in_macro.test b/vendor/twig/twig/tests/Fixtures/tags/inheritance/extends_in_macro.test
deleted file mode 100644
index dc87b2a8c2..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/inheritance/extends_in_macro.test
+++ /dev/null
@@ -1,10 +0,0 @@
---TEST--
-"extends" tag in a macro
---TEMPLATE--
-{% macro foo() %}
- {% extends "foo.twig" %}
-{% endmacro %}
---DATA--
-return []
---EXCEPTION--
-Twig\Error\SyntaxError: Cannot use "extend" in a macro in "index.twig" at line 3.
diff --git a/vendor/twig/twig/tests/Fixtures/tags/inheritance/multiple.test b/vendor/twig/twig/tests/Fixtures/tags/inheritance/multiple.test
deleted file mode 100644
index fc25badd34..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/inheritance/multiple.test
+++ /dev/null
@@ -1,12 +0,0 @@
---TEST--
-"extends" tag
---TEMPLATE--
-{% extends "layout.twig" %}{% block content %}{{ parent() }}index {% endblock %}
---TEMPLATE(layout.twig)--
-{% extends "base.twig" %}{% block content %}{{ parent() }}layout {% endblock %}
---TEMPLATE(base.twig)--
-{% block content %}base {% endblock %}
---DATA--
-return []
---EXPECT--
-base layout index
diff --git a/vendor/twig/twig/tests/Fixtures/tags/inheritance/multiple_dynamic.test b/vendor/twig/twig/tests/Fixtures/tags/inheritance/multiple_dynamic.test
deleted file mode 100644
index fa887177bd..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/inheritance/multiple_dynamic.test
+++ /dev/null
@@ -1,22 +0,0 @@
---TEST--
-"extends" tag
---TEMPLATE--
-{% set foo = 1 %}
-{{ include('parent.twig') }}
-{{ include('parent.twig') }}
-{% set foo = 2 %}
-{{ include('parent.twig') }}
---TEMPLATE(parent.twig)--
-{% extends foo~'_parent.twig' %}{% block content %}{{ parent() }} parent{% endblock %}
---TEMPLATE(1_parent.twig)--
-{% block content %}1{% endblock %}
---TEMPLATE(2_parent.twig)--
-{% block content %}2{% endblock %}
---DATA--
-return []
---EXPECT--
-1 parent
-
-1 parent
-
-2 parent
diff --git a/vendor/twig/twig/tests/Fixtures/tags/inheritance/nested_blocks.test b/vendor/twig/twig/tests/Fixtures/tags/inheritance/nested_blocks.test
deleted file mode 100644
index abea2e9d47..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/inheritance/nested_blocks.test
+++ /dev/null
@@ -1,22 +0,0 @@
---TEST--
-"block" tag
---TEMPLATE--
-{% extends "foo.twig" %}
-
-{% block content %}
- {% block subcontent %}
- {% block subsubcontent %}
- SUBSUBCONTENT
- {% endblock %}
- {% endblock %}
-{% endblock %}
---TEMPLATE(foo.twig)--
-{% block content %}
- {% block subcontent %}
- SUBCONTENT
- {% endblock %}
-{% endblock %}
---DATA--
-return []
---EXPECT--
-SUBSUBCONTENT
diff --git a/vendor/twig/twig/tests/Fixtures/tags/inheritance/nested_blocks_parent_only.test b/vendor/twig/twig/tests/Fixtures/tags/inheritance/nested_blocks_parent_only.test
deleted file mode 100644
index 20b7848f8d..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/inheritance/nested_blocks_parent_only.test
+++ /dev/null
@@ -1,15 +0,0 @@
---TEST--
-"block" tag
---TEMPLATE--
-{% block content %}
- CONTENT
- {%- block subcontent -%}
- SUBCONTENT
- {%- endblock -%}
- ENDCONTENT
-{% endblock %}
---TEMPLATE(foo.twig)--
---DATA--
-return []
---EXPECT--
-CONTENTSUBCONTENTENDCONTENT
diff --git a/vendor/twig/twig/tests/Fixtures/tags/inheritance/nested_inheritance.test b/vendor/twig/twig/tests/Fixtures/tags/inheritance/nested_inheritance.test
deleted file mode 100644
index 0b585b4809..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/inheritance/nested_inheritance.test
+++ /dev/null
@@ -1,16 +0,0 @@
---TEST--
-"extends" tag
---TEMPLATE--
-{% extends "layout.twig" %}
-{% block inside %}INSIDE{% endblock inside %}
---TEMPLATE(layout.twig)--
-{% extends "base.twig" %}
-{% block body %}
- {% block inside '' %}
-{% endblock body %}
---TEMPLATE(base.twig)--
-{% block body '' %}
---DATA--
-return []
---EXPECT--
-INSIDE
diff --git a/vendor/twig/twig/tests/Fixtures/tags/inheritance/parent.test b/vendor/twig/twig/tests/Fixtures/tags/inheritance/parent.test
deleted file mode 100644
index 73f4c0ec5e..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/inheritance/parent.test
+++ /dev/null
@@ -1,12 +0,0 @@
---TEST--
-"extends" tag
---TEMPLATE--
-{% extends "foo.twig" %}
-
-{% block content %}{{ parent() }}FOO{{ parent() }}{% endblock %}
---TEMPLATE(foo.twig)--
-{% block content %}BAR{% endblock %}
---DATA--
-return []
---EXPECT--
-BARFOOBAR
diff --git a/vendor/twig/twig/tests/Fixtures/tags/inheritance/parent_as_template_wrapper.test b/vendor/twig/twig/tests/Fixtures/tags/inheritance/parent_as_template_wrapper.test
deleted file mode 100644
index 1aaed556c5..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/inheritance/parent_as_template_wrapper.test
+++ /dev/null
@@ -1,12 +0,0 @@
---TEST--
-"extends" tag with a parent as a Twig_TemplateWrapper instance
---TEMPLATE--
-{% extends foo %}
-
-{% block content %}New{% endblock %}
---TEMPLATE(foo.twig)--
-{% block content %}Default{% endblock %}
---DATA--
-return ['foo' => $twig->load('foo.twig')]
---EXPECT--
-New
diff --git a/vendor/twig/twig/tests/Fixtures/tags/inheritance/parent_change.test b/vendor/twig/twig/tests/Fixtures/tags/inheritance/parent_change.test
deleted file mode 100644
index 01bd544f83..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/inheritance/parent_change.test
+++ /dev/null
@@ -1,16 +0,0 @@
---TEST--
-"extends" tag
---TEMPLATE--
-{% extends foo ? 'foo.twig' : 'bar.twig' %}
---TEMPLATE(foo.twig)--
-FOO
---TEMPLATE(bar.twig)--
-BAR
---DATA--
-return ['foo' => true]
---EXPECT--
-FOO
---DATA--
-return ['foo' => false]
---EXPECT--
-BAR
diff --git a/vendor/twig/twig/tests/Fixtures/tags/inheritance/parent_isolation.test b/vendor/twig/twig/tests/Fixtures/tags/inheritance/parent_isolation.test
deleted file mode 100644
index 58a37bd902..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/inheritance/parent_isolation.test
+++ /dev/null
@@ -1,20 +0,0 @@
---TEST--
-"extends" tag
---TEMPLATE--
-{% extends "base.twig" %}
-{% block content %}{% include "included.twig" %}{% endblock %}
-
-{% block footer %}Footer{% endblock %}
---TEMPLATE(included.twig)--
-{% extends "base.twig" %}
-{% block content %}Included Content{% endblock %}
---TEMPLATE(base.twig)--
-{% block content %}Default Content{% endblock %}
-
-{% block footer %}Default Footer{% endblock %}
---DATA--
-return []
---EXPECT--
-Included Content
-Default Footer
-Footer
diff --git a/vendor/twig/twig/tests/Fixtures/tags/inheritance/parent_nested.test b/vendor/twig/twig/tests/Fixtures/tags/inheritance/parent_nested.test
deleted file mode 100644
index d4347bac4f..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/inheritance/parent_nested.test
+++ /dev/null
@@ -1,28 +0,0 @@
---TEST--
-"extends" tag
---TEMPLATE--
-{% extends "foo.twig" %}
-
-{% block content %}
- {% block inside %}
- INSIDE OVERRIDDEN
- {% endblock %}
-
- BEFORE
- {{ parent() }}
- AFTER
-{% endblock %}
---TEMPLATE(foo.twig)--
-{% block content %}
- BAR
-{% endblock %}
---DATA--
-return []
---EXPECT--
-
-INSIDE OVERRIDDEN
-
- BEFORE
- BAR
-
- AFTER
diff --git a/vendor/twig/twig/tests/Fixtures/tags/inheritance/parent_without_extends.test b/vendor/twig/twig/tests/Fixtures/tags/inheritance/parent_without_extends.test
deleted file mode 100644
index 6d98891553..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/inheritance/parent_without_extends.test
+++ /dev/null
@@ -1,8 +0,0 @@
---TEST--
-"parent" tag
---TEMPLATE--
-{% block content %}
- {{ parent() }}
-{% endblock %}
---EXCEPTION--
-Twig\Error\SyntaxError: Calling "parent" on a template that does not extend nor "use" another template is forbidden in "index.twig" at line 3.
diff --git a/vendor/twig/twig/tests/Fixtures/tags/inheritance/parent_without_extends_but_traits.test b/vendor/twig/twig/tests/Fixtures/tags/inheritance/parent_without_extends_but_traits.test
deleted file mode 100644
index 39882b8b39..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/inheritance/parent_without_extends_but_traits.test
+++ /dev/null
@@ -1,14 +0,0 @@
---TEST--
-"parent" tag
---TEMPLATE--
-{% use 'foo.twig' %}
-
-{% block content %}
- {{ parent() }}
-{% endblock %}
---TEMPLATE(foo.twig)--
-{% block content %}BAR{% endblock %}
---DATA--
-return []
---EXPECT--
-BAR
diff --git a/vendor/twig/twig/tests/Fixtures/tags/inheritance/template_instance.test b/vendor/twig/twig/tests/Fixtures/tags/inheritance/template_instance.test
deleted file mode 100644
index a5a223886d..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/inheritance/template_instance.test
+++ /dev/null
@@ -1,14 +0,0 @@
---TEST--
-"extends" tag accepts Twig_Template instance
---TEMPLATE--
-{% extends foo %}
-
-{% block content %}
-{{ parent() }}FOO
-{% endblock %}
---TEMPLATE(foo.twig)--
-{% block content %}BAR{% endblock %}
---DATA--
-return ['foo' => $twig->load('foo.twig')]
---EXPECT--
-BARFOO
diff --git a/vendor/twig/twig/tests/Fixtures/tags/inheritance/use.test b/vendor/twig/twig/tests/Fixtures/tags/inheritance/use.test
deleted file mode 100644
index 4df32ee9d3..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/inheritance/use.test
+++ /dev/null
@@ -1,44 +0,0 @@
---TEST--
-"parent" function
---TEMPLATE--
-{% extends "parent.twig" %}
-
-{% use "use1.twig" %}
-{% use "use2.twig" %}
-
-{% block content_parent %}
- {{ parent() }}
-{% endblock %}
-
-{% block content_use1 %}
- {{ parent() }}
-{% endblock %}
-
-{% block content_use2 %}
- {{ parent() }}
-{% endblock %}
-
-{% block content %}
- {{ block('content_use1_only') }}
- {{ block('content_use2_only') }}
-{% endblock %}
---TEMPLATE(parent.twig)--
-{% block content_parent 'content_parent' %}
-{% block content_use1 'content_parent' %}
-{% block content_use2 'content_parent' %}
-{% block content '' %}
---TEMPLATE(use1.twig)--
-{% block content_use1 'content_use1' %}
-{% block content_use2 'content_use1' %}
-{% block content_use1_only 'content_use1_only' %}
---TEMPLATE(use2.twig)--
-{% block content_use2 'content_use2' %}
-{% block content_use2_only 'content_use2_only' %}
---DATA--
-return []
---EXPECT--
- content_parent
- content_use1
- content_use2
- content_use1_only
- content_use2_only
diff --git a/vendor/twig/twig/tests/Fixtures/tags/macro/basic.test b/vendor/twig/twig/tests/Fixtures/tags/macro/basic.test
deleted file mode 100644
index ae090f9a06..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/macro/basic.test
+++ /dev/null
@@ -1,17 +0,0 @@
---TEST--
-"macro" tag
---TEMPLATE--
-{% import _self as macros %}
-
-{{ macros.input('username') }}
-{{ macros.input('password', null, 'password', 1) }}
-
-{% macro input(name, value, type, size) %}
- <input type="{{ type|default("text") }}" name="{{ name }}" value="{{ value|e|default('') }}" size="{{ size|default(20) }}">
-{% endmacro %}
---DATA--
-return []
---EXPECT--
- <input type="text" name="username" value="" size="20">
-
- <input type="password" name="password" value="" size="1">
diff --git a/vendor/twig/twig/tests/Fixtures/tags/macro/endmacro_name.test b/vendor/twig/twig/tests/Fixtures/tags/macro/endmacro_name.test
deleted file mode 100644
index 3f3caf7773..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/macro/endmacro_name.test
+++ /dev/null
@@ -1,16 +0,0 @@
---TEST--
-"macro" tag supports name for endmacro
---TEMPLATE--
-{% import _self as macros %}
-
-{{ macros.foo() }}
-{{ macros.bar() }}
-
-{% macro foo() %}foo{% endmacro %}
-{% macro bar() %}bar{% endmacro bar %}
---DATA--
-return []
---EXPECT--
-foo
-bar
-
diff --git a/vendor/twig/twig/tests/Fixtures/tags/macro/external.test b/vendor/twig/twig/tests/Fixtures/tags/macro/external.test
deleted file mode 100644
index b28ca19f02..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/macro/external.test
+++ /dev/null
@@ -1,17 +0,0 @@
---TEST--
-"macro" tag
---TEMPLATE--
-{% import 'forms.twig' as forms %}
-
-{{ forms.input('username') }}
-{{ forms.input('password', null, 'password', 1) }}
---TEMPLATE(forms.twig)--
-{% macro input(name, value, type, size) %}
- <input type="{{ type|default("text") }}" name="{{ name }}" value="{{ value|e|default('') }}" size="{{ size|default(20) }}">
-{% endmacro %}
---DATA--
-return []
---EXPECT--
- <input type="text" name="username" value="" size="20">
-
- <input type="password" name="password" value="" size="1">
diff --git a/vendor/twig/twig/tests/Fixtures/tags/macro/from.test b/vendor/twig/twig/tests/Fixtures/tags/macro/from.test
deleted file mode 100644
index 8b9aae8789..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/macro/from.test
+++ /dev/null
@@ -1,18 +0,0 @@
---TEST--
-"macro" tag
---TEMPLATE--
-{% from 'forms.twig' import foo %}
-{% from 'forms.twig' import foo as foobar, bar %}
-
-{{ foo('foo') }}
-{{ foobar('foo') }}
-{{ bar('foo') }}
---TEMPLATE(forms.twig)--
-{% macro foo(name) %}foo{{ name }}{% endmacro %}
-{% macro bar(name) %}bar{{ name }}{% endmacro %}
---DATA--
-return []
---EXPECT--
-foofoo
-foofoo
-barfoo
diff --git a/vendor/twig/twig/tests/Fixtures/tags/macro/from_in_block_is_local.test b/vendor/twig/twig/tests/Fixtures/tags/macro/from_in_block_is_local.test
deleted file mode 100644
index 0c89ce62a8..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/macro/from_in_block_is_local.test
+++ /dev/null
@@ -1,18 +0,0 @@
---TEST--
-"macro" tag
---TEMPLATE--
-{% block foo %}
- {%- from _self import input as linput %}
-{% endblock %}
-
-{% block bar %}
- {{- linput('username') }}
-{% endblock %}
-
-{% macro input(name) -%}
- <input name="{{ name }}">
-{% endmacro %}
---DATA--
-return []
---EXCEPTION--
-Twig\Error\SyntaxError: Unknown "linput" function in "index.twig" at line 7.
diff --git a/vendor/twig/twig/tests/Fixtures/tags/macro/from_local_override.test b/vendor/twig/twig/tests/Fixtures/tags/macro/from_local_override.test
deleted file mode 100644
index 27bfbaee1f..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/macro/from_local_override.test
+++ /dev/null
@@ -1,28 +0,0 @@
---TEST--
-"macro" tag
---TEMPLATE--
-{%- from _self import input %}
-
-{% block foo %}
- {%- from "macros" import input %}
- {{- input('username') }}
-{% endblock %}
-
-{% block bar %}
- {{- input('username') }}
-{% endblock %}
-
-{% macro input(name) -%}
- <input name="{{ name }}">
-{% endmacro %}
---TEMPLATE(macros)--
-{% macro input(name) %}
- <input name="{{ name }}" value="local">
-{% endmacro %}
---DATA--
-return []
---EXPECT--
-<input name="username" value="local">
-
-
-<input name="username">
diff --git a/vendor/twig/twig/tests/Fixtures/tags/macro/from_macro_in_a_macro.test b/vendor/twig/twig/tests/Fixtures/tags/macro/from_macro_in_a_macro.test
deleted file mode 100644
index 87ac25c310..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/macro/from_macro_in_a_macro.test
+++ /dev/null
@@ -1,18 +0,0 @@
---TEST--
-"from" tag with syntax error
---TEMPLATE--
-{% from _self import another, foo %}
-
-{{ foo() }}
-
-{% macro foo() %}
- {{ another() }}
-{% endmacro %}
-
-{% macro another() %}
- OK
-{% endmacro %}
---DATA--
-return []
---EXCEPTION--
-Twig\Error\SyntaxError: Unknown "another" function in "index.twig" at line 7.
diff --git a/vendor/twig/twig/tests/Fixtures/tags/macro/from_nested_blocks.test b/vendor/twig/twig/tests/Fixtures/tags/macro/from_nested_blocks.test
deleted file mode 100644
index 8ede5db509..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/macro/from_nested_blocks.test
+++ /dev/null
@@ -1,18 +0,0 @@
---TEST--
-"macro" tag
---TEMPLATE--
-{% block foo %}
- {%- from _self import input as linput %}
-
- {% block bar %}
- {{- linput('username') }}
- {% endblock %}
-{% endblock %}
-
-{% macro input(name) -%}
- <input name="{{ name }}">
-{% endmacro %}
---DATA--
-return []
---EXCEPTION--
-Twig\Error\SyntaxError: Unknown "linput" function in "index.twig" at line 6.
diff --git a/vendor/twig/twig/tests/Fixtures/tags/macro/from_nested_blocks_with_global_macro.test b/vendor/twig/twig/tests/Fixtures/tags/macro/from_nested_blocks_with_global_macro.test
deleted file mode 100644
index f737bf0d8b..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/macro/from_nested_blocks_with_global_macro.test
+++ /dev/null
@@ -1,18 +0,0 @@
---TEST--
-"macro" tag
---TEMPLATE--
-{%- from _self import input %}
-
-{% block foo %}
- {% block bar %}
- {{- input('username') }}
- {% endblock %}
-{% endblock %}
-
-{% macro input(name) -%}
- <input name="{{ name }}">
-{% endmacro %}
---DATA--
-return []
---EXCEPTION--
-Twig\Error\SyntaxError: Unknown "input" function in "index.twig" at line 6.
diff --git a/vendor/twig/twig/tests/Fixtures/tags/macro/from_syntax_error.test b/vendor/twig/twig/tests/Fixtures/tags/macro/from_syntax_error.test
deleted file mode 100644
index 6223cfe947..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/macro/from_syntax_error.test
+++ /dev/null
@@ -1,8 +0,0 @@
---TEST--
-"from" tag with syntax error
---TEMPLATE--
-{% from 'forms.twig' %}
---DATA--
-return []
---EXCEPTION--
-Twig\Error\SyntaxError: Unexpected token "end of statement block" ("name" expected with value "import") in "index.twig" at line 2.
diff --git a/vendor/twig/twig/tests/Fixtures/tags/macro/from_with_reserved_name.test b/vendor/twig/twig/tests/Fixtures/tags/macro/from_with_reserved_name.test
deleted file mode 100644
index 19adb9df4c..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/macro/from_with_reserved_name.test
+++ /dev/null
@@ -1,8 +0,0 @@
---TEST--
-"from" tag with reserved name
---TEMPLATE--
-{% from 'forms.twig' import templateName %}
---DATA--
-return []
---EXCEPTION--
-Twig\Error\SyntaxError: "templateName" cannot be an imported macro as it is a reserved keyword in "index.twig" at line 2.
diff --git a/vendor/twig/twig/tests/Fixtures/tags/macro/global.test b/vendor/twig/twig/tests/Fixtures/tags/macro/global.test
deleted file mode 100644
index 832740eac5..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/macro/global.test
+++ /dev/null
@@ -1,14 +0,0 @@
---TEST--
-"macro" tag
---TEMPLATE--
-{% from 'forms.twig' import foo %}
-
-{{ foo('foo') }}
-{{ foo() }}
---TEMPLATE(forms.twig)--
-{% macro foo(name) %}{{ name|default('foo') }}{{ global }}{% endmacro %}
---DATA--
-return []
---EXPECT--
-fooglobal
-fooglobal
diff --git a/vendor/twig/twig/tests/Fixtures/tags/macro/import_and_blocks.test b/vendor/twig/twig/tests/Fixtures/tags/macro/import_and_blocks.test
deleted file mode 100644
index 721f5506a5..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/macro/import_and_blocks.test
+++ /dev/null
@@ -1,36 +0,0 @@
---TEST--
-"macro" tag
---TEMPLATE--
-{% import _self as macros %}
-{% from _self import input %}
-
-{% block foo %}
- {{- macros.input('username') }}
- {{- input('username') }}
-
- {%- import _self as lmacros %}
- {%- from _self import input as linput %}
-
- {{- lmacros.input('username') }}
- {{- linput('username') }}
-{% endblock %}
-
-{% block bar %}
- {{- macros.input('username') }}
- {{- input('username') }}
-{% endblock %}
-
-{% macro input(name) -%}
- <input name="{{ name }}">
-{% endmacro %}
---DATA--
-return []
---EXPECT--
-<input name="username">
-<input name="username">
-<input name="username">
-<input name="username">
-
-
-<input name="username">
-<input name="username">
diff --git a/vendor/twig/twig/tests/Fixtures/tags/macro/import_from_string_template.test b/vendor/twig/twig/tests/Fixtures/tags/macro/import_from_string_template.test
deleted file mode 100644
index 6c1817be7d..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/macro/import_from_string_template.test
+++ /dev/null
@@ -1,10 +0,0 @@
---TEST--
-"import" tag with a template as string
---TEMPLATE--
-{% import template_from_string("{% macro test() %}ok{% endmacro %}") as m %}
-{{ m.test() }}
---TEMPLATE(forms.twig)--
---DATA--
-return []
---EXPECT--
-ok
diff --git a/vendor/twig/twig/tests/Fixtures/tags/macro/import_in_block_is_local.test b/vendor/twig/twig/tests/Fixtures/tags/macro/import_in_block_is_local.test
deleted file mode 100644
index 9443e12221..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/macro/import_in_block_is_local.test
+++ /dev/null
@@ -1,18 +0,0 @@
---TEST--
-"macro" tag
---TEMPLATE--
-{% block foo %}
- {%- import _self as lmacros %}
-{% endblock %}
-
-{% block bar %}
- {{- lmacros.input('username') }}
-{% endblock %}
-
-{% macro input(name) -%}
- <input name="{{ name }}">
-{% endmacro %}
---DATA--
-return []
---EXCEPTION--
-Twig\Error\RuntimeError: Variable "lmacros" does not exist in "index.twig" at line 7.
diff --git a/vendor/twig/twig/tests/Fixtures/tags/macro/import_local_override.test b/vendor/twig/twig/tests/Fixtures/tags/macro/import_local_override.test
deleted file mode 100644
index 7cf0552f83..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/macro/import_local_override.test
+++ /dev/null
@@ -1,28 +0,0 @@
---TEST--
-"macro" tag
---TEMPLATE--
-{%- import _self as macros %}
-
-{% block foo %}
- {%- import "macros" as macros %}
- {{- macros.input('username') }}
-{% endblock %}
-
-{% block bar %}
- {{- macros.input('username') }}
-{% endblock %}
-
-{% macro input(name) -%}
- <input name="{{ name }}">
-{% endmacro %}
---TEMPLATE(macros)--
-{% macro input(name) %}
- <input name="{{ name }}" value="local">
-{% endmacro %}
---DATA--
-return []
---EXPECT--
-<input name="username" value="local">
-
-
-<input name="username">
diff --git a/vendor/twig/twig/tests/Fixtures/tags/macro/import_macro_in_a_macro.test b/vendor/twig/twig/tests/Fixtures/tags/macro/import_macro_in_a_macro.test
deleted file mode 100644
index d224482e19..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/macro/import_macro_in_a_macro.test
+++ /dev/null
@@ -1,18 +0,0 @@
---TEST--
-"import" tag with syntax error
---TEMPLATE--
-{% import _self as foo %}
-
-{{ foo.foo() }}
-
-{% macro foo() %}
- {{ foo.another() }}
-{% endmacro %}
-
-{% macro another() %}
- OK
-{% endmacro %}
---DATA--
-return []
---EXCEPTION--
-Twig\Error\RuntimeError: Variable "foo" does not exist in "index.twig" at line 7.
diff --git a/vendor/twig/twig/tests/Fixtures/tags/macro/import_nested_blocks.legacy.test b/vendor/twig/twig/tests/Fixtures/tags/macro/import_nested_blocks.legacy.test
deleted file mode 100644
index e822c7ff48..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/macro/import_nested_blocks.legacy.test
+++ /dev/null
@@ -1,18 +0,0 @@
---TEST--
-"macro" tag
---TEMPLATE--
-{% block foo %}
- {%- import _self as lmacros %}
-
- {% block bar %}
- {{- lmacros.input('username') }}
- {% endblock %}
-{% endblock %}
-
-{% macro input(name) -%}
- <input name="{{ name }}">
-{% endmacro %}
---DATA--
-return []
---EXPECT--
-<input name="username">
diff --git a/vendor/twig/twig/tests/Fixtures/tags/macro/import_nested_blocks_with_global_macro.legacy.test b/vendor/twig/twig/tests/Fixtures/tags/macro/import_nested_blocks_with_global_macro.legacy.test
deleted file mode 100644
index 697d665f84..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/macro/import_nested_blocks_with_global_macro.legacy.test
+++ /dev/null
@@ -1,18 +0,0 @@
---TEST--
-"macro" tag
---TEMPLATE--
-{%- import _self as macros %}
-
-{% block foo %}
- {% block bar %}
- {{- macros.input('username') }}
- {% endblock %}
-{% endblock %}
-
-{% macro input(name) -%}
- <input name="{{ name }}">
-{% endmacro %}
---DATA--
-return []
---EXPECT--
-<input name="username">
diff --git a/vendor/twig/twig/tests/Fixtures/tags/macro/import_self_parent.test b/vendor/twig/twig/tests/Fixtures/tags/macro/import_self_parent.test
deleted file mode 100644
index 24a8cdb50b..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/macro/import_self_parent.test
+++ /dev/null
@@ -1,23 +0,0 @@
---TEST--
-"macro" tag
---TEMPLATE--
-{% extends "parent" %}
-{% import _self as me %}
-
-{% block test %}
- {{ me.hello() }}
-{% endblock test %}
---TEMPLATE(parent)--
-{% import _self as me %}
-
-{% block test %}
-Hello
-{% endblock test %}
-
-{% macro hello() %}
- Test
-{% endmacro %}
---DATA--
-return []
---EXPECT--
-Test
diff --git a/vendor/twig/twig/tests/Fixtures/tags/macro/import_syntax_error.test b/vendor/twig/twig/tests/Fixtures/tags/macro/import_syntax_error.test
deleted file mode 100644
index b9817f0eed..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/macro/import_syntax_error.test
+++ /dev/null
@@ -1,10 +0,0 @@
---TEST--
-"import" tag with reserved name
---TEMPLATE--
-{% import 'forms.twig' %}
-
-{{ macros.parent() }}
---DATA--
-return []
---EXCEPTION--
-Twig\Error\SyntaxError: Unexpected token "end of statement block" ("name" expected with value "as") in "index.twig" at line 2.
diff --git a/vendor/twig/twig/tests/Fixtures/tags/macro/import_with_reserved_name.test b/vendor/twig/twig/tests/Fixtures/tags/macro/import_with_reserved_name.test
deleted file mode 100644
index 34b8d43a25..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/macro/import_with_reserved_name.test
+++ /dev/null
@@ -1,10 +0,0 @@
---TEST--
-"from" tag with reserved name
---TEMPLATE--
-{% import 'forms.twig' as macros %}
-
-{{ macros.parent() }}
---DATA--
-return []
---EXCEPTION--
-Twig\Error\SyntaxError: "parent" cannot be called as macro as it is a reserved keyword in "index.twig" at line 4.
diff --git a/vendor/twig/twig/tests/Fixtures/tags/macro/reserved_name.test b/vendor/twig/twig/tests/Fixtures/tags/macro/reserved_name.test
deleted file mode 100644
index e58dd7cacc..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/macro/reserved_name.test
+++ /dev/null
@@ -1,10 +0,0 @@
---TEST--
-"macro" tag with reserved name
---TEMPLATE--
-{% macro parent(arg1, arg2) %}
- parent
-{% endmacro %}
---DATA--
-return []
---EXCEPTION--
-Twig\Error\SyntaxError: "parent" cannot be used as a macro name as it is a reserved keyword in "index.twig" at line 2.
diff --git a/vendor/twig/twig/tests/Fixtures/tags/macro/self_import.test b/vendor/twig/twig/tests/Fixtures/tags/macro/self_import.test
deleted file mode 100644
index ca3157dd88..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/macro/self_import.test
+++ /dev/null
@@ -1,17 +0,0 @@
---TEST--
-"macro" tag
---TEMPLATE--
-{% import _self as forms %}
-
-{{ forms.input('username') }}
-{{ forms.input('password', null, 'password', 1) }}
-
-{% macro input(name, value, type, size) %}
- <input type="{{ type|default("text") }}" name="{{ name }}" value="{{ value|e|default('') }}" size="{{ size|default(20) }}">
-{% endmacro %}
---DATA--
-return []
---EXPECT--
- <input type="text" name="username" value="" size="20">
-
- <input type="password" name="password" value="" size="1">
diff --git a/vendor/twig/twig/tests/Fixtures/tags/macro/special_chars.test b/vendor/twig/twig/tests/Fixtures/tags/macro/special_chars.test
deleted file mode 100644
index 491e91e80d..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/macro/special_chars.test
+++ /dev/null
@@ -1,14 +0,0 @@
---TEST--
-"§" as a macro name
---TEMPLATE--
-{% import _self as macros %}
-
-{{ macros.§('foo') }}
-
-{% macro §(foo) %}
- §{{ foo }}§
-{% endmacro %}
---DATA--
-return []
---EXPECT--
-§foo§
diff --git a/vendor/twig/twig/tests/Fixtures/tags/macro/super_globals.test b/vendor/twig/twig/tests/Fixtures/tags/macro/super_globals.test
deleted file mode 100644
index 643697ce28..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/macro/super_globals.test
+++ /dev/null
@@ -1,14 +0,0 @@
---TEST--
-Super globals as macro arguments
---TEMPLATE--
-{% import _self as macros %}
-
-{{ macros.foo('foo') }}
-
-{% macro foo(GET) %}
- {{ GET }}
-{% endmacro %}
---DATA--
-return []
---EXPECT--
-foo
diff --git a/vendor/twig/twig/tests/Fixtures/tags/raw/basic.legacy.test b/vendor/twig/twig/tests/Fixtures/tags/raw/basic.legacy.test
deleted file mode 100644
index 7875b2af72..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/raw/basic.legacy.test
+++ /dev/null
@@ -1,10 +0,0 @@
---TEST--
-"raw" tag
---TEMPLATE--
-{% raw %}
-{{ foo }}
-{% endraw %}
---DATA--
-return []
---EXPECT--
-{{ foo }}
diff --git a/vendor/twig/twig/tests/Fixtures/tags/raw/mixed_usage_with_raw.legacy.test b/vendor/twig/twig/tests/Fixtures/tags/raw/mixed_usage_with_raw.legacy.test
deleted file mode 100644
index d4c8dd2cd1..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/raw/mixed_usage_with_raw.legacy.test
+++ /dev/null
@@ -1,10 +0,0 @@
---TEST--
-"raw" tag
---TEMPLATE--
-{% raw %}
-{{ foo }}
-{% endverbatim %}
---DATA--
-return []
---EXCEPTION--
-Twig\Error\SyntaxError: Unexpected end of file: Unclosed "raw" block in "index.twig" at line 2.
diff --git a/vendor/twig/twig/tests/Fixtures/tags/raw/whitespace_control.legacy.test b/vendor/twig/twig/tests/Fixtures/tags/raw/whitespace_control.legacy.test
deleted file mode 100644
index 11f42025e1..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/raw/whitespace_control.legacy.test
+++ /dev/null
@@ -1,56 +0,0 @@
---TEST--
-"raw" tag
---TEMPLATE--
-1***
-
-{%- raw %}
- {{ 'bla' }}
-{% endraw %}
-
-1***
-2***
-
-{%- raw -%}
- {{ 'bla' }}
-{% endraw %}
-
-2***
-3***
-
-{%- raw -%}
- {{ 'bla' }}
-{% endraw -%}
-
-3***
-4***
-
-{%- raw -%}
- {{ 'bla' }}
-{%- endraw %}
-
-4***
-5***
-
-{%- raw -%}
- {{ 'bla' }}
-{%- endraw -%}
-
-5***
---DATA--
-return []
---EXPECT--
-1***
- {{ 'bla' }}
-
-
-1***
-2***{{ 'bla' }}
-
-
-2***
-3***{{ 'bla' }}
-3***
-4***{{ 'bla' }}
-
-4***
-5***{{ 'bla' }}5***
diff --git a/vendor/twig/twig/tests/Fixtures/tags/sandbox/array.test b/vendor/twig/twig/tests/Fixtures/tags/sandbox/array.test
deleted file mode 100644
index b432427e4a..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/sandbox/array.test
+++ /dev/null
@@ -1,16 +0,0 @@
---TEST--
-sandbox tag
---TEMPLATE--
-{%- sandbox %}
- {%- include "foo.twig" %}
-{%- endsandbox %}
---TEMPLATE(foo.twig)--
-{{ [a][0] }}
-{{ dump([a][0]) }}
---DATA--
-return ['a' => 'b']
---CONFIG--
-return ['autoescape' => false, 'debug' => true]
---EXPECT--
-b
-string(1) "b"
diff --git a/vendor/twig/twig/tests/Fixtures/tags/sandbox/not_valid1.test b/vendor/twig/twig/tests/Fixtures/tags/sandbox/not_valid1.test
deleted file mode 100644
index e26a78bc15..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/sandbox/not_valid1.test
+++ /dev/null
@@ -1,11 +0,0 @@
---TEST--
-sandbox tag
---TEMPLATE--
-{%- sandbox %}
- {%- include "foo.twig" %}
- a
-{%- endsandbox %}
---TEMPLATE(foo.twig)--
-foo
---EXCEPTION--
-Twig\Error\SyntaxError: Only "include" tags are allowed within a "sandbox" section in "index.twig" at line 4.
diff --git a/vendor/twig/twig/tests/Fixtures/tags/sandbox/not_valid2.test b/vendor/twig/twig/tests/Fixtures/tags/sandbox/not_valid2.test
deleted file mode 100644
index bb2a329715..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/sandbox/not_valid2.test
+++ /dev/null
@@ -1,14 +0,0 @@
---TEST--
-sandbox tag
---TEMPLATE--
-{%- sandbox %}
- {%- include "foo.twig" %}
-
- {% if 1 %}
- {%- include "foo.twig" %}
- {% endif %}
-{%- endsandbox %}
---TEMPLATE(foo.twig)--
-foo
---EXCEPTION--
-Twig\Error\SyntaxError: Only "include" tags are allowed within a "sandbox" section in "index.twig" at line 5.
diff --git a/vendor/twig/twig/tests/Fixtures/tags/sandbox/simple.test b/vendor/twig/twig/tests/Fixtures/tags/sandbox/simple.test
deleted file mode 100644
index 4d232d8bbd..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/sandbox/simple.test
+++ /dev/null
@@ -1,22 +0,0 @@
---TEST--
-sandbox tag
---TEMPLATE--
-{%- sandbox %}
- {%- include "foo.twig" %}
-{%- endsandbox %}
-
-{%- sandbox %}
- {%- include "foo.twig" %}
- {%- include "foo.twig" %}
-{%- endsandbox %}
-
-{%- sandbox %}{% include "foo.twig" %}{% endsandbox %}
---TEMPLATE(foo.twig)--
-foo
---DATA--
-return []
---EXPECT--
-foo
-foo
-foo
-foo
diff --git a/vendor/twig/twig/tests/Fixtures/tags/set/basic.test b/vendor/twig/twig/tests/Fixtures/tags/set/basic.test
deleted file mode 100644
index aae1427e81..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/set/basic.test
+++ /dev/null
@@ -1,20 +0,0 @@
---TEST--
-"set" tag
---TEMPLATE--
-{% set foo = 'foo' %}
-{% set bar = 'foo<br />' %}
-
-{{ foo }}
-{{ bar }}
-
-{% set foo, bar = 'foo', 'bar' %}
-
-{{ foo }}{{ bar }}
---DATA--
-return []
---EXPECT--
-foo
-foo<br />
-
-
-foobar
diff --git a/vendor/twig/twig/tests/Fixtures/tags/set/capture-empty.test b/vendor/twig/twig/tests/Fixtures/tags/set/capture-empty.test
deleted file mode 100644
index 97fc43cc2a..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/set/capture-empty.test
+++ /dev/null
@@ -1,9 +0,0 @@
---TEST--
-"set" tag block empty capture
---TEMPLATE--
-{% set foo %}{% endset %}
-
-{% if foo %}FAIL{% endif %}
---DATA--
-return []
---EXPECT--
diff --git a/vendor/twig/twig/tests/Fixtures/tags/set/capture.test b/vendor/twig/twig/tests/Fixtures/tags/set/capture.test
deleted file mode 100644
index c3faf25003..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/set/capture.test
+++ /dev/null
@@ -1,10 +0,0 @@
---TEST--
-"set" tag block capture
---TEMPLATE--
-{% set foo %}f<br />o<br />o{% endset %}
-
-{{ foo }}
---DATA--
-return []
---EXPECT--
-f<br />o<br />o
diff --git a/vendor/twig/twig/tests/Fixtures/tags/set/capture_scope.test b/vendor/twig/twig/tests/Fixtures/tags/set/capture_scope.test
deleted file mode 100644
index bb2bbebaf0..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/set/capture_scope.test
+++ /dev/null
@@ -1,10 +0,0 @@
---TEST--
-"set" tag block capture
---TEMPLATE--
-{% set foo %}{{ foo }}{% endset %}
-
-{{ foo }}
---DATA--
-return ['foo' => 'foo']
---EXPECT--
-foo
diff --git a/vendor/twig/twig/tests/Fixtures/tags/set/expression.test b/vendor/twig/twig/tests/Fixtures/tags/set/expression.test
deleted file mode 100644
index bd472771a6..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/set/expression.test
+++ /dev/null
@@ -1,12 +0,0 @@
---TEST--
-"set" tag
---TEMPLATE--
-{% set foo, bar = 'foo' ~ 'bar', 'bar' ~ 'foo' %}
-
-{{ foo }}
-{{ bar }}
---DATA--
-return []
---EXPECT--
-foobar
-barfoo
diff --git a/vendor/twig/twig/tests/Fixtures/tags/set/inheritance.test b/vendor/twig/twig/tests/Fixtures/tags/set/inheritance.test
deleted file mode 100644
index 79e89ce79b..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/set/inheritance.test
+++ /dev/null
@@ -1,24 +0,0 @@
---TEST--
-"set" tag with inheritance
---TEMPLATE--
-{% extends "layout.twig" %}
-
-{% set bar %}bar{% endset %}
-
-{% block var_from_child %}
- {{- bar -}}
-{% endblock %}
---TEMPLATE(layout.twig)--
-{% set foo %}foo{% endset %}
-
-{% block var_from_layout %}
- {{- foo -}}
-{% endblock %}
-
-{% block var_from_child %}
-{% endblock %}
---DATA--
-return []
---EXPECT--
-foo
-bar
diff --git a/vendor/twig/twig/tests/Fixtures/tags/set/inheritance_overriding.test b/vendor/twig/twig/tests/Fixtures/tags/set/inheritance_overriding.test
deleted file mode 100644
index 2d23c83ae6..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/set/inheritance_overriding.test
+++ /dev/null
@@ -1,24 +0,0 @@
---TEST--
-"set" tag with inheritance
---TEMPLATE--
-{% extends "layout.twig" %}
-
-{% set foo %}bar{% endset %}
-
-{% block var_from_child %}
- {{- foo -}}
-{% endblock %}
---TEMPLATE(layout.twig)--
-{% set foo %}foo{% endset %}
-
-{% block var_from_layout %}
- {{- foo -}}
-{% endblock %}
-
-{% block var_from_child %}
-{% endblock %}
---DATA--
-return []
---EXPECT--
-foo
-foo
diff --git a/vendor/twig/twig/tests/Fixtures/tags/set/mutating.test b/vendor/twig/twig/tests/Fixtures/tags/set/mutating.test
deleted file mode 100644
index ae388bb873..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/set/mutating.test
+++ /dev/null
@@ -1,17 +0,0 @@
---TEST--
-"set" tag
---TEMPLATE--
-{% set foo = "foo" %}
-
-{% set bar %}
- {%- set foo = "bar" -%}
- bar
-{% endset %}
-
-{{ foo }}
-{{ bar }}
---DATA--
-return []
---EXPECT--
-bar
-bar
diff --git a/vendor/twig/twig/tests/Fixtures/tags/spaceless/simple.test b/vendor/twig/twig/tests/Fixtures/tags/spaceless/simple.test
deleted file mode 100644
index 98bd27a13a..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/spaceless/simple.test
+++ /dev/null
@@ -1,12 +0,0 @@
---TEST--
-"spaceless" tag removes whites between HTML tags
---TEMPLATE--
-{% spaceless %}
-
- <div> <div> foo </div> </div>
-
-{% endspaceless %}
---DATA--
-return []
---EXPECT--
-<div><div> foo </div></div>
diff --git a/vendor/twig/twig/tests/Fixtures/tags/special_chars.test b/vendor/twig/twig/tests/Fixtures/tags/special_chars.test
deleted file mode 100644
index 64ffd1d76b..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/special_chars.test
+++ /dev/null
@@ -1,8 +0,0 @@
---TEST--
-"§" custom tag
---TEMPLATE--
-{% § %}
---DATA--
-return []
---EXPECT--
-§
diff --git a/vendor/twig/twig/tests/Fixtures/tags/use/aliases.test b/vendor/twig/twig/tests/Fixtures/tags/use/aliases.test
deleted file mode 100644
index b6b1d5c668..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/use/aliases.test
+++ /dev/null
@@ -1,12 +0,0 @@
---TEST--
-"use" tag
---TEMPLATE--
-{% use "blocks.twig" with content as foo %}
-
-{{ block('foo') }}
---TEMPLATE(blocks.twig)--
-{% block content 'foo' %}
---DATA--
-return []
---EXPECT--
-foo
diff --git a/vendor/twig/twig/tests/Fixtures/tags/use/basic.test b/vendor/twig/twig/tests/Fixtures/tags/use/basic.test
deleted file mode 100644
index be622a10e2..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/use/basic.test
+++ /dev/null
@@ -1,12 +0,0 @@
---TEST--
-"use" tag
---TEMPLATE--
-{% use "blocks.twig" %}
-
-{{ block('content') }}
---TEMPLATE(blocks.twig)--
-{% block content 'foo' %}
---DATA--
-return []
---EXPECT--
-foo
diff --git a/vendor/twig/twig/tests/Fixtures/tags/use/deep.test b/vendor/twig/twig/tests/Fixtures/tags/use/deep.test
deleted file mode 100644
index 771ba642b9..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/use/deep.test
+++ /dev/null
@@ -1,22 +0,0 @@
---TEST--
-"use" tag
---TEMPLATE--
-{% use "foo.twig" %}
-
-{{ block('content') }}
-{{ block('foo') }}
-{{ block('bar') }}
---TEMPLATE(foo.twig)--
-{% use "bar.twig" %}
-
-{% block content 'foo' %}
-{% block foo 'foo' %}
---TEMPLATE(bar.twig)--
-{% block content 'bar' %}
-{% block bar 'bar' %}
---DATA--
-return []
---EXPECT--
-foo
-foo
-bar
diff --git a/vendor/twig/twig/tests/Fixtures/tags/use/deep_empty.test b/vendor/twig/twig/tests/Fixtures/tags/use/deep_empty.test
deleted file mode 100644
index f14ce83de5..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/use/deep_empty.test
+++ /dev/null
@@ -1,10 +0,0 @@
---TEST--
-"use" tag
---TEMPLATE--
-{% use "foo.twig" %}
---TEMPLATE(foo.twig)--
-{% use "bar.twig" %}
---TEMPLATE(bar.twig)--
---DATA--
-return []
---EXPECT--
diff --git a/vendor/twig/twig/tests/Fixtures/tags/use/inheritance.test b/vendor/twig/twig/tests/Fixtures/tags/use/inheritance.test
deleted file mode 100644
index 1edeaa1115..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/use/inheritance.test
+++ /dev/null
@@ -1,25 +0,0 @@
---TEST--
-"use" tag
---TEMPLATE--
-{% use "parent.twig" %}
-
-{{ block('container') }}
---TEMPLATE(parent.twig)--
-{% use "ancestor.twig" %}
-
-{% block sub_container %}
- <div class="overridden_sub_container">overridden sub_container</div>
-{% endblock %}
---TEMPLATE(ancestor.twig)--
-{% block container %}
- <div class="container">{{ block('sub_container') }}</div>
-{% endblock %}
-
-{% block sub_container %}
- <div class="sub_container">sub_container</div>
-{% endblock %}
---DATA--
-return []
---EXPECT--
-<div class="container"> <div class="overridden_sub_container">overridden sub_container</div>
-</div>
diff --git a/vendor/twig/twig/tests/Fixtures/tags/use/inheritance2.test b/vendor/twig/twig/tests/Fixtures/tags/use/inheritance2.test
deleted file mode 100644
index accec5094b..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/use/inheritance2.test
+++ /dev/null
@@ -1,24 +0,0 @@
---TEST--
-"use" tag
---TEMPLATE--
-{% use "ancestor.twig" %}
-{% use "parent.twig" %}
-
-{{ block('container') }}
---TEMPLATE(parent.twig)--
-{% block sub_container %}
- <div class="overridden_sub_container">overridden sub_container</div>
-{% endblock %}
---TEMPLATE(ancestor.twig)--
-{% block container %}
- <div class="container">{{ block('sub_container') }}</div>
-{% endblock %}
-
-{% block sub_container %}
- <div class="sub_container">sub_container</div>
-{% endblock %}
---DATA--
-return []
---EXPECT--
-<div class="container"> <div class="overridden_sub_container">overridden sub_container</div>
-</div>
diff --git a/vendor/twig/twig/tests/Fixtures/tags/use/multiple.test b/vendor/twig/twig/tests/Fixtures/tags/use/multiple.test
deleted file mode 100644
index 85a63958df..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/use/multiple.test
+++ /dev/null
@@ -1,21 +0,0 @@
---TEST--
-"use" tag
---TEMPLATE--
-{% use "foo.twig" %}
-{% use "bar.twig" %}
-
-{{ block('content') }}
-{{ block('foo') }}
-{{ block('bar') }}
---TEMPLATE(foo.twig)--
-{% block content 'foo' %}
-{% block foo 'foo' %}
---TEMPLATE(bar.twig)--
-{% block content 'bar' %}
-{% block bar 'bar' %}
---DATA--
-return []
---EXPECT--
-bar
-foo
-bar
diff --git a/vendor/twig/twig/tests/Fixtures/tags/use/multiple_aliases.test b/vendor/twig/twig/tests/Fixtures/tags/use/multiple_aliases.test
deleted file mode 100644
index 413bdfa4dd..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/use/multiple_aliases.test
+++ /dev/null
@@ -1,23 +0,0 @@
---TEST--
-"use" tag
---TEMPLATE--
-{% use "foo.twig" with content as foo_content %}
-{% use "bar.twig" %}
-
-{{ block('content') }}
-{{ block('foo') }}
-{{ block('bar') }}
-{{ block('foo_content') }}
---TEMPLATE(foo.twig)--
-{% block content 'foo' %}
-{% block foo 'foo' %}
---TEMPLATE(bar.twig)--
-{% block content 'bar' %}
-{% block bar 'bar' %}
---DATA--
-return []
---EXPECT--
-bar
-foo
-bar
-foo
diff --git a/vendor/twig/twig/tests/Fixtures/tags/use/parent_block.test b/vendor/twig/twig/tests/Fixtures/tags/use/parent_block.test
deleted file mode 100644
index 49328f6e87..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/use/parent_block.test
+++ /dev/null
@@ -1,24 +0,0 @@
---TEST--
-"use" tag
---TEMPLATE--
-{% use 'file2.html.twig' with foobar as base_base_foobar %}
-{% block foobar %}
- {{- block('base_base_foobar') -}}
- Content of block (second override)
-{% endblock foobar %}
---TEMPLATE(file2.html.twig)--
-{% use 'file1.html.twig' with foobar as base_foobar %}
-{% block foobar %}
- {{- block('base_foobar') -}}
- Content of block (first override)
-{% endblock foobar %}
---TEMPLATE(file1.html.twig)--
-{% block foobar -%}
- Content of block
-{% endblock foobar %}
---DATA--
-return []
---EXPECT--
-Content of block
-Content of block (first override)
-Content of block (second override)
diff --git a/vendor/twig/twig/tests/Fixtures/tags/use/parent_block2.test b/vendor/twig/twig/tests/Fixtures/tags/use/parent_block2.test
deleted file mode 100644
index 274baa8216..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/use/parent_block2.test
+++ /dev/null
@@ -1,24 +0,0 @@
---TEST--
-"use" tag
---TEMPLATE--
-{% use 'file2.html.twig'%}
-{% block foobar %}
- {{- parent() -}}
- Content of block (second override)
-{% endblock foobar %}
---TEMPLATE(file2.html.twig)--
-{% use 'file1.html.twig' %}
-{% block foobar %}
- {{- parent() -}}
- Content of block (first override)
-{% endblock foobar %}
---TEMPLATE(file1.html.twig)--
-{% block foobar -%}
- Content of block
-{% endblock foobar %}
---DATA--
-return []
---EXPECT--
-Content of block
-Content of block (first override)
-Content of block (second override)
diff --git a/vendor/twig/twig/tests/Fixtures/tags/use/parent_block3.test b/vendor/twig/twig/tests/Fixtures/tags/use/parent_block3.test
deleted file mode 100644
index f6f221273f..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/use/parent_block3.test
+++ /dev/null
@@ -1,38 +0,0 @@
---TEST--
-"use" tag
---TEMPLATE--
-{% use 'file2.html.twig' %}
-{% use 'file1.html.twig' with foo %}
-{% block foo %}
- {{- parent() -}}
- Content of foo (second override)
-{% endblock foo %}
-{% block bar %}
- {{- parent() -}}
- Content of bar (second override)
-{% endblock bar %}
---TEMPLATE(file2.html.twig)--
-{% use 'file1.html.twig' %}
-{% block foo %}
- {{- parent() -}}
- Content of foo (first override)
-{% endblock foo %}
-{% block bar %}
- {{- parent() -}}
- Content of bar (first override)
-{% endblock bar %}
---TEMPLATE(file1.html.twig)--
-{% block foo -%}
- Content of foo
-{% endblock foo %}
-{% block bar -%}
- Content of bar
-{% endblock bar %}
---DATA--
-return []
---EXPECT--
-Content of foo
-Content of foo (first override)
-Content of foo (second override)
-Content of bar
-Content of bar (second override)
diff --git a/vendor/twig/twig/tests/Fixtures/tags/use/use_with_parent.test b/vendor/twig/twig/tests/Fixtures/tags/use/use_with_parent.test
deleted file mode 100644
index fad9a2d189..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/use/use_with_parent.test
+++ /dev/null
@@ -1,24 +0,0 @@
---TEST--
-"use" tag with a parent block
---TEMPLATE--
-{% extends "parent.twig" %}
-
-{% use 'blocks.twig' %}
-
-{% block body %}
- {{ parent() -}}
- CHILD
- {{ block('content') }}
-{% endblock %}
---TEMPLATE(parent.twig)--
-{% block body %}
- PARENT
-{% endblock %}
---TEMPLATE(blocks.twig)--
-{% block content 'BLOCK' %}
---DATA--
-return []
---EXPECT--
-PARENT
-CHILD
- BLOCK
diff --git a/vendor/twig/twig/tests/Fixtures/tags/verbatim/basic.test b/vendor/twig/twig/tests/Fixtures/tags/verbatim/basic.test
deleted file mode 100644
index 9b60abc49f..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/verbatim/basic.test
+++ /dev/null
@@ -1,10 +0,0 @@
---TEST--
-"verbatim" tag
---TEMPLATE--
-{% verbatim %}
-{{ foo }}
-{% endverbatim %}
---DATA--
-return []
---EXPECT--
-{{ foo }}
diff --git a/vendor/twig/twig/tests/Fixtures/tags/verbatim/mixed_usage_with_raw.test b/vendor/twig/twig/tests/Fixtures/tags/verbatim/mixed_usage_with_raw.test
deleted file mode 100644
index 2177538d51..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/verbatim/mixed_usage_with_raw.test
+++ /dev/null
@@ -1,10 +0,0 @@
---TEST--
-"verbatim" tag
---TEMPLATE--
-{% verbatim %}
-{{ foo }}
-{% endraw %}
---DATA--
-return []
---EXCEPTION--
-Twig\Error\SyntaxError: Unexpected end of file: Unclosed "verbatim" block in "index.twig" at line 2.
diff --git a/vendor/twig/twig/tests/Fixtures/tags/verbatim/whitespace_control.test b/vendor/twig/twig/tests/Fixtures/tags/verbatim/whitespace_control.test
deleted file mode 100644
index 501922bddd..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/verbatim/whitespace_control.test
+++ /dev/null
@@ -1,56 +0,0 @@
---TEST--
-"verbatim" tag
---TEMPLATE--
-1***
-
-{%- verbatim %}
- {{ 'bla' }}
-{% endverbatim %}
-
-1***
-2***
-
-{%- verbatim -%}
- {{ 'bla' }}
-{% endverbatim %}
-
-2***
-3***
-
-{%- verbatim -%}
- {{ 'bla' }}
-{% endverbatim -%}
-
-3***
-4***
-
-{%- verbatim -%}
- {{ 'bla' }}
-{%- endverbatim %}
-
-4***
-5***
-
-{%- verbatim -%}
- {{ 'bla' }}
-{%- endverbatim -%}
-
-5***
---DATA--
-return []
---EXPECT--
-1***
- {{ 'bla' }}
-
-
-1***
-2***{{ 'bla' }}
-
-
-2***
-3***{{ 'bla' }}
-3***
-4***{{ 'bla' }}
-
-4***
-5***{{ 'bla' }}5***
diff --git a/vendor/twig/twig/tests/Fixtures/tags/with/basic.test b/vendor/twig/twig/tests/Fixtures/tags/with/basic.test
deleted file mode 100644
index 7c2abd0f9b..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/with/basic.test
+++ /dev/null
@@ -1,13 +0,0 @@
---TEST--
-"with" tag
---TEMPLATE--
-{% with %}
- {% set bar = 'BAZ' %}
- {{ foo }}{{ bar }}
-{% endwith %}
-{{ foo }}{{ bar }}
---DATA--
-return ['foo' => 'foo', 'bar' => 'bar']
---EXPECT--
-fooBAZ
-foobar
diff --git a/vendor/twig/twig/tests/Fixtures/tags/with/expression.test b/vendor/twig/twig/tests/Fixtures/tags/with/expression.test
deleted file mode 100644
index e4433d44c8..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/with/expression.test
+++ /dev/null
@@ -1,10 +0,0 @@
---TEST--
-"with" tag with expression
---TEMPLATE--
-{% with {foo: 'foo', bar: 'BAZ'} %}
- {{ foo }}{{ bar }}
-{% endwith %}
---DATA--
-return ['foo' => 'baz']
---EXPECT--
-fooBAZ
diff --git a/vendor/twig/twig/tests/Fixtures/tags/with/globals.test b/vendor/twig/twig/tests/Fixtures/tags/with/globals.test
deleted file mode 100644
index b030e7eff3..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/with/globals.test
+++ /dev/null
@@ -1,10 +0,0 @@
---TEST--
-"with" tag
---TEMPLATE--
-{% with [] only %}
- {{ global }}
-{% endwith %}
---DATA--
-return []
---EXPECT--
-global
diff --git a/vendor/twig/twig/tests/Fixtures/tags/with/iterable.test b/vendor/twig/twig/tests/Fixtures/tags/with/iterable.test
deleted file mode 100644
index 1b0cbc63e5..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/with/iterable.test
+++ /dev/null
@@ -1,10 +0,0 @@
---TEST--
-"with" tag with an iterable expression
---TEMPLATE--
-{% with vars %}
- {{ foo }}{{ bar }}
-{% endwith %}
---DATA--
-return ['vars' => new ArrayObject(['foo' => 'baz', 'bar' => 'qux'])]
---EXPECT--
-bazqux
diff --git a/vendor/twig/twig/tests/Fixtures/tags/with/nested.test b/vendor/twig/twig/tests/Fixtures/tags/with/nested.test
deleted file mode 100644
index 33ca390b2a..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/with/nested.test
+++ /dev/null
@@ -1,15 +0,0 @@
---TEST--
-nested "with" tags
---TEMPLATE--
-{% set foo, bar = 'foo', 'bar' %}
-{% with {bar: 'BAZ'} %}
- {% with {foo: 'FOO'} %}
- {{ foo }}{{ bar }}
- {% endwith %}
-{% endwith %}
-{{ foo }}{{ bar }}
---DATA--
-return []
---EXPECT--
-FOOBAZ
- foobar
diff --git a/vendor/twig/twig/tests/Fixtures/tags/with/with_no_hash.test b/vendor/twig/twig/tests/Fixtures/tags/with/with_no_hash.test
deleted file mode 100644
index 7083050b42..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/with/with_no_hash.test
+++ /dev/null
@@ -1,10 +0,0 @@
---TEST--
-"with" tag with an expression that is not a hash
---TEMPLATE--
-{% with vars %}
- {{ foo }}{{ bar }}
-{% endwith %}
---DATA--
-return ['vars' => 'no-hash']
---EXCEPTION--
-Twig\Error\RuntimeError: Variables passed to the "with" tag must be a hash in "index.twig" at line 2.
diff --git a/vendor/twig/twig/tests/Fixtures/tags/with/with_only.test b/vendor/twig/twig/tests/Fixtures/tags/with/with_only.test
deleted file mode 100644
index 1aca34fc15..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tags/with/with_only.test
+++ /dev/null
@@ -1,10 +0,0 @@
---TEST--
-"with" tag with expression and only
---TEMPLATE--
-{% with {foo: 'foo', bar: 'BAZ'} only %}
- {{ foo }}{{ bar }}{{ baz }}
-{% endwith %}
---DATA--
-return ['foo' => 'baz', 'baz' => 'baz']
---EXCEPTION--
-Twig\Error\RuntimeError: Variable "baz" does not exist in "index.twig" at line 3.
diff --git a/vendor/twig/twig/tests/Fixtures/tests/array.test b/vendor/twig/twig/tests/Fixtures/tests/array.test
deleted file mode 100644
index 7c9a6c80aa..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tests/array.test
+++ /dev/null
@@ -1,24 +0,0 @@
---TEST--
-array index test
---TEMPLATE--
-{% for key, value in days %}
-{{ key }}
-{% endfor %}
---DATA--
-return ['days' => [
- 1 => ['money' => 9],
- 2 => ['money' => 21],
- 3 => ['money' => 38],
- 4 => ['money' => 6],
- 18 => ['money' => 6],
- 19 => ['money' => 3],
- 31 => ['money' => 11],
-]]
---EXPECT--
-1
-2
-3
-4
-18
-19
-31
diff --git a/vendor/twig/twig/tests/Fixtures/tests/constant.test b/vendor/twig/twig/tests/Fixtures/tests/constant.test
deleted file mode 100644
index d4a9be7764..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tests/constant.test
+++ /dev/null
@@ -1,14 +0,0 @@
---TEST--
-"const" test
---TEMPLATE--
-{{ 8 is constant('E_NOTICE') ? 'ok' : 'no' }}
-{{ 'bar' is constant('Twig\\Tests\\TwigTestFoo::BAR_NAME') ? 'ok' : 'no' }}
-{{ value is constant('Twig\\Tests\\TwigTestFoo::BAR_NAME') ? 'ok' : 'no' }}
-{{ 2 is constant('ARRAY_AS_PROPS', object) ? 'ok' : 'no' }}
---DATA--
-return ['value' => 'bar', 'object' => new \ArrayObject(['hi'])]
---EXPECT--
-ok
-ok
-ok
-ok
\ No newline at end of file
diff --git a/vendor/twig/twig/tests/Fixtures/tests/defined.test b/vendor/twig/twig/tests/Fixtures/tests/defined.test
deleted file mode 100644
index 1648c66fba..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tests/defined.test
+++ /dev/null
@@ -1,129 +0,0 @@
---TEST--
-"defined" test
---TEMPLATE--
-{{ definedVar is defined ? 'ok' : 'ko' }}
-{{ definedVar is not defined ? 'ko' : 'ok' }}
-{{ undefinedVar is defined ? 'ko' : 'ok' }}
-{{ undefinedVar is not defined ? 'ok' : 'ko' }}
-{{ zeroVar is defined ? 'ok' : 'ko' }}
-{{ nullVar is defined ? 'ok' : 'ko' }}
-{{ nested.definedVar is defined ? 'ok' : 'ko' }}
-{{ nested['definedVar'] is defined ? 'ok' : 'ko' }}
-{{ nested.definedVar is not defined ? 'ko' : 'ok' }}
-{{ nested.undefinedVar is defined ? 'ko' : 'ok' }}
-{{ nested['undefinedVar'] is defined ? 'ko' : 'ok' }}
-{{ nested.undefinedVar is not defined ? 'ok' : 'ko' }}
-{{ nested.zeroVar is defined ? 'ok' : 'ko' }}
-{{ nested.nullVar is defined ? 'ok' : 'ko' }}
-{{ nested.definedArray.0 is defined ? 'ok' : 'ko' }}
-{{ nested['definedArray'][0] is defined ? 'ok' : 'ko' }}
-{{ object.foo is defined ? 'ok' : 'ko' }}
-{{ object.undefinedMethod is defined ? 'ko' : 'ok' }}
-{{ object.getFoo() is defined ? 'ok' : 'ko' }}
-{{ object.getFoo('a') is defined ? 'ok' : 'ko' }}
-{{ object.undefinedMethod() is defined ? 'ko' : 'ok' }}
-{{ object.undefinedMethod('a') is defined ? 'ko' : 'ok' }}
-{{ object.self.foo is defined ? 'ok' : 'ko' }}
-{{ object.self.undefinedMethod is defined ? 'ko' : 'ok' }}
-{{ object.undefinedMethod.self is defined ? 'ko' : 'ok' }}
-{{ 0 is defined ? 'ok' : 'ko' }}
-{{ "foo" is defined ? 'ok' : 'ko' }}
-{{ true is defined ? 'ok' : 'ko' }}
-{{ false is defined ? 'ok' : 'ko' }}
-{{ null is defined ? 'ok' : 'ko' }}
-{{ [1, 2] is defined ? 'ok' : 'ko' }}
-{{ { foo: "bar" } is defined ? 'ok' : 'ko' }}
---DATA--
-return [
- 'definedVar' => 'defined',
- 'zeroVar' => 0,
- 'nullVar' => null,
- 'nested' => [
- 'definedVar' => 'defined',
- 'zeroVar' => 0,
- 'nullVar' => null,
- 'definedArray' => [0],
- ],
- 'object' => new Twig\Tests\TwigTestFoo(),
-]
---EXPECT--
-ok
-ok
-ok
-ok
-ok
-ok
-ok
-ok
-ok
-ok
-ok
-ok
-ok
-ok
-ok
-ok
-ok
-ok
-ok
-ok
-ok
-ok
-ok
-ok
-ok
-ok
-ok
-ok
-ok
-ok
-ok
-ok
---DATA--
-return [
- 'definedVar' => 'defined',
- 'zeroVar' => 0,
- 'nullVar' => null,
- 'nested' => [
- 'definedVar' => 'defined',
- 'zeroVar' => 0,
- 'nullVar' => null,
- 'definedArray' => [0],
- ],
- 'object' => new Twig\Tests\TwigTestFoo(),
-]
---CONFIG--
-return ['strict_variables' => false]
---EXPECT--
-ok
-ok
-ok
-ok
-ok
-ok
-ok
-ok
-ok
-ok
-ok
-ok
-ok
-ok
-ok
-ok
-ok
-ok
-ok
-ok
-ok
-ok
-ok
-ok
-ok
-ok
-ok
-ok
-ok
-ok
-ok
-ok
diff --git a/vendor/twig/twig/tests/Fixtures/tests/defined_for_attribute.test b/vendor/twig/twig/tests/Fixtures/tests/defined_for_attribute.test
deleted file mode 100644
index 5fd2fe3f2d..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tests/defined_for_attribute.test
+++ /dev/null
@@ -1,35 +0,0 @@
---TEST--
-"defined" support for attribute
---TEMPLATE--
-{{ attribute(nested, "definedVar") is defined ? 'ok' : 'ko' }}
-{{ attribute(nested, "undefinedVar") is not defined ? 'ok' : 'ko' }}
-{{ attribute(nested, definedVarName) is defined ? 'ok' : 'ko' }}
-{{ attribute(nested, undefinedVarName) is not defined ? 'ok' : 'ko' }}
---DATA--
-return [
- 'nested' => [
- 'definedVar' => 'defined',
- ],
- 'definedVarName' => 'definedVar',
- 'undefinedVarName' => 'undefinedVar',
-]
---EXPECT--
-ok
-ok
-ok
-ok
---DATA--
-return [
- 'nested' => [
- 'definedVar' => 'defined',
- ],
- 'definedVarName' => 'definedVar',
- 'undefinedVarName' => 'undefinedVar',
-]
---CONFIG--
-return ['strict_variables' => false]
---EXPECT--
-ok
-ok
-ok
-ok
diff --git a/vendor/twig/twig/tests/Fixtures/tests/defined_for_blocks.test b/vendor/twig/twig/tests/Fixtures/tests/defined_for_blocks.test
deleted file mode 100644
index c8b90f8c9c..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tests/defined_for_blocks.test
+++ /dev/null
@@ -1,38 +0,0 @@
---TEST--
-"defined" support for blocks
---TEMPLATE--
-{% extends 'parent' %}
-{% block icon %}icon{% endblock %}
-{% block body %}
- {{ parent() }}
- {{ block('foo') is defined ? 'ok' : 'ko' }}
- {{ block('footer') is defined ? 'ok' : 'ko' }}
- {{ block('icon') is defined ? 'ok' : 'ko' }}
- {{ block('block1') is defined ? 'ok' : 'ko' }}
- {%- embed 'embed' %}
- {% block content %}content{% endblock %}
- {% endembed %}
-{% endblock %}
-{% use 'blocks' %}
---TEMPLATE(parent)--
-{% block body %}
- {{ block('icon') is defined ? 'ok' : 'ko' -}}
-{% endblock %}
-{% block footer %}{% endblock %}
---TEMPLATE(embed)--
-{{ block('icon') is defined ? 'ok' : 'ko' }}
-{{ block('content') is defined ? 'ok' : 'ko' }}
-{{ block('block1') is defined ? 'ok' : 'ko' }}
---TEMPLATE(blocks)--
-{% block block1 %}{%endblock %}
---DATA--
-return []
---EXPECT--
-ok
- ko
- ok
- ok
- ok
-ko
-ok
-ko
diff --git a/vendor/twig/twig/tests/Fixtures/tests/defined_for_blocks_with_template.test b/vendor/twig/twig/tests/Fixtures/tests/defined_for_blocks_with_template.test
deleted file mode 100644
index 68540de7aa..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tests/defined_for_blocks_with_template.test
+++ /dev/null
@@ -1,17 +0,0 @@
---TEST--
-"defined" support for blocks with a template argument
---TEMPLATE--
-{{ block('foo', 'included.twig') is defined ? 'ok' : 'ko' }}
-{{ block('foo', included_loaded) is defined ? 'ok' : 'ko' }}
-{{ block('foo', included_loaded_internal) is defined ? 'ok' : 'ko' }}
---TEMPLATE(included.twig)--
-{% block foo %}FOO{% endblock %}
---DATA--
-return [
- 'included_loaded' => $twig->load('included.twig'),
- 'included_loaded_internal' => $twig->load('included.twig'),
-]
---EXPECT--
-ok
-ok
-ok
diff --git a/vendor/twig/twig/tests/Fixtures/tests/defined_for_constants.test b/vendor/twig/twig/tests/Fixtures/tests/defined_for_constants.test
deleted file mode 100644
index 62172e4f1f..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tests/defined_for_constants.test
+++ /dev/null
@@ -1,14 +0,0 @@
---TEST--
-"defined" support for constants
---TEMPLATE--
-{{ constant('DATE_W3C') is defined ? 'ok' : 'ko' }}
-{{ constant('ARRAY_AS_PROPS', object) is defined ? 'ok' : 'ko' }}
-{{ constant('FOOBAR') is not defined ? 'ok' : 'ko' }}
-{{ constant('FOOBAR', object) is not defined ? 'ok' : 'ko' }}
---DATA--
-return ['expect' => DATE_W3C, 'object' => new \ArrayObject(['hi'])]
---EXPECT--
-ok
-ok
-ok
-ok
diff --git a/vendor/twig/twig/tests/Fixtures/tests/defined_on_complex_expr.test b/vendor/twig/twig/tests/Fixtures/tests/defined_on_complex_expr.test
deleted file mode 100644
index 2d0615832f..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tests/defined_on_complex_expr.test
+++ /dev/null
@@ -1,8 +0,0 @@
---TEST--
-"defined" support for "complex" expressions
---TEMPLATE--
-{{ (1 + 2) is defined ? 'ok' : 'ko' }}
---DATA--
-return []
---EXCEPTION--
-Twig\Error\SyntaxError: The "defined" test only works with simple variables in "index.twig" at line 2.
diff --git a/vendor/twig/twig/tests/Fixtures/tests/dynamic_test.test b/vendor/twig/twig/tests/Fixtures/tests/dynamic_test.test
deleted file mode 100644
index 41625f6af1..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tests/dynamic_test.test
+++ /dev/null
@@ -1,14 +0,0 @@
---TEST--
-dynamic test
---TEMPLATE--
-{{ 'bar' is test_bar ? '1' :'0' }}
-{{ 'foo' is test_foo ? '1' :'0' }}
-{{ 'bar' is test_foo ? '1' :'0' }}
-{{ 'foo' is test_bar ? '1' :'0' }}
---DATA--
-return []
---EXPECT--
-1
-1
-0
-0
diff --git a/vendor/twig/twig/tests/Fixtures/tests/empty.test b/vendor/twig/twig/tests/Fixtures/tests/empty.test
deleted file mode 100644
index ffcd518708..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tests/empty.test
+++ /dev/null
@@ -1,54 +0,0 @@
---TEST--
-"empty" test
---TEMPLATE--
-{{ string_empty is empty ? 'ok' : 'ko' }}
-{{ string_zero is empty ? 'ko' : 'ok' }}
-{{ value_null is empty ? 'ok' : 'ko' }}
-{{ value_false is empty ? 'ok' : 'ko' }}
-{{ value_int_zero is empty ? 'ko' : 'ok' }}
-{{ array_empty is empty ? 'ok' : 'ko' }}
-{{ array_not_empty is empty ? 'ko' : 'ok' }}
-{{ magically_callable is empty ? 'ko' : 'ok' }}
-{{ countable_empty is empty ? 'ok' : 'ko' }}
-{{ countable_not_empty is empty ? 'ko' : 'ok' }}
-{{ tostring_empty is empty ? 'ok' : 'ko' }}
-{{ tostring_not_empty is empty ? 'ko' : 'ok' }}
-{{ markup_empty is empty ? 'ok' : 'ko' }}
-{{ markup_not_empty is empty ? 'ko' : 'ok' }}
-{{ iterator is empty ? 'ko' : 'ok' }}
-{{ empty_iterator is empty ? 'ok' : 'ko' }}
-{{ callback_iterator is empty ? 'ko' : 'ok' }}
-{{ empty_callback_iterator is empty ? 'ok' : 'ko' }}
---DATA--
-return [
- 'string_empty' => '', 'string_zero' => '0',
- 'value_null' => null, 'value_false' => false, 'value_int_zero' => 0,
- 'array_empty' => [], 'array_not_empty' => [1, 2],
- 'magically_callable' => new \Twig\Tests\MagicCallStub(),
- 'countable_empty' => new \Twig\Tests\CountableStub([]), 'countable_not_empty' => new \Twig\Tests\CountableStub([1, 2]),
- 'tostring_empty' => new \Twig\Tests\ToStringStub(''), 'tostring_not_empty' => new \Twig\Tests\ToStringStub('0' /* edge case of using "0" as the string */),
- 'markup_empty' => new \Twig\Markup('', 'UTF-8'), 'markup_not_empty' => new \Twig\Markup('test', 'UTF-8'),
- 'iterator' => $iter = new \ArrayIterator(['bar', 'foo']),
- 'empty_iterator' => new \ArrayIterator(),
- 'callback_iterator' => new \CallbackFilterIterator($iter, function ($el) { return true; }),
- 'empty_callback_iterator' => new \CallbackFilterIterator($iter, function ($el) { return false; }),
-]
---EXPECT--
-ok
-ok
-ok
-ok
-ok
-ok
-ok
-ok
-ok
-ok
-ok
-ok
-ok
-ok
-ok
-ok
-ok
-ok
diff --git a/vendor/twig/twig/tests/Fixtures/tests/even.test b/vendor/twig/twig/tests/Fixtures/tests/even.test
deleted file mode 100644
index 5c73b01e90..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tests/even.test
+++ /dev/null
@@ -1,14 +0,0 @@
---TEST--
-"even" test
---TEMPLATE--
-{{ 1 is even ? 'ko' : 'ok' }}
-{{ 2 is even ? 'ok' : 'ko' }}
-{{ 1 is not even ? 'ok' : 'ko' }}
-{{ 2 is not even ? 'ko' : 'ok' }}
---DATA--
-return []
---EXPECT--
-ok
-ok
-ok
-ok
diff --git a/vendor/twig/twig/tests/Fixtures/tests/in.test b/vendor/twig/twig/tests/Fixtures/tests/in.test
deleted file mode 100644
index f7b172e8d0..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tests/in.test
+++ /dev/null
@@ -1,118 +0,0 @@
---TEST--
-Twig supports the in operator
---TEMPLATE--
-{{ bar in foo ? 'OK' : 'KO' }}
-{{ not (bar in foo) ? 'KO' : 'OK' }}
-{{ bar not in foo ? 'KO' : 'OK' }}
-{{ 'a' in bar ? 'OK' : 'KO' }}
-{{ 'c' not in bar ? 'OK' : 'KO' }}
-{{ '' in bar ? 'OK' : 'KO' }}
-{{ '' in '' ? 'OK' : 'KO' }}
-{{ '0' not in '' ? 'OK' : 'KO' }}
-{{ 'a' not in '0' ? 'OK' : 'KO' }}
-{{ '0' in '0' ? 'OK' : 'KO' }}
-
-{{ false in [0, 1] ? 'OK' : 'KO' }}
-{{ true in [0, 1] ? 'OK' : 'KO' }}
-{{ '0' in [0, 1] ? 'OK' : 'KO' }}
-{{ '0' in [1, 0] ? 'OK' : 'KO' }}
-{{ '' in [0, 1] ? 'OK' : 'KO' }}
-{{ '' in [1, 0] ? 'OK' : 'KO' }}
-{{ 0 in ['', 1] ? 'OK' : 'KO' }}
-{{ 0 in [1, ''] ? 'OK' : 'KO' }}
-
-{{ '' in 'foo' ? 'OK' : 'KO' }}
-{{ 0 in 'foo' ? 'KO' : 'OK' }}
-{{ false in 'foo' ? 'KO' : 'OK' }}
-{{ false in '100' ? 'KO' : 'OK' }}
-{{ true in '100' ? 'KO' : 'OK' }}
-
-{{ [] in [true, false] ? 'OK' : 'KO' }}
-{{ [] in [true, ''] ? 'KO' : 'OK' }}
-{{ [] in [true, []] ? 'OK' : 'KO' }}
-
-{{ resource ? 'OK' : 'KO' }}
-{{ resource in 'foo'~resource ? 'KO' : 'OK' }}
-{{ object in 'stdClass' ? 'KO' : 'OK' }}
-{{ [] in 'Array' ? 'KO' : 'OK' }}
-{{ dir_object in 'foo'~dir_object ? 'KO' : 'OK' }}
-
-{{ ''~resource in resource ? 'KO' : 'OK' }}
-{{ 'stdClass' in object ? 'KO' : 'OK' }}
-{{ 'Array' in [] ? 'KO' : 'OK' }}
-{{ ''~dir_object in dir_object ? 'KO' : 'OK' }}
-
-{{ resource in [''~resource] ? 'KO' : 'OK' }}
-{{ resource in [resource + 1 - 1] ? 'KO' : 'OK' }}
-{{ dir_object in [''~dir_object] ? 'KO' : 'OK' }}
-
-{{ 5 in 125 ? 'KO' : 'OK' }}
-{{ 5 in '125' ? 'OK' : 'KO' }}
-{{ '5' in 125 ? 'KO' : 'OK' }}
-{{ '5' in '125' ? 'OK' : 'KO' }}
-
-{{ 5.5 in 125.5 ? 'KO' : 'OK' }}
-{{ 5.5 in '125.5' ? 'OK' : 'KO' }}
-{{ '5.5' in 125.5 ? 'KO' : 'OK' }}
-
-{{ safe in ['foo', 'bar'] ? 'OK' : 'KO' }}
-{{ 'fo' in safe ? 'OK' : 'KO' }}
---DATA--
-return ['bar' => 'bar', 'foo' => ['bar' => 'bar'], 'dir_object' => new \SplFileInfo(dirname(__FILE__)), 'object' => new \stdClass(), 'resource' => opendir(dirname(__FILE__)), 'safe' => new \Twig\Markup('foo', 'UTF-8')]
---EXPECT--
-OK
-OK
-OK
-OK
-OK
-OK
-OK
-OK
-OK
-OK
-
-OK
-OK
-OK
-OK
-OK
-OK
-OK
-OK
-
-OK
-OK
-OK
-OK
-OK
-
-OK
-OK
-OK
-
-OK
-OK
-OK
-OK
-OK
-
-OK
-OK
-OK
-OK
-
-OK
-OK
-OK
-
-OK
-OK
-OK
-OK
-
-OK
-OK
-OK
-
-OK
-OK
diff --git a/vendor/twig/twig/tests/Fixtures/tests/in_with_objects.test b/vendor/twig/twig/tests/Fixtures/tests/in_with_objects.test
deleted file mode 100644
index 1f9fc6393a..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tests/in_with_objects.test
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-Twig supports the in operator when using objects
---TEMPLATE--
-{% if object in object_list %}
-TRUE
-{% endif %}
---DATA--
-$foo = new Twig\Tests\TwigTestFoo();
-$foo1 = new Twig\Tests\TwigTestFoo();
-
-$foo->position = $foo1;
-$foo1->position = $foo;
-
-return [
- 'object' => $foo,
- 'object_list' => [$foo1, $foo],
-]
---EXPECT--
-TRUE
diff --git a/vendor/twig/twig/tests/Fixtures/tests/iterable.test b/vendor/twig/twig/tests/Fixtures/tests/iterable.test
deleted file mode 100644
index 75b5756e1e..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tests/iterable.test
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-"iterable" test
---TEMPLATE--
-{{ foo is iterable ? 'ok' : 'ko' }}
-{{ traversable is iterable ? 'ok' : 'ko' }}
-{{ obj is iterable ? 'ok' : 'ko' }}
-{{ val is iterable ? 'ok' : 'ko' }}
---DATA--
-return [
- 'foo' => [],
- 'traversable' => new \ArrayIterator([]),
- 'obj' => new \stdClass(),
- 'val' => 'test',
-]
---EXPECT--
-ok
-ok
-ko
-ko
\ No newline at end of file
diff --git a/vendor/twig/twig/tests/Fixtures/tests/null_coalesce.test b/vendor/twig/twig/tests/Fixtures/tests/null_coalesce.test
deleted file mode 100644
index 7af3255d61..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tests/null_coalesce.test
+++ /dev/null
@@ -1,30 +0,0 @@
---TEST--
-Twig supports the ?? operator
---TEMPLATE--
-{{ 'OK' ?? 'KO' }}
-{{ null ?? 'OK' }}
-{{ bar ?? 'KO' }}
-{{ baz ?? 'OK' }}
-{{ foo.bar ?? 'KO' }}
-{{ foo.missing ?? 'OK' }}
-{{ foo.bar.baz.missing ?? 'OK' }}
-{{ foo['bar'] ?? 'KO' }}
-{{ foo['missing'] ?? 'OK' }}
-{{ nope ?? nada ?? 'OK' }}
-{{ 1 + nope ?? nada ?? 2 }}
-{{ 1 + nope ?? 3 + nada ?? 2 }}
---DATA--
-return ['bar' => 'OK', 'foo' => ['bar' => 'OK']]
---EXPECT--
-OK
-OK
-OK
-OK
-OK
-OK
-OK
-OK
-OK
-OK
-3
-6
diff --git a/vendor/twig/twig/tests/Fixtures/tests/odd.test b/vendor/twig/twig/tests/Fixtures/tests/odd.test
deleted file mode 100644
index ec88bb519c..0000000000
--- a/vendor/twig/twig/tests/Fixtures/tests/odd.test
+++ /dev/null
@@ -1,10 +0,0 @@
---TEST--
-"odd" test
---TEMPLATE--
-{{ 1 is odd ? 'ok' : 'ko' }}
-{{ 2 is odd ? 'ko' : 'ok' }}
---DATA--
-return []
---EXPECT--
-ok
-ok
\ No newline at end of file
diff --git a/vendor/twig/twig/tests/Fixtures/whitespace/trim_block.test b/vendor/twig/twig/tests/Fixtures/whitespace/trim_block.test
deleted file mode 100644
index 346a11076c..0000000000
--- a/vendor/twig/twig/tests/Fixtures/whitespace/trim_block.test
+++ /dev/null
@@ -1,68 +0,0 @@
---TEST--
-Whitespace trimming on tags.
---TEMPLATE--
-Trim on control tag:
-{% for i in range(1, 9) -%}
- {{ i }}
-{%- endfor %}
-
-
-Trim on output tag:
-{% for i in range(1, 9) %}
- {{- i -}}
-{% endfor %}
-
-
-Trim comments:
-
-{#- Invisible -#}
-
-After the comment.
-
-Trim leading space:
-{% if leading %}
-
- {{- leading }}
-{% endif %}
-
-{%- if leading %}
- {{- leading }}
-
-{%- endif %}
-
-
-Trim trailing space:
-{% if trailing -%}
- {{ trailing -}}
-
-{% endif -%}
-
-Combined:
-
-{%- if both -%}
-<ul>
- <li> {{- both -}} </li>
-</ul>
-
-{%- endif -%}
-
-end
---DATA--
-return ['leading' => 'leading space', 'trailing' => 'trailing space', 'both' => 'both']
---EXPECT--
-Trim on control tag:
-123456789
-
-Trim on output tag:
-123456789
-
-Trim comments:After the comment.
-
-Trim leading space:
-leading space
-leading space
-
-Trim trailing space:
-trailing spaceCombined:<ul>
- <li>both</li>
-</ul>end
diff --git a/vendor/twig/twig/tests/Fixtures/whitespace/trim_delimiter_as_strings.test b/vendor/twig/twig/tests/Fixtures/whitespace/trim_delimiter_as_strings.test
deleted file mode 100644
index a58818dde4..0000000000
--- a/vendor/twig/twig/tests/Fixtures/whitespace/trim_delimiter_as_strings.test
+++ /dev/null
@@ -1,10 +0,0 @@
---TEST--
-Whitespace trimming as strings.
---TEMPLATE--
-{{ 5 * '{#-'|length }}
-{{ '{{-'|length * 5 + '{%-'|length }}
---DATA--
-return []
---EXPECT--
-15
-18
diff --git a/vendor/twig/twig/tests/Fixtures/whitespace/trim_left.test b/vendor/twig/twig/tests/Fixtures/whitespace/trim_left.test
deleted file mode 100644
index 75d0f80319..0000000000
--- a/vendor/twig/twig/tests/Fixtures/whitespace/trim_left.test
+++ /dev/null
@@ -1,32 +0,0 @@
---TEST--
-Whitespace trimming on tags (left side).
---TEMPLATE--
-**{% if true %}
-foo
-
- {%- endif %}**
-
-**
-
- {{- 'foo' }}**
-
-**
-
-
-{#- comment #}**
-
-**{% verbatim %}
-foo
-
- {%- endverbatim %}**
---DATA--
-return []
---EXPECT--
-**foo**
-
-**foo**
-
-****
-
-**
-foo**
diff --git a/vendor/twig/twig/tests/Fixtures/whitespace/trim_line_left.test b/vendor/twig/twig/tests/Fixtures/whitespace/trim_line_left.test
deleted file mode 100644
index e5e845f08b..0000000000
--- a/vendor/twig/twig/tests/Fixtures/whitespace/trim_line_left.test
+++ /dev/null
@@ -1,33 +0,0 @@
---TEST--
-Line whitespace trimming on tags (left side).
---TEMPLATE--
-**{% if true %}
-foo
- {%~ endif %}**
-
-**
- {{~ 'foo' }}**
-
-**
- {#~ comment #}**
-
-**{% verbatim %}
-foo
-
- {%~ endverbatim %}**
---DATA--
-return []
---EXPECT--
-**foo
-**
-
-**
-foo**
-
-**
-**
-
-**
-foo
-
-**
diff --git a/vendor/twig/twig/tests/Fixtures/whitespace/trim_line_right.test b/vendor/twig/twig/tests/Fixtures/whitespace/trim_line_right.test
deleted file mode 100644
index e7b510c85d..0000000000
--- a/vendor/twig/twig/tests/Fixtures/whitespace/trim_line_right.test
+++ /dev/null
@@ -1,32 +0,0 @@
---TEST--
-Line whitespace trimming on tags (right side).
---TEMPLATE--
-**{% if true ~%}
-foo{% endif %}**
-
-**{{ 'foo' ~}}
-foo
-**
-
-**{# comment ~#}
- foo
-**
-
-**{% verbatim ~%}
- foo{% endverbatim %}**
---DATA--
-return []
---EXPECT--
-**
-foo**
-
-**foo
-foo
-**
-
-**
- foo
-**
-
-**
- foo**
diff --git a/vendor/twig/twig/tests/Fixtures/whitespace/trim_right.test b/vendor/twig/twig/tests/Fixtures/whitespace/trim_right.test
deleted file mode 100644
index 0ec3b0ceaa..0000000000
--- a/vendor/twig/twig/tests/Fixtures/whitespace/trim_right.test
+++ /dev/null
@@ -1,28 +0,0 @@
---TEST--
-Whitespace trimming on tags (right side).
---TEMPLATE--
-**{% if true -%}
-
- foo{% endif %}**
-
-**{{ 'foo' -}}
-
-**
-
-**{# comment -#}
-
-**
-
-**{% verbatim -%}
-
-foo{% endverbatim %}**
---DATA--
-return []
---EXPECT--
-**foo**
-
-**foo**
-
-****
-
-**foo**
diff --git a/vendor/twig/twig/tests/IntegrationTest.php b/vendor/twig/twig/tests/IntegrationTest.php
deleted file mode 100644
index 243aadb2bf..0000000000
--- a/vendor/twig/twig/tests/IntegrationTest.php
+++ /dev/null
@@ -1,386 +0,0 @@
-<?php
-
-namespace Twig\Tests;
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Twig\Extension\AbstractExtension;
-use Twig\Extension\DebugExtension;
-use Twig\Extension\SandboxExtension;
-use Twig\Extension\StringLoaderExtension;
-use Twig\Node\Expression\ConstantExpression;
-use Twig\Node\PrintNode;
-use Twig\Sandbox\SecurityPolicy;
-use Twig\Test\IntegrationTestCase;
-use Twig\Token;
-use Twig\TokenParser\AbstractTokenParser;
-use Twig\TwigFilter;
-use Twig\TwigFunction;
-use Twig\TwigTest;
-
-// This function is defined to check that escaping strategies
-// like html works even if a function with the same name is defined.
-function html()
-{
- return 'foo';
-}
-
-class IntegrationTest extends IntegrationTestCase
-{
- public function getExtensions()
- {
- $policy = new SecurityPolicy([], [], [], [], ['dump']);
-
- return [
- new DebugExtension(),
- new SandboxExtension($policy, false),
- new StringLoaderExtension(),
- new TwigTestExtension(),
- ];
- }
-
- public function getFixturesDir()
- {
- return __DIR__.'/Fixtures/';
- }
-}
-
-function test_foo($value = 'foo')
-{
- return $value;
-}
-
-class TwigTestFoo implements \Iterator
-{
- const BAR_NAME = 'bar';
-
- public $position = 0;
- public $array = [1, 2];
-
- public function bar($param1 = null, $param2 = null)
- {
- return 'bar'.($param1 ? '_'.$param1 : '').($param2 ? '-'.$param2 : '');
- }
-
- public function getFoo()
- {
- return 'foo';
- }
-
- public function getSelf()
- {
- return $this;
- }
-
- public function is()
- {
- return 'is';
- }
-
- public function in()
- {
- return 'in';
- }
-
- public function not()
- {
- return 'not';
- }
-
- public function strToLower($value)
- {
- return strtolower($value);
- }
-
- public function rewind()
- {
- $this->position = 0;
- }
-
- public function current()
- {
- return $this->array[$this->position];
- }
-
- public function key()
- {
- return 'a';
- }
-
- public function next()
- {
- ++$this->position;
- }
-
- public function valid()
- {
- return isset($this->array[$this->position]);
- }
-}
-
-class TwigTestTokenParser_§ extends AbstractTokenParser
-{
- public function parse(Token $token)
- {
- $this->parser->getStream()->expect(Token::BLOCK_END_TYPE);
-
- return new PrintNode(new ConstantExpression('§', -1), -1);
- }
-
- public function getTag()
- {
- return '§';
- }
-}
-
-class TwigTestExtension extends AbstractExtension
-{
- public function getTokenParsers()
- {
- return [
- new TwigTestTokenParser_§(),
- ];
- }
-
- public function getFilters()
- {
- return [
- new TwigFilter('§', [$this, '§Filter']),
- new TwigFilter('escape_and_nl2br', [$this, 'escape_and_nl2br'], ['needs_environment' => true, 'is_safe' => ['html']]),
- new TwigFilter('nl2br', [$this, 'nl2br'], ['pre_escape' => 'html', 'is_safe' => ['html']]),
- new TwigFilter('escape_something', [$this, 'escape_something'], ['is_safe' => ['something']]),
- new TwigFilter('preserves_safety', [$this, 'preserves_safety'], ['preserves_safety' => ['html']]),
- new TwigFilter('static_call_string', 'Twig\Tests\TwigTestExtension::staticCall'),
- new TwigFilter('static_call_array', ['Twig\Tests\TwigTestExtension', 'staticCall']),
- new TwigFilter('magic_call', [$this, 'magicCall']),
- new TwigFilter('magic_call_string', 'Twig\Tests\TwigTestExtension::magicStaticCall'),
- new TwigFilter('magic_call_array', ['Twig\Tests\TwigTestExtension', 'magicStaticCall']),
- new TwigFilter('*_path', [$this, 'dynamic_path']),
- new TwigFilter('*_foo_*_bar', [$this, 'dynamic_foo']),
- ];
- }
-
- public function getFunctions()
- {
- return [
- new TwigFunction('§', [$this, '§Function']),
- new TwigFunction('safe_br', [$this, 'br'], ['is_safe' => ['html']]),
- new TwigFunction('unsafe_br', [$this, 'br']),
- new TwigFunction('static_call_string', 'Twig\Tests\TwigTestExtension::staticCall'),
- new TwigFunction('static_call_array', ['Twig\Tests\TwigTestExtension', 'staticCall']),
- new TwigFunction('*_path', [$this, 'dynamic_path']),
- new TwigFunction('*_foo_*_bar', [$this, 'dynamic_foo']),
- ];
- }
-
- public function getTests()
- {
- return [
- new TwigTest('multi word', [$this, 'is_multi_word']),
- new TwigTest('test_*', [$this, 'dynamic_test']),
- ];
- }
-
- public function §Filter($value)
- {
- return "§{$value}§";
- }
-
- public function §Function($value)
- {
- return "§{$value}§";
- }
-
- /**
- * nl2br which also escapes, for testing escaper filters.
- */
- public function escape_and_nl2br($env, $value, $sep = '<br />')
- {
- return $this->nl2br(twig_escape_filter($env, $value, 'html'), $sep);
- }
-
- /**
- * nl2br only, for testing filters with pre_escape.
- */
- public function nl2br($value, $sep = '<br />')
- {
- // not secure if $value contains html tags (not only entities)
- // don't use
- return str_replace("\n", "$sep\n", $value);
- }
-
- public function dynamic_path($element, $item)
- {
- return $element.'/'.$item;
- }
-
- public function dynamic_foo($foo, $bar, $item)
- {
- return $foo.'/'.$bar.'/'.$item;
- }
-
- public function dynamic_test($element, $item)
- {
- return $element === $item;
- }
-
- public function escape_something($value)
- {
- return strtoupper($value);
- }
-
- public function preserves_safety($value)
- {
- return strtoupper($value);
- }
-
- public static function staticCall($value)
- {
- return "*$value*";
- }
-
- public function br()
- {
- return '<br />';
- }
-
- public function is_multi_word($value)
- {
- return false !== strpos($value, ' ');
- }
-
- public function __call($method, $arguments)
- {
- if ('magicCall' !== $method) {
- throw new \BadMethodCallException('Unexpected call to __call');
- }
-
- return 'magic_'.$arguments[0];
- }
-
- public static function __callStatic($method, $arguments)
- {
- if ('magicStaticCall' !== $method) {
- throw new \BadMethodCallException('Unexpected call to __callStatic');
- }
-
- return 'static_magic_'.$arguments[0];
- }
-}
-
-/**
- * This class is used in tests for the "length" filter and "empty" test. It asserts that __call is not
- * used to convert such objects to strings.
- */
-class MagicCallStub
-{
- public function __call($name, $args)
- {
- throw new \Exception('__call shall not be called');
- }
-}
-
-class ToStringStub
-{
- /**
- * @var string
- */
- private $string;
-
- public function __construct($string)
- {
- $this->string = $string;
- }
-
- public function __toString()
- {
- return $this->string;
- }
-}
-
-/**
- * This class is used in tests for the length filter and empty test to show
- * that when \Countable is implemented, it is preferred over the __toString()
- * method.
- */
-class CountableStub implements \Countable
-{
- private $count;
-
- public function __construct($count)
- {
- $this->count = $count;
- }
-
- public function count()
- {
- return $this->count;
- }
-
- public function __toString()
- {
- throw new \Exception('__toString shall not be called on \Countables');
- }
-}
-
-/**
- * This class is used in tests for the length filter.
- */
-class IteratorAggregateStub implements \IteratorAggregate
-{
- private $data;
-
- public function __construct(array $data)
- {
- $this->data = $data;
- }
-
- public function getIterator()
- {
- return new \ArrayIterator($this->data);
- }
-}
-
-class SimpleIteratorForTesting implements \Iterator
-{
- private $data = [1, 2, 3, 4, 5, 6, 7];
- private $key = 0;
-
- public function current()
- {
- return $this->key;
- }
-
- public function next()
- {
- ++$this->key;
- }
-
- public function key()
- {
- return $this->key;
- }
-
- public function valid()
- {
- return isset($this->data[$this->key]);
- }
-
- public function rewind()
- {
- $this->key = 0;
- }
-
- public function __toString()
- {
- // for testing, make sure string length returned is not the same as the `iterator_count`
- return str_repeat('X', iterator_count($this) + 10);
- }
-}
diff --git a/vendor/twig/twig/tests/LegacyFixtures/autoescape/filename.legacy.test b/vendor/twig/twig/tests/LegacyFixtures/autoescape/filename.legacy.test
deleted file mode 100644
index d25f75e8ee..0000000000
--- a/vendor/twig/twig/tests/LegacyFixtures/autoescape/filename.legacy.test
+++ /dev/null
@@ -1,18 +0,0 @@
---TEST--
-"filename" autoescape strategy
---TEMPLATE--
-{{ br -}}
-{{ include('index.html.twig') -}}
-{{ include('index.txt.twig') -}}
---TEMPLATE(index.html.twig)--
-{{ br -}}
---TEMPLATE(index.txt.twig)--
-{{ br -}}
---DATA--
-return ['br' => '<br />']
---CONFIG--
-return ['autoescape' => 'filename']
---EXPECT--
-<br />
-<br />
-<br />
diff --git a/vendor/twig/twig/tests/LegacyFixtures/functions/undefined_block.legacy.test b/vendor/twig/twig/tests/LegacyFixtures/functions/undefined_block.legacy.test
deleted file mode 100644
index e52c3b2592..0000000000
--- a/vendor/twig/twig/tests/LegacyFixtures/functions/undefined_block.legacy.test
+++ /dev/null
@@ -1,12 +0,0 @@
---TEST--
-"block" function with undefined block
---TEMPLATE--
-{% extends "base.twig" %}
-{% block foo %}{{ parent() }}{{ block('unknown') }}{{ block('bar') }}{% endblock %}
---TEMPLATE(base.twig)--
-{% block foo %}Foo{% endblock %}
-{% block bar %}Bar{% endblock %}
---DATA--
-return []
---EXPECT--
-FooBarBar
diff --git a/vendor/twig/twig/tests/LegacyFixtures/test.legacy.test b/vendor/twig/twig/tests/LegacyFixtures/test.legacy.test
deleted file mode 100644
index 4bd1f6ac0a..0000000000
--- a/vendor/twig/twig/tests/LegacyFixtures/test.legacy.test
+++ /dev/null
@@ -1,8 +0,0 @@
---TEST--
-Old test classes usage
---TEMPLATE--
-{{ 'foo' is multi word ? 'yes' : 'no' }}
---DATA--
-return []
---EXPECT--
-no
diff --git a/vendor/twig/twig/tests/LegacyIntegrationTest.php b/vendor/twig/twig/tests/LegacyIntegrationTest.php
deleted file mode 100644
index db556f31bf..0000000000
--- a/vendor/twig/twig/tests/LegacyIntegrationTest.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-namespace Twig\Tests;
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Twig\Extension\AbstractExtension;
-use Twig\Test\IntegrationTestCase;
-
-class LegacyIntegrationTest extends IntegrationTestCase
-{
- public function getExtensions()
- {
- return [
- new LegacyTwigTestExtension(),
- ];
- }
-
- public function getFixturesDir()
- {
- return __DIR__.'/LegacyFixtures/';
- }
-
- public function getTests($name, $legacyTests = false)
- {
- if (!$legacyTests) {
- return [['', '', '', [], '', []]];
- }
-
- return parent::getTests($name, true);
- }
-}
-
-class LegacyTwigTestExtension extends AbstractExtension
-{
- public function getTests()
- {
- return [
- 'multi word' => new \Twig_Test_Method($this, 'is_multi_word'),
- ];
- }
-
- public function is_multi_word($value)
- {
- return false !== strpos($value, ' ');
- }
-
- public function getName()
- {
- return 'legacy_integration_test';
- }
-}
diff --git a/vendor/twig/twig/tests/LexerTest.php b/vendor/twig/twig/tests/LexerTest.php
deleted file mode 100644
index 8bd2de5cf9..0000000000
--- a/vendor/twig/twig/tests/LexerTest.php
+++ /dev/null
@@ -1,378 +0,0 @@
-<?php
-
-namespace Twig\Tests;
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Twig\Environment;
-use Twig\Lexer;
-use Twig\Source;
-use Twig\Token;
-
-class LexerTest extends \PHPUnit\Framework\TestCase
-{
- /**
- * @group legacy
- */
- public function testLegacyConstructorSignature()
- {
- $lexer = new Lexer(new Environment($this->createMock('\Twig\Loader\LoaderInterface')));
- $stream = $lexer->tokenize('{{ foo }}', 'foo');
- $this->assertEquals('foo', $stream->getFilename());
- $this->assertEquals('{{ foo }}', $stream->getSource());
- }
-
- public function testNameLabelForTag()
- {
- $template = '{% § %}';
-
- $lexer = new Lexer(new Environment($this->createMock('\Twig\Loader\LoaderInterface')));
- $stream = $lexer->tokenize(new Source($template, 'index'));
-
- $stream->expect(Token::BLOCK_START_TYPE);
- $this->assertSame('§', $stream->expect(Token::NAME_TYPE)->getValue());
- }
-
- public function testNameLabelForFunction()
- {
- $template = '{{ §() }}';
-
- $lexer = new Lexer(new Environment($this->createMock('\Twig\Loader\LoaderInterface')));
- $stream = $lexer->tokenize(new Source($template, 'index'));
-
- $stream->expect(Token::VAR_START_TYPE);
- $this->assertSame('§', $stream->expect(Token::NAME_TYPE)->getValue());
- }
-
- public function testBracketsNesting()
- {
- $template = '{{ {"a":{"b":"c"}} }}';
-
- $this->assertEquals(2, $this->countToken($template, Token::PUNCTUATION_TYPE, '{'));
- $this->assertEquals(2, $this->countToken($template, Token::PUNCTUATION_TYPE, '}'));
- }
-
- protected function countToken($template, $type, $value = null)
- {
- $lexer = new Lexer(new Environment($this->createMock('\Twig\Loader\LoaderInterface')));
- $stream = $lexer->tokenize(new Source($template, 'index'));
-
- $count = 0;
- while (!$stream->isEOF()) {
- $token = $stream->next();
- if ($type === $token->getType()) {
- if (null === $value || $value === $token->getValue()) {
- ++$count;
- }
- }
- }
-
- return $count;
- }
-
- public function testLineDirective()
- {
- $template = "foo\n"
- ."bar\n"
- ."{% line 10 %}\n"
- ."{{\n"
- ."baz\n"
- ."}}\n";
-
- $lexer = new Lexer(new Environment($this->createMock('\Twig\Loader\LoaderInterface')));
- $stream = $lexer->tokenize(new Source($template, 'index'));
-
- // foo\nbar\n
- $this->assertSame(1, $stream->expect(Token::TEXT_TYPE)->getLine());
- // \n (after {% line %})
- $this->assertSame(10, $stream->expect(Token::TEXT_TYPE)->getLine());
- // {{
- $this->assertSame(11, $stream->expect(Token::VAR_START_TYPE)->getLine());
- // baz
- $this->assertSame(12, $stream->expect(Token::NAME_TYPE)->getLine());
- }
-
- public function testLineDirectiveInline()
- {
- $template = "foo\n"
- ."bar{% line 10 %}{{\n"
- ."baz\n"
- ."}}\n";
-
- $lexer = new Lexer(new Environment($this->createMock('\Twig\Loader\LoaderInterface')));
- $stream = $lexer->tokenize(new Source($template, 'index'));
-
- // foo\nbar
- $this->assertSame(1, $stream->expect(Token::TEXT_TYPE)->getLine());
- // {{
- $this->assertSame(10, $stream->expect(Token::VAR_START_TYPE)->getLine());
- // baz
- $this->assertSame(11, $stream->expect(Token::NAME_TYPE)->getLine());
- }
-
- public function testLongComments()
- {
- $template = '{# '.str_repeat('*', 100000).' #}';
-
- $lexer = new Lexer(new Environment($this->createMock('\Twig\Loader\LoaderInterface')));
- $lexer->tokenize(new Source($template, 'index'));
-
- // add a dummy assertion here to satisfy PHPUnit, the only thing we want to test is that the code above
- // can be executed without throwing any exceptions
- $this->addToAssertionCount(1);
- }
-
- public function testLongVerbatim()
- {
- $template = '{% verbatim %}'.str_repeat('*', 100000).'{% endverbatim %}';
-
- $lexer = new Lexer(new Environment($this->createMock('\Twig\Loader\LoaderInterface')));
- $lexer->tokenize(new Source($template, 'index'));
-
- // add a dummy assertion here to satisfy PHPUnit, the only thing we want to test is that the code above
- // can be executed without throwing any exceptions
- $this->addToAssertionCount(1);
- }
-
- public function testLongVar()
- {
- $template = '{{ '.str_repeat('x', 100000).' }}';
-
- $lexer = new Lexer(new Environment($this->createMock('\Twig\Loader\LoaderInterface')));
- $lexer->tokenize(new Source($template, 'index'));
-
- // add a dummy assertion here to satisfy PHPUnit, the only thing we want to test is that the code above
- // can be executed without throwing any exceptions
- $this->addToAssertionCount(1);
- }
-
- public function testLongBlock()
- {
- $template = '{% '.str_repeat('x', 100000).' %}';
-
- $lexer = new Lexer(new Environment($this->createMock('\Twig\Loader\LoaderInterface')));
- $lexer->tokenize(new Source($template, 'index'));
-
- // add a dummy assertion here to satisfy PHPUnit, the only thing we want to test is that the code above
- // can be executed without throwing any exceptions
- $this->addToAssertionCount(1);
- }
-
- public function testBigNumbers()
- {
- $template = '{{ 922337203685477580700 }}';
-
- $lexer = new Lexer(new Environment($this->createMock('\Twig\Loader\LoaderInterface')));
- $stream = $lexer->tokenize(new Source($template, 'index'));
- $stream->next();
- $node = $stream->next();
- $this->assertEquals('922337203685477580700', $node->getValue());
- }
-
- public function testStringWithEscapedDelimiter()
- {
- $tests = [
- "{{ 'foo \' bar' }}" => 'foo \' bar',
- '{{ "foo \" bar" }}' => 'foo " bar',
- ];
- $lexer = new Lexer(new Environment($this->createMock('\Twig\Loader\LoaderInterface')));
- foreach ($tests as $template => $expected) {
- $stream = $lexer->tokenize(new Source($template, 'index'));
- $stream->expect(Token::VAR_START_TYPE);
- $stream->expect(Token::STRING_TYPE, $expected);
-
- // add a dummy assertion here to satisfy PHPUnit, the only thing we want to test is that the code above
- // can be executed without throwing any exceptions
- $this->addToAssertionCount(1);
- }
- }
-
- public function testStringWithInterpolation()
- {
- $template = 'foo {{ "bar #{ baz + 1 }" }}';
-
- $lexer = new Lexer(new Environment($this->createMock('\Twig\Loader\LoaderInterface')));
- $stream = $lexer->tokenize(new Source($template, 'index'));
- $stream->expect(Token::TEXT_TYPE, 'foo ');
- $stream->expect(Token::VAR_START_TYPE);
- $stream->expect(Token::STRING_TYPE, 'bar ');
- $stream->expect(Token::INTERPOLATION_START_TYPE);
- $stream->expect(Token::NAME_TYPE, 'baz');
- $stream->expect(Token::OPERATOR_TYPE, '+');
- $stream->expect(Token::NUMBER_TYPE, '1');
- $stream->expect(Token::INTERPOLATION_END_TYPE);
- $stream->expect(Token::VAR_END_TYPE);
-
- // add a dummy assertion here to satisfy PHPUnit, the only thing we want to test is that the code above
- // can be executed without throwing any exceptions
- $this->addToAssertionCount(1);
- }
-
- public function testStringWithEscapedInterpolation()
- {
- $template = '{{ "bar \#{baz+1}" }}';
-
- $lexer = new Lexer(new Environment($this->createMock('\Twig\Loader\LoaderInterface')));
- $stream = $lexer->tokenize(new Source($template, 'index'));
- $stream->expect(Token::VAR_START_TYPE);
- $stream->expect(Token::STRING_TYPE, 'bar #{baz+1}');
- $stream->expect(Token::VAR_END_TYPE);
-
- // add a dummy assertion here to satisfy PHPUnit, the only thing we want to test is that the code above
- // can be executed without throwing any exceptions
- $this->addToAssertionCount(1);
- }
-
- public function testStringWithHash()
- {
- $template = '{{ "bar # baz" }}';
-
- $lexer = new Lexer(new Environment($this->createMock('\Twig\Loader\LoaderInterface')));
- $stream = $lexer->tokenize(new Source($template, 'index'));
- $stream->expect(Token::VAR_START_TYPE);
- $stream->expect(Token::STRING_TYPE, 'bar # baz');
- $stream->expect(Token::VAR_END_TYPE);
-
- // add a dummy assertion here to satisfy PHPUnit, the only thing we want to test is that the code above
- // can be executed without throwing any exceptions
- $this->addToAssertionCount(1);
- }
-
- public function testStringWithUnterminatedInterpolation()
- {
- $this->expectException('\Twig\Error\SyntaxError');
- $this->expectExceptionMessage('Unclosed """');
-
- $template = '{{ "bar #{x" }}';
-
- $lexer = new Lexer(new Environment($this->createMock('\Twig\Loader\LoaderInterface')));
- $lexer->tokenize(new Source($template, 'index'));
- }
-
- public function testStringWithNestedInterpolations()
- {
- $template = '{{ "bar #{ "foo#{bar}" }" }}';
-
- $lexer = new Lexer(new Environment($this->createMock('\Twig\Loader\LoaderInterface')));
- $stream = $lexer->tokenize(new Source($template, 'index'));
- $stream->expect(Token::VAR_START_TYPE);
- $stream->expect(Token::STRING_TYPE, 'bar ');
- $stream->expect(Token::INTERPOLATION_START_TYPE);
- $stream->expect(Token::STRING_TYPE, 'foo');
- $stream->expect(Token::INTERPOLATION_START_TYPE);
- $stream->expect(Token::NAME_TYPE, 'bar');
- $stream->expect(Token::INTERPOLATION_END_TYPE);
- $stream->expect(Token::INTERPOLATION_END_TYPE);
- $stream->expect(Token::VAR_END_TYPE);
-
- // add a dummy assertion here to satisfy PHPUnit, the only thing we want to test is that the code above
- // can be executed without throwing any exceptions
- $this->addToAssertionCount(1);
- }
-
- public function testStringWithNestedInterpolationsInBlock()
- {
- $template = '{% foo "bar #{ "foo#{bar}" }" %}';
-
- $lexer = new Lexer(new Environment($this->createMock('\Twig\Loader\LoaderInterface')));
- $stream = $lexer->tokenize(new Source($template, 'index'));
- $stream->expect(Token::BLOCK_START_TYPE);
- $stream->expect(Token::NAME_TYPE, 'foo');
- $stream->expect(Token::STRING_TYPE, 'bar ');
- $stream->expect(Token::INTERPOLATION_START_TYPE);
- $stream->expect(Token::STRING_TYPE, 'foo');
- $stream->expect(Token::INTERPOLATION_START_TYPE);
- $stream->expect(Token::NAME_TYPE, 'bar');
- $stream->expect(Token::INTERPOLATION_END_TYPE);
- $stream->expect(Token::INTERPOLATION_END_TYPE);
- $stream->expect(Token::BLOCK_END_TYPE);
-
- // add a dummy assertion here to satisfy PHPUnit, the only thing we want to test is that the code above
- // can be executed without throwing any exceptions
- $this->addToAssertionCount(1);
- }
-
- public function testOperatorEndingWithALetterAtTheEndOfALine()
- {
- $template = "{{ 1 and\n0}}";
-
- $lexer = new Lexer(new Environment($this->createMock('\Twig\Loader\LoaderInterface')));
- $stream = $lexer->tokenize(new Source($template, 'index'));
- $stream->expect(Token::VAR_START_TYPE);
- $stream->expect(Token::NUMBER_TYPE, 1);
- $stream->expect(Token::OPERATOR_TYPE, 'and');
-
- // add a dummy assertion here to satisfy PHPUnit, the only thing we want to test is that the code above
- // can be executed without throwing any exceptions
- $this->addToAssertionCount(1);
- }
-
- public function testUnterminatedVariable()
- {
- $this->expectException('\Twig\Error\SyntaxError');
- $this->expectExceptionMessage('Unclosed "variable" in "index" at line 3');
-
- $template = '
-
-{{
-
-bar
-
-
-';
-
- $lexer = new Lexer(new Environment($this->createMock('\Twig\Loader\LoaderInterface')));
- $lexer->tokenize(new Source($template, 'index'));
- }
-
- public function testUnterminatedBlock()
- {
- $this->expectException('\Twig\Error\SyntaxError');
- $this->expectExceptionMessage('Unclosed "block" in "index" at line 3');
-
- $template = '
-
-{%
-
-bar
-
-
-';
-
- $lexer = new Lexer(new Environment($this->createMock('\Twig\Loader\LoaderInterface')));
- $lexer->tokenize(new Source($template, 'index'));
- }
-
- public function testOverridingSyntax()
- {
- $template = '[# comment #]{# variable #}/# if true #/true/# endif #/';
- $lexer = new Lexer(new Environment($this->createMock('\Twig\Loader\LoaderInterface')), [
- 'tag_comment' => ['[#', '#]'],
- 'tag_block' => ['/#', '#/'],
- 'tag_variable' => ['{#', '#}'],
- ]);
- $stream = $lexer->tokenize(new Source($template, 'index'));
- $stream->expect(Token::VAR_START_TYPE);
- $stream->expect(Token::NAME_TYPE, 'variable');
- $stream->expect(Token::VAR_END_TYPE);
- $stream->expect(Token::BLOCK_START_TYPE);
- $stream->expect(Token::NAME_TYPE, 'if');
- $stream->expect(Token::NAME_TYPE, 'true');
- $stream->expect(Token::BLOCK_END_TYPE);
- $stream->expect(Token::TEXT_TYPE, 'true');
- $stream->expect(Token::BLOCK_START_TYPE);
- $stream->expect(Token::NAME_TYPE, 'endif');
- $stream->expect(Token::BLOCK_END_TYPE);
-
- // add a dummy assertion here to satisfy PHPUnit, the only thing we want to test is that the code above
- // can be executed without throwing any exceptions
- $this->addToAssertionCount(1);
- }
-}
diff --git a/vendor/twig/twig/tests/Loader/ArrayTest.php b/vendor/twig/twig/tests/Loader/ArrayTest.php
deleted file mode 100644
index ab670b58aa..0000000000
--- a/vendor/twig/twig/tests/Loader/ArrayTest.php
+++ /dev/null
@@ -1,139 +0,0 @@
-<?php
-
-namespace Twig\Tests\Loader;
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Twig\Loader\ArrayLoader;
-
-class ArrayTest extends \PHPUnit\Framework\TestCase
-{
- /**
- * @group legacy
- */
- public function testGetSource()
- {
- $loader = new ArrayLoader(['foo' => 'bar']);
-
- $this->assertEquals('bar', $loader->getSource('foo'));
- }
-
- /**
- * @group legacy
- */
- public function testGetSourceWhenTemplateDoesNotExist()
- {
- $this->expectException('\Twig\Error\LoaderError');
-
- $loader = new ArrayLoader([]);
-
- $loader->getSource('foo');
- }
-
- public function testGetSourceContextWhenTemplateDoesNotExist()
- {
- $this->expectException('\Twig\Error\LoaderError');
-
- $loader = new ArrayLoader([]);
-
- $loader->getSourceContext('foo');
- }
-
- public function testGetCacheKey()
- {
- $loader = new ArrayLoader(['foo' => 'bar']);
-
- $this->assertEquals('foo:bar', $loader->getCacheKey('foo'));
- }
-
- public function testGetCacheKeyWhenTemplateHasDuplicateContent()
- {
- $loader = new ArrayLoader([
- 'foo' => 'bar',
- 'baz' => 'bar',
- ]);
-
- $this->assertEquals('foo:bar', $loader->getCacheKey('foo'));
- $this->assertEquals('baz:bar', $loader->getCacheKey('baz'));
- }
-
- public function testGetCacheKeyIsProtectedFromEdgeCollisions()
- {
- $loader = new ArrayLoader([
- 'foo__' => 'bar',
- 'foo' => '__bar',
- ]);
-
- $this->assertEquals('foo__:bar', $loader->getCacheKey('foo__'));
- $this->assertEquals('foo:__bar', $loader->getCacheKey('foo'));
- }
-
- public function testGetCacheKeyWhenTemplateDoesNotExist()
- {
- $this->expectException('\Twig\Error\LoaderError');
-
- $loader = new ArrayLoader([]);
-
- $loader->getCacheKey('foo');
- }
-
- public function testSetTemplate()
- {
- $loader = new ArrayLoader([]);
- $loader->setTemplate('foo', 'bar');
-
- $this->assertEquals('bar', $loader->getSourceContext('foo')->getCode());
- }
-
- public function testIsFresh()
- {
- $loader = new ArrayLoader(['foo' => 'bar']);
- $this->assertTrue($loader->isFresh('foo', time()));
- }
-
- public function testIsFreshWhenTemplateDoesNotExist()
- {
- $this->expectException('\Twig\Error\LoaderError');
-
- $loader = new ArrayLoader([]);
-
- $loader->isFresh('foo', time());
- }
-
- public function testTemplateReference()
- {
- $name = new Twig_Test_Loader_TemplateReference('foo');
- $loader = new ArrayLoader(['foo' => 'bar']);
-
- $loader->getCacheKey($name);
- $loader->getSourceContext($name);
- $loader->isFresh($name, time());
- $loader->setTemplate($name, 'foo:bar');
-
- // add a dummy assertion here to satisfy PHPUnit, the only thing we want to test is that the code above
- // can be executed without crashing PHP
- $this->addToAssertionCount(1);
- }
-}
-
-class Twig_Test_Loader_TemplateReference
-{
- private $name;
-
- public function __construct($name)
- {
- $this->name = $name;
- }
-
- public function __toString()
- {
- return $this->name;
- }
-}
diff --git a/vendor/twig/twig/tests/Loader/ChainTest.php b/vendor/twig/twig/tests/Loader/ChainTest.php
deleted file mode 100644
index d89e2cc23f..0000000000
--- a/vendor/twig/twig/tests/Loader/ChainTest.php
+++ /dev/null
@@ -1,133 +0,0 @@
-<?php
-
-namespace Twig\Tests\Loader;
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Twig\Loader\ArrayLoader;
-use Twig\Loader\ChainLoader;
-use Twig\Loader\ExistsLoaderInterface;
-use Twig\Loader\FilesystemLoader;
-use Twig\Loader\LoaderInterface;
-use Twig\Loader\SourceContextLoaderInterface;
-use Twig\Source;
-
-class ChainTest extends \PHPUnit\Framework\TestCase
-{
- /**
- * @group legacy
- */
- public function testGetSource()
- {
- $loader = new ChainLoader([
- new ArrayLoader(['foo' => 'bar']),
- new ArrayLoader(['foo' => 'foobar', 'bar' => 'foo']),
- ]);
-
- $this->assertEquals('bar', $loader->getSource('foo'));
- $this->assertEquals('foo', $loader->getSource('bar'));
- }
-
- public function testGetSourceContext()
- {
- $path = __DIR__.'/../Fixtures';
- $loader = new ChainLoader([
- new ArrayLoader(['foo' => 'bar']),
- new ArrayLoader(['errors/index.html' => 'baz']),
- new FilesystemLoader([$path]),
- ]);
-
- $this->assertEquals('foo', $loader->getSourceContext('foo')->getName());
- $this->assertSame('', $loader->getSourceContext('foo')->getPath());
-
- $this->assertEquals('errors/index.html', $loader->getSourceContext('errors/index.html')->getName());
- $this->assertSame('', $loader->getSourceContext('errors/index.html')->getPath());
- $this->assertEquals('baz', $loader->getSourceContext('errors/index.html')->getCode());
-
- $this->assertEquals('errors/base.html', $loader->getSourceContext('errors/base.html')->getName());
- $this->assertEquals(realpath($path.'/errors/base.html'), realpath($loader->getSourceContext('errors/base.html')->getPath()));
- $this->assertNotEquals('baz', $loader->getSourceContext('errors/base.html')->getCode());
- }
-
- public function testGetSourceContextWhenTemplateDoesNotExist()
- {
- $this->expectException('\Twig\Error\LoaderError');
-
- $loader = new ChainLoader([]);
-
- $loader->getSourceContext('foo');
- }
-
- /**
- * @group legacy
- */
- public function testGetSourceWhenTemplateDoesNotExist()
- {
- $this->expectException('\Twig\Error\LoaderError');
-
- $loader = new ChainLoader([]);
-
- $loader->getSource('foo');
- }
-
- public function testGetCacheKey()
- {
- $loader = new ChainLoader([
- new ArrayLoader(['foo' => 'bar']),
- new ArrayLoader(['foo' => 'foobar', 'bar' => 'foo']),
- ]);
-
- $this->assertEquals('foo:bar', $loader->getCacheKey('foo'));
- $this->assertEquals('bar:foo', $loader->getCacheKey('bar'));
- }
-
- public function testGetCacheKeyWhenTemplateDoesNotExist()
- {
- $this->expectException('\Twig\Error\LoaderError');
-
- $loader = new ChainLoader([]);
-
- $loader->getCacheKey('foo');
- }
-
- public function testAddLoader()
- {
- $loader = new ChainLoader();
- $loader->addLoader(new ArrayLoader(['foo' => 'bar']));
-
- $this->assertEquals('bar', $loader->getSourceContext('foo')->getCode());
- }
-
- public function testExists()
- {
- $loader1 = $this->createMock('Twig\Tests\Loader\ChainTestLoaderWithExistsInterface');
- $loader1->expects($this->once())->method('exists')->willReturn(false);
- $loader1->expects($this->never())->method('getSourceContext');
-
- // can be removed in 2.0
- $loader2 = $this->createMock('Twig\Tests\Loader\ChainTestLoaderInterface');
- //$loader2 = $this->createMock(['\Twig\Loader\LoaderInterface', '\Twig\Loader\SourceContextLoaderInterface']);
- $loader2->expects($this->once())->method('getSourceContext')->willReturn(new Source('content', 'index'));
-
- $loader = new ChainLoader();
- $loader->addLoader($loader1);
- $loader->addLoader($loader2);
-
- $this->assertTrue($loader->exists('foo'));
- }
-}
-
-interface ChainTestLoaderInterface extends LoaderInterface, SourceContextLoaderInterface
-{
-}
-
-interface ChainTestLoaderWithExistsInterface extends LoaderInterface, ExistsLoaderInterface, SourceContextLoaderInterface
-{
-}
diff --git a/vendor/twig/twig/tests/Loader/FilesystemTest.php b/vendor/twig/twig/tests/Loader/FilesystemTest.php
deleted file mode 100644
index 3307a9b7e9..0000000000
--- a/vendor/twig/twig/tests/Loader/FilesystemTest.php
+++ /dev/null
@@ -1,247 +0,0 @@
-<?php
-
-namespace Twig\Tests\Loader;
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Twig\Environment;
-use Twig\Error\LoaderError;
-use Twig\Loader\FilesystemLoader;
-
-class FilesystemTest extends \PHPUnit\Framework\TestCase
-{
- public function testGetSourceContext()
- {
- $path = __DIR__.'/../Fixtures';
- $loader = new FilesystemLoader([$path]);
- $this->assertEquals('errors/index.html', $loader->getSourceContext('errors/index.html')->getName());
- $this->assertEquals(realpath($path.'/errors/index.html'), realpath($loader->getSourceContext('errors/index.html')->getPath()));
- }
-
- /**
- * @dataProvider getSecurityTests
- */
- public function testSecurity($template)
- {
- $loader = new FilesystemLoader([__DIR__.'/../Fixtures']);
-
- try {
- $loader->getCacheKey($template);
- $this->fail();
- } catch (LoaderError $e) {
- $this->assertStringNotContainsString('Unable to find template', $e->getMessage());
- }
- }
-
- public function getSecurityTests()
- {
- return [
- ["AutoloaderTest\0.php"],
- ['..\\AutoloaderTest.php'],
- ['..\\\\\\AutoloaderTest.php'],
- ['../AutoloaderTest.php'],
- ['..////AutoloaderTest.php'],
- ['./../AutoloaderTest.php'],
- ['.\\..\\AutoloaderTest.php'],
- ['././././././../AutoloaderTest.php'],
- ['.\\./.\\./.\\./../AutoloaderTest.php'],
- ['foo/../../AutoloaderTest.php'],
- ['foo\\..\\..\\AutoloaderTest.php'],
- ['foo/../bar/../../AutoloaderTest.php'],
- ['foo/bar/../../../AutoloaderTest.php'],
- ['filters/../../AutoloaderTest.php'],
- ['filters//..//..//AutoloaderTest.php'],
- ['filters\\..\\..\\AutoloaderTest.php'],
- ['filters\\\\..\\\\..\\\\AutoloaderTest.php'],
- ['filters\\//../\\/\\..\\AutoloaderTest.php'],
- ['/../AutoloaderTest.php'],
- ];
- }
-
- /**
- * @dataProvider getBasePaths
- */
- public function testPaths($basePath, $cacheKey, $rootPath)
- {
- $loader = new FilesystemLoader([$basePath.'/normal', $basePath.'/normal_bis'], $rootPath);
- $loader->setPaths([$basePath.'/named', $basePath.'/named_bis'], 'named');
- $loader->addPath($basePath.'/named_ter', 'named');
- $loader->addPath($basePath.'/normal_ter');
- $loader->prependPath($basePath.'/normal_final');
- $loader->prependPath($basePath.'/named/../named_quater', 'named');
- $loader->prependPath($basePath.'/named_final', 'named');
-
- $this->assertEquals([
- $basePath.'/normal_final',
- $basePath.'/normal',
- $basePath.'/normal_bis',
- $basePath.'/normal_ter',
- ], $loader->getPaths());
- $this->assertEquals([
- $basePath.'/named_final',
- $basePath.'/named/../named_quater',
- $basePath.'/named',
- $basePath.'/named_bis',
- $basePath.'/named_ter',
- ], $loader->getPaths('named'));
-
- // do not use realpath here as it would make the test unuseful
- $this->assertEquals($cacheKey, str_replace('\\', '/', $loader->getCacheKey('@named/named_absolute.html')));
- $this->assertEquals("path (final)\n", $loader->getSourceContext('index.html')->getCode());
- $this->assertEquals("path (final)\n", $loader->getSourceContext('@__main__/index.html')->getCode());
- $this->assertEquals("named path (final)\n", $loader->getSourceContext('@named/index.html')->getCode());
- }
-
- public function getBasePaths()
- {
- return [
- [
- __DIR__.'/Fixtures',
- 'tests/Loader/Fixtures/named_quater/named_absolute.html',
- null,
- ],
- [
- __DIR__.'/Fixtures/../Fixtures',
- 'tests/Loader/Fixtures/named_quater/named_absolute.html',
- null,
- ],
- [
- 'tests/Loader/Fixtures',
- 'tests/Loader/Fixtures/named_quater/named_absolute.html',
- getcwd(),
- ],
- [
- 'Fixtures',
- 'Fixtures/named_quater/named_absolute.html',
- getcwd().'/tests/Loader',
- ],
- [
- 'Fixtures',
- 'Fixtures/named_quater/named_absolute.html',
- getcwd().'/tests/../tests/Loader',
- ],
- ];
- }
-
- public function testEmptyConstructor()
- {
- $loader = new FilesystemLoader();
- $this->assertEquals([], $loader->getPaths());
- }
-
- public function testGetNamespaces()
- {
- $loader = new FilesystemLoader(sys_get_temp_dir());
- $this->assertEquals([FilesystemLoader::MAIN_NAMESPACE], $loader->getNamespaces());
-
- $loader->addPath(sys_get_temp_dir(), 'named');
- $this->assertEquals([FilesystemLoader::MAIN_NAMESPACE, 'named'], $loader->getNamespaces());
- }
-
- public function testFindTemplateExceptionNamespace()
- {
- $basePath = __DIR__.'/Fixtures';
-
- $loader = new FilesystemLoader([$basePath.'/normal']);
- $loader->addPath($basePath.'/named', 'named');
-
- try {
- $loader->getSourceContext('@named/nowhere.html');
- } catch (\Exception $e) {
- $this->assertInstanceOf('\Twig\Error\LoaderError', $e);
- $this->assertStringContainsString('Unable to find template "@named/nowhere.html"', $e->getMessage());
- }
- }
-
- public function testFindTemplateWithCache()
- {
- $basePath = __DIR__.'/Fixtures';
-
- $loader = new FilesystemLoader([$basePath.'/normal']);
- $loader->addPath($basePath.'/named', 'named');
-
- // prime the cache for index.html in the named namespace
- $namedSource = $loader->getSourceContext('@named/index.html')->getCode();
- $this->assertEquals("named path\n", $namedSource);
-
- // get index.html from the main namespace
- $this->assertEquals("path\n", $loader->getSourceContext('index.html')->getCode());
- }
-
- public function testLoadTemplateAndRenderBlockWithCache()
- {
- $loader = new FilesystemLoader([]);
- $loader->addPath(__DIR__.'/Fixtures/themes/theme2');
- $loader->addPath(__DIR__.'/Fixtures/themes/theme1');
- $loader->addPath(__DIR__.'/Fixtures/themes/theme1', 'default_theme');
-
- $twig = new Environment($loader);
-
- $template = $twig->load('blocks.html.twig');
- $this->assertSame('block from theme 1', $template->renderBlock('b1', []));
-
- $template = $twig->load('blocks.html.twig');
- $this->assertSame('block from theme 2', $template->renderBlock('b2', []));
- }
-
- public function getArrayInheritanceTests()
- {
- return [
- 'valid array inheritance' => ['array_inheritance_valid_parent.html.twig'],
- 'array inheritance with null first template' => ['array_inheritance_null_parent.html.twig'],
- 'array inheritance with empty first template' => ['array_inheritance_empty_parent.html.twig'],
- 'array inheritance with non-existent first template' => ['array_inheritance_nonexistent_parent.html.twig'],
- ];
- }
-
- /**
- * @dataProvider getArrayInheritanceTests
- *
- * @param $templateName string Template name with array inheritance
- */
- public function testArrayInheritance($templateName)
- {
- $loader = new FilesystemLoader([]);
- $loader->addPath(__DIR__.'/Fixtures/inheritance');
-
- $twig = new Environment($loader);
-
- $template = $twig->load($templateName);
- $this->assertSame('VALID Child', $template->renderBlock('body', []));
- }
-
- /**
- * @requires PHP 5.3
- */
- public function testLoadTemplateFromPhar()
- {
- $loader = new FilesystemLoader([]);
- // phar-sample.phar was created with the following script:
- // $f = new Phar('phar-test.phar');
- // $f->addFromString('hello.twig', 'hello from phar');
- $loader->addPath('phar://'.__DIR__.'/Fixtures/phar/phar-sample.phar');
- $this->assertSame('hello from phar', $loader->getSourceContext('hello.twig')->getCode());
- }
-
- public function testTemplateExistsAlwaysReturnsBool()
- {
- $loader = new FilesystemLoader([]);
- $this->assertFalse($loader->exists("foo\0.twig"));
- $this->assertFalse($loader->exists('../foo.twig'));
- $this->assertFalse($loader->exists('@foo'));
- $this->assertFalse($loader->exists('foo'));
- $this->assertFalse($loader->exists('@foo/bar.twig'));
-
- $loader->addPath(__DIR__.'/Fixtures/normal');
- $this->assertTrue($loader->exists('index.html'));
- $loader->addPath(__DIR__.'/Fixtures/normal', 'foo');
- $this->assertTrue($loader->exists('@foo/index.html'));
- }
-}
diff --git a/vendor/twig/twig/tests/Loader/Fixtures/inheritance/array_inheritance_empty_parent.html.twig b/vendor/twig/twig/tests/Loader/Fixtures/inheritance/array_inheritance_empty_parent.html.twig
deleted file mode 100644
index 6977ebf66c..0000000000
--- a/vendor/twig/twig/tests/Loader/Fixtures/inheritance/array_inheritance_empty_parent.html.twig
+++ /dev/null
@@ -1,3 +0,0 @@
-{% extends ['','parent.html.twig'] %}
-
-{% block body %}{{ parent() }} Child{% endblock %}
diff --git a/vendor/twig/twig/tests/Loader/Fixtures/inheritance/array_inheritance_nonexistent_parent.html.twig b/vendor/twig/twig/tests/Loader/Fixtures/inheritance/array_inheritance_nonexistent_parent.html.twig
deleted file mode 100644
index 5b50a8b211..0000000000
--- a/vendor/twig/twig/tests/Loader/Fixtures/inheritance/array_inheritance_nonexistent_parent.html.twig
+++ /dev/null
@@ -1,3 +0,0 @@
-{% extends ['nonexistent.html.twig','parent.html.twig'] %}
-
-{% block body %}{{ parent() }} Child{% endblock %}
diff --git a/vendor/twig/twig/tests/Loader/Fixtures/inheritance/array_inheritance_null_parent.html.twig b/vendor/twig/twig/tests/Loader/Fixtures/inheritance/array_inheritance_null_parent.html.twig
deleted file mode 100644
index a16b3adedb..0000000000
--- a/vendor/twig/twig/tests/Loader/Fixtures/inheritance/array_inheritance_null_parent.html.twig
+++ /dev/null
@@ -1,3 +0,0 @@
-{% extends [null,'parent.html.twig'] %}
-
-{% block body %}{{ parent() }} Child{% endblock %}
diff --git a/vendor/twig/twig/tests/Loader/Fixtures/inheritance/array_inheritance_valid_parent.html.twig b/vendor/twig/twig/tests/Loader/Fixtures/inheritance/array_inheritance_valid_parent.html.twig
deleted file mode 100644
index 4940dad416..0000000000
--- a/vendor/twig/twig/tests/Loader/Fixtures/inheritance/array_inheritance_valid_parent.html.twig
+++ /dev/null
@@ -1,3 +0,0 @@
-{% extends ['parent.html.twig','spare_parent.html.twig'] %}
-
-{% block body %}{{ parent() }} Child{% endblock %}
diff --git a/vendor/twig/twig/tests/Loader/Fixtures/inheritance/parent.html.twig b/vendor/twig/twig/tests/Loader/Fixtures/inheritance/parent.html.twig
deleted file mode 100644
index d594c0ed49..0000000000
--- a/vendor/twig/twig/tests/Loader/Fixtures/inheritance/parent.html.twig
+++ /dev/null
@@ -1 +0,0 @@
-{% block body %}VALID{% endblock %}
diff --git a/vendor/twig/twig/tests/Loader/Fixtures/inheritance/spare_parent.html.twig b/vendor/twig/twig/tests/Loader/Fixtures/inheritance/spare_parent.html.twig
deleted file mode 100644
index 70b7360a2c..0000000000
--- a/vendor/twig/twig/tests/Loader/Fixtures/inheritance/spare_parent.html.twig
+++ /dev/null
@@ -1 +0,0 @@
-{% block body %}SPARE PARENT{% endblock %}
diff --git a/vendor/twig/twig/tests/Loader/Fixtures/named/index.html b/vendor/twig/twig/tests/Loader/Fixtures/named/index.html
deleted file mode 100644
index 9e5449c7c5..0000000000
--- a/vendor/twig/twig/tests/Loader/Fixtures/named/index.html
+++ /dev/null
@@ -1 +0,0 @@
-named path
diff --git a/vendor/twig/twig/tests/Loader/Fixtures/named_bis/index.html b/vendor/twig/twig/tests/Loader/Fixtures/named_bis/index.html
deleted file mode 100644
index d3a272b19d..0000000000
--- a/vendor/twig/twig/tests/Loader/Fixtures/named_bis/index.html
+++ /dev/null
@@ -1 +0,0 @@
-named path (bis)
diff --git a/vendor/twig/twig/tests/Loader/Fixtures/named_final/index.html b/vendor/twig/twig/tests/Loader/Fixtures/named_final/index.html
deleted file mode 100644
index 9f05d15075..0000000000
--- a/vendor/twig/twig/tests/Loader/Fixtures/named_final/index.html
+++ /dev/null
@@ -1 +0,0 @@
-named path (final)
diff --git a/vendor/twig/twig/tests/Loader/Fixtures/named_quater/named_absolute.html b/vendor/twig/twig/tests/Loader/Fixtures/named_quater/named_absolute.html
deleted file mode 100644
index b1fb5f5d7c..0000000000
--- a/vendor/twig/twig/tests/Loader/Fixtures/named_quater/named_absolute.html
+++ /dev/null
@@ -1 +0,0 @@
-named path (quater)
diff --git a/vendor/twig/twig/tests/Loader/Fixtures/named_ter/index.html b/vendor/twig/twig/tests/Loader/Fixtures/named_ter/index.html
deleted file mode 100644
index 24fb68ad2e..0000000000
--- a/vendor/twig/twig/tests/Loader/Fixtures/named_ter/index.html
+++ /dev/null
@@ -1 +0,0 @@
-named path (ter)
diff --git a/vendor/twig/twig/tests/Loader/Fixtures/normal/index.html b/vendor/twig/twig/tests/Loader/Fixtures/normal/index.html
deleted file mode 100644
index e7a8fd4d0a..0000000000
--- a/vendor/twig/twig/tests/Loader/Fixtures/normal/index.html
+++ /dev/null
@@ -1 +0,0 @@
-path
diff --git a/vendor/twig/twig/tests/Loader/Fixtures/normal_bis/index.html b/vendor/twig/twig/tests/Loader/Fixtures/normal_bis/index.html
deleted file mode 100644
index bfa916049f..0000000000
--- a/vendor/twig/twig/tests/Loader/Fixtures/normal_bis/index.html
+++ /dev/null
@@ -1 +0,0 @@
-path (bis)
diff --git a/vendor/twig/twig/tests/Loader/Fixtures/normal_final/index.html b/vendor/twig/twig/tests/Loader/Fixtures/normal_final/index.html
deleted file mode 100644
index 73a089bbda..0000000000
--- a/vendor/twig/twig/tests/Loader/Fixtures/normal_final/index.html
+++ /dev/null
@@ -1 +0,0 @@
-path (final)
diff --git a/vendor/twig/twig/tests/Loader/Fixtures/normal_ter/index.html b/vendor/twig/twig/tests/Loader/Fixtures/normal_ter/index.html
deleted file mode 100644
index b7ad97d8f4..0000000000
--- a/vendor/twig/twig/tests/Loader/Fixtures/normal_ter/index.html
+++ /dev/null
@@ -1 +0,0 @@
-path (ter)
diff --git a/vendor/twig/twig/tests/Loader/Fixtures/phar/phar-sample.phar b/vendor/twig/twig/tests/Loader/Fixtures/phar/phar-sample.phar
deleted file mode 100644
index 092bbfae3e..0000000000
--- a/vendor/twig/twig/tests/Loader/Fixtures/phar/phar-sample.phar
+++ /dev/null
@@ -1,293 +0,0 @@
-<?php
-
-$web = 'index.php';
-
-if (in_array('phar', stream_get_wrappers()) && class_exists('Phar', 0)) {
-Phar::interceptFileFuncs();
-set_include_path('phar://' . __FILE__ . PATH_SEPARATOR . get_include_path());
-Phar::webPhar(null, $web);
-include 'phar://' . __FILE__ . '/' . Extract_Phar::START;
-return;
-}
-
-if (@(isset($_SERVER['REQUEST_URI']) && isset($_SERVER['REQUEST_METHOD']) && ($_SERVER['REQUEST_METHOD'] == 'GET' || $_SERVER['REQUEST_METHOD'] == 'POST'))) {
-Extract_Phar::go(true);
-$mimes = array(
-'phps' => 2,
-'c' => 'text/plain',
-'cc' => 'text/plain',
-'cpp' => 'text/plain',
-'c++' => 'text/plain',
-'dtd' => 'text/plain',
-'h' => 'text/plain',
-'log' => 'text/plain',
-'rng' => 'text/plain',
-'txt' => 'text/plain',
-'xsd' => 'text/plain',
-'php' => 1,
-'inc' => 1,
-'avi' => 'video/avi',
-'bmp' => 'image/bmp',
-'css' => 'text/css',
-'gif' => 'image/gif',
-'htm' => 'text/html',
-'html' => 'text/html',
-'htmls' => 'text/html',
-'ico' => 'image/x-ico',
-'jpe' => 'image/jpeg',
-'jpg' => 'image/jpeg',
-'jpeg' => 'image/jpeg',
-'js' => 'application/x-javascript',
-'midi' => 'audio/midi',
-'mid' => 'audio/midi',
-'mod' => 'audio/mod',
-'mov' => 'movie/quicktime',
-'mp3' => 'audio/mp3',
-'mpg' => 'video/mpeg',
-'mpeg' => 'video/mpeg',
-'pdf' => 'application/pdf',
-'png' => 'image/png',
-'swf' => 'application/shockwave-flash',
-'tif' => 'image/tiff',
-'tiff' => 'image/tiff',
-'wav' => 'audio/wav',
-'xbm' => 'image/xbm',
-'xml' => 'text/xml',
-);
-
-header("Cache-Control: no-cache, must-revalidate");
-header("Pragma: no-cache");
-
-$basename = basename(__FILE__);
-if (!strpos($_SERVER['REQUEST_URI'], $basename)) {
-chdir(Extract_Phar::$temp);
-include $web;
-return;
-}
-$pt = substr($_SERVER['REQUEST_URI'], strpos($_SERVER['REQUEST_URI'], $basename) + strlen($basename));
-if (!$pt || $pt == '/') {
-$pt = $web;
-header('HTTP/1.1 301 Moved Permanently');
-header('Location: ' . $_SERVER['REQUEST_URI'] . '/' . $pt);
-exit;
-}
-$a = realpath(Extract_Phar::$temp . DIRECTORY_SEPARATOR . $pt);
-if (!$a || strlen(dirname($a)) < strlen(Extract_Phar::$temp)) {
-header('HTTP/1.0 404 Not Found');
-echo "<html>\n <head>\n <title>File Not Found<title>\n </head>\n <body>\n <h1>404 - File ", $pt, " Not Found</h1>\n </body>\n</html>";
-exit;
-}
-$b = pathinfo($a);
-if (!isset($b['extension'])) {
-header('Content-Type: text/plain');
-header('Content-Length: ' . filesize($a));
-readfile($a);
-exit;
-}
-if (isset($mimes[$b['extension']])) {
-if ($mimes[$b['extension']] === 1) {
-include $a;
-exit;
-}
-if ($mimes[$b['extension']] === 2) {
-highlight_file($a);
-exit;
-}
-header('Content-Type: ' .$mimes[$b['extension']]);
-header('Content-Length: ' . filesize($a));
-readfile($a);
-exit;
-}
-}
-
-class Extract_Phar
-{
-static $temp;
-static $origdir;
-const GZ = 0x1000;
-const BZ2 = 0x2000;
-const MASK = 0x3000;
-const START = 'index.php';
-const LEN = 6685;
-
-static function go($return = false)
-{
-$fp = fopen(__FILE__, 'rb');
-fseek($fp, self::LEN);
-$L = unpack('V', $a = (binary)fread($fp, 4));
-$m = (binary)'';
-
-do {
-$read = 8192;
-if ($L[1] - strlen($m) < 8192) {
-$read = $L[1] - strlen($m);
-}
-$last = (binary)fread($fp, $read);
-$m .= $last;
-} while (strlen($last) && strlen($m) < $L[1]);
-
-if (strlen($m) < $L[1]) {
-die('ERROR: manifest length read was "' .
-strlen($m) .'" should be "' .
-$L[1] . '"');
-}
-
-$info = self::_unpack($m);
-$f = $info['c'];
-
-if ($f & self::GZ) {
-if (!function_exists('gzinflate')) {
-die('Error: zlib extension is not enabled -' .
-' gzinflate() function needed for zlib-compressed .phars');
-}
-}
-
-if ($f & self::BZ2) {
-if (!function_exists('bzdecompress')) {
-die('Error: bzip2 extension is not enabled -' .
-' bzdecompress() function needed for bz2-compressed .phars');
-}
-}
-
-$temp = self::tmpdir();
-
-if (!$temp || !is_writable($temp)) {
-$sessionpath = session_save_path();
-if (strpos ($sessionpath, ";") !== false)
-$sessionpath = substr ($sessionpath, strpos ($sessionpath, ";")+1);
-if (!file_exists($sessionpath) || !is_dir($sessionpath)) {
-die('Could not locate temporary directory to extract phar');
-}
-$temp = $sessionpath;
-}
-
-$temp .= '/pharextract/'.basename(__FILE__, '.phar');
-self::$temp = $temp;
-self::$origdir = getcwd();
-@mkdir($temp, 0777, true);
-$temp = realpath($temp);
-
-if (!file_exists($temp . DIRECTORY_SEPARATOR . md5_file(__FILE__))) {
-self::_removeTmpFiles($temp, getcwd());
-@mkdir($temp, 0777, true);
-@file_put_contents($temp . '/' . md5_file(__FILE__), '');
-
-foreach ($info['m'] as $path => $file) {
-$a = !file_exists(dirname($temp . '/' . $path));
-@mkdir(dirname($temp . '/' . $path), 0777, true);
-clearstatcache();
-
-if ($path[strlen($path) - 1] == '/') {
-@mkdir($temp . '/' . $path, 0777);
-} else {
-file_put_contents($temp . '/' . $path, self::extractFile($path, $file, $fp));
-@chmod($temp . '/' . $path, 0666);
-}
-}
-}
-
-chdir($temp);
-
-if (!$return) {
-include self::START;
-}
-}
-
-static function tmpdir()
-{
-if (strpos(PHP_OS, 'WIN') !== false) {
-if ($var = getenv('TMP') ? getenv('TMP') : getenv('TEMP')) {
-return $var;
-}
-if (is_dir('/temp') || mkdir('/temp')) {
-return realpath('/temp');
-}
-return false;
-}
-if ($var = getenv('TMPDIR')) {
-return $var;
-}
-return realpath('/tmp');
-}
-
-static function _unpack($m)
-{
-$info = unpack('V', substr($m, 0, 4));
- $l = unpack('V', substr($m, 10, 4));
-$m = substr($m, 14 + $l[1]);
-$s = unpack('V', substr($m, 0, 4));
-$o = 0;
-$start = 4 + $s[1];
-$ret['c'] = 0;
-
-for ($i = 0; $i < $info[1]; $i++) {
- $len = unpack('V', substr($m, $start, 4));
-$start += 4;
- $savepath = substr($m, $start, $len[1]);
-$start += $len[1];
- $ret['m'][$savepath] = array_values(unpack('Va/Vb/Vc/Vd/Ve/Vf', substr($m, $start, 24)));
-$ret['m'][$savepath][3] = sprintf('%u', $ret['m'][$savepath][3]
-& 0xffffffff);
-$ret['m'][$savepath][7] = $o;
-$o += $ret['m'][$savepath][2];
-$start += 24 + $ret['m'][$savepath][5];
-$ret['c'] |= $ret['m'][$savepath][4] & self::MASK;
-}
-return $ret;
-}
-
-static function extractFile($path, $entry, $fp)
-{
-$data = '';
-$c = $entry[2];
-
-while ($c) {
-if ($c < 8192) {
-$data .= @fread($fp, $c);
-$c = 0;
-} else {
-$c -= 8192;
-$data .= @fread($fp, 8192);
-}
-}
-
-if ($entry[4] & self::GZ) {
-$data = gzinflate($data);
-} elseif ($entry[4] & self::BZ2) {
-$data = bzdecompress($data);
-}
-
-if (strlen($data) != $entry[0]) {
-die("Invalid internal .phar file (size error " . strlen($data) . " != " .
-$stat[7] . ")");
-}
-
-if ($entry[3] != sprintf("%u", crc32((binary)$data) & 0xffffffff)) {
-die("Invalid internal .phar file (checksum error)");
-}
-
-return $data;
-}
-
-static function _removeTmpFiles($temp, $origdir)
-{
-chdir($temp);
-
-foreach (glob('*') as $f) {
-if (file_exists($f)) {
-is_dir($f) ? @rmdir($f) : @unlink($f);
-if (file_exists($f) && is_dir($f)) {
-self::_removeTmpFiles($f, getcwd());
-}
-}
-}
-
-@rmdir($temp);
-clearstatcache();
-chdir($origdir);
-}
-}
-
-Extract_Phar::go();
-__HALT_COMPILER(); ?>8������������������
-���hello.twig������W���xY5A�������hello from phar�`�E��8�5� �A�����x����GBMB
\ No newline at end of file
diff --git a/vendor/twig/twig/tests/Loader/Fixtures/themes/theme1/blocks.html.twig b/vendor/twig/twig/tests/Loader/Fixtures/themes/theme1/blocks.html.twig
deleted file mode 100644
index dd0cbc2e71..0000000000
--- a/vendor/twig/twig/tests/Loader/Fixtures/themes/theme1/blocks.html.twig
+++ /dev/null
@@ -1,3 +0,0 @@
-{% block b1 %}block from theme 1{% endblock %}
-
-{% block b2 %}block from theme 1{% endblock %}
diff --git a/vendor/twig/twig/tests/Loader/Fixtures/themes/theme2/blocks.html.twig b/vendor/twig/twig/tests/Loader/Fixtures/themes/theme2/blocks.html.twig
deleted file mode 100644
index 07cf9db0de..0000000000
--- a/vendor/twig/twig/tests/Loader/Fixtures/themes/theme2/blocks.html.twig
+++ /dev/null
@@ -1,3 +0,0 @@
-{% use '@default_theme/blocks.html.twig' %}
-
-{% block b2 %}block from theme 2{% endblock %}
diff --git a/vendor/twig/twig/tests/NativeExtensionTest.php b/vendor/twig/twig/tests/NativeExtensionTest.php
deleted file mode 100644
index 3399292e38..0000000000
--- a/vendor/twig/twig/tests/NativeExtensionTest.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-namespace Twig\Tests;
-
-namespace Twig\Tests;
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Twig\Environment;
-use Twig\Loader\ArrayLoader;
-
-class NativeExtensionTest extends \PHPUnit\Framework\TestCase
-{
- /**
- * @requires PHP 5.3
- */
- public function testGetProperties()
- {
- if (\PHP_VERSION_ID >= 70000) {
- $this->markTestSkipped('Extension is not available on PHP 7+');
- }
-
- $twig = new Environment(new ArrayLoader(['index' => '{{ d1.date }}{{ d2.date }}']), [
- 'debug' => true,
- 'cache' => false,
- 'autoescape' => false,
- ]);
-
- $d1 = new \DateTime();
- $d2 = new \DateTime();
- $output = $twig->render('index', compact('d1', 'd2'));
-
- // If it fails, PHP will crash.
- $this->assertEquals($output, $d1->date.$d2->date);
- }
-}
diff --git a/vendor/twig/twig/tests/Node/AutoEscapeTest.php b/vendor/twig/twig/tests/Node/AutoEscapeTest.php
deleted file mode 100644
index d0f641c083..0000000000
--- a/vendor/twig/twig/tests/Node/AutoEscapeTest.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-namespace Twig\Tests\Node;
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Twig\Node\AutoEscapeNode;
-use Twig\Node\Node;
-use Twig\Node\TextNode;
-use Twig\Test\NodeTestCase;
-
-class AutoEscapeTest extends NodeTestCase
-{
- public function testConstructor()
- {
- $body = new Node([new TextNode('foo', 1)]);
- $node = new AutoEscapeNode(true, $body, 1);
-
- $this->assertEquals($body, $node->getNode('body'));
- $this->assertTrue($node->getAttribute('value'));
- }
-
- public function getTests()
- {
- $body = new Node([new TextNode('foo', 1)]);
- $node = new AutoEscapeNode(true, $body, 1);
-
- return [
- [$node, "// line 1\necho \"foo\";"],
- ];
- }
-}
diff --git a/vendor/twig/twig/tests/Node/BlockReferenceTest.php b/vendor/twig/twig/tests/Node/BlockReferenceTest.php
deleted file mode 100644
index 63dc0707c7..0000000000
--- a/vendor/twig/twig/tests/Node/BlockReferenceTest.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-namespace Twig\Tests\Node;
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Twig\Node\BlockReferenceNode;
-use Twig\Test\NodeTestCase;
-
-class BlockReferenceTest extends NodeTestCase
-{
- public function testConstructor()
- {
- $node = new BlockReferenceNode('foo', 1);
-
- $this->assertEquals('foo', $node->getAttribute('name'));
- }
-
- public function getTests()
- {
- return [
- [new BlockReferenceNode('foo', 1), <<<EOF
-// line 1
-\$this->displayBlock('foo', \$context, \$blocks);
-EOF
- ],
- ];
- }
-}
diff --git a/vendor/twig/twig/tests/Node/BlockTest.php b/vendor/twig/twig/tests/Node/BlockTest.php
deleted file mode 100644
index 235cbaf84f..0000000000
--- a/vendor/twig/twig/tests/Node/BlockTest.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-namespace Twig\Tests\Node;
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Twig\Node\BlockNode;
-use Twig\Node\TextNode;
-use Twig\Test\NodeTestCase;
-
-class BlockTest extends NodeTestCase
-{
- public function testConstructor()
- {
- $body = new TextNode('foo', 1);
- $node = new BlockNode('foo', $body, 1);
-
- $this->assertEquals($body, $node->getNode('body'));
- $this->assertEquals('foo', $node->getAttribute('name'));
- }
-
- public function getTests()
- {
- $body = new TextNode('foo', 1);
- $node = new BlockNode('foo', $body, 1);
-
- return [
- [$node, <<<EOF
-// line 1
-public function block_foo(\$context, array \$blocks = [])
-{
- echo "foo";
-}
-EOF
- ],
- ];
- }
-}
diff --git a/vendor/twig/twig/tests/Node/DeprecatedTest.php b/vendor/twig/twig/tests/Node/DeprecatedTest.php
deleted file mode 100644
index f4d1cb3b4d..0000000000
--- a/vendor/twig/twig/tests/Node/DeprecatedTest.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-
-namespace Twig\Tests\Node;
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Twig\Environment;
-use Twig\Node\DeprecatedNode;
-use Twig\Node\Expression\ConstantExpression;
-use Twig\Node\Expression\FunctionExpression;
-use Twig\Node\IfNode;
-use Twig\Node\Node;
-use Twig\Test\NodeTestCase;
-use Twig\TwigFunction;
-
-class DeprecatedTest extends NodeTestCase
-{
- public function testConstructor()
- {
- $expr = new ConstantExpression('foo', 1);
- $node = new DeprecatedNode($expr, 1);
-
- $this->assertEquals($expr, $node->getNode('expr'));
- }
-
- public function getTests()
- {
- $tests = [];
-
- $expr = new ConstantExpression('This section is deprecated', 1);
- $node = new DeprecatedNode($expr, 1, 'deprecated');
- $node->setTemplateName('foo.twig');
-
- $tests[] = [$node, <<<EOF
-// line 1
-@trigger_error("This section is deprecated"." (\"foo.twig\" at line 1).", E_USER_DEPRECATED);
-EOF
- ];
-
- $t = new Node([
- new ConstantExpression(true, 1),
- new DeprecatedNode($expr, 2, 'deprecated'),
- ], [], 1);
- $node = new IfNode($t, null, 1);
- $node->setTemplateName('foo.twig');
-
- $tests[] = [$node, <<<EOF
-// line 1
-if (true) {
- // line 2
- @trigger_error("This section is deprecated"." (\"foo.twig\" at line 2).", E_USER_DEPRECATED);
-}
-EOF
- ];
-
- $environment = new Environment($this->createMock('\Twig\Loader\LoaderInterface'));
- $environment->addFunction(new TwigFunction('foo', 'foo', []));
-
- $expr = new FunctionExpression('foo', new Node(), 1);
- $node = new DeprecatedNode($expr, 1, 'deprecated');
- $node->setTemplateName('foo.twig');
-
- $compiler = $this->getCompiler($environment);
- $varName = $compiler->getVarName();
-
- $tests[] = [$node, <<<EOF
-// line 1
-\$$varName = foo();
-@trigger_error(\$$varName." (\"foo.twig\" at line 1).", E_USER_DEPRECATED);
-EOF
- , $environment];
-
- return $tests;
- }
-}
diff --git a/vendor/twig/twig/tests/Node/DoTest.php b/vendor/twig/twig/tests/Node/DoTest.php
deleted file mode 100644
index aaebba5f79..0000000000
--- a/vendor/twig/twig/tests/Node/DoTest.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-namespace Twig\Tests\Node;
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Twig\Node\DoNode;
-use Twig\Node\Expression\ConstantExpression;
-use Twig\Test\NodeTestCase;
-
-class DoTest extends NodeTestCase
-{
- public function testConstructor()
- {
- $expr = new ConstantExpression('foo', 1);
- $node = new DoNode($expr, 1);
-
- $this->assertEquals($expr, $node->getNode('expr'));
- }
-
- public function getTests()
- {
- $tests = [];
-
- $expr = new ConstantExpression('foo', 1);
- $node = new DoNode($expr, 1);
- $tests[] = [$node, "// line 1\n\"foo\";"];
-
- return $tests;
- }
-}
diff --git a/vendor/twig/twig/tests/Node/Expression/ArrayTest.php b/vendor/twig/twig/tests/Node/Expression/ArrayTest.php
deleted file mode 100644
index cfd9c67f3c..0000000000
--- a/vendor/twig/twig/tests/Node/Expression/ArrayTest.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-namespace Twig\Tests\Node\Expression;
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Twig\Node\Expression\ArrayExpression;
-use Twig\Node\Expression\ConstantExpression;
-use Twig\Test\NodeTestCase;
-
-class ArrayTest extends NodeTestCase
-{
- public function testConstructor()
- {
- $elements = [new ConstantExpression('foo', 1), $foo = new ConstantExpression('bar', 1)];
- $node = new ArrayExpression($elements, 1);
-
- $this->assertEquals($foo, $node->getNode(1));
- }
-
- public function getTests()
- {
- $elements = [
- new ConstantExpression('foo', 1),
- new ConstantExpression('bar', 1),
-
- new ConstantExpression('bar', 1),
- new ConstantExpression('foo', 1),
- ];
- $node = new ArrayExpression($elements, 1);
-
- return [
- [$node, '["foo" => "bar", "bar" => "foo"]'],
- ];
- }
-}
diff --git a/vendor/twig/twig/tests/Node/Expression/AssignNameTest.php b/vendor/twig/twig/tests/Node/Expression/AssignNameTest.php
deleted file mode 100644
index 80dbe94c6c..0000000000
--- a/vendor/twig/twig/tests/Node/Expression/AssignNameTest.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-namespace Twig\Tests\Node\Expression;
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Twig\Node\Expression\AssignNameExpression;
-use Twig\Test\NodeTestCase;
-
-class AssignNameTest extends NodeTestCase
-{
- public function testConstructor()
- {
- $node = new AssignNameExpression('foo', 1);
-
- $this->assertEquals('foo', $node->getAttribute('name'));
- }
-
- public function getTests()
- {
- $node = new AssignNameExpression('foo', 1);
-
- return [
- [$node, '$context["foo"]'],
- ];
- }
-}
diff --git a/vendor/twig/twig/tests/Node/Expression/Binary/AddTest.php b/vendor/twig/twig/tests/Node/Expression/Binary/AddTest.php
deleted file mode 100644
index 5cff2bcff1..0000000000
--- a/vendor/twig/twig/tests/Node/Expression/Binary/AddTest.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-namespace Twig\Tests\Node\Expression\Binary;
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Twig\Node\Expression\Binary\AddBinary;
-use Twig\Node\Expression\ConstantExpression;
-use Twig\Test\NodeTestCase;
-
-class AddTest extends NodeTestCase
-{
- public function testConstructor()
- {
- $left = new ConstantExpression(1, 1);
- $right = new ConstantExpression(2, 1);
- $node = new AddBinary($left, $right, 1);
-
- $this->assertEquals($left, $node->getNode('left'));
- $this->assertEquals($right, $node->getNode('right'));
- }
-
- public function getTests()
- {
- $left = new ConstantExpression(1, 1);
- $right = new ConstantExpression(2, 1);
- $node = new AddBinary($left, $right, 1);
-
- return [
- [$node, '(1 + 2)'],
- ];
- }
-}
diff --git a/vendor/twig/twig/tests/Node/Expression/Binary/AndTest.php b/vendor/twig/twig/tests/Node/Expression/Binary/AndTest.php
deleted file mode 100644
index d83aed04d9..0000000000
--- a/vendor/twig/twig/tests/Node/Expression/Binary/AndTest.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-namespace Twig\Tests\Node\Expression\Binary;
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Twig\Node\Expression\Binary\AndBinary;
-use Twig\Node\Expression\ConstantExpression;
-use Twig\Test\NodeTestCase;
-
-class AndTest extends NodeTestCase
-{
- public function testConstructor()
- {
- $left = new ConstantExpression(1, 1);
- $right = new ConstantExpression(2, 1);
- $node = new AndBinary($left, $right, 1);
-
- $this->assertEquals($left, $node->getNode('left'));
- $this->assertEquals($right, $node->getNode('right'));
- }
-
- public function getTests()
- {
- $left = new ConstantExpression(1, 1);
- $right = new ConstantExpression(2, 1);
- $node = new AndBinary($left, $right, 1);
-
- return [
- [$node, '(1 && 2)'],
- ];
- }
-}
diff --git a/vendor/twig/twig/tests/Node/Expression/Binary/ConcatTest.php b/vendor/twig/twig/tests/Node/Expression/Binary/ConcatTest.php
deleted file mode 100644
index 0eff603ba2..0000000000
--- a/vendor/twig/twig/tests/Node/Expression/Binary/ConcatTest.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-namespace Twig\Tests\Node\Expression\Binary;
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Twig\Node\Expression\Binary\ConcatBinary;
-use Twig\Node\Expression\ConstantExpression;
-use Twig\Test\NodeTestCase;
-
-class ConcatTest extends NodeTestCase
-{
- public function testConstructor()
- {
- $left = new ConstantExpression(1, 1);
- $right = new ConstantExpression(2, 1);
- $node = new ConcatBinary($left, $right, 1);
-
- $this->assertEquals($left, $node->getNode('left'));
- $this->assertEquals($right, $node->getNode('right'));
- }
-
- public function getTests()
- {
- $left = new ConstantExpression(1, 1);
- $right = new ConstantExpression(2, 1);
- $node = new ConcatBinary($left, $right, 1);
-
- return [
- [$node, '(1 . 2)'],
- ];
- }
-}
diff --git a/vendor/twig/twig/tests/Node/Expression/Binary/DivTest.php b/vendor/twig/twig/tests/Node/Expression/Binary/DivTest.php
deleted file mode 100644
index 20cf4646f8..0000000000
--- a/vendor/twig/twig/tests/Node/Expression/Binary/DivTest.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-namespace Twig\Tests\Node\Expression\Binary;
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Twig\Node\Expression\Binary\DivBinary;
-use Twig\Node\Expression\ConstantExpression;
-use Twig\Test\NodeTestCase;
-
-class DivTest extends NodeTestCase
-{
- public function testConstructor()
- {
- $left = new ConstantExpression(1, 1);
- $right = new ConstantExpression(2, 1);
- $node = new DivBinary($left, $right, 1);
-
- $this->assertEquals($left, $node->getNode('left'));
- $this->assertEquals($right, $node->getNode('right'));
- }
-
- public function getTests()
- {
- $left = new ConstantExpression(1, 1);
- $right = new ConstantExpression(2, 1);
- $node = new DivBinary($left, $right, 1);
-
- return [
- [$node, '(1 / 2)'],
- ];
- }
-}
diff --git a/vendor/twig/twig/tests/Node/Expression/Binary/FloorDivTest.php b/vendor/twig/twig/tests/Node/Expression/Binary/FloorDivTest.php
deleted file mode 100644
index 826859851b..0000000000
--- a/vendor/twig/twig/tests/Node/Expression/Binary/FloorDivTest.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-namespace Twig\Tests\Node\Expression\Binary;
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Twig\Node\Expression\Binary\FloorDivBinary;
-use Twig\Node\Expression\ConstantExpression;
-use Twig\Test\NodeTestCase;
-
-class FloorDivTest extends NodeTestCase
-{
- public function testConstructor()
- {
- $left = new ConstantExpression(1, 1);
- $right = new ConstantExpression(2, 1);
- $node = new FloorDivBinary($left, $right, 1);
-
- $this->assertEquals($left, $node->getNode('left'));
- $this->assertEquals($right, $node->getNode('right'));
- }
-
- public function getTests()
- {
- $left = new ConstantExpression(1, 1);
- $right = new ConstantExpression(2, 1);
- $node = new FloorDivBinary($left, $right, 1);
-
- return [
- [$node, '(int) floor((1 / 2))'],
- ];
- }
-}
diff --git a/vendor/twig/twig/tests/Node/Expression/Binary/ModTest.php b/vendor/twig/twig/tests/Node/Expression/Binary/ModTest.php
deleted file mode 100644
index 2069ef0895..0000000000
--- a/vendor/twig/twig/tests/Node/Expression/Binary/ModTest.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-namespace Twig\Tests\Node\Expression\Binary;
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Twig\Node\Expression\Binary\ModBinary;
-use Twig\Node\Expression\ConstantExpression;
-use Twig\Test\NodeTestCase;
-
-class ModTest extends NodeTestCase
-{
- public function testConstructor()
- {
- $left = new ConstantExpression(1, 1);
- $right = new ConstantExpression(2, 1);
- $node = new ModBinary($left, $right, 1);
-
- $this->assertEquals($left, $node->getNode('left'));
- $this->assertEquals($right, $node->getNode('right'));
- }
-
- public function getTests()
- {
- $left = new ConstantExpression(1, 1);
- $right = new ConstantExpression(2, 1);
- $node = new ModBinary($left, $right, 1);
-
- return [
- [$node, '(1 % 2)'],
- ];
- }
-}
diff --git a/vendor/twig/twig/tests/Node/Expression/Binary/MulTest.php b/vendor/twig/twig/tests/Node/Expression/Binary/MulTest.php
deleted file mode 100644
index c50dfc12b1..0000000000
--- a/vendor/twig/twig/tests/Node/Expression/Binary/MulTest.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-namespace Twig\Tests\Node\Expression\Binary;
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Twig\Node\Expression\Binary\MulBinary;
-use Twig\Node\Expression\ConstantExpression;
-use Twig\Test\NodeTestCase;
-
-class MulTest extends NodeTestCase
-{
- public function testConstructor()
- {
- $left = new ConstantExpression(1, 1);
- $right = new ConstantExpression(2, 1);
- $node = new MulBinary($left, $right, 1);
-
- $this->assertEquals($left, $node->getNode('left'));
- $this->assertEquals($right, $node->getNode('right'));
- }
-
- public function getTests()
- {
- $left = new ConstantExpression(1, 1);
- $right = new ConstantExpression(2, 1);
- $node = new MulBinary($left, $right, 1);
-
- return [
- [$node, '(1 * 2)'],
- ];
- }
-}
diff --git a/vendor/twig/twig/tests/Node/Expression/Binary/OrTest.php b/vendor/twig/twig/tests/Node/Expression/Binary/OrTest.php
deleted file mode 100644
index 94df7c0b16..0000000000
--- a/vendor/twig/twig/tests/Node/Expression/Binary/OrTest.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-namespace Twig\Tests\Node\Expression\Binary;
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Twig\Node\Expression\Binary\OrBinary;
-use Twig\Node\Expression\ConstantExpression;
-use Twig\Test\NodeTestCase;
-
-class OrTest extends NodeTestCase
-{
- public function testConstructor()
- {
- $left = new ConstantExpression(1, 1);
- $right = new ConstantExpression(2, 1);
- $node = new OrBinary($left, $right, 1);
-
- $this->assertEquals($left, $node->getNode('left'));
- $this->assertEquals($right, $node->getNode('right'));
- }
-
- public function getTests()
- {
- $left = new ConstantExpression(1, 1);
- $right = new ConstantExpression(2, 1);
- $node = new OrBinary($left, $right, 1);
-
- return [
- [$node, '(1 || 2)'],
- ];
- }
-}
diff --git a/vendor/twig/twig/tests/Node/Expression/Binary/SubTest.php b/vendor/twig/twig/tests/Node/Expression/Binary/SubTest.php
deleted file mode 100644
index 04eebe290d..0000000000
--- a/vendor/twig/twig/tests/Node/Expression/Binary/SubTest.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-namespace Twig\Tests\Node\Expression\Binary;
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Twig\Node\Expression\Binary\SubBinary;
-use Twig\Node\Expression\ConstantExpression;
-use Twig\Test\NodeTestCase;
-
-class SubTest extends NodeTestCase
-{
- public function testConstructor()
- {
- $left = new ConstantExpression(1, 1);
- $right = new ConstantExpression(2, 1);
- $node = new SubBinary($left, $right, 1);
-
- $this->assertEquals($left, $node->getNode('left'));
- $this->assertEquals($right, $node->getNode('right'));
- }
-
- public function getTests()
- {
- $left = new ConstantExpression(1, 1);
- $right = new ConstantExpression(2, 1);
- $node = new SubBinary($left, $right, 1);
-
- return [
- [$node, '(1 - 2)'],
- ];
- }
-}
diff --git a/vendor/twig/twig/tests/Node/Expression/CallTest.php b/vendor/twig/twig/tests/Node/Expression/CallTest.php
deleted file mode 100644
index 1ffb4c7b6f..0000000000
--- a/vendor/twig/twig/tests/Node/Expression/CallTest.php
+++ /dev/null
@@ -1,139 +0,0 @@
-<?php
-
-namespace Twig\Tests\Node\Expression;
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Twig\Node\Expression\CallExpression;
-
-class CallTest extends \PHPUnit\Framework\TestCase
-{
- public function testGetArguments()
- {
- $node = new Node_Expression_Call([], ['type' => 'function', 'name' => 'date']);
- $this->assertEquals(['U', null], $node->getArguments('date', ['format' => 'U', 'timestamp' => null]));
- }
-
- public function testGetArgumentsWhenPositionalArgumentsAfterNamedArguments()
- {
- $this->expectException('\Twig\Error\SyntaxError');
- $this->expectExceptionMessage('Positional arguments cannot be used after named arguments for function "date".');
-
- $node = new Node_Expression_Call([], ['type' => 'function', 'name' => 'date']);
- $node->getArguments('date', ['timestamp' => 123456, 'Y-m-d']);
- }
-
- public function testGetArgumentsWhenArgumentIsDefinedTwice()
- {
- $this->expectException('\Twig\Error\SyntaxError');
- $this->expectExceptionMessage('Argument "format" is defined twice for function "date".');
-
- $node = new Node_Expression_Call([], ['type' => 'function', 'name' => 'date']);
- $node->getArguments('date', ['Y-m-d', 'format' => 'U']);
- }
-
- public function testGetArgumentsWithWrongNamedArgumentName()
- {
- $this->expectException('\Twig\Error\SyntaxError');
- $this->expectExceptionMessage('Unknown argument "unknown" for function "date(format, timestamp)".');
-
- $node = new Node_Expression_Call([], ['type' => 'function', 'name' => 'date']);
- $node->getArguments('date', ['Y-m-d', 'timestamp' => null, 'unknown' => '']);
- }
-
- public function testGetArgumentsWithWrongNamedArgumentNames()
- {
- $this->expectException('\Twig\Error\SyntaxError');
- $this->expectExceptionMessage('Unknown arguments "unknown1", "unknown2" for function "date(format, timestamp)".');
-
- $node = new Node_Expression_Call([], ['type' => 'function', 'name' => 'date']);
- $node->getArguments('date', ['Y-m-d', 'timestamp' => null, 'unknown1' => '', 'unknown2' => '']);
- }
-
- public function testResolveArgumentsWithMissingValueForOptionalArgument()
- {
- $this->expectException('\Twig\Error\SyntaxError');
- $this->expectExceptionMessage('Argument "case_sensitivity" could not be assigned for function "substr_compare(main_str, str, offset, length, case_sensitivity)" because it is mapped to an internal PHP function which cannot determine default value for optional argument "length".');
-
- $node = new Node_Expression_Call([], ['type' => 'function', 'name' => 'substr_compare']);
- $node->getArguments('substr_compare', ['abcd', 'bc', 'offset' => 1, 'case_sensitivity' => true]);
- }
-
- public function testResolveArgumentsOnlyNecessaryArgumentsForCustomFunction()
- {
- $node = new Node_Expression_Call([], ['type' => 'function', 'name' => 'custom_function']);
-
- $this->assertEquals(['arg1'], $node->getArguments([$this, 'customFunction'], ['arg1' => 'arg1']));
- }
-
- public function testGetArgumentsForStaticMethod()
- {
- $node = new Node_Expression_Call([], ['type' => 'function', 'name' => 'custom_static_function']);
- $this->assertEquals(['arg1'], $node->getArguments(__CLASS__.'::customStaticFunction', ['arg1' => 'arg1']));
- }
-
- public function testResolveArgumentsWithMissingParameterForArbitraryArguments()
- {
- $this->expectException('\LogicException');
- $this->expectExceptionMessage('The last parameter of "Twig\\Tests\\Node\\Expression\\CallTest::customFunctionWithArbitraryArguments" for function "foo" must be an array with default value, eg. "array $arg = []".');
-
- $node = new Node_Expression_Call([], ['type' => 'function', 'name' => 'foo', 'is_variadic' => true]);
- $node->getArguments([$this, 'customFunctionWithArbitraryArguments'], []);
- }
-
- public static function customStaticFunction($arg1, $arg2 = 'default', $arg3 = [])
- {
- }
-
- public function customFunction($arg1, $arg2 = 'default', $arg3 = [])
- {
- }
-
- public function customFunctionWithArbitraryArguments()
- {
- }
-
- public function testResolveArgumentsWithMissingParameterForArbitraryArgumentsOnFunction()
- {
- $this->expectException('\LogicException');
- $this->expectExceptionMessageRegExp('#^The last parameter of "Twig\\\\Tests\\\\Node\\\\Expression\\\\custom_Twig_Tests_Node_Expression_CallTest_function" for function "foo" must be an array with default value, eg\\. "array \\$arg \\= \\[\\]"\\.$#');
-
- $node = new Node_Expression_Call([], ['type' => 'function', 'name' => 'foo', 'is_variadic' => true]);
- $node->getArguments('Twig\Tests\Node\Expression\custom_Twig_Tests_Node_Expression_CallTest_function', []);
- }
-
- public function testResolveArgumentsWithMissingParameterForArbitraryArgumentsOnObject()
- {
- $this->expectException('\LogicException');
- $this->expectExceptionMessageRegExp('#^The last parameter of "Twig\\\\Tests\\\\Node\\\\Expression\\\\CallableTestClass\\:\\:__invoke" for function "foo" must be an array with default value, eg\\. "array \\$arg \\= \\[\\]"\\.$#');
-
- $node = new Node_Expression_Call([], ['type' => 'function', 'name' => 'foo', 'is_variadic' => true]);
- $node->getArguments(new CallableTestClass(), []);
- }
-}
-
-class Node_Expression_Call extends CallExpression
-{
- public function getArguments($callable, $arguments)
- {
- return parent::getArguments($callable, $arguments);
- }
-}
-
-class CallableTestClass
-{
- public function __invoke($required)
- {
- }
-}
-
-function custom_Twig_Tests_Node_Expression_CallTest_function($required)
-{
-}
diff --git a/vendor/twig/twig/tests/Node/Expression/ConditionalTest.php b/vendor/twig/twig/tests/Node/Expression/ConditionalTest.php
deleted file mode 100644
index 004e9c9513..0000000000
--- a/vendor/twig/twig/tests/Node/Expression/ConditionalTest.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-namespace Twig\Tests\Node\Expression;
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Twig\Node\Expression\ConditionalExpression;
-use Twig\Node\Expression\ConstantExpression;
-use Twig\Test\NodeTestCase;
-
-class ConditionalTest extends NodeTestCase
-{
- public function testConstructor()
- {
- $expr1 = new ConstantExpression(1, 1);
- $expr2 = new ConstantExpression(2, 1);
- $expr3 = new ConstantExpression(3, 1);
- $node = new ConditionalExpression($expr1, $expr2, $expr3, 1);
-
- $this->assertEquals($expr1, $node->getNode('expr1'));
- $this->assertEquals($expr2, $node->getNode('expr2'));
- $this->assertEquals($expr3, $node->getNode('expr3'));
- }
-
- public function getTests()
- {
- $tests = [];
-
- $expr1 = new ConstantExpression(1, 1);
- $expr2 = new ConstantExpression(2, 1);
- $expr3 = new ConstantExpression(3, 1);
- $node = new ConditionalExpression($expr1, $expr2, $expr3, 1);
- $tests[] = [$node, '((1) ? (2) : (3))'];
-
- return $tests;
- }
-}
diff --git a/vendor/twig/twig/tests/Node/Expression/ConstantTest.php b/vendor/twig/twig/tests/Node/Expression/ConstantTest.php
deleted file mode 100644
index 920892e942..0000000000
--- a/vendor/twig/twig/tests/Node/Expression/ConstantTest.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-namespace Twig\Tests\Node\Expression;
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Twig\Node\Expression\ConstantExpression;
-use Twig\Test\NodeTestCase;
-
-class ConstantTest extends NodeTestCase
-{
- public function testConstructor()
- {
- $node = new ConstantExpression('foo', 1);
-
- $this->assertEquals('foo', $node->getAttribute('value'));
- }
-
- public function getTests()
- {
- $tests = [];
-
- $node = new ConstantExpression('foo', 1);
- $tests[] = [$node, '"foo"'];
-
- return $tests;
- }
-}
diff --git a/vendor/twig/twig/tests/Node/Expression/FilterTest.php b/vendor/twig/twig/tests/Node/Expression/FilterTest.php
deleted file mode 100644
index d7e38f3171..0000000000
--- a/vendor/twig/twig/tests/Node/Expression/FilterTest.php
+++ /dev/null
@@ -1,161 +0,0 @@
-<?php
-
-namespace Twig\Tests\Node\Expression;
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Twig\Environment;
-use Twig\Node\Expression\ConstantExpression;
-use Twig\Node\Expression\FilterExpression;
-use Twig\Node\Node;
-use Twig\Test\NodeTestCase;
-use Twig\TwigFilter;
-
-class FilterTest extends NodeTestCase
-{
- public function testConstructor()
- {
- $expr = new ConstantExpression('foo', 1);
- $name = new ConstantExpression('upper', 1);
- $args = new Node();
- $node = new FilterExpression($expr, $name, $args, 1);
-
- $this->assertEquals($expr, $node->getNode('node'));
- $this->assertEquals($name, $node->getNode('filter'));
- $this->assertEquals($args, $node->getNode('arguments'));
- }
-
- public function getTests()
- {
- $environment = new Environment($this->createMock('\Twig\Loader\LoaderInterface'));
- $environment->addFilter(new TwigFilter('bar', 'bar', ['needs_environment' => true]));
- $environment->addFilter(new TwigFilter('barbar', 'Twig\Tests\Node\Expression\twig_tests_filter_barbar', ['needs_context' => true, 'is_variadic' => true]));
-
- $tests = [];
-
- $expr = new ConstantExpression('foo', 1);
- $node = $this->createFilter($expr, 'upper');
- $node = $this->createFilter($node, 'number_format', [new ConstantExpression(2, 1), new ConstantExpression('.', 1), new ConstantExpression(',', 1)]);
-
- if (\function_exists('mb_get_info')) {
- $tests[] = [$node, 'twig_number_format_filter($this->env, twig_upper_filter($this->env, "foo"), 2, ".", ",")'];
- } else {
- $tests[] = [$node, 'twig_number_format_filter($this->env, strtoupper("foo"), 2, ".", ",")'];
- }
-
- // named arguments
- $date = new ConstantExpression(0, 1);
- $node = $this->createFilter($date, 'date', [
- 'timezone' => new ConstantExpression('America/Chicago', 1),
- 'format' => new ConstantExpression('d/m/Y H:i:s P', 1),
- ]);
- $tests[] = [$node, 'twig_date_format_filter($this->env, 0, "d/m/Y H:i:s P", "America/Chicago")'];
-
- // skip an optional argument
- $date = new ConstantExpression(0, 1);
- $node = $this->createFilter($date, 'date', [
- 'timezone' => new ConstantExpression('America/Chicago', 1),
- ]);
- $tests[] = [$node, 'twig_date_format_filter($this->env, 0, null, "America/Chicago")'];
-
- // underscores vs camelCase for named arguments
- $string = new ConstantExpression('abc', 1);
- $node = $this->createFilter($string, 'reverse', [
- 'preserve_keys' => new ConstantExpression(true, 1),
- ]);
- $tests[] = [$node, 'twig_reverse_filter($this->env, "abc", true)'];
- $node = $this->createFilter($string, 'reverse', [
- 'preserveKeys' => new ConstantExpression(true, 1),
- ]);
- $tests[] = [$node, 'twig_reverse_filter($this->env, "abc", true)'];
-
- // filter as an anonymous function
- if (\PHP_VERSION_ID >= 50300) {
- $node = $this->createFilter(new ConstantExpression('foo', 1), 'anonymous');
- $tests[] = [$node, 'call_user_func_array($this->env->getFilter(\'anonymous\')->getCallable(), ["foo"])'];
- }
-
- // needs environment
- $node = $this->createFilter($string, 'bar');
- $tests[] = [$node, 'bar($this->env, "abc")', $environment];
-
- $node = $this->createFilter($string, 'bar', [new ConstantExpression('bar', 1)]);
- $tests[] = [$node, 'bar($this->env, "abc", "bar")', $environment];
-
- // arbitrary named arguments
- $node = $this->createFilter($string, 'barbar');
- $tests[] = [$node, 'Twig\Tests\Node\Expression\twig_tests_filter_barbar($context, "abc")', $environment];
-
- $node = $this->createFilter($string, 'barbar', ['foo' => new ConstantExpression('bar', 1)]);
- $tests[] = [$node, 'Twig\Tests\Node\Expression\twig_tests_filter_barbar($context, "abc", null, null, ["foo" => "bar"])', $environment];
-
- $node = $this->createFilter($string, 'barbar', ['arg2' => new ConstantExpression('bar', 1)]);
- $tests[] = [$node, 'Twig\Tests\Node\Expression\twig_tests_filter_barbar($context, "abc", null, "bar")', $environment];
-
- $node = $this->createFilter($string, 'barbar', [
- new ConstantExpression('1', 1),
- new ConstantExpression('2', 1),
- new ConstantExpression('3', 1),
- 'foo' => new ConstantExpression('bar', 1),
- ]);
- $tests[] = [$node, 'Twig\Tests\Node\Expression\twig_tests_filter_barbar($context, "abc", "1", "2", [0 => "3", "foo" => "bar"])', $environment];
-
- return $tests;
- }
-
- public function testCompileWithWrongNamedArgumentName()
- {
- $this->expectException('\Twig\Error\SyntaxError');
- $this->expectExceptionMessage('Unknown argument "foobar" for filter "date(format, timezone)" at line 1.');
-
- $date = new ConstantExpression(0, 1);
- $node = $this->createFilter($date, 'date', [
- 'foobar' => new ConstantExpression('America/Chicago', 1),
- ]);
-
- $compiler = $this->getCompiler();
- $compiler->compile($node);
- }
-
- public function testCompileWithMissingNamedArgument()
- {
- $this->expectException('\Twig\Error\SyntaxError');
- $this->expectExceptionMessage('Value for argument "from" is required for filter "replace" at line 1.');
-
- $value = new ConstantExpression(0, 1);
- $node = $this->createFilter($value, 'replace', [
- 'to' => new ConstantExpression('foo', 1),
- ]);
-
- $compiler = $this->getCompiler();
- $compiler->compile($node);
- }
-
- protected function createFilter($node, $name, array $arguments = [])
- {
- $name = new ConstantExpression($name, 1);
- $arguments = new Node($arguments);
-
- return new FilterExpression($node, $name, $arguments, 1);
- }
-
- protected function getEnvironment()
- {
- if (\PHP_VERSION_ID >= 50300) {
- return include 'PHP53/FilterInclude.php';
- }
-
- return parent::getEnvironment();
- }
-}
-
-function twig_tests_filter_barbar($context, $string, $arg1 = null, $arg2 = null, array $args = [])
-{
-}
diff --git a/vendor/twig/twig/tests/Node/Expression/FunctionTest.php b/vendor/twig/twig/tests/Node/Expression/FunctionTest.php
deleted file mode 100644
index 489f17ab41..0000000000
--- a/vendor/twig/twig/tests/Node/Expression/FunctionTest.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-
-namespace Twig\Tests\Node\Expression;
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Twig\Environment;
-use Twig\Node\Expression\ConstantExpression;
-use Twig\Node\Expression\FunctionExpression;
-use Twig\Node\Node;
-use Twig\Test\NodeTestCase;
-use Twig\TwigFunction;
-
-class FunctionTest extends NodeTestCase
-{
- public function testConstructor()
- {
- $name = 'function';
- $args = new Node();
- $node = new FunctionExpression($name, $args, 1);
-
- $this->assertEquals($name, $node->getAttribute('name'));
- $this->assertEquals($args, $node->getNode('arguments'));
- }
-
- public function getTests()
- {
- $environment = new Environment($this->createMock('\Twig\Loader\LoaderInterface'));
- $environment->addFunction(new TwigFunction('foo', 'foo', []));
- $environment->addFunction(new TwigFunction('bar', 'bar', ['needs_environment' => true]));
- $environment->addFunction(new TwigFunction('foofoo', 'foofoo', ['needs_context' => true]));
- $environment->addFunction(new TwigFunction('foobar', 'foobar', ['needs_environment' => true, 'needs_context' => true]));
- $environment->addFunction(new TwigFunction('barbar', 'Twig\Tests\Node\Expression\twig_tests_function_barbar', ['is_variadic' => true]));
-
- $tests = [];
-
- $node = $this->createFunction('foo');
- $tests[] = [$node, 'foo()', $environment];
-
- $node = $this->createFunction('foo', [new ConstantExpression('bar', 1), new ConstantExpression('foobar', 1)]);
- $tests[] = [$node, 'foo("bar", "foobar")', $environment];
-
- $node = $this->createFunction('bar');
- $tests[] = [$node, 'bar($this->env)', $environment];
-
- $node = $this->createFunction('bar', [new ConstantExpression('bar', 1)]);
- $tests[] = [$node, 'bar($this->env, "bar")', $environment];
-
- $node = $this->createFunction('foofoo');
- $tests[] = [$node, 'foofoo($context)', $environment];
-
- $node = $this->createFunction('foofoo', [new ConstantExpression('bar', 1)]);
- $tests[] = [$node, 'foofoo($context, "bar")', $environment];
-
- $node = $this->createFunction('foobar');
- $tests[] = [$node, 'foobar($this->env, $context)', $environment];
-
- $node = $this->createFunction('foobar', [new ConstantExpression('bar', 1)]);
- $tests[] = [$node, 'foobar($this->env, $context, "bar")', $environment];
-
- // named arguments
- $node = $this->createFunction('date', [
- 'timezone' => new ConstantExpression('America/Chicago', 1),
- 'date' => new ConstantExpression(0, 1),
- ]);
- $tests[] = [$node, 'twig_date_converter($this->env, 0, "America/Chicago")'];
-
- // arbitrary named arguments
- $node = $this->createFunction('barbar');
- $tests[] = [$node, 'Twig\Tests\Node\Expression\twig_tests_function_barbar()', $environment];
-
- $node = $this->createFunction('barbar', ['foo' => new ConstantExpression('bar', 1)]);
- $tests[] = [$node, 'Twig\Tests\Node\Expression\twig_tests_function_barbar(null, null, ["foo" => "bar"])', $environment];
-
- $node = $this->createFunction('barbar', ['arg2' => new ConstantExpression('bar', 1)]);
- $tests[] = [$node, 'Twig\Tests\Node\Expression\twig_tests_function_barbar(null, "bar")', $environment];
-
- $node = $this->createFunction('barbar', [
- new ConstantExpression('1', 1),
- new ConstantExpression('2', 1),
- new ConstantExpression('3', 1),
- 'foo' => new ConstantExpression('bar', 1),
- ]);
- $tests[] = [$node, 'Twig\Tests\Node\Expression\twig_tests_function_barbar("1", "2", [0 => "3", "foo" => "bar"])', $environment];
-
- // function as an anonymous function
- if (\PHP_VERSION_ID >= 50300) {
- $node = $this->createFunction('anonymous', [new ConstantExpression('foo', 1)]);
- $tests[] = [$node, 'call_user_func_array($this->env->getFunction(\'anonymous\')->getCallable(), ["foo"])'];
- }
-
- return $tests;
- }
-
- protected function createFunction($name, array $arguments = [])
- {
- return new FunctionExpression($name, new Node($arguments), 1);
- }
-
- protected function getEnvironment()
- {
- if (\PHP_VERSION_ID >= 50300) {
- return include 'PHP53/FunctionInclude.php';
- }
-
- return parent::getEnvironment();
- }
-}
-
-function twig_tests_function_barbar($arg1 = null, $arg2 = null, array $args = [])
-{
-}
diff --git a/vendor/twig/twig/tests/Node/Expression/GetAttrTest.php b/vendor/twig/twig/tests/Node/Expression/GetAttrTest.php
deleted file mode 100644
index 5f9a0a79d8..0000000000
--- a/vendor/twig/twig/tests/Node/Expression/GetAttrTest.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-namespace Twig\Tests\Node\Expression;
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Twig\Node\Expression\ArrayExpression;
-use Twig\Node\Expression\ConstantExpression;
-use Twig\Node\Expression\GetAttrExpression;
-use Twig\Node\Expression\NameExpression;
-use Twig\Template;
-use Twig\Test\NodeTestCase;
-
-class GetAttrTest extends NodeTestCase
-{
- public function testConstructor()
- {
- $expr = new NameExpression('foo', 1);
- $attr = new ConstantExpression('bar', 1);
- $args = new ArrayExpression([], 1);
- $args->addElement(new NameExpression('foo', 1));
- $args->addElement(new ConstantExpression('bar', 1));
- $node = new GetAttrExpression($expr, $attr, $args, Template::ARRAY_CALL, 1);
-
- $this->assertEquals($expr, $node->getNode('node'));
- $this->assertEquals($attr, $node->getNode('attribute'));
- $this->assertEquals($args, $node->getNode('arguments'));
- $this->assertEquals(Template::ARRAY_CALL, $node->getAttribute('type'));
- }
-
- public function getTests()
- {
- $tests = [];
-
- $expr = new NameExpression('foo', 1);
- $attr = new ConstantExpression('bar', 1);
- $args = new ArrayExpression([], 1);
- $node = new GetAttrExpression($expr, $attr, $args, Template::ANY_CALL, 1);
- $tests[] = [$node, sprintf('%s%s, "bar", [])', $this->getAttributeGetter(), $this->getVariableGetter('foo', 1))];
-
- $node = new GetAttrExpression($expr, $attr, $args, Template::ARRAY_CALL, 1);
- $tests[] = [$node, sprintf('%s%s, "bar", [], "array")', $this->getAttributeGetter(), $this->getVariableGetter('foo', 1))];
-
- $args = new ArrayExpression([], 1);
- $args->addElement(new NameExpression('foo', 1));
- $args->addElement(new ConstantExpression('bar', 1));
- $node = new GetAttrExpression($expr, $attr, $args, Template::METHOD_CALL, 1);
- $tests[] = [$node, sprintf('%s%s, "bar", [0 => %s, 1 => "bar"], "method")', $this->getAttributeGetter(), $this->getVariableGetter('foo', 1), $this->getVariableGetter('foo'))];
-
- return $tests;
- }
-}
diff --git a/vendor/twig/twig/tests/Node/Expression/NameTest.php b/vendor/twig/twig/tests/Node/Expression/NameTest.php
deleted file mode 100644
index 738f28ae04..0000000000
--- a/vendor/twig/twig/tests/Node/Expression/NameTest.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-namespace Twig\Tests\Node\Expression;
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Twig\Environment;
-use Twig\Node\Expression\NameExpression;
-use Twig\Test\NodeTestCase;
-
-class NameTest extends NodeTestCase
-{
- public function testConstructor()
- {
- $node = new NameExpression('foo', 1);
-
- $this->assertEquals('foo', $node->getAttribute('name'));
- }
-
- public function getTests()
- {
- $node = new NameExpression('foo', 1);
- $context = new NameExpression('_context', 1);
-
- $env = new Environment($this->createMock('\Twig\Loader\LoaderInterface'), ['strict_variables' => true]);
- $env1 = new Environment($this->createMock('\Twig\Loader\LoaderInterface'), ['strict_variables' => false]);
-
- if (\PHP_VERSION_ID >= 70000) {
- $output = '($context["foo"] ?? $this->getContext($context, "foo"))';
- } elseif (\PHP_VERSION_ID >= 50400) {
- $output = '(isset($context["foo"]) ? $context["foo"] : $this->getContext($context, "foo"))';
- } else {
- $output = '$this->getContext($context, "foo")';
- }
-
- return [
- [$node, "// line 1\n".$output, $env],
- [$node, $this->getVariableGetter('foo', 1), $env1],
- [$context, "// line 1\n\$context"],
- ];
- }
-}
diff --git a/vendor/twig/twig/tests/Node/Expression/NullCoalesceTest.php b/vendor/twig/twig/tests/Node/Expression/NullCoalesceTest.php
deleted file mode 100644
index bbfff5763b..0000000000
--- a/vendor/twig/twig/tests/Node/Expression/NullCoalesceTest.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-namespace Twig\Tests\Node\Expression;
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Twig\Node\Expression\ConstantExpression;
-use Twig\Node\Expression\NameExpression;
-use Twig\Node\Expression\NullCoalesceExpression;
-use Twig\Test\NodeTestCase;
-
-class NullCoalesceTest extends NodeTestCase
-{
- public function getTests()
- {
- $tests = [];
-
- $left = new NameExpression('foo', 1);
- $right = new ConstantExpression(2, 1);
- $node = new NullCoalesceExpression($left, $right, 1);
- if (\PHP_VERSION_ID >= 70000) {
- $tests[] = [$node, "((// line 1\n\$context[\"foo\"]) ?? (2))"];
- } elseif (\PHP_VERSION_ID >= 50400) {
- $tests[] = [$node, "(((// line 1\n(isset(\$context[\"foo\"]) || array_key_exists(\"foo\", \$context)) && !(null === (isset(\$context[\"foo\"]) ? \$context[\"foo\"] : null)))) ? ((isset(\$context[\"foo\"]) ? \$context[\"foo\"] : null)) : (2))"];
- } else {
- $tests[] = [$node, "(((// line 1\n(isset(\$context[\"foo\"]) || array_key_exists(\"foo\", \$context)) && !(null === \$this->getContext(\$context, \"foo\")))) ? (\$this->getContext(\$context, \"foo\")) : (2))"];
- }
-
- return $tests;
- }
-}
diff --git a/vendor/twig/twig/tests/Node/Expression/PHP53/FilterInclude.php b/vendor/twig/twig/tests/Node/Expression/PHP53/FilterInclude.php
deleted file mode 100644
index fc8f517761..0000000000
--- a/vendor/twig/twig/tests/Node/Expression/PHP53/FilterInclude.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-namespace Twig\Tests\Node\Expression\PHP53;
-
-$env = new \Twig\Environment(new \Twig\Loader\ArrayLoader([]));
-$env->addFilter(new \Twig\TwigFilter('anonymous', function () {}));
-
-return $env;
diff --git a/vendor/twig/twig/tests/Node/Expression/PHP53/FunctionInclude.php b/vendor/twig/twig/tests/Node/Expression/PHP53/FunctionInclude.php
deleted file mode 100644
index b364001cde..0000000000
--- a/vendor/twig/twig/tests/Node/Expression/PHP53/FunctionInclude.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-namespace Twig\Tests\Node\Expression\PHP53;
-
-$env = new \Twig\Environment(new \Twig\Loader\ArrayLoader([]));
-$env->addFunction(new \Twig\TwigFunction('anonymous', function () {}));
-
-return $env;
diff --git a/vendor/twig/twig/tests/Node/Expression/PHP53/TestInclude.php b/vendor/twig/twig/tests/Node/Expression/PHP53/TestInclude.php
deleted file mode 100644
index b2bf2cede5..0000000000
--- a/vendor/twig/twig/tests/Node/Expression/PHP53/TestInclude.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-namespace Twig\Tests\Node\Expression\PHP53;
-
-$env = new \Twig\Environment(new \Twig\Loader\ArrayLoader([]));
-$env->addTest(new \Twig\TwigTest('anonymous', function () {}));
-
-return $env;
diff --git a/vendor/twig/twig/tests/Node/Expression/ParentTest.php b/vendor/twig/twig/tests/Node/Expression/ParentTest.php
deleted file mode 100644
index 1a67b77fe4..0000000000
--- a/vendor/twig/twig/tests/Node/Expression/ParentTest.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-namespace Twig\Tests\Node\Expression;
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Twig\Node\Expression\ParentExpression;
-use Twig\Test\NodeTestCase;
-
-class ParentTest extends NodeTestCase
-{
- public function testConstructor()
- {
- $node = new ParentExpression('foo', 1);
-
- $this->assertEquals('foo', $node->getAttribute('name'));
- }
-
- public function getTests()
- {
- $tests = [];
- $tests[] = [new ParentExpression('foo', 1), '$this->renderParentBlock("foo", $context, $blocks)'];
-
- return $tests;
- }
-}
diff --git a/vendor/twig/twig/tests/Node/Expression/TestTest.php b/vendor/twig/twig/tests/Node/Expression/TestTest.php
deleted file mode 100644
index 11e1596ca4..0000000000
--- a/vendor/twig/twig/tests/Node/Expression/TestTest.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-
-namespace Twig\Tests\Node\Expression;
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Twig\Environment;
-use Twig\Node\Expression\ConstantExpression;
-use Twig\Node\Expression\Test\NullTest;
-use Twig\Node\Expression\TestExpression;
-use Twig\Node\Node;
-use Twig\Test\NodeTestCase;
-use Twig\TwigTest;
-
-class TestTest extends NodeTestCase
-{
- public function testConstructor()
- {
- $expr = new ConstantExpression('foo', 1);
- $name = new ConstantExpression('null', 1);
- $args = new Node();
- $node = new TestExpression($expr, $name, $args, 1);
-
- $this->assertEquals($expr, $node->getNode('node'));
- $this->assertEquals($args, $node->getNode('arguments'));
- $this->assertEquals($name, $node->getAttribute('name'));
- }
-
- public function getTests()
- {
- $environment = new Environment($this->createMock('\Twig\Loader\LoaderInterface'));
- $environment->addTest(new TwigTest('barbar', 'Twig\Tests\Node\Expression\twig_tests_test_barbar', ['is_variadic' => true, 'need_context' => true]));
-
- $tests = [];
-
- $expr = new ConstantExpression('foo', 1);
- $node = new NullTest($expr, 'null', new Node([]), 1);
- $tests[] = [$node, '(null === "foo")'];
-
- // test as an anonymous function
- if (\PHP_VERSION_ID >= 50300) {
- $node = $this->createTest(new ConstantExpression('foo', 1), 'anonymous', [new ConstantExpression('foo', 1)]);
- $tests[] = [$node, 'call_user_func_array($this->env->getTest(\'anonymous\')->getCallable(), ["foo", "foo"])'];
- }
-
- // arbitrary named arguments
- $string = new ConstantExpression('abc', 1);
- $node = $this->createTest($string, 'barbar');
- $tests[] = [$node, 'Twig\Tests\Node\Expression\twig_tests_test_barbar("abc")', $environment];
-
- $node = $this->createTest($string, 'barbar', ['foo' => new ConstantExpression('bar', 1)]);
- $tests[] = [$node, 'Twig\Tests\Node\Expression\twig_tests_test_barbar("abc", null, null, ["foo" => "bar"])', $environment];
-
- $node = $this->createTest($string, 'barbar', ['arg2' => new ConstantExpression('bar', 1)]);
- $tests[] = [$node, 'Twig\Tests\Node\Expression\twig_tests_test_barbar("abc", null, "bar")', $environment];
-
- $node = $this->createTest($string, 'barbar', [
- new ConstantExpression('1', 1),
- new ConstantExpression('2', 1),
- new ConstantExpression('3', 1),
- 'foo' => new ConstantExpression('bar', 1),
- ]);
- $tests[] = [$node, 'Twig\Tests\Node\Expression\twig_tests_test_barbar("abc", "1", "2", [0 => "3", "foo" => "bar"])', $environment];
-
- return $tests;
- }
-
- protected function createTest($node, $name, array $arguments = [])
- {
- return new TestExpression($node, $name, new Node($arguments), 1);
- }
-
- protected function getEnvironment()
- {
- if (\PHP_VERSION_ID >= 50300) {
- return include 'PHP53/TestInclude.php';
- }
-
- return parent::getEnvironment();
- }
-}
-
-function twig_tests_test_barbar($string, $arg1 = null, $arg2 = null, array $args = [])
-{
-}
diff --git a/vendor/twig/twig/tests/Node/Expression/Unary/NegTest.php b/vendor/twig/twig/tests/Node/Expression/Unary/NegTest.php
deleted file mode 100644
index fcbf66ece8..0000000000
--- a/vendor/twig/twig/tests/Node/Expression/Unary/NegTest.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-namespace Twig\Tests\Node\Expression\Unary;
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Twig\Node\Expression\ConstantExpression;
-use Twig\Node\Expression\Unary\NegUnary;
-use Twig\Test\NodeTestCase;
-
-class NegTest extends NodeTestCase
-{
- public function testConstructor()
- {
- $expr = new ConstantExpression(1, 1);
- $node = new NegUnary($expr, 1);
-
- $this->assertEquals($expr, $node->getNode('node'));
- }
-
- public function getTests()
- {
- $node = new ConstantExpression(1, 1);
- $node = new NegUnary($node, 1);
-
- return [
- [$node, '-1'],
- [new NegUnary($node, 1), '- -1'],
- ];
- }
-}
diff --git a/vendor/twig/twig/tests/Node/Expression/Unary/NotTest.php b/vendor/twig/twig/tests/Node/Expression/Unary/NotTest.php
deleted file mode 100644
index 8197111e17..0000000000
--- a/vendor/twig/twig/tests/Node/Expression/Unary/NotTest.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-namespace Twig\Tests\Node\Expression\Unary;
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Twig\Node\Expression\ConstantExpression;
-use Twig\Node\Expression\Unary\NotUnary;
-use Twig\Test\NodeTestCase;
-
-class NotTest extends NodeTestCase
-{
- public function testConstructor()
- {
- $expr = new ConstantExpression(1, 1);
- $node = new NotUnary($expr, 1);
-
- $this->assertEquals($expr, $node->getNode('node'));
- }
-
- public function getTests()
- {
- $node = new ConstantExpression(1, 1);
- $node = new NotUnary($node, 1);
-
- return [
- [$node, '!1'],
- ];
- }
-}
diff --git a/vendor/twig/twig/tests/Node/Expression/Unary/PosTest.php b/vendor/twig/twig/tests/Node/Expression/Unary/PosTest.php
deleted file mode 100644
index 780e339e0c..0000000000
--- a/vendor/twig/twig/tests/Node/Expression/Unary/PosTest.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-namespace Twig\Tests\Node\Expression\Unary;
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Twig\Node\Expression\ConstantExpression;
-use Twig\Node\Expression\Unary\PosUnary;
-use Twig\Test\NodeTestCase;
-
-class PosTest extends NodeTestCase
-{
- public function testConstructor()
- {
- $expr = new ConstantExpression(1, 1);
- $node = new PosUnary($expr, 1);
-
- $this->assertEquals($expr, $node->getNode('node'));
- }
-
- public function getTests()
- {
- $node = new ConstantExpression(1, 1);
- $node = new PosUnary($node, 1);
-
- return [
- [$node, '+1'],
- ];
- }
-}
diff --git a/vendor/twig/twig/tests/Node/ForTest.php b/vendor/twig/twig/tests/Node/ForTest.php
deleted file mode 100644
index d960ed6196..0000000000
--- a/vendor/twig/twig/tests/Node/ForTest.php
+++ /dev/null
@@ -1,201 +0,0 @@
-<?php
-
-namespace Twig\Tests\Node;
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Twig\Node\Expression\AssignNameExpression;
-use Twig\Node\Expression\ConstantExpression;
-use Twig\Node\Expression\NameExpression;
-use Twig\Node\ForNode;
-use Twig\Node\Node;
-use Twig\Node\PrintNode;
-use Twig\Test\NodeTestCase;
-
-class ForTest extends NodeTestCase
-{
- public function testConstructor()
- {
- $keyTarget = new AssignNameExpression('key', 1);
- $valueTarget = new AssignNameExpression('item', 1);
- $seq = new NameExpression('items', 1);
- $ifexpr = new ConstantExpression(true, 1);
- $body = new Node([new PrintNode(new NameExpression('foo', 1), 1)], [], 1);
- $else = null;
- $node = new ForNode($keyTarget, $valueTarget, $seq, $ifexpr, $body, $else, 1);
- $node->setAttribute('with_loop', false);
-
- $this->assertEquals($keyTarget, $node->getNode('key_target'));
- $this->assertEquals($valueTarget, $node->getNode('value_target'));
- $this->assertEquals($seq, $node->getNode('seq'));
- $this->assertTrue($node->getAttribute('ifexpr'));
- $this->assertInstanceOf('\Twig\Node\IfNode', $node->getNode('body'));
- $this->assertEquals($body, $node->getNode('body')->getNode('tests')->getNode(1)->getNode(0));
- $this->assertFalse($node->hasNode('else'));
-
- $else = new PrintNode(new NameExpression('foo', 1), 1);
- $node = new ForNode($keyTarget, $valueTarget, $seq, $ifexpr, $body, $else, 1);
- $node->setAttribute('with_loop', false);
- $this->assertEquals($else, $node->getNode('else'));
- }
-
- public function getTests()
- {
- $tests = [];
-
- $keyTarget = new AssignNameExpression('key', 1);
- $valueTarget = new AssignNameExpression('item', 1);
- $seq = new NameExpression('items', 1);
- $ifexpr = null;
- $body = new Node([new PrintNode(new NameExpression('foo', 1), 1)], [], 1);
- $else = null;
- $node = new ForNode($keyTarget, $valueTarget, $seq, $ifexpr, $body, $else, 1);
- $node->setAttribute('with_loop', false);
-
- $tests[] = [$node, <<<EOF
-// line 1
-\$context['_parent'] = \$context;
-\$context['_seq'] = twig_ensure_traversable({$this->getVariableGetter('items')});
-foreach (\$context['_seq'] as \$context["key"] => \$context["item"]) {
- echo {$this->getVariableGetter('foo')};
-}
-\$_parent = \$context['_parent'];
-unset(\$context['_seq'], \$context['_iterated'], \$context['key'], \$context['item'], \$context['_parent'], \$context['loop']);
-\$context = array_intersect_key(\$context, \$_parent) + \$_parent;
-EOF
- ];
-
- $keyTarget = new AssignNameExpression('k', 1);
- $valueTarget = new AssignNameExpression('v', 1);
- $seq = new NameExpression('values', 1);
- $ifexpr = null;
- $body = new Node([new PrintNode(new NameExpression('foo', 1), 1)], [], 1);
- $else = null;
- $node = new ForNode($keyTarget, $valueTarget, $seq, $ifexpr, $body, $else, 1);
- $node->setAttribute('with_loop', true);
-
- $tests[] = [$node, <<<EOF
-// line 1
-\$context['_parent'] = \$context;
-\$context['_seq'] = twig_ensure_traversable({$this->getVariableGetter('values')});
-\$context['loop'] = [
- 'parent' => \$context['_parent'],
- 'index0' => 0,
- 'index' => 1,
- 'first' => true,
-];
-if (is_array(\$context['_seq']) || (is_object(\$context['_seq']) && \$context['_seq'] instanceof \Countable)) {
- \$length = count(\$context['_seq']);
- \$context['loop']['revindex0'] = \$length - 1;
- \$context['loop']['revindex'] = \$length;
- \$context['loop']['length'] = \$length;
- \$context['loop']['last'] = 1 === \$length;
-}
-foreach (\$context['_seq'] as \$context["k"] => \$context["v"]) {
- echo {$this->getVariableGetter('foo')};
- ++\$context['loop']['index0'];
- ++\$context['loop']['index'];
- \$context['loop']['first'] = false;
- if (isset(\$context['loop']['length'])) {
- --\$context['loop']['revindex0'];
- --\$context['loop']['revindex'];
- \$context['loop']['last'] = 0 === \$context['loop']['revindex0'];
- }
-}
-\$_parent = \$context['_parent'];
-unset(\$context['_seq'], \$context['_iterated'], \$context['k'], \$context['v'], \$context['_parent'], \$context['loop']);
-\$context = array_intersect_key(\$context, \$_parent) + \$_parent;
-EOF
- ];
-
- $keyTarget = new AssignNameExpression('k', 1);
- $valueTarget = new AssignNameExpression('v', 1);
- $seq = new NameExpression('values', 1);
- $ifexpr = new ConstantExpression(true, 1);
- $body = new Node([new PrintNode(new NameExpression('foo', 1), 1)], [], 1);
- $else = null;
- $node = new ForNode($keyTarget, $valueTarget, $seq, $ifexpr, $body, $else, 1);
- $node->setAttribute('with_loop', true);
-
- $tests[] = [$node, <<<EOF
-// line 1
-\$context['_parent'] = \$context;
-\$context['_seq'] = twig_ensure_traversable({$this->getVariableGetter('values')});
-\$context['loop'] = [
- 'parent' => \$context['_parent'],
- 'index0' => 0,
- 'index' => 1,
- 'first' => true,
-];
-foreach (\$context['_seq'] as \$context["k"] => \$context["v"]) {
- if (true) {
- echo {$this->getVariableGetter('foo')};
- ++\$context['loop']['index0'];
- ++\$context['loop']['index'];
- \$context['loop']['first'] = false;
- }
-}
-\$_parent = \$context['_parent'];
-unset(\$context['_seq'], \$context['_iterated'], \$context['k'], \$context['v'], \$context['_parent'], \$context['loop']);
-\$context = array_intersect_key(\$context, \$_parent) + \$_parent;
-EOF
- ];
-
- $keyTarget = new AssignNameExpression('k', 1);
- $valueTarget = new AssignNameExpression('v', 1);
- $seq = new NameExpression('values', 1);
- $ifexpr = null;
- $body = new Node([new PrintNode(new NameExpression('foo', 1), 1)], [], 1);
- $else = new PrintNode(new NameExpression('foo', 1), 1);
- $node = new ForNode($keyTarget, $valueTarget, $seq, $ifexpr, $body, $else, 1);
- $node->setAttribute('with_loop', true);
-
- $tests[] = [$node, <<<EOF
-// line 1
-\$context['_parent'] = \$context;
-\$context['_seq'] = twig_ensure_traversable({$this->getVariableGetter('values')});
-\$context['_iterated'] = false;
-\$context['loop'] = [
- 'parent' => \$context['_parent'],
- 'index0' => 0,
- 'index' => 1,
- 'first' => true,
-];
-if (is_array(\$context['_seq']) || (is_object(\$context['_seq']) && \$context['_seq'] instanceof \Countable)) {
- \$length = count(\$context['_seq']);
- \$context['loop']['revindex0'] = \$length - 1;
- \$context['loop']['revindex'] = \$length;
- \$context['loop']['length'] = \$length;
- \$context['loop']['last'] = 1 === \$length;
-}
-foreach (\$context['_seq'] as \$context["k"] => \$context["v"]) {
- echo {$this->getVariableGetter('foo')};
- \$context['_iterated'] = true;
- ++\$context['loop']['index0'];
- ++\$context['loop']['index'];
- \$context['loop']['first'] = false;
- if (isset(\$context['loop']['length'])) {
- --\$context['loop']['revindex0'];
- --\$context['loop']['revindex'];
- \$context['loop']['last'] = 0 === \$context['loop']['revindex0'];
- }
-}
-if (!\$context['_iterated']) {
- echo {$this->getVariableGetter('foo')};
-}
-\$_parent = \$context['_parent'];
-unset(\$context['_seq'], \$context['_iterated'], \$context['k'], \$context['v'], \$context['_parent'], \$context['loop']);
-\$context = array_intersect_key(\$context, \$_parent) + \$_parent;
-EOF
- ];
-
- return $tests;
- }
-}
diff --git a/vendor/twig/twig/tests/Node/IfTest.php b/vendor/twig/twig/tests/Node/IfTest.php
deleted file mode 100644
index d5a6eac8ab..0000000000
--- a/vendor/twig/twig/tests/Node/IfTest.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-
-namespace Twig\Tests\Node;
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Twig\Node\Expression\ConstantExpression;
-use Twig\Node\Expression\NameExpression;
-use Twig\Node\IfNode;
-use Twig\Node\Node;
-use Twig\Node\PrintNode;
-use Twig\Test\NodeTestCase;
-
-class IfTest extends NodeTestCase
-{
- public function testConstructor()
- {
- $t = new Node([
- new ConstantExpression(true, 1),
- new PrintNode(new NameExpression('foo', 1), 1),
- ], [], 1);
- $else = null;
- $node = new IfNode($t, $else, 1);
-
- $this->assertEquals($t, $node->getNode('tests'));
- $this->assertFalse($node->hasNode('else'));
-
- $else = new PrintNode(new NameExpression('bar', 1), 1);
- $node = new IfNode($t, $else, 1);
- $this->assertEquals($else, $node->getNode('else'));
- }
-
- public function getTests()
- {
- $tests = [];
-
- $t = new Node([
- new ConstantExpression(true, 1),
- new PrintNode(new NameExpression('foo', 1), 1),
- ], [], 1);
- $else = null;
- $node = new IfNode($t, $else, 1);
-
- $tests[] = [$node, <<<EOF
-// line 1
-if (true) {
- echo {$this->getVariableGetter('foo')};
-}
-EOF
- ];
-
- $t = new Node([
- new ConstantExpression(true, 1),
- new PrintNode(new NameExpression('foo', 1), 1),
- new ConstantExpression(false, 1),
- new PrintNode(new NameExpression('bar', 1), 1),
- ], [], 1);
- $else = null;
- $node = new IfNode($t, $else, 1);
-
- $tests[] = [$node, <<<EOF
-// line 1
-if (true) {
- echo {$this->getVariableGetter('foo')};
-} elseif (false) {
- echo {$this->getVariableGetter('bar')};
-}
-EOF
- ];
-
- $t = new Node([
- new ConstantExpression(true, 1),
- new PrintNode(new NameExpression('foo', 1), 1),
- ], [], 1);
- $else = new PrintNode(new NameExpression('bar', 1), 1);
- $node = new IfNode($t, $else, 1);
-
- $tests[] = [$node, <<<EOF
-// line 1
-if (true) {
- echo {$this->getVariableGetter('foo')};
-} else {
- echo {$this->getVariableGetter('bar')};
-}
-EOF
- ];
-
- return $tests;
- }
-}
diff --git a/vendor/twig/twig/tests/Node/ImportTest.php b/vendor/twig/twig/tests/Node/ImportTest.php
deleted file mode 100644
index dbb49ab92a..0000000000
--- a/vendor/twig/twig/tests/Node/ImportTest.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-namespace Twig\Tests\Node;
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Twig\Node\Expression\AssignNameExpression;
-use Twig\Node\Expression\ConstantExpression;
-use Twig\Node\ImportNode;
-use Twig\Test\NodeTestCase;
-
-class ImportTest extends NodeTestCase
-{
- public function testConstructor()
- {
- $macro = new ConstantExpression('foo.twig', 1);
- $var = new AssignNameExpression('macro', 1);
- $node = new ImportNode($macro, $var, 1);
-
- $this->assertEquals($macro, $node->getNode('expr'));
- $this->assertEquals($var, $node->getNode('var'));
- }
-
- public function getTests()
- {
- $tests = [];
-
- $macro = new ConstantExpression('foo.twig', 1);
- $var = new AssignNameExpression('macro', 1);
- $node = new ImportNode($macro, $var, 1);
-
- $tests[] = [$node, <<<EOF
-// line 1
-\$context["macro"] = \$this->loadTemplate("foo.twig", null, 1)->unwrap();
-EOF
- ];
-
- return $tests;
- }
-}
diff --git a/vendor/twig/twig/tests/Node/IncludeTest.php b/vendor/twig/twig/tests/Node/IncludeTest.php
deleted file mode 100644
index ab1fdf0bfe..0000000000
--- a/vendor/twig/twig/tests/Node/IncludeTest.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-
-namespace Twig\Tests\Node;
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Twig\Node\Expression\ArrayExpression;
-use Twig\Node\Expression\ConditionalExpression;
-use Twig\Node\Expression\ConstantExpression;
-use Twig\Node\IncludeNode;
-use Twig\Test\NodeTestCase;
-
-class IncludeTest extends NodeTestCase
-{
- public function testConstructor()
- {
- $expr = new ConstantExpression('foo.twig', 1);
- $node = new IncludeNode($expr, null, false, false, 1);
-
- $this->assertFalse($node->hasNode('variables'));
- $this->assertEquals($expr, $node->getNode('expr'));
- $this->assertFalse($node->getAttribute('only'));
-
- $vars = new ArrayExpression([new ConstantExpression('foo', 1), new ConstantExpression(true, 1)], 1);
- $node = new IncludeNode($expr, $vars, true, false, 1);
- $this->assertEquals($vars, $node->getNode('variables'));
- $this->assertTrue($node->getAttribute('only'));
- }
-
- public function getTests()
- {
- $tests = [];
-
- $expr = new ConstantExpression('foo.twig', 1);
- $node = new IncludeNode($expr, null, false, false, 1);
- $tests[] = [$node, <<<EOF
-// line 1
-\$this->loadTemplate("foo.twig", null, 1)->display(\$context);
-EOF
- ];
-
- $expr = new ConditionalExpression(
- new ConstantExpression(true, 1),
- new ConstantExpression('foo', 1),
- new ConstantExpression('foo', 1),
- 0
- );
- $node = new IncludeNode($expr, null, false, false, 1);
- $tests[] = [$node, <<<EOF
-// line 1
-\$this->loadTemplate(((true) ? ("foo") : ("foo")), null, 1)->display(\$context);
-EOF
- ];
-
- $expr = new ConstantExpression('foo.twig', 1);
- $vars = new ArrayExpression([new ConstantExpression('foo', 1), new ConstantExpression(true, 1)], 1);
- $node = new IncludeNode($expr, $vars, false, false, 1);
- $tests[] = [$node, <<<EOF
-// line 1
-\$this->loadTemplate("foo.twig", null, 1)->display(twig_array_merge(\$context, ["foo" => true]));
-EOF
- ];
-
- $node = new IncludeNode($expr, $vars, true, false, 1);
- $tests[] = [$node, <<<EOF
-// line 1
-\$this->loadTemplate("foo.twig", null, 1)->display(twig_to_array(["foo" => true]));
-EOF
- ];
-
- $node = new IncludeNode($expr, $vars, true, true, 1);
- $tests[] = [$node, <<<EOF
-// line 1
-\$__internal_%s = null;
-try {
- \$__internal_%s = \$this->loadTemplate("foo.twig", null, 1);
-} catch (LoaderError \$e) {
- // ignore missing template
-}
-if (\$__internal_%s) {
- \$__internal_%s->display(twig_to_array(["foo" => true]));
-}
-EOF
- , null, true];
-
- return $tests;
- }
-}
diff --git a/vendor/twig/twig/tests/Node/MacroTest.php b/vendor/twig/twig/tests/Node/MacroTest.php
deleted file mode 100644
index 82fc9999da..0000000000
--- a/vendor/twig/twig/tests/Node/MacroTest.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-
-namespace Twig\Tests\Node;
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Twig\Node\Expression\ConstantExpression;
-use Twig\Node\Expression\NameExpression;
-use Twig\Node\MacroNode;
-use Twig\Node\Node;
-use Twig\Node\TextNode;
-use Twig\Test\NodeTestCase;
-
-class MacroTest extends NodeTestCase
-{
- public function testConstructor()
- {
- $body = new TextNode('foo', 1);
- $arguments = new Node([new NameExpression('foo', 1)], [], 1);
- $node = new MacroNode('foo', $body, $arguments, 1);
-
- $this->assertEquals($body, $node->getNode('body'));
- $this->assertEquals($arguments, $node->getNode('arguments'));
- $this->assertEquals('foo', $node->getAttribute('name'));
- }
-
- public function getTests()
- {
- $body = new TextNode('foo', 1);
- $arguments = new Node([
- 'foo' => new ConstantExpression(null, 1),
- 'bar' => new ConstantExpression('Foo', 1),
- ], [], 1);
- $node = new MacroNode('foo', $body, $arguments, 1);
-
- if (\PHP_VERSION_ID >= 50600) {
- $declaration = ', ...$__varargs__';
- $varargs = '$__varargs__';
- } else {
- $declaration = '';
- $varargs = 'func_num_args() > 2 ? array_slice(func_get_args(), 2) : []';
- }
-
- return [
- [$node, <<<EOF
-// line 1
-public function getfoo(\$__foo__ = null, \$__bar__ = "Foo"$declaration)
-{
- \$context = \$this->env->mergeGlobals([
- "foo" => \$__foo__,
- "bar" => \$__bar__,
- "varargs" => $varargs,
- ]);
-
- \$blocks = [];
-
- ob_start(function () { return ''; });
- try {
- echo "foo";
- } catch (\Exception \$e) {
- ob_end_clean();
-
- throw \$e;
- } catch (\Throwable \$e) {
- ob_end_clean();
-
- throw \$e;
- }
-
- return ('' === \$tmp = ob_get_clean()) ? '' : new Markup(\$tmp, \$this->env->getCharset());
-}
-EOF
- ],
- ];
- }
-}
diff --git a/vendor/twig/twig/tests/Node/ModuleTest.php b/vendor/twig/twig/tests/Node/ModuleTest.php
deleted file mode 100644
index aa000d39b2..0000000000
--- a/vendor/twig/twig/tests/Node/ModuleTest.php
+++ /dev/null
@@ -1,270 +0,0 @@
-<?php
-
-namespace Twig\Tests\Node;
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Twig\Environment;
-use Twig\Node\Expression\AssignNameExpression;
-use Twig\Node\Expression\ConditionalExpression;
-use Twig\Node\Expression\ConstantExpression;
-use Twig\Node\ImportNode;
-use Twig\Node\ModuleNode;
-use Twig\Node\Node;
-use Twig\Node\SetNode;
-use Twig\Node\TextNode;
-use Twig\Source;
-use Twig\Test\NodeTestCase;
-
-class ModuleTest extends NodeTestCase
-{
- public function testConstructor()
- {
- $body = new TextNode('foo', 1);
- $parent = new ConstantExpression('layout.twig', 1);
- $blocks = new Node();
- $macros = new Node();
- $traits = new Node();
- $source = new Source('{{ foo }}', 'foo.twig');
- $node = new ModuleNode($body, $parent, $blocks, $macros, $traits, new Node([]), $source);
-
- $this->assertEquals($body, $node->getNode('body'));
- $this->assertEquals($blocks, $node->getNode('blocks'));
- $this->assertEquals($macros, $node->getNode('macros'));
- $this->assertEquals($parent, $node->getNode('parent'));
- $this->assertEquals($source->getName(), $node->getTemplateName());
- }
-
- public function getTests()
- {
- $twig = new Environment($this->createMock('\Twig\Loader\LoaderInterface'));
-
- $tests = [];
-
- $body = new TextNode('foo', 1);
- $extends = null;
- $blocks = new Node();
- $macros = new Node();
- $traits = new Node();
- $source = new Source('{{ foo }}', 'foo.twig');
-
- $node = new ModuleNode($body, $extends, $blocks, $macros, $traits, new Node([]), $source);
- $tests[] = [$node, <<<EOF
-<?php
-
-use Twig\Environment;
-use Twig\Error\LoaderError;
-use Twig\Error\RuntimeError;
-use Twig\Markup;
-use Twig\Sandbox\SecurityError;
-use Twig\Sandbox\SecurityNotAllowedTagError;
-use Twig\Sandbox\SecurityNotAllowedFilterError;
-use Twig\Sandbox\SecurityNotAllowedFunctionError;
-use Twig\Source;
-use Twig\Template;
-
-/* foo.twig */
-class __TwigTemplate_%x extends \Twig\Template
-{
- public function __construct(Environment \$env)
- {
- parent::__construct(\$env);
-
- \$this->parent = false;
-
- \$this->blocks = [
- ];
- }
-
- protected function doDisplay(array \$context, array \$blocks = [])
- {
- // line 1
- echo "foo";
- }
-
- public function getTemplateName()
- {
- return "foo.twig";
- }
-
- public function getDebugInfo()
- {
- return array ( 30 => 1,);
- }
-
- /** @deprecated since 1.27 (to be removed in 2.0). Use getSourceContext() instead */
- public function getSource()
- {
- @trigger_error('The '.__METHOD__.' method is deprecated since version 1.27 and will be removed in 2.0. Use getSourceContext() instead.', E_USER_DEPRECATED);
-
- return \$this->getSourceContext()->getCode();
- }
-
- public function getSourceContext()
- {
- return new Source("", "foo.twig", "");
- }
-}
-EOF
- , $twig, true];
-
- $import = new ImportNode(new ConstantExpression('foo.twig', 1), new AssignNameExpression('macro', 1), 2);
-
- $body = new Node([$import]);
- $extends = new ConstantExpression('layout.twig', 1);
-
- $node = new ModuleNode($body, $extends, $blocks, $macros, $traits, new Node([]), $source);
- $tests[] = [$node, <<<EOF
-<?php
-
-use Twig\Environment;
-use Twig\Error\LoaderError;
-use Twig\Error\RuntimeError;
-use Twig\Markup;
-use Twig\Sandbox\SecurityError;
-use Twig\Sandbox\SecurityNotAllowedTagError;
-use Twig\Sandbox\SecurityNotAllowedFilterError;
-use Twig\Sandbox\SecurityNotAllowedFunctionError;
-use Twig\Source;
-use Twig\Template;
-
-/* foo.twig */
-class __TwigTemplate_%x extends \Twig\Template
-{
- public function __construct(Environment \$env)
- {
- parent::__construct(\$env);
-
- \$this->blocks = [
- ];
- }
-
- protected function doGetParent(array \$context)
- {
- // line 1
- return "layout.twig";
- }
-
- protected function doDisplay(array \$context, array \$blocks = [])
- {
- // line 2
- \$context["macro"] = \$this->loadTemplate("foo.twig", "foo.twig", 2)->unwrap();
- // line 1
- \$this->parent = \$this->loadTemplate("layout.twig", "foo.twig", 1);
- \$this->parent->display(\$context, array_merge(\$this->blocks, \$blocks));
- }
-
- public function getTemplateName()
- {
- return "foo.twig";
- }
-
- public function isTraitable()
- {
- return false;
- }
-
- public function getDebugInfo()
- {
- return array ( 36 => 1, 34 => 2, 28 => 1,);
- }
-
- /** @deprecated since 1.27 (to be removed in 2.0). Use getSourceContext() instead */
- public function getSource()
- {
- @trigger_error('The '.__METHOD__.' method is deprecated since version 1.27 and will be removed in 2.0. Use getSourceContext() instead.', E_USER_DEPRECATED);
-
- return \$this->getSourceContext()->getCode();
- }
-
- public function getSourceContext()
- {
- return new Source("", "foo.twig", "");
- }
-}
-EOF
- , $twig, true];
-
- $set = new SetNode(false, new Node([new AssignNameExpression('foo', 4)]), new Node([new ConstantExpression('foo', 4)]), 4);
- $body = new Node([$set]);
- $extends = new ConditionalExpression(
- new ConstantExpression(true, 2),
- new ConstantExpression('foo', 2),
- new ConstantExpression('foo', 2),
- 2
- );
-
- $twig = new Environment($this->createMock('\Twig\Loader\LoaderInterface'), ['debug' => true]);
- $node = new ModuleNode($body, $extends, $blocks, $macros, $traits, new Node([]), $source);
- $tests[] = [$node, <<<EOF
-<?php
-
-use Twig\Environment;
-use Twig\Error\LoaderError;
-use Twig\Error\RuntimeError;
-use Twig\Markup;
-use Twig\Sandbox\SecurityError;
-use Twig\Sandbox\SecurityNotAllowedTagError;
-use Twig\Sandbox\SecurityNotAllowedFilterError;
-use Twig\Sandbox\SecurityNotAllowedFunctionError;
-use Twig\Source;
-use Twig\Template;
-
-/* foo.twig */
-class __TwigTemplate_%x extends \Twig\Template
-{
- protected function doGetParent(array \$context)
- {
- // line 2
- return \$this->loadTemplate(((true) ? ("foo") : ("foo")), "foo.twig", 2);
- }
-
- protected function doDisplay(array \$context, array \$blocks = [])
- {
- // line 4
- \$context["foo"] = "foo";
- // line 2
- \$this->getParent(\$context)->display(\$context, array_merge(\$this->blocks, \$blocks));
- }
-
- public function getTemplateName()
- {
- return "foo.twig";
- }
-
- public function isTraitable()
- {
- return false;
- }
-
- public function getDebugInfo()
- {
- return array ( 28 => 2, 26 => 4, 20 => 2,);
- }
-
- /** @deprecated since 1.27 (to be removed in 2.0). Use getSourceContext() instead */
- public function getSource()
- {
- @trigger_error('The '.__METHOD__.' method is deprecated since version 1.27 and will be removed in 2.0. Use getSourceContext() instead.', E_USER_DEPRECATED);
-
- return \$this->getSourceContext()->getCode();
- }
-
- public function getSourceContext()
- {
- return new Source("{{ foo }}", "foo.twig", "");
- }
-}
-EOF
- , $twig, true];
-
- return $tests;
- }
-}
diff --git a/vendor/twig/twig/tests/Node/PrintTest.php b/vendor/twig/twig/tests/Node/PrintTest.php
deleted file mode 100644
index 49f8eb4984..0000000000
--- a/vendor/twig/twig/tests/Node/PrintTest.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-namespace Twig\Tests\Node;
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Twig\Node\Expression\ConstantExpression;
-use Twig\Node\PrintNode;
-use Twig\Test\NodeTestCase;
-
-class PrintTest extends NodeTestCase
-{
- public function testConstructor()
- {
- $expr = new ConstantExpression('foo', 1);
- $node = new PrintNode($expr, 1);
-
- $this->assertEquals($expr, $node->getNode('expr'));
- }
-
- public function getTests()
- {
- $tests = [];
- $tests[] = [new PrintNode(new ConstantExpression('foo', 1), 1), "// line 1\necho \"foo\";"];
-
- return $tests;
- }
-}
diff --git a/vendor/twig/twig/tests/Node/SandboxTest.php b/vendor/twig/twig/tests/Node/SandboxTest.php
deleted file mode 100644
index b81781e8b4..0000000000
--- a/vendor/twig/twig/tests/Node/SandboxTest.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-namespace Twig\Tests\Node;
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Twig\Node\SandboxNode;
-use Twig\Node\TextNode;
-use Twig\Test\NodeTestCase;
-
-class SandboxTest extends NodeTestCase
-{
- public function testConstructor()
- {
- $body = new TextNode('foo', 1);
- $node = new SandboxNode($body, 1);
-
- $this->assertEquals($body, $node->getNode('body'));
- }
-
- public function getTests()
- {
- $tests = [];
-
- $body = new TextNode('foo', 1);
- $node = new SandboxNode($body, 1);
-
- $tests[] = [$node, <<<EOF
-// line 1
-if (!\$alreadySandboxed = \$this->sandbox->isSandboxed()) {
- \$this->sandbox->enableSandbox();
-}
-echo "foo";
-if (!\$alreadySandboxed) {
- \$this->sandbox->disableSandbox();
-}
-EOF
- ];
-
- return $tests;
- }
-}
diff --git a/vendor/twig/twig/tests/Node/SetTest.php b/vendor/twig/twig/tests/Node/SetTest.php
deleted file mode 100644
index 370af95f2c..0000000000
--- a/vendor/twig/twig/tests/Node/SetTest.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-
-namespace Twig\Tests\Node;
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Twig\Node\Expression\AssignNameExpression;
-use Twig\Node\Expression\ConstantExpression;
-use Twig\Node\Expression\NameExpression;
-use Twig\Node\Node;
-use Twig\Node\PrintNode;
-use Twig\Node\SetNode;
-use Twig\Node\TextNode;
-use Twig\Test\NodeTestCase;
-
-class SetTest extends NodeTestCase
-{
- public function testConstructor()
- {
- $names = new Node([new AssignNameExpression('foo', 1)], [], 1);
- $values = new Node([new ConstantExpression('foo', 1)], [], 1);
- $node = new SetNode(false, $names, $values, 1);
-
- $this->assertEquals($names, $node->getNode('names'));
- $this->assertEquals($values, $node->getNode('values'));
- $this->assertFalse($node->getAttribute('capture'));
- }
-
- public function getTests()
- {
- $tests = [];
-
- $names = new Node([new AssignNameExpression('foo', 1)], [], 1);
- $values = new Node([new ConstantExpression('foo', 1)], [], 1);
- $node = new SetNode(false, $names, $values, 1);
- $tests[] = [$node, <<<EOF
-// line 1
-\$context["foo"] = "foo";
-EOF
- ];
-
- $names = new Node([new AssignNameExpression('foo', 1)], [], 1);
- $values = new Node([new PrintNode(new ConstantExpression('foo', 1), 1)], [], 1);
- $node = new SetNode(true, $names, $values, 1);
- $tests[] = [$node, <<<EOF
-// line 1
-ob_start(function () { return ''; });
-echo "foo";
-\$context["foo"] = ('' === \$tmp = ob_get_clean()) ? '' : new Markup(\$tmp, \$this->env->getCharset());
-EOF
- ];
-
- $names = new Node([new AssignNameExpression('foo', 1)], [], 1);
- $values = new TextNode('foo', 1);
- $node = new SetNode(true, $names, $values, 1);
- $tests[] = [$node, <<<EOF
-// line 1
-\$context["foo"] = ('' === \$tmp = "foo") ? '' : new Markup(\$tmp, \$this->env->getCharset());
-EOF
- ];
-
- $names = new Node([new AssignNameExpression('foo', 1), new AssignNameExpression('bar', 1)], [], 1);
- $values = new Node([new ConstantExpression('foo', 1), new NameExpression('bar', 1)], [], 1);
- $node = new SetNode(false, $names, $values, 1);
- $tests[] = [$node, <<<EOF
-// line 1
-list(\$context["foo"], \$context["bar"]) = ["foo", {$this->getVariableGetter('bar')}];
-EOF
- ];
-
- return $tests;
- }
-}
diff --git a/vendor/twig/twig/tests/Node/SpacelessTest.php b/vendor/twig/twig/tests/Node/SpacelessTest.php
deleted file mode 100644
index 5f3c81442e..0000000000
--- a/vendor/twig/twig/tests/Node/SpacelessTest.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-namespace Twig\Tests\Node;
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Twig\Node\Node;
-use Twig\Node\SpacelessNode;
-use Twig\Node\TextNode;
-use Twig\Test\NodeTestCase;
-
-class SpacelessTest extends NodeTestCase
-{
- public function testConstructor()
- {
- $body = new Node([new TextNode('<div> <div> foo </div> </div>', 1)]);
- $node = new SpacelessNode($body, 1);
-
- $this->assertEquals($body, $node->getNode('body'));
- }
-
- public function getTests()
- {
- $body = new Node([new TextNode('<div> <div> foo </div> </div>', 1)]);
- $node = new SpacelessNode($body, 1);
-
- return [
- [$node, <<<EOF
-// line 1
-ob_start(function () { return ''; });
-echo "<div> <div> foo </div> </div>";
-echo trim(preg_replace('/>\s+</', '><', ob_get_clean()));
-EOF
- ],
- ];
- }
-}
diff --git a/vendor/twig/twig/tests/Node/TextTest.php b/vendor/twig/twig/tests/Node/TextTest.php
deleted file mode 100644
index ace191213d..0000000000
--- a/vendor/twig/twig/tests/Node/TextTest.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-namespace Twig\Tests\Node;
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Twig\Node\TextNode;
-use Twig\Test\NodeTestCase;
-
-class TextTest extends NodeTestCase
-{
- public function testConstructor()
- {
- $node = new TextNode('foo', 1);
-
- $this->assertEquals('foo', $node->getAttribute('data'));
- }
-
- public function getTests()
- {
- $tests = [];
- $tests[] = [new TextNode('foo', 1), "// line 1\necho \"foo\";"];
-
- return $tests;
- }
-}
diff --git a/vendor/twig/twig/tests/NodeTraverserTest.php b/vendor/twig/twig/tests/NodeTraverserTest.php
deleted file mode 100644
index 7136ae7f6c..0000000000
--- a/vendor/twig/twig/tests/NodeTraverserTest.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-namespace Twig\Tests;
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Twig\Environment;
-use Twig\Node\Node;
-use Twig\NodeTraverser;
-use Twig\NodeVisitor\NodeVisitorInterface;
-
-class NodeTraverserTest extends \PHPUnit\Framework\TestCase
-{
- /**
- * @group legacy
- */
- public function testNodeIsNullWhenTraversing()
- {
- $env = new Environment($this->createMock('\Twig\Loader\LoaderInterface'));
- $traverser = new NodeTraverser($env, [new IdentityVisitor()]);
- $n = new Node([new Node([]), null, new Node([])]);
- $this->assertCount(3, $traverser->traverse($n));
- }
-}
-
-class IdentityVisitor implements NodeVisitorInterface
-{
- public function enterNode(\Twig_NodeInterface $node, Environment $env)
- {
- return $node;
- }
-
- public function leaveNode(\Twig_NodeInterface $node, Environment $env)
- {
- return $node;
- }
-
- public function getPriority()
- {
- return 0;
- }
-}
diff --git a/vendor/twig/twig/tests/NodeVisitor/OptimizerTest.php b/vendor/twig/twig/tests/NodeVisitor/OptimizerTest.php
deleted file mode 100644
index 6bcc828264..0000000000
--- a/vendor/twig/twig/tests/NodeVisitor/OptimizerTest.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-
-namespace Twig\Tests\NodeVisitor;
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Twig\Environment;
-use Twig\Node\ForNode;
-use Twig\Source;
-
-class OptimizerTest extends \PHPUnit\Framework\TestCase
-{
- public function testRenderBlockOptimizer()
- {
- $env = new Environment($this->createMock('\Twig\Loader\LoaderInterface'), ['cache' => false, 'autoescape' => false]);
-
- $stream = $env->parse($env->tokenize(new Source('{{ block("foo") }}', 'index')));
-
- $node = $stream->getNode('body')->getNode(0);
-
- $this->assertInstanceOf('\Twig\Node\Expression\BlockReferenceExpression', $node);
- $this->assertTrue($node->getAttribute('output'));
- }
-
- public function testRenderParentBlockOptimizer()
- {
- $env = new Environment($this->createMock('\Twig\Loader\LoaderInterface'), ['cache' => false, 'autoescape' => false]);
-
- $stream = $env->parse($env->tokenize(new Source('{% extends "foo" %}{% block content %}{{ parent() }}{% endblock %}', 'index')));
-
- $node = $stream->getNode('blocks')->getNode('content')->getNode(0)->getNode('body');
-
- $this->assertInstanceOf('\Twig\Node\Expression\ParentExpression', $node);
- $this->assertTrue($node->getAttribute('output'));
- }
-
- /**
- * @dataProvider getTestsForForOptimizer
- */
- public function testForOptimizer($template, $expected)
- {
- $env = new Environment($this->createMock('\Twig\Loader\LoaderInterface'), ['cache' => false]);
-
- $stream = $env->parse($env->tokenize(new Source($template, 'index')));
-
- foreach ($expected as $target => $withLoop) {
- $this->assertTrue($this->checkForConfiguration($stream, $target, $withLoop), sprintf('variable %s is %soptimized', $target, $withLoop ? 'not ' : ''));
- }
- }
-
- public function getTestsForForOptimizer()
- {
- return [
- ['{% for i in foo %}{% endfor %}', ['i' => false]],
-
- ['{% for i in foo %}{{ loop.index }}{% endfor %}', ['i' => true]],
-
- ['{% for i in foo %}{% for j in foo %}{% endfor %}{% endfor %}', ['i' => false, 'j' => false]],
-
- ['{% for i in foo %}{% include "foo" %}{% endfor %}', ['i' => true]],
-
- ['{% for i in foo %}{% include "foo" only %}{% endfor %}', ['i' => false]],
-
- ['{% for i in foo %}{% include "foo" with { "foo": "bar" } only %}{% endfor %}', ['i' => false]],
-
- ['{% for i in foo %}{% include "foo" with { "foo": loop.index } only %}{% endfor %}', ['i' => true]],
-
- ['{% for i in foo %}{% for j in foo %}{{ loop.index }}{% endfor %}{% endfor %}', ['i' => false, 'j' => true]],
-
- ['{% for i in foo %}{% for j in foo %}{{ loop.parent.loop.index }}{% endfor %}{% endfor %}', ['i' => true, 'j' => true]],
-
- ['{% for i in foo %}{% set l = loop %}{% for j in foo %}{{ l.index }}{% endfor %}{% endfor %}', ['i' => true, 'j' => false]],
-
- ['{% for i in foo %}{% for j in foo %}{{ foo.parent.loop.index }}{% endfor %}{% endfor %}', ['i' => false, 'j' => false]],
-
- ['{% for i in foo %}{% for j in foo %}{{ loop["parent"].loop.index }}{% endfor %}{% endfor %}', ['i' => true, 'j' => true]],
-
- ['{% for i in foo %}{{ include("foo") }}{% endfor %}', ['i' => true]],
-
- ['{% for i in foo %}{{ include("foo", with_context = false) }}{% endfor %}', ['i' => false]],
-
- ['{% for i in foo %}{{ include("foo", with_context = true) }}{% endfor %}', ['i' => true]],
-
- ['{% for i in foo %}{{ include("foo", { "foo": "bar" }, with_context = false) }}{% endfor %}', ['i' => false]],
-
- ['{% for i in foo %}{{ include("foo", { "foo": loop.index }, with_context = false) }}{% endfor %}', ['i' => true]],
- ];
- }
-
- public function checkForConfiguration(\Twig_NodeInterface $node = null, $target, $withLoop)
- {
- if (null === $node) {
- return;
- }
-
- foreach ($node as $n) {
- if ($n instanceof ForNode) {
- if ($target === $n->getNode('value_target')->getAttribute('name')) {
- return $withLoop == $n->getAttribute('with_loop');
- }
- }
-
- $ret = $this->checkForConfiguration($n, $target, $withLoop);
- if (null !== $ret) {
- return $ret;
- }
- }
- }
-}
diff --git a/vendor/twig/twig/tests/ParserTest.php b/vendor/twig/twig/tests/ParserTest.php
deleted file mode 100644
index 917d5deaa7..0000000000
--- a/vendor/twig/twig/tests/ParserTest.php
+++ /dev/null
@@ -1,218 +0,0 @@
-<?php
-
-namespace Twig\Tests;
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Twig\Environment;
-use Twig\Node\MacroNode;
-use Twig\Node\Node;
-use Twig\Node\SetNode;
-use Twig\Node\TextNode;
-use Twig\Parser;
-use Twig\Source;
-use Twig\Token;
-use Twig\TokenParser\AbstractTokenParser;
-use Twig\TokenStream;
-
-class ParserTest extends \PHPUnit\Framework\TestCase
-{
- public function testSetMacroThrowsExceptionOnReservedMethods()
- {
- $this->expectException('\Twig\Error\SyntaxError');
-
- $parser = $this->getParser();
- $parser->setMacro('parent', new MacroNode('foo', new Node(), new Node(), 1));
- }
-
- public function testUnknownTag()
- {
- $this->expectException('\Twig\Error\SyntaxError');
- $this->expectExceptionMessage('Unknown "foo" tag. Did you mean "for" at line 1?');
-
- $stream = new TokenStream([
- new Token(Token::BLOCK_START_TYPE, '', 1),
- new Token(Token::NAME_TYPE, 'foo', 1),
- new Token(Token::BLOCK_END_TYPE, '', 1),
- new Token(Token::EOF_TYPE, '', 1),
- ]);
- $parser = new Parser(new Environment($this->createMock('\Twig\Loader\LoaderInterface')));
- $parser->parse($stream);
- }
-
- public function testUnknownTagWithoutSuggestions()
- {
- $this->expectException('\Twig\Error\SyntaxError');
- $this->expectExceptionMessage('Unknown "foobar" tag at line 1.');
-
- $stream = new TokenStream([
- new Token(Token::BLOCK_START_TYPE, '', 1),
- new Token(Token::NAME_TYPE, 'foobar', 1),
- new Token(Token::BLOCK_END_TYPE, '', 1),
- new Token(Token::EOF_TYPE, '', 1),
- ]);
- $parser = new Parser(new Environment($this->createMock('\Twig\Loader\LoaderInterface')));
- $parser->parse($stream);
- }
-
- /**
- * @dataProvider getFilterBodyNodesData
- */
- public function testFilterBodyNodes($input, $expected)
- {
- $parser = $this->getParser();
-
- $this->assertEquals($expected, $parser->filterBodyNodes($input));
- }
-
- public function getFilterBodyNodesData()
- {
- return [
- [
- new Node([new TextNode(' ', 1)]),
- new Node([]),
- ],
- [
- $input = new Node([new SetNode(false, new Node(), new Node(), 1)]),
- $input,
- ],
- [
- $input = new Node([new SetNode(true, new Node(), new Node([new Node([new TextNode('foo', 1)])]), 1)]),
- $input,
- ],
- ];
- }
-
- /**
- * @dataProvider getFilterBodyNodesDataThrowsException
- */
- public function testFilterBodyNodesThrowsException($input)
- {
- $this->expectException('\Twig\Error\SyntaxError');
-
- $parser = $this->getParser();
-
- $parser->filterBodyNodes($input);
- }
-
- public function getFilterBodyNodesDataThrowsException()
- {
- return [
- [new TextNode('foo', 1)],
- [new Node([new Node([new TextNode('foo', 1)])])],
- ];
- }
-
- /**
- * @dataProvider getFilterBodyNodesWithBOMData
- */
- public function testFilterBodyNodesWithBOM($emptyNode)
- {
- $this->assertNull($this->getParser()->filterBodyNodes(new TextNode(\chr(0xEF).\chr(0xBB).\chr(0xBF).$emptyNode, 1)));
- }
-
- public function getFilterBodyNodesWithBOMData()
- {
- return [
- [' '],
- ["\t"],
- ["\n"],
- ["\n\t\n "],
- ];
- }
-
- public function testParseIsReentrant()
- {
- $twig = new Environment($this->createMock('\Twig\Loader\LoaderInterface'), [
- 'autoescape' => false,
- 'optimizations' => 0,
- ]);
- $twig->addTokenParser(new TestTokenParser());
-
- $parser = new Parser($twig);
-
- $parser->parse(new TokenStream([
- new Token(Token::BLOCK_START_TYPE, '', 1),
- new Token(Token::NAME_TYPE, 'test', 1),
- new Token(Token::BLOCK_END_TYPE, '', 1),
- new Token(Token::VAR_START_TYPE, '', 1),
- new Token(Token::NAME_TYPE, 'foo', 1),
- new Token(Token::VAR_END_TYPE, '', 1),
- new Token(Token::EOF_TYPE, '', 1),
- ]));
-
- $this->assertNull($parser->getParent());
- }
-
- public function testGetVarName()
- {
- $twig = new Environment($this->createMock('\Twig\Loader\LoaderInterface'), [
- 'autoescape' => false,
- 'optimizations' => 0,
- ]);
-
- $twig->parse($twig->tokenize(new Source(<<<EOF
-{% from _self import foo %}
-
-{% macro foo() %}
- {{ foo }}
-{% endmacro %}
-EOF
- , 'index')));
-
- // The getVarName() must not depend on the template loaders,
- // If this test does not throw any exception, that's good.
- // see https://github.com/symfony/symfony/issues/4218
- $this->addToAssertionCount(1);
- }
-
- protected function getParser()
- {
- $parser = new TestParser(new Environment($this->createMock('\Twig\Loader\LoaderInterface')));
- $parser->setParent(new Node());
- $parser->stream = new TokenStream([]);
-
- return $parser;
- }
-}
-
-class TestParser extends Parser
-{
- public $stream;
-
- public function filterBodyNodes(\Twig_NodeInterface $node)
- {
- return parent::filterBodyNodes($node);
- }
-}
-
-class TestTokenParser extends AbstractTokenParser
-{
- public function parse(Token $token)
- {
- // simulate the parsing of another template right in the middle of the parsing of the current template
- $this->parser->parse(new TokenStream([
- new Token(Token::BLOCK_START_TYPE, '', 1),
- new Token(Token::NAME_TYPE, 'extends', 1),
- new Token(Token::STRING_TYPE, 'base', 1),
- new Token(Token::BLOCK_END_TYPE, '', 1),
- new Token(Token::EOF_TYPE, '', 1),
- ]));
-
- $this->parser->getStream()->expect(Token::BLOCK_END_TYPE);
-
- return new Node([]);
- }
-
- public function getTag()
- {
- return 'test';
- }
-}
diff --git a/vendor/twig/twig/tests/Profiler/Dumper/AbstractTest.php b/vendor/twig/twig/tests/Profiler/Dumper/AbstractTest.php
deleted file mode 100644
index a55bfa0d38..0000000000
--- a/vendor/twig/twig/tests/Profiler/Dumper/AbstractTest.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-
-namespace Twig\Tests\Profiler\Dumper;
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Twig\Profiler\Profile;
-
-abstract class AbstractTest extends \PHPUnit\Framework\TestCase
-{
- protected function getProfile()
- {
- $profile = new Profile('main');
- $subProfiles = [
- $this->getIndexProfile(
- [
- $this->getEmbeddedBlockProfile(),
- $this->getEmbeddedTemplateProfile(
- [
- $this->getIncludedTemplateProfile(),
- ]
- ),
- $this->getMacroProfile(),
- $this->getEmbeddedTemplateProfile(
- [
- $this->getIncludedTemplateProfile(),
- ]
- ),
- ]
- ),
- ];
-
- $p = new \ReflectionProperty($profile, 'profiles');
- $p->setAccessible(true);
- $p->setValue($profile, $subProfiles);
-
- return $profile;
- }
-
- private function getIndexProfile(array $subProfiles = [])
- {
- return $this->generateProfile('main', 1, 'template', 'index.twig', $subProfiles);
- }
-
- private function getEmbeddedBlockProfile(array $subProfiles = [])
- {
- return $this->generateProfile('body', 0.0001, 'block', 'embedded.twig', $subProfiles);
- }
-
- private function getEmbeddedTemplateProfile(array $subProfiles = [])
- {
- return $this->generateProfile('main', 0.0001, 'template', 'embedded.twig', $subProfiles);
- }
-
- private function getIncludedTemplateProfile(array $subProfiles = [])
- {
- return $this->generateProfile('main', 0.0001, 'template', 'included.twig', $subProfiles);
- }
-
- private function getMacroProfile(array $subProfiles = [])
- {
- return $this->generateProfile('foo', 0.0001, 'macro', 'index.twig', $subProfiles);
- }
-
- /**
- * @param string $name
- * @param float $duration
- * @param bool $isTemplate
- * @param string $type
- * @param string $templateName
- * @param array $subProfiles
- *
- * @return Profile
- */
- private function generateProfile($name, $duration, $type, $templateName, array $subProfiles = [])
- {
- $profile = new Profile($templateName, $type, $name);
-
- $p = new \ReflectionProperty($profile, 'profiles');
- $p->setAccessible(true);
- $p->setValue($profile, $subProfiles);
-
- $starts = new \ReflectionProperty($profile, 'starts');
- $starts->setAccessible(true);
- $starts->setValue($profile, [
- 'wt' => 0,
- 'mu' => 0,
- 'pmu' => 0,
- ]);
- $ends = new \ReflectionProperty($profile, 'ends');
- $ends->setAccessible(true);
- $ends->setValue($profile, [
- 'wt' => $duration,
- 'mu' => 0,
- 'pmu' => 0,
- ]);
-
- return $profile;
- }
-}
diff --git a/vendor/twig/twig/tests/Profiler/Dumper/BlackfireTest.php b/vendor/twig/twig/tests/Profiler/Dumper/BlackfireTest.php
deleted file mode 100644
index b1c2cd7d1f..0000000000
--- a/vendor/twig/twig/tests/Profiler/Dumper/BlackfireTest.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-namespace Twig\Tests\Profiler\Dumper;
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Twig\Profiler\Dumper\BlackfireDumper;
-
-class BlackfireTest extends AbstractTest
-{
- public function testDump()
- {
- $dumper = new BlackfireDumper();
-
- $this->assertStringMatchesFormat(<<<EOF
-file-format: BlackfireProbe
-cost-dimensions: wt mu pmu
-request-start: %d.%d
-
-main()//1 %d %d %d
-main()==>index.twig//1 %d %d %d
-index.twig==>embedded.twig::block(body)//1 %d %d 0
-index.twig==>embedded.twig//2 %d %d %d
-embedded.twig==>included.twig//2 %d %d %d
-index.twig==>index.twig::macro(foo)//1 %d %d %d
-EOF
- , $dumper->dump($this->getProfile()));
- }
-}
diff --git a/vendor/twig/twig/tests/Profiler/Dumper/HtmlTest.php b/vendor/twig/twig/tests/Profiler/Dumper/HtmlTest.php
deleted file mode 100644
index 20a1ab439c..0000000000
--- a/vendor/twig/twig/tests/Profiler/Dumper/HtmlTest.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-namespace Twig\Tests\Profiler\Dumper;
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Twig\Profiler\Dumper\HtmlDumper;
-
-class HtmlTest extends AbstractTest
-{
- public function testDump()
- {
- $dumper = new HtmlDumper();
- $this->assertStringMatchesFormat(<<<EOF
-<pre>main <span style="color: #d44">%d.%dms/%d%</span>
-└ <span style="background-color: #ffd">index.twig</span> <span style="color: #d44">%d.%dms/%d%</span>
- └ embedded.twig::block(<span style="background-color: #dfd">body</span>)
- └ <span style="background-color: #ffd">embedded.twig</span>
- │ └ <span style="background-color: #ffd">included.twig</span>
- └ index.twig::macro(<span style="background-color: #ddf">foo</span>)
- └ <span style="background-color: #ffd">embedded.twig</span>
- └ <span style="background-color: #ffd">included.twig</span>
-</pre>
-EOF
- , $dumper->dump($this->getProfile()));
- }
-}
diff --git a/vendor/twig/twig/tests/Profiler/Dumper/TextTest.php b/vendor/twig/twig/tests/Profiler/Dumper/TextTest.php
deleted file mode 100644
index 8240e356bd..0000000000
--- a/vendor/twig/twig/tests/Profiler/Dumper/TextTest.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-namespace Twig\Tests\Profiler\Dumper;
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Twig\Profiler\Dumper\TextDumper;
-
-class TextTest extends AbstractTest
-{
- public function testDump()
- {
- $dumper = new TextDumper();
- $this->assertStringMatchesFormat(<<<EOF
-main %d.%dms/%d%
-└ index.twig %d.%dms/%d%
- └ embedded.twig::block(body)
- └ embedded.twig
- │ └ included.twig
- └ index.twig::macro(foo)
- └ embedded.twig
- └ included.twig
-
-EOF
- , $dumper->dump($this->getProfile()));
- }
-}
diff --git a/vendor/twig/twig/tests/Profiler/ProfileTest.php b/vendor/twig/twig/tests/Profiler/ProfileTest.php
deleted file mode 100644
index 0b7fd272f2..0000000000
--- a/vendor/twig/twig/tests/Profiler/ProfileTest.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-
-namespace Twig\Tests\Profiler;
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Twig\Profiler\Profile;
-
-class ProfileTest extends \PHPUnit\Framework\TestCase
-{
- public function testConstructor()
- {
- $profile = new Profile('template', 'type', 'name');
-
- $this->assertEquals('template', $profile->getTemplate());
- $this->assertEquals('type', $profile->getType());
- $this->assertEquals('name', $profile->getName());
- }
-
- public function testIsRoot()
- {
- $profile = new Profile('template', Profile::ROOT);
- $this->assertTrue($profile->isRoot());
-
- $profile = new Profile('template', Profile::TEMPLATE);
- $this->assertFalse($profile->isRoot());
- }
-
- public function testIsTemplate()
- {
- $profile = new Profile('template', Profile::TEMPLATE);
- $this->assertTrue($profile->isTemplate());
-
- $profile = new Profile('template', Profile::ROOT);
- $this->assertFalse($profile->isTemplate());
- }
-
- public function testIsBlock()
- {
- $profile = new Profile('template', Profile::BLOCK);
- $this->assertTrue($profile->isBlock());
-
- $profile = new Profile('template', Profile::ROOT);
- $this->assertFalse($profile->isBlock());
- }
-
- public function testIsMacro()
- {
- $profile = new Profile('template', Profile::MACRO);
- $this->assertTrue($profile->isMacro());
-
- $profile = new Profile('template', Profile::ROOT);
- $this->assertFalse($profile->isMacro());
- }
-
- public function testGetAddProfile()
- {
- $profile = new Profile();
- $profile->addProfile($a = new Profile());
- $profile->addProfile($b = new Profile());
-
- $this->assertSame([$a, $b], $profile->getProfiles());
- $this->assertSame([$a, $b], iterator_to_array($profile));
- }
-
- public function testGetDuration()
- {
- $profile = new Profile();
- usleep(1);
- $profile->leave();
-
- $this->assertTrue($profile->getDuration() > 0, sprintf('Expected duration > 0, got: %f', $profile->getDuration()));
- }
-
- public function testSerialize()
- {
- $profile = new Profile('template', 'type', 'name');
- $profile1 = new Profile('template1', 'type1', 'name1');
- $profile->addProfile($profile1);
- $profile->leave();
- $profile1->leave();
-
- $profile2 = unserialize(serialize($profile));
- $profiles = $profile->getProfiles();
- $this->assertCount(1, $profiles);
- $profile3 = $profiles[0];
-
- $this->assertEquals($profile->getTemplate(), $profile2->getTemplate());
- $this->assertEquals($profile->getType(), $profile2->getType());
- $this->assertEquals($profile->getName(), $profile2->getName());
- $this->assertEquals($profile->getDuration(), $profile2->getDuration());
-
- $this->assertEquals($profile1->getTemplate(), $profile3->getTemplate());
- $this->assertEquals($profile1->getType(), $profile3->getType());
- $this->assertEquals($profile1->getName(), $profile3->getName());
- }
-
- public function testReset()
- {
- $profile = new Profile();
- usleep(1);
- $profile->leave();
- $profile->reset();
-
- $this->assertEquals(0, $profile->getDuration());
- }
-}
diff --git a/vendor/twig/twig/tests/TemplateTest.php b/vendor/twig/twig/tests/TemplateTest.php
deleted file mode 100644
index 41f8d1b043..0000000000
--- a/vendor/twig/twig/tests/TemplateTest.php
+++ /dev/null
@@ -1,809 +0,0 @@
-<?php
-
-namespace Twig\Tests;
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Twig\Environment;
-use Twig\Error\RuntimeError;
-use Twig\Extension\SandboxExtension;
-use Twig\Loader\ArrayLoader;
-use Twig\Loader\LoaderInterface;
-use Twig\Loader\SourceContextLoaderInterface;
-use Twig\Node\Expression\GetAttrExpression;
-use Twig\NodeVisitor\NodeVisitorInterface;
-use Twig\Sandbox\SecurityError;
-use Twig\Sandbox\SecurityPolicy;
-use Twig\Template;
-
-class TemplateTest extends \PHPUnit\Framework\TestCase
-{
- public function testDisplayBlocksAcceptTemplateOnlyAsBlocks()
- {
- $this->expectException('\LogicException');
-
- $twig = new Environment($this->createMock('\Twig\Loader\LoaderInterface'));
- $template = new TemplateForTest($twig);
- $template->displayBlock('foo', [], ['foo' => [new \stdClass(), 'foo']]);
- }
-
- /**
- * @dataProvider getAttributeExceptions
- */
- public function testGetAttributeExceptions($template, $message)
- {
- $templates = ['index' => $template];
- $env = new Environment(new ArrayLoader($templates), ['strict_variables' => true]);
- $template = $env->load('index');
-
- $context = [
- 'string' => 'foo',
- 'null' => null,
- 'empty_array' => [],
- 'array' => ['foo' => 'foo'],
- 'array_access' => new TemplateArrayAccessObject(),
- 'magic_exception' => new TemplateMagicPropertyObjectWithException(),
- 'object' => new \stdClass(),
- ];
-
- try {
- $template->render($context);
- $this->fail('Accessing an invalid attribute should throw an exception.');
- } catch (RuntimeError $e) {
- $this->assertSame(sprintf($message, 'index'), $e->getMessage());
- }
- }
-
- public function getAttributeExceptions()
- {
- return [
- ['{{ string["a"] }}', 'Impossible to access a key ("a") on a string variable ("foo") in "%s" at line 1.'],
- ['{{ null["a"] }}', 'Impossible to access a key ("a") on a null variable in "%s" at line 1.'],
- ['{{ empty_array["a"] }}', 'Key "a" does not exist as the array is empty in "%s" at line 1.'],
- ['{{ array["a"] }}', 'Key "a" for array with keys "foo" does not exist in "%s" at line 1.'],
- ['{{ array_access["a"] }}', 'Key "a" in object with ArrayAccess of class "Twig\Tests\TemplateArrayAccessObject" does not exist in "%s" at line 1.'],
- ['{{ string.a }}', 'Impossible to access an attribute ("a") on a string variable ("foo") in "%s" at line 1.'],
- ['{{ string.a() }}', 'Impossible to invoke a method ("a") on a string variable ("foo") in "%s" at line 1.'],
- ['{{ null.a }}', 'Impossible to access an attribute ("a") on a null variable in "%s" at line 1.'],
- ['{{ null.a() }}', 'Impossible to invoke a method ("a") on a null variable in "%s" at line 1.'],
- ['{{ array.a() }}', 'Impossible to invoke a method ("a") on an array in "%s" at line 1.'],
- ['{{ empty_array.a }}', 'Key "a" does not exist as the array is empty in "%s" at line 1.'],
- ['{{ array.a }}', 'Key "a" for array with keys "foo" does not exist in "%s" at line 1.'],
- ['{{ attribute(array, -10) }}', 'Key "-10" for array with keys "foo" does not exist in "%s" at line 1.'],
- ['{{ array_access.a }}', 'Neither the property "a" nor one of the methods "a()", "geta()"/"isa()" or "__call()" exist and have public access in class "Twig\Tests\TemplateArrayAccessObject" in "%s" at line 1.'],
- ['{% from _self import foo %}{% macro foo(obj) %}{{ obj.missing_method() }}{% endmacro %}{{ foo(array_access) }}', 'Neither the property "missing_method" nor one of the methods "missing_method()", "getmissing_method()"/"ismissing_method()" or "__call()" exist and have public access in class "Twig\Tests\TemplateArrayAccessObject" in "%s" at line 1.'],
- ['{{ magic_exception.test }}', 'An exception has been thrown during the rendering of a template ("Hey! Don\'t try to isset me!") in "%s" at line 1.'],
- ['{{ object["a"] }}', 'Impossible to access a key "a" on an object of class "stdClass" that does not implement ArrayAccess interface in "%s" at line 1.'],
- ];
- }
-
- /**
- * @dataProvider getGetAttributeWithSandbox
- */
- public function testGetAttributeWithSandbox($object, $item, $allowed)
- {
- $twig = new Environment($this->createMock('\Twig\Loader\LoaderInterface'));
- $policy = new SecurityPolicy([], [], [/*method*/], [/*prop*/], []);
- $twig->addExtension(new SandboxExtension($policy, !$allowed));
- $template = new TemplateForTest($twig);
-
- try {
- $template->getAttribute($object, $item, [], 'any');
-
- if (!$allowed) {
- $this->fail();
- } else {
- $this->addToAssertionCount(1);
- }
- } catch (SecurityError $e) {
- if ($allowed) {
- $this->fail();
- } else {
- $this->addToAssertionCount(1);
- }
-
- $this->assertStringContainsString('is not allowed', $e->getMessage());
- }
- }
-
- public function getGetAttributeWithSandbox()
- {
- return [
- [new TemplatePropertyObject(), 'defined', false],
- [new TemplatePropertyObject(), 'defined', true],
- [new TemplateMethodObject(), 'defined', false],
- [new TemplateMethodObject(), 'defined', true],
- ];
- }
-
- /**
- * @group legacy
- */
- public function testGetAttributeWithTemplateAsObject()
- {
- // to be removed in 2.0
- $twig = new Environment($this->createMock('Twig\Tests\TemplateTestLoaderInterface'));
- //$twig = new Environment($this->createMock('\Twig\Loader\LoaderInterface', '\Twig\Loader\SourceContextLoaderInterface'));
-
- $template = new TemplateForTest($twig, 'index.twig');
- $template1 = new TemplateForTest($twig, 'index1.twig');
-
- $this->assertInstanceOf('\Twig\Markup', $template->getAttribute($template1, 'string'));
- $this->assertEquals('some_string', $template->getAttribute($template1, 'string'));
-
- $this->assertInstanceOf('\Twig\Markup', $template->getAttribute($template1, 'true'));
- $this->assertEquals('1', $template->getAttribute($template1, 'true'));
-
- $this->assertInstanceOf('\Twig\Markup', $template->getAttribute($template1, 'zero'));
- $this->assertEquals('0', $template->getAttribute($template1, 'zero'));
-
- $this->assertNotInstanceof('\Twig\Markup', $template->getAttribute($template1, 'empty'));
- $this->assertSame('', $template->getAttribute($template1, 'empty'));
-
- $this->assertFalse($template->getAttribute($template1, 'env', [], Template::ANY_CALL, true));
- $this->assertFalse($template->getAttribute($template1, 'environment', [], Template::ANY_CALL, true));
- $this->assertFalse($template->getAttribute($template1, 'getEnvironment', [], Template::METHOD_CALL, true));
- $this->assertFalse($template->getAttribute($template1, 'displayWithErrorHandling', [], Template::METHOD_CALL, true));
- }
-
- /**
- * @group legacy
- * @expectedDeprecation Calling "string" on template "index1.twig" from template "index.twig" is deprecated since version 1.28 and won't be supported anymore in 2.0.
- * @expectedDeprecation Calling "string" on template "index1.twig" from template "index.twig" is deprecated since version 1.28 and won't be supported anymore in 2.0.
- * @expectedDeprecation Calling "true" on template "index1.twig" from template "index.twig" is deprecated since version 1.28 and won't be supported anymore in 2.0.
- * @expectedDeprecation Calling "true" on template "index1.twig" from template "index.twig" is deprecated since version 1.28 and won't be supported anymore in 2.0.
- * @expectedDeprecation Calling "zero" on template "index1.twig" from template "index.twig" is deprecated since version 1.28 and won't be supported anymore in 2.0.
- * @expectedDeprecation Calling "zero" on template "index1.twig" from template "index.twig" is deprecated since version 1.28 and won't be supported anymore in 2.0.
- * @expectedDeprecation Calling "empty" on template "index1.twig" from template "index.twig" is deprecated since version 1.28 and won't be supported anymore in 2.0.
- * @expectedDeprecation Calling "empty" on template "index1.twig" from template "index.twig" is deprecated since version 1.28 and won't be supported anymore in 2.0.
- * @expectedDeprecation Calling "renderBlock" on template "index.twig" from template "index.twig" is deprecated since version 1.28 and won't be supported anymore in 2.0. Use block("name") instead).
- * @expectedDeprecation Calling "displayBlock" on template "index.twig" from template "index.twig" is deprecated since version 1.28 and won't be supported anymore in 2.0. Use block("name") instead).
- * @expectedDeprecation Calling "hasBlock" on template "index.twig" from template "index.twig" is deprecated since version 1.28 and won't be supported anymore in 2.0. Use "block("name") is defined" instead).
- * @expectedDeprecation Calling "render" on template "index.twig" from template "index.twig" is deprecated since version 1.28 and won't be supported anymore in 2.0. Use include("index.twig") instead).
- * @expectedDeprecation Calling "display" on template "index.twig" from template "index.twig" is deprecated since version 1.28 and won't be supported anymore in 2.0. Use include("index.twig") instead).
- * @expectedDeprecation Calling "renderBlock" on template "index1.twig" from template "index.twig" is deprecated since version 1.28 and won't be supported anymore in 2.0. Use block("name", template) instead).
- * @expectedDeprecation Calling "displayBlock" on template "index1.twig" from template "index.twig" is deprecated since version 1.28 and won't be supported anymore in 2.0. Use block("name", template) instead).
- * @expectedDeprecation Calling "hasBlock" on template "index1.twig" from template "index.twig" is deprecated since version 1.28 and won't be supported anymore in 2.0. Use "block("name", template) is defined" instead).
- * @expectedDeprecation Calling "render" on template "index1.twig" from template "index.twig" is deprecated since version 1.28 and won't be supported anymore in 2.0. Use include("index1.twig") instead).
- * @expectedDeprecation Calling "display" on template "index1.twig" from template "index.twig" is deprecated since version 1.28 and won't be supported anymore in 2.0. Use include("index1.twig") instead).
- */
- public function testGetAttributeWithTemplateAsObjectForDeprecations()
- {
- // to be removed in 2.0
- $twig = new Environment($this->createMock('Twig\Tests\TemplateTestLoaderInterface'));
- //$twig = new Environment($this->createMock('\Twig\Loader\LoaderInterface', '\Twig\Loader\SourceContextLoaderInterface'));
-
- $template = new TemplateForTest($twig, 'index.twig');
- $template1 = new TemplateForTest($twig, 'index1.twig');
-
- $this->assertInstanceOf('\Twig\Markup', $template->getAttribute($template1, 'string'));
- $this->assertEquals('some_string', $template->getAttribute($template1, 'string'));
-
- $this->assertInstanceOf('\Twig\Markup', $template->getAttribute($template1, 'true'));
- $this->assertEquals('1', $template->getAttribute($template1, 'true'));
-
- $this->assertInstanceOf('\Twig\Markup', $template->getAttribute($template1, 'zero'));
- $this->assertEquals('0', $template->getAttribute($template1, 'zero'));
-
- $this->assertNotInstanceof('\Twig\Markup', $template->getAttribute($template1, 'empty'));
- $this->assertSame('', $template->getAttribute($template1, 'empty'));
-
- $blocks = ['name' => [$template1, 'block_name']];
-
- // trigger some deprecation notice messages to check them with @expectedDeprecation
- $template->getAttribute($template, 'renderBlock', ['name', [], $blocks]);
- $template->getAttribute($template, 'displayBlock', ['name', [], $blocks]);
- $template->getAttribute($template, 'hasBlock', ['name', []]);
- $template->getAttribute($template, 'render', [[]]);
- $template->getAttribute($template, 'display', [[]]);
-
- $template->getAttribute($template1, 'renderBlock', ['name', [], $blocks]);
- $template->getAttribute($template1, 'displayBlock', ['name', [], $blocks]);
- $template->getAttribute($template1, 'hasBlock', ['name', []]);
- $template->getAttribute($template1, 'render', [[]]);
- $template->getAttribute($template1, 'display', [[]]);
-
- $this->assertFalse($template->getAttribute($template1, 'env', [], Template::ANY_CALL, true));
- $this->assertFalse($template->getAttribute($template1, 'environment', [], Template::ANY_CALL, true));
- $this->assertFalse($template->getAttribute($template1, 'getEnvironment', [], Template::METHOD_CALL, true));
- $this->assertFalse($template->getAttribute($template1, 'displayWithErrorHandling', [], Template::METHOD_CALL, true));
- }
-
- /**
- * @group legacy
- * @expectedDeprecation Silent display of undefined block "unknown" in template "index.twig" is deprecated since version 1.29 and will throw an exception in 2.0. Use the "block('unknown') is defined" expression to test for block existence.
- * @expectedDeprecation Silent display of undefined block "unknown" in template "index.twig" is deprecated since version 1.29 and will throw an exception in 2.0. Use the "block('unknown') is defined" expression to test for block existence.
- */
- public function testRenderBlockWithUndefinedBlock()
- {
- $twig = new Environment($this->createMock('Twig\Tests\TemplateTestLoaderInterface'));
-
- $template = new TemplateForTest($twig, 'index.twig');
- $template->renderBlock('unknown', []);
- $template->displayBlock('unknown', []);
- }
-
- public function testGetAttributeOnArrayWithConfusableKey()
- {
- $template = new TemplateForTest(new Environment($this->createMock('\Twig\Loader\LoaderInterface')));
-
- $array = ['Zero', 'One', -1 => 'MinusOne', '' => 'EmptyString', '1.5' => 'FloatButString', '01' => 'IntegerButStringWithLeadingZeros'];
-
- $this->assertSame('Zero', $array[false]);
- $this->assertSame('One', $array[true]);
- $this->assertSame('One', $array[1.5]);
- $this->assertSame('One', $array['1']);
- $this->assertSame('MinusOne', $array[-1.5]);
- $this->assertSame('FloatButString', $array['1.5']);
- $this->assertSame('IntegerButStringWithLeadingZeros', $array['01']);
- $this->assertSame('EmptyString', $array[null]);
-
- $this->assertSame('Zero', $template->getAttribute($array, false), 'false is treated as 0 when accessing an array (equals PHP behavior)');
- $this->assertSame('One', $template->getAttribute($array, true), 'true is treated as 1 when accessing an array (equals PHP behavior)');
- $this->assertSame('One', $template->getAttribute($array, 1.5), 'float is casted to int when accessing an array (equals PHP behavior)');
- $this->assertSame('One', $template->getAttribute($array, '1'), '"1" is treated as integer 1 when accessing an array (equals PHP behavior)');
- $this->assertSame('MinusOne', $template->getAttribute($array, -1.5), 'negative float is casted to int when accessing an array (equals PHP behavior)');
- $this->assertSame('FloatButString', $template->getAttribute($array, '1.5'), '"1.5" is treated as-is when accessing an array (equals PHP behavior)');
- $this->assertSame('IntegerButStringWithLeadingZeros', $template->getAttribute($array, '01'), '"01" is treated as-is when accessing an array (equals PHP behavior)');
- $this->assertSame('EmptyString', $template->getAttribute($array, null), 'null is treated as "" when accessing an array (equals PHP behavior)');
- }
-
- /**
- * @dataProvider getGetAttributeTests
- */
- public function testGetAttribute($defined, $value, $object, $item, $arguments, $type)
- {
- $template = new TemplateForTest(new Environment($this->createMock('\Twig\Loader\LoaderInterface')));
-
- $this->assertEquals($value, $template->getAttribute($object, $item, $arguments, $type));
- }
-
- /**
- * @dataProvider getGetAttributeTests
- */
- public function testGetAttributeStrict($defined, $value, $object, $item, $arguments, $type, $exceptionMessage = null)
- {
- $template = new TemplateForTest(new Environment($this->createMock('\Twig\Loader\LoaderInterface'), ['strict_variables' => true]));
-
- if ($defined) {
- $this->assertEquals($value, $template->getAttribute($object, $item, $arguments, $type));
- } else {
- $this->expectException('\Twig\Error\RuntimeError');
- if (null !== $exceptionMessage) {
- $this->expectExceptionMessage($exceptionMessage);
- }
- $this->assertEquals($value, $template->getAttribute($object, $item, $arguments, $type));
- }
- }
-
- /**
- * @dataProvider getGetAttributeTests
- */
- public function testGetAttributeDefined($defined, $value, $object, $item, $arguments, $type)
- {
- $template = new TemplateForTest(new Environment($this->createMock('\Twig\Loader\LoaderInterface')));
-
- $this->assertEquals($defined, $template->getAttribute($object, $item, $arguments, $type, true));
- }
-
- /**
- * @dataProvider getGetAttributeTests
- */
- public function testGetAttributeDefinedStrict($defined, $value, $object, $item, $arguments, $type)
- {
- $template = new TemplateForTest(new Environment($this->createMock('\Twig\Loader\LoaderInterface'), ['strict_variables' => true]));
-
- $this->assertEquals($defined, $template->getAttribute($object, $item, $arguments, $type, true));
- }
-
- public function testGetAttributeCallExceptions()
- {
- $template = new TemplateForTest(new Environment($this->createMock('\Twig\Loader\LoaderInterface')));
-
- $object = new TemplateMagicMethodExceptionObject();
-
- $this->assertNull($template->getAttribute($object, 'foo'));
- }
-
- public function getGetAttributeTests()
- {
- $array = [
- 'defined' => 'defined',
- 'zero' => 0,
- 'null' => null,
- '1' => 1,
- 'bar' => true,
- 'baz' => 'baz',
- '09' => '09',
- '+4' => '+4',
- ];
-
- $objectArray = new TemplateArrayAccessObject();
- $arrayObject = new \ArrayObject($array);
- $stdObject = (object) $array;
- $magicPropertyObject = new TemplateMagicPropertyObject();
- $propertyObject = new TemplatePropertyObject();
- $propertyObject1 = new TemplatePropertyObjectAndIterator();
- $propertyObject2 = new TemplatePropertyObjectAndArrayAccess();
- $propertyObject3 = new TemplatePropertyObjectDefinedWithUndefinedValue();
- $methodObject = new TemplateMethodObject();
- $magicMethodObject = new TemplateMagicMethodObject();
-
- $anyType = Template::ANY_CALL;
- $methodType = Template::METHOD_CALL;
- $arrayType = Template::ARRAY_CALL;
-
- $basicTests = [
- // array(defined, value, property to fetch)
- [true, 'defined', 'defined'],
- [false, null, 'undefined'],
- [false, null, 'protected'],
- [true, 0, 'zero'],
- [true, 1, 1],
- [true, 1, 1.0],
- [true, null, 'null'],
- [true, true, 'bar'],
- [true, 'baz', 'baz'],
- [true, '09', '09'],
- [true, '+4', '+4'],
- ];
- $testObjects = [
- // array(object, type of fetch)
- [$array, $arrayType],
- [$objectArray, $arrayType],
- [$arrayObject, $anyType],
- [$stdObject, $anyType],
- [$magicPropertyObject, $anyType],
- [$methodObject, $methodType],
- [$methodObject, $anyType],
- [$propertyObject, $anyType],
- [$propertyObject1, $anyType],
- [$propertyObject2, $anyType],
- ];
-
- $tests = [];
- foreach ($testObjects as $testObject) {
- foreach ($basicTests as $test) {
- // properties cannot be numbers
- if (($testObject[0] instanceof \stdClass || $testObject[0] instanceof TemplatePropertyObject) && is_numeric($test[2])) {
- continue;
- }
-
- if ('+4' === $test[2] && $methodObject === $testObject[0]) {
- continue;
- }
-
- $tests[] = [$test[0], $test[1], $testObject[0], $test[2], [], $testObject[1]];
- }
- }
-
- // additional properties tests
- $tests = array_merge($tests, [
- [true, null, $propertyObject3, 'foo', [], $anyType],
- ]);
-
- // additional method tests
- $tests = array_merge($tests, [
- [true, 'defined', $methodObject, 'defined', [], $methodType],
- [true, 'defined', $methodObject, 'DEFINED', [], $methodType],
- [true, 'defined', $methodObject, 'getDefined', [], $methodType],
- [true, 'defined', $methodObject, 'GETDEFINED', [], $methodType],
- [true, 'static', $methodObject, 'static', [], $methodType],
- [true, 'static', $methodObject, 'getStatic', [], $methodType],
-
- [true, '__call_undefined', $magicMethodObject, 'undefined', [], $methodType],
- [true, '__call_UNDEFINED', $magicMethodObject, 'UNDEFINED', [], $methodType],
- ]);
-
- // add the same tests for the any type
- foreach ($tests as $test) {
- if ($anyType !== $test[5]) {
- $test[5] = $anyType;
- $tests[] = $test;
- }
- }
-
- $methodAndPropObject = new TemplateMethodAndPropObject();
-
- // additional method tests
- $tests = array_merge($tests, [
- [true, 'a', $methodAndPropObject, 'a', [], $anyType],
- [true, 'a', $methodAndPropObject, 'a', [], $methodType],
- [false, null, $methodAndPropObject, 'a', [], $arrayType],
-
- [true, 'b_prop', $methodAndPropObject, 'b', [], $anyType],
- [true, 'b', $methodAndPropObject, 'B', [], $anyType],
- [true, 'b', $methodAndPropObject, 'b', [], $methodType],
- [true, 'b', $methodAndPropObject, 'B', [], $methodType],
- [false, null, $methodAndPropObject, 'b', [], $arrayType],
-
- [false, null, $methodAndPropObject, 'c', [], $anyType],
- [false, null, $methodAndPropObject, 'c', [], $methodType],
- [false, null, $methodAndPropObject, 'c', [], $arrayType],
- ]);
-
- $arrayAccess = new TemplateArrayAccess();
- $tests = array_merge($tests, [
- [true, ['foo' => 'bar'], $arrayAccess, 'vars', [], $anyType],
- ]);
-
- // tests when input is not an array or object
- $tests = array_merge($tests, [
- [false, null, 42, 'a', [], $anyType, 'Impossible to access an attribute ("a") on a integer variable ("42") in "index.twig".'],
- [false, null, 'string', 'a', [], $anyType, 'Impossible to access an attribute ("a") on a string variable ("string") in "index.twig".'],
- [false, null, [], 'a', [], $anyType, 'Key "a" does not exist as the array is empty in "index.twig".'],
- ]);
-
- return $tests;
- }
-
- public function testGetIsMethods()
- {
- $this->expectException('\Twig\Error\RuntimeError');
-
- $getIsObject = new TemplateGetIsMethods();
- $template = new TemplateForTest(new Environment($this->createMock('\Twig\Loader\LoaderInterface'), ['strict_variables' => true]));
- // first time should not create a cache for "get"
- $this->assertNull($template->getAttribute($getIsObject, 'get'));
- // 0 should be in the method cache now, so this should fail
- $this->assertNull($template->getAttribute($getIsObject, 0));
- }
-}
-
-class TemplateForTest extends Template
-{
- private $name;
-
- public function __construct(Environment $env, $name = 'index.twig')
- {
- parent::__construct($env);
- self::$cache = [];
- $this->name = $name;
- }
-
- public function getZero()
- {
- return 0;
- }
-
- public function getEmpty()
- {
- return '';
- }
-
- public function getString()
- {
- return 'some_string';
- }
-
- public function getTrue()
- {
- return true;
- }
-
- public function getTemplateName()
- {
- return $this->name;
- }
-
- public function getDebugInfo()
- {
- return [];
- }
-
- protected function doGetParent(array $context)
- {
- return false;
- }
-
- protected function doDisplay(array $context, array $blocks = [])
- {
- }
-
- public function getAttribute($object, $item, array $arguments = [], $type = Template::ANY_CALL, $isDefinedTest = false, $ignoreStrictCheck = false)
- {
- if (\function_exists('twig_template_get_attributes')) {
- return twig_template_get_attributes($this, $object, $item, $arguments, $type, $isDefinedTest, $ignoreStrictCheck);
- } else {
- return parent::getAttribute($object, $item, $arguments, $type, $isDefinedTest, $ignoreStrictCheck);
- }
- }
-
- public function block_name($context, array $blocks = [])
- {
- }
-}
-
-class TemplateArrayAccessObject implements \ArrayAccess
-{
- protected $protected = 'protected';
-
- public $attributes = [
- 'defined' => 'defined',
- 'zero' => 0,
- 'null' => null,
- '1' => 1,
- 'bar' => true,
- 'baz' => 'baz',
- '09' => '09',
- '+4' => '+4',
- ];
-
- public function offsetExists($name)
- {
- return \array_key_exists($name, $this->attributes);
- }
-
- public function offsetGet($name)
- {
- return \array_key_exists($name, $this->attributes) ? $this->attributes[$name] : null;
- }
-
- public function offsetSet($name, $value)
- {
- }
-
- public function offsetUnset($name)
- {
- }
-}
-
-class TemplateMagicPropertyObject
-{
- public $defined = 'defined';
-
- public $attributes = [
- 'zero' => 0,
- 'null' => null,
- '1' => 1,
- 'bar' => true,
- 'baz' => 'baz',
- '09' => '09',
- '+4' => '+4',
- ];
-
- protected $protected = 'protected';
-
- public function __isset($name)
- {
- return \array_key_exists($name, $this->attributes);
- }
-
- public function __get($name)
- {
- return \array_key_exists($name, $this->attributes) ? $this->attributes[$name] : null;
- }
-}
-
-class TemplateMagicPropertyObjectWithException
-{
- public function __isset($key)
- {
- throw new \Exception('Hey! Don\'t try to isset me!');
- }
-}
-
-class TemplatePropertyObject
-{
- public $defined = 'defined';
- public $zero = 0;
- public $null = null;
- public $bar = true;
- public $baz = 'baz';
-
- protected $protected = 'protected';
-}
-
-class TemplatePropertyObjectAndIterator extends TemplatePropertyObject implements \IteratorAggregate
-{
- public function getIterator()
- {
- return new \ArrayIterator(['foo', 'bar']);
- }
-}
-
-class TemplatePropertyObjectAndArrayAccess extends TemplatePropertyObject implements \ArrayAccess
-{
- private $data = [
- 'defined' => 'defined',
- 'zero' => 0,
- 'null' => null,
- 'bar' => true,
- 'foo' => true,
- 'baz' => 'baz',
- 'baf' => 'baf',
- ];
-
- public function offsetExists($offset)
- {
- return \array_key_exists($offset, $this->data);
- }
-
- public function offsetGet($offset)
- {
- return $this->offsetExists($offset) ? $this->data[$offset] : 'n/a';
- }
-
- public function offsetSet($offset, $value)
- {
- }
-
- public function offsetUnset($offset)
- {
- }
-}
-
-class TemplatePropertyObjectDefinedWithUndefinedValue
-{
- public $foo;
-
- public function __construct()
- {
- $this->foo = @$notExist;
- }
-}
-
-class TemplateMethodObject
-{
- public function getDefined()
- {
- return 'defined';
- }
-
- public function get1()
- {
- return 1;
- }
-
- public function get09()
- {
- return '09';
- }
-
- public function getZero()
- {
- return 0;
- }
-
- public function getNull()
- {
- }
-
- public function isBar()
- {
- return true;
- }
-
- public function isBaz()
- {
- return 'should never be returned';
- }
-
- public function getBaz()
- {
- return 'baz';
- }
-
- protected function getProtected()
- {
- return 'protected';
- }
-
- public static function getStatic()
- {
- return 'static';
- }
-}
-
-class TemplateGetIsMethods
-{
- public function get()
- {
- }
-
- public function is()
- {
- }
-}
-
-class TemplateMethodAndPropObject
-{
- private $a = 'a_prop';
-
- public function getA()
- {
- return 'a';
- }
-
- public $b = 'b_prop';
-
- public function getB()
- {
- return 'b';
- }
-
- private $c = 'c_prop';
-
- private function getC()
- {
- return 'c';
- }
-}
-
-class TemplateArrayAccess implements \ArrayAccess
-{
- public $vars = [
- 'foo' => 'bar',
- ];
- private $children = [];
-
- public function offsetExists($offset)
- {
- return \array_key_exists($offset, $this->children);
- }
-
- public function offsetGet($offset)
- {
- return $this->children[$offset];
- }
-
- public function offsetSet($offset, $value)
- {
- $this->children[$offset] = $value;
- }
-
- public function offsetUnset($offset)
- {
- unset($this->children[$offset]);
- }
-}
-
-class TemplateMagicMethodObject
-{
- public function __call($method, $arguments)
- {
- return '__call_'.$method;
- }
-}
-
-class TemplateMagicMethodExceptionObject
-{
- public function __call($method, $arguments)
- {
- throw new \BadMethodCallException(sprintf('Unknown method "%s".', $method));
- }
-}
-
-class CExtDisablingNodeVisitor implements NodeVisitorInterface
-{
- public function enterNode(\Twig_NodeInterface $node, Environment $env)
- {
- if ($node instanceof GetAttrExpression) {
- $node->setAttribute('disable_c_ext', true);
- }
-
- return $node;
- }
-
- public function leaveNode(\Twig_NodeInterface $node, Environment $env)
- {
- return $node;
- }
-
- public function getPriority()
- {
- return 0;
- }
-}
-
-// to be removed in 2.0
-interface TemplateTestLoaderInterface extends LoaderInterface, SourceContextLoaderInterface
-{
-}
diff --git a/vendor/twig/twig/tests/TemplateWrapperTest.php b/vendor/twig/twig/tests/TemplateWrapperTest.php
deleted file mode 100644
index b4a0958b50..0000000000
--- a/vendor/twig/twig/tests/TemplateWrapperTest.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-
-namespace Twig\Tests;
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Twig\Environment;
-use Twig\Loader\ArrayLoader;
-
-class TemplateWrapperTest extends \PHPUnit\Framework\TestCase
-{
- public function testHasGetBlocks()
- {
- $twig = new Environment(new ArrayLoader([
- 'index' => '{% block foo %}{% endblock %}',
- 'index_with_use' => '{% use "imported" %}{% block foo %}{% endblock %}',
- 'index_with_extends' => '{% extends "extended" %}{% block foo %}{% endblock %}',
- 'imported' => '{% block imported %}{% endblock %}',
- 'extended' => '{% block extended %}{% endblock %}',
- ]));
-
- $wrapper = $twig->load('index');
- $this->assertTrue($wrapper->hasBlock('foo'));
- $this->assertFalse($wrapper->hasBlock('bar'));
- $this->assertEquals(['foo'], $wrapper->getBlockNames());
-
- $wrapper = $twig->load('index_with_use');
- $this->assertTrue($wrapper->hasBlock('foo'));
- $this->assertTrue($wrapper->hasBlock('imported'));
- $this->assertEquals(['imported', 'foo'], $wrapper->getBlockNames());
-
- $wrapper = $twig->load('index_with_extends');
- $this->assertTrue($wrapper->hasBlock('foo'));
- $this->assertTrue($wrapper->hasBlock('extended'));
- $this->assertEquals(['foo', 'extended'], $wrapper->getBlockNames());
- }
-
- public function testRenderBlock()
- {
- $twig = new Environment(new ArrayLoader([
- 'index' => '{% block foo %}{{ foo }}{{ bar }}{% endblock %}',
- ]));
- $twig->addGlobal('bar', 'BAR');
-
- $wrapper = $twig->load('index');
- $this->assertEquals('FOOBAR', $wrapper->renderBlock('foo', ['foo' => 'FOO']));
- }
-
- public function testDisplayBlock()
- {
- $twig = new Environment(new ArrayLoader([
- 'index' => '{% block foo %}{{ foo }}{{ bar }}{% endblock %}',
- ]));
- $twig->addGlobal('bar', 'BAR');
-
- $wrapper = $twig->load('index');
-
- ob_start();
- $wrapper->displayBlock('foo', ['foo' => 'FOO']);
-
- $this->assertEquals('FOOBAR', ob_get_clean());
- }
-}
diff --git a/vendor/twig/twig/tests/TokenStreamTest.php b/vendor/twig/twig/tests/TokenStreamTest.php
deleted file mode 100644
index c98e0f0720..0000000000
--- a/vendor/twig/twig/tests/TokenStreamTest.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-
-namespace Twig\Tests;
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Twig\Token;
-use Twig\TokenStream;
-
-class TokenStreamTest extends \PHPUnit\Framework\TestCase
-{
- protected static $tokens;
-
- protected function setUp()
- {
- self::$tokens = [
- new Token(Token::TEXT_TYPE, 1, 1),
- new Token(Token::TEXT_TYPE, 2, 1),
- new Token(Token::TEXT_TYPE, 3, 1),
- new Token(Token::TEXT_TYPE, 4, 1),
- new Token(Token::TEXT_TYPE, 5, 1),
- new Token(Token::TEXT_TYPE, 6, 1),
- new Token(Token::TEXT_TYPE, 7, 1),
- new Token(Token::EOF_TYPE, 0, 1),
- ];
- }
-
- /**
- * @group legacy
- */
- public function testLegacyConstructorSignature()
- {
- $stream = new TokenStream([], 'foo', '{{ foo }}');
- $this->assertEquals('foo', $stream->getFilename());
- $this->assertEquals('{{ foo }}', $stream->getSource());
- $this->assertEquals('foo', $stream->getSourceContext()->getName());
- $this->assertEquals('{{ foo }}', $stream->getSourceContext()->getCode());
- }
-
- public function testNext()
- {
- $stream = new TokenStream(self::$tokens);
- $repr = [];
- while (!$stream->isEOF()) {
- $token = $stream->next();
-
- $repr[] = $token->getValue();
- }
- $this->assertEquals('1, 2, 3, 4, 5, 6, 7', implode(', ', $repr), '->next() advances the pointer and returns the current token');
- }
-
- public function testEndOfTemplateNext()
- {
- $this->expectException('\Twig\Error\SyntaxError');
- $this->expectExceptionMessage('Unexpected end of template');
-
- $stream = new TokenStream([
- new Token(Token::BLOCK_START_TYPE, 1, 1),
- ]);
- while (!$stream->isEOF()) {
- $stream->next();
- }
- }
-
- public function testEndOfTemplateLook()
- {
- $this->expectException('\Twig\Error\SyntaxError');
- $this->expectExceptionMessage('Unexpected end of template');
-
- $stream = new TokenStream([
- new Token(Token::BLOCK_START_TYPE, 1, 1),
- ]);
- while (!$stream->isEOF()) {
- $stream->look();
- $stream->next();
- }
- }
-}
diff --git a/vendor/twig/twig/tests/Util/DeprecationCollectorTest.php b/vendor/twig/twig/tests/Util/DeprecationCollectorTest.php
deleted file mode 100644
index e360dbb141..0000000000
--- a/vendor/twig/twig/tests/Util/DeprecationCollectorTest.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-namespace Twig\Tests\Util;
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Twig\Environment;
-use Twig\TwigFunction;
-use Twig\Util\DeprecationCollector;
-
-class DeprecationCollectorTest extends \PHPUnit\Framework\TestCase
-{
- /**
- * @requires PHP 5.3
- */
- public function testCollect()
- {
- $twig = new Environment($this->createMock('\Twig\Loader\LoaderInterface'));
- $twig->addFunction(new TwigFunction('deprec', [$this, 'deprec'], ['deprecated' => true]));
-
- $collector = new DeprecationCollector($twig);
- $deprecations = $collector->collect(new Twig_Tests_Util_Iterator());
-
- $this->assertEquals(['Twig Function "deprec" is deprecated in deprec.twig at line 1.'], $deprecations);
- }
-
- public function deprec()
- {
- }
-}
-
-class Twig_Tests_Util_Iterator implements \IteratorAggregate
-{
- public function getIterator()
- {
- return new \ArrayIterator([
- 'ok.twig' => '{{ foo }}',
- 'deprec.twig' => '{{ deprec("foo") }}',
- ]);
- }
-}
diff --git a/vendor/twig/twig/tests/escapingTest.php b/vendor/twig/twig/tests/escapingTest.php
deleted file mode 100644
index 84759ebb48..0000000000
--- a/vendor/twig/twig/tests/escapingTest.php
+++ /dev/null
@@ -1,327 +0,0 @@
-<?php
-
-namespace Twig\Tests;
-
-/**
- * This class is adapted from code coming from Zend Framework.
- *
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (https://www.zend.com)
- * @license https://framework.zend.com/license/new-bsd New BSD License
- */
-class Twig_Test_EscapingTest extends \PHPUnit\Framework\TestCase
-{
- /**
- * All character encodings supported by htmlspecialchars().
- */
- protected $htmlSpecialChars = [
- '\'' => ''',
- '"' => '"',
- '<' => '<',
- '>' => '>',
- '&' => '&',
- ];
-
- protected $htmlAttrSpecialChars = [
- '\'' => ''',
- /* Characters beyond ASCII value 255 to unicode escape */
- 'Ā' => 'Ā',
- '😀' => '😀',
- /* Immune chars excluded */
- ',' => ',',
- '.' => '.',
- '-' => '-',
- '_' => '_',
- /* Basic alnums excluded */
- 'a' => 'a',
- 'A' => 'A',
- 'z' => 'z',
- 'Z' => 'Z',
- '0' => '0',
- '9' => '9',
- /* Basic control characters and null */
- "\r" => '
',
- "\n" => '
',
- "\t" => '	',
- "\0" => '�', // should use Unicode replacement char
- /* Encode chars as named entities where possible */
- '<' => '<',
- '>' => '>',
- '&' => '&',
- '"' => '"',
- /* Encode spaces for quoteless attribute protection */
- ' ' => ' ',
- ];
-
- protected $jsSpecialChars = [
- /* HTML special chars - escape without exception to hex */
- '<' => '\\u003C',
- '>' => '\\u003E',
- '\'' => '\\u0027',
- '"' => '\\u0022',
- '&' => '\\u0026',
- '/' => '\\/',
- /* Characters beyond ASCII value 255 to unicode escape */
- 'Ā' => '\\u0100',
- '😀' => '\\uD83D\\uDE00',
- /* Immune chars excluded */
- ',' => ',',
- '.' => '.',
- '_' => '_',
- /* Basic alnums excluded */
- 'a' => 'a',
- 'A' => 'A',
- 'z' => 'z',
- 'Z' => 'Z',
- '0' => '0',
- '9' => '9',
- /* Basic control characters and null */
- "\r" => '\r',
- "\n" => '\n',
- "\x08" => '\b',
- "\t" => '\t',
- "\x0C" => '\f',
- "\0" => '\\u0000',
- /* Encode spaces for quoteless attribute protection */
- ' ' => '\\u0020',
- ];
-
- protected $urlSpecialChars = [
- /* HTML special chars - escape without exception to percent encoding */
- '<' => '%3C',
- '>' => '%3E',
- '\'' => '%27',
- '"' => '%22',
- '&' => '%26',
- /* Characters beyond ASCII value 255 to hex sequence */
- 'Ā' => '%C4%80',
- /* Punctuation and unreserved check */
- ',' => '%2C',
- '.' => '.',
- '_' => '_',
- '-' => '-',
- ':' => '%3A',
- ';' => '%3B',
- '!' => '%21',
- /* Basic alnums excluded */
- 'a' => 'a',
- 'A' => 'A',
- 'z' => 'z',
- 'Z' => 'Z',
- '0' => '0',
- '9' => '9',
- /* Basic control characters and null */
- "\r" => '%0D',
- "\n" => '%0A',
- "\t" => '%09',
- "\0" => '%00',
- /* PHP quirks from the past */
- ' ' => '%20',
- '~' => '~',
- '+' => '%2B',
- ];
-
- protected $cssSpecialChars = [
- /* HTML special chars - escape without exception to hex */
- '<' => '\\3C ',
- '>' => '\\3E ',
- '\'' => '\\27 ',
- '"' => '\\22 ',
- '&' => '\\26 ',
- /* Characters beyond ASCII value 255 to unicode escape */
- 'Ā' => '\\100 ',
- /* Immune chars excluded */
- ',' => '\\2C ',
- '.' => '\\2E ',
- '_' => '\\5F ',
- /* Basic alnums excluded */
- 'a' => 'a',
- 'A' => 'A',
- 'z' => 'z',
- 'Z' => 'Z',
- '0' => '0',
- '9' => '9',
- /* Basic control characters and null */
- "\r" => '\\D ',
- "\n" => '\\A ',
- "\t" => '\\9 ',
- "\0" => '\\0 ',
- /* Encode spaces for quoteless attribute protection */
- ' ' => '\\20 ',
- ];
-
- protected $env;
-
- protected function setUp()
- {
- $this->env = new \Twig\Environment($this->createMock('\Twig\Loader\LoaderInterface'));
- }
-
- public function testHtmlEscapingConvertsSpecialChars()
- {
- foreach ($this->htmlSpecialChars as $key => $value) {
- $this->assertEquals($value, twig_escape_filter($this->env, $key, 'html'), 'Failed to escape: '.$key);
- }
- }
-
- public function testHtmlAttributeEscapingConvertsSpecialChars()
- {
- foreach ($this->htmlAttrSpecialChars as $key => $value) {
- $this->assertEquals($value, twig_escape_filter($this->env, $key, 'html_attr'), 'Failed to escape: '.$key);
- }
- }
-
- public function testJavascriptEscapingConvertsSpecialChars()
- {
- foreach ($this->jsSpecialChars as $key => $value) {
- $this->assertEquals($value, twig_escape_filter($this->env, $key, 'js'), 'Failed to escape: '.$key);
- }
- }
-
- public function testJavascriptEscapingReturnsStringIfZeroLength()
- {
- $this->assertEquals('', twig_escape_filter($this->env, '', 'js'));
- }
-
- public function testJavascriptEscapingReturnsStringIfContainsOnlyDigits()
- {
- $this->assertEquals('123', twig_escape_filter($this->env, '123', 'js'));
- }
-
- public function testCssEscapingConvertsSpecialChars()
- {
- foreach ($this->cssSpecialChars as $key => $value) {
- $this->assertEquals($value, twig_escape_filter($this->env, $key, 'css'), 'Failed to escape: '.$key);
- }
- }
-
- public function testCssEscapingReturnsStringIfZeroLength()
- {
- $this->assertEquals('', twig_escape_filter($this->env, '', 'css'));
- }
-
- public function testCssEscapingReturnsStringIfContainsOnlyDigits()
- {
- $this->assertEquals('123', twig_escape_filter($this->env, '123', 'css'));
- }
-
- public function testUrlEscapingConvertsSpecialChars()
- {
- foreach ($this->urlSpecialChars as $key => $value) {
- $this->assertEquals($value, twig_escape_filter($this->env, $key, 'url'), 'Failed to escape: '.$key);
- }
- }
-
- /**
- * Range tests to confirm escaped range of characters is within OWASP recommendation.
- */
-
- /**
- * Only testing the first few 2 ranges on this prot. function as that's all these
- * other range tests require.
- */
- public function testUnicodeCodepointConversionToUtf8()
- {
- $expected = ' ~ޙ';
- $codepoints = [0x20, 0x7e, 0x799];
- $result = '';
- foreach ($codepoints as $value) {
- $result .= $this->codepointToUtf8($value);
- }
- $this->assertEquals($expected, $result);
- }
-
- /**
- * Convert a Unicode Codepoint to a literal UTF-8 character.
- *
- * @param int $codepoint Unicode codepoint in hex notation
- *
- * @return string UTF-8 literal string
- */
- protected function codepointToUtf8($codepoint)
- {
- if ($codepoint < 0x80) {
- return \chr($codepoint);
- }
- if ($codepoint < 0x800) {
- return \chr($codepoint >> 6 & 0x3f | 0xc0)
- .\chr($codepoint & 0x3f | 0x80);
- }
- if ($codepoint < 0x10000) {
- return \chr($codepoint >> 12 & 0x0f | 0xe0)
- .\chr($codepoint >> 6 & 0x3f | 0x80)
- .\chr($codepoint & 0x3f | 0x80);
- }
- if ($codepoint < 0x110000) {
- return \chr($codepoint >> 18 & 0x07 | 0xf0)
- .\chr($codepoint >> 12 & 0x3f | 0x80)
- .\chr($codepoint >> 6 & 0x3f | 0x80)
- .\chr($codepoint & 0x3f | 0x80);
- }
- throw new \Exception('Codepoint requested outside of Unicode range.');
- }
-
- public function testJavascriptEscapingEscapesOwaspRecommendedRanges()
- {
- $immune = [',', '.', '_']; // Exceptions to escaping ranges
- for ($chr = 0; $chr < 0xFF; ++$chr) {
- if ($chr >= 0x30 && $chr <= 0x39
- || $chr >= 0x41 && $chr <= 0x5A
- || $chr >= 0x61 && $chr <= 0x7A) {
- $literal = $this->codepointToUtf8($chr);
- $this->assertEquals($literal, twig_escape_filter($this->env, $literal, 'js'));
- } else {
- $literal = $this->codepointToUtf8($chr);
- if (\in_array($literal, $immune)) {
- $this->assertEquals($literal, twig_escape_filter($this->env, $literal, 'js'));
- } else {
- $this->assertNotEquals(
- $literal,
- twig_escape_filter($this->env, $literal, 'js'),
- "$literal should be escaped!");
- }
- }
- }
- }
-
- public function testHtmlAttributeEscapingEscapesOwaspRecommendedRanges()
- {
- $immune = [',', '.', '-', '_']; // Exceptions to escaping ranges
- for ($chr = 0; $chr < 0xFF; ++$chr) {
- if ($chr >= 0x30 && $chr <= 0x39
- || $chr >= 0x41 && $chr <= 0x5A
- || $chr >= 0x61 && $chr <= 0x7A) {
- $literal = $this->codepointToUtf8($chr);
- $this->assertEquals($literal, twig_escape_filter($this->env, $literal, 'html_attr'));
- } else {
- $literal = $this->codepointToUtf8($chr);
- if (\in_array($literal, $immune)) {
- $this->assertEquals($literal, twig_escape_filter($this->env, $literal, 'html_attr'));
- } else {
- $this->assertNotEquals(
- $literal,
- twig_escape_filter($this->env, $literal, 'html_attr'),
- "$literal should be escaped!");
- }
- }
- }
- }
-
- public function testCssEscapingEscapesOwaspRecommendedRanges()
- {
- // CSS has no exceptions to escaping ranges
- for ($chr = 0; $chr < 0xFF; ++$chr) {
- if ($chr >= 0x30 && $chr <= 0x39
- || $chr >= 0x41 && $chr <= 0x5A
- || $chr >= 0x61 && $chr <= 0x7A) {
- $literal = $this->codepointToUtf8($chr);
- $this->assertEquals($literal, twig_escape_filter($this->env, $literal, 'css'));
- } else {
- $literal = $this->codepointToUtf8($chr);
- $this->assertNotEquals(
- $literal,
- twig_escape_filter($this->env, $literal, 'css'),
- "$literal should be escaped!");
- }
- }
- }
-}
diff --git a/vendor/typo3/phar-stream-wrapper/.appveyor.yml b/vendor/typo3/phar-stream-wrapper/.appveyor.yml
deleted file mode 100644
index 7471e1a03f..0000000000
--- a/vendor/typo3/phar-stream-wrapper/.appveyor.yml
+++ /dev/null
@@ -1,53 +0,0 @@
-build: false
-platform:
- - x64
-clone_folder: c:\projects\php-project-workspace
-
-# php_ver_target can be used as regular expression
-# e.g. '7\.' will be used as pattern '\|7\.' on value 'php|7.1.2'
-environment:
- matrix:
- - dependencies: current
- php_ver_target: 7\.
-
-cache:
- - '%LOCALAPPDATA%\Composer\files -> composer.lock'
- # Cache chocolatey packages
- - C:\ProgramData\chocolatey\bin -> .appveyor.yml
- - C:\ProgramData\chocolatey\lib -> .appveyor.yml
- # Cache php install
- - c:\tools\php -> .appveyor.yml
-
-## Set up environment variables
-init:
- - SET PATH=C:\Program Files\OpenSSL;c:\tools\php;%PATH%
- - SET COMPOSER_NO_INTERACTION=1
- - SET PHP=1 # This var is connected to PHP install cache
- - SET ANSICON=121x90 (121x90)
-
-## Install PHP and composer, and run the appropriate composer command
-install:
- - IF EXIST c:\tools\php (SET PHP=0) # Checks for the PHP install being cached
- - ps: appveyor-retry cinst --params '""/InstallDir:C:\tools\php""' --ignore-checksums -y php --version ((choco search php --exact --all-versions -r | select-string -pattern "\|$env:php_ver_target" | sort { [version]($_ -split '\|' | select -last 1) } -Descending | Select-Object -first 1) -replace '[php|]','')
- - cd c:\tools\php
- - IF %PHP%==1 copy php.ini-production php.ini /Y
- - IF %PHP%==1 echo date.timezone="UTC" >> php.ini
- - IF %PHP%==1 echo extension_dir=ext >> php.ini
- - IF %PHP%==1 echo extension=php_openssl.dll >> php.ini
- - IF %PHP%==1 echo extension=php_mbstring.dll >> php.ini
- - IF %PHP%==1 echo extension=php_fileinfo.dll >> php.ini
- - IF %PHP%==1 echo extension=php_bz2.dll >> php.ini
- - IF %PHP%==1 echo @php %%~dp0composer.phar %%* > composer.bat
- - appveyor-retry appveyor DownloadFile https://getcomposer.org/composer.phar
- - cd c:\projects\php-project-workspace
-# Remove xdebug dependency as performance testing is not relevant at this point.
- - composer remove --dev ext-xdebug
- - IF %dependencies%==lowest appveyor-retry composer update --prefer-lowest --no-progress --profile -n
- - IF %dependencies%==current appveyor-retry composer install --no-progress --profile
- - IF %dependencies%==highest appveyor-retry composer update --no-progress --profile -n
- - composer show
-
-## Run the actual test
-test_script:
- - cd c:\projects\php-project-workspace
- - vendor/bin/phpunit
diff --git a/vendor/typo3/phar-stream-wrapper/.gitignore b/vendor/typo3/phar-stream-wrapper/.gitignore
deleted file mode 100644
index 157ff0c598..0000000000
--- a/vendor/typo3/phar-stream-wrapper/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-.idea
-vendor/
-composer.lock
diff --git a/vendor/zendframework/zend-diactoros/.coveralls.yml b/vendor/zendframework/zend-diactoros/.coveralls.yml
deleted file mode 100644
index bc71b62f87..0000000000
--- a/vendor/zendframework/zend-diactoros/.coveralls.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-coverage_clover: clover.xml
-json_path: coveralls-upload.json
diff --git a/vendor/zendframework/zend-diactoros/CONDUCT.md b/vendor/zendframework/zend-diactoros/CONDUCT.md
deleted file mode 100644
index c663d2be93..0000000000
--- a/vendor/zendframework/zend-diactoros/CONDUCT.md
+++ /dev/null
@@ -1,43 +0,0 @@
-# Contributor Code of Conduct
-
-The Zend Framework project adheres to [The Code Manifesto](http://codemanifesto.com)
-as its guidelines for contributor interactions.
-
-## The Code Manifesto
-
-We want to work in an ecosystem that empowers developers to reach their
-potential — one that encourages growth and effective collaboration. A space that
-is safe for all.
-
-A space such as this benefits everyone that participates in it. It encourages
-new developers to enter our field. It is through discussion and collaboration
-that we grow, and through growth that we improve.
-
-In the effort to create such a place, we hold to these values:
-
-1. **Discrimination limits us.** This includes discrimination on the basis of
- race, gender, sexual orientation, gender identity, age, nationality, technology
- and any other arbitrary exclusion of a group of people.
-2. **Boundaries honor us.** Your comfort levels are not everyone’s comfort
- levels. Remember that, and if brought to your attention, heed it.
-3. **We are our biggest assets.** None of us were born masters of our trade.
- Each of us has been helped along the way. Return that favor, when and where
- you can.
-4. **We are resources for the future.** As an extension of #3, share what you
- know. Make yourself a resource to help those that come after you.
-5. **Respect defines us.** Treat others as you wish to be treated. Make your
- discussions, criticisms and debates from a position of respectfulness. Ask
- yourself, is it true? Is it necessary? Is it constructive? Anything less is
- unacceptable.
-6. **Reactions require grace.** Angry responses are valid, but abusive language
- and vindictive actions are toxic. When something happens that offends you,
- handle it assertively, but be respectful. Escalate reasonably, and try to
- allow the offender an opportunity to explain themselves, and possibly correct
- the issue.
-7. **Opinions are just that: opinions.** Each and every one of us, due to our
- background and upbringing, have varying opinions. The fact of the matter, is
- that is perfectly acceptable. Remember this: if you respect your own
- opinions, you should respect the opinions of others.
-8. **To err is human.** You might not intend it, but mistakes do happen and
- contribute to build experience. Tolerate honest mistakes, and don't hesitate
- to apologize if you make one yourself.
diff --git a/vendor/zendframework/zend-diactoros/CONTRIBUTING.md b/vendor/zendframework/zend-diactoros/CONTRIBUTING.md
deleted file mode 100644
index 817ba7bff3..0000000000
--- a/vendor/zendframework/zend-diactoros/CONTRIBUTING.md
+++ /dev/null
@@ -1,228 +0,0 @@
-# CONTRIBUTING
-
-## RESOURCES
-
-If you wish to contribute to Zend Framework, please be sure to
-read/subscribe to the following resources:
-
- - [Coding Standards](https://github.com/zendframework/zf2/wiki/Coding-Standards)
- - [Contributor's Guide](http://framework.zend.com/participate/contributor-guide)
- - ZF Contributor's mailing list:
- Archives: http://zend-framework-community.634137.n4.nabble.com/ZF-Contributor-f680267.html
- Subscribe: zf-contributors-subscribe@lists.zend.com
- - ZF Contributor's IRC channel:
- #zftalk.dev on Freenode.net
-
-If you are working on new features or refactoring [create a proposal](https://github.com/zendframework/zend-diactoros/issues/new).
-
-## Reporting Potential Security Issues
-
-If you have encountered a potential security vulnerability, please **DO NOT** report it on the public
-issue tracker: send it to us at [zf-security@zend.com](mailto:zf-security@zend.com) instead.
-We will work with you to verify the vulnerability and patch it as soon as possible.
-
-When reporting issues, please provide the following information:
-
-- Component(s) affected
-- A description indicating how to reproduce the issue
-- A summary of the security vulnerability and impact
-
-We request that you contact us via the email address above and give the project
-contributors a chance to resolve the vulnerability and issue a new release prior
-to any public exposure; this helps protect users and provides them with a chance
-to upgrade and/or update in order to protect their applications.
-
-For sensitive email communications, please use [our PGP key](http://framework.zend.com/zf-security-pgp-key.asc).
-
-## Documentation
-
-Documentation is in [GitHub Flavored Markdown](https://help.github.com/articles/github-flavored-markdown/),
-and rendered using [bookdown](http://bookdown.io). Please read and follow the [general documentation
-guidelines](https://github.com/zendframework/documentation/blob/master/CONTRIBUTING.md) when
-providing documentation.
-
-All new features **must** include documentation before they may be accepted and merged.
-
-## RUNNING TESTS
-
-To run tests:
-
-- Clone the repository:
-
- ```console
- $ git clone git@github.com:zendframework/zend-diactoros.git
- $ cd
- ```
-
-- Install dependencies via composer:
-
- ```console
- $ curl -sS https://getcomposer.org/installer | php --
- $ ./composer.phar install
- ```
-
- If you don't have `curl` installed, you can also download `composer.phar` from https://getcomposer.org/
-
-- Run the tests via `phpunit` and the provided PHPUnit config, like in this example:
-
- ```console
- $ ./vendor/bin/phpunit
- ```
-
-## Running Coding Standards Checks
-
-This component uses [phpcs](https://github.com/squizlabs/PHP_CodeSniffer) for coding
-standards checks, and provides configuration for our selected checks.
-`phpcs` is installed by default via Composer.
-
-To run checks only:
-
-```console
-$ composer cs-check
-```
-
-`phpcs` also installs a tool named `phpcbf` which can attempt to fix problems
-for you:
-
-```console
-$ composer cs-fix
-```
-
-If you allow phpcbf to fix CS issues, please re-run the tests to ensure
-they pass, and make sure you add and commit the changes after verification.
-
-## Recommended Workflow for Contributions
-
-Your first step is to establish a public repository from which we can
-pull your work into the master repository. We recommend using
-[GitHub](https://github.com), as that is where the component is already hosted.
-
-1. Setup a [GitHub account](http://github.com/), if you haven't yet
-2. Fork the repository (http://github.com/zendframework/zend-diactoros)
-3. Clone the canonical repository locally and enter it.
-
- ```console
- $ git clone git://github.com/zendframework/zend-diactoros.git
- $ cd zend-diactoros
- ```
-
-4. Add a remote to your fork; substitute your GitHub username in the command
- below.
-
- ```console
- $ git remote add {username} git@github.com:{username}/zend-diactoros.git
- $ git fetch {username}
- ```
-
-### Keeping Up-to-Date
-
-Periodically, you should update your fork or personal repository to
-match the canonical repository. Assuming you have setup your local repository
-per the instructions above, you can do the following:
-
-
-```console
-$ git checkout master
-$ git fetch origin
-$ git rebase origin/master
-# OPTIONALLY, to keep your remote up-to-date -
-$ git push {username} master:master
-```
-
-If you're tracking other branches -- for example, the "develop" branch, where
-new feature development occurs -- you'll want to do the same operations for that
-branch; simply substitute "develop" for "master".
-
-### Working on a patch
-
-We recommend you do each new feature or bugfix in a new branch. This simplifies
-the task of code review as well as the task of merging your changes into the
-canonical repository.
-
-A typical workflow will then consist of the following:
-
-1. Create a new local branch based off either your master or develop branch.
-2. Switch to your new local branch. (This step can be combined with the
- previous step with the use of `git checkout -b`.)
-3. Do some work, commit, repeat as necessary.
-4. Push the local branch to your remote repository.
-5. Send a pull request.
-
-The mechanics of this process are actually quite trivial. Below, we will
-create a branch for fixing an issue in the tracker.
-
-```console
-$ git checkout -b hotfix/9295
-Switched to a new branch 'hotfix/9295'
-```
-
-... do some work ...
-
-
-```console
-$ git commit
-```
-
-... write your log message ...
-
-
-```console
-$ git push {username} hotfix/9295:hotfix/9295
-Counting objects: 38, done.
-Delta compression using up to 2 threads.
-Compression objects: 100% (18/18), done.
-Writing objects: 100% (20/20), 8.19KiB, done.
-Total 20 (delta 12), reused 0 (delta 0)
-To ssh://git@github.com/{username}/zend-diactoros.git
- b5583aa..4f51698 HEAD -> master
-```
-
-To send a pull request, you have two options.
-
-If using GitHub, you can do the pull request from there. Navigate to
-your repository, select the branch you just created, and then select the
-"Pull Request" button in the upper right. Select the user/organization
-"zendframework" as the recipient.
-
-If using your own repository - or even if using GitHub - you can use `git
-format-patch` to create a patchset for us to apply; in fact, this is
-**recommended** for security-related patches. If you use `format-patch`, please
-send the patches as attachments to:
-
-- zf-devteam@zend.com for patches without security implications
-- zf-security@zend.com for security patches
-
-#### What branch to issue the pull request against?
-
-Which branch should you issue a pull request against?
-
-- For fixes against the stable release, issue the pull request against the
- "master" branch.
-- For new features, or fixes that introduce new elements to the public API (such
- as new public methods or properties), issue the pull request against the
- "develop" branch.
-
-### Branch Cleanup
-
-As you might imagine, if you are a frequent contributor, you'll start to
-get a ton of branches both locally and on your remote.
-
-Once you know that your changes have been accepted to the master
-repository, we suggest doing some cleanup of these branches.
-
-- Local branch cleanup
-
- ```console
- $ git branch -d <branchname>
- ```
-
-- Remote branch removal
-
- ```console
- $ git push {username} :<branchname>
- ```
-
-
-## Conduct
-
-Please see our [CONDUCT.md](CONDUCT.md) to understand expected behavior when interacting with others in the project.
diff --git a/vendor/zendframework/zend-diactoros/LICENSE.md b/vendor/zendframework/zend-diactoros/LICENSE.md
deleted file mode 100644
index c7e9a85d7b..0000000000
--- a/vendor/zendframework/zend-diactoros/LICENSE.md
+++ /dev/null
@@ -1,12 +0,0 @@
-Copyright (c) 2015-2016, Zend Technologies USA, Inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-- Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-
-- Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-- Neither the name of Zend Technologies USA, Inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/zendframework/zend-diactoros/README.md b/vendor/zendframework/zend-diactoros/README.md
deleted file mode 100644
index fadb18c24e..0000000000
--- a/vendor/zendframework/zend-diactoros/README.md
+++ /dev/null
@@ -1,34 +0,0 @@
-# zend-diactoros
-
-Master:
-[![Build status][Master image]][Master]
-[![Coverage Status][Master coverage image]][Master coverage]
-Develop:
-[![Build status][Develop image]][Develop]
-[![Coverage Status][Develop coverage image]][Develop coverage]
-
-> Diactoros (pronunciation: `/dɪʌktɒrɒs/`): an epithet for Hermes, meaning literally, "the messenger."
-
-This package supercedes and replaces [phly/http](https://github.com/phly/http).
-
-`zend-diactoros` is a PHP package containing implementations of the [accepted PSR-7 HTTP message interfaces](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-7-http-message.md), as well as a "server" implementation similar to [node's http.Server](http://nodejs.org/api/http.html).
-
-* File issues at https://github.com/zendframework/zend-diactoros/issues
-* Issue patches to https://github.com/zendframework/zend-diactoros/pulls
-
-## Documentation
-
-Documentation is available at:
-
-- https://zendframework.github.io/zend-diactoros/
-
-Source files for documentation are [in the doc/ tree](doc/).
-
- [Master]: https://travis-ci.org/zendframework/zend-diactoros
- [Master image]: https://secure.travis-ci.org/zendframework/zend-diactoros.svg?branch=master
- [Master coverage image]: https://img.shields.io/coveralls/zendframework/zend-diactoros/master.svg
- [Master coverage]: https://coveralls.io/r/zendframework/zend-diactoros?branch=master
- [Develop]: https://github.com/zendframework/zend-diactoros/tree/develop
- [Develop image]: https://secure.travis-ci.org/zendframework/zend-diactoros.svg?branch=develop
- [Develop coverage image]: https://coveralls.io/repos/zendframework/zend-diactoros/badge.svg?branch=develop
- [Develop coverage]: https://coveralls.io/r/zendframework/zend-diactoros?branch=develop
diff --git a/vendor/zendframework/zend-diactoros/composer.json b/vendor/zendframework/zend-diactoros/composer.json
deleted file mode 100644
index cd72e2520c..0000000000
--- a/vendor/zendframework/zend-diactoros/composer.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
- "name": "zendframework/zend-diactoros",
- "description": "PSR HTTP Message implementations",
- "type": "library",
- "license": "BSD-2-Clause",
- "keywords": [
- "http",
- "psr",
- "psr-7"
- ],
- "homepage": "https://github.com/zendframework/zend-diactoros",
- "support": {
- "issues": "https://github.com/zendframework/zend-diactoros/issues",
- "source": "https://github.com/zendframework/zend-diactoros"
- },
- "config": {
- "sort-packages": true
- },
- "extra": {
- "branch-alias": {
- "dev-release-1.8": "1.8.x-dev"
- }
- },
- "require": {
- "php": "^5.6 || ^7.0",
- "psr/http-message": "^1.0"
- },
- "require-dev": {
- "ext-dom": "*",
- "ext-libxml": "*",
- "php-http/psr7-integration-tests": "dev-master",
- "phpunit/phpunit": "^5.7.16 || ^6.0.8 || ^7.2.7",
- "zendframework/zend-coding-standard": "~1.0"
- },
- "provide": {
- "psr/http-message-implementation": "1.0"
- },
- "autoload": {
- "files": [
- "src/functions/create_uploaded_file.php",
- "src/functions/marshal_headers_from_sapi.php",
- "src/functions/marshal_method_from_sapi.php",
- "src/functions/marshal_protocol_version_from_sapi.php",
- "src/functions/marshal_uri_from_sapi.php",
- "src/functions/normalize_server.php",
- "src/functions/normalize_uploaded_files.php",
- "src/functions/parse_cookie_header.php"
- ],
- "psr-4": {
- "Zend\\Diactoros\\": "src/"
- }
- },
- "autoload-dev": {
- "psr-4": {
- "ZendTest\\Diactoros\\": "test/"
- },
- "files": [
- "test/TestAsset/Functions.php",
- "test/TestAsset/SapiResponse.php"
- ]
- },
- "scripts": {
- "check": [
- "@cs-check",
- "@test"
- ],
- "cs-check": "phpcs",
- "cs-fix": "phpcbf",
- "test": "phpunit --colors=always",
- "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
- }
-}
diff --git a/vendor/zendframework/zend-diactoros/composer.lock b/vendor/zendframework/zend-diactoros/composer.lock
deleted file mode 100644
index 3bc15f55dd..0000000000
--- a/vendor/zendframework/zend-diactoros/composer.lock
+++ /dev/null
@@ -1,1695 +0,0 @@
-{
- "_readme": [
- "This file locks the dependencies of your project to a known state",
- "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
- "This file is @generated automatically"
- ],
- "content-hash": "fac154ebe22e2006d25b441f9bc6300a",
- "packages": [
- {
- "name": "psr/http-message",
- "version": "1.0.1",
- "source": {
- "type": "git",
- "url": "https://github.com/php-fig/http-message.git",
- "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363",
- "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.0"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.0.x-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Psr\\Http\\Message\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "PHP-FIG",
- "homepage": "http://www.php-fig.org/"
- }
- ],
- "description": "Common interface for HTTP messages",
- "homepage": "https://github.com/php-fig/http-message",
- "keywords": [
- "http",
- "http-message",
- "psr",
- "psr-7",
- "request",
- "response"
- ],
- "time": "2016-08-06T14:39:51+00:00"
- }
- ],
- "packages-dev": [
- {
- "name": "doctrine/instantiator",
- "version": "1.0.5",
- "source": {
- "type": "git",
- "url": "https://github.com/doctrine/instantiator.git",
- "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d",
- "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3,<8.0-DEV"
- },
- "require-dev": {
- "athletic/athletic": "~0.1.8",
- "ext-pdo": "*",
- "ext-phar": "*",
- "phpunit/phpunit": "~4.0",
- "squizlabs/php_codesniffer": "~2.0"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.0.x-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Marco Pivetta",
- "email": "ocramius@gmail.com",
- "homepage": "http://ocramius.github.com/"
- }
- ],
- "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
- "homepage": "https://github.com/doctrine/instantiator",
- "keywords": [
- "constructor",
- "instantiate"
- ],
- "time": "2015-06-14T21:17:01+00:00"
- },
- {
- "name": "myclabs/deep-copy",
- "version": "1.7.0",
- "source": {
- "type": "git",
- "url": "https://github.com/myclabs/DeepCopy.git",
- "reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e",
- "reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e",
- "shasum": ""
- },
- "require": {
- "php": "^5.6 || ^7.0"
- },
- "require-dev": {
- "doctrine/collections": "^1.0",
- "doctrine/common": "^2.6",
- "phpunit/phpunit": "^4.1"
- },
- "type": "library",
- "autoload": {
- "psr-4": {
- "DeepCopy\\": "src/DeepCopy/"
- },
- "files": [
- "src/DeepCopy/deep_copy.php"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "description": "Create deep copies (clones) of your objects",
- "keywords": [
- "clone",
- "copy",
- "duplicate",
- "object",
- "object graph"
- ],
- "time": "2017-10-19T19:58:43+00:00"
- },
- {
- "name": "phar-io/manifest",
- "version": "1.0.1",
- "source": {
- "type": "git",
- "url": "https://github.com/phar-io/manifest.git",
- "reference": "2df402786ab5368a0169091f61a7c1e0eb6852d0"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/phar-io/manifest/zipball/2df402786ab5368a0169091f61a7c1e0eb6852d0",
- "reference": "2df402786ab5368a0169091f61a7c1e0eb6852d0",
- "shasum": ""
- },
- "require": {
- "ext-dom": "*",
- "ext-phar": "*",
- "phar-io/version": "^1.0.1",
- "php": "^5.6 || ^7.0"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.0.x-dev"
- }
- },
- "autoload": {
- "classmap": [
- "src/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Arne Blankerts",
- "email": "arne@blankerts.de",
- "role": "Developer"
- },
- {
- "name": "Sebastian Heuer",
- "email": "sebastian@phpeople.de",
- "role": "Developer"
- },
- {
- "name": "Sebastian Bergmann",
- "email": "sebastian@phpunit.de",
- "role": "Developer"
- }
- ],
- "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
- "time": "2017-03-05T18:14:27+00:00"
- },
- {
- "name": "phar-io/version",
- "version": "1.0.1",
- "source": {
- "type": "git",
- "url": "https://github.com/phar-io/version.git",
- "reference": "a70c0ced4be299a63d32fa96d9281d03e94041df"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/phar-io/version/zipball/a70c0ced4be299a63d32fa96d9281d03e94041df",
- "reference": "a70c0ced4be299a63d32fa96d9281d03e94041df",
- "shasum": ""
- },
- "require": {
- "php": "^5.6 || ^7.0"
- },
- "type": "library",
- "autoload": {
- "classmap": [
- "src/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Arne Blankerts",
- "email": "arne@blankerts.de",
- "role": "Developer"
- },
- {
- "name": "Sebastian Heuer",
- "email": "sebastian@phpeople.de",
- "role": "Developer"
- },
- {
- "name": "Sebastian Bergmann",
- "email": "sebastian@phpunit.de",
- "role": "Developer"
- }
- ],
- "description": "Library for handling version information and constraints",
- "time": "2017-03-05T17:38:23+00:00"
- },
- {
- "name": "php-http/psr7-integration-tests",
- "version": "dev-master",
- "source": {
- "type": "git",
- "url": "https://github.com/php-http/psr7-integration-tests.git",
- "reference": "5dfefb2da33ca24ae20c971b725c9a6fe7403008"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/php-http/psr7-integration-tests/zipball/5dfefb2da33ca24ae20c971b725c9a6fe7403008",
- "reference": "5dfefb2da33ca24ae20c971b725c9a6fe7403008",
- "shasum": ""
- },
- "require": {
- "php": "^5.4 || ^7.0",
- "phpunit/phpunit": "^5.4 || ^6.0 || ^7.0",
- "psr/http-message": "^1.0"
- },
- "require-dev": {
- "guzzlehttp/psr7": "^1.4",
- "nyholm/psr7": "dev-master",
- "ringcentral/psr7": "^1.2",
- "slim/http": "^0.3",
- "zendframework/zend-diactoros": "^1.8"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.0-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Http\\Psr7Test\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Tobias Nyholm",
- "email": "tobias.nyholm@gmail.com"
- }
- ],
- "description": "Test suite for PSR7",
- "homepage": "http://php-http.org",
- "keywords": [
- "psr-7",
- "test"
- ],
- "time": "2018-09-02T10:01:55+00:00"
- },
- {
- "name": "phpdocumentor/reflection-common",
- "version": "1.0.1",
- "source": {
- "type": "git",
- "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
- "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",
- "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",
- "shasum": ""
- },
- "require": {
- "php": ">=5.5"
- },
- "require-dev": {
- "phpunit/phpunit": "^4.6"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.0.x-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "phpDocumentor\\Reflection\\": [
- "src"
- ]
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Jaap van Otterdijk",
- "email": "opensource@ijaap.nl"
- }
- ],
- "description": "Common reflection classes used by phpdocumentor to reflect the code structure",
- "homepage": "http://www.phpdoc.org",
- "keywords": [
- "FQSEN",
- "phpDocumentor",
- "phpdoc",
- "reflection",
- "static analysis"
- ],
- "time": "2017-09-11T18:02:19+00:00"
- },
- {
- "name": "phpdocumentor/reflection-docblock",
- "version": "4.3.0",
- "source": {
- "type": "git",
- "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
- "reference": "94fd0001232e47129dd3504189fa1c7225010d08"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/94fd0001232e47129dd3504189fa1c7225010d08",
- "reference": "94fd0001232e47129dd3504189fa1c7225010d08",
- "shasum": ""
- },
- "require": {
- "php": "^7.0",
- "phpdocumentor/reflection-common": "^1.0.0",
- "phpdocumentor/type-resolver": "^0.4.0",
- "webmozart/assert": "^1.0"
- },
- "require-dev": {
- "doctrine/instantiator": "~1.0.5",
- "mockery/mockery": "^1.0",
- "phpunit/phpunit": "^6.4"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "4.x-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "phpDocumentor\\Reflection\\": [
- "src/"
- ]
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Mike van Riel",
- "email": "me@mikevanriel.com"
- }
- ],
- "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
- "time": "2017-11-30T07:14:17+00:00"
- },
- {
- "name": "phpdocumentor/type-resolver",
- "version": "0.4.0",
- "source": {
- "type": "git",
- "url": "https://github.com/phpDocumentor/TypeResolver.git",
- "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/9c977708995954784726e25d0cd1dddf4e65b0f7",
- "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7",
- "shasum": ""
- },
- "require": {
- "php": "^5.5 || ^7.0",
- "phpdocumentor/reflection-common": "^1.0"
- },
- "require-dev": {
- "mockery/mockery": "^0.9.4",
- "phpunit/phpunit": "^5.2||^4.8.24"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.0.x-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "phpDocumentor\\Reflection\\": [
- "src/"
- ]
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Mike van Riel",
- "email": "me@mikevanriel.com"
- }
- ],
- "time": "2017-07-14T14:27:02+00:00"
- },
- {
- "name": "phpspec/prophecy",
- "version": "1.7.6",
- "source": {
- "type": "git",
- "url": "https://github.com/phpspec/prophecy.git",
- "reference": "33a7e3c4fda54e912ff6338c48823bd5c0f0b712"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/phpspec/prophecy/zipball/33a7e3c4fda54e912ff6338c48823bd5c0f0b712",
- "reference": "33a7e3c4fda54e912ff6338c48823bd5c0f0b712",
- "shasum": ""
- },
- "require": {
- "doctrine/instantiator": "^1.0.2",
- "php": "^5.3|^7.0",
- "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0",
- "sebastian/comparator": "^1.1|^2.0|^3.0",
- "sebastian/recursion-context": "^1.0|^2.0|^3.0"
- },
- "require-dev": {
- "phpspec/phpspec": "^2.5|^3.2",
- "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.7.x-dev"
- }
- },
- "autoload": {
- "psr-0": {
- "Prophecy\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Konstantin Kudryashov",
- "email": "ever.zet@gmail.com",
- "homepage": "http://everzet.com"
- },
- {
- "name": "Marcello Duarte",
- "email": "marcello.duarte@gmail.com"
- }
- ],
- "description": "Highly opinionated mocking framework for PHP 5.3+",
- "homepage": "https://github.com/phpspec/prophecy",
- "keywords": [
- "Double",
- "Dummy",
- "fake",
- "mock",
- "spy",
- "stub"
- ],
- "time": "2018-04-18T13:57:24+00:00"
- },
- {
- "name": "phpunit/php-code-coverage",
- "version": "5.3.2",
- "source": {
- "type": "git",
- "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
- "reference": "c89677919c5dd6d3b3852f230a663118762218ac"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/c89677919c5dd6d3b3852f230a663118762218ac",
- "reference": "c89677919c5dd6d3b3852f230a663118762218ac",
- "shasum": ""
- },
- "require": {
- "ext-dom": "*",
- "ext-xmlwriter": "*",
- "php": "^7.0",
- "phpunit/php-file-iterator": "^1.4.2",
- "phpunit/php-text-template": "^1.2.1",
- "phpunit/php-token-stream": "^2.0.1",
- "sebastian/code-unit-reverse-lookup": "^1.0.1",
- "sebastian/environment": "^3.0",
- "sebastian/version": "^2.0.1",
- "theseer/tokenizer": "^1.1"
- },
- "require-dev": {
- "phpunit/phpunit": "^6.0"
- },
- "suggest": {
- "ext-xdebug": "^2.5.5"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "5.3.x-dev"
- }
- },
- "autoload": {
- "classmap": [
- "src/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Sebastian Bergmann",
- "email": "sebastian@phpunit.de",
- "role": "lead"
- }
- ],
- "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
- "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
- "keywords": [
- "coverage",
- "testing",
- "xunit"
- ],
- "time": "2018-04-06T15:36:58+00:00"
- },
- {
- "name": "phpunit/php-file-iterator",
- "version": "1.4.5",
- "source": {
- "type": "git",
- "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
- "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/730b01bc3e867237eaac355e06a36b85dd93a8b4",
- "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.3"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.4.x-dev"
- }
- },
- "autoload": {
- "classmap": [
- "src/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Sebastian Bergmann",
- "email": "sb@sebastian-bergmann.de",
- "role": "lead"
- }
- ],
- "description": "FilterIterator implementation that filters files based on a list of suffixes.",
- "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
- "keywords": [
- "filesystem",
- "iterator"
- ],
- "time": "2017-11-27T13:52:08+00:00"
- },
- {
- "name": "phpunit/php-text-template",
- "version": "1.2.1",
- "source": {
- "type": "git",
- "url": "https://github.com/sebastianbergmann/php-text-template.git",
- "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
- "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.3"
- },
- "type": "library",
- "autoload": {
- "classmap": [
- "src/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Sebastian Bergmann",
- "email": "sebastian@phpunit.de",
- "role": "lead"
- }
- ],
- "description": "Simple template engine.",
- "homepage": "https://github.com/sebastianbergmann/php-text-template/",
- "keywords": [
- "template"
- ],
- "time": "2015-06-21T13:50:34+00:00"
- },
- {
- "name": "phpunit/php-timer",
- "version": "1.0.9",
- "source": {
- "type": "git",
- "url": "https://github.com/sebastianbergmann/php-timer.git",
- "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
- "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
- "shasum": ""
- },
- "require": {
- "php": "^5.3.3 || ^7.0"
- },
- "require-dev": {
- "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.0-dev"
- }
- },
- "autoload": {
- "classmap": [
- "src/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Sebastian Bergmann",
- "email": "sb@sebastian-bergmann.de",
- "role": "lead"
- }
- ],
- "description": "Utility class for timing",
- "homepage": "https://github.com/sebastianbergmann/php-timer/",
- "keywords": [
- "timer"
- ],
- "time": "2017-02-26T11:10:40+00:00"
- },
- {
- "name": "phpunit/php-token-stream",
- "version": "2.0.2",
- "source": {
- "type": "git",
- "url": "https://github.com/sebastianbergmann/php-token-stream.git",
- "reference": "791198a2c6254db10131eecfe8c06670700904db"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/791198a2c6254db10131eecfe8c06670700904db",
- "reference": "791198a2c6254db10131eecfe8c06670700904db",
- "shasum": ""
- },
- "require": {
- "ext-tokenizer": "*",
- "php": "^7.0"
- },
- "require-dev": {
- "phpunit/phpunit": "^6.2.4"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.0-dev"
- }
- },
- "autoload": {
- "classmap": [
- "src/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Sebastian Bergmann",
- "email": "sebastian@phpunit.de"
- }
- ],
- "description": "Wrapper around PHP's tokenizer extension.",
- "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
- "keywords": [
- "tokenizer"
- ],
- "time": "2017-11-27T05:48:46+00:00"
- },
- {
- "name": "phpunit/phpunit",
- "version": "6.5.9",
- "source": {
- "type": "git",
- "url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "093ca5508174cd8ab8efe44fd1dde447adfdec8f"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/093ca5508174cd8ab8efe44fd1dde447adfdec8f",
- "reference": "093ca5508174cd8ab8efe44fd1dde447adfdec8f",
- "shasum": ""
- },
- "require": {
- "ext-dom": "*",
- "ext-json": "*",
- "ext-libxml": "*",
- "ext-mbstring": "*",
- "ext-xml": "*",
- "myclabs/deep-copy": "^1.6.1",
- "phar-io/manifest": "^1.0.1",
- "phar-io/version": "^1.0",
- "php": "^7.0",
- "phpspec/prophecy": "^1.7",
- "phpunit/php-code-coverage": "^5.3",
- "phpunit/php-file-iterator": "^1.4.3",
- "phpunit/php-text-template": "^1.2.1",
- "phpunit/php-timer": "^1.0.9",
- "phpunit/phpunit-mock-objects": "^5.0.5",
- "sebastian/comparator": "^2.1",
- "sebastian/diff": "^2.0",
- "sebastian/environment": "^3.1",
- "sebastian/exporter": "^3.1",
- "sebastian/global-state": "^2.0",
- "sebastian/object-enumerator": "^3.0.3",
- "sebastian/resource-operations": "^1.0",
- "sebastian/version": "^2.0.1"
- },
- "conflict": {
- "phpdocumentor/reflection-docblock": "3.0.2",
- "phpunit/dbunit": "<3.0"
- },
- "require-dev": {
- "ext-pdo": "*"
- },
- "suggest": {
- "ext-xdebug": "*",
- "phpunit/php-invoker": "^1.1"
- },
- "bin": [
- "phpunit"
- ],
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "6.5.x-dev"
- }
- },
- "autoload": {
- "classmap": [
- "src/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Sebastian Bergmann",
- "email": "sebastian@phpunit.de",
- "role": "lead"
- }
- ],
- "description": "The PHP Unit Testing framework.",
- "homepage": "https://phpunit.de/",
- "keywords": [
- "phpunit",
- "testing",
- "xunit"
- ],
- "time": "2018-07-03T06:40:40+00:00"
- },
- {
- "name": "phpunit/phpunit-mock-objects",
- "version": "5.0.8",
- "source": {
- "type": "git",
- "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
- "reference": "6f9a3c8bf34188a2b53ce2ae7a126089c53e0a9f"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/6f9a3c8bf34188a2b53ce2ae7a126089c53e0a9f",
- "reference": "6f9a3c8bf34188a2b53ce2ae7a126089c53e0a9f",
- "shasum": ""
- },
- "require": {
- "doctrine/instantiator": "^1.0.5",
- "php": "^7.0",
- "phpunit/php-text-template": "^1.2.1",
- "sebastian/exporter": "^3.1"
- },
- "conflict": {
- "phpunit/phpunit": "<6.0"
- },
- "require-dev": {
- "phpunit/phpunit": "^6.5"
- },
- "suggest": {
- "ext-soap": "*"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "5.0.x-dev"
- }
- },
- "autoload": {
- "classmap": [
- "src/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Sebastian Bergmann",
- "email": "sebastian@phpunit.de",
- "role": "lead"
- }
- ],
- "description": "Mock Object library for PHPUnit",
- "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
- "keywords": [
- "mock",
- "xunit"
- ],
- "time": "2018-07-13T03:27:23+00:00"
- },
- {
- "name": "sebastian/code-unit-reverse-lookup",
- "version": "1.0.1",
- "source": {
- "type": "git",
- "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
- "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/4419fcdb5eabb9caa61a27c7a1db532a6b55dd18",
- "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18",
- "shasum": ""
- },
- "require": {
- "php": "^5.6 || ^7.0"
- },
- "require-dev": {
- "phpunit/phpunit": "^5.7 || ^6.0"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.0.x-dev"
- }
- },
- "autoload": {
- "classmap": [
- "src/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Sebastian Bergmann",
- "email": "sebastian@phpunit.de"
- }
- ],
- "description": "Looks up which function or method a line of code belongs to",
- "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
- "time": "2017-03-04T06:30:41+00:00"
- },
- {
- "name": "sebastian/comparator",
- "version": "2.1.3",
- "source": {
- "type": "git",
- "url": "https://github.com/sebastianbergmann/comparator.git",
- "reference": "34369daee48eafb2651bea869b4b15d75ccc35f9"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/34369daee48eafb2651bea869b4b15d75ccc35f9",
- "reference": "34369daee48eafb2651bea869b4b15d75ccc35f9",
- "shasum": ""
- },
- "require": {
- "php": "^7.0",
- "sebastian/diff": "^2.0 || ^3.0",
- "sebastian/exporter": "^3.1"
- },
- "require-dev": {
- "phpunit/phpunit": "^6.4"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.1.x-dev"
- }
- },
- "autoload": {
- "classmap": [
- "src/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Jeff Welch",
- "email": "whatthejeff@gmail.com"
- },
- {
- "name": "Volker Dusch",
- "email": "github@wallbash.com"
- },
- {
- "name": "Bernhard Schussek",
- "email": "bschussek@2bepublished.at"
- },
- {
- "name": "Sebastian Bergmann",
- "email": "sebastian@phpunit.de"
- }
- ],
- "description": "Provides the functionality to compare PHP values for equality",
- "homepage": "https://github.com/sebastianbergmann/comparator",
- "keywords": [
- "comparator",
- "compare",
- "equality"
- ],
- "time": "2018-02-01T13:46:46+00:00"
- },
- {
- "name": "sebastian/diff",
- "version": "2.0.1",
- "source": {
- "type": "git",
- "url": "https://github.com/sebastianbergmann/diff.git",
- "reference": "347c1d8b49c5c3ee30c7040ea6fc446790e6bddd"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/347c1d8b49c5c3ee30c7040ea6fc446790e6bddd",
- "reference": "347c1d8b49c5c3ee30c7040ea6fc446790e6bddd",
- "shasum": ""
- },
- "require": {
- "php": "^7.0"
- },
- "require-dev": {
- "phpunit/phpunit": "^6.2"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.0-dev"
- }
- },
- "autoload": {
- "classmap": [
- "src/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Kore Nordmann",
- "email": "mail@kore-nordmann.de"
- },
- {
- "name": "Sebastian Bergmann",
- "email": "sebastian@phpunit.de"
- }
- ],
- "description": "Diff implementation",
- "homepage": "https://github.com/sebastianbergmann/diff",
- "keywords": [
- "diff"
- ],
- "time": "2017-08-03T08:09:46+00:00"
- },
- {
- "name": "sebastian/environment",
- "version": "3.1.0",
- "source": {
- "type": "git",
- "url": "https://github.com/sebastianbergmann/environment.git",
- "reference": "cd0871b3975fb7fc44d11314fd1ee20925fce4f5"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/cd0871b3975fb7fc44d11314fd1ee20925fce4f5",
- "reference": "cd0871b3975fb7fc44d11314fd1ee20925fce4f5",
- "shasum": ""
- },
- "require": {
- "php": "^7.0"
- },
- "require-dev": {
- "phpunit/phpunit": "^6.1"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "3.1.x-dev"
- }
- },
- "autoload": {
- "classmap": [
- "src/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Sebastian Bergmann",
- "email": "sebastian@phpunit.de"
- }
- ],
- "description": "Provides functionality to handle HHVM/PHP environments",
- "homepage": "http://www.github.com/sebastianbergmann/environment",
- "keywords": [
- "Xdebug",
- "environment",
- "hhvm"
- ],
- "time": "2017-07-01T08:51:00+00:00"
- },
- {
- "name": "sebastian/exporter",
- "version": "3.1.0",
- "source": {
- "type": "git",
- "url": "https://github.com/sebastianbergmann/exporter.git",
- "reference": "234199f4528de6d12aaa58b612e98f7d36adb937"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/234199f4528de6d12aaa58b612e98f7d36adb937",
- "reference": "234199f4528de6d12aaa58b612e98f7d36adb937",
- "shasum": ""
- },
- "require": {
- "php": "^7.0",
- "sebastian/recursion-context": "^3.0"
- },
- "require-dev": {
- "ext-mbstring": "*",
- "phpunit/phpunit": "^6.0"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "3.1.x-dev"
- }
- },
- "autoload": {
- "classmap": [
- "src/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Jeff Welch",
- "email": "whatthejeff@gmail.com"
- },
- {
- "name": "Volker Dusch",
- "email": "github@wallbash.com"
- },
- {
- "name": "Bernhard Schussek",
- "email": "bschussek@2bepublished.at"
- },
- {
- "name": "Sebastian Bergmann",
- "email": "sebastian@phpunit.de"
- },
- {
- "name": "Adam Harvey",
- "email": "aharvey@php.net"
- }
- ],
- "description": "Provides the functionality to export PHP variables for visualization",
- "homepage": "http://www.github.com/sebastianbergmann/exporter",
- "keywords": [
- "export",
- "exporter"
- ],
- "time": "2017-04-03T13:19:02+00:00"
- },
- {
- "name": "sebastian/global-state",
- "version": "2.0.0",
- "source": {
- "type": "git",
- "url": "https://github.com/sebastianbergmann/global-state.git",
- "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4",
- "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4",
- "shasum": ""
- },
- "require": {
- "php": "^7.0"
- },
- "require-dev": {
- "phpunit/phpunit": "^6.0"
- },
- "suggest": {
- "ext-uopz": "*"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.0-dev"
- }
- },
- "autoload": {
- "classmap": [
- "src/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Sebastian Bergmann",
- "email": "sebastian@phpunit.de"
- }
- ],
- "description": "Snapshotting of global state",
- "homepage": "http://www.github.com/sebastianbergmann/global-state",
- "keywords": [
- "global state"
- ],
- "time": "2017-04-27T15:39:26+00:00"
- },
- {
- "name": "sebastian/object-enumerator",
- "version": "3.0.3",
- "source": {
- "type": "git",
- "url": "https://github.com/sebastianbergmann/object-enumerator.git",
- "reference": "7cfd9e65d11ffb5af41198476395774d4c8a84c5"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/7cfd9e65d11ffb5af41198476395774d4c8a84c5",
- "reference": "7cfd9e65d11ffb5af41198476395774d4c8a84c5",
- "shasum": ""
- },
- "require": {
- "php": "^7.0",
- "sebastian/object-reflector": "^1.1.1",
- "sebastian/recursion-context": "^3.0"
- },
- "require-dev": {
- "phpunit/phpunit": "^6.0"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "3.0.x-dev"
- }
- },
- "autoload": {
- "classmap": [
- "src/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Sebastian Bergmann",
- "email": "sebastian@phpunit.de"
- }
- ],
- "description": "Traverses array structures and object graphs to enumerate all referenced objects",
- "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
- "time": "2017-08-03T12:35:26+00:00"
- },
- {
- "name": "sebastian/object-reflector",
- "version": "1.1.1",
- "source": {
- "type": "git",
- "url": "https://github.com/sebastianbergmann/object-reflector.git",
- "reference": "773f97c67f28de00d397be301821b06708fca0be"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/773f97c67f28de00d397be301821b06708fca0be",
- "reference": "773f97c67f28de00d397be301821b06708fca0be",
- "shasum": ""
- },
- "require": {
- "php": "^7.0"
- },
- "require-dev": {
- "phpunit/phpunit": "^6.0"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.1-dev"
- }
- },
- "autoload": {
- "classmap": [
- "src/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Sebastian Bergmann",
- "email": "sebastian@phpunit.de"
- }
- ],
- "description": "Allows reflection of object attributes, including inherited and non-public ones",
- "homepage": "https://github.com/sebastianbergmann/object-reflector/",
- "time": "2017-03-29T09:07:27+00:00"
- },
- {
- "name": "sebastian/recursion-context",
- "version": "3.0.0",
- "source": {
- "type": "git",
- "url": "https://github.com/sebastianbergmann/recursion-context.git",
- "reference": "5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8",
- "reference": "5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8",
- "shasum": ""
- },
- "require": {
- "php": "^7.0"
- },
- "require-dev": {
- "phpunit/phpunit": "^6.0"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "3.0.x-dev"
- }
- },
- "autoload": {
- "classmap": [
- "src/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Jeff Welch",
- "email": "whatthejeff@gmail.com"
- },
- {
- "name": "Sebastian Bergmann",
- "email": "sebastian@phpunit.de"
- },
- {
- "name": "Adam Harvey",
- "email": "aharvey@php.net"
- }
- ],
- "description": "Provides functionality to recursively process PHP variables",
- "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
- "time": "2017-03-03T06:23:57+00:00"
- },
- {
- "name": "sebastian/resource-operations",
- "version": "1.0.0",
- "source": {
- "type": "git",
- "url": "https://github.com/sebastianbergmann/resource-operations.git",
- "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
- "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
- "shasum": ""
- },
- "require": {
- "php": ">=5.6.0"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.0.x-dev"
- }
- },
- "autoload": {
- "classmap": [
- "src/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Sebastian Bergmann",
- "email": "sebastian@phpunit.de"
- }
- ],
- "description": "Provides a list of PHP built-in functions that operate on resources",
- "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
- "time": "2015-07-28T20:34:47+00:00"
- },
- {
- "name": "sebastian/version",
- "version": "2.0.1",
- "source": {
- "type": "git",
- "url": "https://github.com/sebastianbergmann/version.git",
- "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019",
- "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019",
- "shasum": ""
- },
- "require": {
- "php": ">=5.6"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.0.x-dev"
- }
- },
- "autoload": {
- "classmap": [
- "src/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Sebastian Bergmann",
- "email": "sebastian@phpunit.de",
- "role": "lead"
- }
- ],
- "description": "Library that helps with managing the version number of Git-hosted PHP projects",
- "homepage": "https://github.com/sebastianbergmann/version",
- "time": "2016-10-03T07:35:21+00:00"
- },
- {
- "name": "squizlabs/php_codesniffer",
- "version": "2.9.1",
- "source": {
- "type": "git",
- "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
- "reference": "dcbed1074f8244661eecddfc2a675430d8d33f62"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/dcbed1074f8244661eecddfc2a675430d8d33f62",
- "reference": "dcbed1074f8244661eecddfc2a675430d8d33f62",
- "shasum": ""
- },
- "require": {
- "ext-simplexml": "*",
- "ext-tokenizer": "*",
- "ext-xmlwriter": "*",
- "php": ">=5.1.2"
- },
- "require-dev": {
- "phpunit/phpunit": "~4.0"
- },
- "bin": [
- "scripts/phpcs",
- "scripts/phpcbf"
- ],
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.x-dev"
- }
- },
- "autoload": {
- "classmap": [
- "CodeSniffer.php",
- "CodeSniffer/CLI.php",
- "CodeSniffer/Exception.php",
- "CodeSniffer/File.php",
- "CodeSniffer/Fixer.php",
- "CodeSniffer/Report.php",
- "CodeSniffer/Reporting.php",
- "CodeSniffer/Sniff.php",
- "CodeSniffer/Tokens.php",
- "CodeSniffer/Reports/",
- "CodeSniffer/Tokenizers/",
- "CodeSniffer/DocGenerators/",
- "CodeSniffer/Standards/AbstractPatternSniff.php",
- "CodeSniffer/Standards/AbstractScopeSniff.php",
- "CodeSniffer/Standards/AbstractVariableSniff.php",
- "CodeSniffer/Standards/IncorrectPatternException.php",
- "CodeSniffer/Standards/Generic/Sniffs/",
- "CodeSniffer/Standards/MySource/Sniffs/",
- "CodeSniffer/Standards/PEAR/Sniffs/",
- "CodeSniffer/Standards/PSR1/Sniffs/",
- "CodeSniffer/Standards/PSR2/Sniffs/",
- "CodeSniffer/Standards/Squiz/Sniffs/",
- "CodeSniffer/Standards/Zend/Sniffs/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Greg Sherwood",
- "role": "lead"
- }
- ],
- "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.",
- "homepage": "http://www.squizlabs.com/php-codesniffer",
- "keywords": [
- "phpcs",
- "standards"
- ],
- "time": "2017-05-22T02:43:20+00:00"
- },
- {
- "name": "theseer/tokenizer",
- "version": "1.1.0",
- "source": {
- "type": "git",
- "url": "https://github.com/theseer/tokenizer.git",
- "reference": "cb2f008f3f05af2893a87208fe6a6c4985483f8b"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/theseer/tokenizer/zipball/cb2f008f3f05af2893a87208fe6a6c4985483f8b",
- "reference": "cb2f008f3f05af2893a87208fe6a6c4985483f8b",
- "shasum": ""
- },
- "require": {
- "ext-dom": "*",
- "ext-tokenizer": "*",
- "ext-xmlwriter": "*",
- "php": "^7.0"
- },
- "type": "library",
- "autoload": {
- "classmap": [
- "src/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Arne Blankerts",
- "email": "arne@blankerts.de",
- "role": "Developer"
- }
- ],
- "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
- "time": "2017-04-07T12:08:54+00:00"
- },
- {
- "name": "webmozart/assert",
- "version": "1.3.0",
- "source": {
- "type": "git",
- "url": "https://github.com/webmozart/assert.git",
- "reference": "0df1908962e7a3071564e857d86874dad1ef204a"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/webmozart/assert/zipball/0df1908962e7a3071564e857d86874dad1ef204a",
- "reference": "0df1908962e7a3071564e857d86874dad1ef204a",
- "shasum": ""
- },
- "require": {
- "php": "^5.3.3 || ^7.0"
- },
- "require-dev": {
- "phpunit/phpunit": "^4.6",
- "sebastian/version": "^1.0.1"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.3-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Webmozart\\Assert\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Bernhard Schussek",
- "email": "bschussek@gmail.com"
- }
- ],
- "description": "Assertions to validate method input/output with nice error messages.",
- "keywords": [
- "assert",
- "check",
- "validate"
- ],
- "time": "2018-01-29T19:49:41+00:00"
- },
- {
- "name": "zendframework/zend-coding-standard",
- "version": "1.0.0",
- "source": {
- "type": "git",
- "url": "https://github.com/zendframework/zend-coding-standard.git",
- "reference": "893316d2904e93f1c74c1384b6d7d57778299cb6"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-coding-standard/zipball/893316d2904e93f1c74c1384b6d7d57778299cb6",
- "reference": "893316d2904e93f1c74c1384b6d7d57778299cb6",
- "shasum": ""
- },
- "require": {
- "squizlabs/php_codesniffer": "^2.7"
- },
- "type": "library",
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "description": "Zend Framework coding standard",
- "keywords": [
- "Coding Standard",
- "zf"
- ],
- "time": "2016-11-09T21:30:43+00:00"
- }
- ],
- "aliases": [],
- "minimum-stability": "stable",
- "stability-flags": {
- "php-http/psr7-integration-tests": 20
- },
- "prefer-stable": false,
- "prefer-lowest": false,
- "platform": {
- "php": "^5.6 || ^7.0"
- },
- "platform-dev": {
- "ext-dom": "*",
- "ext-libxml": "*"
- }
-}
diff --git a/vendor/zendframework/zend-diactoros/mkdocs.yml b/vendor/zendframework/zend-diactoros/mkdocs.yml
deleted file mode 100644
index a08660646c..0000000000
--- a/vendor/zendframework/zend-diactoros/mkdocs.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-docs_dir: doc/book
-site_dir: doc/html
-pages:
- - index.md
- - Overview: overview.md
- - Installation: install.md
- - Usage: usage.md
- - Reference:
- - "Custom Responses": custom-responses.md
- - "Emitting Responses": emitting-responses.md
- - Serialization: serialization.md
- - API: api.md
-site_name: zend-diactoros
-site_description: 'zend-diactoros: PSR-7 HTTP message implementation'
-repo_url: 'https://github.com/zendframework/zend-diactoros'
-copyright: 'Copyright (c) 2016 <a href="http://www.zend.com/">Zend Technologies USA Inc.</a>'
diff --git a/vendor/zendframework/zend-diactoros/src/Exception/DeprecatedMethodException.php b/vendor/zendframework/zend-diactoros/src/Exception/DeprecatedMethodException.php
deleted file mode 100644
index 59a2e41944..0000000000
--- a/vendor/zendframework/zend-diactoros/src/Exception/DeprecatedMethodException.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @see http://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015-2016 Zend Technologies USA Inc. (http://www.zend.com)
- * @license https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
- */
-
-namespace Zend\Diactoros\Exception;
-
-use BadMethodCallException;
-
-/**
- * Exception indicating a deprecated method.
- */
-class DeprecatedMethodException extends BadMethodCallException implements ExceptionInterface
-{
-}
diff --git a/vendor/zendframework/zend-diactoros/src/Exception/ExceptionInterface.php b/vendor/zendframework/zend-diactoros/src/Exception/ExceptionInterface.php
deleted file mode 100644
index 4bb54df808..0000000000
--- a/vendor/zendframework/zend-diactoros/src/Exception/ExceptionInterface.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @see http://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015-2016 Zend Technologies USA Inc. (http://www.zend.com)
- * @license https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
- */
-
-namespace Zend\Diactoros\Exception;
-
-/**
- * Marker interface for package-specific exceptions.
- */
-interface ExceptionInterface
-{
-}
diff --git a/vendor/zendframework/zend-diactoros/src/functions/marshal_method_from_sapi.php b/vendor/zendframework/zend-diactoros/src/functions/marshal_method_from_sapi.php
deleted file mode 100644
index c666e4e0ab..0000000000
--- a/vendor/zendframework/zend-diactoros/src/functions/marshal_method_from_sapi.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * @see https://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2018 Zend Technologies USA Inc. (https://www.zend.com)
- * @license https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
- */
-
-namespace Zend\Diactoros;
-
-/**
- * Retrieve the request method from the SAPI parameters.
- *
- * @param array $server
- * @return string
- */
-function marshalMethodFromSapi(array $server)
-{
- return isset($server['REQUEST_METHOD']) ? $server['REQUEST_METHOD'] : 'GET';
-}
diff --git a/vendor/zendframework/zend-escaper/CHANGELOG.md b/vendor/zendframework/zend-escaper/CHANGELOG.md
deleted file mode 100644
index 23d9043be2..0000000000
--- a/vendor/zendframework/zend-escaper/CHANGELOG.md
+++ /dev/null
@@ -1,73 +0,0 @@
-# Changelog
-
-All notable changes to this project will be documented in this file, in reverse chronological order by release.
-
-## 2.6.1 - 2019-09-05
-
-### Added
-
-- [#32](https://github.com/zendframework/zend-escaper/pull/32) adds support for PHP 7.3.
-
-### Changed
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- Nothing.
-
-## 2.6.0 - 2018-04-25
-
-### Added
-
-- [#28](https://github.com/zendframework/zend-escaper/pull/28) adds support for PHP 7.1 and 7.2.
-
-### Changed
-
-- [#25](https://github.com/zendframework/zend-escaper/pull/25) changes the behavior of the `Escaper` constructor; it now raises an
- exception for non-null, non-string `$encoding` arguments.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- [#28](https://github.com/zendframework/zend-escaper/pull/28) removes support for PHP 5.5.
-
-- [#28](https://github.com/zendframework/zend-escaper/pull/28) removes support for HHVM.
-
-### Fixed
-
-- Nothing.
-
-## 2.5.2 - 2016-06-30
-
-### Added
-
-- [#11](https://github.com/zendframework/zend-escaper/pull/11),
- [#12](https://github.com/zendframework/zend-escaper/pull/12), and
- [#13](https://github.com/zendframework/zend-escaper/pull/13) prepare and
- publish documentation to https://zendframework.github.io/zend-escaper/
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- [#3](https://github.com/zendframework/zend-escaper/pull/3) updates the
- the escaping mechanism to add support for escaping characters outside the Basic
- Multilingual Plane when escaping for JS, CSS, or HTML attributes.
diff --git a/vendor/zendframework/zend-escaper/README.md b/vendor/zendframework/zend-escaper/README.md
deleted file mode 100644
index 9df54f4e6d..0000000000
--- a/vendor/zendframework/zend-escaper/README.md
+++ /dev/null
@@ -1,28 +0,0 @@
-# zend-escaper
-
-[](https://secure.travis-ci.org/zendframework/zend-escaper)
-[](https://coveralls.io/github/zendframework/zend-escaper?branch=master)
-
-The OWASP Top 10 web security risks study lists Cross-Site Scripting (XSS) in
-second place. PHP’s sole functionality against XSS is limited to two functions
-of which one is commonly misapplied. Thus, the zend-escaper component was written.
-It offers developers a way to escape output and defend from XSS and related
-vulnerabilities by introducing contextual escaping based on peer-reviewed rules.
-
-## Installation
-
-Run the following to install this library:
-
-```bash
-$ composer require zendframework/zend-escaper
-```
-
-## Documentation
-
-Browse the documentation online at https://docs.zendframework.com/zend-escaper/
-
-## Support
-
-* [Issues](https://github.com/zendframework/zend-escaper/issues/)
-* [Chat](https://zendframework-slack.herokuapp.com/)
-* [Forum](https://discourse.zendframework.com/)
diff --git a/vendor/zendframework/zend-escaper/src/Exception/ExceptionInterface.php b/vendor/zendframework/zend-escaper/src/Exception/ExceptionInterface.php
deleted file mode 100644
index 7174796a32..0000000000
--- a/vendor/zendframework/zend-escaper/src/Exception/ExceptionInterface.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Escaper\Exception;
-
-interface ExceptionInterface
-{
-}
diff --git a/vendor/zendframework/zend-escaper/src/Exception/InvalidArgumentException.php b/vendor/zendframework/zend-escaper/src/Exception/InvalidArgumentException.php
deleted file mode 100644
index 0ad3f7313d..0000000000
--- a/vendor/zendframework/zend-escaper/src/Exception/InvalidArgumentException.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Escaper\Exception;
-
-/**
- * Invalid argument exception
- */
-class InvalidArgumentException extends \InvalidArgumentException implements
- ExceptionInterface
-{
-}
diff --git a/vendor/zendframework/zend-escaper/src/Exception/RuntimeException.php b/vendor/zendframework/zend-escaper/src/Exception/RuntimeException.php
deleted file mode 100644
index d626123af2..0000000000
--- a/vendor/zendframework/zend-escaper/src/Exception/RuntimeException.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Escaper\Exception;
-
-/**
- * Invalid argument exception
- */
-class RuntimeException extends \RuntimeException implements
- ExceptionInterface
-{
-}
diff --git a/vendor/zendframework/zend-feed/CHANGELOG.md b/vendor/zendframework/zend-feed/CHANGELOG.md
deleted file mode 100644
index ec89110b13..0000000000
--- a/vendor/zendframework/zend-feed/CHANGELOG.md
+++ /dev/null
@@ -1,475 +0,0 @@
-# Changelog
-
-All notable changes to this project will be documented in this file, in reverse chronological order by release.
-
-## 2.12.0 - 2019-03-05
-
-### Added
-
-- [#96](https://github.com/zendframework/zend-feed/pull/96) adds the methods `Zend\Feed\Reader\Extension\Podcast\Entry::getTitle() : string`
- and `Zend\Feed\Writer\Extension\ITunes\Entry::setTitle(string $value)`; these
- provide the ability to read and manipulate `<itunes:title>` tags in feeds.
-
-### Changed
-
-- Nothing.
-
-### Deprecated
-
-- [#101](https://github.com/zendframework/zend-feed/pull/101) deprecates the method `Zend\Feed\Writer\Writer::lcfirst()`; use the PHP
- built-in function instead.
-
-- [#97](https://github.com/zendframework/zend-feed/pull/97) deprecates the classes `Zend\Feed\Reader\AbstractEntry` (use
- `Zend\Feed\Reader\Entry\AbstractEntry` instead), `Zend\Feed\Reader\AbstractFeed` (use `Zend\Feed\Reader\Feed\AbstractFeed` instead), and
- `Zend\Feed\Reader\Collection` (use Zend\Feed\Reader\Collection\Author`, `Zend\Feed\Reader\Collection\Category`, or
- `Zend\Feed\Reader\Collection\Collection` instead, based on context).
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- Nothing.
-
-## 2.11.1 - 2019-03-05
-
-### Added
-
-- Nothing.
-
-### Changed
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- [#99](https://github.com/zendframework/zend-feed/pull/99) provides a fix to `Zend\Feed\Writer\Renderer\Entry\Rss` to ensure that
- relative URIs provided for the feed disable the `isPermalink` flag.
-
-- [#100](https://github.com/zendframework/zend-feed/pull/100) fixes parameter and return value annotations for a number of classes to
- specify the correct types.
-
-## 2.11.0 - 2019-01-29
-
-### Added
-
-- [#94](https://github.com/zendframework/zend-feed/pull/94) adds support for PHP 7.3.
-
-- [#91](https://github.com/zendframework/zend-feed/pull/91) adds explicit requirements for both ext-dom and ext-libxml to the package.
-
-### Changed
-
-- [#93](https://github.com/zendframework/zend-feed/pull/93) `Writer\Feed`, `Writer\Entry` and `Writer\Deleted` all now accept
- `DateTimeImmutable` instances as an arguments to methods that previously only
- accepted `DateTime` or Unix Timestamps, such as `Writer\Feed::setDateModified()`.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- [#94](https://github.com/zendframework/zend-feed/pull/94) removes support for zend-stdlib v2 releases.
-
-### Fixed
-
-- Nothing.
-
-## 2.10.3 - 2018-08-01
-
-### Added
-
-- Nothing.
-
-### Changed
-
-- This release modifies how `Zend\Feed\Pubsubhubbub\AbstractCallback::_detectCallbackUrl()`
- marshals the request URI. In prior releases, we would attempt to inspect the
- `X-Rewrite-Url` and `X-Original-Url` headers, using their values, if present.
- These headers are issued by the ISAPI_Rewrite module for IIS (developed by
- HeliconTech). However, we have no way of guaranteeing that the module is what
- issued the headers, making it an unreliable source for discovering the URI. As
- such, we have removed this feature in this release.
-
- The method is not called internally. If you are calling the method from your
- own extension and need support for ISAPI_Rewrite, you will need to override
- the method as follows:
-
- ```php
- protected function _detectCallbackUrl()
- {
- $callbackUrl = null;
- if (isset($_SERVER['HTTP_X_REWRITE_URL'])) {
- $callbackUrl = $_SERVER['HTTP_X_REWRITE_URL'];
- }
- if (isset($_SERVER['HTTP_X_ORIGINAL_URL'])) {
- $callbackUrl = $_SERVER['HTTP_X_ORIGINAL_URL'];
- }
-
- return $callbackUrl ?: parent::__detectCallbackUrl();
- }
- ```
-
- If you use an approach such as the above, make sure you also instruct your web
- server to strip any incoming headers of the same name so that you can
- guarantee they are issued by the ISAPI_Rewrite module.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- Nothing.
-
-## 2.10.2 - 2018-06-18
-
-### Added
-
-- Nothing.
-
-### Changed
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- [#81](https://github.com/zendframework/zend-feed/pull/81) updates the `Zend\Feed\Reader\Reader` and `Zend\Feed\Writer\Writer` classes to
- conditionally register their respective "GooglePlayPodcast" extensions only if
- their extension managers are aware of it. This is done due to the fact that
- existing `ExtensionManagerInterface` implementations may not register it by
- default as the extension did not exist in releases prior to 2.10.0. By having
- the registration conditional, we prevent an exception from being raised; users
- are not impacted by its absence, as the extension features were not exposed
- previously.
-
- Both `Reader` and `Writer` emit an `E_USER_NOTICE` when the extension is not
- found in the extension manager, indicating that the
- `ExtensionManagerInterface` implementation should be updated to add entries
- for the "GooglePlayPodcast" entry, feed, and/or renderer classes.
-
-## 2.10.1 - 2018-06-05
-
-### Added
-
-- Nothing.
-
-### Changed
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- [#79](https://github.com/zendframework/zend-feed/pull/79) fixes an issue in the `setType()` method of the iTunes feed renderer whereby it was setting
- the DOM content with an uninitialized variable.
-
-## 2.10.0 - 2018-05-24
-
-### Added
-
-- [#78](https://github.com/zendframework/zend-feed/pull/78) adds support for the Google Play Podcasts 1.0 DTD in both the Reader and
- Writer subcomponents. The following new classes provide the support:
-
- - `Zend\Feed\Reader\Extension\GooglePlayPodcast\Entry`
- - `Zend\Feed\Reader\Extension\GooglePlayPodcast\Feed`
- - `Zend\Feed\Writer\Extension\GooglePlayPodcast\Entry`
- - `Zend\Feed\Writer\Extension\GooglePlayPodcast\Feed`
- - `Zend\Feed\Writer\Extension\GooglePlayPodcast\Renderer\Entry`
- - `Zend\Feed\Writer\Extension\GooglePlayPodcast\Renderer\Feed`
-
- The extensions are registered by default with both `Zend\Feed\Reader\Reader`
- and `Zend\Feed\Writer\Writer`.
-
-- [#77](https://github.com/zendframework/zend-feed/pull/77) adds support for `itunes:image` for each of:
- - `Zend\Feed\Reader\Extension\Podcast\Entry`, via `getItunesImage()`; previously only the `Feed` supported it.
- - `Zend\Feed\Writer\Extension\ITunes\Entry`, via `setItunesImage()`; previously only the `Feed` supported it.
- - `Zend\Feed\Writer\Extension\ITunes\Renderer\Entry`; previously on the `Feed` supported it.
-
-- [#75](https://github.com/zendframework/zend-feed/pull/75) adds `Zend\Feed\Writer\Extension\ITunes\Entry::setItunesSeason()`, corresponding to the
- `itunes:season` tag, and allowing setting the season number of the episode the
- entry represents.
-
-- [#75](https://github.com/zendframework/zend-feed/pull/75) adds `Zend\Feed\Writer\Extension\ITunes\Entry::setItunesIsClosedCaptioned()`, corresponding to the
- `itunes:isClosedCaptioned` tag, and allowing setting the status of closed
- captioning support in the episode the entry represents.
-
-- [#75](https://github.com/zendframework/zend-feed/pull/75) adds `Zend\Feed\Writer\Extension\ITunes\Entry::setItunesEpisodeType()`, corresponding to the
- `itunes:episodeType` tag, and allowing setting the type of episode the entry represents
- (one of "full", "trailer", or "bonus", and defaulting to "full").
-
-- [#75](https://github.com/zendframework/zend-feed/pull/75) adds `Zend\Feed\Writer\Extension\ITunes\Entry::setEpisode()`, corresponding to the
- `itunes:episode` tag, and allowing setting the number of the episode the entry represents.
-
-- [#75](https://github.com/zendframework/zend-feed/pull/75) adds `Zend\Feed\Writer\Extension\ITunes\Feed::setItunesComplete()`, corresponding to the
- `itunes:complete` tag. It allows setting a boolean flag, indicating whether or not the
- podcast is complete (will not air new episodes).
-
-- [#75](https://github.com/zendframework/zend-feed/pull/75) adds `Zend\Feed\Writer\Extension\ITunes\Feed::setItunesType()`, corresponding to the
- `itunes:type` tag, and allowing setting the podcast type (one of "serial" or "episodic").
-
-- [#75](https://github.com/zendframework/zend-feed/pull/75) adds `Zend\Feed\Reader\Extension\Podcast\Entry::getEpisodeType()`, corresponding to the
- `itunes:episodeType` tag, and returning the type of episode the entry represents
- (one of "full", "trailer", or "bonus", and defaulting to "full").
-
-- [#75](https://github.com/zendframework/zend-feed/pull/75) adds `Zend\Feed\Reader\Extension\Podcast\Entry::getSeason()`, corresponding to the
- `itunes:season` tag, and returning the season number of the episode the entry represents.
-
-- [#75](https://github.com/zendframework/zend-feed/pull/75) adds `Zend\Feed\Reader\Extension\Podcast\Entry::isClsoedCaptioned()`, corresponding to the
- `itunes:isClosedCaptioned` tag, and returning the status of closed captioning
- in the episode the entry represents.
-
-- [#75](https://github.com/zendframework/zend-feed/pull/75) adds `Zend\Feed\Reader\Extension\Podcast\Entry::getEpisode()`, corresponding to the
- `itunes:episode` tag, and returning the number of the episode the entry represents.
-
-- [#75](https://github.com/zendframework/zend-feed/pull/75) adds `Zend\Feed\Reader\Extension\Podcast\Feed::isComplete()`, corresponding to the
- `itunes:complete` tag. It returns a boolean, indicating whether or not the podcast is
- complete (will not air new episodes).
-
-- [#75](https://github.com/zendframework/zend-feed/pull/75) adds `Zend\Feed\Reader\Extension\Podcast\Feed::getPodcastType()`, corresponding to the
- `itunes:type` tag, and providing the podcast type (one of "serial" or "episodic", defaulting
- to the latter).
-
-### Changed
-
-- [#77](https://github.com/zendframework/zend-feed/pull/77) updates URI validation for `Zend\Feed\Writer\Extension\ITunes\Feed::setItunesImage()` to
- first check that we have received a string value before proceeding.
-
-### Deprecated
-
-- [#75](https://github.com/zendframework/zend-feed/pull/75) deprecates each of:
- - `Zend\Feed\Reader\Extension\Podcast\Entry::getKeywords()`
- - `Zend\Feed\Reader\Extension\Podcast\Feed::getKeywords()`
- - `Zend\Feed\Writer\Extension\ITunes\Entry::setKeywords()`
- - `Zend\Feed\Writer\Extension\ITunes\Feed::setKeywords()`
- as the iTunes Podcast RSS specification no longer supports keywords.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- Nothing.
-
-## 2.9.1 - 2018-05-14
-
-### Added
-
-- Nothing.
-
-### Changed
-
-- [#16](https://github.com/zendframework/zend-feed/pull/16) updates the `Zend\Feed\Pubsubhubbub\AbstractCallback` to no longer use the
- `$GLOBALS['HTTP_RAW_POST_DATA']` value as a fallback when `php://input` is
- empty. The fallback existed because, prior to PHP 5.6, `php://input` could
- only be read once. As we now require PHP 5.6, the fallback is unnecessary,
- and best removed as the globals value is deprecated.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- [#68](https://github.com/zendframework/zend-feed/pull/68) fixes the behavior of `Zend\Feed\Writer\AbstractFeed::setTitle()` and
- `Zend\Feed\Writer\Entry::setTitle()` to accept the string `"0"`.
-
-- [#68](https://github.com/zendframework/zend-feed/pull/68) updates both `Zend\Feed\Writer\AbstractFeed` and `Zend\Feed\Writer\Entry`
- to no longer throw an exception for entry titles which have a string value of `0`.
-
-## 2.9.0 - 2017-12-04
-
-### Added
-
-- [#52](https://github.com/zendframework/zend-feed/pull/52) adds support for PHP
- 7.2
-
-- [#53](https://github.com/zendframework/zend-feed/pull/53) adds a number of
- additional aliases to the `Writer\ExtensionPluginManager` to ensure plugins
- will be pulled as expected.
-
-- [#63](https://github.com/zendframework/zend-feed/pull/63) adds the feed title
- to the attributes incorporated in the `FeedSet` instance, per what was already
- documented.
-
-- [#55](https://github.com/zendframework/zend-feed/pull/55) makes two API
- additions to the `StandaloneExtensionManager` implementations of both the reader
- and writer subcomponents:
-
- - `$manager->add($name, $class)` will add an extension class using the
- provided name.
- - `$manager->remove($name)` will remove an existing extension by the provided
- name.
-
-### Changed
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- [#52](https://github.com/zendframework/zend-feed/pull/52) removes support for
- HHVM.
-
-### Fixed
-
-- [#50](https://github.com/zendframework/zend-feed/pull/50) fixes a few issues
- in the PubSubHubbub `Subscription` model where counting was being performed on
- uncountable data; this ensures the subcomponent will work correctly under PHP
- 7.2.
-
-## 2.8.0 - 2017-04-02
-
-### Added
-
-- [#27](https://github.com/zendframework/zend-feed/pull/27) adds a documentation
- chapter demonstrating wrapping a PSR-7 client to use with `Zend\Feed\Reader`.
-- [#22](https://github.com/zendframework/zend-feed/pull/22) adds missing
- ExtensionManagerInterface on Writer\ExtensionPluginManager.
-- [#32](https://github.com/zendframework/zend-feed/pull/32) adds missing
- ExtensionManagerInterface on Reader\ExtensionPluginManager.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- [#38](https://github.com/zendframework/zend-feed/pull/38) dropped php 5.5
- support
-
-### Fixed
-
-- [#35](https://github.com/zendframework/zend-feed/pull/35) fixed
- "A non-numeric value encountered" in php 7.1
-- [#39](https://github.com/zendframework/zend-feed/pull/39) fixed protocol
- relative link absolutisation
-- [#40](https://github.com/zendframework/zend-feed/pull/40) fixed service
- manager v3 compatibility aliases in extension plugin managers
-
-## 2.7.0 - 2016-02-11
-
-### Added
-
-- [#21](https://github.com/zendframework/zend-feed/pull/21) edits, revises, and
- prepares the documentation for publication at https://zendframework.github.io/zend-feed/
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- [#20](https://github.com/zendframework/zend-feed/pull/20) makes the two
- zend-servicemanager extension manager implementations forwards compatible
- with version 3, and the overall code base forwards compatible with zend-stdlib
- v3.
-
-## 2.6.0 - 2015-11-24
-
-### Added
-
-- [#13](https://github.com/zendframework/zend-feed/pull/13) introduces
- `Zend\Feed\Writer\StandaloneExtensionManager`, an implementation of
- `Zend\Feed\Writer\ExtensionManagerInterface` that has no dependencies.
- `Zend\Feed\Writer\ExtensionManager` now composes this by default, instead of
- `Zend\Feed\Writer\ExtensionPluginManager`, for managing the various feed and
- entry extensions. If you relied on `ExtensionPluginManager` previously, you
- will need to create an instance manually and inject it into the `Writer`
- instance.
-- [#14](https://github.com/zendframework/zend-feed/pull/14) introduces:
- - `Zend\Feed\Reader\Http\HeaderAwareClientInterface`, which extends
- `ClientInterface` and adds an optional argument to the `get()` method,
- `array $headers = []`; this argument allows specifying request headers for
- the client to send. `$headers` should have header names for keys, and the
- values should be arrays of strings/numbers representing the header values
- (if only a single value is necessary, it should be represented as an single
- value array).
- - `Zend\Feed\Reader\Http\HeaderAwareResponseInterface`, which extends
- `ResponseInterface` and adds the method `getHeader($name, $default = null)`.
- Clients may return either a `ResponseInterface` or
- `HeaderAwareResponseInterface` instance.
- - `Zend\Feed\Reader\Http\Response`, which is an implementation of
- `HeaderAwareResponseInterface`. Its constructor accepts the status code,
- body, and, optionally, headers.
- - `Zend\Feed\Reader\Http\Psr7ResponseDecorator`, which is an implementation of
- `HeaderAwareResponseInterface`. Its constructor accepts a PSR-7 response
- instance, and the various methdos then proxy to those methods. This should
- make creating wrappers for PSR-7 HTTP clients trivial.
- - `Zend\Feed\Reader\Http\ZendHttpClientDecorator`, which decorates a
- `Zend\Http\Client` instance, implements `HeaderAwareClientInterface`, and
- returns a `Response` instance seeded from the zend-http response upon
- calling `get()`. The class exposes a `getDecoratedClient()` method to allow
- retrieval of the decorated zend-http client instance.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- [#5](https://github.com/zendframework/zend-feed/pull/5) fixes the enclosure
- length check to allow zero and integer strings.
-- [#2](https://github.com/zendframework/zend-feed/pull/2) ensures that the
- routine for "absolutising" a link in `Reader\FeedSet` always generates a URI
- with a scheme.
-- [#14](https://github.com/zendframework/zend-feed/pull/14) makes the following
- changes to fix behavior around HTTP clients used within
- `Zend\Feed\Reader\Reader`:
- - `setHttpClient()` now ensures that the passed client is either a
- `Zend\Feed\Reader\Http\ClientInterface` or `Zend\Http\Client`, raising an
- `InvalidArgumentException` if neither. If a `Zend\Http\Client` is passed, it
- is passed to the constructor of `Zend\Feed\Reader\Http\ZendHttpClientDecorator`,
- and the decorator instance is used.
- - `getHttpClient()` now *always* returns a `Zend\Feed\Reader\Http\ClientInterface`
- instance. If no instance is currently registered, it lazy loads a
- `ZendHttpClientDecorator` instance.
- - `import()` was updated to consume a `ClientInterface` instance; when caches
- are in play, it checks the client against `HeaderAwareClientInterface` to
- determine if it can check for HTTP caching headers, and, if so, to retrieve
- them.
- - `findFeedLinks()` was updated to consume a `ClientInterface`.
diff --git a/vendor/zendframework/zend-feed/README.md b/vendor/zendframework/zend-feed/README.md
deleted file mode 100644
index 1c4bd38909..0000000000
--- a/vendor/zendframework/zend-feed/README.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# zend-feed
-
-[](https://secure.travis-ci.org/zendframework/zend-feed)
-[](https://coveralls.io/github/zendframework/zend-feed?branch=master)
-
-`Zend\Feed` provides functionality for consuming RSS and Atom feeds. It provides
-a natural syntax for accessing elements of feeds, feed attributes, and entry
-attributes. `Zend\Feed` also has extensive support for modifying feed and entry
-structure with the same natural syntax, and turning the result back into XML.
-
-- File issues at https://github.com/zendframework/zend-feed/issues
-- Documentation is at https://docs.zendframework.com/zend-feed/
diff --git a/vendor/zendframework/zend-feed/composer.json b/vendor/zendframework/zend-feed/composer.json
deleted file mode 100644
index aa16a63fa6..0000000000
--- a/vendor/zendframework/zend-feed/composer.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
- "name": "zendframework/zend-feed",
- "description": "provides functionality for consuming RSS and Atom feeds",
- "license": "BSD-3-Clause",
- "keywords": [
- "zf",
- "zendframework",
- "feed"
- ],
- "support": {
- "docs": "https://docs.zendframework.com/zend-feed/",
- "issues": "https://github.com/zendframework/zend-feed/issues",
- "source": "https://github.com/zendframework/zend-feed",
- "rss": "https://github.com/zendframework/zend-feed/releases.atom",
- "slack": "https://zendframework-slack.herokuapp.com",
- "forum": "https://discourse.zendframework.com/c/questions/components"
- },
- "require": {
- "php": "^5.6 || ^7.0",
- "ext-dom": "*",
- "ext-libxml": "*",
- "zendframework/zend-escaper": "^2.5.2",
- "zendframework/zend-stdlib": "^3.2.1"
- },
- "require-dev": {
- "phpunit/phpunit": "^5.7.23 || ^6.4.3",
- "psr/http-message": "^1.0.1",
- "zendframework/zend-cache": "^2.7.2",
- "zendframework/zend-coding-standard": "~1.0.0",
- "zendframework/zend-db": "^2.8.2",
- "zendframework/zend-http": "^2.7",
- "zendframework/zend-servicemanager": "^2.7.8 || ^3.3",
- "zendframework/zend-validator": "^2.10.1"
- },
- "suggest": {
- "psr/http-message": "PSR-7 ^1.0.1, if you wish to use Zend\\Feed\\Reader\\Http\\Psr7ResponseDecorator",
- "zendframework/zend-cache": "Zend\\Cache component, for optionally caching feeds between requests",
- "zendframework/zend-db": "Zend\\Db component, for use with PubSubHubbub",
- "zendframework/zend-http": "Zend\\Http for PubSubHubbub, and optionally for use with Zend\\Feed\\Reader",
- "zendframework/zend-servicemanager": "Zend\\ServiceManager component, for easily extending ExtensionManager implementations",
- "zendframework/zend-validator": "Zend\\Validator component, for validating email addresses used in Atom feeds and entries when using the Writer subcomponent"
- },
- "autoload": {
- "psr-4": {
- "Zend\\Feed\\": "src/"
- }
- },
- "autoload-dev": {
- "psr-4": {
- "ZendTest\\Feed\\": "test/"
- }
- },
- "config": {
- "sort-packages": true
- },
- "extra": {
- "branch-alias": {
- "dev-master": "2.12.x-dev",
- "dev-develop": "2.13.x-dev"
- }
- },
- "scripts": {
- "check": [
- "@cs-check",
- "@test"
- ],
- "cs-check": "phpcs",
- "cs-fix": "phpcbf",
- "test": "phpunit --colors=always",
- "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
- }
-}
diff --git a/vendor/zendframework/zend-feed/src/Exception/BadMethodCallException.php b/vendor/zendframework/zend-feed/src/Exception/BadMethodCallException.php
deleted file mode 100644
index 3e994f2eb2..0000000000
--- a/vendor/zendframework/zend-feed/src/Exception/BadMethodCallException.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Exception;
-
-class BadMethodCallException extends \BadMethodCallException implements ExceptionInterface
-{
-}
diff --git a/vendor/zendframework/zend-feed/src/Exception/ExceptionInterface.php b/vendor/zendframework/zend-feed/src/Exception/ExceptionInterface.php
deleted file mode 100644
index 0f752962f1..0000000000
--- a/vendor/zendframework/zend-feed/src/Exception/ExceptionInterface.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Exception;
-
-interface ExceptionInterface
-{
-}
diff --git a/vendor/zendframework/zend-feed/src/Exception/InvalidArgumentException.php b/vendor/zendframework/zend-feed/src/Exception/InvalidArgumentException.php
deleted file mode 100644
index 29b64828ac..0000000000
--- a/vendor/zendframework/zend-feed/src/Exception/InvalidArgumentException.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Exception;
-
-class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
-{
-}
diff --git a/vendor/zendframework/zend-feed/src/Exception/RuntimeException.php b/vendor/zendframework/zend-feed/src/Exception/RuntimeException.php
deleted file mode 100644
index 43167a1e74..0000000000
--- a/vendor/zendframework/zend-feed/src/Exception/RuntimeException.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Exception;
-
-class RuntimeException extends \RuntimeException implements ExceptionInterface
-{
-}
diff --git a/vendor/zendframework/zend-feed/src/PubSubHubbub/Exception/ExceptionInterface.php b/vendor/zendframework/zend-feed/src/PubSubHubbub/Exception/ExceptionInterface.php
deleted file mode 100644
index f32bc1c3ee..0000000000
--- a/vendor/zendframework/zend-feed/src/PubSubHubbub/Exception/ExceptionInterface.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\PubSubHubbub\Exception;
-
-use Zend\Feed\Exception\ExceptionInterface as Exception;
-
-interface ExceptionInterface extends Exception
-{
-}
diff --git a/vendor/zendframework/zend-feed/src/PubSubHubbub/Exception/InvalidArgumentException.php b/vendor/zendframework/zend-feed/src/PubSubHubbub/Exception/InvalidArgumentException.php
deleted file mode 100644
index cad1e01bdb..0000000000
--- a/vendor/zendframework/zend-feed/src/PubSubHubbub/Exception/InvalidArgumentException.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\PubSubHubbub\Exception;
-
-use Zend\Feed\Exception;
-
-class InvalidArgumentException extends Exception\InvalidArgumentException implements ExceptionInterface
-{
-}
diff --git a/vendor/zendframework/zend-feed/src/PubSubHubbub/Exception/RuntimeException.php b/vendor/zendframework/zend-feed/src/PubSubHubbub/Exception/RuntimeException.php
deleted file mode 100644
index cc954a519b..0000000000
--- a/vendor/zendframework/zend-feed/src/PubSubHubbub/Exception/RuntimeException.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\PubSubHubbub\Exception;
-
-use Zend\Feed\Exception;
-
-class RuntimeException extends Exception\RuntimeException implements ExceptionInterface
-{
-}
diff --git a/vendor/zendframework/zend-feed/src/PubSubHubbub/Model/AbstractModel.php b/vendor/zendframework/zend-feed/src/PubSubHubbub/Model/AbstractModel.php
deleted file mode 100644
index 3ebd07f5b8..0000000000
--- a/vendor/zendframework/zend-feed/src/PubSubHubbub/Model/AbstractModel.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\PubSubHubbub\Model;
-
-use Zend\Db\TableGateway\TableGateway;
-use Zend\Db\TableGateway\TableGatewayInterface;
-
-class AbstractModel
-{
- /**
- * Zend\Db\TableGateway\TableGatewayInterface instance to host database methods
- *
- * @var TableGatewayInterface
- */
- protected $db = null;
-
- /**
- * Constructor
- *
- * @param null|TableGatewayInterface $tableGateway
- */
- public function __construct(TableGatewayInterface $tableGateway = null)
- {
- if ($tableGateway === null) {
- $parts = explode('\\', get_class($this));
- $table = strtolower(array_pop($parts));
- $this->db = new TableGateway($table, null);
- } else {
- $this->db = $tableGateway;
- }
- }
-}
diff --git a/vendor/zendframework/zend-feed/src/PubSubHubbub/Version.php b/vendor/zendframework/zend-feed/src/PubSubHubbub/Version.php
deleted file mode 100644
index 9ac7fb4bdb..0000000000
--- a/vendor/zendframework/zend-feed/src/PubSubHubbub/Version.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\PubSubHubbub;
-
-abstract class Version
-{
- const VERSION = '2';
-}
diff --git a/vendor/zendframework/zend-feed/src/Reader/Collection.php b/vendor/zendframework/zend-feed/src/Reader/Collection.php
deleted file mode 100644
index b6ee93a871..0000000000
--- a/vendor/zendframework/zend-feed/src/Reader/Collection.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2019 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Reader;
-
-use ArrayObject;
-
-/**
- * @deprecated This class is deprecated. Use the concrete collection classes
- * \Zend\Feed\Reader\Collection\Author and \Zend\Feed\Reader\Collection\Category
- * or the generic class \Zend\Feed\Reader\Collection\Collection instead.
- */
-class Collection extends ArrayObject
-{
-}
diff --git a/vendor/zendframework/zend-feed/src/Reader/Collection/Collection.php b/vendor/zendframework/zend-feed/src/Reader/Collection/Collection.php
deleted file mode 100644
index cf791c2e58..0000000000
--- a/vendor/zendframework/zend-feed/src/Reader/Collection/Collection.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Reader\Collection;
-
-use ArrayObject;
-
-class Collection extends ArrayObject
-{
-}
diff --git a/vendor/zendframework/zend-feed/src/Reader/Exception/BadMethodCallException.php b/vendor/zendframework/zend-feed/src/Reader/Exception/BadMethodCallException.php
deleted file mode 100644
index 008c57ecce..0000000000
--- a/vendor/zendframework/zend-feed/src/Reader/Exception/BadMethodCallException.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Reader\Exception;
-
-use Zend\Feed\Exception;
-
-class BadMethodCallException extends Exception\BadMethodCallException implements ExceptionInterface
-{
-}
diff --git a/vendor/zendframework/zend-feed/src/Reader/Exception/ExceptionInterface.php b/vendor/zendframework/zend-feed/src/Reader/Exception/ExceptionInterface.php
deleted file mode 100644
index e5e664aff6..0000000000
--- a/vendor/zendframework/zend-feed/src/Reader/Exception/ExceptionInterface.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Reader\Exception;
-
-use Zend\Feed\Exception\ExceptionInterface as Exception;
-
-interface ExceptionInterface extends Exception
-{
-}
diff --git a/vendor/zendframework/zend-feed/src/Reader/Exception/InvalidArgumentException.php b/vendor/zendframework/zend-feed/src/Reader/Exception/InvalidArgumentException.php
deleted file mode 100644
index 646b767b93..0000000000
--- a/vendor/zendframework/zend-feed/src/Reader/Exception/InvalidArgumentException.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Reader\Exception;
-
-use Zend\Feed\Exception;
-
-class InvalidArgumentException extends Exception\InvalidArgumentException implements ExceptionInterface
-{
-}
diff --git a/vendor/zendframework/zend-feed/src/Reader/Exception/InvalidHttpClientException.php b/vendor/zendframework/zend-feed/src/Reader/Exception/InvalidHttpClientException.php
deleted file mode 100644
index c5d662981e..0000000000
--- a/vendor/zendframework/zend-feed/src/Reader/Exception/InvalidHttpClientException.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Reader\Exception;
-
-use Zend\Feed\Exception;
-
-class InvalidHttpClientException extends Exception\InvalidArgumentException implements ExceptionInterface
-{
-}
diff --git a/vendor/zendframework/zend-feed/src/Reader/Exception/RuntimeException.php b/vendor/zendframework/zend-feed/src/Reader/Exception/RuntimeException.php
deleted file mode 100644
index d876e7f00e..0000000000
--- a/vendor/zendframework/zend-feed/src/Reader/Exception/RuntimeException.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Reader\Exception;
-
-use Zend\Feed\Exception;
-
-class RuntimeException extends Exception\RuntimeException implements ExceptionInterface
-{
-}
diff --git a/vendor/zendframework/zend-feed/src/Reader/Http/ClientInterface.php b/vendor/zendframework/zend-feed/src/Reader/Http/ClientInterface.php
deleted file mode 100644
index 1387981859..0000000000
--- a/vendor/zendframework/zend-feed/src/Reader/Http/ClientInterface.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Reader\Http;
-
-interface ClientInterface
-{
- /**
- * Make a GET request to a given URI
- *
- * @param string $uri
- * @return ResponseInterface
- */
- public function get($uri);
-}
diff --git a/vendor/zendframework/zend-feed/src/Reader/Http/ResponseInterface.php b/vendor/zendframework/zend-feed/src/Reader/Http/ResponseInterface.php
deleted file mode 100644
index 96b422e16d..0000000000
--- a/vendor/zendframework/zend-feed/src/Reader/Http/ResponseInterface.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Reader\Http;
-
-interface ResponseInterface
-{
- /**
- * Retrieve the response body
- *
- * @return string
- */
- public function getBody();
-
- /**
- * Retrieve the HTTP response status code
- *
- * @return int
- */
- public function getStatusCode();
-}
diff --git a/vendor/zendframework/zend-feed/src/Writer/Exception/BadMethodCallException.php b/vendor/zendframework/zend-feed/src/Writer/Exception/BadMethodCallException.php
deleted file mode 100644
index b2ea2bef00..0000000000
--- a/vendor/zendframework/zend-feed/src/Writer/Exception/BadMethodCallException.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Writer\Exception;
-
-use Zend\Feed\Exception;
-
-/**
- * Feed exceptions
- *
- * Class to represent exceptions that occur during Feed operations.
- */
-class BadMethodCallException extends Exception\BadMethodCallException implements ExceptionInterface
-{
-}
diff --git a/vendor/zendframework/zend-feed/src/Writer/Exception/ExceptionInterface.php b/vendor/zendframework/zend-feed/src/Writer/Exception/ExceptionInterface.php
deleted file mode 100644
index ee8bdaf62b..0000000000
--- a/vendor/zendframework/zend-feed/src/Writer/Exception/ExceptionInterface.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Writer\Exception;
-
-/**
- * Feed exceptions
- *
- * Interface to represent exceptions that occur during Feed operations.
- */
-interface ExceptionInterface
-{
-}
diff --git a/vendor/zendframework/zend-feed/src/Writer/Exception/InvalidArgumentException.php b/vendor/zendframework/zend-feed/src/Writer/Exception/InvalidArgumentException.php
deleted file mode 100644
index d8c4a8b82c..0000000000
--- a/vendor/zendframework/zend-feed/src/Writer/Exception/InvalidArgumentException.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Writer\Exception;
-
-use Zend\Feed\Exception;
-
-/**
- * Feed exceptions
- *
- * Class to represent exceptions that occur during Feed operations.
- */
-class InvalidArgumentException extends Exception\InvalidArgumentException implements ExceptionInterface
-{
-}
diff --git a/vendor/zendframework/zend-feed/src/Writer/Exception/RuntimeException.php b/vendor/zendframework/zend-feed/src/Writer/Exception/RuntimeException.php
deleted file mode 100644
index ae8ee361f7..0000000000
--- a/vendor/zendframework/zend-feed/src/Writer/Exception/RuntimeException.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Writer\Exception;
-
-use Zend\Feed\Exception;
-
-class RuntimeException extends Exception\RuntimeException implements ExceptionInterface
-{
-}
diff --git a/vendor/zendframework/zend-feed/src/Writer/Source.php b/vendor/zendframework/zend-feed/src/Writer/Source.php
deleted file mode 100644
index 23affa7a6f..0000000000
--- a/vendor/zendframework/zend-feed/src/Writer/Source.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Writer;
-
-/**
-*/
-class Source extends AbstractFeed
-{
-}
diff --git a/vendor/zendframework/zend-feed/src/Writer/Version.php b/vendor/zendframework/zend-feed/src/Writer/Version.php
deleted file mode 100644
index 08351ca3f1..0000000000
--- a/vendor/zendframework/zend-feed/src/Writer/Version.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Writer;
-
-abstract class Version
-{
- const VERSION = '2';
-}
diff --git a/vendor/zendframework/zend-stdlib/CHANGELOG.md b/vendor/zendframework/zend-stdlib/CHANGELOG.md
deleted file mode 100644
index 26c5e792a6..0000000000
--- a/vendor/zendframework/zend-stdlib/CHANGELOG.md
+++ /dev/null
@@ -1,385 +0,0 @@
-# Changelog
-
-All notable changes to this project will be documented in this file, in reverse chronological order by release.
-
-## 3.2.1 - 2018-08-28
-
-### Added
-
-- Nothing.
-
-### Changed
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- [#92](https://github.com/zendframework/zend-stdlib/pull/92) fixes serialization of `SplPriorityQueue` by ensuring its `$serial`
- property is also serialized.
-
-- [#91](https://github.com/zendframework/zend-stdlib/pull/91) fixes behavior in the `ArrayObject` implementation that was not
- compatible with PHP 7.3.
-
-## 3.2.0 - 2018-04-30
-
-### Added
-
-- [#87](https://github.com/zendframework/zend-stdlib/pull/87) adds support for PHP 7.2.
-
-### Changed
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- [#87](https://github.com/zendframework/zend-stdlib/pull/87) removes support for HHVM.
-
-### Fixed
-
-- Nothing.
-
-## 3.1.1 - 2018-04-12
-
-### Added
-
-- Nothing.
-
-### Changed
-
-- [#67](https://github.com/zendframework/zend-stdlib/pull/67) changes the typehint of the `$content` property
- of the `Message` class to indicate it is a string. All known implementations
- already assumed this.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- [#60](https://github.com/zendframework/zend-stdlib/pull/60) fixes an issue whereby calling `remove()` would
- incorrectly re-calculate the maximum priority stored in the queue.
-
-- [#60](https://github.com/zendframework/zend-stdlib/pull/60) fixes an infinite loop condition that can occur when
- inserting an item at 0 priority.
-
-## 3.1.0 - 2016-09-13
-
-### Added
-
-- [#63](https://github.com/zendframework/zend-stdlib/pull/63) adds a new
- `Zend\Stdlib\ConsoleHelper` class, providing minimal support for writing
- output to `STDOUT` and `STDERR`, with optional colorization, when the console
- supports that feature.
-
-### Deprecated
-
-- [#38](https://github.com/zendframework/zend-stdlib/pull/38) deprecates
- `Zend\Stdlib\JsonSerializable`, as all supported version of PHP now support
- it.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- Nothing.
-
-## 3.0.1 - 2016-04-12
-
-### Added
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- [#59](https://github.com/zendframework/zend-stdlib/pull/59) fixes a notice
- when defining the `Zend\Json\Json::GLOB_BRACE` constant on systems using
- non-gcc glob implementations.
-
-## 3.0.0 - 2016-02-03
-
-### Added
-
-- [#51](https://github.com/zendframework/zend-stdlib/pull/51) adds PHP 7 as a
- supported PHP version.
-- [#51](https://github.com/zendframework/zend-stdlib/pull/51) adds a migration
- document from v2 to v3. Hint: if you use hydrators, you need to be using
- zend-hydrator instead!
-- [#51](https://github.com/zendframework/zend-stdlib/pull/51) adds automated
- documentation builds to gh-pages.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- [#33](https://github.com/zendframework/zend-stdlib/pull/33) - removed
- deprecated classes
- - *All Hydrator classes* see #22.
- - `Zend\Stdlib\CallbackHandler` see #35
-- [#37](https://github.com/zendframework/zend-stdlib/pull/37) - removed
- deprecated classes and polyfills:
- - `Zend\Stdlib\DateTime`; this had been deprecated since 2.5, and only
- existed as a polyfill for the `createFromISO8601()` support, now standard
- in all PHP versions we support.
- - `Zend\Stdlib\Exception\InvalidCallbackException`, which was unused since #33.
- - `Zend\Stdlib\Guard\GuardUtils`, which duplicated `Zend\Stdlib\Guard\AllGuardsTrait`
- to allow usage with pre-PHP 5.4 versions.
- - `src/compatibility/autoload.php`, which has been dprecated since 2.5.
-- [#37](https://github.com/zendframework/zend-stdlib/pull/37) - removed
- unneeded dependencies:
- - zend-config (used only in testing ArrayUtils, and the test was redundant)
- - zend-serializer (no longer used)
-- [#51](https://github.com/zendframework/zend-stdlib/pull/51) removes the
- documentation for hydrators, as those are part of the zend-hydrator
- component.
-
-### Fixed
-
-- Nothing.
-
-## 2.7.4 - 2015-10-15
-
-### Added
-
-- Nothing.
-
-### Deprecated
-
-- [#35](https://github.com/zendframework/zend-stdlib/pull/35) deprecates
- `Zend\Stdlib\CallbackHandler`, as the one component that used it,
- zend-eventmanager, will no longer depend on it starting in v3.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- Nothing.
-
-## 2.7.3 - 2015-09-24
-
-### Added
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- [#27](https://github.com/zendframework/zend-stdlib/pull/27) fixes a race
- condition in the `FastPriorityQueue::remove()` logic that occurs when removing
- items iteratively from the same priority of a queue.
-
-## 2.7.2 - 2015-09-23
-
-### Added
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- [#26](https://github.com/zendframework/zend-stdlib/pull/26) fixes a subtle
- inheritance issue with deprecation in the hydrators, and updates the
- `HydratorInterface` to also extend the zend-hydrator `HydratorInterface` to
- ensure LSP is preserved.
-
-## 2.7.1 - 2015-09-22
-
-### Added
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- [#24](https://github.com/zendframework/zend-stdlib/pull/24) fixes an import in
- `FastPriorityQueue` to alias `SplPriorityQueue` in order to disambiguate with
- the local override present in the component.
-
-## 2.7.0 - 2015-09-22
-
-### Added
-
-- [#19](https://github.com/zendframework/zend-stdlib/pull/19) adds a new
- `FastPriorityQueue` implementation. It follows the same signature as
- `SplPriorityQueue`, but uses a performance-optimized algorithm:
-
- - inserts are 2x faster than `SplPriorityQueue` and 3x faster than the
- `Zend\Stdlib\PriorityQueue` implementation.
- - extracts are 4x faster than `SplPriorityQueue` and 4-5x faster than the
- `Zend\Stdlib\PriorityQueue` implementation.
-
- The intention is to use this as a drop-in replacement in the
- `zend-eventmanager` component to provide performance benefits.
-
-### Deprecated
-
-- [#20](https://github.com/zendframework/zend-stdlib/pull/20) deprecates *all
- hydrator* classes, in favor of the new [zend-hydrator](https://github.com/zendframework/zend-hydrator)
- component. All classes were updated to extend their zend-hydrator equivalents,
- and marked as `@deprecated`, indicating the equivalent class from the other
- repository.
-
- Users *should* immediately start changing their code to use the zend-hydrator
- equivalents; in most cases, this can be as easy as removing the `Stdlib`
- namespace from import statements or hydrator configuration. Hydrators will be
- removed entirely from zend-stdlib in v3.0, and all future updates to hydrators
- will occur in the zend-hydrator library.
-
- Changes with backwards compatibility implications:
-
- - Users implementing `Zend\Stdlib\Hydrator\HydratorAwareInterface` will need to
- update their `setHydrator()` implementation to typehint on
- `Zend\Hydrator\HydratorInterface`. This can be done by changing the import
- statement for that interface as follows:
-
- ```php
- // Replace this:
- use Zend\Stdlib\Hydrator\HydratorInterface;
- // with this:
- use Zend\Hydrator\HydratorInterface;
- ```
-
- If you are not using imports, change the typehint within the signature itself:
-
- ```php
- // Replace this:
- public function setHydrator(\Zend\Stdlib\Hydrator\HydratorInterface $hydrator)
- // with this:
- public function setHydrator(\Zend\Hydrator\HydratorInterface $hydrator)
- ```
-
- If you are using `Zend\Stdlib\Hydrator\HydratorAwareTrait`, no changes are
- necessary, unless you override that method.
-
- - If you were catching hydrator-generated exceptions, these were previously in
- the `Zend\Stdlib\Exception` namespace. You will need to update your code to
- catch exceptions in the `Zend\Hydrator\Exception` namespace.
-
- - Users who *do* migrate to zend-hydrator may end up in a situation where
- their code will not work with existing libraries that are still type-hinting
- on the zend-stdlib interfaces. We will be attempting to address that ASAP,
- but the deprecation within zend-stdlib is necessary as a first step.
-
- In the meantime, you can write hydrators targeting zend-stdlib still in
- order to guarantee compatibility.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- Nothing.
-
-## 2.6.0 - 2015-07-21
-
-### Added
-
-- [#13](https://github.com/zendframework/zend-stdlib/pull/13) adds
- `Zend\Stdlib\Hydrator\Iterator`, which provides mechanisms for hydrating
- objects when iterating a traversable. This allows creating generic collection
- resultsets; the original idea was pulled from
- [PhlyMongo](https://github.com/phly/PhlyMongo), where it was used to hydrate
- collections retrieved from MongoDB.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- Nothing.
-
-## 2.5.2 - 2015-07-21
-
-### Added
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- [#9](https://github.com/zendframework/zend-stdlib/pull/9) fixes an issue with
- count incrementation during insert in PriorityList, ensuring that incrementation only
- occurs when the item inserted was not previously present in the list.
-
-## 2.4.4 - 2015-07-21
-
-### Added
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- [#9](https://github.com/zendframework/zend-stdlib/pull/9) fixes an issue with
- count incrementation during insert in PriorityList, ensuring that incrementation only
- occurs when the item inserted was not previously present in the list.
diff --git a/vendor/zendframework/zend-stdlib/README.md b/vendor/zendframework/zend-stdlib/README.md
deleted file mode 100644
index 8d9ff96cc7..0000000000
--- a/vendor/zendframework/zend-stdlib/README.md
+++ /dev/null
@@ -1,29 +0,0 @@
-# zend-stdlib
-
-[](https://secure.travis-ci.org/zendframework/zend-stdlib)
-[](https://coveralls.io/github/zendframework/zend-stdlib?branch=master)
-
-`Zend\Stdlib` is a set of components that implements general purpose utility
-class for different scopes like:
-
-- array utilities functions;
-- general messaging systems;
-- string wrappers;
-- etc.
-
----
-
-- File issues at https://github.com/zendframework/zend-stdlib/issues
-- Documentation is at https://docs.zendframework.com/zend-stdlib/
-
-## Benchmarks
-
-We provide scripts for benchmarking zend-stdlib using the
-[PHPBench](https://github.com/phpbench/phpbench) framework; these can be
-found in the `benchmark/` directory.
-
-To execute the benchmarks you can run the following command:
-
-```bash
-$ vendor/bin/phpbench run --report=aggregate
-```
diff --git a/vendor/zendframework/zend-stdlib/composer.json b/vendor/zendframework/zend-stdlib/composer.json
deleted file mode 100644
index 8c9900963c..0000000000
--- a/vendor/zendframework/zend-stdlib/composer.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
- "name": "zendframework/zend-stdlib",
- "description": "SPL extensions, array utilities, error handlers, and more",
- "license": "BSD-3-Clause",
- "keywords": [
- "zf",
- "zendframework",
- "stdlib"
- ],
- "support": {
- "docs": "https://docs.zendframework.com/zend-stdlib/",
- "issues": "https://github.com/zendframework/zend-stdlib/issues",
- "source": "https://github.com/zendframework/zend-stdlib",
- "rss": "https://github.com/zendframework/zend-stdlib/releases.atom",
- "slack": "https://zendframework-slack.herokuapp.com",
- "forum": "https://discourse.zendframework.com/c/questions/components"
- },
- "require": {
- "php": "^5.6 || ^7.0"
- },
- "require-dev": {
- "phpbench/phpbench": "^0.13",
- "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2",
- "zendframework/zend-coding-standard": "~1.0.0"
- },
- "autoload": {
- "psr-4": {
- "Zend\\Stdlib\\": "src/"
- }
- },
- "autoload-dev": {
- "psr-4": {
- "ZendTest\\Stdlib\\": "test/",
- "ZendBench\\Stdlib\\": "benchmark/"
- }
- },
- "config": {
- "sort-packages": true
- },
- "extra": {
- "branch-alias": {
- "dev-master": "3.2.x-dev",
- "dev-develop": "3.3.x-dev"
- }
- },
- "scripts": {
- "check": [
- "@cs-check",
- "@test"
- ],
- "cs-check": "phpcs",
- "cs-fix": "phpcbf",
- "test": "phpunit --colors=always",
- "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
- }
-}
diff --git a/vendor/zendframework/zend-stdlib/src/ArrayUtils/MergeRemoveKey.php b/vendor/zendframework/zend-stdlib/src/ArrayUtils/MergeRemoveKey.php
deleted file mode 100644
index 7c4d097d92..0000000000
--- a/vendor/zendframework/zend-stdlib/src/ArrayUtils/MergeRemoveKey.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\ArrayUtils;
-
-final class MergeRemoveKey
-{
-}
diff --git a/vendor/zendframework/zend-stdlib/src/ArrayUtils/MergeReplaceKeyInterface.php b/vendor/zendframework/zend-stdlib/src/ArrayUtils/MergeReplaceKeyInterface.php
deleted file mode 100644
index 725cf11bc7..0000000000
--- a/vendor/zendframework/zend-stdlib/src/ArrayUtils/MergeReplaceKeyInterface.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\ArrayUtils;
-
-/**
- * Marker interface: can be used to replace keys completely in {@see ArrayUtils::merge()} operations
- */
-interface MergeReplaceKeyInterface
-{
- /**
- * @return mixed
- */
- public function getData();
-}
diff --git a/vendor/zendframework/zend-stdlib/src/DispatchableInterface.php b/vendor/zendframework/zend-stdlib/src/DispatchableInterface.php
deleted file mode 100644
index 4f74d1e8af..0000000000
--- a/vendor/zendframework/zend-stdlib/src/DispatchableInterface.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib;
-
-interface DispatchableInterface
-{
- /**
- * Dispatch a request
- *
- * @param RequestInterface $request
- * @param null|ResponseInterface $response
- * @return Response|mixed
- */
- public function dispatch(RequestInterface $request, ResponseInterface $response = null);
-}
diff --git a/vendor/zendframework/zend-stdlib/src/Exception/BadMethodCallException.php b/vendor/zendframework/zend-stdlib/src/Exception/BadMethodCallException.php
deleted file mode 100644
index 0254e45bff..0000000000
--- a/vendor/zendframework/zend-stdlib/src/Exception/BadMethodCallException.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Exception;
-
-/**
- * Bad method call exception
- */
-class BadMethodCallException extends \BadMethodCallException implements ExceptionInterface
-{
-}
diff --git a/vendor/zendframework/zend-stdlib/src/Exception/DomainException.php b/vendor/zendframework/zend-stdlib/src/Exception/DomainException.php
deleted file mode 100644
index 6d2ac714a1..0000000000
--- a/vendor/zendframework/zend-stdlib/src/Exception/DomainException.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Exception;
-
-/**
- * Domain exception
- */
-class DomainException extends \DomainException implements ExceptionInterface
-{
-}
diff --git a/vendor/zendframework/zend-stdlib/src/Exception/ExceptionInterface.php b/vendor/zendframework/zend-stdlib/src/Exception/ExceptionInterface.php
deleted file mode 100644
index 60b795f8dd..0000000000
--- a/vendor/zendframework/zend-stdlib/src/Exception/ExceptionInterface.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Exception;
-
-/**
- * Exception marker interface
- */
-interface ExceptionInterface
-{
-}
diff --git a/vendor/zendframework/zend-stdlib/src/Exception/ExtensionNotLoadedException.php b/vendor/zendframework/zend-stdlib/src/Exception/ExtensionNotLoadedException.php
deleted file mode 100644
index 4b51475f24..0000000000
--- a/vendor/zendframework/zend-stdlib/src/Exception/ExtensionNotLoadedException.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Exception;
-
-/**
- * Extension not loaded exception
- */
-class ExtensionNotLoadedException extends RuntimeException
-{
-}
diff --git a/vendor/zendframework/zend-stdlib/src/Exception/InvalidArgumentException.php b/vendor/zendframework/zend-stdlib/src/Exception/InvalidArgumentException.php
deleted file mode 100644
index 8028c47175..0000000000
--- a/vendor/zendframework/zend-stdlib/src/Exception/InvalidArgumentException.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Exception;
-
-/**
- * Invalid Argument Exception
- */
-class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
-{
-}
diff --git a/vendor/zendframework/zend-stdlib/src/Exception/LogicException.php b/vendor/zendframework/zend-stdlib/src/Exception/LogicException.php
deleted file mode 100644
index 087ac0e83f..0000000000
--- a/vendor/zendframework/zend-stdlib/src/Exception/LogicException.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Exception;
-
-/**
- * Logic exception
- */
-class LogicException extends \LogicException implements ExceptionInterface
-{
-}
diff --git a/vendor/zendframework/zend-stdlib/src/Exception/RuntimeException.php b/vendor/zendframework/zend-stdlib/src/Exception/RuntimeException.php
deleted file mode 100644
index f3891d64b6..0000000000
--- a/vendor/zendframework/zend-stdlib/src/Exception/RuntimeException.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Exception;
-
-/**
- * Runtime exception
- */
-class RuntimeException extends \RuntimeException implements ExceptionInterface
-{
-}
diff --git a/vendor/zendframework/zend-stdlib/src/Guard/AllGuardsTrait.php b/vendor/zendframework/zend-stdlib/src/Guard/AllGuardsTrait.php
deleted file mode 100644
index 95bc5162d3..0000000000
--- a/vendor/zendframework/zend-stdlib/src/Guard/AllGuardsTrait.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Guard;
-
-/**
- * An aggregate for all guard traits
- */
-trait AllGuardsTrait
-{
- use ArrayOrTraversableGuardTrait;
- use EmptyGuardTrait;
- use NullGuardTrait;
-}
diff --git a/vendor/zendframework/zend-stdlib/src/InitializableInterface.php b/vendor/zendframework/zend-stdlib/src/InitializableInterface.php
deleted file mode 100644
index f78bedef30..0000000000
--- a/vendor/zendframework/zend-stdlib/src/InitializableInterface.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib;
-
-/**
- * Interface to allow objects to have initialization logic
- */
-interface InitializableInterface
-{
- /**
- * Init an object
- *
- * @return void
- */
- public function init();
-}
diff --git a/vendor/zendframework/zend-stdlib/src/JsonSerializable.php b/vendor/zendframework/zend-stdlib/src/JsonSerializable.php
deleted file mode 100644
index 05b8836d74..0000000000
--- a/vendor/zendframework/zend-stdlib/src/JsonSerializable.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib;
-
-/**
- * @deprecated Since 3.1.0; use the native JsonSerializable interface
- */
-interface JsonSerializable extends \JsonSerializable
-{
-}
diff --git a/vendor/zendframework/zend-stdlib/src/Request.php b/vendor/zendframework/zend-stdlib/src/Request.php
deleted file mode 100644
index 7c0840395e..0000000000
--- a/vendor/zendframework/zend-stdlib/src/Request.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib;
-
-class Request extends Message implements RequestInterface
-{
- // generic request implementation
-}
diff --git a/vendor/zendframework/zend-stdlib/src/RequestInterface.php b/vendor/zendframework/zend-stdlib/src/RequestInterface.php
deleted file mode 100644
index c2bac316d4..0000000000
--- a/vendor/zendframework/zend-stdlib/src/RequestInterface.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib;
-
-interface RequestInterface extends MessageInterface
-{
-}
diff --git a/vendor/zendframework/zend-stdlib/src/Response.php b/vendor/zendframework/zend-stdlib/src/Response.php
deleted file mode 100644
index f3074bad5e..0000000000
--- a/vendor/zendframework/zend-stdlib/src/Response.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib;
-
-class Response extends Message implements ResponseInterface
-{
- // generic response implementation
-}
diff --git a/vendor/zendframework/zend-stdlib/src/ResponseInterface.php b/vendor/zendframework/zend-stdlib/src/ResponseInterface.php
deleted file mode 100644
index fe94d3043a..0000000000
--- a/vendor/zendframework/zend-stdlib/src/ResponseInterface.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib;
-
-interface ResponseInterface extends MessageInterface
-{
-}
diff --git a/web/core/.eslintignore b/web/core/.eslintignore
index 21c8a024f7..4b825494e1 100644
--- a/web/core/.eslintignore
+++ b/web/core/.eslintignore
@@ -5,3 +5,4 @@ node_modules/**/*
!*.es6.js
modules/locale/tests/locale_test.es6.js
!tests/Drupal/Nightwatch/**/*.js
+misc/polyfills/object.assign.es6.js
diff --git a/web/core/.eslintrc.json b/web/core/.eslintrc.json
index a140e5bcfb..69f8cba050 100644
--- a/web/core/.eslintrc.json
+++ b/web/core/.eslintrc.json
@@ -17,6 +17,7 @@
"jQuery": true,
"_": true,
"matchMedia": true,
+ "Cookies": true,
"Backbone": true,
"Modernizr": true,
"Popper": true,
diff --git a/web/core/CHANGELOG.txt b/web/core/CHANGELOG.txt
index 59c2953dc0..49587bc7aa 100644
--- a/web/core/CHANGELOG.txt
+++ b/web/core/CHANGELOG.txt
@@ -1,6 +1,6 @@
-New minor (feature) releases of Drupal 8 are released every six months and
+New minor (feature) releases of Drupal are released every six months and
patch (bugfix) releases are released every month. More information on the
-Drupal 8 release cycle: https://www.drupal.org/core/release-cycle-overview
+Drupal release cycle: https://www.drupal.org/core/release-cycle-overview
* For a full list of fixes in the latest release, visit:
https://www.drupal.org/8/download
diff --git a/web/core/COPYRIGHT.txt b/web/core/COPYRIGHT.txt
index 618e3defa6..108e783ec6 100644
--- a/web/core/COPYRIGHT.txt
+++ b/web/core/COPYRIGHT.txt
@@ -1,4 +1,4 @@
-All Drupal code is Copyright 2001 - 2013 by the original authors.
+All Drupal code is Copyright 2001 - 2020 by the original authors.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,45 +24,36 @@ Javascript
Farbtastic - Copyright (c) 2010 Matt Farina
- HTML5 Shiv - Copyright (c) 2012 Alexander Farkas, Jonathan Neal, Paul Irish,
+ HTML5 Shiv - Copyright (c) 2014 Alexander Farkas, Jonathan Neal, Paul Irish,
and John-David Dalton
jQuery - Copyright (c) 2011 John Resig
- jQuery Bgiframe - Copyright (c) 2010 Brandon Aaron (http://brandonaaron.net)
+ jQuery Bgiframe - Copyright (c) 2013 Brandon Aaron (http://brandonaaron.net)
jQuery BBQ - Copyright (c) 2010 "Cowboy" Ben Alman
- jQuery Cookie - Copyright (c) 2010 Klaus Hartl
+ jQuery Cookie - Copyright (c) 2014 Klaus Hartl
- jQuery Form - Copyright (c) 2011 Mike Alsup
+ jQuery Form - Copyright (c) 2017 Kevin Morris
jQuery Globalize - Copyright (c) 2012 Software Freedom Conservancy, Inc.
- jQuery Mousewheel - Copyright (c) 2010 Brandon Aaron
- (http://brandonaaron.net)
+ jQuery Mousewheel - Copyright OpenJS Foundation and other contributors
+ (https://openjsf.org/)
jQuery Metadata - Copyright (c) 2006 John Resig, Yehuda Katz, Jörn Zaefferer,
Paul McLanahan
jQuery Once - Copyright (c) 2009 Konstantin Käfer
- jQuery UI - Copyright (c) 2012 by the original authors
+ jQuery UI - Copyright (c) 2015 by the authors and other contributors
(http://jqueryui.com/about)
- Sizzle.js - Copyright (c) 2011 The Dojo Foundation (http://sizzlejs.com/)
+ Sizzle.js - Copyright (c) 2016 JS Foundation and other contributors
+ (https://js.foundation)
PHP
- ArchiveTar - Copyright (c) 1997 - 2008 Vincent Blavet
-
- Doctrine Common - Copyright (c) 2006 - 2012 Alexander Mols, Benjamin Eberlei,
- Fabio B. Silva, Guilherme Blanco, Johannes M. Schmitt, Jonathan Wage,
- Lukas K. Smith, Marco Pivetta et al.
-
- Symfony2 - Copyright (c) 2004 - 2012 Fabien Potencier
- - YUI - Copyright (c) 2010 Yahoo! Inc.
- - Zend Framework (1.10dev - 2010-01-24) - Copyright (c) 2005-2010 Zend
- Technologies USA Inc. (http://www.zend.com)
-
- Twig - Copyright (c) 2009 Twig Team
+ Drupal depends on numerous PHP Composer packages. All Composer packages
+ retain the copyright of the authors.
diff --git a/web/core/MAINTAINERS.txt b/web/core/MAINTAINERS.txt
index e6a3a747c5..a0428579f5 100644
--- a/web/core/MAINTAINERS.txt
+++ b/web/core/MAINTAINERS.txt
@@ -145,7 +145,6 @@ Contact
Content Moderation
- Sam Becker 'Sam152' https://www.drupal.org/u/sam152
-- Tim Millwood 'timmillwood' https://www.drupal.org/u/timmillwood
Content Translation
- Francesco Placella 'plach' https://www.drupal.org/u/plach
@@ -300,13 +299,14 @@ Menu UI
- ?
Migrate
+- Benji Fisher 'benjifisher' https://www.drupal.org/u/benjifisher
- Adam Globus-Hoenich 'phenaproxima' https://www.drupal.org/u/phenaproxima
- Lucas Hedding 'heddn' https://www.drupal.org/u/heddn
- Michael Lutz 'mikelutz' https://www.drupal.org/u/mikelutz
- Vicki Spagnolo 'quietone' https://www.drupal.org/u/quietone
Node
-- Tim Millwood 'timmillwood' https://www.drupal.org/u/timmillwood
+- ?
Node Access
- Ken Rickard 'agentrickard' https://www.drupal.org/u/agentrickard
@@ -382,7 +382,7 @@ Stark
- John Albin Wilkins 'JohnAlbin' https://www.drupal.org/u/johnalbin
Statistics
-- Tim Millwood 'timmillwood' https://www.drupal.org/u/timmillwood
+- ?
Syslog
- Mariano D'Agostino 'dagmar' https://www.drupal.org/u/dagmar
diff --git a/web/core/UPDATE.txt b/web/core/UPDATE.txt
index efcb5e9dd8..354c6f4815 100644
--- a/web/core/UPDATE.txt
+++ b/web/core/UPDATE.txt
@@ -1,242 +1,77 @@
-INTRODUCTION
-------------
-This document describes how to update your Drupal site between 8.x.x minor and
-patch versions; for example, from 8.1.2 to 8.1.3, or from 8.3.5 to 8.4.0.
-
-To upgrade from a previous major version (for example, Drupal 6 or 7), the
-process involves importing site configuration and content from your old site
-into a new Drupal 8 site. The tools and process are currently experimental,
-rather than being fully supported, so be sure to test in a development
-environment. You will need to use the core Migrate Drupal UI module which
-provides a user interface for the Migrate and Migrate Drupal modules included
-in core. See https://www.drupal.org/upgrade/migrate for details, and
-https://www.drupal.org/node/2167633 for known issues.
-
-First steps and definitions:
-
- * If you are upgrading to Drupal version x.y.z, then x is known as the major
- version number, y is known as the minor version number, and z is known as
- the patch version number. The download file will be named
- drupal-x.y.z.tar.gz (or drupal-x.y.z.zip). Previous Drupal versions used
- only x.y (MAJOR.MINOR) to designate their versions.
-
- * All directories mentioned in this document are relative to the directory of
- your Drupal installation.
-
- * Make a full backup of all files, directories, and your database(s) before
- starting, and save it outside your Drupal installation directory.
- Instructions may be found at
- https://www.drupal.org/upgrade/backing-up-the-db
-
- * It is wise to try an update or upgrade on a test copy of your site before
- applying it to your live site. Even minor updates can cause your site's
- behavior to change.
-
- * Each new release of Drupal has release notes, which explain the changes made
- since the previous version and any special instructions needed to update or
- upgrade to the new version. You can find a link to the release notes for the
- version you are upgrading or updating to on the Drupal project page
- (https://www.drupal.org/project/drupal).
+CONTENTS OF THIS FILE
+---------------------
-UPDATE PROBLEMS
-----------------
-If you encounter errors during this process,
+ * Introduction
+ * Minor and patch version updates
+ * Is my site using Composer?
+ * Updating code manually
+ * Updating code with Composer
+ * Updating Drupal 8 to Drupal 9
+ * Updating Drupal 6 or 7 to Drupal 9
- * Note any error messages you see.
- * Restore your site to its previous state, using the file and database backups
- you created before you started the update process. Do not attempt to do
- further updates on a site that had update problems.
+INTRODUCTION
+------------
- * Consult one of the support options listed on https://www.drupal.org/support
+This document provides links to resources on how to update or migrate your
+Drupal site.
-More in-depth information on updating and upgrading can be found at
-https://www.drupal.org/upgrade
MINOR AND PATCH VERSION UPDATES
-------------------------------
-To update from one 8.x.x version of Drupal to any later 8.x.x version, after
-following the instructions in the INTRODUCTION section at the top of this file:
-1. Log in as a user with the permission "Administer software updates".
+Minor and patch updates are done either manually or with Composer, depending on
+how the site was installed. Refer to the sections below on updating with
+Composer or updating manually for tarball/zip installations.
-2. Go to Administration > Configuration > Development > Maintenance mode.
- Enable the "Put site into maintenance mode" checkbox and save the
- configuration.
+Minor and patch versions are updates such as:
+ * Patch releases (e.g. 9.1.2 to 9.1.3)
+ * Scheduled minor releases (e.g 9.3.5 to 9.4.0)
+ * Beta to final releases (e.g. 9.1.0-beta2 to 9.1.0)
-3. Determine if your project is managed by Composer.
- On a typical Unix/Linux command line, this can be determined by running the
- following command (replace /PATH/TO/composer with the appropriate location
- for your system):
+IS MY SITE USING COMPOSER?
+--------------------------
- /PATH/TO/composer info drupal/core
+Before updating, determine if your site is currently managed by Composer.
- If this is successful, your project is managed by Composer.
+On a typical Unix/Linux command line, this can be determined by running the
+following command (replace /PATH/TO/composer with the appropriate location
+for your system):
- If you don't have Composer installed or access to the command line, you can
- check the contents of composer.json. If "drupal/core" is present in the
- "require" section of your composer.json file, then the project is managed by
- Composer.
+ /PATH/TO/composer info drupal/core
- If the project is not managed by Composer, follow the steps under "UPDATING
- CODE WITHOUT COMPOSER", otherwise go to "UPDATING CODE WITH COMPOSER".
UPDATING CODE WITH COMPOSER
---------------------------
-1. On a typical Unix/Linux command line, run the following command from the root
- directory (replace /PATH/TO/composer with the appropriate location for your
- system):
-
- /PATH/TO/composer update
-
- Note, if Composer is not installed you will need to install it in order to
- update Drupal.
-
- Note, if you want to only update drupal/core the following command will
- probably work:
-
- /PATH/TO/composer update drupal/core symfony/* --with-all-dependencies
-
-2. Check the release notes for the updated version of Drupal to find out if
- there is a change to default.settings.php.
-
- You can find the release notes for your version at
- https://www.drupal.org/project/drupal. At bottom of the project page under
- "Downloads" use the link for your version of Drupal to view the release
- notes. If your version is not listed, use the 'View all releases' link. From
- this page you can scroll down or use the filter to find your version and its
- release notes.
-
- If there is a change to default.settings.php, follow these steps:
-
- - Locate your settings.php file in the /sites/* directory. (Typically
- sites/default.)
-
- - Make a backup copy of your settings.php file, with a different file name.
-
- - Make a copy of the new default.settings.php file, and name the copy
- settings.php (overwriting your previous settings.php file).
-
- - Copy the custom and site-specific entries from the backup you made into the
- new settings.php file. You will definitely need the lines giving the
- database information, and you will also want to copy in any other
- customizations you have added.
-
-3. Determine if there are any modifications to files such as .htaccess or
- robots.txt and re-apply them. The Drupal Scaffold composer plugin
- (https://github.com/drupal-composer/drupal-scaffold) can help you with
- excluding files you'd like to always preserve when updating Drupal.
-4. Go to the "UPLOADING THE CODE" section
+ * Refer to 'Update Drupal core via Composer' for details on using Composer:
+ https://www.drupal.org/docs/8/update/update-drupal-core-via-composer
-UPDATING CODE WITHOUT COMPOSER
-------------------------------
-1. Remove the 'core' and 'vendor' directories. Also remove all of the files
- in the top-level directory, except any that you added manually.
- If you made modifications to files like .htaccess, composer.json, or
- robots.txt you will need to re-apply them from your backup, after the new
- files are in place.
+UPDATING CODE MANUALLY
+----------------------
- This should leave you with the modules, profiles, sites, and themes
- directories. These directories should only contain code that you've used to
- extend Drupal.
-
-2. Download the latest Drupal 8.x.x release from https://www.drupal.org/download
- to a directory outside of your web root. Extract the archive and copy the
- files into your Drupal directory.
-
- Copy all the files, but do not accidentally overwrite your modules, profiles,
- sites, or themes directories.
-
- On a typical Unix/Linux command line, use the following commands to download
- and extract:
-
- wget https://www.drupal.org/files/projects/drupal-x.y.z.tar.gz
- tar -zxvf drupal-x.y.z.tar.gz
-
- This creates a new directory drupal-x.y.z/ containing all Drupal files and
- directories. Copy the files into your Drupal installation directory:
-
- cp -R drupal-x.y.z/* drupal-x.y.z/.htaccess /path/to/your/installation
-
- If you do not have command line access to your server, download the archive
- from https://www.drupal.org using your web browser and extract it locally.
-
-3. Check the release notes for the updated version of Drupal to find out if
- there is a change to default.settings.php.
-
- You can find the release notes for your updated version at
- https://www.drupal.org/project/drupal. At bottom of the project page under
- "Downloads" use the link for your updated version of Drupal to view the
- release notes. If your updated version is not listed, use the 'View all
- releases' link. From this page you can scroll down or use the filter to find
- your updated version and its release notes.
-
- If there is a change to default.settings.php, follow these steps:
-
- - Locate your settings.php file in the /sites/* directory. (Typically
- sites/default.)
-
- - Make a backup copy of your settings.php file, with a different file name.
-
- - Make a copy of the new default.settings.php file, and name the copy
- settings.php (overwriting your previous settings.php file).
-
- - Copy the custom and site-specific entries from the backup you made into the
- new settings.php file. You will definitely need the lines giving the
- database information, and you will also want to copy in any other
- customizations you have added.
-
-4. Re-apply any modifications to files such as .htaccess or robots.txt.
-
- If you have added requirements in composer.json, it is recommended that you
- re-add the requirements using Composer instead of applying the changes by
- hand. For example, on a typical Unix/Linux command line, to reinstall the
- Address module and its dependencies run (replace /PATH/TO/composer with the
- appropriate location for your system):
-
- /PATH/TO/composer require drupal/address
-
- If you do not have command line access to your server, you will need to run
- the Composer commands locally before uploading the file system to your
- server.
-
-5. Go to the "UPLOADING THE CODE" section
-
-UPLOADING THE CODE
-------------------
-1. If you updated the code in a different environment from where it is running
- you need to upload the files to your web root including the vendor/
- directory.
-
-2. Go to the "UPDATING THE DATABASE" section
-
-UPDATING THE DATABASE
----------------------
-1. Run update.php by visiting http://www.example.com/update.php (replace
- www.example.com with your domain name). This will update the core database
- tables.
+ * Refer to 'Updating the Core Software' for details on updating manually:
+ https://www.drupal.org/docs/8/update/update-core-manually
- If you are unable to access update.php do the following:
- - Open settings.php with a text editor.
+UPDATING DRUPAL 8 TO DRUPAL 9
+-----------------------------
- - Find the line that says:
- $settings['update_free_access'] = FALSE;
+ 1. Prepare the Drupal 8 site for Drupal 9:
+ https://www.drupal.org/docs/9/how-to-prepare-your-drupal-7-or-8-site-for-drupal-9/upgrading-a-drupal-8-site-to-drupal-9
- - Change it into:
- $settings['update_free_access'] = TRUE;
+ 2. Update the Drupal 8 codebase to Drupal 9:
+ https://www.drupal.org/docs/8/upgrade/upgrading-between-drupal-8-major-versions-eg-from-drupal-8-to-drupal-9
- - Once the update is done, $settings['update_free_access'] must be reverted
- to FALSE.
+ 3. Navigate to /update.php to initiate the update process.
-2. Go to Administration > Reports > Status report. Verify that everything is
- working as expected.
-3. Ensure that $settings['update_free_access'] is FALSE in settings.php.
+UPDATING DRUPAL 6 OR 7 TO DRUPAL 9
+----------------------------------
-4. Go to Administration > Configuration > Development > Maintenance mode.
- Disable the "Put site into maintenance mode" checkbox and save the
- configuration.
+ * Updating from a previous major version, such as Drupal 6 or 7, requires
+ importing the old site configuration and content into a new Drupal 9 site.
+ Refer to the 'Migrate Guide' for more details on this process:
+ https://www.drupal.org/upgrade/migrate
diff --git a/web/core/assets/scaffold/files/default.settings.php b/web/core/assets/scaffold/files/default.settings.php
index 1c8dbee9e7..62f73e1b46 100644
--- a/web/core/assets/scaffold/files/default.settings.php
+++ b/web/core/assets/scaffold/files/default.settings.php
@@ -105,6 +105,16 @@
* webserver. For most other drivers, you must specify a
* username, password, host, and database name.
*
+ * Drupal core implements drivers for mysql, pgsql, and sqlite. Other drivers
+ * can be provided by contributed or custom modules. To use a contributed or
+ * custom driver, the "namespace" property must be set to the namespace of the
+ * driver. The code in this namespace must be autoloadable prior to connecting
+ * to the database, and therefore, prior to when module root namespaces are
+ * added to the autoloader. To add the driver's namespace to the autoloader,
+ * set the "autoload" property to the PSR-4 base directory of the driver's
+ * namespace. This is optional for projects managed with Composer if the
+ * driver's namespace is in Composer's autoloader.
+ *
* Transaction support is enabled by default for all drivers that support it,
* including MySQL. To explicitly disable it, set the 'transactions' key to
* FALSE.
@@ -224,6 +234,20 @@
* 'database' => '/path/to/databasefilename',
* ];
* @endcode
+ *
+ * Sample Database configuration format for a driver in a contributed module:
+ * @code
+ * $databases['default']['default'] = [
+ * 'driver' => 'mydriver',
+ * 'namespace' => 'Drupal\mymodule\Driver\Database\mydriver',
+ * 'autoload' => 'modules/mymodule/src/Driver/Database/mydriver/',
+ * 'database' => 'databasename',
+ * 'username' => 'sqlusername',
+ * 'password' => 'sqlpassword',
+ * 'host' => 'localhost',
+ * 'prefix' => '',
+ * ];
+ * @endcode
*/
/**
@@ -741,6 +765,19 @@
*/
$settings['entity_update_backup'] = TRUE;
+/**
+ * Node migration type.
+ *
+ * This is used to force the migration system to use the classic node migrations
+ * instead of the default complete node migrations. The migration system will
+ * use the classic node migration only if there are existing migrate_map tables
+ * for the classic node migrations and they contain data. These tables may not
+ * exist if you are developing custom migrations and do not want to use the
+ * complete node migrations. Set this to TRUE to force the use of the classic
+ * node migrations.
+ */
+$settings['migrate_node_migrate_type_classic'] = FALSE;
+
/**
* Load local development override configuration, if available.
*
diff --git a/web/core/assets/scaffold/files/drupal.README.txt b/web/core/assets/scaffold/files/drupal.README.txt
index 5ffe2c2469..80cb95cebc 100644
--- a/web/core/assets/scaffold/files/drupal.README.txt
+++ b/web/core/assets/scaffold/files/drupal.README.txt
@@ -9,6 +9,7 @@ CONTENTS OF THIS FILE
* Developing for Drupal
* More information
+
ABOUT DRUPAL
------------
@@ -23,6 +24,7 @@ Legal information about Drupal:
* Learn about the Drupal trademark and logo policy:
https://www.drupal.com/trademark
+
CONFIGURATION AND FEATURES
--------------------------
@@ -89,6 +91,7 @@ More about themes:
* Develop your own theme:
https://www.drupal.org/docs/8/theming
+
DEVELOPING FOR DRUPAL
---------------------
@@ -120,6 +123,7 @@ More about developing:
* Learn from documented Drupal API examples:
https://www.drupal.org/project/examples
+
MORE INFORMATION
----------------
diff --git a/web/core/assets/scaffold/files/example.settings.local.php b/web/core/assets/scaffold/files/example.settings.local.php
index 520cb4acd5..f91b9afb29 100644
--- a/web/core/assets/scaffold/files/example.settings.local.php
+++ b/web/core/assets/scaffold/files/example.settings.local.php
@@ -131,15 +131,15 @@
$settings['skip_permissions_hardening'] = TRUE;
/**
- * Exclude modules from configuration synchronisation.
+ * Exclude modules from configuration synchronization.
*
* On config export sync, no config or dependent config of any excluded module
* is exported. On config import sync, any config of any installed excluded
* module is ignored. In the exported configuration, it will be as if the
* excluded module had never been installed. When syncing configuration, if an
* excluded module is already installed, it will not be uninstalled by the
- * configuration synchronisation, and dependent configuration will remain
- * intact. This affects only configuration synchronisation; single import and
+ * configuration synchronization, and dependent configuration will remain
+ * intact. This affects only configuration synchronization; single import and
* export of configuration are not affected.
*
* Drupal does not validate or sanity check the list of excluded modules. For
@@ -148,7 +148,7 @@
* anymore.
*
* This is an advanced feature and using it means opting out of some of the
- * guarantees the configuration synchronisation provides. It is not recommended
+ * guarantees the configuration synchronization provides. It is not recommended
* to use this feature with modules that affect Drupal in a major way such as
* the language or field module.
*/
diff --git a/web/core/assets/scaffold/files/htaccess b/web/core/assets/scaffold/files/htaccess
index 9a73a3d3a3..6f9123d14b 100644
--- a/web/core/assets/scaffold/files/htaccess
+++ b/web/core/assets/scaffold/files/htaccess
@@ -27,16 +27,9 @@ AddEncoding gzip svgz
# Drupal\Core\DrupalKernel::bootEnvironment() for settings that can be
# changed at runtime.
-# PHP 5, Apache 1 and 2.
-<IfModule mod_php5.c>
+# PHP 7, Apache 1 and 2.
+<IfModule mod_php7.c>
php_value assert.active 0
- php_flag session.auto_start off
- php_value mbstring.http_input pass
- php_value mbstring.http_output pass
- php_flag mbstring.encoding_translation off
- # PHP 5.6 has deprecated $HTTP_RAW_POST_DATA and produces warnings if this is
- # not set.
- php_value always_populate_raw_post_data -1
</IfModule>
# Requires mod_expires to be enabled.
@@ -167,9 +160,9 @@ AddEncoding gzip svgz
RewriteCond %{REQUEST_FILENAME}\.gz -s
RewriteRule ^(.*)\.js $1\.js\.gz [QSA]
- # Serve correct content types, and prevent mod_deflate double gzip.
- RewriteRule \.css\.gz$ - [T=text/css,E=no-gzip:1]
- RewriteRule \.js\.gz$ - [T=text/javascript,E=no-gzip:1]
+ # Serve correct content types, and prevent double compression.
+ RewriteRule \.css\.gz$ - [T=text/css,E=no-gzip:1,E=no-brotli:1]
+ RewriteRule \.js\.gz$ - [T=text/javascript,E=no-gzip:1,E=no-brotli:1]
<FilesMatch "(\.js\.gz|\.css\.gz)$">
# Serve correct encoding type.
diff --git a/web/core/assets/vendor/backbone/backbone-min.js b/web/core/assets/vendor/backbone/backbone-min.js
index 1a1f708dad..c8c33e0d7f 100644
--- a/web/core/assets/vendor/backbone/backbone-min.js
+++ b/web/core/assets/vendor/backbone/backbone-min.js
@@ -1,2 +1,2 @@
-(function(t){var e=typeof self=="object"&&self.self==self&&self||typeof global=="object"&&global.global==global&&global;if(typeof define==="function"&&define.amd){define(["underscore","jquery","exports"],function(i,r,n){e.Backbone=t(e,n,i,r)})}else if(typeof exports!=="undefined"){var i=require("underscore"),r;try{r=require("jquery")}catch(n){}t(e,exports,i,r)}else{e.Backbone=t(e,{},e._,e.jQuery||e.Zepto||e.ender||e.$)}})(function(t,e,i,r){var n=t.Backbone;var s=Array.prototype.slice;e.VERSION="1.2.3";e.$=r;e.noConflict=function(){t.Backbone=n;return this};e.emulateHTTP=false;e.emulateJSON=false;var a=function(t,e,r){switch(t){case 1:return function(){return i[e](this[r])};case 2:return function(t){return i[e](this[r],t)};case 3:return function(t,n){return i[e](this[r],h(t,this),n)};case 4:return function(t,n,s){return i[e](this[r],h(t,this),n,s)};default:return function(){var t=s.call(arguments);t.unshift(this[r]);return i[e].apply(i,t)}}};var o=function(t,e,r){i.each(e,function(e,n){if(i[n])t.prototype[n]=a(e,n,r)})};var h=function(t,e){if(i.isFunction(t))return t;if(i.isObject(t)&&!e._isModel(t))return u(t);if(i.isString(t))return function(e){return e.get(t)};return t};var u=function(t){var e=i.matches(t);return function(t){return e(t.attributes)}};var l=e.Events={};var c=/\s+/;var f=function(t,e,r,n,s){var a=0,o;if(r&&typeof r==="object"){if(n!==void 0&&"context"in s&&s.context===void 0)s.context=n;for(o=i.keys(r);a<o.length;a++){e=f(t,e,o[a],r[o[a]],s)}}else if(r&&c.test(r)){for(o=r.split(c);a<o.length;a++){e=t(e,o[a],n,s)}}else{e=t(e,r,n,s)}return e};l.on=function(t,e,i){return d(this,t,e,i)};var d=function(t,e,i,r,n){t._events=f(v,t._events||{},e,i,{context:r,ctx:t,listening:n});if(n){var s=t._listeners||(t._listeners={});s[n.id]=n}return t};l.listenTo=function(t,e,r){if(!t)return this;var n=t._listenId||(t._listenId=i.uniqueId("l"));var s=this._listeningTo||(this._listeningTo={});var a=s[n];if(!a){var o=this._listenId||(this._listenId=i.uniqueId("l"));a=s[n]={obj:t,objId:n,id:o,listeningTo:s,count:0}}d(t,e,r,this,a);return this};var v=function(t,e,i,r){if(i){var n=t[e]||(t[e]=[]);var s=r.context,a=r.ctx,o=r.listening;if(o)o.count++;n.push({callback:i,context:s,ctx:s||a,listening:o})}return t};l.off=function(t,e,i){if(!this._events)return this;this._events=f(g,this._events,t,e,{context:i,listeners:this._listeners});return this};l.stopListening=function(t,e,r){var n=this._listeningTo;if(!n)return this;var s=t?[t._listenId]:i.keys(n);for(var a=0;a<s.length;a++){var o=n[s[a]];if(!o)break;o.obj.off(e,r,this)}if(i.isEmpty(n))this._listeningTo=void 0;return this};var g=function(t,e,r,n){if(!t)return;var s=0,a;var o=n.context,h=n.listeners;if(!e&&!r&&!o){var u=i.keys(h);for(;s<u.length;s++){a=h[u[s]];delete h[a.id];delete a.listeningTo[a.objId]}return}var l=e?[e]:i.keys(t);for(;s<l.length;s++){e=l[s];var c=t[e];if(!c)break;var f=[];for(var d=0;d<c.length;d++){var v=c[d];if(r&&r!==v.callback&&r!==v.callback._callback||o&&o!==v.context){f.push(v)}else{a=v.listening;if(a&&--a.count===0){delete h[a.id];delete a.listeningTo[a.objId]}}}if(f.length){t[e]=f}else{delete t[e]}}if(i.size(t))return t};l.once=function(t,e,r){var n=f(p,{},t,e,i.bind(this.off,this));return this.on(n,void 0,r)};l.listenToOnce=function(t,e,r){var n=f(p,{},e,r,i.bind(this.stopListening,this,t));return this.listenTo(t,n)};var p=function(t,e,r,n){if(r){var s=t[e]=i.once(function(){n(e,s);r.apply(this,arguments)});s._callback=r}return t};l.trigger=function(t){if(!this._events)return this;var e=Math.max(0,arguments.length-1);var i=Array(e);for(var r=0;r<e;r++)i[r]=arguments[r+1];f(m,this._events,t,void 0,i);return this};var m=function(t,e,i,r){if(t){var n=t[e];var s=t.all;if(n&&s)s=s.slice();if(n)_(n,r);if(s)_(s,[e].concat(r))}return t};var _=function(t,e){var i,r=-1,n=t.length,s=e[0],a=e[1],o=e[2];switch(e.length){case 0:while(++r<n)(i=t[r]).callback.call(i.ctx);return;case 1:while(++r<n)(i=t[r]).callback.call(i.ctx,s);return;case 2:while(++r<n)(i=t[r]).callback.call(i.ctx,s,a);return;case 3:while(++r<n)(i=t[r]).callback.call(i.ctx,s,a,o);return;default:while(++r<n)(i=t[r]).callback.apply(i.ctx,e);return}};l.bind=l.on;l.unbind=l.off;i.extend(e,l);var y=e.Model=function(t,e){var r=t||{};e||(e={});this.cid=i.uniqueId(this.cidPrefix);this.attributes={};if(e.collection)this.collection=e.collection;if(e.parse)r=this.parse(r,e)||{};r=i.defaults({},r,i.result(this,"defaults"));this.set(r,e);this.changed={};this.initialize.apply(this,arguments)};i.extend(y.prototype,l,{changed:null,validationError:null,idAttribute:"id",cidPrefix:"c",initialize:function(){},toJSON:function(t){return i.clone(this.attributes)},sync:function(){return e.sync.apply(this,arguments)},get:function(t){return this.attributes[t]},escape:function(t){return i.escape(this.get(t))},has:function(t){return this.get(t)!=null},matches:function(t){return!!i.iteratee(t,this)(this.attributes)},set:function(t,e,r){if(t==null)return this;var n;if(typeof t==="object"){n=t;r=e}else{(n={})[t]=e}r||(r={});if(!this._validate(n,r))return false;var s=r.unset;var a=r.silent;var o=[];var h=this._changing;this._changing=true;if(!h){this._previousAttributes=i.clone(this.attributes);this.changed={}}var u=this.attributes;var l=this.changed;var c=this._previousAttributes;for(var f in n){e=n[f];if(!i.isEqual(u[f],e))o.push(f);if(!i.isEqual(c[f],e)){l[f]=e}else{delete l[f]}s?delete u[f]:u[f]=e}this.id=this.get(this.idAttribute);if(!a){if(o.length)this._pending=r;for(var d=0;d<o.length;d++){this.trigger("change:"+o[d],this,u[o[d]],r)}}if(h)return this;if(!a){while(this._pending){r=this._pending;this._pending=false;this.trigger("change",this,r)}}this._pending=false;this._changing=false;return this},unset:function(t,e){return this.set(t,void 0,i.extend({},e,{unset:true}))},clear:function(t){var e={};for(var r in this.attributes)e[r]=void 0;return this.set(e,i.extend({},t,{unset:true}))},hasChanged:function(t){if(t==null)return!i.isEmpty(this.changed);return i.has(this.changed,t)},changedAttributes:function(t){if(!t)return this.hasChanged()?i.clone(this.changed):false;var e=this._changing?this._previousAttributes:this.attributes;var r={};for(var n in t){var s=t[n];if(i.isEqual(e[n],s))continue;r[n]=s}return i.size(r)?r:false},previous:function(t){if(t==null||!this._previousAttributes)return null;return this._previousAttributes[t]},previousAttributes:function(){return i.clone(this._previousAttributes)},fetch:function(t){t=i.extend({parse:true},t);var e=this;var r=t.success;t.success=function(i){var n=t.parse?e.parse(i,t):i;if(!e.set(n,t))return false;if(r)r.call(t.context,e,i,t);e.trigger("sync",e,i,t)};z(this,t);return this.sync("read",this,t)},save:function(t,e,r){var n;if(t==null||typeof t==="object"){n=t;r=e}else{(n={})[t]=e}r=i.extend({validate:true,parse:true},r);var s=r.wait;if(n&&!s){if(!this.set(n,r))return false}else{if(!this._validate(n,r))return false}var a=this;var o=r.success;var h=this.attributes;r.success=function(t){a.attributes=h;var e=r.parse?a.parse(t,r):t;if(s)e=i.extend({},n,e);if(e&&!a.set(e,r))return false;if(o)o.call(r.context,a,t,r);a.trigger("sync",a,t,r)};z(this,r);if(n&&s)this.attributes=i.extend({},h,n);var u=this.isNew()?"create":r.patch?"patch":"update";if(u==="patch"&&!r.attrs)r.attrs=n;var l=this.sync(u,this,r);this.attributes=h;return l},destroy:function(t){t=t?i.clone(t):{};var e=this;var r=t.success;var n=t.wait;var s=function(){e.stopListening();e.trigger("destroy",e,e.collection,t)};t.success=function(i){if(n)s();if(r)r.call(t.context,e,i,t);if(!e.isNew())e.trigger("sync",e,i,t)};var a=false;if(this.isNew()){i.defer(t.success)}else{z(this,t);a=this.sync("delete",this,t)}if(!n)s();return a},url:function(){var t=i.result(this,"urlRoot")||i.result(this.collection,"url")||F();if(this.isNew())return t;var e=this.get(this.idAttribute);return t.replace(/[^\/]$/,"$&/")+encodeURIComponent(e)},parse:function(t,e){return t},clone:function(){return new this.constructor(this.attributes)},isNew:function(){return!this.has(this.idAttribute)},isValid:function(t){return this._validate({},i.defaults({validate:true},t))},_validate:function(t,e){if(!e.validate||!this.validate)return true;t=i.extend({},this.attributes,t);var r=this.validationError=this.validate(t,e)||null;if(!r)return true;this.trigger("invalid",this,r,i.extend(e,{validationError:r}));return false}});var b={keys:1,values:1,pairs:1,invert:1,pick:0,omit:0,chain:1,isEmpty:1};o(y,b,"attributes");var x=e.Collection=function(t,e){e||(e={});if(e.model)this.model=e.model;if(e.comparator!==void 0)this.comparator=e.comparator;this._reset();this.initialize.apply(this,arguments);if(t)this.reset(t,i.extend({silent:true},e))};var w={add:true,remove:true,merge:true};var E={add:true,remove:false};var k=function(t,e,i){i=Math.min(Math.max(i,0),t.length);var r=Array(t.length-i);var n=e.length;for(var s=0;s<r.length;s++)r[s]=t[s+i];for(s=0;s<n;s++)t[s+i]=e[s];for(s=0;s<r.length;s++)t[s+n+i]=r[s]};i.extend(x.prototype,l,{model:y,initialize:function(){},toJSON:function(t){return this.map(function(e){return e.toJSON(t)})},sync:function(){return e.sync.apply(this,arguments)},add:function(t,e){return this.set(t,i.extend({merge:false},e,E))},remove:function(t,e){e=i.extend({},e);var r=!i.isArray(t);t=r?[t]:i.clone(t);var n=this._removeModels(t,e);if(!e.silent&&n)this.trigger("update",this,e);return r?n[0]:n},set:function(t,e){if(t==null)return;e=i.defaults({},e,w);if(e.parse&&!this._isModel(t))t=this.parse(t,e);var r=!i.isArray(t);t=r?[t]:t.slice();var n=e.at;if(n!=null)n=+n;if(n<0)n+=this.length+1;var s=[];var a=[];var o=[];var h={};var u=e.add;var l=e.merge;var c=e.remove;var f=false;var d=this.comparator&&n==null&&e.sort!==false;var v=i.isString(this.comparator)?this.comparator:null;var g;for(var p=0;p<t.length;p++){g=t[p];var m=this.get(g);if(m){if(l&&g!==m){var _=this._isModel(g)?g.attributes:g;if(e.parse)_=m.parse(_,e);m.set(_,e);if(d&&!f)f=m.hasChanged(v)}if(!h[m.cid]){h[m.cid]=true;s.push(m)}t[p]=m}else if(u){g=t[p]=this._prepareModel(g,e);if(g){a.push(g);this._addReference(g,e);h[g.cid]=true;s.push(g)}}}if(c){for(p=0;p<this.length;p++){g=this.models[p];if(!h[g.cid])o.push(g)}if(o.length)this._removeModels(o,e)}var y=false;var b=!d&&u&&c;if(s.length&&b){y=this.length!=s.length||i.some(this.models,function(t,e){return t!==s[e]});this.models.length=0;k(this.models,s,0);this.length=this.models.length}else if(a.length){if(d)f=true;k(this.models,a,n==null?this.length:n);this.length=this.models.length}if(f)this.sort({silent:true});if(!e.silent){for(p=0;p<a.length;p++){if(n!=null)e.index=n+p;g=a[p];g.trigger("add",g,this,e)}if(f||y)this.trigger("sort",this,e);if(a.length||o.length)this.trigger("update",this,e)}return r?t[0]:t},reset:function(t,e){e=e?i.clone(e):{};for(var r=0;r<this.models.length;r++){this._removeReference(this.models[r],e)}e.previousModels=this.models;this._reset();t=this.add(t,i.extend({silent:true},e));if(!e.silent)this.trigger("reset",this,e);return t},push:function(t,e){return this.add(t,i.extend({at:this.length},e))},pop:function(t){var e=this.at(this.length-1);return this.remove(e,t)},unshift:function(t,e){return this.add(t,i.extend({at:0},e))},shift:function(t){var e=this.at(0);return this.remove(e,t)},slice:function(){return s.apply(this.models,arguments)},get:function(t){if(t==null)return void 0;var e=this.modelId(this._isModel(t)?t.attributes:t);return this._byId[t]||this._byId[e]||this._byId[t.cid]},at:function(t){if(t<0)t+=this.length;return this.models[t]},where:function(t,e){return this[e?"find":"filter"](t)},findWhere:function(t){return this.where(t,true)},sort:function(t){var e=this.comparator;if(!e)throw new Error("Cannot sort a set without a comparator");t||(t={});var r=e.length;if(i.isFunction(e))e=i.bind(e,this);if(r===1||i.isString(e)){this.models=this.sortBy(e)}else{this.models.sort(e)}if(!t.silent)this.trigger("sort",this,t);return this},pluck:function(t){return i.invoke(this.models,"get",t)},fetch:function(t){t=i.extend({parse:true},t);var e=t.success;var r=this;t.success=function(i){var n=t.reset?"reset":"set";r[n](i,t);if(e)e.call(t.context,r,i,t);r.trigger("sync",r,i,t)};z(this,t);return this.sync("read",this,t)},create:function(t,e){e=e?i.clone(e):{};var r=e.wait;t=this._prepareModel(t,e);if(!t)return false;if(!r)this.add(t,e);var n=this;var s=e.success;e.success=function(t,e,i){if(r)n.add(t,i);if(s)s.call(i.context,t,e,i)};t.save(null,e);return t},parse:function(t,e){return t},clone:function(){return new this.constructor(this.models,{model:this.model,comparator:this.comparator})},modelId:function(t){return t[this.model.prototype.idAttribute||"id"]},_reset:function(){this.length=0;this.models=[];this._byId={}},_prepareModel:function(t,e){if(this._isModel(t)){if(!t.collection)t.collection=this;return t}e=e?i.clone(e):{};e.collection=this;var r=new this.model(t,e);if(!r.validationError)return r;this.trigger("invalid",this,r.validationError,e);return false},_removeModels:function(t,e){var i=[];for(var r=0;r<t.length;r++){var n=this.get(t[r]);if(!n)continue;var s=this.indexOf(n);this.models.splice(s,1);this.length--;if(!e.silent){e.index=s;n.trigger("remove",n,this,e)}i.push(n);this._removeReference(n,e)}return i.length?i:false},_isModel:function(t){return t instanceof y},_addReference:function(t,e){this._byId[t.cid]=t;var i=this.modelId(t.attributes);if(i!=null)this._byId[i]=t;t.on("all",this._onModelEvent,this)},_removeReference:function(t,e){delete this._byId[t.cid];var i=this.modelId(t.attributes);if(i!=null)delete this._byId[i];if(this===t.collection)delete t.collection;t.off("all",this._onModelEvent,this)},_onModelEvent:function(t,e,i,r){if((t==="add"||t==="remove")&&i!==this)return;if(t==="destroy")this.remove(e,r);if(t==="change"){var n=this.modelId(e.previousAttributes());var s=this.modelId(e.attributes);if(n!==s){if(n!=null)delete this._byId[n];if(s!=null)this._byId[s]=e}}this.trigger.apply(this,arguments)}});var S={forEach:3,each:3,map:3,collect:3,reduce:4,foldl:4,inject:4,reduceRight:4,foldr:4,find:3,detect:3,filter:3,select:3,reject:3,every:3,all:3,some:3,any:3,include:3,includes:3,contains:3,invoke:0,max:3,min:3,toArray:1,size:1,first:3,head:3,take:3,initial:3,rest:3,tail:3,drop:3,last:3,without:0,difference:0,indexOf:3,shuffle:1,lastIndexOf:3,isEmpty:1,chain:1,sample:3,partition:3,groupBy:3,countBy:3,sortBy:3,indexBy:3};o(x,S,"models");var I=e.View=function(t){this.cid=i.uniqueId("view");i.extend(this,i.pick(t,P));this._ensureElement();this.initialize.apply(this,arguments)};var T=/^(\S+)\s*(.*)$/;var P=["model","collection","el","id","attributes","className","tagName","events"];i.extend(I.prototype,l,{tagName:"div",$:function(t){return this.$el.find(t)},initialize:function(){},render:function(){return this},remove:function(){this._removeElement();this.stopListening();return this},_removeElement:function(){this.$el.remove()},setElement:function(t){this.undelegateEvents();this._setElement(t);this.delegateEvents();return this},_setElement:function(t){this.$el=t instanceof e.$?t:e.$(t);this.el=this.$el[0]},delegateEvents:function(t){t||(t=i.result(this,"events"));if(!t)return this;this.undelegateEvents();for(var e in t){var r=t[e];if(!i.isFunction(r))r=this[r];if(!r)continue;var n=e.match(T);this.delegate(n[1],n[2],i.bind(r,this))}return this},delegate:function(t,e,i){this.$el.on(t+".delegateEvents"+this.cid,e,i);return this},undelegateEvents:function(){if(this.$el)this.$el.off(".delegateEvents"+this.cid);return this},undelegate:function(t,e,i){this.$el.off(t+".delegateEvents"+this.cid,e,i);return this},_createElement:function(t){return document.createElement(t)},_ensureElement:function(){if(!this.el){var t=i.extend({},i.result(this,"attributes"));if(this.id)t.id=i.result(this,"id");if(this.className)t["class"]=i.result(this,"className");this.setElement(this._createElement(i.result(this,"tagName")));this._setAttributes(t)}else{this.setElement(i.result(this,"el"))}},_setAttributes:function(t){this.$el.attr(t)}});e.sync=function(t,r,n){var s=H[t];i.defaults(n||(n={}),{emulateHTTP:e.emulateHTTP,emulateJSON:e.emulateJSON});var a={type:s,dataType:"json"};if(!n.url){a.url=i.result(r,"url")||F()}if(n.data==null&&r&&(t==="create"||t==="update"||t==="patch")){a.contentType="application/json";a.data=JSON.stringify(n.attrs||r.toJSON(n))}if(n.emulateJSON){a.contentType="application/x-www-form-urlencoded";a.data=a.data?{model:a.data}:{}}if(n.emulateHTTP&&(s==="PUT"||s==="DELETE"||s==="PATCH")){a.type="POST";if(n.emulateJSON)a.data._method=s;var o=n.beforeSend;n.beforeSend=function(t){t.setRequestHeader("X-HTTP-Method-Override",s);if(o)return o.apply(this,arguments)}}if(a.type!=="GET"&&!n.emulateJSON){a.processData=false}var h=n.error;n.error=function(t,e,i){n.textStatus=e;n.errorThrown=i;if(h)h.call(n.context,t,e,i)};var u=n.xhr=e.ajax(i.extend(a,n));r.trigger("request",r,u,n);return u};var H={create:"POST",update:"PUT",patch:"PATCH","delete":"DELETE",read:"GET"};e.ajax=function(){return e.$.ajax.apply(e.$,arguments)};var $=e.Router=function(t){t||(t={});if(t.routes)this.routes=t.routes;this._bindRoutes();this.initialize.apply(this,arguments)};var A=/\((.*?)\)/g;var C=/(\(\?)?:\w+/g;var R=/\*\w+/g;var j=/[\-{}\[\]+?.,\\\^$|#\s]/g;i.extend($.prototype,l,{initialize:function(){},route:function(t,r,n){if(!i.isRegExp(t))t=this._routeToRegExp(t);if(i.isFunction(r)){n=r;r=""}if(!n)n=this[r];var s=this;e.history.route(t,function(i){var a=s._extractParameters(t,i);if(s.execute(n,a,r)!==false){s.trigger.apply(s,["route:"+r].concat(a));s.trigger("route",r,a);e.history.trigger("route",s,r,a)}});return this},execute:function(t,e,i){if(t)t.apply(this,e)},navigate:function(t,i){e.history.navigate(t,i);return this},_bindRoutes:function(){if(!this.routes)return;this.routes=i.result(this,"routes");var t,e=i.keys(this.routes);while((t=e.pop())!=null){this.route(t,this.routes[t])}},_routeToRegExp:function(t){t=t.replace(j,"\\$&").replace(A,"(?:$1)?").replace(C,function(t,e){return e?t:"([^/?]+)"}).replace(R,"([^?]*?)");return new RegExp("^"+t+"(?:\\?([\\s\\S]*))?$")},_extractParameters:function(t,e){var r=t.exec(e).slice(1);return i.map(r,function(t,e){if(e===r.length-1)return t||null;return t?decodeURIComponent(t):null})}});var M=e.History=function(){this.handlers=[];this.checkUrl=i.bind(this.checkUrl,this);if(typeof window!=="undefined"){this.location=window.location;this.history=window.history}};var N=/^[#\/]|\s+$/g;var O=/^\/+|\/+$/g;var U=/#.*$/;M.started=false;i.extend(M.prototype,l,{interval:50,atRoot:function(){var t=this.location.pathname.replace(/[^\/]$/,"$&/");return t===this.root&&!this.getSearch()},matchRoot:function(){var t=this.decodeFragment(this.location.pathname);var e=t.slice(0,this.root.length-1)+"/";return e===this.root},decodeFragment:function(t){return decodeURI(t.replace(/%25/g,"%2525"))},getSearch:function(){var t=this.location.href.replace(/#.*/,"").match(/\?.+/);return t?t[0]:""},getHash:function(t){var e=(t||this).location.href.match(/#(.*)$/);return e?e[1]:""},getPath:function(){var t=this.decodeFragment(this.location.pathname+this.getSearch()).slice(this.root.length-1);return t.charAt(0)==="/"?t.slice(1):t},getFragment:function(t){if(t==null){if(this._usePushState||!this._wantsHashChange){t=this.getPath()}else{t=this.getHash()}}return t.replace(N,"")},start:function(t){if(M.started)throw new Error("Backbone.history has already been started");M.started=true;this.options=i.extend({root:"/"},this.options,t);this.root=this.options.root;this._wantsHashChange=this.options.hashChange!==false;this._hasHashChange="onhashchange"in window&&(document.documentMode===void 0||document.documentMode>7);this._useHashChange=this._wantsHashChange&&this._hasHashChange;this._wantsPushState=!!this.options.pushState;this._hasPushState=!!(this.history&&this.history.pushState);this._usePushState=this._wantsPushState&&this._hasPushState;this.fragment=this.getFragment();this.root=("/"+this.root+"/").replace(O,"/");if(this._wantsHashChange&&this._wantsPushState){if(!this._hasPushState&&!this.atRoot()){var e=this.root.slice(0,-1)||"/";this.location.replace(e+"#"+this.getPath());return true}else if(this._hasPushState&&this.atRoot()){this.navigate(this.getHash(),{replace:true})}}if(!this._hasHashChange&&this._wantsHashChange&&!this._usePushState){this.iframe=document.createElement("iframe");this.iframe.src="javascript:0";this.iframe.style.display="none";this.iframe.tabIndex=-1;var r=document.body;var n=r.insertBefore(this.iframe,r.firstChild).contentWindow;n.document.open();n.document.close();n.location.hash="#"+this.fragment}var s=window.addEventListener||function(t,e){return attachEvent("on"+t,e)};if(this._usePushState){s("popstate",this.checkUrl,false)}else if(this._useHashChange&&!this.iframe){s("hashchange",this.checkUrl,false)}else if(this._wantsHashChange){this._checkUrlInterval=setInterval(this.checkUrl,this.interval)}if(!this.options.silent)return this.loadUrl()},stop:function(){var t=window.removeEventListener||function(t,e){return detachEvent("on"+t,e)};if(this._usePushState){t("popstate",this.checkUrl,false)}else if(this._useHashChange&&!this.iframe){t("hashchange",this.checkUrl,false)}if(this.iframe){document.body.removeChild(this.iframe);this.iframe=null}if(this._checkUrlInterval)clearInterval(this._checkUrlInterval);M.started=false},route:function(t,e){this.handlers.unshift({route:t,callback:e})},checkUrl:function(t){var e=this.getFragment();if(e===this.fragment&&this.iframe){e=this.getHash(this.iframe.contentWindow)}if(e===this.fragment)return false;if(this.iframe)this.navigate(e);this.loadUrl()},loadUrl:function(t){if(!this.matchRoot())return false;t=this.fragment=this.getFragment(t);return i.some(this.handlers,function(e){if(e.route.test(t)){e.callback(t);return true}})},navigate:function(t,e){if(!M.started)return false;if(!e||e===true)e={trigger:!!e};t=this.getFragment(t||"");var i=this.root;if(t===""||t.charAt(0)==="?"){i=i.slice(0,-1)||"/"}var r=i+t;t=this.decodeFragment(t.replace(U,""));if(this.fragment===t)return;this.fragment=t;if(this._usePushState){this.history[e.replace?"replaceState":"pushState"]({},document.title,r)}else if(this._wantsHashChange){this._updateHash(this.location,t,e.replace);if(this.iframe&&t!==this.getHash(this.iframe.contentWindow)){var n=this.iframe.contentWindow;if(!e.replace){n.document.open();n.document.close()}this._updateHash(n.location,t,e.replace)}}else{return this.location.assign(r)}if(e.trigger)return this.loadUrl(t)},_updateHash:function(t,e,i){if(i){var r=t.href.replace(/(javascript:|#).*$/,"");t.replace(r+"#"+e)}else{t.hash="#"+e}}});e.history=new M;var q=function(t,e){var r=this;var n;if(t&&i.has(t,"constructor")){n=t.constructor}else{n=function(){return r.apply(this,arguments)}}i.extend(n,r,e);var s=function(){this.constructor=n};s.prototype=r.prototype;n.prototype=new s;if(t)i.extend(n.prototype,t);n.__super__=r.prototype;return n};y.extend=x.extend=$.extend=I.extend=M.extend=q;var F=function(){throw new Error('A "url" property or function must be specified')};var z=function(t,e){var i=e.error;e.error=function(r){if(i)i.call(e.context,t,r,e);t.trigger("error",t,r,e)}};return e});
+(function(t){var e=typeof self=="object"&&self.self===self&&self||typeof global=="object"&&global.global===global&&global;if(typeof define==="function"&&define.amd){define(["underscore","jquery","exports"],function(i,n,r){e.Backbone=t(e,r,i,n)})}else if(typeof exports!=="undefined"){var i=require("underscore"),n;try{n=require("jquery")}catch(r){}t(e,exports,i,n)}else{e.Backbone=t(e,{},e._,e.jQuery||e.Zepto||e.ender||e.$)}})(function(t,e,i,n){var r=t.Backbone;var s=Array.prototype.slice;e.VERSION="1.4.0";e.$=n;e.noConflict=function(){t.Backbone=r;return this};e.emulateHTTP=false;e.emulateJSON=false;var a=e.Events={};var o=/\s+/;var h;var u=function(t,e,n,r,s){var a=0,h;if(n&&typeof n==="object"){if(r!==void 0&&"context"in s&&s.context===void 0)s.context=r;for(h=i.keys(n);a<h.length;a++){e=u(t,e,h[a],n[h[a]],s)}}else if(n&&o.test(n)){for(h=n.split(o);a<h.length;a++){e=t(e,h[a],r,s)}}else{e=t(e,n,r,s)}return e};a.on=function(t,e,i){this._events=u(l,this._events||{},t,e,{context:i,ctx:this,listening:h});if(h){var n=this._listeners||(this._listeners={});n[h.id]=h;h.interop=false}return this};a.listenTo=function(t,e,n){if(!t)return this;var r=t._listenId||(t._listenId=i.uniqueId("l"));var s=this._listeningTo||(this._listeningTo={});var a=h=s[r];if(!a){this._listenId||(this._listenId=i.uniqueId("l"));a=h=s[r]=new g(this,t)}var o=c(t,e,n,this);h=void 0;if(o)throw o;if(a.interop)a.on(e,n);return this};var l=function(t,e,i,n){if(i){var r=t[e]||(t[e]=[]);var s=n.context,a=n.ctx,o=n.listening;if(o)o.count++;r.push({callback:i,context:s,ctx:s||a,listening:o})}return t};var c=function(t,e,i,n){try{t.on(e,i,n)}catch(r){return r}};a.off=function(t,e,i){if(!this._events)return this;this._events=u(f,this._events,t,e,{context:i,listeners:this._listeners});return this};a.stopListening=function(t,e,n){var r=this._listeningTo;if(!r)return this;var s=t?[t._listenId]:i.keys(r);for(var a=0;a<s.length;a++){var o=r[s[a]];if(!o)break;o.obj.off(e,n,this);if(o.interop)o.off(e,n)}if(i.isEmpty(r))this._listeningTo=void 0;return this};var f=function(t,e,n,r){if(!t)return;var s=r.context,a=r.listeners;var o=0,h;if(!e&&!s&&!n){for(h=i.keys(a);o<h.length;o++){a[h[o]].cleanup()}return}h=e?[e]:i.keys(t);for(;o<h.length;o++){e=h[o];var u=t[e];if(!u)break;var l=[];for(var c=0;c<u.length;c++){var f=u[c];if(n&&n!==f.callback&&n!==f.callback._callback||s&&s!==f.context){l.push(f)}else{var d=f.listening;if(d)d.off(e,n)}}if(l.length){t[e]=l}else{delete t[e]}}return t};a.once=function(t,e,i){var n=u(d,{},t,e,this.off.bind(this));if(typeof t==="string"&&i==null)e=void 0;return this.on(n,e,i)};a.listenToOnce=function(t,e,i){var n=u(d,{},e,i,this.stopListening.bind(this,t));return this.listenTo(t,n)};var d=function(t,e,n,r){if(n){var s=t[e]=i.once(function(){r(e,s);n.apply(this,arguments)});s._callback=n}return t};a.trigger=function(t){if(!this._events)return this;var e=Math.max(0,arguments.length-1);var i=Array(e);for(var n=0;n<e;n++)i[n]=arguments[n+1];u(v,this._events,t,void 0,i);return this};var v=function(t,e,i,n){if(t){var r=t[e];var s=t.all;if(r&&s)s=s.slice();if(r)p(r,n);if(s)p(s,[e].concat(n))}return t};var p=function(t,e){var i,n=-1,r=t.length,s=e[0],a=e[1],o=e[2];switch(e.length){case 0:while(++n<r)(i=t[n]).callback.call(i.ctx);return;case 1:while(++n<r)(i=t[n]).callback.call(i.ctx,s);return;case 2:while(++n<r)(i=t[n]).callback.call(i.ctx,s,a);return;case 3:while(++n<r)(i=t[n]).callback.call(i.ctx,s,a,o);return;default:while(++n<r)(i=t[n]).callback.apply(i.ctx,e);return}};var g=function(t,e){this.id=t._listenId;this.listener=t;this.obj=e;this.interop=true;this.count=0;this._events=void 0};g.prototype.on=a.on;g.prototype.off=function(t,e){var i;if(this.interop){this._events=u(f,this._events,t,e,{context:void 0,listeners:void 0});i=!this._events}else{this.count--;i=this.count===0}if(i)this.cleanup()};g.prototype.cleanup=function(){delete this.listener._listeningTo[this.obj._listenId];if(!this.interop)delete this.obj._listeners[this.id]};a.bind=a.on;a.unbind=a.off;i.extend(e,a);var m=e.Model=function(t,e){var n=t||{};e||(e={});this.preinitialize.apply(this,arguments);this.cid=i.uniqueId(this.cidPrefix);this.attributes={};if(e.collection)this.collection=e.collection;if(e.parse)n=this.parse(n,e)||{};var r=i.result(this,"defaults");n=i.defaults(i.extend({},r,n),r);this.set(n,e);this.changed={};this.initialize.apply(this,arguments)};i.extend(m.prototype,a,{changed:null,validationError:null,idAttribute:"id",cidPrefix:"c",preinitialize:function(){},initialize:function(){},toJSON:function(t){return i.clone(this.attributes)},sync:function(){return e.sync.apply(this,arguments)},get:function(t){return this.attributes[t]},escape:function(t){return i.escape(this.get(t))},has:function(t){return this.get(t)!=null},matches:function(t){return!!i.iteratee(t,this)(this.attributes)},set:function(t,e,n){if(t==null)return this;var r;if(typeof t==="object"){r=t;n=e}else{(r={})[t]=e}n||(n={});if(!this._validate(r,n))return false;var s=n.unset;var a=n.silent;var o=[];var h=this._changing;this._changing=true;if(!h){this._previousAttributes=i.clone(this.attributes);this.changed={}}var u=this.attributes;var l=this.changed;var c=this._previousAttributes;for(var f in r){e=r[f];if(!i.isEqual(u[f],e))o.push(f);if(!i.isEqual(c[f],e)){l[f]=e}else{delete l[f]}s?delete u[f]:u[f]=e}if(this.idAttribute in r)this.id=this.get(this.idAttribute);if(!a){if(o.length)this._pending=n;for(var d=0;d<o.length;d++){this.trigger("change:"+o[d],this,u[o[d]],n)}}if(h)return this;if(!a){while(this._pending){n=this._pending;this._pending=false;this.trigger("change",this,n)}}this._pending=false;this._changing=false;return this},unset:function(t,e){return this.set(t,void 0,i.extend({},e,{unset:true}))},clear:function(t){var e={};for(var n in this.attributes)e[n]=void 0;return this.set(e,i.extend({},t,{unset:true}))},hasChanged:function(t){if(t==null)return!i.isEmpty(this.changed);return i.has(this.changed,t)},changedAttributes:function(t){if(!t)return this.hasChanged()?i.clone(this.changed):false;var e=this._changing?this._previousAttributes:this.attributes;var n={};var r;for(var s in t){var a=t[s];if(i.isEqual(e[s],a))continue;n[s]=a;r=true}return r?n:false},previous:function(t){if(t==null||!this._previousAttributes)return null;return this._previousAttributes[t]},previousAttributes:function(){return i.clone(this._previousAttributes)},fetch:function(t){t=i.extend({parse:true},t);var e=this;var n=t.success;t.success=function(i){var r=t.parse?e.parse(i,t):i;if(!e.set(r,t))return false;if(n)n.call(t.context,e,i,t);e.trigger("sync",e,i,t)};G(this,t);return this.sync("read",this,t)},save:function(t,e,n){var r;if(t==null||typeof t==="object"){r=t;n=e}else{(r={})[t]=e}n=i.extend({validate:true,parse:true},n);var s=n.wait;if(r&&!s){if(!this.set(r,n))return false}else if(!this._validate(r,n)){return false}var a=this;var o=n.success;var h=this.attributes;n.success=function(t){a.attributes=h;var e=n.parse?a.parse(t,n):t;if(s)e=i.extend({},r,e);if(e&&!a.set(e,n))return false;if(o)o.call(n.context,a,t,n);a.trigger("sync",a,t,n)};G(this,n);if(r&&s)this.attributes=i.extend({},h,r);var u=this.isNew()?"create":n.patch?"patch":"update";if(u==="patch"&&!n.attrs)n.attrs=r;var l=this.sync(u,this,n);this.attributes=h;return l},destroy:function(t){t=t?i.clone(t):{};var e=this;var n=t.success;var r=t.wait;var s=function(){e.stopListening();e.trigger("destroy",e,e.collection,t)};t.success=function(i){if(r)s();if(n)n.call(t.context,e,i,t);if(!e.isNew())e.trigger("sync",e,i,t)};var a=false;if(this.isNew()){i.defer(t.success)}else{G(this,t);a=this.sync("delete",this,t)}if(!r)s();return a},url:function(){var t=i.result(this,"urlRoot")||i.result(this.collection,"url")||V();if(this.isNew())return t;var e=this.get(this.idAttribute);return t.replace(/[^\/]$/,"$&/")+encodeURIComponent(e)},parse:function(t,e){return t},clone:function(){return new this.constructor(this.attributes)},isNew:function(){return!this.has(this.idAttribute)},isValid:function(t){return this._validate({},i.extend({},t,{validate:true}))},_validate:function(t,e){if(!e.validate||!this.validate)return true;t=i.extend({},this.attributes,t);var n=this.validationError=this.validate(t,e)||null;if(!n)return true;this.trigger("invalid",this,n,i.extend(e,{validationError:n}));return false}});var _=e.Collection=function(t,e){e||(e={});this.preinitialize.apply(this,arguments);if(e.model)this.model=e.model;if(e.comparator!==void 0)this.comparator=e.comparator;this._reset();this.initialize.apply(this,arguments);if(t)this.reset(t,i.extend({silent:true},e))};var y={add:true,remove:true,merge:true};var b={add:true,remove:false};var x=function(t,e,i){i=Math.min(Math.max(i,0),t.length);var n=Array(t.length-i);var r=e.length;var s;for(s=0;s<n.length;s++)n[s]=t[s+i];for(s=0;s<r;s++)t[s+i]=e[s];for(s=0;s<n.length;s++)t[s+r+i]=n[s]};i.extend(_.prototype,a,{model:m,preinitialize:function(){},initialize:function(){},toJSON:function(t){return this.map(function(e){return e.toJSON(t)})},sync:function(){return e.sync.apply(this,arguments)},add:function(t,e){return this.set(t,i.extend({merge:false},e,b))},remove:function(t,e){e=i.extend({},e);var n=!i.isArray(t);t=n?[t]:t.slice();var r=this._removeModels(t,e);if(!e.silent&&r.length){e.changes={added:[],merged:[],removed:r};this.trigger("update",this,e)}return n?r[0]:r},set:function(t,e){if(t==null)return;e=i.extend({},y,e);if(e.parse&&!this._isModel(t)){t=this.parse(t,e)||[]}var n=!i.isArray(t);t=n?[t]:t.slice();var r=e.at;if(r!=null)r=+r;if(r>this.length)r=this.length;if(r<0)r+=this.length+1;var s=[];var a=[];var o=[];var h=[];var u={};var l=e.add;var c=e.merge;var f=e.remove;var d=false;var v=this.comparator&&r==null&&e.sort!==false;var p=i.isString(this.comparator)?this.comparator:null;var g,m;for(m=0;m<t.length;m++){g=t[m];var _=this.get(g);if(_){if(c&&g!==_){var b=this._isModel(g)?g.attributes:g;if(e.parse)b=_.parse(b,e);_.set(b,e);o.push(_);if(v&&!d)d=_.hasChanged(p)}if(!u[_.cid]){u[_.cid]=true;s.push(_)}t[m]=_}else if(l){g=t[m]=this._prepareModel(g,e);if(g){a.push(g);this._addReference(g,e);u[g.cid]=true;s.push(g)}}}if(f){for(m=0;m<this.length;m++){g=this.models[m];if(!u[g.cid])h.push(g)}if(h.length)this._removeModels(h,e)}var w=false;var E=!v&&l&&f;if(s.length&&E){w=this.length!==s.length||i.some(this.models,function(t,e){return t!==s[e]});this.models.length=0;x(this.models,s,0);this.length=this.models.length}else if(a.length){if(v)d=true;x(this.models,a,r==null?this.length:r);this.length=this.models.length}if(d)this.sort({silent:true});if(!e.silent){for(m=0;m<a.length;m++){if(r!=null)e.index=r+m;g=a[m];g.trigger("add",g,this,e)}if(d||w)this.trigger("sort",this,e);if(a.length||h.length||o.length){e.changes={added:a,removed:h,merged:o};this.trigger("update",this,e)}}return n?t[0]:t},reset:function(t,e){e=e?i.clone(e):{};for(var n=0;n<this.models.length;n++){this._removeReference(this.models[n],e)}e.previousModels=this.models;this._reset();t=this.add(t,i.extend({silent:true},e));if(!e.silent)this.trigger("reset",this,e);return t},push:function(t,e){return this.add(t,i.extend({at:this.length},e))},pop:function(t){var e=this.at(this.length-1);return this.remove(e,t)},unshift:function(t,e){return this.add(t,i.extend({at:0},e))},shift:function(t){var e=this.at(0);return this.remove(e,t)},slice:function(){return s.apply(this.models,arguments)},get:function(t){if(t==null)return void 0;return this._byId[t]||this._byId[this.modelId(this._isModel(t)?t.attributes:t)]||t.cid&&this._byId[t.cid]},has:function(t){return this.get(t)!=null},at:function(t){if(t<0)t+=this.length;return this.models[t]},where:function(t,e){return this[e?"find":"filter"](t)},findWhere:function(t){return this.where(t,true)},sort:function(t){var e=this.comparator;if(!e)throw new Error("Cannot sort a set without a comparator");t||(t={});var n=e.length;if(i.isFunction(e))e=e.bind(this);if(n===1||i.isString(e)){this.models=this.sortBy(e)}else{this.models.sort(e)}if(!t.silent)this.trigger("sort",this,t);return this},pluck:function(t){return this.map(t+"")},fetch:function(t){t=i.extend({parse:true},t);var e=t.success;var n=this;t.success=function(i){var r=t.reset?"reset":"set";n[r](i,t);if(e)e.call(t.context,n,i,t);n.trigger("sync",n,i,t)};G(this,t);return this.sync("read",this,t)},create:function(t,e){e=e?i.clone(e):{};var n=e.wait;t=this._prepareModel(t,e);if(!t)return false;if(!n)this.add(t,e);var r=this;var s=e.success;e.success=function(t,e,i){if(n)r.add(t,i);if(s)s.call(i.context,t,e,i)};t.save(null,e);return t},parse:function(t,e){return t},clone:function(){return new this.constructor(this.models,{model:this.model,comparator:this.comparator})},modelId:function(t){return t[this.model.prototype.idAttribute||"id"]},values:function(){return new E(this,k)},keys:function(){return new E(this,I)},entries:function(){return new E(this,S)},_reset:function(){this.length=0;this.models=[];this._byId={}},_prepareModel:function(t,e){if(this._isModel(t)){if(!t.collection)t.collection=this;return t}e=e?i.clone(e):{};e.collection=this;var n=new this.model(t,e);if(!n.validationError)return n;this.trigger("invalid",this,n.validationError,e);return false},_removeModels:function(t,e){var i=[];for(var n=0;n<t.length;n++){var r=this.get(t[n]);if(!r)continue;var s=this.indexOf(r);this.models.splice(s,1);this.length--;delete this._byId[r.cid];var a=this.modelId(r.attributes);if(a!=null)delete this._byId[a];if(!e.silent){e.index=s;r.trigger("remove",r,this,e)}i.push(r);this._removeReference(r,e)}return i},_isModel:function(t){return t instanceof m},_addReference:function(t,e){this._byId[t.cid]=t;var i=this.modelId(t.attributes);if(i!=null)this._byId[i]=t;t.on("all",this._onModelEvent,this)},_removeReference:function(t,e){delete this._byId[t.cid];var i=this.modelId(t.attributes);if(i!=null)delete this._byId[i];if(this===t.collection)delete t.collection;t.off("all",this._onModelEvent,this)},_onModelEvent:function(t,e,i,n){if(e){if((t==="add"||t==="remove")&&i!==this)return;if(t==="destroy")this.remove(e,n);if(t==="change"){var r=this.modelId(e.previousAttributes());var s=this.modelId(e.attributes);if(r!==s){if(r!=null)delete this._byId[r];if(s!=null)this._byId[s]=e}}}this.trigger.apply(this,arguments)}});var w=typeof Symbol==="function"&&Symbol.iterator;if(w){_.prototype[w]=_.prototype.values}var E=function(t,e){this._collection=t;this._kind=e;this._index=0};var k=1;var I=2;var S=3;if(w){E.prototype[w]=function(){return this}}E.prototype.next=function(){if(this._collection){if(this._index<this._collection.length){var t=this._collection.at(this._index);this._index++;var e;if(this._kind===k){e=t}else{var i=this._collection.modelId(t.attributes);if(this._kind===I){e=i}else{e=[i,t]}}return{value:e,done:false}}this._collection=void 0}return{value:void 0,done:true}};var T=e.View=function(t){this.cid=i.uniqueId("view");this.preinitialize.apply(this,arguments);i.extend(this,i.pick(t,H));this._ensureElement();this.initialize.apply(this,arguments)};var P=/^(\S+)\s*(.*)$/;var H=["model","collection","el","id","attributes","className","tagName","events"];i.extend(T.prototype,a,{tagName:"div",$:function(t){return this.$el.find(t)},preinitialize:function(){},initialize:function(){},render:function(){return this},remove:function(){this._removeElement();this.stopListening();return this},_removeElement:function(){this.$el.remove()},setElement:function(t){this.undelegateEvents();this._setElement(t);this.delegateEvents();return this},_setElement:function(t){this.$el=t instanceof e.$?t:e.$(t);this.el=this.$el[0]},delegateEvents:function(t){t||(t=i.result(this,"events"));if(!t)return this;this.undelegateEvents();for(var e in t){var n=t[e];if(!i.isFunction(n))n=this[n];if(!n)continue;var r=e.match(P);this.delegate(r[1],r[2],n.bind(this))}return this},delegate:function(t,e,i){this.$el.on(t+".delegateEvents"+this.cid,e,i);return this},undelegateEvents:function(){if(this.$el)this.$el.off(".delegateEvents"+this.cid);return this},undelegate:function(t,e,i){this.$el.off(t+".delegateEvents"+this.cid,e,i);return this},_createElement:function(t){return document.createElement(t)},_ensureElement:function(){if(!this.el){var t=i.extend({},i.result(this,"attributes"));if(this.id)t.id=i.result(this,"id");if(this.className)t["class"]=i.result(this,"className");this.setElement(this._createElement(i.result(this,"tagName")));this._setAttributes(t)}else{this.setElement(i.result(this,"el"))}},_setAttributes:function(t){this.$el.attr(t)}});var $=function(t,e,i,n){switch(e){case 1:return function(){return t[i](this[n])};case 2:return function(e){return t[i](this[n],e)};case 3:return function(e,r){return t[i](this[n],C(e,this),r)};case 4:return function(e,r,s){return t[i](this[n],C(e,this),r,s)};default:return function(){var e=s.call(arguments);e.unshift(this[n]);return t[i].apply(t,e)}}};var A=function(t,e,n,r){i.each(n,function(i,n){if(e[n])t.prototype[n]=$(e,i,n,r)})};var C=function(t,e){if(i.isFunction(t))return t;if(i.isObject(t)&&!e._isModel(t))return R(t);if(i.isString(t))return function(e){return e.get(t)};return t};var R=function(t){var e=i.matches(t);return function(t){return e(t.attributes)}};var M={forEach:3,each:3,map:3,collect:3,reduce:0,foldl:0,inject:0,reduceRight:0,foldr:0,find:3,detect:3,filter:3,select:3,reject:3,every:3,all:3,some:3,any:3,include:3,includes:3,contains:3,invoke:0,max:3,min:3,toArray:1,size:1,first:3,head:3,take:3,initial:3,rest:3,tail:3,drop:3,last:3,without:0,difference:0,indexOf:3,shuffle:1,lastIndexOf:3,isEmpty:1,chain:1,sample:3,partition:3,groupBy:3,countBy:3,sortBy:3,indexBy:3,findIndex:3,findLastIndex:3};var N={keys:1,values:1,pairs:1,invert:1,pick:0,omit:0,chain:1,isEmpty:1};i.each([[_,M,"models"],[m,N,"attributes"]],function(t){var e=t[0],n=t[1],r=t[2];e.mixin=function(t){var n=i.reduce(i.functions(t),function(t,e){t[e]=0;return t},{});A(e,t,n,r)};A(e,i,n,r)});e.sync=function(t,n,r){var s=j[t];i.defaults(r||(r={}),{emulateHTTP:e.emulateHTTP,emulateJSON:e.emulateJSON});var a={type:s,dataType:"json"};if(!r.url){a.url=i.result(n,"url")||V()}if(r.data==null&&n&&(t==="create"||t==="update"||t==="patch")){a.contentType="application/json";a.data=JSON.stringify(r.attrs||n.toJSON(r))}if(r.emulateJSON){a.contentType="application/x-www-form-urlencoded";a.data=a.data?{model:a.data}:{}}if(r.emulateHTTP&&(s==="PUT"||s==="DELETE"||s==="PATCH")){a.type="POST";if(r.emulateJSON)a.data._method=s;var o=r.beforeSend;r.beforeSend=function(t){t.setRequestHeader("X-HTTP-Method-Override",s);if(o)return o.apply(this,arguments)}}if(a.type!=="GET"&&!r.emulateJSON){a.processData=false}var h=r.error;r.error=function(t,e,i){r.textStatus=e;r.errorThrown=i;if(h)h.call(r.context,t,e,i)};var u=r.xhr=e.ajax(i.extend(a,r));n.trigger("request",n,u,r);return u};var j={create:"POST",update:"PUT",patch:"PATCH","delete":"DELETE",read:"GET"};e.ajax=function(){return e.$.ajax.apply(e.$,arguments)};var O=e.Router=function(t){t||(t={});this.preinitialize.apply(this,arguments);if(t.routes)this.routes=t.routes;this._bindRoutes();this.initialize.apply(this,arguments)};var U=/\((.*?)\)/g;var z=/(\(\?)?:\w+/g;var q=/\*\w+/g;var F=/[\-{}\[\]+?.,\\\^$|#\s]/g;i.extend(O.prototype,a,{preinitialize:function(){},initialize:function(){},route:function(t,n,r){if(!i.isRegExp(t))t=this._routeToRegExp(t);if(i.isFunction(n)){r=n;n=""}if(!r)r=this[n];var s=this;e.history.route(t,function(i){var a=s._extractParameters(t,i);if(s.execute(r,a,n)!==false){s.trigger.apply(s,["route:"+n].concat(a));s.trigger("route",n,a);e.history.trigger("route",s,n,a)}});return this},execute:function(t,e,i){if(t)t.apply(this,e)},navigate:function(t,i){e.history.navigate(t,i);return this},_bindRoutes:function(){if(!this.routes)return;this.routes=i.result(this,"routes");var t,e=i.keys(this.routes);while((t=e.pop())!=null){this.route(t,this.routes[t])}},_routeToRegExp:function(t){t=t.replace(F,"\\$&").replace(U,"(?:$1)?").replace(z,function(t,e){return e?t:"([^/?]+)"}).replace(q,"([^?]*?)");return new RegExp("^"+t+"(?:\\?([\\s\\S]*))?$")},_extractParameters:function(t,e){var n=t.exec(e).slice(1);return i.map(n,function(t,e){if(e===n.length-1)return t||null;return t?decodeURIComponent(t):null})}});var B=e.History=function(){this.handlers=[];this.checkUrl=this.checkUrl.bind(this);if(typeof window!=="undefined"){this.location=window.location;this.history=window.history}};var J=/^[#\/]|\s+$/g;var L=/^\/+|\/+$/g;var W=/#.*$/;B.started=false;i.extend(B.prototype,a,{interval:50,atRoot:function(){var t=this.location.pathname.replace(/[^\/]$/,"$&/");return t===this.root&&!this.getSearch()},matchRoot:function(){var t=this.decodeFragment(this.location.pathname);var e=t.slice(0,this.root.length-1)+"/";return e===this.root},decodeFragment:function(t){return decodeURI(t.replace(/%25/g,"%2525"))},getSearch:function(){var t=this.location.href.replace(/#.*/,"").match(/\?.+/);return t?t[0]:""},getHash:function(t){var e=(t||this).location.href.match(/#(.*)$/);return e?e[1]:""},getPath:function(){var t=this.decodeFragment(this.location.pathname+this.getSearch()).slice(this.root.length-1);return t.charAt(0)==="/"?t.slice(1):t},getFragment:function(t){if(t==null){if(this._usePushState||!this._wantsHashChange){t=this.getPath()}else{t=this.getHash()}}return t.replace(J,"")},start:function(t){if(B.started)throw new Error("Backbone.history has already been started");B.started=true;this.options=i.extend({root:"/"},this.options,t);this.root=this.options.root;this._wantsHashChange=this.options.hashChange!==false;this._hasHashChange="onhashchange"in window&&(document.documentMode===void 0||document.documentMode>7);this._useHashChange=this._wantsHashChange&&this._hasHashChange;this._wantsPushState=!!this.options.pushState;this._hasPushState=!!(this.history&&this.history.pushState);this._usePushState=this._wantsPushState&&this._hasPushState;this.fragment=this.getFragment();this.root=("/"+this.root+"/").replace(L,"/");if(this._wantsHashChange&&this._wantsPushState){if(!this._hasPushState&&!this.atRoot()){var e=this.root.slice(0,-1)||"/";this.location.replace(e+"#"+this.getPath());return true}else if(this._hasPushState&&this.atRoot()){this.navigate(this.getHash(),{replace:true})}}if(!this._hasHashChange&&this._wantsHashChange&&!this._usePushState){this.iframe=document.createElement("iframe");this.iframe.src="javascript:0";this.iframe.style.display="none";this.iframe.tabIndex=-1;var n=document.body;var r=n.insertBefore(this.iframe,n.firstChild).contentWindow;r.document.open();r.document.close();r.location.hash="#"+this.fragment}var s=window.addEventListener||function(t,e){return attachEvent("on"+t,e)};if(this._usePushState){s("popstate",this.checkUrl,false)}else if(this._useHashChange&&!this.iframe){s("hashchange",this.checkUrl,false)}else if(this._wantsHashChange){this._checkUrlInterval=setInterval(this.checkUrl,this.interval)}if(!this.options.silent)return this.loadUrl()},stop:function(){var t=window.removeEventListener||function(t,e){return detachEvent("on"+t,e)};if(this._usePushState){t("popstate",this.checkUrl,false)}else if(this._useHashChange&&!this.iframe){t("hashchange",this.checkUrl,false)}if(this.iframe){document.body.removeChild(this.iframe);this.iframe=null}if(this._checkUrlInterval)clearInterval(this._checkUrlInterval);B.started=false},route:function(t,e){this.handlers.unshift({route:t,callback:e})},checkUrl:function(t){var e=this.getFragment();if(e===this.fragment&&this.iframe){e=this.getHash(this.iframe.contentWindow)}if(e===this.fragment)return false;if(this.iframe)this.navigate(e);this.loadUrl()},loadUrl:function(t){if(!this.matchRoot())return false;t=this.fragment=this.getFragment(t);return i.some(this.handlers,function(e){if(e.route.test(t)){e.callback(t);return true}})},navigate:function(t,e){if(!B.started)return false;if(!e||e===true)e={trigger:!!e};t=this.getFragment(t||"");var i=this.root;if(t===""||t.charAt(0)==="?"){i=i.slice(0,-1)||"/"}var n=i+t;t=t.replace(W,"");var r=this.decodeFragment(t);if(this.fragment===r)return;this.fragment=r;if(this._usePushState){this.history[e.replace?"replaceState":"pushState"]({},document.title,n)}else if(this._wantsHashChange){this._updateHash(this.location,t,e.replace);if(this.iframe&&t!==this.getHash(this.iframe.contentWindow)){var s=this.iframe.contentWindow;if(!e.replace){s.document.open();s.document.close()}this._updateHash(s.location,t,e.replace)}}else{return this.location.assign(n)}if(e.trigger)return this.loadUrl(t)},_updateHash:function(t,e,i){if(i){var n=t.href.replace(/(javascript:|#).*$/,"");t.replace(n+"#"+e)}else{t.hash="#"+e}}});e.history=new B;var D=function(t,e){var n=this;var r;if(t&&i.has(t,"constructor")){r=t.constructor}else{r=function(){return n.apply(this,arguments)}}i.extend(r,n,e);r.prototype=i.create(n.prototype,t);r.prototype.constructor=r;r.__super__=n.prototype;return r};m.extend=_.extend=O.extend=T.extend=B.extend=D;var V=function(){throw new Error('A "url" property or function must be specified')};var G=function(t,e){var i=e.error;e.error=function(n){if(i)i.call(e.context,t,n,e);t.trigger("error",t,n,e)}};return e});
//# sourceMappingURL=backbone-min.map
\ No newline at end of file
diff --git a/web/core/assets/vendor/backbone/backbone-min.map b/web/core/assets/vendor/backbone/backbone-min.map
index b728f9b3dd..a45f7c13e9 100644
--- a/web/core/assets/vendor/backbone/backbone-min.map
+++ b/web/core/assets/vendor/backbone/backbone-min.map
@@ -1 +1 @@
-{"version":3,"file":"backbone-min.js","sources":["backbone.js"],"names":["factory","root","self","global","define","amd","_","$","exports","Backbone","require","e","jQuery","Zepto","ender","previousBackbone","slice","Array","prototype","VERSION","noConflict","this","emulateHTTP","emulateJSON","addMethod","length","method","attribute","value","iteratee","context","cb","defaultVal","args","call","arguments","unshift","apply","addUnderscoreMethods","Class","methods","each","instance","isFunction","isObject","_isModel","modelMatcher","isString","model","get","attrs","matcher","matches","attributes","Events","eventSplitter","eventsApi","events","name","callback","opts","i","names","keys","test","split","on","internalOn","obj","listening","_events","onApi","ctx","listeners","_listeners","id","listenTo","_listenId","uniqueId","listeningTo","_listeningTo","thisId","objId","count","options","handlers","push","off","offApi","stopListening","ids","isEmpty","remaining","j","handler","_callback","size","once","onceMap","bind","listenToOnce","map","offer","trigger","Math","max","triggerApi","objEvents","allEvents","all","triggerEvents","concat","ev","l","a1","a2","a3","unbind","extend","Model","cid","cidPrefix","collection","parse","defaults","result","set","changed","initialize","validationError","idAttribute","toJSON","clone","sync","attr","escape","has","key","val","_validate","unset","silent","changes","changing","_changing","_previousAttributes","current","prev","isEqual","_pending","clear","hasChanged","changedAttributes","diff","old","previous","previousAttributes","fetch","success","resp","serverAttrs","wrapError","save","validate","wait","isNew","patch","xhr","destroy","defer","url","base","urlError","replace","encodeURIComponent","constructor","isValid","error","modelMethods","values","pairs","invert","pick","omit","chain","Collection","models","comparator","_reset","reset","setOptions","add","remove","merge","addOptions","splice","array","insert","at","min","tail","singular","isArray","removed","_removeModels","toAdd","toRemove","modelMap","sort","sortable","sortAttr","existing","_prepareModel","_addReference","orderChanged","some","index","_removeReference","previousModels","pop","shift","modelId","_byId","where","first","findWhere","Error","sortBy","pluck","invoke","create","callbackOpts","indexOf","_onModelEvent","event","prevId","collectionMethods","forEach","collect","reduce","foldl","inject","reduceRight","foldr","find","detect","filter","select","reject","every","any","include","includes","contains","toArray","head","take","initial","rest","drop","last","without","difference","shuffle","lastIndexOf","sample","partition","groupBy","countBy","indexBy","View","viewOptions","_ensureElement","delegateEventSplitter","tagName","selector","$el","render","_removeElement","setElement","element","undelegateEvents","_setElement","delegateEvents","el","match","delegate","eventName","listener","undelegate","_createElement","document","createElement","className","_setAttributes","type","methodMap","params","dataType","data","contentType","JSON","stringify","_method","beforeSend","setRequestHeader","processData","textStatus","errorThrown","ajax","update","delete","read","Router","routes","_bindRoutes","optionalParam","namedParam","splatParam","escapeRegExp","route","isRegExp","_routeToRegExp","router","history","fragment","_extractParameters","execute","navigate","optional","RegExp","exec","param","decodeURIComponent","History","checkUrl","window","location","routeStripper","rootStripper","pathStripper","started","interval","atRoot","path","pathname","getSearch","matchRoot","decodeFragment","decodeURI","href","getHash","getPath","charAt","getFragment","_usePushState","_wantsHashChange","start","hashChange","_hasHashChange","documentMode","_useHashChange","_wantsPushState","pushState","_hasPushState","iframe","src","style","display","tabIndex","body","iWindow","insertBefore","firstChild","contentWindow","open","close","hash","addEventListener","attachEvent","_checkUrlInterval","setInterval","loadUrl","stop","removeEventListener","detachEvent","removeChild","clearInterval","title","_updateHash","assign","protoProps","staticProps","parent","child","Surrogate","__super__"],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"backbone-min.js","sources":["backbone.js"],"names":["factory","root","self","global","define","amd","_","$","exports","Backbone","require","e","jQuery","Zepto","ender","previousBackbone","slice","Array","prototype","VERSION","noConflict","this","emulateHTTP","emulateJSON","Events","eventSplitter","_listening","eventsApi","iteratee","events","name","callback","opts","i","names","context","keys","length","test","split","on","_events","onApi","ctx","listening","listeners","_listeners","id","interop","listenTo","obj","_listenId","uniqueId","listeningTo","_listeningTo","Listening","error","tryCatchOn","options","handlers","count","push","off","offApi","stopListening","ids","isEmpty","cleanup","remaining","j","handler","_callback","once","onceMap","bind","listenToOnce","map","offer","apply","arguments","trigger","Math","max","args","triggerApi","objEvents","allEvents","all","triggerEvents","concat","ev","l","a1","a2","a3","call","listener","unbind","extend","Model","attributes","attrs","preinitialize","cid","cidPrefix","collection","parse","defaults","result","set","changed","initialize","validationError","idAttribute","toJSON","clone","sync","get","attr","escape","has","matches","key","val","_validate","unset","silent","changes","changing","_changing","_previousAttributes","current","prev","isEqual","_pending","clear","hasChanged","changedAttributes","diff","old","previous","previousAttributes","fetch","model","success","resp","serverAttrs","wrapError","save","validate","wait","method","isNew","patch","xhr","destroy","defer","url","base","urlError","replace","encodeURIComponent","constructor","isValid","Collection","models","comparator","_reset","reset","setOptions","add","remove","merge","addOptions","splice","array","insert","at","min","tail","singular","isArray","removed","_removeModels","added","merged","_isModel","toAdd","toMerge","toRemove","modelMap","sort","sortable","sortAttr","isString","existing","_prepareModel","_addReference","orderChanged","some","m","index","_removeReference","previousModels","pop","unshift","shift","_byId","modelId","where","first","findWhere","Error","isFunction","sortBy","pluck","create","callbackOpts","values","CollectionIterator","ITERATOR_VALUES","ITERATOR_KEYS","entries","ITERATOR_KEYSVALUES","indexOf","_onModelEvent","event","prevId","$$iterator","Symbol","iterator","kind","_collection","_kind","_index","next","value","done","View","pick","viewOptions","_ensureElement","delegateEventSplitter","tagName","selector","$el","find","render","_removeElement","setElement","element","undelegateEvents","_setElement","delegateEvents","el","match","delegate","eventName","undelegate","_createElement","document","createElement","className","_setAttributes","addMethod","attribute","cb","defaultVal","addUnderscoreMethods","Class","methods","each","instance","isObject","modelMatcher","matcher","collectionMethods","forEach","collect","reduce","foldl","inject","reduceRight","foldr","detect","filter","select","reject","every","any","include","includes","contains","invoke","toArray","size","head","take","initial","rest","drop","last","without","difference","shuffle","lastIndexOf","chain","sample","partition","groupBy","countBy","indexBy","findIndex","findLastIndex","modelMethods","pairs","invert","omit","config","Base","mixin","mappings","functions","memo","type","methodMap","params","dataType","data","contentType","JSON","stringify","_method","beforeSend","setRequestHeader","processData","textStatus","errorThrown","ajax","update","delete","read","Router","routes","_bindRoutes","optionalParam","namedParam","splatParam","escapeRegExp","route","isRegExp","_routeToRegExp","router","history","fragment","_extractParameters","execute","navigate","optional","RegExp","exec","param","decodeURIComponent","History","checkUrl","window","location","routeStripper","rootStripper","pathStripper","started","interval","atRoot","path","pathname","getSearch","matchRoot","decodeFragment","rootPath","decodeURI","href","getHash","getPath","charAt","getFragment","_usePushState","_wantsHashChange","start","hashChange","_hasHashChange","documentMode","_useHashChange","_wantsPushState","pushState","_hasPushState","iframe","src","style","display","tabIndex","body","iWindow","insertBefore","firstChild","contentWindow","open","close","hash","addEventListener","attachEvent","_checkUrlInterval","setInterval","loadUrl","stop","removeEventListener","detachEvent","removeChild","clearInterval","decodedFragment","title","_updateHash","assign","protoProps","staticProps","parent","child","__super__"],"mappings":"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"}
\ No newline at end of file
diff --git a/web/core/assets/vendor/backbone/backbone.js b/web/core/assets/vendor/backbone/backbone.js
index c924965621..3e09d0dcb0 100644
--- a/web/core/assets/vendor/backbone/backbone.js
+++ b/web/core/assets/vendor/backbone/backbone.js
@@ -1,6 +1,6 @@
-// Backbone.js 1.2.3
+// Backbone.js 1.4.0
-// (c) 2010-2015 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
+// (c) 2010-2019 Jeremy Ashkenas and DocumentCloud
// Backbone may be freely distributed under the MIT license.
// For all details and documentation:
// http://backbonejs.org
@@ -9,8 +9,8 @@
// Establish the root object, `window` (`self`) in the browser, or `global` on the server.
// We use `self` instead of `window` for `WebWorker` support.
- var root = (typeof self == 'object' && self.self == self && self) ||
- (typeof global == 'object' && global.global == global && global);
+ var root = typeof self == 'object' && self.self === self && self ||
+ typeof global == 'object' && global.global === global && global;
// Set up Backbone appropriately for the environment. Start with AMD.
if (typeof define === 'function' && define.amd) {
@@ -23,15 +23,15 @@
// Next for Node.js or CommonJS. jQuery may not be needed as a module.
} else if (typeof exports !== 'undefined') {
var _ = require('underscore'), $;
- try { $ = require('jquery'); } catch(e) {}
+ try { $ = require('jquery'); } catch (e) {}
factory(root, exports, _, $);
// Finally, as a browser global.
} else {
- root.Backbone = factory(root, {}, root._, (root.jQuery || root.Zepto || root.ender || root.$));
+ root.Backbone = factory(root, {}, root._, root.jQuery || root.Zepto || root.ender || root.$);
}
-}(function(root, Backbone, _, $) {
+})(function(root, Backbone, _, $) {
// Initial Setup
// -------------
@@ -44,7 +44,7 @@
var slice = Array.prototype.slice;
// Current version of the library. Keep in sync with `package.json`.
- Backbone.VERSION = '1.2.3';
+ Backbone.VERSION = '1.4.0';
// For Backbone's purposes, jQuery, Zepto, Ender, or My Library (kidding) owns
// the `$` variable.
@@ -68,54 +68,6 @@
// form param named `model`.
Backbone.emulateJSON = false;
- // Proxy Backbone class methods to Underscore functions, wrapping the model's
- // `attributes` object or collection's `models` array behind the scenes.
- //
- // collection.filter(function(model) { return model.get('age') > 10 });
- // collection.each(this.addView);
- //
- // `Function#apply` can be slow so we use the method's arg count, if we know it.
- var addMethod = function(length, method, attribute) {
- switch (length) {
- case 1: return function() {
- return _[method](this[attribute]);
- };
- case 2: return function(value) {
- return _[method](this[attribute], value);
- };
- case 3: return function(iteratee, context) {
- return _[method](this[attribute], cb(iteratee, this), context);
- };
- case 4: return function(iteratee, defaultVal, context) {
- return _[method](this[attribute], cb(iteratee, this), defaultVal, context);
- };
- default: return function() {
- var args = slice.call(arguments);
- args.unshift(this[attribute]);
- return _[method].apply(_, args);
- };
- }
- };
- var addUnderscoreMethods = function(Class, methods, attribute) {
- _.each(methods, function(length, method) {
- if (_[method]) Class.prototype[method] = addMethod(length, method, attribute);
- });
- };
-
- // Support `collection.sortBy('attr')` and `collection.findWhere({id: 1})`.
- var cb = function(iteratee, instance) {
- if (_.isFunction(iteratee)) return iteratee;
- if (_.isObject(iteratee) && !instance._isModel(iteratee)) return modelMatcher(iteratee);
- if (_.isString(iteratee)) return function(model) { return model.get(iteratee); };
- return iteratee;
- };
- var modelMatcher = function(attrs) {
- var matcher = _.matches(attrs);
- return function(model) {
- return matcher(model.attributes);
- };
- };
-
// Backbone.Events
// ---------------
@@ -134,6 +86,9 @@
// Regular expression used to split event strings.
var eventSplitter = /\s+/;
+ // A private global variable to share between listeners and listenees.
+ var _listening;
+
// Iterates over the standard `event, callback` (as well as the fancy multiple
// space-separated events `"change blur", callback` and jQuery-style event
// maps `{event: callback}`).
@@ -146,7 +101,7 @@
events = eventsApi(iteratee, events, names[i], name[names[i]], opts);
}
} else if (name && eventSplitter.test(name)) {
- // Handle space separated event names by delegating them individually.
+ // Handle space-separated event names by delegating them individually.
for (names = name.split(eventSplitter); i < names.length; i++) {
events = iteratee(events, names[i], callback, opts);
}
@@ -160,43 +115,47 @@
// Bind an event to a `callback` function. Passing `"all"` will bind
// the callback to all events fired.
Events.on = function(name, callback, context) {
- return internalOn(this, name, callback, context);
- };
-
- // Guard the `listening` argument from the public API.
- var internalOn = function(obj, name, callback, context, listening) {
- obj._events = eventsApi(onApi, obj._events || {}, name, callback, {
- context: context,
- ctx: obj,
- listening: listening
+ this._events = eventsApi(onApi, this._events || {}, name, callback, {
+ context: context,
+ ctx: this,
+ listening: _listening
});
- if (listening) {
- var listeners = obj._listeners || (obj._listeners = {});
- listeners[listening.id] = listening;
+ if (_listening) {
+ var listeners = this._listeners || (this._listeners = {});
+ listeners[_listening.id] = _listening;
+ // Allow the listening to use a counter, instead of tracking
+ // callbacks for library interop
+ _listening.interop = false;
}
- return obj;
+ return this;
};
// Inversion-of-control versions of `on`. Tell *this* object to listen to
// an event in another object... keeping track of what it's listening to
// for easier unbinding later.
- Events.listenTo = function(obj, name, callback) {
+ Events.listenTo = function(obj, name, callback) {
if (!obj) return this;
var id = obj._listenId || (obj._listenId = _.uniqueId('l'));
var listeningTo = this._listeningTo || (this._listeningTo = {});
- var listening = listeningTo[id];
+ var listening = _listening = listeningTo[id];
// This object is not listening to any other events on `obj` yet.
// Setup the necessary references to track the listening callbacks.
if (!listening) {
- var thisId = this._listenId || (this._listenId = _.uniqueId('l'));
- listening = listeningTo[id] = {obj: obj, objId: id, id: thisId, listeningTo: listeningTo, count: 0};
+ this._listenId || (this._listenId = _.uniqueId('l'));
+ listening = _listening = listeningTo[id] = new Listening(this, obj);
}
- // Bind callbacks on obj, and keep track of them on listening.
- internalOn(obj, name, callback, this, listening);
+ // Bind callbacks on obj.
+ var error = tryCatchOn(obj, name, callback, this);
+ _listening = void 0;
+
+ if (error) throw error;
+ // If the target obj is not Backbone.Events, track events manually.
+ if (listening.interop) listening.on(name, callback);
+
return this;
};
@@ -207,32 +166,42 @@
var context = options.context, ctx = options.ctx, listening = options.listening;
if (listening) listening.count++;
- handlers.push({ callback: callback, context: context, ctx: context || ctx, listening: listening });
+ handlers.push({callback: callback, context: context, ctx: context || ctx, listening: listening});
}
return events;
};
+ // An try-catch guarded #on function, to prevent poisoning the global
+ // `_listening` variable.
+ var tryCatchOn = function(obj, name, callback, context) {
+ try {
+ obj.on(name, callback, context);
+ } catch (e) {
+ return e;
+ }
+ };
+
// Remove one or many callbacks. If `context` is null, removes all
// callbacks with that function. If `callback` is null, removes all
// callbacks for the event. If `name` is null, removes all bound
// callbacks for all events.
- Events.off = function(name, callback, context) {
+ Events.off = function(name, callback, context) {
if (!this._events) return this;
this._events = eventsApi(offApi, this._events, name, callback, {
- context: context,
- listeners: this._listeners
+ context: context,
+ listeners: this._listeners
});
+
return this;
};
// Tell this object to stop listening to either specific events ... or
// to every object it's currently listening to.
- Events.stopListening = function(obj, name, callback) {
+ Events.stopListening = function(obj, name, callback) {
var listeningTo = this._listeningTo;
if (!listeningTo) return this;
var ids = obj ? [obj._listenId] : _.keys(listeningTo);
-
for (var i = 0; i < ids.length; i++) {
var listening = listeningTo[ids[i]];
@@ -241,6 +210,7 @@
if (!listening) break;
listening.obj.off(name, callback, this);
+ if (listening.interop) listening.off(name, callback);
}
if (_.isEmpty(listeningTo)) this._listeningTo = void 0;
@@ -251,21 +221,18 @@
var offApi = function(events, name, callback, options) {
if (!events) return;
- var i = 0, listening;
var context = options.context, listeners = options.listeners;
+ var i = 0, names;
- // Delete all events listeners and "drop" events.
- if (!name && !callback && !context) {
- var ids = _.keys(listeners);
- for (; i < ids.length; i++) {
- listening = listeners[ids[i]];
- delete listeners[listening.id];
- delete listening.listeningTo[listening.objId];
+ // Delete all event listeners and "drop" events.
+ if (!name && !context && !callback) {
+ for (names = _.keys(listeners); i < names.length; i++) {
+ listeners[names[i]].cleanup();
}
return;
}
- var names = name ? [name] : _.keys(events);
+ names = name ? [name] : _.keys(events);
for (; i < names.length; i++) {
name = names[i];
var handlers = events[name];
@@ -273,7 +240,7 @@
// Bail out if there are no events stored.
if (!handlers) break;
- // Replace events if there are any remaining. Otherwise, clean up.
+ // Find any remaining events.
var remaining = [];
for (var j = 0; j < handlers.length; j++) {
var handler = handlers[j];
@@ -284,38 +251,37 @@
) {
remaining.push(handler);
} else {
- listening = handler.listening;
- if (listening && --listening.count === 0) {
- delete listeners[listening.id];
- delete listening.listeningTo[listening.objId];
- }
+ var listening = handler.listening;
+ if (listening) listening.off(name, callback);
}
}
- // Update tail event if the list has any events. Otherwise, clean up.
+ // Replace events if there are any remaining. Otherwise, clean up.
if (remaining.length) {
events[name] = remaining;
} else {
delete events[name];
}
}
- if (_.size(events)) return events;
+
+ return events;
};
// Bind an event to only be triggered a single time. After the first time
// the callback is invoked, its listener will be removed. If multiple events
// are passed in using the space-separated syntax, the handler will fire
// once for each event, not once for a combination of all events.
- Events.once = function(name, callback, context) {
+ Events.once = function(name, callback, context) {
// Map the event into a `{event: once}` object.
- var events = eventsApi(onceMap, {}, name, callback, _.bind(this.off, this));
- return this.on(events, void 0, context);
+ var events = eventsApi(onceMap, {}, name, callback, this.off.bind(this));
+ if (typeof name === 'string' && context == null) callback = void 0;
+ return this.on(events, callback, context);
};
// Inversion-of-control versions of `once`.
- Events.listenToOnce = function(obj, name, callback) {
+ Events.listenToOnce = function(obj, name, callback) {
// Map the event into a `{event: once}` object.
- var events = eventsApi(onceMap, {}, name, callback, _.bind(this.stopListening, this, obj));
+ var events = eventsApi(onceMap, {}, name, callback, this.stopListening.bind(this, obj));
return this.listenTo(obj, events);
};
@@ -336,7 +302,7 @@
// passed the same arguments as `trigger` is, apart from the event name
// (unless you're listening on `"all"`, which will cause your callback to
// receive the true name of the event as the first argument).
- Events.trigger = function(name) {
+ Events.trigger = function(name) {
if (!this._events) return this;
var length = Math.max(0, arguments.length - 1);
@@ -348,7 +314,7 @@
};
// Handles triggering the appropriate event callbacks.
- var triggerApi = function(objEvents, name, cb, args) {
+ var triggerApi = function(objEvents, name, callback, args) {
if (objEvents) {
var events = objEvents[name];
var allEvents = objEvents.all;
@@ -373,6 +339,44 @@
}
};
+ // A listening class that tracks and cleans up memory bindings
+ // when all callbacks have been offed.
+ var Listening = function(listener, obj) {
+ this.id = listener._listenId;
+ this.listener = listener;
+ this.obj = obj;
+ this.interop = true;
+ this.count = 0;
+ this._events = void 0;
+ };
+
+ Listening.prototype.on = Events.on;
+
+ // Offs a callback (or several).
+ // Uses an optimized counter if the listenee uses Backbone.Events.
+ // Otherwise, falls back to manual tracking to support events
+ // library interop.
+ Listening.prototype.off = function(name, callback) {
+ var cleanup;
+ if (this.interop) {
+ this._events = eventsApi(offApi, this._events, name, callback, {
+ context: void 0,
+ listeners: void 0
+ });
+ cleanup = !this._events;
+ } else {
+ this.count--;
+ cleanup = this.count === 0;
+ }
+ if (cleanup) this.cleanup();
+ };
+
+ // Cleans up memory bindings between the listener and the listenee.
+ Listening.prototype.cleanup = function() {
+ delete this.listener._listeningTo[this.obj._listenId];
+ if (!this.interop) delete this.obj._listeners[this.id];
+ };
+
// Aliases for backwards compatibility.
Events.bind = Events.on;
Events.unbind = Events.off;
@@ -394,11 +398,13 @@
var Model = Backbone.Model = function(attributes, options) {
var attrs = attributes || {};
options || (options = {});
+ this.preinitialize.apply(this, arguments);
this.cid = _.uniqueId(this.cidPrefix);
this.attributes = {};
if (options.collection) this.collection = options.collection;
if (options.parse) attrs = this.parse(attrs, options) || {};
- attrs = _.defaults({}, attrs, _.result(this, 'defaults'));
+ var defaults = _.result(this, 'defaults');
+ attrs = _.defaults(_.extend({}, defaults, attrs), defaults);
this.set(attrs, options);
this.changed = {};
this.initialize.apply(this, arguments);
@@ -421,6 +427,10 @@
// You may want to override this if you're experiencing name clashes with model ids.
cidPrefix: 'c',
+ // preinitialize is an empty function by default. You can override it with a function
+ // or object. preinitialize will run before any instantiation logic is run in the Model.
+ preinitialize: function(){},
+
// Initialize is an empty function by default. Override it with your own
// initialization logic.
initialize: function(){},
@@ -506,7 +516,7 @@
}
// Update the `id`.
- this.id = this.get(this.idAttribute);
+ if (this.idAttribute in attrs) this.id = this.get(this.idAttribute);
// Trigger all relevant attribute changes.
if (!silent) {
@@ -561,12 +571,14 @@
if (!diff) return this.hasChanged() ? _.clone(this.changed) : false;
var old = this._changing ? this._previousAttributes : this.attributes;
var changed = {};
+ var hasChanged;
for (var attr in diff) {
var val = diff[attr];
if (_.isEqual(old[attr], val)) continue;
changed[attr] = val;
+ hasChanged = true;
}
- return _.size(changed) ? changed : false;
+ return hasChanged ? changed : false;
},
// Get the previous value of an attribute, recorded at the time the last
@@ -619,8 +631,8 @@
// the model will be valid when the attributes, if any, are set.
if (attrs && !wait) {
if (!this.set(attrs, options)) return false;
- } else {
- if (!this._validate(attrs, options)) return false;
+ } else if (!this._validate(attrs, options)) {
+ return false;
}
// After a successful server-side save, the client is (optionally)
@@ -642,7 +654,7 @@
// Set temporary attributes if `{wait: true}` to properly find new ids.
if (attrs && wait) this.attributes = _.extend({}, attributes, attrs);
- var method = this.isNew() ? 'create' : (options.patch ? 'patch' : 'update');
+ var method = this.isNew() ? 'create' : options.patch ? 'patch' : 'update';
if (method === 'patch' && !options.attrs) options.attrs = attrs;
var xhr = this.sync(method, this, options);
@@ -714,7 +726,7 @@
// Check if the model is currently in a valid state.
isValid: function(options) {
- return this._validate({}, _.defaults({validate: true}, options));
+ return this._validate({}, _.extend({}, options, {validate: true}));
},
// Run validation against the next complete set of model attributes,
@@ -730,14 +742,6 @@
});
- // Underscore methods that we want to implement on the Model, mapped to the
- // number of arguments they take.
- var modelMethods = { keys: 1, values: 1, pairs: 1, invert: 1, pick: 0,
- omit: 0, chain: 1, isEmpty: 1 };
-
- // Mix in each Underscore method as a proxy to `Model#attributes`.
- addUnderscoreMethods(Model, modelMethods, 'attributes');
-
// Backbone.Collection
// -------------------
@@ -753,6 +757,7 @@
// its models in sort order, as they're added and removed.
var Collection = Backbone.Collection = function(models, options) {
options || (options = {});
+ this.preinitialize.apply(this, arguments);
if (options.model) this.model = options.model;
if (options.comparator !== void 0) this.comparator = options.comparator;
this._reset();
@@ -769,7 +774,8 @@
at = Math.min(Math.max(at, 0), array.length);
var tail = Array(array.length - at);
var length = insert.length;
- for (var i = 0; i < tail.length; i++) tail[i] = array[i + at];
+ var i;
+ for (i = 0; i < tail.length; i++) tail[i] = array[i + at];
for (i = 0; i < length; i++) array[i + at] = insert[i];
for (i = 0; i < tail.length; i++) array[i + length + at] = tail[i];
};
@@ -781,6 +787,11 @@
// This should be overridden in most cases.
model: Model,
+
+ // preinitialize is an empty function by default. You can override it with a function
+ // or object. preinitialize will run before any instantiation logic is run in the Collection.
+ preinitialize: function(){},
+
// Initialize is an empty function by default. Override it with your own
// initialization logic.
initialize: function(){},
@@ -807,9 +818,12 @@
remove: function(models, options) {
options = _.extend({}, options);
var singular = !_.isArray(models);
- models = singular ? [models] : _.clone(models);
+ models = singular ? [models] : models.slice();
var removed = this._removeModels(models, options);
- if (!options.silent && removed) this.trigger('update', this, options);
+ if (!options.silent && removed.length) {
+ options.changes = {added: [], merged: [], removed: removed};
+ this.trigger('update', this, options);
+ }
return singular ? removed[0] : removed;
},
@@ -820,18 +834,22 @@
set: function(models, options) {
if (models == null) return;
- options = _.defaults({}, options, setOptions);
- if (options.parse && !this._isModel(models)) models = this.parse(models, options);
+ options = _.extend({}, setOptions, options);
+ if (options.parse && !this._isModel(models)) {
+ models = this.parse(models, options) || [];
+ }
var singular = !_.isArray(models);
models = singular ? [models] : models.slice();
var at = options.at;
if (at != null) at = +at;
+ if (at > this.length) at = this.length;
if (at < 0) at += this.length + 1;
var set = [];
var toAdd = [];
+ var toMerge = [];
var toRemove = [];
var modelMap = {};
@@ -840,13 +858,13 @@
var remove = options.remove;
var sort = false;
- var sortable = this.comparator && (at == null) && options.sort !== false;
+ var sortable = this.comparator && at == null && options.sort !== false;
var sortAttr = _.isString(this.comparator) ? this.comparator : null;
// Turn bare objects into model references, and prevent invalid models
// from being added.
- var model;
- for (var i = 0; i < models.length; i++) {
+ var model, i;
+ for (i = 0; i < models.length; i++) {
model = models[i];
// If a duplicate is found, prevent it from being added and
@@ -857,6 +875,7 @@
var attrs = this._isModel(model) ? model.attributes : model;
if (options.parse) attrs = existing.parse(attrs, options);
existing.set(attrs, options);
+ toMerge.push(existing);
if (sortable && !sort) sort = existing.hasChanged(sortAttr);
}
if (!modelMap[existing.cid]) {
@@ -890,8 +909,8 @@
var orderChanged = false;
var replace = !sortable && add && remove;
if (set.length && replace) {
- orderChanged = this.length != set.length || _.some(this.models, function(model, index) {
- return model !== set[index];
+ orderChanged = this.length !== set.length || _.some(this.models, function(m, index) {
+ return m !== set[index];
});
this.models.length = 0;
splice(this.models, set, 0);
@@ -905,7 +924,7 @@
// Silently sort the collection if appropriate.
if (sort) this.sort({silent: true});
- // Unless silenced, it's time to fire all appropriate add/sort events.
+ // Unless silenced, it's time to fire all appropriate add/sort/update events.
if (!options.silent) {
for (i = 0; i < toAdd.length; i++) {
if (at != null) options.index = at + i;
@@ -913,7 +932,14 @@
model.trigger('add', model, this, options);
}
if (sort || orderChanged) this.trigger('sort', this, options);
- if (toAdd.length || toRemove.length) this.trigger('update', this, options);
+ if (toAdd.length || toRemove.length || toMerge.length) {
+ options.changes = {
+ added: toAdd,
+ removed: toRemove,
+ merged: toMerge
+ };
+ this.trigger('update', this, options);
+ }
}
// Return the added (or merged) model (or models).
@@ -963,11 +989,18 @@
return slice.apply(this.models, arguments);
},
- // Get a model from the set by id.
+ // Get a model from the set by id, cid, model object with id or cid
+ // properties, or an attributes object that is transformed through modelId.
get: function(obj) {
if (obj == null) return void 0;
- var id = this.modelId(this._isModel(obj) ? obj.attributes : obj);
- return this._byId[obj] || this._byId[id] || this._byId[obj.cid];
+ return this._byId[obj] ||
+ this._byId[this.modelId(this._isModel(obj) ? obj.attributes : obj)] ||
+ obj.cid && this._byId[obj.cid];
+ },
+
+ // Returns `true` if the model is in the collection.
+ has: function(obj) {
+ return this.get(obj) != null;
},
// Get the model at the given index.
@@ -997,7 +1030,7 @@
options || (options = {});
var length = comparator.length;
- if (_.isFunction(comparator)) comparator = _.bind(comparator, this);
+ if (_.isFunction(comparator)) comparator = comparator.bind(this);
// Run sort based on type of `comparator`.
if (length === 1 || _.isString(comparator)) {
@@ -1011,7 +1044,7 @@
// Pluck an attribute from each model in the collection.
pluck: function(attr) {
- return _.invoke(this.models, 'get', attr);
+ return this.map(attr + '');
},
// Fetch the default set of models for this collection, resetting the
@@ -1042,9 +1075,9 @@
if (!wait) this.add(model, options);
var collection = this;
var success = options.success;
- options.success = function(model, resp, callbackOpts) {
- if (wait) collection.add(model, callbackOpts);
- if (success) success.call(callbackOpts.context, model, resp, callbackOpts);
+ options.success = function(m, resp, callbackOpts) {
+ if (wait) collection.add(m, callbackOpts);
+ if (success) success.call(callbackOpts.context, m, resp, callbackOpts);
};
model.save(null, options);
return model;
@@ -1065,10 +1098,25 @@
},
// Define how to uniquely identify models in the collection.
- modelId: function (attrs) {
+ modelId: function(attrs) {
return attrs[this.model.prototype.idAttribute || 'id'];
},
+ // Get an iterator of all models in this collection.
+ values: function() {
+ return new CollectionIterator(this, ITERATOR_VALUES);
+ },
+
+ // Get an iterator of all model IDs in this collection.
+ keys: function() {
+ return new CollectionIterator(this, ITERATOR_KEYS);
+ },
+
+ // Get an iterator of all [ID, model] tuples in this collection.
+ entries: function() {
+ return new CollectionIterator(this, ITERATOR_KEYSVALUES);
+ },
+
// Private method to reset all internal state. Called when the collection
// is first initialized or reset.
_reset: function() {
@@ -1103,6 +1151,12 @@
this.models.splice(index, 1);
this.length--;
+ // Remove references before triggering 'remove' event to prevent an
+ // infinite loop. #3693
+ delete this._byId[model.cid];
+ var id = this.modelId(model.attributes);
+ if (id != null) delete this._byId[id];
+
if (!options.silent) {
options.index = index;
model.trigger('remove', model, this, options);
@@ -1111,12 +1165,12 @@
removed.push(model);
this._removeReference(model, options);
}
- return removed.length ? removed : false;
+ return removed;
},
// Method for checking whether an object should be considered a model for
// the purposes of adding to the collection.
- _isModel: function (model) {
+ _isModel: function(model) {
return model instanceof Model;
},
@@ -1142,14 +1196,16 @@
// events simply proxy through. "add" and "remove" events that originate
// in other collections are ignored.
_onModelEvent: function(event, model, collection, options) {
- if ((event === 'add' || event === 'remove') && collection !== this) return;
- if (event === 'destroy') this.remove(model, options);
- if (event === 'change') {
- var prevId = this.modelId(model.previousAttributes());
- var id = this.modelId(model.attributes);
- if (prevId !== id) {
- if (prevId != null) delete this._byId[prevId];
- if (id != null) this._byId[id] = model;
+ if (model) {
+ if ((event === 'add' || event === 'remove') && collection !== this) return;
+ if (event === 'destroy') this.remove(model, options);
+ if (event === 'change') {
+ var prevId = this.modelId(model.previousAttributes());
+ var id = this.modelId(model.attributes);
+ if (prevId !== id) {
+ if (prevId != null) delete this._byId[prevId];
+ if (id != null) this._byId[id] = model;
+ }
}
}
this.trigger.apply(this, arguments);
@@ -1157,20 +1213,71 @@
});
- // Underscore methods that we want to implement on the Collection.
- // 90% of the core usefulness of Backbone Collections is actually implemented
- // right here:
- var collectionMethods = { forEach: 3, each: 3, map: 3, collect: 3, reduce: 4,
- foldl: 4, inject: 4, reduceRight: 4, foldr: 4, find: 3, detect: 3, filter: 3,
- select: 3, reject: 3, every: 3, all: 3, some: 3, any: 3, include: 3, includes: 3,
- contains: 3, invoke: 0, max: 3, min: 3, toArray: 1, size: 1, first: 3,
- head: 3, take: 3, initial: 3, rest: 3, tail: 3, drop: 3, last: 3,
- without: 0, difference: 0, indexOf: 3, shuffle: 1, lastIndexOf: 3,
- isEmpty: 1, chain: 1, sample: 3, partition: 3, groupBy: 3, countBy: 3,
- sortBy: 3, indexBy: 3};
+ // Defining an @@iterator method implements JavaScript's Iterable protocol.
+ // In modern ES2015 browsers, this value is found at Symbol.iterator.
+ /* global Symbol */
+ var $$iterator = typeof Symbol === 'function' && Symbol.iterator;
+ if ($$iterator) {
+ Collection.prototype[$$iterator] = Collection.prototype.values;
+ }
- // Mix in each Underscore method as a proxy to `Collection#models`.
- addUnderscoreMethods(Collection, collectionMethods, 'models');
+ // CollectionIterator
+ // ------------------
+
+ // A CollectionIterator implements JavaScript's Iterator protocol, allowing the
+ // use of `for of` loops in modern browsers and interoperation between
+ // Backbone.Collection and other JavaScript functions and third-party libraries
+ // which can operate on Iterables.
+ var CollectionIterator = function(collection, kind) {
+ this._collection = collection;
+ this._kind = kind;
+ this._index = 0;
+ };
+
+ // This "enum" defines the three possible kinds of values which can be emitted
+ // by a CollectionIterator that correspond to the values(), keys() and entries()
+ // methods on Collection, respectively.
+ var ITERATOR_VALUES = 1;
+ var ITERATOR_KEYS = 2;
+ var ITERATOR_KEYSVALUES = 3;
+
+ // All Iterators should themselves be Iterable.
+ if ($$iterator) {
+ CollectionIterator.prototype[$$iterator] = function() {
+ return this;
+ };
+ }
+
+ CollectionIterator.prototype.next = function() {
+ if (this._collection) {
+
+ // Only continue iterating if the iterated collection is long enough.
+ if (this._index < this._collection.length) {
+ var model = this._collection.at(this._index);
+ this._index++;
+
+ // Construct a value depending on what kind of values should be iterated.
+ var value;
+ if (this._kind === ITERATOR_VALUES) {
+ value = model;
+ } else {
+ var id = this._collection.modelId(model.attributes);
+ if (this._kind === ITERATOR_KEYS) {
+ value = id;
+ } else { // ITERATOR_KEYSVALUES
+ value = [id, model];
+ }
+ }
+ return {value: value, done: false};
+ }
+
+ // Once exhausted, remove the reference to the collection so future
+ // calls to the next method always return done.
+ this._collection = void 0;
+ }
+
+ return {value: void 0, done: true};
+ };
// Backbone.View
// -------------
@@ -1187,6 +1294,7 @@
// if an existing element is not provided...
var View = Backbone.View = function(options) {
this.cid = _.uniqueId('view');
+ this.preinitialize.apply(this, arguments);
_.extend(this, _.pick(options, viewOptions));
this._ensureElement();
this.initialize.apply(this, arguments);
@@ -1210,6 +1318,10 @@
return this.$el.find(selector);
},
+ // preinitialize is an empty function by default. You can override it with a function
+ // or object. preinitialize will run before any instantiation logic is run in the View
+ preinitialize: function(){},
+
// Initialize is an empty function by default. Override it with your own
// initialization logic.
initialize: function(){},
@@ -1277,7 +1389,7 @@
if (!_.isFunction(method)) method = this[method];
if (!method) continue;
var match = key.match(delegateEventSplitter);
- this.delegate(match[1], match[2], _.bind(method, this));
+ this.delegate(match[1], match[2], method.bind(this));
}
return this;
},
@@ -1335,6 +1447,94 @@
});
+ // Proxy Backbone class methods to Underscore functions, wrapping the model's
+ // `attributes` object or collection's `models` array behind the scenes.
+ //
+ // collection.filter(function(model) { return model.get('age') > 10 });
+ // collection.each(this.addView);
+ //
+ // `Function#apply` can be slow so we use the method's arg count, if we know it.
+ var addMethod = function(base, length, method, attribute) {
+ switch (length) {
+ case 1: return function() {
+ return base[method](this[attribute]);
+ };
+ case 2: return function(value) {
+ return base[method](this[attribute], value);
+ };
+ case 3: return function(iteratee, context) {
+ return base[method](this[attribute], cb(iteratee, this), context);
+ };
+ case 4: return function(iteratee, defaultVal, context) {
+ return base[method](this[attribute], cb(iteratee, this), defaultVal, context);
+ };
+ default: return function() {
+ var args = slice.call(arguments);
+ args.unshift(this[attribute]);
+ return base[method].apply(base, args);
+ };
+ }
+ };
+
+ var addUnderscoreMethods = function(Class, base, methods, attribute) {
+ _.each(methods, function(length, method) {
+ if (base[method]) Class.prototype[method] = addMethod(base, length, method, attribute);
+ });
+ };
+
+ // Support `collection.sortBy('attr')` and `collection.findWhere({id: 1})`.
+ var cb = function(iteratee, instance) {
+ if (_.isFunction(iteratee)) return iteratee;
+ if (_.isObject(iteratee) && !instance._isModel(iteratee)) return modelMatcher(iteratee);
+ if (_.isString(iteratee)) return function(model) { return model.get(iteratee); };
+ return iteratee;
+ };
+ var modelMatcher = function(attrs) {
+ var matcher = _.matches(attrs);
+ return function(model) {
+ return matcher(model.attributes);
+ };
+ };
+
+ // Underscore methods that we want to implement on the Collection.
+ // 90% of the core usefulness of Backbone Collections is actually implemented
+ // right here:
+ var collectionMethods = {forEach: 3, each: 3, map: 3, collect: 3, reduce: 0,
+ foldl: 0, inject: 0, reduceRight: 0, foldr: 0, find: 3, detect: 3, filter: 3,
+ select: 3, reject: 3, every: 3, all: 3, some: 3, any: 3, include: 3, includes: 3,
+ contains: 3, invoke: 0, max: 3, min: 3, toArray: 1, size: 1, first: 3,
+ head: 3, take: 3, initial: 3, rest: 3, tail: 3, drop: 3, last: 3,
+ without: 0, difference: 0, indexOf: 3, shuffle: 1, lastIndexOf: 3,
+ isEmpty: 1, chain: 1, sample: 3, partition: 3, groupBy: 3, countBy: 3,
+ sortBy: 3, indexBy: 3, findIndex: 3, findLastIndex: 3};
+
+
+ // Underscore methods that we want to implement on the Model, mapped to the
+ // number of arguments they take.
+ var modelMethods = {keys: 1, values: 1, pairs: 1, invert: 1, pick: 0,
+ omit: 0, chain: 1, isEmpty: 1};
+
+ // Mix in each Underscore method as a proxy to `Collection#models`.
+
+ _.each([
+ [Collection, collectionMethods, 'models'],
+ [Model, modelMethods, 'attributes']
+ ], function(config) {
+ var Base = config[0],
+ methods = config[1],
+ attribute = config[2];
+
+ Base.mixin = function(obj) {
+ var mappings = _.reduce(_.functions(obj), function(memo, name) {
+ memo[name] = 0;
+ return memo;
+ }, {});
+ addUnderscoreMethods(Base, obj, mappings, attribute);
+ };
+
+ addUnderscoreMethods(Base, _, methods, attribute);
+ });
+
// Backbone.sync
// -------------
@@ -1415,11 +1615,11 @@
// Map from CRUD to HTTP for our default `Backbone.sync` implementation.
var methodMap = {
- 'create': 'POST',
- 'update': 'PUT',
- 'patch': 'PATCH',
- 'delete': 'DELETE',
- 'read': 'GET'
+ create: 'POST',
+ update: 'PUT',
+ patch: 'PATCH',
+ delete: 'DELETE',
+ read: 'GET'
};
// Set the default implementation of `Backbone.ajax` to proxy through to `$`.
@@ -1435,6 +1635,7 @@
// matched. Creating a new one sets its `routes` hash, if not set statically.
var Router = Backbone.Router = function(options) {
options || (options = {});
+ this.preinitialize.apply(this, arguments);
if (options.routes) this.routes = options.routes;
this._bindRoutes();
this.initialize.apply(this, arguments);
@@ -1450,6 +1651,10 @@
// Set up all inheritable **Backbone.Router** properties and methods.
_.extend(Router.prototype, Events, {
+ // preinitialize is an empty function by default. You can override it with a function
+ // or object. preinitialize will run before any instantiation logic is run in the Router.
+ preinitialize: function(){},
+
// Initialize is an empty function by default. Override it with your own
// initialization logic.
initialize: function(){},
@@ -1507,11 +1712,11 @@
// against the current location hash.
_routeToRegExp: function(route) {
route = route.replace(escapeRegExp, '\\$&')
- .replace(optionalParam, '(?:$1)?')
- .replace(namedParam, function(match, optional) {
- return optional ? match : '([^/?]+)';
- })
- .replace(splatParam, '([^?]*?)');
+ .replace(optionalParam, '(?:$1)?')
+ .replace(namedParam, function(match, optional) {
+ return optional ? match : '([^/?]+)';
+ })
+ .replace(splatParam, '([^?]*?)');
return new RegExp('^' + route + '(?:\\?([\\s\\S]*))?$');
},
@@ -1539,7 +1744,7 @@
// falls back to polling.
var History = Backbone.History = function() {
this.handlers = [];
- this.checkUrl = _.bind(this.checkUrl, this);
+ this.checkUrl = this.checkUrl.bind(this);
// Ensure that `History` can be used outside of the browser.
if (typeof window !== 'undefined') {
@@ -1576,8 +1781,8 @@
// Does the pathname match the root?
matchRoot: function() {
var path = this.decodeFragment(this.location.pathname);
- var root = path.slice(0, this.root.length - 1) + '/';
- return root === this.root;
+ var rootPath = path.slice(0, this.root.length - 1) + '/';
+ return rootPath === this.root;
},
// Unicode characters in `location.pathname` are percent encoded so they're
@@ -1649,8 +1854,8 @@
// If we've started off with a route from a `pushState`-enabled
// browser, but we're currently in a browser that doesn't support it...
if (!this._hasPushState && !this.atRoot()) {
- var root = this.root.slice(0, -1) || '/';
- this.location.replace(root + '#' + this.getPath());
+ var rootPath = this.root.slice(0, -1) || '/';
+ this.location.replace(rootPath + '#' + this.getPath());
// Return immediately as browser will do redirect to new url
return true;
@@ -1679,7 +1884,7 @@
}
// Add a cross-platform `addEventListener` shim for older browsers.
- var addEventListener = window.addEventListener || function (eventName, listener) {
+ var addEventListener = window.addEventListener || function(eventName, listener) {
return attachEvent('on' + eventName, listener);
};
@@ -1700,7 +1905,7 @@
// but possibly useful for unit testing Routers.
stop: function() {
// Add a cross-platform `removeEventListener` shim for older browsers.
- var removeEventListener = window.removeEventListener || function (eventName, listener) {
+ var removeEventListener = window.removeEventListener || function(eventName, listener) {
return detachEvent('on' + eventName, listener);
};
@@ -1774,17 +1979,20 @@
fragment = this.getFragment(fragment || '');
// Don't include a trailing slash on the root.
- var root = this.root;
+ var rootPath = this.root;
if (fragment === '' || fragment.charAt(0) === '?') {
- root = root.slice(0, -1) || '/';
+ rootPath = rootPath.slice(0, -1) || '/';
}
- var url = root + fragment;
+ var url = rootPath + fragment;
+
+ // Strip the fragment of the query and hash for matching.
+ fragment = fragment.replace(pathStripper, '');
- // Strip the hash and decode for matching.
- fragment = this.decodeFragment(fragment.replace(pathStripper, ''));
+ // Decode for matching.
+ var decodedFragment = this.decodeFragment(fragment);
- if (this.fragment === fragment) return;
- this.fragment = fragment;
+ if (this.fragment === decodedFragment) return;
+ this.fragment = decodedFragment;
// If pushState is available, we use it to set the fragment as a real URL.
if (this._usePushState) {
@@ -1794,7 +2002,7 @@
// fragment to store history.
} else if (this._wantsHashChange) {
this._updateHash(this.location, fragment, options.replace);
- if (this.iframe && (fragment !== this.getHash(this.iframe.contentWindow))) {
+ if (this.iframe && fragment !== this.getHash(this.iframe.contentWindow)) {
var iWindow = this.iframe.contentWindow;
// Opening and closing the iframe tricks IE7 and earlier to push a
@@ -1856,14 +2064,9 @@
_.extend(child, parent, staticProps);
// Set the prototype chain to inherit from `parent`, without calling
- // `parent` constructor function.
- var Surrogate = function(){ this.constructor = child; };
- Surrogate.prototype = parent.prototype;
- child.prototype = new Surrogate;
-
- // Add prototype properties (instance properties) to the subclass,
- // if supplied.
- if (protoProps) _.extend(child.prototype, protoProps);
+ // `parent`'s constructor function and add the prototype properties.
+ child.prototype = _.create(parent.prototype, protoProps);
+ child.prototype.constructor = child;
// Set a convenience property in case the parent's prototype is needed
// later.
@@ -1890,5 +2093,4 @@
};
return Backbone;
-
-}));
+});
diff --git a/web/core/assets/vendor/jquery-once/jquery.once.js b/web/core/assets/vendor/jquery-once/jquery.once.js
index f0ed4d0a4b..88e0881302 100644
--- a/web/core/assets/vendor/jquery-once/jquery.once.js
+++ b/web/core/assets/vendor/jquery-once/jquery.once.js
@@ -1,5 +1,5 @@
/*!
- * jQuery Once v2.2.0 - http://github.com/robloach/jquery-once
+ * jQuery Once v2.2.3 - http://github.com/robloach/jquery-once
* @license MIT, GPL-2.0
* http://opensource.org/licenses/MIT
* http://opensource.org/licenses/GPL-2.0
@@ -17,7 +17,7 @@
(function (factory) {
'use strict';
- if (typeof exports === 'object') {
+ if (typeof exports === 'object' && typeof exports.nodeName !== 'string') {
// CommonJS
factory(require('jquery'));
} else if (typeof define === 'function' && define.amd) {
@@ -38,7 +38,7 @@
* @param {string} [id=once]
* A string representing the ID to check. Defaults to `'once'`.
*
- * @returns The valid ID name.
+ * @returns {number} The valid ID name.
*
* @throws TypeError when an ID is provided, but not a string.
* @private
@@ -48,6 +48,7 @@
if (typeof id !== 'string') {
throw new TypeError('The jQuery Once id parameter must be a string');
}
+
return id;
};
@@ -58,7 +59,7 @@
* The data ID used to determine whether the given elements have already
* been processed or not. Defaults to `'once'`.
*
- * @returns jQuery collection of elements that have now run once by
+ * @returns {jQuery} jQuery collection of elements that have now run once by
* the given ID.
*
* @example
@@ -108,7 +109,7 @@
* processed by the once function. The ID should be the same ID that was
* originally passed to the once() function. Defaults to `'once'`.
*
- * @returns jQuery collection of elements that were acted upon to remove their
+ * @returns {jQuery} jQuery collection of elements that were acted upon to remove their
* once data.
*
* @example
@@ -143,7 +144,7 @@
* been processed by the once function. The id should be the same id that
* was originally passed to the once() function. Defaults to 'once'.
*
- * @returns jQuery collection of elements that have been run once.
+ * @returns {jQuery} jQuery collection of elements that have been run once.
*
* @example
* ``` javascript
diff --git a/web/core/assets/vendor/jquery-once/jquery.once.min.js b/web/core/assets/vendor/jquery-once/jquery.once.min.js
index 56c4ba17b5..47a878053e 100644
--- a/web/core/assets/vendor/jquery-once/jquery.once.min.js
+++ b/web/core/assets/vendor/jquery-once/jquery.once.min.js
@@ -1,8 +1,8 @@
/*!
- * jQuery Once v2.2.0 - http://github.com/robloach/jquery-once
+ * jQuery Once v2.2.3 - http://github.com/robloach/jquery-once
* @license MIT, GPL-2.0
* http://opensource.org/licenses/MIT
* http://opensource.org/licenses/GPL-2.0
*/
-(function(e){"use strict";if(typeof exports==="object"){e(require("jquery"))}else if(typeof define==="function"&&define.amd){define(["jquery"],e)}else{e(jQuery)}})(function(e){"use strict";var n=function(e){e=e||"once";if(typeof e!=="string"){throw new TypeError("The jQuery Once id parameter must be a string")}return e};e.fn.once=function(t){var r="jquery-once-"+n(t);return this.filter(function(){return e(this).data(r)!==true}).data(r,true)};e.fn.removeOnce=function(e){return this.findOnce(e).removeData("jquery-once-"+n(e))};e.fn.findOnce=function(t){var r="jquery-once-"+n(t);return this.filter(function(){return e(this).data(r)===true})}});
+(function(e){"use strict";if(typeof exports==="object"&&typeof exports.nodeName!=="string"){e(require("jquery"))}else if(typeof define==="function"&&define.amd){define(["jquery"],e)}else{e(jQuery)}})(function(t){"use strict";var r=function(e){e=e||"once";if(typeof e!=="string"){throw new TypeError("The jQuery Once id parameter must be a string")}return e};t.fn.once=function(e){var n="jquery-once-"+r(e);return this.filter(function(){return t(this).data(n)!==true}).data(n,true)};t.fn.removeOnce=function(e){return this.findOnce(e).removeData("jquery-once-"+r(e))};t.fn.findOnce=function(e){var n="jquery-once-"+r(e);return this.filter(function(){return t(this).data(n)===true})}});
//# sourceMappingURL=jquery.once.min.js.map
\ No newline at end of file
diff --git a/web/core/assets/vendor/jquery-once/jquery.once.min.js.map b/web/core/assets/vendor/jquery-once/jquery.once.min.js.map
index 2d48c5cbed..a42313cc28 100644
--- a/web/core/assets/vendor/jquery-once/jquery.once.min.js.map
+++ b/web/core/assets/vendor/jquery-once/jquery.once.min.js.map
@@ -1 +1 @@
-{"version":3,"sources":["jquery.once.js"],"names":["factory","exports","require","define","amd","jQuery","$","checkId","id","TypeError","fn","once","name","this","filter","data","removeOnce","findOnce","removeData"],"mappings":";;;;;;CAgBA,SAAWA,GACT,aAEA,UAAWC,UAAY,SAAU,CAE/BD,EAAQE,QAAQ,gBACX,UAAWC,SAAW,YAAcA,OAAOC,IAAK,CAGrDD,QAAQ,UAAWH,OACd,CAGLA,EAAQK,WAET,SAAUC,GACX,aAaA,IAAIC,EAAU,SAAUC,GACtBA,EAAKA,GAAM,OACX,UAAWA,IAAO,SAAU,CAC1B,MAAM,IAAIC,UAAU,iDAEtB,OAAOD,GAyCTF,EAAEI,GAAGC,KAAO,SAAUH,GAEpB,IAAII,EAAO,eAAiBL,EAAQC,GAGpC,OAAOK,KAAKC,OAAO,WACjB,OAAOR,EAAEO,MAAME,KAAKH,KAAU,OAC7BG,KAAKH,EAAM,OAiChBN,EAAEI,GAAGM,WAAa,SAAUR,GAE1B,OAAOK,KAAKI,SAAST,GAAIU,WAAW,eAAiBX,EAAQC,KAkC/DF,EAAEI,GAAGO,SAAW,SAAUT,GAExB,IAAII,EAAO,eAAiBL,EAAQC,GAEpC,OAAOK,KAAKC,OAAO,WACjB,OAAOR,EAAEO,MAAME,KAAKH,KAAU","file":"jquery.once.min.js"}
\ No newline at end of file
+{"version":3,"sources":["jquery.once.js"],"names":["factory","exports","nodeName","require","define","amd","jQuery","$","checkId","id","TypeError","fn","once","name","this","filter","data","removeOnce","findOnce","removeData"],"mappings":";;;;;;CAgBA,SAAWA,GACT,aAEA,UAAWC,UAAY,iBAAmBA,QAAQC,WAAa,SAAU,CAEvEF,EAAQG,QAAQ,gBACX,UAAWC,SAAW,YAAcA,OAAOC,IAAK,CAGrDD,OAAO,CAAC,UAAWJ,OACd,CAGLA,EAAQM,UAbZ,CAeG,SAAUC,GACX,aAaA,IAAIC,EAAU,SAAUC,GACtBA,EAAKA,GAAM,OACX,UAAWA,IAAO,SAAU,CAC1B,MAAM,IAAIC,UAAU,iDAGtB,OAAOD,GAyCTF,EAAEI,GAAGC,KAAO,SAAUH,GAEpB,IAAII,EAAO,eAAiBL,EAAQC,GAGpC,OAAOK,KAAKC,OAAO,WACjB,OAAOR,EAAEO,MAAME,KAAKH,KAAU,OAC7BG,KAAKH,EAAM,OAiChBN,EAAEI,GAAGM,WAAa,SAAUR,GAE1B,OAAOK,KAAKI,SAAST,GAAIU,WAAW,eAAiBX,EAAQC,KAkC/DF,EAAEI,GAAGO,SAAW,SAAUT,GAExB,IAAII,EAAO,eAAiBL,EAAQC,GAEpC,OAAOK,KAAKC,OAAO,WACjB,OAAOR,EAAEO,MAAME,KAAKH,KAAU","file":"jquery.once.min.js"}
\ No newline at end of file
diff --git a/web/core/assets/vendor/jquery.cookie/jquery.cookie.min.js b/web/core/assets/vendor/jquery.cookie/jquery.cookie.min.js
deleted file mode 100644
index c0f19d8a3b..0000000000
--- a/web/core/assets/vendor/jquery.cookie/jquery.cookie.min.js
+++ /dev/null
@@ -1,2 +0,0 @@
-/*! jquery.cookie v1.4.1 | MIT */
-!function(a){"function"==typeof define&&define.amd?define(["jquery"],a):"object"==typeof exports?a(require("jquery")):a(jQuery)}(function(a){function b(a){return h.raw?a:encodeURIComponent(a)}function c(a){return h.raw?a:decodeURIComponent(a)}function d(a){return b(h.json?JSON.stringify(a):String(a))}function e(a){0===a.indexOf('"')&&(a=a.slice(1,-1).replace(/\\"/g,'"').replace(/\\\\/g,"\\"));try{return a=decodeURIComponent(a.replace(g," ")),h.json?JSON.parse(a):a}catch(b){}}function f(b,c){var d=h.raw?b:e(b);return a.isFunction(c)?c(d):d}var g=/\+/g,h=a.cookie=function(e,g,i){if(void 0!==g&&!a.isFunction(g)){if(i=a.extend({},h.defaults,i),"number"==typeof i.expires){var j=i.expires,k=i.expires=new Date;k.setTime(+k+864e5*j)}return document.cookie=[b(e),"=",d(g),i.expires?"; expires="+i.expires.toUTCString():"",i.path?"; path="+i.path:"",i.domain?"; domain="+i.domain:"",i.secure?"; secure":""].join("")}for(var l=e?void 0:{},m=document.cookie?document.cookie.split("; "):[],n=0,o=m.length;o>n;n++){var p=m[n].split("="),q=c(p.shift()),r=p.join("=");if(e&&e===q){l=f(r,g);break}e||void 0===(r=f(r))||(l[q]=r)}return l};h.defaults={},a.removeCookie=function(b,c){return void 0===a.cookie(b)?!1:(a.cookie(b,"",a.extend({},c,{expires:-1})),!a.cookie(b))}});
\ No newline at end of file
diff --git a/web/core/assets/vendor/jquery/jquery-htmlprefilter-3.5.0.js b/web/core/assets/vendor/jquery/jquery-htmlprefilter-3.5.0.js
deleted file mode 100644
index 1e470baadc..0000000000
--- a/web/core/assets/vendor/jquery/jquery-htmlprefilter-3.5.0.js
+++ /dev/null
@@ -1,96 +0,0 @@
-/**
- * For jQuery versions less than 3.5.0, this replaces the jQuery.htmlPrefilter()
- * function with one that fixes these security vulnerabilities while also
- * retaining the pre-3.5.0 behavior where it's safe to do so.
- * - https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-11022
- * - https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-11023
- */
-
-(function (jQuery) {
-
- // No backport is needed if we're already on jQuery 3.5 or higher.
- var versionParts = jQuery.fn.jquery.split('.');
- var majorVersion = parseInt(versionParts[0]);
- var minorVersion = parseInt(versionParts[1]);
- if ( (majorVersion > 3) || (majorVersion === 3 && minorVersion >= 5) ) {
- return;
- }
-
- // Prior to jQuery 3.5, jQuery converted XHTML-style self-closing tags to
- // their XML equivalent: e.g., "<div />" to "<div></div>". This is
- // problematic for several reasons, including that it's vulnerable to XSS
- // attacks. However, since this was jQuery's behavior for many years, many
- // Drupal modules and jQuery plugins may be relying on it. Therefore, we
- // preserve that behavior, but for a limited set of tags only, that we believe
- // to not be vulnerable. This is the set of HTML tags that satisfy all of the
- // following conditions:
- // - In DOMPurify's list of HTML tags. If an HTML tag isn't safe enough to
- // appear in that list, then we don't want to mess with it here either.
- // @see https://github.com/cure53/DOMPurify/blob/2.0.11/dist/purify.js#L128
- // - A normal element (not a void, template, text, or foreign element).
- // @see https://html.spec.whatwg.org/multipage/syntax.html#elements-2
- // - An element that is still defined by the current HTML specification
- // (not a deprecated element), because we do not want to rely on how
- // browsers parse deprecated elements.
- // @see https://developer.mozilla.org/en-US/docs/Web/HTML/Element
- // - Not 'html', 'head', or 'body', because this pseudo-XHTML expansion is
- // designed for fragments, not entire documents.
- // - Not 'colgroup', because due to an idiosyncrasy of jQuery's original
- // regular expression, it didn't match on colgroup, and we don't want to
- // introduce a behavior change for that.
- var selfClosingTagsToReplace = [
- 'a', 'abbr', 'address', 'article', 'aside', 'audio', 'b', 'bdi', 'bdo',
- 'blockquote', 'button', 'canvas', 'caption', 'cite', 'code', 'data',
- 'datalist', 'dd', 'del', 'details', 'dfn', 'div', 'dl', 'dt', 'em',
- 'fieldset', 'figcaption', 'figure', 'footer', 'form', 'h1', 'h2', 'h3',
- 'h4', 'h5', 'h6', 'header', 'hgroup', 'i', 'ins', 'kbd', 'label', 'legend',
- 'li', 'main', 'map', 'mark', 'menu', 'meter', 'nav', 'ol', 'optgroup',
- 'option', 'output', 'p', 'picture', 'pre', 'progress', 'q', 'rp', 'rt',
- 'ruby', 's', 'samp', 'section', 'select', 'small', 'source', 'span',
- 'strong', 'sub', 'summary', 'sup', 'table', 'tbody', 'td', 'tfoot', 'th',
- 'thead', 'time', 'tr', 'u', 'ul', 'var', 'video'
- ];
-
- // Define regular expressions for <TAG/> and <TAG ATTRIBUTES/>. Doing this as
- // two expressions makes it easier to target <a/> without also targeting
- // every tag that starts with "a".
- var xhtmlRegExpGroup = '(' + selfClosingTagsToReplace.join('|') + ')';
- var whitespace = '[\\x20\\t\\r\\n\\f]';
- var rxhtmlTagWithoutSpaceOrAttributes = new RegExp('<' + xhtmlRegExpGroup + '\\/>', 'gi');
- var rxhtmlTagWithSpaceAndMaybeAttributes = new RegExp('<' + xhtmlRegExpGroup + '(' + whitespace + '[^>]*)\\/>', 'gi');
-
- // jQuery 3.5 also fixed a vulnerability for when </select> appears within
- // an <option> or <optgroup>, but it did that in local code that we can't
- // backport directly. Instead, we filter such cases out. To do so, we need to
- // determine when jQuery would otherwise invoke the vulnerable code, which it
- // uses this regular expression to determine.
- // @see https://github.com/jquery/jquery/blob/3.4.1/dist/jquery.js#L4716
- var rtagName = ( /<([a-z][^\/\0>\x20\t\r\n\f]*)/i );
-
- jQuery.extend({
- htmlPrefilter: function (html) {
- // This is how jQuery determines the first tag in the HTML.
- // @see https://github.com/jquery/jquery/blob/3.4.1/dist/jquery.js#L4815
- var tag = ( rtagName.exec( html ) || [ "", "" ] )[ 1 ].toLowerCase();
-
- // It is not valid HTML for <option> or <optgroup> to have <select> as
- // either a descendant or sibling, and attempts to inject one can cause
- // XSS on jQuery versions before 3.5. Since this is invalid HTML and a
- // possible XSS attack, reject the entire string.
- // @see https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-11023
- if ((tag === 'option' || tag === 'optgroup') && html.match(/<\/?select/i)) {
- html = '';
- }
-
- // Retain jQuery 3.4's conversion of pseudo-XHTML, but for only the
- // tags in the `selfClosingTagsToReplace` list defined above.
- // @see https://github.com/jquery/jquery/blob/3.4.1/dist/jquery.js#L5979
- // @see https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-11022
- html = html.replace(rxhtmlTagWithoutSpaceOrAttributes, "<$1></$1>");
- html = html.replace(rxhtmlTagWithSpaceAndMaybeAttributes, "<$1$2></$1>");
-
- return html;
- }
- });
-
-})(jQuery);
diff --git a/web/core/assets/vendor/jquery/jquery.js b/web/core/assets/vendor/jquery/jquery.js
index 773ad95c56..50937333b9 100644
--- a/web/core/assets/vendor/jquery/jquery.js
+++ b/web/core/assets/vendor/jquery/jquery.js
@@ -1,5 +1,5 @@
/*!
- * jQuery JavaScript Library v3.4.1
+ * jQuery JavaScript Library v3.5.1
* https://jquery.com/
*
* Includes Sizzle.js
@@ -9,7 +9,7 @@
* Released under the MIT license
* https://jquery.org/license
*
- * Date: 2019-05-01T21:04Z
+ * Date: 2020-05-04T22:49Z
*/
( function( global, factory ) {
@@ -47,13 +47,16 @@
var arr = [];
-var document = window.document;
-
var getProto = Object.getPrototypeOf;
var slice = arr.slice;
-var concat = arr.concat;
+var flat = arr.flat ? function( array ) {
+ return arr.flat.call( array );
+} : function( array ) {
+ return arr.concat.apply( [], array );
+};
+
var push = arr.push;
@@ -86,6 +89,8 @@ var isWindow = function isWindow( obj ) {
};
+var document = window.document;
+
var preservedScriptAttributes = {
@@ -142,7 +147,7 @@ function toType( obj ) {
var
- version = "3.4.1",
+ version = "3.5.1",
// Define a local copy of jQuery
jQuery = function( selector, context ) {
@@ -150,11 +155,7 @@ var
// The jQuery object is actually just the init constructor 'enhanced'
// Need init if jQuery is called (just allow error to be thrown if not included)
return new jQuery.fn.init( selector, context );
- },
-
- // Support: Android <=4.0 only
- // Make sure we trim BOM and NBSP
- rtrim = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g;
+ };
jQuery.fn = jQuery.prototype = {
@@ -220,6 +221,18 @@ jQuery.fn = jQuery.prototype = {
return this.eq( -1 );
},
+ even: function() {
+ return this.pushStack( jQuery.grep( this, function( _elem, i ) {
+ return ( i + 1 ) % 2;
+ } ) );
+ },
+
+ odd: function() {
+ return this.pushStack( jQuery.grep( this, function( _elem, i ) {
+ return i % 2;
+ } ) );
+ },
+
eq: function( i ) {
var len = this.length,
j = +i + ( i < 0 ? len : 0 );
@@ -353,9 +366,10 @@ jQuery.extend( {
return true;
},
- // Evaluates a script in a global context
- globalEval: function( code, options ) {
- DOMEval( code, { nonce: options && options.nonce } );
+ // Evaluates a script in a provided context; falls back to the global one
+ // if not specified.
+ globalEval: function( code, options, doc ) {
+ DOMEval( code, { nonce: options && options.nonce }, doc );
},
each: function( obj, callback ) {
@@ -379,13 +393,6 @@ jQuery.extend( {
return obj;
},
- // Support: Android <=4.0 only
- trim: function( text ) {
- return text == null ?
- "" :
- ( text + "" ).replace( rtrim, "" );
- },
-
// results is for internal usage only
makeArray: function( arr, results ) {
var ret = results || [];
@@ -472,7 +479,7 @@ jQuery.extend( {
}
// Flatten any nested arrays
- return concat.apply( [], ret );
+ return flat( ret );
},
// A global GUID counter for objects
@@ -489,7 +496,7 @@ if ( typeof Symbol === "function" ) {
// Populate the class2type map
jQuery.each( "Boolean Number String Function Array Date RegExp Object Error Symbol".split( " " ),
-function( i, name ) {
+function( _i, name ) {
class2type[ "[object " + name + "]" ] = name.toLowerCase();
} );
@@ -511,17 +518,16 @@ function isArrayLike( obj ) {
}
var Sizzle =
/*!
- * Sizzle CSS Selector Engine v2.3.4
+ * Sizzle CSS Selector Engine v2.3.5
* https://sizzlejs.com/
*
* Copyright JS Foundation and other contributors
* Released under the MIT license
* https://js.foundation/
*
- * Date: 2019-04-08
+ * Date: 2020-03-14
*/
-(function( window ) {
-
+( function( window ) {
var i,
support,
Expr,
@@ -561,59 +567,70 @@ var i,
},
// Instance methods
- hasOwn = ({}).hasOwnProperty,
+ hasOwn = ( {} ).hasOwnProperty,
arr = [],
pop = arr.pop,
- push_native = arr.push,
+ pushNative = arr.push,
push = arr.push,
slice = arr.slice,
+
// Use a stripped-down indexOf as it's faster than native
// https://jsperf.com/thor-indexof-vs-for/5
indexOf = function( list, elem ) {
var i = 0,
len = list.length;
for ( ; i < len; i++ ) {
- if ( list[i] === elem ) {
+ if ( list[ i ] === elem ) {
return i;
}
}
return -1;
},
- booleans = "checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",
+ booleans = "checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|" +
+ "ismap|loop|multiple|open|readonly|required|scoped",
// Regular expressions
// http://www.w3.org/TR/css3-selectors/#whitespace
whitespace = "[\\x20\\t\\r\\n\\f]",
- // http://www.w3.org/TR/CSS21/syndata.html#value-def-identifier
- identifier = "(?:\\\\.|[\\w-]|[^\0-\\xa0])+",
+ // https://www.w3.org/TR/css-syntax-3/#ident-token-diagram
+ identifier = "(?:\\\\[\\da-fA-F]{1,6}" + whitespace +
+ "?|\\\\[^\\r\\n\\f]|[\\w-]|[^\0-\\x7f])+",
// Attribute selectors: http://www.w3.org/TR/selectors/#attribute-selectors
attributes = "\\[" + whitespace + "*(" + identifier + ")(?:" + whitespace +
+
// Operator (capture 2)
"*([*^$|!~]?=)" + whitespace +
- // "Attribute values must be CSS identifiers [capture 5] or strings [capture 3 or capture 4]"
- "*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|(" + identifier + "))|)" + whitespace +
- "*\\]",
+
+ // "Attribute values must be CSS identifiers [capture 5]
+ // or strings [capture 3 or capture 4]"
+ "*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|(" + identifier + "))|)" +
+ whitespace + "*\\]",
pseudos = ":(" + identifier + ")(?:\\((" +
+
// To reduce the number of selectors needing tokenize in the preFilter, prefer arguments:
// 1. quoted (capture 3; capture 4 or capture 5)
"('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|" +
+
// 2. simple (capture 6)
"((?:\\\\.|[^\\\\()[\\]]|" + attributes + ")*)|" +
+
// 3. anything else (capture 2)
".*" +
")\\)|)",
// Leading and non-escaped trailing whitespace, capturing some non-whitespace characters preceding the latter
rwhitespace = new RegExp( whitespace + "+", "g" ),
- rtrim = new RegExp( "^" + whitespace + "+|((?:^|[^\\\\])(?:\\\\.)*)" + whitespace + "+$", "g" ),
+ rtrim = new RegExp( "^" + whitespace + "+|((?:^|[^\\\\])(?:\\\\.)*)" +
+ whitespace + "+$", "g" ),
rcomma = new RegExp( "^" + whitespace + "*," + whitespace + "*" ),
- rcombinators = new RegExp( "^" + whitespace + "*([>+~]|" + whitespace + ")" + whitespace + "*" ),
+ rcombinators = new RegExp( "^" + whitespace + "*([>+~]|" + whitespace + ")" + whitespace +
+ "*" ),
rdescend = new RegExp( whitespace + "|>" ),
rpseudo = new RegExp( pseudos ),
@@ -625,14 +642,16 @@ var i,
"TAG": new RegExp( "^(" + identifier + "|[*])" ),
"ATTR": new RegExp( "^" + attributes ),
"PSEUDO": new RegExp( "^" + pseudos ),
- "CHILD": new RegExp( "^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\(" + whitespace +
- "*(even|odd|(([+-]|)(\\d*)n|)" + whitespace + "*(?:([+-]|)" + whitespace +
- "*(\\d+)|))" + whitespace + "*\\)|)", "i" ),
+ "CHILD": new RegExp( "^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\(" +
+ whitespace + "*(even|odd|(([+-]|)(\\d*)n|)" + whitespace + "*(?:([+-]|)" +
+ whitespace + "*(\\d+)|))" + whitespace + "*\\)|)", "i" ),
"bool": new RegExp( "^(?:" + booleans + ")$", "i" ),
+
// For use in libraries implementing .is()
// We use this for POS matching in `select`
- "needsContext": new RegExp( "^" + whitespace + "*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\(" +
- whitespace + "*((?:-\\d)?\\d*)" + whitespace + "*\\)|)(?=[^-]|$)", "i" )
+ "needsContext": new RegExp( "^" + whitespace +
+ "*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\(" + whitespace +
+ "*((?:-\\d)?\\d*)" + whitespace + "*\\)|)(?=[^-]|$)", "i" )
},
rhtml = /HTML$/i,
@@ -648,18 +667,21 @@ var i,
// CSS escapes
// http://www.w3.org/TR/CSS21/syndata.html#escaped-characters
- runescape = new RegExp( "\\\\([\\da-f]{1,6}" + whitespace + "?|(" + whitespace + ")|.)", "ig" ),
- funescape = function( _, escaped, escapedWhitespace ) {
- var high = "0x" + escaped - 0x10000;
- // NaN means non-codepoint
- // Support: Firefox<24
- // Workaround erroneous numeric interpretation of +"0x"
- return high !== high || escapedWhitespace ?
- escaped :
+ runescape = new RegExp( "\\\\[\\da-fA-F]{1,6}" + whitespace + "?|\\\\([^\\r\\n\\f])", "g" ),
+ funescape = function( escape, nonHex ) {
+ var high = "0x" + escape.slice( 1 ) - 0x10000;
+
+ return nonHex ?
+
+ // Strip the backslash prefix from a non-hex escape sequence
+ nonHex :
+
+ // Replace a hexadecimal escape sequence with the encoded Unicode code point
+ // Support: IE <=11+
+ // For values outside the Basic Multilingual Plane (BMP), manually construct a
+ // surrogate pair
high < 0 ?
- // BMP codepoint
String.fromCharCode( high + 0x10000 ) :
- // Supplemental Plane codepoint (surrogate pair)
String.fromCharCode( high >> 10 | 0xD800, high & 0x3FF | 0xDC00 );
},
@@ -675,7 +697,8 @@ var i,
}
// Control characters and (dependent upon position) numbers get escaped as code points
- return ch.slice( 0, -1 ) + "\\" + ch.charCodeAt( ch.length - 1 ).toString( 16 ) + " ";
+ return ch.slice( 0, -1 ) + "\\" +
+ ch.charCodeAt( ch.length - 1 ).toString( 16 ) + " ";
}
// Other potentially-special ASCII characters get backslash-escaped
@@ -700,18 +723,20 @@ var i,
// Optimize for push.apply( _, NodeList )
try {
push.apply(
- (arr = slice.call( preferredDoc.childNodes )),
+ ( arr = slice.call( preferredDoc.childNodes ) ),
preferredDoc.childNodes
);
+
// Support: Android<4.0
// Detect silently failing push.apply
+ // eslint-disable-next-line no-unused-expressions
arr[ preferredDoc.childNodes.length ].nodeType;
} catch ( e ) {
push = { apply: arr.length ?
// Leverage slice if possible
function( target, els ) {
- push_native.apply( target, slice.call(els) );
+ pushNative.apply( target, slice.call( els ) );
} :
// Support: IE<9
@@ -719,8 +744,9 @@ try {
function( target, els ) {
var j = target.length,
i = 0;
+
// Can't trust NodeList.length
- while ( (target[j++] = els[i++]) ) {}
+ while ( ( target[ j++ ] = els[ i++ ] ) ) {}
target.length = j - 1;
}
};
@@ -744,24 +770,21 @@ function Sizzle( selector, context, results, seed ) {
// Try to shortcut find operations (as opposed to filters) in HTML documents
if ( !seed ) {
-
- if ( ( context ? context.ownerDocument || context : preferredDoc ) !== document ) {
- setDocument( context );
- }
+ setDocument( context );
context = context || document;
if ( documentIsHTML ) {
// If the selector is sufficiently simple, try using a "get*By*" DOM method
// (excepting DocumentFragment context, where the methods don't exist)
- if ( nodeType !== 11 && (match = rquickExpr.exec( selector )) ) {
+ if ( nodeType !== 11 && ( match = rquickExpr.exec( selector ) ) ) {
// ID selector
- if ( (m = match[1]) ) {
+ if ( ( m = match[ 1 ] ) ) {
// Document context
if ( nodeType === 9 ) {
- if ( (elem = context.getElementById( m )) ) {
+ if ( ( elem = context.getElementById( m ) ) ) {
// Support: IE, Opera, Webkit
// TODO: identify versions
@@ -780,7 +803,7 @@ function Sizzle( selector, context, results, seed ) {
// Support: IE, Opera, Webkit
// TODO: identify versions
// getElementById can match elements by name instead of ID
- if ( newContext && (elem = newContext.getElementById( m )) &&
+ if ( newContext && ( elem = newContext.getElementById( m ) ) &&
contains( context, elem ) &&
elem.id === m ) {
@@ -790,12 +813,12 @@ function Sizzle( selector, context, results, seed ) {
}
// Type selector
- } else if ( match[2] ) {
+ } else if ( match[ 2 ] ) {
push.apply( results, context.getElementsByTagName( selector ) );
return results;
// Class selector
- } else if ( (m = match[3]) && support.getElementsByClassName &&
+ } else if ( ( m = match[ 3 ] ) && support.getElementsByClassName &&
context.getElementsByClassName ) {
push.apply( results, context.getElementsByClassName( m ) );
@@ -806,11 +829,11 @@ function Sizzle( selector, context, results, seed ) {
// Take advantage of querySelectorAll
if ( support.qsa &&
!nonnativeSelectorCache[ selector + " " ] &&
- (!rbuggyQSA || !rbuggyQSA.test( selector )) &&
+ ( !rbuggyQSA || !rbuggyQSA.test( selector ) ) &&
// Support: IE 8 only
// Exclude object elements
- (nodeType !== 1 || context.nodeName.toLowerCase() !== "object") ) {
+ ( nodeType !== 1 || context.nodeName.toLowerCase() !== "object" ) ) {
newSelector = selector;
newContext = context;
@@ -819,27 +842,36 @@ function Sizzle( selector, context, results, seed ) {
// descendant combinators, which is not what we want.
// In such cases, we work around the behavior by prefixing every selector in the
// list with an ID selector referencing the scope context.
+ // The technique has to be used as well when a leading combinator is used
+ // as such selectors are not recognized by querySelectorAll.
// Thanks to Andrew Dupont for this technique.
- if ( nodeType === 1 && rdescend.test( selector ) ) {
+ if ( nodeType === 1 &&
+ ( rdescend.test( selector ) || rcombinators.test( selector ) ) ) {
- // Capture the context ID, setting it first if necessary
- if ( (nid = context.getAttribute( "id" )) ) {
- nid = nid.replace( rcssescape, fcssescape );
- } else {
- context.setAttribute( "id", (nid = expando) );
+ // Expand context for sibling selectors
+ newContext = rsibling.test( selector ) && testContext( context.parentNode ) ||
+ context;
+
+ // We can use :scope instead of the ID hack if the browser
+ // supports it & if we're not changing the context.
+ if ( newContext !== context || !support.scope ) {
+
+ // Capture the context ID, setting it first if necessary
+ if ( ( nid = context.getAttribute( "id" ) ) ) {
+ nid = nid.replace( rcssescape, fcssescape );
+ } else {
+ context.setAttribute( "id", ( nid = expando ) );
+ }
}
// Prefix every selector in the list
groups = tokenize( selector );
i = groups.length;
while ( i-- ) {
- groups[i] = "#" + nid + " " + toSelector( groups[i] );
+ groups[ i ] = ( nid ? "#" + nid : ":scope" ) + " " +
+ toSelector( groups[ i ] );
}
newSelector = groups.join( "," );
-
- // Expand context for sibling selectors
- newContext = rsibling.test( selector ) && testContext( context.parentNode ) ||
- context;
}
try {
@@ -872,12 +904,14 @@ function createCache() {
var keys = [];
function cache( key, value ) {
+
// Use (key + " ") to avoid collision with native prototype properties (see Issue #157)
if ( keys.push( key + " " ) > Expr.cacheLength ) {
+
// Only keep the most recent entries
delete cache[ keys.shift() ];
}
- return (cache[ key + " " ] = value);
+ return ( cache[ key + " " ] = value );
}
return cache;
}
@@ -896,17 +930,19 @@ function markFunction( fn ) {
* @param {Function} fn Passed the created element and returns a boolean result
*/
function assert( fn ) {
- var el = document.createElement("fieldset");
+ var el = document.createElement( "fieldset" );
try {
return !!fn( el );
- } catch (e) {
+ } catch ( e ) {
return false;
} finally {
+
// Remove from its parent by default
if ( el.parentNode ) {
el.parentNode.removeChild( el );
}
+
// release memory in IE
el = null;
}
@@ -918,11 +954,11 @@ function assert( fn ) {
* @param {Function} handler The method that will be applied
*/
function addHandle( attrs, handler ) {
- var arr = attrs.split("|"),
+ var arr = attrs.split( "|" ),
i = arr.length;
while ( i-- ) {
- Expr.attrHandle[ arr[i] ] = handler;
+ Expr.attrHandle[ arr[ i ] ] = handler;
}
}
@@ -944,7 +980,7 @@ function siblingCheck( a, b ) {
// Check if b follows a
if ( cur ) {
- while ( (cur = cur.nextSibling) ) {
+ while ( ( cur = cur.nextSibling ) ) {
if ( cur === b ) {
return -1;
}
@@ -972,7 +1008,7 @@ function createInputPseudo( type ) {
function createButtonPseudo( type ) {
return function( elem ) {
var name = elem.nodeName.toLowerCase();
- return (name === "input" || name === "button") && elem.type === type;
+ return ( name === "input" || name === "button" ) && elem.type === type;
};
}
@@ -1015,7 +1051,7 @@ function createDisabledPseudo( disabled ) {
// Where there is no isDisabled, check manually
/* jshint -W018 */
elem.isDisabled !== !disabled &&
- inDisabledFieldset( elem ) === disabled;
+ inDisabledFieldset( elem ) === disabled;
}
return elem.disabled === disabled;
@@ -1037,21 +1073,21 @@ function createDisabledPseudo( disabled ) {
* @param {Function} fn
*/
function createPositionalPseudo( fn ) {
- return markFunction(function( argument ) {
+ return markFunction( function( argument ) {
argument = +argument;
- return markFunction(function( seed, matches ) {
+ return markFunction( function( seed, matches ) {
var j,
matchIndexes = fn( [], seed.length, argument ),
i = matchIndexes.length;
// Match elements found at the specified indexes
while ( i-- ) {
- if ( seed[ (j = matchIndexes[i]) ] ) {
- seed[j] = !(matches[j] = seed[j]);
+ if ( seed[ ( j = matchIndexes[ i ] ) ] ) {
+ seed[ j ] = !( matches[ j ] = seed[ j ] );
}
}
- });
- });
+ } );
+ } );
}
/**
@@ -1073,7 +1109,7 @@ support = Sizzle.support = {};
*/
isXML = Sizzle.isXML = function( elem ) {
var namespace = elem.namespaceURI,
- docElem = (elem.ownerDocument || elem).documentElement;
+ docElem = ( elem.ownerDocument || elem ).documentElement;
// Support: IE <=8
// Assume HTML when documentElement doesn't yet exist, such as inside loading iframes
@@ -1091,7 +1127,11 @@ setDocument = Sizzle.setDocument = function( node ) {
doc = node ? node.ownerDocument || node : preferredDoc;
// Return early if doc is invalid or already selected
- if ( doc === document || doc.nodeType !== 9 || !doc.documentElement ) {
+ // Support: IE 11+, Edge 17 - 18+
+ // IE/Edge sometimes throw a "Permission denied" error when strict-comparing
+ // two documents; shallow comparisons work.
+ // eslint-disable-next-line eqeqeq
+ if ( doc == document || doc.nodeType !== 9 || !doc.documentElement ) {
return document;
}
@@ -1100,10 +1140,14 @@ setDocument = Sizzle.setDocument = function( node ) {
docElem = document.documentElement;
documentIsHTML = !isXML( document );
- // Support: IE 9-11, Edge
+ // Support: IE 9 - 11+, Edge 12 - 18+
// Accessing iframe documents after unload throws "permission denied" errors (jQuery #13936)
- if ( preferredDoc !== document &&
- (subWindow = document.defaultView) && subWindow.top !== subWindow ) {
+ // Support: IE 11+, Edge 17 - 18+
+ // IE/Edge sometimes throw a "Permission denied" error when strict-comparing
+ // two documents; shallow comparisons work.
+ // eslint-disable-next-line eqeqeq
+ if ( preferredDoc != document &&
+ ( subWindow = document.defaultView ) && subWindow.top !== subWindow ) {
// Support: IE 11, Edge
if ( subWindow.addEventListener ) {
@@ -1115,25 +1159,36 @@ setDocument = Sizzle.setDocument = function( node ) {
}
}
+ // Support: IE 8 - 11+, Edge 12 - 18+, Chrome <=16 - 25 only, Firefox <=3.6 - 31 only,
+ // Safari 4 - 5 only, Opera <=11.6 - 12.x only
+ // IE/Edge & older browsers don't support the :scope pseudo-class.
+ // Support: Safari 6.0 only
+ // Safari 6.0 supports :scope but it's an alias of :root there.
+ support.scope = assert( function( el ) {
+ docElem.appendChild( el ).appendChild( document.createElement( "div" ) );
+ return typeof el.querySelectorAll !== "undefined" &&
+ !el.querySelectorAll( ":scope fieldset div" ).length;
+ } );
+
/* Attributes
---------------------------------------------------------------------- */
// Support: IE<8
// Verify that getAttribute really returns attributes and not properties
// (excepting IE8 booleans)
- support.attributes = assert(function( el ) {
+ support.attributes = assert( function( el ) {
el.className = "i";
- return !el.getAttribute("className");
- });
+ return !el.getAttribute( "className" );
+ } );
/* getElement(s)By*
---------------------------------------------------------------------- */
// Check if getElementsByTagName("*") returns only elements
- support.getElementsByTagName = assert(function( el ) {
- el.appendChild( document.createComment("") );
- return !el.getElementsByTagName("*").length;
- });
+ support.getElementsByTagName = assert( function( el ) {
+ el.appendChild( document.createComment( "" ) );
+ return !el.getElementsByTagName( "*" ).length;
+ } );
// Support: IE<9
support.getElementsByClassName = rnative.test( document.getElementsByClassName );
@@ -1142,38 +1197,38 @@ setDocument = Sizzle.setDocument = function( node ) {
// Check if getElementById returns elements by name
// The broken getElementById methods don't pick up programmatically-set names,
// so use a roundabout getElementsByName test
- support.getById = assert(function( el ) {
+ support.getById = assert( function( el ) {
docElem.appendChild( el ).id = expando;
return !document.getElementsByName || !document.getElementsByName( expando ).length;
- });
+ } );
// ID filter and find
if ( support.getById ) {
- Expr.filter["ID"] = function( id ) {
+ Expr.filter[ "ID" ] = function( id ) {
var attrId = id.replace( runescape, funescape );
return function( elem ) {
- return elem.getAttribute("id") === attrId;
+ return elem.getAttribute( "id" ) === attrId;
};
};
- Expr.find["ID"] = function( id, context ) {
+ Expr.find[ "ID" ] = function( id, context ) {
if ( typeof context.getElementById !== "undefined" && documentIsHTML ) {
var elem = context.getElementById( id );
return elem ? [ elem ] : [];
}
};
} else {
- Expr.filter["ID"] = function( id ) {
+ Expr.filter[ "ID" ] = function( id ) {
var attrId = id.replace( runescape, funescape );
return function( elem ) {
var node = typeof elem.getAttributeNode !== "undefined" &&
- elem.getAttributeNode("id");
+ elem.getAttributeNode( "id" );
return node && node.value === attrId;
};
};
// Support: IE 6 - 7 only
// getElementById is not reliable as a find shortcut
- Expr.find["ID"] = function( id, context ) {
+ Expr.find[ "ID" ] = function( id, context ) {
if ( typeof context.getElementById !== "undefined" && documentIsHTML ) {
var node, i, elems,
elem = context.getElementById( id );
@@ -1181,7 +1236,7 @@ setDocument = Sizzle.setDocument = function( node ) {
if ( elem ) {
// Verify the id attribute
- node = elem.getAttributeNode("id");
+ node = elem.getAttributeNode( "id" );
if ( node && node.value === id ) {
return [ elem ];
}
@@ -1189,8 +1244,8 @@ setDocument = Sizzle.setDocument = function( node ) {
// Fall back on getElementsByName
elems = context.getElementsByName( id );
i = 0;
- while ( (elem = elems[i++]) ) {
- node = elem.getAttributeNode("id");
+ while ( ( elem = elems[ i++ ] ) ) {
+ node = elem.getAttributeNode( "id" );
if ( node && node.value === id ) {
return [ elem ];
}
@@ -1203,7 +1258,7 @@ setDocument = Sizzle.setDocument = function( node ) {
}
// Tag
- Expr.find["TAG"] = support.getElementsByTagName ?
+ Expr.find[ "TAG" ] = support.getElementsByTagName ?
function( tag, context ) {
if ( typeof context.getElementsByTagName !== "undefined" ) {
return context.getElementsByTagName( tag );
@@ -1218,12 +1273,13 @@ setDocument = Sizzle.setDocument = function( node ) {
var elem,
tmp = [],
i = 0,
+
// By happy coincidence, a (broken) gEBTN appears on DocumentFragment nodes too
results = context.getElementsByTagName( tag );
// Filter out possible comments
if ( tag === "*" ) {
- while ( (elem = results[i++]) ) {
+ while ( ( elem = results[ i++ ] ) ) {
if ( elem.nodeType === 1 ) {
tmp.push( elem );
}
@@ -1235,7 +1291,7 @@ setDocument = Sizzle.setDocument = function( node ) {
};
// Class
- Expr.find["CLASS"] = support.getElementsByClassName && function( className, context ) {
+ Expr.find[ "CLASS" ] = support.getElementsByClassName && function( className, context ) {
if ( typeof context.getElementsByClassName !== "undefined" && documentIsHTML ) {
return context.getElementsByClassName( className );
}
@@ -1256,10 +1312,14 @@ setDocument = Sizzle.setDocument = function( node ) {
// See https://bugs.jquery.com/ticket/13378
rbuggyQSA = [];
- if ( (support.qsa = rnative.test( document.querySelectorAll )) ) {
+ if ( ( support.qsa = rnative.test( document.querySelectorAll ) ) ) {
+
// Build QSA regex
// Regex strategy adopted from Diego Perini
- assert(function( el ) {
+ assert( function( el ) {
+
+ var input;
+
// Select is set to empty string on purpose
// This is to test IE's treatment of not explicitly
// setting a boolean content attribute,
@@ -1273,78 +1333,98 @@ setDocument = Sizzle.setDocument = function( node ) {
// Nothing should be selected when empty strings follow ^= or $= or *=
// The test attribute must be unknown in Opera but "safe" for WinRT
// https://msdn.microsoft.com/en-us/library/ie/hh465388.aspx#attribute_section
- if ( el.querySelectorAll("[msallowcapture^='']").length ) {
+ if ( el.querySelectorAll( "[msallowcapture^='']" ).length ) {
rbuggyQSA.push( "[*^$]=" + whitespace + "*(?:''|\"\")" );
}
// Support: IE8
// Boolean attributes and "value" are not treated correctly
- if ( !el.querySelectorAll("[selected]").length ) {
+ if ( !el.querySelectorAll( "[selected]" ).length ) {
rbuggyQSA.push( "\\[" + whitespace + "*(?:value|" + booleans + ")" );
}
// Support: Chrome<29, Android<4.4, Safari<7.0+, iOS<7.0+, PhantomJS<1.9.8+
if ( !el.querySelectorAll( "[id~=" + expando + "-]" ).length ) {
- rbuggyQSA.push("~=");
+ rbuggyQSA.push( "~=" );
+ }
+
+ // Support: IE 11+, Edge 15 - 18+
+ // IE 11/Edge don't find elements on a `[name='']` query in some cases.
+ // Adding a temporary attribute to the document before the selection works
+ // around the issue.
+ // Interestingly, IE 10 & older don't seem to have the issue.
+ input = document.createElement( "input" );
+ input.setAttribute( "name", "" );
+ el.appendChild( input );
+ if ( !el.querySelectorAll( "[name='']" ).length ) {
+ rbuggyQSA.push( "\\[" + whitespace + "*name" + whitespace + "*=" +
+ whitespace + "*(?:''|\"\")" );
}
// Webkit/Opera - :checked should return selected option elements
// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
// IE8 throws error here and will not see later tests
- if ( !el.querySelectorAll(":checked").length ) {
- rbuggyQSA.push(":checked");
+ if ( !el.querySelectorAll( ":checked" ).length ) {
+ rbuggyQSA.push( ":checked" );
}
// Support: Safari 8+, iOS 8+
// https://bugs.webkit.org/show_bug.cgi?id=136851
// In-page `selector#id sibling-combinator selector` fails
if ( !el.querySelectorAll( "a#" + expando + "+*" ).length ) {
- rbuggyQSA.push(".#.+[+~]");
+ rbuggyQSA.push( ".#.+[+~]" );
}
- });
- assert(function( el ) {
+ // Support: Firefox <=3.6 - 5 only
+ // Old Firefox doesn't throw on a badly-escaped identifier.
+ el.querySelectorAll( "\\\f" );
+ rbuggyQSA.push( "[\\r\\n\\f]" );
+ } );
+
+ assert( function( el ) {
el.innerHTML = "<a href='' disabled='disabled'></a>" +
"<select disabled='disabled'><option/></select>";
// Support: Windows 8 Native Apps
// The type and name attributes are restricted during .innerHTML assignment
- var input = document.createElement("input");
+ var input = document.createElement( "input" );
input.setAttribute( "type", "hidden" );
el.appendChild( input ).setAttribute( "name", "D" );
// Support: IE8
// Enforce case-sensitivity of name attribute
- if ( el.querySelectorAll("[name=d]").length ) {
+ if ( el.querySelectorAll( "[name=d]" ).length ) {
rbuggyQSA.push( "name" + whitespace + "*[*^$|!~]?=" );
}
// FF 3.5 - :enabled/:disabled and hidden elements (hidden elements are still enabled)
// IE8 throws error here and will not see later tests
- if ( el.querySelectorAll(":enabled").length !== 2 ) {
+ if ( el.querySelectorAll( ":enabled" ).length !== 2 ) {
rbuggyQSA.push( ":enabled", ":disabled" );
}
// Support: IE9-11+
// IE's :disabled selector does not pick up the children of disabled fieldsets
docElem.appendChild( el ).disabled = true;
- if ( el.querySelectorAll(":disabled").length !== 2 ) {
+ if ( el.querySelectorAll( ":disabled" ).length !== 2 ) {
rbuggyQSA.push( ":enabled", ":disabled" );
}
+ // Support: Opera 10 - 11 only
// Opera 10-11 does not throw on post-comma invalid pseudos
- el.querySelectorAll("*,:x");
- rbuggyQSA.push(",.*:");
- });
+ el.querySelectorAll( "*,:x" );
+ rbuggyQSA.push( ",.*:" );
+ } );
}
- if ( (support.matchesSelector = rnative.test( (matches = docElem.matches ||
+ if ( ( support.matchesSelector = rnative.test( ( matches = docElem.matches ||
docElem.webkitMatchesSelector ||
docElem.mozMatchesSelector ||
docElem.oMatchesSelector ||
- docElem.msMatchesSelector) )) ) {
+ docElem.msMatchesSelector ) ) ) ) {
+
+ assert( function( el ) {
- assert(function( el ) {
// Check to see if it's possible to do matchesSelector
// on a disconnected node (IE 9)
support.disconnectedMatch = matches.call( el, "*" );
@@ -1353,11 +1433,11 @@ setDocument = Sizzle.setDocument = function( node ) {
// Gecko does not error, returns false instead
matches.call( el, "[s!='']:x" );
rbuggyMatches.push( "!=", pseudos );
- });
+ } );
}
- rbuggyQSA = rbuggyQSA.length && new RegExp( rbuggyQSA.join("|") );
- rbuggyMatches = rbuggyMatches.length && new RegExp( rbuggyMatches.join("|") );
+ rbuggyQSA = rbuggyQSA.length && new RegExp( rbuggyQSA.join( "|" ) );
+ rbuggyMatches = rbuggyMatches.length && new RegExp( rbuggyMatches.join( "|" ) );
/* Contains
---------------------------------------------------------------------- */
@@ -1374,11 +1454,11 @@ setDocument = Sizzle.setDocument = function( node ) {
adown.contains ?
adown.contains( bup ) :
a.compareDocumentPosition && a.compareDocumentPosition( bup ) & 16
- ));
+ ) );
} :
function( a, b ) {
if ( b ) {
- while ( (b = b.parentNode) ) {
+ while ( ( b = b.parentNode ) ) {
if ( b === a ) {
return true;
}
@@ -1407,7 +1487,11 @@ setDocument = Sizzle.setDocument = function( node ) {
}
// Calculate position if both inputs belong to the same document
- compare = ( a.ownerDocument || a ) === ( b.ownerDocument || b ) ?
+ // Support: IE 11+, Edge 17 - 18+
+ // IE/Edge sometimes throw a "Permission denied" error when strict-comparing
+ // two documents; shallow comparisons work.
+ // eslint-disable-next-line eqeqeq
+ compare = ( a.ownerDocument || a ) == ( b.ownerDocument || b ) ?
a.compareDocumentPosition( b ) :
// Otherwise we know they are disconnected
@@ -1415,13 +1499,24 @@ setDocument = Sizzle.setDocument = function( node ) {
// Disconnected nodes
if ( compare & 1 ||
- (!support.sortDetached && b.compareDocumentPosition( a ) === compare) ) {
+ ( !support.sortDetached && b.compareDocumentPosition( a ) === compare ) ) {
// Choose the first element that is related to our preferred document
- if ( a === document || a.ownerDocument === preferredDoc && contains(preferredDoc, a) ) {
+ // Support: IE 11+, Edge 17 - 18+
+ // IE/Edge sometimes throw a "Permission denied" error when strict-comparing
+ // two documents; shallow comparisons work.
+ // eslint-disable-next-line eqeqeq
+ if ( a == document || a.ownerDocument == preferredDoc &&
+ contains( preferredDoc, a ) ) {
return -1;
}
- if ( b === document || b.ownerDocument === preferredDoc && contains(preferredDoc, b) ) {
+
+ // Support: IE 11+, Edge 17 - 18+
+ // IE/Edge sometimes throw a "Permission denied" error when strict-comparing
+ // two documents; shallow comparisons work.
+ // eslint-disable-next-line eqeqeq
+ if ( b == document || b.ownerDocument == preferredDoc &&
+ contains( preferredDoc, b ) ) {
return 1;
}
@@ -1434,6 +1529,7 @@ setDocument = Sizzle.setDocument = function( node ) {
return compare & 4 ? -1 : 1;
} :
function( a, b ) {
+
// Exit early if the nodes are identical
if ( a === b ) {
hasDuplicate = true;
@@ -1449,8 +1545,14 @@ setDocument = Sizzle.setDocument = function( node ) {
// Parentless nodes are either documents or disconnected
if ( !aup || !bup ) {
- return a === document ? -1 :
- b === document ? 1 :
+
+ // Support: IE 11+, Edge 17 - 18+
+ // IE/Edge sometimes throw a "Permission denied" error when strict-comparing
+ // two documents; shallow comparisons work.
+ /* eslint-disable eqeqeq */
+ return a == document ? -1 :
+ b == document ? 1 :
+ /* eslint-enable eqeqeq */
aup ? -1 :
bup ? 1 :
sortInput ?
@@ -1464,26 +1566,32 @@ setDocument = Sizzle.setDocument = function( node ) {
// Otherwise we need full lists of their ancestors for comparison
cur = a;
- while ( (cur = cur.parentNode) ) {
+ while ( ( cur = cur.parentNode ) ) {
ap.unshift( cur );
}
cur = b;
- while ( (cur = cur.parentNode) ) {
+ while ( ( cur = cur.parentNode ) ) {
bp.unshift( cur );
}
// Walk down the tree looking for a discrepancy
- while ( ap[i] === bp[i] ) {
+ while ( ap[ i ] === bp[ i ] ) {
i++;
}
return i ?
+
// Do a sibling check if the nodes have a common ancestor
- siblingCheck( ap[i], bp[i] ) :
+ siblingCheck( ap[ i ], bp[ i ] ) :
// Otherwise nodes in our document sort first
- ap[i] === preferredDoc ? -1 :
- bp[i] === preferredDoc ? 1 :
+ // Support: IE 11+, Edge 17 - 18+
+ // IE/Edge sometimes throw a "Permission denied" error when strict-comparing
+ // two documents; shallow comparisons work.
+ /* eslint-disable eqeqeq */
+ ap[ i ] == preferredDoc ? -1 :
+ bp[ i ] == preferredDoc ? 1 :
+ /* eslint-enable eqeqeq */
0;
};
@@ -1495,10 +1603,7 @@ Sizzle.matches = function( expr, elements ) {
};
Sizzle.matchesSelector = function( elem, expr ) {
- // Set document vars if needed
- if ( ( elem.ownerDocument || elem ) !== document ) {
- setDocument( elem );
- }
+ setDocument( elem );
if ( support.matchesSelector && documentIsHTML &&
!nonnativeSelectorCache[ expr + " " ] &&
@@ -1510,12 +1615,13 @@ Sizzle.matchesSelector = function( elem, expr ) {
// IE 9's matchesSelector returns false on disconnected nodes
if ( ret || support.disconnectedMatch ||
- // As well, disconnected nodes are said to be in a document
- // fragment in IE 9
- elem.document && elem.document.nodeType !== 11 ) {
+
+ // As well, disconnected nodes are said to be in a document
+ // fragment in IE 9
+ elem.document && elem.document.nodeType !== 11 ) {
return ret;
}
- } catch (e) {
+ } catch ( e ) {
nonnativeSelectorCache( expr, true );
}
}
@@ -1524,20 +1630,31 @@ Sizzle.matchesSelector = function( elem, expr ) {
};
Sizzle.contains = function( context, elem ) {
+
// Set document vars if needed
- if ( ( context.ownerDocument || context ) !== document ) {
+ // Support: IE 11+, Edge 17 - 18+
+ // IE/Edge sometimes throw a "Permission denied" error when strict-comparing
+ // two documents; shallow comparisons work.
+ // eslint-disable-next-line eqeqeq
+ if ( ( context.ownerDocument || context ) != document ) {
setDocument( context );
}
return contains( context, elem );
};
Sizzle.attr = function( elem, name ) {
+
// Set document vars if needed
- if ( ( elem.ownerDocument || elem ) !== document ) {
+ // Support: IE 11+, Edge 17 - 18+
+ // IE/Edge sometimes throw a "Permission denied" error when strict-comparing
+ // two documents; shallow comparisons work.
+ // eslint-disable-next-line eqeqeq
+ if ( ( elem.ownerDocument || elem ) != document ) {
setDocument( elem );
}
var fn = Expr.attrHandle[ name.toLowerCase() ],
+
// Don't get fooled by Object.prototype properties (jQuery #13807)
val = fn && hasOwn.call( Expr.attrHandle, name.toLowerCase() ) ?
fn( elem, name, !documentIsHTML ) :
@@ -1547,13 +1664,13 @@ Sizzle.attr = function( elem, name ) {
val :
support.attributes || !documentIsHTML ?
elem.getAttribute( name ) :
- (val = elem.getAttributeNode(name)) && val.specified ?
+ ( val = elem.getAttributeNode( name ) ) && val.specified ?
val.value :
null;
};
Sizzle.escape = function( sel ) {
- return (sel + "").replace( rcssescape, fcssescape );
+ return ( sel + "" ).replace( rcssescape, fcssescape );
};
Sizzle.error = function( msg ) {
@@ -1576,7 +1693,7 @@ Sizzle.uniqueSort = function( results ) {
results.sort( sortOrder );
if ( hasDuplicate ) {
- while ( (elem = results[i++]) ) {
+ while ( ( elem = results[ i++ ] ) ) {
if ( elem === results[ i ] ) {
j = duplicates.push( i );
}
@@ -1604,17 +1721,21 @@ getText = Sizzle.getText = function( elem ) {
nodeType = elem.nodeType;
if ( !nodeType ) {
+
// If no nodeType, this is expected to be an array
- while ( (node = elem[i++]) ) {
+ while ( ( node = elem[ i++ ] ) ) {
+
// Do not traverse comment nodes
ret += getText( node );
}
} else if ( nodeType === 1 || nodeType === 9 || nodeType === 11 ) {
+
// Use textContent for elements
// innerText usage removed for consistency of new lines (jQuery #11153)
if ( typeof elem.textContent === "string" ) {
return elem.textContent;
} else {
+
// Traverse its children
for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
ret += getText( elem );
@@ -1623,6 +1744,7 @@ getText = Sizzle.getText = function( elem ) {
} else if ( nodeType === 3 || nodeType === 4 ) {
return elem.nodeValue;
}
+
// Do not include comment or processing instruction nodes
return ret;
@@ -1650,19 +1772,21 @@ Expr = Sizzle.selectors = {
preFilter: {
"ATTR": function( match ) {
- match[1] = match[1].replace( runescape, funescape );
+ match[ 1 ] = match[ 1 ].replace( runescape, funescape );
// Move the given value to match[3] whether quoted or unquoted
- match[3] = ( match[3] || match[4] || match[5] || "" ).replace( runescape, funescape );
+ match[ 3 ] = ( match[ 3 ] || match[ 4 ] ||
+ match[ 5 ] || "" ).replace( runescape, funescape );
- if ( match[2] === "~=" ) {
- match[3] = " " + match[3] + " ";
+ if ( match[ 2 ] === "~=" ) {
+ match[ 3 ] = " " + match[ 3 ] + " ";
}
return match.slice( 0, 4 );
},
"CHILD": function( match ) {
+
/* matches from matchExpr["CHILD"]
1 type (only|nth|...)
2 what (child|of-type)
@@ -1673,22 +1797,25 @@ Expr = Sizzle.selectors = {
7 sign of y-component
8 y of y-component
*/
- match[1] = match[1].toLowerCase();
+ match[ 1 ] = match[ 1 ].toLowerCase();
+
+ if ( match[ 1 ].slice( 0, 3 ) === "nth" ) {
- if ( match[1].slice( 0, 3 ) === "nth" ) {
// nth-* requires argument
- if ( !match[3] ) {
- Sizzle.error( match[0] );
+ if ( !match[ 3 ] ) {
+ Sizzle.error( match[ 0 ] );
}
// numeric x and y parameters for Expr.filter.CHILD
// remember that false/true cast respectively to 0/1
- match[4] = +( match[4] ? match[5] + (match[6] || 1) : 2 * ( match[3] === "even" || match[3] === "odd" ) );
- match[5] = +( ( match[7] + match[8] ) || match[3] === "odd" );
+ match[ 4 ] = +( match[ 4 ] ?
+ match[ 5 ] + ( match[ 6 ] || 1 ) :
+ 2 * ( match[ 3 ] === "even" || match[ 3 ] === "odd" ) );
+ match[ 5 ] = +( ( match[ 7 ] + match[ 8 ] ) || match[ 3 ] === "odd" );
- // other types prohibit arguments
- } else if ( match[3] ) {
- Sizzle.error( match[0] );
+ // other types prohibit arguments
+ } else if ( match[ 3 ] ) {
+ Sizzle.error( match[ 0 ] );
}
return match;
@@ -1696,26 +1823,28 @@ Expr = Sizzle.selectors = {
"PSEUDO": function( match ) {
var excess,
- unquoted = !match[6] && match[2];
+ unquoted = !match[ 6 ] && match[ 2 ];
- if ( matchExpr["CHILD"].test( match[0] ) ) {
+ if ( matchExpr[ "CHILD" ].test( match[ 0 ] ) ) {
return null;
}
// Accept quoted arguments as-is
- if ( match[3] ) {
- match[2] = match[4] || match[5] || "";
+ if ( match[ 3 ] ) {
+ match[ 2 ] = match[ 4 ] || match[ 5 ] || "";
// Strip excess characters from unquoted arguments
} else if ( unquoted && rpseudo.test( unquoted ) &&
+
// Get excess from tokenize (recursively)
- (excess = tokenize( unquoted, true )) &&
+ ( excess = tokenize( unquoted, true ) ) &&
+
// advance to the next closing parenthesis
- (excess = unquoted.indexOf( ")", unquoted.length - excess ) - unquoted.length) ) {
+ ( excess = unquoted.indexOf( ")", unquoted.length - excess ) - unquoted.length ) ) {
// excess is a negative index
- match[0] = match[0].slice( 0, excess );
- match[2] = unquoted.slice( 0, excess );
+ match[ 0 ] = match[ 0 ].slice( 0, excess );
+ match[ 2 ] = unquoted.slice( 0, excess );
}
// Return only captures needed by the pseudo filter method (type and argument)
@@ -1728,7 +1857,9 @@ Expr = Sizzle.selectors = {
"TAG": function( nodeNameSelector ) {
var nodeName = nodeNameSelector.replace( runescape, funescape ).toLowerCase();
return nodeNameSelector === "*" ?
- function() { return true; } :
+ function() {
+ return true;
+ } :
function( elem ) {
return elem.nodeName && elem.nodeName.toLowerCase() === nodeName;
};
@@ -1738,10 +1869,16 @@ Expr = Sizzle.selectors = {
var pattern = classCache[ className + " " ];
return pattern ||
- (pattern = new RegExp( "(^|" + whitespace + ")" + className + "(" + whitespace + "|$)" )) &&
- classCache( className, function( elem ) {
- return pattern.test( typeof elem.className === "string" && elem.className || typeof elem.getAttribute !== "undefined" && elem.getAttribute("class") || "" );
- });
+ ( pattern = new RegExp( "(^|" + whitespace +
+ ")" + className + "(" + whitespace + "|$)" ) ) && classCache(
+ className, function( elem ) {
+ return pattern.test(
+ typeof elem.className === "string" && elem.className ||
+ typeof elem.getAttribute !== "undefined" &&
+ elem.getAttribute( "class" ) ||
+ ""
+ );
+ } );
},
"ATTR": function( name, operator, check ) {
@@ -1757,6 +1894,8 @@ Expr = Sizzle.selectors = {
result += "";
+ /* eslint-disable max-len */
+
return operator === "=" ? result === check :
operator === "!=" ? result !== check :
operator === "^=" ? check && result.indexOf( check ) === 0 :
@@ -1765,10 +1904,12 @@ Expr = Sizzle.selectors = {
operator === "~=" ? ( " " + result.replace( rwhitespace, " " ) + " " ).indexOf( check ) > -1 :
operator === "|=" ? result === check || result.slice( 0, check.length + 1 ) === check + "-" :
false;
+ /* eslint-enable max-len */
+
};
},
- "CHILD": function( type, what, argument, first, last ) {
+ "CHILD": function( type, what, _argument, first, last ) {
var simple = type.slice( 0, 3 ) !== "nth",
forward = type.slice( -4 ) !== "last",
ofType = what === "of-type";
@@ -1780,7 +1921,7 @@ Expr = Sizzle.selectors = {
return !!elem.parentNode;
} :
- function( elem, context, xml ) {
+ function( elem, _context, xml ) {
var cache, uniqueCache, outerCache, node, nodeIndex, start,
dir = simple !== forward ? "nextSibling" : "previousSibling",
parent = elem.parentNode,
@@ -1794,7 +1935,7 @@ Expr = Sizzle.selectors = {
if ( simple ) {
while ( dir ) {
node = elem;
- while ( (node = node[ dir ]) ) {
+ while ( ( node = node[ dir ] ) ) {
if ( ofType ?
node.nodeName.toLowerCase() === name :
node.nodeType === 1 ) {
@@ -1802,6 +1943,7 @@ Expr = Sizzle.selectors = {
return false;
}
}
+
// Reverse direction for :only-* (if we haven't yet done so)
start = dir = type === "only" && !start && "nextSibling";
}
@@ -1817,22 +1959,22 @@ Expr = Sizzle.selectors = {
// ...in a gzip-friendly way
node = parent;
- outerCache = node[ expando ] || (node[ expando ] = {});
+ outerCache = node[ expando ] || ( node[ expando ] = {} );
// Support: IE <9 only
// Defend against cloned attroperties (jQuery gh-1709)
uniqueCache = outerCache[ node.uniqueID ] ||
- (outerCache[ node.uniqueID ] = {});
+ ( outerCache[ node.uniqueID ] = {} );
cache = uniqueCache[ type ] || [];
nodeIndex = cache[ 0 ] === dirruns && cache[ 1 ];
diff = nodeIndex && cache[ 2 ];
node = nodeIndex && parent.childNodes[ nodeIndex ];
- while ( (node = ++nodeIndex && node && node[ dir ] ||
+ while ( ( node = ++nodeIndex && node && node[ dir ] ||
// Fallback to seeking `elem` from the start
- (diff = nodeIndex = 0) || start.pop()) ) {
+ ( diff = nodeIndex = 0 ) || start.pop() ) ) {
// When found, cache indexes on `parent` and break
if ( node.nodeType === 1 && ++diff && node === elem ) {
@@ -1842,16 +1984,18 @@ Expr = Sizzle.selectors = {
}
} else {
+
// Use previously-cached element index if available
if ( useCache ) {
+
// ...in a gzip-friendly way
node = elem;
- outerCache = node[ expando ] || (node[ expando ] = {});
+ outerCache = node[ expando ] || ( node[ expando ] = {} );
// Support: IE <9 only
// Defend against cloned attroperties (jQuery gh-1709)
uniqueCache = outerCache[ node.uniqueID ] ||
- (outerCache[ node.uniqueID ] = {});
+ ( outerCache[ node.uniqueID ] = {} );
cache = uniqueCache[ type ] || [];
nodeIndex = cache[ 0 ] === dirruns && cache[ 1 ];
@@ -1861,9 +2005,10 @@ Expr = Sizzle.selectors = {
// xml :nth-child(...)
// or :nth-last-child(...) or :nth(-last)?-of-type(...)
if ( diff === false ) {
+
// Use the same loop as above to seek `elem` from the start
- while ( (node = ++nodeIndex && node && node[ dir ] ||
- (diff = nodeIndex = 0) || start.pop()) ) {
+ while ( ( node = ++nodeIndex && node && node[ dir ] ||
+ ( diff = nodeIndex = 0 ) || start.pop() ) ) {
if ( ( ofType ?
node.nodeName.toLowerCase() === name :
@@ -1872,12 +2017,13 @@ Expr = Sizzle.selectors = {
// Cache the index of each encountered element
if ( useCache ) {
- outerCache = node[ expando ] || (node[ expando ] = {});
+ outerCache = node[ expando ] ||
+ ( node[ expando ] = {} );
// Support: IE <9 only
// Defend against cloned attroperties (jQuery gh-1709)
uniqueCache = outerCache[ node.uniqueID ] ||
- (outerCache[ node.uniqueID ] = {});
+ ( outerCache[ node.uniqueID ] = {} );
uniqueCache[ type ] = [ dirruns, diff ];
}
@@ -1898,6 +2044,7 @@ Expr = Sizzle.selectors = {
},
"PSEUDO": function( pseudo, argument ) {
+
// pseudo-class names are case-insensitive
// http://www.w3.org/TR/selectors/#pseudo-classes
// Prioritize by case sensitivity in case custom pseudos are added with uppercase letters
@@ -1917,15 +2064,15 @@ Expr = Sizzle.selectors = {
if ( fn.length > 1 ) {
args = [ pseudo, pseudo, "", argument ];
return Expr.setFilters.hasOwnProperty( pseudo.toLowerCase() ) ?
- markFunction(function( seed, matches ) {
+ markFunction( function( seed, matches ) {
var idx,
matched = fn( seed, argument ),
i = matched.length;
while ( i-- ) {
- idx = indexOf( seed, matched[i] );
- seed[ idx ] = !( matches[ idx ] = matched[i] );
+ idx = indexOf( seed, matched[ i ] );
+ seed[ idx ] = !( matches[ idx ] = matched[ i ] );
}
- }) :
+ } ) :
function( elem ) {
return fn( elem, 0, args );
};
@@ -1936,8 +2083,10 @@ Expr = Sizzle.selectors = {
},
pseudos: {
+
// Potentially complex pseudos
- "not": markFunction(function( selector ) {
+ "not": markFunction( function( selector ) {
+
// Trim the selector passed to compile
// to avoid treating leading and trailing
// spaces as combinators
@@ -1946,39 +2095,40 @@ Expr = Sizzle.selectors = {
matcher = compile( selector.replace( rtrim, "$1" ) );
return matcher[ expando ] ?
- markFunction(function( seed, matches, context, xml ) {
+ markFunction( function( seed, matches, _context, xml ) {
var elem,
unmatched = matcher( seed, null, xml, [] ),
i = seed.length;
// Match elements unmatched by `matcher`
while ( i-- ) {
- if ( (elem = unmatched[i]) ) {
- seed[i] = !(matches[i] = elem);
+ if ( ( elem = unmatched[ i ] ) ) {
+ seed[ i ] = !( matches[ i ] = elem );
}
}
- }) :
- function( elem, context, xml ) {
- input[0] = elem;
+ } ) :
+ function( elem, _context, xml ) {
+ input[ 0 ] = elem;
matcher( input, null, xml, results );
+
// Don't keep the element (issue #299)
- input[0] = null;
+ input[ 0 ] = null;
return !results.pop();
};
- }),
+ } ),
- "has": markFunction(function( selector ) {
+ "has": markFunction( function( selector ) {
return function( elem ) {
return Sizzle( selector, elem ).length > 0;
};
- }),
+ } ),
- "contains": markFunction(function( text ) {
+ "contains": markFunction( function( text ) {
text = text.replace( runescape, funescape );
return function( elem ) {
return ( elem.textContent || getText( elem ) ).indexOf( text ) > -1;
};
- }),
+ } ),
// "Whether an element is represented by a :lang() selector
// is based solely on the element's language value
@@ -1988,25 +2138,26 @@ Expr = Sizzle.selectors = {
// The identifier C does not have to be a valid language name."
// http://www.w3.org/TR/selectors/#lang-pseudo
"lang": markFunction( function( lang ) {
+
// lang value must be a valid identifier
- if ( !ridentifier.test(lang || "") ) {
+ if ( !ridentifier.test( lang || "" ) ) {
Sizzle.error( "unsupported lang: " + lang );
}
lang = lang.replace( runescape, funescape ).toLowerCase();
return function( elem ) {
var elemLang;
do {
- if ( (elemLang = documentIsHTML ?
+ if ( ( elemLang = documentIsHTML ?
elem.lang :
- elem.getAttribute("xml:lang") || elem.getAttribute("lang")) ) {
+ elem.getAttribute( "xml:lang" ) || elem.getAttribute( "lang" ) ) ) {
elemLang = elemLang.toLowerCase();
return elemLang === lang || elemLang.indexOf( lang + "-" ) === 0;
}
- } while ( (elem = elem.parentNode) && elem.nodeType === 1 );
+ } while ( ( elem = elem.parentNode ) && elem.nodeType === 1 );
return false;
};
- }),
+ } ),
// Miscellaneous
"target": function( elem ) {
@@ -2019,7 +2170,9 @@ Expr = Sizzle.selectors = {
},
"focus": function( elem ) {
- return elem === document.activeElement && (!document.hasFocus || document.hasFocus()) && !!(elem.type || elem.href || ~elem.tabIndex);
+ return elem === document.activeElement &&
+ ( !document.hasFocus || document.hasFocus() ) &&
+ !!( elem.type || elem.href || ~elem.tabIndex );
},
// Boolean properties
@@ -2027,16 +2180,20 @@ Expr = Sizzle.selectors = {
"disabled": createDisabledPseudo( true ),
"checked": function( elem ) {
+
// In CSS3, :checked should return both checked and selected elements
// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
var nodeName = elem.nodeName.toLowerCase();
- return (nodeName === "input" && !!elem.checked) || (nodeName === "option" && !!elem.selected);
+ return ( nodeName === "input" && !!elem.checked ) ||
+ ( nodeName === "option" && !!elem.selected );
},
"selected": function( elem ) {
+
// Accessing this property makes selected-by-default
// options in Safari work properly
if ( elem.parentNode ) {
+ // eslint-disable-next-line no-unused-expressions
elem.parentNode.selectedIndex;
}
@@ -2045,6 +2202,7 @@ Expr = Sizzle.selectors = {
// Contents
"empty": function( elem ) {
+
// http://www.w3.org/TR/selectors/#empty-pseudo
// :empty is negated by element (1) or content nodes (text: 3; cdata: 4; entity ref: 5),
// but not by others (comment: 8; processing instruction: 7; etc.)
@@ -2058,7 +2216,7 @@ Expr = Sizzle.selectors = {
},
"parent": function( elem ) {
- return !Expr.pseudos["empty"]( elem );
+ return !Expr.pseudos[ "empty" ]( elem );
},
// Element/input types
@@ -2082,39 +2240,40 @@ Expr = Sizzle.selectors = {
// Support: IE<8
// New HTML5 attribute values (e.g., "search") appear with elem.type === "text"
- ( (attr = elem.getAttribute("type")) == null || attr.toLowerCase() === "text" );
+ ( ( attr = elem.getAttribute( "type" ) ) == null ||
+ attr.toLowerCase() === "text" );
},
// Position-in-collection
- "first": createPositionalPseudo(function() {
+ "first": createPositionalPseudo( function() {
return [ 0 ];
- }),
+ } ),
- "last": createPositionalPseudo(function( matchIndexes, length ) {
+ "last": createPositionalPseudo( function( _matchIndexes, length ) {
return [ length - 1 ];
- }),
+ } ),
- "eq": createPositionalPseudo(function( matchIndexes, length, argument ) {
+ "eq": createPositionalPseudo( function( _matchIndexes, length, argument ) {
return [ argument < 0 ? argument + length : argument ];
- }),
+ } ),
- "even": createPositionalPseudo(function( matchIndexes, length ) {
+ "even": createPositionalPseudo( function( matchIndexes, length ) {
var i = 0;
for ( ; i < length; i += 2 ) {
matchIndexes.push( i );
}
return matchIndexes;
- }),
+ } ),
- "odd": createPositionalPseudo(function( matchIndexes, length ) {
+ "odd": createPositionalPseudo( function( matchIndexes, length ) {
var i = 1;
for ( ; i < length; i += 2 ) {
matchIndexes.push( i );
}
return matchIndexes;
- }),
+ } ),
- "lt": createPositionalPseudo(function( matchIndexes, length, argument ) {
+ "lt": createPositionalPseudo( function( matchIndexes, length, argument ) {
var i = argument < 0 ?
argument + length :
argument > length ?
@@ -2124,19 +2283,19 @@ Expr = Sizzle.selectors = {
matchIndexes.push( i );
}
return matchIndexes;
- }),
+ } ),
- "gt": createPositionalPseudo(function( matchIndexes, length, argument ) {
+ "gt": createPositionalPseudo( function( matchIndexes, length, argument ) {
var i = argument < 0 ? argument + length : argument;
for ( ; ++i < length; ) {
matchIndexes.push( i );
}
return matchIndexes;
- })
+ } )
}
};
-Expr.pseudos["nth"] = Expr.pseudos["eq"];
+Expr.pseudos[ "nth" ] = Expr.pseudos[ "eq" ];
// Add button/input type pseudos
for ( i in { radio: true, checkbox: true, file: true, password: true, image: true } ) {
@@ -2167,37 +2326,39 @@ tokenize = Sizzle.tokenize = function( selector, parseOnly ) {
while ( soFar ) {
// Comma and first run
- if ( !matched || (match = rcomma.exec( soFar )) ) {
+ if ( !matched || ( match = rcomma.exec( soFar ) ) ) {
if ( match ) {
+
// Don't consume trailing commas as valid
- soFar = soFar.slice( match[0].length ) || soFar;
+ soFar = soFar.slice( match[ 0 ].length ) || soFar;
}
- groups.push( (tokens = []) );
+ groups.push( ( tokens = [] ) );
}
matched = false;
// Combinators
- if ( (match = rcombinators.exec( soFar )) ) {
+ if ( ( match = rcombinators.exec( soFar ) ) ) {
matched = match.shift();
- tokens.push({
+ tokens.push( {
value: matched,
+
// Cast descendant combinators to space
- type: match[0].replace( rtrim, " " )
- });
+ type: match[ 0 ].replace( rtrim, " " )
+ } );
soFar = soFar.slice( matched.length );
}
// Filters
for ( type in Expr.filter ) {
- if ( (match = matchExpr[ type ].exec( soFar )) && (!preFilters[ type ] ||
- (match = preFilters[ type ]( match ))) ) {
+ if ( ( match = matchExpr[ type ].exec( soFar ) ) && ( !preFilters[ type ] ||
+ ( match = preFilters[ type ]( match ) ) ) ) {
matched = match.shift();
- tokens.push({
+ tokens.push( {
value: matched,
type: type,
matches: match
- });
+ } );
soFar = soFar.slice( matched.length );
}
}
@@ -2214,6 +2375,7 @@ tokenize = Sizzle.tokenize = function( selector, parseOnly ) {
soFar.length :
soFar ?
Sizzle.error( selector ) :
+
// Cache the tokens
tokenCache( selector, groups ).slice( 0 );
};
@@ -2223,7 +2385,7 @@ function toSelector( tokens ) {
len = tokens.length,
selector = "";
for ( ; i < len; i++ ) {
- selector += tokens[i].value;
+ selector += tokens[ i ].value;
}
return selector;
}
@@ -2236,9 +2398,10 @@ function addCombinator( matcher, combinator, base ) {
doneName = done++;
return combinator.first ?
+
// Check against closest ancestor/preceding element
function( elem, context, xml ) {
- while ( (elem = elem[ dir ]) ) {
+ while ( ( elem = elem[ dir ] ) ) {
if ( elem.nodeType === 1 || checkNonElements ) {
return matcher( elem, context, xml );
}
@@ -2253,7 +2416,7 @@ function addCombinator( matcher, combinator, base ) {
// We can't set arbitrary data on XML nodes, so they don't benefit from combinator caching
if ( xml ) {
- while ( (elem = elem[ dir ]) ) {
+ while ( ( elem = elem[ dir ] ) ) {
if ( elem.nodeType === 1 || checkNonElements ) {
if ( matcher( elem, context, xml ) ) {
return true;
@@ -2261,27 +2424,29 @@ function addCombinator( matcher, combinator, base ) {
}
}
} else {
- while ( (elem = elem[ dir ]) ) {
+ while ( ( elem = elem[ dir ] ) ) {
if ( elem.nodeType === 1 || checkNonElements ) {
- outerCache = elem[ expando ] || (elem[ expando ] = {});
+ outerCache = elem[ expando ] || ( elem[ expando ] = {} );
// Support: IE <9 only
// Defend against cloned attroperties (jQuery gh-1709)
- uniqueCache = outerCache[ elem.uniqueID ] || (outerCache[ elem.uniqueID ] = {});
+ uniqueCache = outerCache[ elem.uniqueID ] ||
+ ( outerCache[ elem.uniqueID ] = {} );
if ( skip && skip === elem.nodeName.toLowerCase() ) {
elem = elem[ dir ] || elem;
- } else if ( (oldCache = uniqueCache[ key ]) &&
+ } else if ( ( oldCache = uniqueCache[ key ] ) &&
oldCache[ 0 ] === dirruns && oldCache[ 1 ] === doneName ) {
// Assign to newCache so results back-propagate to previous elements
- return (newCache[ 2 ] = oldCache[ 2 ]);
+ return ( newCache[ 2 ] = oldCache[ 2 ] );
} else {
+
// Reuse newcache so results back-propagate to previous elements
uniqueCache[ key ] = newCache;
// A match means we're done; a fail means we have to keep checking
- if ( (newCache[ 2 ] = matcher( elem, context, xml )) ) {
+ if ( ( newCache[ 2 ] = matcher( elem, context, xml ) ) ) {
return true;
}
}
@@ -2297,20 +2462,20 @@ function elementMatcher( matchers ) {
function( elem, context, xml ) {
var i = matchers.length;
while ( i-- ) {
- if ( !matchers[i]( elem, context, xml ) ) {
+ if ( !matchers[ i ]( elem, context, xml ) ) {
return false;
}
}
return true;
} :
- matchers[0];
+ matchers[ 0 ];
}
function multipleContexts( selector, contexts, results ) {
var i = 0,
len = contexts.length;
for ( ; i < len; i++ ) {
- Sizzle( selector, contexts[i], results );
+ Sizzle( selector, contexts[ i ], results );
}
return results;
}
@@ -2323,7 +2488,7 @@ function condense( unmatched, map, filter, context, xml ) {
mapped = map != null;
for ( ; i < len; i++ ) {
- if ( (elem = unmatched[i]) ) {
+ if ( ( elem = unmatched[ i ] ) ) {
if ( !filter || filter( elem, context, xml ) ) {
newUnmatched.push( elem );
if ( mapped ) {
@@ -2343,14 +2508,18 @@ function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postS
if ( postFinder && !postFinder[ expando ] ) {
postFinder = setMatcher( postFinder, postSelector );
}
- return markFunction(function( seed, results, context, xml ) {
+ return markFunction( function( seed, results, context, xml ) {
var temp, i, elem,
preMap = [],
postMap = [],
preexisting = results.length,
// Get initial elements from seed or context
- elems = seed || multipleContexts( selector || "*", context.nodeType ? [ context ] : context, [] ),
+ elems = seed || multipleContexts(
+ selector || "*",
+ context.nodeType ? [ context ] : context,
+ []
+ ),
// Prefilter to get matcher input, preserving a map for seed-results synchronization
matcherIn = preFilter && ( seed || !selector ) ?
@@ -2358,6 +2527,7 @@ function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postS
elems,
matcherOut = matcher ?
+
// If we have a postFinder, or filtered seed, or non-seed postFilter or preexisting results,
postFinder || ( seed ? preFilter : preexisting || postFilter ) ?
@@ -2381,8 +2551,8 @@ function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postS
// Un-match failing elements by moving them back to matcherIn
i = temp.length;
while ( i-- ) {
- if ( (elem = temp[i]) ) {
- matcherOut[ postMap[i] ] = !(matcherIn[ postMap[i] ] = elem);
+ if ( ( elem = temp[ i ] ) ) {
+ matcherOut[ postMap[ i ] ] = !( matcherIn[ postMap[ i ] ] = elem );
}
}
}
@@ -2390,25 +2560,27 @@ function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postS
if ( seed ) {
if ( postFinder || preFilter ) {
if ( postFinder ) {
+
// Get the final matcherOut by condensing this intermediate into postFinder contexts
temp = [];
i = matcherOut.length;
while ( i-- ) {
- if ( (elem = matcherOut[i]) ) {
+ if ( ( elem = matcherOut[ i ] ) ) {
+
// Restore matcherIn since elem is not yet a final match
- temp.push( (matcherIn[i] = elem) );
+ temp.push( ( matcherIn[ i ] = elem ) );
}
}
- postFinder( null, (matcherOut = []), temp, xml );
+ postFinder( null, ( matcherOut = [] ), temp, xml );
}
// Move matched elements from seed to results to keep them synchronized
i = matcherOut.length;
while ( i-- ) {
- if ( (elem = matcherOut[i]) &&
- (temp = postFinder ? indexOf( seed, elem ) : preMap[i]) > -1 ) {
+ if ( ( elem = matcherOut[ i ] ) &&
+ ( temp = postFinder ? indexOf( seed, elem ) : preMap[ i ] ) > -1 ) {
- seed[temp] = !(results[temp] = elem);
+ seed[ temp ] = !( results[ temp ] = elem );
}
}
}
@@ -2426,14 +2598,14 @@ function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postS
push.apply( results, matcherOut );
}
}
- });
+ } );
}
function matcherFromTokens( tokens ) {
var checkContext, matcher, j,
len = tokens.length,
- leadingRelative = Expr.relative[ tokens[0].type ],
- implicitRelative = leadingRelative || Expr.relative[" "],
+ leadingRelative = Expr.relative[ tokens[ 0 ].type ],
+ implicitRelative = leadingRelative || Expr.relative[ " " ],
i = leadingRelative ? 1 : 0,
// The foundational matcher ensures that elements are reachable from top-level context(s)
@@ -2445,38 +2617,43 @@ function matcherFromTokens( tokens ) {
}, implicitRelative, true ),
matchers = [ function( elem, context, xml ) {
var ret = ( !leadingRelative && ( xml || context !== outermostContext ) ) || (
- (checkContext = context).nodeType ?
+ ( checkContext = context ).nodeType ?
matchContext( elem, context, xml ) :
matchAnyContext( elem, context, xml ) );
+
// Avoid hanging onto element (issue #299)
checkContext = null;
return ret;
} ];
for ( ; i < len; i++ ) {
- if ( (matcher = Expr.relative[ tokens[i].type ]) ) {
- matchers = [ addCombinator(elementMatcher( matchers ), matcher) ];
+ if ( ( matcher = Expr.relative[ tokens[ i ].type ] ) ) {
+ matchers = [ addCombinator( elementMatcher( matchers ), matcher ) ];
} else {
- matcher = Expr.filter[ tokens[i].type ].apply( null, tokens[i].matches );
+ matcher = Expr.filter[ tokens[ i ].type ].apply( null, tokens[ i ].matches );
// Return special upon seeing a positional matcher
if ( matcher[ expando ] ) {
+
// Find the next relative operator (if any) for proper handling
j = ++i;
for ( ; j < len; j++ ) {
- if ( Expr.relative[ tokens[j].type ] ) {
+ if ( Expr.relative[ tokens[ j ].type ] ) {
break;
}
}
return setMatcher(
i > 1 && elementMatcher( matchers ),
i > 1 && toSelector(
- // If the preceding token was a descendant combinator, insert an implicit any-element `*`
- tokens.slice( 0, i - 1 ).concat({ value: tokens[ i - 2 ].type === " " ? "*" : "" })
+
+ // If the preceding token was a descendant combinator, insert an implicit any-element `*`
+ tokens
+ .slice( 0, i - 1 )
+ .concat( { value: tokens[ i - 2 ].type === " " ? "*" : "" } )
).replace( rtrim, "$1" ),
matcher,
i < j && matcherFromTokens( tokens.slice( i, j ) ),
- j < len && matcherFromTokens( (tokens = tokens.slice( j )) ),
+ j < len && matcherFromTokens( ( tokens = tokens.slice( j ) ) ),
j < len && toSelector( tokens )
);
}
@@ -2497,28 +2674,40 @@ function matcherFromGroupMatchers( elementMatchers, setMatchers ) {
unmatched = seed && [],
setMatched = [],
contextBackup = outermostContext,
+
// We must always have either seed elements or outermost context
- elems = seed || byElement && Expr.find["TAG"]( "*", outermost ),
+ elems = seed || byElement && Expr.find[ "TAG" ]( "*", outermost ),
+
// Use integer dirruns iff this is the outermost matcher
- dirrunsUnique = (dirruns += contextBackup == null ? 1 : Math.random() || 0.1),
+ dirrunsUnique = ( dirruns += contextBackup == null ? 1 : Math.random() || 0.1 ),
len = elems.length;
if ( outermost ) {
- outermostContext = context === document || context || outermost;
+
+ // Support: IE 11+, Edge 17 - 18+
+ // IE/Edge sometimes throw a "Permission denied" error when strict-comparing
+ // two documents; shallow comparisons work.
+ // eslint-disable-next-line eqeqeq
+ outermostContext = context == document || context || outermost;
}
// Add elements passing elementMatchers directly to results
// Support: IE<9, Safari
// Tolerate NodeList properties (IE: "length"; Safari: <number>) matching elements by id
- for ( ; i !== len && (elem = elems[i]) != null; i++ ) {
+ for ( ; i !== len && ( elem = elems[ i ] ) != null; i++ ) {
if ( byElement && elem ) {
j = 0;
- if ( !context && elem.ownerDocument !== document ) {
+
+ // Support: IE 11+, Edge 17 - 18+
+ // IE/Edge sometimes throw a "Permission denied" error when strict-comparing
+ // two documents; shallow comparisons work.
+ // eslint-disable-next-line eqeqeq
+ if ( !context && elem.ownerDocument != document ) {
setDocument( elem );
xml = !documentIsHTML;
}
- while ( (matcher = elementMatchers[j++]) ) {
- if ( matcher( elem, context || document, xml) ) {
+ while ( ( matcher = elementMatchers[ j++ ] ) ) {
+ if ( matcher( elem, context || document, xml ) ) {
results.push( elem );
break;
}
@@ -2530,8 +2719,9 @@ function matcherFromGroupMatchers( elementMatchers, setMatchers ) {
// Track unmatched elements for set filters
if ( bySet ) {
+
// They will have gone through all possible matchers
- if ( (elem = !matcher && elem) ) {
+ if ( ( elem = !matcher && elem ) ) {
matchedCount--;
}
@@ -2555,16 +2745,17 @@ function matcherFromGroupMatchers( elementMatchers, setMatchers ) {
// numerically zero.
if ( bySet && i !== matchedCount ) {
j = 0;
- while ( (matcher = setMatchers[j++]) ) {
+ while ( ( matcher = setMatchers[ j++ ] ) ) {
matcher( unmatched, setMatched, context, xml );
}
if ( seed ) {
+
// Reintegrate element matches to eliminate the need for sorting
if ( matchedCount > 0 ) {
while ( i-- ) {
- if ( !(unmatched[i] || setMatched[i]) ) {
- setMatched[i] = pop.call( results );
+ if ( !( unmatched[ i ] || setMatched[ i ] ) ) {
+ setMatched[ i ] = pop.call( results );
}
}
}
@@ -2605,13 +2796,14 @@ compile = Sizzle.compile = function( selector, match /* Internal Use Only */ ) {
cached = compilerCache[ selector + " " ];
if ( !cached ) {
+
// Generate a function of recursive functions that can be used to check each element
if ( !match ) {
match = tokenize( selector );
}
i = match.length;
while ( i-- ) {
- cached = matcherFromTokens( match[i] );
+ cached = matcherFromTokens( match[ i ] );
if ( cached[ expando ] ) {
setMatchers.push( cached );
} else {
@@ -2620,7 +2812,10 @@ compile = Sizzle.compile = function( selector, match /* Internal Use Only */ ) {
}
// Cache the compiled function
- cached = compilerCache( selector, matcherFromGroupMatchers( elementMatchers, setMatchers ) );
+ cached = compilerCache(
+ selector,
+ matcherFromGroupMatchers( elementMatchers, setMatchers )
+ );
// Save selector and tokenization
cached.selector = selector;
@@ -2640,7 +2835,7 @@ compile = Sizzle.compile = function( selector, match /* Internal Use Only */ ) {
select = Sizzle.select = function( selector, context, results, seed ) {
var i, tokens, token, type, find,
compiled = typeof selector === "function" && selector,
- match = !seed && tokenize( (selector = compiled.selector || selector) );
+ match = !seed && tokenize( ( selector = compiled.selector || selector ) );
results = results || [];
@@ -2649,11 +2844,12 @@ select = Sizzle.select = function( selector, context, results, seed ) {
if ( match.length === 1 ) {
// Reduce context if the leading compound selector is an ID
- tokens = match[0] = match[0].slice( 0 );
- if ( tokens.length > 2 && (token = tokens[0]).type === "ID" &&
- context.nodeType === 9 && documentIsHTML && Expr.relative[ tokens[1].type ] ) {
+ tokens = match[ 0 ] = match[ 0 ].slice( 0 );
+ if ( tokens.length > 2 && ( token = tokens[ 0 ] ).type === "ID" &&
+ context.nodeType === 9 && documentIsHTML && Expr.relative[ tokens[ 1 ].type ] ) {
- context = ( Expr.find["ID"]( token.matches[0].replace(runescape, funescape), context ) || [] )[0];
+ context = ( Expr.find[ "ID" ]( token.matches[ 0 ]
+ .replace( runescape, funescape ), context ) || [] )[ 0 ];
if ( !context ) {
return results;
@@ -2666,20 +2862,22 @@ select = Sizzle.select = function( selector, context, results, seed ) {
}
// Fetch a seed set for right-to-left matching
- i = matchExpr["needsContext"].test( selector ) ? 0 : tokens.length;
+ i = matchExpr[ "needsContext" ].test( selector ) ? 0 : tokens.length;
while ( i-- ) {
- token = tokens[i];
+ token = tokens[ i ];
// Abort if we hit a combinator
- if ( Expr.relative[ (type = token.type) ] ) {
+ if ( Expr.relative[ ( type = token.type ) ] ) {
break;
}
- if ( (find = Expr.find[ type ]) ) {
+ if ( ( find = Expr.find[ type ] ) ) {
+
// Search, expanding context for leading sibling combinators
- if ( (seed = find(
- token.matches[0].replace( runescape, funescape ),
- rsibling.test( tokens[0].type ) && testContext( context.parentNode ) || context
- )) ) {
+ if ( ( seed = find(
+ token.matches[ 0 ].replace( runescape, funescape ),
+ rsibling.test( tokens[ 0 ].type ) && testContext( context.parentNode ) ||
+ context
+ ) ) ) {
// If seed is empty or no tokens remain, we can return early
tokens.splice( i, 1 );
@@ -2710,7 +2908,7 @@ select = Sizzle.select = function( selector, context, results, seed ) {
// One-time assignments
// Sort stability
-support.sortStable = expando.split("").sort( sortOrder ).join("") === expando;
+support.sortStable = expando.split( "" ).sort( sortOrder ).join( "" ) === expando;
// Support: Chrome 14-35+
// Always assume duplicates if they aren't passed to the comparison function
@@ -2721,58 +2919,59 @@ setDocument();
// Support: Webkit<537.32 - Safari 6.0.3/Chrome 25 (fixed in Chrome 27)
// Detached nodes confoundingly follow *each other*
-support.sortDetached = assert(function( el ) {
+support.sortDetached = assert( function( el ) {
+
// Should return 1, but returns 4 (following)
- return el.compareDocumentPosition( document.createElement("fieldset") ) & 1;
-});
+ return el.compareDocumentPosition( document.createElement( "fieldset" ) ) & 1;
+} );
// Support: IE<8
// Prevent attribute/property "interpolation"
// https://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx
-if ( !assert(function( el ) {
+if ( !assert( function( el ) {
el.innerHTML = "<a href='#'></a>";
- return el.firstChild.getAttribute("href") === "#" ;
-}) ) {
+ return el.firstChild.getAttribute( "href" ) === "#";
+} ) ) {
addHandle( "type|href|height|width", function( elem, name, isXML ) {
if ( !isXML ) {
return elem.getAttribute( name, name.toLowerCase() === "type" ? 1 : 2 );
}
- });
+ } );
}
// Support: IE<9
// Use defaultValue in place of getAttribute("value")
-if ( !support.attributes || !assert(function( el ) {
+if ( !support.attributes || !assert( function( el ) {
el.innerHTML = "<input/>";
el.firstChild.setAttribute( "value", "" );
return el.firstChild.getAttribute( "value" ) === "";
-}) ) {
- addHandle( "value", function( elem, name, isXML ) {
+} ) ) {
+ addHandle( "value", function( elem, _name, isXML ) {
if ( !isXML && elem.nodeName.toLowerCase() === "input" ) {
return elem.defaultValue;
}
- });
+ } );
}
// Support: IE<9
// Use getAttributeNode to fetch booleans when getAttribute lies
-if ( !assert(function( el ) {
- return el.getAttribute("disabled") == null;
-}) ) {
+if ( !assert( function( el ) {
+ return el.getAttribute( "disabled" ) == null;
+} ) ) {
addHandle( booleans, function( elem, name, isXML ) {
var val;
if ( !isXML ) {
return elem[ name ] === true ? name.toLowerCase() :
- (val = elem.getAttributeNode( name )) && val.specified ?
+ ( val = elem.getAttributeNode( name ) ) && val.specified ?
val.value :
- null;
+ null;
}
- });
+ } );
}
return Sizzle;
-})( window );
+} )( window );
@@ -3141,7 +3340,7 @@ jQuery.each( {
parents: function( elem ) {
return dir( elem, "parentNode" );
},
- parentsUntil: function( elem, i, until ) {
+ parentsUntil: function( elem, _i, until ) {
return dir( elem, "parentNode", until );
},
next: function( elem ) {
@@ -3156,10 +3355,10 @@ jQuery.each( {
prevAll: function( elem ) {
return dir( elem, "previousSibling" );
},
- nextUntil: function( elem, i, until ) {
+ nextUntil: function( elem, _i, until ) {
return dir( elem, "nextSibling", until );
},
- prevUntil: function( elem, i, until ) {
+ prevUntil: function( elem, _i, until ) {
return dir( elem, "previousSibling", until );
},
siblings: function( elem ) {
@@ -3169,7 +3368,13 @@ jQuery.each( {
return siblings( elem.firstChild );
},
contents: function( elem ) {
- if ( typeof elem.contentDocument !== "undefined" ) {
+ if ( elem.contentDocument != null &&
+
+ // Support: IE 11+
+ // <object> elements with no `data` attribute has an object
+ // `contentDocument` with a `null` prototype.
+ getProto( elem.contentDocument ) ) {
+
return elem.contentDocument;
}
@@ -3512,7 +3717,7 @@ jQuery.extend( {
var fns = arguments;
return jQuery.Deferred( function( newDefer ) {
- jQuery.each( tuples, function( i, tuple ) {
+ jQuery.each( tuples, function( _i, tuple ) {
// Map tuples (progress, done, fail) to arguments (done, fail, progress)
var fn = isFunction( fns[ tuple[ 4 ] ] ) && fns[ tuple[ 4 ] ];
@@ -3965,7 +4170,7 @@ var access = function( elems, fn, key, value, chainable, emptyGet, raw ) {
// ...except when executing function values
} else {
bulk = fn;
- fn = function( elem, key, value ) {
+ fn = function( elem, _key, value ) {
return bulk.call( jQuery( elem ), value );
};
}
@@ -4000,7 +4205,7 @@ var rmsPrefix = /^-ms-/,
rdashAlpha = /-([a-z])/g;
// Used by camelCase as callback to replace()
-function fcamelCase( all, letter ) {
+function fcamelCase( _all, letter ) {
return letter.toUpperCase();
}
@@ -4528,27 +4733,6 @@ var isHiddenWithinTree = function( elem, el ) {
jQuery.css( elem, "display" ) === "none";
};
-var swap = function( elem, options, callback, args ) {
- var ret, name,
- old = {};
-
- // Remember the old values, and insert the new ones
- for ( name in options ) {
- old[ name ] = elem.style[ name ];
- elem.style[ name ] = options[ name ];
- }
-
- ret = callback.apply( elem, args || [] );
-
- // Revert the old values
- for ( name in options ) {
- elem.style[ name ] = old[ name ];
- }
-
- return ret;
-};
-
-
function adjustCSS( elem, prop, valueParts, tween ) {
@@ -4719,11 +4903,40 @@ var rscriptType = ( /^$|^module$|\/(?:java|ecma)script/i );
-// We have to close these tags to support XHTML (#13200)
-var wrapMap = {
+( function() {
+ var fragment = document.createDocumentFragment(),
+ div = fragment.appendChild( document.createElement( "div" ) ),
+ input = document.createElement( "input" );
+
+ // Support: Android 4.0 - 4.3 only
+ // Check state lost if the name is set (#11217)
+ // Support: Windows Web Apps (WWA)
+ // `name` and `type` must use .setAttribute for WWA (#14901)
+ input.setAttribute( "type", "radio" );
+ input.setAttribute( "checked", "checked" );
+ input.setAttribute( "name", "t" );
+
+ div.appendChild( input );
+
+ // Support: Android <=4.1 only
+ // Older WebKit doesn't clone checked state correctly in fragments
+ support.checkClone = div.cloneNode( true ).cloneNode( true ).lastChild.checked;
+
+ // Support: IE <=11 only
+ // Make sure textarea (and checkbox) defaultValue is properly cloned
+ div.innerHTML = "<textarea>x</textarea>";
+ support.noCloneChecked = !!div.cloneNode( true ).lastChild.defaultValue;
// Support: IE <=9 only
- option: [ 1, "<select multiple='multiple'>", "</select>" ],
+ // IE <=9 replaces <option> tags with their contents when inserted outside of
+ // the select element.
+ div.innerHTML = "<option></option>";
+ support.option = !!div.lastChild;
+} )();
+
+
+// We have to close these tags to support XHTML (#13200)
+var wrapMap = {
// XHTML parsers do not magically insert elements in the
// same way that tag soup parsers do. So we cannot shorten
@@ -4736,12 +4949,14 @@ var wrapMap = {
_default: [ 0, "", "" ]
};
-// Support: IE <=9 only
-wrapMap.optgroup = wrapMap.option;
-
wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead;
wrapMap.th = wrapMap.td;
+// Support: IE <=9 only
+if ( !support.option ) {
+ wrapMap.optgroup = wrapMap.option = [ 1, "<select multiple='multiple'>", "</select>" ];
+}
+
function getAll( context, tag ) {
@@ -4874,32 +5089,6 @@ function buildFragment( elems, context, scripts, selection, ignored ) {
}
-( function() {
- var fragment = document.createDocumentFragment(),
- div = fragment.appendChild( document.createElement( "div" ) ),
- input = document.createElement( "input" );
-
- // Support: Android 4.0 - 4.3 only
- // Check state lost if the name is set (#11217)
- // Support: Windows Web Apps (WWA)
- // `name` and `type` must use .setAttribute for WWA (#14901)
- input.setAttribute( "type", "radio" );
- input.setAttribute( "checked", "checked" );
- input.setAttribute( "name", "t" );
-
- div.appendChild( input );
-
- // Support: Android <=4.1 only
- // Older WebKit doesn't clone checked state correctly in fragments
- support.checkClone = div.cloneNode( true ).cloneNode( true ).lastChild.checked;
-
- // Support: IE <=11 only
- // Make sure textarea (and checkbox) defaultValue is properly cloned
- div.innerHTML = "<textarea>x</textarea>";
- support.noCloneChecked = !!div.cloneNode( true ).lastChild.defaultValue;
-} )();
-
-
var
rkeyEvent = /^key/,
rmouseEvent = /^(?:mouse|pointer|contextmenu|drag|drop)|click/,
@@ -5008,8 +5197,8 @@ jQuery.event = {
special, handlers, type, namespaces, origType,
elemData = dataPriv.get( elem );
- // Don't attach events to noData or text/comment nodes (but allow plain objects)
- if ( !elemData ) {
+ // Only attach events to objects that accept data
+ if ( !acceptData( elem ) ) {
return;
}
@@ -5033,7 +5222,7 @@ jQuery.event = {
// Init the element's event structure and main handler, if this is the first
if ( !( events = elemData.events ) ) {
- events = elemData.events = {};
+ events = elemData.events = Object.create( null );
}
if ( !( eventHandle = elemData.handle ) ) {
eventHandle = elemData.handle = function( e ) {
@@ -5191,12 +5380,15 @@ jQuery.event = {
dispatch: function( nativeEvent ) {
- // Make a writable jQuery.Event from the native event object
- var event = jQuery.event.fix( nativeEvent );
-
var i, j, ret, matched, handleObj, handlerQueue,
args = new Array( arguments.length ),
- handlers = ( dataPriv.get( this, "events" ) || {} )[ event.type ] || [],
+
+ // Make a writable jQuery.Event from the native event object
+ event = jQuery.event.fix( nativeEvent ),
+
+ handlers = (
+ dataPriv.get( this, "events" ) || Object.create( null )
+ )[ event.type ] || [],
special = jQuery.event.special[ event.type ] || {};
// Use the fix-ed jQuery.Event rather than the (read-only) native event
@@ -5771,13 +5963,6 @@ jQuery.fn.extend( {
var
- /* eslint-disable max-len */
-
- // See https://github.com/eslint/eslint/issues/3229
- rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([a-z][^\/\0>\x20\t\r\n\f]*)[^>]*)\/>/gi,
-
- /* eslint-enable */
-
// Support: IE <=10 - 11, Edge 12 - 13 only
// In IE/Edge using regex groups here causes severe slowdowns.
// See https://connect.microsoft.com/IE/feedback/details/1736512/
@@ -5814,7 +5999,7 @@ function restoreScript( elem ) {
}
function cloneCopyEvent( src, dest ) {
- var i, l, type, pdataOld, pdataCur, udataOld, udataCur, events;
+ var i, l, type, pdataOld, udataOld, udataCur, events;
if ( dest.nodeType !== 1 ) {
return;
@@ -5822,13 +6007,11 @@ function cloneCopyEvent( src, dest ) {
// 1. Copy private data: events, handlers, etc.
if ( dataPriv.hasData( src ) ) {
- pdataOld = dataPriv.access( src );
- pdataCur = dataPriv.set( dest, pdataOld );
+ pdataOld = dataPriv.get( src );
events = pdataOld.events;
if ( events ) {
- delete pdataCur.handle;
- pdataCur.events = {};
+ dataPriv.remove( dest, "handle events" );
for ( type in events ) {
for ( i = 0, l = events[ type ].length; i < l; i++ ) {
@@ -5864,7 +6047,7 @@ function fixInput( src, dest ) {
function domManip( collection, args, callback, ignored ) {
// Flatten any nested arrays
- args = concat.apply( [], args );
+ args = flat( args );
var fragment, first, scripts, hasScripts, node, doc,
i = 0,
@@ -5939,7 +6122,7 @@ function domManip( collection, args, callback, ignored ) {
if ( jQuery._evalUrl && !node.noModule ) {
jQuery._evalUrl( node.src, {
nonce: node.nonce || node.getAttribute( "nonce" )
- } );
+ }, doc );
}
} else {
DOMEval( node.textContent.replace( rcleanScript, "" ), node, doc );
@@ -5976,7 +6159,7 @@ function remove( elem, selector, keepData ) {
jQuery.extend( {
htmlPrefilter: function( html ) {
- return html.replace( rxhtmlTag, "<$1></$2>" );
+ return html;
},
clone: function( elem, dataAndEvents, deepDataAndEvents ) {
@@ -6238,6 +6421,27 @@ var getStyles = function( elem ) {
return view.getComputedStyle( elem );
};
+var swap = function( elem, options, callback ) {
+ var ret, name,
+ old = {};
+
+ // Remember the old values, and insert the new ones
+ for ( name in options ) {
+ old[ name ] = elem.style[ name ];
+ elem.style[ name ] = options[ name ];
+ }
+
+ ret = callback.call( elem );
+
+ // Revert the old values
+ for ( name in options ) {
+ elem.style[ name ] = old[ name ];
+ }
+
+ return ret;
+};
+
+
var rboxStyle = new RegExp( cssExpand.join( "|" ), "i" );
@@ -6295,7 +6499,7 @@ var rboxStyle = new RegExp( cssExpand.join( "|" ), "i" );
}
var pixelPositionVal, boxSizingReliableVal, scrollboxSizeVal, pixelBoxStylesVal,
- reliableMarginLeftVal,
+ reliableTrDimensionsVal, reliableMarginLeftVal,
container = document.createElement( "div" ),
div = document.createElement( "div" );
@@ -6330,6 +6534,35 @@ var rboxStyle = new RegExp( cssExpand.join( "|" ), "i" );
scrollboxSize: function() {
computeStyleTests();
return scrollboxSizeVal;
+ },
+
+ // Support: IE 9 - 11+, Edge 15 - 18+
+ // IE/Edge misreport `getComputedStyle` of table rows with width/height
+ // set in CSS while `offset*` properties report correct values.
+ // Behavior in IE 9 is more subtle than in newer versions & it passes
+ // some versions of this test; make sure not to make it pass there!
+ reliableTrDimensions: function() {
+ var table, tr, trChild, trStyle;
+ if ( reliableTrDimensionsVal == null ) {
+ table = document.createElement( "table" );
+ tr = document.createElement( "tr" );
+ trChild = document.createElement( "div" );
+
+ table.style.cssText = "position:absolute;left:-11111px";
+ tr.style.height = "1px";
+ trChild.style.height = "9px";
+
+ documentElement
+ .appendChild( table )
+ .appendChild( tr )
+ .appendChild( trChild );
+
+ trStyle = window.getComputedStyle( tr );
+ reliableTrDimensionsVal = parseInt( trStyle.height ) > 3;
+
+ documentElement.removeChild( table );
+ }
+ return reliableTrDimensionsVal;
}
} );
} )();
@@ -6454,7 +6687,7 @@ var
fontWeight: "400"
};
-function setPositiveNumber( elem, value, subtract ) {
+function setPositiveNumber( _elem, value, subtract ) {
// Any relative (+/-) values have already been
// normalized at this point
@@ -6559,17 +6792,26 @@ function getWidthOrHeight( elem, dimension, extra ) {
}
- // Fall back to offsetWidth/offsetHeight when value is "auto"
- // This happens for inline elements with no explicit setting (gh-3571)
- // Support: Android <=4.1 - 4.3 only
- // Also use offsetWidth/offsetHeight for misreported inline dimensions (gh-3602)
- // Support: IE 9-11 only
- // Also use offsetWidth/offsetHeight for when box sizing is unreliable
- // We use getClientRects() to check for hidden/disconnected.
- // In those cases, the computed value can be trusted to be border-box
+ // Support: IE 9 - 11 only
+ // Use offsetWidth/offsetHeight for when box sizing is unreliable.
+ // In those cases, the computed value can be trusted to be border-box.
if ( ( !support.boxSizingReliable() && isBorderBox ||
+
+ // Support: IE 10 - 11+, Edge 15 - 18+
+ // IE/Edge misreport `getComputedStyle` of table rows with width/height
+ // set in CSS while `offset*` properties report correct values.
+ // Interestingly, in some cases IE 9 doesn't suffer from this issue.
+ !support.reliableTrDimensions() && nodeName( elem, "tr" ) ||
+
+ // Fall back to offsetWidth/offsetHeight when value is "auto"
+ // This happens for inline elements with no explicit setting (gh-3571)
val === "auto" ||
+
+ // Support: Android <=4.1 - 4.3 only
+ // Also use offsetWidth/offsetHeight for misreported inline dimensions (gh-3602)
!parseFloat( val ) && jQuery.css( elem, "display", false, styles ) === "inline" ) &&
+
+ // Make sure the element is visible & connected
elem.getClientRects().length ) {
isBorderBox = jQuery.css( elem, "boxSizing", false, styles ) === "border-box";
@@ -6764,7 +7006,7 @@ jQuery.extend( {
}
} );
-jQuery.each( [ "height", "width" ], function( i, dimension ) {
+jQuery.each( [ "height", "width" ], function( _i, dimension ) {
jQuery.cssHooks[ dimension ] = {
get: function( elem, computed, extra ) {
if ( computed ) {
@@ -7537,7 +7779,7 @@ jQuery.fn.extend( {
clearQueue = type;
type = undefined;
}
- if ( clearQueue && type !== false ) {
+ if ( clearQueue ) {
this.queue( type || "fx", [] );
}
@@ -7620,7 +7862,7 @@ jQuery.fn.extend( {
}
} );
-jQuery.each( [ "toggle", "show", "hide" ], function( i, name ) {
+jQuery.each( [ "toggle", "show", "hide" ], function( _i, name ) {
var cssFn = jQuery.fn[ name ];
jQuery.fn[ name ] = function( speed, easing, callback ) {
return speed == null || typeof speed === "boolean" ?
@@ -7841,7 +8083,7 @@ boolHook = {
}
};
-jQuery.each( jQuery.expr.match.bool.source.match( /\w+/g ), function( i, name ) {
+jQuery.each( jQuery.expr.match.bool.source.match( /\w+/g ), function( _i, name ) {
var getter = attrHandle[ name ] || jQuery.find.attr;
attrHandle[ name ] = function( elem, name, isXML ) {
@@ -8465,7 +8707,9 @@ jQuery.extend( jQuery.event, {
special.bindType || type;
// jQuery handler
- handle = ( dataPriv.get( cur, "events" ) || {} )[ event.type ] &&
+ handle = (
+ dataPriv.get( cur, "events" ) || Object.create( null )
+ )[ event.type ] &&
dataPriv.get( cur, "handle" );
if ( handle ) {
handle.apply( cur, data );
@@ -8576,7 +8820,10 @@ if ( !support.focusin ) {
jQuery.event.special[ fix ] = {
setup: function() {
- var doc = this.ownerDocument || this,
+
+ // Handle: regular nodes (via `this.ownerDocument`), window
+ // (via `this.document`) & document (via `this`).
+ var doc = this.ownerDocument || this.document || this,
attaches = dataPriv.access( doc, fix );
if ( !attaches ) {
@@ -8585,7 +8832,7 @@ if ( !support.focusin ) {
dataPriv.access( doc, fix, ( attaches || 0 ) + 1 );
},
teardown: function() {
- var doc = this.ownerDocument || this,
+ var doc = this.ownerDocument || this.document || this,
attaches = dataPriv.access( doc, fix ) - 1;
if ( !attaches ) {
@@ -8601,7 +8848,7 @@ if ( !support.focusin ) {
}
var location = window.location;
-var nonce = Date.now();
+var nonce = { guid: Date.now() };
var rquery = ( /\?/ );
@@ -8733,7 +8980,7 @@ jQuery.fn.extend( {
rsubmittable.test( this.nodeName ) && !rsubmitterTypes.test( type ) &&
( this.checked || !rcheckableType.test( type ) );
} )
- .map( function( i, elem ) {
+ .map( function( _i, elem ) {
var val = jQuery( this ).val();
if ( val == null ) {
@@ -9346,7 +9593,8 @@ jQuery.extend( {
// Add or update anti-cache param if needed
if ( s.cache === false ) {
cacheURL = cacheURL.replace( rantiCache, "$1" );
- uncached = ( rquery.test( cacheURL ) ? "&" : "?" ) + "_=" + ( nonce++ ) + uncached;
+ uncached = ( rquery.test( cacheURL ) ? "&" : "?" ) + "_=" + ( nonce.guid++ ) +
+ uncached;
}
// Put hash and anti-cache on the URL that will be requested (gh-1732)
@@ -9479,6 +9727,11 @@ jQuery.extend( {
response = ajaxHandleResponses( s, jqXHR, responses );
}
+ // Use a noop converter for missing script
+ if ( !isSuccess && jQuery.inArray( "script", s.dataTypes ) > -1 ) {
+ s.converters[ "text script" ] = function() {};
+ }
+
// Convert no matter what (that way responseXXX fields are always set)
response = ajaxConvert( s, response, jqXHR, isSuccess );
@@ -9569,7 +9822,7 @@ jQuery.extend( {
}
} );
-jQuery.each( [ "get", "post" ], function( i, method ) {
+jQuery.each( [ "get", "post" ], function( _i, method ) {
jQuery[ method ] = function( url, data, callback, type ) {
// Shift arguments if data argument was omitted
@@ -9590,8 +9843,17 @@ jQuery.each( [ "get", "post" ], function( i, method ) {
};
} );
+jQuery.ajaxPrefilter( function( s ) {
+ var i;
+ for ( i in s.headers ) {
+ if ( i.toLowerCase() === "content-type" ) {
+ s.contentType = s.headers[ i ] || "";
+ }
+ }
+} );
+
-jQuery._evalUrl = function( url, options ) {
+jQuery._evalUrl = function( url, options, doc ) {
return jQuery.ajax( {
url: url,
@@ -9609,7 +9871,7 @@ jQuery._evalUrl = function( url, options ) {
"text script": function() {}
},
dataFilter: function( response ) {
- jQuery.globalEval( response, options );
+ jQuery.globalEval( response, options, doc );
}
} );
};
@@ -9931,7 +10193,7 @@ var oldCallbacks = [],
jQuery.ajaxSetup( {
jsonp: "callback",
jsonpCallback: function() {
- var callback = oldCallbacks.pop() || ( jQuery.expando + "_" + ( nonce++ ) );
+ var callback = oldCallbacks.pop() || ( jQuery.expando + "_" + ( nonce.guid++ ) );
this[ callback ] = true;
return callback;
}
@@ -10148,23 +10410,6 @@ jQuery.fn.load = function( url, params, callback ) {
-// Attach a bunch of functions for handling common AJAX events
-jQuery.each( [
- "ajaxStart",
- "ajaxStop",
- "ajaxComplete",
- "ajaxError",
- "ajaxSuccess",
- "ajaxSend"
-], function( i, type ) {
- jQuery.fn[ type ] = function( fn ) {
- return this.on( type, fn );
- };
-} );
-
-
-
-
jQuery.expr.pseudos.animated = function( elem ) {
return jQuery.grep( jQuery.timers, function( fn ) {
return elem === fn.elem;
@@ -10221,6 +10466,12 @@ jQuery.offset = {
options.using.call( elem, props );
} else {
+ if ( typeof props.top === "number" ) {
+ props.top += "px";
+ }
+ if ( typeof props.left === "number" ) {
+ props.left += "px";
+ }
curElem.css( props );
}
}
@@ -10371,7 +10622,7 @@ jQuery.each( { scrollLeft: "pageXOffset", scrollTop: "pageYOffset" }, function(
// Blink bug: https://bugs.chromium.org/p/chromium/issues/detail?id=589347
// getComputedStyle returns percent when specified for top/left/bottom/right;
// rather than make the css module depend on the offset module, just check for it here
-jQuery.each( [ "top", "left" ], function( i, prop ) {
+jQuery.each( [ "top", "left" ], function( _i, prop ) {
jQuery.cssHooks[ prop ] = addGetHookIf( support.pixelPosition,
function( elem, computed ) {
if ( computed ) {
@@ -10434,25 +10685,19 @@ jQuery.each( { Height: "height", Width: "width" }, function( name, type ) {
} );
-jQuery.each( ( "blur focus focusin focusout resize scroll click dblclick " +
- "mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " +
- "change select submit keydown keypress keyup contextmenu" ).split( " " ),
- function( i, name ) {
-
- // Handle event binding
- jQuery.fn[ name ] = function( data, fn ) {
- return arguments.length > 0 ?
- this.on( name, null, data, fn ) :
- this.trigger( name );
+jQuery.each( [
+ "ajaxStart",
+ "ajaxStop",
+ "ajaxComplete",
+ "ajaxError",
+ "ajaxSuccess",
+ "ajaxSend"
+], function( _i, type ) {
+ jQuery.fn[ type ] = function( fn ) {
+ return this.on( type, fn );
};
} );
-jQuery.fn.extend( {
- hover: function( fnOver, fnOut ) {
- return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver );
- }
-} );
-
@@ -10474,9 +10719,33 @@ jQuery.fn.extend( {
return arguments.length === 1 ?
this.off( selector, "**" ) :
this.off( types, selector || "**", fn );
+ },
+
+ hover: function( fnOver, fnOut ) {
+ return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver );
}
} );
+jQuery.each( ( "blur focus focusin focusout resize scroll click dblclick " +
+ "mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " +
+ "change select submit keydown keypress keyup contextmenu" ).split( " " ),
+ function( _i, name ) {
+
+ // Handle event binding
+ jQuery.fn[ name ] = function( data, fn ) {
+ return arguments.length > 0 ?
+ this.on( name, null, data, fn ) :
+ this.trigger( name );
+ };
+ } );
+
+
+
+
+// Support: Android <=4.0 only
+// Make sure we trim BOM and NBSP
+var rtrim = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g;
+
// Bind a function to a context, optionally partially applying any
// arguments.
// jQuery.proxy is deprecated to promote standards (specifically Function#bind)
@@ -10539,6 +10808,11 @@ jQuery.isNumeric = function( obj ) {
!isNaN( obj - parseFloat( obj ) );
};
+jQuery.trim = function( text ) {
+ return text == null ?
+ "" :
+ ( text + "" ).replace( rtrim, "" );
+};
@@ -10587,7 +10861,7 @@ jQuery.noConflict = function( deep ) {
// Expose jQuery and $ identifiers, even in AMD
// (#7102#comment:10, https://github.com/jquery/jquery/pull/557)
// and CommonJS for browser emulators (#13566)
-if ( !noGlobal ) {
+if ( typeof noGlobal === "undefined" ) {
window.jQuery = window.$ = jQuery;
}
diff --git a/web/core/assets/vendor/jquery/jquery.min.js b/web/core/assets/vendor/jquery/jquery.min.js
index a1c07fd803..b0614034ad 100644
--- a/web/core/assets/vendor/jquery/jquery.min.js
+++ b/web/core/assets/vendor/jquery/jquery.min.js
@@ -1,2 +1,2 @@
-/*! jQuery v3.4.1 | (c) JS Foundation and other contributors | jquery.org/license */
-!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(C,e){"use strict";var t=[],E=C.document,r=Object.getPrototypeOf,s=t.slice,g=t.concat,u=t.push,i=t.indexOf,n={},o=n.toString,v=n.hasOwnProperty,a=v.toString,l=a.call(Object),y={},m=function(e){return"function"==typeof e&&"number"!=typeof e.nodeType},x=function(e){return null!=e&&e===e.window},c={type:!0,src:!0,nonce:!0,noModule:!0};function b(e,t,n){var r,i,o=(n=n||E).createElement("script");if(o.text=e,t)for(r in c)(i=t[r]||t.getAttribute&&t.getAttribute(r))&&o.setAttribute(r,i);n.head.appendChild(o).parentNode.removeChild(o)}function w(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?n[o.call(e)]||"object":typeof e}var f="3.4.1",k=function(e,t){return new k.fn.init(e,t)},p=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g;function d(e){var t=!!e&&"length"in e&&e.length,n=w(e);return!m(e)&&!x(e)&&("array"===n||0===t||"number"==typeof t&&0<t&&t-1 in e)}k.fn=k.prototype={jquery:f,constructor:k,length:0,toArray:function(){return s.call(this)},get:function(e){return null==e?s.call(this):e<0?this[e+this.length]:this[e]},pushStack:function(e){var t=k.merge(this.constructor(),e);return t.prevObject=this,t},each:function(e){return k.each(this,e)},map:function(n){return this.pushStack(k.map(this,function(e,t){return n.call(e,t,e)}))},slice:function(){return this.pushStack(s.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(e<0?t:0);return this.pushStack(0<=n&&n<t?[this[n]]:[])},end:function(){return this.prevObject||this.constructor()},push:u,sort:t.sort,splice:t.splice},k.extend=k.fn.extend=function(){var e,t,n,r,i,o,a=arguments[0]||{},s=1,u=arguments.length,l=!1;for("boolean"==typeof a&&(l=a,a=arguments[s]||{},s++),"object"==typeof a||m(a)||(a={}),s===u&&(a=this,s--);s<u;s++)if(null!=(e=arguments[s]))for(t in e)r=e[t],"__proto__"!==t&&a!==r&&(l&&r&&(k.isPlainObject(r)||(i=Array.isArray(r)))?(n=a[t],o=i&&!Array.isArray(n)?[]:i||k.isPlainObject(n)?n:{},i=!1,a[t]=k.extend(l,o,r)):void 0!==r&&(a[t]=r));return a},k.extend({expando:"jQuery"+(f+Math.random()).replace(/\D/g,""),isReady:!0,error:function(e){throw new Error(e)},noop:function(){},isPlainObject:function(e){var t,n;return!(!e||"[object Object]"!==o.call(e))&&(!(t=r(e))||"function"==typeof(n=v.call(t,"constructor")&&t.constructor)&&a.call(n)===l)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},globalEval:function(e,t){b(e,{nonce:t&&t.nonce})},each:function(e,t){var n,r=0;if(d(e)){for(n=e.length;r<n;r++)if(!1===t.call(e[r],r,e[r]))break}else for(r in e)if(!1===t.call(e[r],r,e[r]))break;return e},trim:function(e){return null==e?"":(e+"").replace(p,"")},makeArray:function(e,t){var n=t||[];return null!=e&&(d(Object(e))?k.merge(n,"string"==typeof e?[e]:e):u.call(n,e)),n},inArray:function(e,t,n){return null==t?-1:i.call(t,e,n)},merge:function(e,t){for(var n=+t.length,r=0,i=e.length;r<n;r++)e[i++]=t[r];return e.length=i,e},grep:function(e,t,n){for(var r=[],i=0,o=e.length,a=!n;i<o;i++)!t(e[i],i)!==a&&r.push(e[i]);return r},map:function(e,t,n){var r,i,o=0,a=[];if(d(e))for(r=e.length;o<r;o++)null!=(i=t(e[o],o,n))&&a.push(i);else for(o in e)null!=(i=t(e[o],o,n))&&a.push(i);return g.apply([],a)},guid:1,support:y}),"function"==typeof Symbol&&(k.fn[Symbol.iterator]=t[Symbol.iterator]),k.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(e,t){n["[object "+t+"]"]=t.toLowerCase()});var h=function(n){var e,d,b,o,i,h,f,g,w,u,l,T,C,a,E,v,s,c,y,k="sizzle"+1*new Date,m=n.document,S=0,r=0,p=ue(),x=ue(),N=ue(),A=ue(),D=function(e,t){return e===t&&(l=!0),0},j={}.hasOwnProperty,t=[],q=t.pop,L=t.push,H=t.push,O=t.slice,P=function(e,t){for(var n=0,r=e.length;n<r;n++)if(e[n]===t)return n;return-1},R="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",M="[\\x20\\t\\r\\n\\f]",I="(?:\\\\.|[\\w-]|[^\0-\\xa0])+",W="\\["+M+"*("+I+")(?:"+M+"*([*^$|!~]?=)"+M+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+I+"))|)"+M+"*\\]",$=":("+I+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+W+")*)|.*)\\)|)",F=new RegExp(M+"+","g"),B=new RegExp("^"+M+"+|((?:^|[^\\\\])(?:\\\\.)*)"+M+"+$","g"),_=new RegExp("^"+M+"*,"+M+"*"),z=new RegExp("^"+M+"*([>+~]|"+M+")"+M+"*"),U=new RegExp(M+"|>"),X=new RegExp($),V=new RegExp("^"+I+"$"),G={ID:new RegExp("^#("+I+")"),CLASS:new RegExp("^\\.("+I+")"),TAG:new RegExp("^("+I+"|[*])"),ATTR:new RegExp("^"+W),PSEUDO:new RegExp("^"+$),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+R+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/HTML$/i,Q=/^(?:input|select|textarea|button)$/i,J=/^h\d$/i,K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ee=/[+~]/,te=new RegExp("\\\\([\\da-f]{1,6}"+M+"?|("+M+")|.)","ig"),ne=function(e,t,n){var r="0x"+t-65536;return r!=r||n?t:r<0?String.fromCharCode(r+65536):String.fromCharCode(r>>10|55296,1023&r|56320)},re=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ie=function(e,t){return t?"\0"===e?"\ufffd":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},oe=function(){T()},ae=be(function(e){return!0===e.disabled&&"fieldset"===e.nodeName.toLowerCase()},{dir:"parentNode",next:"legend"});try{H.apply(t=O.call(m.childNodes),m.childNodes),t[m.childNodes.length].nodeType}catch(e){H={apply:t.length?function(e,t){L.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function se(t,e,n,r){var i,o,a,s,u,l,c,f=e&&e.ownerDocument,p=e?e.nodeType:9;if(n=n||[],"string"!=typeof t||!t||1!==p&&9!==p&&11!==p)return n;if(!r&&((e?e.ownerDocument||e:m)!==C&&T(e),e=e||C,E)){if(11!==p&&(u=Z.exec(t)))if(i=u[1]){if(9===p){if(!(a=e.getElementById(i)))return n;if(a.id===i)return n.push(a),n}else if(f&&(a=f.getElementById(i))&&y(e,a)&&a.id===i)return n.push(a),n}else{if(u[2])return H.apply(n,e.getElementsByTagName(t)),n;if((i=u[3])&&d.getElementsByClassName&&e.getElementsByClassName)return H.apply(n,e.getElementsByClassName(i)),n}if(d.qsa&&!A[t+" "]&&(!v||!v.test(t))&&(1!==p||"object"!==e.nodeName.toLowerCase())){if(c=t,f=e,1===p&&U.test(t)){(s=e.getAttribute("id"))?s=s.replace(re,ie):e.setAttribute("id",s=k),o=(l=h(t)).length;while(o--)l[o]="#"+s+" "+xe(l[o]);c=l.join(","),f=ee.test(t)&&ye(e.parentNode)||e}try{return H.apply(n,f.querySelectorAll(c)),n}catch(e){A(t,!0)}finally{s===k&&e.removeAttribute("id")}}}return g(t.replace(B,"$1"),e,n,r)}function ue(){var r=[];return function e(t,n){return r.push(t+" ")>b.cacheLength&&delete e[r.shift()],e[t+" "]=n}}function le(e){return e[k]=!0,e}function ce(e){var t=C.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function fe(e,t){var n=e.split("|"),r=n.length;while(r--)b.attrHandle[n[r]]=t}function pe(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&e.sourceIndex-t.sourceIndex;if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function de(t){return function(e){return"input"===e.nodeName.toLowerCase()&&e.type===t}}function he(n){return function(e){var t=e.nodeName.toLowerCase();return("input"===t||"button"===t)&&e.type===n}}function ge(t){return function(e){return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&ae(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function ve(a){return le(function(o){return o=+o,le(function(e,t){var n,r=a([],e.length,o),i=r.length;while(i--)e[n=r[i]]&&(e[n]=!(t[n]=e[n]))})})}function ye(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}for(e in d=se.support={},i=se.isXML=function(e){var t=e.namespaceURI,n=(e.ownerDocument||e).documentElement;return!Y.test(t||n&&n.nodeName||"HTML")},T=se.setDocument=function(e){var t,n,r=e?e.ownerDocument||e:m;return r!==C&&9===r.nodeType&&r.documentElement&&(a=(C=r).documentElement,E=!i(C),m!==C&&(n=C.defaultView)&&n.top!==n&&(n.addEventListener?n.addEventListener("unload",oe,!1):n.attachEvent&&n.attachEvent("onunload",oe)),d.attributes=ce(function(e){return e.className="i",!e.getAttribute("className")}),d.getElementsByTagName=ce(function(e){return e.appendChild(C.createComment("")),!e.getElementsByTagName("*").length}),d.getElementsByClassName=K.test(C.getElementsByClassName),d.getById=ce(function(e){return a.appendChild(e).id=k,!C.getElementsByName||!C.getElementsByName(k).length}),d.getById?(b.filter.ID=function(e){var t=e.replace(te,ne);return function(e){return e.getAttribute("id")===t}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n=t.getElementById(e);return n?[n]:[]}}):(b.filter.ID=function(e){var n=e.replace(te,ne);return function(e){var t="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return t&&t.value===n}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),b.find.TAG=d.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):d.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},b.find.CLASS=d.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&E)return t.getElementsByClassName(e)},s=[],v=[],(d.qsa=K.test(C.querySelectorAll))&&(ce(function(e){a.appendChild(e).innerHTML="<a id='"+k+"'></a><select id='"+k+"-\r\\' msallowcapture=''><option selected=''></option></select>",e.querySelectorAll("[msallowcapture^='']").length&&v.push("[*^$]="+M+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||v.push("\\["+M+"*(?:value|"+R+")"),e.querySelectorAll("[id~="+k+"-]").length||v.push("~="),e.querySelectorAll(":checked").length||v.push(":checked"),e.querySelectorAll("a#"+k+"+*").length||v.push(".#.+[+~]")}),ce(function(e){e.innerHTML="<a href='' disabled='disabled'></a><select disabled='disabled'><option/></select>";var t=C.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&v.push("name"+M+"*[*^$|!~]?="),2!==e.querySelectorAll(":enabled").length&&v.push(":enabled",":disabled"),a.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&v.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),v.push(",.*:")})),(d.matchesSelector=K.test(c=a.matches||a.webkitMatchesSelector||a.mozMatchesSelector||a.oMatchesSelector||a.msMatchesSelector))&&ce(function(e){d.disconnectedMatch=c.call(e,"*"),c.call(e,"[s!='']:x"),s.push("!=",$)}),v=v.length&&new RegExp(v.join("|")),s=s.length&&new RegExp(s.join("|")),t=K.test(a.compareDocumentPosition),y=t||K.test(a.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},D=t?function(e,t){if(e===t)return l=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)===(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!d.sortDetached&&t.compareDocumentPosition(e)===n?e===C||e.ownerDocument===m&&y(m,e)?-1:t===C||t.ownerDocument===m&&y(m,t)?1:u?P(u,e)-P(u,t):0:4&n?-1:1)}:function(e,t){if(e===t)return l=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,a=[e],s=[t];if(!i||!o)return e===C?-1:t===C?1:i?-1:o?1:u?P(u,e)-P(u,t):0;if(i===o)return pe(e,t);n=e;while(n=n.parentNode)a.unshift(n);n=t;while(n=n.parentNode)s.unshift(n);while(a[r]===s[r])r++;return r?pe(a[r],s[r]):a[r]===m?-1:s[r]===m?1:0}),C},se.matches=function(e,t){return se(e,null,null,t)},se.matchesSelector=function(e,t){if((e.ownerDocument||e)!==C&&T(e),d.matchesSelector&&E&&!A[t+" "]&&(!s||!s.test(t))&&(!v||!v.test(t)))try{var n=c.call(e,t);if(n||d.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(e){A(t,!0)}return 0<se(t,C,null,[e]).length},se.contains=function(e,t){return(e.ownerDocument||e)!==C&&T(e),y(e,t)},se.attr=function(e,t){(e.ownerDocument||e)!==C&&T(e);var n=b.attrHandle[t.toLowerCase()],r=n&&j.call(b.attrHandle,t.toLowerCase())?n(e,t,!E):void 0;return void 0!==r?r:d.attributes||!E?e.getAttribute(t):(r=e.getAttributeNode(t))&&r.specified?r.value:null},se.escape=function(e){return(e+"").replace(re,ie)},se.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},se.uniqueSort=function(e){var t,n=[],r=0,i=0;if(l=!d.detectDuplicates,u=!d.sortStable&&e.slice(0),e.sort(D),l){while(t=e[i++])t===e[i]&&(r=n.push(i));while(r--)e.splice(n[r],1)}return u=null,e},o=se.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=o(e)}else if(3===i||4===i)return e.nodeValue}else while(t=e[r++])n+=o(t);return n},(b=se.selectors={cacheLength:50,createPseudo:le,match:G,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(te,ne),e[3]=(e[3]||e[4]||e[5]||"").replace(te,ne),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||se.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&se.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return G.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&X.test(n)&&(t=h(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(te,ne).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=p[e+" "];return t||(t=new RegExp("(^|"+M+")"+e+"("+M+"|$)"))&&p(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(n,r,i){return function(e){var t=se.attr(e,n);return null==t?"!="===r:!r||(t+="","="===r?t===i:"!="===r?t!==i:"^="===r?i&&0===t.indexOf(i):"*="===r?i&&-1<t.indexOf(i):"$="===r?i&&t.slice(-i.length)===i:"~="===r?-1<(" "+t.replace(F," ")+" ").indexOf(i):"|="===r&&(t===i||t.slice(0,i.length+1)===i+"-"))}},CHILD:function(h,e,t,g,v){var y="nth"!==h.slice(0,3),m="last"!==h.slice(-4),x="of-type"===e;return 1===g&&0===v?function(e){return!!e.parentNode}:function(e,t,n){var r,i,o,a,s,u,l=y!==m?"nextSibling":"previousSibling",c=e.parentNode,f=x&&e.nodeName.toLowerCase(),p=!n&&!x,d=!1;if(c){if(y){while(l){a=e;while(a=a[l])if(x?a.nodeName.toLowerCase()===f:1===a.nodeType)return!1;u=l="only"===h&&!u&&"nextSibling"}return!0}if(u=[m?c.firstChild:c.lastChild],m&&p){d=(s=(r=(i=(o=(a=c)[k]||(a[k]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]||[])[0]===S&&r[1])&&r[2],a=s&&c.childNodes[s];while(a=++s&&a&&a[l]||(d=s=0)||u.pop())if(1===a.nodeType&&++d&&a===e){i[h]=[S,s,d];break}}else if(p&&(d=s=(r=(i=(o=(a=e)[k]||(a[k]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]||[])[0]===S&&r[1]),!1===d)while(a=++s&&a&&a[l]||(d=s=0)||u.pop())if((x?a.nodeName.toLowerCase()===f:1===a.nodeType)&&++d&&(p&&((i=(o=a[k]||(a[k]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]=[S,d]),a===e))break;return(d-=v)===g||d%g==0&&0<=d/g}}},PSEUDO:function(e,o){var t,a=b.pseudos[e]||b.setFilters[e.toLowerCase()]||se.error("unsupported pseudo: "+e);return a[k]?a(o):1<a.length?(t=[e,e,"",o],b.setFilters.hasOwnProperty(e.toLowerCase())?le(function(e,t){var n,r=a(e,o),i=r.length;while(i--)e[n=P(e,r[i])]=!(t[n]=r[i])}):function(e){return a(e,0,t)}):a}},pseudos:{not:le(function(e){var r=[],i=[],s=f(e.replace(B,"$1"));return s[k]?le(function(e,t,n,r){var i,o=s(e,null,r,[]),a=e.length;while(a--)(i=o[a])&&(e[a]=!(t[a]=i))}):function(e,t,n){return r[0]=e,s(r,null,n,i),r[0]=null,!i.pop()}}),has:le(function(t){return function(e){return 0<se(t,e).length}}),contains:le(function(t){return t=t.replace(te,ne),function(e){return-1<(e.textContent||o(e)).indexOf(t)}}),lang:le(function(n){return V.test(n||"")||se.error("unsupported lang: "+n),n=n.replace(te,ne).toLowerCase(),function(e){var t;do{if(t=E?e.lang:e.getAttribute("xml:lang")||e.getAttribute("lang"))return(t=t.toLowerCase())===n||0===t.indexOf(n+"-")}while((e=e.parentNode)&&1===e.nodeType);return!1}}),target:function(e){var t=n.location&&n.location.hash;return t&&t.slice(1)===e.id},root:function(e){return e===a},focus:function(e){return e===C.activeElement&&(!C.hasFocus||C.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:ge(!1),disabled:ge(!0),checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,!0===e.selected},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeType<6)return!1;return!0},parent:function(e){return!b.pseudos.empty(e)},header:function(e){return J.test(e.nodeName)},input:function(e){return Q.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||"text"===t.toLowerCase())},first:ve(function(){return[0]}),last:ve(function(e,t){return[t-1]}),eq:ve(function(e,t,n){return[n<0?n+t:n]}),even:ve(function(e,t){for(var n=0;n<t;n+=2)e.push(n);return e}),odd:ve(function(e,t){for(var n=1;n<t;n+=2)e.push(n);return e}),lt:ve(function(e,t,n){for(var r=n<0?n+t:t<n?t:n;0<=--r;)e.push(r);return e}),gt:ve(function(e,t,n){for(var r=n<0?n+t:n;++r<t;)e.push(r);return e})}}).pseudos.nth=b.pseudos.eq,{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})b.pseudos[e]=de(e);for(e in{submit:!0,reset:!0})b.pseudos[e]=he(e);function me(){}function xe(e){for(var t=0,n=e.length,r="";t<n;t++)r+=e[t].value;return r}function be(s,e,t){var u=e.dir,l=e.next,c=l||u,f=t&&"parentNode"===c,p=r++;return e.first?function(e,t,n){while(e=e[u])if(1===e.nodeType||f)return s(e,t,n);return!1}:function(e,t,n){var r,i,o,a=[S,p];if(n){while(e=e[u])if((1===e.nodeType||f)&&s(e,t,n))return!0}else while(e=e[u])if(1===e.nodeType||f)if(i=(o=e[k]||(e[k]={}))[e.uniqueID]||(o[e.uniqueID]={}),l&&l===e.nodeName.toLowerCase())e=e[u]||e;else{if((r=i[c])&&r[0]===S&&r[1]===p)return a[2]=r[2];if((i[c]=a)[2]=s(e,t,n))return!0}return!1}}function we(i){return 1<i.length?function(e,t,n){var r=i.length;while(r--)if(!i[r](e,t,n))return!1;return!0}:i[0]}function Te(e,t,n,r,i){for(var o,a=[],s=0,u=e.length,l=null!=t;s<u;s++)(o=e[s])&&(n&&!n(o,r,i)||(a.push(o),l&&t.push(s)));return a}function Ce(d,h,g,v,y,e){return v&&!v[k]&&(v=Ce(v)),y&&!y[k]&&(y=Ce(y,e)),le(function(e,t,n,r){var i,o,a,s=[],u=[],l=t.length,c=e||function(e,t,n){for(var r=0,i=t.length;r<i;r++)se(e,t[r],n);return n}(h||"*",n.nodeType?[n]:n,[]),f=!d||!e&&h?c:Te(c,s,d,n,r),p=g?y||(e?d:l||v)?[]:t:f;if(g&&g(f,p,n,r),v){i=Te(p,u),v(i,[],n,r),o=i.length;while(o--)(a=i[o])&&(p[u[o]]=!(f[u[o]]=a))}if(e){if(y||d){if(y){i=[],o=p.length;while(o--)(a=p[o])&&i.push(f[o]=a);y(null,p=[],i,r)}o=p.length;while(o--)(a=p[o])&&-1<(i=y?P(e,a):s[o])&&(e[i]=!(t[i]=a))}}else p=Te(p===t?p.splice(l,p.length):p),y?y(null,t,p,r):H.apply(t,p)})}function Ee(e){for(var i,t,n,r=e.length,o=b.relative[e[0].type],a=o||b.relative[" "],s=o?1:0,u=be(function(e){return e===i},a,!0),l=be(function(e){return-1<P(i,e)},a,!0),c=[function(e,t,n){var r=!o&&(n||t!==w)||((i=t).nodeType?u(e,t,n):l(e,t,n));return i=null,r}];s<r;s++)if(t=b.relative[e[s].type])c=[be(we(c),t)];else{if((t=b.filter[e[s].type].apply(null,e[s].matches))[k]){for(n=++s;n<r;n++)if(b.relative[e[n].type])break;return Ce(1<s&&we(c),1<s&&xe(e.slice(0,s-1).concat({value:" "===e[s-2].type?"*":""})).replace(B,"$1"),t,s<n&&Ee(e.slice(s,n)),n<r&&Ee(e=e.slice(n)),n<r&&xe(e))}c.push(t)}return we(c)}return me.prototype=b.filters=b.pseudos,b.setFilters=new me,h=se.tokenize=function(e,t){var n,r,i,o,a,s,u,l=x[e+" "];if(l)return t?0:l.slice(0);a=e,s=[],u=b.preFilter;while(a){for(o in n&&!(r=_.exec(a))||(r&&(a=a.slice(r[0].length)||a),s.push(i=[])),n=!1,(r=z.exec(a))&&(n=r.shift(),i.push({value:n,type:r[0].replace(B," ")}),a=a.slice(n.length)),b.filter)!(r=G[o].exec(a))||u[o]&&!(r=u[o](r))||(n=r.shift(),i.push({value:n,type:o,matches:r}),a=a.slice(n.length));if(!n)break}return t?a.length:a?se.error(e):x(e,s).slice(0)},f=se.compile=function(e,t){var n,v,y,m,x,r,i=[],o=[],a=N[e+" "];if(!a){t||(t=h(e)),n=t.length;while(n--)(a=Ee(t[n]))[k]?i.push(a):o.push(a);(a=N(e,(v=o,m=0<(y=i).length,x=0<v.length,r=function(e,t,n,r,i){var o,a,s,u=0,l="0",c=e&&[],f=[],p=w,d=e||x&&b.find.TAG("*",i),h=S+=null==p?1:Math.random()||.1,g=d.length;for(i&&(w=t===C||t||i);l!==g&&null!=(o=d[l]);l++){if(x&&o){a=0,t||o.ownerDocument===C||(T(o),n=!E);while(s=v[a++])if(s(o,t||C,n)){r.push(o);break}i&&(S=h)}m&&((o=!s&&o)&&u--,e&&c.push(o))}if(u+=l,m&&l!==u){a=0;while(s=y[a++])s(c,f,t,n);if(e){if(0<u)while(l--)c[l]||f[l]||(f[l]=q.call(r));f=Te(f)}H.apply(r,f),i&&!e&&0<f.length&&1<u+y.length&&se.uniqueSort(r)}return i&&(S=h,w=p),c},m?le(r):r))).selector=e}return a},g=se.select=function(e,t,n,r){var i,o,a,s,u,l="function"==typeof e&&e,c=!r&&h(e=l.selector||e);if(n=n||[],1===c.length){if(2<(o=c[0]=c[0].slice(0)).length&&"ID"===(a=o[0]).type&&9===t.nodeType&&E&&b.relative[o[1].type]){if(!(t=(b.find.ID(a.matches[0].replace(te,ne),t)||[])[0]))return n;l&&(t=t.parentNode),e=e.slice(o.shift().value.length)}i=G.needsContext.test(e)?0:o.length;while(i--){if(a=o[i],b.relative[s=a.type])break;if((u=b.find[s])&&(r=u(a.matches[0].replace(te,ne),ee.test(o[0].type)&&ye(t.parentNode)||t))){if(o.splice(i,1),!(e=r.length&&xe(o)))return H.apply(n,r),n;break}}}return(l||f(e,c))(r,t,!E,n,!t||ee.test(e)&&ye(t.parentNode)||t),n},d.sortStable=k.split("").sort(D).join("")===k,d.detectDuplicates=!!l,T(),d.sortDetached=ce(function(e){return 1&e.compareDocumentPosition(C.createElement("fieldset"))}),ce(function(e){return e.innerHTML="<a href='#'></a>","#"===e.firstChild.getAttribute("href")})||fe("type|href|height|width",function(e,t,n){if(!n)return e.getAttribute(t,"type"===t.toLowerCase()?1:2)}),d.attributes&&ce(function(e){return e.innerHTML="<input/>",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||fe("value",function(e,t,n){if(!n&&"input"===e.nodeName.toLowerCase())return e.defaultValue}),ce(function(e){return null==e.getAttribute("disabled")})||fe(R,function(e,t,n){var r;if(!n)return!0===e[t]?t.toLowerCase():(r=e.getAttributeNode(t))&&r.specified?r.value:null}),se}(C);k.find=h,k.expr=h.selectors,k.expr[":"]=k.expr.pseudos,k.uniqueSort=k.unique=h.uniqueSort,k.text=h.getText,k.isXMLDoc=h.isXML,k.contains=h.contains,k.escapeSelector=h.escape;var T=function(e,t,n){var r=[],i=void 0!==n;while((e=e[t])&&9!==e.nodeType)if(1===e.nodeType){if(i&&k(e).is(n))break;r.push(e)}return r},S=function(e,t){for(var n=[];e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n},N=k.expr.match.needsContext;function A(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()}var D=/^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function j(e,n,r){return m(n)?k.grep(e,function(e,t){return!!n.call(e,t,e)!==r}):n.nodeType?k.grep(e,function(e){return e===n!==r}):"string"!=typeof n?k.grep(e,function(e){return-1<i.call(n,e)!==r}):k.filter(n,e,r)}k.filter=function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?k.find.matchesSelector(r,e)?[r]:[]:k.find.matches(e,k.grep(t,function(e){return 1===e.nodeType}))},k.fn.extend({find:function(e){var t,n,r=this.length,i=this;if("string"!=typeof e)return this.pushStack(k(e).filter(function(){for(t=0;t<r;t++)if(k.contains(i[t],this))return!0}));for(n=this.pushStack([]),t=0;t<r;t++)k.find(e,i[t],n);return 1<r?k.uniqueSort(n):n},filter:function(e){return this.pushStack(j(this,e||[],!1))},not:function(e){return this.pushStack(j(this,e||[],!0))},is:function(e){return!!j(this,"string"==typeof e&&N.test(e)?k(e):e||[],!1).length}});var q,L=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/;(k.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||q,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&3<=e.length?[null,e,null]:L.exec(e))||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof k?t[0]:t,k.merge(this,k.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:E,!0)),D.test(r[1])&&k.isPlainObject(t))for(r in t)m(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return(i=E.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):m(e)?void 0!==n.ready?n.ready(e):e(k):k.makeArray(e,this)}).prototype=k.fn,q=k(E);var H=/^(?:parents|prev(?:Until|All))/,O={children:!0,contents:!0,next:!0,prev:!0};function P(e,t){while((e=e[t])&&1!==e.nodeType);return e}k.fn.extend({has:function(e){var t=k(e,this),n=t.length;return this.filter(function(){for(var e=0;e<n;e++)if(k.contains(this,t[e]))return!0})},closest:function(e,t){var n,r=0,i=this.length,o=[],a="string"!=typeof e&&k(e);if(!N.test(e))for(;r<i;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(n.nodeType<11&&(a?-1<a.index(n):1===n.nodeType&&k.find.matchesSelector(n,e))){o.push(n);break}return this.pushStack(1<o.length?k.uniqueSort(o):o)},index:function(e){return e?"string"==typeof e?i.call(k(e),this[0]):i.call(this,e.jquery?e[0]:e):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){return this.pushStack(k.uniqueSort(k.merge(this.get(),k(e,t))))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}}),k.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return T(e,"parentNode")},parentsUntil:function(e,t,n){return T(e,"parentNode",n)},next:function(e){return P(e,"nextSibling")},prev:function(e){return P(e,"previousSibling")},nextAll:function(e){return T(e,"nextSibling")},prevAll:function(e){return T(e,"previousSibling")},nextUntil:function(e,t,n){return T(e,"nextSibling",n)},prevUntil:function(e,t,n){return T(e,"previousSibling",n)},siblings:function(e){return S((e.parentNode||{}).firstChild,e)},children:function(e){return S(e.firstChild)},contents:function(e){return"undefined"!=typeof e.contentDocument?e.contentDocument:(A(e,"template")&&(e=e.content||e),k.merge([],e.childNodes))}},function(r,i){k.fn[r]=function(e,t){var n=k.map(this,i,e);return"Until"!==r.slice(-5)&&(t=e),t&&"string"==typeof t&&(n=k.filter(t,n)),1<this.length&&(O[r]||k.uniqueSort(n),H.test(r)&&n.reverse()),this.pushStack(n)}});var R=/[^\x20\t\r\n\f]+/g;function M(e){return e}function I(e){throw e}function W(e,t,n,r){var i;try{e&&m(i=e.promise)?i.call(e).done(t).fail(n):e&&m(i=e.then)?i.call(e,t,n):t.apply(void 0,[e].slice(r))}catch(e){n.apply(void 0,[e])}}k.Callbacks=function(r){var e,n;r="string"==typeof r?(e=r,n={},k.each(e.match(R)||[],function(e,t){n[t]=!0}),n):k.extend({},r);var i,t,o,a,s=[],u=[],l=-1,c=function(){for(a=a||r.once,o=i=!0;u.length;l=-1){t=u.shift();while(++l<s.length)!1===s[l].apply(t[0],t[1])&&r.stopOnFalse&&(l=s.length,t=!1)}r.memory||(t=!1),i=!1,a&&(s=t?[]:"")},f={add:function(){return s&&(t&&!i&&(l=s.length-1,u.push(t)),function n(e){k.each(e,function(e,t){m(t)?r.unique&&f.has(t)||s.push(t):t&&t.length&&"string"!==w(t)&&n(t)})}(arguments),t&&!i&&c()),this},remove:function(){return k.each(arguments,function(e,t){var n;while(-1<(n=k.inArray(t,s,n)))s.splice(n,1),n<=l&&l--}),this},has:function(e){return e?-1<k.inArray(e,s):0<s.length},empty:function(){return s&&(s=[]),this},disable:function(){return a=u=[],s=t="",this},disabled:function(){return!s},lock:function(){return a=u=[],t||i||(s=t=""),this},locked:function(){return!!a},fireWith:function(e,t){return a||(t=[e,(t=t||[]).slice?t.slice():t],u.push(t),i||c()),this},fire:function(){return f.fireWith(this,arguments),this},fired:function(){return!!o}};return f},k.extend({Deferred:function(e){var o=[["notify","progress",k.Callbacks("memory"),k.Callbacks("memory"),2],["resolve","done",k.Callbacks("once memory"),k.Callbacks("once memory"),0,"resolved"],["reject","fail",k.Callbacks("once memory"),k.Callbacks("once memory"),1,"rejected"]],i="pending",a={state:function(){return i},always:function(){return s.done(arguments).fail(arguments),this},"catch":function(e){return a.then(null,e)},pipe:function(){var i=arguments;return k.Deferred(function(r){k.each(o,function(e,t){var n=m(i[t[4]])&&i[t[4]];s[t[1]](function(){var e=n&&n.apply(this,arguments);e&&m(e.promise)?e.promise().progress(r.notify).done(r.resolve).fail(r.reject):r[t[0]+"With"](this,n?[e]:arguments)})}),i=null}).promise()},then:function(t,n,r){var u=0;function l(i,o,a,s){return function(){var n=this,r=arguments,e=function(){var e,t;if(!(i<u)){if((e=a.apply(n,r))===o.promise())throw new TypeError("Thenable self-resolution");t=e&&("object"==typeof e||"function"==typeof e)&&e.then,m(t)?s?t.call(e,l(u,o,M,s),l(u,o,I,s)):(u++,t.call(e,l(u,o,M,s),l(u,o,I,s),l(u,o,M,o.notifyWith))):(a!==M&&(n=void 0,r=[e]),(s||o.resolveWith)(n,r))}},t=s?e:function(){try{e()}catch(e){k.Deferred.exceptionHook&&k.Deferred.exceptionHook(e,t.stackTrace),u<=i+1&&(a!==I&&(n=void 0,r=[e]),o.rejectWith(n,r))}};i?t():(k.Deferred.getStackHook&&(t.stackTrace=k.Deferred.getStackHook()),C.setTimeout(t))}}return k.Deferred(function(e){o[0][3].add(l(0,e,m(r)?r:M,e.notifyWith)),o[1][3].add(l(0,e,m(t)?t:M)),o[2][3].add(l(0,e,m(n)?n:I))}).promise()},promise:function(e){return null!=e?k.extend(e,a):a}},s={};return k.each(o,function(e,t){var n=t[2],r=t[5];a[t[1]]=n.add,r&&n.add(function(){i=r},o[3-e][2].disable,o[3-e][3].disable,o[0][2].lock,o[0][3].lock),n.add(t[3].fire),s[t[0]]=function(){return s[t[0]+"With"](this===s?void 0:this,arguments),this},s[t[0]+"With"]=n.fireWith}),a.promise(s),e&&e.call(s,s),s},when:function(e){var n=arguments.length,t=n,r=Array(t),i=s.call(arguments),o=k.Deferred(),a=function(t){return function(e){r[t]=this,i[t]=1<arguments.length?s.call(arguments):e,--n||o.resolveWith(r,i)}};if(n<=1&&(W(e,o.done(a(t)).resolve,o.reject,!n),"pending"===o.state()||m(i[t]&&i[t].then)))return o.then();while(t--)W(i[t],a(t),o.reject);return o.promise()}});var $=/^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;k.Deferred.exceptionHook=function(e,t){C.console&&C.console.warn&&e&&$.test(e.name)&&C.console.warn("jQuery.Deferred exception: "+e.message,e.stack,t)},k.readyException=function(e){C.setTimeout(function(){throw e})};var F=k.Deferred();function B(){E.removeEventListener("DOMContentLoaded",B),C.removeEventListener("load",B),k.ready()}k.fn.ready=function(e){return F.then(e)["catch"](function(e){k.readyException(e)}),this},k.extend({isReady:!1,readyWait:1,ready:function(e){(!0===e?--k.readyWait:k.isReady)||(k.isReady=!0)!==e&&0<--k.readyWait||F.resolveWith(E,[k])}}),k.ready.then=F.then,"complete"===E.readyState||"loading"!==E.readyState&&!E.documentElement.doScroll?C.setTimeout(k.ready):(E.addEventListener("DOMContentLoaded",B),C.addEventListener("load",B));var _=function(e,t,n,r,i,o,a){var s=0,u=e.length,l=null==n;if("object"===w(n))for(s in i=!0,n)_(e,t,s,n[s],!0,o,a);else if(void 0!==r&&(i=!0,m(r)||(a=!0),l&&(a?(t.call(e,r),t=null):(l=t,t=function(e,t,n){return l.call(k(e),n)})),t))for(;s<u;s++)t(e[s],n,a?r:r.call(e[s],s,t(e[s],n)));return i?e:l?t.call(e):u?t(e[0],n):o},z=/^-ms-/,U=/-([a-z])/g;function X(e,t){return t.toUpperCase()}function V(e){return e.replace(z,"ms-").replace(U,X)}var G=function(e){return 1===e.nodeType||9===e.nodeType||!+e.nodeType};function Y(){this.expando=k.expando+Y.uid++}Y.uid=1,Y.prototype={cache:function(e){var t=e[this.expando];return t||(t={},G(e)&&(e.nodeType?e[this.expando]=t:Object.defineProperty(e,this.expando,{value:t,configurable:!0}))),t},set:function(e,t,n){var r,i=this.cache(e);if("string"==typeof t)i[V(t)]=n;else for(r in t)i[V(r)]=t[r];return i},get:function(e,t){return void 0===t?this.cache(e):e[this.expando]&&e[this.expando][V(t)]},access:function(e,t,n){return void 0===t||t&&"string"==typeof t&&void 0===n?this.get(e,t):(this.set(e,t,n),void 0!==n?n:t)},remove:function(e,t){var n,r=e[this.expando];if(void 0!==r){if(void 0!==t){n=(t=Array.isArray(t)?t.map(V):(t=V(t))in r?[t]:t.match(R)||[]).length;while(n--)delete r[t[n]]}(void 0===t||k.isEmptyObject(r))&&(e.nodeType?e[this.expando]=void 0:delete e[this.expando])}},hasData:function(e){var t=e[this.expando];return void 0!==t&&!k.isEmptyObject(t)}};var Q=new Y,J=new Y,K=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,Z=/[A-Z]/g;function ee(e,t,n){var r,i;if(void 0===n&&1===e.nodeType)if(r="data-"+t.replace(Z,"-$&").toLowerCase(),"string"==typeof(n=e.getAttribute(r))){try{n="true"===(i=n)||"false"!==i&&("null"===i?null:i===+i+""?+i:K.test(i)?JSON.parse(i):i)}catch(e){}J.set(e,t,n)}else n=void 0;return n}k.extend({hasData:function(e){return J.hasData(e)||Q.hasData(e)},data:function(e,t,n){return J.access(e,t,n)},removeData:function(e,t){J.remove(e,t)},_data:function(e,t,n){return Q.access(e,t,n)},_removeData:function(e,t){Q.remove(e,t)}}),k.fn.extend({data:function(n,e){var t,r,i,o=this[0],a=o&&o.attributes;if(void 0===n){if(this.length&&(i=J.get(o),1===o.nodeType&&!Q.get(o,"hasDataAttrs"))){t=a.length;while(t--)a[t]&&0===(r=a[t].name).indexOf("data-")&&(r=V(r.slice(5)),ee(o,r,i[r]));Q.set(o,"hasDataAttrs",!0)}return i}return"object"==typeof n?this.each(function(){J.set(this,n)}):_(this,function(e){var t;if(o&&void 0===e)return void 0!==(t=J.get(o,n))?t:void 0!==(t=ee(o,n))?t:void 0;this.each(function(){J.set(this,n,e)})},null,e,1<arguments.length,null,!0)},removeData:function(e){return this.each(function(){J.remove(this,e)})}}),k.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=Q.get(e,t),n&&(!r||Array.isArray(n)?r=Q.access(e,t,k.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=k.queue(e,t),r=n.length,i=n.shift(),o=k._queueHooks(e,t);"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,function(){k.dequeue(e,t)},o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return Q.get(e,n)||Q.access(e,n,{empty:k.Callbacks("once memory").add(function(){Q.remove(e,[t+"queue",n])})})}}),k.fn.extend({queue:function(t,n){var e=2;return"string"!=typeof t&&(n=t,t="fx",e--),arguments.length<e?k.queue(this[0],t):void 0===n?this:this.each(function(){var e=k.queue(this,t,n);k._queueHooks(this,t),"fx"===t&&"inprogress"!==e[0]&&k.dequeue(this,t)})},dequeue:function(e){return this.each(function(){k.dequeue(this,e)})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,t){var n,r=1,i=k.Deferred(),o=this,a=this.length,s=function(){--r||i.resolveWith(o,[o])};"string"!=typeof e&&(t=e,e=void 0),e=e||"fx";while(a--)(n=Q.get(o[a],e+"queueHooks"))&&n.empty&&(r++,n.empty.add(s));return s(),i.promise(t)}});var te=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,ne=new RegExp("^(?:([+-])=|)("+te+")([a-z%]*)$","i"),re=["Top","Right","Bottom","Left"],ie=E.documentElement,oe=function(e){return k.contains(e.ownerDocument,e)},ae={composed:!0};ie.getRootNode&&(oe=function(e){return k.contains(e.ownerDocument,e)||e.getRootNode(ae)===e.ownerDocument});var se=function(e,t){return"none"===(e=t||e).style.display||""===e.style.display&&oe(e)&&"none"===k.css(e,"display")},ue=function(e,t,n,r){var i,o,a={};for(o in t)a[o]=e.style[o],e.style[o]=t[o];for(o in i=n.apply(e,r||[]),t)e.style[o]=a[o];return i};function le(e,t,n,r){var i,o,a=20,s=r?function(){return r.cur()}:function(){return k.css(e,t,"")},u=s(),l=n&&n[3]||(k.cssNumber[t]?"":"px"),c=e.nodeType&&(k.cssNumber[t]||"px"!==l&&+u)&&ne.exec(k.css(e,t));if(c&&c[3]!==l){u/=2,l=l||c[3],c=+u||1;while(a--)k.style(e,t,c+l),(1-o)*(1-(o=s()/u||.5))<=0&&(a=0),c/=o;c*=2,k.style(e,t,c+l),n=n||[]}return n&&(c=+c||+u||0,i=n[1]?c+(n[1]+1)*n[2]:+n[2],r&&(r.unit=l,r.start=c,r.end=i)),i}var ce={};function fe(e,t){for(var n,r,i,o,a,s,u,l=[],c=0,f=e.length;c<f;c++)(r=e[c]).style&&(n=r.style.display,t?("none"===n&&(l[c]=Q.get(r,"display")||null,l[c]||(r.style.display="")),""===r.style.display&&se(r)&&(l[c]=(u=a=o=void 0,a=(i=r).ownerDocument,s=i.nodeName,(u=ce[s])||(o=a.body.appendChild(a.createElement(s)),u=k.css(o,"display"),o.parentNode.removeChild(o),"none"===u&&(u="block"),ce[s]=u)))):"none"!==n&&(l[c]="none",Q.set(r,"display",n)));for(c=0;c<f;c++)null!=l[c]&&(e[c].style.display=l[c]);return e}k.fn.extend({show:function(){return fe(this,!0)},hide:function(){return fe(this)},toggle:function(e){return"boolean"==typeof e?e?this.show():this.hide():this.each(function(){se(this)?k(this).show():k(this).hide()})}});var pe=/^(?:checkbox|radio)$/i,de=/<([a-z][^\/\0>\x20\t\r\n\f]*)/i,he=/^$|^module$|\/(?:java|ecma)script/i,ge={option:[1,"<select multiple='multiple'>","</select>"],thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};function ve(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&A(e,t)?k.merge([e],n):n}function ye(e,t){for(var n=0,r=e.length;n<r;n++)Q.set(e[n],"globalEval",!t||Q.get(t[n],"globalEval"))}ge.optgroup=ge.option,ge.tbody=ge.tfoot=ge.colgroup=ge.caption=ge.thead,ge.th=ge.td;var me,xe,be=/<|&#?\w+;/;function we(e,t,n,r,i){for(var o,a,s,u,l,c,f=t.createDocumentFragment(),p=[],d=0,h=e.length;d<h;d++)if((o=e[d])||0===o)if("object"===w(o))k.merge(p,o.nodeType?[o]:o);else if(be.test(o)){a=a||f.appendChild(t.createElement("div")),s=(de.exec(o)||["",""])[1].toLowerCase(),u=ge[s]||ge._default,a.innerHTML=u[1]+k.htmlPrefilter(o)+u[2],c=u[0];while(c--)a=a.lastChild;k.merge(p,a.childNodes),(a=f.firstChild).textContent=""}else p.push(t.createTextNode(o));f.textContent="",d=0;while(o=p[d++])if(r&&-1<k.inArray(o,r))i&&i.push(o);else if(l=oe(o),a=ve(f.appendChild(o),"script"),l&&ye(a),n){c=0;while(o=a[c++])he.test(o.type||"")&&n.push(o)}return f}me=E.createDocumentFragment().appendChild(E.createElement("div")),(xe=E.createElement("input")).setAttribute("type","radio"),xe.setAttribute("checked","checked"),xe.setAttribute("name","t"),me.appendChild(xe),y.checkClone=me.cloneNode(!0).cloneNode(!0).lastChild.checked,me.innerHTML="<textarea>x</textarea>",y.noCloneChecked=!!me.cloneNode(!0).lastChild.defaultValue;var Te=/^key/,Ce=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,Ee=/^([^.]*)(?:\.(.+)|)/;function ke(){return!0}function Se(){return!1}function Ne(e,t){return e===function(){try{return E.activeElement}catch(e){}}()==("focus"===t)}function Ae(e,t,n,r,i,o){var a,s;if("object"==typeof t){for(s in"string"!=typeof n&&(r=r||n,n=void 0),t)Ae(e,s,n,r,t[s],o);return e}if(null==r&&null==i?(i=n,r=n=void 0):null==i&&("string"==typeof n?(i=r,r=void 0):(i=r,r=n,n=void 0)),!1===i)i=Se;else if(!i)return e;return 1===o&&(a=i,(i=function(e){return k().off(e),a.apply(this,arguments)}).guid=a.guid||(a.guid=k.guid++)),e.each(function(){k.event.add(this,t,i,r,n)})}function De(e,i,o){o?(Q.set(e,i,!1),k.event.add(e,i,{namespace:!1,handler:function(e){var t,n,r=Q.get(this,i);if(1&e.isTrigger&&this[i]){if(r.length)(k.event.special[i]||{}).delegateType&&e.stopPropagation();else if(r=s.call(arguments),Q.set(this,i,r),t=o(this,i),this[i](),r!==(n=Q.get(this,i))||t?Q.set(this,i,!1):n={},r!==n)return e.stopImmediatePropagation(),e.preventDefault(),n.value}else r.length&&(Q.set(this,i,{value:k.event.trigger(k.extend(r[0],k.Event.prototype),r.slice(1),this)}),e.stopImmediatePropagation())}})):void 0===Q.get(e,i)&&k.event.add(e,i,ke)}k.event={global:{},add:function(t,e,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=Q.get(t);if(v){n.handler&&(n=(o=n).handler,i=o.selector),i&&k.find.matchesSelector(ie,i),n.guid||(n.guid=k.guid++),(u=v.events)||(u=v.events={}),(a=v.handle)||(a=v.handle=function(e){return"undefined"!=typeof k&&k.event.triggered!==e.type?k.event.dispatch.apply(t,arguments):void 0}),l=(e=(e||"").match(R)||[""]).length;while(l--)d=g=(s=Ee.exec(e[l])||[])[1],h=(s[2]||"").split(".").sort(),d&&(f=k.event.special[d]||{},d=(i?f.delegateType:f.bindType)||d,f=k.event.special[d]||{},c=k.extend({type:d,origType:g,data:r,handler:n,guid:n.guid,selector:i,needsContext:i&&k.expr.match.needsContext.test(i),namespace:h.join(".")},o),(p=u[d])||((p=u[d]=[]).delegateCount=0,f.setup&&!1!==f.setup.call(t,r,h,a)||t.addEventListener&&t.addEventListener(d,a)),f.add&&(f.add.call(t,c),c.handler.guid||(c.handler.guid=n.guid)),i?p.splice(p.delegateCount++,0,c):p.push(c),k.event.global[d]=!0)}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=Q.hasData(e)&&Q.get(e);if(v&&(u=v.events)){l=(t=(t||"").match(R)||[""]).length;while(l--)if(d=g=(s=Ee.exec(t[l])||[])[1],h=(s[2]||"").split(".").sort(),d){f=k.event.special[d]||{},p=u[d=(r?f.delegateType:f.bindType)||d]||[],s=s[2]&&new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),a=o=p.length;while(o--)c=p[o],!i&&g!==c.origType||n&&n.guid!==c.guid||s&&!s.test(c.namespace)||r&&r!==c.selector&&("**"!==r||!c.selector)||(p.splice(o,1),c.selector&&p.delegateCount--,f.remove&&f.remove.call(e,c));a&&!p.length&&(f.teardown&&!1!==f.teardown.call(e,h,v.handle)||k.removeEvent(e,d,v.handle),delete u[d])}else for(d in u)k.event.remove(e,d+t[l],n,r,!0);k.isEmptyObject(u)&&Q.remove(e,"handle events")}},dispatch:function(e){var t,n,r,i,o,a,s=k.event.fix(e),u=new Array(arguments.length),l=(Q.get(this,"events")||{})[s.type]||[],c=k.event.special[s.type]||{};for(u[0]=s,t=1;t<arguments.length;t++)u[t]=arguments[t];if(s.delegateTarget=this,!c.preDispatch||!1!==c.preDispatch.call(this,s)){a=k.event.handlers.call(this,s,l),t=0;while((i=a[t++])&&!s.isPropagationStopped()){s.currentTarget=i.elem,n=0;while((o=i.handlers[n++])&&!s.isImmediatePropagationStopped())s.rnamespace&&!1!==o.namespace&&!s.rnamespace.test(o.namespace)||(s.handleObj=o,s.data=o.data,void 0!==(r=((k.event.special[o.origType]||{}).handle||o.handler).apply(i.elem,u))&&!1===(s.result=r)&&(s.preventDefault(),s.stopPropagation()))}return c.postDispatch&&c.postDispatch.call(this,s),s.result}},handlers:function(e,t){var n,r,i,o,a,s=[],u=t.delegateCount,l=e.target;if(u&&l.nodeType&&!("click"===e.type&&1<=e.button))for(;l!==this;l=l.parentNode||this)if(1===l.nodeType&&("click"!==e.type||!0!==l.disabled)){for(o=[],a={},n=0;n<u;n++)void 0===a[i=(r=t[n]).selector+" "]&&(a[i]=r.needsContext?-1<k(i,this).index(l):k.find(i,this,null,[l]).length),a[i]&&o.push(r);o.length&&s.push({elem:l,handlers:o})}return l=this,u<t.length&&s.push({elem:l,handlers:t.slice(u)}),s},addProp:function(t,e){Object.defineProperty(k.Event.prototype,t,{enumerable:!0,configurable:!0,get:m(e)?function(){if(this.originalEvent)return e(this.originalEvent)}:function(){if(this.originalEvent)return this.originalEvent[t]},set:function(e){Object.defineProperty(this,t,{enumerable:!0,configurable:!0,writable:!0,value:e})}})},fix:function(e){return e[k.expando]?e:new k.Event(e)},special:{load:{noBubble:!0},click:{setup:function(e){var t=this||e;return pe.test(t.type)&&t.click&&A(t,"input")&&De(t,"click",ke),!1},trigger:function(e){var t=this||e;return pe.test(t.type)&&t.click&&A(t,"input")&&De(t,"click"),!0},_default:function(e){var t=e.target;return pe.test(t.type)&&t.click&&A(t,"input")&&Q.get(t,"click")||A(t,"a")}},beforeunload:{postDispatch:function(e){void 0!==e.result&&e.originalEvent&&(e.originalEvent.returnValue=e.result)}}}},k.removeEvent=function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n)},k.Event=function(e,t){if(!(this instanceof k.Event))return new k.Event(e,t);e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||void 0===e.defaultPrevented&&!1===e.returnValue?ke:Se,this.target=e.target&&3===e.target.nodeType?e.target.parentNode:e.target,this.currentTarget=e.currentTarget,this.relatedTarget=e.relatedTarget):this.type=e,t&&k.extend(this,t),this.timeStamp=e&&e.timeStamp||Date.now(),this[k.expando]=!0},k.Event.prototype={constructor:k.Event,isDefaultPrevented:Se,isPropagationStopped:Se,isImmediatePropagationStopped:Se,isSimulated:!1,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=ke,e&&!this.isSimulated&&e.preventDefault()},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=ke,e&&!this.isSimulated&&e.stopPropagation()},stopImmediatePropagation:function(){var e=this.originalEvent;this.isImmediatePropagationStopped=ke,e&&!this.isSimulated&&e.stopImmediatePropagation(),this.stopPropagation()}},k.each({altKey:!0,bubbles:!0,cancelable:!0,changedTouches:!0,ctrlKey:!0,detail:!0,eventPhase:!0,metaKey:!0,pageX:!0,pageY:!0,shiftKey:!0,view:!0,"char":!0,code:!0,charCode:!0,key:!0,keyCode:!0,button:!0,buttons:!0,clientX:!0,clientY:!0,offsetX:!0,offsetY:!0,pointerId:!0,pointerType:!0,screenX:!0,screenY:!0,targetTouches:!0,toElement:!0,touches:!0,which:function(e){var t=e.button;return null==e.which&&Te.test(e.type)?null!=e.charCode?e.charCode:e.keyCode:!e.which&&void 0!==t&&Ce.test(e.type)?1&t?1:2&t?3:4&t?2:0:e.which}},k.event.addProp),k.each({focus:"focusin",blur:"focusout"},function(e,t){k.event.special[e]={setup:function(){return De(this,e,Ne),!1},trigger:function(){return De(this,e),!0},delegateType:t}}),k.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(e,i){k.event.special[e]={delegateType:i,bindType:i,handle:function(e){var t,n=e.relatedTarget,r=e.handleObj;return n&&(n===this||k.contains(this,n))||(e.type=r.origType,t=r.handler.apply(this,arguments),e.type=i),t}}}),k.fn.extend({on:function(e,t,n,r){return Ae(this,e,t,n,r)},one:function(e,t,n,r){return Ae(this,e,t,n,r,1)},off:function(e,t,n){var r,i;if(e&&e.preventDefault&&e.handleObj)return r=e.handleObj,k(e.delegateTarget).off(r.namespace?r.origType+"."+r.namespace:r.origType,r.selector,r.handler),this;if("object"==typeof e){for(i in e)this.off(i,t,e[i]);return this}return!1!==t&&"function"!=typeof t||(n=t,t=void 0),!1===n&&(n=Se),this.each(function(){k.event.remove(this,e,n,t)})}});var je=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([a-z][^\/\0>\x20\t\r\n\f]*)[^>]*)\/>/gi,qe=/<script|<style|<link/i,Le=/checked\s*(?:[^=]|=\s*.checked.)/i,He=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g;function Oe(e,t){return A(e,"table")&&A(11!==t.nodeType?t:t.firstChild,"tr")&&k(e).children("tbody")[0]||e}function Pe(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function Re(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Me(e,t){var n,r,i,o,a,s,u,l;if(1===t.nodeType){if(Q.hasData(e)&&(o=Q.access(e),a=Q.set(t,o),l=o.events))for(i in delete a.handle,a.events={},l)for(n=0,r=l[i].length;n<r;n++)k.event.add(t,i,l[i][n]);J.hasData(e)&&(s=J.access(e),u=k.extend({},s),J.set(t,u))}}function Ie(n,r,i,o){r=g.apply([],r);var e,t,a,s,u,l,c=0,f=n.length,p=f-1,d=r[0],h=m(d);if(h||1<f&&"string"==typeof d&&!y.checkClone&&Le.test(d))return n.each(function(e){var t=n.eq(e);h&&(r[0]=d.call(this,e,t.html())),Ie(t,r,i,o)});if(f&&(t=(e=we(r,n[0].ownerDocument,!1,n,o)).firstChild,1===e.childNodes.length&&(e=t),t||o)){for(s=(a=k.map(ve(e,"script"),Pe)).length;c<f;c++)u=e,c!==p&&(u=k.clone(u,!0,!0),s&&k.merge(a,ve(u,"script"))),i.call(n[c],u,c);if(s)for(l=a[a.length-1].ownerDocument,k.map(a,Re),c=0;c<s;c++)u=a[c],he.test(u.type||"")&&!Q.access(u,"globalEval")&&k.contains(l,u)&&(u.src&&"module"!==(u.type||"").toLowerCase()?k._evalUrl&&!u.noModule&&k._evalUrl(u.src,{nonce:u.nonce||u.getAttribute("nonce")}):b(u.textContent.replace(He,""),u,l))}return n}function We(e,t,n){for(var r,i=t?k.filter(t,e):e,o=0;null!=(r=i[o]);o++)n||1!==r.nodeType||k.cleanData(ve(r)),r.parentNode&&(n&&oe(r)&&ye(ve(r,"script")),r.parentNode.removeChild(r));return e}k.extend({htmlPrefilter:function(e){return e.replace(je,"<$1></$2>")},clone:function(e,t,n){var r,i,o,a,s,u,l,c=e.cloneNode(!0),f=oe(e);if(!(y.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||k.isXMLDoc(e)))for(a=ve(c),r=0,i=(o=ve(e)).length;r<i;r++)s=o[r],u=a[r],void 0,"input"===(l=u.nodeName.toLowerCase())&&pe.test(s.type)?u.checked=s.checked:"input"!==l&&"textarea"!==l||(u.defaultValue=s.defaultValue);if(t)if(n)for(o=o||ve(e),a=a||ve(c),r=0,i=o.length;r<i;r++)Me(o[r],a[r]);else Me(e,c);return 0<(a=ve(c,"script")).length&&ye(a,!f&&ve(e,"script")),c},cleanData:function(e){for(var t,n,r,i=k.event.special,o=0;void 0!==(n=e[o]);o++)if(G(n)){if(t=n[Q.expando]){if(t.events)for(r in t.events)i[r]?k.event.remove(n,r):k.removeEvent(n,r,t.handle);n[Q.expando]=void 0}n[J.expando]&&(n[J.expando]=void 0)}}}),k.fn.extend({detach:function(e){return We(this,e,!0)},remove:function(e){return We(this,e)},text:function(e){return _(this,function(e){return void 0===e?k.text(this):this.empty().each(function(){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||(this.textContent=e)})},null,e,arguments.length)},append:function(){return Ie(this,arguments,function(e){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||Oe(this,e).appendChild(e)})},prepend:function(){return Ie(this,arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=Oe(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return Ie(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return Ie(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},empty:function(){for(var e,t=0;null!=(e=this[t]);t++)1===e.nodeType&&(k.cleanData(ve(e,!1)),e.textContent="");return this},clone:function(e,t){return e=null!=e&&e,t=null==t?e:t,this.map(function(){return k.clone(this,e,t)})},html:function(e){return _(this,function(e){var t=this[0]||{},n=0,r=this.length;if(void 0===e&&1===t.nodeType)return t.innerHTML;if("string"==typeof e&&!qe.test(e)&&!ge[(de.exec(e)||["",""])[1].toLowerCase()]){e=k.htmlPrefilter(e);try{for(;n<r;n++)1===(t=this[n]||{}).nodeType&&(k.cleanData(ve(t,!1)),t.innerHTML=e);t=0}catch(e){}}t&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var n=[];return Ie(this,arguments,function(e){var t=this.parentNode;k.inArray(this,n)<0&&(k.cleanData(ve(this)),t&&t.replaceChild(e,this))},n)}}),k.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,a){k.fn[e]=function(e){for(var t,n=[],r=k(e),i=r.length-1,o=0;o<=i;o++)t=o===i?this:this.clone(!0),k(r[o])[a](t),u.apply(n,t.get());return this.pushStack(n)}});var $e=new RegExp("^("+te+")(?!px)[a-z%]+$","i"),Fe=function(e){var t=e.ownerDocument.defaultView;return t&&t.opener||(t=C),t.getComputedStyle(e)},Be=new RegExp(re.join("|"),"i");function _e(e,t,n){var r,i,o,a,s=e.style;return(n=n||Fe(e))&&(""!==(a=n.getPropertyValue(t)||n[t])||oe(e)||(a=k.style(e,t)),!y.pixelBoxStyles()&&$e.test(a)&&Be.test(t)&&(r=s.width,i=s.minWidth,o=s.maxWidth,s.minWidth=s.maxWidth=s.width=a,a=n.width,s.width=r,s.minWidth=i,s.maxWidth=o)),void 0!==a?a+"":a}function ze(e,t){return{get:function(){if(!e())return(this.get=t).apply(this,arguments);delete this.get}}}!function(){function e(){if(u){s.style.cssText="position:absolute;left:-11111px;width:60px;margin-top:1px;padding:0;border:0",u.style.cssText="position:relative;display:block;box-sizing:border-box;overflow:scroll;margin:auto;border:1px;padding:1px;width:60%;top:1%",ie.appendChild(s).appendChild(u);var e=C.getComputedStyle(u);n="1%"!==e.top,a=12===t(e.marginLeft),u.style.right="60%",o=36===t(e.right),r=36===t(e.width),u.style.position="absolute",i=12===t(u.offsetWidth/3),ie.removeChild(s),u=null}}function t(e){return Math.round(parseFloat(e))}var n,r,i,o,a,s=E.createElement("div"),u=E.createElement("div");u.style&&(u.style.backgroundClip="content-box",u.cloneNode(!0).style.backgroundClip="",y.clearCloneStyle="content-box"===u.style.backgroundClip,k.extend(y,{boxSizingReliable:function(){return e(),r},pixelBoxStyles:function(){return e(),o},pixelPosition:function(){return e(),n},reliableMarginLeft:function(){return e(),a},scrollboxSize:function(){return e(),i}}))}();var Ue=["Webkit","Moz","ms"],Xe=E.createElement("div").style,Ve={};function Ge(e){var t=k.cssProps[e]||Ve[e];return t||(e in Xe?e:Ve[e]=function(e){var t=e[0].toUpperCase()+e.slice(1),n=Ue.length;while(n--)if((e=Ue[n]+t)in Xe)return e}(e)||e)}var Ye=/^(none|table(?!-c[ea]).+)/,Qe=/^--/,Je={position:"absolute",visibility:"hidden",display:"block"},Ke={letterSpacing:"0",fontWeight:"400"};function Ze(e,t,n){var r=ne.exec(t);return r?Math.max(0,r[2]-(n||0))+(r[3]||"px"):t}function et(e,t,n,r,i,o){var a="width"===t?1:0,s=0,u=0;if(n===(r?"border":"content"))return 0;for(;a<4;a+=2)"margin"===n&&(u+=k.css(e,n+re[a],!0,i)),r?("content"===n&&(u-=k.css(e,"padding"+re[a],!0,i)),"margin"!==n&&(u-=k.css(e,"border"+re[a]+"Width",!0,i))):(u+=k.css(e,"padding"+re[a],!0,i),"padding"!==n?u+=k.css(e,"border"+re[a]+"Width",!0,i):s+=k.css(e,"border"+re[a]+"Width",!0,i));return!r&&0<=o&&(u+=Math.max(0,Math.ceil(e["offset"+t[0].toUpperCase()+t.slice(1)]-o-u-s-.5))||0),u}function tt(e,t,n){var r=Fe(e),i=(!y.boxSizingReliable()||n)&&"border-box"===k.css(e,"boxSizing",!1,r),o=i,a=_e(e,t,r),s="offset"+t[0].toUpperCase()+t.slice(1);if($e.test(a)){if(!n)return a;a="auto"}return(!y.boxSizingReliable()&&i||"auto"===a||!parseFloat(a)&&"inline"===k.css(e,"display",!1,r))&&e.getClientRects().length&&(i="border-box"===k.css(e,"boxSizing",!1,r),(o=s in e)&&(a=e[s])),(a=parseFloat(a)||0)+et(e,t,n||(i?"border":"content"),o,r,a)+"px"}function nt(e,t,n,r,i){return new nt.prototype.init(e,t,n,r,i)}k.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=_e(e,"opacity");return""===n?"1":n}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,gridArea:!0,gridColumn:!0,gridColumnEnd:!0,gridColumnStart:!0,gridRow:!0,gridRowEnd:!0,gridRowStart:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{},style:function(e,t,n,r){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var i,o,a,s=V(t),u=Qe.test(t),l=e.style;if(u||(t=Ge(s)),a=k.cssHooks[t]||k.cssHooks[s],void 0===n)return a&&"get"in a&&void 0!==(i=a.get(e,!1,r))?i:l[t];"string"===(o=typeof n)&&(i=ne.exec(n))&&i[1]&&(n=le(e,t,i),o="number"),null!=n&&n==n&&("number"!==o||u||(n+=i&&i[3]||(k.cssNumber[s]?"":"px")),y.clearCloneStyle||""!==n||0!==t.indexOf("background")||(l[t]="inherit"),a&&"set"in a&&void 0===(n=a.set(e,n,r))||(u?l.setProperty(t,n):l[t]=n))}},css:function(e,t,n,r){var i,o,a,s=V(t);return Qe.test(t)||(t=Ge(s)),(a=k.cssHooks[t]||k.cssHooks[s])&&"get"in a&&(i=a.get(e,!0,n)),void 0===i&&(i=_e(e,t,r)),"normal"===i&&t in Ke&&(i=Ke[t]),""===n||n?(o=parseFloat(i),!0===n||isFinite(o)?o||0:i):i}}),k.each(["height","width"],function(e,u){k.cssHooks[u]={get:function(e,t,n){if(t)return!Ye.test(k.css(e,"display"))||e.getClientRects().length&&e.getBoundingClientRect().width?tt(e,u,n):ue(e,Je,function(){return tt(e,u,n)})},set:function(e,t,n){var r,i=Fe(e),o=!y.scrollboxSize()&&"absolute"===i.position,a=(o||n)&&"border-box"===k.css(e,"boxSizing",!1,i),s=n?et(e,u,n,a,i):0;return a&&o&&(s-=Math.ceil(e["offset"+u[0].toUpperCase()+u.slice(1)]-parseFloat(i[u])-et(e,u,"border",!1,i)-.5)),s&&(r=ne.exec(t))&&"px"!==(r[3]||"px")&&(e.style[u]=t,t=k.css(e,u)),Ze(0,t,s)}}}),k.cssHooks.marginLeft=ze(y.reliableMarginLeft,function(e,t){if(t)return(parseFloat(_e(e,"marginLeft"))||e.getBoundingClientRect().left-ue(e,{marginLeft:0},function(){return e.getBoundingClientRect().left}))+"px"}),k.each({margin:"",padding:"",border:"Width"},function(i,o){k.cssHooks[i+o]={expand:function(e){for(var t=0,n={},r="string"==typeof e?e.split(" "):[e];t<4;t++)n[i+re[t]+o]=r[t]||r[t-2]||r[0];return n}},"margin"!==i&&(k.cssHooks[i+o].set=Ze)}),k.fn.extend({css:function(e,t){return _(this,function(e,t,n){var r,i,o={},a=0;if(Array.isArray(t)){for(r=Fe(e),i=t.length;a<i;a++)o[t[a]]=k.css(e,t[a],!1,r);return o}return void 0!==n?k.style(e,t,n):k.css(e,t)},e,t,1<arguments.length)}}),((k.Tween=nt).prototype={constructor:nt,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||k.easing._default,this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(k.cssNumber[n]?"":"px")},cur:function(){var e=nt.propHooks[this.prop];return e&&e.get?e.get(this):nt.propHooks._default.get(this)},run:function(e){var t,n=nt.propHooks[this.prop];return this.options.duration?this.pos=t=k.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):this.pos=t=e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):nt.propHooks._default.set(this),this}}).init.prototype=nt.prototype,(nt.propHooks={_default:{get:function(e){var t;return 1!==e.elem.nodeType||null!=e.elem[e.prop]&&null==e.elem.style[e.prop]?e.elem[e.prop]:(t=k.css(e.elem,e.prop,""))&&"auto"!==t?t:0},set:function(e){k.fx.step[e.prop]?k.fx.step[e.prop](e):1!==e.elem.nodeType||!k.cssHooks[e.prop]&&null==e.elem.style[Ge(e.prop)]?e.elem[e.prop]=e.now:k.style(e.elem,e.prop,e.now+e.unit)}}}).scrollTop=nt.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},k.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2},_default:"swing"},k.fx=nt.prototype.init,k.fx.step={};var rt,it,ot,at,st=/^(?:toggle|show|hide)$/,ut=/queueHooks$/;function lt(){it&&(!1===E.hidden&&C.requestAnimationFrame?C.requestAnimationFrame(lt):C.setTimeout(lt,k.fx.interval),k.fx.tick())}function ct(){return C.setTimeout(function(){rt=void 0}),rt=Date.now()}function ft(e,t){var n,r=0,i={height:e};for(t=t?1:0;r<4;r+=2-t)i["margin"+(n=re[r])]=i["padding"+n]=e;return t&&(i.opacity=i.width=e),i}function pt(e,t,n){for(var r,i=(dt.tweeners[t]||[]).concat(dt.tweeners["*"]),o=0,a=i.length;o<a;o++)if(r=i[o].call(n,t,e))return r}function dt(o,e,t){var n,a,r=0,i=dt.prefilters.length,s=k.Deferred().always(function(){delete u.elem}),u=function(){if(a)return!1;for(var e=rt||ct(),t=Math.max(0,l.startTime+l.duration-e),n=1-(t/l.duration||0),r=0,i=l.tweens.length;r<i;r++)l.tweens[r].run(n);return s.notifyWith(o,[l,n,t]),n<1&&i?t:(i||s.notifyWith(o,[l,1,0]),s.resolveWith(o,[l]),!1)},l=s.promise({elem:o,props:k.extend({},e),opts:k.extend(!0,{specialEasing:{},easing:k.easing._default},t),originalProperties:e,originalOptions:t,startTime:rt||ct(),duration:t.duration,tweens:[],createTween:function(e,t){var n=k.Tween(o,l.opts,e,t,l.opts.specialEasing[e]||l.opts.easing);return l.tweens.push(n),n},stop:function(e){var t=0,n=e?l.tweens.length:0;if(a)return this;for(a=!0;t<n;t++)l.tweens[t].run(1);return e?(s.notifyWith(o,[l,1,0]),s.resolveWith(o,[l,e])):s.rejectWith(o,[l,e]),this}}),c=l.props;for(!function(e,t){var n,r,i,o,a;for(n in e)if(i=t[r=V(n)],o=e[n],Array.isArray(o)&&(i=o[1],o=e[n]=o[0]),n!==r&&(e[r]=o,delete e[n]),(a=k.cssHooks[r])&&"expand"in a)for(n in o=a.expand(o),delete e[r],o)n in e||(e[n]=o[n],t[n]=i);else t[r]=i}(c,l.opts.specialEasing);r<i;r++)if(n=dt.prefilters[r].call(l,o,c,l.opts))return m(n.stop)&&(k._queueHooks(l.elem,l.opts.queue).stop=n.stop.bind(n)),n;return k.map(c,pt,l),m(l.opts.start)&&l.opts.start.call(o,l),l.progress(l.opts.progress).done(l.opts.done,l.opts.complete).fail(l.opts.fail).always(l.opts.always),k.fx.timer(k.extend(u,{elem:o,anim:l,queue:l.opts.queue})),l}k.Animation=k.extend(dt,{tweeners:{"*":[function(e,t){var n=this.createTween(e,t);return le(n.elem,e,ne.exec(t),n),n}]},tweener:function(e,t){m(e)?(t=e,e=["*"]):e=e.match(R);for(var n,r=0,i=e.length;r<i;r++)n=e[r],dt.tweeners[n]=dt.tweeners[n]||[],dt.tweeners[n].unshift(t)},prefilters:[function(e,t,n){var r,i,o,a,s,u,l,c,f="width"in t||"height"in t,p=this,d={},h=e.style,g=e.nodeType&&se(e),v=Q.get(e,"fxshow");for(r in n.queue||(null==(a=k._queueHooks(e,"fx")).unqueued&&(a.unqueued=0,s=a.empty.fire,a.empty.fire=function(){a.unqueued||s()}),a.unqueued++,p.always(function(){p.always(function(){a.unqueued--,k.queue(e,"fx").length||a.empty.fire()})})),t)if(i=t[r],st.test(i)){if(delete t[r],o=o||"toggle"===i,i===(g?"hide":"show")){if("show"!==i||!v||void 0===v[r])continue;g=!0}d[r]=v&&v[r]||k.style(e,r)}if((u=!k.isEmptyObject(t))||!k.isEmptyObject(d))for(r in f&&1===e.nodeType&&(n.overflow=[h.overflow,h.overflowX,h.overflowY],null==(l=v&&v.display)&&(l=Q.get(e,"display")),"none"===(c=k.css(e,"display"))&&(l?c=l:(fe([e],!0),l=e.style.display||l,c=k.css(e,"display"),fe([e]))),("inline"===c||"inline-block"===c&&null!=l)&&"none"===k.css(e,"float")&&(u||(p.done(function(){h.display=l}),null==l&&(c=h.display,l="none"===c?"":c)),h.display="inline-block")),n.overflow&&(h.overflow="hidden",p.always(function(){h.overflow=n.overflow[0],h.overflowX=n.overflow[1],h.overflowY=n.overflow[2]})),u=!1,d)u||(v?"hidden"in v&&(g=v.hidden):v=Q.access(e,"fxshow",{display:l}),o&&(v.hidden=!g),g&&fe([e],!0),p.done(function(){for(r in g||fe([e]),Q.remove(e,"fxshow"),d)k.style(e,r,d[r])})),u=pt(g?v[r]:0,r,p),r in v||(v[r]=u.start,g&&(u.end=u.start,u.start=0))}],prefilter:function(e,t){t?dt.prefilters.unshift(e):dt.prefilters.push(e)}}),k.speed=function(e,t,n){var r=e&&"object"==typeof e?k.extend({},e):{complete:n||!n&&t||m(e)&&e,duration:e,easing:n&&t||t&&!m(t)&&t};return k.fx.off?r.duration=0:"number"!=typeof r.duration&&(r.duration in k.fx.speeds?r.duration=k.fx.speeds[r.duration]:r.duration=k.fx.speeds._default),null!=r.queue&&!0!==r.queue||(r.queue="fx"),r.old=r.complete,r.complete=function(){m(r.old)&&r.old.call(this),r.queue&&k.dequeue(this,r.queue)},r},k.fn.extend({fadeTo:function(e,t,n,r){return this.filter(se).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(t,e,n,r){var i=k.isEmptyObject(t),o=k.speed(e,n,r),a=function(){var e=dt(this,k.extend({},t),o);(i||Q.get(this,"finish"))&&e.stop(!0)};return a.finish=a,i||!1===o.queue?this.each(a):this.queue(o.queue,a)},stop:function(i,e,o){var a=function(e){var t=e.stop;delete e.stop,t(o)};return"string"!=typeof i&&(o=e,e=i,i=void 0),e&&!1!==i&&this.queue(i||"fx",[]),this.each(function(){var e=!0,t=null!=i&&i+"queueHooks",n=k.timers,r=Q.get(this);if(t)r[t]&&r[t].stop&&a(r[t]);else for(t in r)r[t]&&r[t].stop&&ut.test(t)&&a(r[t]);for(t=n.length;t--;)n[t].elem!==this||null!=i&&n[t].queue!==i||(n[t].anim.stop(o),e=!1,n.splice(t,1));!e&&o||k.dequeue(this,i)})},finish:function(a){return!1!==a&&(a=a||"fx"),this.each(function(){var e,t=Q.get(this),n=t[a+"queue"],r=t[a+"queueHooks"],i=k.timers,o=n?n.length:0;for(t.finish=!0,k.queue(this,a,[]),r&&r.stop&&r.stop.call(this,!0),e=i.length;e--;)i[e].elem===this&&i[e].queue===a&&(i[e].anim.stop(!0),i.splice(e,1));for(e=0;e<o;e++)n[e]&&n[e].finish&&n[e].finish.call(this);delete t.finish})}}),k.each(["toggle","show","hide"],function(e,r){var i=k.fn[r];k.fn[r]=function(e,t,n){return null==e||"boolean"==typeof e?i.apply(this,arguments):this.animate(ft(r,!0),e,t,n)}}),k.each({slideDown:ft("show"),slideUp:ft("hide"),slideToggle:ft("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,r){k.fn[e]=function(e,t,n){return this.animate(r,e,t,n)}}),k.timers=[],k.fx.tick=function(){var e,t=0,n=k.timers;for(rt=Date.now();t<n.length;t++)(e=n[t])()||n[t]!==e||n.splice(t--,1);n.length||k.fx.stop(),rt=void 0},k.fx.timer=function(e){k.timers.push(e),k.fx.start()},k.fx.interval=13,k.fx.start=function(){it||(it=!0,lt())},k.fx.stop=function(){it=null},k.fx.speeds={slow:600,fast:200,_default:400},k.fn.delay=function(r,e){return r=k.fx&&k.fx.speeds[r]||r,e=e||"fx",this.queue(e,function(e,t){var n=C.setTimeout(e,r);t.stop=function(){C.clearTimeout(n)}})},ot=E.createElement("input"),at=E.createElement("select").appendChild(E.createElement("option")),ot.type="checkbox",y.checkOn=""!==ot.value,y.optSelected=at.selected,(ot=E.createElement("input")).value="t",ot.type="radio",y.radioValue="t"===ot.value;var ht,gt=k.expr.attrHandle;k.fn.extend({attr:function(e,t){return _(this,k.attr,e,t,1<arguments.length)},removeAttr:function(e){return this.each(function(){k.removeAttr(this,e)})}}),k.extend({attr:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return"undefined"==typeof e.getAttribute?k.prop(e,t,n):(1===o&&k.isXMLDoc(e)||(i=k.attrHooks[t.toLowerCase()]||(k.expr.match.bool.test(t)?ht:void 0)),void 0!==n?null===n?void k.removeAttr(e,t):i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:(e.setAttribute(t,n+""),n):i&&"get"in i&&null!==(r=i.get(e,t))?r:null==(r=k.find.attr(e,t))?void 0:r)},attrHooks:{type:{set:function(e,t){if(!y.radioValue&&"radio"===t&&A(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},removeAttr:function(e,t){var n,r=0,i=t&&t.match(R);if(i&&1===e.nodeType)while(n=i[r++])e.removeAttribute(n)}}),ht={set:function(e,t,n){return!1===t?k.removeAttr(e,n):e.setAttribute(n,n),n}},k.each(k.expr.match.bool.source.match(/\w+/g),function(e,t){var a=gt[t]||k.find.attr;gt[t]=function(e,t,n){var r,i,o=t.toLowerCase();return n||(i=gt[o],gt[o]=r,r=null!=a(e,t,n)?o:null,gt[o]=i),r}});var vt=/^(?:input|select|textarea|button)$/i,yt=/^(?:a|area)$/i;function mt(e){return(e.match(R)||[]).join(" ")}function xt(e){return e.getAttribute&&e.getAttribute("class")||""}function bt(e){return Array.isArray(e)?e:"string"==typeof e&&e.match(R)||[]}k.fn.extend({prop:function(e,t){return _(this,k.prop,e,t,1<arguments.length)},removeProp:function(e){return this.each(function(){delete this[k.propFix[e]||e]})}}),k.extend({prop:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return 1===o&&k.isXMLDoc(e)||(t=k.propFix[t]||t,i=k.propHooks[t]),void 0!==n?i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:e[t]=n:i&&"get"in i&&null!==(r=i.get(e,t))?r:e[t]},propHooks:{tabIndex:{get:function(e){var t=k.find.attr(e,"tabindex");return t?parseInt(t,10):vt.test(e.nodeName)||yt.test(e.nodeName)&&e.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),y.optSelected||(k.propHooks.selected={get:function(e){var t=e.parentNode;return t&&t.parentNode&&t.parentNode.selectedIndex,null},set:function(e){var t=e.parentNode;t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex)}}),k.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){k.propFix[this.toLowerCase()]=this}),k.fn.extend({addClass:function(t){var e,n,r,i,o,a,s,u=0;if(m(t))return this.each(function(e){k(this).addClass(t.call(this,e,xt(this)))});if((e=bt(t)).length)while(n=this[u++])if(i=xt(n),r=1===n.nodeType&&" "+mt(i)+" "){a=0;while(o=e[a++])r.indexOf(" "+o+" ")<0&&(r+=o+" ");i!==(s=mt(r))&&n.setAttribute("class",s)}return this},removeClass:function(t){var e,n,r,i,o,a,s,u=0;if(m(t))return this.each(function(e){k(this).removeClass(t.call(this,e,xt(this)))});if(!arguments.length)return this.attr("class","");if((e=bt(t)).length)while(n=this[u++])if(i=xt(n),r=1===n.nodeType&&" "+mt(i)+" "){a=0;while(o=e[a++])while(-1<r.indexOf(" "+o+" "))r=r.replace(" "+o+" "," ");i!==(s=mt(r))&&n.setAttribute("class",s)}return this},toggleClass:function(i,t){var o=typeof i,a="string"===o||Array.isArray(i);return"boolean"==typeof t&&a?t?this.addClass(i):this.removeClass(i):m(i)?this.each(function(e){k(this).toggleClass(i.call(this,e,xt(this),t),t)}):this.each(function(){var e,t,n,r;if(a){t=0,n=k(this),r=bt(i);while(e=r[t++])n.hasClass(e)?n.removeClass(e):n.addClass(e)}else void 0!==i&&"boolean"!==o||((e=xt(this))&&Q.set(this,"__className__",e),this.setAttribute&&this.setAttribute("class",e||!1===i?"":Q.get(this,"__className__")||""))})},hasClass:function(e){var t,n,r=0;t=" "+e+" ";while(n=this[r++])if(1===n.nodeType&&-1<(" "+mt(xt(n))+" ").indexOf(t))return!0;return!1}});var wt=/\r/g;k.fn.extend({val:function(n){var r,e,i,t=this[0];return arguments.length?(i=m(n),this.each(function(e){var t;1===this.nodeType&&(null==(t=i?n.call(this,e,k(this).val()):n)?t="":"number"==typeof t?t+="":Array.isArray(t)&&(t=k.map(t,function(e){return null==e?"":e+""})),(r=k.valHooks[this.type]||k.valHooks[this.nodeName.toLowerCase()])&&"set"in r&&void 0!==r.set(this,t,"value")||(this.value=t))})):t?(r=k.valHooks[t.type]||k.valHooks[t.nodeName.toLowerCase()])&&"get"in r&&void 0!==(e=r.get(t,"value"))?e:"string"==typeof(e=t.value)?e.replace(wt,""):null==e?"":e:void 0}}),k.extend({valHooks:{option:{get:function(e){var t=k.find.attr(e,"value");return null!=t?t:mt(k.text(e))}},select:{get:function(e){var t,n,r,i=e.options,o=e.selectedIndex,a="select-one"===e.type,s=a?null:[],u=a?o+1:i.length;for(r=o<0?u:a?o:0;r<u;r++)if(((n=i[r]).selected||r===o)&&!n.disabled&&(!n.parentNode.disabled||!A(n.parentNode,"optgroup"))){if(t=k(n).val(),a)return t;s.push(t)}return s},set:function(e,t){var n,r,i=e.options,o=k.makeArray(t),a=i.length;while(a--)((r=i[a]).selected=-1<k.inArray(k.valHooks.option.get(r),o))&&(n=!0);return n||(e.selectedIndex=-1),o}}}}),k.each(["radio","checkbox"],function(){k.valHooks[this]={set:function(e,t){if(Array.isArray(t))return e.checked=-1<k.inArray(k(e).val(),t)}},y.checkOn||(k.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})}),y.focusin="onfocusin"in C;var Tt=/^(?:focusinfocus|focusoutblur)$/,Ct=function(e){e.stopPropagation()};k.extend(k.event,{trigger:function(e,t,n,r){var i,o,a,s,u,l,c,f,p=[n||E],d=v.call(e,"type")?e.type:e,h=v.call(e,"namespace")?e.namespace.split("."):[];if(o=f=a=n=n||E,3!==n.nodeType&&8!==n.nodeType&&!Tt.test(d+k.event.triggered)&&(-1<d.indexOf(".")&&(d=(h=d.split(".")).shift(),h.sort()),u=d.indexOf(":")<0&&"on"+d,(e=e[k.expando]?e:new k.Event(d,"object"==typeof e&&e)).isTrigger=r?2:3,e.namespace=h.join("."),e.rnamespace=e.namespace?new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,e.result=void 0,e.target||(e.target=n),t=null==t?[e]:k.makeArray(t,[e]),c=k.event.special[d]||{},r||!c.trigger||!1!==c.trigger.apply(n,t))){if(!r&&!c.noBubble&&!x(n)){for(s=c.delegateType||d,Tt.test(s+d)||(o=o.parentNode);o;o=o.parentNode)p.push(o),a=o;a===(n.ownerDocument||E)&&p.push(a.defaultView||a.parentWindow||C)}i=0;while((o=p[i++])&&!e.isPropagationStopped())f=o,e.type=1<i?s:c.bindType||d,(l=(Q.get(o,"events")||{})[e.type]&&Q.get(o,"handle"))&&l.apply(o,t),(l=u&&o[u])&&l.apply&&G(o)&&(e.result=l.apply(o,t),!1===e.result&&e.preventDefault());return e.type=d,r||e.isDefaultPrevented()||c._default&&!1!==c._default.apply(p.pop(),t)||!G(n)||u&&m(n[d])&&!x(n)&&((a=n[u])&&(n[u]=null),k.event.triggered=d,e.isPropagationStopped()&&f.addEventListener(d,Ct),n[d](),e.isPropagationStopped()&&f.removeEventListener(d,Ct),k.event.triggered=void 0,a&&(n[u]=a)),e.result}},simulate:function(e,t,n){var r=k.extend(new k.Event,n,{type:e,isSimulated:!0});k.event.trigger(r,null,t)}}),k.fn.extend({trigger:function(e,t){return this.each(function(){k.event.trigger(e,t,this)})},triggerHandler:function(e,t){var n=this[0];if(n)return k.event.trigger(e,t,n,!0)}}),y.focusin||k.each({focus:"focusin",blur:"focusout"},function(n,r){var i=function(e){k.event.simulate(r,e.target,k.event.fix(e))};k.event.special[r]={setup:function(){var e=this.ownerDocument||this,t=Q.access(e,r);t||e.addEventListener(n,i,!0),Q.access(e,r,(t||0)+1)},teardown:function(){var e=this.ownerDocument||this,t=Q.access(e,r)-1;t?Q.access(e,r,t):(e.removeEventListener(n,i,!0),Q.remove(e,r))}}});var Et=C.location,kt=Date.now(),St=/\?/;k.parseXML=function(e){var t;if(!e||"string"!=typeof e)return null;try{t=(new C.DOMParser).parseFromString(e,"text/xml")}catch(e){t=void 0}return t&&!t.getElementsByTagName("parsererror").length||k.error("Invalid XML: "+e),t};var Nt=/\[\]$/,At=/\r?\n/g,Dt=/^(?:submit|button|image|reset|file)$/i,jt=/^(?:input|select|textarea|keygen)/i;function qt(n,e,r,i){var t;if(Array.isArray(e))k.each(e,function(e,t){r||Nt.test(n)?i(n,t):qt(n+"["+("object"==typeof t&&null!=t?e:"")+"]",t,r,i)});else if(r||"object"!==w(e))i(n,e);else for(t in e)qt(n+"["+t+"]",e[t],r,i)}k.param=function(e,t){var n,r=[],i=function(e,t){var n=m(t)?t():t;r[r.length]=encodeURIComponent(e)+"="+encodeURIComponent(null==n?"":n)};if(null==e)return"";if(Array.isArray(e)||e.jquery&&!k.isPlainObject(e))k.each(e,function(){i(this.name,this.value)});else for(n in e)qt(n,e[n],t,i);return r.join("&")},k.fn.extend({serialize:function(){return k.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=k.prop(this,"elements");return e?k.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!k(this).is(":disabled")&&jt.test(this.nodeName)&&!Dt.test(e)&&(this.checked||!pe.test(e))}).map(function(e,t){var n=k(this).val();return null==n?null:Array.isArray(n)?k.map(n,function(e){return{name:t.name,value:e.replace(At,"\r\n")}}):{name:t.name,value:n.replace(At,"\r\n")}}).get()}});var Lt=/%20/g,Ht=/#.*$/,Ot=/([?&])_=[^&]*/,Pt=/^(.*?):[ \t]*([^\r\n]*)$/gm,Rt=/^(?:GET|HEAD)$/,Mt=/^\/\//,It={},Wt={},$t="*/".concat("*"),Ft=E.createElement("a");function Bt(o){return function(e,t){"string"!=typeof e&&(t=e,e="*");var n,r=0,i=e.toLowerCase().match(R)||[];if(m(t))while(n=i[r++])"+"===n[0]?(n=n.slice(1)||"*",(o[n]=o[n]||[]).unshift(t)):(o[n]=o[n]||[]).push(t)}}function _t(t,i,o,a){var s={},u=t===Wt;function l(e){var r;return s[e]=!0,k.each(t[e]||[],function(e,t){var n=t(i,o,a);return"string"!=typeof n||u||s[n]?u?!(r=n):void 0:(i.dataTypes.unshift(n),l(n),!1)}),r}return l(i.dataTypes[0])||!s["*"]&&l("*")}function zt(e,t){var n,r,i=k.ajaxSettings.flatOptions||{};for(n in t)void 0!==t[n]&&((i[n]?e:r||(r={}))[n]=t[n]);return r&&k.extend(!0,e,r),e}Ft.href=Et.href,k.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:Et.href,type:"GET",isLocal:/^(?:about|app|app-storage|.+-extension|file|res|widget):$/.test(Et.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":$t,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":JSON.parse,"text xml":k.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?zt(zt(e,k.ajaxSettings),t):zt(k.ajaxSettings,e)},ajaxPrefilter:Bt(It),ajaxTransport:Bt(Wt),ajax:function(e,t){"object"==typeof e&&(t=e,e=void 0),t=t||{};var c,f,p,n,d,r,h,g,i,o,v=k.ajaxSetup({},t),y=v.context||v,m=v.context&&(y.nodeType||y.jquery)?k(y):k.event,x=k.Deferred(),b=k.Callbacks("once memory"),w=v.statusCode||{},a={},s={},u="canceled",T={readyState:0,getResponseHeader:function(e){var t;if(h){if(!n){n={};while(t=Pt.exec(p))n[t[1].toLowerCase()+" "]=(n[t[1].toLowerCase()+" "]||[]).concat(t[2])}t=n[e.toLowerCase()+" "]}return null==t?null:t.join(", ")},getAllResponseHeaders:function(){return h?p:null},setRequestHeader:function(e,t){return null==h&&(e=s[e.toLowerCase()]=s[e.toLowerCase()]||e,a[e]=t),this},overrideMimeType:function(e){return null==h&&(v.mimeType=e),this},statusCode:function(e){var t;if(e)if(h)T.always(e[T.status]);else for(t in e)w[t]=[w[t],e[t]];return this},abort:function(e){var t=e||u;return c&&c.abort(t),l(0,t),this}};if(x.promise(T),v.url=((e||v.url||Et.href)+"").replace(Mt,Et.protocol+"//"),v.type=t.method||t.type||v.method||v.type,v.dataTypes=(v.dataType||"*").toLowerCase().match(R)||[""],null==v.crossDomain){r=E.createElement("a");try{r.href=v.url,r.href=r.href,v.crossDomain=Ft.protocol+"//"+Ft.host!=r.protocol+"//"+r.host}catch(e){v.crossDomain=!0}}if(v.data&&v.processData&&"string"!=typeof v.data&&(v.data=k.param(v.data,v.traditional)),_t(It,v,t,T),h)return T;for(i in(g=k.event&&v.global)&&0==k.active++&&k.event.trigger("ajaxStart"),v.type=v.type.toUpperCase(),v.hasContent=!Rt.test(v.type),f=v.url.replace(Ht,""),v.hasContent?v.data&&v.processData&&0===(v.contentType||"").indexOf("application/x-www-form-urlencoded")&&(v.data=v.data.replace(Lt,"+")):(o=v.url.slice(f.length),v.data&&(v.processData||"string"==typeof v.data)&&(f+=(St.test(f)?"&":"?")+v.data,delete v.data),!1===v.cache&&(f=f.replace(Ot,"$1"),o=(St.test(f)?"&":"?")+"_="+kt+++o),v.url=f+o),v.ifModified&&(k.lastModified[f]&&T.setRequestHeader("If-Modified-Since",k.lastModified[f]),k.etag[f]&&T.setRequestHeader("If-None-Match",k.etag[f])),(v.data&&v.hasContent&&!1!==v.contentType||t.contentType)&&T.setRequestHeader("Content-Type",v.contentType),T.setRequestHeader("Accept",v.dataTypes[0]&&v.accepts[v.dataTypes[0]]?v.accepts[v.dataTypes[0]]+("*"!==v.dataTypes[0]?", "+$t+"; q=0.01":""):v.accepts["*"]),v.headers)T.setRequestHeader(i,v.headers[i]);if(v.beforeSend&&(!1===v.beforeSend.call(y,T,v)||h))return T.abort();if(u="abort",b.add(v.complete),T.done(v.success),T.fail(v.error),c=_t(Wt,v,t,T)){if(T.readyState=1,g&&m.trigger("ajaxSend",[T,v]),h)return T;v.async&&0<v.timeout&&(d=C.setTimeout(function(){T.abort("timeout")},v.timeout));try{h=!1,c.send(a,l)}catch(e){if(h)throw e;l(-1,e)}}else l(-1,"No Transport");function l(e,t,n,r){var i,o,a,s,u,l=t;h||(h=!0,d&&C.clearTimeout(d),c=void 0,p=r||"",T.readyState=0<e?4:0,i=200<=e&&e<300||304===e,n&&(s=function(e,t,n){var r,i,o,a,s=e.contents,u=e.dataTypes;while("*"===u[0])u.shift(),void 0===r&&(r=e.mimeType||t.getResponseHeader("Content-Type"));if(r)for(i in s)if(s[i]&&s[i].test(r)){u.unshift(i);break}if(u[0]in n)o=u[0];else{for(i in n){if(!u[0]||e.converters[i+" "+u[0]]){o=i;break}a||(a=i)}o=o||a}if(o)return o!==u[0]&&u.unshift(o),n[o]}(v,T,n)),s=function(e,t,n,r){var i,o,a,s,u,l={},c=e.dataTypes.slice();if(c[1])for(a in e.converters)l[a.toLowerCase()]=e.converters[a];o=c.shift();while(o)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!u&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u=o,o=c.shift())if("*"===o)o=u;else if("*"!==u&&u!==o){if(!(a=l[u+" "+o]||l["* "+o]))for(i in l)if((s=i.split(" "))[1]===o&&(a=l[u+" "+s[0]]||l["* "+s[0]])){!0===a?a=l[i]:!0!==l[i]&&(o=s[0],c.unshift(s[1]));break}if(!0!==a)if(a&&e["throws"])t=a(t);else try{t=a(t)}catch(e){return{state:"parsererror",error:a?e:"No conversion from "+u+" to "+o}}}return{state:"success",data:t}}(v,s,T,i),i?(v.ifModified&&((u=T.getResponseHeader("Last-Modified"))&&(k.lastModified[f]=u),(u=T.getResponseHeader("etag"))&&(k.etag[f]=u)),204===e||"HEAD"===v.type?l="nocontent":304===e?l="notmodified":(l=s.state,o=s.data,i=!(a=s.error))):(a=l,!e&&l||(l="error",e<0&&(e=0))),T.status=e,T.statusText=(t||l)+"",i?x.resolveWith(y,[o,l,T]):x.rejectWith(y,[T,l,a]),T.statusCode(w),w=void 0,g&&m.trigger(i?"ajaxSuccess":"ajaxError",[T,v,i?o:a]),b.fireWith(y,[T,l]),g&&(m.trigger("ajaxComplete",[T,v]),--k.active||k.event.trigger("ajaxStop")))}return T},getJSON:function(e,t,n){return k.get(e,t,n,"json")},getScript:function(e,t){return k.get(e,void 0,t,"script")}}),k.each(["get","post"],function(e,i){k[i]=function(e,t,n,r){return m(t)&&(r=r||n,n=t,t=void 0),k.ajax(k.extend({url:e,type:i,dataType:r,data:t,success:n},k.isPlainObject(e)&&e))}}),k._evalUrl=function(e,t){return k.ajax({url:e,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,converters:{"text script":function(){}},dataFilter:function(e){k.globalEval(e,t)}})},k.fn.extend({wrapAll:function(e){var t;return this[0]&&(m(e)&&(e=e.call(this[0])),t=k(e,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstElementChild)e=e.firstElementChild;return e}).append(this)),this},wrapInner:function(n){return m(n)?this.each(function(e){k(this).wrapInner(n.call(this,e))}):this.each(function(){var e=k(this),t=e.contents();t.length?t.wrapAll(n):e.append(n)})},wrap:function(t){var n=m(t);return this.each(function(e){k(this).wrapAll(n?t.call(this,e):t)})},unwrap:function(e){return this.parent(e).not("body").each(function(){k(this).replaceWith(this.childNodes)}),this}}),k.expr.pseudos.hidden=function(e){return!k.expr.pseudos.visible(e)},k.expr.pseudos.visible=function(e){return!!(e.offsetWidth||e.offsetHeight||e.getClientRects().length)},k.ajaxSettings.xhr=function(){try{return new C.XMLHttpRequest}catch(e){}};var Ut={0:200,1223:204},Xt=k.ajaxSettings.xhr();y.cors=!!Xt&&"withCredentials"in Xt,y.ajax=Xt=!!Xt,k.ajaxTransport(function(i){var o,a;if(y.cors||Xt&&!i.crossDomain)return{send:function(e,t){var n,r=i.xhr();if(r.open(i.type,i.url,i.async,i.username,i.password),i.xhrFields)for(n in i.xhrFields)r[n]=i.xhrFields[n];for(n in i.mimeType&&r.overrideMimeType&&r.overrideMimeType(i.mimeType),i.crossDomain||e["X-Requested-With"]||(e["X-Requested-With"]="XMLHttpRequest"),e)r.setRequestHeader(n,e[n]);o=function(e){return function(){o&&(o=a=r.onload=r.onerror=r.onabort=r.ontimeout=r.onreadystatechange=null,"abort"===e?r.abort():"error"===e?"number"!=typeof r.status?t(0,"error"):t(r.status,r.statusText):t(Ut[r.status]||r.status,r.statusText,"text"!==(r.responseType||"text")||"string"!=typeof r.responseText?{binary:r.response}:{text:r.responseText},r.getAllResponseHeaders()))}},r.onload=o(),a=r.onerror=r.ontimeout=o("error"),void 0!==r.onabort?r.onabort=a:r.onreadystatechange=function(){4===r.readyState&&C.setTimeout(function(){o&&a()})},o=o("abort");try{r.send(i.hasContent&&i.data||null)}catch(e){if(o)throw e}},abort:function(){o&&o()}}}),k.ajaxPrefilter(function(e){e.crossDomain&&(e.contents.script=!1)}),k.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(e){return k.globalEval(e),e}}}),k.ajaxPrefilter("script",function(e){void 0===e.cache&&(e.cache=!1),e.crossDomain&&(e.type="GET")}),k.ajaxTransport("script",function(n){var r,i;if(n.crossDomain||n.scriptAttrs)return{send:function(e,t){r=k("<script>").attr(n.scriptAttrs||{}).prop({charset:n.scriptCharset,src:n.url}).on("load error",i=function(e){r.remove(),i=null,e&&t("error"===e.type?404:200,e.type)}),E.head.appendChild(r[0])},abort:function(){i&&i()}}});var Vt,Gt=[],Yt=/(=)\?(?=&|$)|\?\?/;k.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Gt.pop()||k.expando+"_"+kt++;return this[e]=!0,e}}),k.ajaxPrefilter("json jsonp",function(e,t,n){var r,i,o,a=!1!==e.jsonp&&(Yt.test(e.url)?"url":"string"==typeof e.data&&0===(e.contentType||"").indexOf("application/x-www-form-urlencoded")&&Yt.test(e.data)&&"data");if(a||"jsonp"===e.dataTypes[0])return r=e.jsonpCallback=m(e.jsonpCallback)?e.jsonpCallback():e.jsonpCallback,a?e[a]=e[a].replace(Yt,"$1"+r):!1!==e.jsonp&&(e.url+=(St.test(e.url)?"&":"?")+e.jsonp+"="+r),e.converters["script json"]=function(){return o||k.error(r+" was not called"),o[0]},e.dataTypes[0]="json",i=C[r],C[r]=function(){o=arguments},n.always(function(){void 0===i?k(C).removeProp(r):C[r]=i,e[r]&&(e.jsonpCallback=t.jsonpCallback,Gt.push(r)),o&&m(i)&&i(o[0]),o=i=void 0}),"script"}),y.createHTMLDocument=((Vt=E.implementation.createHTMLDocument("").body).innerHTML="<form></form><form></form>",2===Vt.childNodes.length),k.parseHTML=function(e,t,n){return"string"!=typeof e?[]:("boolean"==typeof t&&(n=t,t=!1),t||(y.createHTMLDocument?((r=(t=E.implementation.createHTMLDocument("")).createElement("base")).href=E.location.href,t.head.appendChild(r)):t=E),o=!n&&[],(i=D.exec(e))?[t.createElement(i[1])]:(i=we([e],t,o),o&&o.length&&k(o).remove(),k.merge([],i.childNodes)));var r,i,o},k.fn.load=function(e,t,n){var r,i,o,a=this,s=e.indexOf(" ");return-1<s&&(r=mt(e.slice(s)),e=e.slice(0,s)),m(t)?(n=t,t=void 0):t&&"object"==typeof t&&(i="POST"),0<a.length&&k.ajax({url:e,type:i||"GET",dataType:"html",data:t}).done(function(e){o=arguments,a.html(r?k("<div>").append(k.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},k.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){k.fn[t]=function(e){return this.on(t,e)}}),k.expr.pseudos.animated=function(t){return k.grep(k.timers,function(e){return t===e.elem}).length},k.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l=k.css(e,"position"),c=k(e),f={};"static"===l&&(e.style.position="relative"),s=c.offset(),o=k.css(e,"top"),u=k.css(e,"left"),("absolute"===l||"fixed"===l)&&-1<(o+u).indexOf("auto")?(a=(r=c.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),m(t)&&(t=t.call(e,n,k.extend({},s))),null!=t.top&&(f.top=t.top-s.top+a),null!=t.left&&(f.left=t.left-s.left+i),"using"in t?t.using.call(e,f):c.css(f)}},k.fn.extend({offset:function(t){if(arguments.length)return void 0===t?this:this.each(function(e){k.offset.setOffset(this,t,e)});var e,n,r=this[0];return r?r.getClientRects().length?(e=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:e.top+n.pageYOffset,left:e.left+n.pageXOffset}):{top:0,left:0}:void 0},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===k.css(r,"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===k.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=k(e).offset()).top+=k.css(e,"borderTopWidth",!0),i.left+=k.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-k.css(r,"marginTop",!0),left:t.left-i.left-k.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===k.css(e,"position"))e=e.offsetParent;return e||ie})}}),k.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,i){var o="pageYOffset"===i;k.fn[t]=function(e){return _(this,function(e,t,n){var r;if(x(e)?r=e:9===e.nodeType&&(r=e.defaultView),void 0===n)return r?r[i]:e[t];r?r.scrollTo(o?r.pageXOffset:n,o?n:r.pageYOffset):e[t]=n},t,e,arguments.length)}}),k.each(["top","left"],function(e,n){k.cssHooks[n]=ze(y.pixelPosition,function(e,t){if(t)return t=_e(e,n),$e.test(t)?k(e).position()[n]+"px":t})}),k.each({Height:"height",Width:"width"},function(a,s){k.each({padding:"inner"+a,content:s,"":"outer"+a},function(r,o){k.fn[o]=function(e,t){var n=arguments.length&&(r||"boolean"!=typeof e),i=r||(!0===e||!0===t?"margin":"border");return _(this,function(e,t,n){var r;return x(e)?0===o.indexOf("outer")?e["inner"+a]:e.document.documentElement["client"+a]:9===e.nodeType?(r=e.documentElement,Math.max(e.body["scroll"+a],r["scroll"+a],e.body["offset"+a],r["offset"+a],r["client"+a])):void 0===n?k.css(e,t,i):k.style(e,t,n,i)},s,n?e:void 0,n)}})}),k.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,n){k.fn[n]=function(e,t){return 0<arguments.length?this.on(n,null,e,t):this.trigger(n)}}),k.fn.extend({hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}}),k.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)}}),k.proxy=function(e,t){var n,r,i;if("string"==typeof t&&(n=e[t],t=e,e=n),m(e))return r=s.call(arguments,2),(i=function(){return e.apply(t||this,r.concat(s.call(arguments)))}).guid=e.guid=e.guid||k.guid++,i},k.holdReady=function(e){e?k.readyWait++:k.ready(!0)},k.isArray=Array.isArray,k.parseJSON=JSON.parse,k.nodeName=A,k.isFunction=m,k.isWindow=x,k.camelCase=V,k.type=w,k.now=Date.now,k.isNumeric=function(e){var t=k.type(e);return("number"===t||"string"===t)&&!isNaN(e-parseFloat(e))},"function"==typeof define&&define.amd&&define("jquery",[],function(){return k});var Qt=C.jQuery,Jt=C.$;return k.noConflict=function(e){return C.$===k&&(C.$=Jt),e&&C.jQuery===k&&(C.jQuery=Qt),k},e||(C.jQuery=C.$=k),k});
+/*! jQuery v3.5.1 | (c) JS Foundation and other contributors | jquery.org/license */
+!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(C,e){"use strict";var t=[],r=Object.getPrototypeOf,s=t.slice,g=t.flat?function(e){return t.flat.call(e)}:function(e){return t.concat.apply([],e)},u=t.push,i=t.indexOf,n={},o=n.toString,v=n.hasOwnProperty,a=v.toString,l=a.call(Object),y={},m=function(e){return"function"==typeof e&&"number"!=typeof e.nodeType},x=function(e){return null!=e&&e===e.window},E=C.document,c={type:!0,src:!0,nonce:!0,noModule:!0};function b(e,t,n){var r,i,o=(n=n||E).createElement("script");if(o.text=e,t)for(r in c)(i=t[r]||t.getAttribute&&t.getAttribute(r))&&o.setAttribute(r,i);n.head.appendChild(o).parentNode.removeChild(o)}function w(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?n[o.call(e)]||"object":typeof e}var f="3.5.1",S=function(e,t){return new S.fn.init(e,t)};function p(e){var t=!!e&&"length"in e&&e.length,n=w(e);return!m(e)&&!x(e)&&("array"===n||0===t||"number"==typeof t&&0<t&&t-1 in e)}S.fn=S.prototype={jquery:f,constructor:S,length:0,toArray:function(){return s.call(this)},get:function(e){return null==e?s.call(this):e<0?this[e+this.length]:this[e]},pushStack:function(e){var t=S.merge(this.constructor(),e);return t.prevObject=this,t},each:function(e){return S.each(this,e)},map:function(n){return this.pushStack(S.map(this,function(e,t){return n.call(e,t,e)}))},slice:function(){return this.pushStack(s.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},even:function(){return this.pushStack(S.grep(this,function(e,t){return(t+1)%2}))},odd:function(){return this.pushStack(S.grep(this,function(e,t){return t%2}))},eq:function(e){var t=this.length,n=+e+(e<0?t:0);return this.pushStack(0<=n&&n<t?[this[n]]:[])},end:function(){return this.prevObject||this.constructor()},push:u,sort:t.sort,splice:t.splice},S.extend=S.fn.extend=function(){var e,t,n,r,i,o,a=arguments[0]||{},s=1,u=arguments.length,l=!1;for("boolean"==typeof a&&(l=a,a=arguments[s]||{},s++),"object"==typeof a||m(a)||(a={}),s===u&&(a=this,s--);s<u;s++)if(null!=(e=arguments[s]))for(t in e)r=e[t],"__proto__"!==t&&a!==r&&(l&&r&&(S.isPlainObject(r)||(i=Array.isArray(r)))?(n=a[t],o=i&&!Array.isArray(n)?[]:i||S.isPlainObject(n)?n:{},i=!1,a[t]=S.extend(l,o,r)):void 0!==r&&(a[t]=r));return a},S.extend({expando:"jQuery"+(f+Math.random()).replace(/\D/g,""),isReady:!0,error:function(e){throw new Error(e)},noop:function(){},isPlainObject:function(e){var t,n;return!(!e||"[object Object]"!==o.call(e))&&(!(t=r(e))||"function"==typeof(n=v.call(t,"constructor")&&t.constructor)&&a.call(n)===l)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},globalEval:function(e,t,n){b(e,{nonce:t&&t.nonce},n)},each:function(e,t){var n,r=0;if(p(e)){for(n=e.length;r<n;r++)if(!1===t.call(e[r],r,e[r]))break}else for(r in e)if(!1===t.call(e[r],r,e[r]))break;return e},makeArray:function(e,t){var n=t||[];return null!=e&&(p(Object(e))?S.merge(n,"string"==typeof e?[e]:e):u.call(n,e)),n},inArray:function(e,t,n){return null==t?-1:i.call(t,e,n)},merge:function(e,t){for(var n=+t.length,r=0,i=e.length;r<n;r++)e[i++]=t[r];return e.length=i,e},grep:function(e,t,n){for(var r=[],i=0,o=e.length,a=!n;i<o;i++)!t(e[i],i)!==a&&r.push(e[i]);return r},map:function(e,t,n){var r,i,o=0,a=[];if(p(e))for(r=e.length;o<r;o++)null!=(i=t(e[o],o,n))&&a.push(i);else for(o in e)null!=(i=t(e[o],o,n))&&a.push(i);return g(a)},guid:1,support:y}),"function"==typeof Symbol&&(S.fn[Symbol.iterator]=t[Symbol.iterator]),S.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(e,t){n["[object "+t+"]"]=t.toLowerCase()});var d=function(n){var e,d,b,o,i,h,f,g,w,u,l,T,C,a,E,v,s,c,y,S="sizzle"+1*new Date,p=n.document,k=0,r=0,m=ue(),x=ue(),A=ue(),N=ue(),D=function(e,t){return e===t&&(l=!0),0},j={}.hasOwnProperty,t=[],q=t.pop,L=t.push,H=t.push,O=t.slice,P=function(e,t){for(var n=0,r=e.length;n<r;n++)if(e[n]===t)return n;return-1},R="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",M="[\\x20\\t\\r\\n\\f]",I="(?:\\\\[\\da-fA-F]{1,6}"+M+"?|\\\\[^\\r\\n\\f]|[\\w-]|[^\0-\\x7f])+",W="\\["+M+"*("+I+")(?:"+M+"*([*^$|!~]?=)"+M+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+I+"))|)"+M+"*\\]",F=":("+I+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+W+")*)|.*)\\)|)",B=new RegExp(M+"+","g"),$=new RegExp("^"+M+"+|((?:^|[^\\\\])(?:\\\\.)*)"+M+"+$","g"),_=new RegExp("^"+M+"*,"+M+"*"),z=new RegExp("^"+M+"*([>+~]|"+M+")"+M+"*"),U=new RegExp(M+"|>"),X=new RegExp(F),V=new RegExp("^"+I+"$"),G={ID:new RegExp("^#("+I+")"),CLASS:new RegExp("^\\.("+I+")"),TAG:new RegExp("^("+I+"|[*])"),ATTR:new RegExp("^"+W),PSEUDO:new RegExp("^"+F),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+R+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/HTML$/i,Q=/^(?:input|select|textarea|button)$/i,J=/^h\d$/i,K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ee=/[+~]/,te=new RegExp("\\\\[\\da-fA-F]{1,6}"+M+"?|\\\\([^\\r\\n\\f])","g"),ne=function(e,t){var n="0x"+e.slice(1)-65536;return t||(n<0?String.fromCharCode(n+65536):String.fromCharCode(n>>10|55296,1023&n|56320))},re=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ie=function(e,t){return t?"\0"===e?"\ufffd":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},oe=function(){T()},ae=be(function(e){return!0===e.disabled&&"fieldset"===e.nodeName.toLowerCase()},{dir:"parentNode",next:"legend"});try{H.apply(t=O.call(p.childNodes),p.childNodes),t[p.childNodes.length].nodeType}catch(e){H={apply:t.length?function(e,t){L.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function se(t,e,n,r){var i,o,a,s,u,l,c,f=e&&e.ownerDocument,p=e?e.nodeType:9;if(n=n||[],"string"!=typeof t||!t||1!==p&&9!==p&&11!==p)return n;if(!r&&(T(e),e=e||C,E)){if(11!==p&&(u=Z.exec(t)))if(i=u[1]){if(9===p){if(!(a=e.getElementById(i)))return n;if(a.id===i)return n.push(a),n}else if(f&&(a=f.getElementById(i))&&y(e,a)&&a.id===i)return n.push(a),n}else{if(u[2])return H.apply(n,e.getElementsByTagName(t)),n;if((i=u[3])&&d.getElementsByClassName&&e.getElementsByClassName)return H.apply(n,e.getElementsByClassName(i)),n}if(d.qsa&&!N[t+" "]&&(!v||!v.test(t))&&(1!==p||"object"!==e.nodeName.toLowerCase())){if(c=t,f=e,1===p&&(U.test(t)||z.test(t))){(f=ee.test(t)&&ye(e.parentNode)||e)===e&&d.scope||((s=e.getAttribute("id"))?s=s.replace(re,ie):e.setAttribute("id",s=S)),o=(l=h(t)).length;while(o--)l[o]=(s?"#"+s:":scope")+" "+xe(l[o]);c=l.join(",")}try{return H.apply(n,f.querySelectorAll(c)),n}catch(e){N(t,!0)}finally{s===S&&e.removeAttribute("id")}}}return g(t.replace($,"$1"),e,n,r)}function ue(){var r=[];return function e(t,n){return r.push(t+" ")>b.cacheLength&&delete e[r.shift()],e[t+" "]=n}}function le(e){return e[S]=!0,e}function ce(e){var t=C.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function fe(e,t){var n=e.split("|"),r=n.length;while(r--)b.attrHandle[n[r]]=t}function pe(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&e.sourceIndex-t.sourceIndex;if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function de(t){return function(e){return"input"===e.nodeName.toLowerCase()&&e.type===t}}function he(n){return function(e){var t=e.nodeName.toLowerCase();return("input"===t||"button"===t)&&e.type===n}}function ge(t){return function(e){return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&ae(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function ve(a){return le(function(o){return o=+o,le(function(e,t){var n,r=a([],e.length,o),i=r.length;while(i--)e[n=r[i]]&&(e[n]=!(t[n]=e[n]))})})}function ye(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}for(e in d=se.support={},i=se.isXML=function(e){var t=e.namespaceURI,n=(e.ownerDocument||e).documentElement;return!Y.test(t||n&&n.nodeName||"HTML")},T=se.setDocument=function(e){var t,n,r=e?e.ownerDocument||e:p;return r!=C&&9===r.nodeType&&r.documentElement&&(a=(C=r).documentElement,E=!i(C),p!=C&&(n=C.defaultView)&&n.top!==n&&(n.addEventListener?n.addEventListener("unload",oe,!1):n.attachEvent&&n.attachEvent("onunload",oe)),d.scope=ce(function(e){return a.appendChild(e).appendChild(C.createElement("div")),"undefined"!=typeof e.querySelectorAll&&!e.querySelectorAll(":scope fieldset div").length}),d.attributes=ce(function(e){return e.className="i",!e.getAttribute("className")}),d.getElementsByTagName=ce(function(e){return e.appendChild(C.createComment("")),!e.getElementsByTagName("*").length}),d.getElementsByClassName=K.test(C.getElementsByClassName),d.getById=ce(function(e){return a.appendChild(e).id=S,!C.getElementsByName||!C.getElementsByName(S).length}),d.getById?(b.filter.ID=function(e){var t=e.replace(te,ne);return function(e){return e.getAttribute("id")===t}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n=t.getElementById(e);return n?[n]:[]}}):(b.filter.ID=function(e){var n=e.replace(te,ne);return function(e){var t="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return t&&t.value===n}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),b.find.TAG=d.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):d.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},b.find.CLASS=d.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&E)return t.getElementsByClassName(e)},s=[],v=[],(d.qsa=K.test(C.querySelectorAll))&&(ce(function(e){var t;a.appendChild(e).innerHTML="<a id='"+S+"'></a><select id='"+S+"-\r\\' msallowcapture=''><option selected=''></option></select>",e.querySelectorAll("[msallowcapture^='']").length&&v.push("[*^$]="+M+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||v.push("\\["+M+"*(?:value|"+R+")"),e.querySelectorAll("[id~="+S+"-]").length||v.push("~="),(t=C.createElement("input")).setAttribute("name",""),e.appendChild(t),e.querySelectorAll("[name='']").length||v.push("\\["+M+"*name"+M+"*="+M+"*(?:''|\"\")"),e.querySelectorAll(":checked").length||v.push(":checked"),e.querySelectorAll("a#"+S+"+*").length||v.push(".#.+[+~]"),e.querySelectorAll("\\\f"),v.push("[\\r\\n\\f]")}),ce(function(e){e.innerHTML="<a href='' disabled='disabled'></a><select disabled='disabled'><option/></select>";var t=C.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&v.push("name"+M+"*[*^$|!~]?="),2!==e.querySelectorAll(":enabled").length&&v.push(":enabled",":disabled"),a.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&v.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),v.push(",.*:")})),(d.matchesSelector=K.test(c=a.matches||a.webkitMatchesSelector||a.mozMatchesSelector||a.oMatchesSelector||a.msMatchesSelector))&&ce(function(e){d.disconnectedMatch=c.call(e,"*"),c.call(e,"[s!='']:x"),s.push("!=",F)}),v=v.length&&new RegExp(v.join("|")),s=s.length&&new RegExp(s.join("|")),t=K.test(a.compareDocumentPosition),y=t||K.test(a.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},D=t?function(e,t){if(e===t)return l=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)==(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!d.sortDetached&&t.compareDocumentPosition(e)===n?e==C||e.ownerDocument==p&&y(p,e)?-1:t==C||t.ownerDocument==p&&y(p,t)?1:u?P(u,e)-P(u,t):0:4&n?-1:1)}:function(e,t){if(e===t)return l=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,a=[e],s=[t];if(!i||!o)return e==C?-1:t==C?1:i?-1:o?1:u?P(u,e)-P(u,t):0;if(i===o)return pe(e,t);n=e;while(n=n.parentNode)a.unshift(n);n=t;while(n=n.parentNode)s.unshift(n);while(a[r]===s[r])r++;return r?pe(a[r],s[r]):a[r]==p?-1:s[r]==p?1:0}),C},se.matches=function(e,t){return se(e,null,null,t)},se.matchesSelector=function(e,t){if(T(e),d.matchesSelector&&E&&!N[t+" "]&&(!s||!s.test(t))&&(!v||!v.test(t)))try{var n=c.call(e,t);if(n||d.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(e){N(t,!0)}return 0<se(t,C,null,[e]).length},se.contains=function(e,t){return(e.ownerDocument||e)!=C&&T(e),y(e,t)},se.attr=function(e,t){(e.ownerDocument||e)!=C&&T(e);var n=b.attrHandle[t.toLowerCase()],r=n&&j.call(b.attrHandle,t.toLowerCase())?n(e,t,!E):void 0;return void 0!==r?r:d.attributes||!E?e.getAttribute(t):(r=e.getAttributeNode(t))&&r.specified?r.value:null},se.escape=function(e){return(e+"").replace(re,ie)},se.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},se.uniqueSort=function(e){var t,n=[],r=0,i=0;if(l=!d.detectDuplicates,u=!d.sortStable&&e.slice(0),e.sort(D),l){while(t=e[i++])t===e[i]&&(r=n.push(i));while(r--)e.splice(n[r],1)}return u=null,e},o=se.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=o(e)}else if(3===i||4===i)return e.nodeValue}else while(t=e[r++])n+=o(t);return n},(b=se.selectors={cacheLength:50,createPseudo:le,match:G,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(te,ne),e[3]=(e[3]||e[4]||e[5]||"").replace(te,ne),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||se.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&se.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return G.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&X.test(n)&&(t=h(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(te,ne).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=m[e+" "];return t||(t=new RegExp("(^|"+M+")"+e+"("+M+"|$)"))&&m(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(n,r,i){return function(e){var t=se.attr(e,n);return null==t?"!="===r:!r||(t+="","="===r?t===i:"!="===r?t!==i:"^="===r?i&&0===t.indexOf(i):"*="===r?i&&-1<t.indexOf(i):"$="===r?i&&t.slice(-i.length)===i:"~="===r?-1<(" "+t.replace(B," ")+" ").indexOf(i):"|="===r&&(t===i||t.slice(0,i.length+1)===i+"-"))}},CHILD:function(h,e,t,g,v){var y="nth"!==h.slice(0,3),m="last"!==h.slice(-4),x="of-type"===e;return 1===g&&0===v?function(e){return!!e.parentNode}:function(e,t,n){var r,i,o,a,s,u,l=y!==m?"nextSibling":"previousSibling",c=e.parentNode,f=x&&e.nodeName.toLowerCase(),p=!n&&!x,d=!1;if(c){if(y){while(l){a=e;while(a=a[l])if(x?a.nodeName.toLowerCase()===f:1===a.nodeType)return!1;u=l="only"===h&&!u&&"nextSibling"}return!0}if(u=[m?c.firstChild:c.lastChild],m&&p){d=(s=(r=(i=(o=(a=c)[S]||(a[S]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]||[])[0]===k&&r[1])&&r[2],a=s&&c.childNodes[s];while(a=++s&&a&&a[l]||(d=s=0)||u.pop())if(1===a.nodeType&&++d&&a===e){i[h]=[k,s,d];break}}else if(p&&(d=s=(r=(i=(o=(a=e)[S]||(a[S]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]||[])[0]===k&&r[1]),!1===d)while(a=++s&&a&&a[l]||(d=s=0)||u.pop())if((x?a.nodeName.toLowerCase()===f:1===a.nodeType)&&++d&&(p&&((i=(o=a[S]||(a[S]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]=[k,d]),a===e))break;return(d-=v)===g||d%g==0&&0<=d/g}}},PSEUDO:function(e,o){var t,a=b.pseudos[e]||b.setFilters[e.toLowerCase()]||se.error("unsupported pseudo: "+e);return a[S]?a(o):1<a.length?(t=[e,e,"",o],b.setFilters.hasOwnProperty(e.toLowerCase())?le(function(e,t){var n,r=a(e,o),i=r.length;while(i--)e[n=P(e,r[i])]=!(t[n]=r[i])}):function(e){return a(e,0,t)}):a}},pseudos:{not:le(function(e){var r=[],i=[],s=f(e.replace($,"$1"));return s[S]?le(function(e,t,n,r){var i,o=s(e,null,r,[]),a=e.length;while(a--)(i=o[a])&&(e[a]=!(t[a]=i))}):function(e,t,n){return r[0]=e,s(r,null,n,i),r[0]=null,!i.pop()}}),has:le(function(t){return function(e){return 0<se(t,e).length}}),contains:le(function(t){return t=t.replace(te,ne),function(e){return-1<(e.textContent||o(e)).indexOf(t)}}),lang:le(function(n){return V.test(n||"")||se.error("unsupported lang: "+n),n=n.replace(te,ne).toLowerCase(),function(e){var t;do{if(t=E?e.lang:e.getAttribute("xml:lang")||e.getAttribute("lang"))return(t=t.toLowerCase())===n||0===t.indexOf(n+"-")}while((e=e.parentNode)&&1===e.nodeType);return!1}}),target:function(e){var t=n.location&&n.location.hash;return t&&t.slice(1)===e.id},root:function(e){return e===a},focus:function(e){return e===C.activeElement&&(!C.hasFocus||C.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:ge(!1),disabled:ge(!0),checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,!0===e.selected},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeType<6)return!1;return!0},parent:function(e){return!b.pseudos.empty(e)},header:function(e){return J.test(e.nodeName)},input:function(e){return Q.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||"text"===t.toLowerCase())},first:ve(function(){return[0]}),last:ve(function(e,t){return[t-1]}),eq:ve(function(e,t,n){return[n<0?n+t:n]}),even:ve(function(e,t){for(var n=0;n<t;n+=2)e.push(n);return e}),odd:ve(function(e,t){for(var n=1;n<t;n+=2)e.push(n);return e}),lt:ve(function(e,t,n){for(var r=n<0?n+t:t<n?t:n;0<=--r;)e.push(r);return e}),gt:ve(function(e,t,n){for(var r=n<0?n+t:n;++r<t;)e.push(r);return e})}}).pseudos.nth=b.pseudos.eq,{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})b.pseudos[e]=de(e);for(e in{submit:!0,reset:!0})b.pseudos[e]=he(e);function me(){}function xe(e){for(var t=0,n=e.length,r="";t<n;t++)r+=e[t].value;return r}function be(s,e,t){var u=e.dir,l=e.next,c=l||u,f=t&&"parentNode"===c,p=r++;return e.first?function(e,t,n){while(e=e[u])if(1===e.nodeType||f)return s(e,t,n);return!1}:function(e,t,n){var r,i,o,a=[k,p];if(n){while(e=e[u])if((1===e.nodeType||f)&&s(e,t,n))return!0}else while(e=e[u])if(1===e.nodeType||f)if(i=(o=e[S]||(e[S]={}))[e.uniqueID]||(o[e.uniqueID]={}),l&&l===e.nodeName.toLowerCase())e=e[u]||e;else{if((r=i[c])&&r[0]===k&&r[1]===p)return a[2]=r[2];if((i[c]=a)[2]=s(e,t,n))return!0}return!1}}function we(i){return 1<i.length?function(e,t,n){var r=i.length;while(r--)if(!i[r](e,t,n))return!1;return!0}:i[0]}function Te(e,t,n,r,i){for(var o,a=[],s=0,u=e.length,l=null!=t;s<u;s++)(o=e[s])&&(n&&!n(o,r,i)||(a.push(o),l&&t.push(s)));return a}function Ce(d,h,g,v,y,e){return v&&!v[S]&&(v=Ce(v)),y&&!y[S]&&(y=Ce(y,e)),le(function(e,t,n,r){var i,o,a,s=[],u=[],l=t.length,c=e||function(e,t,n){for(var r=0,i=t.length;r<i;r++)se(e,t[r],n);return n}(h||"*",n.nodeType?[n]:n,[]),f=!d||!e&&h?c:Te(c,s,d,n,r),p=g?y||(e?d:l||v)?[]:t:f;if(g&&g(f,p,n,r),v){i=Te(p,u),v(i,[],n,r),o=i.length;while(o--)(a=i[o])&&(p[u[o]]=!(f[u[o]]=a))}if(e){if(y||d){if(y){i=[],o=p.length;while(o--)(a=p[o])&&i.push(f[o]=a);y(null,p=[],i,r)}o=p.length;while(o--)(a=p[o])&&-1<(i=y?P(e,a):s[o])&&(e[i]=!(t[i]=a))}}else p=Te(p===t?p.splice(l,p.length):p),y?y(null,t,p,r):H.apply(t,p)})}function Ee(e){for(var i,t,n,r=e.length,o=b.relative[e[0].type],a=o||b.relative[" "],s=o?1:0,u=be(function(e){return e===i},a,!0),l=be(function(e){return-1<P(i,e)},a,!0),c=[function(e,t,n){var r=!o&&(n||t!==w)||((i=t).nodeType?u(e,t,n):l(e,t,n));return i=null,r}];s<r;s++)if(t=b.relative[e[s].type])c=[be(we(c),t)];else{if((t=b.filter[e[s].type].apply(null,e[s].matches))[S]){for(n=++s;n<r;n++)if(b.relative[e[n].type])break;return Ce(1<s&&we(c),1<s&&xe(e.slice(0,s-1).concat({value:" "===e[s-2].type?"*":""})).replace($,"$1"),t,s<n&&Ee(e.slice(s,n)),n<r&&Ee(e=e.slice(n)),n<r&&xe(e))}c.push(t)}return we(c)}return me.prototype=b.filters=b.pseudos,b.setFilters=new me,h=se.tokenize=function(e,t){var n,r,i,o,a,s,u,l=x[e+" "];if(l)return t?0:l.slice(0);a=e,s=[],u=b.preFilter;while(a){for(o in n&&!(r=_.exec(a))||(r&&(a=a.slice(r[0].length)||a),s.push(i=[])),n=!1,(r=z.exec(a))&&(n=r.shift(),i.push({value:n,type:r[0].replace($," ")}),a=a.slice(n.length)),b.filter)!(r=G[o].exec(a))||u[o]&&!(r=u[o](r))||(n=r.shift(),i.push({value:n,type:o,matches:r}),a=a.slice(n.length));if(!n)break}return t?a.length:a?se.error(e):x(e,s).slice(0)},f=se.compile=function(e,t){var n,v,y,m,x,r,i=[],o=[],a=A[e+" "];if(!a){t||(t=h(e)),n=t.length;while(n--)(a=Ee(t[n]))[S]?i.push(a):o.push(a);(a=A(e,(v=o,m=0<(y=i).length,x=0<v.length,r=function(e,t,n,r,i){var o,a,s,u=0,l="0",c=e&&[],f=[],p=w,d=e||x&&b.find.TAG("*",i),h=k+=null==p?1:Math.random()||.1,g=d.length;for(i&&(w=t==C||t||i);l!==g&&null!=(o=d[l]);l++){if(x&&o){a=0,t||o.ownerDocument==C||(T(o),n=!E);while(s=v[a++])if(s(o,t||C,n)){r.push(o);break}i&&(k=h)}m&&((o=!s&&o)&&u--,e&&c.push(o))}if(u+=l,m&&l!==u){a=0;while(s=y[a++])s(c,f,t,n);if(e){if(0<u)while(l--)c[l]||f[l]||(f[l]=q.call(r));f=Te(f)}H.apply(r,f),i&&!e&&0<f.length&&1<u+y.length&&se.uniqueSort(r)}return i&&(k=h,w=p),c},m?le(r):r))).selector=e}return a},g=se.select=function(e,t,n,r){var i,o,a,s,u,l="function"==typeof e&&e,c=!r&&h(e=l.selector||e);if(n=n||[],1===c.length){if(2<(o=c[0]=c[0].slice(0)).length&&"ID"===(a=o[0]).type&&9===t.nodeType&&E&&b.relative[o[1].type]){if(!(t=(b.find.ID(a.matches[0].replace(te,ne),t)||[])[0]))return n;l&&(t=t.parentNode),e=e.slice(o.shift().value.length)}i=G.needsContext.test(e)?0:o.length;while(i--){if(a=o[i],b.relative[s=a.type])break;if((u=b.find[s])&&(r=u(a.matches[0].replace(te,ne),ee.test(o[0].type)&&ye(t.parentNode)||t))){if(o.splice(i,1),!(e=r.length&&xe(o)))return H.apply(n,r),n;break}}}return(l||f(e,c))(r,t,!E,n,!t||ee.test(e)&&ye(t.parentNode)||t),n},d.sortStable=S.split("").sort(D).join("")===S,d.detectDuplicates=!!l,T(),d.sortDetached=ce(function(e){return 1&e.compareDocumentPosition(C.createElement("fieldset"))}),ce(function(e){return e.innerHTML="<a href='#'></a>","#"===e.firstChild.getAttribute("href")})||fe("type|href|height|width",function(e,t,n){if(!n)return e.getAttribute(t,"type"===t.toLowerCase()?1:2)}),d.attributes&&ce(function(e){return e.innerHTML="<input/>",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||fe("value",function(e,t,n){if(!n&&"input"===e.nodeName.toLowerCase())return e.defaultValue}),ce(function(e){return null==e.getAttribute("disabled")})||fe(R,function(e,t,n){var r;if(!n)return!0===e[t]?t.toLowerCase():(r=e.getAttributeNode(t))&&r.specified?r.value:null}),se}(C);S.find=d,S.expr=d.selectors,S.expr[":"]=S.expr.pseudos,S.uniqueSort=S.unique=d.uniqueSort,S.text=d.getText,S.isXMLDoc=d.isXML,S.contains=d.contains,S.escapeSelector=d.escape;var h=function(e,t,n){var r=[],i=void 0!==n;while((e=e[t])&&9!==e.nodeType)if(1===e.nodeType){if(i&&S(e).is(n))break;r.push(e)}return r},T=function(e,t){for(var n=[];e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n},k=S.expr.match.needsContext;function A(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()}var N=/^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function D(e,n,r){return m(n)?S.grep(e,function(e,t){return!!n.call(e,t,e)!==r}):n.nodeType?S.grep(e,function(e){return e===n!==r}):"string"!=typeof n?S.grep(e,function(e){return-1<i.call(n,e)!==r}):S.filter(n,e,r)}S.filter=function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?S.find.matchesSelector(r,e)?[r]:[]:S.find.matches(e,S.grep(t,function(e){return 1===e.nodeType}))},S.fn.extend({find:function(e){var t,n,r=this.length,i=this;if("string"!=typeof e)return this.pushStack(S(e).filter(function(){for(t=0;t<r;t++)if(S.contains(i[t],this))return!0}));for(n=this.pushStack([]),t=0;t<r;t++)S.find(e,i[t],n);return 1<r?S.uniqueSort(n):n},filter:function(e){return this.pushStack(D(this,e||[],!1))},not:function(e){return this.pushStack(D(this,e||[],!0))},is:function(e){return!!D(this,"string"==typeof e&&k.test(e)?S(e):e||[],!1).length}});var j,q=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/;(S.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||j,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&3<=e.length?[null,e,null]:q.exec(e))||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof S?t[0]:t,S.merge(this,S.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:E,!0)),N.test(r[1])&&S.isPlainObject(t))for(r in t)m(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return(i=E.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):m(e)?void 0!==n.ready?n.ready(e):e(S):S.makeArray(e,this)}).prototype=S.fn,j=S(E);var L=/^(?:parents|prev(?:Until|All))/,H={children:!0,contents:!0,next:!0,prev:!0};function O(e,t){while((e=e[t])&&1!==e.nodeType);return e}S.fn.extend({has:function(e){var t=S(e,this),n=t.length;return this.filter(function(){for(var e=0;e<n;e++)if(S.contains(this,t[e]))return!0})},closest:function(e,t){var n,r=0,i=this.length,o=[],a="string"!=typeof e&&S(e);if(!k.test(e))for(;r<i;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(n.nodeType<11&&(a?-1<a.index(n):1===n.nodeType&&S.find.matchesSelector(n,e))){o.push(n);break}return this.pushStack(1<o.length?S.uniqueSort(o):o)},index:function(e){return e?"string"==typeof e?i.call(S(e),this[0]):i.call(this,e.jquery?e[0]:e):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){return this.pushStack(S.uniqueSort(S.merge(this.get(),S(e,t))))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}}),S.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return h(e,"parentNode")},parentsUntil:function(e,t,n){return h(e,"parentNode",n)},next:function(e){return O(e,"nextSibling")},prev:function(e){return O(e,"previousSibling")},nextAll:function(e){return h(e,"nextSibling")},prevAll:function(e){return h(e,"previousSibling")},nextUntil:function(e,t,n){return h(e,"nextSibling",n)},prevUntil:function(e,t,n){return h(e,"previousSibling",n)},siblings:function(e){return T((e.parentNode||{}).firstChild,e)},children:function(e){return T(e.firstChild)},contents:function(e){return null!=e.contentDocument&&r(e.contentDocument)?e.contentDocument:(A(e,"template")&&(e=e.content||e),S.merge([],e.childNodes))}},function(r,i){S.fn[r]=function(e,t){var n=S.map(this,i,e);return"Until"!==r.slice(-5)&&(t=e),t&&"string"==typeof t&&(n=S.filter(t,n)),1<this.length&&(H[r]||S.uniqueSort(n),L.test(r)&&n.reverse()),this.pushStack(n)}});var P=/[^\x20\t\r\n\f]+/g;function R(e){return e}function M(e){throw e}function I(e,t,n,r){var i;try{e&&m(i=e.promise)?i.call(e).done(t).fail(n):e&&m(i=e.then)?i.call(e,t,n):t.apply(void 0,[e].slice(r))}catch(e){n.apply(void 0,[e])}}S.Callbacks=function(r){var e,n;r="string"==typeof r?(e=r,n={},S.each(e.match(P)||[],function(e,t){n[t]=!0}),n):S.extend({},r);var i,t,o,a,s=[],u=[],l=-1,c=function(){for(a=a||r.once,o=i=!0;u.length;l=-1){t=u.shift();while(++l<s.length)!1===s[l].apply(t[0],t[1])&&r.stopOnFalse&&(l=s.length,t=!1)}r.memory||(t=!1),i=!1,a&&(s=t?[]:"")},f={add:function(){return s&&(t&&!i&&(l=s.length-1,u.push(t)),function n(e){S.each(e,function(e,t){m(t)?r.unique&&f.has(t)||s.push(t):t&&t.length&&"string"!==w(t)&&n(t)})}(arguments),t&&!i&&c()),this},remove:function(){return S.each(arguments,function(e,t){var n;while(-1<(n=S.inArray(t,s,n)))s.splice(n,1),n<=l&&l--}),this},has:function(e){return e?-1<S.inArray(e,s):0<s.length},empty:function(){return s&&(s=[]),this},disable:function(){return a=u=[],s=t="",this},disabled:function(){return!s},lock:function(){return a=u=[],t||i||(s=t=""),this},locked:function(){return!!a},fireWith:function(e,t){return a||(t=[e,(t=t||[]).slice?t.slice():t],u.push(t),i||c()),this},fire:function(){return f.fireWith(this,arguments),this},fired:function(){return!!o}};return f},S.extend({Deferred:function(e){var o=[["notify","progress",S.Callbacks("memory"),S.Callbacks("memory"),2],["resolve","done",S.Callbacks("once memory"),S.Callbacks("once memory"),0,"resolved"],["reject","fail",S.Callbacks("once memory"),S.Callbacks("once memory"),1,"rejected"]],i="pending",a={state:function(){return i},always:function(){return s.done(arguments).fail(arguments),this},"catch":function(e){return a.then(null,e)},pipe:function(){var i=arguments;return S.Deferred(function(r){S.each(o,function(e,t){var n=m(i[t[4]])&&i[t[4]];s[t[1]](function(){var e=n&&n.apply(this,arguments);e&&m(e.promise)?e.promise().progress(r.notify).done(r.resolve).fail(r.reject):r[t[0]+"With"](this,n?[e]:arguments)})}),i=null}).promise()},then:function(t,n,r){var u=0;function l(i,o,a,s){return function(){var n=this,r=arguments,e=function(){var e,t;if(!(i<u)){if((e=a.apply(n,r))===o.promise())throw new TypeError("Thenable self-resolution");t=e&&("object"==typeof e||"function"==typeof e)&&e.then,m(t)?s?t.call(e,l(u,o,R,s),l(u,o,M,s)):(u++,t.call(e,l(u,o,R,s),l(u,o,M,s),l(u,o,R,o.notifyWith))):(a!==R&&(n=void 0,r=[e]),(s||o.resolveWith)(n,r))}},t=s?e:function(){try{e()}catch(e){S.Deferred.exceptionHook&&S.Deferred.exceptionHook(e,t.stackTrace),u<=i+1&&(a!==M&&(n=void 0,r=[e]),o.rejectWith(n,r))}};i?t():(S.Deferred.getStackHook&&(t.stackTrace=S.Deferred.getStackHook()),C.setTimeout(t))}}return S.Deferred(function(e){o[0][3].add(l(0,e,m(r)?r:R,e.notifyWith)),o[1][3].add(l(0,e,m(t)?t:R)),o[2][3].add(l(0,e,m(n)?n:M))}).promise()},promise:function(e){return null!=e?S.extend(e,a):a}},s={};return S.each(o,function(e,t){var n=t[2],r=t[5];a[t[1]]=n.add,r&&n.add(function(){i=r},o[3-e][2].disable,o[3-e][3].disable,o[0][2].lock,o[0][3].lock),n.add(t[3].fire),s[t[0]]=function(){return s[t[0]+"With"](this===s?void 0:this,arguments),this},s[t[0]+"With"]=n.fireWith}),a.promise(s),e&&e.call(s,s),s},when:function(e){var n=arguments.length,t=n,r=Array(t),i=s.call(arguments),o=S.Deferred(),a=function(t){return function(e){r[t]=this,i[t]=1<arguments.length?s.call(arguments):e,--n||o.resolveWith(r,i)}};if(n<=1&&(I(e,o.done(a(t)).resolve,o.reject,!n),"pending"===o.state()||m(i[t]&&i[t].then)))return o.then();while(t--)I(i[t],a(t),o.reject);return o.promise()}});var W=/^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;S.Deferred.exceptionHook=function(e,t){C.console&&C.console.warn&&e&&W.test(e.name)&&C.console.warn("jQuery.Deferred exception: "+e.message,e.stack,t)},S.readyException=function(e){C.setTimeout(function(){throw e})};var F=S.Deferred();function B(){E.removeEventListener("DOMContentLoaded",B),C.removeEventListener("load",B),S.ready()}S.fn.ready=function(e){return F.then(e)["catch"](function(e){S.readyException(e)}),this},S.extend({isReady:!1,readyWait:1,ready:function(e){(!0===e?--S.readyWait:S.isReady)||(S.isReady=!0)!==e&&0<--S.readyWait||F.resolveWith(E,[S])}}),S.ready.then=F.then,"complete"===E.readyState||"loading"!==E.readyState&&!E.documentElement.doScroll?C.setTimeout(S.ready):(E.addEventListener("DOMContentLoaded",B),C.addEventListener("load",B));var $=function(e,t,n,r,i,o,a){var s=0,u=e.length,l=null==n;if("object"===w(n))for(s in i=!0,n)$(e,t,s,n[s],!0,o,a);else if(void 0!==r&&(i=!0,m(r)||(a=!0),l&&(a?(t.call(e,r),t=null):(l=t,t=function(e,t,n){return l.call(S(e),n)})),t))for(;s<u;s++)t(e[s],n,a?r:r.call(e[s],s,t(e[s],n)));return i?e:l?t.call(e):u?t(e[0],n):o},_=/^-ms-/,z=/-([a-z])/g;function U(e,t){return t.toUpperCase()}function X(e){return e.replace(_,"ms-").replace(z,U)}var V=function(e){return 1===e.nodeType||9===e.nodeType||!+e.nodeType};function G(){this.expando=S.expando+G.uid++}G.uid=1,G.prototype={cache:function(e){var t=e[this.expando];return t||(t={},V(e)&&(e.nodeType?e[this.expando]=t:Object.defineProperty(e,this.expando,{value:t,configurable:!0}))),t},set:function(e,t,n){var r,i=this.cache(e);if("string"==typeof t)i[X(t)]=n;else for(r in t)i[X(r)]=t[r];return i},get:function(e,t){return void 0===t?this.cache(e):e[this.expando]&&e[this.expando][X(t)]},access:function(e,t,n){return void 0===t||t&&"string"==typeof t&&void 0===n?this.get(e,t):(this.set(e,t,n),void 0!==n?n:t)},remove:function(e,t){var n,r=e[this.expando];if(void 0!==r){if(void 0!==t){n=(t=Array.isArray(t)?t.map(X):(t=X(t))in r?[t]:t.match(P)||[]).length;while(n--)delete r[t[n]]}(void 0===t||S.isEmptyObject(r))&&(e.nodeType?e[this.expando]=void 0:delete e[this.expando])}},hasData:function(e){var t=e[this.expando];return void 0!==t&&!S.isEmptyObject(t)}};var Y=new G,Q=new G,J=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,K=/[A-Z]/g;function Z(e,t,n){var r,i;if(void 0===n&&1===e.nodeType)if(r="data-"+t.replace(K,"-$&").toLowerCase(),"string"==typeof(n=e.getAttribute(r))){try{n="true"===(i=n)||"false"!==i&&("null"===i?null:i===+i+""?+i:J.test(i)?JSON.parse(i):i)}catch(e){}Q.set(e,t,n)}else n=void 0;return n}S.extend({hasData:function(e){return Q.hasData(e)||Y.hasData(e)},data:function(e,t,n){return Q.access(e,t,n)},removeData:function(e,t){Q.remove(e,t)},_data:function(e,t,n){return Y.access(e,t,n)},_removeData:function(e,t){Y.remove(e,t)}}),S.fn.extend({data:function(n,e){var t,r,i,o=this[0],a=o&&o.attributes;if(void 0===n){if(this.length&&(i=Q.get(o),1===o.nodeType&&!Y.get(o,"hasDataAttrs"))){t=a.length;while(t--)a[t]&&0===(r=a[t].name).indexOf("data-")&&(r=X(r.slice(5)),Z(o,r,i[r]));Y.set(o,"hasDataAttrs",!0)}return i}return"object"==typeof n?this.each(function(){Q.set(this,n)}):$(this,function(e){var t;if(o&&void 0===e)return void 0!==(t=Q.get(o,n))?t:void 0!==(t=Z(o,n))?t:void 0;this.each(function(){Q.set(this,n,e)})},null,e,1<arguments.length,null,!0)},removeData:function(e){return this.each(function(){Q.remove(this,e)})}}),S.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=Y.get(e,t),n&&(!r||Array.isArray(n)?r=Y.access(e,t,S.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=S.queue(e,t),r=n.length,i=n.shift(),o=S._queueHooks(e,t);"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,function(){S.dequeue(e,t)},o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return Y.get(e,n)||Y.access(e,n,{empty:S.Callbacks("once memory").add(function(){Y.remove(e,[t+"queue",n])})})}}),S.fn.extend({queue:function(t,n){var e=2;return"string"!=typeof t&&(n=t,t="fx",e--),arguments.length<e?S.queue(this[0],t):void 0===n?this:this.each(function(){var e=S.queue(this,t,n);S._queueHooks(this,t),"fx"===t&&"inprogress"!==e[0]&&S.dequeue(this,t)})},dequeue:function(e){return this.each(function(){S.dequeue(this,e)})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,t){var n,r=1,i=S.Deferred(),o=this,a=this.length,s=function(){--r||i.resolveWith(o,[o])};"string"!=typeof e&&(t=e,e=void 0),e=e||"fx";while(a--)(n=Y.get(o[a],e+"queueHooks"))&&n.empty&&(r++,n.empty.add(s));return s(),i.promise(t)}});var ee=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,te=new RegExp("^(?:([+-])=|)("+ee+")([a-z%]*)$","i"),ne=["Top","Right","Bottom","Left"],re=E.documentElement,ie=function(e){return S.contains(e.ownerDocument,e)},oe={composed:!0};re.getRootNode&&(ie=function(e){return S.contains(e.ownerDocument,e)||e.getRootNode(oe)===e.ownerDocument});var ae=function(e,t){return"none"===(e=t||e).style.display||""===e.style.display&&ie(e)&&"none"===S.css(e,"display")};function se(e,t,n,r){var i,o,a=20,s=r?function(){return r.cur()}:function(){return S.css(e,t,"")},u=s(),l=n&&n[3]||(S.cssNumber[t]?"":"px"),c=e.nodeType&&(S.cssNumber[t]||"px"!==l&&+u)&&te.exec(S.css(e,t));if(c&&c[3]!==l){u/=2,l=l||c[3],c=+u||1;while(a--)S.style(e,t,c+l),(1-o)*(1-(o=s()/u||.5))<=0&&(a=0),c/=o;c*=2,S.style(e,t,c+l),n=n||[]}return n&&(c=+c||+u||0,i=n[1]?c+(n[1]+1)*n[2]:+n[2],r&&(r.unit=l,r.start=c,r.end=i)),i}var ue={};function le(e,t){for(var n,r,i,o,a,s,u,l=[],c=0,f=e.length;c<f;c++)(r=e[c]).style&&(n=r.style.display,t?("none"===n&&(l[c]=Y.get(r,"display")||null,l[c]||(r.style.display="")),""===r.style.display&&ae(r)&&(l[c]=(u=a=o=void 0,a=(i=r).ownerDocument,s=i.nodeName,(u=ue[s])||(o=a.body.appendChild(a.createElement(s)),u=S.css(o,"display"),o.parentNode.removeChild(o),"none"===u&&(u="block"),ue[s]=u)))):"none"!==n&&(l[c]="none",Y.set(r,"display",n)));for(c=0;c<f;c++)null!=l[c]&&(e[c].style.display=l[c]);return e}S.fn.extend({show:function(){return le(this,!0)},hide:function(){return le(this)},toggle:function(e){return"boolean"==typeof e?e?this.show():this.hide():this.each(function(){ae(this)?S(this).show():S(this).hide()})}});var ce,fe,pe=/^(?:checkbox|radio)$/i,de=/<([a-z][^\/\0>\x20\t\r\n\f]*)/i,he=/^$|^module$|\/(?:java|ecma)script/i;ce=E.createDocumentFragment().appendChild(E.createElement("div")),(fe=E.createElement("input")).setAttribute("type","radio"),fe.setAttribute("checked","checked"),fe.setAttribute("name","t"),ce.appendChild(fe),y.checkClone=ce.cloneNode(!0).cloneNode(!0).lastChild.checked,ce.innerHTML="<textarea>x</textarea>",y.noCloneChecked=!!ce.cloneNode(!0).lastChild.defaultValue,ce.innerHTML="<option></option>",y.option=!!ce.lastChild;var ge={thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};function ve(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&A(e,t)?S.merge([e],n):n}function ye(e,t){for(var n=0,r=e.length;n<r;n++)Y.set(e[n],"globalEval",!t||Y.get(t[n],"globalEval"))}ge.tbody=ge.tfoot=ge.colgroup=ge.caption=ge.thead,ge.th=ge.td,y.option||(ge.optgroup=ge.option=[1,"<select multiple='multiple'>","</select>"]);var me=/<|&#?\w+;/;function xe(e,t,n,r,i){for(var o,a,s,u,l,c,f=t.createDocumentFragment(),p=[],d=0,h=e.length;d<h;d++)if((o=e[d])||0===o)if("object"===w(o))S.merge(p,o.nodeType?[o]:o);else if(me.test(o)){a=a||f.appendChild(t.createElement("div")),s=(de.exec(o)||["",""])[1].toLowerCase(),u=ge[s]||ge._default,a.innerHTML=u[1]+S.htmlPrefilter(o)+u[2],c=u[0];while(c--)a=a.lastChild;S.merge(p,a.childNodes),(a=f.firstChild).textContent=""}else p.push(t.createTextNode(o));f.textContent="",d=0;while(o=p[d++])if(r&&-1<S.inArray(o,r))i&&i.push(o);else if(l=ie(o),a=ve(f.appendChild(o),"script"),l&&ye(a),n){c=0;while(o=a[c++])he.test(o.type||"")&&n.push(o)}return f}var be=/^key/,we=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,Te=/^([^.]*)(?:\.(.+)|)/;function Ce(){return!0}function Ee(){return!1}function Se(e,t){return e===function(){try{return E.activeElement}catch(e){}}()==("focus"===t)}function ke(e,t,n,r,i,o){var a,s;if("object"==typeof t){for(s in"string"!=typeof n&&(r=r||n,n=void 0),t)ke(e,s,n,r,t[s],o);return e}if(null==r&&null==i?(i=n,r=n=void 0):null==i&&("string"==typeof n?(i=r,r=void 0):(i=r,r=n,n=void 0)),!1===i)i=Ee;else if(!i)return e;return 1===o&&(a=i,(i=function(e){return S().off(e),a.apply(this,arguments)}).guid=a.guid||(a.guid=S.guid++)),e.each(function(){S.event.add(this,t,i,r,n)})}function Ae(e,i,o){o?(Y.set(e,i,!1),S.event.add(e,i,{namespace:!1,handler:function(e){var t,n,r=Y.get(this,i);if(1&e.isTrigger&&this[i]){if(r.length)(S.event.special[i]||{}).delegateType&&e.stopPropagation();else if(r=s.call(arguments),Y.set(this,i,r),t=o(this,i),this[i](),r!==(n=Y.get(this,i))||t?Y.set(this,i,!1):n={},r!==n)return e.stopImmediatePropagation(),e.preventDefault(),n.value}else r.length&&(Y.set(this,i,{value:S.event.trigger(S.extend(r[0],S.Event.prototype),r.slice(1),this)}),e.stopImmediatePropagation())}})):void 0===Y.get(e,i)&&S.event.add(e,i,Ce)}S.event={global:{},add:function(t,e,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=Y.get(t);if(V(t)){n.handler&&(n=(o=n).handler,i=o.selector),i&&S.find.matchesSelector(re,i),n.guid||(n.guid=S.guid++),(u=v.events)||(u=v.events=Object.create(null)),(a=v.handle)||(a=v.handle=function(e){return"undefined"!=typeof S&&S.event.triggered!==e.type?S.event.dispatch.apply(t,arguments):void 0}),l=(e=(e||"").match(P)||[""]).length;while(l--)d=g=(s=Te.exec(e[l])||[])[1],h=(s[2]||"").split(".").sort(),d&&(f=S.event.special[d]||{},d=(i?f.delegateType:f.bindType)||d,f=S.event.special[d]||{},c=S.extend({type:d,origType:g,data:r,handler:n,guid:n.guid,selector:i,needsContext:i&&S.expr.match.needsContext.test(i),namespace:h.join(".")},o),(p=u[d])||((p=u[d]=[]).delegateCount=0,f.setup&&!1!==f.setup.call(t,r,h,a)||t.addEventListener&&t.addEventListener(d,a)),f.add&&(f.add.call(t,c),c.handler.guid||(c.handler.guid=n.guid)),i?p.splice(p.delegateCount++,0,c):p.push(c),S.event.global[d]=!0)}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=Y.hasData(e)&&Y.get(e);if(v&&(u=v.events)){l=(t=(t||"").match(P)||[""]).length;while(l--)if(d=g=(s=Te.exec(t[l])||[])[1],h=(s[2]||"").split(".").sort(),d){f=S.event.special[d]||{},p=u[d=(r?f.delegateType:f.bindType)||d]||[],s=s[2]&&new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),a=o=p.length;while(o--)c=p[o],!i&&g!==c.origType||n&&n.guid!==c.guid||s&&!s.test(c.namespace)||r&&r!==c.selector&&("**"!==r||!c.selector)||(p.splice(o,1),c.selector&&p.delegateCount--,f.remove&&f.remove.call(e,c));a&&!p.length&&(f.teardown&&!1!==f.teardown.call(e,h,v.handle)||S.removeEvent(e,d,v.handle),delete u[d])}else for(d in u)S.event.remove(e,d+t[l],n,r,!0);S.isEmptyObject(u)&&Y.remove(e,"handle events")}},dispatch:function(e){var t,n,r,i,o,a,s=new Array(arguments.length),u=S.event.fix(e),l=(Y.get(this,"events")||Object.create(null))[u.type]||[],c=S.event.special[u.type]||{};for(s[0]=u,t=1;t<arguments.length;t++)s[t]=arguments[t];if(u.delegateTarget=this,!c.preDispatch||!1!==c.preDispatch.call(this,u)){a=S.event.handlers.call(this,u,l),t=0;while((i=a[t++])&&!u.isPropagationStopped()){u.currentTarget=i.elem,n=0;while((o=i.handlers[n++])&&!u.isImmediatePropagationStopped())u.rnamespace&&!1!==o.namespace&&!u.rnamespace.test(o.namespace)||(u.handleObj=o,u.data=o.data,void 0!==(r=((S.event.special[o.origType]||{}).handle||o.handler).apply(i.elem,s))&&!1===(u.result=r)&&(u.preventDefault(),u.stopPropagation()))}return c.postDispatch&&c.postDispatch.call(this,u),u.result}},handlers:function(e,t){var n,r,i,o,a,s=[],u=t.delegateCount,l=e.target;if(u&&l.nodeType&&!("click"===e.type&&1<=e.button))for(;l!==this;l=l.parentNode||this)if(1===l.nodeType&&("click"!==e.type||!0!==l.disabled)){for(o=[],a={},n=0;n<u;n++)void 0===a[i=(r=t[n]).selector+" "]&&(a[i]=r.needsContext?-1<S(i,this).index(l):S.find(i,this,null,[l]).length),a[i]&&o.push(r);o.length&&s.push({elem:l,handlers:o})}return l=this,u<t.length&&s.push({elem:l,handlers:t.slice(u)}),s},addProp:function(t,e){Object.defineProperty(S.Event.prototype,t,{enumerable:!0,configurable:!0,get:m(e)?function(){if(this.originalEvent)return e(this.originalEvent)}:function(){if(this.originalEvent)return this.originalEvent[t]},set:function(e){Object.defineProperty(this,t,{enumerable:!0,configurable:!0,writable:!0,value:e})}})},fix:function(e){return e[S.expando]?e:new S.Event(e)},special:{load:{noBubble:!0},click:{setup:function(e){var t=this||e;return pe.test(t.type)&&t.click&&A(t,"input")&&Ae(t,"click",Ce),!1},trigger:function(e){var t=this||e;return pe.test(t.type)&&t.click&&A(t,"input")&&Ae(t,"click"),!0},_default:function(e){var t=e.target;return pe.test(t.type)&&t.click&&A(t,"input")&&Y.get(t,"click")||A(t,"a")}},beforeunload:{postDispatch:function(e){void 0!==e.result&&e.originalEvent&&(e.originalEvent.returnValue=e.result)}}}},S.removeEvent=function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n)},S.Event=function(e,t){if(!(this instanceof S.Event))return new S.Event(e,t);e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||void 0===e.defaultPrevented&&!1===e.returnValue?Ce:Ee,this.target=e.target&&3===e.target.nodeType?e.target.parentNode:e.target,this.currentTarget=e.currentTarget,this.relatedTarget=e.relatedTarget):this.type=e,t&&S.extend(this,t),this.timeStamp=e&&e.timeStamp||Date.now(),this[S.expando]=!0},S.Event.prototype={constructor:S.Event,isDefaultPrevented:Ee,isPropagationStopped:Ee,isImmediatePropagationStopped:Ee,isSimulated:!1,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=Ce,e&&!this.isSimulated&&e.preventDefault()},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=Ce,e&&!this.isSimulated&&e.stopPropagation()},stopImmediatePropagation:function(){var e=this.originalEvent;this.isImmediatePropagationStopped=Ce,e&&!this.isSimulated&&e.stopImmediatePropagation(),this.stopPropagation()}},S.each({altKey:!0,bubbles:!0,cancelable:!0,changedTouches:!0,ctrlKey:!0,detail:!0,eventPhase:!0,metaKey:!0,pageX:!0,pageY:!0,shiftKey:!0,view:!0,"char":!0,code:!0,charCode:!0,key:!0,keyCode:!0,button:!0,buttons:!0,clientX:!0,clientY:!0,offsetX:!0,offsetY:!0,pointerId:!0,pointerType:!0,screenX:!0,screenY:!0,targetTouches:!0,toElement:!0,touches:!0,which:function(e){var t=e.button;return null==e.which&&be.test(e.type)?null!=e.charCode?e.charCode:e.keyCode:!e.which&&void 0!==t&&we.test(e.type)?1&t?1:2&t?3:4&t?2:0:e.which}},S.event.addProp),S.each({focus:"focusin",blur:"focusout"},function(e,t){S.event.special[e]={setup:function(){return Ae(this,e,Se),!1},trigger:function(){return Ae(this,e),!0},delegateType:t}}),S.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(e,i){S.event.special[e]={delegateType:i,bindType:i,handle:function(e){var t,n=e.relatedTarget,r=e.handleObj;return n&&(n===this||S.contains(this,n))||(e.type=r.origType,t=r.handler.apply(this,arguments),e.type=i),t}}}),S.fn.extend({on:function(e,t,n,r){return ke(this,e,t,n,r)},one:function(e,t,n,r){return ke(this,e,t,n,r,1)},off:function(e,t,n){var r,i;if(e&&e.preventDefault&&e.handleObj)return r=e.handleObj,S(e.delegateTarget).off(r.namespace?r.origType+"."+r.namespace:r.origType,r.selector,r.handler),this;if("object"==typeof e){for(i in e)this.off(i,t,e[i]);return this}return!1!==t&&"function"!=typeof t||(n=t,t=void 0),!1===n&&(n=Ee),this.each(function(){S.event.remove(this,e,n,t)})}});var Ne=/<script|<style|<link/i,De=/checked\s*(?:[^=]|=\s*.checked.)/i,je=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g;function qe(e,t){return A(e,"table")&&A(11!==t.nodeType?t:t.firstChild,"tr")&&S(e).children("tbody")[0]||e}function Le(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function He(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Oe(e,t){var n,r,i,o,a,s;if(1===t.nodeType){if(Y.hasData(e)&&(s=Y.get(e).events))for(i in Y.remove(t,"handle events"),s)for(n=0,r=s[i].length;n<r;n++)S.event.add(t,i,s[i][n]);Q.hasData(e)&&(o=Q.access(e),a=S.extend({},o),Q.set(t,a))}}function Pe(n,r,i,o){r=g(r);var e,t,a,s,u,l,c=0,f=n.length,p=f-1,d=r[0],h=m(d);if(h||1<f&&"string"==typeof d&&!y.checkClone&&De.test(d))return n.each(function(e){var t=n.eq(e);h&&(r[0]=d.call(this,e,t.html())),Pe(t,r,i,o)});if(f&&(t=(e=xe(r,n[0].ownerDocument,!1,n,o)).firstChild,1===e.childNodes.length&&(e=t),t||o)){for(s=(a=S.map(ve(e,"script"),Le)).length;c<f;c++)u=e,c!==p&&(u=S.clone(u,!0,!0),s&&S.merge(a,ve(u,"script"))),i.call(n[c],u,c);if(s)for(l=a[a.length-1].ownerDocument,S.map(a,He),c=0;c<s;c++)u=a[c],he.test(u.type||"")&&!Y.access(u,"globalEval")&&S.contains(l,u)&&(u.src&&"module"!==(u.type||"").toLowerCase()?S._evalUrl&&!u.noModule&&S._evalUrl(u.src,{nonce:u.nonce||u.getAttribute("nonce")},l):b(u.textContent.replace(je,""),u,l))}return n}function Re(e,t,n){for(var r,i=t?S.filter(t,e):e,o=0;null!=(r=i[o]);o++)n||1!==r.nodeType||S.cleanData(ve(r)),r.parentNode&&(n&&ie(r)&&ye(ve(r,"script")),r.parentNode.removeChild(r));return e}S.extend({htmlPrefilter:function(e){return e},clone:function(e,t,n){var r,i,o,a,s,u,l,c=e.cloneNode(!0),f=ie(e);if(!(y.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||S.isXMLDoc(e)))for(a=ve(c),r=0,i=(o=ve(e)).length;r<i;r++)s=o[r],u=a[r],void 0,"input"===(l=u.nodeName.toLowerCase())&&pe.test(s.type)?u.checked=s.checked:"input"!==l&&"textarea"!==l||(u.defaultValue=s.defaultValue);if(t)if(n)for(o=o||ve(e),a=a||ve(c),r=0,i=o.length;r<i;r++)Oe(o[r],a[r]);else Oe(e,c);return 0<(a=ve(c,"script")).length&&ye(a,!f&&ve(e,"script")),c},cleanData:function(e){for(var t,n,r,i=S.event.special,o=0;void 0!==(n=e[o]);o++)if(V(n)){if(t=n[Y.expando]){if(t.events)for(r in t.events)i[r]?S.event.remove(n,r):S.removeEvent(n,r,t.handle);n[Y.expando]=void 0}n[Q.expando]&&(n[Q.expando]=void 0)}}}),S.fn.extend({detach:function(e){return Re(this,e,!0)},remove:function(e){return Re(this,e)},text:function(e){return $(this,function(e){return void 0===e?S.text(this):this.empty().each(function(){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||(this.textContent=e)})},null,e,arguments.length)},append:function(){return Pe(this,arguments,function(e){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||qe(this,e).appendChild(e)})},prepend:function(){return Pe(this,arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=qe(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return Pe(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return Pe(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},empty:function(){for(var e,t=0;null!=(e=this[t]);t++)1===e.nodeType&&(S.cleanData(ve(e,!1)),e.textContent="");return this},clone:function(e,t){return e=null!=e&&e,t=null==t?e:t,this.map(function(){return S.clone(this,e,t)})},html:function(e){return $(this,function(e){var t=this[0]||{},n=0,r=this.length;if(void 0===e&&1===t.nodeType)return t.innerHTML;if("string"==typeof e&&!Ne.test(e)&&!ge[(de.exec(e)||["",""])[1].toLowerCase()]){e=S.htmlPrefilter(e);try{for(;n<r;n++)1===(t=this[n]||{}).nodeType&&(S.cleanData(ve(t,!1)),t.innerHTML=e);t=0}catch(e){}}t&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var n=[];return Pe(this,arguments,function(e){var t=this.parentNode;S.inArray(this,n)<0&&(S.cleanData(ve(this)),t&&t.replaceChild(e,this))},n)}}),S.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,a){S.fn[e]=function(e){for(var t,n=[],r=S(e),i=r.length-1,o=0;o<=i;o++)t=o===i?this:this.clone(!0),S(r[o])[a](t),u.apply(n,t.get());return this.pushStack(n)}});var Me=new RegExp("^("+ee+")(?!px)[a-z%]+$","i"),Ie=function(e){var t=e.ownerDocument.defaultView;return t&&t.opener||(t=C),t.getComputedStyle(e)},We=function(e,t,n){var r,i,o={};for(i in t)o[i]=e.style[i],e.style[i]=t[i];for(i in r=n.call(e),t)e.style[i]=o[i];return r},Fe=new RegExp(ne.join("|"),"i");function Be(e,t,n){var r,i,o,a,s=e.style;return(n=n||Ie(e))&&(""!==(a=n.getPropertyValue(t)||n[t])||ie(e)||(a=S.style(e,t)),!y.pixelBoxStyles()&&Me.test(a)&&Fe.test(t)&&(r=s.width,i=s.minWidth,o=s.maxWidth,s.minWidth=s.maxWidth=s.width=a,a=n.width,s.width=r,s.minWidth=i,s.maxWidth=o)),void 0!==a?a+"":a}function $e(e,t){return{get:function(){if(!e())return(this.get=t).apply(this,arguments);delete this.get}}}!function(){function e(){if(l){u.style.cssText="position:absolute;left:-11111px;width:60px;margin-top:1px;padding:0;border:0",l.style.cssText="position:relative;display:block;box-sizing:border-box;overflow:scroll;margin:auto;border:1px;padding:1px;width:60%;top:1%",re.appendChild(u).appendChild(l);var e=C.getComputedStyle(l);n="1%"!==e.top,s=12===t(e.marginLeft),l.style.right="60%",o=36===t(e.right),r=36===t(e.width),l.style.position="absolute",i=12===t(l.offsetWidth/3),re.removeChild(u),l=null}}function t(e){return Math.round(parseFloat(e))}var n,r,i,o,a,s,u=E.createElement("div"),l=E.createElement("div");l.style&&(l.style.backgroundClip="content-box",l.cloneNode(!0).style.backgroundClip="",y.clearCloneStyle="content-box"===l.style.backgroundClip,S.extend(y,{boxSizingReliable:function(){return e(),r},pixelBoxStyles:function(){return e(),o},pixelPosition:function(){return e(),n},reliableMarginLeft:function(){return e(),s},scrollboxSize:function(){return e(),i},reliableTrDimensions:function(){var e,t,n,r;return null==a&&(e=E.createElement("table"),t=E.createElement("tr"),n=E.createElement("div"),e.style.cssText="position:absolute;left:-11111px",t.style.height="1px",n.style.height="9px",re.appendChild(e).appendChild(t).appendChild(n),r=C.getComputedStyle(t),a=3<parseInt(r.height),re.removeChild(e)),a}}))}();var _e=["Webkit","Moz","ms"],ze=E.createElement("div").style,Ue={};function Xe(e){var t=S.cssProps[e]||Ue[e];return t||(e in ze?e:Ue[e]=function(e){var t=e[0].toUpperCase()+e.slice(1),n=_e.length;while(n--)if((e=_e[n]+t)in ze)return e}(e)||e)}var Ve=/^(none|table(?!-c[ea]).+)/,Ge=/^--/,Ye={position:"absolute",visibility:"hidden",display:"block"},Qe={letterSpacing:"0",fontWeight:"400"};function Je(e,t,n){var r=te.exec(t);return r?Math.max(0,r[2]-(n||0))+(r[3]||"px"):t}function Ke(e,t,n,r,i,o){var a="width"===t?1:0,s=0,u=0;if(n===(r?"border":"content"))return 0;for(;a<4;a+=2)"margin"===n&&(u+=S.css(e,n+ne[a],!0,i)),r?("content"===n&&(u-=S.css(e,"padding"+ne[a],!0,i)),"margin"!==n&&(u-=S.css(e,"border"+ne[a]+"Width",!0,i))):(u+=S.css(e,"padding"+ne[a],!0,i),"padding"!==n?u+=S.css(e,"border"+ne[a]+"Width",!0,i):s+=S.css(e,"border"+ne[a]+"Width",!0,i));return!r&&0<=o&&(u+=Math.max(0,Math.ceil(e["offset"+t[0].toUpperCase()+t.slice(1)]-o-u-s-.5))||0),u}function Ze(e,t,n){var r=Ie(e),i=(!y.boxSizingReliable()||n)&&"border-box"===S.css(e,"boxSizing",!1,r),o=i,a=Be(e,t,r),s="offset"+t[0].toUpperCase()+t.slice(1);if(Me.test(a)){if(!n)return a;a="auto"}return(!y.boxSizingReliable()&&i||!y.reliableTrDimensions()&&A(e,"tr")||"auto"===a||!parseFloat(a)&&"inline"===S.css(e,"display",!1,r))&&e.getClientRects().length&&(i="border-box"===S.css(e,"boxSizing",!1,r),(o=s in e)&&(a=e[s])),(a=parseFloat(a)||0)+Ke(e,t,n||(i?"border":"content"),o,r,a)+"px"}function et(e,t,n,r,i){return new et.prototype.init(e,t,n,r,i)}S.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Be(e,"opacity");return""===n?"1":n}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,gridArea:!0,gridColumn:!0,gridColumnEnd:!0,gridColumnStart:!0,gridRow:!0,gridRowEnd:!0,gridRowStart:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{},style:function(e,t,n,r){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var i,o,a,s=X(t),u=Ge.test(t),l=e.style;if(u||(t=Xe(s)),a=S.cssHooks[t]||S.cssHooks[s],void 0===n)return a&&"get"in a&&void 0!==(i=a.get(e,!1,r))?i:l[t];"string"===(o=typeof n)&&(i=te.exec(n))&&i[1]&&(n=se(e,t,i),o="number"),null!=n&&n==n&&("number"!==o||u||(n+=i&&i[3]||(S.cssNumber[s]?"":"px")),y.clearCloneStyle||""!==n||0!==t.indexOf("background")||(l[t]="inherit"),a&&"set"in a&&void 0===(n=a.set(e,n,r))||(u?l.setProperty(t,n):l[t]=n))}},css:function(e,t,n,r){var i,o,a,s=X(t);return Ge.test(t)||(t=Xe(s)),(a=S.cssHooks[t]||S.cssHooks[s])&&"get"in a&&(i=a.get(e,!0,n)),void 0===i&&(i=Be(e,t,r)),"normal"===i&&t in Qe&&(i=Qe[t]),""===n||n?(o=parseFloat(i),!0===n||isFinite(o)?o||0:i):i}}),S.each(["height","width"],function(e,u){S.cssHooks[u]={get:function(e,t,n){if(t)return!Ve.test(S.css(e,"display"))||e.getClientRects().length&&e.getBoundingClientRect().width?Ze(e,u,n):We(e,Ye,function(){return Ze(e,u,n)})},set:function(e,t,n){var r,i=Ie(e),o=!y.scrollboxSize()&&"absolute"===i.position,a=(o||n)&&"border-box"===S.css(e,"boxSizing",!1,i),s=n?Ke(e,u,n,a,i):0;return a&&o&&(s-=Math.ceil(e["offset"+u[0].toUpperCase()+u.slice(1)]-parseFloat(i[u])-Ke(e,u,"border",!1,i)-.5)),s&&(r=te.exec(t))&&"px"!==(r[3]||"px")&&(e.style[u]=t,t=S.css(e,u)),Je(0,t,s)}}}),S.cssHooks.marginLeft=$e(y.reliableMarginLeft,function(e,t){if(t)return(parseFloat(Be(e,"marginLeft"))||e.getBoundingClientRect().left-We(e,{marginLeft:0},function(){return e.getBoundingClientRect().left}))+"px"}),S.each({margin:"",padding:"",border:"Width"},function(i,o){S.cssHooks[i+o]={expand:function(e){for(var t=0,n={},r="string"==typeof e?e.split(" "):[e];t<4;t++)n[i+ne[t]+o]=r[t]||r[t-2]||r[0];return n}},"margin"!==i&&(S.cssHooks[i+o].set=Je)}),S.fn.extend({css:function(e,t){return $(this,function(e,t,n){var r,i,o={},a=0;if(Array.isArray(t)){for(r=Ie(e),i=t.length;a<i;a++)o[t[a]]=S.css(e,t[a],!1,r);return o}return void 0!==n?S.style(e,t,n):S.css(e,t)},e,t,1<arguments.length)}}),((S.Tween=et).prototype={constructor:et,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||S.easing._default,this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(S.cssNumber[n]?"":"px")},cur:function(){var e=et.propHooks[this.prop];return e&&e.get?e.get(this):et.propHooks._default.get(this)},run:function(e){var t,n=et.propHooks[this.prop];return this.options.duration?this.pos=t=S.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):this.pos=t=e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):et.propHooks._default.set(this),this}}).init.prototype=et.prototype,(et.propHooks={_default:{get:function(e){var t;return 1!==e.elem.nodeType||null!=e.elem[e.prop]&&null==e.elem.style[e.prop]?e.elem[e.prop]:(t=S.css(e.elem,e.prop,""))&&"auto"!==t?t:0},set:function(e){S.fx.step[e.prop]?S.fx.step[e.prop](e):1!==e.elem.nodeType||!S.cssHooks[e.prop]&&null==e.elem.style[Xe(e.prop)]?e.elem[e.prop]=e.now:S.style(e.elem,e.prop,e.now+e.unit)}}}).scrollTop=et.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},S.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2},_default:"swing"},S.fx=et.prototype.init,S.fx.step={};var tt,nt,rt,it,ot=/^(?:toggle|show|hide)$/,at=/queueHooks$/;function st(){nt&&(!1===E.hidden&&C.requestAnimationFrame?C.requestAnimationFrame(st):C.setTimeout(st,S.fx.interval),S.fx.tick())}function ut(){return C.setTimeout(function(){tt=void 0}),tt=Date.now()}function lt(e,t){var n,r=0,i={height:e};for(t=t?1:0;r<4;r+=2-t)i["margin"+(n=ne[r])]=i["padding"+n]=e;return t&&(i.opacity=i.width=e),i}function ct(e,t,n){for(var r,i=(ft.tweeners[t]||[]).concat(ft.tweeners["*"]),o=0,a=i.length;o<a;o++)if(r=i[o].call(n,t,e))return r}function ft(o,e,t){var n,a,r=0,i=ft.prefilters.length,s=S.Deferred().always(function(){delete u.elem}),u=function(){if(a)return!1;for(var e=tt||ut(),t=Math.max(0,l.startTime+l.duration-e),n=1-(t/l.duration||0),r=0,i=l.tweens.length;r<i;r++)l.tweens[r].run(n);return s.notifyWith(o,[l,n,t]),n<1&&i?t:(i||s.notifyWith(o,[l,1,0]),s.resolveWith(o,[l]),!1)},l=s.promise({elem:o,props:S.extend({},e),opts:S.extend(!0,{specialEasing:{},easing:S.easing._default},t),originalProperties:e,originalOptions:t,startTime:tt||ut(),duration:t.duration,tweens:[],createTween:function(e,t){var n=S.Tween(o,l.opts,e,t,l.opts.specialEasing[e]||l.opts.easing);return l.tweens.push(n),n},stop:function(e){var t=0,n=e?l.tweens.length:0;if(a)return this;for(a=!0;t<n;t++)l.tweens[t].run(1);return e?(s.notifyWith(o,[l,1,0]),s.resolveWith(o,[l,e])):s.rejectWith(o,[l,e]),this}}),c=l.props;for(!function(e,t){var n,r,i,o,a;for(n in e)if(i=t[r=X(n)],o=e[n],Array.isArray(o)&&(i=o[1],o=e[n]=o[0]),n!==r&&(e[r]=o,delete e[n]),(a=S.cssHooks[r])&&"expand"in a)for(n in o=a.expand(o),delete e[r],o)n in e||(e[n]=o[n],t[n]=i);else t[r]=i}(c,l.opts.specialEasing);r<i;r++)if(n=ft.prefilters[r].call(l,o,c,l.opts))return m(n.stop)&&(S._queueHooks(l.elem,l.opts.queue).stop=n.stop.bind(n)),n;return S.map(c,ct,l),m(l.opts.start)&&l.opts.start.call(o,l),l.progress(l.opts.progress).done(l.opts.done,l.opts.complete).fail(l.opts.fail).always(l.opts.always),S.fx.timer(S.extend(u,{elem:o,anim:l,queue:l.opts.queue})),l}S.Animation=S.extend(ft,{tweeners:{"*":[function(e,t){var n=this.createTween(e,t);return se(n.elem,e,te.exec(t),n),n}]},tweener:function(e,t){m(e)?(t=e,e=["*"]):e=e.match(P);for(var n,r=0,i=e.length;r<i;r++)n=e[r],ft.tweeners[n]=ft.tweeners[n]||[],ft.tweeners[n].unshift(t)},prefilters:[function(e,t,n){var r,i,o,a,s,u,l,c,f="width"in t||"height"in t,p=this,d={},h=e.style,g=e.nodeType&&ae(e),v=Y.get(e,"fxshow");for(r in n.queue||(null==(a=S._queueHooks(e,"fx")).unqueued&&(a.unqueued=0,s=a.empty.fire,a.empty.fire=function(){a.unqueued||s()}),a.unqueued++,p.always(function(){p.always(function(){a.unqueued--,S.queue(e,"fx").length||a.empty.fire()})})),t)if(i=t[r],ot.test(i)){if(delete t[r],o=o||"toggle"===i,i===(g?"hide":"show")){if("show"!==i||!v||void 0===v[r])continue;g=!0}d[r]=v&&v[r]||S.style(e,r)}if((u=!S.isEmptyObject(t))||!S.isEmptyObject(d))for(r in f&&1===e.nodeType&&(n.overflow=[h.overflow,h.overflowX,h.overflowY],null==(l=v&&v.display)&&(l=Y.get(e,"display")),"none"===(c=S.css(e,"display"))&&(l?c=l:(le([e],!0),l=e.style.display||l,c=S.css(e,"display"),le([e]))),("inline"===c||"inline-block"===c&&null!=l)&&"none"===S.css(e,"float")&&(u||(p.done(function(){h.display=l}),null==l&&(c=h.display,l="none"===c?"":c)),h.display="inline-block")),n.overflow&&(h.overflow="hidden",p.always(function(){h.overflow=n.overflow[0],h.overflowX=n.overflow[1],h.overflowY=n.overflow[2]})),u=!1,d)u||(v?"hidden"in v&&(g=v.hidden):v=Y.access(e,"fxshow",{display:l}),o&&(v.hidden=!g),g&&le([e],!0),p.done(function(){for(r in g||le([e]),Y.remove(e,"fxshow"),d)S.style(e,r,d[r])})),u=ct(g?v[r]:0,r,p),r in v||(v[r]=u.start,g&&(u.end=u.start,u.start=0))}],prefilter:function(e,t){t?ft.prefilters.unshift(e):ft.prefilters.push(e)}}),S.speed=function(e,t,n){var r=e&&"object"==typeof e?S.extend({},e):{complete:n||!n&&t||m(e)&&e,duration:e,easing:n&&t||t&&!m(t)&&t};return S.fx.off?r.duration=0:"number"!=typeof r.duration&&(r.duration in S.fx.speeds?r.duration=S.fx.speeds[r.duration]:r.duration=S.fx.speeds._default),null!=r.queue&&!0!==r.queue||(r.queue="fx"),r.old=r.complete,r.complete=function(){m(r.old)&&r.old.call(this),r.queue&&S.dequeue(this,r.queue)},r},S.fn.extend({fadeTo:function(e,t,n,r){return this.filter(ae).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(t,e,n,r){var i=S.isEmptyObject(t),o=S.speed(e,n,r),a=function(){var e=ft(this,S.extend({},t),o);(i||Y.get(this,"finish"))&&e.stop(!0)};return a.finish=a,i||!1===o.queue?this.each(a):this.queue(o.queue,a)},stop:function(i,e,o){var a=function(e){var t=e.stop;delete e.stop,t(o)};return"string"!=typeof i&&(o=e,e=i,i=void 0),e&&this.queue(i||"fx",[]),this.each(function(){var e=!0,t=null!=i&&i+"queueHooks",n=S.timers,r=Y.get(this);if(t)r[t]&&r[t].stop&&a(r[t]);else for(t in r)r[t]&&r[t].stop&&at.test(t)&&a(r[t]);for(t=n.length;t--;)n[t].elem!==this||null!=i&&n[t].queue!==i||(n[t].anim.stop(o),e=!1,n.splice(t,1));!e&&o||S.dequeue(this,i)})},finish:function(a){return!1!==a&&(a=a||"fx"),this.each(function(){var e,t=Y.get(this),n=t[a+"queue"],r=t[a+"queueHooks"],i=S.timers,o=n?n.length:0;for(t.finish=!0,S.queue(this,a,[]),r&&r.stop&&r.stop.call(this,!0),e=i.length;e--;)i[e].elem===this&&i[e].queue===a&&(i[e].anim.stop(!0),i.splice(e,1));for(e=0;e<o;e++)n[e]&&n[e].finish&&n[e].finish.call(this);delete t.finish})}}),S.each(["toggle","show","hide"],function(e,r){var i=S.fn[r];S.fn[r]=function(e,t,n){return null==e||"boolean"==typeof e?i.apply(this,arguments):this.animate(lt(r,!0),e,t,n)}}),S.each({slideDown:lt("show"),slideUp:lt("hide"),slideToggle:lt("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,r){S.fn[e]=function(e,t,n){return this.animate(r,e,t,n)}}),S.timers=[],S.fx.tick=function(){var e,t=0,n=S.timers;for(tt=Date.now();t<n.length;t++)(e=n[t])()||n[t]!==e||n.splice(t--,1);n.length||S.fx.stop(),tt=void 0},S.fx.timer=function(e){S.timers.push(e),S.fx.start()},S.fx.interval=13,S.fx.start=function(){nt||(nt=!0,st())},S.fx.stop=function(){nt=null},S.fx.speeds={slow:600,fast:200,_default:400},S.fn.delay=function(r,e){return r=S.fx&&S.fx.speeds[r]||r,e=e||"fx",this.queue(e,function(e,t){var n=C.setTimeout(e,r);t.stop=function(){C.clearTimeout(n)}})},rt=E.createElement("input"),it=E.createElement("select").appendChild(E.createElement("option")),rt.type="checkbox",y.checkOn=""!==rt.value,y.optSelected=it.selected,(rt=E.createElement("input")).value="t",rt.type="radio",y.radioValue="t"===rt.value;var pt,dt=S.expr.attrHandle;S.fn.extend({attr:function(e,t){return $(this,S.attr,e,t,1<arguments.length)},removeAttr:function(e){return this.each(function(){S.removeAttr(this,e)})}}),S.extend({attr:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return"undefined"==typeof e.getAttribute?S.prop(e,t,n):(1===o&&S.isXMLDoc(e)||(i=S.attrHooks[t.toLowerCase()]||(S.expr.match.bool.test(t)?pt:void 0)),void 0!==n?null===n?void S.removeAttr(e,t):i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:(e.setAttribute(t,n+""),n):i&&"get"in i&&null!==(r=i.get(e,t))?r:null==(r=S.find.attr(e,t))?void 0:r)},attrHooks:{type:{set:function(e,t){if(!y.radioValue&&"radio"===t&&A(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},removeAttr:function(e,t){var n,r=0,i=t&&t.match(P);if(i&&1===e.nodeType)while(n=i[r++])e.removeAttribute(n)}}),pt={set:function(e,t,n){return!1===t?S.removeAttr(e,n):e.setAttribute(n,n),n}},S.each(S.expr.match.bool.source.match(/\w+/g),function(e,t){var a=dt[t]||S.find.attr;dt[t]=function(e,t,n){var r,i,o=t.toLowerCase();return n||(i=dt[o],dt[o]=r,r=null!=a(e,t,n)?o:null,dt[o]=i),r}});var ht=/^(?:input|select|textarea|button)$/i,gt=/^(?:a|area)$/i;function vt(e){return(e.match(P)||[]).join(" ")}function yt(e){return e.getAttribute&&e.getAttribute("class")||""}function mt(e){return Array.isArray(e)?e:"string"==typeof e&&e.match(P)||[]}S.fn.extend({prop:function(e,t){return $(this,S.prop,e,t,1<arguments.length)},removeProp:function(e){return this.each(function(){delete this[S.propFix[e]||e]})}}),S.extend({prop:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return 1===o&&S.isXMLDoc(e)||(t=S.propFix[t]||t,i=S.propHooks[t]),void 0!==n?i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:e[t]=n:i&&"get"in i&&null!==(r=i.get(e,t))?r:e[t]},propHooks:{tabIndex:{get:function(e){var t=S.find.attr(e,"tabindex");return t?parseInt(t,10):ht.test(e.nodeName)||gt.test(e.nodeName)&&e.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),y.optSelected||(S.propHooks.selected={get:function(e){var t=e.parentNode;return t&&t.parentNode&&t.parentNode.selectedIndex,null},set:function(e){var t=e.parentNode;t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex)}}),S.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){S.propFix[this.toLowerCase()]=this}),S.fn.extend({addClass:function(t){var e,n,r,i,o,a,s,u=0;if(m(t))return this.each(function(e){S(this).addClass(t.call(this,e,yt(this)))});if((e=mt(t)).length)while(n=this[u++])if(i=yt(n),r=1===n.nodeType&&" "+vt(i)+" "){a=0;while(o=e[a++])r.indexOf(" "+o+" ")<0&&(r+=o+" ");i!==(s=vt(r))&&n.setAttribute("class",s)}return this},removeClass:function(t){var e,n,r,i,o,a,s,u=0;if(m(t))return this.each(function(e){S(this).removeClass(t.call(this,e,yt(this)))});if(!arguments.length)return this.attr("class","");if((e=mt(t)).length)while(n=this[u++])if(i=yt(n),r=1===n.nodeType&&" "+vt(i)+" "){a=0;while(o=e[a++])while(-1<r.indexOf(" "+o+" "))r=r.replace(" "+o+" "," ");i!==(s=vt(r))&&n.setAttribute("class",s)}return this},toggleClass:function(i,t){var o=typeof i,a="string"===o||Array.isArray(i);return"boolean"==typeof t&&a?t?this.addClass(i):this.removeClass(i):m(i)?this.each(function(e){S(this).toggleClass(i.call(this,e,yt(this),t),t)}):this.each(function(){var e,t,n,r;if(a){t=0,n=S(this),r=mt(i);while(e=r[t++])n.hasClass(e)?n.removeClass(e):n.addClass(e)}else void 0!==i&&"boolean"!==o||((e=yt(this))&&Y.set(this,"__className__",e),this.setAttribute&&this.setAttribute("class",e||!1===i?"":Y.get(this,"__className__")||""))})},hasClass:function(e){var t,n,r=0;t=" "+e+" ";while(n=this[r++])if(1===n.nodeType&&-1<(" "+vt(yt(n))+" ").indexOf(t))return!0;return!1}});var xt=/\r/g;S.fn.extend({val:function(n){var r,e,i,t=this[0];return arguments.length?(i=m(n),this.each(function(e){var t;1===this.nodeType&&(null==(t=i?n.call(this,e,S(this).val()):n)?t="":"number"==typeof t?t+="":Array.isArray(t)&&(t=S.map(t,function(e){return null==e?"":e+""})),(r=S.valHooks[this.type]||S.valHooks[this.nodeName.toLowerCase()])&&"set"in r&&void 0!==r.set(this,t,"value")||(this.value=t))})):t?(r=S.valHooks[t.type]||S.valHooks[t.nodeName.toLowerCase()])&&"get"in r&&void 0!==(e=r.get(t,"value"))?e:"string"==typeof(e=t.value)?e.replace(xt,""):null==e?"":e:void 0}}),S.extend({valHooks:{option:{get:function(e){var t=S.find.attr(e,"value");return null!=t?t:vt(S.text(e))}},select:{get:function(e){var t,n,r,i=e.options,o=e.selectedIndex,a="select-one"===e.type,s=a?null:[],u=a?o+1:i.length;for(r=o<0?u:a?o:0;r<u;r++)if(((n=i[r]).selected||r===o)&&!n.disabled&&(!n.parentNode.disabled||!A(n.parentNode,"optgroup"))){if(t=S(n).val(),a)return t;s.push(t)}return s},set:function(e,t){var n,r,i=e.options,o=S.makeArray(t),a=i.length;while(a--)((r=i[a]).selected=-1<S.inArray(S.valHooks.option.get(r),o))&&(n=!0);return n||(e.selectedIndex=-1),o}}}}),S.each(["radio","checkbox"],function(){S.valHooks[this]={set:function(e,t){if(Array.isArray(t))return e.checked=-1<S.inArray(S(e).val(),t)}},y.checkOn||(S.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})}),y.focusin="onfocusin"in C;var bt=/^(?:focusinfocus|focusoutblur)$/,wt=function(e){e.stopPropagation()};S.extend(S.event,{trigger:function(e,t,n,r){var i,o,a,s,u,l,c,f,p=[n||E],d=v.call(e,"type")?e.type:e,h=v.call(e,"namespace")?e.namespace.split("."):[];if(o=f=a=n=n||E,3!==n.nodeType&&8!==n.nodeType&&!bt.test(d+S.event.triggered)&&(-1<d.indexOf(".")&&(d=(h=d.split(".")).shift(),h.sort()),u=d.indexOf(":")<0&&"on"+d,(e=e[S.expando]?e:new S.Event(d,"object"==typeof e&&e)).isTrigger=r?2:3,e.namespace=h.join("."),e.rnamespace=e.namespace?new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,e.result=void 0,e.target||(e.target=n),t=null==t?[e]:S.makeArray(t,[e]),c=S.event.special[d]||{},r||!c.trigger||!1!==c.trigger.apply(n,t))){if(!r&&!c.noBubble&&!x(n)){for(s=c.delegateType||d,bt.test(s+d)||(o=o.parentNode);o;o=o.parentNode)p.push(o),a=o;a===(n.ownerDocument||E)&&p.push(a.defaultView||a.parentWindow||C)}i=0;while((o=p[i++])&&!e.isPropagationStopped())f=o,e.type=1<i?s:c.bindType||d,(l=(Y.get(o,"events")||Object.create(null))[e.type]&&Y.get(o,"handle"))&&l.apply(o,t),(l=u&&o[u])&&l.apply&&V(o)&&(e.result=l.apply(o,t),!1===e.result&&e.preventDefault());return e.type=d,r||e.isDefaultPrevented()||c._default&&!1!==c._default.apply(p.pop(),t)||!V(n)||u&&m(n[d])&&!x(n)&&((a=n[u])&&(n[u]=null),S.event.triggered=d,e.isPropagationStopped()&&f.addEventListener(d,wt),n[d](),e.isPropagationStopped()&&f.removeEventListener(d,wt),S.event.triggered=void 0,a&&(n[u]=a)),e.result}},simulate:function(e,t,n){var r=S.extend(new S.Event,n,{type:e,isSimulated:!0});S.event.trigger(r,null,t)}}),S.fn.extend({trigger:function(e,t){return this.each(function(){S.event.trigger(e,t,this)})},triggerHandler:function(e,t){var n=this[0];if(n)return S.event.trigger(e,t,n,!0)}}),y.focusin||S.each({focus:"focusin",blur:"focusout"},function(n,r){var i=function(e){S.event.simulate(r,e.target,S.event.fix(e))};S.event.special[r]={setup:function(){var e=this.ownerDocument||this.document||this,t=Y.access(e,r);t||e.addEventListener(n,i,!0),Y.access(e,r,(t||0)+1)},teardown:function(){var e=this.ownerDocument||this.document||this,t=Y.access(e,r)-1;t?Y.access(e,r,t):(e.removeEventListener(n,i,!0),Y.remove(e,r))}}});var Tt=C.location,Ct={guid:Date.now()},Et=/\?/;S.parseXML=function(e){var t;if(!e||"string"!=typeof e)return null;try{t=(new C.DOMParser).parseFromString(e,"text/xml")}catch(e){t=void 0}return t&&!t.getElementsByTagName("parsererror").length||S.error("Invalid XML: "+e),t};var St=/\[\]$/,kt=/\r?\n/g,At=/^(?:submit|button|image|reset|file)$/i,Nt=/^(?:input|select|textarea|keygen)/i;function Dt(n,e,r,i){var t;if(Array.isArray(e))S.each(e,function(e,t){r||St.test(n)?i(n,t):Dt(n+"["+("object"==typeof t&&null!=t?e:"")+"]",t,r,i)});else if(r||"object"!==w(e))i(n,e);else for(t in e)Dt(n+"["+t+"]",e[t],r,i)}S.param=function(e,t){var n,r=[],i=function(e,t){var n=m(t)?t():t;r[r.length]=encodeURIComponent(e)+"="+encodeURIComponent(null==n?"":n)};if(null==e)return"";if(Array.isArray(e)||e.jquery&&!S.isPlainObject(e))S.each(e,function(){i(this.name,this.value)});else for(n in e)Dt(n,e[n],t,i);return r.join("&")},S.fn.extend({serialize:function(){return S.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=S.prop(this,"elements");return e?S.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!S(this).is(":disabled")&&Nt.test(this.nodeName)&&!At.test(e)&&(this.checked||!pe.test(e))}).map(function(e,t){var n=S(this).val();return null==n?null:Array.isArray(n)?S.map(n,function(e){return{name:t.name,value:e.replace(kt,"\r\n")}}):{name:t.name,value:n.replace(kt,"\r\n")}}).get()}});var jt=/%20/g,qt=/#.*$/,Lt=/([?&])_=[^&]*/,Ht=/^(.*?):[ \t]*([^\r\n]*)$/gm,Ot=/^(?:GET|HEAD)$/,Pt=/^\/\//,Rt={},Mt={},It="*/".concat("*"),Wt=E.createElement("a");function Ft(o){return function(e,t){"string"!=typeof e&&(t=e,e="*");var n,r=0,i=e.toLowerCase().match(P)||[];if(m(t))while(n=i[r++])"+"===n[0]?(n=n.slice(1)||"*",(o[n]=o[n]||[]).unshift(t)):(o[n]=o[n]||[]).push(t)}}function Bt(t,i,o,a){var s={},u=t===Mt;function l(e){var r;return s[e]=!0,S.each(t[e]||[],function(e,t){var n=t(i,o,a);return"string"!=typeof n||u||s[n]?u?!(r=n):void 0:(i.dataTypes.unshift(n),l(n),!1)}),r}return l(i.dataTypes[0])||!s["*"]&&l("*")}function $t(e,t){var n,r,i=S.ajaxSettings.flatOptions||{};for(n in t)void 0!==t[n]&&((i[n]?e:r||(r={}))[n]=t[n]);return r&&S.extend(!0,e,r),e}Wt.href=Tt.href,S.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:Tt.href,type:"GET",isLocal:/^(?:about|app|app-storage|.+-extension|file|res|widget):$/.test(Tt.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":It,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":JSON.parse,"text xml":S.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?$t($t(e,S.ajaxSettings),t):$t(S.ajaxSettings,e)},ajaxPrefilter:Ft(Rt),ajaxTransport:Ft(Mt),ajax:function(e,t){"object"==typeof e&&(t=e,e=void 0),t=t||{};var c,f,p,n,d,r,h,g,i,o,v=S.ajaxSetup({},t),y=v.context||v,m=v.context&&(y.nodeType||y.jquery)?S(y):S.event,x=S.Deferred(),b=S.Callbacks("once memory"),w=v.statusCode||{},a={},s={},u="canceled",T={readyState:0,getResponseHeader:function(e){var t;if(h){if(!n){n={};while(t=Ht.exec(p))n[t[1].toLowerCase()+" "]=(n[t[1].toLowerCase()+" "]||[]).concat(t[2])}t=n[e.toLowerCase()+" "]}return null==t?null:t.join(", ")},getAllResponseHeaders:function(){return h?p:null},setRequestHeader:function(e,t){return null==h&&(e=s[e.toLowerCase()]=s[e.toLowerCase()]||e,a[e]=t),this},overrideMimeType:function(e){return null==h&&(v.mimeType=e),this},statusCode:function(e){var t;if(e)if(h)T.always(e[T.status]);else for(t in e)w[t]=[w[t],e[t]];return this},abort:function(e){var t=e||u;return c&&c.abort(t),l(0,t),this}};if(x.promise(T),v.url=((e||v.url||Tt.href)+"").replace(Pt,Tt.protocol+"//"),v.type=t.method||t.type||v.method||v.type,v.dataTypes=(v.dataType||"*").toLowerCase().match(P)||[""],null==v.crossDomain){r=E.createElement("a");try{r.href=v.url,r.href=r.href,v.crossDomain=Wt.protocol+"//"+Wt.host!=r.protocol+"//"+r.host}catch(e){v.crossDomain=!0}}if(v.data&&v.processData&&"string"!=typeof v.data&&(v.data=S.param(v.data,v.traditional)),Bt(Rt,v,t,T),h)return T;for(i in(g=S.event&&v.global)&&0==S.active++&&S.event.trigger("ajaxStart"),v.type=v.type.toUpperCase(),v.hasContent=!Ot.test(v.type),f=v.url.replace(qt,""),v.hasContent?v.data&&v.processData&&0===(v.contentType||"").indexOf("application/x-www-form-urlencoded")&&(v.data=v.data.replace(jt,"+")):(o=v.url.slice(f.length),v.data&&(v.processData||"string"==typeof v.data)&&(f+=(Et.test(f)?"&":"?")+v.data,delete v.data),!1===v.cache&&(f=f.replace(Lt,"$1"),o=(Et.test(f)?"&":"?")+"_="+Ct.guid+++o),v.url=f+o),v.ifModified&&(S.lastModified[f]&&T.setRequestHeader("If-Modified-Since",S.lastModified[f]),S.etag[f]&&T.setRequestHeader("If-None-Match",S.etag[f])),(v.data&&v.hasContent&&!1!==v.contentType||t.contentType)&&T.setRequestHeader("Content-Type",v.contentType),T.setRequestHeader("Accept",v.dataTypes[0]&&v.accepts[v.dataTypes[0]]?v.accepts[v.dataTypes[0]]+("*"!==v.dataTypes[0]?", "+It+"; q=0.01":""):v.accepts["*"]),v.headers)T.setRequestHeader(i,v.headers[i]);if(v.beforeSend&&(!1===v.beforeSend.call(y,T,v)||h))return T.abort();if(u="abort",b.add(v.complete),T.done(v.success),T.fail(v.error),c=Bt(Mt,v,t,T)){if(T.readyState=1,g&&m.trigger("ajaxSend",[T,v]),h)return T;v.async&&0<v.timeout&&(d=C.setTimeout(function(){T.abort("timeout")},v.timeout));try{h=!1,c.send(a,l)}catch(e){if(h)throw e;l(-1,e)}}else l(-1,"No Transport");function l(e,t,n,r){var i,o,a,s,u,l=t;h||(h=!0,d&&C.clearTimeout(d),c=void 0,p=r||"",T.readyState=0<e?4:0,i=200<=e&&e<300||304===e,n&&(s=function(e,t,n){var r,i,o,a,s=e.contents,u=e.dataTypes;while("*"===u[0])u.shift(),void 0===r&&(r=e.mimeType||t.getResponseHeader("Content-Type"));if(r)for(i in s)if(s[i]&&s[i].test(r)){u.unshift(i);break}if(u[0]in n)o=u[0];else{for(i in n){if(!u[0]||e.converters[i+" "+u[0]]){o=i;break}a||(a=i)}o=o||a}if(o)return o!==u[0]&&u.unshift(o),n[o]}(v,T,n)),!i&&-1<S.inArray("script",v.dataTypes)&&(v.converters["text script"]=function(){}),s=function(e,t,n,r){var i,o,a,s,u,l={},c=e.dataTypes.slice();if(c[1])for(a in e.converters)l[a.toLowerCase()]=e.converters[a];o=c.shift();while(o)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!u&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u=o,o=c.shift())if("*"===o)o=u;else if("*"!==u&&u!==o){if(!(a=l[u+" "+o]||l["* "+o]))for(i in l)if((s=i.split(" "))[1]===o&&(a=l[u+" "+s[0]]||l["* "+s[0]])){!0===a?a=l[i]:!0!==l[i]&&(o=s[0],c.unshift(s[1]));break}if(!0!==a)if(a&&e["throws"])t=a(t);else try{t=a(t)}catch(e){return{state:"parsererror",error:a?e:"No conversion from "+u+" to "+o}}}return{state:"success",data:t}}(v,s,T,i),i?(v.ifModified&&((u=T.getResponseHeader("Last-Modified"))&&(S.lastModified[f]=u),(u=T.getResponseHeader("etag"))&&(S.etag[f]=u)),204===e||"HEAD"===v.type?l="nocontent":304===e?l="notmodified":(l=s.state,o=s.data,i=!(a=s.error))):(a=l,!e&&l||(l="error",e<0&&(e=0))),T.status=e,T.statusText=(t||l)+"",i?x.resolveWith(y,[o,l,T]):x.rejectWith(y,[T,l,a]),T.statusCode(w),w=void 0,g&&m.trigger(i?"ajaxSuccess":"ajaxError",[T,v,i?o:a]),b.fireWith(y,[T,l]),g&&(m.trigger("ajaxComplete",[T,v]),--S.active||S.event.trigger("ajaxStop")))}return T},getJSON:function(e,t,n){return S.get(e,t,n,"json")},getScript:function(e,t){return S.get(e,void 0,t,"script")}}),S.each(["get","post"],function(e,i){S[i]=function(e,t,n,r){return m(t)&&(r=r||n,n=t,t=void 0),S.ajax(S.extend({url:e,type:i,dataType:r,data:t,success:n},S.isPlainObject(e)&&e))}}),S.ajaxPrefilter(function(e){var t;for(t in e.headers)"content-type"===t.toLowerCase()&&(e.contentType=e.headers[t]||"")}),S._evalUrl=function(e,t,n){return S.ajax({url:e,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,converters:{"text script":function(){}},dataFilter:function(e){S.globalEval(e,t,n)}})},S.fn.extend({wrapAll:function(e){var t;return this[0]&&(m(e)&&(e=e.call(this[0])),t=S(e,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstElementChild)e=e.firstElementChild;return e}).append(this)),this},wrapInner:function(n){return m(n)?this.each(function(e){S(this).wrapInner(n.call(this,e))}):this.each(function(){var e=S(this),t=e.contents();t.length?t.wrapAll(n):e.append(n)})},wrap:function(t){var n=m(t);return this.each(function(e){S(this).wrapAll(n?t.call(this,e):t)})},unwrap:function(e){return this.parent(e).not("body").each(function(){S(this).replaceWith(this.childNodes)}),this}}),S.expr.pseudos.hidden=function(e){return!S.expr.pseudos.visible(e)},S.expr.pseudos.visible=function(e){return!!(e.offsetWidth||e.offsetHeight||e.getClientRects().length)},S.ajaxSettings.xhr=function(){try{return new C.XMLHttpRequest}catch(e){}};var _t={0:200,1223:204},zt=S.ajaxSettings.xhr();y.cors=!!zt&&"withCredentials"in zt,y.ajax=zt=!!zt,S.ajaxTransport(function(i){var o,a;if(y.cors||zt&&!i.crossDomain)return{send:function(e,t){var n,r=i.xhr();if(r.open(i.type,i.url,i.async,i.username,i.password),i.xhrFields)for(n in i.xhrFields)r[n]=i.xhrFields[n];for(n in i.mimeType&&r.overrideMimeType&&r.overrideMimeType(i.mimeType),i.crossDomain||e["X-Requested-With"]||(e["X-Requested-With"]="XMLHttpRequest"),e)r.setRequestHeader(n,e[n]);o=function(e){return function(){o&&(o=a=r.onload=r.onerror=r.onabort=r.ontimeout=r.onreadystatechange=null,"abort"===e?r.abort():"error"===e?"number"!=typeof r.status?t(0,"error"):t(r.status,r.statusText):t(_t[r.status]||r.status,r.statusText,"text"!==(r.responseType||"text")||"string"!=typeof r.responseText?{binary:r.response}:{text:r.responseText},r.getAllResponseHeaders()))}},r.onload=o(),a=r.onerror=r.ontimeout=o("error"),void 0!==r.onabort?r.onabort=a:r.onreadystatechange=function(){4===r.readyState&&C.setTimeout(function(){o&&a()})},o=o("abort");try{r.send(i.hasContent&&i.data||null)}catch(e){if(o)throw e}},abort:function(){o&&o()}}}),S.ajaxPrefilter(function(e){e.crossDomain&&(e.contents.script=!1)}),S.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(e){return S.globalEval(e),e}}}),S.ajaxPrefilter("script",function(e){void 0===e.cache&&(e.cache=!1),e.crossDomain&&(e.type="GET")}),S.ajaxTransport("script",function(n){var r,i;if(n.crossDomain||n.scriptAttrs)return{send:function(e,t){r=S("<script>").attr(n.scriptAttrs||{}).prop({charset:n.scriptCharset,src:n.url}).on("load error",i=function(e){r.remove(),i=null,e&&t("error"===e.type?404:200,e.type)}),E.head.appendChild(r[0])},abort:function(){i&&i()}}});var Ut,Xt=[],Vt=/(=)\?(?=&|$)|\?\?/;S.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Xt.pop()||S.expando+"_"+Ct.guid++;return this[e]=!0,e}}),S.ajaxPrefilter("json jsonp",function(e,t,n){var r,i,o,a=!1!==e.jsonp&&(Vt.test(e.url)?"url":"string"==typeof e.data&&0===(e.contentType||"").indexOf("application/x-www-form-urlencoded")&&Vt.test(e.data)&&"data");if(a||"jsonp"===e.dataTypes[0])return r=e.jsonpCallback=m(e.jsonpCallback)?e.jsonpCallback():e.jsonpCallback,a?e[a]=e[a].replace(Vt,"$1"+r):!1!==e.jsonp&&(e.url+=(Et.test(e.url)?"&":"?")+e.jsonp+"="+r),e.converters["script json"]=function(){return o||S.error(r+" was not called"),o[0]},e.dataTypes[0]="json",i=C[r],C[r]=function(){o=arguments},n.always(function(){void 0===i?S(C).removeProp(r):C[r]=i,e[r]&&(e.jsonpCallback=t.jsonpCallback,Xt.push(r)),o&&m(i)&&i(o[0]),o=i=void 0}),"script"}),y.createHTMLDocument=((Ut=E.implementation.createHTMLDocument("").body).innerHTML="<form></form><form></form>",2===Ut.childNodes.length),S.parseHTML=function(e,t,n){return"string"!=typeof e?[]:("boolean"==typeof t&&(n=t,t=!1),t||(y.createHTMLDocument?((r=(t=E.implementation.createHTMLDocument("")).createElement("base")).href=E.location.href,t.head.appendChild(r)):t=E),o=!n&&[],(i=N.exec(e))?[t.createElement(i[1])]:(i=xe([e],t,o),o&&o.length&&S(o).remove(),S.merge([],i.childNodes)));var r,i,o},S.fn.load=function(e,t,n){var r,i,o,a=this,s=e.indexOf(" ");return-1<s&&(r=vt(e.slice(s)),e=e.slice(0,s)),m(t)?(n=t,t=void 0):t&&"object"==typeof t&&(i="POST"),0<a.length&&S.ajax({url:e,type:i||"GET",dataType:"html",data:t}).done(function(e){o=arguments,a.html(r?S("<div>").append(S.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},S.expr.pseudos.animated=function(t){return S.grep(S.timers,function(e){return t===e.elem}).length},S.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l=S.css(e,"position"),c=S(e),f={};"static"===l&&(e.style.position="relative"),s=c.offset(),o=S.css(e,"top"),u=S.css(e,"left"),("absolute"===l||"fixed"===l)&&-1<(o+u).indexOf("auto")?(a=(r=c.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),m(t)&&(t=t.call(e,n,S.extend({},s))),null!=t.top&&(f.top=t.top-s.top+a),null!=t.left&&(f.left=t.left-s.left+i),"using"in t?t.using.call(e,f):("number"==typeof f.top&&(f.top+="px"),"number"==typeof f.left&&(f.left+="px"),c.css(f))}},S.fn.extend({offset:function(t){if(arguments.length)return void 0===t?this:this.each(function(e){S.offset.setOffset(this,t,e)});var e,n,r=this[0];return r?r.getClientRects().length?(e=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:e.top+n.pageYOffset,left:e.left+n.pageXOffset}):{top:0,left:0}:void 0},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===S.css(r,"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===S.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=S(e).offset()).top+=S.css(e,"borderTopWidth",!0),i.left+=S.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-S.css(r,"marginTop",!0),left:t.left-i.left-S.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===S.css(e,"position"))e=e.offsetParent;return e||re})}}),S.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,i){var o="pageYOffset"===i;S.fn[t]=function(e){return $(this,function(e,t,n){var r;if(x(e)?r=e:9===e.nodeType&&(r=e.defaultView),void 0===n)return r?r[i]:e[t];r?r.scrollTo(o?r.pageXOffset:n,o?n:r.pageYOffset):e[t]=n},t,e,arguments.length)}}),S.each(["top","left"],function(e,n){S.cssHooks[n]=$e(y.pixelPosition,function(e,t){if(t)return t=Be(e,n),Me.test(t)?S(e).position()[n]+"px":t})}),S.each({Height:"height",Width:"width"},function(a,s){S.each({padding:"inner"+a,content:s,"":"outer"+a},function(r,o){S.fn[o]=function(e,t){var n=arguments.length&&(r||"boolean"!=typeof e),i=r||(!0===e||!0===t?"margin":"border");return $(this,function(e,t,n){var r;return x(e)?0===o.indexOf("outer")?e["inner"+a]:e.document.documentElement["client"+a]:9===e.nodeType?(r=e.documentElement,Math.max(e.body["scroll"+a],r["scroll"+a],e.body["offset"+a],r["offset"+a],r["client"+a])):void 0===n?S.css(e,t,i):S.style(e,t,n,i)},s,n?e:void 0,n)}})}),S.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){S.fn[t]=function(e){return this.on(t,e)}}),S.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)},hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}}),S.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,n){S.fn[n]=function(e,t){return 0<arguments.length?this.on(n,null,e,t):this.trigger(n)}});var Gt=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g;S.proxy=function(e,t){var n,r,i;if("string"==typeof t&&(n=e[t],t=e,e=n),m(e))return r=s.call(arguments,2),(i=function(){return e.apply(t||this,r.concat(s.call(arguments)))}).guid=e.guid=e.guid||S.guid++,i},S.holdReady=function(e){e?S.readyWait++:S.ready(!0)},S.isArray=Array.isArray,S.parseJSON=JSON.parse,S.nodeName=A,S.isFunction=m,S.isWindow=x,S.camelCase=X,S.type=w,S.now=Date.now,S.isNumeric=function(e){var t=S.type(e);return("number"===t||"string"===t)&&!isNaN(e-parseFloat(e))},S.trim=function(e){return null==e?"":(e+"").replace(Gt,"")},"function"==typeof define&&define.amd&&define("jquery",[],function(){return S});var Yt=C.jQuery,Qt=C.$;return S.noConflict=function(e){return C.$===S&&(C.$=Qt),e&&C.jQuery===S&&(C.jQuery=Yt),S},"undefined"==typeof e&&(C.jQuery=C.$=S),S});
diff --git a/web/core/assets/vendor/jquery/jquery.min.map b/web/core/assets/vendor/jquery/jquery.min.map
index 7a3d4b05e0..cbe1012155 100644
--- a/web/core/assets/vendor/jquery/jquery.min.map
+++ b/web/core/assets/vendor/jquery/jquery.min.map
@@ -1 +1 @@
-{"version":3,"sources":["jquery.js"],"names":["global","factory","module","exports","document","w","Error","window","this","noGlobal","arr","getProto","Object","getPrototypeOf","slice","concat","push","indexOf","class2type","toString","hasOwn","hasOwnProperty","fnToString","ObjectFunctionString","call","support","isFunction","obj","nodeType","isWindow","preservedScriptAttributes","type","src","nonce","noModule","DOMEval","code","node","doc","i","val","script","createElement","text","getAttribute","setAttribute","head","appendChild","parentNode","removeChild","toType","version","jQuery","selector","context","fn","init","rtrim","isArrayLike","length","prototype","jquery","constructor","toArray","get","num","pushStack","elems","ret","merge","prevObject","each","callback","map","elem","apply","arguments","first","eq","last","len","j","end","sort","splice","extend","options","name","copy","copyIsArray","clone","target","deep","isPlainObject","Array","isArray","undefined","expando","Math","random","replace","isReady","error","msg","noop","proto","Ctor","isEmptyObject","globalEval","trim","makeArray","results","inArray","second","grep","invert","matches","callbackExpect","arg","value","guid","Symbol","iterator","split","toLowerCase","Sizzle","Expr","getText","isXML","tokenize","compile","select","outermostContext","sortInput","hasDuplicate","setDocument","docElem","documentIsHTML","rbuggyQSA","rbuggyMatches","contains","Date","preferredDoc","dirruns","done","classCache","createCache","tokenCache","compilerCache","nonnativeSelectorCache","sortOrder","a","b","pop","push_native","list","booleans","whitespace","identifier","attributes","pseudos","rwhitespace","RegExp","rcomma","rcombinators","rdescend","rpseudo","ridentifier","matchExpr","ID","CLASS","TAG","ATTR","PSEUDO","CHILD","bool","needsContext","rhtml","rinputs","rheader","rnative","rquickExpr","rsibling","runescape","funescape","_","escaped","escapedWhitespace","high","String","fromCharCode","rcssescape","fcssescape","ch","asCodePoint","charCodeAt","unloadHandler","inDisabledFieldset","addCombinator","disabled","nodeName","dir","next","childNodes","e","els","seed","m","nid","match","groups","newSelector","newContext","ownerDocument","exec","getElementById","id","getElementsByTagName","getElementsByClassName","qsa","test","toSelector","join","testContext","querySelectorAll","qsaError","removeAttribute","keys","cache","key","cacheLength","shift","markFunction","assert","el","addHandle","attrs","handler","attrHandle","siblingCheck","cur","diff","sourceIndex","nextSibling","createInputPseudo","createButtonPseudo","createDisabledPseudo","isDisabled","createPositionalPseudo","argument","matchIndexes","namespace","namespaceURI","documentElement","hasCompare","subWindow","defaultView","top","addEventListener","attachEvent","className","createComment","getById","getElementsByName","filter","attrId","find","getAttributeNode","tag","tmp","innerHTML","input","matchesSelector","webkitMatchesSelector","mozMatchesSelector","oMatchesSelector","msMatchesSelector","disconnectedMatch","compareDocumentPosition","adown","bup","compare","sortDetached","aup","ap","bp","unshift","expr","elements","attr","specified","escape","sel","uniqueSort","duplicates","detectDuplicates","sortStable","textContent","firstChild","nodeValue","selectors","createPseudo","relative",">"," ","+","~","preFilter","excess","unquoted","nodeNameSelector","pattern","operator","check","result","what","simple","forward","ofType","xml","uniqueCache","outerCache","nodeIndex","start","parent","useCache","lastChild","uniqueID","pseudo","args","setFilters","idx","matched","not","matcher","unmatched","has","lang","elemLang","hash","location","root","focus","activeElement","hasFocus","href","tabIndex","enabled","checked","selected","selectedIndex","empty","header","button","even","odd","lt","gt","radio","checkbox","file","password","image","submit","reset","tokens","combinator","base","skip","checkNonElements","doneName","oldCache","newCache","elementMatcher","matchers","condense","newUnmatched","mapped","setMatcher","postFilter","postFinder","postSelector","temp","preMap","postMap","preexisting","contexts","multipleContexts","matcherIn","matcherOut","matcherFromTokens","checkContext","leadingRelative","implicitRelative","matchContext","matchAnyContext","filters","parseOnly","soFar","preFilters","cached","elementMatchers","setMatchers","bySet","byElement","superMatcher","outermost","matchedCount","setMatched","contextBackup","dirrunsUnique","token","compiled","defaultValue","unique","isXMLDoc","escapeSelector","until","truncate","is","siblings","n","rneedsContext","rsingleTag","winnow","qualifier","self","rootjQuery","parseHTML","ready","rparentsprev","guaranteedUnique","children","contents","prev","sibling","targets","l","closest","index","prevAll","add","addBack","parents","parentsUntil","nextAll","nextUntil","prevUntil","contentDocument","content","reverse","rnothtmlwhite","Identity","v","Thrower","ex","adoptValue","resolve","reject","noValue","method","promise","fail","then","Callbacks","object","flag","firing","memory","fired","locked","queue","firingIndex","fire","once","stopOnFalse","remove","disable","lock","fireWith","Deferred","func","tuples","state","always","deferred","catch","pipe","fns","newDefer","tuple","returned","progress","notify","onFulfilled","onRejected","onProgress","maxDepth","depth","special","that","mightThrow","TypeError","notifyWith","resolveWith","process","exceptionHook","stackTrace","rejectWith","getStackHook","setTimeout","stateString","when","singleValue","remaining","resolveContexts","resolveValues","master","updateFunc","rerrorNames","stack","console","warn","message","readyException","readyList","completed","removeEventListener","readyWait","wait","readyState","doScroll","access","chainable","emptyGet","raw","bulk","rmsPrefix","rdashAlpha","fcamelCase","all","letter","toUpperCase","camelCase","string","acceptData","owner","Data","uid","defineProperty","configurable","set","data","prop","hasData","dataPriv","dataUser","rbrace","rmultiDash","dataAttr","JSON","parse","removeData","_data","_removeData","dequeue","startLength","hooks","_queueHooks","stop","setter","clearQueue","count","defer","pnum","source","rcssNum","cssExpand","isAttached","composed","getRootNode","isHiddenWithinTree","style","display","css","swap","old","adjustCSS","valueParts","tween","adjusted","scale","maxIterations","currentValue","initial","unit","cssNumber","initialInUnit","defaultDisplayMap","showHide","show","values","body","hide","toggle","rcheckableType","rtagName","rscriptType","wrapMap","option","thead","col","tr","td","_default","getAll","setGlobalEval","refElements","optgroup","tbody","tfoot","colgroup","caption","th","div","buildFragment","scripts","selection","ignored","wrap","attached","fragment","createDocumentFragment","nodes","htmlPrefilter","createTextNode","checkClone","cloneNode","noCloneChecked","rkeyEvent","rmouseEvent","rtypenamespace","returnTrue","returnFalse","expectSync","err","safeActiveElement","on","types","one","origFn","event","off","leverageNative","notAsync","saved","isTrigger","delegateType","stopPropagation","stopImmediatePropagation","preventDefault","trigger","Event","handleObjIn","eventHandle","events","t","handleObj","handlers","namespaces","origType","elemData","handle","triggered","dispatch","bindType","delegateCount","setup","mappedTypes","origCount","teardown","removeEvent","nativeEvent","handlerQueue","fix","delegateTarget","preDispatch","isPropagationStopped","currentTarget","isImmediatePropagationStopped","rnamespace","postDispatch","matchedHandlers","matchedSelectors","addProp","hook","enumerable","originalEvent","writable","load","noBubble","click","beforeunload","returnValue","props","isDefaultPrevented","defaultPrevented","relatedTarget","timeStamp","now","isSimulated","altKey","bubbles","cancelable","changedTouches","ctrlKey","detail","eventPhase","metaKey","pageX","pageY","shiftKey","view","char","charCode","keyCode","buttons","clientX","clientY","offsetX","offsetY","pointerId","pointerType","screenX","screenY","targetTouches","toElement","touches","which","blur","mouseenter","mouseleave","pointerenter","pointerleave","orig","related","rxhtmlTag","rnoInnerhtml","rchecked","rcleanScript","manipulationTarget","disableScript","restoreScript","cloneCopyEvent","dest","pdataOld","pdataCur","udataOld","udataCur","domManip","collection","hasScripts","iNoClone","valueIsFunction","html","_evalUrl","keepData","cleanData","dataAndEvents","deepDataAndEvents","srcElements","destElements","inPage","detach","append","prepend","insertBefore","before","after","replaceWith","replaceChild","appendTo","prependTo","insertAfter","replaceAll","original","insert","rnumnonpx","getStyles","opener","getComputedStyle","rboxStyle","curCSS","computed","width","minWidth","maxWidth","getPropertyValue","pixelBoxStyles","addGetHookIf","conditionFn","hookFn","computeStyleTests","container","cssText","divStyle","pixelPositionVal","reliableMarginLeftVal","roundPixelMeasures","marginLeft","right","pixelBoxStylesVal","boxSizingReliableVal","position","scrollboxSizeVal","offsetWidth","measure","round","parseFloat","backgroundClip","clearCloneStyle","boxSizingReliable","pixelPosition","reliableMarginLeft","scrollboxSize","cssPrefixes","emptyStyle","vendorProps","finalPropName","final","cssProps","capName","vendorPropName","rdisplayswap","rcustomProp","cssShow","visibility","cssNormalTransform","letterSpacing","fontWeight","setPositiveNumber","subtract","max","boxModelAdjustment","dimension","box","isBorderBox","styles","computedVal","extra","delta","ceil","getWidthOrHeight","valueIsBorderBox","offsetProp","getClientRects","Tween","easing","cssHooks","opacity","animationIterationCount","columnCount","fillOpacity","flexGrow","flexShrink","gridArea","gridColumn","gridColumnEnd","gridColumnStart","gridRow","gridRowEnd","gridRowStart","lineHeight","order","orphans","widows","zIndex","zoom","origName","isCustomProp","setProperty","isFinite","getBoundingClientRect","scrollboxSizeBuggy","left","margin","padding","border","prefix","suffix","expand","expanded","parts","propHooks","run","percent","eased","duration","pos","step","fx","scrollTop","scrollLeft","linear","p","swing","cos","PI","fxNow","inProgress","opt","rfxtypes","rrun","schedule","hidden","requestAnimationFrame","interval","tick","createFxNow","genFx","includeWidth","height","createTween","animation","Animation","tweeners","properties","stopped","prefilters","currentTime","startTime","tweens","opts","specialEasing","originalProperties","originalOptions","gotoEnd","propFilter","bind","complete","timer","anim","*","tweener","oldfire","propTween","restoreDisplay","isBox","dataShow","unqueued","overflow","overflowX","overflowY","prefilter","speed","speeds","fadeTo","to","animate","optall","doAnimation","finish","stopQueue","timers","cssFn","slideDown","slideUp","slideToggle","fadeIn","fadeOut","fadeToggle","slow","fast","delay","time","timeout","clearTimeout","checkOn","optSelected","radioValue","boolHook","removeAttr","nType","attrHooks","attrNames","getter","lowercaseName","rfocusable","rclickable","stripAndCollapse","getClass","classesToArray","removeProp","propFix","tabindex","parseInt","for","class","addClass","classes","curValue","clazz","finalValue","removeClass","toggleClass","stateVal","isValidValue","classNames","hasClass","rreturn","valHooks","optionSet","focusin","rfocusMorph","stopPropagationCallback","onlyHandlers","bubbleType","ontype","lastElement","eventPath","parentWindow","simulate","triggerHandler","attaches","rquery","parseXML","DOMParser","parseFromString","rbracket","rCRLF","rsubmitterTypes","rsubmittable","buildParams","traditional","param","s","valueOrFunction","encodeURIComponent","serialize","serializeArray","r20","rhash","rantiCache","rheaders","rnoContent","rprotocol","transports","allTypes","originAnchor","addToPrefiltersOrTransports","structure","dataTypeExpression","dataType","dataTypes","inspectPrefiltersOrTransports","jqXHR","inspected","seekingTransport","inspect","prefilterOrFactory","dataTypeOrTransport","ajaxExtend","flatOptions","ajaxSettings","active","lastModified","etag","url","isLocal","protocol","processData","async","contentType","accepts","json","responseFields","converters","* text","text html","text json","text xml","ajaxSetup","settings","ajaxPrefilter","ajaxTransport","ajax","transport","cacheURL","responseHeadersString","responseHeaders","timeoutTimer","urlAnchor","fireGlobals","uncached","callbackContext","globalEventContext","completeDeferred","statusCode","requestHeaders","requestHeadersNames","strAbort","getResponseHeader","getAllResponseHeaders","setRequestHeader","overrideMimeType","mimeType","status","abort","statusText","finalText","crossDomain","host","hasContent","ifModified","headers","beforeSend","success","send","nativeStatusText","responses","isSuccess","response","modified","ct","finalDataType","firstDataType","ajaxHandleResponses","conv2","current","conv","dataFilter","throws","ajaxConvert","getJSON","getScript","text script","wrapAll","firstElementChild","wrapInner","htmlIsFunction","unwrap","visible","offsetHeight","xhr","XMLHttpRequest","xhrSuccessStatus","0","1223","xhrSupported","cors","errorCallback","open","username","xhrFields","onload","onerror","onabort","ontimeout","onreadystatechange","responseType","responseText","binary","scriptAttrs","charset","scriptCharset","evt","oldCallbacks","rjsonp","jsonp","jsonpCallback","originalSettings","callbackName","overwritten","responseContainer","jsonProp","createHTMLDocument","implementation","keepScripts","parsed","params","animated","offset","setOffset","curPosition","curLeft","curCSSTop","curTop","curOffset","curCSSLeft","curElem","using","rect","win","pageYOffset","pageXOffset","offsetParent","parentOffset","scrollTo","Height","Width","","defaultExtra","funcName","hover","fnOver","fnOut","unbind","delegate","undelegate","proxy","holdReady","hold","parseJSON","isNumeric","isNaN","define","amd","_jQuery","_$","$","noConflict"],"mappings":"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","file":"jquery.min.js"}
\ No newline at end of file
+{"version":3,"sources":["jquery.js"],"names":["global","factory","module","exports","document","w","Error","window","this","noGlobal","arr","getProto","Object","getPrototypeOf","slice","flat","array","call","concat","apply","push","indexOf","class2type","toString","hasOwn","hasOwnProperty","fnToString","ObjectFunctionString","support","isFunction","obj","nodeType","isWindow","preservedScriptAttributes","type","src","nonce","noModule","DOMEval","code","node","doc","i","val","script","createElement","text","getAttribute","setAttribute","head","appendChild","parentNode","removeChild","toType","version","jQuery","selector","context","fn","init","isArrayLike","length","prototype","jquery","constructor","toArray","get","num","pushStack","elems","ret","merge","prevObject","each","callback","map","elem","arguments","first","eq","last","even","grep","_elem","odd","len","j","end","sort","splice","extend","options","name","copy","copyIsArray","clone","target","deep","isPlainObject","Array","isArray","undefined","expando","Math","random","replace","isReady","error","msg","noop","proto","Ctor","isEmptyObject","globalEval","makeArray","results","inArray","second","invert","matches","callbackExpect","arg","value","guid","Symbol","iterator","split","_i","toLowerCase","Sizzle","Expr","getText","isXML","tokenize","compile","select","outermostContext","sortInput","hasDuplicate","setDocument","docElem","documentIsHTML","rbuggyQSA","rbuggyMatches","contains","Date","preferredDoc","dirruns","done","classCache","createCache","tokenCache","compilerCache","nonnativeSelectorCache","sortOrder","a","b","pop","pushNative","list","booleans","whitespace","identifier","attributes","pseudos","rwhitespace","RegExp","rtrim","rcomma","rcombinators","rdescend","rpseudo","ridentifier","matchExpr","ID","CLASS","TAG","ATTR","PSEUDO","CHILD","bool","needsContext","rhtml","rinputs","rheader","rnative","rquickExpr","rsibling","runescape","funescape","escape","nonHex","high","String","fromCharCode","rcssescape","fcssescape","ch","asCodePoint","charCodeAt","unloadHandler","inDisabledFieldset","addCombinator","disabled","nodeName","dir","next","childNodes","e","els","seed","m","nid","match","groups","newSelector","newContext","ownerDocument","exec","getElementById","id","getElementsByTagName","getElementsByClassName","qsa","test","testContext","scope","toSelector","join","querySelectorAll","qsaError","removeAttribute","keys","cache","key","cacheLength","shift","markFunction","assert","el","addHandle","attrs","handler","attrHandle","siblingCheck","cur","diff","sourceIndex","nextSibling","createInputPseudo","createButtonPseudo","createDisabledPseudo","isDisabled","createPositionalPseudo","argument","matchIndexes","namespace","namespaceURI","documentElement","hasCompare","subWindow","defaultView","top","addEventListener","attachEvent","className","createComment","getById","getElementsByName","filter","attrId","find","getAttributeNode","tag","tmp","input","innerHTML","matchesSelector","webkitMatchesSelector","mozMatchesSelector","oMatchesSelector","msMatchesSelector","disconnectedMatch","compareDocumentPosition","adown","bup","compare","sortDetached","aup","ap","bp","unshift","expr","elements","attr","specified","sel","uniqueSort","duplicates","detectDuplicates","sortStable","textContent","firstChild","nodeValue","selectors","createPseudo","relative",">"," ","+","~","preFilter","excess","unquoted","nodeNameSelector","pattern","operator","check","result","what","_argument","simple","forward","ofType","_context","xml","uniqueCache","outerCache","nodeIndex","start","parent","useCache","lastChild","uniqueID","pseudo","args","setFilters","idx","matched","not","matcher","unmatched","has","lang","elemLang","hash","location","root","focus","activeElement","hasFocus","href","tabIndex","enabled","checked","selected","selectedIndex","empty","header","button","_matchIndexes","lt","gt","radio","checkbox","file","password","image","submit","reset","tokens","combinator","base","skip","checkNonElements","doneName","oldCache","newCache","elementMatcher","matchers","condense","newUnmatched","mapped","setMatcher","postFilter","postFinder","postSelector","temp","preMap","postMap","preexisting","contexts","multipleContexts","matcherIn","matcherOut","matcherFromTokens","checkContext","leadingRelative","implicitRelative","matchContext","matchAnyContext","filters","parseOnly","soFar","preFilters","cached","elementMatchers","setMatchers","bySet","byElement","superMatcher","outermost","matchedCount","setMatched","contextBackup","dirrunsUnique","token","compiled","_name","defaultValue","unique","isXMLDoc","escapeSelector","until","truncate","is","siblings","n","rneedsContext","rsingleTag","winnow","qualifier","self","rootjQuery","parseHTML","ready","rparentsprev","guaranteedUnique","children","contents","prev","sibling","targets","l","closest","index","prevAll","add","addBack","parents","parentsUntil","nextAll","nextUntil","prevUntil","contentDocument","content","reverse","rnothtmlwhite","Identity","v","Thrower","ex","adoptValue","resolve","reject","noValue","method","promise","fail","then","Callbacks","object","_","flag","firing","memory","fired","locked","queue","firingIndex","fire","once","stopOnFalse","remove","disable","lock","fireWith","Deferred","func","tuples","state","always","deferred","catch","pipe","fns","newDefer","tuple","returned","progress","notify","onFulfilled","onRejected","onProgress","maxDepth","depth","special","that","mightThrow","TypeError","notifyWith","resolveWith","process","exceptionHook","stackTrace","rejectWith","getStackHook","setTimeout","stateString","when","singleValue","remaining","resolveContexts","resolveValues","master","updateFunc","rerrorNames","stack","console","warn","message","readyException","readyList","completed","removeEventListener","readyWait","wait","readyState","doScroll","access","chainable","emptyGet","raw","bulk","_key","rmsPrefix","rdashAlpha","fcamelCase","_all","letter","toUpperCase","camelCase","string","acceptData","owner","Data","uid","defineProperty","configurable","set","data","prop","hasData","dataPriv","dataUser","rbrace","rmultiDash","dataAttr","JSON","parse","removeData","_data","_removeData","dequeue","startLength","hooks","_queueHooks","stop","setter","clearQueue","count","defer","pnum","source","rcssNum","cssExpand","isAttached","composed","getRootNode","isHiddenWithinTree","style","display","css","adjustCSS","valueParts","tween","adjusted","scale","maxIterations","currentValue","initial","unit","cssNumber","initialInUnit","defaultDisplayMap","showHide","show","values","body","hide","toggle","div","rcheckableType","rtagName","rscriptType","createDocumentFragment","checkClone","cloneNode","noCloneChecked","option","wrapMap","thead","col","tr","td","_default","getAll","setGlobalEval","refElements","tbody","tfoot","colgroup","caption","th","optgroup","buildFragment","scripts","selection","ignored","wrap","attached","fragment","nodes","htmlPrefilter","createTextNode","rkeyEvent","rmouseEvent","rtypenamespace","returnTrue","returnFalse","expectSync","err","safeActiveElement","on","types","one","origFn","event","off","leverageNative","notAsync","saved","isTrigger","delegateType","stopPropagation","stopImmediatePropagation","preventDefault","trigger","Event","handleObjIn","eventHandle","events","t","handleObj","handlers","namespaces","origType","elemData","create","handle","triggered","dispatch","bindType","delegateCount","setup","mappedTypes","origCount","teardown","removeEvent","nativeEvent","handlerQueue","fix","delegateTarget","preDispatch","isPropagationStopped","currentTarget","isImmediatePropagationStopped","rnamespace","postDispatch","matchedHandlers","matchedSelectors","addProp","hook","enumerable","originalEvent","writable","load","noBubble","click","beforeunload","returnValue","props","isDefaultPrevented","defaultPrevented","relatedTarget","timeStamp","now","isSimulated","altKey","bubbles","cancelable","changedTouches","ctrlKey","detail","eventPhase","metaKey","pageX","pageY","shiftKey","view","char","charCode","keyCode","buttons","clientX","clientY","offsetX","offsetY","pointerId","pointerType","screenX","screenY","targetTouches","toElement","touches","which","blur","mouseenter","mouseleave","pointerenter","pointerleave","orig","related","rnoInnerhtml","rchecked","rcleanScript","manipulationTarget","disableScript","restoreScript","cloneCopyEvent","dest","udataOld","udataCur","domManip","collection","hasScripts","iNoClone","valueIsFunction","html","_evalUrl","keepData","cleanData","dataAndEvents","deepDataAndEvents","srcElements","destElements","inPage","detach","append","prepend","insertBefore","before","after","replaceWith","replaceChild","appendTo","prependTo","insertAfter","replaceAll","original","insert","rnumnonpx","getStyles","opener","getComputedStyle","swap","old","rboxStyle","curCSS","computed","width","minWidth","maxWidth","getPropertyValue","pixelBoxStyles","addGetHookIf","conditionFn","hookFn","computeStyleTests","container","cssText","divStyle","pixelPositionVal","reliableMarginLeftVal","roundPixelMeasures","marginLeft","right","pixelBoxStylesVal","boxSizingReliableVal","position","scrollboxSizeVal","offsetWidth","measure","round","parseFloat","reliableTrDimensionsVal","backgroundClip","clearCloneStyle","boxSizingReliable","pixelPosition","reliableMarginLeft","scrollboxSize","reliableTrDimensions","table","trChild","trStyle","height","parseInt","cssPrefixes","emptyStyle","vendorProps","finalPropName","final","cssProps","capName","vendorPropName","rdisplayswap","rcustomProp","cssShow","visibility","cssNormalTransform","letterSpacing","fontWeight","setPositiveNumber","subtract","max","boxModelAdjustment","dimension","box","isBorderBox","styles","computedVal","extra","delta","ceil","getWidthOrHeight","valueIsBorderBox","offsetProp","getClientRects","Tween","easing","cssHooks","opacity","animationIterationCount","columnCount","fillOpacity","flexGrow","flexShrink","gridArea","gridColumn","gridColumnEnd","gridColumnStart","gridRow","gridRowEnd","gridRowStart","lineHeight","order","orphans","widows","zIndex","zoom","origName","isCustomProp","setProperty","isFinite","getBoundingClientRect","scrollboxSizeBuggy","left","margin","padding","border","prefix","suffix","expand","expanded","parts","propHooks","run","percent","eased","duration","pos","step","fx","scrollTop","scrollLeft","linear","p","swing","cos","PI","fxNow","inProgress","opt","rfxtypes","rrun","schedule","hidden","requestAnimationFrame","interval","tick","createFxNow","genFx","includeWidth","createTween","animation","Animation","tweeners","properties","stopped","prefilters","currentTime","startTime","tweens","opts","specialEasing","originalProperties","originalOptions","gotoEnd","propFilter","bind","complete","timer","anim","*","tweener","oldfire","propTween","restoreDisplay","isBox","dataShow","unqueued","overflow","overflowX","overflowY","prefilter","speed","speeds","fadeTo","to","animate","optall","doAnimation","finish","stopQueue","timers","cssFn","slideDown","slideUp","slideToggle","fadeIn","fadeOut","fadeToggle","slow","fast","delay","time","timeout","clearTimeout","checkOn","optSelected","radioValue","boolHook","removeAttr","nType","attrHooks","attrNames","getter","lowercaseName","rfocusable","rclickable","stripAndCollapse","getClass","classesToArray","removeProp","propFix","tabindex","for","class","addClass","classes","curValue","clazz","finalValue","removeClass","toggleClass","stateVal","isValidValue","classNames","hasClass","rreturn","valHooks","optionSet","focusin","rfocusMorph","stopPropagationCallback","onlyHandlers","bubbleType","ontype","lastElement","eventPath","parentWindow","simulate","triggerHandler","attaches","rquery","parseXML","DOMParser","parseFromString","rbracket","rCRLF","rsubmitterTypes","rsubmittable","buildParams","traditional","param","s","valueOrFunction","encodeURIComponent","serialize","serializeArray","r20","rhash","rantiCache","rheaders","rnoContent","rprotocol","transports","allTypes","originAnchor","addToPrefiltersOrTransports","structure","dataTypeExpression","dataType","dataTypes","inspectPrefiltersOrTransports","jqXHR","inspected","seekingTransport","inspect","prefilterOrFactory","dataTypeOrTransport","ajaxExtend","flatOptions","ajaxSettings","active","lastModified","etag","url","isLocal","protocol","processData","async","contentType","accepts","json","responseFields","converters","* text","text html","text json","text xml","ajaxSetup","settings","ajaxPrefilter","ajaxTransport","ajax","transport","cacheURL","responseHeadersString","responseHeaders","timeoutTimer","urlAnchor","fireGlobals","uncached","callbackContext","globalEventContext","completeDeferred","statusCode","requestHeaders","requestHeadersNames","strAbort","getResponseHeader","getAllResponseHeaders","setRequestHeader","overrideMimeType","mimeType","status","abort","statusText","finalText","crossDomain","host","hasContent","ifModified","headers","beforeSend","success","send","nativeStatusText","responses","isSuccess","response","modified","ct","finalDataType","firstDataType","ajaxHandleResponses","conv2","current","conv","dataFilter","throws","ajaxConvert","getJSON","getScript","text script","wrapAll","firstElementChild","wrapInner","htmlIsFunction","unwrap","visible","offsetHeight","xhr","XMLHttpRequest","xhrSuccessStatus","0","1223","xhrSupported","cors","errorCallback","open","username","xhrFields","onload","onerror","onabort","ontimeout","onreadystatechange","responseType","responseText","binary","scriptAttrs","charset","scriptCharset","evt","oldCallbacks","rjsonp","jsonp","jsonpCallback","originalSettings","callbackName","overwritten","responseContainer","jsonProp","createHTMLDocument","implementation","keepScripts","parsed","params","animated","offset","setOffset","curPosition","curLeft","curCSSTop","curTop","curOffset","curCSSLeft","curElem","using","rect","win","pageYOffset","pageXOffset","offsetParent","parentOffset","scrollTo","Height","Width","","defaultExtra","funcName","unbind","delegate","undelegate","hover","fnOver","fnOut","proxy","holdReady","hold","parseJSON","isNumeric","isNaN","trim","define","amd","_jQuery","_$","$","noConflict"],"mappings":";CAaA,SAAYA,EAAQC,GAEnB,aAEuB,iBAAXC,QAAiD,iBAAnBA,OAAOC,QAShDD,OAAOC,QAAUH,EAAOI,SACvBH,EAASD,GAAQ,GACjB,SAAUK,GACT,IAAMA,EAAED,SACP,MAAM,IAAIE,MAAO,4CAElB,OAAOL,EAASI,IAGlBJ,EAASD,GAtBX,CA0BuB,oBAAXO,OAAyBA,OAASC,KAAM,SAAUD,EAAQE,GAMtE,aAEA,IAAIC,EAAM,GAENC,EAAWC,OAAOC,eAElBC,EAAQJ,EAAII,MAEZC,EAAOL,EAAIK,KAAO,SAAUC,GAC/B,OAAON,EAAIK,KAAKE,KAAMD,IACnB,SAAUA,GACb,OAAON,EAAIQ,OAAOC,MAAO,GAAIH,IAI1BI,EAAOV,EAAIU,KAEXC,EAAUX,EAAIW,QAEdC,EAAa,GAEbC,EAAWD,EAAWC,SAEtBC,EAASF,EAAWG,eAEpBC,EAAaF,EAAOD,SAEpBI,EAAuBD,EAAWT,KAAML,QAExCgB,EAAU,GAEVC,EAAa,SAAqBC,GAMhC,MAAsB,mBAARA,GAA8C,iBAAjBA,EAAIC,UAIjDC,EAAW,SAAmBF,GAChC,OAAc,MAAPA,GAAeA,IAAQA,EAAIvB,QAIhCH,EAAWG,EAAOH,SAIjB6B,EAA4B,CAC/BC,MAAM,EACNC,KAAK,EACLC,OAAO,EACPC,UAAU,GAGX,SAASC,EAASC,EAAMC,EAAMC,GAG7B,IAAIC,EAAGC,EACNC,GAHDH,EAAMA,GAAOrC,GAGCyC,cAAe,UAG7B,GADAD,EAAOE,KAAOP,EACTC,EACJ,IAAME,KAAKT,GAYVU,EAAMH,EAAME,IAAOF,EAAKO,cAAgBP,EAAKO,aAAcL,KAE1DE,EAAOI,aAAcN,EAAGC,GAI3BF,EAAIQ,KAAKC,YAAaN,GAASO,WAAWC,YAAaR,GAIzD,SAASS,EAAQvB,GAChB,OAAY,MAAPA,EACGA,EAAM,GAIQ,iBAARA,GAAmC,mBAARA,EACxCR,EAAYC,EAASN,KAAMa,KAAW,gBAC/BA,EAQT,IACCwB,EAAU,QAGVC,EAAS,SAAUC,EAAUC,GAI5B,OAAO,IAAIF,EAAOG,GAAGC,KAAMH,EAAUC,IA0VvC,SAASG,EAAa9B,GAMrB,IAAI+B,IAAW/B,GAAO,WAAYA,GAAOA,EAAI+B,OAC5C3B,EAAOmB,EAAQvB,GAEhB,OAAKD,EAAYC,KAASE,EAAUF,KAIpB,UAATI,GAA+B,IAAX2B,GACR,iBAAXA,GAAgC,EAATA,GAAgBA,EAAS,KAAO/B,GArWhEyB,EAAOG,GAAKH,EAAOO,UAAY,CAG9BC,OAAQT,EAERU,YAAaT,EAGbM,OAAQ,EAERI,QAAS,WACR,OAAOnD,EAAMG,KAAMT,OAKpB0D,IAAK,SAAUC,GAGd,OAAY,MAAPA,EACGrD,EAAMG,KAAMT,MAIb2D,EAAM,EAAI3D,KAAM2D,EAAM3D,KAAKqD,QAAWrD,KAAM2D,IAKpDC,UAAW,SAAUC,GAGpB,IAAIC,EAAMf,EAAOgB,MAAO/D,KAAKwD,cAAeK,GAM5C,OAHAC,EAAIE,WAAahE,KAGV8D,GAIRG,KAAM,SAAUC,GACf,OAAOnB,EAAOkB,KAAMjE,KAAMkE,IAG3BC,IAAK,SAAUD,GACd,OAAOlE,KAAK4D,UAAWb,EAAOoB,IAAKnE,KAAM,SAAUoE,EAAMlC,GACxD,OAAOgC,EAASzD,KAAM2D,EAAMlC,EAAGkC,OAIjC9D,MAAO,WACN,OAAON,KAAK4D,UAAWtD,EAAMK,MAAOX,KAAMqE,aAG3CC,MAAO,WACN,OAAOtE,KAAKuE,GAAI,IAGjBC,KAAM,WACL,OAAOxE,KAAKuE,IAAK,IAGlBE,KAAM,WACL,OAAOzE,KAAK4D,UAAWb,EAAO2B,KAAM1E,KAAM,SAAU2E,EAAOzC,GAC1D,OAASA,EAAI,GAAM,MAIrB0C,IAAK,WACJ,OAAO5E,KAAK4D,UAAWb,EAAO2B,KAAM1E,KAAM,SAAU2E,EAAOzC,GAC1D,OAAOA,EAAI,MAIbqC,GAAI,SAAUrC,GACb,IAAI2C,EAAM7E,KAAKqD,OACdyB,GAAK5C,GAAMA,EAAI,EAAI2C,EAAM,GAC1B,OAAO7E,KAAK4D,UAAgB,GAALkB,GAAUA,EAAID,EAAM,CAAE7E,KAAM8E,IAAQ,KAG5DC,IAAK,WACJ,OAAO/E,KAAKgE,YAAchE,KAAKwD,eAKhC5C,KAAMA,EACNoE,KAAM9E,EAAI8E,KACVC,OAAQ/E,EAAI+E,QAGblC,EAAOmC,OAASnC,EAAOG,GAAGgC,OAAS,WAClC,IAAIC,EAASC,EAAMzD,EAAK0D,EAAMC,EAAaC,EAC1CC,EAASnB,UAAW,IAAO,GAC3BnC,EAAI,EACJmB,EAASgB,UAAUhB,OACnBoC,GAAO,EAsBR,IAnBuB,kBAAXD,IACXC,EAAOD,EAGPA,EAASnB,UAAWnC,IAAO,GAC3BA,KAIsB,iBAAXsD,GAAwBnE,EAAYmE,KAC/CA,EAAS,IAILtD,IAAMmB,IACVmC,EAASxF,KACTkC,KAGOA,EAAImB,EAAQnB,IAGnB,GAAqC,OAA9BiD,EAAUd,UAAWnC,IAG3B,IAAMkD,KAAQD,EACbE,EAAOF,EAASC,GAIF,cAATA,GAAwBI,IAAWH,IAKnCI,GAAQJ,IAAUtC,EAAO2C,cAAeL,KAC1CC,EAAcK,MAAMC,QAASP,MAC/B1D,EAAM6D,EAAQJ,GAIbG,EADID,IAAgBK,MAAMC,QAASjE,GAC3B,GACI2D,GAAgBvC,EAAO2C,cAAe/D,GAG1CA,EAFA,GAIT2D,GAAc,EAGdE,EAAQJ,GAASrC,EAAOmC,OAAQO,EAAMF,EAAOF,SAGzBQ,IAATR,IACXG,EAAQJ,GAASC,IAOrB,OAAOG,GAGRzC,EAAOmC,OAAQ,CAGdY,QAAS,UAAahD,EAAUiD,KAAKC,UAAWC,QAAS,MAAO,IAGhEC,SAAS,EAETC,MAAO,SAAUC,GAChB,MAAM,IAAItG,MAAOsG,IAGlBC,KAAM,aAENX,cAAe,SAAUpE,GACxB,IAAIgF,EAAOC,EAIX,SAAMjF,GAAgC,oBAAzBP,EAASN,KAAMa,QAI5BgF,EAAQnG,EAAUmB,KASK,mBADvBiF,EAAOvF,EAAOP,KAAM6F,EAAO,gBAAmBA,EAAM9C,cACftC,EAAWT,KAAM8F,KAAWpF,IAGlEqF,cAAe,SAAUlF,GACxB,IAAI8D,EAEJ,IAAMA,KAAQ9D,EACb,OAAO,EAER,OAAO,GAKRmF,WAAY,SAAU1E,EAAMoD,EAASlD,GACpCH,EAASC,EAAM,CAAEH,MAAOuD,GAAWA,EAAQvD,OAASK,IAGrDgC,KAAM,SAAU3C,EAAK4C,GACpB,IAAIb,EAAQnB,EAAI,EAEhB,GAAKkB,EAAa9B,IAEjB,IADA+B,EAAS/B,EAAI+B,OACLnB,EAAImB,EAAQnB,IACnB,IAAgD,IAA3CgC,EAASzD,KAAMa,EAAKY,GAAKA,EAAGZ,EAAKY,IACrC,WAIF,IAAMA,KAAKZ,EACV,IAAgD,IAA3C4C,EAASzD,KAAMa,EAAKY,GAAKA,EAAGZ,EAAKY,IACrC,MAKH,OAAOZ,GAIRoF,UAAW,SAAUxG,EAAKyG,GACzB,IAAI7C,EAAM6C,GAAW,GAarB,OAXY,MAAPzG,IACCkD,EAAahD,OAAQF,IACzB6C,EAAOgB,MAAOD,EACE,iBAAR5D,EACP,CAAEA,GAAQA,GAGXU,EAAKH,KAAMqD,EAAK5D,IAIX4D,GAGR8C,QAAS,SAAUxC,EAAMlE,EAAKgC,GAC7B,OAAc,MAAPhC,GAAe,EAAIW,EAAQJ,KAAMP,EAAKkE,EAAMlC,IAKpD6B,MAAO,SAAUO,EAAOuC,GAKvB,IAJA,IAAIhC,GAAOgC,EAAOxD,OACjByB,EAAI,EACJ5C,EAAIoC,EAAMjB,OAEHyB,EAAID,EAAKC,IAChBR,EAAOpC,KAAQ2E,EAAQ/B,GAKxB,OAFAR,EAAMjB,OAASnB,EAERoC,GAGRI,KAAM,SAAUb,EAAOK,EAAU4C,GAShC,IARA,IACCC,EAAU,GACV7E,EAAI,EACJmB,EAASQ,EAAMR,OACf2D,GAAkBF,EAIX5E,EAAImB,EAAQnB,KACAgC,EAAUL,EAAO3B,GAAKA,KAChB8E,GACxBD,EAAQnG,KAAMiD,EAAO3B,IAIvB,OAAO6E,GAIR5C,IAAK,SAAUN,EAAOK,EAAU+C,GAC/B,IAAI5D,EAAQ6D,EACXhF,EAAI,EACJ4B,EAAM,GAGP,GAAKV,EAAaS,GAEjB,IADAR,EAASQ,EAAMR,OACPnB,EAAImB,EAAQnB,IAGL,OAFdgF,EAAQhD,EAAUL,EAAO3B,GAAKA,EAAG+E,KAGhCnD,EAAIlD,KAAMsG,QAMZ,IAAMhF,KAAK2B,EAGI,OAFdqD,EAAQhD,EAAUL,EAAO3B,GAAKA,EAAG+E,KAGhCnD,EAAIlD,KAAMsG,GAMb,OAAO3G,EAAMuD,IAIdqD,KAAM,EAIN/F,QAASA,IAGa,mBAAXgG,SACXrE,EAAOG,GAAIkE,OAAOC,UAAanH,EAAKkH,OAAOC,WAI5CtE,EAAOkB,KAAM,uEAAuEqD,MAAO,KAC3F,SAAUC,EAAInC,GACbtE,EAAY,WAAasE,EAAO,KAAQA,EAAKoC,gBAmB9C,IAAIC,EAWJ,SAAY1H,GACZ,IAAImC,EACHd,EACAsG,EACAC,EACAC,EACAC,EACAC,EACAC,EACAC,EACAC,EACAC,EAGAC,EACAvI,EACAwI,EACAC,EACAC,EACAC,EACAxB,EACAyB,EAGA1C,EAAU,SAAW,EAAI,IAAI2C,KAC7BC,EAAe3I,EAAOH,SACtB+I,EAAU,EACVC,EAAO,EACPC,EAAaC,KACbC,EAAaD,KACbE,EAAgBF,KAChBG,EAAyBH,KACzBI,EAAY,SAAUC,EAAGC,GAIxB,OAHKD,IAAMC,IACVlB,GAAe,GAET,GAIRlH,EAAS,GAAOC,eAChBf,EAAM,GACNmJ,EAAMnJ,EAAImJ,IACVC,EAAapJ,EAAIU,KACjBA,EAAOV,EAAIU,KACXN,EAAQJ,EAAII,MAIZO,EAAU,SAAU0I,EAAMnF,GAGzB,IAFA,IAAIlC,EAAI,EACP2C,EAAM0E,EAAKlG,OACJnB,EAAI2C,EAAK3C,IAChB,GAAKqH,EAAMrH,KAAQkC,EAClB,OAAOlC,EAGT,OAAQ,GAGTsH,EAAW,6HAMXC,EAAa,sBAGbC,EAAa,0BAA4BD,EACxC,0CAGDE,EAAa,MAAQF,EAAa,KAAOC,EAAa,OAASD,EAG9D,gBAAkBA,EAIlB,2DAA6DC,EAAa,OAC1ED,EAAa,OAEdG,EAAU,KAAOF,EAAa,wFAOAC,EAAa,eAO3CE,EAAc,IAAIC,OAAQL,EAAa,IAAK,KAC5CM,EAAQ,IAAID,OAAQ,IAAML,EAAa,8BACtCA,EAAa,KAAM,KAEpBO,EAAS,IAAIF,OAAQ,IAAML,EAAa,KAAOA,EAAa,KAC5DQ,EAAe,IAAIH,OAAQ,IAAML,EAAa,WAAaA,EAAa,IAAMA,EAC7E,KACDS,EAAW,IAAIJ,OAAQL,EAAa,MAEpCU,EAAU,IAAIL,OAAQF,GACtBQ,EAAc,IAAIN,OAAQ,IAAMJ,EAAa,KAE7CW,EAAY,CACXC,GAAM,IAAIR,OAAQ,MAAQJ,EAAa,KACvCa,MAAS,IAAIT,OAAQ,QAAUJ,EAAa,KAC5Cc,IAAO,IAAIV,OAAQ,KAAOJ,EAAa,SACvCe,KAAQ,IAAIX,OAAQ,IAAMH,GAC1Be,OAAU,IAAIZ,OAAQ,IAAMF,GAC5Be,MAAS,IAAIb,OAAQ,yDACpBL,EAAa,+BAAiCA,EAAa,cAC3DA,EAAa,aAAeA,EAAa,SAAU,KACpDmB,KAAQ,IAAId,OAAQ,OAASN,EAAW,KAAM,KAI9CqB,aAAgB,IAAIf,OAAQ,IAAML,EACjC,mDAAqDA,EACrD,mBAAqBA,EAAa,mBAAoB,MAGxDqB,EAAQ,SACRC,EAAU,sCACVC,EAAU,SAEVC,EAAU,yBAGVC,EAAa,mCAEbC,GAAW,OAIXC,GAAY,IAAItB,OAAQ,uBAAyBL,EAAa,uBAAwB,KACtF4B,GAAY,SAAUC,EAAQC,GAC7B,IAAIC,EAAO,KAAOF,EAAOhL,MAAO,GAAM,MAEtC,OAAOiL,IASNC,EAAO,EACNC,OAAOC,aAAcF,EAAO,OAC5BC,OAAOC,aAAcF,GAAQ,GAAK,MAAe,KAAPA,EAAe,SAK5DG,GAAa,sDACbC,GAAa,SAAUC,EAAIC,GAC1B,OAAKA,EAGQ,OAAPD,EACG,SAIDA,EAAGvL,MAAO,GAAI,GAAM,KAC1BuL,EAAGE,WAAYF,EAAGxI,OAAS,GAAItC,SAAU,IAAO,IAI3C,KAAO8K,GAOfG,GAAgB,WACf7D,KAGD8D,GAAqBC,GACpB,SAAU9H,GACT,OAAyB,IAAlBA,EAAK+H,UAAqD,aAAhC/H,EAAKgI,SAAS5E,eAEhD,CAAE6E,IAAK,aAAcC,KAAM,WAI7B,IACC1L,EAAKD,MACFT,EAAMI,EAAMG,KAAMiI,EAAa6D,YACjC7D,EAAa6D,YAMdrM,EAAKwI,EAAa6D,WAAWlJ,QAAS9B,SACrC,MAAQiL,GACT5L,EAAO,CAAED,MAAOT,EAAImD,OAGnB,SAAUmC,EAAQiH,GACjBnD,EAAW3I,MAAO6E,EAAQlF,EAAMG,KAAMgM,KAKvC,SAAUjH,EAAQiH,GACjB,IAAI3H,EAAIU,EAAOnC,OACdnB,EAAI,EAGL,MAAUsD,EAAQV,KAAQ2H,EAAKvK,MAC/BsD,EAAOnC,OAASyB,EAAI,IAKvB,SAAS2C,GAAQzE,EAAUC,EAAS0D,EAAS+F,GAC5C,IAAIC,EAAGzK,EAAGkC,EAAMwI,EAAKC,EAAOC,EAAQC,EACnCC,EAAa/J,GAAWA,EAAQgK,cAGhC1L,EAAW0B,EAAUA,EAAQ1B,SAAW,EAKzC,GAHAoF,EAAUA,GAAW,GAGI,iBAAb3D,IAA0BA,GACxB,IAAbzB,GAA+B,IAAbA,GAA+B,KAAbA,EAEpC,OAAOoF,EAIR,IAAM+F,IACLvE,EAAalF,GACbA,EAAUA,GAAWrD,EAEhByI,GAAiB,CAIrB,GAAkB,KAAb9G,IAAqBsL,EAAQ3B,EAAWgC,KAAMlK,IAGlD,GAAO2J,EAAIE,EAAO,IAGjB,GAAkB,IAAbtL,EAAiB,CACrB,KAAO6C,EAAOnB,EAAQkK,eAAgBR,IAUrC,OAAOhG,EALP,GAAKvC,EAAKgJ,KAAOT,EAEhB,OADAhG,EAAQ/F,KAAMwD,GACPuC,OAYT,GAAKqG,IAAgB5I,EAAO4I,EAAWG,eAAgBR,KACtDnE,EAAUvF,EAASmB,IACnBA,EAAKgJ,KAAOT,EAGZ,OADAhG,EAAQ/F,KAAMwD,GACPuC,MAKH,CAAA,GAAKkG,EAAO,GAElB,OADAjM,EAAKD,MAAOgG,EAAS1D,EAAQoK,qBAAsBrK,IAC5C2D,EAGD,IAAOgG,EAAIE,EAAO,KAASzL,EAAQkM,wBACzCrK,EAAQqK,uBAGR,OADA1M,EAAKD,MAAOgG,EAAS1D,EAAQqK,uBAAwBX,IAC9ChG,EAKT,GAAKvF,EAAQmM,MACXtE,EAAwBjG,EAAW,QACjCsF,IAAcA,EAAUkF,KAAMxK,MAIlB,IAAbzB,GAAqD,WAAnC0B,EAAQmJ,SAAS5E,eAA+B,CAYpE,GAVAuF,EAAc/J,EACdgK,EAAa/J,EASK,IAAb1B,IACF2I,EAASsD,KAAMxK,IAAciH,EAAauD,KAAMxK,IAAe,EAGjEgK,EAAa7B,GAASqC,KAAMxK,IAAcyK,GAAaxK,EAAQN,aAC9DM,KAImBA,GAAY7B,EAAQsM,SAGhCd,EAAM3J,EAAQV,aAAc,OAClCqK,EAAMA,EAAI3G,QAAS0F,GAAYC,IAE/B3I,EAAQT,aAAc,KAAQoK,EAAM9G,IAMtC5D,GADA4K,EAASjF,EAAU7E,IACRK,OACX,MAAQnB,IACP4K,EAAQ5K,IAAQ0K,EAAM,IAAMA,EAAM,UAAa,IAC9Ce,GAAYb,EAAQ5K,IAEtB6K,EAAcD,EAAOc,KAAM,KAG5B,IAIC,OAHAhN,EAAKD,MAAOgG,EACXqG,EAAWa,iBAAkBd,IAEvBpG,EACN,MAAQmH,GACT7E,EAAwBjG,GAAU,GACjC,QACI4J,IAAQ9G,GACZ7C,EAAQ8K,gBAAiB,QAQ9B,OAAOhG,EAAQ/E,EAASiD,QAAS8D,EAAO,MAAQ9G,EAAS0D,EAAS+F,GASnE,SAAS5D,KACR,IAAIkF,EAAO,GAYX,OAVA,SAASC,EAAOC,EAAKhH,GAQpB,OALK8G,EAAKpN,KAAMsN,EAAM,KAAQxG,EAAKyG,oBAG3BF,EAAOD,EAAKI,SAEXH,EAAOC,EAAM,KAAQhH,GAShC,SAASmH,GAAcnL,GAEtB,OADAA,EAAI4C,IAAY,EACT5C,EAOR,SAASoL,GAAQpL,GAChB,IAAIqL,EAAK3O,EAASyC,cAAe,YAEjC,IACC,QAASa,EAAIqL,GACZ,MAAQ/B,GACT,OAAO,EACN,QAGI+B,EAAG5L,YACP4L,EAAG5L,WAAWC,YAAa2L,GAI5BA,EAAK,MASP,SAASC,GAAWC,EAAOC,GAC1B,IAAIxO,EAAMuO,EAAMnH,MAAO,KACtBpF,EAAIhC,EAAImD,OAET,MAAQnB,IACPwF,EAAKiH,WAAYzO,EAAKgC,IAAQwM,EAUhC,SAASE,GAAczF,EAAGC,GACzB,IAAIyF,EAAMzF,GAAKD,EACd2F,EAAOD,GAAsB,IAAf1F,EAAE5H,UAAiC,IAAf6H,EAAE7H,UACnC4H,EAAE4F,YAAc3F,EAAE2F,YAGpB,GAAKD,EACJ,OAAOA,EAIR,GAAKD,EACJ,MAAUA,EAAMA,EAAIG,YACnB,GAAKH,IAAQzF,EACZ,OAAQ,EAKX,OAAOD,EAAI,GAAK,EAOjB,SAAS8F,GAAmBvN,GAC3B,OAAO,SAAU0C,GAEhB,MAAgB,UADLA,EAAKgI,SAAS5E,eACEpD,EAAK1C,OAASA,GAQ3C,SAASwN,GAAoBxN,GAC5B,OAAO,SAAU0C,GAChB,IAAIgB,EAAOhB,EAAKgI,SAAS5E,cACzB,OAAkB,UAATpC,GAA6B,WAATA,IAAuBhB,EAAK1C,OAASA,GAQpE,SAASyN,GAAsBhD,GAG9B,OAAO,SAAU/H,GAKhB,MAAK,SAAUA,EASTA,EAAKzB,aAAgC,IAAlByB,EAAK+H,SAGvB,UAAW/H,EACV,UAAWA,EAAKzB,WACbyB,EAAKzB,WAAWwJ,WAAaA,EAE7B/H,EAAK+H,WAAaA,EAMpB/H,EAAKgL,aAAejD,GAI1B/H,EAAKgL,cAAgBjD,GACrBF,GAAoB7H,KAAW+H,EAG1B/H,EAAK+H,WAAaA,EAKd,UAAW/H,GACfA,EAAK+H,WAAaA,GAY5B,SAASkD,GAAwBnM,GAChC,OAAOmL,GAAc,SAAUiB,GAE9B,OADAA,GAAYA,EACLjB,GAAc,SAAU3B,EAAM3F,GACpC,IAAIjC,EACHyK,EAAerM,EAAI,GAAIwJ,EAAKrJ,OAAQiM,GACpCpN,EAAIqN,EAAalM,OAGlB,MAAQnB,IACFwK,EAAQ5H,EAAIyK,EAAcrN,MAC9BwK,EAAM5H,KAASiC,EAASjC,GAAM4H,EAAM5H,SAYzC,SAAS2I,GAAaxK,GACrB,OAAOA,GAAmD,oBAAjCA,EAAQoK,sBAAwCpK,EAkrC1E,IAAMf,KA9qCNd,EAAUqG,GAAOrG,QAAU,GAO3BwG,EAAQH,GAAOG,MAAQ,SAAUxD,GAChC,IAAIoL,EAAYpL,EAAKqL,aACpBrH,GAAYhE,EAAK6I,eAAiB7I,GAAOsL,gBAK1C,OAAQ5E,EAAM0C,KAAMgC,GAAapH,GAAWA,EAAQgE,UAAY,SAQjEjE,EAAcV,GAAOU,YAAc,SAAUnG,GAC5C,IAAI2N,EAAYC,EACf3N,EAAMD,EAAOA,EAAKiL,eAAiBjL,EAAO0G,EAO3C,OAAKzG,GAAOrC,GAA6B,IAAjBqC,EAAIV,UAAmBU,EAAIyN,kBAMnDtH,GADAxI,EAAWqC,GACQyN,gBACnBrH,GAAkBT,EAAOhI,GAQpB8I,GAAgB9I,IAClBgQ,EAAYhQ,EAASiQ,cAAiBD,EAAUE,MAAQF,IAGrDA,EAAUG,iBACdH,EAAUG,iBAAkB,SAAU/D,IAAe,GAG1C4D,EAAUI,aACrBJ,EAAUI,YAAa,WAAYhE,KASrC5K,EAAQsM,MAAQY,GAAQ,SAAUC,GAEjC,OADAnG,EAAQ1F,YAAa6L,GAAK7L,YAAa9C,EAASyC,cAAe,QACzB,oBAAxBkM,EAAGV,mBACfU,EAAGV,iBAAkB,uBAAwBxK,SAShDjC,EAAQuI,WAAa2E,GAAQ,SAAUC,GAEtC,OADAA,EAAG0B,UAAY,KACP1B,EAAGhM,aAAc,eAO1BnB,EAAQiM,qBAAuBiB,GAAQ,SAAUC,GAEhD,OADAA,EAAG7L,YAAa9C,EAASsQ,cAAe,MAChC3B,EAAGlB,qBAAsB,KAAMhK,SAIxCjC,EAAQkM,uBAAyBrC,EAAQuC,KAAM5N,EAAS0N,wBAMxDlM,EAAQ+O,QAAU7B,GAAQ,SAAUC,GAEnC,OADAnG,EAAQ1F,YAAa6L,GAAKnB,GAAKtH,GACvBlG,EAASwQ,oBAAsBxQ,EAASwQ,kBAAmBtK,GAAUzC,SAIzEjC,EAAQ+O,SACZzI,EAAK2I,OAAa,GAAI,SAAUjD,GAC/B,IAAIkD,EAASlD,EAAGnH,QAASmF,GAAWC,IACpC,OAAO,SAAUjH,GAChB,OAAOA,EAAK7B,aAAc,QAAW+N,IAGvC5I,EAAK6I,KAAW,GAAI,SAAUnD,EAAInK,GACjC,GAAuC,oBAA3BA,EAAQkK,gBAAkC9E,EAAiB,CACtE,IAAIjE,EAAOnB,EAAQkK,eAAgBC,GACnC,OAAOhJ,EAAO,CAAEA,GAAS,OAI3BsD,EAAK2I,OAAa,GAAK,SAAUjD,GAChC,IAAIkD,EAASlD,EAAGnH,QAASmF,GAAWC,IACpC,OAAO,SAAUjH,GAChB,IAAIpC,EAAwC,oBAA1BoC,EAAKoM,kBACtBpM,EAAKoM,iBAAkB,MACxB,OAAOxO,GAAQA,EAAKkF,QAAUoJ,IAMhC5I,EAAK6I,KAAW,GAAI,SAAUnD,EAAInK,GACjC,GAAuC,oBAA3BA,EAAQkK,gBAAkC9E,EAAiB,CACtE,IAAIrG,EAAME,EAAG2B,EACZO,EAAOnB,EAAQkK,eAAgBC,GAEhC,GAAKhJ,EAAO,CAIX,IADApC,EAAOoC,EAAKoM,iBAAkB,QACjBxO,EAAKkF,QAAUkG,EAC3B,MAAO,CAAEhJ,GAIVP,EAAQZ,EAAQmN,kBAAmBhD,GACnClL,EAAI,EACJ,MAAUkC,EAAOP,EAAO3B,KAEvB,IADAF,EAAOoC,EAAKoM,iBAAkB,QACjBxO,EAAKkF,QAAUkG,EAC3B,MAAO,CAAEhJ,GAKZ,MAAO,MAMVsD,EAAK6I,KAAY,IAAInP,EAAQiM,qBAC5B,SAAUoD,EAAKxN,GACd,MAA6C,oBAAjCA,EAAQoK,qBACZpK,EAAQoK,qBAAsBoD,GAG1BrP,EAAQmM,IACZtK,EAAQ4K,iBAAkB4C,QAD3B,GAKR,SAAUA,EAAKxN,GACd,IAAImB,EACHsM,EAAM,GACNxO,EAAI,EAGJyE,EAAU1D,EAAQoK,qBAAsBoD,GAGzC,GAAa,MAARA,EAAc,CAClB,MAAUrM,EAAOuC,EAASzE,KACF,IAAlBkC,EAAK7C,UACTmP,EAAI9P,KAAMwD,GAIZ,OAAOsM,EAER,OAAO/J,GAITe,EAAK6I,KAAc,MAAInP,EAAQkM,wBAA0B,SAAU2C,EAAWhN,GAC7E,GAA+C,oBAAnCA,EAAQqK,wBAA0CjF,EAC7D,OAAOpF,EAAQqK,uBAAwB2C,IAUzC1H,EAAgB,GAOhBD,EAAY,IAELlH,EAAQmM,IAAMtC,EAAQuC,KAAM5N,EAASiO,qBAI3CS,GAAQ,SAAUC,GAEjB,IAAIoC,EAOJvI,EAAQ1F,YAAa6L,GAAKqC,UAAY,UAAY9K,EAAU,qBAC1CA,EAAU,kEAOvByI,EAAGV,iBAAkB,wBAAyBxK,QAClDiF,EAAU1H,KAAM,SAAW6I,EAAa,gBAKnC8E,EAAGV,iBAAkB,cAAexK,QACzCiF,EAAU1H,KAAM,MAAQ6I,EAAa,aAAeD,EAAW,KAI1D+E,EAAGV,iBAAkB,QAAU/H,EAAU,MAAOzC,QACrDiF,EAAU1H,KAAM,OAQjB+P,EAAQ/Q,EAASyC,cAAe,UAC1BG,aAAc,OAAQ,IAC5B+L,EAAG7L,YAAaiO,GACVpC,EAAGV,iBAAkB,aAAcxK,QACxCiF,EAAU1H,KAAM,MAAQ6I,EAAa,QAAUA,EAAa,KAC3DA,EAAa,gBAMT8E,EAAGV,iBAAkB,YAAaxK,QACvCiF,EAAU1H,KAAM,YAMX2N,EAAGV,iBAAkB,KAAO/H,EAAU,MAAOzC,QAClDiF,EAAU1H,KAAM,YAKjB2N,EAAGV,iBAAkB,QACrBvF,EAAU1H,KAAM,iBAGjB0N,GAAQ,SAAUC,GACjBA,EAAGqC,UAAY,oFAKf,IAAID,EAAQ/Q,EAASyC,cAAe,SACpCsO,EAAMnO,aAAc,OAAQ,UAC5B+L,EAAG7L,YAAaiO,GAAQnO,aAAc,OAAQ,KAIzC+L,EAAGV,iBAAkB,YAAaxK,QACtCiF,EAAU1H,KAAM,OAAS6I,EAAa,eAKW,IAA7C8E,EAAGV,iBAAkB,YAAaxK,QACtCiF,EAAU1H,KAAM,WAAY,aAK7BwH,EAAQ1F,YAAa6L,GAAKpC,UAAW,EACc,IAA9CoC,EAAGV,iBAAkB,aAAcxK,QACvCiF,EAAU1H,KAAM,WAAY,aAK7B2N,EAAGV,iBAAkB,QACrBvF,EAAU1H,KAAM,YAIXQ,EAAQyP,gBAAkB5F,EAAQuC,KAAQzG,EAAUqB,EAAQrB,SAClEqB,EAAQ0I,uBACR1I,EAAQ2I,oBACR3I,EAAQ4I,kBACR5I,EAAQ6I,qBAER3C,GAAQ,SAAUC,GAIjBnN,EAAQ8P,kBAAoBnK,EAAQtG,KAAM8N,EAAI,KAI9CxH,EAAQtG,KAAM8N,EAAI,aAClBhG,EAAc3H,KAAM,KAAMgJ,KAI5BtB,EAAYA,EAAUjF,QAAU,IAAIyG,OAAQxB,EAAUsF,KAAM,MAC5DrF,EAAgBA,EAAclF,QAAU,IAAIyG,OAAQvB,EAAcqF,KAAM,MAIxE+B,EAAa1E,EAAQuC,KAAMpF,EAAQ+I,yBAKnC3I,EAAWmH,GAAc1E,EAAQuC,KAAMpF,EAAQI,UAC9C,SAAUW,EAAGC,GACZ,IAAIgI,EAAuB,IAAfjI,EAAE5H,SAAiB4H,EAAEuG,gBAAkBvG,EAClDkI,EAAMjI,GAAKA,EAAEzG,WACd,OAAOwG,IAAMkI,MAAWA,GAAwB,IAAjBA,EAAI9P,YAClC6P,EAAM5I,SACL4I,EAAM5I,SAAU6I,GAChBlI,EAAEgI,yBAA8D,GAAnChI,EAAEgI,wBAAyBE,MAG3D,SAAUlI,EAAGC,GACZ,GAAKA,EACJ,MAAUA,EAAIA,EAAEzG,WACf,GAAKyG,IAAMD,EACV,OAAO,EAIV,OAAO,GAOTD,EAAYyG,EACZ,SAAUxG,EAAGC,GAGZ,GAAKD,IAAMC,EAEV,OADAlB,GAAe,EACR,EAIR,IAAIoJ,GAAWnI,EAAEgI,yBAA2B/H,EAAE+H,wBAC9C,OAAKG,IAgBU,GAPfA,GAAYnI,EAAE8D,eAAiB9D,KAASC,EAAE6D,eAAiB7D,GAC1DD,EAAEgI,wBAAyB/H,GAG3B,KAIGhI,EAAQmQ,cAAgBnI,EAAE+H,wBAAyBhI,KAAQmI,EAOzDnI,GAAKvJ,GAAYuJ,EAAE8D,eAAiBvE,GACxCF,EAAUE,EAAcS,IAChB,EAOJC,GAAKxJ,GAAYwJ,EAAE6D,eAAiBvE,GACxCF,EAAUE,EAAcU,GACjB,EAIDnB,EACJpH,EAASoH,EAAWkB,GAAMtI,EAASoH,EAAWmB,GAChD,EAGe,EAAVkI,GAAe,EAAI,IAE3B,SAAUnI,EAAGC,GAGZ,GAAKD,IAAMC,EAEV,OADAlB,GAAe,EACR,EAGR,IAAI2G,EACH3M,EAAI,EACJsP,EAAMrI,EAAExG,WACR0O,EAAMjI,EAAEzG,WACR8O,EAAK,CAAEtI,GACPuI,EAAK,CAAEtI,GAGR,IAAMoI,IAAQH,EAMb,OAAOlI,GAAKvJ,GAAY,EACvBwJ,GAAKxJ,EAAW,EAEhB4R,GAAO,EACPH,EAAM,EACNpJ,EACEpH,EAASoH,EAAWkB,GAAMtI,EAASoH,EAAWmB,GAChD,EAGK,GAAKoI,IAAQH,EACnB,OAAOzC,GAAczF,EAAGC,GAIzByF,EAAM1F,EACN,MAAU0F,EAAMA,EAAIlM,WACnB8O,EAAGE,QAAS9C,GAEbA,EAAMzF,EACN,MAAUyF,EAAMA,EAAIlM,WACnB+O,EAAGC,QAAS9C,GAIb,MAAQ4C,EAAIvP,KAAQwP,EAAIxP,GACvBA,IAGD,OAAOA,EAGN0M,GAAc6C,EAAIvP,GAAKwP,EAAIxP,IAO3BuP,EAAIvP,IAAOwG,GAAgB,EAC3BgJ,EAAIxP,IAAOwG,EAAe,EAE1B,IAGK9I,GAGR6H,GAAOV,QAAU,SAAU6K,EAAMC,GAChC,OAAOpK,GAAQmK,EAAM,KAAM,KAAMC,IAGlCpK,GAAOoJ,gBAAkB,SAAUzM,EAAMwN,GAGxC,GAFAzJ,EAAa/D,GAERhD,EAAQyP,iBAAmBxI,IAC9BY,EAAwB2I,EAAO,QAC7BrJ,IAAkBA,EAAciF,KAAMoE,OACtCtJ,IAAkBA,EAAUkF,KAAMoE,IAErC,IACC,IAAI9N,EAAMiD,EAAQtG,KAAM2D,EAAMwN,GAG9B,GAAK9N,GAAO1C,EAAQ8P,mBAInB9M,EAAKxE,UAAuC,KAA3BwE,EAAKxE,SAAS2B,SAC/B,OAAOuC,EAEP,MAAQ0I,GACTvD,EAAwB2I,GAAM,GAIhC,OAAyD,EAAlDnK,GAAQmK,EAAMhS,EAAU,KAAM,CAAEwE,IAASf,QAGjDoE,GAAOe,SAAW,SAAUvF,EAASmB,GAUpC,OAHOnB,EAAQgK,eAAiBhK,IAAarD,GAC5CuI,EAAalF,GAEPuF,EAAUvF,EAASmB,IAG3BqD,GAAOqK,KAAO,SAAU1N,EAAMgB,IAOtBhB,EAAK6I,eAAiB7I,IAAUxE,GACtCuI,EAAa/D,GAGd,IAAIlB,EAAKwE,EAAKiH,WAAYvJ,EAAKoC,eAG9BrF,EAAMe,GAAMlC,EAAOP,KAAMiH,EAAKiH,WAAYvJ,EAAKoC,eAC9CtE,EAAIkB,EAAMgB,GAAOiD,QACjBxC,EAEF,YAAeA,IAAR1D,EACNA,EACAf,EAAQuI,aAAetB,EACtBjE,EAAK7B,aAAc6C,IACjBjD,EAAMiC,EAAKoM,iBAAkBpL,KAAYjD,EAAI4P,UAC9C5P,EAAI+E,MACJ,MAGJO,GAAO6D,OAAS,SAAU0G,GACzB,OAASA,EAAM,IAAK/L,QAAS0F,GAAYC,KAG1CnE,GAAOtB,MAAQ,SAAUC,GACxB,MAAM,IAAItG,MAAO,0CAA4CsG,IAO9DqB,GAAOwK,WAAa,SAAUtL,GAC7B,IAAIvC,EACH8N,EAAa,GACbpN,EAAI,EACJ5C,EAAI,EAOL,GAJAgG,GAAgB9G,EAAQ+Q,iBACxBlK,GAAa7G,EAAQgR,YAAczL,EAAQrG,MAAO,GAClDqG,EAAQ3B,KAAMkE,GAEThB,EAAe,CACnB,MAAU9D,EAAOuC,EAASzE,KACpBkC,IAASuC,EAASzE,KACtB4C,EAAIoN,EAAWtR,KAAMsB,IAGvB,MAAQ4C,IACP6B,EAAQ1B,OAAQiN,EAAYpN,GAAK,GAQnC,OAFAmD,EAAY,KAELtB,GAORgB,EAAUF,GAAOE,QAAU,SAAUvD,GACpC,IAAIpC,EACH8B,EAAM,GACN5B,EAAI,EACJX,EAAW6C,EAAK7C,SAEjB,GAAMA,GAQC,GAAkB,IAAbA,GAA+B,IAAbA,GAA+B,KAAbA,EAAkB,CAIjE,GAAiC,iBAArB6C,EAAKiO,YAChB,OAAOjO,EAAKiO,YAIZ,IAAMjO,EAAOA,EAAKkO,WAAYlO,EAAMA,EAAOA,EAAK4K,YAC/ClL,GAAO6D,EAASvD,QAGZ,GAAkB,IAAb7C,GAA+B,IAAbA,EAC7B,OAAO6C,EAAKmO,eAnBZ,MAAUvQ,EAAOoC,EAAMlC,KAGtB4B,GAAO6D,EAAS3F,GAqBlB,OAAO8B,IAGR4D,EAAOD,GAAO+K,UAAY,CAGzBrE,YAAa,GAEbsE,aAAcpE,GAEdxB,MAAOxC,EAEPsE,WAAY,GAEZ4B,KAAM,GAENmC,SAAU,CACTC,IAAK,CAAEtG,IAAK,aAAc/H,OAAO,GACjCsO,IAAK,CAAEvG,IAAK,cACZwG,IAAK,CAAExG,IAAK,kBAAmB/H,OAAO,GACtCwO,IAAK,CAAEzG,IAAK,oBAGb0G,UAAW,CACVtI,KAAQ,SAAUoC,GAWjB,OAVAA,EAAO,GAAMA,EAAO,GAAI5G,QAASmF,GAAWC,IAG5CwB,EAAO,IAAQA,EAAO,IAAOA,EAAO,IACnCA,EAAO,IAAO,IAAK5G,QAASmF,GAAWC,IAEpB,OAAfwB,EAAO,KACXA,EAAO,GAAM,IAAMA,EAAO,GAAM,KAG1BA,EAAMvM,MAAO,EAAG,IAGxBqK,MAAS,SAAUkC,GAiClB,OArBAA,EAAO,GAAMA,EAAO,GAAIrF,cAEU,QAA7BqF,EAAO,GAAIvM,MAAO,EAAG,IAGnBuM,EAAO,IACZpF,GAAOtB,MAAO0G,EAAO,IAKtBA,EAAO,KAASA,EAAO,GACtBA,EAAO,IAAQA,EAAO,IAAO,GAC7B,GAAqB,SAAfA,EAAO,IAAiC,QAAfA,EAAO,KACvCA,EAAO,KAAWA,EAAO,GAAMA,EAAO,IAAwB,QAAfA,EAAO,KAG3CA,EAAO,IAClBpF,GAAOtB,MAAO0G,EAAO,IAGfA,GAGRnC,OAAU,SAAUmC,GACnB,IAAImG,EACHC,GAAYpG,EAAO,IAAOA,EAAO,GAElC,OAAKxC,EAAmB,MAAEmD,KAAMX,EAAO,IAC/B,MAIHA,EAAO,GACXA,EAAO,GAAMA,EAAO,IAAOA,EAAO,IAAO,GAG9BoG,GAAY9I,EAAQqD,KAAMyF,KAGnCD,EAASnL,EAAUoL,GAAU,MAG7BD,EAASC,EAASpS,QAAS,IAAKoS,EAAS5P,OAAS2P,GAAWC,EAAS5P,UAGxEwJ,EAAO,GAAMA,EAAO,GAAIvM,MAAO,EAAG0S,GAClCnG,EAAO,GAAMoG,EAAS3S,MAAO,EAAG0S,IAI1BnG,EAAMvM,MAAO,EAAG,MAIzB+P,OAAQ,CAEP7F,IAAO,SAAU0I,GAChB,IAAI9G,EAAW8G,EAAiBjN,QAASmF,GAAWC,IAAY7D,cAChE,MAA4B,MAArB0L,EACN,WACC,OAAO,GAER,SAAU9O,GACT,OAAOA,EAAKgI,UAAYhI,EAAKgI,SAAS5E,gBAAkB4E,IAI3D7B,MAAS,SAAU0F,GAClB,IAAIkD,EAAUtK,EAAYoH,EAAY,KAEtC,OAAOkD,IACJA,EAAU,IAAIrJ,OAAQ,MAAQL,EAC/B,IAAMwG,EAAY,IAAMxG,EAAa,SAAaZ,EACjDoH,EAAW,SAAU7L,GACpB,OAAO+O,EAAQ3F,KACY,iBAAnBpJ,EAAK6L,WAA0B7L,EAAK6L,WACd,oBAAtB7L,EAAK7B,cACX6B,EAAK7B,aAAc,UACpB,OAKNkI,KAAQ,SAAUrF,EAAMgO,EAAUC,GACjC,OAAO,SAAUjP,GAChB,IAAIkP,EAAS7L,GAAOqK,KAAM1N,EAAMgB,GAEhC,OAAe,MAAVkO,EACgB,OAAbF,GAEFA,IAINE,GAAU,GAIU,MAAbF,EAAmBE,IAAWD,EACvB,OAAbD,EAAoBE,IAAWD,EAClB,OAAbD,EAAoBC,GAAqC,IAA5BC,EAAOzS,QAASwS,GAChC,OAAbD,EAAoBC,IAAoC,EAA3BC,EAAOzS,QAASwS,GAChC,OAAbD,EAAoBC,GAASC,EAAOhT,OAAQ+S,EAAMhQ,UAAagQ,EAClD,OAAbD,GAA2F,GAArE,IAAME,EAAOrN,QAAS4D,EAAa,KAAQ,KAAMhJ,QAASwS,GACnE,OAAbD,IAAoBE,IAAWD,GAASC,EAAOhT,MAAO,EAAG+S,EAAMhQ,OAAS,KAAQgQ,EAAQ,QAO3F1I,MAAS,SAAUjJ,EAAM6R,EAAMC,EAAWlP,EAAOE,GAChD,IAAIiP,EAAgC,QAAvB/R,EAAKpB,MAAO,EAAG,GAC3BoT,EAA+B,SAArBhS,EAAKpB,OAAQ,GACvBqT,EAAkB,YAATJ,EAEV,OAAiB,IAAVjP,GAAwB,IAATE,EAGrB,SAAUJ,GACT,QAASA,EAAKzB,YAGf,SAAUyB,EAAMwP,EAAUC,GACzB,IAAI5F,EAAO6F,EAAaC,EAAY/R,EAAMgS,EAAWC,EACpD5H,EAAMoH,IAAWC,EAAU,cAAgB,kBAC3CQ,EAAS9P,EAAKzB,WACdyC,EAAOuO,GAAUvP,EAAKgI,SAAS5E,cAC/B2M,GAAYN,IAAQF,EACpB7E,GAAO,EAER,GAAKoF,EAAS,CAGb,GAAKT,EAAS,CACb,MAAQpH,EAAM,CACbrK,EAAOoC,EACP,MAAUpC,EAAOA,EAAMqK,GACtB,GAAKsH,EACJ3R,EAAKoK,SAAS5E,gBAAkBpC,EACd,IAAlBpD,EAAKT,SAEL,OAAO,EAKT0S,EAAQ5H,EAAe,SAAT3K,IAAoBuS,GAAS,cAE5C,OAAO,EAMR,GAHAA,EAAQ,CAAEP,EAAUQ,EAAO5B,WAAa4B,EAAOE,WAG1CV,GAAWS,EAAW,CAe1BrF,GADAkF,GADA/F,GAHA6F,GAJAC,GADA/R,EAAOkS,GACYpO,KAAe9D,EAAM8D,GAAY,KAI1B9D,EAAKqS,YAC5BN,EAAY/R,EAAKqS,UAAa,KAEZ3S,IAAU,IACZ,KAAQiH,GAAWsF,EAAO,KACzBA,EAAO,GAC3BjM,EAAOgS,GAAaE,EAAO3H,WAAYyH,GAEvC,MAAUhS,IAASgS,GAAahS,GAAQA,EAAMqK,KAG3CyC,EAAOkF,EAAY,IAAOC,EAAM5K,MAGlC,GAAuB,IAAlBrH,EAAKT,YAAoBuN,GAAQ9M,IAASoC,EAAO,CACrD0P,EAAapS,GAAS,CAAEiH,EAASqL,EAAWlF,GAC5C,YAyBF,GAlBKqF,IAaJrF,EADAkF,GADA/F,GAHA6F,GAJAC,GADA/R,EAAOoC,GACY0B,KAAe9D,EAAM8D,GAAY,KAI1B9D,EAAKqS,YAC5BN,EAAY/R,EAAKqS,UAAa,KAEZ3S,IAAU,IACZ,KAAQiH,GAAWsF,EAAO,KAMhC,IAATa,EAGJ,MAAU9M,IAASgS,GAAahS,GAAQA,EAAMqK,KAC3CyC,EAAOkF,EAAY,IAAOC,EAAM5K,MAElC,IAAOsK,EACN3R,EAAKoK,SAAS5E,gBAAkBpC,EACd,IAAlBpD,EAAKT,aACHuN,IAGGqF,KAMJL,GALAC,EAAa/R,EAAM8D,KAChB9D,EAAM8D,GAAY,KAIK9D,EAAKqS,YAC5BN,EAAY/R,EAAKqS,UAAa,KAEpB3S,GAAS,CAAEiH,EAASmG,IAG7B9M,IAASoC,GACb,MASL,OADA0K,GAAQtK,KACQF,GAAWwK,EAAOxK,GAAU,GAAqB,GAAhBwK,EAAOxK,KAK5DoG,OAAU,SAAU4J,EAAQhF,GAM3B,IAAIiF,EACHrR,EAAKwE,EAAKkC,QAAS0K,IAAY5M,EAAK8M,WAAYF,EAAO9M,gBACtDC,GAAOtB,MAAO,uBAAyBmO,GAKzC,OAAKpR,EAAI4C,GACD5C,EAAIoM,GAIK,EAAZpM,EAAGG,QACPkR,EAAO,CAAED,EAAQA,EAAQ,GAAIhF,GACtB5H,EAAK8M,WAAWvT,eAAgBqT,EAAO9M,eAC7C6G,GAAc,SAAU3B,EAAM3F,GAC7B,IAAI0N,EACHC,EAAUxR,EAAIwJ,EAAM4C,GACpBpN,EAAIwS,EAAQrR,OACb,MAAQnB,IAEPwK,EADA+H,EAAM5T,EAAS6L,EAAMgI,EAASxS,OACb6E,EAAS0N,GAAQC,EAASxS,MAG7C,SAAUkC,GACT,OAAOlB,EAAIkB,EAAM,EAAGmQ,KAIhBrR,IAIT0G,QAAS,CAGR+K,IAAOtG,GAAc,SAAUrL,GAK9B,IAAI2N,EAAQ,GACXhK,EAAU,GACViO,EAAU9M,EAAS9E,EAASiD,QAAS8D,EAAO,OAE7C,OAAO6K,EAAS9O,GACfuI,GAAc,SAAU3B,EAAM3F,EAAS6M,EAAUC,GAChD,IAAIzP,EACHyQ,EAAYD,EAASlI,EAAM,KAAMmH,EAAK,IACtC3R,EAAIwK,EAAKrJ,OAGV,MAAQnB,KACAkC,EAAOyQ,EAAW3S,MACxBwK,EAAMxK,KAAS6E,EAAS7E,GAAMkC,MAIjC,SAAUA,EAAMwP,EAAUC,GAMzB,OALAlD,EAAO,GAAMvM,EACbwQ,EAASjE,EAAO,KAAMkD,EAAKlN,GAG3BgK,EAAO,GAAM,MACLhK,EAAQ0C,SAInByL,IAAOzG,GAAc,SAAUrL,GAC9B,OAAO,SAAUoB,GAChB,OAAyC,EAAlCqD,GAAQzE,EAAUoB,GAAOf,UAIlCmF,SAAY6F,GAAc,SAAU/L,GAEnC,OADAA,EAAOA,EAAK2D,QAASmF,GAAWC,IACzB,SAAUjH,GAChB,OAAkE,GAAzDA,EAAKiO,aAAe1K,EAASvD,IAASvD,QAASyB,MAW1DyS,KAAQ1G,GAAc,SAAU0G,GAO/B,OAJM3K,EAAYoD,KAAMuH,GAAQ,KAC/BtN,GAAOtB,MAAO,qBAAuB4O,GAEtCA,EAAOA,EAAK9O,QAASmF,GAAWC,IAAY7D,cACrC,SAAUpD,GAChB,IAAI4Q,EACJ,GACC,GAAOA,EAAW3M,EACjBjE,EAAK2Q,KACL3Q,EAAK7B,aAAc,aAAgB6B,EAAK7B,aAAc,QAGtD,OADAyS,EAAWA,EAASxN,iBACAuN,GAA2C,IAAnCC,EAASnU,QAASkU,EAAO,YAE3C3Q,EAAOA,EAAKzB,aAAkC,IAAlByB,EAAK7C,UAC7C,OAAO,KAKTiE,OAAU,SAAUpB,GACnB,IAAI6Q,EAAOlV,EAAOmV,UAAYnV,EAAOmV,SAASD,KAC9C,OAAOA,GAAQA,EAAK3U,MAAO,KAAQ8D,EAAKgJ,IAGzC+H,KAAQ,SAAU/Q,GACjB,OAAOA,IAASgE,GAGjBgN,MAAS,SAAUhR,GAClB,OAAOA,IAASxE,EAASyV,iBACrBzV,EAAS0V,UAAY1V,EAAS0V,gBAC7BlR,EAAK1C,MAAQ0C,EAAKmR,OAASnR,EAAKoR,WAItCC,QAAWtG,IAAsB,GACjChD,SAAYgD,IAAsB,GAElCuG,QAAW,SAAUtR,GAIpB,IAAIgI,EAAWhI,EAAKgI,SAAS5E,cAC7B,MAAsB,UAAb4E,KAA0BhI,EAAKsR,SACxB,WAAbtJ,KAA2BhI,EAAKuR,UAGpCA,SAAY,SAAUvR,GASrB,OALKA,EAAKzB,YAETyB,EAAKzB,WAAWiT,eAGQ,IAAlBxR,EAAKuR,UAIbE,MAAS,SAAUzR,GAMlB,IAAMA,EAAOA,EAAKkO,WAAYlO,EAAMA,EAAOA,EAAK4K,YAC/C,GAAK5K,EAAK7C,SAAW,EACpB,OAAO,EAGT,OAAO,GAGR2S,OAAU,SAAU9P,GACnB,OAAQsD,EAAKkC,QAAiB,MAAGxF,IAIlC0R,OAAU,SAAU1R,GACnB,OAAO4G,EAAQwC,KAAMpJ,EAAKgI,WAG3BuE,MAAS,SAAUvM,GAClB,OAAO2G,EAAQyC,KAAMpJ,EAAKgI,WAG3B2J,OAAU,SAAU3R,GACnB,IAAIgB,EAAOhB,EAAKgI,SAAS5E,cACzB,MAAgB,UAATpC,GAAkC,WAAdhB,EAAK1C,MAA8B,WAAT0D,GAGtD9C,KAAQ,SAAU8B,GACjB,IAAI0N,EACJ,MAAuC,UAAhC1N,EAAKgI,SAAS5E,eACN,SAAdpD,EAAK1C,OAIuC,OAAxCoQ,EAAO1N,EAAK7B,aAAc,UACN,SAAvBuP,EAAKtK,gBAIRlD,MAAS+K,GAAwB,WAChC,MAAO,CAAE,KAGV7K,KAAQ6K,GAAwB,SAAU2G,EAAe3S,GACxD,MAAO,CAAEA,EAAS,KAGnBkB,GAAM8K,GAAwB,SAAU2G,EAAe3S,EAAQiM,GAC9D,MAAO,CAAEA,EAAW,EAAIA,EAAWjM,EAASiM,KAG7C7K,KAAQ4K,GAAwB,SAAUE,EAAclM,GAEvD,IADA,IAAInB,EAAI,EACAA,EAAImB,EAAQnB,GAAK,EACxBqN,EAAa3O,KAAMsB,GAEpB,OAAOqN,IAGR3K,IAAOyK,GAAwB,SAAUE,EAAclM,GAEtD,IADA,IAAInB,EAAI,EACAA,EAAImB,EAAQnB,GAAK,EACxBqN,EAAa3O,KAAMsB,GAEpB,OAAOqN,IAGR0G,GAAM5G,GAAwB,SAAUE,EAAclM,EAAQiM,GAM7D,IALA,IAAIpN,EAAIoN,EAAW,EAClBA,EAAWjM,EACAA,EAAXiM,EACCjM,EACAiM,EACa,KAALpN,GACTqN,EAAa3O,KAAMsB,GAEpB,OAAOqN,IAGR2G,GAAM7G,GAAwB,SAAUE,EAAclM,EAAQiM,GAE7D,IADA,IAAIpN,EAAIoN,EAAW,EAAIA,EAAWjM,EAASiM,IACjCpN,EAAImB,GACbkM,EAAa3O,KAAMsB,GAEpB,OAAOqN,OAKL3F,QAAe,IAAIlC,EAAKkC,QAAc,GAGhC,CAAEuM,OAAO,EAAMC,UAAU,EAAMC,MAAM,EAAMC,UAAU,EAAMC,OAAO,GAC5E7O,EAAKkC,QAAS1H,GAAM+M,GAAmB/M,GAExC,IAAMA,IAAK,CAAEsU,QAAQ,EAAMC,OAAO,GACjC/O,EAAKkC,QAAS1H,GAAMgN,GAAoBhN,GAIzC,SAASsS,MA0ET,SAAS7G,GAAY+I,GAIpB,IAHA,IAAIxU,EAAI,EACP2C,EAAM6R,EAAOrT,OACbL,EAAW,GACJd,EAAI2C,EAAK3C,IAChBc,GAAY0T,EAAQxU,GAAIgF,MAEzB,OAAOlE,EAGR,SAASkJ,GAAe0I,EAAS+B,EAAYC,GAC5C,IAAIvK,EAAMsK,EAAWtK,IACpBwK,EAAOF,EAAWrK,KAClB4B,EAAM2I,GAAQxK,EACdyK,EAAmBF,GAAgB,eAAR1I,EAC3B6I,EAAWnO,IAEZ,OAAO+N,EAAWrS,MAGjB,SAAUF,EAAMnB,EAAS4Q,GACxB,MAAUzP,EAAOA,EAAMiI,GACtB,GAAuB,IAAlBjI,EAAK7C,UAAkBuV,EAC3B,OAAOlC,EAASxQ,EAAMnB,EAAS4Q,GAGjC,OAAO,GAIR,SAAUzP,EAAMnB,EAAS4Q,GACxB,IAAImD,EAAUlD,EAAaC,EAC1BkD,EAAW,CAAEtO,EAASoO,GAGvB,GAAKlD,GACJ,MAAUzP,EAAOA,EAAMiI,GACtB,IAAuB,IAAlBjI,EAAK7C,UAAkBuV,IACtBlC,EAASxQ,EAAMnB,EAAS4Q,GAC5B,OAAO,OAKV,MAAUzP,EAAOA,EAAMiI,GACtB,GAAuB,IAAlBjI,EAAK7C,UAAkBuV,EAQ3B,GAHAhD,GAJAC,EAAa3P,EAAM0B,KAAe1B,EAAM0B,GAAY,KAI1B1B,EAAKiQ,YAC5BN,EAAY3P,EAAKiQ,UAAa,IAE5BwC,GAAQA,IAASzS,EAAKgI,SAAS5E,cACnCpD,EAAOA,EAAMiI,IAASjI,MAChB,CAAA,IAAO4S,EAAWlD,EAAa5F,KACrC8I,EAAU,KAAQrO,GAAWqO,EAAU,KAAQD,EAG/C,OAASE,EAAU,GAAMD,EAAU,GAOnC,IAHAlD,EAAa5F,GAAQ+I,GAGJ,GAAMrC,EAASxQ,EAAMnB,EAAS4Q,GAC9C,OAAO,EAMZ,OAAO,GAIV,SAASqD,GAAgBC,GACxB,OAAyB,EAAlBA,EAAS9T,OACf,SAAUe,EAAMnB,EAAS4Q,GACxB,IAAI3R,EAAIiV,EAAS9T,OACjB,MAAQnB,IACP,IAAMiV,EAAUjV,GAAKkC,EAAMnB,EAAS4Q,GACnC,OAAO,EAGT,OAAO,GAERsD,EAAU,GAYZ,SAASC,GAAUvC,EAAW1Q,EAAKkM,EAAQpN,EAAS4Q,GAOnD,IANA,IAAIzP,EACHiT,EAAe,GACfnV,EAAI,EACJ2C,EAAMgQ,EAAUxR,OAChBiU,EAAgB,MAAPnT,EAEFjC,EAAI2C,EAAK3C,KACTkC,EAAOyQ,EAAW3S,MAClBmO,IAAUA,EAAQjM,EAAMnB,EAAS4Q,KACtCwD,EAAazW,KAAMwD,GACdkT,GACJnT,EAAIvD,KAAMsB,KAMd,OAAOmV,EAGR,SAASE,GAAYxE,EAAW/P,EAAU4R,EAAS4C,EAAYC,EAAYC,GAO1E,OANKF,IAAeA,EAAY1R,KAC/B0R,EAAaD,GAAYC,IAErBC,IAAeA,EAAY3R,KAC/B2R,EAAaF,GAAYE,EAAYC,IAE/BrJ,GAAc,SAAU3B,EAAM/F,EAAS1D,EAAS4Q,GACtD,IAAI8D,EAAMzV,EAAGkC,EACZwT,EAAS,GACTC,EAAU,GACVC,EAAcnR,EAAQtD,OAGtBQ,EAAQ6I,GA5CX,SAA2B1J,EAAU+U,EAAUpR,GAG9C,IAFA,IAAIzE,EAAI,EACP2C,EAAMkT,EAAS1U,OACRnB,EAAI2C,EAAK3C,IAChBuF,GAAQzE,EAAU+U,EAAU7V,GAAKyE,GAElC,OAAOA,EAsCWqR,CACfhV,GAAY,IACZC,EAAQ1B,SAAW,CAAE0B,GAAYA,EACjC,IAIDgV,GAAYlF,IAAerG,GAAS1J,EAEnCa,EADAuT,GAAUvT,EAAO+T,EAAQ7E,EAAW9P,EAAS4Q,GAG9CqE,EAAatD,EAGZ6C,IAAgB/K,EAAOqG,EAAY+E,GAAeN,GAGjD,GAGA7Q,EACDsR,EAQF,GALKrD,GACJA,EAASqD,EAAWC,EAAYjV,EAAS4Q,GAIrC2D,EAAa,CACjBG,EAAOP,GAAUc,EAAYL,GAC7BL,EAAYG,EAAM,GAAI1U,EAAS4Q,GAG/B3R,EAAIyV,EAAKtU,OACT,MAAQnB,KACAkC,EAAOuT,EAAMzV,MACnBgW,EAAYL,EAAS3V,MAAW+V,EAAWJ,EAAS3V,IAAQkC,IAK/D,GAAKsI,GACJ,GAAK+K,GAAc1E,EAAY,CAC9B,GAAK0E,EAAa,CAGjBE,EAAO,GACPzV,EAAIgW,EAAW7U,OACf,MAAQnB,KACAkC,EAAO8T,EAAYhW,KAGzByV,EAAK/W,KAAQqX,EAAW/V,GAAMkC,GAGhCqT,EAAY,KAAQS,EAAa,GAAMP,EAAM9D,GAI9C3R,EAAIgW,EAAW7U,OACf,MAAQnB,KACAkC,EAAO8T,EAAYhW,MACsC,GAA7DyV,EAAOF,EAAa5W,EAAS6L,EAAMtI,GAASwT,EAAQ1V,MAEtDwK,EAAMiL,KAAYhR,EAASgR,GAASvT,UAOvC8T,EAAad,GACZc,IAAevR,EACduR,EAAWjT,OAAQ6S,EAAaI,EAAW7U,QAC3C6U,GAEGT,EACJA,EAAY,KAAM9Q,EAASuR,EAAYrE,GAEvCjT,EAAKD,MAAOgG,EAASuR,KAMzB,SAASC,GAAmBzB,GAyB3B,IAxBA,IAAI0B,EAAcxD,EAAS9P,EAC1BD,EAAM6R,EAAOrT,OACbgV,EAAkB3Q,EAAKgL,SAAUgE,EAAQ,GAAIhV,MAC7C4W,EAAmBD,GAAmB3Q,EAAKgL,SAAU,KACrDxQ,EAAImW,EAAkB,EAAI,EAG1BE,EAAerM,GAAe,SAAU9H,GACvC,OAAOA,IAASgU,GACdE,GAAkB,GACrBE,EAAkBtM,GAAe,SAAU9H,GAC1C,OAAwC,EAAjCvD,EAASuX,EAAchU,IAC5BkU,GAAkB,GACrBnB,EAAW,CAAE,SAAU/S,EAAMnB,EAAS4Q,GACrC,IAAI/P,GAASuU,IAAqBxE,GAAO5Q,IAAY+E,MAClDoQ,EAAenV,GAAU1B,SAC1BgX,EAAcnU,EAAMnB,EAAS4Q,GAC7B2E,EAAiBpU,EAAMnB,EAAS4Q,IAIlC,OADAuE,EAAe,KACRtU,IAGD5B,EAAI2C,EAAK3C,IAChB,GAAO0S,EAAUlN,EAAKgL,SAAUgE,EAAQxU,GAAIR,MAC3CyV,EAAW,CAAEjL,GAAegL,GAAgBC,GAAYvC,QAClD,CAIN,IAHAA,EAAUlN,EAAK2I,OAAQqG,EAAQxU,GAAIR,MAAOf,MAAO,KAAM+V,EAAQxU,GAAI6E,UAGrDjB,GAAY,CAIzB,IADAhB,IAAM5C,EACE4C,EAAID,EAAKC,IAChB,GAAK4C,EAAKgL,SAAUgE,EAAQ5R,GAAIpD,MAC/B,MAGF,OAAO6V,GACF,EAAJrV,GAASgV,GAAgBC,GACrB,EAAJjV,GAASyL,GAGT+I,EACEpW,MAAO,EAAG4B,EAAI,GACdxB,OAAQ,CAAEwG,MAAgC,MAAzBwP,EAAQxU,EAAI,GAAIR,KAAe,IAAM,MACtDuE,QAAS8D,EAAO,MAClB6K,EACA1S,EAAI4C,GAAKqT,GAAmBzB,EAAOpW,MAAO4B,EAAG4C,IAC7CA,EAAID,GAAOsT,GAAqBzB,EAASA,EAAOpW,MAAOwE,IACvDA,EAAID,GAAO8I,GAAY+I,IAGzBS,EAASvW,KAAMgU,GAIjB,OAAOsC,GAAgBC,GAoTxB,OAtpBA3C,GAAWlR,UAAYoE,EAAK+Q,QAAU/Q,EAAKkC,QAC3ClC,EAAK8M,WAAa,IAAIA,GAEtB3M,EAAWJ,GAAOI,SAAW,SAAU7E,EAAU0V,GAChD,IAAIhE,EAAS7H,EAAO6J,EAAQhV,EAC3BiX,EAAO7L,EAAQ8L,EACfC,EAAS9P,EAAY/F,EAAW,KAEjC,GAAK6V,EACJ,OAAOH,EAAY,EAAIG,EAAOvY,MAAO,GAGtCqY,EAAQ3V,EACR8J,EAAS,GACT8L,EAAalR,EAAKqL,UAElB,MAAQ4F,EAAQ,CA2Bf,IAAMjX,KAxBAgT,KAAa7H,EAAQ7C,EAAOkD,KAAMyL,MAClC9L,IAGJ8L,EAAQA,EAAMrY,MAAOuM,EAAO,GAAIxJ,SAAYsV,GAE7C7L,EAAOlM,KAAQ8V,EAAS,KAGzBhC,GAAU,GAGH7H,EAAQ5C,EAAaiD,KAAMyL,MACjCjE,EAAU7H,EAAMuB,QAChBsI,EAAO9V,KAAM,CACZsG,MAAOwN,EAGPhT,KAAMmL,EAAO,GAAI5G,QAAS8D,EAAO,OAElC4O,EAAQA,EAAMrY,MAAOoU,EAAQrR,SAIhBqE,EAAK2I,SACXxD,EAAQxC,EAAW3I,GAAOwL,KAAMyL,KAAgBC,EAAYlX,MAChEmL,EAAQ+L,EAAYlX,GAAQmL,MAC9B6H,EAAU7H,EAAMuB,QAChBsI,EAAO9V,KAAM,CACZsG,MAAOwN,EACPhT,KAAMA,EACNqF,QAAS8F,IAEV8L,EAAQA,EAAMrY,MAAOoU,EAAQrR,SAI/B,IAAMqR,EACL,MAOF,OAAOgE,EACNC,EAAMtV,OACNsV,EACClR,GAAOtB,MAAOnD,GAGd+F,EAAY/F,EAAU8J,GAASxM,MAAO,IA4ZzCwH,EAAUL,GAAOK,QAAU,SAAU9E,EAAU6J,GAC9C,IAAI3K,EA9H8B4W,EAAiBC,EAC/CC,EACHC,EACAC,EA4HAH,EAAc,GACdD,EAAkB,GAClBD,EAAS7P,EAAehG,EAAW,KAEpC,IAAM6V,EAAS,CAGRhM,IACLA,EAAQhF,EAAU7E,IAEnBd,EAAI2K,EAAMxJ,OACV,MAAQnB,KACP2W,EAASV,GAAmBtL,EAAO3K,KACtB4D,GACZiT,EAAYnY,KAAMiY,GAElBC,EAAgBlY,KAAMiY,IAKxBA,EAAS7P,EACRhG,GArJgC8V,EAsJNA,EArJxBE,EAA6B,GADkBD,EAsJNA,GArJrB1V,OACvB4V,EAAqC,EAAzBH,EAAgBzV,OAC5B6V,EAAe,SAAUxM,EAAMzJ,EAAS4Q,EAAKlN,EAASwS,GACrD,IAAI/U,EAAMU,EAAG8P,EACZwE,EAAe,EACflX,EAAI,IACJ2S,EAAYnI,GAAQ,GACpB2M,EAAa,GACbC,EAAgBtR,EAGhBnE,EAAQ6I,GAAQuM,GAAavR,EAAK6I,KAAY,IAAG,IAAK4I,GAGtDI,EAAkB5Q,GAA4B,MAAjB2Q,EAAwB,EAAIvT,KAAKC,UAAY,GAC1EnB,EAAMhB,EAAMR,OAcb,IAZK8V,IAMJnR,EAAmB/E,GAAWrD,GAAYqD,GAAWkW,GAM9CjX,IAAM2C,GAAgC,OAAvBT,EAAOP,EAAO3B,IAAeA,IAAM,CACzD,GAAK+W,GAAa7U,EAAO,CACxBU,EAAI,EAME7B,GAAWmB,EAAK6I,eAAiBrN,IACtCuI,EAAa/D,GACbyP,GAAOxL,GAER,MAAUuM,EAAUkE,EAAiBhU,KACpC,GAAK8P,EAASxQ,EAAMnB,GAAWrD,EAAUiU,GAAQ,CAChDlN,EAAQ/F,KAAMwD,GACd,MAGG+U,IACJxQ,EAAU4Q,GAKPP,KAGG5U,GAAQwQ,GAAWxQ,IACzBgV,IAII1M,GACJmI,EAAUjU,KAAMwD,IAgBnB,GATAgV,GAAgBlX,EASX8W,GAAS9W,IAAMkX,EAAe,CAClCtU,EAAI,EACJ,MAAU8P,EAAUmE,EAAajU,KAChC8P,EAASC,EAAWwE,EAAYpW,EAAS4Q,GAG1C,GAAKnH,EAAO,CAGX,GAAoB,EAAf0M,EACJ,MAAQlX,IACC2S,EAAW3S,IAAOmX,EAAYnX,KACrCmX,EAAYnX,GAAMmH,EAAI5I,KAAMkG,IAM/B0S,EAAajC,GAAUiC,GAIxBzY,EAAKD,MAAOgG,EAAS0S,GAGhBF,IAAczM,GAA4B,EAApB2M,EAAWhW,QACG,EAAtC+V,EAAeL,EAAY1V,QAE7BoE,GAAOwK,WAAYtL,GAUrB,OALKwS,IACJxQ,EAAU4Q,EACVvR,EAAmBsR,GAGbzE,GAGFmE,EACN3K,GAAc6K,GACdA,KAgCOlW,SAAWA,EAEnB,OAAO6V,GAYR9Q,EAASN,GAAOM,OAAS,SAAU/E,EAAUC,EAAS0D,EAAS+F,GAC9D,IAAIxK,EAAGwU,EAAQ8C,EAAO9X,EAAM6O,EAC3BkJ,EAA+B,mBAAbzW,GAA2BA,EAC7C6J,GAASH,GAAQ7E,EAAY7E,EAAWyW,EAASzW,UAAYA,GAM9D,GAJA2D,EAAUA,GAAW,GAIC,IAAjBkG,EAAMxJ,OAAe,CAIzB,GAAqB,GADrBqT,EAAS7J,EAAO,GAAMA,EAAO,GAAIvM,MAAO,IAC5B+C,QAA+C,QAA/BmW,EAAQ9C,EAAQ,IAAMhV,MAC5B,IAArBuB,EAAQ1B,UAAkB8G,GAAkBX,EAAKgL,SAAUgE,EAAQ,GAAIhV,MAAS,CAIhF,KAFAuB,GAAYyE,EAAK6I,KAAW,GAAGiJ,EAAMzS,QAAS,GAC5Cd,QAASmF,GAAWC,IAAapI,IAAa,IAAM,IAErD,OAAO0D,EAGI8S,IACXxW,EAAUA,EAAQN,YAGnBK,EAAWA,EAAS1C,MAAOoW,EAAOtI,QAAQlH,MAAM7D,QAIjDnB,EAAImI,EAA0B,aAAEmD,KAAMxK,GAAa,EAAI0T,EAAOrT,OAC9D,MAAQnB,IAAM,CAIb,GAHAsX,EAAQ9C,EAAQxU,GAGXwF,EAAKgL,SAAYhR,EAAO8X,EAAM9X,MAClC,MAED,IAAO6O,EAAO7I,EAAK6I,KAAM7O,MAGjBgL,EAAO6D,EACbiJ,EAAMzS,QAAS,GAAId,QAASmF,GAAWC,IACvCF,GAASqC,KAAMkJ,EAAQ,GAAIhV,OAAU+L,GAAaxK,EAAQN,aACzDM,IACI,CAKL,GAFAyT,EAAOzR,OAAQ/C,EAAG,KAClBc,EAAW0J,EAAKrJ,QAAUsK,GAAY+I,IAGrC,OADA9V,EAAKD,MAAOgG,EAAS+F,GACd/F,EAGR,QAeJ,OAPE8S,GAAY3R,EAAS9E,EAAU6J,IAChCH,EACAzJ,GACCoF,EACD1B,GACC1D,GAAWkI,GAASqC,KAAMxK,IAAcyK,GAAaxK,EAAQN,aAAgBM,GAExE0D,GAMRvF,EAAQgR,WAAatM,EAAQwB,MAAO,IAAKtC,KAAMkE,GAAY0E,KAAM,MAAS9H,EAI1E1E,EAAQ+Q,mBAAqBjK,EAG7BC,IAIA/G,EAAQmQ,aAAejD,GAAQ,SAAUC,GAGxC,OAA4E,EAArEA,EAAG4C,wBAAyBvR,EAASyC,cAAe,eAMtDiM,GAAQ,SAAUC,GAEvB,OADAA,EAAGqC,UAAY,mBACiC,MAAzCrC,EAAG+D,WAAW/P,aAAc,WAEnCiM,GAAW,yBAA0B,SAAUpK,EAAMgB,EAAMwC,GAC1D,IAAMA,EACL,OAAOxD,EAAK7B,aAAc6C,EAA6B,SAAvBA,EAAKoC,cAA2B,EAAI,KAOjEpG,EAAQuI,YAAe2E,GAAQ,SAAUC,GAG9C,OAFAA,EAAGqC,UAAY,WACfrC,EAAG+D,WAAW9P,aAAc,QAAS,IACY,KAA1C+L,EAAG+D,WAAW/P,aAAc,YAEnCiM,GAAW,QAAS,SAAUpK,EAAMsV,EAAO9R,GAC1C,IAAMA,GAAyC,UAAhCxD,EAAKgI,SAAS5E,cAC5B,OAAOpD,EAAKuV,eAOTrL,GAAQ,SAAUC,GACvB,OAAwC,MAAjCA,EAAGhM,aAAc,eAExBiM,GAAWhF,EAAU,SAAUpF,EAAMgB,EAAMwC,GAC1C,IAAIzF,EACJ,IAAMyF,EACL,OAAwB,IAAjBxD,EAAMgB,GAAkBA,EAAKoC,eACjCrF,EAAMiC,EAAKoM,iBAAkBpL,KAAYjD,EAAI4P,UAC9C5P,EAAI+E,MACJ,OAKEO,GA14EP,CA44EK1H,GAILgD,EAAOwN,KAAO9I,EACd1E,EAAO6O,KAAOnK,EAAO+K,UAGrBzP,EAAO6O,KAAM,KAAQ7O,EAAO6O,KAAKhI,QACjC7G,EAAOkP,WAAalP,EAAO6W,OAASnS,EAAOwK,WAC3ClP,EAAOT,KAAOmF,EAAOE,QACrB5E,EAAO8W,SAAWpS,EAAOG,MACzB7E,EAAOyF,SAAWf,EAAOe,SACzBzF,EAAO+W,eAAiBrS,EAAO6D,OAK/B,IAAIe,EAAM,SAAUjI,EAAMiI,EAAK0N,GAC9B,IAAIrF,EAAU,GACbsF,OAAqBnU,IAAVkU,EAEZ,OAAU3V,EAAOA,EAAMiI,KAA6B,IAAlBjI,EAAK7C,SACtC,GAAuB,IAAlB6C,EAAK7C,SAAiB,CAC1B,GAAKyY,GAAYjX,EAAQqB,GAAO6V,GAAIF,GACnC,MAEDrF,EAAQ9T,KAAMwD,GAGhB,OAAOsQ,GAIJwF,EAAW,SAAUC,EAAG/V,GAG3B,IAFA,IAAIsQ,EAAU,GAENyF,EAAGA,EAAIA,EAAEnL,YACI,IAAfmL,EAAE5Y,UAAkB4Y,IAAM/V,GAC9BsQ,EAAQ9T,KAAMuZ,GAIhB,OAAOzF,GAIJ0F,EAAgBrX,EAAO6O,KAAK/E,MAAMhC,aAItC,SAASuB,EAAUhI,EAAMgB,GAEvB,OAAOhB,EAAKgI,UAAYhI,EAAKgI,SAAS5E,gBAAkBpC,EAAKoC,cAG/D,IAAI6S,EAAa,kEAKjB,SAASC,EAAQzI,EAAU0I,EAAW5F,GACrC,OAAKtT,EAAYkZ,GACTxX,EAAO2B,KAAMmN,EAAU,SAAUzN,EAAMlC,GAC7C,QAASqY,EAAU9Z,KAAM2D,EAAMlC,EAAGkC,KAAWuQ,IAK1C4F,EAAUhZ,SACPwB,EAAO2B,KAAMmN,EAAU,SAAUzN,GACvC,OAASA,IAASmW,IAAgB5F,IAKV,iBAAd4F,EACJxX,EAAO2B,KAAMmN,EAAU,SAAUzN,GACvC,OAA4C,EAAnCvD,EAAQJ,KAAM8Z,EAAWnW,KAAkBuQ,IAK/C5R,EAAOsN,OAAQkK,EAAW1I,EAAU8C,GAG5C5R,EAAOsN,OAAS,SAAUuB,EAAM/N,EAAO8Q,GACtC,IAAIvQ,EAAOP,EAAO,GAMlB,OAJK8Q,IACJ/C,EAAO,QAAUA,EAAO,KAGH,IAAjB/N,EAAMR,QAAkC,IAAlBe,EAAK7C,SACxBwB,EAAOwN,KAAKM,gBAAiBzM,EAAMwN,GAAS,CAAExN,GAAS,GAGxDrB,EAAOwN,KAAKxJ,QAAS6K,EAAM7O,EAAO2B,KAAMb,EAAO,SAAUO,GAC/D,OAAyB,IAAlBA,EAAK7C,aAIdwB,EAAOG,GAAGgC,OAAQ,CACjBqL,KAAM,SAAUvN,GACf,IAAId,EAAG4B,EACNe,EAAM7E,KAAKqD,OACXmX,EAAOxa,KAER,GAAyB,iBAAbgD,EACX,OAAOhD,KAAK4D,UAAWb,EAAQC,GAAWqN,OAAQ,WACjD,IAAMnO,EAAI,EAAGA,EAAI2C,EAAK3C,IACrB,GAAKa,EAAOyF,SAAUgS,EAAMtY,GAAKlC,MAChC,OAAO,KAQX,IAFA8D,EAAM9D,KAAK4D,UAAW,IAEhB1B,EAAI,EAAGA,EAAI2C,EAAK3C,IACrBa,EAAOwN,KAAMvN,EAAUwX,EAAMtY,GAAK4B,GAGnC,OAAa,EAANe,EAAU9B,EAAOkP,WAAYnO,GAAQA,GAE7CuM,OAAQ,SAAUrN,GACjB,OAAOhD,KAAK4D,UAAW0W,EAAQta,KAAMgD,GAAY,IAAI,KAEtD2R,IAAK,SAAU3R,GACd,OAAOhD,KAAK4D,UAAW0W,EAAQta,KAAMgD,GAAY,IAAI,KAEtDiX,GAAI,SAAUjX,GACb,QAASsX,EACRta,KAIoB,iBAAbgD,GAAyBoX,EAAc5M,KAAMxK,GACnDD,EAAQC,GACRA,GAAY,IACb,GACCK,UASJ,IAAIoX,EAMHvP,EAAa,uCAENnI,EAAOG,GAAGC,KAAO,SAAUH,EAAUC,EAASkS,GACpD,IAAItI,EAAOzI,EAGX,IAAMpB,EACL,OAAOhD,KAQR,GAHAmV,EAAOA,GAAQsF,EAGU,iBAAbzX,EAAwB,CAanC,KAPC6J,EALsB,MAAlB7J,EAAU,IACsB,MAApCA,EAAUA,EAASK,OAAS,IACT,GAAnBL,EAASK,OAGD,CAAE,KAAML,EAAU,MAGlBkI,EAAWgC,KAAMlK,MAIV6J,EAAO,IAAQ5J,EA6CxB,OAAMA,GAAWA,EAAQM,QACtBN,GAAWkS,GAAO5E,KAAMvN,GAK1BhD,KAAKwD,YAAaP,GAAUsN,KAAMvN,GAhDzC,GAAK6J,EAAO,GAAM,CAYjB,GAXA5J,EAAUA,aAAmBF,EAASE,EAAS,GAAMA,EAIrDF,EAAOgB,MAAO/D,KAAM+C,EAAO2X,UAC1B7N,EAAO,GACP5J,GAAWA,EAAQ1B,SAAW0B,EAAQgK,eAAiBhK,EAAUrD,GACjE,IAIIya,EAAW7M,KAAMX,EAAO,KAAS9J,EAAO2C,cAAezC,GAC3D,IAAM4J,KAAS5J,EAGT5B,EAAYrB,KAAM6M,IACtB7M,KAAM6M,GAAS5J,EAAS4J,IAIxB7M,KAAK8R,KAAMjF,EAAO5J,EAAS4J,IAK9B,OAAO7M,KAYP,OARAoE,EAAOxE,EAASuN,eAAgBN,EAAO,OAKtC7M,KAAM,GAAMoE,EACZpE,KAAKqD,OAAS,GAERrD,KAcH,OAAKgD,EAASzB,UACpBvB,KAAM,GAAMgD,EACZhD,KAAKqD,OAAS,EACPrD,MAIIqB,EAAY2B,QACD6C,IAAfsP,EAAKwF,MACXxF,EAAKwF,MAAO3X,GAGZA,EAAUD,GAGLA,EAAO2D,UAAW1D,EAAUhD,QAIhCsD,UAAYP,EAAOG,GAGxBuX,EAAa1X,EAAQnD,GAGrB,IAAIgb,EAAe,iCAGlBC,EAAmB,CAClBC,UAAU,EACVC,UAAU,EACVzO,MAAM,EACN0O,MAAM,GAoFR,SAASC,EAASpM,EAAKxC,GACtB,OAAUwC,EAAMA,EAAKxC,KAA4B,IAAjBwC,EAAItN,UACpC,OAAOsN,EAnFR9L,EAAOG,GAAGgC,OAAQ,CACjB4P,IAAK,SAAUtP,GACd,IAAI0V,EAAUnY,EAAQyC,EAAQxF,MAC7Bmb,EAAID,EAAQ7X,OAEb,OAAOrD,KAAKqQ,OAAQ,WAEnB,IADA,IAAInO,EAAI,EACAA,EAAIiZ,EAAGjZ,IACd,GAAKa,EAAOyF,SAAUxI,KAAMkb,EAAShZ,IACpC,OAAO,KAMXkZ,QAAS,SAAU5I,EAAWvP,GAC7B,IAAI4L,EACH3M,EAAI,EACJiZ,EAAInb,KAAKqD,OACTqR,EAAU,GACVwG,EAA+B,iBAAd1I,GAA0BzP,EAAQyP,GAGpD,IAAM4H,EAAc5M,KAAMgF,GACzB,KAAQtQ,EAAIiZ,EAAGjZ,IACd,IAAM2M,EAAM7O,KAAMkC,GAAK2M,GAAOA,IAAQ5L,EAAS4L,EAAMA,EAAIlM,WAGxD,GAAKkM,EAAItN,SAAW,KAAQ2Z,GACH,EAAxBA,EAAQG,MAAOxM,GAGE,IAAjBA,EAAItN,UACHwB,EAAOwN,KAAKM,gBAAiBhC,EAAK2D,IAAgB,CAEnDkC,EAAQ9T,KAAMiO,GACd,MAMJ,OAAO7O,KAAK4D,UAA4B,EAAjB8Q,EAAQrR,OAAaN,EAAOkP,WAAYyC,GAAYA,IAI5E2G,MAAO,SAAUjX,GAGhB,OAAMA,EAKe,iBAATA,EACJvD,EAAQJ,KAAMsC,EAAQqB,GAAQpE,KAAM,IAIrCa,EAAQJ,KAAMT,KAGpBoE,EAAKb,OAASa,EAAM,GAAMA,GAZjBpE,KAAM,IAAOA,KAAM,GAAI2C,WAAe3C,KAAKsE,QAAQgX,UAAUjY,QAAU,GAgBlFkY,IAAK,SAAUvY,EAAUC,GACxB,OAAOjD,KAAK4D,UACXb,EAAOkP,WACNlP,EAAOgB,MAAO/D,KAAK0D,MAAOX,EAAQC,EAAUC,OAK/CuY,QAAS,SAAUxY,GAClB,OAAOhD,KAAKub,IAAiB,MAAZvY,EAChBhD,KAAKgE,WAAahE,KAAKgE,WAAWqM,OAAQrN,OAU7CD,EAAOkB,KAAM,CACZiQ,OAAQ,SAAU9P,GACjB,IAAI8P,EAAS9P,EAAKzB,WAClB,OAAOuR,GAA8B,KAApBA,EAAO3S,SAAkB2S,EAAS,MAEpDuH,QAAS,SAAUrX,GAClB,OAAOiI,EAAKjI,EAAM,eAEnBsX,aAAc,SAAUtX,EAAMmD,EAAIwS,GACjC,OAAO1N,EAAKjI,EAAM,aAAc2V,IAEjCzN,KAAM,SAAUlI,GACf,OAAO6W,EAAS7W,EAAM,gBAEvB4W,KAAM,SAAU5W,GACf,OAAO6W,EAAS7W,EAAM,oBAEvBuX,QAAS,SAAUvX,GAClB,OAAOiI,EAAKjI,EAAM,gBAEnBkX,QAAS,SAAUlX,GAClB,OAAOiI,EAAKjI,EAAM,oBAEnBwX,UAAW,SAAUxX,EAAMmD,EAAIwS,GAC9B,OAAO1N,EAAKjI,EAAM,cAAe2V,IAElC8B,UAAW,SAAUzX,EAAMmD,EAAIwS,GAC9B,OAAO1N,EAAKjI,EAAM,kBAAmB2V,IAEtCG,SAAU,SAAU9V,GACnB,OAAO8V,GAAY9V,EAAKzB,YAAc,IAAK2P,WAAYlO,IAExD0W,SAAU,SAAU1W,GACnB,OAAO8V,EAAU9V,EAAKkO,aAEvByI,SAAU,SAAU3W,GACnB,OAA6B,MAAxBA,EAAK0X,iBAKT3b,EAAUiE,EAAK0X,iBAER1X,EAAK0X,iBAMR1P,EAAUhI,EAAM,cACpBA,EAAOA,EAAK2X,SAAW3X,GAGjBrB,EAAOgB,MAAO,GAAIK,EAAKmI,eAE7B,SAAUnH,EAAMlC,GAClBH,EAAOG,GAAIkC,GAAS,SAAU2U,EAAO/W,GACpC,IAAI0R,EAAU3R,EAAOoB,IAAKnE,KAAMkD,EAAI6W,GAuBpC,MArB0B,UAArB3U,EAAK9E,OAAQ,KACjB0C,EAAW+W,GAGP/W,GAAgC,iBAAbA,IACvB0R,EAAU3R,EAAOsN,OAAQrN,EAAU0R,IAGjB,EAAd1U,KAAKqD,SAGHwX,EAAkBzV,IACvBrC,EAAOkP,WAAYyC,GAIfkG,EAAapN,KAAMpI,IACvBsP,EAAQsH,WAIHhc,KAAK4D,UAAW8Q,MAGzB,IAAIuH,EAAgB,oBAsOpB,SAASC,EAAUC,GAClB,OAAOA,EAER,SAASC,EAASC,GACjB,MAAMA,EAGP,SAASC,EAAYpV,EAAOqV,EAASC,EAAQC,GAC5C,IAAIC,EAEJ,IAGMxV,GAAS7F,EAAcqb,EAASxV,EAAMyV,SAC1CD,EAAOjc,KAAMyG,GAAQ0B,KAAM2T,GAAUK,KAAMJ,GAGhCtV,GAAS7F,EAAcqb,EAASxV,EAAM2V,MACjDH,EAAOjc,KAAMyG,EAAOqV,EAASC,GAQ7BD,EAAQ5b,WAAOkF,EAAW,CAAEqB,GAAQ5G,MAAOmc,IAM3C,MAAQvV,GAITsV,EAAO7b,WAAOkF,EAAW,CAAEqB,KAvO7BnE,EAAO+Z,UAAY,SAAU3X,GA9B7B,IAAwBA,EACnB4X,EAiCJ5X,EAA6B,iBAAZA,GAlCMA,EAmCPA,EAlCZ4X,EAAS,GACbha,EAAOkB,KAAMkB,EAAQ0H,MAAOoP,IAAmB,GAAI,SAAUe,EAAGC,GAC/DF,EAAQE,IAAS,IAEXF,GA+BNha,EAAOmC,OAAQ,GAAIC,GAEpB,IACC+X,EAGAC,EAGAC,EAGAC,EAGA9T,EAAO,GAGP+T,EAAQ,GAGRC,GAAe,EAGfC,EAAO,WAQN,IALAH,EAASA,GAAUlY,EAAQsY,KAI3BL,EAAQF,GAAS,EACTI,EAAMja,OAAQka,GAAe,EAAI,CACxCJ,EAASG,EAAMlP,QACf,QAAUmP,EAAchU,EAAKlG,QAGmC,IAA1DkG,EAAMgU,GAAc5c,MAAOwc,EAAQ,GAAKA,EAAQ,KACpDhY,EAAQuY,cAGRH,EAAchU,EAAKlG,OACnB8Z,GAAS,GAMNhY,EAAQgY,SACbA,GAAS,GAGVD,GAAS,EAGJG,IAIH9T,EADI4T,EACG,GAIA,KAMV3C,EAAO,CAGNe,IAAK,WA2BJ,OA1BKhS,IAGC4T,IAAWD,IACfK,EAAchU,EAAKlG,OAAS,EAC5Bia,EAAM1c,KAAMuc,IAGb,SAAW5B,EAAKhH,GACfxR,EAAOkB,KAAMsQ,EAAM,SAAUyI,EAAG/V,GAC1B5F,EAAY4F,GACV9B,EAAQyU,QAAWY,EAAK1F,IAAK7N,IAClCsC,EAAK3I,KAAMqG,GAEDA,GAAOA,EAAI5D,QAA4B,WAAlBR,EAAQoE,IAGxCsU,EAAKtU,KATR,CAYK5C,WAEA8Y,IAAWD,GACfM,KAGKxd,MAIR2d,OAAQ,WAYP,OAXA5a,EAAOkB,KAAMI,UAAW,SAAU2Y,EAAG/V,GACpC,IAAIoU,EACJ,OAA0D,GAAhDA,EAAQtY,EAAO6D,QAASK,EAAKsC,EAAM8R,IAC5C9R,EAAKtE,OAAQoW,EAAO,GAGfA,GAASkC,GACbA,MAIIvd,MAKR8U,IAAK,SAAU5R,GACd,OAAOA,GACwB,EAA9BH,EAAO6D,QAAS1D,EAAIqG,GACN,EAAdA,EAAKlG,QAIPwS,MAAO,WAIN,OAHKtM,IACJA,EAAO,IAEDvJ,MAMR4d,QAAS,WAGR,OAFAP,EAASC,EAAQ,GACjB/T,EAAO4T,EAAS,GACTnd,MAERmM,SAAU,WACT,OAAQ5C,GAMTsU,KAAM,WAKL,OAJAR,EAASC,EAAQ,GACXH,GAAWD,IAChB3T,EAAO4T,EAAS,IAEVnd,MAERqd,OAAQ,WACP,QAASA,GAIVS,SAAU,SAAU7a,EAASsR,GAS5B,OARM8I,IAEL9I,EAAO,CAAEtR,GADTsR,EAAOA,GAAQ,IACQjU,MAAQiU,EAAKjU,QAAUiU,GAC9C+I,EAAM1c,KAAM2T,GACN2I,GACLM,KAGKxd,MAIRwd,KAAM,WAEL,OADAhD,EAAKsD,SAAU9d,KAAMqE,WACdrE,MAIRod,MAAO,WACN,QAASA,IAIZ,OAAO5C,GA4CRzX,EAAOmC,OAAQ,CAEd6Y,SAAU,SAAUC,GACnB,IAAIC,EAAS,CAIX,CAAE,SAAU,WAAYlb,EAAO+Z,UAAW,UACzC/Z,EAAO+Z,UAAW,UAAY,GAC/B,CAAE,UAAW,OAAQ/Z,EAAO+Z,UAAW,eACtC/Z,EAAO+Z,UAAW,eAAiB,EAAG,YACvC,CAAE,SAAU,OAAQ/Z,EAAO+Z,UAAW,eACrC/Z,EAAO+Z,UAAW,eAAiB,EAAG,aAExCoB,EAAQ,UACRvB,EAAU,CACTuB,MAAO,WACN,OAAOA,GAERC,OAAQ,WAEP,OADAC,EAASxV,KAAMvE,WAAYuY,KAAMvY,WAC1BrE,MAERqe,QAAS,SAAUnb,GAClB,OAAOyZ,EAAQE,KAAM,KAAM3Z,IAI5Bob,KAAM,WACL,IAAIC,EAAMla,UAEV,OAAOtB,EAAOgb,SAAU,SAAUS,GACjCzb,EAAOkB,KAAMga,EAAQ,SAAU1W,EAAIkX,GAGlC,IAAIvb,EAAK7B,EAAYkd,EAAKE,EAAO,MAAWF,EAAKE,EAAO,IAKxDL,EAAUK,EAAO,IAAO,WACvB,IAAIC,EAAWxb,GAAMA,EAAGvC,MAAOX,KAAMqE,WAChCqa,GAAYrd,EAAYqd,EAAS/B,SACrC+B,EAAS/B,UACPgC,SAAUH,EAASI,QACnBhW,KAAM4V,EAASjC,SACfK,KAAM4B,EAAShC,QAEjBgC,EAAUC,EAAO,GAAM,QACtBze,KACAkD,EAAK,CAAEwb,GAAara,eAKxBka,EAAM,OACH5B,WAELE,KAAM,SAAUgC,EAAaC,EAAYC,GACxC,IAAIC,EAAW,EACf,SAASzC,EAAS0C,EAAOb,EAAU1P,EAASwQ,GAC3C,OAAO,WACN,IAAIC,EAAOnf,KACVuU,EAAOlQ,UACP+a,EAAa,WACZ,IAAIV,EAAU7B,EAKd,KAAKoC,EAAQD,GAAb,CAQA,IAJAN,EAAWhQ,EAAQ/N,MAAOwe,EAAM5K,MAId6J,EAASzB,UAC1B,MAAM,IAAI0C,UAAW,4BAOtBxC,EAAO6B,IAKgB,iBAAbA,GACY,mBAAbA,IACRA,EAAS7B,KAGLxb,EAAYwb,GAGXqC,EACJrC,EAAKpc,KACJie,EACAnC,EAASyC,EAAUZ,EAAUlC,EAAUgD,GACvC3C,EAASyC,EAAUZ,EAAUhC,EAAS8C,KAOvCF,IAEAnC,EAAKpc,KACJie,EACAnC,EAASyC,EAAUZ,EAAUlC,EAAUgD,GACvC3C,EAASyC,EAAUZ,EAAUhC,EAAS8C,GACtC3C,EAASyC,EAAUZ,EAAUlC,EAC5BkC,EAASkB,eASP5Q,IAAYwN,IAChBiD,OAAOtZ,EACP0O,EAAO,CAAEmK,KAKRQ,GAAWd,EAASmB,aAAeJ,EAAM5K,MAK7CiL,EAAUN,EACTE,EACA,WACC,IACCA,IACC,MAAQ5S,GAEJzJ,EAAOgb,SAAS0B,eACpB1c,EAAOgb,SAAS0B,cAAejT,EAC9BgT,EAAQE,YAMQV,GAAbC,EAAQ,IAIPvQ,IAAY0N,IAChB+C,OAAOtZ,EACP0O,EAAO,CAAE/H,IAGV4R,EAASuB,WAAYR,EAAM5K,MAS3B0K,EACJO,KAKKzc,EAAOgb,SAAS6B,eACpBJ,EAAQE,WAAa3c,EAAOgb,SAAS6B,gBAEtC7f,EAAO8f,WAAYL,KAKtB,OAAOzc,EAAOgb,SAAU,SAAUS,GAGjCP,EAAQ,GAAK,GAAI1C,IAChBgB,EACC,EACAiC,EACAnd,EAAY0d,GACXA,EACA7C,EACDsC,EAASc,aAKXrB,EAAQ,GAAK,GAAI1C,IAChBgB,EACC,EACAiC,EACAnd,EAAYwd,GACXA,EACA3C,IAKH+B,EAAQ,GAAK,GAAI1C,IAChBgB,EACC,EACAiC,EACAnd,EAAYyd,GACXA,EACA1C,MAGAO,WAKLA,QAAS,SAAUrb,GAClB,OAAc,MAAPA,EAAcyB,EAAOmC,OAAQ5D,EAAKqb,GAAYA,IAGvDyB,EAAW,GAkEZ,OA/DArb,EAAOkB,KAAMga,EAAQ,SAAU/b,EAAGuc,GACjC,IAAIlV,EAAOkV,EAAO,GACjBqB,EAAcrB,EAAO,GAKtB9B,EAAS8B,EAAO,IAAQlV,EAAKgS,IAGxBuE,GACJvW,EAAKgS,IACJ,WAIC2C,EAAQ4B,GAKT7B,EAAQ,EAAI/b,GAAK,GAAI0b,QAIrBK,EAAQ,EAAI/b,GAAK,GAAI0b,QAGrBK,EAAQ,GAAK,GAAIJ,KAGjBI,EAAQ,GAAK,GAAIJ,MAOnBtU,EAAKgS,IAAKkD,EAAO,GAAIjB,MAKrBY,EAAUK,EAAO,IAAQ,WAExB,OADAL,EAAUK,EAAO,GAAM,QAAUze,OAASoe,OAAWvY,EAAY7F,KAAMqE,WAChErE,MAMRoe,EAAUK,EAAO,GAAM,QAAWlV,EAAKuU,WAIxCnB,EAAQA,QAASyB,GAGZJ,GACJA,EAAKvd,KAAM2d,EAAUA,GAIfA,GAIR2B,KAAM,SAAUC,GACf,IAGCC,EAAY5b,UAAUhB,OAGtBnB,EAAI+d,EAGJC,EAAkBva,MAAOzD,GACzBie,EAAgB7f,EAAMG,KAAM4D,WAG5B+b,EAASrd,EAAOgb,WAGhBsC,EAAa,SAAUne,GACtB,OAAO,SAAUgF,GAChBgZ,EAAiBhe,GAAMlC,KACvBmgB,EAAeje,GAAyB,EAAnBmC,UAAUhB,OAAa/C,EAAMG,KAAM4D,WAAc6C,IAC5D+Y,GACTG,EAAOb,YAAaW,EAAiBC,KAMzC,GAAKF,GAAa,IACjB3D,EAAY0D,EAAaI,EAAOxX,KAAMyX,EAAYne,IAAMqa,QAAS6D,EAAO5D,QACtEyD,GAGsB,YAAnBG,EAAOlC,SACX7c,EAAY8e,EAAeje,IAAOie,EAAeje,GAAI2a,OAErD,OAAOuD,EAAOvD,OAKhB,MAAQ3a,IACPoa,EAAY6D,EAAeje,GAAKme,EAAYne,GAAKke,EAAO5D,QAGzD,OAAO4D,EAAOzD,aAOhB,IAAI2D,EAAc,yDAElBvd,EAAOgb,SAAS0B,cAAgB,SAAUtZ,EAAOoa,GAI3CxgB,EAAOygB,SAAWzgB,EAAOygB,QAAQC,MAAQta,GAASma,EAAY9S,KAAMrH,EAAMf,OAC9ErF,EAAOygB,QAAQC,KAAM,8BAAgCta,EAAMua,QAASva,EAAMoa,MAAOA,IAOnFxd,EAAO4d,eAAiB,SAAUxa,GACjCpG,EAAO8f,WAAY,WAClB,MAAM1Z,KAQR,IAAIya,EAAY7d,EAAOgb,WAkDvB,SAAS8C,IACRjhB,EAASkhB,oBAAqB,mBAAoBD,GAClD9gB,EAAO+gB,oBAAqB,OAAQD,GACpC9d,EAAO4X,QAnDR5X,EAAOG,GAAGyX,MAAQ,SAAUzX,GAY3B,OAVA0d,EACE/D,KAAM3Z,GAKNmb,SAAO,SAAUlY,GACjBpD,EAAO4d,eAAgBxa,KAGlBnG,MAGR+C,EAAOmC,OAAQ,CAGdgB,SAAS,EAIT6a,UAAW,EAGXpG,MAAO,SAAUqG,KAGF,IAATA,IAAkBje,EAAOge,UAAYhe,EAAOmD,WAKjDnD,EAAOmD,SAAU,KAGZ8a,GAAsC,IAAnBje,EAAOge,WAK/BH,EAAUrB,YAAa3f,EAAU,CAAEmD,OAIrCA,EAAO4X,MAAMkC,KAAO+D,EAAU/D,KAaD,aAAxBjd,EAASqhB,YACa,YAAxBrhB,EAASqhB,aAA6BrhB,EAAS8P,gBAAgBwR,SAGjEnhB,EAAO8f,WAAY9c,EAAO4X,QAK1B/a,EAASmQ,iBAAkB,mBAAoB8Q,GAG/C9gB,EAAOgQ,iBAAkB,OAAQ8Q,IAQlC,IAAIM,EAAS,SAAUtd,EAAOX,EAAIgL,EAAKhH,EAAOka,EAAWC,EAAUC,GAClE,IAAIpf,EAAI,EACP2C,EAAMhB,EAAMR,OACZke,EAAc,MAAPrT,EAGR,GAAuB,WAAlBrL,EAAQqL,GAEZ,IAAMhM,KADNkf,GAAY,EACDlT,EACViT,EAAQtd,EAAOX,EAAIhB,EAAGgM,EAAKhM,IAAK,EAAMmf,EAAUC,QAI3C,QAAezb,IAAVqB,IACXka,GAAY,EAEN/f,EAAY6F,KACjBoa,GAAM,GAGFC,IAGCD,GACJpe,EAAGzC,KAAMoD,EAAOqD,GAChBhE,EAAK,OAILqe,EAAOre,EACPA,EAAK,SAAUkB,EAAMod,EAAMta,GAC1B,OAAOqa,EAAK9gB,KAAMsC,EAAQqB,GAAQ8C,MAKhChE,GACJ,KAAQhB,EAAI2C,EAAK3C,IAChBgB,EACCW,EAAO3B,GAAKgM,EAAKoT,EACjBpa,EACAA,EAAMzG,KAAMoD,EAAO3B,GAAKA,EAAGgB,EAAIW,EAAO3B,GAAKgM,KAM/C,OAAKkT,EACGvd,EAIH0d,EACGre,EAAGzC,KAAMoD,GAGVgB,EAAM3B,EAAIW,EAAO,GAAKqK,GAAQmT,GAKlCI,EAAY,QACfC,EAAa,YAGd,SAASC,EAAYC,EAAMC,GAC1B,OAAOA,EAAOC,cAMf,SAASC,EAAWC,GACnB,OAAOA,EAAO/b,QAASwb,EAAW,OAAQxb,QAASyb,EAAYC,GAEhE,IAAIM,EAAa,SAAUC,GAQ1B,OAA0B,IAAnBA,EAAM3gB,UAAqC,IAAnB2gB,EAAM3gB,YAAsB2gB,EAAM3gB,UAMlE,SAAS4gB,IACRniB,KAAK8F,QAAU/C,EAAO+C,QAAUqc,EAAKC,MAGtCD,EAAKC,IAAM,EAEXD,EAAK7e,UAAY,CAEhB2K,MAAO,SAAUiU,GAGhB,IAAIhb,EAAQgb,EAAOliB,KAAK8F,SA4BxB,OAzBMoB,IACLA,EAAQ,GAKH+a,EAAYC,KAIXA,EAAM3gB,SACV2gB,EAAOliB,KAAK8F,SAAYoB,EAMxB9G,OAAOiiB,eAAgBH,EAAOliB,KAAK8F,QAAS,CAC3CoB,MAAOA,EACPob,cAAc,MAMXpb,GAERqb,IAAK,SAAUL,EAAOM,EAAMtb,GAC3B,IAAIub,EACHxU,EAAQjO,KAAKiO,MAAOiU,GAIrB,GAAqB,iBAATM,EACXvU,EAAO8T,EAAWS,IAAWtb,OAM7B,IAAMub,KAAQD,EACbvU,EAAO8T,EAAWU,IAAWD,EAAMC,GAGrC,OAAOxU,GAERvK,IAAK,SAAUwe,EAAOhU,GACrB,YAAerI,IAARqI,EACNlO,KAAKiO,MAAOiU,GAGZA,EAAOliB,KAAK8F,UAAaoc,EAAOliB,KAAK8F,SAAWic,EAAW7T,KAE7DiT,OAAQ,SAAUe,EAAOhU,EAAKhH,GAa7B,YAAarB,IAARqI,GACCA,GAAsB,iBAARA,QAAgCrI,IAAVqB,EAElClH,KAAK0D,IAAKwe,EAAOhU,IASzBlO,KAAKuiB,IAAKL,EAAOhU,EAAKhH,QAILrB,IAAVqB,EAAsBA,EAAQgH,IAEtCyP,OAAQ,SAAUuE,EAAOhU,GACxB,IAAIhM,EACH+L,EAAQiU,EAAOliB,KAAK8F,SAErB,QAAeD,IAAVoI,EAAL,CAIA,QAAapI,IAARqI,EAAoB,CAkBxBhM,GAXCgM,EAJIvI,MAAMC,QAASsI,GAIbA,EAAI/J,IAAK4d,IAEf7T,EAAM6T,EAAW7T,MAIJD,EACZ,CAAEC,GACAA,EAAIrB,MAAOoP,IAAmB,IAG1B5Y,OAER,MAAQnB,WACA+L,EAAOC,EAAKhM,UAKR2D,IAARqI,GAAqBnL,EAAOyD,cAAeyH,MAM1CiU,EAAM3gB,SACV2gB,EAAOliB,KAAK8F,cAAYD,SAEjBqc,EAAOliB,KAAK8F,YAItB4c,QAAS,SAAUR,GAClB,IAAIjU,EAAQiU,EAAOliB,KAAK8F,SACxB,YAAiBD,IAAVoI,IAAwBlL,EAAOyD,cAAeyH,KAGvD,IAAI0U,EAAW,IAAIR,EAEfS,EAAW,IAAIT,EAcfU,EAAS,gCACZC,EAAa,SA2Bd,SAASC,EAAU3e,EAAM8J,EAAKsU,GAC7B,IAAIpd,EA1Baod,EA8BjB,QAAc3c,IAAT2c,GAAwC,IAAlBpe,EAAK7C,SAI/B,GAHA6D,EAAO,QAAU8I,EAAIjI,QAAS6c,EAAY,OAAQtb,cAG7B,iBAFrBgb,EAAOpe,EAAK7B,aAAc6C,IAEM,CAC/B,IACCod,EAnCW,UADGA,EAoCEA,IA/BL,UAATA,IAIS,SAATA,EACG,KAIHA,KAAUA,EAAO,IACbA,EAGJK,EAAOrV,KAAMgV,GACVQ,KAAKC,MAAOT,GAGbA,GAeH,MAAQhW,IAGVoW,EAASL,IAAKne,EAAM8J,EAAKsU,QAEzBA,OAAO3c,EAGT,OAAO2c,EAGRzf,EAAOmC,OAAQ,CACdwd,QAAS,SAAUte,GAClB,OAAOwe,EAASF,QAASte,IAAUue,EAASD,QAASte,IAGtDoe,KAAM,SAAUpe,EAAMgB,EAAMod,GAC3B,OAAOI,EAASzB,OAAQ/c,EAAMgB,EAAMod,IAGrCU,WAAY,SAAU9e,EAAMgB,GAC3Bwd,EAASjF,OAAQvZ,EAAMgB,IAKxB+d,MAAO,SAAU/e,EAAMgB,EAAMod,GAC5B,OAAOG,EAASxB,OAAQ/c,EAAMgB,EAAMod,IAGrCY,YAAa,SAAUhf,EAAMgB,GAC5Bud,EAAShF,OAAQvZ,EAAMgB,MAIzBrC,EAAOG,GAAGgC,OAAQ,CACjBsd,KAAM,SAAUtU,EAAKhH,GACpB,IAAIhF,EAAGkD,EAAMod,EACZpe,EAAOpE,KAAM,GACbyO,EAAQrK,GAAQA,EAAKuF,WAGtB,QAAa9D,IAARqI,EAAoB,CACxB,GAAKlO,KAAKqD,SACTmf,EAAOI,EAASlf,IAAKU,GAEE,IAAlBA,EAAK7C,WAAmBohB,EAASjf,IAAKU,EAAM,iBAAmB,CACnElC,EAAIuM,EAAMpL,OACV,MAAQnB,IAIFuM,EAAOvM,IAEsB,KADjCkD,EAAOqJ,EAAOvM,GAAIkD,MACRvE,QAAS,WAClBuE,EAAO2c,EAAW3c,EAAK9E,MAAO,IAC9ByiB,EAAU3e,EAAMgB,EAAMod,EAAMpd,KAI/Bud,EAASJ,IAAKne,EAAM,gBAAgB,GAItC,OAAOoe,EAIR,MAAoB,iBAARtU,EACJlO,KAAKiE,KAAM,WACjB2e,EAASL,IAAKviB,KAAMkO,KAIfiT,EAAQnhB,KAAM,SAAUkH,GAC9B,IAAIsb,EAOJ,GAAKpe,QAAkByB,IAAVqB,EAKZ,YAAcrB,KADd2c,EAAOI,EAASlf,IAAKU,EAAM8J,IAEnBsU,OAMM3c,KADd2c,EAAOO,EAAU3e,EAAM8J,IAEfsU,OAIR,EAIDxiB,KAAKiE,KAAM,WAGV2e,EAASL,IAAKviB,KAAMkO,EAAKhH,MAExB,KAAMA,EAA0B,EAAnB7C,UAAUhB,OAAY,MAAM,IAG7C6f,WAAY,SAAUhV,GACrB,OAAOlO,KAAKiE,KAAM,WACjB2e,EAASjF,OAAQ3d,KAAMkO,QAM1BnL,EAAOmC,OAAQ,CACdoY,MAAO,SAAUlZ,EAAM1C,EAAM8gB,GAC5B,IAAIlF,EAEJ,GAAKlZ,EAYJ,OAXA1C,GAASA,GAAQ,MAAS,QAC1B4b,EAAQqF,EAASjf,IAAKU,EAAM1C,GAGvB8gB,KACElF,GAAS3X,MAAMC,QAAS4c,GAC7BlF,EAAQqF,EAASxB,OAAQ/c,EAAM1C,EAAMqB,EAAO2D,UAAW8b,IAEvDlF,EAAM1c,KAAM4hB,IAGPlF,GAAS,IAIlB+F,QAAS,SAAUjf,EAAM1C,GACxBA,EAAOA,GAAQ,KAEf,IAAI4b,EAAQva,EAAOua,MAAOlZ,EAAM1C,GAC/B4hB,EAAchG,EAAMja,OACpBH,EAAKoa,EAAMlP,QACXmV,EAAQxgB,EAAOygB,YAAapf,EAAM1C,GAMvB,eAAPwB,IACJA,EAAKoa,EAAMlP,QACXkV,KAGIpgB,IAIU,OAATxB,GACJ4b,EAAM3L,QAAS,qBAIT4R,EAAME,KACbvgB,EAAGzC,KAAM2D,EApBF,WACNrB,EAAOsgB,QAASjf,EAAM1C,IAmBF6hB,KAGhBD,GAAeC,GACpBA,EAAM1N,MAAM2H,QAKdgG,YAAa,SAAUpf,EAAM1C,GAC5B,IAAIwM,EAAMxM,EAAO,aACjB,OAAOihB,EAASjf,IAAKU,EAAM8J,IAASyU,EAASxB,OAAQ/c,EAAM8J,EAAK,CAC/D2H,MAAO9S,EAAO+Z,UAAW,eAAgBvB,IAAK,WAC7CoH,EAAShF,OAAQvZ,EAAM,CAAE1C,EAAO,QAASwM,WAM7CnL,EAAOG,GAAGgC,OAAQ,CACjBoY,MAAO,SAAU5b,EAAM8gB,GACtB,IAAIkB,EAAS,EAQb,MANqB,iBAAThiB,IACX8gB,EAAO9gB,EACPA,EAAO,KACPgiB,KAGIrf,UAAUhB,OAASqgB,EAChB3gB,EAAOua,MAAOtd,KAAM,GAAK0B,QAGjBmE,IAAT2c,EACNxiB,KACAA,KAAKiE,KAAM,WACV,IAAIqZ,EAAQva,EAAOua,MAAOtd,KAAM0B,EAAM8gB,GAGtCzf,EAAOygB,YAAaxjB,KAAM0B,GAEZ,OAATA,GAAgC,eAAf4b,EAAO,IAC5Bva,EAAOsgB,QAASrjB,KAAM0B,MAI1B2hB,QAAS,SAAU3hB,GAClB,OAAO1B,KAAKiE,KAAM,WACjBlB,EAAOsgB,QAASrjB,KAAM0B,MAGxBiiB,WAAY,SAAUjiB,GACrB,OAAO1B,KAAKsd,MAAO5b,GAAQ,KAAM,KAKlCib,QAAS,SAAUjb,EAAMJ,GACxB,IAAIoP,EACHkT,EAAQ,EACRC,EAAQ9gB,EAAOgb,WACflM,EAAW7R,KACXkC,EAAIlC,KAAKqD,OACTkZ,EAAU,aACCqH,GACTC,EAAMtE,YAAa1N,EAAU,CAAEA,KAIb,iBAATnQ,IACXJ,EAAMI,EACNA,OAAOmE,GAERnE,EAAOA,GAAQ,KAEf,MAAQQ,KACPwO,EAAMiS,EAASjf,IAAKmO,EAAU3P,GAAKR,EAAO,gBAC9BgP,EAAImF,QACf+N,IACAlT,EAAImF,MAAM0F,IAAKgB,IAIjB,OADAA,IACOsH,EAAMlH,QAASrb,MAGxB,IAAIwiB,GAAO,sCAA0CC,OAEjDC,GAAU,IAAIla,OAAQ,iBAAmBga,GAAO,cAAe,KAG/DG,GAAY,CAAE,MAAO,QAAS,SAAU,QAExCvU,GAAkB9P,EAAS8P,gBAI1BwU,GAAa,SAAU9f,GACzB,OAAOrB,EAAOyF,SAAUpE,EAAK6I,cAAe7I,IAE7C+f,GAAW,CAAEA,UAAU,GAOnBzU,GAAgB0U,cACpBF,GAAa,SAAU9f,GACtB,OAAOrB,EAAOyF,SAAUpE,EAAK6I,cAAe7I,IAC3CA,EAAKggB,YAAaD,MAAe/f,EAAK6I,gBAG1C,IAAIoX,GAAqB,SAAUjgB,EAAMmK,GAOvC,MAA8B,UAH9BnK,EAAOmK,GAAMnK,GAGDkgB,MAAMC,SACM,KAAvBngB,EAAKkgB,MAAMC,SAMXL,GAAY9f,IAEsB,SAAlCrB,EAAOyhB,IAAKpgB,EAAM,YAKrB,SAASqgB,GAAWrgB,EAAMqe,EAAMiC,EAAYC,GAC3C,IAAIC,EAAUC,EACbC,EAAgB,GAChBC,EAAeJ,EACd,WACC,OAAOA,EAAM9V,OAEd,WACC,OAAO9L,EAAOyhB,IAAKpgB,EAAMqe,EAAM,KAEjCuC,EAAUD,IACVE,EAAOP,GAAcA,EAAY,KAAS3hB,EAAOmiB,UAAWzC,GAAS,GAAK,MAG1E0C,EAAgB/gB,EAAK7C,WAClBwB,EAAOmiB,UAAWzC,IAAmB,OAATwC,IAAkBD,IAChDhB,GAAQ9W,KAAMnK,EAAOyhB,IAAKpgB,EAAMqe,IAElC,GAAK0C,GAAiBA,EAAe,KAAQF,EAAO,CAInDD,GAAoB,EAGpBC,EAAOA,GAAQE,EAAe,GAG9BA,GAAiBH,GAAW,EAE5B,MAAQF,IAIP/hB,EAAOuhB,MAAOlgB,EAAMqe,EAAM0C,EAAgBF,IACnC,EAAIJ,IAAY,GAAMA,EAAQE,IAAiBC,GAAW,MAAW,IAC3EF,EAAgB,GAEjBK,GAAgCN,EAIjCM,GAAgC,EAChCpiB,EAAOuhB,MAAOlgB,EAAMqe,EAAM0C,EAAgBF,GAG1CP,EAAaA,GAAc,GAgB5B,OAbKA,IACJS,GAAiBA,IAAkBH,GAAW,EAG9CJ,EAAWF,EAAY,GACtBS,GAAkBT,EAAY,GAAM,GAAMA,EAAY,IACrDA,EAAY,GACTC,IACJA,EAAMM,KAAOA,EACbN,EAAM1Q,MAAQkR,EACdR,EAAM5f,IAAM6f,IAGPA,EAIR,IAAIQ,GAAoB,GAyBxB,SAASC,GAAUxT,EAAUyT,GAO5B,IANA,IAAIf,EAASngB,EAxBcA,EACvBuT,EACH1V,EACAmK,EACAmY,EAqBAgB,EAAS,GACTlK,EAAQ,EACRhY,EAASwO,EAASxO,OAGXgY,EAAQhY,EAAQgY,KACvBjX,EAAOyN,EAAUwJ,IACNiJ,QAIXC,EAAUngB,EAAKkgB,MAAMC,QAChBe,GAKa,SAAZf,IACJgB,EAAQlK,GAAUsH,EAASjf,IAAKU,EAAM,YAAe,KAC/CmhB,EAAQlK,KACbjX,EAAKkgB,MAAMC,QAAU,KAGK,KAAvBngB,EAAKkgB,MAAMC,SAAkBF,GAAoBjgB,KACrDmhB,EAAQlK,IA7CVkJ,EAFAtiB,EADG0V,OAAAA,EACH1V,GAF0BmC,EAiDaA,GA/C5B6I,cACXb,EAAWhI,EAAKgI,UAChBmY,EAAUa,GAAmBhZ,MAM9BuL,EAAO1V,EAAIujB,KAAK9iB,YAAaT,EAAII,cAAe+J,IAChDmY,EAAUxhB,EAAOyhB,IAAK7M,EAAM,WAE5BA,EAAKhV,WAAWC,YAAa+U,GAEZ,SAAZ4M,IACJA,EAAU,SAEXa,GAAmBhZ,GAAamY,MAkCb,SAAZA,IACJgB,EAAQlK,GAAU,OAGlBsH,EAASJ,IAAKne,EAAM,UAAWmgB,KAMlC,IAAMlJ,EAAQ,EAAGA,EAAQhY,EAAQgY,IACR,MAAnBkK,EAAQlK,KACZxJ,EAAUwJ,GAAQiJ,MAAMC,QAAUgB,EAAQlK,IAI5C,OAAOxJ,EAGR9O,EAAOG,GAAGgC,OAAQ,CACjBogB,KAAM,WACL,OAAOD,GAAUrlB,MAAM,IAExBylB,KAAM,WACL,OAAOJ,GAAUrlB,OAElB0lB,OAAQ,SAAUxH,GACjB,MAAsB,kBAAVA,EACJA,EAAQle,KAAKslB,OAAStlB,KAAKylB,OAG5BzlB,KAAKiE,KAAM,WACZogB,GAAoBrkB,MACxB+C,EAAQ/C,MAAOslB,OAEfviB,EAAQ/C,MAAOylB,YAKnB,IAUEE,GACAhV,GAXEiV,GAAiB,wBAEjBC,GAAW,iCAEXC,GAAc,qCAMhBH,GADc/lB,EAASmmB,yBACRrjB,YAAa9C,EAASyC,cAAe,SACpDsO,GAAQ/Q,EAASyC,cAAe,UAM3BG,aAAc,OAAQ,SAC5BmO,GAAMnO,aAAc,UAAW,WAC/BmO,GAAMnO,aAAc,OAAQ,KAE5BmjB,GAAIjjB,YAAaiO,IAIjBvP,EAAQ4kB,WAAaL,GAAIM,WAAW,GAAOA,WAAW,GAAO7R,UAAUsB,QAIvEiQ,GAAI/U,UAAY,yBAChBxP,EAAQ8kB,iBAAmBP,GAAIM,WAAW,GAAO7R,UAAUuF,aAK3DgM,GAAI/U,UAAY,oBAChBxP,EAAQ+kB,SAAWR,GAAIvR,UAKxB,IAAIgS,GAAU,CAKbC,MAAO,CAAE,EAAG,UAAW,YACvBC,IAAK,CAAE,EAAG,oBAAqB,uBAC/BC,GAAI,CAAE,EAAG,iBAAkB,oBAC3BC,GAAI,CAAE,EAAG,qBAAsB,yBAE/BC,SAAU,CAAE,EAAG,GAAI,KAYpB,SAASC,GAAQzjB,EAASwN,GAIzB,IAAI3M,EAYJ,OATCA,EAD4C,oBAAjCb,EAAQoK,qBACbpK,EAAQoK,qBAAsBoD,GAAO,KAEI,oBAA7BxN,EAAQ4K,iBACpB5K,EAAQ4K,iBAAkB4C,GAAO,KAGjC,QAGM5K,IAAR4K,GAAqBA,GAAOrE,EAAUnJ,EAASwN,GAC5C1N,EAAOgB,MAAO,CAAEd,GAAWa,GAG5BA,EAKR,SAAS6iB,GAAe9iB,EAAO+iB,GAI9B,IAHA,IAAI1kB,EAAI,EACPiZ,EAAItX,EAAMR,OAEHnB,EAAIiZ,EAAGjZ,IACdygB,EAASJ,IACR1e,EAAO3B,GACP,cACC0kB,GAAejE,EAASjf,IAAKkjB,EAAa1kB,GAAK,eA1CnDkkB,GAAQS,MAAQT,GAAQU,MAAQV,GAAQW,SAAWX,GAAQY,QAAUZ,GAAQC,MAC7ED,GAAQa,GAAKb,GAAQI,GAGfplB,EAAQ+kB,SACbC,GAAQc,SAAWd,GAAQD,OAAS,CAAE,EAAG,+BAAgC,cA2C1E,IAAIrb,GAAQ,YAEZ,SAASqc,GAAetjB,EAAOZ,EAASmkB,EAASC,EAAWC,GAO3D,IANA,IAAIljB,EAAMsM,EAAKD,EAAK8W,EAAMC,EAAU1iB,EACnC2iB,EAAWxkB,EAAQ8iB,yBACnB2B,EAAQ,GACRxlB,EAAI,EACJiZ,EAAItX,EAAMR,OAEHnB,EAAIiZ,EAAGjZ,IAGd,IAFAkC,EAAOP,EAAO3B,KAEQ,IAATkC,EAGZ,GAAwB,WAAnBvB,EAAQuB,GAIZrB,EAAOgB,MAAO2jB,EAAOtjB,EAAK7C,SAAW,CAAE6C,GAASA,QAG1C,GAAM0G,GAAM0C,KAAMpJ,GAIlB,CACNsM,EAAMA,GAAO+W,EAAS/kB,YAAaO,EAAQZ,cAAe,QAG1DoO,GAAQoV,GAAS3Y,KAAM9I,IAAU,CAAE,GAAI,KAAQ,GAAIoD,cACnD+f,EAAOnB,GAAS3V,IAAS2V,GAAQK,SACjC/V,EAAIE,UAAY2W,EAAM,GAAMxkB,EAAO4kB,cAAevjB,GAASmjB,EAAM,GAGjEziB,EAAIyiB,EAAM,GACV,MAAQziB,IACP4L,EAAMA,EAAI0D,UAKXrR,EAAOgB,MAAO2jB,EAAOhX,EAAInE,aAGzBmE,EAAM+W,EAASnV,YAGXD,YAAc,QAzBlBqV,EAAM9mB,KAAMqC,EAAQ2kB,eAAgBxjB,IA+BvCqjB,EAASpV,YAAc,GAEvBnQ,EAAI,EACJ,MAAUkC,EAAOsjB,EAAOxlB,KAGvB,GAAKmlB,IAAkD,EAArCtkB,EAAO6D,QAASxC,EAAMijB,GAClCC,GACJA,EAAQ1mB,KAAMwD,QAgBhB,GAXAojB,EAAWtD,GAAY9f,GAGvBsM,EAAMgW,GAAQe,EAAS/kB,YAAa0B,GAAQ,UAGvCojB,GACJb,GAAejW,GAIX0W,EAAU,CACdtiB,EAAI,EACJ,MAAUV,EAAOsM,EAAK5L,KAChBghB,GAAYtY,KAAMpJ,EAAK1C,MAAQ,KACnC0lB,EAAQxmB,KAAMwD,GAMlB,OAAOqjB,EAIR,IACCI,GAAY,OACZC,GAAc,iDACdC,GAAiB,sBAElB,SAASC,KACR,OAAO,EAGR,SAASC,KACR,OAAO,EASR,SAASC,GAAY9jB,EAAM1C,GAC1B,OAAS0C,IAMV,WACC,IACC,OAAOxE,EAASyV,cACf,MAAQ8S,KATQC,KAAqC,UAAT1mB,GAY/C,SAAS2mB,GAAIjkB,EAAMkkB,EAAOtlB,EAAUwf,EAAMtf,EAAIqlB,GAC7C,IAAIC,EAAQ9mB,EAGZ,GAAsB,iBAAV4mB,EAAqB,CAShC,IAAM5mB,IANmB,iBAAbsB,IAGXwf,EAAOA,GAAQxf,EACfA,OAAW6C,GAEEyiB,EACbD,GAAIjkB,EAAM1C,EAAMsB,EAAUwf,EAAM8F,EAAO5mB,GAAQ6mB,GAEhD,OAAOnkB,EAsBR,GAnBa,MAARoe,GAAsB,MAANtf,GAGpBA,EAAKF,EACLwf,EAAOxf,OAAW6C,GACD,MAAN3C,IACc,iBAAbF,GAGXE,EAAKsf,EACLA,OAAO3c,IAIP3C,EAAKsf,EACLA,EAAOxf,EACPA,OAAW6C,KAGD,IAAP3C,EACJA,EAAK+kB,QACC,IAAM/kB,EACZ,OAAOkB,EAeR,OAZa,IAARmkB,IACJC,EAAStlB,GACTA,EAAK,SAAUulB,GAId,OADA1lB,IAAS2lB,IAAKD,GACPD,EAAO7nB,MAAOX,KAAMqE,aAIzB8C,KAAOqhB,EAAOrhB,OAAUqhB,EAAOrhB,KAAOpE,EAAOoE,SAE1C/C,EAAKH,KAAM,WACjBlB,EAAO0lB,MAAMlN,IAAKvb,KAAMsoB,EAAOplB,EAAIsf,EAAMxf,KA+a3C,SAAS2lB,GAAgBpa,EAAI7M,EAAMwmB,GAG5BA,GAQNvF,EAASJ,IAAKhU,EAAI7M,GAAM,GACxBqB,EAAO0lB,MAAMlN,IAAKhN,EAAI7M,EAAM,CAC3B8N,WAAW,EACXd,QAAS,SAAU+Z,GAClB,IAAIG,EAAUtV,EACbuV,EAAQlG,EAASjf,IAAK1D,KAAM0B,GAE7B,GAAyB,EAAlB+mB,EAAMK,WAAmB9oB,KAAM0B,IAKrC,GAAMmnB,EAAMxlB,QAiCEN,EAAO0lB,MAAMvJ,QAASxd,IAAU,IAAKqnB,cAClDN,EAAMO,uBAfN,GAdAH,EAAQvoB,EAAMG,KAAM4D,WACpBse,EAASJ,IAAKviB,KAAM0B,EAAMmnB,GAK1BD,EAAWV,EAAYloB,KAAM0B,GAC7B1B,KAAM0B,KAEDmnB,KADLvV,EAASqP,EAASjf,IAAK1D,KAAM0B,KACJknB,EACxBjG,EAASJ,IAAKviB,KAAM0B,GAAM,GAE1B4R,EAAS,GAELuV,IAAUvV,EAKd,OAFAmV,EAAMQ,2BACNR,EAAMS,iBACC5V,EAAOpM,WAeL2hB,EAAMxlB,SAGjBsf,EAASJ,IAAKviB,KAAM0B,EAAM,CACzBwF,MAAOnE,EAAO0lB,MAAMU,QAInBpmB,EAAOmC,OAAQ2jB,EAAO,GAAK9lB,EAAOqmB,MAAM9lB,WACxCulB,EAAMvoB,MAAO,GACbN,QAKFyoB,EAAMQ,qCAzE0BpjB,IAA7B8c,EAASjf,IAAK6K,EAAI7M,IACtBqB,EAAO0lB,MAAMlN,IAAKhN,EAAI7M,EAAMsmB,IA5a/BjlB,EAAO0lB,MAAQ,CAEdjpB,OAAQ,GAER+b,IAAK,SAAUnX,EAAMkkB,EAAO5Z,EAAS8T,EAAMxf,GAE1C,IAAIqmB,EAAaC,EAAa5Y,EAC7B6Y,EAAQC,EAAGC,EACXvK,EAASwK,EAAUhoB,EAAMioB,EAAYC,EACrCC,EAAWlH,EAASjf,IAAKU,GAG1B,GAAM6d,EAAY7d,GAAlB,CAKKsK,EAAQA,UAEZA,GADA2a,EAAc3a,GACQA,QACtB1L,EAAWqmB,EAAYrmB,UAKnBA,GACJD,EAAOwN,KAAKM,gBAAiBnB,GAAiB1M,GAIzC0L,EAAQvH,OACbuH,EAAQvH,KAAOpE,EAAOoE,SAIfoiB,EAASM,EAASN,UACzBA,EAASM,EAASN,OAASnpB,OAAO0pB,OAAQ,QAEnCR,EAAcO,EAASE,UAC9BT,EAAcO,EAASE,OAAS,SAAUvd,GAIzC,MAAyB,oBAAXzJ,GAA0BA,EAAO0lB,MAAMuB,YAAcxd,EAAE9K,KACpEqB,EAAO0lB,MAAMwB,SAAStpB,MAAOyD,EAAMC,gBAAcwB,IAMpD2jB,GADAlB,GAAUA,GAAS,IAAKzb,MAAOoP,IAAmB,CAAE,KAC1C5Y,OACV,MAAQmmB,IAEP9nB,EAAOkoB,GADPlZ,EAAMqX,GAAe7a,KAAMob,EAAOkB,KAAS,IACpB,GACvBG,GAAejZ,EAAK,IAAO,IAAKpJ,MAAO,KAAMtC,OAGvCtD,IAKNwd,EAAUnc,EAAO0lB,MAAMvJ,QAASxd,IAAU,GAG1CA,GAASsB,EAAWkc,EAAQ6J,aAAe7J,EAAQgL,WAAcxoB,EAGjEwd,EAAUnc,EAAO0lB,MAAMvJ,QAASxd,IAAU,GAG1C+nB,EAAY1mB,EAAOmC,OAAQ,CAC1BxD,KAAMA,EACNkoB,SAAUA,EACVpH,KAAMA,EACN9T,QAASA,EACTvH,KAAMuH,EAAQvH,KACdnE,SAAUA,EACV6H,aAAc7H,GAAYD,EAAO6O,KAAK/E,MAAMhC,aAAa2C,KAAMxK,GAC/DwM,UAAWma,EAAW/b,KAAM,MAC1Byb,IAGKK,EAAWH,EAAQ7nB,OAC1BgoB,EAAWH,EAAQ7nB,GAAS,IACnByoB,cAAgB,EAGnBjL,EAAQkL,QACiD,IAA9DlL,EAAQkL,MAAM3pB,KAAM2D,EAAMoe,EAAMmH,EAAYL,IAEvCllB,EAAK2L,kBACT3L,EAAK2L,iBAAkBrO,EAAM4nB,IAK3BpK,EAAQ3D,MACZ2D,EAAQ3D,IAAI9a,KAAM2D,EAAMqlB,GAElBA,EAAU/a,QAAQvH,OACvBsiB,EAAU/a,QAAQvH,KAAOuH,EAAQvH,OAK9BnE,EACJ0mB,EAASzkB,OAAQykB,EAASS,gBAAiB,EAAGV,GAE9CC,EAAS9oB,KAAM6oB,GAIhB1mB,EAAO0lB,MAAMjpB,OAAQkC,IAAS,KAMhCic,OAAQ,SAAUvZ,EAAMkkB,EAAO5Z,EAAS1L,EAAUqnB,GAEjD,IAAIvlB,EAAGwlB,EAAW5Z,EACjB6Y,EAAQC,EAAGC,EACXvK,EAASwK,EAAUhoB,EAAMioB,EAAYC,EACrCC,EAAWlH,EAASD,QAASte,IAAUue,EAASjf,IAAKU,GAEtD,GAAMylB,IAAeN,EAASM,EAASN,QAAvC,CAMAC,GADAlB,GAAUA,GAAS,IAAKzb,MAAOoP,IAAmB,CAAE,KAC1C5Y,OACV,MAAQmmB,IAMP,GAJA9nB,EAAOkoB,GADPlZ,EAAMqX,GAAe7a,KAAMob,EAAOkB,KAAS,IACpB,GACvBG,GAAejZ,EAAK,IAAO,IAAKpJ,MAAO,KAAMtC,OAGvCtD,EAAN,CAOAwd,EAAUnc,EAAO0lB,MAAMvJ,QAASxd,IAAU,GAE1CgoB,EAAWH,EADX7nB,GAASsB,EAAWkc,EAAQ6J,aAAe7J,EAAQgL,WAAcxoB,IACpC,GAC7BgP,EAAMA,EAAK,IACV,IAAI5G,OAAQ,UAAY6f,EAAW/b,KAAM,iBAAoB,WAG9D0c,EAAYxlB,EAAI4kB,EAASrmB,OACzB,MAAQyB,IACP2kB,EAAYC,EAAU5kB,IAEfulB,GAAeT,IAAaH,EAAUG,UACzClb,GAAWA,EAAQvH,OAASsiB,EAAUtiB,MACtCuJ,IAAOA,EAAIlD,KAAMic,EAAUja,YAC3BxM,GAAYA,IAAaymB,EAAUzmB,WACxB,OAAbA,IAAqBymB,EAAUzmB,YAChC0mB,EAASzkB,OAAQH,EAAG,GAEf2kB,EAAUzmB,UACd0mB,EAASS,gBAELjL,EAAQvB,QACZuB,EAAQvB,OAAOld,KAAM2D,EAAMqlB,IAOzBa,IAAcZ,EAASrmB,SACrB6b,EAAQqL,WACkD,IAA/DrL,EAAQqL,SAAS9pB,KAAM2D,EAAMulB,EAAYE,EAASE,SAElDhnB,EAAOynB,YAAapmB,EAAM1C,EAAMmoB,EAASE,eAGnCR,EAAQ7nB,SA1Cf,IAAMA,KAAQ6nB,EACbxmB,EAAO0lB,MAAM9K,OAAQvZ,EAAM1C,EAAO4mB,EAAOkB,GAAK9a,EAAS1L,GAAU,GA8C/DD,EAAOyD,cAAe+iB,IAC1B5G,EAAShF,OAAQvZ,EAAM,mBAIzB6lB,SAAU,SAAUQ,GAEnB,IAAIvoB,EAAG4C,EAAGhB,EAAK4Q,EAAS+U,EAAWiB,EAClCnW,EAAO,IAAI5O,MAAOtB,UAAUhB,QAG5BolB,EAAQ1lB,EAAO0lB,MAAMkC,IAAKF,GAE1Bf,GACE/G,EAASjf,IAAK1D,KAAM,WAAcI,OAAO0pB,OAAQ,OAC/CrB,EAAM/mB,OAAU,GACpBwd,EAAUnc,EAAO0lB,MAAMvJ,QAASuJ,EAAM/mB,OAAU,GAKjD,IAFA6S,EAAM,GAAMkU,EAENvmB,EAAI,EAAGA,EAAImC,UAAUhB,OAAQnB,IAClCqS,EAAMrS,GAAMmC,UAAWnC,GAMxB,GAHAumB,EAAMmC,eAAiB5qB,MAGlBkf,EAAQ2L,cAA2D,IAA5C3L,EAAQ2L,YAAYpqB,KAAMT,KAAMyoB,GAA5D,CAKAiC,EAAe3nB,EAAO0lB,MAAMiB,SAASjpB,KAAMT,KAAMyoB,EAAOiB,GAGxDxnB,EAAI,EACJ,OAAUwS,EAAUgW,EAAcxoB,QAAYumB,EAAMqC,uBAAyB,CAC5ErC,EAAMsC,cAAgBrW,EAAQtQ,KAE9BU,EAAI,EACJ,OAAU2kB,EAAY/U,EAAQgV,SAAU5kB,QACtC2jB,EAAMuC,gCAIDvC,EAAMwC,aAAsC,IAAxBxB,EAAUja,YACnCiZ,EAAMwC,WAAWzd,KAAMic,EAAUja,aAEjCiZ,EAAMgB,UAAYA,EAClBhB,EAAMjG,KAAOiH,EAAUjH,UAKV3c,KAHb/B,IAAUf,EAAO0lB,MAAMvJ,QAASuK,EAAUG,WAAc,IAAKG,QAC5DN,EAAU/a,SAAU/N,MAAO+T,EAAQtQ,KAAMmQ,MAGT,KAAzBkU,EAAMnV,OAASxP,KACrB2kB,EAAMS,iBACNT,EAAMO,oBAYX,OAJK9J,EAAQgM,cACZhM,EAAQgM,aAAazqB,KAAMT,KAAMyoB,GAG3BA,EAAMnV,SAGdoW,SAAU,SAAUjB,EAAOiB,GAC1B,IAAIxnB,EAAGunB,EAAWzX,EAAKmZ,EAAiBC,EACvCV,EAAe,GACfP,EAAgBT,EAASS,cACzBtb,EAAM4Z,EAAMjjB,OAGb,GAAK2kB,GAIJtb,EAAItN,YAOc,UAAfknB,EAAM/mB,MAAoC,GAAhB+mB,EAAM1S,QAEnC,KAAQlH,IAAQ7O,KAAM6O,EAAMA,EAAIlM,YAAc3C,KAI7C,GAAsB,IAAjB6O,EAAItN,WAAoC,UAAfknB,EAAM/mB,OAAqC,IAAjBmN,EAAI1C,UAAsB,CAGjF,IAFAgf,EAAkB,GAClBC,EAAmB,GACblpB,EAAI,EAAGA,EAAIioB,EAAejoB,SAME2D,IAA5BulB,EAFLpZ,GAHAyX,EAAYC,EAAUxnB,IAGNc,SAAW,OAG1BooB,EAAkBpZ,GAAQyX,EAAU5e,cACC,EAApC9H,EAAQiP,EAAKhS,MAAOqb,MAAOxM,GAC3B9L,EAAOwN,KAAMyB,EAAKhS,KAAM,KAAM,CAAE6O,IAAQxL,QAErC+nB,EAAkBpZ,IACtBmZ,EAAgBvqB,KAAM6oB,GAGnB0B,EAAgB9nB,QACpBqnB,EAAa9pB,KAAM,CAAEwD,KAAMyK,EAAK6a,SAAUyB,IAY9C,OALAtc,EAAM7O,KACDmqB,EAAgBT,EAASrmB,QAC7BqnB,EAAa9pB,KAAM,CAAEwD,KAAMyK,EAAK6a,SAAUA,EAASppB,MAAO6pB,KAGpDO,GAGRW,QAAS,SAAUjmB,EAAMkmB,GACxBlrB,OAAOiiB,eAAgBtf,EAAOqmB,MAAM9lB,UAAW8B,EAAM,CACpDmmB,YAAY,EACZjJ,cAAc,EAEd5e,IAAKrC,EAAYiqB,GAChB,WACC,GAAKtrB,KAAKwrB,cACR,OAAOF,EAAMtrB,KAAKwrB,gBAGrB,WACC,GAAKxrB,KAAKwrB,cACR,OAAOxrB,KAAKwrB,cAAepmB,IAI/Bmd,IAAK,SAAUrb,GACd9G,OAAOiiB,eAAgBriB,KAAMoF,EAAM,CAClCmmB,YAAY,EACZjJ,cAAc,EACdmJ,UAAU,EACVvkB,MAAOA,QAMXyjB,IAAK,SAAUa,GACd,OAAOA,EAAezoB,EAAO+C,SAC5B0lB,EACA,IAAIzoB,EAAOqmB,MAAOoC,IAGpBtM,QAAS,CACRwM,KAAM,CAGLC,UAAU,GAEXC,MAAO,CAGNxB,MAAO,SAAU5H,GAIhB,IAAIjU,EAAKvO,MAAQwiB,EAWjB,OARKoD,GAAepY,KAAMe,EAAG7M,OAC5B6M,EAAGqd,OAASxf,EAAUmC,EAAI,UAG1Boa,GAAgBpa,EAAI,QAASyZ,KAIvB,GAERmB,QAAS,SAAU3G,GAIlB,IAAIjU,EAAKvO,MAAQwiB,EAUjB,OAPKoD,GAAepY,KAAMe,EAAG7M,OAC5B6M,EAAGqd,OAASxf,EAAUmC,EAAI,UAE1Boa,GAAgBpa,EAAI,UAId,GAKRkY,SAAU,SAAUgC,GACnB,IAAIjjB,EAASijB,EAAMjjB,OACnB,OAAOogB,GAAepY,KAAMhI,EAAO9D,OAClC8D,EAAOomB,OAASxf,EAAU5G,EAAQ,UAClCmd,EAASjf,IAAK8B,EAAQ,UACtB4G,EAAU5G,EAAQ,OAIrBqmB,aAAc,CACbX,aAAc,SAAUzC,QAID5iB,IAAjB4iB,EAAMnV,QAAwBmV,EAAM+C,gBACxC/C,EAAM+C,cAAcM,YAAcrD,EAAMnV,YA8F7CvQ,EAAOynB,YAAc,SAAUpmB,EAAM1C,EAAMqoB,GAGrC3lB,EAAK0c,qBACT1c,EAAK0c,oBAAqBpf,EAAMqoB,IAIlChnB,EAAOqmB,MAAQ,SAAUznB,EAAKoqB,GAG7B,KAAQ/rB,gBAAgB+C,EAAOqmB,OAC9B,OAAO,IAAIrmB,EAAOqmB,MAAOznB,EAAKoqB,GAI1BpqB,GAAOA,EAAID,MACf1B,KAAKwrB,cAAgB7pB,EACrB3B,KAAK0B,KAAOC,EAAID,KAIhB1B,KAAKgsB,mBAAqBrqB,EAAIsqB,uBACHpmB,IAAzBlE,EAAIsqB,mBAGgB,IAApBtqB,EAAImqB,YACL9D,GACAC,GAKDjoB,KAAKwF,OAAW7D,EAAI6D,QAAkC,IAAxB7D,EAAI6D,OAAOjE,SACxCI,EAAI6D,OAAO7C,WACXhB,EAAI6D,OAELxF,KAAK+qB,cAAgBppB,EAAIopB,cACzB/qB,KAAKksB,cAAgBvqB,EAAIuqB,eAIzBlsB,KAAK0B,KAAOC,EAIRoqB,GACJhpB,EAAOmC,OAAQlF,KAAM+rB,GAItB/rB,KAAKmsB,UAAYxqB,GAAOA,EAAIwqB,WAAa1jB,KAAK2jB,MAG9CpsB,KAAM+C,EAAO+C,UAAY,GAK1B/C,EAAOqmB,MAAM9lB,UAAY,CACxBE,YAAaT,EAAOqmB,MACpB4C,mBAAoB/D,GACpB6C,qBAAsB7C,GACtB+C,8BAA+B/C,GAC/BoE,aAAa,EAEbnD,eAAgB,WACf,IAAI1c,EAAIxM,KAAKwrB,cAEbxrB,KAAKgsB,mBAAqBhE,GAErBxb,IAAMxM,KAAKqsB,aACf7f,EAAE0c,kBAGJF,gBAAiB,WAChB,IAAIxc,EAAIxM,KAAKwrB,cAEbxrB,KAAK8qB,qBAAuB9C,GAEvBxb,IAAMxM,KAAKqsB,aACf7f,EAAEwc,mBAGJC,yBAA0B,WACzB,IAAIzc,EAAIxM,KAAKwrB,cAEbxrB,KAAKgrB,8BAAgChD,GAEhCxb,IAAMxM,KAAKqsB,aACf7f,EAAEyc,2BAGHjpB,KAAKgpB,oBAKPjmB,EAAOkB,KAAM,CACZqoB,QAAQ,EACRC,SAAS,EACTC,YAAY,EACZC,gBAAgB,EAChBC,SAAS,EACTC,QAAQ,EACRC,YAAY,EACZC,SAAS,EACTC,OAAO,EACPC,OAAO,EACPC,UAAU,EACVC,MAAM,EACNC,QAAQ,EACRnrB,MAAM,EACNorB,UAAU,EACVjf,KAAK,EACLkf,SAAS,EACTrX,QAAQ,EACRsX,SAAS,EACTC,SAAS,EACTC,SAAS,EACTC,SAAS,EACTC,SAAS,EACTC,WAAW,EACXC,aAAa,EACbC,SAAS,EACTC,SAAS,EACTC,eAAe,EACfC,WAAW,EACXC,SAAS,EAETC,MAAO,SAAUxF,GAChB,IAAI1S,EAAS0S,EAAM1S,OAGnB,OAAoB,MAAf0S,EAAMwF,OAAiBpG,GAAUra,KAAMib,EAAM/mB,MACxB,MAAlB+mB,EAAM0E,SAAmB1E,EAAM0E,SAAW1E,EAAM2E,SAIlD3E,EAAMwF,YAAoBpoB,IAAXkQ,GAAwB+R,GAAYta,KAAMib,EAAM/mB,MACtD,EAATqU,EACG,EAGM,EAATA,EACG,EAGM,EAATA,EACG,EAGD,EAGD0S,EAAMwF,QAEZlrB,EAAO0lB,MAAM4C,SAEhBtoB,EAAOkB,KAAM,CAAEmR,MAAO,UAAW8Y,KAAM,YAAc,SAAUxsB,EAAMqnB,GACpEhmB,EAAO0lB,MAAMvJ,QAASxd,GAAS,CAG9B0oB,MAAO,WAQN,OAHAzB,GAAgB3oB,KAAM0B,EAAMwmB,KAGrB,GAERiB,QAAS,WAMR,OAHAR,GAAgB3oB,KAAM0B,IAGf,GAGRqnB,aAAcA,KAYhBhmB,EAAOkB,KAAM,CACZkqB,WAAY,YACZC,WAAY,WACZC,aAAc,cACdC,aAAc,cACZ,SAAUC,EAAM5D,GAClB5nB,EAAO0lB,MAAMvJ,QAASqP,GAAS,CAC9BxF,aAAc4B,EACdT,SAAUS,EAEVZ,OAAQ,SAAUtB,GACjB,IAAI3kB,EAEH0qB,EAAU/F,EAAMyD,cAChBzC,EAAYhB,EAAMgB,UASnB,OALM+E,IAAaA,IANTxuB,MAMgC+C,EAAOyF,SANvCxI,KAMyDwuB,MAClE/F,EAAM/mB,KAAO+nB,EAAUG,SACvB9lB,EAAM2lB,EAAU/a,QAAQ/N,MAAOX,KAAMqE,WACrCokB,EAAM/mB,KAAOipB,GAEP7mB,MAKVf,EAAOG,GAAGgC,OAAQ,CAEjBmjB,GAAI,SAAUC,EAAOtlB,EAAUwf,EAAMtf,GACpC,OAAOmlB,GAAIroB,KAAMsoB,EAAOtlB,EAAUwf,EAAMtf,IAEzCqlB,IAAK,SAAUD,EAAOtlB,EAAUwf,EAAMtf,GACrC,OAAOmlB,GAAIroB,KAAMsoB,EAAOtlB,EAAUwf,EAAMtf,EAAI,IAE7CwlB,IAAK,SAAUJ,EAAOtlB,EAAUE,GAC/B,IAAIumB,EAAW/nB,EACf,GAAK4mB,GAASA,EAAMY,gBAAkBZ,EAAMmB,UAW3C,OARAA,EAAYnB,EAAMmB,UAClB1mB,EAAQulB,EAAMsC,gBAAiBlC,IAC9Be,EAAUja,UACTia,EAAUG,SAAW,IAAMH,EAAUja,UACrCia,EAAUG,SACXH,EAAUzmB,SACVymB,EAAU/a,SAEJ1O,KAER,GAAsB,iBAAVsoB,EAAqB,CAGhC,IAAM5mB,KAAQ4mB,EACbtoB,KAAK0oB,IAAKhnB,EAAMsB,EAAUslB,EAAO5mB,IAElC,OAAO1B,KAWR,OATkB,IAAbgD,GAA0C,mBAAbA,IAGjCE,EAAKF,EACLA,OAAW6C,IAEA,IAAP3C,IACJA,EAAK+kB,IAECjoB,KAAKiE,KAAM,WACjBlB,EAAO0lB,MAAM9K,OAAQ3d,KAAMsoB,EAAOplB,EAAIF,QAMzC,IAKCyrB,GAAe,wBAGfC,GAAW,oCACXC,GAAe,2CAGhB,SAASC,GAAoBxqB,EAAM2X,GAClC,OAAK3P,EAAUhI,EAAM,UACpBgI,EAA+B,KAArB2P,EAAQxa,SAAkBwa,EAAUA,EAAQzJ,WAAY,OAE3DvP,EAAQqB,GAAO0W,SAAU,SAAW,IAGrC1W,EAIR,SAASyqB,GAAezqB,GAEvB,OADAA,EAAK1C,MAAyC,OAAhC0C,EAAK7B,aAAc,SAAsB,IAAM6B,EAAK1C,KAC3D0C,EAER,SAAS0qB,GAAe1qB,GAOvB,MAN2C,WAApCA,EAAK1C,MAAQ,IAAKpB,MAAO,EAAG,GAClC8D,EAAK1C,KAAO0C,EAAK1C,KAAKpB,MAAO,GAE7B8D,EAAK2J,gBAAiB,QAGhB3J,EAGR,SAAS2qB,GAAgBptB,EAAKqtB,GAC7B,IAAI9sB,EAAGiZ,EAAGzZ,EAAgButB,EAAUC,EAAU3F,EAE9C,GAAuB,IAAlByF,EAAKztB,SAAV,CAKA,GAAKohB,EAASD,QAAS/gB,KAEtB4nB,EADW5G,EAASjf,IAAK/B,GACP4nB,QAKjB,IAAM7nB,KAFNihB,EAAShF,OAAQqR,EAAM,iBAETzF,EACb,IAAMrnB,EAAI,EAAGiZ,EAAIoO,EAAQ7nB,GAAO2B,OAAQnB,EAAIiZ,EAAGjZ,IAC9Ca,EAAO0lB,MAAMlN,IAAKyT,EAAMttB,EAAM6nB,EAAQ7nB,GAAQQ,IAO7C0gB,EAASF,QAAS/gB,KACtBstB,EAAWrM,EAASzB,OAAQxf,GAC5ButB,EAAWnsB,EAAOmC,OAAQ,GAAI+pB,GAE9BrM,EAASL,IAAKyM,EAAME,KAkBtB,SAASC,GAAUC,EAAY7a,EAAMrQ,EAAUojB,GAG9C/S,EAAOhU,EAAMgU,GAEb,IAAIkT,EAAUnjB,EAAO8iB,EAASiI,EAAYrtB,EAAMC,EAC/CC,EAAI,EACJiZ,EAAIiU,EAAW/rB,OACfisB,EAAWnU,EAAI,EACfjU,EAAQqN,EAAM,GACdgb,EAAkBluB,EAAY6F,GAG/B,GAAKqoB,GACG,EAAJpU,GAA0B,iBAAVjU,IAChB9F,EAAQ4kB,YAAc0I,GAASlhB,KAAMtG,GACxC,OAAOkoB,EAAWnrB,KAAM,SAAUoX,GACjC,IAAIb,EAAO4U,EAAW7qB,GAAI8W,GACrBkU,IACJhb,EAAM,GAAMrN,EAAMzG,KAAMT,KAAMqb,EAAOb,EAAKgV,SAE3CL,GAAU3U,EAAMjG,EAAMrQ,EAAUojB,KAIlC,GAAKnM,IAEJ7W,GADAmjB,EAAWN,GAAe5S,EAAM6a,EAAY,GAAIniB,eAAe,EAAOmiB,EAAY9H,IACjEhV,WAEmB,IAA/BmV,EAASlb,WAAWlJ,SACxBokB,EAAWnjB,GAIPA,GAASgjB,GAAU,CAOvB,IALA+H,GADAjI,EAAUrkB,EAAOoB,IAAKuiB,GAAQe,EAAU,UAAYoH,KAC/BxrB,OAKbnB,EAAIiZ,EAAGjZ,IACdF,EAAOylB,EAEFvlB,IAAMotB,IACVttB,EAAOe,EAAOwC,MAAOvD,GAAM,GAAM,GAG5BqtB,GAIJtsB,EAAOgB,MAAOqjB,EAASV,GAAQ1kB,EAAM,YAIvCkC,EAASzD,KAAM2uB,EAAYltB,GAAKF,EAAME,GAGvC,GAAKmtB,EAOJ,IANAptB,EAAMmlB,EAASA,EAAQ/jB,OAAS,GAAI4J,cAGpClK,EAAOoB,IAAKijB,EAAS0H,IAGf5sB,EAAI,EAAGA,EAAImtB,EAAYntB,IAC5BF,EAAOolB,EAASllB,GACX4jB,GAAYtY,KAAMxL,EAAKN,MAAQ,MAClCihB,EAASxB,OAAQnf,EAAM,eACxBe,EAAOyF,SAAUvG,EAAKD,KAEjBA,EAAKL,KAA8C,YAArCK,EAAKN,MAAQ,IAAK8F,cAG/BzE,EAAO0sB,WAAaztB,EAAKH,UAC7BkB,EAAO0sB,SAAUztB,EAAKL,IAAK,CAC1BC,MAAOI,EAAKJ,OAASI,EAAKO,aAAc,UACtCN,GAGJH,EAASE,EAAKqQ,YAAYpM,QAAS0oB,GAAc,IAAM3sB,EAAMC,IAQnE,OAAOmtB,EAGR,SAASzR,GAAQvZ,EAAMpB,EAAU0sB,GAKhC,IAJA,IAAI1tB,EACH0lB,EAAQ1kB,EAAWD,EAAOsN,OAAQrN,EAAUoB,GAASA,EACrDlC,EAAI,EAE4B,OAAvBF,EAAO0lB,EAAOxlB,IAAeA,IAChCwtB,GAA8B,IAAlB1tB,EAAKT,UACtBwB,EAAO4sB,UAAWjJ,GAAQ1kB,IAGtBA,EAAKW,aACJ+sB,GAAYxL,GAAYliB,IAC5B2kB,GAAeD,GAAQ1kB,EAAM,WAE9BA,EAAKW,WAAWC,YAAaZ,IAI/B,OAAOoC,EAGRrB,EAAOmC,OAAQ,CACdyiB,cAAe,SAAU6H,GACxB,OAAOA,GAGRjqB,MAAO,SAAUnB,EAAMwrB,EAAeC,GACrC,IAAI3tB,EAAGiZ,EAAG2U,EAAaC,EApINpuB,EAAKqtB,EACnB5iB,EAoIF7G,EAAQnB,EAAK6hB,WAAW,GACxB+J,EAAS9L,GAAY9f,GAGtB,KAAMhD,EAAQ8kB,gBAAsC,IAAlB9hB,EAAK7C,UAAoC,KAAlB6C,EAAK7C,UAC3DwB,EAAO8W,SAAUzV,IAMnB,IAHA2rB,EAAerJ,GAAQnhB,GAGjBrD,EAAI,EAAGiZ,GAFb2U,EAAcpJ,GAAQtiB,IAEOf,OAAQnB,EAAIiZ,EAAGjZ,IAhJ5BP,EAiJLmuB,EAAa5tB,GAjJH8sB,EAiJQe,EAAc7tB,QAhJzCkK,EAGc,WAHdA,EAAW4iB,EAAK5iB,SAAS5E,gBAGAoe,GAAepY,KAAM7L,EAAID,MACrDstB,EAAKtZ,QAAU/T,EAAI+T,QAGK,UAAbtJ,GAAqC,aAAbA,IACnC4iB,EAAKrV,aAAehY,EAAIgY,cA6IxB,GAAKiW,EACJ,GAAKC,EAIJ,IAHAC,EAAcA,GAAepJ,GAAQtiB,GACrC2rB,EAAeA,GAAgBrJ,GAAQnhB,GAEjCrD,EAAI,EAAGiZ,EAAI2U,EAAYzsB,OAAQnB,EAAIiZ,EAAGjZ,IAC3C6sB,GAAgBe,EAAa5tB,GAAK6tB,EAAc7tB,SAGjD6sB,GAAgB3qB,EAAMmB,GAWxB,OAL2B,GAD3BwqB,EAAerJ,GAAQnhB,EAAO,WACZlC,QACjBsjB,GAAeoJ,GAAeC,GAAUtJ,GAAQtiB,EAAM,WAIhDmB,GAGRoqB,UAAW,SAAU9rB,GAKpB,IAJA,IAAI2e,EAAMpe,EAAM1C,EACfwd,EAAUnc,EAAO0lB,MAAMvJ,QACvBhd,EAAI,OAE6B2D,KAAxBzB,EAAOP,EAAO3B,IAAqBA,IAC5C,GAAK+f,EAAY7d,GAAS,CACzB,GAAOoe,EAAOpe,EAAMue,EAAS7c,SAAc,CAC1C,GAAK0c,EAAK+G,OACT,IAAM7nB,KAAQ8gB,EAAK+G,OACbrK,EAASxd,GACbqB,EAAO0lB,MAAM9K,OAAQvZ,EAAM1C,GAI3BqB,EAAOynB,YAAapmB,EAAM1C,EAAM8gB,EAAKuH,QAOxC3lB,EAAMue,EAAS7c,cAAYD,EAEvBzB,EAAMwe,EAAS9c,WAInB1B,EAAMwe,EAAS9c,cAAYD,OAOhC9C,EAAOG,GAAGgC,OAAQ,CACjB+qB,OAAQ,SAAUjtB,GACjB,OAAO2a,GAAQ3d,KAAMgD,GAAU,IAGhC2a,OAAQ,SAAU3a,GACjB,OAAO2a,GAAQ3d,KAAMgD,IAGtBV,KAAM,SAAU4E,GACf,OAAOia,EAAQnhB,KAAM,SAAUkH,GAC9B,YAAiBrB,IAAVqB,EACNnE,EAAOT,KAAMtC,MACbA,KAAK6V,QAAQ5R,KAAM,WACK,IAAlBjE,KAAKuB,UAAoC,KAAlBvB,KAAKuB,UAAqC,IAAlBvB,KAAKuB,WACxDvB,KAAKqS,YAAcnL,MAGpB,KAAMA,EAAO7C,UAAUhB,SAG3B6sB,OAAQ,WACP,OAAOf,GAAUnvB,KAAMqE,UAAW,SAAUD,GACpB,IAAlBpE,KAAKuB,UAAoC,KAAlBvB,KAAKuB,UAAqC,IAAlBvB,KAAKuB,UAC3CqtB,GAAoB5uB,KAAMoE,GAChC1B,YAAa0B,MAKvB+rB,QAAS,WACR,OAAOhB,GAAUnvB,KAAMqE,UAAW,SAAUD,GAC3C,GAAuB,IAAlBpE,KAAKuB,UAAoC,KAAlBvB,KAAKuB,UAAqC,IAAlBvB,KAAKuB,SAAiB,CACzE,IAAIiE,EAASopB,GAAoB5uB,KAAMoE,GACvCoB,EAAO4qB,aAAchsB,EAAMoB,EAAO8M,gBAKrC+d,OAAQ,WACP,OAAOlB,GAAUnvB,KAAMqE,UAAW,SAAUD,GACtCpE,KAAK2C,YACT3C,KAAK2C,WAAWytB,aAAchsB,EAAMpE,SAKvCswB,MAAO,WACN,OAAOnB,GAAUnvB,KAAMqE,UAAW,SAAUD,GACtCpE,KAAK2C,YACT3C,KAAK2C,WAAWytB,aAAchsB,EAAMpE,KAAKgP,gBAK5C6G,MAAO,WAIN,IAHA,IAAIzR,EACHlC,EAAI,EAE2B,OAAtBkC,EAAOpE,KAAMkC,IAAeA,IACd,IAAlBkC,EAAK7C,WAGTwB,EAAO4sB,UAAWjJ,GAAQtiB,GAAM,IAGhCA,EAAKiO,YAAc,IAIrB,OAAOrS,MAGRuF,MAAO,SAAUqqB,EAAeC,GAI/B,OAHAD,EAAiC,MAAjBA,GAAgCA,EAChDC,EAAyC,MAArBA,EAA4BD,EAAgBC,EAEzD7vB,KAAKmE,IAAK,WAChB,OAAOpB,EAAOwC,MAAOvF,KAAM4vB,EAAeC,MAI5CL,KAAM,SAAUtoB,GACf,OAAOia,EAAQnhB,KAAM,SAAUkH,GAC9B,IAAI9C,EAAOpE,KAAM,IAAO,GACvBkC,EAAI,EACJiZ,EAAInb,KAAKqD,OAEV,QAAewC,IAAVqB,GAAyC,IAAlB9C,EAAK7C,SAChC,OAAO6C,EAAKwM,UAIb,GAAsB,iBAAV1J,IAAuBunB,GAAajhB,KAAMtG,KACpDkf,IAAWP,GAAS3Y,KAAMhG,IAAW,CAAE,GAAI,KAAQ,GAAIM,eAAkB,CAE1EN,EAAQnE,EAAO4kB,cAAezgB,GAE9B,IACC,KAAQhF,EAAIiZ,EAAGjZ,IAIS,KAHvBkC,EAAOpE,KAAMkC,IAAO,IAGVX,WACTwB,EAAO4sB,UAAWjJ,GAAQtiB,GAAM,IAChCA,EAAKwM,UAAY1J,GAInB9C,EAAO,EAGN,MAAQoI,KAGNpI,GACJpE,KAAK6V,QAAQqa,OAAQhpB,IAEpB,KAAMA,EAAO7C,UAAUhB,SAG3BktB,YAAa,WACZ,IAAIjJ,EAAU,GAGd,OAAO6H,GAAUnvB,KAAMqE,UAAW,SAAUD,GAC3C,IAAI8P,EAASlU,KAAK2C,WAEbI,EAAO6D,QAAS5G,KAAMsnB,GAAY,IACtCvkB,EAAO4sB,UAAWjJ,GAAQ1mB,OACrBkU,GACJA,EAAOsc,aAAcpsB,EAAMpE,QAK3BsnB,MAILvkB,EAAOkB,KAAM,CACZwsB,SAAU,SACVC,UAAW,UACXN,aAAc,SACdO,YAAa,QACbC,WAAY,eACV,SAAUxrB,EAAMyrB,GAClB9tB,EAAOG,GAAIkC,GAAS,SAAUpC,GAO7B,IANA,IAAIa,EACHC,EAAM,GACNgtB,EAAS/tB,EAAQC,GACjBwB,EAAOssB,EAAOztB,OAAS,EACvBnB,EAAI,EAEGA,GAAKsC,EAAMtC,IAClB2B,EAAQ3B,IAAMsC,EAAOxE,KAAOA,KAAKuF,OAAO,GACxCxC,EAAQ+tB,EAAQ5uB,IAAO2uB,GAAYhtB,GAInCjD,EAAKD,MAAOmD,EAAKD,EAAMH,OAGxB,OAAO1D,KAAK4D,UAAWE,MAGzB,IAAIitB,GAAY,IAAIjnB,OAAQ,KAAOga,GAAO,kBAAmB,KAEzDkN,GAAY,SAAU5sB,GAKxB,IAAI6oB,EAAO7oB,EAAK6I,cAAc4C,YAM9B,OAJMod,GAASA,EAAKgE,SACnBhE,EAAOltB,GAGDktB,EAAKiE,iBAAkB9sB,IAG5B+sB,GAAO,SAAU/sB,EAAMe,EAASjB,GACnC,IAAIJ,EAAKsB,EACRgsB,EAAM,GAGP,IAAMhsB,KAAQD,EACbisB,EAAKhsB,GAAShB,EAAKkgB,MAAOlf,GAC1BhB,EAAKkgB,MAAOlf,GAASD,EAASC,GAM/B,IAAMA,KAHNtB,EAAMI,EAASzD,KAAM2D,GAGPe,EACbf,EAAKkgB,MAAOlf,GAASgsB,EAAKhsB,GAG3B,OAAOtB,GAIJutB,GAAY,IAAIvnB,OAAQma,GAAUrW,KAAM,KAAO,KA8HnD,SAAS0jB,GAAQltB,EAAMgB,EAAMmsB,GAC5B,IAAIC,EAAOC,EAAUC,EAAU5tB,EAM9BwgB,EAAQlgB,EAAKkgB,MAqCd,OAnCAiN,EAAWA,GAAYP,GAAW5sB,MAQpB,MAFbN,EAAMytB,EAASI,iBAAkBvsB,IAAUmsB,EAAUnsB,KAEjC8e,GAAY9f,KAC/BN,EAAMf,EAAOuhB,MAAOlgB,EAAMgB,KAQrBhE,EAAQwwB,kBAAoBb,GAAUvjB,KAAM1J,IAASutB,GAAU7jB,KAAMpI,KAG1EosB,EAAQlN,EAAMkN,MACdC,EAAWnN,EAAMmN,SACjBC,EAAWpN,EAAMoN,SAGjBpN,EAAMmN,SAAWnN,EAAMoN,SAAWpN,EAAMkN,MAAQ1tB,EAChDA,EAAMytB,EAASC,MAGflN,EAAMkN,MAAQA,EACdlN,EAAMmN,SAAWA,EACjBnN,EAAMoN,SAAWA,SAIJ7rB,IAAR/B,EAINA,EAAM,GACNA,EAIF,SAAS+tB,GAAcC,EAAaC,GAGnC,MAAO,CACNruB,IAAK,WACJ,IAAKouB,IASL,OAAS9xB,KAAK0D,IAAMquB,GAASpxB,MAAOX,KAAMqE,kBALlCrE,KAAK0D,OAxLhB,WAIC,SAASsuB,IAGR,GAAMrM,EAAN,CAIAsM,EAAU3N,MAAM4N,QAAU,+EAE1BvM,EAAIrB,MAAM4N,QACT,4HAGDxiB,GAAgBhN,YAAauvB,GAAYvvB,YAAaijB,GAEtD,IAAIwM,EAAWpyB,EAAOmxB,iBAAkBvL,GACxCyM,EAAoC,OAAjBD,EAASriB,IAG5BuiB,EAAsE,KAA9CC,EAAoBH,EAASI,YAIrD5M,EAAIrB,MAAMkO,MAAQ,MAClBC,EAA6D,KAAzCH,EAAoBH,EAASK,OAIjDE,EAAgE,KAAzCJ,EAAoBH,EAASX,OAMpD7L,EAAIrB,MAAMqO,SAAW,WACrBC,EAAiE,KAA9CN,EAAoB3M,EAAIkN,YAAc,GAEzDnjB,GAAgB9M,YAAaqvB,GAI7BtM,EAAM,MAGP,SAAS2M,EAAoBQ,GAC5B,OAAO/sB,KAAKgtB,MAAOC,WAAYF,IAGhC,IAAIV,EAAkBM,EAAsBE,EAAkBH,EAC7DQ,EAAyBZ,EACzBJ,EAAYryB,EAASyC,cAAe,OACpCsjB,EAAM/lB,EAASyC,cAAe,OAGzBsjB,EAAIrB,QAMVqB,EAAIrB,MAAM4O,eAAiB,cAC3BvN,EAAIM,WAAW,GAAO3B,MAAM4O,eAAiB,GAC7C9xB,EAAQ+xB,gBAA+C,gBAA7BxN,EAAIrB,MAAM4O,eAEpCnwB,EAAOmC,OAAQ9D,EAAS,CACvBgyB,kBAAmB,WAElB,OADApB,IACOU,GAERd,eAAgB,WAEf,OADAI,IACOS,GAERY,cAAe,WAEd,OADArB,IACOI,GAERkB,mBAAoB,WAEnB,OADAtB,IACOK,GAERkB,cAAe,WAEd,OADAvB,IACOY,GAQRY,qBAAsB,WACrB,IAAIC,EAAOlN,EAAImN,EAASC,EAoBxB,OAnBgC,MAA3BV,IACJQ,EAAQ7zB,EAASyC,cAAe,SAChCkkB,EAAK3mB,EAASyC,cAAe,MAC7BqxB,EAAU9zB,EAASyC,cAAe,OAElCoxB,EAAMnP,MAAM4N,QAAU,kCACtB3L,EAAGjC,MAAMsP,OAAS,MAClBF,EAAQpP,MAAMsP,OAAS,MAEvBlkB,GACEhN,YAAa+wB,GACb/wB,YAAa6jB,GACb7jB,YAAagxB,GAEfC,EAAU5zB,EAAOmxB,iBAAkB3K,GACnC0M,EAAuD,EAA7BY,SAAUF,EAAQC,QAE5ClkB,GAAgB9M,YAAa6wB,IAEvBR,MApHV,GAmMA,IAAIa,GAAc,CAAE,SAAU,MAAO,MACpCC,GAAan0B,EAASyC,cAAe,OAAQiiB,MAC7C0P,GAAc,GAkBf,SAASC,GAAe7uB,GACvB,IAAI8uB,EAAQnxB,EAAOoxB,SAAU/uB,IAAU4uB,GAAa5uB,GAEpD,OAAK8uB,IAGA9uB,KAAQ2uB,GACL3uB,EAED4uB,GAAa5uB,GAxBrB,SAAyBA,GAGxB,IAAIgvB,EAAUhvB,EAAM,GAAI0c,cAAgB1c,EAAK9E,MAAO,GACnD4B,EAAI4xB,GAAYzwB,OAEjB,MAAQnB,IAEP,IADAkD,EAAO0uB,GAAa5xB,GAAMkyB,KACbL,GACZ,OAAO3uB,EAeoBivB,CAAgBjvB,IAAUA,GAIxD,IAKCkvB,GAAe,4BACfC,GAAc,MACdC,GAAU,CAAE7B,SAAU,WAAY8B,WAAY,SAAUlQ,QAAS,SACjEmQ,GAAqB,CACpBC,cAAe,IACfC,WAAY,OAGd,SAASC,GAAmBlwB,EAAOuC,EAAO4tB,GAIzC,IAAI/tB,EAAUid,GAAQ9W,KAAMhG,GAC5B,OAAOH,EAGNhB,KAAKgvB,IAAK,EAAGhuB,EAAS,IAAQ+tB,GAAY,KAAU/tB,EAAS,IAAO,MACpEG,EAGF,SAAS8tB,GAAoB5wB,EAAM6wB,EAAWC,EAAKC,EAAaC,EAAQC,GACvE,IAAInzB,EAAkB,UAAd+yB,EAAwB,EAAI,EACnCK,EAAQ,EACRC,EAAQ,EAGT,GAAKL,KAAUC,EAAc,SAAW,WACvC,OAAO,EAGR,KAAQjzB,EAAI,EAAGA,GAAK,EAGN,WAARgzB,IACJK,GAASxyB,EAAOyhB,IAAKpgB,EAAM8wB,EAAMjR,GAAW/hB,IAAK,EAAMkzB,IAIlDD,GAmBQ,YAARD,IACJK,GAASxyB,EAAOyhB,IAAKpgB,EAAM,UAAY6f,GAAW/hB,IAAK,EAAMkzB,IAIjD,WAARF,IACJK,GAASxyB,EAAOyhB,IAAKpgB,EAAM,SAAW6f,GAAW/hB,GAAM,SAAS,EAAMkzB,MAtBvEG,GAASxyB,EAAOyhB,IAAKpgB,EAAM,UAAY6f,GAAW/hB,IAAK,EAAMkzB,GAGhD,YAARF,EACJK,GAASxyB,EAAOyhB,IAAKpgB,EAAM,SAAW6f,GAAW/hB,GAAM,SAAS,EAAMkzB,GAItEE,GAASvyB,EAAOyhB,IAAKpgB,EAAM,SAAW6f,GAAW/hB,GAAM,SAAS,EAAMkzB,IAoCzE,OAhBMD,GAA8B,GAAfE,IAIpBE,GAASxvB,KAAKgvB,IAAK,EAAGhvB,KAAKyvB,KAC1BpxB,EAAM,SAAW6wB,EAAW,GAAInT,cAAgBmT,EAAU30B,MAAO,IACjE+0B,EACAE,EACAD,EACA,MAIM,GAGDC,EAGR,SAASE,GAAkBrxB,EAAM6wB,EAAWK,GAG3C,IAAIF,EAASpE,GAAW5sB,GAKvB+wB,IADmB/zB,EAAQgyB,qBAAuBkC,IAEE,eAAnDvyB,EAAOyhB,IAAKpgB,EAAM,aAAa,EAAOgxB,GACvCM,EAAmBP,EAEnBhzB,EAAMmvB,GAAQltB,EAAM6wB,EAAWG,GAC/BO,EAAa,SAAWV,EAAW,GAAInT,cAAgBmT,EAAU30B,MAAO,GAIzE,GAAKywB,GAAUvjB,KAAMrL,GAAQ,CAC5B,IAAMmzB,EACL,OAAOnzB,EAERA,EAAM,OAyCP,QAlCQf,EAAQgyB,qBAAuB+B,IAMrC/zB,EAAQoyB,wBAA0BpnB,EAAUhI,EAAM,OAI3C,SAARjC,IAIC6wB,WAAY7wB,IAA0D,WAAjDY,EAAOyhB,IAAKpgB,EAAM,WAAW,EAAOgxB,KAG1DhxB,EAAKwxB,iBAAiBvyB,SAEtB8xB,EAAiE,eAAnDpyB,EAAOyhB,IAAKpgB,EAAM,aAAa,EAAOgxB,IAKpDM,EAAmBC,KAAcvxB,KAEhCjC,EAAMiC,EAAMuxB,MAKdxzB,EAAM6wB,WAAY7wB,IAAS,GAI1B6yB,GACC5wB,EACA6wB,EACAK,IAAWH,EAAc,SAAW,WACpCO,EACAN,EAGAjzB,GAEE,KA+SL,SAAS0zB,GAAOzxB,EAAMe,EAASsd,EAAM1d,EAAK+wB,GACzC,OAAO,IAAID,GAAMvyB,UAAUH,KAAMiB,EAAMe,EAASsd,EAAM1d,EAAK+wB,GA7S5D/yB,EAAOmC,OAAQ,CAId6wB,SAAU,CACTC,QAAS,CACRtyB,IAAK,SAAUU,EAAMmtB,GACpB,GAAKA,EAAW,CAGf,IAAIztB,EAAMwtB,GAAQltB,EAAM,WACxB,MAAe,KAARN,EAAa,IAAMA,MAO9BohB,UAAW,CACV+Q,yBAA2B,EAC3BC,aAAe,EACfC,aAAe,EACfC,UAAY,EACZC,YAAc,EACdzB,YAAc,EACd0B,UAAY,EACZC,YAAc,EACdC,eAAiB,EACjBC,iBAAmB,EACnBC,SAAW,EACXC,YAAc,EACdC,cAAgB,EAChBC,YAAc,EACdb,SAAW,EACXc,OAAS,EACTC,SAAW,EACXC,QAAU,EACVC,QAAU,EACVC,MAAQ,GAKT/C,SAAU,GAGV7P,MAAO,SAAUlgB,EAAMgB,EAAM8B,EAAOouB,GAGnC,GAAMlxB,GAA0B,IAAlBA,EAAK7C,UAAoC,IAAlB6C,EAAK7C,UAAmB6C,EAAKkgB,MAAlE,CAKA,IAAIxgB,EAAKpC,EAAM6hB,EACd4T,EAAWpV,EAAW3c,GACtBgyB,EAAe7C,GAAY/mB,KAAMpI,GACjCkf,EAAQlgB,EAAKkgB,MAad,GARM8S,IACLhyB,EAAO6uB,GAAekD,IAIvB5T,EAAQxgB,EAAOgzB,SAAU3wB,IAAUrC,EAAOgzB,SAAUoB,QAGrCtxB,IAAVqB,EA0CJ,OAAKqc,GAAS,QAASA,QACwB1d,KAA5C/B,EAAMyf,EAAM7f,IAAKU,GAAM,EAAOkxB,IAEzBxxB,EAIDwgB,EAAOlf,GA7CA,YAHd1D,SAAcwF,KAGcpD,EAAMkgB,GAAQ9W,KAAMhG,KAAapD,EAAK,KACjEoD,EAAQud,GAAWrgB,EAAMgB,EAAMtB,GAG/BpC,EAAO,UAIM,MAATwF,GAAiBA,GAAUA,IAOlB,WAATxF,GAAsB01B,IAC1BlwB,GAASpD,GAAOA,EAAK,KAASf,EAAOmiB,UAAWiS,GAAa,GAAK,OAI7D/1B,EAAQ+xB,iBAA6B,KAAVjsB,GAAiD,IAAjC9B,EAAKvE,QAAS,gBAC9DyjB,EAAOlf,GAAS,WAIXme,GAAY,QAASA,QACsB1d,KAA9CqB,EAAQqc,EAAMhB,IAAKne,EAAM8C,EAAOouB,MAE7B8B,EACJ9S,EAAM+S,YAAajyB,EAAM8B,GAEzBod,EAAOlf,GAAS8B,MAkBpBsd,IAAK,SAAUpgB,EAAMgB,EAAMkwB,EAAOF,GACjC,IAAIjzB,EAAKwB,EAAK4f,EACb4T,EAAWpV,EAAW3c,GA6BvB,OA5BgBmvB,GAAY/mB,KAAMpI,KAMjCA,EAAO6uB,GAAekD,KAIvB5T,EAAQxgB,EAAOgzB,SAAU3wB,IAAUrC,EAAOgzB,SAAUoB,KAGtC,QAAS5T,IACtBphB,EAAMohB,EAAM7f,IAAKU,GAAM,EAAMkxB,SAIjBzvB,IAAR1D,IACJA,EAAMmvB,GAAQltB,EAAMgB,EAAMgwB,IAId,WAARjzB,GAAoBiD,KAAQsvB,KAChCvyB,EAAMuyB,GAAoBtvB,IAIZ,KAAVkwB,GAAgBA,GACpB3xB,EAAMqvB,WAAY7wB,IACD,IAAVmzB,GAAkBgC,SAAU3zB,GAAQA,GAAO,EAAIxB,GAGhDA,KAITY,EAAOkB,KAAM,CAAE,SAAU,SAAW,SAAUsD,EAAI0tB,GACjDlyB,EAAOgzB,SAAUd,GAAc,CAC9BvxB,IAAK,SAAUU,EAAMmtB,EAAU+D,GAC9B,GAAK/D,EAIJ,OAAO+C,GAAa9mB,KAAMzK,EAAOyhB,IAAKpgB,EAAM,aAQxCA,EAAKwxB,iBAAiBvyB,QAAWe,EAAKmzB,wBAAwB/F,MAIhEiE,GAAkBrxB,EAAM6wB,EAAWK,GAHnCnE,GAAM/sB,EAAMowB,GAAS,WACpB,OAAOiB,GAAkBrxB,EAAM6wB,EAAWK,MAM/C/S,IAAK,SAAUne,EAAM8C,EAAOouB,GAC3B,IAAIvuB,EACHquB,EAASpE,GAAW5sB,GAIpBozB,GAAsBp2B,EAAQmyB,iBACT,aAApB6B,EAAOzC,SAIRwC,GADkBqC,GAAsBlC,IAEY,eAAnDvyB,EAAOyhB,IAAKpgB,EAAM,aAAa,EAAOgxB,GACvCN,EAAWQ,EACVN,GACC5wB,EACA6wB,EACAK,EACAH,EACAC,GAED,EAqBF,OAjBKD,GAAeqC,IACnB1C,GAAY/uB,KAAKyvB,KAChBpxB,EAAM,SAAW6wB,EAAW,GAAInT,cAAgBmT,EAAU30B,MAAO,IACjE0yB,WAAYoC,EAAQH,IACpBD,GAAoB5wB,EAAM6wB,EAAW,UAAU,EAAOG,GACtD,KAKGN,IAAc/tB,EAAUid,GAAQ9W,KAAMhG,KACb,QAA3BH,EAAS,IAAO,QAElB3C,EAAKkgB,MAAO2Q,GAAc/tB,EAC1BA,EAAQnE,EAAOyhB,IAAKpgB,EAAM6wB,IAGpBJ,GAAmBzwB,EAAM8C,EAAO4tB,OAK1C/xB,EAAOgzB,SAASxD,WAAaV,GAAczwB,EAAQkyB,mBAClD,SAAUlvB,EAAMmtB,GACf,GAAKA,EACJ,OAASyB,WAAY1B,GAAQltB,EAAM,gBAClCA,EAAKmzB,wBAAwBE,KAC5BtG,GAAM/sB,EAAM,CAAEmuB,WAAY,GAAK,WAC9B,OAAOnuB,EAAKmzB,wBAAwBE,QAElC,OAMR10B,EAAOkB,KAAM,CACZyzB,OAAQ,GACRC,QAAS,GACTC,OAAQ,SACN,SAAUC,EAAQC,GACpB/0B,EAAOgzB,SAAU8B,EAASC,GAAW,CACpCC,OAAQ,SAAU7wB,GAOjB,IANA,IAAIhF,EAAI,EACP81B,EAAW,GAGXC,EAAyB,iBAAV/wB,EAAqBA,EAAMI,MAAO,KAAQ,CAAEJ,GAEpDhF,EAAI,EAAGA,IACd81B,EAAUH,EAAS5T,GAAW/hB,GAAM41B,GACnCG,EAAO/1B,IAAO+1B,EAAO/1B,EAAI,IAAO+1B,EAAO,GAGzC,OAAOD,IAIO,WAAXH,IACJ90B,EAAOgzB,SAAU8B,EAASC,GAASvV,IAAMsS,MAI3C9xB,EAAOG,GAAGgC,OAAQ,CACjBsf,IAAK,SAAUpf,EAAM8B,GACpB,OAAOia,EAAQnhB,KAAM,SAAUoE,EAAMgB,EAAM8B,GAC1C,IAAIkuB,EAAQvwB,EACXV,EAAM,GACNjC,EAAI,EAEL,GAAKyD,MAAMC,QAASR,GAAS,CAI5B,IAHAgwB,EAASpE,GAAW5sB,GACpBS,EAAMO,EAAK/B,OAEHnB,EAAI2C,EAAK3C,IAChBiC,EAAKiB,EAAMlD,IAAQa,EAAOyhB,IAAKpgB,EAAMgB,EAAMlD,IAAK,EAAOkzB,GAGxD,OAAOjxB,EAGR,YAAiB0B,IAAVqB,EACNnE,EAAOuhB,MAAOlgB,EAAMgB,EAAM8B,GAC1BnE,EAAOyhB,IAAKpgB,EAAMgB,IACjBA,EAAM8B,EAA0B,EAAnB7C,UAAUhB,aAQ5BN,EAAO8yB,MAAQA,IAETvyB,UAAY,CACjBE,YAAaqyB,GACb1yB,KAAM,SAAUiB,EAAMe,EAASsd,EAAM1d,EAAK+wB,EAAQ7Q,GACjDjlB,KAAKoE,KAAOA,EACZpE,KAAKyiB,KAAOA,EACZziB,KAAK81B,OAASA,GAAU/yB,EAAO+yB,OAAOrP,SACtCzmB,KAAKmF,QAAUA,EACfnF,KAAKiU,MAAQjU,KAAKosB,IAAMpsB,KAAK6O,MAC7B7O,KAAK+E,IAAMA,EACX/E,KAAKilB,KAAOA,IAAUliB,EAAOmiB,UAAWzC,GAAS,GAAK,OAEvD5T,IAAK,WACJ,IAAI0U,EAAQsS,GAAMqC,UAAWl4B,KAAKyiB,MAElC,OAAOc,GAASA,EAAM7f,IACrB6f,EAAM7f,IAAK1D,MACX61B,GAAMqC,UAAUzR,SAAS/iB,IAAK1D,OAEhCm4B,IAAK,SAAUC,GACd,IAAIC,EACH9U,EAAQsS,GAAMqC,UAAWl4B,KAAKyiB,MAoB/B,OAlBKziB,KAAKmF,QAAQmzB,SACjBt4B,KAAKu4B,IAAMF,EAAQt1B,EAAO+yB,OAAQ91B,KAAK81B,QACtCsC,EAASp4B,KAAKmF,QAAQmzB,SAAWF,EAAS,EAAG,EAAGp4B,KAAKmF,QAAQmzB,UAG9Dt4B,KAAKu4B,IAAMF,EAAQD,EAEpBp4B,KAAKosB,KAAQpsB,KAAK+E,IAAM/E,KAAKiU,OAAUokB,EAAQr4B,KAAKiU,MAE/CjU,KAAKmF,QAAQqzB,MACjBx4B,KAAKmF,QAAQqzB,KAAK/3B,KAAMT,KAAKoE,KAAMpE,KAAKosB,IAAKpsB,MAGzCujB,GAASA,EAAMhB,IACnBgB,EAAMhB,IAAKviB,MAEX61B,GAAMqC,UAAUzR,SAASlE,IAAKviB,MAExBA,QAIOmD,KAAKG,UAAYuyB,GAAMvyB,WAEvCuyB,GAAMqC,UAAY,CACjBzR,SAAU,CACT/iB,IAAK,SAAUihB,GACd,IAAIrR,EAIJ,OAA6B,IAAxBqR,EAAMvgB,KAAK7C,UACa,MAA5BojB,EAAMvgB,KAAMugB,EAAMlC,OAAoD,MAAlCkC,EAAMvgB,KAAKkgB,MAAOK,EAAMlC,MACrDkC,EAAMvgB,KAAMugB,EAAMlC,OAO1BnP,EAASvQ,EAAOyhB,IAAKG,EAAMvgB,KAAMugB,EAAMlC,KAAM,MAGhB,SAAXnP,EAAwBA,EAAJ,GAEvCiP,IAAK,SAAUoC,GAKT5hB,EAAO01B,GAAGD,KAAM7T,EAAMlC,MAC1B1f,EAAO01B,GAAGD,KAAM7T,EAAMlC,MAAQkC,GACK,IAAxBA,EAAMvgB,KAAK7C,WACrBwB,EAAOgzB,SAAUpR,EAAMlC,OAC4B,MAAnDkC,EAAMvgB,KAAKkgB,MAAO2P,GAAetP,EAAMlC,OAGxCkC,EAAMvgB,KAAMugB,EAAMlC,MAASkC,EAAMyH,IAFjCrpB,EAAOuhB,MAAOK,EAAMvgB,KAAMugB,EAAMlC,KAAMkC,EAAMyH,IAAMzH,EAAMM,UAU5CyT,UAAY7C,GAAMqC,UAAUS,WAAa,CACxDpW,IAAK,SAAUoC,GACTA,EAAMvgB,KAAK7C,UAAYojB,EAAMvgB,KAAKzB,aACtCgiB,EAAMvgB,KAAMugB,EAAMlC,MAASkC,EAAMyH,OAKpCrpB,EAAO+yB,OAAS,CACf8C,OAAQ,SAAUC,GACjB,OAAOA,GAERC,MAAO,SAAUD,GAChB,MAAO,GAAM9yB,KAAKgzB,IAAKF,EAAI9yB,KAAKizB,IAAO,GAExCvS,SAAU,SAGX1jB,EAAO01B,GAAK5C,GAAMvyB,UAAUH,KAG5BJ,EAAO01B,GAAGD,KAAO,GAKjB,IACCS,GAAOC,GAkrBHvoB,GAEHwoB,GAnrBDC,GAAW,yBACXC,GAAO,cAER,SAASC,KACHJ,MACqB,IAApBt5B,EAAS25B,QAAoBx5B,EAAOy5B,sBACxCz5B,EAAOy5B,sBAAuBF,IAE9Bv5B,EAAO8f,WAAYyZ,GAAUv2B,EAAO01B,GAAGgB,UAGxC12B,EAAO01B,GAAGiB,QAKZ,SAASC,KAIR,OAHA55B,EAAO8f,WAAY,WAClBoZ,QAAQpzB,IAEAozB,GAAQxwB,KAAK2jB,MAIvB,SAASwN,GAAOl4B,EAAMm4B,GACrB,IAAI5L,EACH/rB,EAAI,EACJuM,EAAQ,CAAEmlB,OAAQlyB,GAKnB,IADAm4B,EAAeA,EAAe,EAAI,EAC1B33B,EAAI,EAAGA,GAAK,EAAI23B,EAEvBprB,EAAO,UADPwf,EAAQhK,GAAW/hB,KACSuM,EAAO,UAAYwf,GAAUvsB,EAO1D,OAJKm4B,IACJprB,EAAMunB,QAAUvnB,EAAM+iB,MAAQ9vB,GAGxB+M,EAGR,SAASqrB,GAAa5yB,EAAOub,EAAMsX,GAKlC,IAJA,IAAIpV,EACHyK,GAAe4K,GAAUC,SAAUxX,IAAU,IAAK/hB,OAAQs5B,GAAUC,SAAU,MAC9E5e,EAAQ,EACRhY,EAAS+rB,EAAW/rB,OACbgY,EAAQhY,EAAQgY,IACvB,GAAOsJ,EAAQyK,EAAY/T,GAAQ5a,KAAMs5B,EAAWtX,EAAMvb,GAGzD,OAAOyd,EAsNV,SAASqV,GAAW51B,EAAM81B,EAAY/0B,GACrC,IAAImO,EACH6mB,EACA9e,EAAQ,EACRhY,EAAS22B,GAAUI,WAAW/2B,OAC9B+a,EAAWrb,EAAOgb,WAAWI,OAAQ,kBAG7Bub,EAAKt1B,OAEbs1B,EAAO,WACN,GAAKS,EACJ,OAAO,EAYR,IAVA,IAAIE,EAAcpB,IAASU,KAC1B1Z,EAAYla,KAAKgvB,IAAK,EAAGgF,EAAUO,UAAYP,EAAUzB,SAAW+B,GAKpEjC,EAAU,GADHnY,EAAY8Z,EAAUzB,UAAY,GAEzCjd,EAAQ,EACRhY,EAAS02B,EAAUQ,OAAOl3B,OAEnBgY,EAAQhY,EAAQgY,IACvB0e,EAAUQ,OAAQlf,GAAQ8c,IAAKC,GAMhC,OAHAha,EAASkB,WAAYlb,EAAM,CAAE21B,EAAW3B,EAASnY,IAG5CmY,EAAU,GAAK/0B,EACZ4c,GAIF5c,GACL+a,EAASkB,WAAYlb,EAAM,CAAE21B,EAAW,EAAG,IAI5C3b,EAASmB,YAAanb,EAAM,CAAE21B,KACvB,IAERA,EAAY3b,EAASzB,QAAS,CAC7BvY,KAAMA,EACN2nB,MAAOhpB,EAAOmC,OAAQ,GAAIg1B,GAC1BM,KAAMz3B,EAAOmC,QAAQ,EAAM,CAC1Bu1B,cAAe,GACf3E,OAAQ/yB,EAAO+yB,OAAOrP,UACpBthB,GACHu1B,mBAAoBR,EACpBS,gBAAiBx1B,EACjBm1B,UAAWrB,IAASU,KACpBrB,SAAUnzB,EAAQmzB,SAClBiC,OAAQ,GACRT,YAAa,SAAUrX,EAAM1d,GAC5B,IAAI4f,EAAQ5hB,EAAO8yB,MAAOzxB,EAAM21B,EAAUS,KAAM/X,EAAM1d,EACpDg1B,EAAUS,KAAKC,cAAehY,IAAUsX,EAAUS,KAAK1E,QAEzD,OADAiE,EAAUQ,OAAO35B,KAAM+jB,GAChBA,GAERlB,KAAM,SAAUmX,GACf,IAAIvf,EAAQ,EAIXhY,EAASu3B,EAAUb,EAAUQ,OAAOl3B,OAAS,EAC9C,GAAK82B,EACJ,OAAOn6B,KAGR,IADAm6B,GAAU,EACF9e,EAAQhY,EAAQgY,IACvB0e,EAAUQ,OAAQlf,GAAQ8c,IAAK,GAUhC,OANKyC,GACJxc,EAASkB,WAAYlb,EAAM,CAAE21B,EAAW,EAAG,IAC3C3b,EAASmB,YAAanb,EAAM,CAAE21B,EAAWa,KAEzCxc,EAASuB,WAAYvb,EAAM,CAAE21B,EAAWa,IAElC56B,QAGT+rB,EAAQgO,EAAUhO,MAInB,KA/HD,SAAqBA,EAAO0O,GAC3B,IAAIpf,EAAOjW,EAAM0wB,EAAQ5uB,EAAOqc,EAGhC,IAAMlI,KAAS0Q,EAed,GAbA+J,EAAS2E,EADTr1B,EAAO2c,EAAW1G,IAElBnU,EAAQ6kB,EAAO1Q,GACV1V,MAAMC,QAASsB,KACnB4uB,EAAS5uB,EAAO,GAChBA,EAAQ6kB,EAAO1Q,GAAUnU,EAAO,IAG5BmU,IAAUjW,IACd2mB,EAAO3mB,GAAS8B,SACT6kB,EAAO1Q,KAGfkI,EAAQxgB,EAAOgzB,SAAU3wB,KACX,WAAYme,EAMzB,IAAMlI,KALNnU,EAAQqc,EAAMwU,OAAQ7wB,UACf6kB,EAAO3mB,GAIC8B,EACNmU,KAAS0Q,IAChBA,EAAO1Q,GAAUnU,EAAOmU,GACxBof,EAAepf,GAAUya,QAI3B2E,EAAer1B,GAAS0wB,EA6F1B+E,CAAY9O,EAAOgO,EAAUS,KAAKC,eAE1Bpf,EAAQhY,EAAQgY,IAEvB,GADA/H,EAAS0mB,GAAUI,WAAY/e,GAAQ5a,KAAMs5B,EAAW31B,EAAM2nB,EAAOgO,EAAUS,MAM9E,OAJKn5B,EAAYiS,EAAOmQ,QACvB1gB,EAAOygB,YAAauW,EAAU31B,KAAM21B,EAAUS,KAAKld,OAAQmG,KAC1DnQ,EAAOmQ,KAAKqX,KAAMxnB,IAEbA,EAyBT,OArBAvQ,EAAOoB,IAAK4nB,EAAO+N,GAAaC,GAE3B14B,EAAY04B,EAAUS,KAAKvmB,QAC/B8lB,EAAUS,KAAKvmB,MAAMxT,KAAM2D,EAAM21B,GAIlCA,EACEpb,SAAUob,EAAUS,KAAK7b,UACzB/V,KAAMmxB,EAAUS,KAAK5xB,KAAMmxB,EAAUS,KAAKO,UAC1Cne,KAAMmd,EAAUS,KAAK5d,MACrBuB,OAAQ4b,EAAUS,KAAKrc,QAEzBpb,EAAO01B,GAAGuC,MACTj4B,EAAOmC,OAAQw0B,EAAM,CACpBt1B,KAAMA,EACN62B,KAAMlB,EACNzc,MAAOyc,EAAUS,KAAKld,SAIjByc,EAGRh3B,EAAOi3B,UAAYj3B,EAAOmC,OAAQ80B,GAAW,CAE5CC,SAAU,CACTiB,IAAK,CAAE,SAAUzY,EAAMvb,GACtB,IAAIyd,EAAQ3kB,KAAK85B,YAAarX,EAAMvb,GAEpC,OADAud,GAAWE,EAAMvgB,KAAMqe,EAAMuB,GAAQ9W,KAAMhG,GAASyd,GAC7CA,KAITwW,QAAS,SAAUpP,EAAO7nB,GACpB7C,EAAY0qB,IAChB7nB,EAAW6nB,EACXA,EAAQ,CAAE,MAEVA,EAAQA,EAAMlf,MAAOoP,GAOtB,IAJA,IAAIwG,EACHpH,EAAQ,EACRhY,EAAS0oB,EAAM1oB,OAERgY,EAAQhY,EAAQgY,IACvBoH,EAAOsJ,EAAO1Q,GACd2e,GAAUC,SAAUxX,GAASuX,GAAUC,SAAUxX,IAAU,GAC3DuX,GAAUC,SAAUxX,GAAO9Q,QAASzN,IAItCk2B,WAAY,CA3Wb,SAA2Bh2B,EAAM2nB,EAAOyO,GACvC,IAAI/X,EAAMvb,EAAOwe,EAAQnC,EAAO6X,EAASC,EAAWC,EAAgB/W,EACnEgX,EAAQ,UAAWxP,GAAS,WAAYA,EACxCkP,EAAOj7B,KACPuuB,EAAO,GACPjK,EAAQlgB,EAAKkgB,MACbiV,EAASn1B,EAAK7C,UAAY8iB,GAAoBjgB,GAC9Co3B,EAAW7Y,EAASjf,IAAKU,EAAM,UA6BhC,IAAMqe,KA1BA+X,EAAKld,QAEa,OADvBiG,EAAQxgB,EAAOygB,YAAapf,EAAM,OACvBq3B,WACVlY,EAAMkY,SAAW,EACjBL,EAAU7X,EAAM1N,MAAM2H,KACtB+F,EAAM1N,MAAM2H,KAAO,WACZ+F,EAAMkY,UACXL,MAIH7X,EAAMkY,WAENR,EAAK9c,OAAQ,WAGZ8c,EAAK9c,OAAQ,WACZoF,EAAMkY,WACA14B,EAAOua,MAAOlZ,EAAM,MAAOf,QAChCkgB,EAAM1N,MAAM2H,YAOFuO,EAEb,GADA7kB,EAAQ6kB,EAAOtJ,GACV2W,GAAS5rB,KAAMtG,GAAU,CAG7B,UAFO6kB,EAAOtJ,GACdiD,EAASA,GAAoB,WAAVxe,EACdA,KAAYqyB,EAAS,OAAS,QAAW,CAI7C,GAAe,SAAVryB,IAAoBs0B,QAAiC31B,IAArB21B,EAAU/Y,GAK9C,SAJA8W,GAAS,EAOXhL,EAAM9L,GAAS+Y,GAAYA,EAAU/Y,IAAU1f,EAAOuhB,MAAOlgB,EAAMqe,GAMrE,IADA4Y,GAAat4B,EAAOyD,cAAeulB,MAChBhpB,EAAOyD,cAAe+nB,GA8DzC,IAAM9L,KAzDD8Y,GAA2B,IAAlBn3B,EAAK7C,WAMlBi5B,EAAKkB,SAAW,CAAEpX,EAAMoX,SAAUpX,EAAMqX,UAAWrX,EAAMsX,WAIlC,OADvBN,EAAiBE,GAAYA,EAASjX,WAErC+W,EAAiB3Y,EAASjf,IAAKU,EAAM,YAGrB,UADjBmgB,EAAUxhB,EAAOyhB,IAAKpgB,EAAM,cAEtBk3B,EACJ/W,EAAU+W,GAIVjW,GAAU,CAAEjhB,IAAQ,GACpBk3B,EAAiBl3B,EAAKkgB,MAAMC,SAAW+W,EACvC/W,EAAUxhB,EAAOyhB,IAAKpgB,EAAM,WAC5BihB,GAAU,CAAEjhB,OAKG,WAAZmgB,GAAoC,iBAAZA,GAAgD,MAAlB+W,IACrB,SAAhCv4B,EAAOyhB,IAAKpgB,EAAM,WAGhBi3B,IACLJ,EAAKryB,KAAM,WACV0b,EAAMC,QAAU+W,IAEM,MAAlBA,IACJ/W,EAAUD,EAAMC,QAChB+W,EAA6B,SAAZ/W,EAAqB,GAAKA,IAG7CD,EAAMC,QAAU,iBAKdiW,EAAKkB,WACTpX,EAAMoX,SAAW,SACjBT,EAAK9c,OAAQ,WACZmG,EAAMoX,SAAWlB,EAAKkB,SAAU,GAChCpX,EAAMqX,UAAYnB,EAAKkB,SAAU,GACjCpX,EAAMsX,UAAYpB,EAAKkB,SAAU,MAKnCL,GAAY,EACE9M,EAGP8M,IACAG,EACC,WAAYA,IAChBjC,EAASiC,EAASjC,QAGnBiC,EAAW7Y,EAASxB,OAAQ/c,EAAM,SAAU,CAAEmgB,QAAS+W,IAInD5V,IACJ8V,EAASjC,QAAUA,GAIfA,GACJlU,GAAU,CAAEjhB,IAAQ,GAKrB62B,EAAKryB,KAAM,WASV,IAAM6Z,KAJA8W,GACLlU,GAAU,CAAEjhB,IAEbue,EAAShF,OAAQvZ,EAAM,UACTmqB,EACbxrB,EAAOuhB,MAAOlgB,EAAMqe,EAAM8L,EAAM9L,OAMnC4Y,EAAYvB,GAAaP,EAASiC,EAAU/Y,GAAS,EAAGA,EAAMwY,GACtDxY,KAAQ+Y,IACfA,EAAU/Y,GAAS4Y,EAAUpnB,MACxBslB,IACJ8B,EAAUt2B,IAAMs2B,EAAUpnB,MAC1BonB,EAAUpnB,MAAQ,MAuMrB4nB,UAAW,SAAU33B,EAAUisB,GACzBA,EACJ6J,GAAUI,WAAWzoB,QAASzN,GAE9B81B,GAAUI,WAAWx5B,KAAMsD,MAK9BnB,EAAO+4B,MAAQ,SAAUA,EAAOhG,EAAQ5yB,GACvC,IAAIi2B,EAAM2C,GAA0B,iBAAVA,EAAqB/4B,EAAOmC,OAAQ,GAAI42B,GAAU,CAC3Ef,SAAU73B,IAAOA,GAAM4yB,GACtBz0B,EAAYy6B,IAAWA,EACxBxD,SAAUwD,EACVhG,OAAQ5yB,GAAM4yB,GAAUA,IAAWz0B,EAAYy0B,IAAYA,GAoC5D,OAhCK/yB,EAAO01B,GAAG/P,IACdyQ,EAAIb,SAAW,EAGc,iBAAjBa,EAAIb,WACVa,EAAIb,YAAYv1B,EAAO01B,GAAGsD,OAC9B5C,EAAIb,SAAWv1B,EAAO01B,GAAGsD,OAAQ5C,EAAIb,UAGrCa,EAAIb,SAAWv1B,EAAO01B,GAAGsD,OAAOtV,UAMjB,MAAb0S,EAAI7b,QAA+B,IAAd6b,EAAI7b,QAC7B6b,EAAI7b,MAAQ,MAIb6b,EAAI/H,IAAM+H,EAAI4B,SAEd5B,EAAI4B,SAAW,WACT15B,EAAY83B,EAAI/H,MACpB+H,EAAI/H,IAAI3wB,KAAMT,MAGVm5B,EAAI7b,OACRva,EAAOsgB,QAASrjB,KAAMm5B,EAAI7b,QAIrB6b,GAGRp2B,EAAOG,GAAGgC,OAAQ,CACjB82B,OAAQ,SAAUF,EAAOG,EAAInG,EAAQ5xB,GAGpC,OAAOlE,KAAKqQ,OAAQgU,IAAqBG,IAAK,UAAW,GAAIc,OAG3DvgB,MAAMm3B,QAAS,CAAElG,QAASiG,GAAMH,EAAOhG,EAAQ5xB,IAElDg4B,QAAS,SAAUzZ,EAAMqZ,EAAOhG,EAAQ5xB,GACvC,IAAI2R,EAAQ9S,EAAOyD,cAAeic,GACjC0Z,EAASp5B,EAAO+4B,MAAOA,EAAOhG,EAAQ5xB,GACtCk4B,EAAc,WAGb,IAAInB,EAAOjB,GAAWh6B,KAAM+C,EAAOmC,OAAQ,GAAIud,GAAQ0Z,IAGlDtmB,GAAS8M,EAASjf,IAAK1D,KAAM,YACjCi7B,EAAKxX,MAAM,IAKd,OAFC2Y,EAAYC,OAASD,EAEfvmB,IAA0B,IAAjBsmB,EAAO7e,MACtBtd,KAAKiE,KAAMm4B,GACXp8B,KAAKsd,MAAO6e,EAAO7e,MAAO8e,IAE5B3Y,KAAM,SAAU/hB,EAAMiiB,EAAYiX,GACjC,IAAI0B,EAAY,SAAU/Y,GACzB,IAAIE,EAAOF,EAAME,YACVF,EAAME,KACbA,EAAMmX,IAYP,MATqB,iBAATl5B,IACXk5B,EAAUjX,EACVA,EAAajiB,EACbA,OAAOmE,GAEH8d,GACJ3jB,KAAKsd,MAAO5b,GAAQ,KAAM,IAGpB1B,KAAKiE,KAAM,WACjB,IAAIof,GAAU,EACbhI,EAAgB,MAAR3Z,GAAgBA,EAAO,aAC/B66B,EAASx5B,EAAOw5B,OAChB/Z,EAAOG,EAASjf,IAAK1D,MAEtB,GAAKqb,EACCmH,EAAMnH,IAAWmH,EAAMnH,GAAQoI,MACnC6Y,EAAW9Z,EAAMnH,SAGlB,IAAMA,KAASmH,EACTA,EAAMnH,IAAWmH,EAAMnH,GAAQoI,MAAQ4V,GAAK7rB,KAAM6N,IACtDihB,EAAW9Z,EAAMnH,IAKpB,IAAMA,EAAQkhB,EAAOl5B,OAAQgY,KACvBkhB,EAAQlhB,GAAQjX,OAASpE,MACnB,MAAR0B,GAAgB66B,EAAQlhB,GAAQiC,QAAU5b,IAE5C66B,EAAQlhB,GAAQ4f,KAAKxX,KAAMmX,GAC3BvX,GAAU,EACVkZ,EAAOt3B,OAAQoW,EAAO,KAOnBgI,GAAYuX,GAChB73B,EAAOsgB,QAASrjB,KAAM0B,MAIzB26B,OAAQ,SAAU36B,GAIjB,OAHc,IAATA,IACJA,EAAOA,GAAQ,MAET1B,KAAKiE,KAAM,WACjB,IAAIoX,EACHmH,EAAOG,EAASjf,IAAK1D,MACrBsd,EAAQkF,EAAM9gB,EAAO,SACrB6hB,EAAQf,EAAM9gB,EAAO,cACrB66B,EAASx5B,EAAOw5B,OAChBl5B,EAASia,EAAQA,EAAMja,OAAS,EAajC,IAVAmf,EAAK6Z,QAAS,EAGdt5B,EAAOua,MAAOtd,KAAM0B,EAAM,IAErB6hB,GAASA,EAAME,MACnBF,EAAME,KAAKhjB,KAAMT,MAAM,GAIlBqb,EAAQkhB,EAAOl5B,OAAQgY,KACvBkhB,EAAQlhB,GAAQjX,OAASpE,MAAQu8B,EAAQlhB,GAAQiC,QAAU5b,IAC/D66B,EAAQlhB,GAAQ4f,KAAKxX,MAAM,GAC3B8Y,EAAOt3B,OAAQoW,EAAO,IAKxB,IAAMA,EAAQ,EAAGA,EAAQhY,EAAQgY,IAC3BiC,EAAOjC,IAAWiC,EAAOjC,GAAQghB,QACrC/e,EAAOjC,GAAQghB,OAAO57B,KAAMT,aAKvBwiB,EAAK6Z,YAKft5B,EAAOkB,KAAM,CAAE,SAAU,OAAQ,QAAU,SAAUsD,EAAInC,GACxD,IAAIo3B,EAAQz5B,EAAOG,GAAIkC,GACvBrC,EAAOG,GAAIkC,GAAS,SAAU02B,EAAOhG,EAAQ5xB,GAC5C,OAAgB,MAAT43B,GAAkC,kBAAVA,EAC9BU,EAAM77B,MAAOX,KAAMqE,WACnBrE,KAAKk8B,QAAStC,GAAOx0B,GAAM,GAAQ02B,EAAOhG,EAAQ5xB,MAKrDnB,EAAOkB,KAAM,CACZw4B,UAAW7C,GAAO,QAClB8C,QAAS9C,GAAO,QAChB+C,YAAa/C,GAAO,UACpBgD,OAAQ,CAAE5G,QAAS,QACnB6G,QAAS,CAAE7G,QAAS,QACpB8G,WAAY,CAAE9G,QAAS,WACrB,SAAU5wB,EAAM2mB,GAClBhpB,EAAOG,GAAIkC,GAAS,SAAU02B,EAAOhG,EAAQ5xB,GAC5C,OAAOlE,KAAKk8B,QAASnQ,EAAO+P,EAAOhG,EAAQ5xB,MAI7CnB,EAAOw5B,OAAS,GAChBx5B,EAAO01B,GAAGiB,KAAO,WAChB,IAAIsB,EACH94B,EAAI,EACJq6B,EAASx5B,EAAOw5B,OAIjB,IAFAtD,GAAQxwB,KAAK2jB,MAELlqB,EAAIq6B,EAAOl5B,OAAQnB,KAC1B84B,EAAQuB,EAAQr6B,OAGCq6B,EAAQr6B,KAAQ84B,GAChCuB,EAAOt3B,OAAQ/C,IAAK,GAIhBq6B,EAAOl5B,QACZN,EAAO01B,GAAGhV,OAEXwV,QAAQpzB,GAGT9C,EAAO01B,GAAGuC,MAAQ,SAAUA,GAC3Bj4B,EAAOw5B,OAAO37B,KAAMo6B,GACpBj4B,EAAO01B,GAAGxkB,SAGXlR,EAAO01B,GAAGgB,SAAW,GACrB12B,EAAO01B,GAAGxkB,MAAQ,WACZilB,KAILA,IAAa,EACbI,OAGDv2B,EAAO01B,GAAGhV,KAAO,WAChByV,GAAa,MAGdn2B,EAAO01B,GAAGsD,OAAS,CAClBgB,KAAM,IACNC,KAAM,IAGNvW,SAAU,KAMX1jB,EAAOG,GAAG+5B,MAAQ,SAAUC,EAAMx7B,GAIjC,OAHAw7B,EAAOn6B,EAAO01B,IAAK11B,EAAO01B,GAAGsD,OAAQmB,IAAiBA,EACtDx7B,EAAOA,GAAQ,KAER1B,KAAKsd,MAAO5b,EAAM,SAAU4K,EAAMiX,GACxC,IAAI4Z,EAAUp9B,EAAO8f,WAAYvT,EAAM4wB,GACvC3Z,EAAME,KAAO,WACZ1jB,EAAOq9B,aAAcD,OAOnBxsB,GAAQ/Q,EAASyC,cAAe,SAEnC82B,GADSv5B,EAASyC,cAAe,UACpBK,YAAa9C,EAASyC,cAAe,WAEnDsO,GAAMjP,KAAO,WAIbN,EAAQi8B,QAA0B,KAAhB1sB,GAAMzJ,MAIxB9F,EAAQk8B,YAAcnE,GAAIxjB,UAI1BhF,GAAQ/Q,EAASyC,cAAe,UAC1B6E,MAAQ,IACdyJ,GAAMjP,KAAO,QACbN,EAAQm8B,WAA6B,MAAhB5sB,GAAMzJ,MAI5B,IAAIs2B,GACH7uB,GAAa5L,EAAO6O,KAAKjD,WAE1B5L,EAAOG,GAAGgC,OAAQ,CACjB4M,KAAM,SAAU1M,EAAM8B,GACrB,OAAOia,EAAQnhB,KAAM+C,EAAO+O,KAAM1M,EAAM8B,EAA0B,EAAnB7C,UAAUhB,SAG1Do6B,WAAY,SAAUr4B,GACrB,OAAOpF,KAAKiE,KAAM,WACjBlB,EAAO06B,WAAYz9B,KAAMoF,QAK5BrC,EAAOmC,OAAQ,CACd4M,KAAM,SAAU1N,EAAMgB,EAAM8B,GAC3B,IAAIpD,EAAKyf,EACRma,EAAQt5B,EAAK7C,SAGd,GAAe,IAAVm8B,GAAyB,IAAVA,GAAyB,IAAVA,EAKnC,MAAkC,oBAAtBt5B,EAAK7B,aACTQ,EAAO0f,KAAMre,EAAMgB,EAAM8B,IAKlB,IAAVw2B,GAAgB36B,EAAO8W,SAAUzV,KACrCmf,EAAQxgB,EAAO46B,UAAWv4B,EAAKoC,iBAC5BzE,EAAO6O,KAAK/E,MAAMjC,KAAK4C,KAAMpI,GAASo4B,QAAW33B,SAGtCA,IAAVqB,EACW,OAAVA,OACJnE,EAAO06B,WAAYr5B,EAAMgB,GAIrBme,GAAS,QAASA,QACuB1d,KAA3C/B,EAAMyf,EAAMhB,IAAKne,EAAM8C,EAAO9B,IACzBtB,GAGRM,EAAK5B,aAAc4C,EAAM8B,EAAQ,IAC1BA,GAGHqc,GAAS,QAASA,GAA+C,QAApCzf,EAAMyf,EAAM7f,IAAKU,EAAMgB,IACjDtB,EAMM,OAHdA,EAAMf,EAAOwN,KAAKuB,KAAM1N,EAAMgB,SAGTS,EAAY/B,IAGlC65B,UAAW,CACVj8B,KAAM,CACL6gB,IAAK,SAAUne,EAAM8C,GACpB,IAAM9F,EAAQm8B,YAAwB,UAAVr2B,GAC3BkF,EAAUhI,EAAM,SAAY,CAC5B,IAAIjC,EAAMiC,EAAK8C,MAKf,OAJA9C,EAAK5B,aAAc,OAAQ0E,GACtB/E,IACJiC,EAAK8C,MAAQ/E,GAEP+E,MAMXu2B,WAAY,SAAUr5B,EAAM8C,GAC3B,IAAI9B,EACHlD,EAAI,EAIJ07B,EAAY12B,GAASA,EAAM2F,MAAOoP,GAEnC,GAAK2hB,GAA+B,IAAlBx5B,EAAK7C,SACtB,MAAU6D,EAAOw4B,EAAW17B,KAC3BkC,EAAK2J,gBAAiB3I,MAO1Bo4B,GAAW,CACVjb,IAAK,SAAUne,EAAM8C,EAAO9B,GAQ3B,OAPe,IAAV8B,EAGJnE,EAAO06B,WAAYr5B,EAAMgB,GAEzBhB,EAAK5B,aAAc4C,EAAMA,GAEnBA,IAITrC,EAAOkB,KAAMlB,EAAO6O,KAAK/E,MAAMjC,KAAKmZ,OAAOlX,MAAO,QAAU,SAAUtF,EAAInC,GACzE,IAAIy4B,EAASlvB,GAAYvJ,IAAUrC,EAAOwN,KAAKuB,KAE/CnD,GAAYvJ,GAAS,SAAUhB,EAAMgB,EAAMwC,GAC1C,IAAI9D,EAAKimB,EACR+T,EAAgB14B,EAAKoC,cAYtB,OAVMI,IAGLmiB,EAASpb,GAAYmvB,GACrBnvB,GAAYmvB,GAAkBh6B,EAC9BA,EAAqC,MAA/B+5B,EAAQz5B,EAAMgB,EAAMwC,GACzBk2B,EACA,KACDnvB,GAAYmvB,GAAkB/T,GAExBjmB,KAOT,IAAIi6B,GAAa,sCAChBC,GAAa,gBAyIb,SAASC,GAAkB/2B,GAE1B,OADaA,EAAM2F,MAAOoP,IAAmB,IAC/BrO,KAAM,KAItB,SAASswB,GAAU95B,GAClB,OAAOA,EAAK7B,cAAgB6B,EAAK7B,aAAc,UAAa,GAG7D,SAAS47B,GAAgBj3B,GACxB,OAAKvB,MAAMC,QAASsB,GACZA,EAEc,iBAAVA,GACJA,EAAM2F,MAAOoP,IAEd,GAxJRlZ,EAAOG,GAAGgC,OAAQ,CACjBud,KAAM,SAAUrd,EAAM8B,GACrB,OAAOia,EAAQnhB,KAAM+C,EAAO0f,KAAMrd,EAAM8B,EAA0B,EAAnB7C,UAAUhB,SAG1D+6B,WAAY,SAAUh5B,GACrB,OAAOpF,KAAKiE,KAAM,kBACVjE,KAAM+C,EAAOs7B,QAASj5B,IAAUA,QAK1CrC,EAAOmC,OAAQ,CACdud,KAAM,SAAUre,EAAMgB,EAAM8B,GAC3B,IAAIpD,EAAKyf,EACRma,EAAQt5B,EAAK7C,SAGd,GAAe,IAAVm8B,GAAyB,IAAVA,GAAyB,IAAVA,EAWnC,OAPe,IAAVA,GAAgB36B,EAAO8W,SAAUzV,KAGrCgB,EAAOrC,EAAOs7B,QAASj5B,IAAUA,EACjCme,EAAQxgB,EAAOm1B,UAAW9yB,SAGZS,IAAVqB,EACCqc,GAAS,QAASA,QACuB1d,KAA3C/B,EAAMyf,EAAMhB,IAAKne,EAAM8C,EAAO9B,IACzBtB,EAGCM,EAAMgB,GAAS8B,EAGpBqc,GAAS,QAASA,GAA+C,QAApCzf,EAAMyf,EAAM7f,IAAKU,EAAMgB,IACjDtB,EAGDM,EAAMgB,IAGd8yB,UAAW,CACV1iB,SAAU,CACT9R,IAAK,SAAUU,GAOd,IAAIk6B,EAAWv7B,EAAOwN,KAAKuB,KAAM1N,EAAM,YAEvC,OAAKk6B,EACGzK,SAAUyK,EAAU,IAI3BP,GAAWvwB,KAAMpJ,EAAKgI,WACtB4xB,GAAWxwB,KAAMpJ,EAAKgI,WACtBhI,EAAKmR,KAEE,GAGA,KAKX8oB,QAAS,CACRE,MAAO,UACPC,QAAS,eAYLp9B,EAAQk8B,cACbv6B,EAAOm1B,UAAUviB,SAAW,CAC3BjS,IAAK,SAAUU,GAId,IAAI8P,EAAS9P,EAAKzB,WAIlB,OAHKuR,GAAUA,EAAOvR,YACrBuR,EAAOvR,WAAWiT,cAEZ,MAER2M,IAAK,SAAUne,GAId,IAAI8P,EAAS9P,EAAKzB,WACbuR,IACJA,EAAO0B,cAEF1B,EAAOvR,YACXuR,EAAOvR,WAAWiT,kBAOvB7S,EAAOkB,KAAM,CACZ,WACA,WACA,YACA,cACA,cACA,UACA,UACA,SACA,cACA,mBACE,WACFlB,EAAOs7B,QAASr+B,KAAKwH,eAAkBxH,OA4BxC+C,EAAOG,GAAGgC,OAAQ,CACjBu5B,SAAU,SAAUv3B,GACnB,IAAIw3B,EAASt6B,EAAMyK,EAAK8vB,EAAUC,EAAO95B,EAAG+5B,EAC3C38B,EAAI,EAEL,GAAKb,EAAY6F,GAChB,OAAOlH,KAAKiE,KAAM,SAAUa,GAC3B/B,EAAQ/C,MAAOy+B,SAAUv3B,EAAMzG,KAAMT,KAAM8E,EAAGo5B,GAAUl+B,UAM1D,IAFA0+B,EAAUP,GAAgBj3B,IAEb7D,OACZ,MAAUe,EAAOpE,KAAMkC,KAItB,GAHAy8B,EAAWT,GAAU95B,GACrByK,EAAwB,IAAlBzK,EAAK7C,UAAoB,IAAM08B,GAAkBU,GAAa,IAEzD,CACV75B,EAAI,EACJ,MAAU85B,EAAQF,EAAS55B,KACrB+J,EAAIhO,QAAS,IAAM+9B,EAAQ,KAAQ,IACvC/vB,GAAO+vB,EAAQ,KAMZD,KADLE,EAAaZ,GAAkBpvB,KAE9BzK,EAAK5B,aAAc,QAASq8B,GAMhC,OAAO7+B,MAGR8+B,YAAa,SAAU53B,GACtB,IAAIw3B,EAASt6B,EAAMyK,EAAK8vB,EAAUC,EAAO95B,EAAG+5B,EAC3C38B,EAAI,EAEL,GAAKb,EAAY6F,GAChB,OAAOlH,KAAKiE,KAAM,SAAUa,GAC3B/B,EAAQ/C,MAAO8+B,YAAa53B,EAAMzG,KAAMT,KAAM8E,EAAGo5B,GAAUl+B,UAI7D,IAAMqE,UAAUhB,OACf,OAAOrD,KAAK8R,KAAM,QAAS,IAK5B,IAFA4sB,EAAUP,GAAgBj3B,IAEb7D,OACZ,MAAUe,EAAOpE,KAAMkC,KAMtB,GALAy8B,EAAWT,GAAU95B,GAGrByK,EAAwB,IAAlBzK,EAAK7C,UAAoB,IAAM08B,GAAkBU,GAAa,IAEzD,CACV75B,EAAI,EACJ,MAAU85B,EAAQF,EAAS55B,KAG1B,OAA4C,EAApC+J,EAAIhO,QAAS,IAAM+9B,EAAQ,KAClC/vB,EAAMA,EAAI5I,QAAS,IAAM24B,EAAQ,IAAK,KAMnCD,KADLE,EAAaZ,GAAkBpvB,KAE9BzK,EAAK5B,aAAc,QAASq8B,GAMhC,OAAO7+B,MAGR++B,YAAa,SAAU73B,EAAO83B,GAC7B,IAAIt9B,SAAcwF,EACjB+3B,EAAwB,WAATv9B,GAAqBiE,MAAMC,QAASsB,GAEpD,MAAyB,kBAAb83B,GAA0BC,EAC9BD,EAAWh/B,KAAKy+B,SAAUv3B,GAAUlH,KAAK8+B,YAAa53B,GAGzD7F,EAAY6F,GACTlH,KAAKiE,KAAM,SAAU/B,GAC3Ba,EAAQ/C,MAAO++B,YACd73B,EAAMzG,KAAMT,KAAMkC,EAAGg8B,GAAUl+B,MAAQg/B,GACvCA,KAKIh/B,KAAKiE,KAAM,WACjB,IAAIgM,EAAW/N,EAAGsY,EAAM0kB,EAExB,GAAKD,EAAe,CAGnB/8B,EAAI,EACJsY,EAAOzX,EAAQ/C,MACfk/B,EAAaf,GAAgBj3B,GAE7B,MAAU+I,EAAYivB,EAAYh9B,KAG5BsY,EAAK2kB,SAAUlvB,GACnBuK,EAAKskB,YAAa7uB,GAElBuK,EAAKikB,SAAUxuB,aAKIpK,IAAVqB,GAAgC,YAATxF,KAClCuO,EAAYiuB,GAAUl+B,QAIrB2iB,EAASJ,IAAKviB,KAAM,gBAAiBiQ,GAOjCjQ,KAAKwC,cACTxC,KAAKwC,aAAc,QAClByN,IAAuB,IAAV/I,EACb,GACAyb,EAASjf,IAAK1D,KAAM,kBAAqB,QAO9Cm/B,SAAU,SAAUn8B,GACnB,IAAIiN,EAAW7L,EACdlC,EAAI,EAEL+N,EAAY,IAAMjN,EAAW,IAC7B,MAAUoB,EAAOpE,KAAMkC,KACtB,GAAuB,IAAlBkC,EAAK7C,WACoE,GAA3E,IAAM08B,GAAkBC,GAAU95B,IAAW,KAAMvD,QAASoP,GAC7D,OAAO,EAIV,OAAO,KAOT,IAAImvB,GAAU,MAEdr8B,EAAOG,GAAGgC,OAAQ,CACjB/C,IAAK,SAAU+E,GACd,IAAIqc,EAAOzf,EAAKyrB,EACfnrB,EAAOpE,KAAM,GAEd,OAAMqE,UAAUhB,QA0BhBksB,EAAkBluB,EAAY6F,GAEvBlH,KAAKiE,KAAM,SAAU/B,GAC3B,IAAIC,EAEmB,IAAlBnC,KAAKuB,WAWE,OANXY,EADIotB,EACEroB,EAAMzG,KAAMT,KAAMkC,EAAGa,EAAQ/C,MAAOmC,OAEpC+E,GAKN/E,EAAM,GAEoB,iBAARA,EAClBA,GAAO,GAEIwD,MAAMC,QAASzD,KAC1BA,EAAMY,EAAOoB,IAAKhC,EAAK,SAAU+E,GAChC,OAAgB,MAATA,EAAgB,GAAKA,EAAQ,OAItCqc,EAAQxgB,EAAOs8B,SAAUr/B,KAAK0B,OAAUqB,EAAOs8B,SAAUr/B,KAAKoM,SAAS5E,iBAGrD,QAAS+b,QAA+C1d,IAApC0d,EAAMhB,IAAKviB,KAAMmC,EAAK,WAC3DnC,KAAKkH,MAAQ/E,OAzDTiC,GACJmf,EAAQxgB,EAAOs8B,SAAUj7B,EAAK1C,OAC7BqB,EAAOs8B,SAAUj7B,EAAKgI,SAAS5E,iBAG/B,QAAS+b,QACgC1d,KAAvC/B,EAAMyf,EAAM7f,IAAKU,EAAM,UAElBN,EAMY,iBAHpBA,EAAMM,EAAK8C,OAIHpD,EAAImC,QAASm5B,GAAS,IAIhB,MAAPt7B,EAAc,GAAKA,OAG3B,KAyCHf,EAAOmC,OAAQ,CACdm6B,SAAU,CACTlZ,OAAQ,CACPziB,IAAK,SAAUU,GAEd,IAAIjC,EAAMY,EAAOwN,KAAKuB,KAAM1N,EAAM,SAClC,OAAc,MAAPjC,EACNA,EAMA87B,GAAkBl7B,EAAOT,KAAM8B,MAGlC2D,OAAQ,CACPrE,IAAK,SAAUU,GACd,IAAI8C,EAAOif,EAAQjkB,EAClBiD,EAAUf,EAAKe,QACfkW,EAAQjX,EAAKwR,cACb2S,EAAoB,eAAdnkB,EAAK1C,KACX6jB,EAASgD,EAAM,KAAO,GACtBwM,EAAMxM,EAAMlN,EAAQ,EAAIlW,EAAQ9B,OAUjC,IAPCnB,EADImZ,EAAQ,EACR0Z,EAGAxM,EAAMlN,EAAQ,EAIXnZ,EAAI6yB,EAAK7yB,IAKhB,KAJAikB,EAAShhB,EAASjD,IAIJyT,UAAYzT,IAAMmZ,KAG7B8K,EAAOha,YACLga,EAAOxjB,WAAWwJ,WACnBC,EAAU+Z,EAAOxjB,WAAY,aAAiB,CAMjD,GAHAuE,EAAQnE,EAAQojB,GAAShkB,MAGpBomB,EACJ,OAAOrhB,EAIRqe,EAAO3kB,KAAMsG,GAIf,OAAOqe,GAGRhD,IAAK,SAAUne,EAAM8C,GACpB,IAAIo4B,EAAWnZ,EACdhhB,EAAUf,EAAKe,QACfogB,EAASxiB,EAAO2D,UAAWQ,GAC3BhF,EAAIiD,EAAQ9B,OAEb,MAAQnB,MACPikB,EAAShhB,EAASjD,IAINyT,UACuD,EAAlE5S,EAAO6D,QAAS7D,EAAOs8B,SAASlZ,OAAOziB,IAAKyiB,GAAUZ,MAEtD+Z,GAAY,GAUd,OAHMA,IACLl7B,EAAKwR,eAAiB,GAEhB2P,OAOXxiB,EAAOkB,KAAM,CAAE,QAAS,YAAc,WACrClB,EAAOs8B,SAAUr/B,MAAS,CACzBuiB,IAAK,SAAUne,EAAM8C,GACpB,GAAKvB,MAAMC,QAASsB,GACnB,OAAS9C,EAAKsR,SAA2D,EAAjD3S,EAAO6D,QAAS7D,EAAQqB,GAAOjC,MAAO+E,KAI3D9F,EAAQi8B,UACbt6B,EAAOs8B,SAAUr/B,MAAO0D,IAAM,SAAUU,GACvC,OAAwC,OAAjCA,EAAK7B,aAAc,SAAqB,KAAO6B,EAAK8C,UAW9D9F,EAAQm+B,QAAU,cAAex/B,EAGjC,IAAIy/B,GAAc,kCACjBC,GAA0B,SAAUjzB,GACnCA,EAAEwc,mBAGJjmB,EAAOmC,OAAQnC,EAAO0lB,MAAO,CAE5BU,QAAS,SAAUV,EAAOjG,EAAMpe,EAAMs7B,GAErC,IAAIx9B,EAAG2M,EAAK6B,EAAKivB,EAAYC,EAAQ7V,EAAQ7K,EAAS2gB,EACrDC,EAAY,CAAE17B,GAAQxE,GACtB8B,EAAOV,EAAOP,KAAMgoB,EAAO,QAAWA,EAAM/mB,KAAO+mB,EACnDkB,EAAa3oB,EAAOP,KAAMgoB,EAAO,aAAgBA,EAAMjZ,UAAUlI,MAAO,KAAQ,GAKjF,GAHAuH,EAAMgxB,EAAcnvB,EAAMtM,EAAOA,GAAQxE,EAGlB,IAAlBwE,EAAK7C,UAAoC,IAAlB6C,EAAK7C,WAK5Bi+B,GAAYhyB,KAAM9L,EAAOqB,EAAO0lB,MAAMuB,cAIf,EAAvBtoB,EAAKb,QAAS,OAIlBa,GADAioB,EAAajoB,EAAK4F,MAAO,MACP8G,QAClBub,EAAW3kB,QAEZ46B,EAASl+B,EAAKb,QAAS,KAAQ,GAAK,KAAOa,GAG3C+mB,EAAQA,EAAO1lB,EAAO+C,SACrB2iB,EACA,IAAI1lB,EAAOqmB,MAAO1nB,EAAuB,iBAAV+mB,GAAsBA,IAGhDK,UAAY4W,EAAe,EAAI,EACrCjX,EAAMjZ,UAAYma,EAAW/b,KAAM,KACnC6a,EAAMwC,WAAaxC,EAAMjZ,UACxB,IAAI1F,OAAQ,UAAY6f,EAAW/b,KAAM,iBAAoB,WAC7D,KAGD6a,EAAMnV,YAASzN,EACT4iB,EAAMjjB,SACXijB,EAAMjjB,OAASpB,GAIhBoe,EAAe,MAARA,EACN,CAAEiG,GACF1lB,EAAO2D,UAAW8b,EAAM,CAAEiG,IAG3BvJ,EAAUnc,EAAO0lB,MAAMvJ,QAASxd,IAAU,GACpCg+B,IAAgBxgB,EAAQiK,UAAmD,IAAxCjK,EAAQiK,QAAQxoB,MAAOyD,EAAMoe,IAAtE,CAMA,IAAMkd,IAAiBxgB,EAAQyM,WAAanqB,EAAU4C,GAAS,CAM9D,IAJAu7B,EAAazgB,EAAQ6J,cAAgBrnB,EAC/B89B,GAAYhyB,KAAMmyB,EAAaj+B,KACpCmN,EAAMA,EAAIlM,YAEHkM,EAAKA,EAAMA,EAAIlM,WACtBm9B,EAAUl/B,KAAMiO,GAChB6B,EAAM7B,EAIF6B,KAAUtM,EAAK6I,eAAiBrN,IACpCkgC,EAAUl/B,KAAM8P,EAAIb,aAAea,EAAIqvB,cAAgBhgC,GAKzDmC,EAAI,EACJ,OAAU2M,EAAMixB,EAAW59B,QAAYumB,EAAMqC,uBAC5C+U,EAAchxB,EACd4Z,EAAM/mB,KAAW,EAAJQ,EACZy9B,EACAzgB,EAAQgL,UAAYxoB,GAGrBqoB,GACEpH,EAASjf,IAAKmL,EAAK,WAAczO,OAAO0pB,OAAQ,OAC9CrB,EAAM/mB,OACTihB,EAASjf,IAAKmL,EAAK,YAEnBkb,EAAOppB,MAAOkO,EAAK2T,IAIpBuH,EAAS6V,GAAU/wB,EAAK+wB,KACT7V,EAAOppB,OAASshB,EAAYpT,KAC1C4Z,EAAMnV,OAASyW,EAAOppB,MAAOkO,EAAK2T,IACZ,IAAjBiG,EAAMnV,QACVmV,EAAMS,kBA8CT,OA1CAT,EAAM/mB,KAAOA,EAGPg+B,GAAiBjX,EAAMuD,sBAEpB9M,EAAQuH,WACqC,IAApDvH,EAAQuH,SAAS9lB,MAAOm/B,EAAUz2B,MAAOmZ,KACzCP,EAAY7d,IAIPw7B,GAAUv+B,EAAY+C,EAAM1C,MAAaF,EAAU4C,MAGvDsM,EAAMtM,EAAMw7B,MAGXx7B,EAAMw7B,GAAW,MAIlB78B,EAAO0lB,MAAMuB,UAAYtoB,EAEpB+mB,EAAMqC,wBACV+U,EAAY9vB,iBAAkBrO,EAAM+9B,IAGrCr7B,EAAM1C,KAED+mB,EAAMqC,wBACV+U,EAAY/e,oBAAqBpf,EAAM+9B,IAGxC18B,EAAO0lB,MAAMuB,eAAYnkB,EAEpB6K,IACJtM,EAAMw7B,GAAWlvB,IAMd+X,EAAMnV,SAKd0sB,SAAU,SAAUt+B,EAAM0C,EAAMqkB,GAC/B,IAAIjc,EAAIzJ,EAAOmC,OACd,IAAInC,EAAOqmB,MACXX,EACA,CACC/mB,KAAMA,EACN2qB,aAAa,IAIftpB,EAAO0lB,MAAMU,QAAS3c,EAAG,KAAMpI,MAKjCrB,EAAOG,GAAGgC,OAAQ,CAEjBikB,QAAS,SAAUznB,EAAM8gB,GACxB,OAAOxiB,KAAKiE,KAAM,WACjBlB,EAAO0lB,MAAMU,QAASznB,EAAM8gB,EAAMxiB,SAGpCigC,eAAgB,SAAUv+B,EAAM8gB,GAC/B,IAAIpe,EAAOpE,KAAM,GACjB,GAAKoE,EACJ,OAAOrB,EAAO0lB,MAAMU,QAASznB,EAAM8gB,EAAMpe,GAAM,MAc5ChD,EAAQm+B,SACbx8B,EAAOkB,KAAM,CAAEmR,MAAO,UAAW8Y,KAAM,YAAc,SAAUK,EAAM5D,GAGpE,IAAIjc,EAAU,SAAU+Z,GACvB1lB,EAAO0lB,MAAMuX,SAAUrV,EAAKlC,EAAMjjB,OAAQzC,EAAO0lB,MAAMkC,IAAKlC,KAG7D1lB,EAAO0lB,MAAMvJ,QAASyL,GAAQ,CAC7BP,MAAO,WAIN,IAAInoB,EAAMjC,KAAKiN,eAAiBjN,KAAKJ,UAAYI,KAChDkgC,EAAWvd,EAASxB,OAAQlf,EAAK0oB,GAE5BuV,GACLj+B,EAAI8N,iBAAkBwe,EAAM7f,GAAS,GAEtCiU,EAASxB,OAAQlf,EAAK0oB,GAAOuV,GAAY,GAAM,IAEhD3V,SAAU,WACT,IAAItoB,EAAMjC,KAAKiN,eAAiBjN,KAAKJ,UAAYI,KAChDkgC,EAAWvd,EAASxB,OAAQlf,EAAK0oB,GAAQ,EAEpCuV,EAKLvd,EAASxB,OAAQlf,EAAK0oB,EAAKuV,IAJ3Bj+B,EAAI6e,oBAAqByN,EAAM7f,GAAS,GACxCiU,EAAShF,OAAQ1b,EAAK0oB,QAS3B,IAAIzV,GAAWnV,EAAOmV,SAElBtT,GAAQ,CAAEuF,KAAMsB,KAAK2jB,OAErB+T,GAAS,KAKbp9B,EAAOq9B,SAAW,SAAU5d,GAC3B,IAAI3O,EACJ,IAAM2O,GAAwB,iBAATA,EACpB,OAAO,KAKR,IACC3O,GAAM,IAAM9T,EAAOsgC,WAAcC,gBAAiB9d,EAAM,YACvD,MAAQhW,GACTqH,OAAMhO,EAMP,OAHMgO,IAAOA,EAAIxG,qBAAsB,eAAgBhK,QACtDN,EAAOoD,MAAO,gBAAkBqc,GAE1B3O,GAIR,IACC0sB,GAAW,QACXC,GAAQ,SACRC,GAAkB,wCAClBC,GAAe,qCAEhB,SAASC,GAAa9I,EAAQv2B,EAAKs/B,EAAarlB,GAC/C,IAAInW,EAEJ,GAAKO,MAAMC,QAAStE,GAGnByB,EAAOkB,KAAM3C,EAAK,SAAUY,EAAGia,GACzBykB,GAAeL,GAAS/yB,KAAMqqB,GAGlCtc,EAAKsc,EAAQ1b,GAKbwkB,GACC9I,EAAS,KAAqB,iBAAN1b,GAAuB,MAALA,EAAYja,EAAI,IAAO,IACjEia,EACAykB,EACArlB,UAKG,GAAMqlB,GAAiC,WAAlB/9B,EAAQvB,GAUnCia,EAAKsc,EAAQv2B,QAPb,IAAM8D,KAAQ9D,EACbq/B,GAAa9I,EAAS,IAAMzyB,EAAO,IAAK9D,EAAK8D,GAAQw7B,EAAarlB,GAYrExY,EAAO89B,MAAQ,SAAU13B,EAAGy3B,GAC3B,IAAI/I,EACHiJ,EAAI,GACJvlB,EAAM,SAAUrN,EAAK6yB,GAGpB,IAAI75B,EAAQ7F,EAAY0/B,GACvBA,IACAA,EAEDD,EAAGA,EAAEz9B,QAAW29B,mBAAoB9yB,GAAQ,IAC3C8yB,mBAA6B,MAAT95B,EAAgB,GAAKA,IAG5C,GAAU,MAALiC,EACJ,MAAO,GAIR,GAAKxD,MAAMC,QAASuD,IAASA,EAAE5F,SAAWR,EAAO2C,cAAeyD,GAG/DpG,EAAOkB,KAAMkF,EAAG,WACfoS,EAAKvb,KAAKoF,KAAMpF,KAAKkH,cAOtB,IAAM2wB,KAAU1uB,EACfw3B,GAAa9I,EAAQ1uB,EAAG0uB,GAAU+I,EAAarlB,GAKjD,OAAOulB,EAAElzB,KAAM,MAGhB7K,EAAOG,GAAGgC,OAAQ,CACjB+7B,UAAW,WACV,OAAOl+B,EAAO89B,MAAO7gC,KAAKkhC,mBAE3BA,eAAgB,WACf,OAAOlhC,KAAKmE,IAAK,WAGhB,IAAI0N,EAAW9O,EAAO0f,KAAMziB,KAAM,YAClC,OAAO6R,EAAW9O,EAAO2D,UAAWmL,GAAa7R,OAEjDqQ,OAAQ,WACR,IAAI3O,EAAO1B,KAAK0B,KAGhB,OAAO1B,KAAKoF,OAASrC,EAAQ/C,MAAOia,GAAI,cACvCymB,GAAalzB,KAAMxN,KAAKoM,YAAeq0B,GAAgBjzB,KAAM9L,KAC3D1B,KAAK0V,UAAYkQ,GAAepY,KAAM9L,MAEzCyC,IAAK,SAAUoD,EAAInD,GACnB,IAAIjC,EAAMY,EAAQ/C,MAAOmC,MAEzB,OAAY,MAAPA,EACG,KAGHwD,MAAMC,QAASzD,GACZY,EAAOoB,IAAKhC,EAAK,SAAUA,GACjC,MAAO,CAAEiD,KAAMhB,EAAKgB,KAAM8B,MAAO/E,EAAI8D,QAASu6B,GAAO,WAIhD,CAAEp7B,KAAMhB,EAAKgB,KAAM8B,MAAO/E,EAAI8D,QAASu6B,GAAO,WAClD98B,SAKN,IACCy9B,GAAM,OACNC,GAAQ,OACRC,GAAa,gBACbC,GAAW,6BAIXC,GAAa,iBACbC,GAAY,QAWZpH,GAAa,GAObqH,GAAa,GAGbC,GAAW,KAAKhhC,OAAQ,KAGxBihC,GAAe/hC,EAASyC,cAAe,KAIxC,SAASu/B,GAA6BC,GAGrC,OAAO,SAAUC,EAAoB9jB,GAED,iBAAvB8jB,IACX9jB,EAAO8jB,EACPA,EAAqB,KAGtB,IAAIC,EACH7/B,EAAI,EACJ8/B,EAAYF,EAAmBt6B,cAAcqF,MAAOoP,IAAmB,GAExE,GAAK5a,EAAY2c,GAGhB,MAAU+jB,EAAWC,EAAW9/B,KAGR,MAAlB6/B,EAAU,IACdA,EAAWA,EAASzhC,MAAO,IAAO,KAChCuhC,EAAWE,GAAaF,EAAWE,IAAc,IAAKpwB,QAASqM,KAI/D6jB,EAAWE,GAAaF,EAAWE,IAAc,IAAKnhC,KAAMod,IAQnE,SAASikB,GAA+BJ,EAAW18B,EAASw1B,EAAiBuH,GAE5E,IAAIC,EAAY,GACfC,EAAqBP,IAAcJ,GAEpC,SAASY,EAASN,GACjB,IAAIpsB,EAcJ,OAbAwsB,EAAWJ,IAAa,EACxBh/B,EAAOkB,KAAM49B,EAAWE,IAAc,GAAI,SAAU/kB,EAAGslB,GACtD,IAAIC,EAAsBD,EAAoBn9B,EAASw1B,EAAiBuH,GACxE,MAAoC,iBAAxBK,GACVH,GAAqBD,EAAWI,GAKtBH,IACDzsB,EAAW4sB,QADf,GAHNp9B,EAAQ68B,UAAUrwB,QAAS4wB,GAC3BF,EAASE,IACF,KAKF5sB,EAGR,OAAO0sB,EAASl9B,EAAQ68B,UAAW,MAAUG,EAAW,MAASE,EAAS,KAM3E,SAASG,GAAYh9B,EAAQ7D,GAC5B,IAAIuM,EAAKzI,EACRg9B,EAAc1/B,EAAO2/B,aAAaD,aAAe,GAElD,IAAMv0B,KAAOvM,OACQkE,IAAflE,EAAKuM,MACPu0B,EAAav0B,GAAQ1I,EAAWC,IAAUA,EAAO,KAAUyI,GAAQvM,EAAKuM,IAO5E,OAJKzI,GACJ1C,EAAOmC,QAAQ,EAAMM,EAAQC,GAGvBD,EA/EPm8B,GAAapsB,KAAOL,GAASK,KAgP9BxS,EAAOmC,OAAQ,CAGdy9B,OAAQ,EAGRC,aAAc,GACdC,KAAM,GAENH,aAAc,CACbI,IAAK5tB,GAASK,KACd7T,KAAM,MACNqhC,QAvRgB,4DAuRQv1B,KAAM0H,GAAS8tB,UACvCxjC,QAAQ,EACRyjC,aAAa,EACbC,OAAO,EACPC,YAAa,mDAcbC,QAAS,CACRlI,IAAKwG,GACLp/B,KAAM,aACNktB,KAAM,YACN3b,IAAK,4BACLwvB,KAAM,qCAGPtoB,SAAU,CACTlH,IAAK,UACL2b,KAAM,SACN6T,KAAM,YAGPC,eAAgB,CACfzvB,IAAK,cACLvR,KAAM,eACN+gC,KAAM,gBAKPE,WAAY,CAGXC,SAAU/3B,OAGVg4B,aAAa,EAGbC,YAAa1gB,KAAKC,MAGlB0gB,WAAY5gC,EAAOq9B,UAOpBqC,YAAa,CACZK,KAAK,EACL7/B,SAAS,IAOX2gC,UAAW,SAAUp+B,EAAQq+B,GAC5B,OAAOA,EAGNrB,GAAYA,GAAYh9B,EAAQzC,EAAO2/B,cAAgBmB,GAGvDrB,GAAYz/B,EAAO2/B,aAAcl9B,IAGnCs+B,cAAelC,GAA6BxH,IAC5C2J,cAAenC,GAA6BH,IAG5CuC,KAAM,SAAUlB,EAAK39B,GAGA,iBAAR29B,IACX39B,EAAU29B,EACVA,OAAMj9B,GAIPV,EAAUA,GAAW,GAErB,IAAI8+B,EAGHC,EAGAC,EACAC,EAGAC,EAGAC,EAGAzjB,EAGA0jB,EAGAriC,EAGAsiC,EAGA1D,EAAI/9B,EAAO6gC,UAAW,GAAIz+B,GAG1Bs/B,EAAkB3D,EAAE79B,SAAW69B,EAG/B4D,EAAqB5D,EAAE79B,UACpBwhC,EAAgBljC,UAAYkjC,EAAgBlhC,QAC7CR,EAAQ0hC,GACR1hC,EAAO0lB,MAGTrK,EAAWrb,EAAOgb,WAClB4mB,EAAmB5hC,EAAO+Z,UAAW,eAGrC8nB,EAAa9D,EAAE8D,YAAc,GAG7BC,EAAiB,GACjBC,EAAsB,GAGtBC,EAAW,WAGX7C,EAAQ,CACPjhB,WAAY,EAGZ+jB,kBAAmB,SAAU92B,GAC5B,IAAIrB,EACJ,GAAKgU,EAAY,CAChB,IAAMujB,EAAkB,CACvBA,EAAkB,GAClB,MAAUv3B,EAAQy0B,GAASp0B,KAAMi3B,GAChCC,EAAiBv3B,EAAO,GAAIrF,cAAgB,MACzC48B,EAAiBv3B,EAAO,GAAIrF,cAAgB,MAAS,IACrD9G,OAAQmM,EAAO,IAGpBA,EAAQu3B,EAAiBl2B,EAAI1G,cAAgB,KAE9C,OAAgB,MAATqF,EAAgB,KAAOA,EAAMe,KAAM,OAI3Cq3B,sBAAuB,WACtB,OAAOpkB,EAAYsjB,EAAwB,MAI5Ce,iBAAkB,SAAU9/B,EAAM8B,GAMjC,OALkB,MAAb2Z,IACJzb,EAAO0/B,EAAqB1/B,EAAKoC,eAChCs9B,EAAqB1/B,EAAKoC,gBAAmBpC,EAC9Cy/B,EAAgBz/B,GAAS8B,GAEnBlH,MAIRmlC,iBAAkB,SAAUzjC,GAI3B,OAHkB,MAAbmf,IACJigB,EAAEsE,SAAW1jC,GAEP1B,MAIR4kC,WAAY,SAAUzgC,GACrB,IAAIpC,EACJ,GAAKoC,EACJ,GAAK0c,EAGJqhB,EAAM/jB,OAAQha,EAAK+9B,EAAMmD,cAIzB,IAAMtjC,KAAQoC,EACbygC,EAAY7iC,GAAS,CAAE6iC,EAAY7iC,GAAQoC,EAAKpC,IAInD,OAAO/B,MAIRslC,MAAO,SAAUC,GAChB,IAAIC,EAAYD,GAAcR,EAK9B,OAJKd,GACJA,EAAUqB,MAAOE,GAElB58B,EAAM,EAAG48B,GACFxlC,OAoBV,GAfAoe,EAASzB,QAASulB,GAKlBpB,EAAEgC,MAAUA,GAAOhC,EAAEgC,KAAO5tB,GAASK,MAAS,IAC5CtP,QAASu7B,GAAWtsB,GAAS8tB,SAAW,MAG1ClC,EAAEp/B,KAAOyD,EAAQuX,QAAUvX,EAAQzD,MAAQo/B,EAAEpkB,QAAUokB,EAAEp/B,KAGzDo/B,EAAEkB,WAAclB,EAAEiB,UAAY,KAAMv6B,cAAcqF,MAAOoP,IAAmB,CAAE,IAGxD,MAAjB6kB,EAAE2E,YAAsB,CAC5BnB,EAAY1kC,EAASyC,cAAe,KAKpC,IACCiiC,EAAU/uB,KAAOurB,EAAEgC,IAInBwB,EAAU/uB,KAAO+uB,EAAU/uB,KAC3BurB,EAAE2E,YAAc9D,GAAaqB,SAAW,KAAOrB,GAAa+D,MAC3DpB,EAAUtB,SAAW,KAAOsB,EAAUoB,KACtC,MAAQl5B,GAITs0B,EAAE2E,aAAc,GAalB,GARK3E,EAAEte,MAAQse,EAAEmC,aAAiC,iBAAXnC,EAAEte,OACxCse,EAAEte,KAAOzf,EAAO89B,MAAOC,EAAEte,KAAMse,EAAEF,cAIlCqB,GAA+B7H,GAAY0G,EAAG37B,EAAS+8B,GAGlDrhB,EACJ,OAAOqhB,EA8ER,IAAMhgC,KAzENqiC,EAAcxhC,EAAO0lB,OAASqY,EAAEthC,SAGQ,GAApBuD,EAAO4/B,UAC1B5/B,EAAO0lB,MAAMU,QAAS,aAIvB2X,EAAEp/B,KAAOo/B,EAAEp/B,KAAKogB,cAGhBgf,EAAE6E,YAAcpE,GAAW/zB,KAAMszB,EAAEp/B,MAKnCwiC,EAAWpD,EAAEgC,IAAI78B,QAASm7B,GAAO,IAG3BN,EAAE6E,WAwBI7E,EAAEte,MAAQse,EAAEmC,aACoD,KAAzEnC,EAAEqC,aAAe,IAAKtiC,QAAS,uCACjCigC,EAAEte,KAAOse,EAAEte,KAAKvc,QAASk7B,GAAK,OAvB9BqD,EAAW1D,EAAEgC,IAAIxiC,MAAO4jC,EAAS7gC,QAG5By9B,EAAEte,OAAUse,EAAEmC,aAAiC,iBAAXnC,EAAEte,QAC1C0hB,IAAc/D,GAAO3yB,KAAM02B,GAAa,IAAM,KAAQpD,EAAEte,YAGjDse,EAAEte,OAIO,IAAZse,EAAE7yB,QACNi2B,EAAWA,EAASj+B,QAASo7B,GAAY,MACzCmD,GAAarE,GAAO3yB,KAAM02B,GAAa,IAAM,KAAQ,KAAStiC,GAAMuF,OACnEq9B,GAIF1D,EAAEgC,IAAMoB,EAAWM,GASf1D,EAAE8E,aACD7iC,EAAO6/B,aAAcsB,IACzBhC,EAAMgD,iBAAkB,oBAAqBniC,EAAO6/B,aAAcsB,IAE9DnhC,EAAO8/B,KAAMqB,IACjBhC,EAAMgD,iBAAkB,gBAAiBniC,EAAO8/B,KAAMqB,MAKnDpD,EAAEte,MAAQse,EAAE6E,aAAgC,IAAlB7E,EAAEqC,aAAyBh+B,EAAQg+B,cACjEjB,EAAMgD,iBAAkB,eAAgBpE,EAAEqC,aAI3CjB,EAAMgD,iBACL,SACApE,EAAEkB,UAAW,IAAOlB,EAAEsC,QAAStC,EAAEkB,UAAW,IAC3ClB,EAAEsC,QAAStC,EAAEkB,UAAW,KACA,MAArBlB,EAAEkB,UAAW,GAAc,KAAON,GAAW,WAAa,IAC7DZ,EAAEsC,QAAS,MAIFtC,EAAE+E,QACZ3D,EAAMgD,iBAAkBhjC,EAAG4+B,EAAE+E,QAAS3jC,IAIvC,GAAK4+B,EAAEgF,cAC+C,IAAnDhF,EAAEgF,WAAWrlC,KAAMgkC,EAAiBvC,EAAOpB,IAAiBjgB,GAG9D,OAAOqhB,EAAMoD,QAed,GAXAP,EAAW,QAGXJ,EAAiBppB,IAAKulB,EAAE/F,UACxBmH,EAAMt5B,KAAMk4B,EAAEiF,SACd7D,EAAMtlB,KAAMkkB,EAAE36B,OAGd89B,EAAYhC,GAA+BR,GAAYX,EAAG37B,EAAS+8B,GAK5D,CASN,GARAA,EAAMjhB,WAAa,EAGdsjB,GACJG,EAAmBvb,QAAS,WAAY,CAAE+Y,EAAOpB,IAI7CjgB,EACJ,OAAOqhB,EAIHpB,EAAEoC,OAAqB,EAAZpC,EAAE3D,UACjBkH,EAAetkC,EAAO8f,WAAY,WACjCqiB,EAAMoD,MAAO,YACXxE,EAAE3D,UAGN,IACCtc,GAAY,EACZojB,EAAU+B,KAAMnB,EAAgBj8B,GAC/B,MAAQ4D,GAGT,GAAKqU,EACJ,MAAMrU,EAIP5D,GAAO,EAAG4D,SAhCX5D,GAAO,EAAG,gBAqCX,SAASA,EAAMy8B,EAAQY,EAAkBC,EAAWL,GACnD,IAAIM,EAAWJ,EAAS5/B,EAAOigC,EAAUC,EACxCd,EAAaU,EAGTplB,IAILA,GAAY,EAGPwjB,GACJtkC,EAAOq9B,aAAciH,GAKtBJ,OAAYp+B,EAGZs+B,EAAwB0B,GAAW,GAGnC3D,EAAMjhB,WAAsB,EAATokB,EAAa,EAAI,EAGpCc,EAAsB,KAAVd,GAAiBA,EAAS,KAAkB,MAAXA,EAGxCa,IACJE,EA7lBJ,SAA8BtF,EAAGoB,EAAOgE,GAEvC,IAAII,EAAI5kC,EAAM6kC,EAAeC,EAC5BzrB,EAAW+lB,EAAE/lB,SACbinB,EAAYlB,EAAEkB,UAGf,MAA2B,MAAnBA,EAAW,GAClBA,EAAU5zB,aACEvI,IAAPygC,IACJA,EAAKxF,EAAEsE,UAAYlD,EAAM8C,kBAAmB,iBAK9C,GAAKsB,EACJ,IAAM5kC,KAAQqZ,EACb,GAAKA,EAAUrZ,IAAUqZ,EAAUrZ,GAAO8L,KAAM84B,GAAO,CACtDtE,EAAUrwB,QAASjQ,GACnB,MAMH,GAAKsgC,EAAW,KAAOkE,EACtBK,EAAgBvE,EAAW,OACrB,CAGN,IAAMtgC,KAAQwkC,EAAY,CACzB,IAAMlE,EAAW,IAAOlB,EAAEyC,WAAY7hC,EAAO,IAAMsgC,EAAW,IAAQ,CACrEuE,EAAgB7kC,EAChB,MAEK8kC,IACLA,EAAgB9kC,GAKlB6kC,EAAgBA,GAAiBC,EAMlC,GAAKD,EAIJ,OAHKA,IAAkBvE,EAAW,IACjCA,EAAUrwB,QAAS40B,GAEbL,EAAWK,GA0iBLE,CAAqB3F,EAAGoB,EAAOgE,KAIrCC,IAAwD,EAA3CpjC,EAAO6D,QAAS,SAAUk6B,EAAEkB,aAC9ClB,EAAEyC,WAAY,eAAkB,cAIjC6C,EA5iBH,SAAsBtF,EAAGsF,EAAUlE,EAAOiE,GACzC,IAAIO,EAAOC,EAASC,EAAMl2B,EAAKsK,EAC9BuoB,EAAa,GAGbvB,EAAYlB,EAAEkB,UAAU1hC,QAGzB,GAAK0hC,EAAW,GACf,IAAM4E,KAAQ9F,EAAEyC,WACfA,EAAYqD,EAAKp/B,eAAkBs5B,EAAEyC,WAAYqD,GAInDD,EAAU3E,EAAU5zB,QAGpB,MAAQu4B,EAcP,GAZK7F,EAAEwC,eAAgBqD,KACtBzE,EAAOpB,EAAEwC,eAAgBqD,IAAcP,IAIlCprB,GAAQmrB,GAAarF,EAAE+F,aAC5BT,EAAWtF,EAAE+F,WAAYT,EAAUtF,EAAEiB,WAGtC/mB,EAAO2rB,EACPA,EAAU3E,EAAU5zB,QAKnB,GAAiB,MAAZu4B,EAEJA,EAAU3rB,OAGJ,GAAc,MAATA,GAAgBA,IAAS2rB,EAAU,CAM9C,KAHAC,EAAOrD,EAAYvoB,EAAO,IAAM2rB,IAAapD,EAAY,KAAOoD,IAI/D,IAAMD,KAASnD,EAId,IADA7yB,EAAMg2B,EAAMp/B,MAAO,MACT,KAAQq/B,IAGjBC,EAAOrD,EAAYvoB,EAAO,IAAMtK,EAAK,KACpC6yB,EAAY,KAAO7yB,EAAK,KACb,EAGG,IAATk2B,EACJA,EAAOrD,EAAYmD,IAGgB,IAAxBnD,EAAYmD,KACvBC,EAAUj2B,EAAK,GACfsxB,EAAUrwB,QAASjB,EAAK,KAEzB,MAOJ,IAAc,IAATk2B,EAGJ,GAAKA,GAAQ9F,EAAEgG,UACdV,EAAWQ,EAAMR,QAEjB,IACCA,EAAWQ,EAAMR,GAChB,MAAQ55B,GACT,MAAO,CACN0R,MAAO,cACP/X,MAAOygC,EAAOp6B,EAAI,sBAAwBwO,EAAO,OAAS2rB,IASjE,MAAO,CAAEzoB,MAAO,UAAWsE,KAAM4jB,GA+cpBW,CAAajG,EAAGsF,EAAUlE,EAAOiE,GAGvCA,GAGCrF,EAAE8E,cACNS,EAAWnE,EAAM8C,kBAAmB,oBAEnCjiC,EAAO6/B,aAAcsB,GAAamC,IAEnCA,EAAWnE,EAAM8C,kBAAmB,WAEnCjiC,EAAO8/B,KAAMqB,GAAamC,IAKZ,MAAXhB,GAA6B,SAAXvE,EAAEp/B,KACxB6jC,EAAa,YAGS,MAAXF,EACXE,EAAa,eAIbA,EAAaa,EAASloB,MACtB6nB,EAAUK,EAAS5jB,KAEnB2jB,IADAhgC,EAAQigC,EAASjgC,UAMlBA,EAAQo/B,GACHF,GAAWE,IACfA,EAAa,QACRF,EAAS,IACbA,EAAS,KAMZnD,EAAMmD,OAASA,EACfnD,EAAMqD,YAAeU,GAAoBV,GAAe,GAGnDY,EACJ/nB,EAASmB,YAAaklB,EAAiB,CAAEsB,EAASR,EAAYrD,IAE9D9jB,EAASuB,WAAY8kB,EAAiB,CAAEvC,EAAOqD,EAAYp/B,IAI5D+7B,EAAM0C,WAAYA,GAClBA,OAAa/+B,EAER0+B,GACJG,EAAmBvb,QAASgd,EAAY,cAAgB,YACvD,CAAEjE,EAAOpB,EAAGqF,EAAYJ,EAAU5/B,IAIpCw+B,EAAiB7mB,SAAU2mB,EAAiB,CAAEvC,EAAOqD,IAEhDhB,IACJG,EAAmBvb,QAAS,eAAgB,CAAE+Y,EAAOpB,MAG3C/9B,EAAO4/B,QAChB5/B,EAAO0lB,MAAMU,QAAS,cAKzB,OAAO+Y,GAGR8E,QAAS,SAAUlE,EAAKtgB,EAAMte,GAC7B,OAAOnB,EAAOW,IAAKo/B,EAAKtgB,EAAMte,EAAU,SAGzC+iC,UAAW,SAAUnE,EAAK5+B,GACzB,OAAOnB,EAAOW,IAAKo/B,OAAKj9B,EAAW3B,EAAU,aAI/CnB,EAAOkB,KAAM,CAAE,MAAO,QAAU,SAAUsD,EAAImV,GAC7C3Z,EAAQ2Z,GAAW,SAAUomB,EAAKtgB,EAAMte,EAAUxC,GAUjD,OAPKL,EAAYmhB,KAChB9gB,EAAOA,GAAQwC,EACfA,EAAWse,EACXA,OAAO3c,GAID9C,EAAOihC,KAAMjhC,EAAOmC,OAAQ,CAClC49B,IAAKA,EACLphC,KAAMgb,EACNqlB,SAAUrgC,EACV8gB,KAAMA,EACNujB,QAAS7hC,GACPnB,EAAO2C,cAAeo9B,IAASA,OAIpC//B,EAAO+gC,cAAe,SAAUhD,GAC/B,IAAI5+B,EACJ,IAAMA,KAAK4+B,EAAE+E,QACa,iBAApB3jC,EAAEsF,gBACNs5B,EAAEqC,YAAcrC,EAAE+E,QAAS3jC,IAAO,MAMrCa,EAAO0sB,SAAW,SAAUqT,EAAK39B,EAASlD,GACzC,OAAOc,EAAOihC,KAAM,CACnBlB,IAAKA,EAGLphC,KAAM,MACNqgC,SAAU,SACV9zB,OAAO,EACPi1B,OAAO,EACP1jC,QAAQ,EAKR+jC,WAAY,CACX2D,cAAe,cAEhBL,WAAY,SAAUT,GACrBrjC,EAAO0D,WAAY2/B,EAAUjhC,EAASlD,OAMzCc,EAAOG,GAAGgC,OAAQ,CACjBiiC,QAAS,SAAU3X,GAClB,IAAIjI,EAyBJ,OAvBKvnB,KAAM,KACLqB,EAAYmuB,KAChBA,EAAOA,EAAK/uB,KAAMT,KAAM,KAIzBunB,EAAOxkB,EAAQysB,EAAMxvB,KAAM,GAAIiN,eAAgB1I,GAAI,GAAIgB,OAAO,GAEzDvF,KAAM,GAAI2C,YACd4kB,EAAK6I,aAAcpwB,KAAM,IAG1BunB,EAAKpjB,IAAK,WACT,IAAIC,EAAOpE,KAEX,MAAQoE,EAAKgjC,kBACZhjC,EAAOA,EAAKgjC,kBAGb,OAAOhjC,IACJ8rB,OAAQlwB,OAGNA,MAGRqnC,UAAW,SAAU7X,GACpB,OAAKnuB,EAAYmuB,GACTxvB,KAAKiE,KAAM,SAAU/B,GAC3Ba,EAAQ/C,MAAOqnC,UAAW7X,EAAK/uB,KAAMT,KAAMkC,MAItClC,KAAKiE,KAAM,WACjB,IAAIuW,EAAOzX,EAAQ/C,MAClB+a,EAAWP,EAAKO,WAEZA,EAAS1X,OACb0X,EAASosB,QAAS3X,GAGlBhV,EAAK0V,OAAQV,MAKhBjI,KAAM,SAAUiI,GACf,IAAI8X,EAAiBjmC,EAAYmuB,GAEjC,OAAOxvB,KAAKiE,KAAM,SAAU/B,GAC3Ba,EAAQ/C,MAAOmnC,QAASG,EAAiB9X,EAAK/uB,KAAMT,KAAMkC,GAAMstB,MAIlE+X,OAAQ,SAAUvkC,GAIjB,OAHAhD,KAAKkU,OAAQlR,GAAW2R,IAAK,QAAS1Q,KAAM,WAC3ClB,EAAQ/C,MAAOuwB,YAAavwB,KAAKuM,cAE3BvM,QAKT+C,EAAO6O,KAAKhI,QAAQ2vB,OAAS,SAAUn1B,GACtC,OAAQrB,EAAO6O,KAAKhI,QAAQ49B,QAASpjC,IAEtCrB,EAAO6O,KAAKhI,QAAQ49B,QAAU,SAAUpjC,GACvC,SAAWA,EAAKyuB,aAAezuB,EAAKqjC,cAAgBrjC,EAAKwxB,iBAAiBvyB,SAM3EN,EAAO2/B,aAAagF,IAAM,WACzB,IACC,OAAO,IAAI3nC,EAAO4nC,eACjB,MAAQn7B,MAGX,IAAIo7B,GAAmB,CAGrBC,EAAG,IAIHC,KAAM,KAEPC,GAAehlC,EAAO2/B,aAAagF,MAEpCtmC,EAAQ4mC,OAASD,IAAkB,oBAAqBA,GACxD3mC,EAAQ4iC,KAAO+D,KAAiBA,GAEhChlC,EAAOghC,cAAe,SAAU5+B,GAC/B,IAAIjB,EAAU+jC,EAGd,GAAK7mC,EAAQ4mC,MAAQD,KAAiB5iC,EAAQsgC,YAC7C,MAAO,CACNO,KAAM,SAAUH,EAAS9K,GACxB,IAAI74B,EACHwlC,EAAMviC,EAAQuiC,MAWf,GATAA,EAAIQ,KACH/iC,EAAQzD,KACRyD,EAAQ29B,IACR39B,EAAQ+9B,MACR/9B,EAAQgjC,SACRhjC,EAAQmR,UAIJnR,EAAQijC,UACZ,IAAMlmC,KAAKiD,EAAQijC,UAClBV,EAAKxlC,GAAMiD,EAAQijC,UAAWlmC,GAmBhC,IAAMA,KAdDiD,EAAQigC,UAAYsC,EAAIvC,kBAC5BuC,EAAIvC,iBAAkBhgC,EAAQigC,UAQzBjgC,EAAQsgC,aAAgBI,EAAS,sBACtCA,EAAS,oBAAuB,kBAItBA,EACV6B,EAAIxC,iBAAkBhjC,EAAG2jC,EAAS3jC,IAInCgC,EAAW,SAAUxC,GACpB,OAAO,WACDwC,IACJA,EAAW+jC,EAAgBP,EAAIW,OAC9BX,EAAIY,QAAUZ,EAAIa,QAAUb,EAAIc,UAC/Bd,EAAIe,mBAAqB,KAEb,UAAT/mC,EACJgmC,EAAIpC,QACgB,UAAT5jC,EAKgB,iBAAfgmC,EAAIrC,OACftK,EAAU,EAAG,SAEbA,EAGC2M,EAAIrC,OACJqC,EAAInC,YAINxK,EACC6M,GAAkBF,EAAIrC,SAAYqC,EAAIrC,OACtCqC,EAAInC,WAK+B,UAAjCmC,EAAIgB,cAAgB,SACM,iBAArBhB,EAAIiB,aACV,CAAEC,OAAQlB,EAAItB,UACd,CAAE9jC,KAAMolC,EAAIiB,cACbjB,EAAIzC,4BAQTyC,EAAIW,OAASnkC,IACb+jC,EAAgBP,EAAIY,QAAUZ,EAAIc,UAAYtkC,EAAU,cAKnC2B,IAAhB6hC,EAAIa,QACRb,EAAIa,QAAUN,EAEdP,EAAIe,mBAAqB,WAGA,IAAnBf,EAAIzmB,YAMRlhB,EAAO8f,WAAY,WACb3b,GACJ+jC,OAQL/jC,EAAWA,EAAU,SAErB,IAGCwjC,EAAI1B,KAAM7gC,EAAQwgC,YAAcxgC,EAAQqd,MAAQ,MAC/C,MAAQhW,GAGT,GAAKtI,EACJ,MAAMsI,IAKT84B,MAAO,WACDphC,GACJA,QAWLnB,EAAO+gC,cAAe,SAAUhD,GAC1BA,EAAE2E,cACN3E,EAAE/lB,SAAS3Y,QAAS,KAKtBW,EAAO6gC,UAAW,CACjBR,QAAS,CACRhhC,OAAQ,6FAGT2Y,SAAU,CACT3Y,OAAQ,2BAETmhC,WAAY,CACX2D,cAAe,SAAU5kC,GAExB,OADAS,EAAO0D,WAAYnE,GACZA,MAMVS,EAAO+gC,cAAe,SAAU,SAAUhD,QACxBj7B,IAAZi7B,EAAE7yB,QACN6yB,EAAE7yB,OAAQ,GAEN6yB,EAAE2E,cACN3E,EAAEp/B,KAAO,SAKXqB,EAAOghC,cAAe,SAAU,SAAUjD,GAIxC,IAAI1+B,EAAQ8B,EADb,GAAK48B,EAAE2E,aAAe3E,EAAE+H,YAEvB,MAAO,CACN7C,KAAM,SAAUhpB,EAAG+d,GAClB34B,EAASW,EAAQ,YACf+O,KAAMgvB,EAAE+H,aAAe,IACvBpmB,KAAM,CAAEqmB,QAAShI,EAAEiI,cAAepnC,IAAKm/B,EAAEgC,MACzCza,GAAI,aAAcnkB,EAAW,SAAU8kC,GACvC5mC,EAAOub,SACPzZ,EAAW,KACN8kC,GACJjO,EAAuB,UAAbiO,EAAItnC,KAAmB,IAAM,IAAKsnC,EAAItnC,QAKnD9B,EAAS6C,KAAKC,YAAaN,EAAQ,KAEpCkjC,MAAO,WACDphC,GACJA,QAUL,IAqGKshB,GArGDyjB,GAAe,GAClBC,GAAS,oBAGVnmC,EAAO6gC,UAAW,CACjBuF,MAAO,WACPC,cAAe,WACd,IAAIllC,EAAW+kC,GAAa5/B,OAAWtG,EAAO+C,QAAU,IAAQlE,GAAMuF,OAEtE,OADAnH,KAAMkE,IAAa,EACZA,KAKTnB,EAAO+gC,cAAe,aAAc,SAAUhD,EAAGuI,EAAkBnH,GAElE,IAAIoH,EAAcC,EAAaC,EAC9BC,GAAuB,IAAZ3I,EAAEqI,QAAqBD,GAAO17B,KAAMszB,EAAEgC,KAChD,MACkB,iBAAXhC,EAAEte,MAE6C,KADnDse,EAAEqC,aAAe,IACjBtiC,QAAS,sCACXqoC,GAAO17B,KAAMszB,EAAEte,OAAU,QAI5B,GAAKinB,GAAiC,UAArB3I,EAAEkB,UAAW,GA8D7B,OA3DAsH,EAAexI,EAAEsI,cAAgB/nC,EAAYy/B,EAAEsI,eAC9CtI,EAAEsI,gBACFtI,EAAEsI,cAGEK,EACJ3I,EAAG2I,GAAa3I,EAAG2I,GAAWxjC,QAASijC,GAAQ,KAAOI,IAC/B,IAAZxI,EAAEqI,QACbrI,EAAEgC,MAAS3C,GAAO3yB,KAAMszB,EAAEgC,KAAQ,IAAM,KAAQhC,EAAEqI,MAAQ,IAAMG,GAIjExI,EAAEyC,WAAY,eAAkB,WAI/B,OAHMiG,GACLzmC,EAAOoD,MAAOmjC,EAAe,mBAEvBE,EAAmB,IAI3B1I,EAAEkB,UAAW,GAAM,OAGnBuH,EAAcxpC,EAAQupC,GACtBvpC,EAAQupC,GAAiB,WACxBE,EAAoBnlC,WAIrB69B,EAAM/jB,OAAQ,gBAGQtY,IAAhB0jC,EACJxmC,EAAQhD,GAASq+B,WAAYkL,GAI7BvpC,EAAQupC,GAAiBC,EAIrBzI,EAAGwI,KAGPxI,EAAEsI,cAAgBC,EAAiBD,cAGnCH,GAAaroC,KAAM0oC,IAIfE,GAAqBnoC,EAAYkoC,IACrCA,EAAaC,EAAmB,IAGjCA,EAAoBD,OAAc1jC,IAI5B,WAYTzE,EAAQsoC,qBACHlkB,GAAO5lB,EAAS+pC,eAAeD,mBAAoB,IAAKlkB,MACvD5U,UAAY,6BACiB,IAA3B4U,GAAKjZ,WAAWlJ,QAQxBN,EAAO2X,UAAY,SAAU8H,EAAMvf,EAAS2mC,GAC3C,MAAqB,iBAATpnB,EACJ,IAEgB,kBAAZvf,IACX2mC,EAAc3mC,EACdA,GAAU,GAKLA,IAIA7B,EAAQsoC,qBAMZ9yB,GALA3T,EAAUrD,EAAS+pC,eAAeD,mBAAoB,KAKvCrnC,cAAe,SACzBkT,KAAO3V,EAASsV,SAASK,KAC9BtS,EAAQR,KAAKC,YAAakU,IAE1B3T,EAAUrD,GAKZwnB,GAAWwiB,GAAe,IAD1BC,EAASxvB,EAAWnN,KAAMsV,IAKlB,CAAEvf,EAAQZ,cAAewnC,EAAQ,MAGzCA,EAAS1iB,GAAe,CAAE3E,GAAQvf,EAASmkB,GAEtCA,GAAWA,EAAQ/jB,QACvBN,EAAQqkB,GAAUzJ,SAGZ5a,EAAOgB,MAAO,GAAI8lC,EAAOt9B,cAlChC,IAAIqK,EAAMizB,EAAQziB,GAyCnBrkB,EAAOG,GAAGwoB,KAAO,SAAUoX,EAAKgH,EAAQ5lC,GACvC,IAAIlB,EAAUtB,EAAM0kC,EACnB5rB,EAAOxa,KACP0oB,EAAMoa,EAAIjiC,QAAS,KAsDpB,OApDY,EAAP6nB,IACJ1lB,EAAWi7B,GAAkB6E,EAAIxiC,MAAOooB,IACxCoa,EAAMA,EAAIxiC,MAAO,EAAGooB,IAIhBrnB,EAAYyoC,IAGhB5lC,EAAW4lC,EACXA,OAASjkC,GAGEikC,GAA4B,iBAAXA,IAC5BpoC,EAAO,QAIW,EAAd8Y,EAAKnX,QACTN,EAAOihC,KAAM,CACZlB,IAAKA,EAKLphC,KAAMA,GAAQ,MACdqgC,SAAU,OACVvf,KAAMsnB,IACHlhC,KAAM,SAAU+/B,GAGnBvC,EAAW/hC,UAEXmW,EAAKgV,KAAMxsB,EAIVD,EAAQ,SAAUmtB,OAAQntB,EAAO2X,UAAWiuB,IAAiBp4B,KAAMvN,GAGnE2lC,KAKExqB,OAAQja,GAAY,SAAUg+B,EAAOmD,GACxC7qB,EAAKvW,KAAM,WACVC,EAASvD,MAAOX,KAAMomC,GAAY,CAAElE,EAAMyG,aAActD,EAAQnD,QAK5DliC,MAMR+C,EAAO6O,KAAKhI,QAAQmgC,SAAW,SAAU3lC,GACxC,OAAOrB,EAAO2B,KAAM3B,EAAOw5B,OAAQ,SAAUr5B,GAC5C,OAAOkB,IAASlB,EAAGkB,OAChBf,QAMLN,EAAOinC,OAAS,CACfC,UAAW,SAAU7lC,EAAMe,EAASjD,GACnC,IAAIgoC,EAAaC,EAASC,EAAWC,EAAQC,EAAWC,EACvD5X,EAAW5vB,EAAOyhB,IAAKpgB,EAAM,YAC7BomC,EAAUznC,EAAQqB,GAClB2nB,EAAQ,GAGS,WAAb4G,IACJvuB,EAAKkgB,MAAMqO,SAAW,YAGvB2X,EAAYE,EAAQR,SACpBI,EAAYrnC,EAAOyhB,IAAKpgB,EAAM,OAC9BmmC,EAAaxnC,EAAOyhB,IAAKpgB,EAAM,SACI,aAAbuuB,GAAwC,UAAbA,KACA,GAA9CyX,EAAYG,GAAa1pC,QAAS,SAMpCwpC,GADAH,EAAcM,EAAQ7X,YACD7iB,IACrBq6B,EAAUD,EAAYzS,OAGtB4S,EAASrX,WAAYoX,IAAe,EACpCD,EAAUnX,WAAYuX,IAAgB,GAGlClpC,EAAY8D,KAGhBA,EAAUA,EAAQ1E,KAAM2D,EAAMlC,EAAGa,EAAOmC,OAAQ,GAAIolC,KAGjC,MAAfnlC,EAAQ2K,MACZic,EAAMjc,IAAQ3K,EAAQ2K,IAAMw6B,EAAUx6B,IAAQu6B,GAE1B,MAAhBllC,EAAQsyB,OACZ1L,EAAM0L,KAAStyB,EAAQsyB,KAAO6S,EAAU7S,KAAS0S,GAG7C,UAAWhlC,EACfA,EAAQslC,MAAMhqC,KAAM2D,EAAM2nB,IAGA,iBAAdA,EAAMjc,MACjBic,EAAMjc,KAAO,MAEa,iBAAfic,EAAM0L,OACjB1L,EAAM0L,MAAQ,MAEf+S,EAAQhmB,IAAKuH,MAKhBhpB,EAAOG,GAAGgC,OAAQ,CAGjB8kC,OAAQ,SAAU7kC,GAGjB,GAAKd,UAAUhB,OACd,YAAmBwC,IAAZV,EACNnF,KACAA,KAAKiE,KAAM,SAAU/B,GACpBa,EAAOinC,OAAOC,UAAWjqC,KAAMmF,EAASjD,KAI3C,IAAIwoC,EAAMC,EACTvmC,EAAOpE,KAAM,GAEd,OAAMoE,EAQAA,EAAKwxB,iBAAiBvyB,QAK5BqnC,EAAOtmC,EAAKmzB,wBACZoT,EAAMvmC,EAAK6I,cAAc4C,YAClB,CACNC,IAAK46B,EAAK56B,IAAM66B,EAAIC,YACpBnT,KAAMiT,EAAKjT,KAAOkT,EAAIE,cARf,CAAE/6B,IAAK,EAAG2nB,KAAM,QATxB,GAuBD9E,SAAU,WACT,GAAM3yB,KAAM,GAAZ,CAIA,IAAI8qC,EAAcd,EAAQ/nC,EACzBmC,EAAOpE,KAAM,GACb+qC,EAAe,CAAEj7B,IAAK,EAAG2nB,KAAM,GAGhC,GAAwC,UAAnC10B,EAAOyhB,IAAKpgB,EAAM,YAGtB4lC,EAAS5lC,EAAKmzB,4BAER,CACNyS,EAAShqC,KAAKgqC,SAId/nC,EAAMmC,EAAK6I,cACX69B,EAAe1mC,EAAK0mC,cAAgB7oC,EAAIyN,gBACxC,MAAQo7B,IACLA,IAAiB7oC,EAAIujB,MAAQslB,IAAiB7oC,EAAIyN,kBACT,WAA3C3M,EAAOyhB,IAAKsmB,EAAc,YAE1BA,EAAeA,EAAanoC,WAExBmoC,GAAgBA,IAAiB1mC,GAAkC,IAA1B0mC,EAAavpC,YAG1DwpC,EAAehoC,EAAQ+nC,GAAed,UACzBl6B,KAAO/M,EAAOyhB,IAAKsmB,EAAc,kBAAkB,GAChEC,EAAatT,MAAQ10B,EAAOyhB,IAAKsmB,EAAc,mBAAmB,IAKpE,MAAO,CACNh7B,IAAKk6B,EAAOl6B,IAAMi7B,EAAaj7B,IAAM/M,EAAOyhB,IAAKpgB,EAAM,aAAa,GACpEqzB,KAAMuS,EAAOvS,KAAOsT,EAAatT,KAAO10B,EAAOyhB,IAAKpgB,EAAM,cAAc,MAc1E0mC,aAAc,WACb,OAAO9qC,KAAKmE,IAAK,WAChB,IAAI2mC,EAAe9qC,KAAK8qC,aAExB,MAAQA,GAA2D,WAA3C/nC,EAAOyhB,IAAKsmB,EAAc,YACjDA,EAAeA,EAAaA,aAG7B,OAAOA,GAAgBp7B,QAM1B3M,EAAOkB,KAAM,CAAE00B,WAAY,cAAeD,UAAW,eAAiB,SAAUhc,EAAQ+F,GACvF,IAAI3S,EAAM,gBAAkB2S,EAE5B1f,EAAOG,GAAIwZ,GAAW,SAAUva,GAC/B,OAAOgf,EAAQnhB,KAAM,SAAUoE,EAAMsY,EAAQva,GAG5C,IAAIwoC,EAOJ,GANKnpC,EAAU4C,GACdumC,EAAMvmC,EACuB,IAAlBA,EAAK7C,WAChBopC,EAAMvmC,EAAKyL,kBAGChK,IAAR1D,EACJ,OAAOwoC,EAAMA,EAAKloB,GAASre,EAAMsY,GAG7BiuB,EACJA,EAAIK,SACFl7B,EAAY66B,EAAIE,YAAV1oC,EACP2N,EAAM3N,EAAMwoC,EAAIC,aAIjBxmC,EAAMsY,GAAWva,GAEhBua,EAAQva,EAAKkC,UAAUhB,WAU5BN,EAAOkB,KAAM,CAAE,MAAO,QAAU,SAAUsD,EAAIkb,GAC7C1f,EAAOgzB,SAAUtT,GAASoP,GAAczwB,EAAQiyB,cAC/C,SAAUjvB,EAAMmtB,GACf,GAAKA,EAIJ,OAHAA,EAAWD,GAAQltB,EAAMqe,GAGlBsO,GAAUvjB,KAAM+jB,GACtBxuB,EAAQqB,GAAOuuB,WAAYlQ,GAAS,KACpC8O,MAQLxuB,EAAOkB,KAAM,CAAEgnC,OAAQ,SAAUC,MAAO,SAAW,SAAU9lC,EAAM1D,GAClEqB,EAAOkB,KAAM,CAAE0zB,QAAS,QAAUvyB,EAAM2W,QAASra,EAAMypC,GAAI,QAAU/lC,GACpE,SAAUgmC,EAAcC,GAGxBtoC,EAAOG,GAAImoC,GAAa,SAAU3T,EAAQxwB,GACzC,IAAIka,EAAY/c,UAAUhB,SAAY+nC,GAAkC,kBAAX1T,GAC5DpC,EAAQ8V,KAA6B,IAAX1T,IAA6B,IAAVxwB,EAAiB,SAAW,UAE1E,OAAOia,EAAQnhB,KAAM,SAAUoE,EAAM1C,EAAMwF,GAC1C,IAAIjF,EAEJ,OAAKT,EAAU4C,GAGyB,IAAhCinC,EAASxqC,QAAS,SACxBuD,EAAM,QAAUgB,GAChBhB,EAAKxE,SAAS8P,gBAAiB,SAAWtK,GAIrB,IAAlBhB,EAAK7C,UACTU,EAAMmC,EAAKsL,gBAIJ3J,KAAKgvB,IACX3wB,EAAKohB,KAAM,SAAWpgB,GAAQnD,EAAK,SAAWmD,GAC9ChB,EAAKohB,KAAM,SAAWpgB,GAAQnD,EAAK,SAAWmD,GAC9CnD,EAAK,SAAWmD,UAIDS,IAAVqB,EAGNnE,EAAOyhB,IAAKpgB,EAAM1C,EAAM4zB,GAGxBvyB,EAAOuhB,MAAOlgB,EAAM1C,EAAMwF,EAAOouB,IAChC5zB,EAAM0f,EAAYsW,OAAS7xB,EAAWub,QAM5Cre,EAAOkB,KAAM,CACZ,YACA,WACA,eACA,YACA,cACA,YACE,SAAUsD,EAAI7F,GAChBqB,EAAOG,GAAIxB,GAAS,SAAUwB,GAC7B,OAAOlD,KAAKqoB,GAAI3mB,EAAMwB,MAOxBH,EAAOG,GAAGgC,OAAQ,CAEjB41B,KAAM,SAAUxS,EAAO9F,EAAMtf,GAC5B,OAAOlD,KAAKqoB,GAAIC,EAAO,KAAM9F,EAAMtf,IAEpCooC,OAAQ,SAAUhjB,EAAOplB,GACxB,OAAOlD,KAAK0oB,IAAKJ,EAAO,KAAMplB,IAG/BqoC,SAAU,SAAUvoC,EAAUslB,EAAO9F,EAAMtf,GAC1C,OAAOlD,KAAKqoB,GAAIC,EAAOtlB,EAAUwf,EAAMtf,IAExCsoC,WAAY,SAAUxoC,EAAUslB,EAAOplB,GAGtC,OAA4B,IAArBmB,UAAUhB,OAChBrD,KAAK0oB,IAAK1lB,EAAU,MACpBhD,KAAK0oB,IAAKJ,EAAOtlB,GAAY,KAAME,IAGrCuoC,MAAO,SAAUC,EAAQC,GACxB,OAAO3rC,KAAKmuB,WAAYud,GAAStd,WAAYud,GAASD,MAIxD3oC,EAAOkB,KAAM,wLAEgDqD,MAAO,KACnE,SAAUC,EAAInC,GAGbrC,EAAOG,GAAIkC,GAAS,SAAUod,EAAMtf,GACnC,OAA0B,EAAnBmB,UAAUhB,OAChBrD,KAAKqoB,GAAIjjB,EAAM,KAAMod,EAAMtf,GAC3BlD,KAAKmpB,QAAS/jB,MASlB,IAAI2E,GAAQ,qCAMZhH,EAAO6oC,MAAQ,SAAU1oC,EAAID,GAC5B,IAAIyN,EAAK6D,EAAMq3B,EAUf,GARwB,iBAAZ3oC,IACXyN,EAAMxN,EAAID,GACVA,EAAUC,EACVA,EAAKwN,GAKArP,EAAY6B,GAalB,OARAqR,EAAOjU,EAAMG,KAAM4D,UAAW,IAC9BunC,EAAQ,WACP,OAAO1oC,EAAGvC,MAAOsC,GAAWjD,KAAMuU,EAAK7T,OAAQJ,EAAMG,KAAM4D,eAItD8C,KAAOjE,EAAGiE,KAAOjE,EAAGiE,MAAQpE,EAAOoE,OAElCykC,GAGR7oC,EAAO8oC,UAAY,SAAUC,GACvBA,EACJ/oC,EAAOge,YAEPhe,EAAO4X,OAAO,IAGhB5X,EAAO6C,QAAUD,MAAMC,QACvB7C,EAAOgpC,UAAY/oB,KAAKC,MACxBlgB,EAAOqJ,SAAWA,EAClBrJ,EAAO1B,WAAaA,EACpB0B,EAAOvB,SAAWA,EAClBuB,EAAOgf,UAAYA,EACnBhf,EAAOrB,KAAOmB,EAEdE,EAAOqpB,IAAM3jB,KAAK2jB,IAElBrpB,EAAOipC,UAAY,SAAU1qC,GAK5B,IAAII,EAAOqB,EAAOrB,KAAMJ,GACxB,OAAkB,WAATI,GAA8B,WAATA,KAK5BuqC,MAAO3qC,EAAM0xB,WAAY1xB,KAG5ByB,EAAOmpC,KAAO,SAAU5pC,GACvB,OAAe,MAARA,EACN,IACEA,EAAO,IAAK2D,QAAS8D,GAAO,KAkBT,mBAAXoiC,QAAyBA,OAAOC,KAC3CD,OAAQ,SAAU,GAAI,WACrB,OAAOppC,IAOT,IAGCspC,GAAUtsC,EAAOgD,OAGjBupC,GAAKvsC,EAAOwsC,EAwBb,OAtBAxpC,EAAOypC,WAAa,SAAU/mC,GAS7B,OARK1F,EAAOwsC,IAAMxpC,IACjBhD,EAAOwsC,EAAID,IAGP7mC,GAAQ1F,EAAOgD,SAAWA,IAC9BhD,EAAOgD,OAASspC,IAGVtpC,GAMiB,oBAAb9C,IACXF,EAAOgD,OAAShD,EAAOwsC,EAAIxpC,GAMrBA","file":"jquery.min.js"}
\ No newline at end of file
diff --git a/web/core/assets/vendor/js-cookie/js.cookie.min.js b/web/core/assets/vendor/js-cookie/js.cookie.min.js
new file mode 100644
index 0000000000..a0e6820c7b
--- /dev/null
+++ b/web/core/assets/vendor/js-cookie/js.cookie.min.js
@@ -0,0 +1,2 @@
+/*! js-cookie v3.0.0-rc.0 | MIT */
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):(e=e||self,function(){var r=e.Cookies,n=e.Cookies=t();n.noConflict=function(){return e.Cookies=r,n}}())}(this,function(){"use strict";function e(e){for(var t=1;t<arguments.length;t++){var r=arguments[t];for(var n in r)e[n]=r[n]}return e}var t={read:function(e){return e.replace(/%3B/g,";")},write:function(e){return e.replace(/;/g,"%3B")}};return function r(n,i){function o(r,o,u){if("undefined"!=typeof document){"number"==typeof(u=e({},i,u)).expires&&(u.expires=new Date(Date.now()+864e5*u.expires)),u.expires&&(u.expires=u.expires.toUTCString()),r=t.write(r).replace(/=/g,"%3D"),o=n.write(String(o),r);var c="";for(var f in u)u[f]&&(c+="; "+f,!0!==u[f]&&(c+="="+u[f].split(";")[0]));return document.cookie=r+"="+o+c}}return Object.create({set:o,get:function(e){if("undefined"!=typeof document&&(!arguments.length||e)){for(var r=document.cookie?document.cookie.split("; "):[],i={},o=0;o<r.length;o++){var u=r[o].split("="),c=u.slice(1).join("="),f=t.read(u[0]).replace(/%3D/g,"=");if(i[f]=n.read(c,f),e===f)break}return e?i[e]:i}},remove:function(t,r){o(t,"",e({},r,{expires:-1}))},withAttributes:function(t){return r(this.converter,e({},this.attributes,t))},withConverter:function(t){return r(e({},this.converter,t),this.attributes)}},{attributes:{value:Object.freeze(i)},converter:{value:Object.freeze(n)}})}(t,{path:"/"})});
diff --git a/web/core/assets/vendor/picturefill/picturefill.min.js b/web/core/assets/vendor/picturefill/picturefill.min.js
index 5bb1dd8a8b..9df7198d30 100644
--- a/web/core/assets/vendor/picturefill/picturefill.min.js
+++ b/web/core/assets/vendor/picturefill/picturefill.min.js
@@ -1,5 +1,5 @@
-/*! Picturefill - v3.0.1 - 2015-09-30
- * http://scottjehl.github.io/picturefill
- * Copyright (c) 2015 https://github.com/scottjehl/picturefill/blob/master/Authors.txt; Licensed MIT
+/*! picturefill - v3.0.2 - 2016-02-12
+ * https://scottjehl.github.io/picturefill/
+ * Copyright (c) 2016 https://github.com/scottjehl/picturefill/blob/master/Authors.txt; Licensed MIT
*/
-!function(a){var b=navigator.userAgent;a.HTMLPictureElement&&/ecko/.test(b)&&b.match(/rv\:(\d+)/)&&RegExp.$1<41&&addEventListener("resize",function(){var b,c=document.createElement("source"),d=function(a){var b,d,e=a.parentNode;"PICTURE"===e.nodeName.toUpperCase()?(b=c.cloneNode(),e.insertBefore(b,e.firstElementChild),setTimeout(function(){e.removeChild(b)})):(!a._pfLastSize||a.offsetWidth>a._pfLastSize)&&(a._pfLastSize=a.offsetWidth,d=a.sizes,a.sizes+=",100vw",setTimeout(function(){a.sizes=d}))},e=function(){var a,b=document.querySelectorAll("picture > img, img[srcset][sizes]");for(a=0;a<b.length;a++)d(b[a])},f=function(){clearTimeout(b),b=setTimeout(e,99)},g=a.matchMedia&&matchMedia("(orientation: landscape)"),h=function(){f(),g&&g.addListener&&g.addListener(f)};return c.srcset="data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==",/^[c|i]|d$/.test(document.readyState||"")?h():document.addEventListener("DOMContentLoaded",h),f}())}(window),function(a,b,c){"use strict";function d(a){return" "===a||" "===a||"\n"===a||"\f"===a||"\r"===a}function e(b,c){var d=new a.Image;return d.onerror=function(){z[b]=!1,aa()},d.onload=function(){z[b]=1===d.width,aa()},d.src=c,"pending"}function f(){L=!1,O=a.devicePixelRatio,M={},N={},s.DPR=O||1,P.width=Math.max(a.innerWidth||0,y.clientWidth),P.height=Math.max(a.innerHeight||0,y.clientHeight),P.vw=P.width/100,P.vh=P.height/100,r=[P.height,P.width,O].join("-"),P.em=s.getEmValue(),P.rem=P.em}function g(a,b,c,d){var e,f,g,h;return"saveData"===A.algorithm?a>2.7?h=c+1:(f=b-c,e=Math.pow(a-.6,1.5),g=f*e,d&&(g+=.1*e),h=a+g):h=c>1?Math.sqrt(a*b):a,h>c}function h(a){var b,c=s.getSet(a),d=!1;"pending"!==c&&(d=r,c&&(b=s.setRes(c),s.applySetCandidate(b,a))),a[s.ns].evaled=d}function i(a,b){return a.res-b.res}function j(a,b,c){var d;return!c&&b&&(c=a[s.ns].sets,c=c&&c[c.length-1]),d=k(b,c),d&&(b=s.makeUrl(b),a[s.ns].curSrc=b,a[s.ns].curCan=d,d.res||_(d,d.set.sizes)),d}function k(a,b){var c,d,e;if(a&&b)for(e=s.parseSet(b),a=s.makeUrl(a),c=0;c<e.length;c++)if(a===s.makeUrl(e[c].url)){d=e[c];break}return d}function l(a,b){var c,d,e,f,g=a.getElementsByTagName("source");for(c=0,d=g.length;d>c;c++)e=g[c],e[s.ns]=!0,f=e.getAttribute("srcset"),f&&b.push({srcset:f,media:e.getAttribute("media"),type:e.getAttribute("type"),sizes:e.getAttribute("sizes")})}function m(a,b){function c(b){var c,d=b.exec(a.substring(m));return d?(c=d[0],m+=c.length,c):void 0}function e(){var a,c,d,e,f,i,j,k,l,m=!1,o={};for(e=0;e<h.length;e++)f=h[e],i=f[f.length-1],j=f.substring(0,f.length-1),k=parseInt(j,10),l=parseFloat(j),W.test(j)&&"w"===i?((a||c)&&(m=!0),0===k?m=!0:a=k):X.test(j)&&"x"===i?((a||c||d)&&(m=!0),0>l?m=!0:c=l):W.test(j)&&"h"===i?((d||c)&&(m=!0),0===k?m=!0:d=k):m=!0;m||(o.url=g,a&&(o.w=a),c&&(o.d=c),d&&(o.h=d),d||c||a||(o.d=1),1===o.d&&(b.has1x=!0),o.set=b,n.push(o))}function f(){for(c(S),i="",j="in descriptor";;){if(k=a.charAt(m),"in descriptor"===j)if(d(k))i&&(h.push(i),i="",j="after descriptor");else{if(","===k)return m+=1,i&&h.push(i),void e();if("("===k)i+=k,j="in parens";else{if(""===k)return i&&h.push(i),void e();i+=k}}else if("in parens"===j)if(")"===k)i+=k,j="in descriptor";else{if(""===k)return h.push(i),void e();i+=k}else if("after descriptor"===j)if(d(k));else{if(""===k)return void e();j="in descriptor",m-=1}m+=1}}for(var g,h,i,j,k,l=a.length,m=0,n=[];;){if(c(T),m>=l)return n;g=c(U),h=[],","===g.slice(-1)?(g=g.replace(V,""),e()):f()}}function n(a){function b(a){function b(){f&&(g.push(f),f="")}function c(){g[0]&&(h.push(g),g=[])}for(var e,f="",g=[],h=[],i=0,j=0,k=!1;;){if(e=a.charAt(j),""===e)return b(),c(),h;if(k){if("*"===e&&"/"===a[j+1]){k=!1,j+=2,b();continue}j+=1}else{if(d(e)){if(a.charAt(j-1)&&d(a.charAt(j-1))||!f){j+=1;continue}if(0===i){b(),j+=1;continue}e=" "}else if("("===e)i+=1;else if(")"===e)i-=1;else{if(","===e){b(),c(),j+=1;continue}if("/"===e&&"*"===a.charAt(j+1)){k=!0,j+=2;continue}}f+=e,j+=1}}}function c(a){return k.test(a)&&parseFloat(a)>=0?!0:l.test(a)?!0:"0"===a||"-0"===a||"+0"===a?!0:!1}var e,f,g,h,i,j,k=/^(?:[+-]?[0-9]+|[0-9]*\.[0-9]+)(?:[eE][+-]?[0-9]+)?(?:ch|cm|em|ex|in|mm|pc|pt|px|rem|vh|vmin|vmax|vw)$/i,l=/^calc\((?:[0-9a-z \.\+\-\*\/\(\)]+)\)$/i;for(f=b(a),g=f.length,e=0;g>e;e++)if(h=f[e],i=h[h.length-1],c(i)){if(j=i,h.pop(),0===h.length)return j;if(h=h.join(" "),s.matchesMedia(h))return j}return"100vw"}b.createElement("picture");var o,p,q,r,s={},t=function(){},u=b.createElement("img"),v=u.getAttribute,w=u.setAttribute,x=u.removeAttribute,y=b.documentElement,z={},A={algorithm:""},B="data-pfsrc",C=B+"set",D=navigator.userAgent,E=/rident/.test(D)||/ecko/.test(D)&&D.match(/rv\:(\d+)/)&&RegExp.$1>35,F="currentSrc",G=/\s+\+?\d+(e\d+)?w/,H=/(\([^)]+\))?\s*(.+)/,I=a.picturefillCFG,J="position:absolute;left:0;visibility:hidden;display:block;padding:0;border:none;font-size:1em;width:1em;overflow:hidden;clip:rect(0px, 0px, 0px, 0px)",K="font-size:100%!important;",L=!0,M={},N={},O=a.devicePixelRatio,P={px:1,"in":96},Q=b.createElement("a"),R=!1,S=/^[ \t\n\r\u000c]+/,T=/^[, \t\n\r\u000c]+/,U=/^[^ \t\n\r\u000c]+/,V=/[,]+$/,W=/^\d+$/,X=/^-?(?:[0-9]+|[0-9]*\.[0-9]+)(?:[eE][+-]?[0-9]+)?$/,Y=function(a,b,c,d){a.addEventListener?a.addEventListener(b,c,d||!1):a.attachEvent&&a.attachEvent("on"+b,c)},Z=function(a){var b={};return function(c){return c in b||(b[c]=a(c)),b[c]}},$=function(){var a=/^([\d\.]+)(em|vw|px)$/,b=function(){for(var a=arguments,b=0,c=a[0];++b in a;)c=c.replace(a[b],a[++b]);return c},c=Z(function(a){return"return "+b((a||"").toLowerCase(),/\band\b/g,"&&",/,/g,"||",/min-([a-z-\s]+):/g,"e.$1>=",/max-([a-z-\s]+):/g,"e.$1<=",/calc([^)]+)/g,"($1)",/(\d+[\.]*[\d]*)([a-z]+)/g,"($1 * e.$2)",/^(?!(e.[a-z]|[0-9\.&=|><\+\-\*\(\)\/])).*/gi,"")+";"});return function(b,d){var e;if(!(b in M))if(M[b]=!1,d&&(e=b.match(a)))M[b]=e[1]*P[e[2]];else try{M[b]=new Function("e",c(b))(P)}catch(f){}return M[b]}}(),_=function(a,b){return a.w?(a.cWidth=s.calcListLength(b||"100vw"),a.res=a.w/a.cWidth):a.res=a.d,a},aa=function(a){var c,d,e,f=a||{};if(f.elements&&1===f.elements.nodeType&&("IMG"===f.elements.nodeName.toUpperCase()?f.elements=[f.elements]:(f.context=f.elements,f.elements=null)),c=f.elements||s.qsa(f.context||b,f.reevaluate||f.reselect?s.sel:s.selShort),e=c.length){for(s.setupRun(f),R=!0,d=0;e>d;d++)s.fillImg(c[d],f);s.teardownRun(f)}};o=a.console&&console.warn?function(a){console.warn(a)}:t,F in u||(F="src"),z["image/jpeg"]=!0,z["image/gif"]=!0,z["image/png"]=!0,z["image/svg+xml"]=b.implementation.hasFeature("http://wwwindow.w3.org/TR/SVG11/feature#Image","1.1"),s.ns=("pf"+(new Date).getTime()).substr(0,9),s.supSrcset="srcset"in u,s.supSizes="sizes"in u,s.supPicture=!!a.HTMLPictureElement,s.supSrcset&&s.supPicture&&!s.supSizes&&!function(a){u.srcset="data:,a",a.src="data:,a",s.supSrcset=u.complete===a.complete,s.supPicture=s.supSrcset&&s.supPicture}(b.createElement("img")),s.selShort="picture>img,img[srcset]",s.sel=s.selShort,s.cfg=A,s.supSrcset&&(s.sel+=",img["+C+"]"),s.DPR=O||1,s.u=P,s.types=z,q=s.supSrcset&&!s.supSizes,s.setSize=t,s.makeUrl=Z(function(a){return Q.href=a,Q.href}),s.qsa=function(a,b){return a.querySelectorAll(b)},s.matchesMedia=function(){return a.matchMedia&&(matchMedia("(min-width: 0.1em)")||{}).matches?s.matchesMedia=function(a){return!a||matchMedia(a).matches}:s.matchesMedia=s.mMQ,s.matchesMedia.apply(this,arguments)},s.mMQ=function(a){return a?$(a):!0},s.calcLength=function(a){var b=$(a,!0)||!1;return 0>b&&(b=!1),b},s.supportsType=function(a){return a?z[a]:!0},s.parseSize=Z(function(a){var b=(a||"").match(H);return{media:b&&b[1],length:b&&b[2]}}),s.parseSet=function(a){return a.cands||(a.cands=m(a.srcset,a)),a.cands},s.getEmValue=function(){var a;if(!p&&(a=b.body)){var c=b.createElement("div"),d=y.style.cssText,e=a.style.cssText;c.style.cssText=J,y.style.cssText=K,a.style.cssText=K,a.appendChild(c),p=c.offsetWidth,a.removeChild(c),p=parseFloat(p,10),y.style.cssText=d,a.style.cssText=e}return p||16},s.calcListLength=function(a){if(!(a in N)||A.uT){var b=s.calcLength(n(a));N[a]=b?b:P.width}return N[a]},s.setRes=function(a){var b;if(a){b=s.parseSet(a);for(var c=0,d=b.length;d>c;c++)_(b[c],a.sizes)}return b},s.setRes.res=_,s.applySetCandidate=function(a,b){if(a.length){var c,d,e,f,h,k,l,m,n,o=b[s.ns],p=s.DPR;if(k=o.curSrc||b[F],l=o.curCan||j(b,k,a[0].set),l&&l.set===a[0].set&&(n=E&&!b.complete&&l.res-.1>p,n||(l.cached=!0,l.res>=p&&(h=l))),!h)for(a.sort(i),f=a.length,h=a[f-1],d=0;f>d;d++)if(c=a[d],c.res>=p){e=d-1,h=a[e]&&(n||k!==s.makeUrl(c.url))&&g(a[e].res,c.res,p,a[e].cached)?a[e]:c;break}h&&(m=s.makeUrl(h.url),o.curSrc=m,o.curCan=h,m!==k&&s.setSrc(b,h),s.setSize(b))}},s.setSrc=function(a,b){var c;a.src=b.url,"image/svg+xml"===b.set.type&&(c=a.style.width,a.style.width=a.offsetWidth+1+"px",a.offsetWidth+1&&(a.style.width=c))},s.getSet=function(a){var b,c,d,e=!1,f=a[s.ns].sets;for(b=0;b<f.length&&!e;b++)if(c=f[b],c.srcset&&s.matchesMedia(c.media)&&(d=s.supportsType(c.type))){"pending"===d&&(c=d),e=c;break}return e},s.parseSets=function(a,b,d){var e,f,g,h,i=b&&"PICTURE"===b.nodeName.toUpperCase(),j=a[s.ns];(j.src===c||d.src)&&(j.src=v.call(a,"src"),j.src?w.call(a,B,j.src):x.call(a,B)),(j.srcset===c||d.srcset||!s.supSrcset||a.srcset)&&(e=v.call(a,"srcset"),j.srcset=e,h=!0),j.sets=[],i&&(j.pic=!0,l(b,j.sets)),j.srcset?(f={srcset:j.srcset,sizes:v.call(a,"sizes")},j.sets.push(f),g=(q||j.src)&&G.test(j.srcset||""),g||!j.src||k(j.src,f)||f.has1x||(f.srcset+=", "+j.src,f.cands.push({url:j.src,d:1,set:f}))):j.src&&j.sets.push({srcset:j.src,sizes:null}),j.curCan=null,j.curSrc=c,j.supported=!(i||f&&!s.supSrcset||g),h&&s.supSrcset&&!j.supported&&(e?(w.call(a,C,e),a.srcset=""):x.call(a,C)),j.supported&&!j.srcset&&(!j.src&&a.src||a.src!==s.makeUrl(j.src))&&(null===j.src?a.removeAttribute("src"):a.src=j.src),j.parsed=!0},s.fillImg=function(a,b){var c,d=b.reselect||b.reevaluate;a[s.ns]||(a[s.ns]={}),c=a[s.ns],(d||c.evaled!==r)&&((!c.parsed||b.reevaluate)&&s.parseSets(a,a.parentNode,b),c.supported?c.evaled=r:h(a))},s.setupRun=function(){(!R||L||O!==a.devicePixelRatio)&&f()},s.supPicture?(aa=t,s.fillImg=t):!function(){var c,d=a.attachEvent?/d$|^c/:/d$|^c|^i/,e=function(){var a=b.readyState||"";f=setTimeout(e,"loading"===a?200:999),b.body&&(s.fillImgs(),c=c||d.test(a),c&&clearTimeout(f))},f=setTimeout(e,b.body?9:99),g=function(a,b){var c,d,e=function(){var f=new Date-d;b>f?c=setTimeout(e,b-f):(c=null,a())};return function(){d=new Date,c||(c=setTimeout(e,b))}},h=y.clientHeight,i=function(){L=Math.max(a.innerWidth||0,y.clientWidth)!==P.width||y.clientHeight!==h,h=y.clientHeight,L&&s.fillImgs()};Y(a,"resize",g(i,99)),Y(b,"readystatechange",e)}(),s.picturefill=aa,s.fillImgs=aa,s.teardownRun=t,aa._=s,a.picturefillCFG={pf:s,push:function(a){var b=a.shift();"function"==typeof s[b]?s[b].apply(s,a):(A[b]=a[0],R&&s.fillImgs({reselect:!0}))}};for(;I&&I.length;)a.picturefillCFG.push(I.shift());a.picturefill=aa,"object"==typeof module&&"object"==typeof module.exports?module.exports=aa:"function"==typeof define&&define.amd&&define("picturefill",function(){return aa}),s.supPicture||(z["image/webp"]=e("image/webp","data:image/webp;base64,UklGRkoAAABXRUJQVlA4WAoAAAAQAAAAAAAAAAAAQUxQSAwAAAABBxAR/Q9ERP8DAABWUDggGAAAADABAJ0BKgEAAQADADQlpAADcAD++/1QAA=="))}(window,document);
\ No newline at end of file
+!function(a){var b=navigator.userAgent;a.HTMLPictureElement&&/ecko/.test(b)&&b.match(/rv\:(\d+)/)&&RegExp.$1<45&&addEventListener("resize",function(){var b,c=document.createElement("source"),d=function(a){var b,d,e=a.parentNode;"PICTURE"===e.nodeName.toUpperCase()?(b=c.cloneNode(),e.insertBefore(b,e.firstElementChild),setTimeout(function(){e.removeChild(b)})):(!a._pfLastSize||a.offsetWidth>a._pfLastSize)&&(a._pfLastSize=a.offsetWidth,d=a.sizes,a.sizes+=",100vw",setTimeout(function(){a.sizes=d}))},e=function(){var a,b=document.querySelectorAll("picture > img, img[srcset][sizes]");for(a=0;a<b.length;a++)d(b[a])},f=function(){clearTimeout(b),b=setTimeout(e,99)},g=a.matchMedia&&matchMedia("(orientation: landscape)"),h=function(){f(),g&&g.addListener&&g.addListener(f)};return c.srcset="data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==",/^[c|i]|d$/.test(document.readyState||"")?h():document.addEventListener("DOMContentLoaded",h),f}())}(window),function(a,b,c){"use strict";function d(a){return" "===a||" "===a||"\n"===a||"\f"===a||"\r"===a}function e(b,c){var d=new a.Image;return d.onerror=function(){A[b]=!1,ba()},d.onload=function(){A[b]=1===d.width,ba()},d.src=c,"pending"}function f(){M=!1,P=a.devicePixelRatio,N={},O={},s.DPR=P||1,Q.width=Math.max(a.innerWidth||0,z.clientWidth),Q.height=Math.max(a.innerHeight||0,z.clientHeight),Q.vw=Q.width/100,Q.vh=Q.height/100,r=[Q.height,Q.width,P].join("-"),Q.em=s.getEmValue(),Q.rem=Q.em}function g(a,b,c,d){var e,f,g,h;return"saveData"===B.algorithm?a>2.7?h=c+1:(f=b-c,e=Math.pow(a-.6,1.5),g=f*e,d&&(g+=.1*e),h=a+g):h=c>1?Math.sqrt(a*b):a,h>c}function h(a){var b,c=s.getSet(a),d=!1;"pending"!==c&&(d=r,c&&(b=s.setRes(c),s.applySetCandidate(b,a))),a[s.ns].evaled=d}function i(a,b){return a.res-b.res}function j(a,b,c){var d;return!c&&b&&(c=a[s.ns].sets,c=c&&c[c.length-1]),d=k(b,c),d&&(b=s.makeUrl(b),a[s.ns].curSrc=b,a[s.ns].curCan=d,d.res||aa(d,d.set.sizes)),d}function k(a,b){var c,d,e;if(a&&b)for(e=s.parseSet(b),a=s.makeUrl(a),c=0;c<e.length;c++)if(a===s.makeUrl(e[c].url)){d=e[c];break}return d}function l(a,b){var c,d,e,f,g=a.getElementsByTagName("source");for(c=0,d=g.length;d>c;c++)e=g[c],e[s.ns]=!0,f=e.getAttribute("srcset"),f&&b.push({srcset:f,media:e.getAttribute("media"),type:e.getAttribute("type"),sizes:e.getAttribute("sizes")})}function m(a,b){function c(b){var c,d=b.exec(a.substring(m));return d?(c=d[0],m+=c.length,c):void 0}function e(){var a,c,d,e,f,i,j,k,l,m=!1,o={};for(e=0;e<h.length;e++)f=h[e],i=f[f.length-1],j=f.substring(0,f.length-1),k=parseInt(j,10),l=parseFloat(j),X.test(j)&&"w"===i?((a||c)&&(m=!0),0===k?m=!0:a=k):Y.test(j)&&"x"===i?((a||c||d)&&(m=!0),0>l?m=!0:c=l):X.test(j)&&"h"===i?((d||c)&&(m=!0),0===k?m=!0:d=k):m=!0;m||(o.url=g,a&&(o.w=a),c&&(o.d=c),d&&(o.h=d),d||c||a||(o.d=1),1===o.d&&(b.has1x=!0),o.set=b,n.push(o))}function f(){for(c(T),i="",j="in descriptor";;){if(k=a.charAt(m),"in descriptor"===j)if(d(k))i&&(h.push(i),i="",j="after descriptor");else{if(","===k)return m+=1,i&&h.push(i),void e();if("("===k)i+=k,j="in parens";else{if(""===k)return i&&h.push(i),void e();i+=k}}else if("in parens"===j)if(")"===k)i+=k,j="in descriptor";else{if(""===k)return h.push(i),void e();i+=k}else if("after descriptor"===j)if(d(k));else{if(""===k)return void e();j="in descriptor",m-=1}m+=1}}for(var g,h,i,j,k,l=a.length,m=0,n=[];;){if(c(U),m>=l)return n;g=c(V),h=[],","===g.slice(-1)?(g=g.replace(W,""),e()):f()}}function n(a){function b(a){function b(){f&&(g.push(f),f="")}function c(){g[0]&&(h.push(g),g=[])}for(var e,f="",g=[],h=[],i=0,j=0,k=!1;;){if(e=a.charAt(j),""===e)return b(),c(),h;if(k){if("*"===e&&"/"===a[j+1]){k=!1,j+=2,b();continue}j+=1}else{if(d(e)){if(a.charAt(j-1)&&d(a.charAt(j-1))||!f){j+=1;continue}if(0===i){b(),j+=1;continue}e=" "}else if("("===e)i+=1;else if(")"===e)i-=1;else{if(","===e){b(),c(),j+=1;continue}if("/"===e&&"*"===a.charAt(j+1)){k=!0,j+=2;continue}}f+=e,j+=1}}}function c(a){return k.test(a)&&parseFloat(a)>=0?!0:l.test(a)?!0:"0"===a||"-0"===a||"+0"===a?!0:!1}var e,f,g,h,i,j,k=/^(?:[+-]?[0-9]+|[0-9]*\.[0-9]+)(?:[eE][+-]?[0-9]+)?(?:ch|cm|em|ex|in|mm|pc|pt|px|rem|vh|vmin|vmax|vw)$/i,l=/^calc\((?:[0-9a-z \.\+\-\*\/\(\)]+)\)$/i;for(f=b(a),g=f.length,e=0;g>e;e++)if(h=f[e],i=h[h.length-1],c(i)){if(j=i,h.pop(),0===h.length)return j;if(h=h.join(" "),s.matchesMedia(h))return j}return"100vw"}b.createElement("picture");var o,p,q,r,s={},t=!1,u=function(){},v=b.createElement("img"),w=v.getAttribute,x=v.setAttribute,y=v.removeAttribute,z=b.documentElement,A={},B={algorithm:""},C="data-pfsrc",D=C+"set",E=navigator.userAgent,F=/rident/.test(E)||/ecko/.test(E)&&E.match(/rv\:(\d+)/)&&RegExp.$1>35,G="currentSrc",H=/\s+\+?\d+(e\d+)?w/,I=/(\([^)]+\))?\s*(.+)/,J=a.picturefillCFG,K="position:absolute;left:0;visibility:hidden;display:block;padding:0;border:none;font-size:1em;width:1em;overflow:hidden;clip:rect(0px, 0px, 0px, 0px)",L="font-size:100%!important;",M=!0,N={},O={},P=a.devicePixelRatio,Q={px:1,"in":96},R=b.createElement("a"),S=!1,T=/^[ \t\n\r\u000c]+/,U=/^[, \t\n\r\u000c]+/,V=/^[^ \t\n\r\u000c]+/,W=/[,]+$/,X=/^\d+$/,Y=/^-?(?:[0-9]+|[0-9]*\.[0-9]+)(?:[eE][+-]?[0-9]+)?$/,Z=function(a,b,c,d){a.addEventListener?a.addEventListener(b,c,d||!1):a.attachEvent&&a.attachEvent("on"+b,c)},$=function(a){var b={};return function(c){return c in b||(b[c]=a(c)),b[c]}},_=function(){var a=/^([\d\.]+)(em|vw|px)$/,b=function(){for(var a=arguments,b=0,c=a[0];++b in a;)c=c.replace(a[b],a[++b]);return c},c=$(function(a){return"return "+b((a||"").toLowerCase(),/\band\b/g,"&&",/,/g,"||",/min-([a-z-\s]+):/g,"e.$1>=",/max-([a-z-\s]+):/g,"e.$1<=",/calc([^)]+)/g,"($1)",/(\d+[\.]*[\d]*)([a-z]+)/g,"($1 * e.$2)",/^(?!(e.[a-z]|[0-9\.&=|><\+\-\*\(\)\/])).*/gi,"")+";"});return function(b,d){var e;if(!(b in N))if(N[b]=!1,d&&(e=b.match(a)))N[b]=e[1]*Q[e[2]];else try{N[b]=new Function("e",c(b))(Q)}catch(f){}return N[b]}}(),aa=function(a,b){return a.w?(a.cWidth=s.calcListLength(b||"100vw"),a.res=a.w/a.cWidth):a.res=a.d,a},ba=function(a){if(t){var c,d,e,f=a||{};if(f.elements&&1===f.elements.nodeType&&("IMG"===f.elements.nodeName.toUpperCase()?f.elements=[f.elements]:(f.context=f.elements,f.elements=null)),c=f.elements||s.qsa(f.context||b,f.reevaluate||f.reselect?s.sel:s.selShort),e=c.length){for(s.setupRun(f),S=!0,d=0;e>d;d++)s.fillImg(c[d],f);s.teardownRun(f)}}};o=a.console&&console.warn?function(a){console.warn(a)}:u,G in v||(G="src"),A["image/jpeg"]=!0,A["image/gif"]=!0,A["image/png"]=!0,A["image/svg+xml"]=b.implementation.hasFeature("http://www.w3.org/TR/SVG11/feature#Image","1.1"),s.ns=("pf"+(new Date).getTime()).substr(0,9),s.supSrcset="srcset"in v,s.supSizes="sizes"in v,s.supPicture=!!a.HTMLPictureElement,s.supSrcset&&s.supPicture&&!s.supSizes&&!function(a){v.srcset="data:,a",a.src="data:,a",s.supSrcset=v.complete===a.complete,s.supPicture=s.supSrcset&&s.supPicture}(b.createElement("img")),s.supSrcset&&!s.supSizes?!function(){var a="data:image/gif;base64,R0lGODlhAgABAPAAAP///wAAACH5BAAAAAAALAAAAAACAAEAAAICBAoAOw==",c="data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==",d=b.createElement("img"),e=function(){var a=d.width;2===a&&(s.supSizes=!0),q=s.supSrcset&&!s.supSizes,t=!0,setTimeout(ba)};d.onload=e,d.onerror=e,d.setAttribute("sizes","9px"),d.srcset=c+" 1w,"+a+" 9w",d.src=c}():t=!0,s.selShort="picture>img,img[srcset]",s.sel=s.selShort,s.cfg=B,s.DPR=P||1,s.u=Q,s.types=A,s.setSize=u,s.makeUrl=$(function(a){return R.href=a,R.href}),s.qsa=function(a,b){return"querySelector"in a?a.querySelectorAll(b):[]},s.matchesMedia=function(){return a.matchMedia&&(matchMedia("(min-width: 0.1em)")||{}).matches?s.matchesMedia=function(a){return!a||matchMedia(a).matches}:s.matchesMedia=s.mMQ,s.matchesMedia.apply(this,arguments)},s.mMQ=function(a){return a?_(a):!0},s.calcLength=function(a){var b=_(a,!0)||!1;return 0>b&&(b=!1),b},s.supportsType=function(a){return a?A[a]:!0},s.parseSize=$(function(a){var b=(a||"").match(I);return{media:b&&b[1],length:b&&b[2]}}),s.parseSet=function(a){return a.cands||(a.cands=m(a.srcset,a)),a.cands},s.getEmValue=function(){var a;if(!p&&(a=b.body)){var c=b.createElement("div"),d=z.style.cssText,e=a.style.cssText;c.style.cssText=K,z.style.cssText=L,a.style.cssText=L,a.appendChild(c),p=c.offsetWidth,a.removeChild(c),p=parseFloat(p,10),z.style.cssText=d,a.style.cssText=e}return p||16},s.calcListLength=function(a){if(!(a in O)||B.uT){var b=s.calcLength(n(a));O[a]=b?b:Q.width}return O[a]},s.setRes=function(a){var b;if(a){b=s.parseSet(a);for(var c=0,d=b.length;d>c;c++)aa(b[c],a.sizes)}return b},s.setRes.res=aa,s.applySetCandidate=function(a,b){if(a.length){var c,d,e,f,h,k,l,m,n,o=b[s.ns],p=s.DPR;if(k=o.curSrc||b[G],l=o.curCan||j(b,k,a[0].set),l&&l.set===a[0].set&&(n=F&&!b.complete&&l.res-.1>p,n||(l.cached=!0,l.res>=p&&(h=l))),!h)for(a.sort(i),f=a.length,h=a[f-1],d=0;f>d;d++)if(c=a[d],c.res>=p){e=d-1,h=a[e]&&(n||k!==s.makeUrl(c.url))&&g(a[e].res,c.res,p,a[e].cached)?a[e]:c;break}h&&(m=s.makeUrl(h.url),o.curSrc=m,o.curCan=h,m!==k&&s.setSrc(b,h),s.setSize(b))}},s.setSrc=function(a,b){var c;a.src=b.url,"image/svg+xml"===b.set.type&&(c=a.style.width,a.style.width=a.offsetWidth+1+"px",a.offsetWidth+1&&(a.style.width=c))},s.getSet=function(a){var b,c,d,e=!1,f=a[s.ns].sets;for(b=0;b<f.length&&!e;b++)if(c=f[b],c.srcset&&s.matchesMedia(c.media)&&(d=s.supportsType(c.type))){"pending"===d&&(c=d),e=c;break}return e},s.parseSets=function(a,b,d){var e,f,g,h,i=b&&"PICTURE"===b.nodeName.toUpperCase(),j=a[s.ns];(j.src===c||d.src)&&(j.src=w.call(a,"src"),j.src?x.call(a,C,j.src):y.call(a,C)),(j.srcset===c||d.srcset||!s.supSrcset||a.srcset)&&(e=w.call(a,"srcset"),j.srcset=e,h=!0),j.sets=[],i&&(j.pic=!0,l(b,j.sets)),j.srcset?(f={srcset:j.srcset,sizes:w.call(a,"sizes")},j.sets.push(f),g=(q||j.src)&&H.test(j.srcset||""),g||!j.src||k(j.src,f)||f.has1x||(f.srcset+=", "+j.src,f.cands.push({url:j.src,d:1,set:f}))):j.src&&j.sets.push({srcset:j.src,sizes:null}),j.curCan=null,j.curSrc=c,j.supported=!(i||f&&!s.supSrcset||g&&!s.supSizes),h&&s.supSrcset&&!j.supported&&(e?(x.call(a,D,e),a.srcset=""):y.call(a,D)),j.supported&&!j.srcset&&(!j.src&&a.src||a.src!==s.makeUrl(j.src))&&(null===j.src?a.removeAttribute("src"):a.src=j.src),j.parsed=!0},s.fillImg=function(a,b){var c,d=b.reselect||b.reevaluate;a[s.ns]||(a[s.ns]={}),c=a[s.ns],(d||c.evaled!==r)&&((!c.parsed||b.reevaluate)&&s.parseSets(a,a.parentNode,b),c.supported?c.evaled=r:h(a))},s.setupRun=function(){(!S||M||P!==a.devicePixelRatio)&&f()},s.supPicture?(ba=u,s.fillImg=u):!function(){var c,d=a.attachEvent?/d$|^c/:/d$|^c|^i/,e=function(){var a=b.readyState||"";f=setTimeout(e,"loading"===a?200:999),b.body&&(s.fillImgs(),c=c||d.test(a),c&&clearTimeout(f))},f=setTimeout(e,b.body?9:99),g=function(a,b){var c,d,e=function(){var f=new Date-d;b>f?c=setTimeout(e,b-f):(c=null,a())};return function(){d=new Date,c||(c=setTimeout(e,b))}},h=z.clientHeight,i=function(){M=Math.max(a.innerWidth||0,z.clientWidth)!==Q.width||z.clientHeight!==h,h=z.clientHeight,M&&s.fillImgs()};Z(a,"resize",g(i,99)),Z(b,"readystatechange",e)}(),s.picturefill=ba,s.fillImgs=ba,s.teardownRun=u,ba._=s,a.picturefillCFG={pf:s,push:function(a){var b=a.shift();"function"==typeof s[b]?s[b].apply(s,a):(B[b]=a[0],S&&s.fillImgs({reselect:!0}))}};for(;J&&J.length;)a.picturefillCFG.push(J.shift());a.picturefill=ba,"object"==typeof module&&"object"==typeof module.exports?module.exports=ba:"function"==typeof define&&define.amd&&define("picturefill",function(){return ba}),s.supPicture||(A["image/webp"]=e("image/webp","data:image/webp;base64,UklGRkoAAABXRUJQVlA4WAoAAAAQAAAAAAAAAAAAQUxQSAwAAAABBxAR/Q9ERP8DAABWUDggGAAAADABAJ0BKgEAAQADADQlpAADcAD++/1QAA=="))}(window,document);
\ No newline at end of file
diff --git a/web/core/assets/vendor/popperjs/popper.min.js b/web/core/assets/vendor/popperjs/popper.min.js
index 36c2aeb998..8a17212f7d 100644
--- a/web/core/assets/vendor/popperjs/popper.min.js
+++ b/web/core/assets/vendor/popperjs/popper.min.js
@@ -1,5 +1,5 @@
/*
Copyright (C) Federico Zivolo 2019
Distributed under the MIT License (license terms are at http://opensource.org/licenses/MIT).
- */(function(e,t){'object'==typeof exports&&'undefined'!=typeof module?module.exports=t():'function'==typeof define&&define.amd?define(t):e.Popper=t()})(this,function(){'use strict';function e(e){return e&&'[object Function]'==={}.toString.call(e)}function t(e,t){if(1!==e.nodeType)return[];var o=e.ownerDocument.defaultView,n=o.getComputedStyle(e,null);return t?n[t]:n}function o(e){return'HTML'===e.nodeName?e:e.parentNode||e.host}function n(e){if(!e)return document.body;switch(e.nodeName){case'HTML':case'BODY':return e.ownerDocument.body;case'#document':return e.body;}var i=t(e),r=i.overflow,p=i.overflowX,s=i.overflowY;return /(auto|scroll|overlay)/.test(r+s+p)?e:n(o(e))}function r(e){return 11===e?pe:10===e?se:pe||se}function p(e){if(!e)return document.documentElement;for(var o=r(10)?document.body:null,n=e.offsetParent||null;n===o&&e.nextElementSibling;)n=(e=e.nextElementSibling).offsetParent;var i=n&&n.nodeName;return i&&'BODY'!==i&&'HTML'!==i?-1!==['TH','TD','TABLE'].indexOf(n.nodeName)&&'static'===t(n,'position')?p(n):n:e?e.ownerDocument.documentElement:document.documentElement}function s(e){var t=e.nodeName;return'BODY'!==t&&('HTML'===t||p(e.firstElementChild)===e)}function d(e){return null===e.parentNode?e:d(e.parentNode)}function a(e,t){if(!e||!e.nodeType||!t||!t.nodeType)return document.documentElement;var o=e.compareDocumentPosition(t)&Node.DOCUMENT_POSITION_FOLLOWING,n=o?e:t,i=o?t:e,r=document.createRange();r.setStart(n,0),r.setEnd(i,0);var l=r.commonAncestorContainer;if(e!==l&&t!==l||n.contains(i))return s(l)?l:p(l);var f=d(e);return f.host?a(f.host,t):a(e,d(t).host)}function l(e){var t=1<arguments.length&&void 0!==arguments[1]?arguments[1]:'top',o='top'===t?'scrollTop':'scrollLeft',n=e.nodeName;if('BODY'===n||'HTML'===n){var i=e.ownerDocument.documentElement,r=e.ownerDocument.scrollingElement||i;return r[o]}return e[o]}function f(e,t){var o=2<arguments.length&&void 0!==arguments[2]&&arguments[2],n=l(t,'top'),i=l(t,'left'),r=o?-1:1;return e.top+=n*r,e.bottom+=n*r,e.left+=i*r,e.right+=i*r,e}function m(e,t){var o='x'===t?'Left':'Top',n='Left'==o?'Right':'Bottom';return parseFloat(e['border'+o+'Width'],10)+parseFloat(e['border'+n+'Width'],10)}function h(e,t,o,n){return ee(t['offset'+e],t['scroll'+e],o['client'+e],o['offset'+e],o['scroll'+e],r(10)?parseInt(o['offset'+e])+parseInt(n['margin'+('Height'===e?'Top':'Left')])+parseInt(n['margin'+('Height'===e?'Bottom':'Right')]):0)}function c(e){var t=e.body,o=e.documentElement,n=r(10)&&getComputedStyle(o);return{height:h('Height',t,o,n),width:h('Width',t,o,n)}}function g(e){return fe({},e,{right:e.left+e.width,bottom:e.top+e.height})}function u(e){var o={};try{if(r(10)){o=e.getBoundingClientRect();var n=l(e,'top'),i=l(e,'left');o.top+=n,o.left+=i,o.bottom+=n,o.right+=i}else o=e.getBoundingClientRect()}catch(t){}var p={left:o.left,top:o.top,width:o.right-o.left,height:o.bottom-o.top},s='HTML'===e.nodeName?c(e.ownerDocument):{},d=s.width||e.clientWidth||p.right-p.left,a=s.height||e.clientHeight||p.bottom-p.top,f=e.offsetWidth-d,h=e.offsetHeight-a;if(f||h){var u=t(e);f-=m(u,'x'),h-=m(u,'y'),p.width-=f,p.height-=h}return g(p)}function b(e,o){var i=2<arguments.length&&void 0!==arguments[2]&&arguments[2],p=r(10),s='HTML'===o.nodeName,d=u(e),a=u(o),l=n(e),m=t(o),h=parseFloat(m.borderTopWidth,10),c=parseFloat(m.borderLeftWidth,10);i&&s&&(a.top=ee(a.top,0),a.left=ee(a.left,0));var b=g({top:d.top-a.top-h,left:d.left-a.left-c,width:d.width,height:d.height});if(b.marginTop=0,b.marginLeft=0,!p&&s){var w=parseFloat(m.marginTop,10),y=parseFloat(m.marginLeft,10);b.top-=h-w,b.bottom-=h-w,b.left-=c-y,b.right-=c-y,b.marginTop=w,b.marginLeft=y}return(p&&!i?o.contains(l):o===l&&'BODY'!==l.nodeName)&&(b=f(b,o)),b}function w(e){var t=1<arguments.length&&void 0!==arguments[1]&&arguments[1],o=e.ownerDocument.documentElement,n=b(e,o),i=ee(o.clientWidth,window.innerWidth||0),r=ee(o.clientHeight,window.innerHeight||0),p=t?0:l(o),s=t?0:l(o,'left'),d={top:p-n.top+n.marginTop,left:s-n.left+n.marginLeft,width:i,height:r};return g(d)}function y(e){var n=e.nodeName;if('BODY'===n||'HTML'===n)return!1;if('fixed'===t(e,'position'))return!0;var i=o(e);return!!i&&y(i)}function E(e){if(!e||!e.parentElement||r())return document.documentElement;for(var o=e.parentElement;o&&'none'===t(o,'transform');)o=o.parentElement;return o||document.documentElement}function v(e,t,i,r){var p=4<arguments.length&&void 0!==arguments[4]&&arguments[4],s={top:0,left:0},d=p?E(e):a(e,t);if('viewport'===r)s=w(d,p);else{var l;'scrollParent'===r?(l=n(o(t)),'BODY'===l.nodeName&&(l=e.ownerDocument.documentElement)):'window'===r?l=e.ownerDocument.documentElement:l=r;var f=b(l,d,p);if('HTML'===l.nodeName&&!y(d)){var m=c(e.ownerDocument),h=m.height,g=m.width;s.top+=f.top-f.marginTop,s.bottom=h+f.top,s.left+=f.left-f.marginLeft,s.right=g+f.left}else s=f}i=i||0;var u='number'==typeof i;return s.left+=u?i:i.left||0,s.top+=u?i:i.top||0,s.right-=u?i:i.right||0,s.bottom-=u?i:i.bottom||0,s}function x(e){var t=e.width,o=e.height;return t*o}function O(e,t,o,n,i){var r=5<arguments.length&&void 0!==arguments[5]?arguments[5]:0;if(-1===e.indexOf('auto'))return e;var p=v(o,n,r,i),s={top:{width:p.width,height:t.top-p.top},right:{width:p.right-t.right,height:p.height},bottom:{width:p.width,height:p.bottom-t.bottom},left:{width:t.left-p.left,height:p.height}},d=Object.keys(s).map(function(e){return fe({key:e},s[e],{area:x(s[e])})}).sort(function(e,t){return t.area-e.area}),a=d.filter(function(e){var t=e.width,n=e.height;return t>=o.clientWidth&&n>=o.clientHeight}),l=0<a.length?a[0].key:d[0].key,f=e.split('-')[1];return l+(f?'-'+f:'')}function L(e,t,o){var n=3<arguments.length&&void 0!==arguments[3]?arguments[3]:null,i=n?E(t):a(t,o);return b(o,i,n)}function S(e){var t=e.ownerDocument.defaultView,o=t.getComputedStyle(e),n=parseFloat(o.marginTop||0)+parseFloat(o.marginBottom||0),i=parseFloat(o.marginLeft||0)+parseFloat(o.marginRight||0),r={width:e.offsetWidth+i,height:e.offsetHeight+n};return r}function T(e){var t={left:'right',right:'left',bottom:'top',top:'bottom'};return e.replace(/left|right|bottom|top/g,function(e){return t[e]})}function C(e,t,o){o=o.split('-')[0];var n=S(e),i={width:n.width,height:n.height},r=-1!==['right','left'].indexOf(o),p=r?'top':'left',s=r?'left':'top',d=r?'height':'width',a=r?'width':'height';return i[p]=t[p]+t[d]/2-n[d]/2,i[s]=o===s?t[s]-n[a]:t[T(s)],i}function D(e,t){return Array.prototype.find?e.find(t):e.filter(t)[0]}function N(e,t,o){if(Array.prototype.findIndex)return e.findIndex(function(e){return e[t]===o});var n=D(e,function(e){return e[t]===o});return e.indexOf(n)}function P(t,o,n){var i=void 0===n?t:t.slice(0,N(t,'name',n));return i.forEach(function(t){t['function']&&console.warn('`modifier.function` is deprecated, use `modifier.fn`!');var n=t['function']||t.fn;t.enabled&&e(n)&&(o.offsets.popper=g(o.offsets.popper),o.offsets.reference=g(o.offsets.reference),o=n(o,t))}),o}function k(){if(!this.state.isDestroyed){var e={instance:this,styles:{},arrowStyles:{},attributes:{},flipped:!1,offsets:{}};e.offsets.reference=L(this.state,this.popper,this.reference,this.options.positionFixed),e.placement=O(this.options.placement,e.offsets.reference,this.popper,this.reference,this.options.modifiers.flip.boundariesElement,this.options.modifiers.flip.padding),e.originalPlacement=e.placement,e.positionFixed=this.options.positionFixed,e.offsets.popper=C(this.popper,e.offsets.reference,e.placement),e.offsets.popper.position=this.options.positionFixed?'fixed':'absolute',e=P(this.modifiers,e),this.state.isCreated?this.options.onUpdate(e):(this.state.isCreated=!0,this.options.onCreate(e))}}function W(e,t){return e.some(function(e){var o=e.name,n=e.enabled;return n&&o===t})}function B(e){for(var t=[!1,'ms','Webkit','Moz','O'],o=e.charAt(0).toUpperCase()+e.slice(1),n=0;n<t.length;n++){var i=t[n],r=i?''+i+o:e;if('undefined'!=typeof document.body.style[r])return r}return null}function H(){return this.state.isDestroyed=!0,W(this.modifiers,'applyStyle')&&(this.popper.removeAttribute('x-placement'),this.popper.style.position='',this.popper.style.top='',this.popper.style.left='',this.popper.style.right='',this.popper.style.bottom='',this.popper.style.willChange='',this.popper.style[B('transform')]=''),this.disableEventListeners(),this.options.removeOnDestroy&&this.popper.parentNode.removeChild(this.popper),this}function A(e){var t=e.ownerDocument;return t?t.defaultView:window}function M(e,t,o,i){var r='BODY'===e.nodeName,p=r?e.ownerDocument.defaultView:e;p.addEventListener(t,o,{passive:!0}),r||M(n(p.parentNode),t,o,i),i.push(p)}function F(e,t,o,i){o.updateBound=i,A(e).addEventListener('resize',o.updateBound,{passive:!0});var r=n(e);return M(r,'scroll',o.updateBound,o.scrollParents),o.scrollElement=r,o.eventsEnabled=!0,o}function I(){this.state.eventsEnabled||(this.state=F(this.reference,this.options,this.state,this.scheduleUpdate))}function R(e,t){return A(e).removeEventListener('resize',t.updateBound),t.scrollParents.forEach(function(e){e.removeEventListener('scroll',t.updateBound)}),t.updateBound=null,t.scrollParents=[],t.scrollElement=null,t.eventsEnabled=!1,t}function U(){this.state.eventsEnabled&&(cancelAnimationFrame(this.scheduleUpdate),this.state=R(this.reference,this.state))}function Y(e){return''!==e&&!isNaN(parseFloat(e))&&isFinite(e)}function V(e,t){Object.keys(t).forEach(function(o){var n='';-1!==['width','height','top','right','bottom','left'].indexOf(o)&&Y(t[o])&&(n='px'),e.style[o]=t[o]+n})}function j(e,t){Object.keys(t).forEach(function(o){var n=t[o];!1===n?e.removeAttribute(o):e.setAttribute(o,t[o])})}function q(e,t){var o=e.offsets,n=o.popper,i=o.reference,r=$,p=function(e){return e},s=r(i.width),d=r(n.width),a=-1!==['left','right'].indexOf(e.placement),l=-1!==e.placement.indexOf('-'),f=t?a||l||s%2==d%2?r:Z:p,m=t?r:p;return{left:f(1==s%2&&1==d%2&&!l&&t?n.left-1:n.left),top:m(n.top),bottom:m(n.bottom),right:f(n.right)}}function K(e,t,o){var n=D(e,function(e){var o=e.name;return o===t}),i=!!n&&e.some(function(e){return e.name===o&&e.enabled&&e.order<n.order});if(!i){var r='`'+t+'`';console.warn('`'+o+'`'+' modifier is required by '+r+' modifier in order to work, be sure to include it before '+r+'!')}return i}function z(e){return'end'===e?'start':'start'===e?'end':e}function G(e){var t=1<arguments.length&&void 0!==arguments[1]&&arguments[1],o=ce.indexOf(e),n=ce.slice(o+1).concat(ce.slice(0,o));return t?n.reverse():n}function _(e,t,o,n){var i=e.match(/((?:\-|\+)?\d*\.?\d*)(.*)/),r=+i[1],p=i[2];if(!r)return e;if(0===p.indexOf('%')){var s;switch(p){case'%p':s=o;break;case'%':case'%r':default:s=n;}var d=g(s);return d[t]/100*r}if('vh'===p||'vw'===p){var a;return a='vh'===p?ee(document.documentElement.clientHeight,window.innerHeight||0):ee(document.documentElement.clientWidth,window.innerWidth||0),a/100*r}return r}function X(e,t,o,n){var i=[0,0],r=-1!==['right','left'].indexOf(n),p=e.split(/(\+|\-)/).map(function(e){return e.trim()}),s=p.indexOf(D(p,function(e){return-1!==e.search(/,|\s/)}));p[s]&&-1===p[s].indexOf(',')&&console.warn('Offsets separated by white space(s) are deprecated, use a comma (,) instead.');var d=/\s*,\s*|\s+/,a=-1===s?[p]:[p.slice(0,s).concat([p[s].split(d)[0]]),[p[s].split(d)[1]].concat(p.slice(s+1))];return a=a.map(function(e,n){var i=(1===n?!r:r)?'height':'width',p=!1;return e.reduce(function(e,t){return''===e[e.length-1]&&-1!==['+','-'].indexOf(t)?(e[e.length-1]=t,p=!0,e):p?(e[e.length-1]+=t,p=!1,e):e.concat(t)},[]).map(function(e){return _(e,i,t,o)})}),a.forEach(function(e,t){e.forEach(function(o,n){Y(o)&&(i[t]+=o*('-'===e[n-1]?-1:1))})}),i}function J(e,t){var o,n=t.offset,i=e.placement,r=e.offsets,p=r.popper,s=r.reference,d=i.split('-')[0];return o=Y(+n)?[+n,0]:X(n,p,s,d),'left'===d?(p.top+=o[0],p.left-=o[1]):'right'===d?(p.top+=o[0],p.left+=o[1]):'top'===d?(p.left+=o[0],p.top-=o[1]):'bottom'===d&&(p.left+=o[0],p.top+=o[1]),e.popper=p,e}for(var Q=Math.min,Z=Math.floor,$=Math.round,ee=Math.max,te='undefined'!=typeof window&&'undefined'!=typeof document,oe=['Edge','Trident','Firefox'],ne=0,ie=0;ie<oe.length;ie+=1)if(te&&0<=navigator.userAgent.indexOf(oe[ie])){ne=1;break}var i=te&&window.Promise,re=i?function(e){var t=!1;return function(){t||(t=!0,window.Promise.resolve().then(function(){t=!1,e()}))}}:function(e){var t=!1;return function(){t||(t=!0,setTimeout(function(){t=!1,e()},ne))}},pe=te&&!!(window.MSInputMethodContext&&document.documentMode),se=te&&/MSIE 10/.test(navigator.userAgent),de=function(e,t){if(!(e instanceof t))throw new TypeError('Cannot call a class as a function')},ae=function(){function e(e,t){for(var o,n=0;n<t.length;n++)o=t[n],o.enumerable=o.enumerable||!1,o.configurable=!0,'value'in o&&(o.writable=!0),Object.defineProperty(e,o.key,o)}return function(t,o,n){return o&&e(t.prototype,o),n&&e(t,n),t}}(),le=function(e,t,o){return t in e?Object.defineProperty(e,t,{value:o,enumerable:!0,configurable:!0,writable:!0}):e[t]=o,e},fe=Object.assign||function(e){for(var t,o=1;o<arguments.length;o++)for(var n in t=arguments[o],t)Object.prototype.hasOwnProperty.call(t,n)&&(e[n]=t[n]);return e},me=te&&/Firefox/i.test(navigator.userAgent),he=['auto-start','auto','auto-end','top-start','top','top-end','right-start','right','right-end','bottom-end','bottom','bottom-start','left-end','left','left-start'],ce=he.slice(3),ge={FLIP:'flip',CLOCKWISE:'clockwise',COUNTERCLOCKWISE:'counterclockwise'},ue=function(){function t(o,n){var i=this,r=2<arguments.length&&void 0!==arguments[2]?arguments[2]:{};de(this,t),this.scheduleUpdate=function(){return requestAnimationFrame(i.update)},this.update=re(this.update.bind(this)),this.options=fe({},t.Defaults,r),this.state={isDestroyed:!1,isCreated:!1,scrollParents:[]},this.reference=o&&o.jquery?o[0]:o,this.popper=n&&n.jquery?n[0]:n,this.options.modifiers={},Object.keys(fe({},t.Defaults.modifiers,r.modifiers)).forEach(function(e){i.options.modifiers[e]=fe({},t.Defaults.modifiers[e]||{},r.modifiers?r.modifiers[e]:{})}),this.modifiers=Object.keys(this.options.modifiers).map(function(e){return fe({name:e},i.options.modifiers[e])}).sort(function(e,t){return e.order-t.order}),this.modifiers.forEach(function(t){t.enabled&&e(t.onLoad)&&t.onLoad(i.reference,i.popper,i.options,t,i.state)}),this.update();var p=this.options.eventsEnabled;p&&this.enableEventListeners(),this.state.eventsEnabled=p}return ae(t,[{key:'update',value:function(){return k.call(this)}},{key:'destroy',value:function(){return H.call(this)}},{key:'enableEventListeners',value:function(){return I.call(this)}},{key:'disableEventListeners',value:function(){return U.call(this)}}]),t}();return ue.Utils=('undefined'==typeof window?global:window).PopperUtils,ue.placements=he,ue.Defaults={placement:'bottom',positionFixed:!1,eventsEnabled:!0,removeOnDestroy:!1,onCreate:function(){},onUpdate:function(){},modifiers:{shift:{order:100,enabled:!0,fn:function(e){var t=e.placement,o=t.split('-')[0],n=t.split('-')[1];if(n){var i=e.offsets,r=i.reference,p=i.popper,s=-1!==['bottom','top'].indexOf(o),d=s?'left':'top',a=s?'width':'height',l={start:le({},d,r[d]),end:le({},d,r[d]+r[a]-p[a])};e.offsets.popper=fe({},p,l[n])}return e}},offset:{order:200,enabled:!0,fn:J,offset:0},preventOverflow:{order:300,enabled:!0,fn:function(e,t){var o=t.boundariesElement||p(e.instance.popper);e.instance.reference===o&&(o=p(o));var n=B('transform'),i=e.instance.popper.style,r=i.top,s=i.left,d=i[n];i.top='',i.left='',i[n]='';var a=v(e.instance.popper,e.instance.reference,t.padding,o,e.positionFixed);i.top=r,i.left=s,i[n]=d,t.boundaries=a;var l=t.priority,f=e.offsets.popper,m={primary:function(e){var o=f[e];return f[e]<a[e]&&!t.escapeWithReference&&(o=ee(f[e],a[e])),le({},e,o)},secondary:function(e){var o='right'===e?'left':'top',n=f[o];return f[e]>a[e]&&!t.escapeWithReference&&(n=Q(f[o],a[e]-('right'===e?f.width:f.height))),le({},o,n)}};return l.forEach(function(e){var t=-1===['left','top'].indexOf(e)?'secondary':'primary';f=fe({},f,m[t](e))}),e.offsets.popper=f,e},priority:['left','right','top','bottom'],padding:5,boundariesElement:'scrollParent'},keepTogether:{order:400,enabled:!0,fn:function(e){var t=e.offsets,o=t.popper,n=t.reference,i=e.placement.split('-')[0],r=Z,p=-1!==['top','bottom'].indexOf(i),s=p?'right':'bottom',d=p?'left':'top',a=p?'width':'height';return o[s]<r(n[d])&&(e.offsets.popper[d]=r(n[d])-o[a]),o[d]>r(n[s])&&(e.offsets.popper[d]=r(n[s])),e}},arrow:{order:500,enabled:!0,fn:function(e,o){var n;if(!K(e.instance.modifiers,'arrow','keepTogether'))return e;var i=o.element;if('string'==typeof i){if(i=e.instance.popper.querySelector(i),!i)return e;}else if(!e.instance.popper.contains(i))return console.warn('WARNING: `arrow.element` must be child of its popper element!'),e;var r=e.placement.split('-')[0],p=e.offsets,s=p.popper,d=p.reference,a=-1!==['left','right'].indexOf(r),l=a?'height':'width',f=a?'Top':'Left',m=f.toLowerCase(),h=a?'left':'top',c=a?'bottom':'right',u=S(i)[l];d[c]-u<s[m]&&(e.offsets.popper[m]-=s[m]-(d[c]-u)),d[m]+u>s[c]&&(e.offsets.popper[m]+=d[m]+u-s[c]),e.offsets.popper=g(e.offsets.popper);var b=d[m]+d[l]/2-u/2,w=t(e.instance.popper),y=parseFloat(w['margin'+f],10),E=parseFloat(w['border'+f+'Width'],10),v=b-e.offsets.popper[m]-y-E;return v=ee(Q(s[l]-u,v),0),e.arrowElement=i,e.offsets.arrow=(n={},le(n,m,$(v)),le(n,h,''),n),e},element:'[x-arrow]'},flip:{order:600,enabled:!0,fn:function(e,t){if(W(e.instance.modifiers,'inner'))return e;if(e.flipped&&e.placement===e.originalPlacement)return e;var o=v(e.instance.popper,e.instance.reference,t.padding,t.boundariesElement,e.positionFixed),n=e.placement.split('-')[0],i=T(n),r=e.placement.split('-')[1]||'',p=[];switch(t.behavior){case ge.FLIP:p=[n,i];break;case ge.CLOCKWISE:p=G(n);break;case ge.COUNTERCLOCKWISE:p=G(n,!0);break;default:p=t.behavior;}return p.forEach(function(s,d){if(n!==s||p.length===d+1)return e;n=e.placement.split('-')[0],i=T(n);var a=e.offsets.popper,l=e.offsets.reference,f=Z,m='left'===n&&f(a.right)>f(l.left)||'right'===n&&f(a.left)<f(l.right)||'top'===n&&f(a.bottom)>f(l.top)||'bottom'===n&&f(a.top)<f(l.bottom),h=f(a.left)<f(o.left),c=f(a.right)>f(o.right),g=f(a.top)<f(o.top),u=f(a.bottom)>f(o.bottom),b='left'===n&&h||'right'===n&&c||'top'===n&&g||'bottom'===n&&u,w=-1!==['top','bottom'].indexOf(n),y=!!t.flipVariations&&(w&&'start'===r&&h||w&&'end'===r&&c||!w&&'start'===r&&g||!w&&'end'===r&&u),E=!!t.flipVariationsByContent&&(w&&'start'===r&&c||w&&'end'===r&&h||!w&&'start'===r&&u||!w&&'end'===r&&g),v=y||E;(m||b||v)&&(e.flipped=!0,(m||b)&&(n=p[d+1]),v&&(r=z(r)),e.placement=n+(r?'-'+r:''),e.offsets.popper=fe({},e.offsets.popper,C(e.instance.popper,e.offsets.reference,e.placement)),e=P(e.instance.modifiers,e,'flip'))}),e},behavior:'flip',padding:5,boundariesElement:'viewport',flipVariations:!1,flipVariationsByContent:!1},inner:{order:700,enabled:!1,fn:function(e){var t=e.placement,o=t.split('-')[0],n=e.offsets,i=n.popper,r=n.reference,p=-1!==['left','right'].indexOf(o),s=-1===['top','left'].indexOf(o);return i[p?'left':'top']=r[o]-(s?i[p?'width':'height']:0),e.placement=T(t),e.offsets.popper=g(i),e}},hide:{order:800,enabled:!0,fn:function(e){if(!K(e.instance.modifiers,'hide','preventOverflow'))return e;var t=e.offsets.reference,o=D(e.instance.modifiers,function(e){return'preventOverflow'===e.name}).boundaries;if(t.bottom<o.top||t.left>o.right||t.top>o.bottom||t.right<o.left){if(!0===e.hide)return e;e.hide=!0,e.attributes['x-out-of-boundaries']=''}else{if(!1===e.hide)return e;e.hide=!1,e.attributes['x-out-of-boundaries']=!1}return e}},computeStyle:{order:850,enabled:!0,fn:function(e,t){var o=t.x,n=t.y,i=e.offsets.popper,r=D(e.instance.modifiers,function(e){return'applyStyle'===e.name}).gpuAcceleration;void 0!==r&&console.warn('WARNING: `gpuAcceleration` option moved to `computeStyle` modifier and will not be supported in future versions of Popper.js!');var s,d,a=void 0===r?t.gpuAcceleration:r,l=p(e.instance.popper),f=u(l),m={position:i.position},h=q(e,2>window.devicePixelRatio||!me),c='bottom'===o?'top':'bottom',g='right'===n?'left':'right',b=B('transform');if(d='bottom'==c?'HTML'===l.nodeName?-l.clientHeight+h.bottom:-f.height+h.bottom:h.top,s='right'==g?'HTML'===l.nodeName?-l.clientWidth+h.right:-f.width+h.right:h.left,a&&b)m[b]='translate3d('+s+'px, '+d+'px, 0)',m[c]=0,m[g]=0,m.willChange='transform';else{var w='bottom'==c?-1:1,y='right'==g?-1:1;m[c]=d*w,m[g]=s*y,m.willChange=c+', '+g}var E={"x-placement":e.placement};return e.attributes=fe({},E,e.attributes),e.styles=fe({},m,e.styles),e.arrowStyles=fe({},e.offsets.arrow,e.arrowStyles),e},gpuAcceleration:!0,x:'bottom',y:'right'},applyStyle:{order:900,enabled:!0,fn:function(e){return V(e.instance.popper,e.styles),j(e.instance.popper,e.attributes),e.arrowElement&&Object.keys(e.arrowStyles).length&&V(e.arrowElement,e.arrowStyles),e},onLoad:function(e,t,o,n,i){var r=L(i,t,e,o.positionFixed),p=O(o.placement,r,t,e,o.modifiers.flip.boundariesElement,o.modifiers.flip.padding);return t.setAttribute('x-placement',p),V(t,{position:o.positionFixed?'fixed':'absolute'}),o},gpuAcceleration:void 0}}},ue});
+ */(function(e,t){'object'==typeof exports&&'undefined'!=typeof module?module.exports=t():'function'==typeof define&&define.amd?define(t):e.Popper=t()})(this,function(){'use strict';function e(e){return e&&'[object Function]'==={}.toString.call(e)}function t(e,t){if(1!==e.nodeType)return[];var o=e.ownerDocument.defaultView,n=o.getComputedStyle(e,null);return t?n[t]:n}function o(e){return'HTML'===e.nodeName?e:e.parentNode||e.host}function n(e){if(!e)return document.body;switch(e.nodeName){case'HTML':case'BODY':return e.ownerDocument.body;case'#document':return e.body;}var i=t(e),r=i.overflow,p=i.overflowX,s=i.overflowY;return /(auto|scroll|overlay)/.test(r+s+p)?e:n(o(e))}function i(e){return e&&e.referenceNode?e.referenceNode:e}function r(e){return 11===e?re:10===e?pe:re||pe}function p(e){if(!e)return document.documentElement;for(var o=r(10)?document.body:null,n=e.offsetParent||null;n===o&&e.nextElementSibling;)n=(e=e.nextElementSibling).offsetParent;var i=n&&n.nodeName;return i&&'BODY'!==i&&'HTML'!==i?-1!==['TH','TD','TABLE'].indexOf(n.nodeName)&&'static'===t(n,'position')?p(n):n:e?e.ownerDocument.documentElement:document.documentElement}function s(e){var t=e.nodeName;return'BODY'!==t&&('HTML'===t||p(e.firstElementChild)===e)}function d(e){return null===e.parentNode?e:d(e.parentNode)}function a(e,t){if(!e||!e.nodeType||!t||!t.nodeType)return document.documentElement;var o=e.compareDocumentPosition(t)&Node.DOCUMENT_POSITION_FOLLOWING,n=o?e:t,i=o?t:e,r=document.createRange();r.setStart(n,0),r.setEnd(i,0);var l=r.commonAncestorContainer;if(e!==l&&t!==l||n.contains(i))return s(l)?l:p(l);var f=d(e);return f.host?a(f.host,t):a(e,d(t).host)}function l(e){var t=1<arguments.length&&void 0!==arguments[1]?arguments[1]:'top',o='top'===t?'scrollTop':'scrollLeft',n=e.nodeName;if('BODY'===n||'HTML'===n){var i=e.ownerDocument.documentElement,r=e.ownerDocument.scrollingElement||i;return r[o]}return e[o]}function f(e,t){var o=2<arguments.length&&void 0!==arguments[2]&&arguments[2],n=l(t,'top'),i=l(t,'left'),r=o?-1:1;return e.top+=n*r,e.bottom+=n*r,e.left+=i*r,e.right+=i*r,e}function m(e,t){var o='x'===t?'Left':'Top',n='Left'==o?'Right':'Bottom';return parseFloat(e['border'+o+'Width'],10)+parseFloat(e['border'+n+'Width'],10)}function h(e,t,o,n){return ee(t['offset'+e],t['scroll'+e],o['client'+e],o['offset'+e],o['scroll'+e],r(10)?parseInt(o['offset'+e])+parseInt(n['margin'+('Height'===e?'Top':'Left')])+parseInt(n['margin'+('Height'===e?'Bottom':'Right')]):0)}function c(e){var t=e.body,o=e.documentElement,n=r(10)&&getComputedStyle(o);return{height:h('Height',t,o,n),width:h('Width',t,o,n)}}function g(e){return le({},e,{right:e.left+e.width,bottom:e.top+e.height})}function u(e){var o={};try{if(r(10)){o=e.getBoundingClientRect();var n=l(e,'top'),i=l(e,'left');o.top+=n,o.left+=i,o.bottom+=n,o.right+=i}else o=e.getBoundingClientRect()}catch(t){}var p={left:o.left,top:o.top,width:o.right-o.left,height:o.bottom-o.top},s='HTML'===e.nodeName?c(e.ownerDocument):{},d=s.width||e.clientWidth||p.width,a=s.height||e.clientHeight||p.height,f=e.offsetWidth-d,h=e.offsetHeight-a;if(f||h){var u=t(e);f-=m(u,'x'),h-=m(u,'y'),p.width-=f,p.height-=h}return g(p)}function b(e,o){var i=2<arguments.length&&void 0!==arguments[2]&&arguments[2],p=r(10),s='HTML'===o.nodeName,d=u(e),a=u(o),l=n(e),m=t(o),h=parseFloat(m.borderTopWidth,10),c=parseFloat(m.borderLeftWidth,10);i&&s&&(a.top=ee(a.top,0),a.left=ee(a.left,0));var b=g({top:d.top-a.top-h,left:d.left-a.left-c,width:d.width,height:d.height});if(b.marginTop=0,b.marginLeft=0,!p&&s){var w=parseFloat(m.marginTop,10),y=parseFloat(m.marginLeft,10);b.top-=h-w,b.bottom-=h-w,b.left-=c-y,b.right-=c-y,b.marginTop=w,b.marginLeft=y}return(p&&!i?o.contains(l):o===l&&'BODY'!==l.nodeName)&&(b=f(b,o)),b}function w(e){var t=1<arguments.length&&void 0!==arguments[1]&&arguments[1],o=e.ownerDocument.documentElement,n=b(e,o),i=ee(o.clientWidth,window.innerWidth||0),r=ee(o.clientHeight,window.innerHeight||0),p=t?0:l(o),s=t?0:l(o,'left'),d={top:p-n.top+n.marginTop,left:s-n.left+n.marginLeft,width:i,height:r};return g(d)}function y(e){var n=e.nodeName;if('BODY'===n||'HTML'===n)return!1;if('fixed'===t(e,'position'))return!0;var i=o(e);return!!i&&y(i)}function E(e){if(!e||!e.parentElement||r())return document.documentElement;for(var o=e.parentElement;o&&'none'===t(o,'transform');)o=o.parentElement;return o||document.documentElement}function v(e,t,r,p){var s=4<arguments.length&&void 0!==arguments[4]&&arguments[4],d={top:0,left:0},l=s?E(e):a(e,i(t));if('viewport'===p)d=w(l,s);else{var f;'scrollParent'===p?(f=n(o(t)),'BODY'===f.nodeName&&(f=e.ownerDocument.documentElement)):'window'===p?f=e.ownerDocument.documentElement:f=p;var m=b(f,l,s);if('HTML'===f.nodeName&&!y(l)){var h=c(e.ownerDocument),g=h.height,u=h.width;d.top+=m.top-m.marginTop,d.bottom=g+m.top,d.left+=m.left-m.marginLeft,d.right=u+m.left}else d=m}r=r||0;var v='number'==typeof r;return d.left+=v?r:r.left||0,d.top+=v?r:r.top||0,d.right-=v?r:r.right||0,d.bottom-=v?r:r.bottom||0,d}function x(e){var t=e.width,o=e.height;return t*o}function O(e,t,o,n,i){var r=5<arguments.length&&void 0!==arguments[5]?arguments[5]:0;if(-1===e.indexOf('auto'))return e;var p=v(o,n,r,i),s={top:{width:p.width,height:t.top-p.top},right:{width:p.right-t.right,height:p.height},bottom:{width:p.width,height:p.bottom-t.bottom},left:{width:t.left-p.left,height:p.height}},d=Object.keys(s).map(function(e){return le({key:e},s[e],{area:x(s[e])})}).sort(function(e,t){return t.area-e.area}),a=d.filter(function(e){var t=e.width,n=e.height;return t>=o.clientWidth&&n>=o.clientHeight}),l=0<a.length?a[0].key:d[0].key,f=e.split('-')[1];return l+(f?'-'+f:'')}function L(e,t,o){var n=3<arguments.length&&void 0!==arguments[3]?arguments[3]:null,r=n?E(t):a(t,i(o));return b(o,r,n)}function S(e){var t=e.ownerDocument.defaultView,o=t.getComputedStyle(e),n=parseFloat(o.marginTop||0)+parseFloat(o.marginBottom||0),i=parseFloat(o.marginLeft||0)+parseFloat(o.marginRight||0),r={width:e.offsetWidth+i,height:e.offsetHeight+n};return r}function T(e){var t={left:'right',right:'left',bottom:'top',top:'bottom'};return e.replace(/left|right|bottom|top/g,function(e){return t[e]})}function C(e,t,o){o=o.split('-')[0];var n=S(e),i={width:n.width,height:n.height},r=-1!==['right','left'].indexOf(o),p=r?'top':'left',s=r?'left':'top',d=r?'height':'width',a=r?'width':'height';return i[p]=t[p]+t[d]/2-n[d]/2,i[s]=o===s?t[s]-n[a]:t[T(s)],i}function D(e,t){return Array.prototype.find?e.find(t):e.filter(t)[0]}function N(e,t,o){if(Array.prototype.findIndex)return e.findIndex(function(e){return e[t]===o});var n=D(e,function(e){return e[t]===o});return e.indexOf(n)}function P(t,o,n){var i=void 0===n?t:t.slice(0,N(t,'name',n));return i.forEach(function(t){t['function']&&console.warn('`modifier.function` is deprecated, use `modifier.fn`!');var n=t['function']||t.fn;t.enabled&&e(n)&&(o.offsets.popper=g(o.offsets.popper),o.offsets.reference=g(o.offsets.reference),o=n(o,t))}),o}function k(){if(!this.state.isDestroyed){var e={instance:this,styles:{},arrowStyles:{},attributes:{},flipped:!1,offsets:{}};e.offsets.reference=L(this.state,this.popper,this.reference,this.options.positionFixed),e.placement=O(this.options.placement,e.offsets.reference,this.popper,this.reference,this.options.modifiers.flip.boundariesElement,this.options.modifiers.flip.padding),e.originalPlacement=e.placement,e.positionFixed=this.options.positionFixed,e.offsets.popper=C(this.popper,e.offsets.reference,e.placement),e.offsets.popper.position=this.options.positionFixed?'fixed':'absolute',e=P(this.modifiers,e),this.state.isCreated?this.options.onUpdate(e):(this.state.isCreated=!0,this.options.onCreate(e))}}function W(e,t){return e.some(function(e){var o=e.name,n=e.enabled;return n&&o===t})}function B(e){for(var t=[!1,'ms','Webkit','Moz','O'],o=e.charAt(0).toUpperCase()+e.slice(1),n=0;n<t.length;n++){var i=t[n],r=i?''+i+o:e;if('undefined'!=typeof document.body.style[r])return r}return null}function H(){return this.state.isDestroyed=!0,W(this.modifiers,'applyStyle')&&(this.popper.removeAttribute('x-placement'),this.popper.style.position='',this.popper.style.top='',this.popper.style.left='',this.popper.style.right='',this.popper.style.bottom='',this.popper.style.willChange='',this.popper.style[B('transform')]=''),this.disableEventListeners(),this.options.removeOnDestroy&&this.popper.parentNode.removeChild(this.popper),this}function A(e){var t=e.ownerDocument;return t?t.defaultView:window}function M(e,t,o,i){var r='BODY'===e.nodeName,p=r?e.ownerDocument.defaultView:e;p.addEventListener(t,o,{passive:!0}),r||M(n(p.parentNode),t,o,i),i.push(p)}function F(e,t,o,i){o.updateBound=i,A(e).addEventListener('resize',o.updateBound,{passive:!0});var r=n(e);return M(r,'scroll',o.updateBound,o.scrollParents),o.scrollElement=r,o.eventsEnabled=!0,o}function I(){this.state.eventsEnabled||(this.state=F(this.reference,this.options,this.state,this.scheduleUpdate))}function R(e,t){return A(e).removeEventListener('resize',t.updateBound),t.scrollParents.forEach(function(e){e.removeEventListener('scroll',t.updateBound)}),t.updateBound=null,t.scrollParents=[],t.scrollElement=null,t.eventsEnabled=!1,t}function U(){this.state.eventsEnabled&&(cancelAnimationFrame(this.scheduleUpdate),this.state=R(this.reference,this.state))}function Y(e){return''!==e&&!isNaN(parseFloat(e))&&isFinite(e)}function V(e,t){Object.keys(t).forEach(function(o){var n='';-1!==['width','height','top','right','bottom','left'].indexOf(o)&&Y(t[o])&&(n='px'),e.style[o]=t[o]+n})}function j(e,t){Object.keys(t).forEach(function(o){var n=t[o];!1===n?e.removeAttribute(o):e.setAttribute(o,t[o])})}function q(e,t){var o=e.offsets,n=o.popper,i=o.reference,r=$,p=function(e){return e},s=r(i.width),d=r(n.width),a=-1!==['left','right'].indexOf(e.placement),l=-1!==e.placement.indexOf('-'),f=t?a||l||s%2==d%2?r:Z:p,m=t?r:p;return{left:f(1==s%2&&1==d%2&&!l&&t?n.left-1:n.left),top:m(n.top),bottom:m(n.bottom),right:f(n.right)}}function K(e,t,o){var n=D(e,function(e){var o=e.name;return o===t}),i=!!n&&e.some(function(e){return e.name===o&&e.enabled&&e.order<n.order});if(!i){var r='`'+t+'`';console.warn('`'+o+'`'+' modifier is required by '+r+' modifier in order to work, be sure to include it before '+r+'!')}return i}function z(e){return'end'===e?'start':'start'===e?'end':e}function G(e){var t=1<arguments.length&&void 0!==arguments[1]&&arguments[1],o=he.indexOf(e),n=he.slice(o+1).concat(he.slice(0,o));return t?n.reverse():n}function _(e,t,o,n){var i=e.match(/((?:\-|\+)?\d*\.?\d*)(.*)/),r=+i[1],p=i[2];if(!r)return e;if(0===p.indexOf('%')){var s;switch(p){case'%p':s=o;break;case'%':case'%r':default:s=n;}var d=g(s);return d[t]/100*r}if('vh'===p||'vw'===p){var a;return a='vh'===p?ee(document.documentElement.clientHeight,window.innerHeight||0):ee(document.documentElement.clientWidth,window.innerWidth||0),a/100*r}return r}function X(e,t,o,n){var i=[0,0],r=-1!==['right','left'].indexOf(n),p=e.split(/(\+|\-)/).map(function(e){return e.trim()}),s=p.indexOf(D(p,function(e){return-1!==e.search(/,|\s/)}));p[s]&&-1===p[s].indexOf(',')&&console.warn('Offsets separated by white space(s) are deprecated, use a comma (,) instead.');var d=/\s*,\s*|\s+/,a=-1===s?[p]:[p.slice(0,s).concat([p[s].split(d)[0]]),[p[s].split(d)[1]].concat(p.slice(s+1))];return a=a.map(function(e,n){var i=(1===n?!r:r)?'height':'width',p=!1;return e.reduce(function(e,t){return''===e[e.length-1]&&-1!==['+','-'].indexOf(t)?(e[e.length-1]=t,p=!0,e):p?(e[e.length-1]+=t,p=!1,e):e.concat(t)},[]).map(function(e){return _(e,i,t,o)})}),a.forEach(function(e,t){e.forEach(function(o,n){Y(o)&&(i[t]+=o*('-'===e[n-1]?-1:1))})}),i}function J(e,t){var o,n=t.offset,i=e.placement,r=e.offsets,p=r.popper,s=r.reference,d=i.split('-')[0];return o=Y(+n)?[+n,0]:X(n,p,s,d),'left'===d?(p.top+=o[0],p.left-=o[1]):'right'===d?(p.top+=o[0],p.left+=o[1]):'top'===d?(p.left+=o[0],p.top-=o[1]):'bottom'===d&&(p.left+=o[0],p.top+=o[1]),e.popper=p,e}var Q=Math.min,Z=Math.floor,$=Math.round,ee=Math.max,te='undefined'!=typeof window&&'undefined'!=typeof document&&'undefined'!=typeof navigator,oe=function(){for(var e=['Edge','Trident','Firefox'],t=0;t<e.length;t+=1)if(te&&0<=navigator.userAgent.indexOf(e[t]))return 1;return 0}(),ne=te&&window.Promise,ie=ne?function(e){var t=!1;return function(){t||(t=!0,window.Promise.resolve().then(function(){t=!1,e()}))}}:function(e){var t=!1;return function(){t||(t=!0,setTimeout(function(){t=!1,e()},oe))}},re=te&&!!(window.MSInputMethodContext&&document.documentMode),pe=te&&/MSIE 10/.test(navigator.userAgent),se=function(e,t){if(!(e instanceof t))throw new TypeError('Cannot call a class as a function')},de=function(){function e(e,t){for(var o,n=0;n<t.length;n++)o=t[n],o.enumerable=o.enumerable||!1,o.configurable=!0,'value'in o&&(o.writable=!0),Object.defineProperty(e,o.key,o)}return function(t,o,n){return o&&e(t.prototype,o),n&&e(t,n),t}}(),ae=function(e,t,o){return t in e?Object.defineProperty(e,t,{value:o,enumerable:!0,configurable:!0,writable:!0}):e[t]=o,e},le=Object.assign||function(e){for(var t,o=1;o<arguments.length;o++)for(var n in t=arguments[o],t)Object.prototype.hasOwnProperty.call(t,n)&&(e[n]=t[n]);return e},fe=te&&/Firefox/i.test(navigator.userAgent),me=['auto-start','auto','auto-end','top-start','top','top-end','right-start','right','right-end','bottom-end','bottom','bottom-start','left-end','left','left-start'],he=me.slice(3),ce={FLIP:'flip',CLOCKWISE:'clockwise',COUNTERCLOCKWISE:'counterclockwise'},ge=function(){function t(o,n){var i=this,r=2<arguments.length&&void 0!==arguments[2]?arguments[2]:{};se(this,t),this.scheduleUpdate=function(){return requestAnimationFrame(i.update)},this.update=ie(this.update.bind(this)),this.options=le({},t.Defaults,r),this.state={isDestroyed:!1,isCreated:!1,scrollParents:[]},this.reference=o&&o.jquery?o[0]:o,this.popper=n&&n.jquery?n[0]:n,this.options.modifiers={},Object.keys(le({},t.Defaults.modifiers,r.modifiers)).forEach(function(e){i.options.modifiers[e]=le({},t.Defaults.modifiers[e]||{},r.modifiers?r.modifiers[e]:{})}),this.modifiers=Object.keys(this.options.modifiers).map(function(e){return le({name:e},i.options.modifiers[e])}).sort(function(e,t){return e.order-t.order}),this.modifiers.forEach(function(t){t.enabled&&e(t.onLoad)&&t.onLoad(i.reference,i.popper,i.options,t,i.state)}),this.update();var p=this.options.eventsEnabled;p&&this.enableEventListeners(),this.state.eventsEnabled=p}return de(t,[{key:'update',value:function(){return k.call(this)}},{key:'destroy',value:function(){return H.call(this)}},{key:'enableEventListeners',value:function(){return I.call(this)}},{key:'disableEventListeners',value:function(){return U.call(this)}}]),t}();return ge.Utils=('undefined'==typeof window?global:window).PopperUtils,ge.placements=me,ge.Defaults={placement:'bottom',positionFixed:!1,eventsEnabled:!0,removeOnDestroy:!1,onCreate:function(){},onUpdate:function(){},modifiers:{shift:{order:100,enabled:!0,fn:function(e){var t=e.placement,o=t.split('-')[0],n=t.split('-')[1];if(n){var i=e.offsets,r=i.reference,p=i.popper,s=-1!==['bottom','top'].indexOf(o),d=s?'left':'top',a=s?'width':'height',l={start:ae({},d,r[d]),end:ae({},d,r[d]+r[a]-p[a])};e.offsets.popper=le({},p,l[n])}return e}},offset:{order:200,enabled:!0,fn:J,offset:0},preventOverflow:{order:300,enabled:!0,fn:function(e,t){var o=t.boundariesElement||p(e.instance.popper);e.instance.reference===o&&(o=p(o));var n=B('transform'),i=e.instance.popper.style,r=i.top,s=i.left,d=i[n];i.top='',i.left='',i[n]='';var a=v(e.instance.popper,e.instance.reference,t.padding,o,e.positionFixed);i.top=r,i.left=s,i[n]=d,t.boundaries=a;var l=t.priority,f=e.offsets.popper,m={primary:function(e){var o=f[e];return f[e]<a[e]&&!t.escapeWithReference&&(o=ee(f[e],a[e])),ae({},e,o)},secondary:function(e){var o='right'===e?'left':'top',n=f[o];return f[e]>a[e]&&!t.escapeWithReference&&(n=Q(f[o],a[e]-('right'===e?f.width:f.height))),ae({},o,n)}};return l.forEach(function(e){var t=-1===['left','top'].indexOf(e)?'secondary':'primary';f=le({},f,m[t](e))}),e.offsets.popper=f,e},priority:['left','right','top','bottom'],padding:5,boundariesElement:'scrollParent'},keepTogether:{order:400,enabled:!0,fn:function(e){var t=e.offsets,o=t.popper,n=t.reference,i=e.placement.split('-')[0],r=Z,p=-1!==['top','bottom'].indexOf(i),s=p?'right':'bottom',d=p?'left':'top',a=p?'width':'height';return o[s]<r(n[d])&&(e.offsets.popper[d]=r(n[d])-o[a]),o[d]>r(n[s])&&(e.offsets.popper[d]=r(n[s])),e}},arrow:{order:500,enabled:!0,fn:function(e,o){var n;if(!K(e.instance.modifiers,'arrow','keepTogether'))return e;var i=o.element;if('string'==typeof i){if(i=e.instance.popper.querySelector(i),!i)return e;}else if(!e.instance.popper.contains(i))return console.warn('WARNING: `arrow.element` must be child of its popper element!'),e;var r=e.placement.split('-')[0],p=e.offsets,s=p.popper,d=p.reference,a=-1!==['left','right'].indexOf(r),l=a?'height':'width',f=a?'Top':'Left',m=f.toLowerCase(),h=a?'left':'top',c=a?'bottom':'right',u=S(i)[l];d[c]-u<s[m]&&(e.offsets.popper[m]-=s[m]-(d[c]-u)),d[m]+u>s[c]&&(e.offsets.popper[m]+=d[m]+u-s[c]),e.offsets.popper=g(e.offsets.popper);var b=d[m]+d[l]/2-u/2,w=t(e.instance.popper),y=parseFloat(w['margin'+f],10),E=parseFloat(w['border'+f+'Width'],10),v=b-e.offsets.popper[m]-y-E;return v=ee(Q(s[l]-u,v),0),e.arrowElement=i,e.offsets.arrow=(n={},ae(n,m,$(v)),ae(n,h,''),n),e},element:'[x-arrow]'},flip:{order:600,enabled:!0,fn:function(e,t){if(W(e.instance.modifiers,'inner'))return e;if(e.flipped&&e.placement===e.originalPlacement)return e;var o=v(e.instance.popper,e.instance.reference,t.padding,t.boundariesElement,e.positionFixed),n=e.placement.split('-')[0],i=T(n),r=e.placement.split('-')[1]||'',p=[];switch(t.behavior){case ce.FLIP:p=[n,i];break;case ce.CLOCKWISE:p=G(n);break;case ce.COUNTERCLOCKWISE:p=G(n,!0);break;default:p=t.behavior;}return p.forEach(function(s,d){if(n!==s||p.length===d+1)return e;n=e.placement.split('-')[0],i=T(n);var a=e.offsets.popper,l=e.offsets.reference,f=Z,m='left'===n&&f(a.right)>f(l.left)||'right'===n&&f(a.left)<f(l.right)||'top'===n&&f(a.bottom)>f(l.top)||'bottom'===n&&f(a.top)<f(l.bottom),h=f(a.left)<f(o.left),c=f(a.right)>f(o.right),g=f(a.top)<f(o.top),u=f(a.bottom)>f(o.bottom),b='left'===n&&h||'right'===n&&c||'top'===n&&g||'bottom'===n&&u,w=-1!==['top','bottom'].indexOf(n),y=!!t.flipVariations&&(w&&'start'===r&&h||w&&'end'===r&&c||!w&&'start'===r&&g||!w&&'end'===r&&u),E=!!t.flipVariationsByContent&&(w&&'start'===r&&c||w&&'end'===r&&h||!w&&'start'===r&&u||!w&&'end'===r&&g),v=y||E;(m||b||v)&&(e.flipped=!0,(m||b)&&(n=p[d+1]),v&&(r=z(r)),e.placement=n+(r?'-'+r:''),e.offsets.popper=le({},e.offsets.popper,C(e.instance.popper,e.offsets.reference,e.placement)),e=P(e.instance.modifiers,e,'flip'))}),e},behavior:'flip',padding:5,boundariesElement:'viewport',flipVariations:!1,flipVariationsByContent:!1},inner:{order:700,enabled:!1,fn:function(e){var t=e.placement,o=t.split('-')[0],n=e.offsets,i=n.popper,r=n.reference,p=-1!==['left','right'].indexOf(o),s=-1===['top','left'].indexOf(o);return i[p?'left':'top']=r[o]-(s?i[p?'width':'height']:0),e.placement=T(t),e.offsets.popper=g(i),e}},hide:{order:800,enabled:!0,fn:function(e){if(!K(e.instance.modifiers,'hide','preventOverflow'))return e;var t=e.offsets.reference,o=D(e.instance.modifiers,function(e){return'preventOverflow'===e.name}).boundaries;if(t.bottom<o.top||t.left>o.right||t.top>o.bottom||t.right<o.left){if(!0===e.hide)return e;e.hide=!0,e.attributes['x-out-of-boundaries']=''}else{if(!1===e.hide)return e;e.hide=!1,e.attributes['x-out-of-boundaries']=!1}return e}},computeStyle:{order:850,enabled:!0,fn:function(e,t){var o=t.x,n=t.y,i=e.offsets.popper,r=D(e.instance.modifiers,function(e){return'applyStyle'===e.name}).gpuAcceleration;void 0!==r&&console.warn('WARNING: `gpuAcceleration` option moved to `computeStyle` modifier and will not be supported in future versions of Popper.js!');var s,d,a=void 0===r?t.gpuAcceleration:r,l=p(e.instance.popper),f=u(l),m={position:i.position},h=q(e,2>window.devicePixelRatio||!fe),c='bottom'===o?'top':'bottom',g='right'===n?'left':'right',b=B('transform');if(d='bottom'==c?'HTML'===l.nodeName?-l.clientHeight+h.bottom:-f.height+h.bottom:h.top,s='right'==g?'HTML'===l.nodeName?-l.clientWidth+h.right:-f.width+h.right:h.left,a&&b)m[b]='translate3d('+s+'px, '+d+'px, 0)',m[c]=0,m[g]=0,m.willChange='transform';else{var w='bottom'==c?-1:1,y='right'==g?-1:1;m[c]=d*w,m[g]=s*y,m.willChange=c+', '+g}var E={"x-placement":e.placement};return e.attributes=le({},E,e.attributes),e.styles=le({},m,e.styles),e.arrowStyles=le({},e.offsets.arrow,e.arrowStyles),e},gpuAcceleration:!0,x:'bottom',y:'right'},applyStyle:{order:900,enabled:!0,fn:function(e){return V(e.instance.popper,e.styles),j(e.instance.popper,e.attributes),e.arrowElement&&Object.keys(e.arrowStyles).length&&V(e.arrowElement,e.arrowStyles),e},onLoad:function(e,t,o,n,i){var r=L(i,t,e,o.positionFixed),p=O(o.placement,r,t,e,o.modifiers.flip.boundariesElement,o.modifiers.flip.padding);return t.setAttribute('x-placement',p),V(t,{position:o.positionFixed?'fixed':'absolute'}),o},gpuAcceleration:void 0}}},ge});
//# sourceMappingURL=popper.min.js.map
diff --git a/web/core/assets/vendor/popperjs/popper.min.js.map b/web/core/assets/vendor/popperjs/popper.min.js.map
index 1cc1e9f3e9..7107f613cf 100644
--- a/web/core/assets/vendor/popperjs/popper.min.js.map
+++ b/web/core/assets/vendor/popperjs/popper.min.js.map
@@ -1 +1 @@
-{"version":3,"file":"popper.min.js","sources":["../../src/utils/isFunction.js","../../src/utils/getStyleComputedProperty.js","../../src/utils/getParentNode.js","../../src/utils/getScrollParent.js","../../src/utils/isIE.js","../../src/utils/getOffsetParent.js","../../src/utils/isOffsetContainer.js","../../src/utils/getRoot.js","../../src/utils/findCommonOffsetParent.js","../../src/utils/getScroll.js","../../src/utils/includeScroll.js","../../src/utils/getBordersSize.js","../../src/utils/getWindowSizes.js","../../src/utils/getClientRect.js","../../src/utils/getBoundingClientRect.js","../../src/utils/getOffsetRectRelativeToArbitraryNode.js","../../src/utils/getViewportOffsetRectRelativeToArtbitraryNode.js","../../src/utils/isFixed.js","../../src/utils/getFixedPositionOffsetParent.js","../../src/utils/getBoundaries.js","../../src/utils/computeAutoPlacement.js","../../src/utils/getReferenceOffsets.js","../../src/utils/getOuterSizes.js","../../src/utils/getOppositePlacement.js","../../src/utils/getPopperOffsets.js","../../src/utils/find.js","../../src/utils/findIndex.js","../../src/utils/runModifiers.js","../../src/methods/update.js","../../src/utils/isModifierEnabled.js","../../src/utils/getSupportedPropertyName.js","../../src/methods/destroy.js","../../src/utils/getWindow.js","../../src/utils/setupEventListeners.js","../../src/methods/enableEventListeners.js","../../src/utils/removeEventListeners.js","../../src/methods/disableEventListeners.js","../../src/utils/isNumeric.js","../../src/utils/setStyles.js","../../src/utils/setAttributes.js","../../src/utils/getRoundedOffsets.js","../../src/utils/isModifierRequired.js","../../src/utils/getOppositeVariation.js","../../src/utils/clockwise.js","../../src/modifiers/offset.js","../../src/utils/debounce.js","../../src/modifiers/arrow.js","../../src/utils/isBrowser.js","../../src/modifiers/computeStyle.js","../../src/modifiers/flip.js","../../src/index.js","../../src/methods/defaults.js","../../src/modifiers/index.js","../../src/modifiers/shift.js","../../src/modifiers/preventOverflow.js","../../src/modifiers/keepTogether.js","../../src/modifiers/inner.js","../../src/modifiers/hide.js","../../src/modifiers/applyStyle.js"],"sourcesContent":["/**\n * Check if the given variable is a function\n * @method\n * @memberof Popper.Utils\n * @argument {Any} functionToCheck - variable to check\n * @returns {Boolean} answer to: is a function?\n */\nexport default function isFunction(functionToCheck) {\n const getType = {};\n return (\n functionToCheck &&\n getType.toString.call(functionToCheck) === '[object Function]'\n );\n}\n","/**\n * Get CSS computed property of the given element\n * @method\n * @memberof Popper.Utils\n * @argument {Eement} element\n * @argument {String} property\n */\nexport default function getStyleComputedProperty(element, property) {\n if (element.nodeType !== 1) {\n return [];\n }\n // NOTE: 1 DOM access here\n const window = element.ownerDocument.defaultView;\n const css = window.getComputedStyle(element, null);\n return property ? css[property] : css;\n}\n","/**\n * Returns the parentNode or the host of the element\n * @method\n * @memberof Popper.Utils\n * @argument {Element} element\n * @returns {Element} parent\n */\nexport default function getParentNode(element) {\n if (element.nodeName === 'HTML') {\n return element;\n }\n return element.parentNode || element.host;\n}\n","import getStyleComputedProperty from './getStyleComputedProperty';\nimport getParentNode from './getParentNode';\n\n/**\n * Returns the scrolling parent of the given element\n * @method\n * @memberof Popper.Utils\n * @argument {Element} element\n * @returns {Element} scroll parent\n */\nexport default function getScrollParent(element) {\n // Return body, `getScroll` will take care to get the correct `scrollTop` from it\n if (!element) {\n return document.body\n }\n\n switch (element.nodeName) {\n case 'HTML':\n case 'BODY':\n return element.ownerDocument.body\n case '#document':\n return element.body\n }\n\n // Firefox want us to check `-x` and `-y` variations as well\n const { overflow, overflowX, overflowY } = getStyleComputedProperty(element);\n if (/(auto|scroll|overlay)/.test(overflow + overflowY + overflowX)) {\n return element;\n }\n\n return getScrollParent(getParentNode(element));\n}\n","import isBrowser from './isBrowser';\n\nconst isIE11 = isBrowser && !!(window.MSInputMethodContext && document.documentMode);\nconst isIE10 = isBrowser && /MSIE 10/.test(navigator.userAgent);\n\n/**\n * Determines if the browser is Internet Explorer\n * @method\n * @memberof Popper.Utils\n * @param {Number} version to check\n * @returns {Boolean} isIE\n */\nexport default function isIE(version) {\n if (version === 11) {\n return isIE11;\n }\n if (version === 10) {\n return isIE10;\n }\n return isIE11 || isIE10;\n}\n","import getStyleComputedProperty from './getStyleComputedProperty';\nimport isIE from './isIE';\n/**\n * Returns the offset parent of the given element\n * @method\n * @memberof Popper.Utils\n * @argument {Element} element\n * @returns {Element} offset parent\n */\nexport default function getOffsetParent(element) {\n if (!element) {\n return document.documentElement;\n }\n\n const noOffsetParent = isIE(10) ? document.body : null;\n\n // NOTE: 1 DOM access here\n let offsetParent = element.offsetParent || null;\n // Skip hidden elements which don't have an offsetParent\n while (offsetParent === noOffsetParent && element.nextElementSibling) {\n offsetParent = (element = element.nextElementSibling).offsetParent;\n }\n\n const nodeName = offsetParent && offsetParent.nodeName;\n\n if (!nodeName || nodeName === 'BODY' || nodeName === 'HTML') {\n return element ? element.ownerDocument.documentElement : document.documentElement;\n }\n\n // .offsetParent will return the closest TH, TD or TABLE in case\n // no offsetParent is present, I hate this job...\n if (\n ['TH', 'TD', 'TABLE'].indexOf(offsetParent.nodeName) !== -1 &&\n getStyleComputedProperty(offsetParent, 'position') === 'static'\n ) {\n return getOffsetParent(offsetParent);\n }\n\n return offsetParent;\n}\n","import getOffsetParent from './getOffsetParent';\n\nexport default function isOffsetContainer(element) {\n const { nodeName } = element;\n if (nodeName === 'BODY') {\n return false;\n }\n return (\n nodeName === 'HTML' || getOffsetParent(element.firstElementChild) === element\n );\n}\n","/**\n * Finds the root node (document, shadowDOM root) of the given element\n * @method\n * @memberof Popper.Utils\n * @argument {Element} node\n * @returns {Element} root node\n */\nexport default function getRoot(node) {\n if (node.parentNode !== null) {\n return getRoot(node.parentNode);\n }\n\n return node;\n}\n","import isOffsetContainer from './isOffsetContainer';\nimport getRoot from './getRoot';\nimport getOffsetParent from './getOffsetParent';\n\n/**\n * Finds the offset parent common to the two provided nodes\n * @method\n * @memberof Popper.Utils\n * @argument {Element} element1\n * @argument {Element} element2\n * @returns {Element} common offset parent\n */\nexport default function findCommonOffsetParent(element1, element2) {\n // This check is needed to avoid errors in case one of the elements isn't defined for any reason\n if (!element1 || !element1.nodeType || !element2 || !element2.nodeType) {\n return document.documentElement;\n }\n\n // Here we make sure to give as \"start\" the element that comes first in the DOM\n const order =\n element1.compareDocumentPosition(element2) &\n Node.DOCUMENT_POSITION_FOLLOWING;\n const start = order ? element1 : element2;\n const end = order ? element2 : element1;\n\n // Get common ancestor container\n const range = document.createRange();\n range.setStart(start, 0);\n range.setEnd(end, 0);\n const { commonAncestorContainer } = range;\n\n // Both nodes are inside #document\n if (\n (element1 !== commonAncestorContainer &&\n element2 !== commonAncestorContainer) ||\n start.contains(end)\n ) {\n if (isOffsetContainer(commonAncestorContainer)) {\n return commonAncestorContainer;\n }\n\n return getOffsetParent(commonAncestorContainer);\n }\n\n // one of the nodes is inside shadowDOM, find which one\n const element1root = getRoot(element1);\n if (element1root.host) {\n return findCommonOffsetParent(element1root.host, element2);\n } else {\n return findCommonOffsetParent(element1, getRoot(element2).host);\n }\n}\n","/**\n * Gets the scroll value of the given element in the given side (top and left)\n * @method\n * @memberof Popper.Utils\n * @argument {Element} element\n * @argument {String} side `top` or `left`\n * @returns {number} amount of scrolled pixels\n */\nexport default function getScroll(element, side = 'top') {\n const upperSide = side === 'top' ? 'scrollTop' : 'scrollLeft';\n const nodeName = element.nodeName;\n\n if (nodeName === 'BODY' || nodeName === 'HTML') {\n const html = element.ownerDocument.documentElement;\n const scrollingElement = element.ownerDocument.scrollingElement || html;\n return scrollingElement[upperSide];\n }\n\n return element[upperSide];\n}\n","import getScroll from './getScroll';\n\n/*\n * Sum or subtract the element scroll values (left and top) from a given rect object\n * @method\n * @memberof Popper.Utils\n * @param {Object} rect - Rect object you want to change\n * @param {HTMLElement} element - The element from the function reads the scroll values\n * @param {Boolean} subtract - set to true if you want to subtract the scroll values\n * @return {Object} rect - The modifier rect object\n */\nexport default function includeScroll(rect, element, subtract = false) {\n const scrollTop = getScroll(element, 'top');\n const scrollLeft = getScroll(element, 'left');\n const modifier = subtract ? -1 : 1;\n rect.top += scrollTop * modifier;\n rect.bottom += scrollTop * modifier;\n rect.left += scrollLeft * modifier;\n rect.right += scrollLeft * modifier;\n return rect;\n}\n","/*\n * Helper to detect borders of a given element\n * @method\n * @memberof Popper.Utils\n * @param {CSSStyleDeclaration} styles\n * Result of `getStyleComputedProperty` on the given element\n * @param {String} axis - `x` or `y`\n * @return {number} borders - The borders size of the given axis\n */\n\nexport default function getBordersSize(styles, axis) {\n const sideA = axis === 'x' ? 'Left' : 'Top';\n const sideB = sideA === 'Left' ? 'Right' : 'Bottom';\n\n return (\n parseFloat(styles[`border${sideA}Width`], 10) +\n parseFloat(styles[`border${sideB}Width`], 10)\n );\n}\n","import isIE from './isIE';\n\nfunction getSize(axis, body, html, computedStyle) {\n return Math.max(\n body[`offset${axis}`],\n body[`scroll${axis}`],\n html[`client${axis}`],\n html[`offset${axis}`],\n html[`scroll${axis}`],\n isIE(10)\n ? (parseInt(html[`offset${axis}`]) + \n parseInt(computedStyle[`margin${axis === 'Height' ? 'Top' : 'Left'}`]) + \n parseInt(computedStyle[`margin${axis === 'Height' ? 'Bottom' : 'Right'}`]))\n : 0 \n );\n}\n\nexport default function getWindowSizes(document) {\n const body = document.body;\n const html = document.documentElement;\n const computedStyle = isIE(10) && getComputedStyle(html);\n\n return {\n height: getSize('Height', body, html, computedStyle),\n width: getSize('Width', body, html, computedStyle),\n };\n}\n","/**\n * Given element offsets, generate an output similar to getBoundingClientRect\n * @method\n * @memberof Popper.Utils\n * @argument {Object} offsets\n * @returns {Object} ClientRect like output\n */\nexport default function getClientRect(offsets) {\n return {\n ...offsets,\n right: offsets.left + offsets.width,\n bottom: offsets.top + offsets.height,\n };\n}\n","import getStyleComputedProperty from './getStyleComputedProperty';\nimport getBordersSize from './getBordersSize';\nimport getWindowSizes from './getWindowSizes';\nimport getScroll from './getScroll';\nimport getClientRect from './getClientRect';\nimport isIE from './isIE';\n\n/**\n * Get bounding client rect of given element\n * @method\n * @memberof Popper.Utils\n * @param {HTMLElement} element\n * @return {Object} client rect\n */\nexport default function getBoundingClientRect(element) {\n let rect = {};\n\n // IE10 10 FIX: Please, don't ask, the element isn't\n // considered in DOM in some circumstances...\n // This isn't reproducible in IE10 compatibility mode of IE11\n try {\n if (isIE(10)) {\n rect = element.getBoundingClientRect();\n const scrollTop = getScroll(element, 'top');\n const scrollLeft = getScroll(element, 'left');\n rect.top += scrollTop;\n rect.left += scrollLeft;\n rect.bottom += scrollTop;\n rect.right += scrollLeft;\n }\n else {\n rect = element.getBoundingClientRect();\n }\n }\n catch(e){}\n\n const result = {\n left: rect.left,\n top: rect.top,\n width: rect.right - rect.left,\n height: rect.bottom - rect.top,\n };\n\n // subtract scrollbar size from sizes\n const sizes = element.nodeName === 'HTML' ? getWindowSizes(element.ownerDocument) : {};\n const width =\n sizes.width || element.clientWidth || result.right - result.left;\n const height =\n sizes.height || element.clientHeight || result.bottom - result.top;\n\n let horizScrollbar = element.offsetWidth - width;\n let vertScrollbar = element.offsetHeight - height;\n\n // if an hypothetical scrollbar is detected, we must be sure it's not a `border`\n // we make this check conditional for performance reasons\n if (horizScrollbar || vertScrollbar) {\n const styles = getStyleComputedProperty(element);\n horizScrollbar -= getBordersSize(styles, 'x');\n vertScrollbar -= getBordersSize(styles, 'y');\n\n result.width -= horizScrollbar;\n result.height -= vertScrollbar;\n }\n\n return getClientRect(result);\n}\n","import getStyleComputedProperty from './getStyleComputedProperty';\nimport includeScroll from './includeScroll';\nimport getScrollParent from './getScrollParent';\nimport getBoundingClientRect from './getBoundingClientRect';\nimport runIsIE from './isIE';\nimport getClientRect from './getClientRect';\n\nexport default function getOffsetRectRelativeToArbitraryNode(children, parent, fixedPosition = false) {\n const isIE10 = runIsIE(10);\n const isHTML = parent.nodeName === 'HTML';\n const childrenRect = getBoundingClientRect(children);\n const parentRect = getBoundingClientRect(parent);\n const scrollParent = getScrollParent(children);\n\n const styles = getStyleComputedProperty(parent);\n const borderTopWidth = parseFloat(styles.borderTopWidth, 10);\n const borderLeftWidth = parseFloat(styles.borderLeftWidth, 10);\n\n // In cases where the parent is fixed, we must ignore negative scroll in offset calc\n if(fixedPosition && isHTML) {\n parentRect.top = Math.max(parentRect.top, 0);\n parentRect.left = Math.max(parentRect.left, 0);\n }\n let offsets = getClientRect({\n top: childrenRect.top - parentRect.top - borderTopWidth,\n left: childrenRect.left - parentRect.left - borderLeftWidth,\n width: childrenRect.width,\n height: childrenRect.height,\n });\n offsets.marginTop = 0;\n offsets.marginLeft = 0;\n\n // Subtract margins of documentElement in case it's being used as parent\n // we do this only on HTML because it's the only element that behaves\n // differently when margins are applied to it. The margins are included in\n // the box of the documentElement, in the other cases not.\n if (!isIE10 && isHTML) {\n const marginTop = parseFloat(styles.marginTop, 10);\n const marginLeft = parseFloat(styles.marginLeft, 10);\n\n offsets.top -= borderTopWidth - marginTop;\n offsets.bottom -= borderTopWidth - marginTop;\n offsets.left -= borderLeftWidth - marginLeft;\n offsets.right -= borderLeftWidth - marginLeft;\n\n // Attach marginTop and marginLeft because in some circumstances we may need them\n offsets.marginTop = marginTop;\n offsets.marginLeft = marginLeft;\n }\n\n if (\n isIE10 && !fixedPosition\n ? parent.contains(scrollParent)\n : parent === scrollParent && scrollParent.nodeName !== 'BODY'\n ) {\n offsets = includeScroll(offsets, parent);\n }\n\n return offsets;\n}\n","import getOffsetRectRelativeToArbitraryNode from './getOffsetRectRelativeToArbitraryNode';\nimport getScroll from './getScroll';\nimport getClientRect from './getClientRect';\n\nexport default function getViewportOffsetRectRelativeToArtbitraryNode(element, excludeScroll = false) {\n const html = element.ownerDocument.documentElement;\n const relativeOffset = getOffsetRectRelativeToArbitraryNode(element, html);\n const width = Math.max(html.clientWidth, window.innerWidth || 0);\n const height = Math.max(html.clientHeight, window.innerHeight || 0);\n\n const scrollTop = !excludeScroll ? getScroll(html) : 0;\n const scrollLeft = !excludeScroll ? getScroll(html, 'left') : 0;\n\n const offset = {\n top: scrollTop - relativeOffset.top + relativeOffset.marginTop,\n left: scrollLeft - relativeOffset.left + relativeOffset.marginLeft,\n width,\n height,\n };\n\n return getClientRect(offset);\n}\n","import getStyleComputedProperty from './getStyleComputedProperty';\nimport getParentNode from './getParentNode';\n\n/**\n * Check if the given element is fixed or is inside a fixed parent\n * @method\n * @memberof Popper.Utils\n * @argument {Element} element\n * @argument {Element} customContainer\n * @returns {Boolean} answer to \"isFixed?\"\n */\nexport default function isFixed(element) {\n const nodeName = element.nodeName;\n if (nodeName === 'BODY' || nodeName === 'HTML') {\n return false;\n }\n if (getStyleComputedProperty(element, 'position') === 'fixed') {\n return true;\n }\n const parentNode = getParentNode(element);\n if (!parentNode) {\n return false;\n }\n return isFixed(parentNode);\n}\n","import getStyleComputedProperty from './getStyleComputedProperty';\nimport isIE from './isIE';\n/**\n * Finds the first parent of an element that has a transformed property defined\n * @method\n * @memberof Popper.Utils\n * @argument {Element} element\n * @returns {Element} first transformed parent or documentElement\n */\n\nexport default function getFixedPositionOffsetParent(element) {\n // This check is needed to avoid errors in case one of the elements isn't defined for any reason\n if (!element || !element.parentElement || isIE()) {\n return document.documentElement;\n }\n let el = element.parentElement;\n while (el && getStyleComputedProperty(el, 'transform') === 'none') {\n el = el.parentElement;\n }\n return el || document.documentElement;\n\n}\n","import getScrollParent from './getScrollParent';\nimport getParentNode from './getParentNode';\nimport findCommonOffsetParent from './findCommonOffsetParent';\nimport getOffsetRectRelativeToArbitraryNode from './getOffsetRectRelativeToArbitraryNode';\nimport getViewportOffsetRectRelativeToArtbitraryNode from './getViewportOffsetRectRelativeToArtbitraryNode';\nimport getWindowSizes from './getWindowSizes';\nimport isFixed from './isFixed';\nimport getFixedPositionOffsetParent from './getFixedPositionOffsetParent';\n\n/**\n * Computed the boundaries limits and return them\n * @method\n * @memberof Popper.Utils\n * @param {HTMLElement} popper\n * @param {HTMLElement} reference\n * @param {number} padding\n * @param {HTMLElement} boundariesElement - Element used to define the boundaries\n * @param {Boolean} fixedPosition - Is in fixed position mode\n * @returns {Object} Coordinates of the boundaries\n */\nexport default function getBoundaries(\n popper,\n reference,\n padding,\n boundariesElement,\n fixedPosition = false\n) {\n // NOTE: 1 DOM access here\n\n let boundaries = { top: 0, left: 0 };\n const offsetParent = fixedPosition ? getFixedPositionOffsetParent(popper) : findCommonOffsetParent(popper, reference);\n\n // Handle viewport case\n if (boundariesElement === 'viewport' ) {\n boundaries = getViewportOffsetRectRelativeToArtbitraryNode(offsetParent, fixedPosition);\n }\n\n else {\n // Handle other cases based on DOM element used as boundaries\n let boundariesNode;\n if (boundariesElement === 'scrollParent') {\n boundariesNode = getScrollParent(getParentNode(reference));\n if (boundariesNode.nodeName === 'BODY') {\n boundariesNode = popper.ownerDocument.documentElement;\n }\n } else if (boundariesElement === 'window') {\n boundariesNode = popper.ownerDocument.documentElement;\n } else {\n boundariesNode = boundariesElement;\n }\n\n const offsets = getOffsetRectRelativeToArbitraryNode(\n boundariesNode,\n offsetParent,\n fixedPosition\n );\n\n // In case of HTML, we need a different computation\n if (boundariesNode.nodeName === 'HTML' && !isFixed(offsetParent)) {\n const { height, width } = getWindowSizes(popper.ownerDocument);\n boundaries.top += offsets.top - offsets.marginTop;\n boundaries.bottom = height + offsets.top;\n boundaries.left += offsets.left - offsets.marginLeft;\n boundaries.right = width + offsets.left;\n } else {\n // for all the other DOM elements, this one is good\n boundaries = offsets;\n }\n }\n\n // Add paddings\n padding = padding || 0;\n const isPaddingNumber = typeof padding === 'number';\n boundaries.left += isPaddingNumber ? padding : padding.left || 0; \n boundaries.top += isPaddingNumber ? padding : padding.top || 0; \n boundaries.right -= isPaddingNumber ? padding : padding.right || 0; \n boundaries.bottom -= isPaddingNumber ? padding : padding.bottom || 0; \n\n return boundaries;\n}\n","import getBoundaries from '../utils/getBoundaries';\n\nfunction getArea({ width, height }) {\n return width * height;\n}\n\n/**\n * Utility used to transform the `auto` placement to the placement with more\n * available space.\n * @method\n * @memberof Popper.Utils\n * @argument {Object} data - The data object generated by update method\n * @argument {Object} options - Modifiers configuration and options\n * @returns {Object} The data object, properly modified\n */\nexport default function computeAutoPlacement(\n placement,\n refRect,\n popper,\n reference,\n boundariesElement,\n padding = 0\n) {\n if (placement.indexOf('auto') === -1) {\n return placement;\n }\n\n const boundaries = getBoundaries(\n popper,\n reference,\n padding,\n boundariesElement\n );\n\n const rects = {\n top: {\n width: boundaries.width,\n height: refRect.top - boundaries.top,\n },\n right: {\n width: boundaries.right - refRect.right,\n height: boundaries.height,\n },\n bottom: {\n width: boundaries.width,\n height: boundaries.bottom - refRect.bottom,\n },\n left: {\n width: refRect.left - boundaries.left,\n height: boundaries.height,\n },\n };\n\n const sortedAreas = Object.keys(rects)\n .map(key => ({\n key,\n ...rects[key],\n area: getArea(rects[key]),\n }))\n .sort((a, b) => b.area - a.area);\n\n const filteredAreas = sortedAreas.filter(\n ({ width, height }) =>\n width >= popper.clientWidth && height >= popper.clientHeight\n );\n\n const computedPlacement = filteredAreas.length > 0\n ? filteredAreas[0].key\n : sortedAreas[0].key;\n\n const variation = placement.split('-')[1];\n\n return computedPlacement + (variation ? `-${variation}` : '');\n}\n","import findCommonOffsetParent from './findCommonOffsetParent';\nimport getOffsetRectRelativeToArbitraryNode from './getOffsetRectRelativeToArbitraryNode';\nimport getFixedPositionOffsetParent from './getFixedPositionOffsetParent';\n\n/**\n * Get offsets to the reference element\n * @method\n * @memberof Popper.Utils\n * @param {Object} state\n * @param {Element} popper - the popper element\n * @param {Element} reference - the reference element (the popper will be relative to this)\n * @param {Element} fixedPosition - is in fixed position mode\n * @returns {Object} An object containing the offsets which will be applied to the popper\n */\nexport default function getReferenceOffsets(state, popper, reference, fixedPosition = null) {\n const commonOffsetParent = fixedPosition ? getFixedPositionOffsetParent(popper) : findCommonOffsetParent(popper, reference);\n return getOffsetRectRelativeToArbitraryNode(reference, commonOffsetParent, fixedPosition);\n}\n","/**\n * Get the outer sizes of the given element (offset size + margins)\n * @method\n * @memberof Popper.Utils\n * @argument {Element} element\n * @returns {Object} object containing width and height properties\n */\nexport default function getOuterSizes(element) {\n const window = element.ownerDocument.defaultView;\n const styles = window.getComputedStyle(element);\n const x = parseFloat(styles.marginTop || 0) + parseFloat(styles.marginBottom || 0);\n const y = parseFloat(styles.marginLeft || 0) + parseFloat(styles.marginRight || 0);\n const result = {\n width: element.offsetWidth + y,\n height: element.offsetHeight + x,\n };\n return result;\n}\n","/**\n * Get the opposite placement of the given one\n * @method\n * @memberof Popper.Utils\n * @argument {String} placement\n * @returns {String} flipped placement\n */\nexport default function getOppositePlacement(placement) {\n const hash = { left: 'right', right: 'left', bottom: 'top', top: 'bottom' };\n return placement.replace(/left|right|bottom|top/g, matched => hash[matched]);\n}\n","import getOuterSizes from './getOuterSizes';\nimport getOppositePlacement from './getOppositePlacement';\n\n/**\n * Get offsets to the popper\n * @method\n * @memberof Popper.Utils\n * @param {Object} position - CSS position the Popper will get applied\n * @param {HTMLElement} popper - the popper element\n * @param {Object} referenceOffsets - the reference offsets (the popper will be relative to this)\n * @param {String} placement - one of the valid placement options\n * @returns {Object} popperOffsets - An object containing the offsets which will be applied to the popper\n */\nexport default function getPopperOffsets(popper, referenceOffsets, placement) {\n placement = placement.split('-')[0];\n\n // Get popper node sizes\n const popperRect = getOuterSizes(popper);\n\n // Add position, width and height to our offsets object\n const popperOffsets = {\n width: popperRect.width,\n height: popperRect.height,\n };\n\n // depending by the popper placement we have to compute its offsets slightly differently\n const isHoriz = ['right', 'left'].indexOf(placement) !== -1;\n const mainSide = isHoriz ? 'top' : 'left';\n const secondarySide = isHoriz ? 'left' : 'top';\n const measurement = isHoriz ? 'height' : 'width';\n const secondaryMeasurement = !isHoriz ? 'height' : 'width';\n\n popperOffsets[mainSide] =\n referenceOffsets[mainSide] +\n referenceOffsets[measurement] / 2 -\n popperRect[measurement] / 2;\n if (placement === secondarySide) {\n popperOffsets[secondarySide] =\n referenceOffsets[secondarySide] - popperRect[secondaryMeasurement];\n } else {\n popperOffsets[secondarySide] =\n referenceOffsets[getOppositePlacement(secondarySide)];\n }\n\n return popperOffsets;\n}\n","/**\n * Mimics the `find` method of Array\n * @method\n * @memberof Popper.Utils\n * @argument {Array} arr\n * @argument prop\n * @argument value\n * @returns index or -1\n */\nexport default function find(arr, check) {\n // use native find if supported\n if (Array.prototype.find) {\n return arr.find(check);\n }\n\n // use `filter` to obtain the same behavior of `find`\n return arr.filter(check)[0];\n}\n","import find from './find';\n\n/**\n * Return the index of the matching object\n * @method\n * @memberof Popper.Utils\n * @argument {Array} arr\n * @argument prop\n * @argument value\n * @returns index or -1\n */\nexport default function findIndex(arr, prop, value) {\n // use native findIndex if supported\n if (Array.prototype.findIndex) {\n return arr.findIndex(cur => cur[prop] === value);\n }\n\n // use `find` + `indexOf` if `findIndex` isn't supported\n const match = find(arr, obj => obj[prop] === value);\n return arr.indexOf(match);\n}\n","import isFunction from './isFunction';\nimport findIndex from './findIndex';\nimport getClientRect from '../utils/getClientRect';\n\n/**\n * Loop trough the list of modifiers and run them in order,\n * each of them will then edit the data object.\n * @method\n * @memberof Popper.Utils\n * @param {dataObject} data\n * @param {Array} modifiers\n * @param {String} ends - Optional modifier name used as stopper\n * @returns {dataObject}\n */\nexport default function runModifiers(modifiers, data, ends) {\n const modifiersToRun = ends === undefined\n ? modifiers\n : modifiers.slice(0, findIndex(modifiers, 'name', ends));\n\n modifiersToRun.forEach(modifier => {\n if (modifier['function']) { // eslint-disable-line dot-notation\n console.warn('`modifier.function` is deprecated, use `modifier.fn`!');\n }\n const fn = modifier['function'] || modifier.fn; // eslint-disable-line dot-notation\n if (modifier.enabled && isFunction(fn)) {\n // Add properties to offsets to make them a complete clientRect object\n // we do this before each modifier to make sure the previous one doesn't\n // mess with these values\n data.offsets.popper = getClientRect(data.offsets.popper);\n data.offsets.reference = getClientRect(data.offsets.reference);\n\n data = fn(data, modifier);\n }\n });\n\n return data;\n}\n","import computeAutoPlacement from '../utils/computeAutoPlacement';\nimport getReferenceOffsets from '../utils/getReferenceOffsets';\nimport getPopperOffsets from '../utils/getPopperOffsets';\nimport runModifiers from '../utils/runModifiers';\n\n/**\n * Updates the position of the popper, computing the new offsets and applying\n * the new style.<br />\n * Prefer `scheduleUpdate` over `update` because of performance reasons.\n * @method\n * @memberof Popper\n */\nexport default function update() {\n // if popper is destroyed, don't perform any further update\n if (this.state.isDestroyed) {\n return;\n }\n\n let data = {\n instance: this,\n styles: {},\n arrowStyles: {},\n attributes: {},\n flipped: false,\n offsets: {},\n };\n\n // compute reference element offsets\n data.offsets.reference = getReferenceOffsets(\n this.state,\n this.popper,\n this.reference,\n this.options.positionFixed\n );\n\n // compute auto placement, store placement inside the data object,\n // modifiers will be able to edit `placement` if needed\n // and refer to originalPlacement to know the original value\n data.placement = computeAutoPlacement(\n this.options.placement,\n data.offsets.reference,\n this.popper,\n this.reference,\n this.options.modifiers.flip.boundariesElement,\n this.options.modifiers.flip.padding\n );\n\n // store the computed placement inside `originalPlacement`\n data.originalPlacement = data.placement;\n\n data.positionFixed = this.options.positionFixed;\n\n // compute the popper offsets\n data.offsets.popper = getPopperOffsets(\n this.popper,\n data.offsets.reference,\n data.placement\n );\n\n data.offsets.popper.position = this.options.positionFixed\n ? 'fixed'\n : 'absolute';\n\n // run the modifiers\n data = runModifiers(this.modifiers, data);\n\n // the first `update` will call `onCreate` callback\n // the other ones will call `onUpdate` callback\n if (!this.state.isCreated) {\n this.state.isCreated = true;\n this.options.onCreate(data);\n } else {\n this.options.onUpdate(data);\n }\n}\n","/**\n * Helper used to know if the given modifier is enabled.\n * @method\n * @memberof Popper.Utils\n * @returns {Boolean}\n */\nexport default function isModifierEnabled(modifiers, modifierName) {\n return modifiers.some(\n ({ name, enabled }) => enabled && name === modifierName\n );\n}\n","/**\n * Get the prefixed supported property name\n * @method\n * @memberof Popper.Utils\n * @argument {String} property (camelCase)\n * @returns {String} prefixed property (camelCase or PascalCase, depending on the vendor prefix)\n */\nexport default function getSupportedPropertyName(property) {\n const prefixes = [false, 'ms', 'Webkit', 'Moz', 'O'];\n const upperProp = property.charAt(0).toUpperCase() + property.slice(1);\n\n for (let i = 0; i < prefixes.length; i++) {\n const prefix = prefixes[i];\n const toCheck = prefix ? `${prefix}${upperProp}` : property;\n if (typeof document.body.style[toCheck] !== 'undefined') {\n return toCheck;\n }\n }\n return null;\n}\n","import isModifierEnabled from '../utils/isModifierEnabled';\nimport getSupportedPropertyName from '../utils/getSupportedPropertyName';\n\n/**\n * Destroys the popper.\n * @method\n * @memberof Popper\n */\nexport default function destroy() {\n this.state.isDestroyed = true;\n\n // touch DOM only if `applyStyle` modifier is enabled\n if (isModifierEnabled(this.modifiers, 'applyStyle')) {\n this.popper.removeAttribute('x-placement');\n this.popper.style.position = '';\n this.popper.style.top = '';\n this.popper.style.left = '';\n this.popper.style.right = '';\n this.popper.style.bottom = '';\n this.popper.style.willChange = '';\n this.popper.style[getSupportedPropertyName('transform')] = '';\n }\n\n this.disableEventListeners();\n\n // remove the popper if user explicity asked for the deletion on destroy\n // do not use `remove` because IE11 doesn't support it\n if (this.options.removeOnDestroy) {\n this.popper.parentNode.removeChild(this.popper);\n }\n return this;\n}\n","/**\n * Get the window associated with the element\n * @argument {Element} element\n * @returns {Window}\n */\nexport default function getWindow(element) {\n const ownerDocument = element.ownerDocument;\n return ownerDocument ? ownerDocument.defaultView : window;\n}\n","import getScrollParent from './getScrollParent';\nimport getWindow from './getWindow';\n\nfunction attachToScrollParents(scrollParent, event, callback, scrollParents) {\n const isBody = scrollParent.nodeName === 'BODY';\n const target = isBody ? scrollParent.ownerDocument.defaultView : scrollParent;\n target.addEventListener(event, callback, { passive: true });\n\n if (!isBody) {\n attachToScrollParents(\n getScrollParent(target.parentNode),\n event,\n callback,\n scrollParents\n );\n }\n scrollParents.push(target);\n}\n\n/**\n * Setup needed event listeners used to update the popper position\n * @method\n * @memberof Popper.Utils\n * @private\n */\nexport default function setupEventListeners(\n reference,\n options,\n state,\n updateBound\n) {\n // Resize event listener on window\n state.updateBound = updateBound;\n getWindow(reference).addEventListener('resize', state.updateBound, { passive: true });\n\n // Scroll event listener on scroll parents\n const scrollElement = getScrollParent(reference);\n attachToScrollParents(\n scrollElement,\n 'scroll',\n state.updateBound,\n state.scrollParents\n );\n state.scrollElement = scrollElement;\n state.eventsEnabled = true;\n\n return state;\n}\n","import setupEventListeners from '../utils/setupEventListeners';\n\n/**\n * It will add resize/scroll events and start recalculating\n * position of the popper element when they are triggered.\n * @method\n * @memberof Popper\n */\nexport default function enableEventListeners() {\n if (!this.state.eventsEnabled) {\n this.state = setupEventListeners(\n this.reference,\n this.options,\n this.state,\n this.scheduleUpdate\n );\n }\n}\n","import getWindow from './getWindow';\n\n/**\n * Remove event listeners used to update the popper position\n * @method\n * @memberof Popper.Utils\n * @private\n */\nexport default function removeEventListeners(reference, state) {\n // Remove resize event listener on window\n getWindow(reference).removeEventListener('resize', state.updateBound);\n\n // Remove scroll event listener on scroll parents\n state.scrollParents.forEach(target => {\n target.removeEventListener('scroll', state.updateBound);\n });\n\n // Reset state\n state.updateBound = null;\n state.scrollParents = [];\n state.scrollElement = null;\n state.eventsEnabled = false;\n return state;\n}\n","import removeEventListeners from '../utils/removeEventListeners';\n\n/**\n * It will remove resize/scroll events and won't recalculate popper position\n * when they are triggered. It also won't trigger `onUpdate` callback anymore,\n * unless you call `update` method manually.\n * @method\n * @memberof Popper\n */\nexport default function disableEventListeners() {\n if (this.state.eventsEnabled) {\n cancelAnimationFrame(this.scheduleUpdate);\n this.state = removeEventListeners(this.reference, this.state);\n }\n}\n","/**\n * Tells if a given input is a number\n * @method\n * @memberof Popper.Utils\n * @param {*} input to check\n * @return {Boolean}\n */\nexport default function isNumeric(n) {\n return n !== '' && !isNaN(parseFloat(n)) && isFinite(n);\n}\n","import isNumeric from './isNumeric';\n\n/**\n * Set the style to the given popper\n * @method\n * @memberof Popper.Utils\n * @argument {Element} element - Element to apply the style to\n * @argument {Object} styles\n * Object with a list of properties and values which will be applied to the element\n */\nexport default function setStyles(element, styles) {\n Object.keys(styles).forEach(prop => {\n let unit = '';\n // add unit if the value is numeric and is one of the following\n if (\n ['width', 'height', 'top', 'right', 'bottom', 'left'].indexOf(prop) !==\n -1 &&\n isNumeric(styles[prop])\n ) {\n unit = 'px';\n }\n element.style[prop] = styles[prop] + unit;\n });\n}\n","/**\n * Set the attributes to the given popper\n * @method\n * @memberof Popper.Utils\n * @argument {Element} element - Element to apply the attributes to\n * @argument {Object} styles\n * Object with a list of properties and values which will be applied to the element\n */\nexport default function setAttributes(element, attributes) {\n Object.keys(attributes).forEach(function(prop) {\n const value = attributes[prop];\n if (value !== false) {\n element.setAttribute(prop, attributes[prop]);\n } else {\n element.removeAttribute(prop);\n }\n });\n}\n","/**\n * @function\n * @memberof Popper.Utils\n * @argument {Object} data - The data object generated by `update` method\n * @argument {Boolean} shouldRound - If the offsets should be rounded at all\n * @returns {Object} The popper's position offsets rounded\n *\n * The tale of pixel-perfect positioning. It's still not 100% perfect, but as\n * good as it can be within reason.\n * Discussion here: https://github.com/FezVrasta/popper.js/pull/715\n *\n * Low DPI screens cause a popper to be blurry if not using full pixels (Safari\n * as well on High DPI screens).\n *\n * Firefox prefers no rounding for positioning and does not have blurriness on\n * high DPI screens.\n *\n * Only horizontal placement and left/right values need to be considered.\n */\nexport default function getRoundedOffsets(data, shouldRound) {\n const { popper, reference } = data.offsets;\n const { round, floor } = Math;\n const noRound = v => v;\n \n const referenceWidth = round(reference.width);\n const popperWidth = round(popper.width);\n \n const isVertical = ['left', 'right'].indexOf(data.placement) !== -1;\n const isVariation = data.placement.indexOf('-') !== -1;\n const sameWidthParity = referenceWidth % 2 === popperWidth % 2;\n const bothOddWidth = referenceWidth % 2 === 1 && popperWidth % 2 === 1;\n\n const horizontalToInteger = !shouldRound\n ? noRound\n : isVertical || isVariation || sameWidthParity\n ? round\n : floor;\n const verticalToInteger = !shouldRound ? noRound : round;\n\n return {\n left: horizontalToInteger(\n bothOddWidth && !isVariation && shouldRound\n ? popper.left - 1\n : popper.left\n ),\n top: verticalToInteger(popper.top),\n bottom: verticalToInteger(popper.bottom),\n right: horizontalToInteger(popper.right),\n };\n}\n","import find from './find';\n\n/**\n * Helper used to know if the given modifier depends from another one.<br />\n * It checks if the needed modifier is listed and enabled.\n * @method\n * @memberof Popper.Utils\n * @param {Array} modifiers - list of modifiers\n * @param {String} requestingName - name of requesting modifier\n * @param {String} requestedName - name of requested modifier\n * @returns {Boolean}\n */\nexport default function isModifierRequired(\n modifiers,\n requestingName,\n requestedName\n) {\n const requesting = find(modifiers, ({ name }) => name === requestingName);\n\n const isRequired =\n !!requesting &&\n modifiers.some(modifier => {\n return (\n modifier.name === requestedName &&\n modifier.enabled &&\n modifier.order < requesting.order\n );\n });\n\n if (!isRequired) {\n const requesting = `\\`${requestingName}\\``;\n const requested = `\\`${requestedName}\\``;\n console.warn(\n `${requested} modifier is required by ${requesting} modifier in order to work, be sure to include it before ${requesting}!`\n );\n }\n return isRequired;\n}\n","/**\n * Get the opposite placement variation of the given one\n * @method\n * @memberof Popper.Utils\n * @argument {String} placement variation\n * @returns {String} flipped placement variation\n */\nexport default function getOppositeVariation(variation) {\n if (variation === 'end') {\n return 'start';\n } else if (variation === 'start') {\n return 'end';\n }\n return variation;\n}\n","import placements from '../methods/placements';\n\n// Get rid of `auto` `auto-start` and `auto-end`\nconst validPlacements = placements.slice(3);\n\n/**\n * Given an initial placement, returns all the subsequent placements\n * clockwise (or counter-clockwise).\n *\n * @method\n * @memberof Popper.Utils\n * @argument {String} placement - A valid placement (it accepts variations)\n * @argument {Boolean} counter - Set to true to walk the placements counterclockwise\n * @returns {Array} placements including their variations\n */\nexport default function clockwise(placement, counter = false) {\n const index = validPlacements.indexOf(placement);\n const arr = validPlacements\n .slice(index + 1)\n .concat(validPlacements.slice(0, index));\n return counter ? arr.reverse() : arr;\n}\n","import isNumeric from '../utils/isNumeric';\nimport getClientRect from '../utils/getClientRect';\nimport find from '../utils/find';\n\n/**\n * Converts a string containing value + unit into a px value number\n * @function\n * @memberof {modifiers~offset}\n * @private\n * @argument {String} str - Value + unit string\n * @argument {String} measurement - `height` or `width`\n * @argument {Object} popperOffsets\n * @argument {Object} referenceOffsets\n * @returns {Number|String}\n * Value in pixels, or original string if no values were extracted\n */\nexport function toValue(str, measurement, popperOffsets, referenceOffsets) {\n // separate value from unit\n const split = str.match(/((?:\\-|\\+)?\\d*\\.?\\d*)(.*)/);\n const value = +split[1];\n const unit = split[2];\n\n // If it's not a number it's an operator, I guess\n if (!value) {\n return str;\n }\n\n if (unit.indexOf('%') === 0) {\n let element;\n switch (unit) {\n case '%p':\n element = popperOffsets;\n break;\n case '%':\n case '%r':\n default:\n element = referenceOffsets;\n }\n\n const rect = getClientRect(element);\n return rect[measurement] / 100 * value;\n } else if (unit === 'vh' || unit === 'vw') {\n // if is a vh or vw, we calculate the size based on the viewport\n let size;\n if (unit === 'vh') {\n size = Math.max(\n document.documentElement.clientHeight,\n window.innerHeight || 0\n );\n } else {\n size = Math.max(\n document.documentElement.clientWidth,\n window.innerWidth || 0\n );\n }\n return size / 100 * value;\n } else {\n // if is an explicit pixel unit, we get rid of the unit and keep the value\n // if is an implicit unit, it's px, and we return just the value\n return value;\n }\n}\n\n/**\n * Parse an `offset` string to extrapolate `x` and `y` numeric offsets.\n * @function\n * @memberof {modifiers~offset}\n * @private\n * @argument {String} offset\n * @argument {Object} popperOffsets\n * @argument {Object} referenceOffsets\n * @argument {String} basePlacement\n * @returns {Array} a two cells array with x and y offsets in numbers\n */\nexport function parseOffset(\n offset,\n popperOffsets,\n referenceOffsets,\n basePlacement\n) {\n const offsets = [0, 0];\n\n // Use height if placement is left or right and index is 0 otherwise use width\n // in this way the first offset will use an axis and the second one\n // will use the other one\n const useHeight = ['right', 'left'].indexOf(basePlacement) !== -1;\n\n // Split the offset string to obtain a list of values and operands\n // The regex addresses values with the plus or minus sign in front (+10, -20, etc)\n const fragments = offset.split(/(\\+|\\-)/).map(frag => frag.trim());\n\n // Detect if the offset string contains a pair of values or a single one\n // they could be separated by comma or space\n const divider = fragments.indexOf(\n find(fragments, frag => frag.search(/,|\\s/) !== -1)\n );\n\n if (fragments[divider] && fragments[divider].indexOf(',') === -1) {\n console.warn(\n 'Offsets separated by white space(s) are deprecated, use a comma (,) instead.'\n );\n }\n\n // If divider is found, we divide the list of values and operands to divide\n // them by ofset X and Y.\n const splitRegex = /\\s*,\\s*|\\s+/;\n let ops = divider !== -1\n ? [\n fragments\n .slice(0, divider)\n .concat([fragments[divider].split(splitRegex)[0]]),\n [fragments[divider].split(splitRegex)[1]].concat(\n fragments.slice(divider + 1)\n ),\n ]\n : [fragments];\n\n // Convert the values with units to absolute pixels to allow our computations\n ops = ops.map((op, index) => {\n // Most of the units rely on the orientation of the popper\n const measurement = (index === 1 ? !useHeight : useHeight)\n ? 'height'\n : 'width';\n let mergeWithPrevious = false;\n return (\n op\n // This aggregates any `+` or `-` sign that aren't considered operators\n // e.g.: 10 + +5 => [10, +, +5]\n .reduce((a, b) => {\n if (a[a.length - 1] === '' && ['+', '-'].indexOf(b) !== -1) {\n a[a.length - 1] = b;\n mergeWithPrevious = true;\n return a;\n } else if (mergeWithPrevious) {\n a[a.length - 1] += b;\n mergeWithPrevious = false;\n return a;\n } else {\n return a.concat(b);\n }\n }, [])\n // Here we convert the string values into number values (in px)\n .map(str => toValue(str, measurement, popperOffsets, referenceOffsets))\n );\n });\n\n // Loop trough the offsets arrays and execute the operations\n ops.forEach((op, index) => {\n op.forEach((frag, index2) => {\n if (isNumeric(frag)) {\n offsets[index] += frag * (op[index2 - 1] === '-' ? -1 : 1);\n }\n });\n });\n return offsets;\n}\n\n/**\n * @function\n * @memberof Modifiers\n * @argument {Object} data - The data object generated by update method\n * @argument {Object} options - Modifiers configuration and options\n * @argument {Number|String} options.offset=0\n * The offset value as described in the modifier description\n * @returns {Object} The data object, properly modified\n */\nexport default function offset(data, { offset }) {\n const { placement, offsets: { popper, reference } } = data;\n const basePlacement = placement.split('-')[0];\n\n let offsets;\n if (isNumeric(+offset)) {\n offsets = [+offset, 0];\n } else {\n offsets = parseOffset(offset, popper, reference, basePlacement);\n }\n\n if (basePlacement === 'left') {\n popper.top += offsets[0];\n popper.left -= offsets[1];\n } else if (basePlacement === 'right') {\n popper.top += offsets[0];\n popper.left += offsets[1];\n } else if (basePlacement === 'top') {\n popper.left += offsets[0];\n popper.top -= offsets[1];\n } else if (basePlacement === 'bottom') {\n popper.left += offsets[0];\n popper.top += offsets[1];\n }\n\n data.popper = popper;\n return data;\n}\n","import isBrowser from './isBrowser';\n\nconst longerTimeoutBrowsers = ['Edge', 'Trident', 'Firefox'];\nlet timeoutDuration = 0;\nfor (let i = 0; i < longerTimeoutBrowsers.length; i += 1) {\n if (isBrowser && navigator.userAgent.indexOf(longerTimeoutBrowsers[i]) >= 0) {\n timeoutDuration = 1;\n break;\n }\n}\n\nexport function microtaskDebounce(fn) {\n let called = false\n return () => {\n if (called) {\n return\n }\n called = true\n window.Promise.resolve().then(() => {\n called = false\n fn()\n })\n }\n}\n\nexport function taskDebounce(fn) {\n let scheduled = false;\n return () => {\n if (!scheduled) {\n scheduled = true;\n setTimeout(() => {\n scheduled = false;\n fn();\n }, timeoutDuration);\n }\n };\n}\n\nconst supportsMicroTasks = isBrowser && window.Promise\n\n\n/**\n* Create a debounced version of a method, that's asynchronously deferred\n* but called in the minimum time possible.\n*\n* @method\n* @memberof Popper.Utils\n* @argument {Function} fn\n* @returns {Function}\n*/\nexport default (supportsMicroTasks\n ? microtaskDebounce\n : taskDebounce);\n","import getClientRect from '../utils/getClientRect';\nimport getOuterSizes from '../utils/getOuterSizes';\nimport isModifierRequired from '../utils/isModifierRequired';\nimport getStyleComputedProperty from '../utils/getStyleComputedProperty';\n\n/**\n * @function\n * @memberof Modifiers\n * @argument {Object} data - The data object generated by update method\n * @argument {Object} options - Modifiers configuration and options\n * @returns {Object} The data object, properly modified\n */\nexport default function arrow(data, options) {\n // arrow depends on keepTogether in order to work\n if (!isModifierRequired(data.instance.modifiers, 'arrow', 'keepTogether')) {\n return data;\n }\n\n let arrowElement = options.element;\n\n // if arrowElement is a string, suppose it's a CSS selector\n if (typeof arrowElement === 'string') {\n arrowElement = data.instance.popper.querySelector(arrowElement);\n\n // if arrowElement is not found, don't run the modifier\n if (!arrowElement) {\n return data;\n }\n } else {\n // if the arrowElement isn't a query selector we must check that the\n // provided DOM node is child of its popper node\n if (!data.instance.popper.contains(arrowElement)) {\n console.warn(\n 'WARNING: `arrow.element` must be child of its popper element!'\n );\n return data;\n }\n }\n\n const placement = data.placement.split('-')[0];\n const { popper, reference } = data.offsets;\n const isVertical = ['left', 'right'].indexOf(placement) !== -1;\n\n const len = isVertical ? 'height' : 'width';\n const sideCapitalized = isVertical ? 'Top' : 'Left';\n const side = sideCapitalized.toLowerCase();\n const altSide = isVertical ? 'left' : 'top';\n const opSide = isVertical ? 'bottom' : 'right';\n const arrowElementSize = getOuterSizes(arrowElement)[len];\n\n //\n // extends keepTogether behavior making sure the popper and its\n // reference have enough pixels in conjunction\n //\n\n // top/left side\n if (reference[opSide] - arrowElementSize < popper[side]) {\n data.offsets.popper[side] -=\n popper[side] - (reference[opSide] - arrowElementSize);\n }\n // bottom/right side\n if (reference[side] + arrowElementSize > popper[opSide]) {\n data.offsets.popper[side] +=\n reference[side] + arrowElementSize - popper[opSide];\n }\n data.offsets.popper = getClientRect(data.offsets.popper);\n\n // compute center of the popper\n const center = reference[side] + reference[len] / 2 - arrowElementSize / 2;\n\n // Compute the sideValue using the updated popper offsets\n // take popper margin in account because we don't have this info available\n const css = getStyleComputedProperty(data.instance.popper);\n const popperMarginSide = parseFloat(css[`margin${sideCapitalized}`], 10);\n const popperBorderSide = parseFloat(css[`border${sideCapitalized}Width`], 10);\n let sideValue =\n center - data.offsets.popper[side] - popperMarginSide - popperBorderSide;\n\n // prevent arrowElement from being placed not contiguously to its popper\n sideValue = Math.max(Math.min(popper[len] - arrowElementSize, sideValue), 0);\n\n data.arrowElement = arrowElement;\n data.offsets.arrow = {\n [side]: Math.round(sideValue),\n [altSide]: '', // make sure to unset any eventual altSide value from the DOM node\n };\n\n return data;\n}\n","export default typeof window !== 'undefined' && typeof document !== 'undefined';\n","import getSupportedPropertyName from '../utils/getSupportedPropertyName';\nimport find from '../utils/find';\nimport getOffsetParent from '../utils/getOffsetParent';\nimport getBoundingClientRect from '../utils/getBoundingClientRect';\nimport getRoundedOffsets from '../utils/getRoundedOffsets';\nimport isBrowser from '../utils/isBrowser';\n\nconst isFirefox = isBrowser && /Firefox/i.test(navigator.userAgent);\n\n/**\n * @function\n * @memberof Modifiers\n * @argument {Object} data - The data object generated by `update` method\n * @argument {Object} options - Modifiers configuration and options\n * @returns {Object} The data object, properly modified\n */\nexport default function computeStyle(data, options) {\n const { x, y } = options;\n const { popper } = data.offsets;\n\n // Remove this legacy support in Popper.js v2\n const legacyGpuAccelerationOption = find(\n data.instance.modifiers,\n modifier => modifier.name === 'applyStyle'\n ).gpuAcceleration;\n if (legacyGpuAccelerationOption !== undefined) {\n console.warn(\n 'WARNING: `gpuAcceleration` option moved to `computeStyle` modifier and will not be supported in future versions of Popper.js!'\n );\n }\n const gpuAcceleration =\n legacyGpuAccelerationOption !== undefined\n ? legacyGpuAccelerationOption\n : options.gpuAcceleration;\n\n const offsetParent = getOffsetParent(data.instance.popper);\n const offsetParentRect = getBoundingClientRect(offsetParent);\n\n // Styles\n const styles = {\n position: popper.position,\n };\n\n const offsets = getRoundedOffsets(\n data,\n window.devicePixelRatio < 2 || !isFirefox\n );\n\n const sideA = x === 'bottom' ? 'top' : 'bottom';\n const sideB = y === 'right' ? 'left' : 'right';\n\n // if gpuAcceleration is set to `true` and transform is supported,\n // we use `translate3d` to apply the position to the popper we\n // automatically use the supported prefixed version if needed\n const prefixedProperty = getSupportedPropertyName('transform');\n\n // now, let's make a step back and look at this code closely (wtf?)\n // If the content of the popper grows once it's been positioned, it\n // may happen that the popper gets misplaced because of the new content\n // overflowing its reference element\n // To avoid this problem, we provide two options (x and y), which allow\n // the consumer to define the offset origin.\n // If we position a popper on top of a reference element, we can set\n // `x` to `top` to make the popper grow towards its top instead of\n // its bottom.\n let left, top;\n if (sideA === 'bottom') {\n // when offsetParent is <html> the positioning is relative to the bottom of the screen (excluding the scrollbar)\n // and not the bottom of the html element\n if (offsetParent.nodeName === 'HTML') {\n top = -offsetParent.clientHeight + offsets.bottom;\n } else {\n top = -offsetParentRect.height + offsets.bottom;\n }\n } else {\n top = offsets.top;\n }\n if (sideB === 'right') {\n if (offsetParent.nodeName === 'HTML') {\n left = -offsetParent.clientWidth + offsets.right;\n } else {\n left = -offsetParentRect.width + offsets.right;\n }\n } else {\n left = offsets.left;\n }\n if (gpuAcceleration && prefixedProperty) {\n styles[prefixedProperty] = `translate3d(${left}px, ${top}px, 0)`;\n styles[sideA] = 0;\n styles[sideB] = 0;\n styles.willChange = 'transform';\n } else {\n // othwerise, we use the standard `top`, `left`, `bottom` and `right` properties\n const invertTop = sideA === 'bottom' ? -1 : 1;\n const invertLeft = sideB === 'right' ? -1 : 1;\n styles[sideA] = top * invertTop;\n styles[sideB] = left * invertLeft;\n styles.willChange = `${sideA}, ${sideB}`;\n }\n\n // Attributes\n const attributes = {\n 'x-placement': data.placement,\n };\n\n // Update `data` attributes, styles and arrowStyles\n data.attributes = { ...attributes, ...data.attributes };\n data.styles = { ...styles, ...data.styles };\n data.arrowStyles = { ...data.offsets.arrow, ...data.arrowStyles };\n\n return data;\n}\n","import getOppositePlacement from '../utils/getOppositePlacement';\nimport getOppositeVariation from '../utils/getOppositeVariation';\nimport getPopperOffsets from '../utils/getPopperOffsets';\nimport runModifiers from '../utils/runModifiers';\nimport getBoundaries from '../utils/getBoundaries';\nimport isModifierEnabled from '../utils/isModifierEnabled';\nimport clockwise from '../utils/clockwise';\n\nconst BEHAVIORS = {\n FLIP: 'flip',\n CLOCKWISE: 'clockwise',\n COUNTERCLOCKWISE: 'counterclockwise',\n};\n\n/**\n * @function\n * @memberof Modifiers\n * @argument {Object} data - The data object generated by update method\n * @argument {Object} options - Modifiers configuration and options\n * @returns {Object} The data object, properly modified\n */\nexport default function flip(data, options) {\n // if `inner` modifier is enabled, we can't use the `flip` modifier\n if (isModifierEnabled(data.instance.modifiers, 'inner')) {\n return data;\n }\n\n if (data.flipped && data.placement === data.originalPlacement) {\n // seems like flip is trying to loop, probably there's not enough space on any of the flippable sides\n return data;\n }\n\n const boundaries = getBoundaries(\n data.instance.popper,\n data.instance.reference,\n options.padding,\n options.boundariesElement,\n data.positionFixed\n );\n\n let placement = data.placement.split('-')[0];\n let placementOpposite = getOppositePlacement(placement);\n let variation = data.placement.split('-')[1] || '';\n\n let flipOrder = [];\n\n switch (options.behavior) {\n case BEHAVIORS.FLIP:\n flipOrder = [placement, placementOpposite];\n break;\n case BEHAVIORS.CLOCKWISE:\n flipOrder = clockwise(placement);\n break;\n case BEHAVIORS.COUNTERCLOCKWISE:\n flipOrder = clockwise(placement, true);\n break;\n default:\n flipOrder = options.behavior;\n }\n\n flipOrder.forEach((step, index) => {\n if (placement !== step || flipOrder.length === index + 1) {\n return data;\n }\n\n placement = data.placement.split('-')[0];\n placementOpposite = getOppositePlacement(placement);\n\n const popperOffsets = data.offsets.popper;\n const refOffsets = data.offsets.reference;\n\n // using floor because the reference offsets may contain decimals we are not going to consider here\n const floor = Math.floor;\n const overlapsRef =\n (placement === 'left' &&\n floor(popperOffsets.right) > floor(refOffsets.left)) ||\n (placement === 'right' &&\n floor(popperOffsets.left) < floor(refOffsets.right)) ||\n (placement === 'top' &&\n floor(popperOffsets.bottom) > floor(refOffsets.top)) ||\n (placement === 'bottom' &&\n floor(popperOffsets.top) < floor(refOffsets.bottom));\n\n const overflowsLeft = floor(popperOffsets.left) < floor(boundaries.left);\n const overflowsRight = floor(popperOffsets.right) > floor(boundaries.right);\n const overflowsTop = floor(popperOffsets.top) < floor(boundaries.top);\n const overflowsBottom =\n floor(popperOffsets.bottom) > floor(boundaries.bottom);\n\n const overflowsBoundaries =\n (placement === 'left' && overflowsLeft) ||\n (placement === 'right' && overflowsRight) ||\n (placement === 'top' && overflowsTop) ||\n (placement === 'bottom' && overflowsBottom);\n\n // flip the variation if required\n const isVertical = ['top', 'bottom'].indexOf(placement) !== -1;\n\n // flips variation if reference element overflows boundaries\n const flippedVariationByRef =\n !!options.flipVariations &&\n ((isVertical && variation === 'start' && overflowsLeft) ||\n (isVertical && variation === 'end' && overflowsRight) ||\n (!isVertical && variation === 'start' && overflowsTop) ||\n (!isVertical && variation === 'end' && overflowsBottom));\n\n // flips variation if popper content overflows boundaries\n const flippedVariationByContent =\n !!options.flipVariationsByContent &&\n ((isVertical && variation === 'start' && overflowsRight) ||\n (isVertical && variation === 'end' && overflowsLeft) ||\n (!isVertical && variation === 'start' && overflowsBottom) ||\n (!isVertical && variation === 'end' && overflowsTop));\n\n const flippedVariation = flippedVariationByRef || flippedVariationByContent;\n\n if (overlapsRef || overflowsBoundaries || flippedVariation) {\n // this boolean to detect any flip loop\n data.flipped = true;\n\n if (overlapsRef || overflowsBoundaries) {\n placement = flipOrder[index + 1];\n }\n\n if (flippedVariation) {\n variation = getOppositeVariation(variation);\n }\n\n data.placement = placement + (variation ? '-' + variation : '');\n\n // this object contains `position`, we want to preserve it along with\n // any additional property we may add in the future\n data.offsets.popper = {\n ...data.offsets.popper,\n ...getPopperOffsets(\n data.instance.popper,\n data.offsets.reference,\n data.placement\n ),\n };\n\n data = runModifiers(data.instance.modifiers, data, 'flip');\n }\n });\n return data;\n}\n","// Utils\nimport debounce from './utils/debounce';\nimport isFunction from './utils/isFunction';\n\n// Methods\nimport update from './methods/update';\nimport destroy from './methods/destroy';\nimport enableEventListeners from './methods/enableEventListeners';\nimport disableEventListeners from './methods/disableEventListeners';\nimport Defaults from './methods/defaults';\nimport placements from './methods/placements';\n\nexport default class Popper {\n /**\n * Creates a new Popper.js instance.\n * @class Popper\n * @param {Element|referenceObject} reference - The reference element used to position the popper\n * @param {Element} popper - The HTML / XML element used as the popper\n * @param {Object} options - Your custom options to override the ones defined in [Defaults](#defaults)\n * @return {Object} instance - The generated Popper.js instance\n */\n constructor(reference, popper, options = {}) {\n // make update() debounced, so that it only runs at most once-per-tick\n this.update = debounce(this.update.bind(this));\n\n // with {} we create a new object with the options inside it\n this.options = { ...Popper.Defaults, ...options };\n\n // init state\n this.state = {\n isDestroyed: false,\n isCreated: false,\n scrollParents: [],\n };\n\n // get reference and popper elements (allow jQuery wrappers)\n this.reference = reference && reference.jquery ? reference[0] : reference;\n this.popper = popper && popper.jquery ? popper[0] : popper;\n\n // Deep merge modifiers options\n this.options.modifiers = {};\n Object.keys({\n ...Popper.Defaults.modifiers,\n ...options.modifiers,\n }).forEach(name => {\n this.options.modifiers[name] = {\n // If it's a built-in modifier, use it as base\n ...(Popper.Defaults.modifiers[name] || {}),\n // If there are custom options, override and merge with default ones\n ...(options.modifiers ? options.modifiers[name] : {}),\n };\n });\n\n // Refactoring modifiers' list (Object => Array)\n this.modifiers = Object.keys(this.options.modifiers)\n .map(name => ({\n name,\n ...this.options.modifiers[name],\n }))\n // sort the modifiers by order\n .sort((a, b) => a.order - b.order);\n\n // modifiers have the ability to execute arbitrary code when Popper.js get inited\n // such code is executed in the same order of its modifier\n // they could add new properties to their options configuration\n // BE AWARE: don't add options to `options.modifiers.name` but to `modifierOptions`!\n this.modifiers.forEach(modifierOptions => {\n if (modifierOptions.enabled && isFunction(modifierOptions.onLoad)) {\n modifierOptions.onLoad(\n this.reference,\n this.popper,\n this.options,\n modifierOptions,\n this.state\n );\n }\n });\n\n // fire the first update to position the popper in the right place\n this.update();\n\n const eventsEnabled = this.options.eventsEnabled;\n if (eventsEnabled) {\n // setup event listeners, they will take care of update the position in specific situations\n this.enableEventListeners();\n }\n\n this.state.eventsEnabled = eventsEnabled;\n }\n\n // We can't use class properties because they don't get listed in the\n // class prototype and break stuff like Sinon stubs\n update() {\n return update.call(this);\n }\n destroy() {\n return destroy.call(this);\n }\n enableEventListeners() {\n return enableEventListeners.call(this);\n }\n disableEventListeners() {\n return disableEventListeners.call(this);\n }\n\n /**\n * Schedules an update. It will run on the next UI update available.\n * @method scheduleUpdate\n * @memberof Popper\n */\n scheduleUpdate = () => requestAnimationFrame(this.update);\n\n /**\n * Collection of utilities useful when writing custom modifiers.\n * Starting from version 1.7, this method is available only if you\n * include `popper-utils.js` before `popper.js`.\n *\n * **DEPRECATION**: This way to access PopperUtils is deprecated\n * and will be removed in v2! Use the PopperUtils module directly instead.\n * Due to the high instability of the methods contained in Utils, we can't\n * guarantee them to follow semver. Use them at your own risk!\n * @static\n * @private\n * @type {Object}\n * @deprecated since version 1.8\n * @member Utils\n * @memberof Popper\n */\n static Utils = (typeof window !== 'undefined' ? window : global).PopperUtils;\n\n static placements = placements;\n\n static Defaults = Defaults;\n}\n\n/**\n * The `referenceObject` is an object that provides an interface compatible with Popper.js\n * and lets you use it as replacement of a real DOM node.<br />\n * You can use this method to position a popper relatively to a set of coordinates\n * in case you don't have a DOM node to use as reference.\n *\n * ```\n * new Popper(referenceObject, popperNode);\n * ```\n *\n * NB: This feature isn't supported in Internet Explorer 10.\n * @name referenceObject\n * @property {Function} data.getBoundingClientRect\n * A function that returns a set of coordinates compatible with the native `getBoundingClientRect` method.\n * @property {number} data.clientWidth\n * An ES6 getter that will return the width of the virtual reference element.\n * @property {number} data.clientHeight\n * An ES6 getter that will return the height of the virtual reference element.\n */\n","import modifiers from '../modifiers/index';\n\n/**\n * Default options provided to Popper.js constructor.<br />\n * These can be overridden using the `options` argument of Popper.js.<br />\n * To override an option, simply pass an object with the same\n * structure of the `options` object, as the 3rd argument. For example:\n * ```\n * new Popper(ref, pop, {\n * modifiers: {\n * preventOverflow: { enabled: false }\n * }\n * })\n * ```\n * @type {Object}\n * @static\n * @memberof Popper\n */\nexport default {\n /**\n * Popper's placement.\n * @prop {Popper.placements} placement='bottom'\n */\n placement: 'bottom',\n\n /**\n * Set this to true if you want popper to position it self in 'fixed' mode\n * @prop {Boolean} positionFixed=false\n */\n positionFixed: false,\n\n /**\n * Whether events (resize, scroll) are initially enabled.\n * @prop {Boolean} eventsEnabled=true\n */\n eventsEnabled: true,\n\n /**\n * Set to true if you want to automatically remove the popper when\n * you call the `destroy` method.\n * @prop {Boolean} removeOnDestroy=false\n */\n removeOnDestroy: false,\n\n /**\n * Callback called when the popper is created.<br />\n * By default, it is set to no-op.<br />\n * Access Popper.js instance with `data.instance`.\n * @prop {onCreate}\n */\n onCreate: () => {},\n\n /**\n * Callback called when the popper is updated. This callback is not called\n * on the initialization/creation of the popper, but only on subsequent\n * updates.<br />\n * By default, it is set to no-op.<br />\n * Access Popper.js instance with `data.instance`.\n * @prop {onUpdate}\n */\n onUpdate: () => {},\n\n /**\n * List of modifiers used to modify the offsets before they are applied to the popper.\n * They provide most of the functionalities of Popper.js.\n * @prop {modifiers}\n */\n modifiers,\n};\n\n/**\n * @callback onCreate\n * @param {dataObject} data\n */\n\n/**\n * @callback onUpdate\n * @param {dataObject} data\n */\n","import applyStyle, { applyStyleOnLoad } from './applyStyle';\nimport computeStyle from './computeStyle';\nimport arrow from './arrow';\nimport flip from './flip';\nimport keepTogether from './keepTogether';\nimport offset from './offset';\nimport preventOverflow from './preventOverflow';\nimport shift from './shift';\nimport hide from './hide';\nimport inner from './inner';\n\n/**\n * Modifier function, each modifier can have a function of this type assigned\n * to its `fn` property.<br />\n * These functions will be called on each update, this means that you must\n * make sure they are performant enough to avoid performance bottlenecks.\n *\n * @function ModifierFn\n * @argument {dataObject} data - The data object generated by `update` method\n * @argument {Object} options - Modifiers configuration and options\n * @returns {dataObject} The data object, properly modified\n */\n\n/**\n * Modifiers are plugins used to alter the behavior of your poppers.<br />\n * Popper.js uses a set of 9 modifiers to provide all the basic functionalities\n * needed by the library.\n *\n * Usually you don't want to override the `order`, `fn` and `onLoad` props.\n * All the other properties are configurations that could be tweaked.\n * @namespace modifiers\n */\nexport default {\n /**\n * Modifier used to shift the popper on the start or end of its reference\n * element.<br />\n * It will read the variation of the `placement` property.<br />\n * It can be one either `-end` or `-start`.\n * @memberof modifiers\n * @inner\n */\n shift: {\n /** @prop {number} order=100 - Index used to define the order of execution */\n order: 100,\n /** @prop {Boolean} enabled=true - Whether the modifier is enabled or not */\n enabled: true,\n /** @prop {ModifierFn} */\n fn: shift,\n },\n\n /**\n * The `offset` modifier can shift your popper on both its axis.\n *\n * It accepts the following units:\n * - `px` or unit-less, interpreted as pixels\n * - `%` or `%r`, percentage relative to the length of the reference element\n * - `%p`, percentage relative to the length of the popper element\n * - `vw`, CSS viewport width unit\n * - `vh`, CSS viewport height unit\n *\n * For length is intended the main axis relative to the placement of the popper.<br />\n * This means that if the placement is `top` or `bottom`, the length will be the\n * `width`. In case of `left` or `right`, it will be the `height`.\n *\n * You can provide a single value (as `Number` or `String`), or a pair of values\n * as `String` divided by a comma or one (or more) white spaces.<br />\n * The latter is a deprecated method because it leads to confusion and will be\n * removed in v2.<br />\n * Additionally, it accepts additions and subtractions between different units.\n * Note that multiplications and divisions aren't supported.\n *\n * Valid examples are:\n * ```\n * 10\n * '10%'\n * '10, 10'\n * '10%, 10'\n * '10 + 10%'\n * '10 - 5vh + 3%'\n * '-10px + 5vh, 5px - 6%'\n * ```\n * > **NB**: If you desire to apply offsets to your poppers in a way that may make them overlap\n * > with their reference element, unfortunately, you will have to disable the `flip` modifier.\n * > You can read more on this at this [issue](https://github.com/FezVrasta/popper.js/issues/373).\n *\n * @memberof modifiers\n * @inner\n */\n offset: {\n /** @prop {number} order=200 - Index used to define the order of execution */\n order: 200,\n /** @prop {Boolean} enabled=true - Whether the modifier is enabled or not */\n enabled: true,\n /** @prop {ModifierFn} */\n fn: offset,\n /** @prop {Number|String} offset=0\n * The offset value as described in the modifier description\n */\n offset: 0,\n },\n\n /**\n * Modifier used to prevent the popper from being positioned outside the boundary.\n *\n * A scenario exists where the reference itself is not within the boundaries.<br />\n * We can say it has \"escaped the boundaries\" — or just \"escaped\".<br />\n * In this case we need to decide whether the popper should either:\n *\n * - detach from the reference and remain \"trapped\" in the boundaries, or\n * - if it should ignore the boundary and \"escape with its reference\"\n *\n * When `escapeWithReference` is set to`true` and reference is completely\n * outside its boundaries, the popper will overflow (or completely leave)\n * the boundaries in order to remain attached to the edge of the reference.\n *\n * @memberof modifiers\n * @inner\n */\n preventOverflow: {\n /** @prop {number} order=300 - Index used to define the order of execution */\n order: 300,\n /** @prop {Boolean} enabled=true - Whether the modifier is enabled or not */\n enabled: true,\n /** @prop {ModifierFn} */\n fn: preventOverflow,\n /**\n * @prop {Array} [priority=['left','right','top','bottom']]\n * Popper will try to prevent overflow following these priorities by default,\n * then, it could overflow on the left and on top of the `boundariesElement`\n */\n priority: ['left', 'right', 'top', 'bottom'],\n /**\n * @prop {number} padding=5\n * Amount of pixel used to define a minimum distance between the boundaries\n * and the popper. This makes sure the popper always has a little padding\n * between the edges of its container\n */\n padding: 5,\n /**\n * @prop {String|HTMLElement} boundariesElement='scrollParent'\n * Boundaries used by the modifier. Can be `scrollParent`, `window`,\n * `viewport` or any DOM element.\n */\n boundariesElement: 'scrollParent',\n },\n\n /**\n * Modifier used to make sure the reference and its popper stay near each other\n * without leaving any gap between the two. Especially useful when the arrow is\n * enabled and you want to ensure that it points to its reference element.\n * It cares only about the first axis. You can still have poppers with margin\n * between the popper and its reference element.\n * @memberof modifiers\n * @inner\n */\n keepTogether: {\n /** @prop {number} order=400 - Index used to define the order of execution */\n order: 400,\n /** @prop {Boolean} enabled=true - Whether the modifier is enabled or not */\n enabled: true,\n /** @prop {ModifierFn} */\n fn: keepTogether,\n },\n\n /**\n * This modifier is used to move the `arrowElement` of the popper to make\n * sure it is positioned between the reference element and its popper element.\n * It will read the outer size of the `arrowElement` node to detect how many\n * pixels of conjunction are needed.\n *\n * It has no effect if no `arrowElement` is provided.\n * @memberof modifiers\n * @inner\n */\n arrow: {\n /** @prop {number} order=500 - Index used to define the order of execution */\n order: 500,\n /** @prop {Boolean} enabled=true - Whether the modifier is enabled or not */\n enabled: true,\n /** @prop {ModifierFn} */\n fn: arrow,\n /** @prop {String|HTMLElement} element='[x-arrow]' - Selector or node used as arrow */\n element: '[x-arrow]',\n },\n\n /**\n * Modifier used to flip the popper's placement when it starts to overlap its\n * reference element.\n *\n * Requires the `preventOverflow` modifier before it in order to work.\n *\n * **NOTE:** this modifier will interrupt the current update cycle and will\n * restart it if it detects the need to flip the placement.\n * @memberof modifiers\n * @inner\n */\n flip: {\n /** @prop {number} order=600 - Index used to define the order of execution */\n order: 600,\n /** @prop {Boolean} enabled=true - Whether the modifier is enabled or not */\n enabled: true,\n /** @prop {ModifierFn} */\n fn: flip,\n /**\n * @prop {String|Array} behavior='flip'\n * The behavior used to change the popper's placement. It can be one of\n * `flip`, `clockwise`, `counterclockwise` or an array with a list of valid\n * placements (with optional variations)\n */\n behavior: 'flip',\n /**\n * @prop {number} padding=5\n * The popper will flip if it hits the edges of the `boundariesElement`\n */\n padding: 5,\n /**\n * @prop {String|HTMLElement} boundariesElement='viewport'\n * The element which will define the boundaries of the popper position.\n * The popper will never be placed outside of the defined boundaries\n * (except if `keepTogether` is enabled)\n */\n boundariesElement: 'viewport',\n /**\n * @prop {Boolean} flipVariations=false\n * The popper will switch placement variation between `-start` and `-end` when\n * the reference element overlaps its boundaries.\n *\n * The original placement should have a set variation.\n */\n flipVariations: false,\n /**\n * @prop {Boolean} flipVariationsByContent=false\n * The popper will switch placement variation between `-start` and `-end` when\n * the popper element overlaps its reference boundaries.\n *\n * The original placement should have a set variation.\n */\n flipVariationsByContent: false,\n },\n\n /**\n * Modifier used to make the popper flow toward the inner of the reference element.\n * By default, when this modifier is disabled, the popper will be placed outside\n * the reference element.\n * @memberof modifiers\n * @inner\n */\n inner: {\n /** @prop {number} order=700 - Index used to define the order of execution */\n order: 700,\n /** @prop {Boolean} enabled=false - Whether the modifier is enabled or not */\n enabled: false,\n /** @prop {ModifierFn} */\n fn: inner,\n },\n\n /**\n * Modifier used to hide the popper when its reference element is outside of the\n * popper boundaries. It will set a `x-out-of-boundaries` attribute which can\n * be used to hide with a CSS selector the popper when its reference is\n * out of boundaries.\n *\n * Requires the `preventOverflow` modifier before it in order to work.\n * @memberof modifiers\n * @inner\n */\n hide: {\n /** @prop {number} order=800 - Index used to define the order of execution */\n order: 800,\n /** @prop {Boolean} enabled=true - Whether the modifier is enabled or not */\n enabled: true,\n /** @prop {ModifierFn} */\n fn: hide,\n },\n\n /**\n * Computes the style that will be applied to the popper element to gets\n * properly positioned.\n *\n * Note that this modifier will not touch the DOM, it just prepares the styles\n * so that `applyStyle` modifier can apply it. This separation is useful\n * in case you need to replace `applyStyle` with a custom implementation.\n *\n * This modifier has `850` as `order` value to maintain backward compatibility\n * with previous versions of Popper.js. Expect the modifiers ordering method\n * to change in future major versions of the library.\n *\n * @memberof modifiers\n * @inner\n */\n computeStyle: {\n /** @prop {number} order=850 - Index used to define the order of execution */\n order: 850,\n /** @prop {Boolean} enabled=true - Whether the modifier is enabled or not */\n enabled: true,\n /** @prop {ModifierFn} */\n fn: computeStyle,\n /**\n * @prop {Boolean} gpuAcceleration=true\n * If true, it uses the CSS 3D transformation to position the popper.\n * Otherwise, it will use the `top` and `left` properties\n */\n gpuAcceleration: true,\n /**\n * @prop {string} [x='bottom']\n * Where to anchor the X axis (`bottom` or `top`). AKA X offset origin.\n * Change this if your popper should grow in a direction different from `bottom`\n */\n x: 'bottom',\n /**\n * @prop {string} [x='left']\n * Where to anchor the Y axis (`left` or `right`). AKA Y offset origin.\n * Change this if your popper should grow in a direction different from `right`\n */\n y: 'right',\n },\n\n /**\n * Applies the computed styles to the popper element.\n *\n * All the DOM manipulations are limited to this modifier. This is useful in case\n * you want to integrate Popper.js inside a framework or view library and you\n * want to delegate all the DOM manipulations to it.\n *\n * Note that if you disable this modifier, you must make sure the popper element\n * has its position set to `absolute` before Popper.js can do its work!\n *\n * Just disable this modifier and define your own to achieve the desired effect.\n *\n * @memberof modifiers\n * @inner\n */\n applyStyle: {\n /** @prop {number} order=900 - Index used to define the order of execution */\n order: 900,\n /** @prop {Boolean} enabled=true - Whether the modifier is enabled or not */\n enabled: true,\n /** @prop {ModifierFn} */\n fn: applyStyle,\n /** @prop {Function} */\n onLoad: applyStyleOnLoad,\n /**\n * @deprecated since version 1.10.0, the property moved to `computeStyle` modifier\n * @prop {Boolean} gpuAcceleration=true\n * If true, it uses the CSS 3D transformation to position the popper.\n * Otherwise, it will use the `top` and `left` properties\n */\n gpuAcceleration: undefined,\n },\n};\n\n/**\n * The `dataObject` is an object containing all the information used by Popper.js.\n * This object is passed to modifiers and to the `onCreate` and `onUpdate` callbacks.\n * @name dataObject\n * @property {Object} data.instance The Popper.js instance\n * @property {String} data.placement Placement applied to popper\n * @property {String} data.originalPlacement Placement originally defined on init\n * @property {Boolean} data.flipped True if popper has been flipped by flip modifier\n * @property {Boolean} data.hide True if the reference element is out of boundaries, useful to know when to hide the popper\n * @property {HTMLElement} data.arrowElement Node used as arrow by arrow modifier\n * @property {Object} data.styles Any CSS property defined here will be applied to the popper. It expects the JavaScript nomenclature (eg. `marginBottom`)\n * @property {Object} data.arrowStyles Any CSS property defined here will be applied to the popper arrow. It expects the JavaScript nomenclature (eg. `marginBottom`)\n * @property {Object} data.boundaries Offsets of the popper boundaries\n * @property {Object} data.offsets The measurements of popper, reference and arrow elements\n * @property {Object} data.offsets.popper `top`, `left`, `width`, `height` values\n * @property {Object} data.offsets.reference `top`, `left`, `width`, `height` values\n * @property {Object} data.offsets.arrow] `top` and `left` offsets, only one of them will be different from 0\n */\n","/**\n * @function\n * @memberof Modifiers\n * @argument {Object} data - The data object generated by `update` method\n * @argument {Object} options - Modifiers configuration and options\n * @returns {Object} The data object, properly modified\n */\nexport default function shift(data) {\n const placement = data.placement;\n const basePlacement = placement.split('-')[0];\n const shiftvariation = placement.split('-')[1];\n\n // if shift shiftvariation is specified, run the modifier\n if (shiftvariation) {\n const { reference, popper } = data.offsets;\n const isVertical = ['bottom', 'top'].indexOf(basePlacement) !== -1;\n const side = isVertical ? 'left' : 'top';\n const measurement = isVertical ? 'width' : 'height';\n\n const shiftOffsets = {\n start: { [side]: reference[side] },\n end: {\n [side]: reference[side] + reference[measurement] - popper[measurement],\n },\n };\n\n data.offsets.popper = { ...popper, ...shiftOffsets[shiftvariation] };\n }\n\n return data;\n}\n","import getOffsetParent from '../utils/getOffsetParent';\nimport getBoundaries from '../utils/getBoundaries';\nimport getSupportedPropertyName from '../utils/getSupportedPropertyName';\n\n/**\n * @function\n * @memberof Modifiers\n * @argument {Object} data - The data object generated by `update` method\n * @argument {Object} options - Modifiers configuration and options\n * @returns {Object} The data object, properly modified\n */\nexport default function preventOverflow(data, options) {\n let boundariesElement =\n options.boundariesElement || getOffsetParent(data.instance.popper);\n\n // If offsetParent is the reference element, we really want to\n // go one step up and use the next offsetParent as reference to\n // avoid to make this modifier completely useless and look like broken\n if (data.instance.reference === boundariesElement) {\n boundariesElement = getOffsetParent(boundariesElement);\n }\n\n // NOTE: DOM access here\n // resets the popper's position so that the document size can be calculated excluding\n // the size of the popper element itself\n const transformProp = getSupportedPropertyName('transform');\n const popperStyles = data.instance.popper.style; // assignment to help minification\n const { top, left, [transformProp]: transform } = popperStyles;\n popperStyles.top = '';\n popperStyles.left = '';\n popperStyles[transformProp] = '';\n\n const boundaries = getBoundaries(\n data.instance.popper,\n data.instance.reference,\n options.padding,\n boundariesElement,\n data.positionFixed\n );\n\n // NOTE: DOM access here\n // restores the original style properties after the offsets have been computed\n popperStyles.top = top;\n popperStyles.left = left;\n popperStyles[transformProp] = transform;\n\n options.boundaries = boundaries;\n\n const order = options.priority;\n let popper = data.offsets.popper;\n\n const check = {\n primary(placement) {\n let value = popper[placement];\n if (\n popper[placement] < boundaries[placement] &&\n !options.escapeWithReference\n ) {\n value = Math.max(popper[placement], boundaries[placement]);\n }\n return { [placement]: value };\n },\n secondary(placement) {\n const mainSide = placement === 'right' ? 'left' : 'top';\n let value = popper[mainSide];\n if (\n popper[placement] > boundaries[placement] &&\n !options.escapeWithReference\n ) {\n value = Math.min(\n popper[mainSide],\n boundaries[placement] -\n (placement === 'right' ? popper.width : popper.height)\n );\n }\n return { [mainSide]: value };\n },\n };\n\n order.forEach(placement => {\n const side =\n ['left', 'top'].indexOf(placement) !== -1 ? 'primary' : 'secondary';\n popper = { ...popper, ...check[side](placement) };\n });\n\n data.offsets.popper = popper;\n\n return data;\n}\n","/**\n * @function\n * @memberof Modifiers\n * @argument {Object} data - The data object generated by update method\n * @argument {Object} options - Modifiers configuration and options\n * @returns {Object} The data object, properly modified\n */\nexport default function keepTogether(data) {\n const { popper, reference } = data.offsets;\n const placement = data.placement.split('-')[0];\n const floor = Math.floor;\n const isVertical = ['top', 'bottom'].indexOf(placement) !== -1;\n const side = isVertical ? 'right' : 'bottom';\n const opSide = isVertical ? 'left' : 'top';\n const measurement = isVertical ? 'width' : 'height';\n\n if (popper[side] < floor(reference[opSide])) {\n data.offsets.popper[opSide] =\n floor(reference[opSide]) - popper[measurement];\n }\n if (popper[opSide] > floor(reference[side])) {\n data.offsets.popper[opSide] = floor(reference[side]);\n }\n\n return data;\n}\n","import getClientRect from '../utils/getClientRect';\nimport getOppositePlacement from '../utils/getOppositePlacement';\n\n/**\n * @function\n * @memberof Modifiers\n * @argument {Object} data - The data object generated by `update` method\n * @argument {Object} options - Modifiers configuration and options\n * @returns {Object} The data object, properly modified\n */\nexport default function inner(data) {\n const placement = data.placement;\n const basePlacement = placement.split('-')[0];\n const { popper, reference } = data.offsets;\n const isHoriz = ['left', 'right'].indexOf(basePlacement) !== -1;\n\n const subtractLength = ['top', 'left'].indexOf(basePlacement) === -1;\n\n popper[isHoriz ? 'left' : 'top'] =\n reference[basePlacement] -\n (subtractLength ? popper[isHoriz ? 'width' : 'height'] : 0);\n\n data.placement = getOppositePlacement(placement);\n data.offsets.popper = getClientRect(popper);\n\n return data;\n}\n","import isModifierRequired from '../utils/isModifierRequired';\nimport find from '../utils/find';\n\n/**\n * @function\n * @memberof Modifiers\n * @argument {Object} data - The data object generated by update method\n * @argument {Object} options - Modifiers configuration and options\n * @returns {Object} The data object, properly modified\n */\nexport default function hide(data) {\n if (!isModifierRequired(data.instance.modifiers, 'hide', 'preventOverflow')) {\n return data;\n }\n\n const refRect = data.offsets.reference;\n const bound = find(\n data.instance.modifiers,\n modifier => modifier.name === 'preventOverflow'\n ).boundaries;\n\n if (\n refRect.bottom < bound.top ||\n refRect.left > bound.right ||\n refRect.top > bound.bottom ||\n refRect.right < bound.left\n ) {\n // Avoid unnecessary DOM access if visibility hasn't changed\n if (data.hide === true) {\n return data;\n }\n\n data.hide = true;\n data.attributes['x-out-of-boundaries'] = '';\n } else {\n // Avoid unnecessary DOM access if visibility hasn't changed\n if (data.hide === false) {\n return data;\n }\n\n data.hide = false;\n data.attributes['x-out-of-boundaries'] = false;\n }\n\n return data;\n}\n","import setStyles from '../utils/setStyles';\nimport setAttributes from '../utils/setAttributes';\nimport getReferenceOffsets from '../utils/getReferenceOffsets';\nimport computeAutoPlacement from '../utils/computeAutoPlacement';\n\n/**\n * @function\n * @memberof Modifiers\n * @argument {Object} data - The data object generated by `update` method\n * @argument {Object} data.styles - List of style properties - values to apply to popper element\n * @argument {Object} data.attributes - List of attribute properties - values to apply to popper element\n * @argument {Object} options - Modifiers configuration and options\n * @returns {Object} The same data object\n */\nexport default function applyStyle(data) {\n // any property present in `data.styles` will be applied to the popper,\n // in this way we can make the 3rd party modifiers add custom styles to it\n // Be aware, modifiers could override the properties defined in the previous\n // lines of this modifier!\n setStyles(data.instance.popper, data.styles);\n\n // any property present in `data.attributes` will be applied to the popper,\n // they will be set as HTML attributes of the element\n setAttributes(data.instance.popper, data.attributes);\n\n // if arrowElement is defined and arrowStyles has some properties\n if (data.arrowElement && Object.keys(data.arrowStyles).length) {\n setStyles(data.arrowElement, data.arrowStyles);\n }\n\n return data;\n}\n\n/**\n * Set the x-placement attribute before everything else because it could be used\n * to add margins to the popper margins needs to be calculated to get the\n * correct popper offsets.\n * @method\n * @memberof Popper.modifiers\n * @param {HTMLElement} reference - The reference element used to position the popper\n * @param {HTMLElement} popper - The HTML element used as popper\n * @param {Object} options - Popper.js options\n */\nexport function applyStyleOnLoad(\n reference,\n popper,\n options,\n modifierOptions,\n state\n) {\n // compute reference element offsets\n const referenceOffsets = getReferenceOffsets(state, popper, reference, options.positionFixed);\n\n // compute auto placement, store placement inside the data object,\n // modifiers will be able to edit `placement` if needed\n // and refer to originalPlacement to know the original value\n const placement = computeAutoPlacement(\n options.placement,\n referenceOffsets,\n popper,\n reference,\n options.modifiers.flip.boundariesElement,\n options.modifiers.flip.padding\n );\n\n popper.setAttribute('x-placement', placement);\n\n // Apply `position` to popper before anything else because\n // without the position applied we can't guarantee correct computations\n setStyles(popper, { position: options.positionFixed ? 'fixed' : 'absolute' });\n\n return options;\n}\n"],"names":["functionToCheck","getType","toString","call","element","nodeType","window","ownerDocument","defaultView","css","getComputedStyle","property","nodeName","parentNode","host","document","body","getStyleComputedProperty","overflow","overflowX","overflowY","test","getScrollParent","getParentNode","version","isIE11","documentElement","noOffsetParent","isIE","offsetParent","nextElementSibling","indexOf","getOffsetParent","firstElementChild","node","getRoot","element1","element2","order","compareDocumentPosition","Node","DOCUMENT_POSITION_FOLLOWING","start","end","range","createRange","setStart","setEnd","commonAncestorContainer","contains","isOffsetContainer","element1root","findCommonOffsetParent","side","upperSide","html","scrollingElement","subtract","scrollTop","getScroll","scrollLeft","modifier","top","bottom","left","right","sideA","axis","sideB","parseFloat","styles","Math","parseInt","computedStyle","getSize","offsets","width","height","rect","getBoundingClientRect","result","sizes","getWindowSizes","clientWidth","clientHeight","horizScrollbar","offsetWidth","vertScrollbar","offsetHeight","getBordersSize","getClientRect","fixedPosition","isIE10","runIsIE","isHTML","parent","childrenRect","parentRect","scrollParent","borderTopWidth","borderLeftWidth","marginTop","marginLeft","includeScroll","excludeScroll","relativeOffset","getOffsetRectRelativeToArbitraryNode","innerWidth","innerHeight","offset","isFixed","parentElement","el","boundaries","getFixedPositionOffsetParent","boundariesElement","getViewportOffsetRectRelativeToArtbitraryNode","boundariesNode","popper","padding","isPaddingNumber","placement","getBoundaries","rects","refRect","sortedAreas","Object","keys","map","getArea","sort","b","area","a","filteredAreas","filter","computedPlacement","length","key","variation","split","commonOffsetParent","x","marginBottom","y","marginRight","hash","replace","popperRect","getOuterSizes","popperOffsets","isHoriz","mainSide","secondarySide","measurement","secondaryMeasurement","referenceOffsets","getOppositePlacement","Array","prototype","find","arr","findIndex","cur","match","obj","modifiersToRun","ends","modifiers","slice","forEach","warn","fn","enabled","isFunction","data","reference","state","isDestroyed","getReferenceOffsets","options","positionFixed","computeAutoPlacement","flip","originalPlacement","getPopperOffsets","position","runModifiers","isCreated","onUpdate","onCreate","some","name","prefixes","upperProp","charAt","toUpperCase","i","prefix","toCheck","style","isModifierEnabled","removeAttribute","willChange","getSupportedPropertyName","disableEventListeners","removeOnDestroy","removeChild","isBody","target","addEventListener","passive","push","updateBound","scrollElement","scrollParents","eventsEnabled","setupEventListeners","scheduleUpdate","removeEventListener","removeEventListeners","n","isNaN","isFinite","unit","isNumeric","value","attributes","setAttribute","round","noRound","referenceWidth","popperWidth","isVertical","isVariation","horizontalToInteger","verticalToInteger","bothOddWidth","requesting","isRequired","requested","counter","index","validPlacements","concat","reverse","str","size","useHeight","fragments","frag","trim","divider","search","splitRegex","ops","mergeWithPrevious","op","reduce","toValue","index2","basePlacement","parseOffset","min","floor","max","timeoutDuration","longerTimeoutBrowsers","isBrowser","navigator","userAgent","supportsMicroTasks","Promise","called","resolve","then","scheduled","MSInputMethodContext","documentMode","isFirefox","placements","BEHAVIORS","Popper","requestAnimationFrame","update","debounce","bind","Defaults","jquery","modifierOptions","onLoad","enableEventListeners","destroy","Utils","global","PopperUtils","shiftvariation","shiftOffsets","instance","transformProp","popperStyles","transform","priority","check","escapeWithReference","opSide","isModifierRequired","arrowElement","querySelector","len","sideCapitalized","toLowerCase","altSide","arrowElementSize","center","popperMarginSide","popperBorderSide","sideValue","arrow","flipped","placementOpposite","flipOrder","behavior","FLIP","CLOCKWISE","clockwise","COUNTERCLOCKWISE","refOffsets","overlapsRef","overflowsLeft","overflowsRight","overflowsTop","overflowsBottom","overflowsBoundaries","flippedVariationByRef","flipVariations","flippedVariationByContent","flipVariationsByContent","flippedVariation","getOppositeVariation","subtractLength","bound","hide","legacyGpuAccelerationOption","gpuAcceleration","offsetParentRect","getRoundedOffsets","devicePixelRatio","prefixedProperty","invertTop","invertLeft","arrowStyles"],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"popper.min.js","sources":["../../src/utils/isFunction.js","../../src/utils/getStyleComputedProperty.js","../../src/utils/getParentNode.js","../../src/utils/getScrollParent.js","../../src/utils/getReferenceNode.js","../../src/utils/isIE.js","../../src/utils/getOffsetParent.js","../../src/utils/isOffsetContainer.js","../../src/utils/getRoot.js","../../src/utils/findCommonOffsetParent.js","../../src/utils/getScroll.js","../../src/utils/includeScroll.js","../../src/utils/getBordersSize.js","../../src/utils/getWindowSizes.js","../../src/utils/getClientRect.js","../../src/utils/getBoundingClientRect.js","../../src/utils/getOffsetRectRelativeToArbitraryNode.js","../../src/utils/getViewportOffsetRectRelativeToArtbitraryNode.js","../../src/utils/isFixed.js","../../src/utils/getFixedPositionOffsetParent.js","../../src/utils/getBoundaries.js","../../src/utils/computeAutoPlacement.js","../../src/utils/getReferenceOffsets.js","../../src/utils/getOuterSizes.js","../../src/utils/getOppositePlacement.js","../../src/utils/getPopperOffsets.js","../../src/utils/find.js","../../src/utils/findIndex.js","../../src/utils/runModifiers.js","../../src/methods/update.js","../../src/utils/isModifierEnabled.js","../../src/utils/getSupportedPropertyName.js","../../src/methods/destroy.js","../../src/utils/getWindow.js","../../src/utils/setupEventListeners.js","../../src/methods/enableEventListeners.js","../../src/utils/removeEventListeners.js","../../src/methods/disableEventListeners.js","../../src/utils/isNumeric.js","../../src/utils/setStyles.js","../../src/utils/setAttributes.js","../../src/utils/getRoundedOffsets.js","../../src/utils/isModifierRequired.js","../../src/utils/getOppositeVariation.js","../../src/utils/clockwise.js","../../src/modifiers/offset.js","../../src/modifiers/arrow.js","../../src/utils/isBrowser.js","../../src/utils/debounce.js","../../src/modifiers/computeStyle.js","../../src/modifiers/flip.js","../../src/index.js","../../src/methods/defaults.js","../../src/modifiers/index.js","../../src/modifiers/shift.js","../../src/modifiers/preventOverflow.js","../../src/modifiers/keepTogether.js","../../src/modifiers/inner.js","../../src/modifiers/hide.js","../../src/modifiers/applyStyle.js"],"sourcesContent":["/**\n * Check if the given variable is a function\n * @method\n * @memberof Popper.Utils\n * @argument {Any} functionToCheck - variable to check\n * @returns {Boolean} answer to: is a function?\n */\nexport default function isFunction(functionToCheck) {\n const getType = {};\n return (\n functionToCheck &&\n getType.toString.call(functionToCheck) === '[object Function]'\n );\n}\n","/**\n * Get CSS computed property of the given element\n * @method\n * @memberof Popper.Utils\n * @argument {Eement} element\n * @argument {String} property\n */\nexport default function getStyleComputedProperty(element, property) {\n if (element.nodeType !== 1) {\n return [];\n }\n // NOTE: 1 DOM access here\n const window = element.ownerDocument.defaultView;\n const css = window.getComputedStyle(element, null);\n return property ? css[property] : css;\n}\n","/**\n * Returns the parentNode or the host of the element\n * @method\n * @memberof Popper.Utils\n * @argument {Element} element\n * @returns {Element} parent\n */\nexport default function getParentNode(element) {\n if (element.nodeName === 'HTML') {\n return element;\n }\n return element.parentNode || element.host;\n}\n","import getStyleComputedProperty from './getStyleComputedProperty';\nimport getParentNode from './getParentNode';\n\n/**\n * Returns the scrolling parent of the given element\n * @method\n * @memberof Popper.Utils\n * @argument {Element} element\n * @returns {Element} scroll parent\n */\nexport default function getScrollParent(element) {\n // Return body, `getScroll` will take care to get the correct `scrollTop` from it\n if (!element) {\n return document.body\n }\n\n switch (element.nodeName) {\n case 'HTML':\n case 'BODY':\n return element.ownerDocument.body\n case '#document':\n return element.body\n }\n\n // Firefox want us to check `-x` and `-y` variations as well\n const { overflow, overflowX, overflowY } = getStyleComputedProperty(element);\n if (/(auto|scroll|overlay)/.test(overflow + overflowY + overflowX)) {\n return element;\n }\n\n return getScrollParent(getParentNode(element));\n}\n","/**\n * Returns the reference node of the reference object, or the reference object itself.\n * @method\n * @memberof Popper.Utils\n * @param {Element|Object} reference - the reference element (the popper will be relative to this)\n * @returns {Element} parent\n */\nexport default function getReferenceNode(reference) {\n return reference && reference.referenceNode ? reference.referenceNode : reference;\n}\n","import isBrowser from './isBrowser';\n\nconst isIE11 = isBrowser && !!(window.MSInputMethodContext && document.documentMode);\nconst isIE10 = isBrowser && /MSIE 10/.test(navigator.userAgent);\n\n/**\n * Determines if the browser is Internet Explorer\n * @method\n * @memberof Popper.Utils\n * @param {Number} version to check\n * @returns {Boolean} isIE\n */\nexport default function isIE(version) {\n if (version === 11) {\n return isIE11;\n }\n if (version === 10) {\n return isIE10;\n }\n return isIE11 || isIE10;\n}\n","import getStyleComputedProperty from './getStyleComputedProperty';\nimport isIE from './isIE';\n/**\n * Returns the offset parent of the given element\n * @method\n * @memberof Popper.Utils\n * @argument {Element} element\n * @returns {Element} offset parent\n */\nexport default function getOffsetParent(element) {\n if (!element) {\n return document.documentElement;\n }\n\n const noOffsetParent = isIE(10) ? document.body : null;\n\n // NOTE: 1 DOM access here\n let offsetParent = element.offsetParent || null;\n // Skip hidden elements which don't have an offsetParent\n while (offsetParent === noOffsetParent && element.nextElementSibling) {\n offsetParent = (element = element.nextElementSibling).offsetParent;\n }\n\n const nodeName = offsetParent && offsetParent.nodeName;\n\n if (!nodeName || nodeName === 'BODY' || nodeName === 'HTML') {\n return element ? element.ownerDocument.documentElement : document.documentElement;\n }\n\n // .offsetParent will return the closest TH, TD or TABLE in case\n // no offsetParent is present, I hate this job...\n if (\n ['TH', 'TD', 'TABLE'].indexOf(offsetParent.nodeName) !== -1 &&\n getStyleComputedProperty(offsetParent, 'position') === 'static'\n ) {\n return getOffsetParent(offsetParent);\n }\n\n return offsetParent;\n}\n","import getOffsetParent from './getOffsetParent';\n\nexport default function isOffsetContainer(element) {\n const { nodeName } = element;\n if (nodeName === 'BODY') {\n return false;\n }\n return (\n nodeName === 'HTML' || getOffsetParent(element.firstElementChild) === element\n );\n}\n","/**\n * Finds the root node (document, shadowDOM root) of the given element\n * @method\n * @memberof Popper.Utils\n * @argument {Element} node\n * @returns {Element} root node\n */\nexport default function getRoot(node) {\n if (node.parentNode !== null) {\n return getRoot(node.parentNode);\n }\n\n return node;\n}\n","import isOffsetContainer from './isOffsetContainer';\nimport getRoot from './getRoot';\nimport getOffsetParent from './getOffsetParent';\n\n/**\n * Finds the offset parent common to the two provided nodes\n * @method\n * @memberof Popper.Utils\n * @argument {Element} element1\n * @argument {Element} element2\n * @returns {Element} common offset parent\n */\nexport default function findCommonOffsetParent(element1, element2) {\n // This check is needed to avoid errors in case one of the elements isn't defined for any reason\n if (!element1 || !element1.nodeType || !element2 || !element2.nodeType) {\n return document.documentElement;\n }\n\n // Here we make sure to give as \"start\" the element that comes first in the DOM\n const order =\n element1.compareDocumentPosition(element2) &\n Node.DOCUMENT_POSITION_FOLLOWING;\n const start = order ? element1 : element2;\n const end = order ? element2 : element1;\n\n // Get common ancestor container\n const range = document.createRange();\n range.setStart(start, 0);\n range.setEnd(end, 0);\n const { commonAncestorContainer } = range;\n\n // Both nodes are inside #document\n if (\n (element1 !== commonAncestorContainer &&\n element2 !== commonAncestorContainer) ||\n start.contains(end)\n ) {\n if (isOffsetContainer(commonAncestorContainer)) {\n return commonAncestorContainer;\n }\n\n return getOffsetParent(commonAncestorContainer);\n }\n\n // one of the nodes is inside shadowDOM, find which one\n const element1root = getRoot(element1);\n if (element1root.host) {\n return findCommonOffsetParent(element1root.host, element2);\n } else {\n return findCommonOffsetParent(element1, getRoot(element2).host);\n }\n}\n","/**\n * Gets the scroll value of the given element in the given side (top and left)\n * @method\n * @memberof Popper.Utils\n * @argument {Element} element\n * @argument {String} side `top` or `left`\n * @returns {number} amount of scrolled pixels\n */\nexport default function getScroll(element, side = 'top') {\n const upperSide = side === 'top' ? 'scrollTop' : 'scrollLeft';\n const nodeName = element.nodeName;\n\n if (nodeName === 'BODY' || nodeName === 'HTML') {\n const html = element.ownerDocument.documentElement;\n const scrollingElement = element.ownerDocument.scrollingElement || html;\n return scrollingElement[upperSide];\n }\n\n return element[upperSide];\n}\n","import getScroll from './getScroll';\n\n/*\n * Sum or subtract the element scroll values (left and top) from a given rect object\n * @method\n * @memberof Popper.Utils\n * @param {Object} rect - Rect object you want to change\n * @param {HTMLElement} element - The element from the function reads the scroll values\n * @param {Boolean} subtract - set to true if you want to subtract the scroll values\n * @return {Object} rect - The modifier rect object\n */\nexport default function includeScroll(rect, element, subtract = false) {\n const scrollTop = getScroll(element, 'top');\n const scrollLeft = getScroll(element, 'left');\n const modifier = subtract ? -1 : 1;\n rect.top += scrollTop * modifier;\n rect.bottom += scrollTop * modifier;\n rect.left += scrollLeft * modifier;\n rect.right += scrollLeft * modifier;\n return rect;\n}\n","/*\n * Helper to detect borders of a given element\n * @method\n * @memberof Popper.Utils\n * @param {CSSStyleDeclaration} styles\n * Result of `getStyleComputedProperty` on the given element\n * @param {String} axis - `x` or `y`\n * @return {number} borders - The borders size of the given axis\n */\n\nexport default function getBordersSize(styles, axis) {\n const sideA = axis === 'x' ? 'Left' : 'Top';\n const sideB = sideA === 'Left' ? 'Right' : 'Bottom';\n\n return (\n parseFloat(styles[`border${sideA}Width`], 10) +\n parseFloat(styles[`border${sideB}Width`], 10)\n );\n}\n","import isIE from './isIE';\n\nfunction getSize(axis, body, html, computedStyle) {\n return Math.max(\n body[`offset${axis}`],\n body[`scroll${axis}`],\n html[`client${axis}`],\n html[`offset${axis}`],\n html[`scroll${axis}`],\n isIE(10)\n ? (parseInt(html[`offset${axis}`]) + \n parseInt(computedStyle[`margin${axis === 'Height' ? 'Top' : 'Left'}`]) + \n parseInt(computedStyle[`margin${axis === 'Height' ? 'Bottom' : 'Right'}`]))\n : 0 \n );\n}\n\nexport default function getWindowSizes(document) {\n const body = document.body;\n const html = document.documentElement;\n const computedStyle = isIE(10) && getComputedStyle(html);\n\n return {\n height: getSize('Height', body, html, computedStyle),\n width: getSize('Width', body, html, computedStyle),\n };\n}\n","/**\n * Given element offsets, generate an output similar to getBoundingClientRect\n * @method\n * @memberof Popper.Utils\n * @argument {Object} offsets\n * @returns {Object} ClientRect like output\n */\nexport default function getClientRect(offsets) {\n return {\n ...offsets,\n right: offsets.left + offsets.width,\n bottom: offsets.top + offsets.height,\n };\n}\n","import getStyleComputedProperty from './getStyleComputedProperty';\nimport getBordersSize from './getBordersSize';\nimport getWindowSizes from './getWindowSizes';\nimport getScroll from './getScroll';\nimport getClientRect from './getClientRect';\nimport isIE from './isIE';\n\n/**\n * Get bounding client rect of given element\n * @method\n * @memberof Popper.Utils\n * @param {HTMLElement} element\n * @return {Object} client rect\n */\nexport default function getBoundingClientRect(element) {\n let rect = {};\n\n // IE10 10 FIX: Please, don't ask, the element isn't\n // considered in DOM in some circumstances...\n // This isn't reproducible in IE10 compatibility mode of IE11\n try {\n if (isIE(10)) {\n rect = element.getBoundingClientRect();\n const scrollTop = getScroll(element, 'top');\n const scrollLeft = getScroll(element, 'left');\n rect.top += scrollTop;\n rect.left += scrollLeft;\n rect.bottom += scrollTop;\n rect.right += scrollLeft;\n }\n else {\n rect = element.getBoundingClientRect();\n }\n }\n catch(e){}\n\n const result = {\n left: rect.left,\n top: rect.top,\n width: rect.right - rect.left,\n height: rect.bottom - rect.top,\n };\n\n // subtract scrollbar size from sizes\n const sizes = element.nodeName === 'HTML' ? getWindowSizes(element.ownerDocument) : {};\n const width =\n sizes.width || element.clientWidth || result.width;\n const height =\n sizes.height || element.clientHeight || result.height;\n\n let horizScrollbar = element.offsetWidth - width;\n let vertScrollbar = element.offsetHeight - height;\n\n // if an hypothetical scrollbar is detected, we must be sure it's not a `border`\n // we make this check conditional for performance reasons\n if (horizScrollbar || vertScrollbar) {\n const styles = getStyleComputedProperty(element);\n horizScrollbar -= getBordersSize(styles, 'x');\n vertScrollbar -= getBordersSize(styles, 'y');\n\n result.width -= horizScrollbar;\n result.height -= vertScrollbar;\n }\n\n return getClientRect(result);\n}\n","import getStyleComputedProperty from './getStyleComputedProperty';\nimport includeScroll from './includeScroll';\nimport getScrollParent from './getScrollParent';\nimport getBoundingClientRect from './getBoundingClientRect';\nimport runIsIE from './isIE';\nimport getClientRect from './getClientRect';\n\nexport default function getOffsetRectRelativeToArbitraryNode(children, parent, fixedPosition = false) {\n const isIE10 = runIsIE(10);\n const isHTML = parent.nodeName === 'HTML';\n const childrenRect = getBoundingClientRect(children);\n const parentRect = getBoundingClientRect(parent);\n const scrollParent = getScrollParent(children);\n\n const styles = getStyleComputedProperty(parent);\n const borderTopWidth = parseFloat(styles.borderTopWidth, 10);\n const borderLeftWidth = parseFloat(styles.borderLeftWidth, 10);\n\n // In cases where the parent is fixed, we must ignore negative scroll in offset calc\n if(fixedPosition && isHTML) {\n parentRect.top = Math.max(parentRect.top, 0);\n parentRect.left = Math.max(parentRect.left, 0);\n }\n let offsets = getClientRect({\n top: childrenRect.top - parentRect.top - borderTopWidth,\n left: childrenRect.left - parentRect.left - borderLeftWidth,\n width: childrenRect.width,\n height: childrenRect.height,\n });\n offsets.marginTop = 0;\n offsets.marginLeft = 0;\n\n // Subtract margins of documentElement in case it's being used as parent\n // we do this only on HTML because it's the only element that behaves\n // differently when margins are applied to it. The margins are included in\n // the box of the documentElement, in the other cases not.\n if (!isIE10 && isHTML) {\n const marginTop = parseFloat(styles.marginTop, 10);\n const marginLeft = parseFloat(styles.marginLeft, 10);\n\n offsets.top -= borderTopWidth - marginTop;\n offsets.bottom -= borderTopWidth - marginTop;\n offsets.left -= borderLeftWidth - marginLeft;\n offsets.right -= borderLeftWidth - marginLeft;\n\n // Attach marginTop and marginLeft because in some circumstances we may need them\n offsets.marginTop = marginTop;\n offsets.marginLeft = marginLeft;\n }\n\n if (\n isIE10 && !fixedPosition\n ? parent.contains(scrollParent)\n : parent === scrollParent && scrollParent.nodeName !== 'BODY'\n ) {\n offsets = includeScroll(offsets, parent);\n }\n\n return offsets;\n}\n","import getOffsetRectRelativeToArbitraryNode from './getOffsetRectRelativeToArbitraryNode';\nimport getScroll from './getScroll';\nimport getClientRect from './getClientRect';\n\nexport default function getViewportOffsetRectRelativeToArtbitraryNode(element, excludeScroll = false) {\n const html = element.ownerDocument.documentElement;\n const relativeOffset = getOffsetRectRelativeToArbitraryNode(element, html);\n const width = Math.max(html.clientWidth, window.innerWidth || 0);\n const height = Math.max(html.clientHeight, window.innerHeight || 0);\n\n const scrollTop = !excludeScroll ? getScroll(html) : 0;\n const scrollLeft = !excludeScroll ? getScroll(html, 'left') : 0;\n\n const offset = {\n top: scrollTop - relativeOffset.top + relativeOffset.marginTop,\n left: scrollLeft - relativeOffset.left + relativeOffset.marginLeft,\n width,\n height,\n };\n\n return getClientRect(offset);\n}\n","import getStyleComputedProperty from './getStyleComputedProperty';\nimport getParentNode from './getParentNode';\n\n/**\n * Check if the given element is fixed or is inside a fixed parent\n * @method\n * @memberof Popper.Utils\n * @argument {Element} element\n * @argument {Element} customContainer\n * @returns {Boolean} answer to \"isFixed?\"\n */\nexport default function isFixed(element) {\n const nodeName = element.nodeName;\n if (nodeName === 'BODY' || nodeName === 'HTML') {\n return false;\n }\n if (getStyleComputedProperty(element, 'position') === 'fixed') {\n return true;\n }\n const parentNode = getParentNode(element);\n if (!parentNode) {\n return false;\n }\n return isFixed(parentNode);\n}\n","import getStyleComputedProperty from './getStyleComputedProperty';\nimport isIE from './isIE';\n/**\n * Finds the first parent of an element that has a transformed property defined\n * @method\n * @memberof Popper.Utils\n * @argument {Element} element\n * @returns {Element} first transformed parent or documentElement\n */\n\nexport default function getFixedPositionOffsetParent(element) {\n // This check is needed to avoid errors in case one of the elements isn't defined for any reason\n if (!element || !element.parentElement || isIE()) {\n return document.documentElement;\n }\n let el = element.parentElement;\n while (el && getStyleComputedProperty(el, 'transform') === 'none') {\n el = el.parentElement;\n }\n return el || document.documentElement;\n\n}\n","import getScrollParent from './getScrollParent';\nimport getParentNode from './getParentNode';\nimport getReferenceNode from './getReferenceNode';\nimport findCommonOffsetParent from './findCommonOffsetParent';\nimport getOffsetRectRelativeToArbitraryNode from './getOffsetRectRelativeToArbitraryNode';\nimport getViewportOffsetRectRelativeToArtbitraryNode from './getViewportOffsetRectRelativeToArtbitraryNode';\nimport getWindowSizes from './getWindowSizes';\nimport isFixed from './isFixed';\nimport getFixedPositionOffsetParent from './getFixedPositionOffsetParent';\n\n/**\n * Computed the boundaries limits and return them\n * @method\n * @memberof Popper.Utils\n * @param {HTMLElement} popper\n * @param {HTMLElement} reference\n * @param {number} padding\n * @param {HTMLElement} boundariesElement - Element used to define the boundaries\n * @param {Boolean} fixedPosition - Is in fixed position mode\n * @returns {Object} Coordinates of the boundaries\n */\nexport default function getBoundaries(\n popper,\n reference,\n padding,\n boundariesElement,\n fixedPosition = false\n) {\n // NOTE: 1 DOM access here\n\n let boundaries = { top: 0, left: 0 };\n const offsetParent = fixedPosition ? getFixedPositionOffsetParent(popper) : findCommonOffsetParent(popper, getReferenceNode(reference));\n\n // Handle viewport case\n if (boundariesElement === 'viewport' ) {\n boundaries = getViewportOffsetRectRelativeToArtbitraryNode(offsetParent, fixedPosition);\n }\n\n else {\n // Handle other cases based on DOM element used as boundaries\n let boundariesNode;\n if (boundariesElement === 'scrollParent') {\n boundariesNode = getScrollParent(getParentNode(reference));\n if (boundariesNode.nodeName === 'BODY') {\n boundariesNode = popper.ownerDocument.documentElement;\n }\n } else if (boundariesElement === 'window') {\n boundariesNode = popper.ownerDocument.documentElement;\n } else {\n boundariesNode = boundariesElement;\n }\n\n const offsets = getOffsetRectRelativeToArbitraryNode(\n boundariesNode,\n offsetParent,\n fixedPosition\n );\n\n // In case of HTML, we need a different computation\n if (boundariesNode.nodeName === 'HTML' && !isFixed(offsetParent)) {\n const { height, width } = getWindowSizes(popper.ownerDocument);\n boundaries.top += offsets.top - offsets.marginTop;\n boundaries.bottom = height + offsets.top;\n boundaries.left += offsets.left - offsets.marginLeft;\n boundaries.right = width + offsets.left;\n } else {\n // for all the other DOM elements, this one is good\n boundaries = offsets;\n }\n }\n\n // Add paddings\n padding = padding || 0;\n const isPaddingNumber = typeof padding === 'number';\n boundaries.left += isPaddingNumber ? padding : padding.left || 0; \n boundaries.top += isPaddingNumber ? padding : padding.top || 0; \n boundaries.right -= isPaddingNumber ? padding : padding.right || 0; \n boundaries.bottom -= isPaddingNumber ? padding : padding.bottom || 0; \n\n return boundaries;\n}\n","import getBoundaries from '../utils/getBoundaries';\n\nfunction getArea({ width, height }) {\n return width * height;\n}\n\n/**\n * Utility used to transform the `auto` placement to the placement with more\n * available space.\n * @method\n * @memberof Popper.Utils\n * @argument {Object} data - The data object generated by update method\n * @argument {Object} options - Modifiers configuration and options\n * @returns {Object} The data object, properly modified\n */\nexport default function computeAutoPlacement(\n placement,\n refRect,\n popper,\n reference,\n boundariesElement,\n padding = 0\n) {\n if (placement.indexOf('auto') === -1) {\n return placement;\n }\n\n const boundaries = getBoundaries(\n popper,\n reference,\n padding,\n boundariesElement\n );\n\n const rects = {\n top: {\n width: boundaries.width,\n height: refRect.top - boundaries.top,\n },\n right: {\n width: boundaries.right - refRect.right,\n height: boundaries.height,\n },\n bottom: {\n width: boundaries.width,\n height: boundaries.bottom - refRect.bottom,\n },\n left: {\n width: refRect.left - boundaries.left,\n height: boundaries.height,\n },\n };\n\n const sortedAreas = Object.keys(rects)\n .map(key => ({\n key,\n ...rects[key],\n area: getArea(rects[key]),\n }))\n .sort((a, b) => b.area - a.area);\n\n const filteredAreas = sortedAreas.filter(\n ({ width, height }) =>\n width >= popper.clientWidth && height >= popper.clientHeight\n );\n\n const computedPlacement = filteredAreas.length > 0\n ? filteredAreas[0].key\n : sortedAreas[0].key;\n\n const variation = placement.split('-')[1];\n\n return computedPlacement + (variation ? `-${variation}` : '');\n}\n","import findCommonOffsetParent from './findCommonOffsetParent';\nimport getOffsetRectRelativeToArbitraryNode from './getOffsetRectRelativeToArbitraryNode';\nimport getFixedPositionOffsetParent from './getFixedPositionOffsetParent';\nimport getReferenceNode from './getReferenceNode';\n\n/**\n * Get offsets to the reference element\n * @method\n * @memberof Popper.Utils\n * @param {Object} state\n * @param {Element} popper - the popper element\n * @param {Element} reference - the reference element (the popper will be relative to this)\n * @param {Element} fixedPosition - is in fixed position mode\n * @returns {Object} An object containing the offsets which will be applied to the popper\n */\nexport default function getReferenceOffsets(state, popper, reference, fixedPosition = null) {\n const commonOffsetParent = fixedPosition ? getFixedPositionOffsetParent(popper) : findCommonOffsetParent(popper, getReferenceNode(reference));\n return getOffsetRectRelativeToArbitraryNode(reference, commonOffsetParent, fixedPosition);\n}\n","/**\n * Get the outer sizes of the given element (offset size + margins)\n * @method\n * @memberof Popper.Utils\n * @argument {Element} element\n * @returns {Object} object containing width and height properties\n */\nexport default function getOuterSizes(element) {\n const window = element.ownerDocument.defaultView;\n const styles = window.getComputedStyle(element);\n const x = parseFloat(styles.marginTop || 0) + parseFloat(styles.marginBottom || 0);\n const y = parseFloat(styles.marginLeft || 0) + parseFloat(styles.marginRight || 0);\n const result = {\n width: element.offsetWidth + y,\n height: element.offsetHeight + x,\n };\n return result;\n}\n","/**\n * Get the opposite placement of the given one\n * @method\n * @memberof Popper.Utils\n * @argument {String} placement\n * @returns {String} flipped placement\n */\nexport default function getOppositePlacement(placement) {\n const hash = { left: 'right', right: 'left', bottom: 'top', top: 'bottom' };\n return placement.replace(/left|right|bottom|top/g, matched => hash[matched]);\n}\n","import getOuterSizes from './getOuterSizes';\nimport getOppositePlacement from './getOppositePlacement';\n\n/**\n * Get offsets to the popper\n * @method\n * @memberof Popper.Utils\n * @param {Object} position - CSS position the Popper will get applied\n * @param {HTMLElement} popper - the popper element\n * @param {Object} referenceOffsets - the reference offsets (the popper will be relative to this)\n * @param {String} placement - one of the valid placement options\n * @returns {Object} popperOffsets - An object containing the offsets which will be applied to the popper\n */\nexport default function getPopperOffsets(popper, referenceOffsets, placement) {\n placement = placement.split('-')[0];\n\n // Get popper node sizes\n const popperRect = getOuterSizes(popper);\n\n // Add position, width and height to our offsets object\n const popperOffsets = {\n width: popperRect.width,\n height: popperRect.height,\n };\n\n // depending by the popper placement we have to compute its offsets slightly differently\n const isHoriz = ['right', 'left'].indexOf(placement) !== -1;\n const mainSide = isHoriz ? 'top' : 'left';\n const secondarySide = isHoriz ? 'left' : 'top';\n const measurement = isHoriz ? 'height' : 'width';\n const secondaryMeasurement = !isHoriz ? 'height' : 'width';\n\n popperOffsets[mainSide] =\n referenceOffsets[mainSide] +\n referenceOffsets[measurement] / 2 -\n popperRect[measurement] / 2;\n if (placement === secondarySide) {\n popperOffsets[secondarySide] =\n referenceOffsets[secondarySide] - popperRect[secondaryMeasurement];\n } else {\n popperOffsets[secondarySide] =\n referenceOffsets[getOppositePlacement(secondarySide)];\n }\n\n return popperOffsets;\n}\n","/**\n * Mimics the `find` method of Array\n * @method\n * @memberof Popper.Utils\n * @argument {Array} arr\n * @argument prop\n * @argument value\n * @returns index or -1\n */\nexport default function find(arr, check) {\n // use native find if supported\n if (Array.prototype.find) {\n return arr.find(check);\n }\n\n // use `filter` to obtain the same behavior of `find`\n return arr.filter(check)[0];\n}\n","import find from './find';\n\n/**\n * Return the index of the matching object\n * @method\n * @memberof Popper.Utils\n * @argument {Array} arr\n * @argument prop\n * @argument value\n * @returns index or -1\n */\nexport default function findIndex(arr, prop, value) {\n // use native findIndex if supported\n if (Array.prototype.findIndex) {\n return arr.findIndex(cur => cur[prop] === value);\n }\n\n // use `find` + `indexOf` if `findIndex` isn't supported\n const match = find(arr, obj => obj[prop] === value);\n return arr.indexOf(match);\n}\n","import isFunction from './isFunction';\nimport findIndex from './findIndex';\nimport getClientRect from '../utils/getClientRect';\n\n/**\n * Loop trough the list of modifiers and run them in order,\n * each of them will then edit the data object.\n * @method\n * @memberof Popper.Utils\n * @param {dataObject} data\n * @param {Array} modifiers\n * @param {String} ends - Optional modifier name used as stopper\n * @returns {dataObject}\n */\nexport default function runModifiers(modifiers, data, ends) {\n const modifiersToRun = ends === undefined\n ? modifiers\n : modifiers.slice(0, findIndex(modifiers, 'name', ends));\n\n modifiersToRun.forEach(modifier => {\n if (modifier['function']) { // eslint-disable-line dot-notation\n console.warn('`modifier.function` is deprecated, use `modifier.fn`!');\n }\n const fn = modifier['function'] || modifier.fn; // eslint-disable-line dot-notation\n if (modifier.enabled && isFunction(fn)) {\n // Add properties to offsets to make them a complete clientRect object\n // we do this before each modifier to make sure the previous one doesn't\n // mess with these values\n data.offsets.popper = getClientRect(data.offsets.popper);\n data.offsets.reference = getClientRect(data.offsets.reference);\n\n data = fn(data, modifier);\n }\n });\n\n return data;\n}\n","import computeAutoPlacement from '../utils/computeAutoPlacement';\nimport getReferenceOffsets from '../utils/getReferenceOffsets';\nimport getPopperOffsets from '../utils/getPopperOffsets';\nimport runModifiers from '../utils/runModifiers';\n\n/**\n * Updates the position of the popper, computing the new offsets and applying\n * the new style.<br />\n * Prefer `scheduleUpdate` over `update` because of performance reasons.\n * @method\n * @memberof Popper\n */\nexport default function update() {\n // if popper is destroyed, don't perform any further update\n if (this.state.isDestroyed) {\n return;\n }\n\n let data = {\n instance: this,\n styles: {},\n arrowStyles: {},\n attributes: {},\n flipped: false,\n offsets: {},\n };\n\n // compute reference element offsets\n data.offsets.reference = getReferenceOffsets(\n this.state,\n this.popper,\n this.reference,\n this.options.positionFixed\n );\n\n // compute auto placement, store placement inside the data object,\n // modifiers will be able to edit `placement` if needed\n // and refer to originalPlacement to know the original value\n data.placement = computeAutoPlacement(\n this.options.placement,\n data.offsets.reference,\n this.popper,\n this.reference,\n this.options.modifiers.flip.boundariesElement,\n this.options.modifiers.flip.padding\n );\n\n // store the computed placement inside `originalPlacement`\n data.originalPlacement = data.placement;\n\n data.positionFixed = this.options.positionFixed;\n\n // compute the popper offsets\n data.offsets.popper = getPopperOffsets(\n this.popper,\n data.offsets.reference,\n data.placement\n );\n\n data.offsets.popper.position = this.options.positionFixed\n ? 'fixed'\n : 'absolute';\n\n // run the modifiers\n data = runModifiers(this.modifiers, data);\n\n // the first `update` will call `onCreate` callback\n // the other ones will call `onUpdate` callback\n if (!this.state.isCreated) {\n this.state.isCreated = true;\n this.options.onCreate(data);\n } else {\n this.options.onUpdate(data);\n }\n}\n","/**\n * Helper used to know if the given modifier is enabled.\n * @method\n * @memberof Popper.Utils\n * @returns {Boolean}\n */\nexport default function isModifierEnabled(modifiers, modifierName) {\n return modifiers.some(\n ({ name, enabled }) => enabled && name === modifierName\n );\n}\n","/**\n * Get the prefixed supported property name\n * @method\n * @memberof Popper.Utils\n * @argument {String} property (camelCase)\n * @returns {String} prefixed property (camelCase or PascalCase, depending on the vendor prefix)\n */\nexport default function getSupportedPropertyName(property) {\n const prefixes = [false, 'ms', 'Webkit', 'Moz', 'O'];\n const upperProp = property.charAt(0).toUpperCase() + property.slice(1);\n\n for (let i = 0; i < prefixes.length; i++) {\n const prefix = prefixes[i];\n const toCheck = prefix ? `${prefix}${upperProp}` : property;\n if (typeof document.body.style[toCheck] !== 'undefined') {\n return toCheck;\n }\n }\n return null;\n}\n","import isModifierEnabled from '../utils/isModifierEnabled';\nimport getSupportedPropertyName from '../utils/getSupportedPropertyName';\n\n/**\n * Destroys the popper.\n * @method\n * @memberof Popper\n */\nexport default function destroy() {\n this.state.isDestroyed = true;\n\n // touch DOM only if `applyStyle` modifier is enabled\n if (isModifierEnabled(this.modifiers, 'applyStyle')) {\n this.popper.removeAttribute('x-placement');\n this.popper.style.position = '';\n this.popper.style.top = '';\n this.popper.style.left = '';\n this.popper.style.right = '';\n this.popper.style.bottom = '';\n this.popper.style.willChange = '';\n this.popper.style[getSupportedPropertyName('transform')] = '';\n }\n\n this.disableEventListeners();\n\n // remove the popper if user explicitly asked for the deletion on destroy\n // do not use `remove` because IE11 doesn't support it\n if (this.options.removeOnDestroy) {\n this.popper.parentNode.removeChild(this.popper);\n }\n return this;\n}\n","/**\n * Get the window associated with the element\n * @argument {Element} element\n * @returns {Window}\n */\nexport default function getWindow(element) {\n const ownerDocument = element.ownerDocument;\n return ownerDocument ? ownerDocument.defaultView : window;\n}\n","import getScrollParent from './getScrollParent';\nimport getWindow from './getWindow';\n\nfunction attachToScrollParents(scrollParent, event, callback, scrollParents) {\n const isBody = scrollParent.nodeName === 'BODY';\n const target = isBody ? scrollParent.ownerDocument.defaultView : scrollParent;\n target.addEventListener(event, callback, { passive: true });\n\n if (!isBody) {\n attachToScrollParents(\n getScrollParent(target.parentNode),\n event,\n callback,\n scrollParents\n );\n }\n scrollParents.push(target);\n}\n\n/**\n * Setup needed event listeners used to update the popper position\n * @method\n * @memberof Popper.Utils\n * @private\n */\nexport default function setupEventListeners(\n reference,\n options,\n state,\n updateBound\n) {\n // Resize event listener on window\n state.updateBound = updateBound;\n getWindow(reference).addEventListener('resize', state.updateBound, { passive: true });\n\n // Scroll event listener on scroll parents\n const scrollElement = getScrollParent(reference);\n attachToScrollParents(\n scrollElement,\n 'scroll',\n state.updateBound,\n state.scrollParents\n );\n state.scrollElement = scrollElement;\n state.eventsEnabled = true;\n\n return state;\n}\n","import setupEventListeners from '../utils/setupEventListeners';\n\n/**\n * It will add resize/scroll events and start recalculating\n * position of the popper element when they are triggered.\n * @method\n * @memberof Popper\n */\nexport default function enableEventListeners() {\n if (!this.state.eventsEnabled) {\n this.state = setupEventListeners(\n this.reference,\n this.options,\n this.state,\n this.scheduleUpdate\n );\n }\n}\n","import getWindow from './getWindow';\n\n/**\n * Remove event listeners used to update the popper position\n * @method\n * @memberof Popper.Utils\n * @private\n */\nexport default function removeEventListeners(reference, state) {\n // Remove resize event listener on window\n getWindow(reference).removeEventListener('resize', state.updateBound);\n\n // Remove scroll event listener on scroll parents\n state.scrollParents.forEach(target => {\n target.removeEventListener('scroll', state.updateBound);\n });\n\n // Reset state\n state.updateBound = null;\n state.scrollParents = [];\n state.scrollElement = null;\n state.eventsEnabled = false;\n return state;\n}\n","import removeEventListeners from '../utils/removeEventListeners';\n\n/**\n * It will remove resize/scroll events and won't recalculate popper position\n * when they are triggered. It also won't trigger `onUpdate` callback anymore,\n * unless you call `update` method manually.\n * @method\n * @memberof Popper\n */\nexport default function disableEventListeners() {\n if (this.state.eventsEnabled) {\n cancelAnimationFrame(this.scheduleUpdate);\n this.state = removeEventListeners(this.reference, this.state);\n }\n}\n","/**\n * Tells if a given input is a number\n * @method\n * @memberof Popper.Utils\n * @param {*} input to check\n * @return {Boolean}\n */\nexport default function isNumeric(n) {\n return n !== '' && !isNaN(parseFloat(n)) && isFinite(n);\n}\n","import isNumeric from './isNumeric';\n\n/**\n * Set the style to the given popper\n * @method\n * @memberof Popper.Utils\n * @argument {Element} element - Element to apply the style to\n * @argument {Object} styles\n * Object with a list of properties and values which will be applied to the element\n */\nexport default function setStyles(element, styles) {\n Object.keys(styles).forEach(prop => {\n let unit = '';\n // add unit if the value is numeric and is one of the following\n if (\n ['width', 'height', 'top', 'right', 'bottom', 'left'].indexOf(prop) !==\n -1 &&\n isNumeric(styles[prop])\n ) {\n unit = 'px';\n }\n element.style[prop] = styles[prop] + unit;\n });\n}\n","/**\n * Set the attributes to the given popper\n * @method\n * @memberof Popper.Utils\n * @argument {Element} element - Element to apply the attributes to\n * @argument {Object} styles\n * Object with a list of properties and values which will be applied to the element\n */\nexport default function setAttributes(element, attributes) {\n Object.keys(attributes).forEach(function(prop) {\n const value = attributes[prop];\n if (value !== false) {\n element.setAttribute(prop, attributes[prop]);\n } else {\n element.removeAttribute(prop);\n }\n });\n}\n","/**\n * @function\n * @memberof Popper.Utils\n * @argument {Object} data - The data object generated by `update` method\n * @argument {Boolean} shouldRound - If the offsets should be rounded at all\n * @returns {Object} The popper's position offsets rounded\n *\n * The tale of pixel-perfect positioning. It's still not 100% perfect, but as\n * good as it can be within reason.\n * Discussion here: https://github.com/FezVrasta/popper.js/pull/715\n *\n * Low DPI screens cause a popper to be blurry if not using full pixels (Safari\n * as well on High DPI screens).\n *\n * Firefox prefers no rounding for positioning and does not have blurriness on\n * high DPI screens.\n *\n * Only horizontal placement and left/right values need to be considered.\n */\nexport default function getRoundedOffsets(data, shouldRound) {\n const { popper, reference } = data.offsets;\n const { round, floor } = Math;\n const noRound = v => v;\n \n const referenceWidth = round(reference.width);\n const popperWidth = round(popper.width);\n \n const isVertical = ['left', 'right'].indexOf(data.placement) !== -1;\n const isVariation = data.placement.indexOf('-') !== -1;\n const sameWidthParity = referenceWidth % 2 === popperWidth % 2;\n const bothOddWidth = referenceWidth % 2 === 1 && popperWidth % 2 === 1;\n\n const horizontalToInteger = !shouldRound\n ? noRound\n : isVertical || isVariation || sameWidthParity\n ? round\n : floor;\n const verticalToInteger = !shouldRound ? noRound : round;\n\n return {\n left: horizontalToInteger(\n bothOddWidth && !isVariation && shouldRound\n ? popper.left - 1\n : popper.left\n ),\n top: verticalToInteger(popper.top),\n bottom: verticalToInteger(popper.bottom),\n right: horizontalToInteger(popper.right),\n };\n}\n","import find from './find';\n\n/**\n * Helper used to know if the given modifier depends from another one.<br />\n * It checks if the needed modifier is listed and enabled.\n * @method\n * @memberof Popper.Utils\n * @param {Array} modifiers - list of modifiers\n * @param {String} requestingName - name of requesting modifier\n * @param {String} requestedName - name of requested modifier\n * @returns {Boolean}\n */\nexport default function isModifierRequired(\n modifiers,\n requestingName,\n requestedName\n) {\n const requesting = find(modifiers, ({ name }) => name === requestingName);\n\n const isRequired =\n !!requesting &&\n modifiers.some(modifier => {\n return (\n modifier.name === requestedName &&\n modifier.enabled &&\n modifier.order < requesting.order\n );\n });\n\n if (!isRequired) {\n const requesting = `\\`${requestingName}\\``;\n const requested = `\\`${requestedName}\\``;\n console.warn(\n `${requested} modifier is required by ${requesting} modifier in order to work, be sure to include it before ${requesting}!`\n );\n }\n return isRequired;\n}\n","/**\n * Get the opposite placement variation of the given one\n * @method\n * @memberof Popper.Utils\n * @argument {String} placement variation\n * @returns {String} flipped placement variation\n */\nexport default function getOppositeVariation(variation) {\n if (variation === 'end') {\n return 'start';\n } else if (variation === 'start') {\n return 'end';\n }\n return variation;\n}\n","import placements from '../methods/placements';\n\n// Get rid of `auto` `auto-start` and `auto-end`\nconst validPlacements = placements.slice(3);\n\n/**\n * Given an initial placement, returns all the subsequent placements\n * clockwise (or counter-clockwise).\n *\n * @method\n * @memberof Popper.Utils\n * @argument {String} placement - A valid placement (it accepts variations)\n * @argument {Boolean} counter - Set to true to walk the placements counterclockwise\n * @returns {Array} placements including their variations\n */\nexport default function clockwise(placement, counter = false) {\n const index = validPlacements.indexOf(placement);\n const arr = validPlacements\n .slice(index + 1)\n .concat(validPlacements.slice(0, index));\n return counter ? arr.reverse() : arr;\n}\n","import isNumeric from '../utils/isNumeric';\nimport getClientRect from '../utils/getClientRect';\nimport find from '../utils/find';\n\n/**\n * Converts a string containing value + unit into a px value number\n * @function\n * @memberof {modifiers~offset}\n * @private\n * @argument {String} str - Value + unit string\n * @argument {String} measurement - `height` or `width`\n * @argument {Object} popperOffsets\n * @argument {Object} referenceOffsets\n * @returns {Number|String}\n * Value in pixels, or original string if no values were extracted\n */\nexport function toValue(str, measurement, popperOffsets, referenceOffsets) {\n // separate value from unit\n const split = str.match(/((?:\\-|\\+)?\\d*\\.?\\d*)(.*)/);\n const value = +split[1];\n const unit = split[2];\n\n // If it's not a number it's an operator, I guess\n if (!value) {\n return str;\n }\n\n if (unit.indexOf('%') === 0) {\n let element;\n switch (unit) {\n case '%p':\n element = popperOffsets;\n break;\n case '%':\n case '%r':\n default:\n element = referenceOffsets;\n }\n\n const rect = getClientRect(element);\n return rect[measurement] / 100 * value;\n } else if (unit === 'vh' || unit === 'vw') {\n // if is a vh or vw, we calculate the size based on the viewport\n let size;\n if (unit === 'vh') {\n size = Math.max(\n document.documentElement.clientHeight,\n window.innerHeight || 0\n );\n } else {\n size = Math.max(\n document.documentElement.clientWidth,\n window.innerWidth || 0\n );\n }\n return size / 100 * value;\n } else {\n // if is an explicit pixel unit, we get rid of the unit and keep the value\n // if is an implicit unit, it's px, and we return just the value\n return value;\n }\n}\n\n/**\n * Parse an `offset` string to extrapolate `x` and `y` numeric offsets.\n * @function\n * @memberof {modifiers~offset}\n * @private\n * @argument {String} offset\n * @argument {Object} popperOffsets\n * @argument {Object} referenceOffsets\n * @argument {String} basePlacement\n * @returns {Array} a two cells array with x and y offsets in numbers\n */\nexport function parseOffset(\n offset,\n popperOffsets,\n referenceOffsets,\n basePlacement\n) {\n const offsets = [0, 0];\n\n // Use height if placement is left or right and index is 0 otherwise use width\n // in this way the first offset will use an axis and the second one\n // will use the other one\n const useHeight = ['right', 'left'].indexOf(basePlacement) !== -1;\n\n // Split the offset string to obtain a list of values and operands\n // The regex addresses values with the plus or minus sign in front (+10, -20, etc)\n const fragments = offset.split(/(\\+|\\-)/).map(frag => frag.trim());\n\n // Detect if the offset string contains a pair of values or a single one\n // they could be separated by comma or space\n const divider = fragments.indexOf(\n find(fragments, frag => frag.search(/,|\\s/) !== -1)\n );\n\n if (fragments[divider] && fragments[divider].indexOf(',') === -1) {\n console.warn(\n 'Offsets separated by white space(s) are deprecated, use a comma (,) instead.'\n );\n }\n\n // If divider is found, we divide the list of values and operands to divide\n // them by ofset X and Y.\n const splitRegex = /\\s*,\\s*|\\s+/;\n let ops = divider !== -1\n ? [\n fragments\n .slice(0, divider)\n .concat([fragments[divider].split(splitRegex)[0]]),\n [fragments[divider].split(splitRegex)[1]].concat(\n fragments.slice(divider + 1)\n ),\n ]\n : [fragments];\n\n // Convert the values with units to absolute pixels to allow our computations\n ops = ops.map((op, index) => {\n // Most of the units rely on the orientation of the popper\n const measurement = (index === 1 ? !useHeight : useHeight)\n ? 'height'\n : 'width';\n let mergeWithPrevious = false;\n return (\n op\n // This aggregates any `+` or `-` sign that aren't considered operators\n // e.g.: 10 + +5 => [10, +, +5]\n .reduce((a, b) => {\n if (a[a.length - 1] === '' && ['+', '-'].indexOf(b) !== -1) {\n a[a.length - 1] = b;\n mergeWithPrevious = true;\n return a;\n } else if (mergeWithPrevious) {\n a[a.length - 1] += b;\n mergeWithPrevious = false;\n return a;\n } else {\n return a.concat(b);\n }\n }, [])\n // Here we convert the string values into number values (in px)\n .map(str => toValue(str, measurement, popperOffsets, referenceOffsets))\n );\n });\n\n // Loop trough the offsets arrays and execute the operations\n ops.forEach((op, index) => {\n op.forEach((frag, index2) => {\n if (isNumeric(frag)) {\n offsets[index] += frag * (op[index2 - 1] === '-' ? -1 : 1);\n }\n });\n });\n return offsets;\n}\n\n/**\n * @function\n * @memberof Modifiers\n * @argument {Object} data - The data object generated by update method\n * @argument {Object} options - Modifiers configuration and options\n * @argument {Number|String} options.offset=0\n * The offset value as described in the modifier description\n * @returns {Object} The data object, properly modified\n */\nexport default function offset(data, { offset }) {\n const { placement, offsets: { popper, reference } } = data;\n const basePlacement = placement.split('-')[0];\n\n let offsets;\n if (isNumeric(+offset)) {\n offsets = [+offset, 0];\n } else {\n offsets = parseOffset(offset, popper, reference, basePlacement);\n }\n\n if (basePlacement === 'left') {\n popper.top += offsets[0];\n popper.left -= offsets[1];\n } else if (basePlacement === 'right') {\n popper.top += offsets[0];\n popper.left += offsets[1];\n } else if (basePlacement === 'top') {\n popper.left += offsets[0];\n popper.top -= offsets[1];\n } else if (basePlacement === 'bottom') {\n popper.left += offsets[0];\n popper.top += offsets[1];\n }\n\n data.popper = popper;\n return data;\n}\n","import getClientRect from '../utils/getClientRect';\nimport getOuterSizes from '../utils/getOuterSizes';\nimport isModifierRequired from '../utils/isModifierRequired';\nimport getStyleComputedProperty from '../utils/getStyleComputedProperty';\n\n/**\n * @function\n * @memberof Modifiers\n * @argument {Object} data - The data object generated by update method\n * @argument {Object} options - Modifiers configuration and options\n * @returns {Object} The data object, properly modified\n */\nexport default function arrow(data, options) {\n // arrow depends on keepTogether in order to work\n if (!isModifierRequired(data.instance.modifiers, 'arrow', 'keepTogether')) {\n return data;\n }\n\n let arrowElement = options.element;\n\n // if arrowElement is a string, suppose it's a CSS selector\n if (typeof arrowElement === 'string') {\n arrowElement = data.instance.popper.querySelector(arrowElement);\n\n // if arrowElement is not found, don't run the modifier\n if (!arrowElement) {\n return data;\n }\n } else {\n // if the arrowElement isn't a query selector we must check that the\n // provided DOM node is child of its popper node\n if (!data.instance.popper.contains(arrowElement)) {\n console.warn(\n 'WARNING: `arrow.element` must be child of its popper element!'\n );\n return data;\n }\n }\n\n const placement = data.placement.split('-')[0];\n const { popper, reference } = data.offsets;\n const isVertical = ['left', 'right'].indexOf(placement) !== -1;\n\n const len = isVertical ? 'height' : 'width';\n const sideCapitalized = isVertical ? 'Top' : 'Left';\n const side = sideCapitalized.toLowerCase();\n const altSide = isVertical ? 'left' : 'top';\n const opSide = isVertical ? 'bottom' : 'right';\n const arrowElementSize = getOuterSizes(arrowElement)[len];\n\n //\n // extends keepTogether behavior making sure the popper and its\n // reference have enough pixels in conjunction\n //\n\n // top/left side\n if (reference[opSide] - arrowElementSize < popper[side]) {\n data.offsets.popper[side] -=\n popper[side] - (reference[opSide] - arrowElementSize);\n }\n // bottom/right side\n if (reference[side] + arrowElementSize > popper[opSide]) {\n data.offsets.popper[side] +=\n reference[side] + arrowElementSize - popper[opSide];\n }\n data.offsets.popper = getClientRect(data.offsets.popper);\n\n // compute center of the popper\n const center = reference[side] + reference[len] / 2 - arrowElementSize / 2;\n\n // Compute the sideValue using the updated popper offsets\n // take popper margin in account because we don't have this info available\n const css = getStyleComputedProperty(data.instance.popper);\n const popperMarginSide = parseFloat(css[`margin${sideCapitalized}`], 10);\n const popperBorderSide = parseFloat(css[`border${sideCapitalized}Width`], 10);\n let sideValue =\n center - data.offsets.popper[side] - popperMarginSide - popperBorderSide;\n\n // prevent arrowElement from being placed not contiguously to its popper\n sideValue = Math.max(Math.min(popper[len] - arrowElementSize, sideValue), 0);\n\n data.arrowElement = arrowElement;\n data.offsets.arrow = {\n [side]: Math.round(sideValue),\n [altSide]: '', // make sure to unset any eventual altSide value from the DOM node\n };\n\n return data;\n}\n","export default typeof window !== 'undefined' && typeof document !== 'undefined' && typeof navigator !== 'undefined';\n","import isBrowser from './isBrowser';\n\nconst timeoutDuration = (function(){\n const longerTimeoutBrowsers = ['Edge', 'Trident', 'Firefox'];\n for (let i = 0; i < longerTimeoutBrowsers.length; i += 1) {\n if (isBrowser && navigator.userAgent.indexOf(longerTimeoutBrowsers[i]) >= 0) {\n return 1;\n }\n }\n return 0;\n}());\n\nexport function microtaskDebounce(fn) {\n let called = false\n return () => {\n if (called) {\n return\n }\n called = true\n window.Promise.resolve().then(() => {\n called = false\n fn()\n })\n }\n}\n\nexport function taskDebounce(fn) {\n let scheduled = false;\n return () => {\n if (!scheduled) {\n scheduled = true;\n setTimeout(() => {\n scheduled = false;\n fn();\n }, timeoutDuration);\n }\n };\n}\n\nconst supportsMicroTasks = isBrowser && window.Promise\n\n\n/**\n* Create a debounced version of a method, that's asynchronously deferred\n* but called in the minimum time possible.\n*\n* @method\n* @memberof Popper.Utils\n* @argument {Function} fn\n* @returns {Function}\n*/\nexport default (supportsMicroTasks\n ? microtaskDebounce\n : taskDebounce);\n","import getSupportedPropertyName from '../utils/getSupportedPropertyName';\nimport find from '../utils/find';\nimport getOffsetParent from '../utils/getOffsetParent';\nimport getBoundingClientRect from '../utils/getBoundingClientRect';\nimport getRoundedOffsets from '../utils/getRoundedOffsets';\nimport isBrowser from '../utils/isBrowser';\n\nconst isFirefox = isBrowser && /Firefox/i.test(navigator.userAgent);\n\n/**\n * @function\n * @memberof Modifiers\n * @argument {Object} data - The data object generated by `update` method\n * @argument {Object} options - Modifiers configuration and options\n * @returns {Object} The data object, properly modified\n */\nexport default function computeStyle(data, options) {\n const { x, y } = options;\n const { popper } = data.offsets;\n\n // Remove this legacy support in Popper.js v2\n const legacyGpuAccelerationOption = find(\n data.instance.modifiers,\n modifier => modifier.name === 'applyStyle'\n ).gpuAcceleration;\n if (legacyGpuAccelerationOption !== undefined) {\n console.warn(\n 'WARNING: `gpuAcceleration` option moved to `computeStyle` modifier and will not be supported in future versions of Popper.js!'\n );\n }\n const gpuAcceleration =\n legacyGpuAccelerationOption !== undefined\n ? legacyGpuAccelerationOption\n : options.gpuAcceleration;\n\n const offsetParent = getOffsetParent(data.instance.popper);\n const offsetParentRect = getBoundingClientRect(offsetParent);\n\n // Styles\n const styles = {\n position: popper.position,\n };\n\n const offsets = getRoundedOffsets(\n data,\n window.devicePixelRatio < 2 || !isFirefox\n );\n\n const sideA = x === 'bottom' ? 'top' : 'bottom';\n const sideB = y === 'right' ? 'left' : 'right';\n\n // if gpuAcceleration is set to `true` and transform is supported,\n // we use `translate3d` to apply the position to the popper we\n // automatically use the supported prefixed version if needed\n const prefixedProperty = getSupportedPropertyName('transform');\n\n // now, let's make a step back and look at this code closely (wtf?)\n // If the content of the popper grows once it's been positioned, it\n // may happen that the popper gets misplaced because of the new content\n // overflowing its reference element\n // To avoid this problem, we provide two options (x and y), which allow\n // the consumer to define the offset origin.\n // If we position a popper on top of a reference element, we can set\n // `x` to `top` to make the popper grow towards its top instead of\n // its bottom.\n let left, top;\n if (sideA === 'bottom') {\n // when offsetParent is <html> the positioning is relative to the bottom of the screen (excluding the scrollbar)\n // and not the bottom of the html element\n if (offsetParent.nodeName === 'HTML') {\n top = -offsetParent.clientHeight + offsets.bottom;\n } else {\n top = -offsetParentRect.height + offsets.bottom;\n }\n } else {\n top = offsets.top;\n }\n if (sideB === 'right') {\n if (offsetParent.nodeName === 'HTML') {\n left = -offsetParent.clientWidth + offsets.right;\n } else {\n left = -offsetParentRect.width + offsets.right;\n }\n } else {\n left = offsets.left;\n }\n if (gpuAcceleration && prefixedProperty) {\n styles[prefixedProperty] = `translate3d(${left}px, ${top}px, 0)`;\n styles[sideA] = 0;\n styles[sideB] = 0;\n styles.willChange = 'transform';\n } else {\n // othwerise, we use the standard `top`, `left`, `bottom` and `right` properties\n const invertTop = sideA === 'bottom' ? -1 : 1;\n const invertLeft = sideB === 'right' ? -1 : 1;\n styles[sideA] = top * invertTop;\n styles[sideB] = left * invertLeft;\n styles.willChange = `${sideA}, ${sideB}`;\n }\n\n // Attributes\n const attributes = {\n 'x-placement': data.placement,\n };\n\n // Update `data` attributes, styles and arrowStyles\n data.attributes = { ...attributes, ...data.attributes };\n data.styles = { ...styles, ...data.styles };\n data.arrowStyles = { ...data.offsets.arrow, ...data.arrowStyles };\n\n return data;\n}\n","import getOppositePlacement from '../utils/getOppositePlacement';\nimport getOppositeVariation from '../utils/getOppositeVariation';\nimport getPopperOffsets from '../utils/getPopperOffsets';\nimport runModifiers from '../utils/runModifiers';\nimport getBoundaries from '../utils/getBoundaries';\nimport isModifierEnabled from '../utils/isModifierEnabled';\nimport clockwise from '../utils/clockwise';\n\nconst BEHAVIORS = {\n FLIP: 'flip',\n CLOCKWISE: 'clockwise',\n COUNTERCLOCKWISE: 'counterclockwise',\n};\n\n/**\n * @function\n * @memberof Modifiers\n * @argument {Object} data - The data object generated by update method\n * @argument {Object} options - Modifiers configuration and options\n * @returns {Object} The data object, properly modified\n */\nexport default function flip(data, options) {\n // if `inner` modifier is enabled, we can't use the `flip` modifier\n if (isModifierEnabled(data.instance.modifiers, 'inner')) {\n return data;\n }\n\n if (data.flipped && data.placement === data.originalPlacement) {\n // seems like flip is trying to loop, probably there's not enough space on any of the flippable sides\n return data;\n }\n\n const boundaries = getBoundaries(\n data.instance.popper,\n data.instance.reference,\n options.padding,\n options.boundariesElement,\n data.positionFixed\n );\n\n let placement = data.placement.split('-')[0];\n let placementOpposite = getOppositePlacement(placement);\n let variation = data.placement.split('-')[1] || '';\n\n let flipOrder = [];\n\n switch (options.behavior) {\n case BEHAVIORS.FLIP:\n flipOrder = [placement, placementOpposite];\n break;\n case BEHAVIORS.CLOCKWISE:\n flipOrder = clockwise(placement);\n break;\n case BEHAVIORS.COUNTERCLOCKWISE:\n flipOrder = clockwise(placement, true);\n break;\n default:\n flipOrder = options.behavior;\n }\n\n flipOrder.forEach((step, index) => {\n if (placement !== step || flipOrder.length === index + 1) {\n return data;\n }\n\n placement = data.placement.split('-')[0];\n placementOpposite = getOppositePlacement(placement);\n\n const popperOffsets = data.offsets.popper;\n const refOffsets = data.offsets.reference;\n\n // using floor because the reference offsets may contain decimals we are not going to consider here\n const floor = Math.floor;\n const overlapsRef =\n (placement === 'left' &&\n floor(popperOffsets.right) > floor(refOffsets.left)) ||\n (placement === 'right' &&\n floor(popperOffsets.left) < floor(refOffsets.right)) ||\n (placement === 'top' &&\n floor(popperOffsets.bottom) > floor(refOffsets.top)) ||\n (placement === 'bottom' &&\n floor(popperOffsets.top) < floor(refOffsets.bottom));\n\n const overflowsLeft = floor(popperOffsets.left) < floor(boundaries.left);\n const overflowsRight = floor(popperOffsets.right) > floor(boundaries.right);\n const overflowsTop = floor(popperOffsets.top) < floor(boundaries.top);\n const overflowsBottom =\n floor(popperOffsets.bottom) > floor(boundaries.bottom);\n\n const overflowsBoundaries =\n (placement === 'left' && overflowsLeft) ||\n (placement === 'right' && overflowsRight) ||\n (placement === 'top' && overflowsTop) ||\n (placement === 'bottom' && overflowsBottom);\n\n // flip the variation if required\n const isVertical = ['top', 'bottom'].indexOf(placement) !== -1;\n\n // flips variation if reference element overflows boundaries\n const flippedVariationByRef =\n !!options.flipVariations &&\n ((isVertical && variation === 'start' && overflowsLeft) ||\n (isVertical && variation === 'end' && overflowsRight) ||\n (!isVertical && variation === 'start' && overflowsTop) ||\n (!isVertical && variation === 'end' && overflowsBottom));\n\n // flips variation if popper content overflows boundaries\n const flippedVariationByContent =\n !!options.flipVariationsByContent &&\n ((isVertical && variation === 'start' && overflowsRight) ||\n (isVertical && variation === 'end' && overflowsLeft) ||\n (!isVertical && variation === 'start' && overflowsBottom) ||\n (!isVertical && variation === 'end' && overflowsTop));\n\n const flippedVariation = flippedVariationByRef || flippedVariationByContent;\n\n if (overlapsRef || overflowsBoundaries || flippedVariation) {\n // this boolean to detect any flip loop\n data.flipped = true;\n\n if (overlapsRef || overflowsBoundaries) {\n placement = flipOrder[index + 1];\n }\n\n if (flippedVariation) {\n variation = getOppositeVariation(variation);\n }\n\n data.placement = placement + (variation ? '-' + variation : '');\n\n // this object contains `position`, we want to preserve it along with\n // any additional property we may add in the future\n data.offsets.popper = {\n ...data.offsets.popper,\n ...getPopperOffsets(\n data.instance.popper,\n data.offsets.reference,\n data.placement\n ),\n };\n\n data = runModifiers(data.instance.modifiers, data, 'flip');\n }\n });\n return data;\n}\n","// Utils\nimport debounce from './utils/debounce';\nimport isFunction from './utils/isFunction';\n\n// Methods\nimport update from './methods/update';\nimport destroy from './methods/destroy';\nimport enableEventListeners from './methods/enableEventListeners';\nimport disableEventListeners from './methods/disableEventListeners';\nimport Defaults from './methods/defaults';\nimport placements from './methods/placements';\n\nexport default class Popper {\n /**\n * Creates a new Popper.js instance.\n * @class Popper\n * @param {Element|referenceObject} reference - The reference element used to position the popper\n * @param {Element} popper - The HTML / XML element used as the popper\n * @param {Object} options - Your custom options to override the ones defined in [Defaults](#defaults)\n * @return {Object} instance - The generated Popper.js instance\n */\n constructor(reference, popper, options = {}) {\n // make update() debounced, so that it only runs at most once-per-tick\n this.update = debounce(this.update.bind(this));\n\n // with {} we create a new object with the options inside it\n this.options = { ...Popper.Defaults, ...options };\n\n // init state\n this.state = {\n isDestroyed: false,\n isCreated: false,\n scrollParents: [],\n };\n\n // get reference and popper elements (allow jQuery wrappers)\n this.reference = reference && reference.jquery ? reference[0] : reference;\n this.popper = popper && popper.jquery ? popper[0] : popper;\n\n // Deep merge modifiers options\n this.options.modifiers = {};\n Object.keys({\n ...Popper.Defaults.modifiers,\n ...options.modifiers,\n }).forEach(name => {\n this.options.modifiers[name] = {\n // If it's a built-in modifier, use it as base\n ...(Popper.Defaults.modifiers[name] || {}),\n // If there are custom options, override and merge with default ones\n ...(options.modifiers ? options.modifiers[name] : {}),\n };\n });\n\n // Refactoring modifiers' list (Object => Array)\n this.modifiers = Object.keys(this.options.modifiers)\n .map(name => ({\n name,\n ...this.options.modifiers[name],\n }))\n // sort the modifiers by order\n .sort((a, b) => a.order - b.order);\n\n // modifiers have the ability to execute arbitrary code when Popper.js get inited\n // such code is executed in the same order of its modifier\n // they could add new properties to their options configuration\n // BE AWARE: don't add options to `options.modifiers.name` but to `modifierOptions`!\n this.modifiers.forEach(modifierOptions => {\n if (modifierOptions.enabled && isFunction(modifierOptions.onLoad)) {\n modifierOptions.onLoad(\n this.reference,\n this.popper,\n this.options,\n modifierOptions,\n this.state\n );\n }\n });\n\n // fire the first update to position the popper in the right place\n this.update();\n\n const eventsEnabled = this.options.eventsEnabled;\n if (eventsEnabled) {\n // setup event listeners, they will take care of update the position in specific situations\n this.enableEventListeners();\n }\n\n this.state.eventsEnabled = eventsEnabled;\n }\n\n // We can't use class properties because they don't get listed in the\n // class prototype and break stuff like Sinon stubs\n update() {\n return update.call(this);\n }\n destroy() {\n return destroy.call(this);\n }\n enableEventListeners() {\n return enableEventListeners.call(this);\n }\n disableEventListeners() {\n return disableEventListeners.call(this);\n }\n\n /**\n * Schedules an update. It will run on the next UI update available.\n * @method scheduleUpdate\n * @memberof Popper\n */\n scheduleUpdate = () => requestAnimationFrame(this.update);\n\n /**\n * Collection of utilities useful when writing custom modifiers.\n * Starting from version 1.7, this method is available only if you\n * include `popper-utils.js` before `popper.js`.\n *\n * **DEPRECATION**: This way to access PopperUtils is deprecated\n * and will be removed in v2! Use the PopperUtils module directly instead.\n * Due to the high instability of the methods contained in Utils, we can't\n * guarantee them to follow semver. Use them at your own risk!\n * @static\n * @private\n * @type {Object}\n * @deprecated since version 1.8\n * @member Utils\n * @memberof Popper\n */\n static Utils = (typeof window !== 'undefined' ? window : global).PopperUtils;\n\n static placements = placements;\n\n static Defaults = Defaults;\n}\n\n/**\n * The `referenceObject` is an object that provides an interface compatible with Popper.js\n * and lets you use it as replacement of a real DOM node.<br />\n * You can use this method to position a popper relatively to a set of coordinates\n * in case you don't have a DOM node to use as reference.\n *\n * ```\n * new Popper(referenceObject, popperNode);\n * ```\n *\n * NB: This feature isn't supported in Internet Explorer 10.\n * @name referenceObject\n * @property {Function} data.getBoundingClientRect\n * A function that returns a set of coordinates compatible with the native `getBoundingClientRect` method.\n * @property {number} data.clientWidth\n * An ES6 getter that will return the width of the virtual reference element.\n * @property {number} data.clientHeight\n * An ES6 getter that will return the height of the virtual reference element.\n */\n","import modifiers from '../modifiers/index';\n\n/**\n * Default options provided to Popper.js constructor.<br />\n * These can be overridden using the `options` argument of Popper.js.<br />\n * To override an option, simply pass an object with the same\n * structure of the `options` object, as the 3rd argument. For example:\n * ```\n * new Popper(ref, pop, {\n * modifiers: {\n * preventOverflow: { enabled: false }\n * }\n * })\n * ```\n * @type {Object}\n * @static\n * @memberof Popper\n */\nexport default {\n /**\n * Popper's placement.\n * @prop {Popper.placements} placement='bottom'\n */\n placement: 'bottom',\n\n /**\n * Set this to true if you want popper to position it self in 'fixed' mode\n * @prop {Boolean} positionFixed=false\n */\n positionFixed: false,\n\n /**\n * Whether events (resize, scroll) are initially enabled.\n * @prop {Boolean} eventsEnabled=true\n */\n eventsEnabled: true,\n\n /**\n * Set to true if you want to automatically remove the popper when\n * you call the `destroy` method.\n * @prop {Boolean} removeOnDestroy=false\n */\n removeOnDestroy: false,\n\n /**\n * Callback called when the popper is created.<br />\n * By default, it is set to no-op.<br />\n * Access Popper.js instance with `data.instance`.\n * @prop {onCreate}\n */\n onCreate: () => {},\n\n /**\n * Callback called when the popper is updated. This callback is not called\n * on the initialization/creation of the popper, but only on subsequent\n * updates.<br />\n * By default, it is set to no-op.<br />\n * Access Popper.js instance with `data.instance`.\n * @prop {onUpdate}\n */\n onUpdate: () => {},\n\n /**\n * List of modifiers used to modify the offsets before they are applied to the popper.\n * They provide most of the functionalities of Popper.js.\n * @prop {modifiers}\n */\n modifiers,\n};\n\n/**\n * @callback onCreate\n * @param {dataObject} data\n */\n\n/**\n * @callback onUpdate\n * @param {dataObject} data\n */\n","import applyStyle, { applyStyleOnLoad } from './applyStyle';\nimport computeStyle from './computeStyle';\nimport arrow from './arrow';\nimport flip from './flip';\nimport keepTogether from './keepTogether';\nimport offset from './offset';\nimport preventOverflow from './preventOverflow';\nimport shift from './shift';\nimport hide from './hide';\nimport inner from './inner';\n\n/**\n * Modifier function, each modifier can have a function of this type assigned\n * to its `fn` property.<br />\n * These functions will be called on each update, this means that you must\n * make sure they are performant enough to avoid performance bottlenecks.\n *\n * @function ModifierFn\n * @argument {dataObject} data - The data object generated by `update` method\n * @argument {Object} options - Modifiers configuration and options\n * @returns {dataObject} The data object, properly modified\n */\n\n/**\n * Modifiers are plugins used to alter the behavior of your poppers.<br />\n * Popper.js uses a set of 9 modifiers to provide all the basic functionalities\n * needed by the library.\n *\n * Usually you don't want to override the `order`, `fn` and `onLoad` props.\n * All the other properties are configurations that could be tweaked.\n * @namespace modifiers\n */\nexport default {\n /**\n * Modifier used to shift the popper on the start or end of its reference\n * element.<br />\n * It will read the variation of the `placement` property.<br />\n * It can be one either `-end` or `-start`.\n * @memberof modifiers\n * @inner\n */\n shift: {\n /** @prop {number} order=100 - Index used to define the order of execution */\n order: 100,\n /** @prop {Boolean} enabled=true - Whether the modifier is enabled or not */\n enabled: true,\n /** @prop {ModifierFn} */\n fn: shift,\n },\n\n /**\n * The `offset` modifier can shift your popper on both its axis.\n *\n * It accepts the following units:\n * - `px` or unit-less, interpreted as pixels\n * - `%` or `%r`, percentage relative to the length of the reference element\n * - `%p`, percentage relative to the length of the popper element\n * - `vw`, CSS viewport width unit\n * - `vh`, CSS viewport height unit\n *\n * For length is intended the main axis relative to the placement of the popper.<br />\n * This means that if the placement is `top` or `bottom`, the length will be the\n * `width`. In case of `left` or `right`, it will be the `height`.\n *\n * You can provide a single value (as `Number` or `String`), or a pair of values\n * as `String` divided by a comma or one (or more) white spaces.<br />\n * The latter is a deprecated method because it leads to confusion and will be\n * removed in v2.<br />\n * Additionally, it accepts additions and subtractions between different units.\n * Note that multiplications and divisions aren't supported.\n *\n * Valid examples are:\n * ```\n * 10\n * '10%'\n * '10, 10'\n * '10%, 10'\n * '10 + 10%'\n * '10 - 5vh + 3%'\n * '-10px + 5vh, 5px - 6%'\n * ```\n * > **NB**: If you desire to apply offsets to your poppers in a way that may make them overlap\n * > with their reference element, unfortunately, you will have to disable the `flip` modifier.\n * > You can read more on this at this [issue](https://github.com/FezVrasta/popper.js/issues/373).\n *\n * @memberof modifiers\n * @inner\n */\n offset: {\n /** @prop {number} order=200 - Index used to define the order of execution */\n order: 200,\n /** @prop {Boolean} enabled=true - Whether the modifier is enabled or not */\n enabled: true,\n /** @prop {ModifierFn} */\n fn: offset,\n /** @prop {Number|String} offset=0\n * The offset value as described in the modifier description\n */\n offset: 0,\n },\n\n /**\n * Modifier used to prevent the popper from being positioned outside the boundary.\n *\n * A scenario exists where the reference itself is not within the boundaries.<br />\n * We can say it has \"escaped the boundaries\" — or just \"escaped\".<br />\n * In this case we need to decide whether the popper should either:\n *\n * - detach from the reference and remain \"trapped\" in the boundaries, or\n * - if it should ignore the boundary and \"escape with its reference\"\n *\n * When `escapeWithReference` is set to`true` and reference is completely\n * outside its boundaries, the popper will overflow (or completely leave)\n * the boundaries in order to remain attached to the edge of the reference.\n *\n * @memberof modifiers\n * @inner\n */\n preventOverflow: {\n /** @prop {number} order=300 - Index used to define the order of execution */\n order: 300,\n /** @prop {Boolean} enabled=true - Whether the modifier is enabled or not */\n enabled: true,\n /** @prop {ModifierFn} */\n fn: preventOverflow,\n /**\n * @prop {Array} [priority=['left','right','top','bottom']]\n * Popper will try to prevent overflow following these priorities by default,\n * then, it could overflow on the left and on top of the `boundariesElement`\n */\n priority: ['left', 'right', 'top', 'bottom'],\n /**\n * @prop {number} padding=5\n * Amount of pixel used to define a minimum distance between the boundaries\n * and the popper. This makes sure the popper always has a little padding\n * between the edges of its container\n */\n padding: 5,\n /**\n * @prop {String|HTMLElement} boundariesElement='scrollParent'\n * Boundaries used by the modifier. Can be `scrollParent`, `window`,\n * `viewport` or any DOM element.\n */\n boundariesElement: 'scrollParent',\n },\n\n /**\n * Modifier used to make sure the reference and its popper stay near each other\n * without leaving any gap between the two. Especially useful when the arrow is\n * enabled and you want to ensure that it points to its reference element.\n * It cares only about the first axis. You can still have poppers with margin\n * between the popper and its reference element.\n * @memberof modifiers\n * @inner\n */\n keepTogether: {\n /** @prop {number} order=400 - Index used to define the order of execution */\n order: 400,\n /** @prop {Boolean} enabled=true - Whether the modifier is enabled or not */\n enabled: true,\n /** @prop {ModifierFn} */\n fn: keepTogether,\n },\n\n /**\n * This modifier is used to move the `arrowElement` of the popper to make\n * sure it is positioned between the reference element and its popper element.\n * It will read the outer size of the `arrowElement` node to detect how many\n * pixels of conjunction are needed.\n *\n * It has no effect if no `arrowElement` is provided.\n * @memberof modifiers\n * @inner\n */\n arrow: {\n /** @prop {number} order=500 - Index used to define the order of execution */\n order: 500,\n /** @prop {Boolean} enabled=true - Whether the modifier is enabled or not */\n enabled: true,\n /** @prop {ModifierFn} */\n fn: arrow,\n /** @prop {String|HTMLElement} element='[x-arrow]' - Selector or node used as arrow */\n element: '[x-arrow]',\n },\n\n /**\n * Modifier used to flip the popper's placement when it starts to overlap its\n * reference element.\n *\n * Requires the `preventOverflow` modifier before it in order to work.\n *\n * **NOTE:** this modifier will interrupt the current update cycle and will\n * restart it if it detects the need to flip the placement.\n * @memberof modifiers\n * @inner\n */\n flip: {\n /** @prop {number} order=600 - Index used to define the order of execution */\n order: 600,\n /** @prop {Boolean} enabled=true - Whether the modifier is enabled or not */\n enabled: true,\n /** @prop {ModifierFn} */\n fn: flip,\n /**\n * @prop {String|Array} behavior='flip'\n * The behavior used to change the popper's placement. It can be one of\n * `flip`, `clockwise`, `counterclockwise` or an array with a list of valid\n * placements (with optional variations)\n */\n behavior: 'flip',\n /**\n * @prop {number} padding=5\n * The popper will flip if it hits the edges of the `boundariesElement`\n */\n padding: 5,\n /**\n * @prop {String|HTMLElement} boundariesElement='viewport'\n * The element which will define the boundaries of the popper position.\n * The popper will never be placed outside of the defined boundaries\n * (except if `keepTogether` is enabled)\n */\n boundariesElement: 'viewport',\n /**\n * @prop {Boolean} flipVariations=false\n * The popper will switch placement variation between `-start` and `-end` when\n * the reference element overlaps its boundaries.\n *\n * The original placement should have a set variation.\n */\n flipVariations: false,\n /**\n * @prop {Boolean} flipVariationsByContent=false\n * The popper will switch placement variation between `-start` and `-end` when\n * the popper element overlaps its reference boundaries.\n *\n * The original placement should have a set variation.\n */\n flipVariationsByContent: false,\n },\n\n /**\n * Modifier used to make the popper flow toward the inner of the reference element.\n * By default, when this modifier is disabled, the popper will be placed outside\n * the reference element.\n * @memberof modifiers\n * @inner\n */\n inner: {\n /** @prop {number} order=700 - Index used to define the order of execution */\n order: 700,\n /** @prop {Boolean} enabled=false - Whether the modifier is enabled or not */\n enabled: false,\n /** @prop {ModifierFn} */\n fn: inner,\n },\n\n /**\n * Modifier used to hide the popper when its reference element is outside of the\n * popper boundaries. It will set a `x-out-of-boundaries` attribute which can\n * be used to hide with a CSS selector the popper when its reference is\n * out of boundaries.\n *\n * Requires the `preventOverflow` modifier before it in order to work.\n * @memberof modifiers\n * @inner\n */\n hide: {\n /** @prop {number} order=800 - Index used to define the order of execution */\n order: 800,\n /** @prop {Boolean} enabled=true - Whether the modifier is enabled or not */\n enabled: true,\n /** @prop {ModifierFn} */\n fn: hide,\n },\n\n /**\n * Computes the style that will be applied to the popper element to gets\n * properly positioned.\n *\n * Note that this modifier will not touch the DOM, it just prepares the styles\n * so that `applyStyle` modifier can apply it. This separation is useful\n * in case you need to replace `applyStyle` with a custom implementation.\n *\n * This modifier has `850` as `order` value to maintain backward compatibility\n * with previous versions of Popper.js. Expect the modifiers ordering method\n * to change in future major versions of the library.\n *\n * @memberof modifiers\n * @inner\n */\n computeStyle: {\n /** @prop {number} order=850 - Index used to define the order of execution */\n order: 850,\n /** @prop {Boolean} enabled=true - Whether the modifier is enabled or not */\n enabled: true,\n /** @prop {ModifierFn} */\n fn: computeStyle,\n /**\n * @prop {Boolean} gpuAcceleration=true\n * If true, it uses the CSS 3D transformation to position the popper.\n * Otherwise, it will use the `top` and `left` properties\n */\n gpuAcceleration: true,\n /**\n * @prop {string} [x='bottom']\n * Where to anchor the X axis (`bottom` or `top`). AKA X offset origin.\n * Change this if your popper should grow in a direction different from `bottom`\n */\n x: 'bottom',\n /**\n * @prop {string} [x='left']\n * Where to anchor the Y axis (`left` or `right`). AKA Y offset origin.\n * Change this if your popper should grow in a direction different from `right`\n */\n y: 'right',\n },\n\n /**\n * Applies the computed styles to the popper element.\n *\n * All the DOM manipulations are limited to this modifier. This is useful in case\n * you want to integrate Popper.js inside a framework or view library and you\n * want to delegate all the DOM manipulations to it.\n *\n * Note that if you disable this modifier, you must make sure the popper element\n * has its position set to `absolute` before Popper.js can do its work!\n *\n * Just disable this modifier and define your own to achieve the desired effect.\n *\n * @memberof modifiers\n * @inner\n */\n applyStyle: {\n /** @prop {number} order=900 - Index used to define the order of execution */\n order: 900,\n /** @prop {Boolean} enabled=true - Whether the modifier is enabled or not */\n enabled: true,\n /** @prop {ModifierFn} */\n fn: applyStyle,\n /** @prop {Function} */\n onLoad: applyStyleOnLoad,\n /**\n * @deprecated since version 1.10.0, the property moved to `computeStyle` modifier\n * @prop {Boolean} gpuAcceleration=true\n * If true, it uses the CSS 3D transformation to position the popper.\n * Otherwise, it will use the `top` and `left` properties\n */\n gpuAcceleration: undefined,\n },\n};\n\n/**\n * The `dataObject` is an object containing all the information used by Popper.js.\n * This object is passed to modifiers and to the `onCreate` and `onUpdate` callbacks.\n * @name dataObject\n * @property {Object} data.instance The Popper.js instance\n * @property {String} data.placement Placement applied to popper\n * @property {String} data.originalPlacement Placement originally defined on init\n * @property {Boolean} data.flipped True if popper has been flipped by flip modifier\n * @property {Boolean} data.hide True if the reference element is out of boundaries, useful to know when to hide the popper\n * @property {HTMLElement} data.arrowElement Node used as arrow by arrow modifier\n * @property {Object} data.styles Any CSS property defined here will be applied to the popper. It expects the JavaScript nomenclature (eg. `marginBottom`)\n * @property {Object} data.arrowStyles Any CSS property defined here will be applied to the popper arrow. It expects the JavaScript nomenclature (eg. `marginBottom`)\n * @property {Object} data.boundaries Offsets of the popper boundaries\n * @property {Object} data.offsets The measurements of popper, reference and arrow elements\n * @property {Object} data.offsets.popper `top`, `left`, `width`, `height` values\n * @property {Object} data.offsets.reference `top`, `left`, `width`, `height` values\n * @property {Object} data.offsets.arrow] `top` and `left` offsets, only one of them will be different from 0\n */\n","/**\n * @function\n * @memberof Modifiers\n * @argument {Object} data - The data object generated by `update` method\n * @argument {Object} options - Modifiers configuration and options\n * @returns {Object} The data object, properly modified\n */\nexport default function shift(data) {\n const placement = data.placement;\n const basePlacement = placement.split('-')[0];\n const shiftvariation = placement.split('-')[1];\n\n // if shift shiftvariation is specified, run the modifier\n if (shiftvariation) {\n const { reference, popper } = data.offsets;\n const isVertical = ['bottom', 'top'].indexOf(basePlacement) !== -1;\n const side = isVertical ? 'left' : 'top';\n const measurement = isVertical ? 'width' : 'height';\n\n const shiftOffsets = {\n start: { [side]: reference[side] },\n end: {\n [side]: reference[side] + reference[measurement] - popper[measurement],\n },\n };\n\n data.offsets.popper = { ...popper, ...shiftOffsets[shiftvariation] };\n }\n\n return data;\n}\n","import getOffsetParent from '../utils/getOffsetParent';\nimport getBoundaries from '../utils/getBoundaries';\nimport getSupportedPropertyName from '../utils/getSupportedPropertyName';\n\n/**\n * @function\n * @memberof Modifiers\n * @argument {Object} data - The data object generated by `update` method\n * @argument {Object} options - Modifiers configuration and options\n * @returns {Object} The data object, properly modified\n */\nexport default function preventOverflow(data, options) {\n let boundariesElement =\n options.boundariesElement || getOffsetParent(data.instance.popper);\n\n // If offsetParent is the reference element, we really want to\n // go one step up and use the next offsetParent as reference to\n // avoid to make this modifier completely useless and look like broken\n if (data.instance.reference === boundariesElement) {\n boundariesElement = getOffsetParent(boundariesElement);\n }\n\n // NOTE: DOM access here\n // resets the popper's position so that the document size can be calculated excluding\n // the size of the popper element itself\n const transformProp = getSupportedPropertyName('transform');\n const popperStyles = data.instance.popper.style; // assignment to help minification\n const { top, left, [transformProp]: transform } = popperStyles;\n popperStyles.top = '';\n popperStyles.left = '';\n popperStyles[transformProp] = '';\n\n const boundaries = getBoundaries(\n data.instance.popper,\n data.instance.reference,\n options.padding,\n boundariesElement,\n data.positionFixed\n );\n\n // NOTE: DOM access here\n // restores the original style properties after the offsets have been computed\n popperStyles.top = top;\n popperStyles.left = left;\n popperStyles[transformProp] = transform;\n\n options.boundaries = boundaries;\n\n const order = options.priority;\n let popper = data.offsets.popper;\n\n const check = {\n primary(placement) {\n let value = popper[placement];\n if (\n popper[placement] < boundaries[placement] &&\n !options.escapeWithReference\n ) {\n value = Math.max(popper[placement], boundaries[placement]);\n }\n return { [placement]: value };\n },\n secondary(placement) {\n const mainSide = placement === 'right' ? 'left' : 'top';\n let value = popper[mainSide];\n if (\n popper[placement] > boundaries[placement] &&\n !options.escapeWithReference\n ) {\n value = Math.min(\n popper[mainSide],\n boundaries[placement] -\n (placement === 'right' ? popper.width : popper.height)\n );\n }\n return { [mainSide]: value };\n },\n };\n\n order.forEach(placement => {\n const side =\n ['left', 'top'].indexOf(placement) !== -1 ? 'primary' : 'secondary';\n popper = { ...popper, ...check[side](placement) };\n });\n\n data.offsets.popper = popper;\n\n return data;\n}\n","/**\n * @function\n * @memberof Modifiers\n * @argument {Object} data - The data object generated by update method\n * @argument {Object} options - Modifiers configuration and options\n * @returns {Object} The data object, properly modified\n */\nexport default function keepTogether(data) {\n const { popper, reference } = data.offsets;\n const placement = data.placement.split('-')[0];\n const floor = Math.floor;\n const isVertical = ['top', 'bottom'].indexOf(placement) !== -1;\n const side = isVertical ? 'right' : 'bottom';\n const opSide = isVertical ? 'left' : 'top';\n const measurement = isVertical ? 'width' : 'height';\n\n if (popper[side] < floor(reference[opSide])) {\n data.offsets.popper[opSide] =\n floor(reference[opSide]) - popper[measurement];\n }\n if (popper[opSide] > floor(reference[side])) {\n data.offsets.popper[opSide] = floor(reference[side]);\n }\n\n return data;\n}\n","import getClientRect from '../utils/getClientRect';\nimport getOppositePlacement from '../utils/getOppositePlacement';\n\n/**\n * @function\n * @memberof Modifiers\n * @argument {Object} data - The data object generated by `update` method\n * @argument {Object} options - Modifiers configuration and options\n * @returns {Object} The data object, properly modified\n */\nexport default function inner(data) {\n const placement = data.placement;\n const basePlacement = placement.split('-')[0];\n const { popper, reference } = data.offsets;\n const isHoriz = ['left', 'right'].indexOf(basePlacement) !== -1;\n\n const subtractLength = ['top', 'left'].indexOf(basePlacement) === -1;\n\n popper[isHoriz ? 'left' : 'top'] =\n reference[basePlacement] -\n (subtractLength ? popper[isHoriz ? 'width' : 'height'] : 0);\n\n data.placement = getOppositePlacement(placement);\n data.offsets.popper = getClientRect(popper);\n\n return data;\n}\n","import isModifierRequired from '../utils/isModifierRequired';\nimport find from '../utils/find';\n\n/**\n * @function\n * @memberof Modifiers\n * @argument {Object} data - The data object generated by update method\n * @argument {Object} options - Modifiers configuration and options\n * @returns {Object} The data object, properly modified\n */\nexport default function hide(data) {\n if (!isModifierRequired(data.instance.modifiers, 'hide', 'preventOverflow')) {\n return data;\n }\n\n const refRect = data.offsets.reference;\n const bound = find(\n data.instance.modifiers,\n modifier => modifier.name === 'preventOverflow'\n ).boundaries;\n\n if (\n refRect.bottom < bound.top ||\n refRect.left > bound.right ||\n refRect.top > bound.bottom ||\n refRect.right < bound.left\n ) {\n // Avoid unnecessary DOM access if visibility hasn't changed\n if (data.hide === true) {\n return data;\n }\n\n data.hide = true;\n data.attributes['x-out-of-boundaries'] = '';\n } else {\n // Avoid unnecessary DOM access if visibility hasn't changed\n if (data.hide === false) {\n return data;\n }\n\n data.hide = false;\n data.attributes['x-out-of-boundaries'] = false;\n }\n\n return data;\n}\n","import setStyles from '../utils/setStyles';\nimport setAttributes from '../utils/setAttributes';\nimport getReferenceOffsets from '../utils/getReferenceOffsets';\nimport computeAutoPlacement from '../utils/computeAutoPlacement';\n\n/**\n * @function\n * @memberof Modifiers\n * @argument {Object} data - The data object generated by `update` method\n * @argument {Object} data.styles - List of style properties - values to apply to popper element\n * @argument {Object} data.attributes - List of attribute properties - values to apply to popper element\n * @argument {Object} options - Modifiers configuration and options\n * @returns {Object} The same data object\n */\nexport default function applyStyle(data) {\n // any property present in `data.styles` will be applied to the popper,\n // in this way we can make the 3rd party modifiers add custom styles to it\n // Be aware, modifiers could override the properties defined in the previous\n // lines of this modifier!\n setStyles(data.instance.popper, data.styles);\n\n // any property present in `data.attributes` will be applied to the popper,\n // they will be set as HTML attributes of the element\n setAttributes(data.instance.popper, data.attributes);\n\n // if arrowElement is defined and arrowStyles has some properties\n if (data.arrowElement && Object.keys(data.arrowStyles).length) {\n setStyles(data.arrowElement, data.arrowStyles);\n }\n\n return data;\n}\n\n/**\n * Set the x-placement attribute before everything else because it could be used\n * to add margins to the popper margins needs to be calculated to get the\n * correct popper offsets.\n * @method\n * @memberof Popper.modifiers\n * @param {HTMLElement} reference - The reference element used to position the popper\n * @param {HTMLElement} popper - The HTML element used as popper\n * @param {Object} options - Popper.js options\n */\nexport function applyStyleOnLoad(\n reference,\n popper,\n options,\n modifierOptions,\n state\n) {\n // compute reference element offsets\n const referenceOffsets = getReferenceOffsets(state, popper, reference, options.positionFixed);\n\n // compute auto placement, store placement inside the data object,\n // modifiers will be able to edit `placement` if needed\n // and refer to originalPlacement to know the original value\n const placement = computeAutoPlacement(\n options.placement,\n referenceOffsets,\n popper,\n reference,\n options.modifiers.flip.boundariesElement,\n options.modifiers.flip.padding\n );\n\n popper.setAttribute('x-placement', placement);\n\n // Apply `position` to popper before anything else because\n // without the position applied we can't guarantee correct computations\n setStyles(popper, { position: options.positionFixed ? 'fixed' : 'absolute' });\n\n return options;\n}\n"],"names":["functionToCheck","getType","toString","call","element","nodeType","window","ownerDocument","defaultView","css","getComputedStyle","property","nodeName","parentNode","host","document","body","getStyleComputedProperty","overflow","overflowX","overflowY","test","getScrollParent","getParentNode","reference","referenceNode","version","isIE11","documentElement","noOffsetParent","isIE","offsetParent","nextElementSibling","indexOf","getOffsetParent","firstElementChild","node","getRoot","element1","element2","order","compareDocumentPosition","Node","DOCUMENT_POSITION_FOLLOWING","start","end","range","createRange","setStart","setEnd","commonAncestorContainer","contains","isOffsetContainer","element1root","findCommonOffsetParent","side","upperSide","html","scrollingElement","subtract","scrollTop","getScroll","scrollLeft","modifier","top","bottom","left","right","sideA","axis","sideB","parseFloat","styles","Math","parseInt","computedStyle","getSize","offsets","width","height","rect","getBoundingClientRect","result","sizes","getWindowSizes","clientWidth","clientHeight","horizScrollbar","offsetWidth","vertScrollbar","offsetHeight","getBordersSize","getClientRect","fixedPosition","isIE10","runIsIE","isHTML","parent","childrenRect","parentRect","scrollParent","borderTopWidth","borderLeftWidth","marginTop","marginLeft","includeScroll","excludeScroll","relativeOffset","getOffsetRectRelativeToArbitraryNode","innerWidth","innerHeight","offset","isFixed","parentElement","el","boundaries","getFixedPositionOffsetParent","getReferenceNode","boundariesElement","getViewportOffsetRectRelativeToArtbitraryNode","boundariesNode","popper","padding","isPaddingNumber","placement","getBoundaries","rects","refRect","sortedAreas","Object","keys","map","getArea","sort","b","area","a","filteredAreas","filter","computedPlacement","length","key","variation","split","commonOffsetParent","x","marginBottom","y","marginRight","hash","replace","popperRect","getOuterSizes","popperOffsets","isHoriz","mainSide","secondarySide","measurement","secondaryMeasurement","referenceOffsets","getOppositePlacement","Array","prototype","find","arr","findIndex","cur","match","obj","modifiersToRun","ends","modifiers","slice","forEach","warn","fn","enabled","isFunction","data","state","isDestroyed","getReferenceOffsets","options","positionFixed","computeAutoPlacement","flip","originalPlacement","getPopperOffsets","position","runModifiers","isCreated","onUpdate","onCreate","some","name","prefixes","upperProp","charAt","toUpperCase","i","prefix","toCheck","style","isModifierEnabled","removeAttribute","willChange","getSupportedPropertyName","disableEventListeners","removeOnDestroy","removeChild","isBody","target","addEventListener","passive","push","updateBound","scrollElement","scrollParents","eventsEnabled","setupEventListeners","scheduleUpdate","removeEventListener","removeEventListeners","n","isNaN","isFinite","unit","isNumeric","value","attributes","setAttribute","round","noRound","referenceWidth","popperWidth","isVertical","isVariation","horizontalToInteger","verticalToInteger","bothOddWidth","requesting","isRequired","requested","counter","index","validPlacements","concat","reverse","str","size","useHeight","fragments","frag","trim","divider","search","splitRegex","ops","mergeWithPrevious","op","reduce","toValue","index2","basePlacement","parseOffset","min","floor","max","navigator","longerTimeoutBrowsers","isBrowser","userAgent","supportsMicroTasks","Promise","called","resolve","then","scheduled","MSInputMethodContext","documentMode","isFirefox","placements","BEHAVIORS","Popper","requestAnimationFrame","update","debounce","bind","Defaults","jquery","modifierOptions","onLoad","enableEventListeners","destroy","Utils","global","PopperUtils","shiftvariation","shiftOffsets","instance","transformProp","popperStyles","transform","priority","check","escapeWithReference","opSide","isModifierRequired","arrowElement","querySelector","len","sideCapitalized","toLowerCase","altSide","arrowElementSize","center","popperMarginSide","popperBorderSide","sideValue","arrow","flipped","placementOpposite","flipOrder","behavior","FLIP","CLOCKWISE","clockwise","COUNTERCLOCKWISE","refOffsets","overlapsRef","overflowsLeft","overflowsRight","overflowsTop","overflowsBottom","overflowsBoundaries","flippedVariationByRef","flipVariations","flippedVariationByContent","flipVariationsByContent","flippedVariation","getOppositeVariation","subtractLength","bound","hide","legacyGpuAccelerationOption","gpuAcceleration","offsetParentRect","getRoundedOffsets","devicePixelRatio","prefixedProperty","invertTop","invertLeft","arrowStyles"],"mappings":"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"}
\ No newline at end of file
diff --git a/web/core/assets/vendor/sortable/Sortable.min.js b/web/core/assets/vendor/sortable/Sortable.min.js
index 693054f625..eba0614973 100644
--- a/web/core/assets/vendor/sortable/Sortable.min.js
+++ b/web/core/assets/vendor/sortable/Sortable.min.js
@@ -1,2 +1,2 @@
-/*! Sortable 1.10.0 - MIT | git://github.com/SortableJS/Sortable.git */
-!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e():"function"==typeof define&&define.amd?define(e):(t=t||self).Sortable=e()}(this,function(){"use strict";function o(t){return(o="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function a(){return(a=Object.assign||function(t){for(var e=1;e<arguments.length;e++){var n=arguments[e];for(var o in n)Object.prototype.hasOwnProperty.call(n,o)&&(t[o]=n[o])}return t}).apply(this,arguments)}function I(i){for(var t=1;t<arguments.length;t++){var r=null!=arguments[t]?arguments[t]:{},e=Object.keys(r);"function"==typeof Object.getOwnPropertySymbols&&(e=e.concat(Object.getOwnPropertySymbols(r).filter(function(t){return Object.getOwnPropertyDescriptor(r,t).enumerable}))),e.forEach(function(t){var e,n,o;e=i,o=r[n=t],n in e?Object.defineProperty(e,n,{value:o,enumerable:!0,configurable:!0,writable:!0}):e[n]=o})}return i}function l(t,e){if(null==t)return{};var n,o,i=function(t,e){if(null==t)return{};var n,o,i={},r=Object.keys(t);for(o=0;o<r.length;o++)n=r[o],0<=e.indexOf(n)||(i[n]=t[n]);return i}(t,e);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(t);for(o=0;o<r.length;o++)n=r[o],0<=e.indexOf(n)||Object.prototype.propertyIsEnumerable.call(t,n)&&(i[n]=t[n])}return i}function e(t){return function(t){if(Array.isArray(t)){for(var e=0,n=new Array(t.length);e<t.length;e++)n[e]=t[e];return n}}(t)||function(t){if(Symbol.iterator in Object(t)||"[object Arguments]"===Object.prototype.toString.call(t))return Array.from(t)}(t)||function(){throw new TypeError("Invalid attempt to spread non-iterable instance")}()}function t(t){return!!navigator.userAgent.match(t)}var w=t(/(?:Trident.*rv[ :]?11\.|msie|iemobile|Windows Phone)/i),E=t(/Edge/i),c=t(/firefox/i),s=t(/safari/i)&&!t(/chrome/i)&&!t(/android/i),n=t(/iP(ad|od|hone)/i),i=t(/chrome/i)&&t(/android/i),r={capture:!1,passive:!1};function u(t,e,n){t.addEventListener(e,n,!w&&r)}function d(t,e,n){t.removeEventListener(e,n,!w&&r)}function h(t,e){if(e){if(">"===e[0]&&(e=e.substring(1)),t)try{if(t.matches)return t.matches(e);if(t.msMatchesSelector)return t.msMatchesSelector(e);if(t.webkitMatchesSelector)return t.webkitMatchesSelector(e)}catch(t){return!1}return!1}}function P(t,e,n,o){if(t){n=n||document;do{if(null!=e&&(">"===e[0]?t.parentNode===n&&h(t,e):h(t,e))||o&&t===n)return t;if(t===n)break}while(t=(i=t).host&&i!==document&&i.host.nodeType?i.host:i.parentNode)}var i;return null}var f,p=/\s+/g;function k(t,e,n){if(t&&e)if(t.classList)t.classList[n?"add":"remove"](e);else{var o=(" "+t.className+" ").replace(p," ").replace(" "+e+" "," ");t.className=(o+(n?" "+e:"")).replace(p," ")}}function R(t,e,n){var o=t&&t.style;if(o){if(void 0===n)return document.defaultView&&document.defaultView.getComputedStyle?n=document.defaultView.getComputedStyle(t,""):t.currentStyle&&(n=t.currentStyle),void 0===e?n:n[e];e in o||-1!==e.indexOf("webkit")||(e="-webkit-"+e),o[e]=n+("string"==typeof n?"":"px")}}function v(t,e){var n="";if("string"==typeof t)n=t;else do{var o=R(t,"transform");o&&"none"!==o&&(n=o+" "+n)}while(!e&&(t=t.parentNode));var i=window.DOMMatrix||window.WebKitCSSMatrix||window.CSSMatrix;return i&&new i(n)}function g(t,e,n){if(t){var o=t.getElementsByTagName(e),i=0,r=o.length;if(n)for(;i<r;i++)n(o[i],i);return o}return[]}function N(){return w?document.documentElement:document.scrollingElement}function X(t,e,n,o,i){if(t.getBoundingClientRect||t===window){var r,a,l,s,c,u,d;if(d=t!==window&&t!==N()?(a=(r=t.getBoundingClientRect()).top,l=r.left,s=r.bottom,c=r.right,u=r.height,r.width):(l=a=0,s=window.innerHeight,c=window.innerWidth,u=window.innerHeight,window.innerWidth),(e||n)&&t!==window&&(i=i||t.parentNode,!w))do{if(i&&i.getBoundingClientRect&&("none"!==R(i,"transform")||n&&"static"!==R(i,"position"))){var h=i.getBoundingClientRect();a-=h.top+parseInt(R(i,"border-top-width")),l-=h.left+parseInt(R(i,"border-left-width")),s=a+r.height,c=l+r.width;break}}while(i=i.parentNode);if(o&&t!==window){var f=v(i||t),p=f&&f.a,g=f&&f.d;f&&(s=(a/=g)+(u/=g),c=(l/=p)+(d/=p))}return{top:a,left:l,bottom:s,right:c,width:d,height:u}}}function Y(t,e,n){for(var o=H(t,!0),i=X(t)[e];o;){var r=X(o)[n];if(!("top"===n||"left"===n?r<=i:i<=r))return o;if(o===N())break;o=H(o,!1)}return!1}function m(t,e,n){for(var o=0,i=0,r=t.children;i<r.length;){if("none"!==r[i].style.display&&r[i]!==kt.ghost&&r[i]!==kt.dragged&&P(r[i],n.draggable,t,!1)){if(o===e)return r[i];o++}i++}return null}function B(t,e){for(var n=t.lastElementChild;n&&(n===kt.ghost||"none"===R(n,"display")||e&&!h(n,e));)n=n.previousElementSibling;return n||null}function F(t,e){var n=0;if(!t||!t.parentNode)return-1;for(;t=t.previousElementSibling;)"TEMPLATE"===t.nodeName.toUpperCase()||t===kt.clone||e&&!h(t,e)||n++;return n}function b(t){var e=0,n=0,o=N();if(t)do{var i=v(t),r=i.a,a=i.d;e+=t.scrollLeft*r,n+=t.scrollTop*a}while(t!==o&&(t=t.parentNode));return[e,n]}function H(t,e){if(!t||!t.getBoundingClientRect)return N();var n=t,o=!1;do{if(n.clientWidth<n.scrollWidth||n.clientHeight<n.scrollHeight){var i=R(n);if(n.clientWidth<n.scrollWidth&&("auto"==i.overflowX||"scroll"==i.overflowX)||n.clientHeight<n.scrollHeight&&("auto"==i.overflowY||"scroll"==i.overflowY)){if(!n.getBoundingClientRect||n===document.body)return N();if(o||e)return n;o=!0}}}while(n=n.parentNode);return N()}function y(t,e){return Math.round(t.top)===Math.round(e.top)&&Math.round(t.left)===Math.round(e.left)&&Math.round(t.height)===Math.round(e.height)&&Math.round(t.width)===Math.round(e.width)}function D(e,n){return function(){if(!f){var t=arguments;1===t.length?e.call(this,t[0]):e.apply(this,t),f=setTimeout(function(){f=void 0},n)}}}function L(t,e,n){t.scrollLeft+=e,t.scrollTop+=n}function S(t){var e=window.Polymer,n=window.jQuery||window.Zepto;return e&&e.dom?e.dom(t).cloneNode(!0):n?n(t).clone(!0)[0]:t.cloneNode(!0)}function _(t,e){R(t,"position","absolute"),R(t,"top",e.top),R(t,"left",e.left),R(t,"width",e.width),R(t,"height",e.height)}function C(t){R(t,"position",""),R(t,"top",""),R(t,"left",""),R(t,"width",""),R(t,"height","")}var j="Sortable"+(new Date).getTime();function T(){var e,o=[];return{captureAnimationState:function(){o=[],this.options.animation&&[].slice.call(this.el.children).forEach(function(t){if("none"!==R(t,"display")&&t!==kt.ghost){o.push({target:t,rect:X(t)});var e=I({},o[o.length-1].rect);if(t.thisAnimationDuration){var n=v(t,!0);n&&(e.top-=n.f,e.left-=n.e)}t.fromRect=e}})},addAnimationState:function(t){o.push(t)},removeAnimationState:function(t){o.splice(function(t,e){for(var n in t)if(t.hasOwnProperty(n))for(var o in e)if(e.hasOwnProperty(o)&&e[o]===t[n][o])return Number(n);return-1}(o,{target:t}),1)},animateAll:function(t){var c=this;if(!this.options.animation)return clearTimeout(e),void("function"==typeof t&&t());var u=!1,d=0;o.forEach(function(t){var e=0,n=t.target,o=n.fromRect,i=X(n),r=n.prevFromRect,a=n.prevToRect,l=t.rect,s=v(n,!0);s&&(i.top-=s.f,i.left-=s.e),n.toRect=i,n.thisAnimationDuration&&y(r,i)&&!y(o,i)&&(l.top-i.top)/(l.left-i.left)==(o.top-i.top)/(o.left-i.left)&&(e=function(t,e,n,o){return Math.sqrt(Math.pow(e.top-t.top,2)+Math.pow(e.left-t.left,2))/Math.sqrt(Math.pow(e.top-n.top,2)+Math.pow(e.left-n.left,2))*o.animation}(l,r,a,c.options)),y(i,o)||(n.prevFromRect=o,n.prevToRect=i,e||(e=c.options.animation),c.animate(n,l,i,e)),e&&(u=!0,d=Math.max(d,e),clearTimeout(n.animationResetTimer),n.animationResetTimer=setTimeout(function(){n.animationTime=0,n.prevFromRect=null,n.fromRect=null,n.prevToRect=null,n.thisAnimationDuration=null},e),n.thisAnimationDuration=e)}),clearTimeout(e),u?e=setTimeout(function(){"function"==typeof t&&t()},d):"function"==typeof t&&t(),o=[]},animate:function(t,e,n,o){if(o){R(t,"transition",""),R(t,"transform","");var i=v(this.el),r=i&&i.a,a=i&&i.d,l=(e.left-n.left)/(r||1),s=(e.top-n.top)/(a||1);t.animatingX=!!l,t.animatingY=!!s,R(t,"transform","translate3d("+l+"px,"+s+"px,0)"),function(t){t.offsetWidth}(t),R(t,"transition","transform "+o+"ms"+(this.options.easing?" "+this.options.easing:"")),R(t,"transform","translate3d(0,0,0)"),"number"==typeof t.animated&&clearTimeout(t.animated),t.animated=setTimeout(function(){R(t,"transition",""),R(t,"transform",""),t.animated=!1,t.animatingX=!1,t.animatingY=!1},o)}}}}var x=[],M={initializeByDefault:!0},O={mount:function(t){for(var e in M)!M.hasOwnProperty(e)||e in t||(t[e]=M[e]);x.push(t)},pluginEvent:function(e,n,o){var t=this;this.eventCanceled=!1,o.cancel=function(){t.eventCanceled=!0};var i=e+"Global";x.forEach(function(t){n[t.pluginName]&&(n[t.pluginName][i]&&n[t.pluginName][i](I({sortable:n},o)),n.options[t.pluginName]&&n[t.pluginName][e]&&n[t.pluginName][e](I({sortable:n},o)))})},initializePlugins:function(o,i,r,t){for(var e in x.forEach(function(t){var e=t.pluginName;if(o.options[e]||t.initializeByDefault){var n=new t(o,i,o.options);n.sortable=o,n.options=o.options,o[e]=n,a(r,n.defaults)}}),o.options)if(o.options.hasOwnProperty(e)){var n=this.modifyOption(o,e,o.options[e]);void 0!==n&&(o.options[e]=n)}},getEventProperties:function(e,n){var o={};return x.forEach(function(t){"function"==typeof t.eventProperties&&a(o,t.eventProperties.call(n[t.pluginName],e))}),o},modifyOption:function(e,n,o){var i;return x.forEach(function(t){e[t.pluginName]&&t.optionListeners&&"function"==typeof t.optionListeners[n]&&(i=t.optionListeners[n].call(e[t.pluginName],o))}),i}};function A(t){var e=t.sortable,n=t.rootEl,o=t.name,i=t.targetEl,r=t.cloneEl,a=t.toEl,l=t.fromEl,s=t.oldIndex,c=t.newIndex,u=t.oldDraggableIndex,d=t.newDraggableIndex,h=t.originalEvent,f=t.putSortable,p=t.extraEventProperties;if(e=e||n&&n[j]){var g,v=e.options,m="on"+o.charAt(0).toUpperCase()+o.substr(1);!window.CustomEvent||w||E?(g=document.createEvent("Event")).initEvent(o,!0,!0):g=new CustomEvent(o,{bubbles:!0,cancelable:!0}),g.to=a||n,g.from=l||n,g.item=i||n,g.clone=r,g.oldIndex=s,g.newIndex=c,g.oldDraggableIndex=u,g.newDraggableIndex=d,g.originalEvent=h,g.pullMode=f?f.lastPutMode:void 0;var b=I({},p,O.getEventProperties(o,e));for(var y in b)g[y]=b[y];n&&n.dispatchEvent(g),v[m]&&v[m].call(e,g)}}function K(t,e,n){var o=2<arguments.length&&void 0!==n?n:{},i=o.evt,r=l(o,["evt"]);O.pluginEvent.bind(kt)(t,e,I({dragEl:z,parentEl:G,ghostEl:U,rootEl:q,nextEl:V,lastDownEl:Z,cloneEl:Q,cloneHidden:$,dragStarted:dt,putSortable:it,activeSortable:kt.active,originalEvent:i,oldIndex:J,oldDraggableIndex:et,newIndex:tt,newDraggableIndex:nt,hideGhostForTarget:At,unhideGhostForTarget:Nt,cloneNowHidden:function(){$=!0},cloneNowShown:function(){$=!1},dispatchSortableEvent:function(t){W({sortable:e,name:t,originalEvent:i})}},r))}function W(t){A(I({putSortable:it,cloneEl:Q,targetEl:z,rootEl:q,oldIndex:J,oldDraggableIndex:et,newIndex:tt,newDraggableIndex:nt},t))}if("undefined"==typeof window||!window.document)throw new Error("Sortable.js requires a window with a document");var z,G,U,q,V,Z,Q,$,J,tt,et,nt,ot,it,rt,at,lt,st,ct,ut,dt,ht,ft,pt,gt,vt=!1,mt=!1,bt=[],yt=!1,wt=!1,Et=[],Dt=!1,St=[],_t=n,Ct=E||w?"cssFloat":"float",Tt=!i&&!n&&"draggable"in document.createElement("div"),xt=function(){if(w)return!1;var t=document.createElement("x");return t.style.cssText="pointer-events:auto","auto"===t.style.pointerEvents}(),Mt=function(t,e){var n=R(t),o=parseInt(n.width)-parseInt(n.paddingLeft)-parseInt(n.paddingRight)-parseInt(n.borderLeftWidth)-parseInt(n.borderRightWidth),i=m(t,0,e),r=m(t,1,e),a=i&&R(i),l=r&&R(r),s=a&&parseInt(a.marginLeft)+parseInt(a.marginRight)+X(i).width,c=l&&parseInt(l.marginLeft)+parseInt(l.marginRight)+X(r).width;if("flex"===n.display)return"column"===n.flexDirection||"column-reverse"===n.flexDirection?"vertical":"horizontal";if("grid"===n.display)return n.gridTemplateColumns.split(" ").length<=1?"vertical":"horizontal";if(i&&a.float&&"none"!==a.float){var u="left"===a.float?"left":"right";return!r||"both"!==l.clear&&l.clear!==u?"horizontal":"vertical"}return i&&("block"===a.display||"flex"===a.display||"table"===a.display||"grid"===a.display||o<=s&&"none"===n[Ct]||r&&"none"===n[Ct]&&o<s+c)?"vertical":"horizontal"},Ot=function(t){function s(a,l){return function(t,e,n,o){var i=t.options.group.name&&e.options.group.name&&t.options.group.name===e.options.group.name;if(null==a&&(l||i))return!0;if(null==a||!1===a)return!1;if(l&&"clone"===a)return a;if("function"==typeof a)return s(a(t,e,n,o),l)(t,e,n,o);var r=(l?t:e).options.group.name;return!0===a||"string"==typeof a&&a===r||a.join&&-1<a.indexOf(r)}}var e={},n=t.group;n&&"object"==o(n)||(n={name:n}),e.name=n.name,e.checkPull=s(n.pull,!0),e.checkPut=s(n.put),e.revertClone=n.revertClone,t.group=e},At=function(){!xt&&U&&R(U,"display","none")},Nt=function(){!xt&&U&&R(U,"display","")};document.addEventListener("click",function(t){if(mt)return t.preventDefault(),t.stopPropagation&&t.stopPropagation(),t.stopImmediatePropagation&&t.stopImmediatePropagation(),mt=!1},!0);function It(t){if(z){var e=function(r,a){var l;return bt.some(function(t){if(!B(t)){var e=X(t),n=t[j].options.emptyInsertThreshold,o=r>=e.left-n&&r<=e.right+n,i=a>=e.top-n&&a<=e.bottom+n;return n&&o&&i?l=t:void 0}}),l}((t=t.touches?t.touches[0]:t).clientX,t.clientY);if(e){var n={};for(var o in t)t.hasOwnProperty(o)&&(n[o]=t[o]);n.target=n.rootEl=e,n.preventDefault=void 0,n.stopPropagation=void 0,e[j]._onDragOver(n)}}}function Pt(t){z&&z.parentNode[j]._isOutsideThisEl(t.target)}function kt(t,e){if(!t||!t.nodeType||1!==t.nodeType)throw"Sortable: `el` must be an HTMLElement, not ".concat({}.toString.call(t));this.el=t,this.options=e=a({},e),t[j]=this;var n={group:null,sort:!0,disabled:!1,store:null,handle:null,draggable:/^[uo]l$/i.test(t.nodeName)?">li":">*",swapThreshold:1,invertSwap:!1,invertedSwapThreshold:null,removeCloneOnHide:!0,direction:function(){return Mt(t,this.options)},ghostClass:"sortable-ghost",chosenClass:"sortable-chosen",dragClass:"sortable-drag",ignore:"a, img",filter:null,preventOnFilter:!0,animation:0,easing:null,setData:function(t,e){t.setData("Text",e.textContent)},dropBubble:!1,dragoverBubble:!1,dataIdAttr:"data-id",delay:0,delayOnTouchOnly:!1,touchStartThreshold:(Number.parseInt?Number:window).parseInt(window.devicePixelRatio,10)||1,forceFallback:!1,fallbackClass:"sortable-fallback",fallbackOnBody:!1,fallbackTolerance:0,fallbackOffset:{x:0,y:0},supportPointer:!1!==kt.supportPointer&&"PointerEvent"in window,emptyInsertThreshold:5};for(var o in O.initializePlugins(this,t,n),n)o in e||(e[o]=n[o]);for(var i in Ot(e),this)"_"===i.charAt(0)&&"function"==typeof this[i]&&(this[i]=this[i].bind(this));this.nativeDraggable=!e.forceFallback&&Tt,this.nativeDraggable&&(this.options.touchStartThreshold=1),e.supportPointer?u(t,"pointerdown",this._onTapStart):(u(t,"mousedown",this._onTapStart),u(t,"touchstart",this._onTapStart)),this.nativeDraggable&&(u(t,"dragover",this),u(t,"dragenter",this)),bt.push(this.el),e.store&&e.store.get&&this.sort(e.store.get(this)||[]),a(this,T())}function Rt(t,e,n,o,i,r,a,l){var s,c,u=t[j],d=u.options.onMove;return!window.CustomEvent||w||E?(s=document.createEvent("Event")).initEvent("move",!0,!0):s=new CustomEvent("move",{bubbles:!0,cancelable:!0}),s.to=e,s.from=t,s.dragged=n,s.draggedRect=o,s.related=i||e,s.relatedRect=r||X(e),s.willInsertAfter=l,s.originalEvent=a,t.dispatchEvent(s),d&&(c=d.call(u,s,a)),c}function Xt(t){t.draggable=!1}function Yt(){Dt=!1}function Bt(t){for(var e=t.tagName+t.className+t.src+t.href+t.textContent,n=e.length,o=0;n--;)o+=e.charCodeAt(n);return o.toString(36)}function Ft(t){return setTimeout(t,0)}function Ht(t){return clearTimeout(t)}kt.prototype={constructor:kt,_isOutsideThisEl:function(t){this.el.contains(t)||t===this.el||(ht=null)},_getDirection:function(t,e){return"function"==typeof this.options.direction?this.options.direction.call(this,t,e,z):this.options.direction},_onTapStart:function(e){if(e.cancelable){var n=this,o=this.el,t=this.options,i=t.preventOnFilter,r=e.type,a=e.touches&&e.touches[0]||e.pointerType&&"touch"===e.pointerType&&e,l=(a||e).target,s=e.target.shadowRoot&&(e.path&&e.path[0]||e.composedPath&&e.composedPath()[0])||l,c=t.filter;if(function(t){St.length=0;var e=t.getElementsByTagName("input"),n=e.length;for(;n--;){var o=e[n];o.checked&&St.push(o)}}(o),!z&&!(/mousedown|pointerdown/.test(r)&&0!==e.button||t.disabled||s.isContentEditable||(l=P(l,t.draggable,o,!1))&&l.animated||Z===l)){if(J=F(l),et=F(l,t.draggable),"function"==typeof c){if(c.call(this,e,l,this))return W({sortable:n,rootEl:s,name:"filter",targetEl:l,toEl:o,fromEl:o}),K("filter",n,{evt:e}),void(i&&e.cancelable&&e.preventDefault())}else if(c&&(c=c.split(",").some(function(t){if(t=P(s,t.trim(),o,!1))return W({sortable:n,rootEl:t,name:"filter",targetEl:l,fromEl:o,toEl:o}),K("filter",n,{evt:e}),!0})))return void(i&&e.cancelable&&e.preventDefault());t.handle&&!P(s,t.handle,o,!1)||this._prepareDragStart(e,a,l)}}},_prepareDragStart:function(t,e,n){var o,i=this,r=i.el,a=i.options,l=r.ownerDocument;if(n&&!z&&n.parentNode===r){var s=X(n);if(q=r,G=(z=n).parentNode,V=z.nextSibling,Z=n,ot=a.group,rt={target:kt.dragged=z,clientX:(e||t).clientX,clientY:(e||t).clientY},ct=rt.clientX-s.left,ut=rt.clientY-s.top,this._lastX=(e||t).clientX,this._lastY=(e||t).clientY,z.style["will-change"]="all",o=function(){K("delayEnded",i,{evt:t}),kt.eventCanceled?i._onDrop():(i._disableDelayedDragEvents(),!c&&i.nativeDraggable&&(z.draggable=!0),i._triggerDragStart(t,e),W({sortable:i,name:"choose",originalEvent:t}),k(z,a.chosenClass,!0))},a.ignore.split(",").forEach(function(t){g(z,t.trim(),Xt)}),u(l,"dragover",It),u(l,"mousemove",It),u(l,"touchmove",It),u(l,"mouseup",i._onDrop),u(l,"touchend",i._onDrop),u(l,"touchcancel",i._onDrop),c&&this.nativeDraggable&&(this.options.touchStartThreshold=4,z.draggable=!0),K("delayStart",this,{evt:t}),!a.delay||a.delayOnTouchOnly&&!e||this.nativeDraggable&&(E||w))o();else{if(kt.eventCanceled)return void this._onDrop();u(l,"mouseup",i._disableDelayedDrag),u(l,"touchend",i._disableDelayedDrag),u(l,"touchcancel",i._disableDelayedDrag),u(l,"mousemove",i._delayedDragTouchMoveHandler),u(l,"touchmove",i._delayedDragTouchMoveHandler),a.supportPointer&&u(l,"pointermove",i._delayedDragTouchMoveHandler),i._dragStartTimer=setTimeout(o,a.delay)}}},_delayedDragTouchMoveHandler:function(t){var e=t.touches?t.touches[0]:t;Math.max(Math.abs(e.clientX-this._lastX),Math.abs(e.clientY-this._lastY))>=Math.floor(this.options.touchStartThreshold/(this.nativeDraggable&&window.devicePixelRatio||1))&&this._disableDelayedDrag()},_disableDelayedDrag:function(){z&&Xt(z),clearTimeout(this._dragStartTimer),this._disableDelayedDragEvents()},_disableDelayedDragEvents:function(){var t=this.el.ownerDocument;d(t,"mouseup",this._disableDelayedDrag),d(t,"touchend",this._disableDelayedDrag),d(t,"touchcancel",this._disableDelayedDrag),d(t,"mousemove",this._delayedDragTouchMoveHandler),d(t,"touchmove",this._delayedDragTouchMoveHandler),d(t,"pointermove",this._delayedDragTouchMoveHandler)},_triggerDragStart:function(t,e){e=e||"touch"==t.pointerType&&t,!this.nativeDraggable||e?this.options.supportPointer?u(document,"pointermove",this._onTouchMove):u(document,e?"touchmove":"mousemove",this._onTouchMove):(u(z,"dragend",this),u(q,"dragstart",this._onDragStart));try{document.selection?Ft(function(){document.selection.empty()}):window.getSelection().removeAllRanges()}catch(t){}},_dragStarted:function(t,e){if(vt=!1,q&&z){K("dragStarted",this,{evt:e}),this.nativeDraggable&&u(document,"dragover",Pt);var n=this.options;t||k(z,n.dragClass,!1),k(z,n.ghostClass,!0),kt.active=this,t&&this._appendGhost(),W({sortable:this,name:"start",originalEvent:e})}else this._nulling()},_emulateDragOver:function(){if(at){this._lastX=at.clientX,this._lastY=at.clientY,At();for(var t=document.elementFromPoint(at.clientX,at.clientY),e=t;t&&t.shadowRoot&&(t=t.shadowRoot.elementFromPoint(at.clientX,at.clientY))!==e;)e=t;if(z.parentNode[j]._isOutsideThisEl(t),e)do{if(e[j]){if(e[j]._onDragOver({clientX:at.clientX,clientY:at.clientY,target:t,rootEl:e})&&!this.options.dragoverBubble)break}t=e}while(e=e.parentNode);Nt()}},_onTouchMove:function(t){if(rt){var e=this.options,n=e.fallbackTolerance,o=e.fallbackOffset,i=t.touches?t.touches[0]:t,r=U&&v(U),a=U&&r&&r.a,l=U&&r&&r.d,s=_t&>&&b(gt),c=(i.clientX-rt.clientX+o.x)/(a||1)+(s?s[0]-Et[0]:0)/(a||1),u=(i.clientY-rt.clientY+o.y)/(l||1)+(s?s[1]-Et[1]:0)/(l||1);if(!kt.active&&!vt){if(n&&Math.max(Math.abs(i.clientX-this._lastX),Math.abs(i.clientY-this._lastY))<n)return;this._onDragStart(t,!0)}if(U){r?(r.e+=c-(lt||0),r.f+=u-(st||0)):r={a:1,b:0,c:0,d:1,e:c,f:u};var d="matrix(".concat(r.a,",").concat(r.b,",").concat(r.c,",").concat(r.d,",").concat(r.e,",").concat(r.f,")");R(U,"webkitTransform",d),R(U,"mozTransform",d),R(U,"msTransform",d),R(U,"transform",d),lt=c,st=u,at=i}t.cancelable&&t.preventDefault()}},_appendGhost:function(){if(!U){var t=this.options.fallbackOnBody?document.body:q,e=X(z,!0,_t,!0,t),n=this.options;if(_t){for(gt=t;"static"===R(gt,"position")&&"none"===R(gt,"transform")&>!==document;)gt=gt.parentNode;gt!==document.body&>!==document.documentElement?(gt===document&&(gt=N()),e.top+=gt.scrollTop,e.left+=gt.scrollLeft):gt=N(),Et=b(gt)}k(U=z.cloneNode(!0),n.ghostClass,!1),k(U,n.fallbackClass,!0),k(U,n.dragClass,!0),R(U,"transition",""),R(U,"transform",""),R(U,"box-sizing","border-box"),R(U,"margin",0),R(U,"top",e.top),R(U,"left",e.left),R(U,"width",e.width),R(U,"height",e.height),R(U,"opacity","0.8"),R(U,"position",_t?"absolute":"fixed"),R(U,"zIndex","100000"),R(U,"pointerEvents","none"),kt.ghost=U,t.appendChild(U),R(U,"transform-origin",ct/parseInt(U.style.width)*100+"% "+ut/parseInt(U.style.height)*100+"%")}},_onDragStart:function(t,e){var n=this,o=t.dataTransfer,i=n.options;K("dragStart",this,{evt:t}),kt.eventCanceled?this._onDrop():(K("setupClone",this),kt.eventCanceled||((Q=S(z)).draggable=!1,Q.style["will-change"]="",this._hideClone(),k(Q,this.options.chosenClass,!1),kt.clone=Q),n.cloneId=Ft(function(){K("clone",n),kt.eventCanceled||(n.options.removeCloneOnHide||q.insertBefore(Q,z),n._hideClone(),W({sortable:n,name:"clone"}))}),e||k(z,i.dragClass,!0),e?(mt=!0,n._loopId=setInterval(n._emulateDragOver,50)):(d(document,"mouseup",n._onDrop),d(document,"touchend",n._onDrop),d(document,"touchcancel",n._onDrop),o&&(o.effectAllowed="move",i.setData&&i.setData.call(n,o,z)),u(document,"drop",n),R(z,"transform","translateZ(0)")),vt=!0,n._dragStartId=Ft(n._dragStarted.bind(n,e,t)),u(document,"selectstart",n),dt=!0,s&&R(document.body,"user-select","none"))},_onDragOver:function(n){var o,i,r,a,l=this.el,s=n.target,e=this.options,t=e.group,c=kt.active,u=ot===t,d=e.sort,h=it||c,f=this,p=!1;if(!Dt){if(void 0!==n.preventDefault&&n.cancelable&&n.preventDefault(),s=P(s,e.draggable,l,!0),M("dragOver"),kt.eventCanceled)return p;if(z.contains(n.target)||s.animated&&s.animatingX&&s.animatingY||f._ignoreWhileAnimating===s)return A(!1);if(mt=!1,c&&!e.disabled&&(u?d||(r=!q.contains(z)):it===this||(this.lastPutMode=ot.checkPull(this,c,z,n))&&t.checkPut(this,c,z,n))){if(a="vertical"===this._getDirection(n,s),o=X(z),M("dragOverValid"),kt.eventCanceled)return p;if(r)return G=q,O(),this._hideClone(),M("revert"),kt.eventCanceled||(V?q.insertBefore(z,V):q.appendChild(z)),A(!0);var g=B(l,e.draggable);if(!g||function(t,e,n){var o=X(B(n.el,n.options.draggable));return e?t.clientX>o.right+10||t.clientX<=o.right&&t.clientY>o.bottom&&t.clientX>=o.left:t.clientX>o.right&&t.clientY>o.top||t.clientX<=o.right&&t.clientY>o.bottom+10}(n,a,this)&&!g.animated){if(g===z)return A(!1);if(g&&l===n.target&&(s=g),s&&(i=X(s)),!1!==Rt(q,l,z,o,s,i,n,!!s))return O(),l.appendChild(z),G=l,N(),A(!0)}else if(s.parentNode===l){i=X(s);var v,m,b,y=z.parentNode!==l,w=!function(t,e,n){var o=n?t.left:t.top,i=n?t.right:t.bottom,r=n?t.width:t.height,a=n?e.left:e.top,l=n?e.right:e.bottom,s=n?e.width:e.height;return o===a||i===l||o+r/2===a+s/2}(z.animated&&z.toRect||o,s.animated&&s.toRect||i,a),E=a?"top":"left",D=Y(s,"top","top")||Y(z,"top","top"),S=D?D.scrollTop:void 0;if(ht!==s&&(m=i[E],yt=!1,wt=!w&&e.invertSwap||y),0!==(v=function(t,e,n,o,i,r,a,l){var s=o?t.clientY:t.clientX,c=o?n.height:n.width,u=o?n.top:n.left,d=o?n.bottom:n.right,h=!1;if(!a)if(l&&pt<c*i){if(!yt&&(1===ft?u+c*r/2<s:s<d-c*r/2)&&(yt=!0),yt)h=!0;else if(1===ft?s<u+pt:d-pt<s)return-ft}else if(u+c*(1-i)/2<s&&s<d-c*(1-i)/2)return function(t){return F(z)<F(t)?1:-1}(e);if((h=h||a)&&(s<u+c*r/2||d-c*r/2<s))return u+c/2<s?1:-1;return 0}(n,s,i,a,w?1:e.swapThreshold,null==e.invertedSwapThreshold?e.swapThreshold:e.invertedSwapThreshold,wt,ht===s)))for(var _=F(z);_-=v,(b=G.children[_])&&("none"===R(b,"display")||b===U););if(0===v||b===s)return A(!1);ft=v;var C=(ht=s).nextElementSibling,T=!1,x=Rt(q,l,z,o,s,i,n,T=1===v);if(!1!==x)return 1!==x&&-1!==x||(T=1===x),Dt=!0,setTimeout(Yt,30),O(),T&&!C?l.appendChild(z):s.parentNode.insertBefore(z,T?C:s),D&&L(D,0,S-D.scrollTop),G=z.parentNode,void 0===m||wt||(pt=Math.abs(m-X(s)[E])),N(),A(!0)}if(l.contains(z))return A(!1)}return!1}function M(t,e){K(t,f,I({evt:n,isOwner:u,axis:a?"vertical":"horizontal",revert:r,dragRect:o,targetRect:i,canSort:d,fromSortable:h,target:s,completed:A,onMove:function(t,e){return Rt(q,l,z,o,t,X(t),n,e)},changed:N},e))}function O(){M("dragOverAnimationCapture"),f.captureAnimationState(),f!==h&&h.captureAnimationState()}function A(t){return M("dragOverCompleted",{insertion:t}),t&&(u?c._hideClone():c._showClone(f),f!==h&&(k(z,it?it.options.ghostClass:c.options.ghostClass,!1),k(z,e.ghostClass,!0)),it!==f&&f!==kt.active?it=f:f===kt.active&&it&&(it=null),h===f&&(f._ignoreWhileAnimating=s),f.animateAll(function(){M("dragOverAnimationComplete"),f._ignoreWhileAnimating=null}),f!==h&&(h.animateAll(),h._ignoreWhileAnimating=null)),(s===z&&!z.animated||s===l&&!s.animated)&&(ht=null),e.dragoverBubble||n.rootEl||s===document||(z.parentNode[j]._isOutsideThisEl(n.target),t||It(n)),!e.dragoverBubble&&n.stopPropagation&&n.stopPropagation(),p=!0}function N(){tt=F(z),nt=F(z,e.draggable),W({sortable:f,name:"change",toEl:l,newIndex:tt,newDraggableIndex:nt,originalEvent:n})}},_ignoreWhileAnimating:null,_offMoveEvents:function(){d(document,"mousemove",this._onTouchMove),d(document,"touchmove",this._onTouchMove),d(document,"pointermove",this._onTouchMove),d(document,"dragover",It),d(document,"mousemove",It),d(document,"touchmove",It)},_offUpEvents:function(){var t=this.el.ownerDocument;d(t,"mouseup",this._onDrop),d(t,"touchend",this._onDrop),d(t,"pointerup",this._onDrop),d(t,"touchcancel",this._onDrop),d(document,"selectstart",this)},_onDrop:function(t){var e=this.el,n=this.options;tt=F(z),nt=F(z,n.draggable),K("drop",this,{evt:t}),G=z&&z.parentNode,tt=F(z),nt=F(z,n.draggable),kt.eventCanceled||(yt=wt=vt=!1,clearInterval(this._loopId),clearTimeout(this._dragStartTimer),Ht(this.cloneId),Ht(this._dragStartId),this.nativeDraggable&&(d(document,"drop",this),d(e,"dragstart",this._onDragStart)),this._offMoveEvents(),this._offUpEvents(),s&&R(document.body,"user-select",""),t&&(dt&&(t.cancelable&&t.preventDefault(),n.dropBubble||t.stopPropagation()),U&&U.parentNode&&U.parentNode.removeChild(U),(q===G||it&&"clone"!==it.lastPutMode)&&Q&&Q.parentNode&&Q.parentNode.removeChild(Q),z&&(this.nativeDraggable&&d(z,"dragend",this),Xt(z),z.style["will-change"]="",dt&&!vt&&k(z,it?it.options.ghostClass:this.options.ghostClass,!1),k(z,this.options.chosenClass,!1),W({sortable:this,name:"unchoose",toEl:G,newIndex:null,newDraggableIndex:null,originalEvent:t}),q!==G?(0<=tt&&(W({rootEl:G,name:"add",toEl:G,fromEl:q,originalEvent:t}),W({sortable:this,name:"remove",toEl:G,originalEvent:t}),W({rootEl:G,name:"sort",toEl:G,fromEl:q,originalEvent:t}),W({sortable:this,name:"sort",toEl:G,originalEvent:t})),it&&it.save()):tt!==J&&0<=tt&&(W({sortable:this,name:"update",toEl:G,originalEvent:t}),W({sortable:this,name:"sort",toEl:G,originalEvent:t})),kt.active&&(null!=tt&&-1!==tt||(tt=J,nt=et),W({sortable:this,name:"end",toEl:G,originalEvent:t}),this.save())))),this._nulling()},_nulling:function(){K("nulling",this),q=z=G=U=V=Q=Z=$=rt=at=dt=tt=nt=J=et=ht=ft=it=ot=kt.dragged=kt.ghost=kt.clone=kt.active=null,St.forEach(function(t){t.checked=!0}),St.length=lt=st=0},handleEvent:function(t){switch(t.type){case"drop":case"dragend":this._onDrop(t);break;case"dragenter":case"dragover":z&&(this._onDragOver(t),function(t){t.dataTransfer&&(t.dataTransfer.dropEffect="move");t.cancelable&&t.preventDefault()}(t));break;case"selectstart":t.preventDefault()}},toArray:function(){for(var t,e=[],n=this.el.children,o=0,i=n.length,r=this.options;o<i;o++)P(t=n[o],r.draggable,this.el,!1)&&e.push(t.getAttribute(r.dataIdAttr)||Bt(t));return e},sort:function(t){var o={},i=this.el;this.toArray().forEach(function(t,e){var n=i.children[e];P(n,this.options.draggable,i,!1)&&(o[t]=n)},this),t.forEach(function(t){o[t]&&(i.removeChild(o[t]),i.appendChild(o[t]))})},save:function(){var t=this.options.store;t&&t.set&&t.set(this)},closest:function(t,e){return P(t,e||this.options.draggable,this.el,!1)},option:function(t,e){var n=this.options;if(void 0===e)return n[t];var o=O.modifyOption(this,t,e);n[t]=void 0!==o?o:e,"group"===t&&Ot(n)},destroy:function(){K("destroy",this);var t=this.el;t[j]=null,d(t,"mousedown",this._onTapStart),d(t,"touchstart",this._onTapStart),d(t,"pointerdown",this._onTapStart),this.nativeDraggable&&(d(t,"dragover",this),d(t,"dragenter",this)),Array.prototype.forEach.call(t.querySelectorAll("[draggable]"),function(t){t.removeAttribute("draggable")}),this._onDrop(),bt.splice(bt.indexOf(this.el),1),this.el=t=null},_hideClone:function(){if(!$){if(K("hideClone",this),kt.eventCanceled)return;R(Q,"display","none"),this.options.removeCloneOnHide&&Q.parentNode&&Q.parentNode.removeChild(Q),$=!0}},_showClone:function(t){if("clone"===t.lastPutMode){if($){if(K("showClone",this),kt.eventCanceled)return;q.contains(z)&&!this.options.group.revertClone?q.insertBefore(Q,z):V?q.insertBefore(Q,V):q.appendChild(Q),this.options.group.revertClone&&this.animate(z,Q),R(Q,"display",""),$=!1}}else this._hideClone()}},u(document,"touchmove",function(t){(kt.active||vt)&&t.cancelable&&t.preventDefault()}),kt.utils={on:u,off:d,css:R,find:g,is:function(t,e){return!!P(t,e,t,!1)},extend:function(t,e){if(t&&e)for(var n in e)e.hasOwnProperty(n)&&(t[n]=e[n]);return t},throttle:D,closest:P,toggleClass:k,clone:S,index:F,nextTick:Ft,cancelNextTick:Ht,detectDirection:Mt,getChild:m},kt.get=function(t){return t[j]},kt.mount=function(){for(var t=arguments.length,e=new Array(t),n=0;n<t;n++)e[n]=arguments[n];e[0].constructor===Array&&(e=e[0]),e.forEach(function(t){if(!t.prototype||!t.prototype.constructor)throw"Sortable: Mounted plugin must be a constructor function, not ".concat({}.toString.call(t));t.utils&&(kt.utils=I({},kt.utils,t.utils)),O.mount(t)})},kt.create=function(t,e){return new kt(t,e)};var Lt,jt,Kt,Wt,zt,Gt,Ut=[],qt=!(kt.version="1.10.0");function Vt(){Ut.forEach(function(t){clearInterval(t.pid)}),Ut=[]}function Zt(){clearInterval(Gt)}function Qt(t){var e=t.originalEvent,n=t.putSortable,o=t.dragEl,i=t.activeSortable,r=t.dispatchSortableEvent,a=t.hideGhostForTarget,l=t.unhideGhostForTarget,s=n||i;a();var c=e.changedTouches&&e.changedTouches.length?e.changedTouches[0]:e,u=document.elementFromPoint(c.clientX,c.clientY);l(),s&&!s.el.contains(u)&&(r("spill"),this.onSpill({dragEl:o,putSortable:n}))}var $t,Jt=D(function(n,t,e,o){if(t.scroll){var i,r=(n.touches?n.touches[0]:n).clientX,a=(n.touches?n.touches[0]:n).clientY,l=t.scrollSensitivity,s=t.scrollSpeed,c=N(),u=!1;jt!==e&&(jt=e,Vt(),Lt=t.scroll,i=t.scrollFn,!0===Lt&&(Lt=H(e,!0)));var d=0,h=Lt;do{var f=h,p=X(f),g=p.top,v=p.bottom,m=p.left,b=p.right,y=p.width,w=p.height,E=void 0,D=void 0,S=f.scrollWidth,_=f.scrollHeight,C=R(f),T=f.scrollLeft,x=f.scrollTop;D=f===c?(E=y<S&&("auto"===C.overflowX||"scroll"===C.overflowX||"visible"===C.overflowX),w<_&&("auto"===C.overflowY||"scroll"===C.overflowY||"visible"===C.overflowY)):(E=y<S&&("auto"===C.overflowX||"scroll"===C.overflowX),w<_&&("auto"===C.overflowY||"scroll"===C.overflowY));var M=E&&(Math.abs(b-r)<=l&&T+y<S)-(Math.abs(m-r)<=l&&!!T),O=D&&(Math.abs(v-a)<=l&&x+w<_)-(Math.abs(g-a)<=l&&!!x);if(!Ut[d])for(var A=0;A<=d;A++)Ut[A]||(Ut[A]={});Ut[d].vx==M&&Ut[d].vy==O&&Ut[d].el===f||(Ut[d].el=f,Ut[d].vx=M,Ut[d].vy=O,clearInterval(Ut[d].pid),0==M&&0==O||(u=!0,Ut[d].pid=setInterval(function(){o&&0===this.layer&&kt.active._onTouchMove(zt);var t=Ut[this.layer].vy?Ut[this.layer].vy*s:0,e=Ut[this.layer].vx?Ut[this.layer].vx*s:0;"function"==typeof i&&"continue"!==i.call(kt.dragged.parentNode[j],e,t,n,zt,Ut[this.layer].el)||L(Ut[this.layer].el,e,t)}.bind({layer:d}),24))),d++}while(t.bubbleScroll&&h!==c&&(h=H(h,!1)));qt=u}},30);function te(){}function ee(){}te.prototype={startIndex:null,dragStart:function(t){var e=t.oldDraggableIndex;this.startIndex=e},onSpill:function(t){var e=t.dragEl,n=t.putSortable;this.sortable.captureAnimationState(),n&&n.captureAnimationState();var o=m(this.sortable.el,this.startIndex,this.options);o?this.sortable.el.insertBefore(e,o):this.sortable.el.appendChild(e),this.sortable.animateAll(),n&&n.animateAll()},drop:Qt},a(te,{pluginName:"revertOnSpill"}),ee.prototype={onSpill:function(t){var e=t.dragEl,n=t.putSortable||this.sortable;n.captureAnimationState(),e.parentNode&&e.parentNode.removeChild(e),n.animateAll()},drop:Qt},a(ee,{pluginName:"removeOnSpill"});var ne,oe,ie,re,ae,le=[],se=[],ce=!1,ue=!1,de=!1;function he(o,i){se.forEach(function(t,e){var n=i.children[t.sortableIndex+(o?Number(e):0)];n?i.insertBefore(t,n):i.appendChild(t)})}function fe(){le.forEach(function(t){t!==ie&&t.parentNode&&t.parentNode.removeChild(t)})}return kt.mount(new function(){function t(){for(var t in this.defaults={scroll:!0,scrollSensitivity:30,scrollSpeed:10,bubbleScroll:!0},this)"_"===t.charAt(0)&&"function"==typeof this[t]&&(this[t]=this[t].bind(this))}return t.prototype={dragStarted:function(t){var e=t.originalEvent;this.sortable.nativeDraggable?u(document,"dragover",this._handleAutoScroll):this.options.supportPointer?u(document,"pointermove",this._handleFallbackAutoScroll):e.touches?u(document,"touchmove",this._handleFallbackAutoScroll):u(document,"mousemove",this._handleFallbackAutoScroll)},dragOverCompleted:function(t){var e=t.originalEvent;this.options.dragOverBubble||e.rootEl||this._handleAutoScroll(e)},drop:function(){this.sortable.nativeDraggable?d(document,"dragover",this._handleAutoScroll):(d(document,"pointermove",this._handleFallbackAutoScroll),d(document,"touchmove",this._handleFallbackAutoScroll),d(document,"mousemove",this._handleFallbackAutoScroll)),Zt(),Vt(),clearTimeout(f),f=void 0},nulling:function(){zt=jt=Lt=qt=Gt=Kt=Wt=null,Ut.length=0},_handleFallbackAutoScroll:function(t){this._handleAutoScroll(t,!0)},_handleAutoScroll:function(e,n){var o=this,i=(e.touches?e.touches[0]:e).clientX,r=(e.touches?e.touches[0]:e).clientY,t=document.elementFromPoint(i,r);if(zt=e,n||E||w||s){Jt(e,this.options,t,n);var a=H(t,!0);!qt||Gt&&i===Kt&&r===Wt||(Gt&&Zt(),Gt=setInterval(function(){var t=H(document.elementFromPoint(i,r),!0);t!==a&&(a=t,Vt()),Jt(e,o.options,t,n)},10),Kt=i,Wt=r)}else{if(!this.options.bubbleScroll||H(t,!0)===N())return void Vt();Jt(e,this.options,H(t,!1),!1)}}},a(t,{pluginName:"scroll",initializeByDefault:!0})}),kt.mount(ee,te),kt.mount(new function(){function t(){this.defaults={swapClass:"sortable-swap-highlight"}}return t.prototype={dragStart:function(t){var e=t.dragEl;$t=e},dragOverValid:function(t){var e=t.completed,n=t.target,o=t.onMove,i=t.activeSortable,r=t.changed,a=t.cancel;if(i.options.swap){var l=this.sortable.el,s=this.options;if(n&&n!==l){var c=$t;$t=!1!==o(n)?(k(n,s.swapClass,!0),n):null,c&&c!==$t&&k(c,s.swapClass,!1)}r(),e(!0),a()}},drop:function(t){var e=t.activeSortable,n=t.putSortable,o=t.dragEl,i=n||this.sortable,r=this.options;$t&&k($t,r.swapClass,!1),$t&&(r.swap||n&&n.options.swap)&&o!==$t&&(i.captureAnimationState(),i!==e&&e.captureAnimationState(),function(t,e){var n,o,i=t.parentNode,r=e.parentNode;if(!i||!r||i.isEqualNode(e)||r.isEqualNode(t))return;n=F(t),o=F(e),i.isEqualNode(r)&&n<o&&o++;i.insertBefore(e,i.children[n]),r.insertBefore(t,r.children[o])}(o,$t),i.animateAll(),i!==e&&e.animateAll())},nulling:function(){$t=null}},a(t,{pluginName:"swap",eventProperties:function(){return{swapItem:$t}}})}),kt.mount(new function(){function t(o){for(var t in this)"_"===t.charAt(0)&&"function"==typeof this[t]&&(this[t]=this[t].bind(this));o.options.supportPointer?u(document,"pointerup",this._deselectMultiDrag):(u(document,"mouseup",this._deselectMultiDrag),u(document,"touchend",this._deselectMultiDrag)),u(document,"keydown",this._checkKeyDown),u(document,"keyup",this._checkKeyUp),this.defaults={selectedClass:"sortable-selected",multiDragKey:null,setData:function(t,e){var n="";le.length&&oe===o?le.forEach(function(t,e){n+=(e?", ":"")+t.textContent}):n=e.textContent,t.setData("Text",n)}}}return t.prototype={multiDragKeyDown:!1,isMultiDrag:!1,delayStartGlobal:function(t){var e=t.dragEl;ie=e},delayEnded:function(){this.isMultiDrag=~le.indexOf(ie)},setupClone:function(t){var e=t.sortable,n=t.cancel;if(this.isMultiDrag){for(var o=0;o<le.length;o++)se.push(S(le[o])),se[o].sortableIndex=le[o].sortableIndex,se[o].draggable=!1,se[o].style["will-change"]="",k(se[o],this.options.selectedClass,!1),le[o]===ie&&k(se[o],this.options.chosenClass,!1);e._hideClone(),n()}},clone:function(t){var e=t.sortable,n=t.rootEl,o=t.dispatchSortableEvent,i=t.cancel;this.isMultiDrag&&(this.options.removeCloneOnHide||le.length&&oe===e&&(he(!0,n),o("clone"),i()))},showClone:function(t){var e=t.cloneNowShown,n=t.rootEl,o=t.cancel;this.isMultiDrag&&(he(!1,n),se.forEach(function(t){R(t,"display","")}),e(),ae=!1,o())},hideClone:function(t){var e=this,n=(t.sortable,t.cloneNowHidden),o=t.cancel;this.isMultiDrag&&(se.forEach(function(t){R(t,"display","none"),e.options.removeCloneOnHide&&t.parentNode&&t.parentNode.removeChild(t)}),n(),ae=!0,o())},dragStartGlobal:function(t){t.sortable;!this.isMultiDrag&&oe&&oe.multiDrag._deselectMultiDrag(),le.forEach(function(t){t.sortableIndex=F(t)}),le=le.sort(function(t,e){return t.sortableIndex-e.sortableIndex}),de=!0},dragStarted:function(t){var e=this,n=t.sortable;if(this.isMultiDrag){if(this.options.sort&&(n.captureAnimationState(),this.options.animation)){le.forEach(function(t){t!==ie&&R(t,"position","absolute")});var o=X(ie,!1,!0,!0);le.forEach(function(t){t!==ie&&_(t,o)}),ce=ue=!0}n.animateAll(function(){ce=ue=!1,e.options.animation&&le.forEach(function(t){C(t)}),e.options.sort&&fe()})}},dragOver:function(t){var e=t.target,n=t.completed,o=t.cancel;ue&&~le.indexOf(e)&&(n(!1),o())},revert:function(t){var e=t.fromSortable,n=t.rootEl,o=t.sortable,i=t.dragRect;1<le.length&&(le.forEach(function(t){o.addAnimationState({target:t,rect:ue?X(t):i}),C(t),t.fromRect=i,e.removeAnimationState(t)}),ue=!1,function(o,i){le.forEach(function(t,e){var n=i.children[t.sortableIndex+(o?Number(e):0)];n?i.insertBefore(t,n):i.appendChild(t)})}(!this.options.removeCloneOnHide,n))},dragOverCompleted:function(t){var e=t.sortable,n=t.isOwner,o=t.insertion,i=t.activeSortable,r=t.parentEl,a=t.putSortable,l=this.options;if(o){if(n&&i._hideClone(),ce=!1,l.animation&&1<le.length&&(ue||!n&&!i.options.sort&&!a)){var s=X(ie,!1,!0,!0);le.forEach(function(t){t!==ie&&(_(t,s),r.appendChild(t))}),ue=!0}if(!n)if(ue||fe(),1<le.length){var c=ae;i._showClone(e),i.options.animation&&!ae&&c&&se.forEach(function(t){i.addAnimationState({target:t,rect:re}),t.fromRect=re,t.thisAnimationDuration=null})}else i._showClone(e)}},dragOverAnimationCapture:function(t){var e=t.dragRect,n=t.isOwner,o=t.activeSortable;if(le.forEach(function(t){t.thisAnimationDuration=null}),o.options.animation&&!n&&o.multiDrag.isMultiDrag){re=a({},e);var i=v(ie,!0);re.top-=i.f,re.left-=i.e}},dragOverAnimationComplete:function(){ue&&(ue=!1,fe())},drop:function(t){var e=t.originalEvent,n=t.rootEl,o=t.parentEl,i=t.sortable,r=t.dispatchSortableEvent,a=t.oldIndex,l=t.putSortable,s=l||this.sortable;if(e){var c=this.options,u=o.children;if(!de)if(c.multiDragKey&&!this.multiDragKeyDown&&this._deselectMultiDrag(),k(ie,c.selectedClass,!~le.indexOf(ie)),~le.indexOf(ie))le.splice(le.indexOf(ie),1),ne=null,A({sortable:i,rootEl:n,name:"deselect",targetEl:ie,originalEvt:e});else{if(le.push(ie),A({sortable:i,rootEl:n,name:"select",targetEl:ie,originalEvt:e}),e.shiftKey&&ne&&i.el.contains(ne)){var d,h,f=F(ne),p=F(ie);if(~f&&~p&&f!==p)for(d=f<p?(h=f,p):(h=p,f+1);h<d;h++)~le.indexOf(u[h])||(k(u[h],c.selectedClass,!0),le.push(u[h]),A({sortable:i,rootEl:n,name:"select",targetEl:u[h],originalEvt:e}))}else ne=ie;oe=s}if(de&&this.isMultiDrag){if((o[j].options.sort||o!==n)&&1<le.length){var g=X(ie),v=F(ie,":not(."+this.options.selectedClass+")");if(!ce&&c.animation&&(ie.thisAnimationDuration=null),s.captureAnimationState(),!ce&&(c.animation&&(ie.fromRect=g,le.forEach(function(t){if(t.thisAnimationDuration=null,t!==ie){var e=ue?X(t):g;t.fromRect=e,s.addAnimationState({target:t,rect:e})}})),fe(),le.forEach(function(t){u[v]?o.insertBefore(t,u[v]):o.appendChild(t),v++}),a===F(ie))){var m=!1;le.forEach(function(t){t.sortableIndex===F(t)||(m=!0)}),m&&r("update")}le.forEach(function(t){C(t)}),s.animateAll()}oe=s}(n===o||l&&"clone"!==l.lastPutMode)&&se.forEach(function(t){t.parentNode&&t.parentNode.removeChild(t)})}},nullingGlobal:function(){this.isMultiDrag=de=!1,se.length=0},destroyGlobal:function(){this._deselectMultiDrag(),d(document,"pointerup",this._deselectMultiDrag),d(document,"mouseup",this._deselectMultiDrag),d(document,"touchend",this._deselectMultiDrag),d(document,"keydown",this._checkKeyDown),d(document,"keyup",this._checkKeyUp)},_deselectMultiDrag:function(t){if(!de&&oe===this.sortable&&!(t&&P(t.target,this.options.draggable,this.sortable.el,!1)||t&&0!==t.button))for(;le.length;){var e=le[0];k(e,this.options.selectedClass,!1),le.shift(),A({sortable:this.sortable,rootEl:this.sortable.el,name:"deselect",targetEl:e,originalEvt:t})}},_checkKeyDown:function(t){t.key===this.options.multiDragKey&&(this.multiDragKeyDown=!0)},_checkKeyUp:function(t){t.key===this.options.multiDragKey&&(this.multiDragKeyDown=!1)}},a(t,{pluginName:"multiDrag",utils:{select:function(t){var e=t.parentNode[j];e&&e.options.multiDrag&&!~le.indexOf(t)&&(oe&&oe!==e&&(oe.multiDrag._deselectMultiDrag(),oe=e),k(t,e.options.selectedClass,!0),le.push(t))},deselect:function(t){var e=t.parentNode[j],n=le.indexOf(t);e&&e.options.multiDrag&&~n&&(k(t,e.options.selectedClass,!1),le.splice(n,1))}},eventProperties:function(){var n=this,o=[],i=[];return le.forEach(function(t){var e;o.push({multiDragElement:t,index:t.sortableIndex}),e=ue&&t!==ie?-1:ue?F(t,":not(."+n.options.selectedClass+")"):F(t),i.push({multiDragElement:t,index:e})}),{items:e(le),clones:[].concat(se),oldIndicies:o,newIndicies:i}},optionListeners:{multiDragKey:function(t){return"ctrl"===(t=t.toLowerCase())?t="Control":1<t.length&&(t=t.charAt(0).toUpperCase()+t.substr(1)),t}}})}),kt});
\ No newline at end of file
+/*! Sortable 1.10.2 - MIT | git://github.com/SortableJS/Sortable.git */
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e():"function"==typeof define&&define.amd?define(e):(t=t||self).Sortable=e()}(this,function(){"use strict";function o(t){return(o="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function a(){return(a=Object.assign||function(t){for(var e=1;e<arguments.length;e++){var n=arguments[e];for(var o in n)Object.prototype.hasOwnProperty.call(n,o)&&(t[o]=n[o])}return t}).apply(this,arguments)}function I(i){for(var t=1;t<arguments.length;t++){var r=null!=arguments[t]?arguments[t]:{},e=Object.keys(r);"function"==typeof Object.getOwnPropertySymbols&&(e=e.concat(Object.getOwnPropertySymbols(r).filter(function(t){return Object.getOwnPropertyDescriptor(r,t).enumerable}))),e.forEach(function(t){var e,n,o;e=i,o=r[n=t],n in e?Object.defineProperty(e,n,{value:o,enumerable:!0,configurable:!0,writable:!0}):e[n]=o})}return i}function l(t,e){if(null==t)return{};var n,o,i=function(t,e){if(null==t)return{};var n,o,i={},r=Object.keys(t);for(o=0;o<r.length;o++)n=r[o],0<=e.indexOf(n)||(i[n]=t[n]);return i}(t,e);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(t);for(o=0;o<r.length;o++)n=r[o],0<=e.indexOf(n)||Object.prototype.propertyIsEnumerable.call(t,n)&&(i[n]=t[n])}return i}function e(t){return function(t){if(Array.isArray(t)){for(var e=0,n=new Array(t.length);e<t.length;e++)n[e]=t[e];return n}}(t)||function(t){if(Symbol.iterator in Object(t)||"[object Arguments]"===Object.prototype.toString.call(t))return Array.from(t)}(t)||function(){throw new TypeError("Invalid attempt to spread non-iterable instance")}()}function t(t){if("undefined"!=typeof window&&window.navigator)return!!navigator.userAgent.match(t)}var w=t(/(?:Trident.*rv[ :]?11\.|msie|iemobile|Windows Phone)/i),E=t(/Edge/i),c=t(/firefox/i),s=t(/safari/i)&&!t(/chrome/i)&&!t(/android/i),n=t(/iP(ad|od|hone)/i),i=t(/chrome/i)&&t(/android/i),r={capture:!1,passive:!1};function u(t,e,n){t.addEventListener(e,n,!w&&r)}function d(t,e,n){t.removeEventListener(e,n,!w&&r)}function h(t,e){if(e){if(">"===e[0]&&(e=e.substring(1)),t)try{if(t.matches)return t.matches(e);if(t.msMatchesSelector)return t.msMatchesSelector(e);if(t.webkitMatchesSelector)return t.webkitMatchesSelector(e)}catch(t){return!1}return!1}}function P(t,e,n,o){if(t){n=n||document;do{if(null!=e&&(">"===e[0]?t.parentNode===n&&h(t,e):h(t,e))||o&&t===n)return t;if(t===n)break}while(t=(i=t).host&&i!==document&&i.host.nodeType?i.host:i.parentNode)}var i;return null}var f,p=/\s+/g;function k(t,e,n){if(t&&e)if(t.classList)t.classList[n?"add":"remove"](e);else{var o=(" "+t.className+" ").replace(p," ").replace(" "+e+" "," ");t.className=(o+(n?" "+e:"")).replace(p," ")}}function R(t,e,n){var o=t&&t.style;if(o){if(void 0===n)return document.defaultView&&document.defaultView.getComputedStyle?n=document.defaultView.getComputedStyle(t,""):t.currentStyle&&(n=t.currentStyle),void 0===e?n:n[e];e in o||-1!==e.indexOf("webkit")||(e="-webkit-"+e),o[e]=n+("string"==typeof n?"":"px")}}function v(t,e){var n="";if("string"==typeof t)n=t;else do{var o=R(t,"transform");o&&"none"!==o&&(n=o+" "+n)}while(!e&&(t=t.parentNode));var i=window.DOMMatrix||window.WebKitCSSMatrix||window.CSSMatrix||window.MSCSSMatrix;return i&&new i(n)}function g(t,e,n){if(t){var o=t.getElementsByTagName(e),i=0,r=o.length;if(n)for(;i<r;i++)n(o[i],i);return o}return[]}function N(){var t=document.scrollingElement;return t||document.documentElement}function X(t,e,n,o,i){if(t.getBoundingClientRect||t===window){var r,a,l,s,c,u,d;if(d=t!==window&&t!==N()?(a=(r=t.getBoundingClientRect()).top,l=r.left,s=r.bottom,c=r.right,u=r.height,r.width):(l=a=0,s=window.innerHeight,c=window.innerWidth,u=window.innerHeight,window.innerWidth),(e||n)&&t!==window&&(i=i||t.parentNode,!w))do{if(i&&i.getBoundingClientRect&&("none"!==R(i,"transform")||n&&"static"!==R(i,"position"))){var h=i.getBoundingClientRect();a-=h.top+parseInt(R(i,"border-top-width")),l-=h.left+parseInt(R(i,"border-left-width")),s=a+r.height,c=l+r.width;break}}while(i=i.parentNode);if(o&&t!==window){var f=v(i||t),p=f&&f.a,g=f&&f.d;f&&(s=(a/=g)+(u/=g),c=(l/=p)+(d/=p))}return{top:a,left:l,bottom:s,right:c,width:d,height:u}}}function Y(t,e,n){for(var o=H(t,!0),i=X(t)[e];o;){var r=X(o)[n];if(!("top"===n||"left"===n?r<=i:i<=r))return o;if(o===N())break;o=H(o,!1)}return!1}function m(t,e,n){for(var o=0,i=0,r=t.children;i<r.length;){if("none"!==r[i].style.display&&r[i]!==Rt.ghost&&r[i]!==Rt.dragged&&P(r[i],n.draggable,t,!1)){if(o===e)return r[i];o++}i++}return null}function B(t,e){for(var n=t.lastElementChild;n&&(n===Rt.ghost||"none"===R(n,"display")||e&&!h(n,e));)n=n.previousElementSibling;return n||null}function F(t,e){var n=0;if(!t||!t.parentNode)return-1;for(;t=t.previousElementSibling;)"TEMPLATE"===t.nodeName.toUpperCase()||t===Rt.clone||e&&!h(t,e)||n++;return n}function b(t){var e=0,n=0,o=N();if(t)do{var i=v(t),r=i.a,a=i.d;e+=t.scrollLeft*r,n+=t.scrollTop*a}while(t!==o&&(t=t.parentNode));return[e,n]}function H(t,e){if(!t||!t.getBoundingClientRect)return N();var n=t,o=!1;do{if(n.clientWidth<n.scrollWidth||n.clientHeight<n.scrollHeight){var i=R(n);if(n.clientWidth<n.scrollWidth&&("auto"==i.overflowX||"scroll"==i.overflowX)||n.clientHeight<n.scrollHeight&&("auto"==i.overflowY||"scroll"==i.overflowY)){if(!n.getBoundingClientRect||n===document.body)return N();if(o||e)return n;o=!0}}}while(n=n.parentNode);return N()}function y(t,e){return Math.round(t.top)===Math.round(e.top)&&Math.round(t.left)===Math.round(e.left)&&Math.round(t.height)===Math.round(e.height)&&Math.round(t.width)===Math.round(e.width)}function D(e,n){return function(){if(!f){var t=arguments;1===t.length?e.call(this,t[0]):e.apply(this,t),f=setTimeout(function(){f=void 0},n)}}}function L(t,e,n){t.scrollLeft+=e,t.scrollTop+=n}function S(t){var e=window.Polymer,n=window.jQuery||window.Zepto;return e&&e.dom?e.dom(t).cloneNode(!0):n?n(t).clone(!0)[0]:t.cloneNode(!0)}function _(t,e){R(t,"position","absolute"),R(t,"top",e.top),R(t,"left",e.left),R(t,"width",e.width),R(t,"height",e.height)}function C(t){R(t,"position",""),R(t,"top",""),R(t,"left",""),R(t,"width",""),R(t,"height","")}var j="Sortable"+(new Date).getTime();function T(){var e,o=[];return{captureAnimationState:function(){o=[],this.options.animation&&[].slice.call(this.el.children).forEach(function(t){if("none"!==R(t,"display")&&t!==Rt.ghost){o.push({target:t,rect:X(t)});var e=I({},o[o.length-1].rect);if(t.thisAnimationDuration){var n=v(t,!0);n&&(e.top-=n.f,e.left-=n.e)}t.fromRect=e}})},addAnimationState:function(t){o.push(t)},removeAnimationState:function(t){o.splice(function(t,e){for(var n in t)if(t.hasOwnProperty(n))for(var o in e)if(e.hasOwnProperty(o)&&e[o]===t[n][o])return Number(n);return-1}(o,{target:t}),1)},animateAll:function(t){var c=this;if(!this.options.animation)return clearTimeout(e),void("function"==typeof t&&t());var u=!1,d=0;o.forEach(function(t){var e=0,n=t.target,o=n.fromRect,i=X(n),r=n.prevFromRect,a=n.prevToRect,l=t.rect,s=v(n,!0);s&&(i.top-=s.f,i.left-=s.e),n.toRect=i,n.thisAnimationDuration&&y(r,i)&&!y(o,i)&&(l.top-i.top)/(l.left-i.left)==(o.top-i.top)/(o.left-i.left)&&(e=function(t,e,n,o){return Math.sqrt(Math.pow(e.top-t.top,2)+Math.pow(e.left-t.left,2))/Math.sqrt(Math.pow(e.top-n.top,2)+Math.pow(e.left-n.left,2))*o.animation}(l,r,a,c.options)),y(i,o)||(n.prevFromRect=o,n.prevToRect=i,e||(e=c.options.animation),c.animate(n,l,i,e)),e&&(u=!0,d=Math.max(d,e),clearTimeout(n.animationResetTimer),n.animationResetTimer=setTimeout(function(){n.animationTime=0,n.prevFromRect=null,n.fromRect=null,n.prevToRect=null,n.thisAnimationDuration=null},e),n.thisAnimationDuration=e)}),clearTimeout(e),u?e=setTimeout(function(){"function"==typeof t&&t()},d):"function"==typeof t&&t(),o=[]},animate:function(t,e,n,o){if(o){R(t,"transition",""),R(t,"transform","");var i=v(this.el),r=i&&i.a,a=i&&i.d,l=(e.left-n.left)/(r||1),s=(e.top-n.top)/(a||1);t.animatingX=!!l,t.animatingY=!!s,R(t,"transform","translate3d("+l+"px,"+s+"px,0)"),function(t){t.offsetWidth}(t),R(t,"transition","transform "+o+"ms"+(this.options.easing?" "+this.options.easing:"")),R(t,"transform","translate3d(0,0,0)"),"number"==typeof t.animated&&clearTimeout(t.animated),t.animated=setTimeout(function(){R(t,"transition",""),R(t,"transform",""),t.animated=!1,t.animatingX=!1,t.animatingY=!1},o)}}}}var x=[],M={initializeByDefault:!0},O={mount:function(t){for(var e in M)!M.hasOwnProperty(e)||e in t||(t[e]=M[e]);x.push(t)},pluginEvent:function(e,n,o){var t=this;this.eventCanceled=!1,o.cancel=function(){t.eventCanceled=!0};var i=e+"Global";x.forEach(function(t){n[t.pluginName]&&(n[t.pluginName][i]&&n[t.pluginName][i](I({sortable:n},o)),n.options[t.pluginName]&&n[t.pluginName][e]&&n[t.pluginName][e](I({sortable:n},o)))})},initializePlugins:function(o,i,r,t){for(var e in x.forEach(function(t){var e=t.pluginName;if(o.options[e]||t.initializeByDefault){var n=new t(o,i,o.options);n.sortable=o,n.options=o.options,o[e]=n,a(r,n.defaults)}}),o.options)if(o.options.hasOwnProperty(e)){var n=this.modifyOption(o,e,o.options[e]);void 0!==n&&(o.options[e]=n)}},getEventProperties:function(e,n){var o={};return x.forEach(function(t){"function"==typeof t.eventProperties&&a(o,t.eventProperties.call(n[t.pluginName],e))}),o},modifyOption:function(e,n,o){var i;return x.forEach(function(t){e[t.pluginName]&&t.optionListeners&&"function"==typeof t.optionListeners[n]&&(i=t.optionListeners[n].call(e[t.pluginName],o))}),i}};function A(t){var e=t.sortable,n=t.rootEl,o=t.name,i=t.targetEl,r=t.cloneEl,a=t.toEl,l=t.fromEl,s=t.oldIndex,c=t.newIndex,u=t.oldDraggableIndex,d=t.newDraggableIndex,h=t.originalEvent,f=t.putSortable,p=t.extraEventProperties;if(e=e||n&&n[j]){var g,v=e.options,m="on"+o.charAt(0).toUpperCase()+o.substr(1);!window.CustomEvent||w||E?(g=document.createEvent("Event")).initEvent(o,!0,!0):g=new CustomEvent(o,{bubbles:!0,cancelable:!0}),g.to=a||n,g.from=l||n,g.item=i||n,g.clone=r,g.oldIndex=s,g.newIndex=c,g.oldDraggableIndex=u,g.newDraggableIndex=d,g.originalEvent=h,g.pullMode=f?f.lastPutMode:void 0;var b=I({},p,O.getEventProperties(o,e));for(var y in b)g[y]=b[y];n&&n.dispatchEvent(g),v[m]&&v[m].call(e,g)}}function K(t,e,n){var o=2<arguments.length&&void 0!==n?n:{},i=o.evt,r=l(o,["evt"]);O.pluginEvent.bind(Rt)(t,e,I({dragEl:z,parentEl:G,ghostEl:U,rootEl:q,nextEl:V,lastDownEl:Z,cloneEl:Q,cloneHidden:$,dragStarted:dt,putSortable:it,activeSortable:Rt.active,originalEvent:i,oldIndex:J,oldDraggableIndex:et,newIndex:tt,newDraggableIndex:nt,hideGhostForTarget:Nt,unhideGhostForTarget:It,cloneNowHidden:function(){$=!0},cloneNowShown:function(){$=!1},dispatchSortableEvent:function(t){W({sortable:e,name:t,originalEvent:i})}},r))}function W(t){A(I({putSortable:it,cloneEl:Q,targetEl:z,rootEl:q,oldIndex:J,oldDraggableIndex:et,newIndex:tt,newDraggableIndex:nt},t))}var z,G,U,q,V,Z,Q,$,J,tt,et,nt,ot,it,rt,at,lt,st,ct,ut,dt,ht,ft,pt,gt,vt=!1,mt=!1,bt=[],yt=!1,wt=!1,Et=[],Dt=!1,St=[],_t="undefined"!=typeof document,Ct=n,Tt=E||w?"cssFloat":"float",xt=_t&&!i&&!n&&"draggable"in document.createElement("div"),Mt=function(){if(_t){if(w)return!1;var t=document.createElement("x");return t.style.cssText="pointer-events:auto","auto"===t.style.pointerEvents}}(),Ot=function(t,e){var n=R(t),o=parseInt(n.width)-parseInt(n.paddingLeft)-parseInt(n.paddingRight)-parseInt(n.borderLeftWidth)-parseInt(n.borderRightWidth),i=m(t,0,e),r=m(t,1,e),a=i&&R(i),l=r&&R(r),s=a&&parseInt(a.marginLeft)+parseInt(a.marginRight)+X(i).width,c=l&&parseInt(l.marginLeft)+parseInt(l.marginRight)+X(r).width;if("flex"===n.display)return"column"===n.flexDirection||"column-reverse"===n.flexDirection?"vertical":"horizontal";if("grid"===n.display)return n.gridTemplateColumns.split(" ").length<=1?"vertical":"horizontal";if(i&&a.float&&"none"!==a.float){var u="left"===a.float?"left":"right";return!r||"both"!==l.clear&&l.clear!==u?"horizontal":"vertical"}return i&&("block"===a.display||"flex"===a.display||"table"===a.display||"grid"===a.display||o<=s&&"none"===n[Tt]||r&&"none"===n[Tt]&&o<s+c)?"vertical":"horizontal"},At=function(t){function s(a,l){return function(t,e,n,o){var i=t.options.group.name&&e.options.group.name&&t.options.group.name===e.options.group.name;if(null==a&&(l||i))return!0;if(null==a||!1===a)return!1;if(l&&"clone"===a)return a;if("function"==typeof a)return s(a(t,e,n,o),l)(t,e,n,o);var r=(l?t:e).options.group.name;return!0===a||"string"==typeof a&&a===r||a.join&&-1<a.indexOf(r)}}var e={},n=t.group;n&&"object"==o(n)||(n={name:n}),e.name=n.name,e.checkPull=s(n.pull,!0),e.checkPut=s(n.put),e.revertClone=n.revertClone,t.group=e},Nt=function(){!Mt&&U&&R(U,"display","none")},It=function(){!Mt&&U&&R(U,"display","")};_t&&document.addEventListener("click",function(t){if(mt)return t.preventDefault(),t.stopPropagation&&t.stopPropagation(),t.stopImmediatePropagation&&t.stopImmediatePropagation(),mt=!1},!0);function Pt(t){if(z){var e=function(r,a){var l;return bt.some(function(t){if(!B(t)){var e=X(t),n=t[j].options.emptyInsertThreshold,o=r>=e.left-n&&r<=e.right+n,i=a>=e.top-n&&a<=e.bottom+n;return n&&o&&i?l=t:void 0}}),l}((t=t.touches?t.touches[0]:t).clientX,t.clientY);if(e){var n={};for(var o in t)t.hasOwnProperty(o)&&(n[o]=t[o]);n.target=n.rootEl=e,n.preventDefault=void 0,n.stopPropagation=void 0,e[j]._onDragOver(n)}}}function kt(t){z&&z.parentNode[j]._isOutsideThisEl(t.target)}function Rt(t,e){if(!t||!t.nodeType||1!==t.nodeType)throw"Sortable: `el` must be an HTMLElement, not ".concat({}.toString.call(t));this.el=t,this.options=e=a({},e),t[j]=this;var n={group:null,sort:!0,disabled:!1,store:null,handle:null,draggable:/^[uo]l$/i.test(t.nodeName)?">li":">*",swapThreshold:1,invertSwap:!1,invertedSwapThreshold:null,removeCloneOnHide:!0,direction:function(){return Ot(t,this.options)},ghostClass:"sortable-ghost",chosenClass:"sortable-chosen",dragClass:"sortable-drag",ignore:"a, img",filter:null,preventOnFilter:!0,animation:0,easing:null,setData:function(t,e){t.setData("Text",e.textContent)},dropBubble:!1,dragoverBubble:!1,dataIdAttr:"data-id",delay:0,delayOnTouchOnly:!1,touchStartThreshold:(Number.parseInt?Number:window).parseInt(window.devicePixelRatio,10)||1,forceFallback:!1,fallbackClass:"sortable-fallback",fallbackOnBody:!1,fallbackTolerance:0,fallbackOffset:{x:0,y:0},supportPointer:!1!==Rt.supportPointer&&"PointerEvent"in window,emptyInsertThreshold:5};for(var o in O.initializePlugins(this,t,n),n)o in e||(e[o]=n[o]);for(var i in At(e),this)"_"===i.charAt(0)&&"function"==typeof this[i]&&(this[i]=this[i].bind(this));this.nativeDraggable=!e.forceFallback&&xt,this.nativeDraggable&&(this.options.touchStartThreshold=1),e.supportPointer?u(t,"pointerdown",this._onTapStart):(u(t,"mousedown",this._onTapStart),u(t,"touchstart",this._onTapStart)),this.nativeDraggable&&(u(t,"dragover",this),u(t,"dragenter",this)),bt.push(this.el),e.store&&e.store.get&&this.sort(e.store.get(this)||[]),a(this,T())}function Xt(t,e,n,o,i,r,a,l){var s,c,u=t[j],d=u.options.onMove;return!window.CustomEvent||w||E?(s=document.createEvent("Event")).initEvent("move",!0,!0):s=new CustomEvent("move",{bubbles:!0,cancelable:!0}),s.to=e,s.from=t,s.dragged=n,s.draggedRect=o,s.related=i||e,s.relatedRect=r||X(e),s.willInsertAfter=l,s.originalEvent=a,t.dispatchEvent(s),d&&(c=d.call(u,s,a)),c}function Yt(t){t.draggable=!1}function Bt(){Dt=!1}function Ft(t){for(var e=t.tagName+t.className+t.src+t.href+t.textContent,n=e.length,o=0;n--;)o+=e.charCodeAt(n);return o.toString(36)}function Ht(t){return setTimeout(t,0)}function Lt(t){return clearTimeout(t)}Rt.prototype={constructor:Rt,_isOutsideThisEl:function(t){this.el.contains(t)||t===this.el||(ht=null)},_getDirection:function(t,e){return"function"==typeof this.options.direction?this.options.direction.call(this,t,e,z):this.options.direction},_onTapStart:function(e){if(e.cancelable){var n=this,o=this.el,t=this.options,i=t.preventOnFilter,r=e.type,a=e.touches&&e.touches[0]||e.pointerType&&"touch"===e.pointerType&&e,l=(a||e).target,s=e.target.shadowRoot&&(e.path&&e.path[0]||e.composedPath&&e.composedPath()[0])||l,c=t.filter;if(function(t){St.length=0;var e=t.getElementsByTagName("input"),n=e.length;for(;n--;){var o=e[n];o.checked&&St.push(o)}}(o),!z&&!(/mousedown|pointerdown/.test(r)&&0!==e.button||t.disabled||s.isContentEditable||(l=P(l,t.draggable,o,!1))&&l.animated||Z===l)){if(J=F(l),et=F(l,t.draggable),"function"==typeof c){if(c.call(this,e,l,this))return W({sortable:n,rootEl:s,name:"filter",targetEl:l,toEl:o,fromEl:o}),K("filter",n,{evt:e}),void(i&&e.cancelable&&e.preventDefault())}else if(c&&(c=c.split(",").some(function(t){if(t=P(s,t.trim(),o,!1))return W({sortable:n,rootEl:t,name:"filter",targetEl:l,fromEl:o,toEl:o}),K("filter",n,{evt:e}),!0})))return void(i&&e.cancelable&&e.preventDefault());t.handle&&!P(s,t.handle,o,!1)||this._prepareDragStart(e,a,l)}}},_prepareDragStart:function(t,e,n){var o,i=this,r=i.el,a=i.options,l=r.ownerDocument;if(n&&!z&&n.parentNode===r){var s=X(n);if(q=r,G=(z=n).parentNode,V=z.nextSibling,Z=n,ot=a.group,rt={target:Rt.dragged=z,clientX:(e||t).clientX,clientY:(e||t).clientY},ct=rt.clientX-s.left,ut=rt.clientY-s.top,this._lastX=(e||t).clientX,this._lastY=(e||t).clientY,z.style["will-change"]="all",o=function(){K("delayEnded",i,{evt:t}),Rt.eventCanceled?i._onDrop():(i._disableDelayedDragEvents(),!c&&i.nativeDraggable&&(z.draggable=!0),i._triggerDragStart(t,e),W({sortable:i,name:"choose",originalEvent:t}),k(z,a.chosenClass,!0))},a.ignore.split(",").forEach(function(t){g(z,t.trim(),Yt)}),u(l,"dragover",Pt),u(l,"mousemove",Pt),u(l,"touchmove",Pt),u(l,"mouseup",i._onDrop),u(l,"touchend",i._onDrop),u(l,"touchcancel",i._onDrop),c&&this.nativeDraggable&&(this.options.touchStartThreshold=4,z.draggable=!0),K("delayStart",this,{evt:t}),!a.delay||a.delayOnTouchOnly&&!e||this.nativeDraggable&&(E||w))o();else{if(Rt.eventCanceled)return void this._onDrop();u(l,"mouseup",i._disableDelayedDrag),u(l,"touchend",i._disableDelayedDrag),u(l,"touchcancel",i._disableDelayedDrag),u(l,"mousemove",i._delayedDragTouchMoveHandler),u(l,"touchmove",i._delayedDragTouchMoveHandler),a.supportPointer&&u(l,"pointermove",i._delayedDragTouchMoveHandler),i._dragStartTimer=setTimeout(o,a.delay)}}},_delayedDragTouchMoveHandler:function(t){var e=t.touches?t.touches[0]:t;Math.max(Math.abs(e.clientX-this._lastX),Math.abs(e.clientY-this._lastY))>=Math.floor(this.options.touchStartThreshold/(this.nativeDraggable&&window.devicePixelRatio||1))&&this._disableDelayedDrag()},_disableDelayedDrag:function(){z&&Yt(z),clearTimeout(this._dragStartTimer),this._disableDelayedDragEvents()},_disableDelayedDragEvents:function(){var t=this.el.ownerDocument;d(t,"mouseup",this._disableDelayedDrag),d(t,"touchend",this._disableDelayedDrag),d(t,"touchcancel",this._disableDelayedDrag),d(t,"mousemove",this._delayedDragTouchMoveHandler),d(t,"touchmove",this._delayedDragTouchMoveHandler),d(t,"pointermove",this._delayedDragTouchMoveHandler)},_triggerDragStart:function(t,e){e=e||"touch"==t.pointerType&&t,!this.nativeDraggable||e?this.options.supportPointer?u(document,"pointermove",this._onTouchMove):u(document,e?"touchmove":"mousemove",this._onTouchMove):(u(z,"dragend",this),u(q,"dragstart",this._onDragStart));try{document.selection?Ht(function(){document.selection.empty()}):window.getSelection().removeAllRanges()}catch(t){}},_dragStarted:function(t,e){if(vt=!1,q&&z){K("dragStarted",this,{evt:e}),this.nativeDraggable&&u(document,"dragover",kt);var n=this.options;t||k(z,n.dragClass,!1),k(z,n.ghostClass,!0),Rt.active=this,t&&this._appendGhost(),W({sortable:this,name:"start",originalEvent:e})}else this._nulling()},_emulateDragOver:function(){if(at){this._lastX=at.clientX,this._lastY=at.clientY,Nt();for(var t=document.elementFromPoint(at.clientX,at.clientY),e=t;t&&t.shadowRoot&&(t=t.shadowRoot.elementFromPoint(at.clientX,at.clientY))!==e;)e=t;if(z.parentNode[j]._isOutsideThisEl(t),e)do{if(e[j]){if(e[j]._onDragOver({clientX:at.clientX,clientY:at.clientY,target:t,rootEl:e})&&!this.options.dragoverBubble)break}t=e}while(e=e.parentNode);It()}},_onTouchMove:function(t){if(rt){var e=this.options,n=e.fallbackTolerance,o=e.fallbackOffset,i=t.touches?t.touches[0]:t,r=U&&v(U,!0),a=U&&r&&r.a,l=U&&r&&r.d,s=Ct&>&&b(gt),c=(i.clientX-rt.clientX+o.x)/(a||1)+(s?s[0]-Et[0]:0)/(a||1),u=(i.clientY-rt.clientY+o.y)/(l||1)+(s?s[1]-Et[1]:0)/(l||1);if(!Rt.active&&!vt){if(n&&Math.max(Math.abs(i.clientX-this._lastX),Math.abs(i.clientY-this._lastY))<n)return;this._onDragStart(t,!0)}if(U){r?(r.e+=c-(lt||0),r.f+=u-(st||0)):r={a:1,b:0,c:0,d:1,e:c,f:u};var d="matrix(".concat(r.a,",").concat(r.b,",").concat(r.c,",").concat(r.d,",").concat(r.e,",").concat(r.f,")");R(U,"webkitTransform",d),R(U,"mozTransform",d),R(U,"msTransform",d),R(U,"transform",d),lt=c,st=u,at=i}t.cancelable&&t.preventDefault()}},_appendGhost:function(){if(!U){var t=this.options.fallbackOnBody?document.body:q,e=X(z,!0,Ct,!0,t),n=this.options;if(Ct){for(gt=t;"static"===R(gt,"position")&&"none"===R(gt,"transform")&>!==document;)gt=gt.parentNode;gt!==document.body&>!==document.documentElement?(gt===document&&(gt=N()),e.top+=gt.scrollTop,e.left+=gt.scrollLeft):gt=N(),Et=b(gt)}k(U=z.cloneNode(!0),n.ghostClass,!1),k(U,n.fallbackClass,!0),k(U,n.dragClass,!0),R(U,"transition",""),R(U,"transform",""),R(U,"box-sizing","border-box"),R(U,"margin",0),R(U,"top",e.top),R(U,"left",e.left),R(U,"width",e.width),R(U,"height",e.height),R(U,"opacity","0.8"),R(U,"position",Ct?"absolute":"fixed"),R(U,"zIndex","100000"),R(U,"pointerEvents","none"),Rt.ghost=U,t.appendChild(U),R(U,"transform-origin",ct/parseInt(U.style.width)*100+"% "+ut/parseInt(U.style.height)*100+"%")}},_onDragStart:function(t,e){var n=this,o=t.dataTransfer,i=n.options;K("dragStart",this,{evt:t}),Rt.eventCanceled?this._onDrop():(K("setupClone",this),Rt.eventCanceled||((Q=S(z)).draggable=!1,Q.style["will-change"]="",this._hideClone(),k(Q,this.options.chosenClass,!1),Rt.clone=Q),n.cloneId=Ht(function(){K("clone",n),Rt.eventCanceled||(n.options.removeCloneOnHide||q.insertBefore(Q,z),n._hideClone(),W({sortable:n,name:"clone"}))}),e||k(z,i.dragClass,!0),e?(mt=!0,n._loopId=setInterval(n._emulateDragOver,50)):(d(document,"mouseup",n._onDrop),d(document,"touchend",n._onDrop),d(document,"touchcancel",n._onDrop),o&&(o.effectAllowed="move",i.setData&&i.setData.call(n,o,z)),u(document,"drop",n),R(z,"transform","translateZ(0)")),vt=!0,n._dragStartId=Ht(n._dragStarted.bind(n,e,t)),u(document,"selectstart",n),dt=!0,s&&R(document.body,"user-select","none"))},_onDragOver:function(n){var o,i,r,a,l=this.el,s=n.target,e=this.options,t=e.group,c=Rt.active,u=ot===t,d=e.sort,h=it||c,f=this,p=!1;if(!Dt){if(void 0!==n.preventDefault&&n.cancelable&&n.preventDefault(),s=P(s,e.draggable,l,!0),M("dragOver"),Rt.eventCanceled)return p;if(z.contains(n.target)||s.animated&&s.animatingX&&s.animatingY||f._ignoreWhileAnimating===s)return A(!1);if(mt=!1,c&&!e.disabled&&(u?d||(r=!q.contains(z)):it===this||(this.lastPutMode=ot.checkPull(this,c,z,n))&&t.checkPut(this,c,z,n))){if(a="vertical"===this._getDirection(n,s),o=X(z),M("dragOverValid"),Rt.eventCanceled)return p;if(r)return G=q,O(),this._hideClone(),M("revert"),Rt.eventCanceled||(V?q.insertBefore(z,V):q.appendChild(z)),A(!0);var g=B(l,e.draggable);if(!g||function(t,e,n){var o=X(B(n.el,n.options.draggable));return e?t.clientX>o.right+10||t.clientX<=o.right&&t.clientY>o.bottom&&t.clientX>=o.left:t.clientX>o.right&&t.clientY>o.top||t.clientX<=o.right&&t.clientY>o.bottom+10}(n,a,this)&&!g.animated){if(g===z)return A(!1);if(g&&l===n.target&&(s=g),s&&(i=X(s)),!1!==Xt(q,l,z,o,s,i,n,!!s))return O(),l.appendChild(z),G=l,N(),A(!0)}else if(s.parentNode===l){i=X(s);var v,m,b,y=z.parentNode!==l,w=!function(t,e,n){var o=n?t.left:t.top,i=n?t.right:t.bottom,r=n?t.width:t.height,a=n?e.left:e.top,l=n?e.right:e.bottom,s=n?e.width:e.height;return o===a||i===l||o+r/2===a+s/2}(z.animated&&z.toRect||o,s.animated&&s.toRect||i,a),E=a?"top":"left",D=Y(s,"top","top")||Y(z,"top","top"),S=D?D.scrollTop:void 0;if(ht!==s&&(m=i[E],yt=!1,wt=!w&&e.invertSwap||y),0!==(v=function(t,e,n,o,i,r,a,l){var s=o?t.clientY:t.clientX,c=o?n.height:n.width,u=o?n.top:n.left,d=o?n.bottom:n.right,h=!1;if(!a)if(l&&pt<c*i){if(!yt&&(1===ft?u+c*r/2<s:s<d-c*r/2)&&(yt=!0),yt)h=!0;else if(1===ft?s<u+pt:d-pt<s)return-ft}else if(u+c*(1-i)/2<s&&s<d-c*(1-i)/2)return function(t){return F(z)<F(t)?1:-1}(e);if((h=h||a)&&(s<u+c*r/2||d-c*r/2<s))return u+c/2<s?1:-1;return 0}(n,s,i,a,w?1:e.swapThreshold,null==e.invertedSwapThreshold?e.swapThreshold:e.invertedSwapThreshold,wt,ht===s)))for(var _=F(z);_-=v,(b=G.children[_])&&("none"===R(b,"display")||b===U););if(0===v||b===s)return A(!1);ft=v;var C=(ht=s).nextElementSibling,T=!1,x=Xt(q,l,z,o,s,i,n,T=1===v);if(!1!==x)return 1!==x&&-1!==x||(T=1===x),Dt=!0,setTimeout(Bt,30),O(),T&&!C?l.appendChild(z):s.parentNode.insertBefore(z,T?C:s),D&&L(D,0,S-D.scrollTop),G=z.parentNode,void 0===m||wt||(pt=Math.abs(m-X(s)[E])),N(),A(!0)}if(l.contains(z))return A(!1)}return!1}function M(t,e){K(t,f,I({evt:n,isOwner:u,axis:a?"vertical":"horizontal",revert:r,dragRect:o,targetRect:i,canSort:d,fromSortable:h,target:s,completed:A,onMove:function(t,e){return Xt(q,l,z,o,t,X(t),n,e)},changed:N},e))}function O(){M("dragOverAnimationCapture"),f.captureAnimationState(),f!==h&&h.captureAnimationState()}function A(t){return M("dragOverCompleted",{insertion:t}),t&&(u?c._hideClone():c._showClone(f),f!==h&&(k(z,it?it.options.ghostClass:c.options.ghostClass,!1),k(z,e.ghostClass,!0)),it!==f&&f!==Rt.active?it=f:f===Rt.active&&it&&(it=null),h===f&&(f._ignoreWhileAnimating=s),f.animateAll(function(){M("dragOverAnimationComplete"),f._ignoreWhileAnimating=null}),f!==h&&(h.animateAll(),h._ignoreWhileAnimating=null)),(s===z&&!z.animated||s===l&&!s.animated)&&(ht=null),e.dragoverBubble||n.rootEl||s===document||(z.parentNode[j]._isOutsideThisEl(n.target),t||Pt(n)),!e.dragoverBubble&&n.stopPropagation&&n.stopPropagation(),p=!0}function N(){tt=F(z),nt=F(z,e.draggable),W({sortable:f,name:"change",toEl:l,newIndex:tt,newDraggableIndex:nt,originalEvent:n})}},_ignoreWhileAnimating:null,_offMoveEvents:function(){d(document,"mousemove",this._onTouchMove),d(document,"touchmove",this._onTouchMove),d(document,"pointermove",this._onTouchMove),d(document,"dragover",Pt),d(document,"mousemove",Pt),d(document,"touchmove",Pt)},_offUpEvents:function(){var t=this.el.ownerDocument;d(t,"mouseup",this._onDrop),d(t,"touchend",this._onDrop),d(t,"pointerup",this._onDrop),d(t,"touchcancel",this._onDrop),d(document,"selectstart",this)},_onDrop:function(t){var e=this.el,n=this.options;tt=F(z),nt=F(z,n.draggable),K("drop",this,{evt:t}),G=z&&z.parentNode,tt=F(z),nt=F(z,n.draggable),Rt.eventCanceled||(yt=wt=vt=!1,clearInterval(this._loopId),clearTimeout(this._dragStartTimer),Lt(this.cloneId),Lt(this._dragStartId),this.nativeDraggable&&(d(document,"drop",this),d(e,"dragstart",this._onDragStart)),this._offMoveEvents(),this._offUpEvents(),s&&R(document.body,"user-select",""),R(z,"transform",""),t&&(dt&&(t.cancelable&&t.preventDefault(),n.dropBubble||t.stopPropagation()),U&&U.parentNode&&U.parentNode.removeChild(U),(q===G||it&&"clone"!==it.lastPutMode)&&Q&&Q.parentNode&&Q.parentNode.removeChild(Q),z&&(this.nativeDraggable&&d(z,"dragend",this),Yt(z),z.style["will-change"]="",dt&&!vt&&k(z,it?it.options.ghostClass:this.options.ghostClass,!1),k(z,this.options.chosenClass,!1),W({sortable:this,name:"unchoose",toEl:G,newIndex:null,newDraggableIndex:null,originalEvent:t}),q!==G?(0<=tt&&(W({rootEl:G,name:"add",toEl:G,fromEl:q,originalEvent:t}),W({sortable:this,name:"remove",toEl:G,originalEvent:t}),W({rootEl:G,name:"sort",toEl:G,fromEl:q,originalEvent:t}),W({sortable:this,name:"sort",toEl:G,originalEvent:t})),it&&it.save()):tt!==J&&0<=tt&&(W({sortable:this,name:"update",toEl:G,originalEvent:t}),W({sortable:this,name:"sort",toEl:G,originalEvent:t})),Rt.active&&(null!=tt&&-1!==tt||(tt=J,nt=et),W({sortable:this,name:"end",toEl:G,originalEvent:t}),this.save())))),this._nulling()},_nulling:function(){K("nulling",this),q=z=G=U=V=Q=Z=$=rt=at=dt=tt=nt=J=et=ht=ft=it=ot=Rt.dragged=Rt.ghost=Rt.clone=Rt.active=null,St.forEach(function(t){t.checked=!0}),St.length=lt=st=0},handleEvent:function(t){switch(t.type){case"drop":case"dragend":this._onDrop(t);break;case"dragenter":case"dragover":z&&(this._onDragOver(t),function(t){t.dataTransfer&&(t.dataTransfer.dropEffect="move");t.cancelable&&t.preventDefault()}(t));break;case"selectstart":t.preventDefault()}},toArray:function(){for(var t,e=[],n=this.el.children,o=0,i=n.length,r=this.options;o<i;o++)P(t=n[o],r.draggable,this.el,!1)&&e.push(t.getAttribute(r.dataIdAttr)||Ft(t));return e},sort:function(t){var o={},i=this.el;this.toArray().forEach(function(t,e){var n=i.children[e];P(n,this.options.draggable,i,!1)&&(o[t]=n)},this),t.forEach(function(t){o[t]&&(i.removeChild(o[t]),i.appendChild(o[t]))})},save:function(){var t=this.options.store;t&&t.set&&t.set(this)},closest:function(t,e){return P(t,e||this.options.draggable,this.el,!1)},option:function(t,e){var n=this.options;if(void 0===e)return n[t];var o=O.modifyOption(this,t,e);n[t]=void 0!==o?o:e,"group"===t&&At(n)},destroy:function(){K("destroy",this);var t=this.el;t[j]=null,d(t,"mousedown",this._onTapStart),d(t,"touchstart",this._onTapStart),d(t,"pointerdown",this._onTapStart),this.nativeDraggable&&(d(t,"dragover",this),d(t,"dragenter",this)),Array.prototype.forEach.call(t.querySelectorAll("[draggable]"),function(t){t.removeAttribute("draggable")}),this._onDrop(),this._disableDelayedDragEvents(),bt.splice(bt.indexOf(this.el),1),this.el=t=null},_hideClone:function(){if(!$){if(K("hideClone",this),Rt.eventCanceled)return;R(Q,"display","none"),this.options.removeCloneOnHide&&Q.parentNode&&Q.parentNode.removeChild(Q),$=!0}},_showClone:function(t){if("clone"===t.lastPutMode){if($){if(K("showClone",this),Rt.eventCanceled)return;q.contains(z)&&!this.options.group.revertClone?q.insertBefore(Q,z):V?q.insertBefore(Q,V):q.appendChild(Q),this.options.group.revertClone&&this.animate(z,Q),R(Q,"display",""),$=!1}}else this._hideClone()}},_t&&u(document,"touchmove",function(t){(Rt.active||vt)&&t.cancelable&&t.preventDefault()}),Rt.utils={on:u,off:d,css:R,find:g,is:function(t,e){return!!P(t,e,t,!1)},extend:function(t,e){if(t&&e)for(var n in e)e.hasOwnProperty(n)&&(t[n]=e[n]);return t},throttle:D,closest:P,toggleClass:k,clone:S,index:F,nextTick:Ht,cancelNextTick:Lt,detectDirection:Ot,getChild:m},Rt.get=function(t){return t[j]},Rt.mount=function(){for(var t=arguments.length,e=new Array(t),n=0;n<t;n++)e[n]=arguments[n];e[0].constructor===Array&&(e=e[0]),e.forEach(function(t){if(!t.prototype||!t.prototype.constructor)throw"Sortable: Mounted plugin must be a constructor function, not ".concat({}.toString.call(t));t.utils&&(Rt.utils=I({},Rt.utils,t.utils)),O.mount(t)})},Rt.create=function(t,e){return new Rt(t,e)};var jt,Kt,Wt,zt,Gt,Ut,qt=[],Vt=!(Rt.version="1.10.2");function Zt(){qt.forEach(function(t){clearInterval(t.pid)}),qt=[]}function Qt(){clearInterval(Ut)}function $t(t){var e=t.originalEvent,n=t.putSortable,o=t.dragEl,i=t.activeSortable,r=t.dispatchSortableEvent,a=t.hideGhostForTarget,l=t.unhideGhostForTarget;if(e){var s=n||i;a();var c=e.changedTouches&&e.changedTouches.length?e.changedTouches[0]:e,u=document.elementFromPoint(c.clientX,c.clientY);l(),s&&!s.el.contains(u)&&(r("spill"),this.onSpill({dragEl:o,putSortable:n}))}}var Jt,te=D(function(n,t,e,o){if(t.scroll){var i,r=(n.touches?n.touches[0]:n).clientX,a=(n.touches?n.touches[0]:n).clientY,l=t.scrollSensitivity,s=t.scrollSpeed,c=N(),u=!1;Kt!==e&&(Kt=e,Zt(),jt=t.scroll,i=t.scrollFn,!0===jt&&(jt=H(e,!0)));var d=0,h=jt;do{var f=h,p=X(f),g=p.top,v=p.bottom,m=p.left,b=p.right,y=p.width,w=p.height,E=void 0,D=void 0,S=f.scrollWidth,_=f.scrollHeight,C=R(f),T=f.scrollLeft,x=f.scrollTop;D=f===c?(E=y<S&&("auto"===C.overflowX||"scroll"===C.overflowX||"visible"===C.overflowX),w<_&&("auto"===C.overflowY||"scroll"===C.overflowY||"visible"===C.overflowY)):(E=y<S&&("auto"===C.overflowX||"scroll"===C.overflowX),w<_&&("auto"===C.overflowY||"scroll"===C.overflowY));var M=E&&(Math.abs(b-r)<=l&&T+y<S)-(Math.abs(m-r)<=l&&!!T),O=D&&(Math.abs(v-a)<=l&&x+w<_)-(Math.abs(g-a)<=l&&!!x);if(!qt[d])for(var A=0;A<=d;A++)qt[A]||(qt[A]={});qt[d].vx==M&&qt[d].vy==O&&qt[d].el===f||(qt[d].el=f,qt[d].vx=M,qt[d].vy=O,clearInterval(qt[d].pid),0==M&&0==O||(u=!0,qt[d].pid=setInterval(function(){o&&0===this.layer&&Rt.active._onTouchMove(Gt);var t=qt[this.layer].vy?qt[this.layer].vy*s:0,e=qt[this.layer].vx?qt[this.layer].vx*s:0;"function"==typeof i&&"continue"!==i.call(Rt.dragged.parentNode[j],e,t,n,Gt,qt[this.layer].el)||L(qt[this.layer].el,e,t)}.bind({layer:d}),24))),d++}while(t.bubbleScroll&&h!==c&&(h=H(h,!1)));Vt=u}},30);function ee(){}function ne(){}ee.prototype={startIndex:null,dragStart:function(t){var e=t.oldDraggableIndex;this.startIndex=e},onSpill:function(t){var e=t.dragEl,n=t.putSortable;this.sortable.captureAnimationState(),n&&n.captureAnimationState();var o=m(this.sortable.el,this.startIndex,this.options);o?this.sortable.el.insertBefore(e,o):this.sortable.el.appendChild(e),this.sortable.animateAll(),n&&n.animateAll()},drop:$t},a(ee,{pluginName:"revertOnSpill"}),ne.prototype={onSpill:function(t){var e=t.dragEl,n=t.putSortable||this.sortable;n.captureAnimationState(),e.parentNode&&e.parentNode.removeChild(e),n.animateAll()},drop:$t},a(ne,{pluginName:"removeOnSpill"});var oe,ie,re,ae,le,se=[],ce=[],ue=!1,de=!1,he=!1;function fe(o,i){ce.forEach(function(t,e){var n=i.children[t.sortableIndex+(o?Number(e):0)];n?i.insertBefore(t,n):i.appendChild(t)})}function pe(){se.forEach(function(t){t!==re&&t.parentNode&&t.parentNode.removeChild(t)})}return Rt.mount(new function(){function t(){for(var t in this.defaults={scroll:!0,scrollSensitivity:30,scrollSpeed:10,bubbleScroll:!0},this)"_"===t.charAt(0)&&"function"==typeof this[t]&&(this[t]=this[t].bind(this))}return t.prototype={dragStarted:function(t){var e=t.originalEvent;this.sortable.nativeDraggable?u(document,"dragover",this._handleAutoScroll):this.options.supportPointer?u(document,"pointermove",this._handleFallbackAutoScroll):e.touches?u(document,"touchmove",this._handleFallbackAutoScroll):u(document,"mousemove",this._handleFallbackAutoScroll)},dragOverCompleted:function(t){var e=t.originalEvent;this.options.dragOverBubble||e.rootEl||this._handleAutoScroll(e)},drop:function(){this.sortable.nativeDraggable?d(document,"dragover",this._handleAutoScroll):(d(document,"pointermove",this._handleFallbackAutoScroll),d(document,"touchmove",this._handleFallbackAutoScroll),d(document,"mousemove",this._handleFallbackAutoScroll)),Qt(),Zt(),clearTimeout(f),f=void 0},nulling:function(){Gt=Kt=jt=Vt=Ut=Wt=zt=null,qt.length=0},_handleFallbackAutoScroll:function(t){this._handleAutoScroll(t,!0)},_handleAutoScroll:function(e,n){var o=this,i=(e.touches?e.touches[0]:e).clientX,r=(e.touches?e.touches[0]:e).clientY,t=document.elementFromPoint(i,r);if(Gt=e,n||E||w||s){te(e,this.options,t,n);var a=H(t,!0);!Vt||Ut&&i===Wt&&r===zt||(Ut&&Qt(),Ut=setInterval(function(){var t=H(document.elementFromPoint(i,r),!0);t!==a&&(a=t,Zt()),te(e,o.options,t,n)},10),Wt=i,zt=r)}else{if(!this.options.bubbleScroll||H(t,!0)===N())return void Zt();te(e,this.options,H(t,!1),!1)}}},a(t,{pluginName:"scroll",initializeByDefault:!0})}),Rt.mount(ne,ee),Rt.mount(new function(){function t(){this.defaults={swapClass:"sortable-swap-highlight"}}return t.prototype={dragStart:function(t){var e=t.dragEl;Jt=e},dragOverValid:function(t){var e=t.completed,n=t.target,o=t.onMove,i=t.activeSortable,r=t.changed,a=t.cancel;if(i.options.swap){var l=this.sortable.el,s=this.options;if(n&&n!==l){var c=Jt;Jt=!1!==o(n)?(k(n,s.swapClass,!0),n):null,c&&c!==Jt&&k(c,s.swapClass,!1)}r(),e(!0),a()}},drop:function(t){var e=t.activeSortable,n=t.putSortable,o=t.dragEl,i=n||this.sortable,r=this.options;Jt&&k(Jt,r.swapClass,!1),Jt&&(r.swap||n&&n.options.swap)&&o!==Jt&&(i.captureAnimationState(),i!==e&&e.captureAnimationState(),function(t,e){var n,o,i=t.parentNode,r=e.parentNode;if(!i||!r||i.isEqualNode(e)||r.isEqualNode(t))return;n=F(t),o=F(e),i.isEqualNode(r)&&n<o&&o++;i.insertBefore(e,i.children[n]),r.insertBefore(t,r.children[o])}(o,Jt),i.animateAll(),i!==e&&e.animateAll())},nulling:function(){Jt=null}},a(t,{pluginName:"swap",eventProperties:function(){return{swapItem:Jt}}})}),Rt.mount(new function(){function t(o){for(var t in this)"_"===t.charAt(0)&&"function"==typeof this[t]&&(this[t]=this[t].bind(this));o.options.supportPointer?u(document,"pointerup",this._deselectMultiDrag):(u(document,"mouseup",this._deselectMultiDrag),u(document,"touchend",this._deselectMultiDrag)),u(document,"keydown",this._checkKeyDown),u(document,"keyup",this._checkKeyUp),this.defaults={selectedClass:"sortable-selected",multiDragKey:null,setData:function(t,e){var n="";se.length&&ie===o?se.forEach(function(t,e){n+=(e?", ":"")+t.textContent}):n=e.textContent,t.setData("Text",n)}}}return t.prototype={multiDragKeyDown:!1,isMultiDrag:!1,delayStartGlobal:function(t){var e=t.dragEl;re=e},delayEnded:function(){this.isMultiDrag=~se.indexOf(re)},setupClone:function(t){var e=t.sortable,n=t.cancel;if(this.isMultiDrag){for(var o=0;o<se.length;o++)ce.push(S(se[o])),ce[o].sortableIndex=se[o].sortableIndex,ce[o].draggable=!1,ce[o].style["will-change"]="",k(ce[o],this.options.selectedClass,!1),se[o]===re&&k(ce[o],this.options.chosenClass,!1);e._hideClone(),n()}},clone:function(t){var e=t.sortable,n=t.rootEl,o=t.dispatchSortableEvent,i=t.cancel;this.isMultiDrag&&(this.options.removeCloneOnHide||se.length&&ie===e&&(fe(!0,n),o("clone"),i()))},showClone:function(t){var e=t.cloneNowShown,n=t.rootEl,o=t.cancel;this.isMultiDrag&&(fe(!1,n),ce.forEach(function(t){R(t,"display","")}),e(),le=!1,o())},hideClone:function(t){var e=this,n=(t.sortable,t.cloneNowHidden),o=t.cancel;this.isMultiDrag&&(ce.forEach(function(t){R(t,"display","none"),e.options.removeCloneOnHide&&t.parentNode&&t.parentNode.removeChild(t)}),n(),le=!0,o())},dragStartGlobal:function(t){t.sortable;!this.isMultiDrag&&ie&&ie.multiDrag._deselectMultiDrag(),se.forEach(function(t){t.sortableIndex=F(t)}),se=se.sort(function(t,e){return t.sortableIndex-e.sortableIndex}),he=!0},dragStarted:function(t){var e=this,n=t.sortable;if(this.isMultiDrag){if(this.options.sort&&(n.captureAnimationState(),this.options.animation)){se.forEach(function(t){t!==re&&R(t,"position","absolute")});var o=X(re,!1,!0,!0);se.forEach(function(t){t!==re&&_(t,o)}),ue=de=!0}n.animateAll(function(){ue=de=!1,e.options.animation&&se.forEach(function(t){C(t)}),e.options.sort&&pe()})}},dragOver:function(t){var e=t.target,n=t.completed,o=t.cancel;de&&~se.indexOf(e)&&(n(!1),o())},revert:function(t){var e=t.fromSortable,n=t.rootEl,o=t.sortable,i=t.dragRect;1<se.length&&(se.forEach(function(t){o.addAnimationState({target:t,rect:de?X(t):i}),C(t),t.fromRect=i,e.removeAnimationState(t)}),de=!1,function(o,i){se.forEach(function(t,e){var n=i.children[t.sortableIndex+(o?Number(e):0)];n?i.insertBefore(t,n):i.appendChild(t)})}(!this.options.removeCloneOnHide,n))},dragOverCompleted:function(t){var e=t.sortable,n=t.isOwner,o=t.insertion,i=t.activeSortable,r=t.parentEl,a=t.putSortable,l=this.options;if(o){if(n&&i._hideClone(),ue=!1,l.animation&&1<se.length&&(de||!n&&!i.options.sort&&!a)){var s=X(re,!1,!0,!0);se.forEach(function(t){t!==re&&(_(t,s),r.appendChild(t))}),de=!0}if(!n)if(de||pe(),1<se.length){var c=le;i._showClone(e),i.options.animation&&!le&&c&&ce.forEach(function(t){i.addAnimationState({target:t,rect:ae}),t.fromRect=ae,t.thisAnimationDuration=null})}else i._showClone(e)}},dragOverAnimationCapture:function(t){var e=t.dragRect,n=t.isOwner,o=t.activeSortable;if(se.forEach(function(t){t.thisAnimationDuration=null}),o.options.animation&&!n&&o.multiDrag.isMultiDrag){ae=a({},e);var i=v(re,!0);ae.top-=i.f,ae.left-=i.e}},dragOverAnimationComplete:function(){de&&(de=!1,pe())},drop:function(t){var e=t.originalEvent,n=t.rootEl,o=t.parentEl,i=t.sortable,r=t.dispatchSortableEvent,a=t.oldIndex,l=t.putSortable,s=l||this.sortable;if(e){var c=this.options,u=o.children;if(!he)if(c.multiDragKey&&!this.multiDragKeyDown&&this._deselectMultiDrag(),k(re,c.selectedClass,!~se.indexOf(re)),~se.indexOf(re))se.splice(se.indexOf(re),1),oe=null,A({sortable:i,rootEl:n,name:"deselect",targetEl:re,originalEvt:e});else{if(se.push(re),A({sortable:i,rootEl:n,name:"select",targetEl:re,originalEvt:e}),e.shiftKey&&oe&&i.el.contains(oe)){var d,h,f=F(oe),p=F(re);if(~f&&~p&&f!==p)for(d=f<p?(h=f,p):(h=p,f+1);h<d;h++)~se.indexOf(u[h])||(k(u[h],c.selectedClass,!0),se.push(u[h]),A({sortable:i,rootEl:n,name:"select",targetEl:u[h],originalEvt:e}))}else oe=re;ie=s}if(he&&this.isMultiDrag){if((o[j].options.sort||o!==n)&&1<se.length){var g=X(re),v=F(re,":not(."+this.options.selectedClass+")");if(!ue&&c.animation&&(re.thisAnimationDuration=null),s.captureAnimationState(),!ue&&(c.animation&&(re.fromRect=g,se.forEach(function(t){if(t.thisAnimationDuration=null,t!==re){var e=de?X(t):g;t.fromRect=e,s.addAnimationState({target:t,rect:e})}})),pe(),se.forEach(function(t){u[v]?o.insertBefore(t,u[v]):o.appendChild(t),v++}),a===F(re))){var m=!1;se.forEach(function(t){t.sortableIndex===F(t)||(m=!0)}),m&&r("update")}se.forEach(function(t){C(t)}),s.animateAll()}ie=s}(n===o||l&&"clone"!==l.lastPutMode)&&ce.forEach(function(t){t.parentNode&&t.parentNode.removeChild(t)})}},nullingGlobal:function(){this.isMultiDrag=he=!1,ce.length=0},destroyGlobal:function(){this._deselectMultiDrag(),d(document,"pointerup",this._deselectMultiDrag),d(document,"mouseup",this._deselectMultiDrag),d(document,"touchend",this._deselectMultiDrag),d(document,"keydown",this._checkKeyDown),d(document,"keyup",this._checkKeyUp)},_deselectMultiDrag:function(t){if(!(void 0!==he&&he||ie!==this.sortable||t&&P(t.target,this.options.draggable,this.sortable.el,!1)||t&&0!==t.button))for(;se.length;){var e=se[0];k(e,this.options.selectedClass,!1),se.shift(),A({sortable:this.sortable,rootEl:this.sortable.el,name:"deselect",targetEl:e,originalEvt:t})}},_checkKeyDown:function(t){t.key===this.options.multiDragKey&&(this.multiDragKeyDown=!0)},_checkKeyUp:function(t){t.key===this.options.multiDragKey&&(this.multiDragKeyDown=!1)}},a(t,{pluginName:"multiDrag",utils:{select:function(t){var e=t.parentNode[j];e&&e.options.multiDrag&&!~se.indexOf(t)&&(ie&&ie!==e&&(ie.multiDrag._deselectMultiDrag(),ie=e),k(t,e.options.selectedClass,!0),se.push(t))},deselect:function(t){var e=t.parentNode[j],n=se.indexOf(t);e&&e.options.multiDrag&&~n&&(k(t,e.options.selectedClass,!1),se.splice(n,1))}},eventProperties:function(){var n=this,o=[],i=[];return se.forEach(function(t){var e;o.push({multiDragElement:t,index:t.sortableIndex}),e=de&&t!==re?-1:de?F(t,":not(."+n.options.selectedClass+")"):F(t),i.push({multiDragElement:t,index:e})}),{items:e(se),clones:[].concat(ce),oldIndicies:o,newIndicies:i}},optionListeners:{multiDragKey:function(t){return"ctrl"===(t=t.toLowerCase())?t="Control":1<t.length&&(t=t.charAt(0).toUpperCase()+t.substr(1)),t}}})}),Rt});
\ No newline at end of file
diff --git a/web/core/assets/vendor/underscore/underscore-min.js b/web/core/assets/vendor/underscore/underscore-min.js
index f01025b7bc..f2a20a54a2 100644
--- a/web/core/assets/vendor/underscore/underscore-min.js
+++ b/web/core/assets/vendor/underscore/underscore-min.js
@@ -1,6 +1,5 @@
-// Underscore.js 1.8.3
+// Underscore.js 1.9.1
// http://underscorejs.org
-// (c) 2009-2015 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
+// (c) 2009-2018 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
// Underscore may be freely distributed under the MIT license.
-(function(){function n(n){function t(t,r,e,u,i,o){for(;i>=0&&o>i;i+=n){var a=u?u[i]:i;e=r(e,t[a],a,t)}return e}return function(r,e,u,i){e=b(e,i,4);var o=!k(r)&&m.keys(r),a=(o||r).length,c=n>0?0:a-1;return arguments.length<3&&(u=r[o?o[c]:c],c+=n),t(r,e,u,o,c,a)}}function t(n){return function(t,r,e){r=x(r,e);for(var u=O(t),i=n>0?0:u-1;i>=0&&u>i;i+=n)if(r(t[i],i,t))return i;return-1}}function r(n,t,r){return function(e,u,i){var o=0,a=O(e);if("number"==typeof i)n>0?o=i>=0?i:Math.max(i+a,o):a=i>=0?Math.min(i+1,a):i+a+1;else if(r&&i&&a)return i=r(e,u),e[i]===u?i:-1;if(u!==u)return i=t(l.call(e,o,a),m.isNaN),i>=0?i+o:-1;for(i=n>0?o:a-1;i>=0&&a>i;i+=n)if(e[i]===u)return i;return-1}}function e(n,t){var r=I.length,e=n.constructor,u=m.isFunction(e)&&e.prototype||a,i="constructor";for(m.has(n,i)&&!m.contains(t,i)&&t.push(i);r--;)i=I[r],i in n&&n[i]!==u[i]&&!m.contains(t,i)&&t.push(i)}var u=this,i=u._,o=Array.prototype,a=Object.prototype,c=Function.prototype,f=o.push,l=o.slice,s=a.toString,p=a.hasOwnProperty,h=Array.isArray,v=Object.keys,g=c.bind,y=Object.create,d=function(){},m=function(n){return n instanceof m?n:this instanceof m?void(this._wrapped=n):new m(n)};"undefined"!=typeof exports?("undefined"!=typeof module&&module.exports&&(exports=module.exports=m),exports._=m):u._=m,m.VERSION="1.8.3";var b=function(n,t,r){if(t===void 0)return n;switch(null==r?3:r){case 1:return function(r){return n.call(t,r)};case 2:return function(r,e){return n.call(t,r,e)};case 3:return function(r,e,u){return n.call(t,r,e,u)};case 4:return function(r,e,u,i){return n.call(t,r,e,u,i)}}return function(){return n.apply(t,arguments)}},x=function(n,t,r){return null==n?m.identity:m.isFunction(n)?b(n,t,r):m.isObject(n)?m.matcher(n):m.property(n)};m.iteratee=function(n,t){return x(n,t,1/0)};var _=function(n,t){return function(r){var e=arguments.length;if(2>e||null==r)return r;for(var u=1;e>u;u++)for(var i=arguments[u],o=n(i),a=o.length,c=0;a>c;c++){var f=o[c];t&&r[f]!==void 0||(r[f]=i[f])}return r}},j=function(n){if(!m.isObject(n))return{};if(y)return y(n);d.prototype=n;var t=new d;return d.prototype=null,t},w=function(n){return function(t){return null==t?void 0:t[n]}},A=Math.pow(2,53)-1,O=w("length"),k=function(n){var t=O(n);return"number"==typeof t&&t>=0&&A>=t};m.each=m.forEach=function(n,t,r){t=b(t,r);var e,u;if(k(n))for(e=0,u=n.length;u>e;e++)t(n[e],e,n);else{var i=m.keys(n);for(e=0,u=i.length;u>e;e++)t(n[i[e]],i[e],n)}return n},m.map=m.collect=function(n,t,r){t=x(t,r);for(var e=!k(n)&&m.keys(n),u=(e||n).length,i=Array(u),o=0;u>o;o++){var a=e?e[o]:o;i[o]=t(n[a],a,n)}return i},m.reduce=m.foldl=m.inject=n(1),m.reduceRight=m.foldr=n(-1),m.find=m.detect=function(n,t,r){var e;return e=k(n)?m.findIndex(n,t,r):m.findKey(n,t,r),e!==void 0&&e!==-1?n[e]:void 0},m.filter=m.select=function(n,t,r){var e=[];return t=x(t,r),m.each(n,function(n,r,u){t(n,r,u)&&e.push(n)}),e},m.reject=function(n,t,r){return m.filter(n,m.negate(x(t)),r)},m.every=m.all=function(n,t,r){t=x(t,r);for(var e=!k(n)&&m.keys(n),u=(e||n).length,i=0;u>i;i++){var o=e?e[i]:i;if(!t(n[o],o,n))return!1}return!0},m.some=m.any=function(n,t,r){t=x(t,r);for(var e=!k(n)&&m.keys(n),u=(e||n).length,i=0;u>i;i++){var o=e?e[i]:i;if(t(n[o],o,n))return!0}return!1},m.contains=m.includes=m.include=function(n,t,r,e){return k(n)||(n=m.values(n)),("number"!=typeof r||e)&&(r=0),m.indexOf(n,t,r)>=0},m.invoke=function(n,t){var r=l.call(arguments,2),e=m.isFunction(t);return m.map(n,function(n){var u=e?t:n[t];return null==u?u:u.apply(n,r)})},m.pluck=function(n,t){return m.map(n,m.property(t))},m.where=function(n,t){return m.filter(n,m.matcher(t))},m.findWhere=function(n,t){return m.find(n,m.matcher(t))},m.max=function(n,t,r){var e,u,i=-1/0,o=-1/0;if(null==t&&null!=n){n=k(n)?n:m.values(n);for(var a=0,c=n.length;c>a;a++)e=n[a],e>i&&(i=e)}else t=x(t,r),m.each(n,function(n,r,e){u=t(n,r,e),(u>o||u===-1/0&&i===-1/0)&&(i=n,o=u)});return i},m.min=function(n,t,r){var e,u,i=1/0,o=1/0;if(null==t&&null!=n){n=k(n)?n:m.values(n);for(var a=0,c=n.length;c>a;a++)e=n[a],i>e&&(i=e)}else t=x(t,r),m.each(n,function(n,r,e){u=t(n,r,e),(o>u||1/0===u&&1/0===i)&&(i=n,o=u)});return i},m.shuffle=function(n){for(var t,r=k(n)?n:m.values(n),e=r.length,u=Array(e),i=0;e>i;i++)t=m.random(0,i),t!==i&&(u[i]=u[t]),u[t]=r[i];return u},m.sample=function(n,t,r){return null==t||r?(k(n)||(n=m.values(n)),n[m.random(n.length-1)]):m.shuffle(n).slice(0,Math.max(0,t))},m.sortBy=function(n,t,r){return t=x(t,r),m.pluck(m.map(n,function(n,r,e){return{value:n,index:r,criteria:t(n,r,e)}}).sort(function(n,t){var r=n.criteria,e=t.criteria;if(r!==e){if(r>e||r===void 0)return 1;if(e>r||e===void 0)return-1}return n.index-t.index}),"value")};var F=function(n){return function(t,r,e){var u={};return r=x(r,e),m.each(t,function(e,i){var o=r(e,i,t);n(u,e,o)}),u}};m.groupBy=F(function(n,t,r){m.has(n,r)?n[r].push(t):n[r]=[t]}),m.indexBy=F(function(n,t,r){n[r]=t}),m.countBy=F(function(n,t,r){m.has(n,r)?n[r]++:n[r]=1}),m.toArray=function(n){return n?m.isArray(n)?l.call(n):k(n)?m.map(n,m.identity):m.values(n):[]},m.size=function(n){return null==n?0:k(n)?n.length:m.keys(n).length},m.partition=function(n,t,r){t=x(t,r);var e=[],u=[];return m.each(n,function(n,r,i){(t(n,r,i)?e:u).push(n)}),[e,u]},m.first=m.head=m.take=function(n,t,r){return null==n?void 0:null==t||r?n[0]:m.initial(n,n.length-t)},m.initial=function(n,t,r){return l.call(n,0,Math.max(0,n.length-(null==t||r?1:t)))},m.last=function(n,t,r){return null==n?void 0:null==t||r?n[n.length-1]:m.rest(n,Math.max(0,n.length-t))},m.rest=m.tail=m.drop=function(n,t,r){return l.call(n,null==t||r?1:t)},m.compact=function(n){return m.filter(n,m.identity)};var S=function(n,t,r,e){for(var u=[],i=0,o=e||0,a=O(n);a>o;o++){var c=n[o];if(k(c)&&(m.isArray(c)||m.isArguments(c))){t||(c=S(c,t,r));var f=0,l=c.length;for(u.length+=l;l>f;)u[i++]=c[f++]}else r||(u[i++]=c)}return u};m.flatten=function(n,t){return S(n,t,!1)},m.without=function(n){return m.difference(n,l.call(arguments,1))},m.uniq=m.unique=function(n,t,r,e){m.isBoolean(t)||(e=r,r=t,t=!1),null!=r&&(r=x(r,e));for(var u=[],i=[],o=0,a=O(n);a>o;o++){var c=n[o],f=r?r(c,o,n):c;t?(o&&i===f||u.push(c),i=f):r?m.contains(i,f)||(i.push(f),u.push(c)):m.contains(u,c)||u.push(c)}return u},m.union=function(){return m.uniq(S(arguments,!0,!0))},m.intersection=function(n){for(var t=[],r=arguments.length,e=0,u=O(n);u>e;e++){var i=n[e];if(!m.contains(t,i)){for(var o=1;r>o&&m.contains(arguments[o],i);o++);o===r&&t.push(i)}}return t},m.difference=function(n){var t=S(arguments,!0,!0,1);return m.filter(n,function(n){return!m.contains(t,n)})},m.zip=function(){return m.unzip(arguments)},m.unzip=function(n){for(var t=n&&m.max(n,O).length||0,r=Array(t),e=0;t>e;e++)r[e]=m.pluck(n,e);return r},m.object=function(n,t){for(var r={},e=0,u=O(n);u>e;e++)t?r[n[e]]=t[e]:r[n[e][0]]=n[e][1];return r},m.findIndex=t(1),m.findLastIndex=t(-1),m.sortedIndex=function(n,t,r,e){r=x(r,e,1);for(var u=r(t),i=0,o=O(n);o>i;){var a=Math.floor((i+o)/2);r(n[a])<u?i=a+1:o=a}return i},m.indexOf=r(1,m.findIndex,m.sortedIndex),m.lastIndexOf=r(-1,m.findLastIndex),m.range=function(n,t,r){null==t&&(t=n||0,n=0),r=r||1;for(var e=Math.max(Math.ceil((t-n)/r),0),u=Array(e),i=0;e>i;i++,n+=r)u[i]=n;return u};var E=function(n,t,r,e,u){if(!(e instanceof t))return n.apply(r,u);var i=j(n.prototype),o=n.apply(i,u);return m.isObject(o)?o:i};m.bind=function(n,t){if(g&&n.bind===g)return g.apply(n,l.call(arguments,1));if(!m.isFunction(n))throw new TypeError("Bind must be called on a function");var r=l.call(arguments,2),e=function(){return E(n,e,t,this,r.concat(l.call(arguments)))};return e},m.partial=function(n){var t=l.call(arguments,1),r=function(){for(var e=0,u=t.length,i=Array(u),o=0;u>o;o++)i[o]=t[o]===m?arguments[e++]:t[o];for(;e<arguments.length;)i.push(arguments[e++]);return E(n,r,this,this,i)};return r},m.bindAll=function(n){var t,r,e=arguments.length;if(1>=e)throw new Error("bindAll must be passed function names");for(t=1;e>t;t++)r=arguments[t],n[r]=m.bind(n[r],n);return n},m.memoize=function(n,t){var r=function(e){var u=r.cache,i=""+(t?t.apply(this,arguments):e);return m.has(u,i)||(u[i]=n.apply(this,arguments)),u[i]};return r.cache={},r},m.delay=function(n,t){var r=l.call(arguments,2);return setTimeout(function(){return n.apply(null,r)},t)},m.defer=m.partial(m.delay,m,1),m.throttle=function(n,t,r){var e,u,i,o=null,a=0;r||(r={});var c=function(){a=r.leading===!1?0:m.now(),o=null,i=n.apply(e,u),o||(e=u=null)};return function(){var f=m.now();a||r.leading!==!1||(a=f);var l=t-(f-a);return e=this,u=arguments,0>=l||l>t?(o&&(clearTimeout(o),o=null),a=f,i=n.apply(e,u),o||(e=u=null)):o||r.trailing===!1||(o=setTimeout(c,l)),i}},m.debounce=function(n,t,r){var e,u,i,o,a,c=function(){var f=m.now()-o;t>f&&f>=0?e=setTimeout(c,t-f):(e=null,r||(a=n.apply(i,u),e||(i=u=null)))};return function(){i=this,u=arguments,o=m.now();var f=r&&!e;return e||(e=setTimeout(c,t)),f&&(a=n.apply(i,u),i=u=null),a}},m.wrap=function(n,t){return m.partial(t,n)},m.negate=function(n){return function(){return!n.apply(this,arguments)}},m.compose=function(){var n=arguments,t=n.length-1;return function(){for(var r=t,e=n[t].apply(this,arguments);r--;)e=n[r].call(this,e);return e}},m.after=function(n,t){return function(){return--n<1?t.apply(this,arguments):void 0}},m.before=function(n,t){var r;return function(){return--n>0&&(r=t.apply(this,arguments)),1>=n&&(t=null),r}},m.once=m.partial(m.before,2);var M=!{toString:null}.propertyIsEnumerable("toString"),I=["valueOf","isPrototypeOf","toString","propertyIsEnumerable","hasOwnProperty","toLocaleString"];m.keys=function(n){if(!m.isObject(n))return[];if(v)return v(n);var t=[];for(var r in n)m.has(n,r)&&t.push(r);return M&&e(n,t),t},m.allKeys=function(n){if(!m.isObject(n))return[];var t=[];for(var r in n)t.push(r);return M&&e(n,t),t},m.values=function(n){for(var t=m.keys(n),r=t.length,e=Array(r),u=0;r>u;u++)e[u]=n[t[u]];return e},m.mapObject=function(n,t,r){t=x(t,r);for(var e,u=m.keys(n),i=u.length,o={},a=0;i>a;a++)e=u[a],o[e]=t(n[e],e,n);return o},m.pairs=function(n){for(var t=m.keys(n),r=t.length,e=Array(r),u=0;r>u;u++)e[u]=[t[u],n[t[u]]];return e},m.invert=function(n){for(var t={},r=m.keys(n),e=0,u=r.length;u>e;e++)t[n[r[e]]]=r[e];return t},m.functions=m.methods=function(n){var t=[];for(var r in n)m.isFunction(n[r])&&t.push(r);return t.sort()},m.extend=_(m.allKeys),m.extendOwn=m.assign=_(m.keys),m.findKey=function(n,t,r){t=x(t,r);for(var e,u=m.keys(n),i=0,o=u.length;o>i;i++)if(e=u[i],t(n[e],e,n))return e},m.pick=function(n,t,r){var e,u,i={},o=n;if(null==o)return i;m.isFunction(t)?(u=m.allKeys(o),e=b(t,r)):(u=S(arguments,!1,!1,1),e=function(n,t,r){return t in r},o=Object(o));for(var a=0,c=u.length;c>a;a++){var f=u[a],l=o[f];e(l,f,o)&&(i[f]=l)}return i},m.omit=function(n,t,r){if(m.isFunction(t))t=m.negate(t);else{var e=m.map(S(arguments,!1,!1,1),String);t=function(n,t){return!m.contains(e,t)}}return m.pick(n,t,r)},m.defaults=_(m.allKeys,!0),m.create=function(n,t){var r=j(n);return t&&m.extendOwn(r,t),r},m.clone=function(n){return m.isObject(n)?m.isArray(n)?n.slice():m.extend({},n):n},m.tap=function(n,t){return t(n),n},m.isMatch=function(n,t){var r=m.keys(t),e=r.length;if(null==n)return!e;for(var u=Object(n),i=0;e>i;i++){var o=r[i];if(t[o]!==u[o]||!(o in u))return!1}return!0};var N=function(n,t,r,e){if(n===t)return 0!==n||1/n===1/t;if(null==n||null==t)return n===t;n instanceof m&&(n=n._wrapped),t instanceof m&&(t=t._wrapped);var u=s.call(n);if(u!==s.call(t))return!1;switch(u){case"[object RegExp]":case"[object String]":return""+n==""+t;case"[object Number]":return+n!==+n?+t!==+t:0===+n?1/+n===1/t:+n===+t;case"[object Date]":case"[object Boolean]":return+n===+t}var i="[object Array]"===u;if(!i){if("object"!=typeof n||"object"!=typeof t)return!1;var o=n.constructor,a=t.constructor;if(o!==a&&!(m.isFunction(o)&&o instanceof o&&m.isFunction(a)&&a instanceof a)&&"constructor"in n&&"constructor"in t)return!1}r=r||[],e=e||[];for(var c=r.length;c--;)if(r[c]===n)return e[c]===t;if(r.push(n),e.push(t),i){if(c=n.length,c!==t.length)return!1;for(;c--;)if(!N(n[c],t[c],r,e))return!1}else{var f,l=m.keys(n);if(c=l.length,m.keys(t).length!==c)return!1;for(;c--;)if(f=l[c],!m.has(t,f)||!N(n[f],t[f],r,e))return!1}return r.pop(),e.pop(),!0};m.isEqual=function(n,t){return N(n,t)},m.isEmpty=function(n){return null==n?!0:k(n)&&(m.isArray(n)||m.isString(n)||m.isArguments(n))?0===n.length:0===m.keys(n).length},m.isElement=function(n){return!(!n||1!==n.nodeType)},m.isArray=h||function(n){return"[object Array]"===s.call(n)},m.isObject=function(n){var t=typeof n;return"function"===t||"object"===t&&!!n},m.each(["Arguments","Function","String","Number","Date","RegExp","Error"],function(n){m["is"+n]=function(t){return s.call(t)==="[object "+n+"]"}}),m.isArguments(arguments)||(m.isArguments=function(n){return m.has(n,"callee")}),"function"!=typeof/./&&"object"!=typeof Int8Array&&(m.isFunction=function(n){return"function"==typeof n||!1}),m.isFinite=function(n){return isFinite(n)&&!isNaN(parseFloat(n))},m.isNaN=function(n){return m.isNumber(n)&&n!==+n},m.isBoolean=function(n){return n===!0||n===!1||"[object Boolean]"===s.call(n)},m.isNull=function(n){return null===n},m.isUndefined=function(n){return n===void 0},m.has=function(n,t){return null!=n&&p.call(n,t)},m.noConflict=function(){return u._=i,this},m.identity=function(n){return n},m.constant=function(n){return function(){return n}},m.noop=function(){},m.property=w,m.propertyOf=function(n){return null==n?function(){}:function(t){return n[t]}},m.matcher=m.matches=function(n){return n=m.extendOwn({},n),function(t){return m.isMatch(t,n)}},m.times=function(n,t,r){var e=Array(Math.max(0,n));t=b(t,r,1);for(var u=0;n>u;u++)e[u]=t(u);return e},m.random=function(n,t){return null==t&&(t=n,n=0),n+Math.floor(Math.random()*(t-n+1))},m.now=Date.now||function(){return(new Date).getTime()};var B={"&":"&","<":"<",">":">",'"':""","'":"'","`":"`"},T=m.invert(B),R=function(n){var t=function(t){return n[t]},r="(?:"+m.keys(n).join("|")+")",e=RegExp(r),u=RegExp(r,"g");return function(n){return n=null==n?"":""+n,e.test(n)?n.replace(u,t):n}};m.escape=R(B),m.unescape=R(T),m.result=function(n,t,r){var e=null==n?void 0:n[t];return e===void 0&&(e=r),m.isFunction(e)?e.call(n):e};var q=0;m.uniqueId=function(n){var t=++q+"";return n?n+t:t},m.templateSettings={evaluate:/<%([\s\S]+?)%>/g,interpolate:/<%=([\s\S]+?)%>/g,escape:/<%-([\s\S]+?)%>/g};var K=/(.)^/,z={"'":"'","\\":"\\","\r":"r","\n":"n","\u2028":"u2028","\u2029":"u2029"},D=/\\|'|\r|\n|\u2028|\u2029/g,L=function(n){return"\\"+z[n]};m.template=function(n,t,r){!t&&r&&(t=r),t=m.defaults({},t,m.templateSettings);var e=RegExp([(t.escape||K).source,(t.interpolate||K).source,(t.evaluate||K).source].join("|")+"|$","g"),u=0,i="__p+='";n.replace(e,function(t,r,e,o,a){return i+=n.slice(u,a).replace(D,L),u=a+t.length,r?i+="'+\n((__t=("+r+"))==null?'':_.escape(__t))+\n'":e?i+="'+\n((__t=("+e+"))==null?'':__t)+\n'":o&&(i+="';\n"+o+"\n__p+='"),t}),i+="';\n",t.variable||(i="with(obj||{}){\n"+i+"}\n"),i="var __t,__p='',__j=Array.prototype.join,"+"print=function(){__p+=__j.call(arguments,'');};\n"+i+"return __p;\n";try{var o=new Function(t.variable||"obj","_",i)}catch(a){throw a.source=i,a}var c=function(n){return o.call(this,n,m)},f=t.variable||"obj";return c.source="function("+f+"){\n"+i+"}",c},m.chain=function(n){var t=m(n);return t._chain=!0,t};var P=function(n,t){return n._chain?m(t).chain():t};m.mixin=function(n){m.each(m.functions(n),function(t){var r=m[t]=n[t];m.prototype[t]=function(){var n=[this._wrapped];return f.apply(n,arguments),P(this,r.apply(m,n))}})},m.mixin(m),m.each(["pop","push","reverse","shift","sort","splice","unshift"],function(n){var t=o[n];m.prototype[n]=function(){var r=this._wrapped;return t.apply(r,arguments),"shift"!==n&&"splice"!==n||0!==r.length||delete r[0],P(this,r)}}),m.each(["concat","join","slice"],function(n){var t=o[n];m.prototype[n]=function(){return P(this,t.apply(this._wrapped,arguments))}}),m.prototype.value=function(){return this._wrapped},m.prototype.valueOf=m.prototype.toJSON=m.prototype.value,m.prototype.toString=function(){return""+this._wrapped},"function"==typeof define&&define.amd&&define("underscore",[],function(){return m})}).call(this);
-//# sourceMappingURL=underscore-min.map
\ No newline at end of file
+!function(){var n="object"==typeof self&&self.self===self&&self||"object"==typeof global&&global.global===global&&global||this||{},r=n._,e=Array.prototype,o=Object.prototype,s="undefined"!=typeof Symbol?Symbol.prototype:null,u=e.push,c=e.slice,p=o.toString,i=o.hasOwnProperty,t=Array.isArray,a=Object.keys,l=Object.create,f=function(){},h=function(n){return n instanceof h?n:this instanceof h?void(this._wrapped=n):new h(n)};"undefined"==typeof exports||exports.nodeType?n._=h:("undefined"!=typeof module&&!module.nodeType&&module.exports&&(exports=module.exports=h),exports._=h),h.VERSION="1.9.1";var v,y=function(u,i,n){if(void 0===i)return u;switch(null==n?3:n){case 1:return function(n){return u.call(i,n)};case 3:return function(n,r,t){return u.call(i,n,r,t)};case 4:return function(n,r,t,e){return u.call(i,n,r,t,e)}}return function(){return u.apply(i,arguments)}},d=function(n,r,t){return h.iteratee!==v?h.iteratee(n,r):null==n?h.identity:h.isFunction(n)?y(n,r,t):h.isObject(n)&&!h.isArray(n)?h.matcher(n):h.property(n)};h.iteratee=v=function(n,r){return d(n,r,1/0)};var g=function(u,i){return i=null==i?u.length-1:+i,function(){for(var n=Math.max(arguments.length-i,0),r=Array(n),t=0;t<n;t++)r[t]=arguments[t+i];switch(i){case 0:return u.call(this,r);case 1:return u.call(this,arguments[0],r);case 2:return u.call(this,arguments[0],arguments[1],r)}var e=Array(i+1);for(t=0;t<i;t++)e[t]=arguments[t];return e[i]=r,u.apply(this,e)}},m=function(n){if(!h.isObject(n))return{};if(l)return l(n);f.prototype=n;var r=new f;return f.prototype=null,r},b=function(r){return function(n){return null==n?void 0:n[r]}},j=function(n,r){return null!=n&&i.call(n,r)},x=function(n,r){for(var t=r.length,e=0;e<t;e++){if(null==n)return;n=n[r[e]]}return t?n:void 0},_=Math.pow(2,53)-1,A=b("length"),w=function(n){var r=A(n);return"number"==typeof r&&0<=r&&r<=_};h.each=h.forEach=function(n,r,t){var e,u;if(r=y(r,t),w(n))for(e=0,u=n.length;e<u;e++)r(n[e],e,n);else{var i=h.keys(n);for(e=0,u=i.length;e<u;e++)r(n[i[e]],i[e],n)}return n},h.map=h.collect=function(n,r,t){r=d(r,t);for(var e=!w(n)&&h.keys(n),u=(e||n).length,i=Array(u),o=0;o<u;o++){var a=e?e[o]:o;i[o]=r(n[a],a,n)}return i};var O=function(c){return function(n,r,t,e){var u=3<=arguments.length;return function(n,r,t,e){var u=!w(n)&&h.keys(n),i=(u||n).length,o=0<c?0:i-1;for(e||(t=n[u?u[o]:o],o+=c);0<=o&&o<i;o+=c){var a=u?u[o]:o;t=r(t,n[a],a,n)}return t}(n,y(r,e,4),t,u)}};h.reduce=h.foldl=h.inject=O(1),h.reduceRight=h.foldr=O(-1),h.find=h.detect=function(n,r,t){var e=(w(n)?h.findIndex:h.findKey)(n,r,t);if(void 0!==e&&-1!==e)return n[e]},h.filter=h.select=function(n,e,r){var u=[];return e=d(e,r),h.each(n,function(n,r,t){e(n,r,t)&&u.push(n)}),u},h.reject=function(n,r,t){return h.filter(n,h.negate(d(r)),t)},h.every=h.all=function(n,r,t){r=d(r,t);for(var e=!w(n)&&h.keys(n),u=(e||n).length,i=0;i<u;i++){var o=e?e[i]:i;if(!r(n[o],o,n))return!1}return!0},h.some=h.any=function(n,r,t){r=d(r,t);for(var e=!w(n)&&h.keys(n),u=(e||n).length,i=0;i<u;i++){var o=e?e[i]:i;if(r(n[o],o,n))return!0}return!1},h.contains=h.includes=h.include=function(n,r,t,e){return w(n)||(n=h.values(n)),("number"!=typeof t||e)&&(t=0),0<=h.indexOf(n,r,t)},h.invoke=g(function(n,t,e){var u,i;return h.isFunction(t)?i=t:h.isArray(t)&&(u=t.slice(0,-1),t=t[t.length-1]),h.map(n,function(n){var r=i;if(!r){if(u&&u.length&&(n=x(n,u)),null==n)return;r=n[t]}return null==r?r:r.apply(n,e)})}),h.pluck=function(n,r){return h.map(n,h.property(r))},h.where=function(n,r){return h.filter(n,h.matcher(r))},h.findWhere=function(n,r){return h.find(n,h.matcher(r))},h.max=function(n,e,r){var t,u,i=-1/0,o=-1/0;if(null==e||"number"==typeof e&&"object"!=typeof n[0]&&null!=n)for(var a=0,c=(n=w(n)?n:h.values(n)).length;a<c;a++)null!=(t=n[a])&&i<t&&(i=t);else e=d(e,r),h.each(n,function(n,r,t){u=e(n,r,t),(o<u||u===-1/0&&i===-1/0)&&(i=n,o=u)});return i},h.min=function(n,e,r){var t,u,i=1/0,o=1/0;if(null==e||"number"==typeof e&&"object"!=typeof n[0]&&null!=n)for(var a=0,c=(n=w(n)?n:h.values(n)).length;a<c;a++)null!=(t=n[a])&&t<i&&(i=t);else e=d(e,r),h.each(n,function(n,r,t){((u=e(n,r,t))<o||u===1/0&&i===1/0)&&(i=n,o=u)});return i},h.shuffle=function(n){return h.sample(n,1/0)},h.sample=function(n,r,t){if(null==r||t)return w(n)||(n=h.values(n)),n[h.random(n.length-1)];var e=w(n)?h.clone(n):h.values(n),u=A(e);r=Math.max(Math.min(r,u),0);for(var i=u-1,o=0;o<r;o++){var a=h.random(o,i),c=e[o];e[o]=e[a],e[a]=c}return e.slice(0,r)},h.sortBy=function(n,e,r){var u=0;return e=d(e,r),h.pluck(h.map(n,function(n,r,t){return{value:n,index:u++,criteria:e(n,r,t)}}).sort(function(n,r){var t=n.criteria,e=r.criteria;if(t!==e){if(e<t||void 0===t)return 1;if(t<e||void 0===e)return-1}return n.index-r.index}),"value")};var k=function(o,r){return function(e,u,n){var i=r?[[],[]]:{};return u=d(u,n),h.each(e,function(n,r){var t=u(n,r,e);o(i,n,t)}),i}};h.groupBy=k(function(n,r,t){j(n,t)?n[t].push(r):n[t]=[r]}),h.indexBy=k(function(n,r,t){n[t]=r}),h.countBy=k(function(n,r,t){j(n,t)?n[t]++:n[t]=1});var S=/[^\ud800-\udfff]|[\ud800-\udbff][\udc00-\udfff]|[\ud800-\udfff]/g;h.toArray=function(n){return n?h.isArray(n)?c.call(n):h.isString(n)?n.match(S):w(n)?h.map(n,h.identity):h.values(n):[]},h.size=function(n){return null==n?0:w(n)?n.length:h.keys(n).length},h.partition=k(function(n,r,t){n[t?0:1].push(r)},!0),h.first=h.head=h.take=function(n,r,t){return null==n||n.length<1?null==r?void 0:[]:null==r||t?n[0]:h.initial(n,n.length-r)},h.initial=function(n,r,t){return c.call(n,0,Math.max(0,n.length-(null==r||t?1:r)))},h.last=function(n,r,t){return null==n||n.length<1?null==r?void 0:[]:null==r||t?n[n.length-1]:h.rest(n,Math.max(0,n.length-r))},h.rest=h.tail=h.drop=function(n,r,t){return c.call(n,null==r||t?1:r)},h.compact=function(n){return h.filter(n,Boolean)};var M=function(n,r,t,e){for(var u=(e=e||[]).length,i=0,o=A(n);i<o;i++){var a=n[i];if(w(a)&&(h.isArray(a)||h.isArguments(a)))if(r)for(var c=0,l=a.length;c<l;)e[u++]=a[c++];else M(a,r,t,e),u=e.length;else t||(e[u++]=a)}return e};h.flatten=function(n,r){return M(n,r,!1)},h.without=g(function(n,r){return h.difference(n,r)}),h.uniq=h.unique=function(n,r,t,e){h.isBoolean(r)||(e=t,t=r,r=!1),null!=t&&(t=d(t,e));for(var u=[],i=[],o=0,a=A(n);o<a;o++){var c=n[o],l=t?t(c,o,n):c;r&&!t?(o&&i===l||u.push(c),i=l):t?h.contains(i,l)||(i.push(l),u.push(c)):h.contains(u,c)||u.push(c)}return u},h.union=g(function(n){return h.uniq(M(n,!0,!0))}),h.intersection=function(n){for(var r=[],t=arguments.length,e=0,u=A(n);e<u;e++){var i=n[e];if(!h.contains(r,i)){var o;for(o=1;o<t&&h.contains(arguments[o],i);o++);o===t&&r.push(i)}}return r},h.difference=g(function(n,r){return r=M(r,!0,!0),h.filter(n,function(n){return!h.contains(r,n)})}),h.unzip=function(n){for(var r=n&&h.max(n,A).length||0,t=Array(r),e=0;e<r;e++)t[e]=h.pluck(n,e);return t},h.zip=g(h.unzip),h.object=function(n,r){for(var t={},e=0,u=A(n);e<u;e++)r?t[n[e]]=r[e]:t[n[e][0]]=n[e][1];return t};var F=function(i){return function(n,r,t){r=d(r,t);for(var e=A(n),u=0<i?0:e-1;0<=u&&u<e;u+=i)if(r(n[u],u,n))return u;return-1}};h.findIndex=F(1),h.findLastIndex=F(-1),h.sortedIndex=function(n,r,t,e){for(var u=(t=d(t,e,1))(r),i=0,o=A(n);i<o;){var a=Math.floor((i+o)/2);t(n[a])<u?i=a+1:o=a}return i};var E=function(i,o,a){return function(n,r,t){var e=0,u=A(n);if("number"==typeof t)0<i?e=0<=t?t:Math.max(t+u,e):u=0<=t?Math.min(t+1,u):t+u+1;else if(a&&t&&u)return n[t=a(n,r)]===r?t:-1;if(r!=r)return 0<=(t=o(c.call(n,e,u),h.isNaN))?t+e:-1;for(t=0<i?e:u-1;0<=t&&t<u;t+=i)if(n[t]===r)return t;return-1}};h.indexOf=E(1,h.findIndex,h.sortedIndex),h.lastIndexOf=E(-1,h.findLastIndex),h.range=function(n,r,t){null==r&&(r=n||0,n=0),t||(t=r<n?-1:1);for(var e=Math.max(Math.ceil((r-n)/t),0),u=Array(e),i=0;i<e;i++,n+=t)u[i]=n;return u},h.chunk=function(n,r){if(null==r||r<1)return[];for(var t=[],e=0,u=n.length;e<u;)t.push(c.call(n,e,e+=r));return t};var N=function(n,r,t,e,u){if(!(e instanceof r))return n.apply(t,u);var i=m(n.prototype),o=n.apply(i,u);return h.isObject(o)?o:i};h.bind=g(function(r,t,e){if(!h.isFunction(r))throw new TypeError("Bind must be called on a function");var u=g(function(n){return N(r,u,t,this,e.concat(n))});return u}),h.partial=g(function(u,i){var o=h.partial.placeholder,a=function(){for(var n=0,r=i.length,t=Array(r),e=0;e<r;e++)t[e]=i[e]===o?arguments[n++]:i[e];for(;n<arguments.length;)t.push(arguments[n++]);return N(u,a,this,this,t)};return a}),(h.partial.placeholder=h).bindAll=g(function(n,r){var t=(r=M(r,!1,!1)).length;if(t<1)throw new Error("bindAll must be passed function names");for(;t--;){var e=r[t];n[e]=h.bind(n[e],n)}}),h.memoize=function(e,u){var i=function(n){var r=i.cache,t=""+(u?u.apply(this,arguments):n);return j(r,t)||(r[t]=e.apply(this,arguments)),r[t]};return i.cache={},i},h.delay=g(function(n,r,t){return setTimeout(function(){return n.apply(null,t)},r)}),h.defer=h.partial(h.delay,h,1),h.throttle=function(t,e,u){var i,o,a,c,l=0;u||(u={});var f=function(){l=!1===u.leading?0:h.now(),i=null,c=t.apply(o,a),i||(o=a=null)},n=function(){var n=h.now();l||!1!==u.leading||(l=n);var r=e-(n-l);return o=this,a=arguments,r<=0||e<r?(i&&(clearTimeout(i),i=null),l=n,c=t.apply(o,a),i||(o=a=null)):i||!1===u.trailing||(i=setTimeout(f,r)),c};return n.cancel=function(){clearTimeout(i),l=0,i=o=a=null},n},h.debounce=function(t,e,u){var i,o,a=function(n,r){i=null,r&&(o=t.apply(n,r))},n=g(function(n){if(i&&clearTimeout(i),u){var r=!i;i=setTimeout(a,e),r&&(o=t.apply(this,n))}else i=h.delay(a,e,this,n);return o});return n.cancel=function(){clearTimeout(i),i=null},n},h.wrap=function(n,r){return h.partial(r,n)},h.negate=function(n){return function(){return!n.apply(this,arguments)}},h.compose=function(){var t=arguments,e=t.length-1;return function(){for(var n=e,r=t[e].apply(this,arguments);n--;)r=t[n].call(this,r);return r}},h.after=function(n,r){return function(){if(--n<1)return r.apply(this,arguments)}},h.before=function(n,r){var t;return function(){return 0<--n&&(t=r.apply(this,arguments)),n<=1&&(r=null),t}},h.once=h.partial(h.before,2),h.restArguments=g;var I=!{toString:null}.propertyIsEnumerable("toString"),T=["valueOf","isPrototypeOf","toString","propertyIsEnumerable","hasOwnProperty","toLocaleString"],B=function(n,r){var t=T.length,e=n.constructor,u=h.isFunction(e)&&e.prototype||o,i="constructor";for(j(n,i)&&!h.contains(r,i)&&r.push(i);t--;)(i=T[t])in n&&n[i]!==u[i]&&!h.contains(r,i)&&r.push(i)};h.keys=function(n){if(!h.isObject(n))return[];if(a)return a(n);var r=[];for(var t in n)j(n,t)&&r.push(t);return I&&B(n,r),r},h.allKeys=function(n){if(!h.isObject(n))return[];var r=[];for(var t in n)r.push(t);return I&&B(n,r),r},h.values=function(n){for(var r=h.keys(n),t=r.length,e=Array(t),u=0;u<t;u++)e[u]=n[r[u]];return e},h.mapObject=function(n,r,t){r=d(r,t);for(var e=h.keys(n),u=e.length,i={},o=0;o<u;o++){var a=e[o];i[a]=r(n[a],a,n)}return i},h.pairs=function(n){for(var r=h.keys(n),t=r.length,e=Array(t),u=0;u<t;u++)e[u]=[r[u],n[r[u]]];return e},h.invert=function(n){for(var r={},t=h.keys(n),e=0,u=t.length;e<u;e++)r[n[t[e]]]=t[e];return r},h.functions=h.methods=function(n){var r=[];for(var t in n)h.isFunction(n[t])&&r.push(t);return r.sort()};var R=function(c,l){return function(n){var r=arguments.length;if(l&&(n=Object(n)),r<2||null==n)return n;for(var t=1;t<r;t++)for(var e=arguments[t],u=c(e),i=u.length,o=0;o<i;o++){var a=u[o];l&&void 0!==n[a]||(n[a]=e[a])}return n}};h.extend=R(h.allKeys),h.extendOwn=h.assign=R(h.keys),h.findKey=function(n,r,t){r=d(r,t);for(var e,u=h.keys(n),i=0,o=u.length;i<o;i++)if(r(n[e=u[i]],e,n))return e};var q,K,z=function(n,r,t){return r in t};h.pick=g(function(n,r){var t={},e=r[0];if(null==n)return t;h.isFunction(e)?(1<r.length&&(e=y(e,r[1])),r=h.allKeys(n)):(e=z,r=M(r,!1,!1),n=Object(n));for(var u=0,i=r.length;u<i;u++){var o=r[u],a=n[o];e(a,o,n)&&(t[o]=a)}return t}),h.omit=g(function(n,t){var r,e=t[0];return h.isFunction(e)?(e=h.negate(e),1<t.length&&(r=t[1])):(t=h.map(M(t,!1,!1),String),e=function(n,r){return!h.contains(t,r)}),h.pick(n,e,r)}),h.defaults=R(h.allKeys,!0),h.create=function(n,r){var t=m(n);return r&&h.extendOwn(t,r),t},h.clone=function(n){return h.isObject(n)?h.isArray(n)?n.slice():h.extend({},n):n},h.tap=function(n,r){return r(n),n},h.isMatch=function(n,r){var t=h.keys(r),e=t.length;if(null==n)return!e;for(var u=Object(n),i=0;i<e;i++){var o=t[i];if(r[o]!==u[o]||!(o in u))return!1}return!0},q=function(n,r,t,e){if(n===r)return 0!==n||1/n==1/r;if(null==n||null==r)return!1;if(n!=n)return r!=r;var u=typeof n;return("function"===u||"object"===u||"object"==typeof r)&&K(n,r,t,e)},K=function(n,r,t,e){n instanceof h&&(n=n._wrapped),r instanceof h&&(r=r._wrapped);var u=p.call(n);if(u!==p.call(r))return!1;switch(u){case"[object RegExp]":case"[object String]":return""+n==""+r;case"[object Number]":return+n!=+n?+r!=+r:0==+n?1/+n==1/r:+n==+r;case"[object Date]":case"[object Boolean]":return+n==+r;case"[object Symbol]":return s.valueOf.call(n)===s.valueOf.call(r)}var i="[object Array]"===u;if(!i){if("object"!=typeof n||"object"!=typeof r)return!1;var o=n.constructor,a=r.constructor;if(o!==a&&!(h.isFunction(o)&&o instanceof o&&h.isFunction(a)&&a instanceof a)&&"constructor"in n&&"constructor"in r)return!1}e=e||[];for(var c=(t=t||[]).length;c--;)if(t[c]===n)return e[c]===r;if(t.push(n),e.push(r),i){if((c=n.length)!==r.length)return!1;for(;c--;)if(!q(n[c],r[c],t,e))return!1}else{var l,f=h.keys(n);if(c=f.length,h.keys(r).length!==c)return!1;for(;c--;)if(l=f[c],!j(r,l)||!q(n[l],r[l],t,e))return!1}return t.pop(),e.pop(),!0},h.isEqual=function(n,r){return q(n,r)},h.isEmpty=function(n){return null==n||(w(n)&&(h.isArray(n)||h.isString(n)||h.isArguments(n))?0===n.length:0===h.keys(n).length)},h.isElement=function(n){return!(!n||1!==n.nodeType)},h.isArray=t||function(n){return"[object Array]"===p.call(n)},h.isObject=function(n){var r=typeof n;return"function"===r||"object"===r&&!!n},h.each(["Arguments","Function","String","Number","Date","RegExp","Error","Symbol","Map","WeakMap","Set","WeakSet"],function(r){h["is"+r]=function(n){return p.call(n)==="[object "+r+"]"}}),h.isArguments(arguments)||(h.isArguments=function(n){return j(n,"callee")});var D=n.document&&n.document.childNodes;"function"!=typeof/./&&"object"!=typeof Int8Array&&"function"!=typeof D&&(h.isFunction=function(n){return"function"==typeof n||!1}),h.isFinite=function(n){return!h.isSymbol(n)&&isFinite(n)&&!isNaN(parseFloat(n))},h.isNaN=function(n){return h.isNumber(n)&&isNaN(n)},h.isBoolean=function(n){return!0===n||!1===n||"[object Boolean]"===p.call(n)},h.isNull=function(n){return null===n},h.isUndefined=function(n){return void 0===n},h.has=function(n,r){if(!h.isArray(r))return j(n,r);for(var t=r.length,e=0;e<t;e++){var u=r[e];if(null==n||!i.call(n,u))return!1;n=n[u]}return!!t},h.noConflict=function(){return n._=r,this},h.identity=function(n){return n},h.constant=function(n){return function(){return n}},h.noop=function(){},h.property=function(r){return h.isArray(r)?function(n){return x(n,r)}:b(r)},h.propertyOf=function(r){return null==r?function(){}:function(n){return h.isArray(n)?x(r,n):r[n]}},h.matcher=h.matches=function(r){return r=h.extendOwn({},r),function(n){return h.isMatch(n,r)}},h.times=function(n,r,t){var e=Array(Math.max(0,n));r=y(r,t,1);for(var u=0;u<n;u++)e[u]=r(u);return e},h.random=function(n,r){return null==r&&(r=n,n=0),n+Math.floor(Math.random()*(r-n+1))},h.now=Date.now||function(){return(new Date).getTime()};var L={"&":"&","<":"<",">":">",'"':""","'":"'","`":"`"},P=h.invert(L),W=function(r){var t=function(n){return r[n]},n="(?:"+h.keys(r).join("|")+")",e=RegExp(n),u=RegExp(n,"g");return function(n){return n=null==n?"":""+n,e.test(n)?n.replace(u,t):n}};h.escape=W(L),h.unescape=W(P),h.result=function(n,r,t){h.isArray(r)||(r=[r]);var e=r.length;if(!e)return h.isFunction(t)?t.call(n):t;for(var u=0;u<e;u++){var i=null==n?void 0:n[r[u]];void 0===i&&(i=t,u=e),n=h.isFunction(i)?i.call(n):i}return n};var C=0;h.uniqueId=function(n){var r=++C+"";return n?n+r:r},h.templateSettings={evaluate:/<%([\s\S]+?)%>/g,interpolate:/<%=([\s\S]+?)%>/g,escape:/<%-([\s\S]+?)%>/g};var J=/(.)^/,U={"'":"'","\\":"\\","\r":"r","\n":"n","\u2028":"u2028","\u2029":"u2029"},V=/\\|'|\r|\n|\u2028|\u2029/g,$=function(n){return"\\"+U[n]};h.template=function(i,n,r){!n&&r&&(n=r),n=h.defaults({},n,h.templateSettings);var t,e=RegExp([(n.escape||J).source,(n.interpolate||J).source,(n.evaluate||J).source].join("|")+"|$","g"),o=0,a="__p+='";i.replace(e,function(n,r,t,e,u){return a+=i.slice(o,u).replace(V,$),o=u+n.length,r?a+="'+\n((__t=("+r+"))==null?'':_.escape(__t))+\n'":t?a+="'+\n((__t=("+t+"))==null?'':__t)+\n'":e&&(a+="';\n"+e+"\n__p+='"),n}),a+="';\n",n.variable||(a="with(obj||{}){\n"+a+"}\n"),a="var __t,__p='',__j=Array.prototype.join,"+"print=function(){__p+=__j.call(arguments,'');};\n"+a+"return __p;\n";try{t=new Function(n.variable||"obj","_",a)}catch(n){throw n.source=a,n}var u=function(n){return t.call(this,n,h)},c=n.variable||"obj";return u.source="function("+c+"){\n"+a+"}",u},h.chain=function(n){var r=h(n);return r._chain=!0,r};var G=function(n,r){return n._chain?h(r).chain():r};h.mixin=function(t){return h.each(h.functions(t),function(n){var r=h[n]=t[n];h.prototype[n]=function(){var n=[this._wrapped];return u.apply(n,arguments),G(this,r.apply(h,n))}}),h},h.mixin(h),h.each(["pop","push","reverse","shift","sort","splice","unshift"],function(r){var t=e[r];h.prototype[r]=function(){var n=this._wrapped;return t.apply(n,arguments),"shift"!==r&&"splice"!==r||0!==n.length||delete n[0],G(this,n)}}),h.each(["concat","join","slice"],function(n){var r=e[n];h.prototype[n]=function(){return G(this,r.apply(this._wrapped,arguments))}}),h.prototype.value=function(){return this._wrapped},h.prototype.valueOf=h.prototype.toJSON=h.prototype.value,h.prototype.toString=function(){return String(this._wrapped)},"function"==typeof define&&define.amd&&define("underscore",[],function(){return h})}();
\ No newline at end of file
diff --git a/web/core/assets/vendor/underscore/underscore-min.js.map b/web/core/assets/vendor/underscore/underscore-min.js.map
new file mode 100644
index 0000000000..3b6056b1e0
--- /dev/null
+++ b/web/core/assets/vendor/underscore/underscore-min.js.map
@@ -0,0 +1 @@
+{"version":3,"sources":["underscore.js"],"names":["root","self","global","this","previousUnderscore","_","ArrayProto","Array","prototype","ObjProto","Object","SymbolProto","Symbol","push","slice","toString","hasOwnProperty","nativeIsArray","isArray","nativeKeys","keys","nativeCreate","create","Ctor","obj","_wrapped","exports","nodeType","module","VERSION","builtinIteratee","optimizeCb","func","context","argCount","value","call","index","collection","accumulator","apply","arguments","cb","iteratee","identity","isFunction","isObject","matcher","property","Infinity","restArguments","startIndex","length","Math","max","rest","args","baseCreate","result","shallowProperty","key","has","path","deepGet","i","MAX_ARRAY_INDEX","pow","getLength","isArrayLike","each","forEach","map","collect","results","currentKey","createReduce","dir","memo","initial","reducer","reduce","foldl","inject","reduceRight","foldr","find","detect","predicate","findIndex","findKey","filter","select","list","reject","negate","every","all","some","any","contains","includes","include","item","fromIndex","guard","values","indexOf","invoke","contextPath","method","pluck","where","attrs","findWhere","computed","lastComputed","v","min","shuffle","sample","n","random","clone","last","rand","temp","sortBy","criteria","sort","left","right","a","b","group","behavior","partition","groupBy","indexBy","countBy","reStrSymbol","toArray","isString","match","size","pass","first","head","take","array","tail","drop","compact","Boolean","flatten","input","shallow","strict","output","idx","isArguments","j","len","without","otherArrays","difference","uniq","unique","isSorted","isBoolean","seen","union","arrays","intersection","argsLength","unzip","zip","object","createPredicateIndexFinder","findLastIndex","sortedIndex","low","high","mid","floor","createIndexFinder","predicateFind","isNaN","lastIndexOf","range","start","stop","step","ceil","chunk","count","executeBound","sourceFunc","boundFunc","callingContext","bind","TypeError","bound","callArgs","concat","partial","boundArgs","placeholder","position","bindAll","Error","memoize","hasher","cache","address","delay","wait","setTimeout","defer","throttle","options","timeout","previous","later","leading","now","throttled","remaining","clearTimeout","trailing","cancel","debounce","immediate","debounced","callNow","wrap","wrapper","compose","after","times","before","once","hasEnumBug","propertyIsEnumerable","nonEnumerableProps","collectNonEnumProps","nonEnumIdx","constructor","proto","prop","allKeys","mapObject","pairs","invert","functions","methods","names","createAssigner","keysFunc","defaults","source","l","extend","extendOwn","assign","eq","deepEq","keyInObj","pick","omit","String","props","tap","interceptor","isMatch","aStack","bStack","type","className","valueOf","areArrays","aCtor","bCtor","pop","isEqual","isEmpty","isElement","name","nodelist","document","childNodes","Int8Array","isFinite","isSymbol","parseFloat","isNumber","isNull","isUndefined","noConflict","constant","noop","propertyOf","matches","accum","Date","getTime","escapeMap","&","<",">","\"","'","`","unescapeMap","createEscaper","escaper","join","testRegexp","RegExp","replaceRegexp","string","test","replace","escape","unescape","fallback","idCounter","uniqueId","prefix","id","templateSettings","evaluate","interpolate","noMatch","escapes","\\","\r","\n","
","
","escapeRegExp","escapeChar","template","text","settings","oldSettings","render","offset","variable","Function","e","data","argument","chain","instance","_chain","chainResult","mixin","toJSON","define","amd"],"mappings":"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"}
\ No newline at end of file
diff --git a/web/core/assets/vendor/underscore/underscore-min.map b/web/core/assets/vendor/underscore/underscore-min.map
deleted file mode 100644
index 60a56877dc..0000000000
--- a/web/core/assets/vendor/underscore/underscore-min.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"underscore-min.js","sources":["underscore.js"],"names":["createReduce","dir","iterator","obj","iteratee","memo","keys","index","length","currentKey","context","optimizeCb","isArrayLike","_","arguments","createPredicateIndexFinder","array","predicate","cb","getLength","createIndexFinder","predicateFind","sortedIndex","item","idx","i","Math","max","min","slice","call","isNaN","collectNonEnumProps","nonEnumIdx","nonEnumerableProps","constructor","proto","isFunction","prototype","ObjProto","prop","has","contains","push","root","this","previousUnderscore","ArrayProto","Array","Object","FuncProto","Function","toString","hasOwnProperty","nativeIsArray","isArray","nativeKeys","nativeBind","bind","nativeCreate","create","Ctor","_wrapped","exports","module","VERSION","func","argCount","value","other","collection","accumulator","apply","identity","isObject","matcher","property","Infinity","createAssigner","keysFunc","undefinedOnly","source","l","key","baseCreate","result","MAX_ARRAY_INDEX","pow","each","forEach","map","collect","results","reduce","foldl","inject","reduceRight","foldr","find","detect","findIndex","findKey","filter","select","list","reject","negate","every","all","some","any","includes","include","fromIndex","guard","values","indexOf","invoke","method","args","isFunc","pluck","where","attrs","findWhere","computed","lastComputed","shuffle","rand","set","shuffled","random","sample","n","sortBy","criteria","sort","left","right","a","b","group","behavior","groupBy","indexBy","countBy","toArray","size","partition","pass","fail","first","head","take","initial","last","rest","tail","drop","compact","flatten","input","shallow","strict","startIndex","output","isArguments","j","len","without","difference","uniq","unique","isSorted","isBoolean","seen","union","intersection","argsLength","zip","unzip","object","findLastIndex","low","high","mid","floor","lastIndexOf","range","start","stop","step","ceil","executeBound","sourceFunc","boundFunc","callingContext","self","TypeError","bound","concat","partial","boundArgs","position","bindAll","Error","memoize","hasher","cache","address","delay","wait","setTimeout","defer","throttle","options","timeout","previous","later","leading","now","remaining","clearTimeout","trailing","debounce","immediate","timestamp","callNow","wrap","wrapper","compose","after","times","before","once","hasEnumBug","propertyIsEnumerable","allKeys","mapObject","pairs","invert","functions","methods","names","extend","extendOwn","assign","pick","oiteratee","omit","String","defaults","props","clone","tap","interceptor","isMatch","eq","aStack","bStack","className","areArrays","aCtor","bCtor","pop","isEqual","isEmpty","isString","isElement","nodeType","type","name","Int8Array","isFinite","parseFloat","isNumber","isNull","isUndefined","noConflict","constant","noop","propertyOf","matches","accum","Date","getTime","escapeMap","&","<",">","\"","'","`","unescapeMap","createEscaper","escaper","match","join","testRegexp","RegExp","replaceRegexp","string","test","replace","escape","unescape","fallback","idCounter","uniqueId","prefix","id","templateSettings","evaluate","interpolate","noMatch","escapes","\\","\r","\n","
","
","escapeChar","template","text","settings","oldSettings","offset","variable","render","e","data","argument","chain","instance","_chain","mixin","valueOf","toJSON","define","amd"],"mappings":"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"}
diff --git a/web/core/authorize.php b/web/core/authorize.php
index aa66be5fd3..e0b7c4f192 100644
--- a/web/core/authorize.php
+++ b/web/core/authorize.php
@@ -104,20 +104,14 @@ function authorize_access_allowed(Request $request) {
require_once __DIR__ . '/includes/form.inc';
require_once __DIR__ . '/includes/batch.inc';
- if (isset($_SESSION['authorize_page_title'])) {
- $page_title = $_SESSION['authorize_page_title'];
- }
- else {
- $page_title = t('Authorize file system changes');
- }
+ $page_title = $request->getSession()->get('authorize_page_title', t('Authorize file system changes'));
// See if we've run the operation and need to display a report.
- if (isset($_SESSION['authorize_results']) && $results = $_SESSION['authorize_results']) {
+ if ($results = $request->getSession()->remove('authorize_results')) {
// Clear the session out.
- unset($_SESSION['authorize_results']);
- unset($_SESSION['authorize_operation']);
- unset($_SESSION['authorize_filetransfer_info']);
+ $request->getSession()->remove('authorize_operation');
+ $request->getSession()->remove('authorize_filetransfer_info');
if (!empty($results['page_title'])) {
$page_title = $results['page_title'];
@@ -175,7 +169,7 @@ function authorize_access_allowed(Request $request) {
}
}
else {
- if (empty($_SESSION['authorize_operation']) || empty($_SESSION['authorize_filetransfer_info'])) {
+ if (!$request->getSession()->has('authorize_operation') || !$request->getSession()->has('authorize_filetransfer_info')) {
$content = ['#markup' => t('It appears you have reached this page in error.')];
}
elseif (!$batch = batch_get()) {
diff --git a/web/core/composer.json b/web/core/composer.json
index 9ebe6723b8..5884117726 100644
--- a/web/core/composer.json
+++ b/web/core/composer.json
@@ -22,7 +22,7 @@
"symfony/console": "~3.4.0",
"symfony/dependency-injection": "~3.4.26",
"symfony/event-dispatcher": "~3.4.0",
- "symfony/http-foundation": "~3.4.27",
+ "symfony/http-foundation": "~3.4.35",
"symfony/http-kernel": "~3.4.14",
"symfony/routing": "~3.4.0",
"symfony/serializer": "~3.4.0",
@@ -38,15 +38,16 @@
"guzzlehttp/guzzle": "^6.3",
"symfony-cmf/routing": "^1.4",
"easyrdf/easyrdf": "^0.9",
- "zendframework/zend-feed": "^2.12",
+ "laminas/laminas-feed": "^2.12",
"stack/builder": "^1.0",
"egulias/email-validator": "^2.0",
"masterminds/html5": "^2.1",
"symfony/psr-http-message-bridge": "^1.1.2",
- "zendframework/zend-diactoros": "^1.8",
+ "laminas/laminas-diactoros": "^1.8",
"composer/semver": "^1.0",
"asm89/stack-cors": "^1.1",
- "pear/archive_tar": "^1.4.9"
+ "pear/archive_tar": "^1.4.9",
+ "psr/log": "^1.0"
},
"conflict": {
"drupal/pathauto": "<1.6",
diff --git a/web/core/core.api.php b/web/core/core.api.php
index 66352cd8f3..23f153f2c0 100644
--- a/web/core/core.api.php
+++ b/web/core/core.api.php
@@ -1119,6 +1119,17 @@
* subdirectory)
* - Directory location: yourmodule/tests/src/FunctionalJavascript (or a
* subdirectory)
+ * - Build tests:
+ * - Purpose: Test building processes and their outcomes, such as whether a
+ * live update process actually works, or whether a Composer project
+ * template actually builds a working site. Provides a temporary build
+ * workspace and a PHP-native HTTP server to send requests to the site
+ * you've built.
+ * - Base class: \Drupal\BuildTests\Framework\BuildTestBase
+ * - Namespace: \Drupal\Tests\yourmodule\Build (or a
+ * subdirectory)
+ * - Directory location: yourmodule/tests/src/Build (or a
+ * subdirectory)
*
* Some notes about writing PHP test classes:
* - The class needs a phpDoc comment block with a description and
@@ -2594,5 +2605,29 @@ function hook_validation_constraint_alter(array &$definitions) {
* within contributed and custom code. Reserved attributes include:
* - uid: The user ID for an authenticated user. The value of this attribute
* cannot be modified.
+ *
+ * @section sec_custom_session_bags Custom session bags
+ * Modules can register custom session bags in order to provide type safe
+ * interfaces on module specific session data. A session bag must implement
+ * \Symfony\Component\HttpFoundation\Session\SessionBagInterface. Custom session
+ * bags are registered using a service entry tagged with the session_bag service
+ * tag. Custom session bags can be accessed through the session retrieved from
+ * the request object.
+ *
+ * Example service definition:
+ * @code
+ * session_test.session_bag:
+ * class: Drupal\session_test\Session\TestSessionBag
+ * tags:
+ * - { name: session_bag }
+ * @endcode
+ *
+ * Example of accessing a custom session bag:
+ * @code
+ * $bag = $request->getSession()->getBag(TestSessionBag::BAG_NAME);
+ * $bag->setFlag();
+ * @endcode
+ * Session data must be deleted from custom session bags as soon as it is no
+ * longer needed (see @ref sec_intro above).
* @}
*/
diff --git a/web/core/core.libraries.yml b/web/core/core.libraries.yml
index 5472c9ffa8..b036741741 100644
--- a/web/core/core.libraries.yml
+++ b/web/core/core.libraries.yml
@@ -2,10 +2,10 @@
backbone:
remote: https://github.com/jashkenas/backbone
- version: "1.2.3"
+ version: "1.4.0"
license:
name: MIT
- url: https://github.com/jashkenas/backbone/blob/1.2.3/LICENSE
+ url: https://github.com/jashkenas/backbone/blob/1.4.0/LICENSE
gpl-compatible: true
js:
assets/vendor/backbone/backbone-min.js: { weight: -19, minified: true }
@@ -229,7 +229,6 @@ drupal.form:
- core/jquery
- core/drupal
- core/drupal.debounce
- - core/jquery.cookie
- core/jquery.once
drupal.machine-name:
@@ -251,6 +250,11 @@ drupal.message:
- core/drupal
- core/drupal.announce
+drupal.object.assign:
+ version: VERSION
+ js:
+ misc/polyfills/object.assign.js: { weight: -20 }
+
drupal.progress:
version: VERSION
js:
@@ -289,7 +293,6 @@ drupal.tabledrag:
- core/drupal
- core/drupalSettings
- core/jquery.once
- - core/jquery.cookie
drupal.tableheader:
version: VERSION
@@ -361,28 +364,23 @@ html5shiv:
jquery:
remote: https://github.com/jquery/jquery
- version: "3.4.1"
+ version: "3.5.1"
license:
name: MIT
- url: https://github.com/jquery/jquery/blob/3.4.1/LICENSE.txt
+ url: https://github.com/jquery/jquery/blob/3.5.1/LICENSE.txt
gpl-compatible: true
js:
assets/vendor/jquery/jquery.min.js: { minified: true, weight: -20 }
- # This includes a security fix, so assign a weight that makes this load as
- # soon after jquery.min.js is loaded as possible.
- assets/vendor/jquery/jquery-htmlprefilter-3.5.0.js: { weight: -19 }
jquery.cookie:
- remote: https://github.com/carhartl/jquery-cookie
- version: "v1.4.1"
- license:
- name: MIT
- url: https://github.com/carhartl/jquery-cookie/blob/v1.4.1/MIT-LICENSE.txt
- gpl-compatible: true
+ version: VERSION
js:
- assets/vendor/jquery.cookie/jquery.cookie.min.js: { minified: true }
+ misc/jquery.cookie.shim.js: {}
dependencies:
- core/jquery
+ - core/drupal
+ - core/js-cookie
+ - core/drupal.object.assign
jquery.farbtastic:
remote: https://github.com/mattfarina/farbtastic
@@ -428,14 +426,13 @@ jquery.joyride:
assets/vendor/jquery-joyride/jquery.joyride-2.1.js: { }
dependencies:
- core/jquery
- - core/jquery.cookie
jquery.once:
remote: https://github.com/RobLoach/jquery-once
- version: "2.2.0"
+ version: "2.2.3"
license:
name: GNU-GPL-2.0-or-later
- url: https://raw.githubusercontent.com/RobLoach/jquery-once/2.2.0/LICENSE.md
+ url: https://github.com/RobLoach/jquery-once/blob/2.2.3/LICENSE.md
gpl-compatible: true
js:
assets/vendor/jquery-once/jquery.once.min.js: { weight: -19, minified: true }
@@ -960,10 +957,10 @@ normalize:
picturefill:
remote: https://github.com/scottjehl/picturefill
- version: "3.0.1"
+ version: "3.0.3"
license:
name: MIT
- url: https://github.com/scottjehl/picturefill/blob/3.0.1/LICENSE
+ url: https://github.com/scottjehl/picturefill/blob/3.0.3/LICENSE
gpl-compatible: true
js:
assets/vendor/picturefill/picturefill.min.js: { weight: -10, minified: true }
@@ -971,30 +968,30 @@ picturefill:
- core/matchmedia
popperjs:
- version: "1.15.0"
+ version: "1.16.0"
license:
name: MIT
- url: https://github.com/FezVrasta/popper.js/blob/v1.15.0/LICENSE.md
+ url: https://github.com/popperjs/popper.js/blob/v1.16.0/LICENSE.md
gpl-compatible: true
js:
assets/vendor/popperjs/popper.min.js: { minified: true }
sortable:
remote: https://github.com/SortableJS/Sortable
- version: "1.10.0"
+ version: "1.10.2"
license:
name: MIT
- url: https://github.com/SortableJS/Sortable/tree/master#mit-license
+ url: https://github.com/SortableJS/Sortable/tree/1.10.2#mit-license
gpl-compatible: true
js:
assets/vendor/sortable/Sortable.min.js: { minified: true }
underscore:
remote: https://github.com/jashkenas/underscore
- version: "1.8.3"
+ version: "1.9.1"
license:
name: MIT
- url: https://github.com/jashkenas/underscore/blob/1.8.3/LICENSE
+ url: https://github.com/jashkenas/underscore/blob/1.9.1/LICENSE
gpl-compatible: true
js:
assets/vendor/underscore/underscore-min.js: { weight: -20, minified: true }
@@ -1027,3 +1024,13 @@ drupal.dialog.off_canvas:
- core/drupal.announce
- core/drupal.dialog
- core/drupal.dialog.ajax
+
+js-cookie:
+ remote: https://github.com/js-cookie/js-cookie
+ version: "v3.0.0-rc0"
+ license:
+ name: MIT
+ url: https://github.com/js-cookie/js-cookie/blob/v3.0.0-rc.0/LICENSE
+ gpl-compatible: true
+ js:
+ assets/vendor/js-cookie/js.cookie.min.js: {}
diff --git a/web/core/core.services.yml b/web/core/core.services.yml
index 98c0aac61a..064a13ad14 100644
--- a/web/core/core.services.yml
+++ b/web/core/core.services.yml
@@ -49,6 +49,11 @@ services:
arguments: ['@request_stack']
tags:
- { name: cache.context }
+ cache_context.protocol_version:
+ class: Drupal\Core\Cache\Context\ProtocolVersionCacheContext
+ arguments: ['@request_stack']
+ tags:
+ - { name: cache.context }
cache_context.headers:
class: Drupal\Core\Cache\Context\HeadersCacheContext
arguments: ['@request_stack']
@@ -547,12 +552,18 @@ services:
- { name: module_install.uninstall_validator }
arguments: ['@string_translation', '@extension.list.module']
lazy: true
+ module_required_by_themes_uninstall_validator:
+ class: Drupal\Core\Extension\ModuleRequiredByThemesUninstallValidator
+ tags:
+ - { name: module_install.uninstall_validator }
+ arguments: ['@string_translation', '@extension.list.module', '@extension.list.theme']
+ lazy: true
theme_handler:
class: Drupal\Core\Extension\ThemeHandler
arguments: ['@app.root', '@config.factory', '@extension.list.theme']
theme_installer:
class: Drupal\Core\Extension\ThemeInstaller
- arguments: ['@theme_handler', '@config.factory', '@config.installer', '@module_handler', '@config.manager', '@asset.css.collection_optimizer', '@router.builder', '@logger.channel.default', '@state']
+ arguments: ['@theme_handler', '@config.factory', '@config.installer', '@module_handler', '@config.manager', '@asset.css.collection_optimizer', '@router.builder', '@logger.channel.default', '@state', '@extension.list.module']
# @deprecated in Drupal 8.0.x and will be removed before 9.0.0. Use the other
# entity* services instead.
entity.manager:
@@ -1171,6 +1182,10 @@ services:
class: Drupal\Core\Entity\EntityAccessCheck
tags:
- { name: access_check, applies_to: _entity_access }
+ access_check.entity_bundles:
+ class: Drupal\Core\Entity\EntityBundleAccessCheck
+ tags:
+ - { name: access_check, applies_to: _entity_bundles }
access_check.entity_create:
class: Drupal\Core\Entity\EntityCreateAccessCheck
arguments: ['@entity_type.manager']
@@ -1431,78 +1446,78 @@ services:
class: Drupal\Component\Bridge\ZfExtensionManagerSfContainer
calls:
- [setContainer, ['@service_container']]
- - [setStandalone, ['\Zend\Feed\Reader\StandaloneExtensionManager']]
+ - [setStandalone, ['\Laminas\Feed\Reader\StandaloneExtensionManager']]
arguments: ['feed.reader.']
feed.bridge.writer:
class: Drupal\Component\Bridge\ZfExtensionManagerSfContainer
calls:
- [setContainer, ['@service_container']]
- - [setStandalone, ['\Zend\Feed\Writer\StandaloneExtensionManager']]
+ - [setStandalone, ['\Laminas\Feed\Writer\StandaloneExtensionManager']]
arguments: ['feed.writer.']
-# Zend Feed reader plugins. Plugin instances should not be shared.
+# Laminas Feed reader plugins. Plugin instances should not be shared.
feed.reader.dublincoreentry:
- class: Zend\Feed\Reader\Extension\DublinCore\Entry
+ class: Laminas\Feed\Reader\Extension\DublinCore\Entry
shared: false
feed.reader.dublincorefeed:
- class: Zend\Feed\Reader\Extension\DublinCore\Feed
+ class: Laminas\Feed\Reader\Extension\DublinCore\Feed
shared: false
feed.reader.contententry:
- class: Zend\Feed\Reader\Extension\Content\Entry
+ class: Laminas\Feed\Reader\Extension\Content\Entry
shared: false
feed.reader.atomentry:
- class: Zend\Feed\Reader\Extension\Atom\Entry
+ class: Laminas\Feed\Reader\Extension\Atom\Entry
shared: false
feed.reader.atomfeed:
- class: Zend\Feed\Reader\Extension\Atom\Feed
+ class: Laminas\Feed\Reader\Extension\Atom\Feed
shared: false
feed.reader.slashentry:
- class: Zend\Feed\Reader\Extension\Slash\Entry
+ class: Laminas\Feed\Reader\Extension\Slash\Entry
shared: false
feed.reader.wellformedwebentry:
- class: Zend\Feed\Reader\Extension\WellFormedWeb\Entry
+ class: Laminas\Feed\Reader\Extension\WellFormedWeb\Entry
shared: false
feed.reader.threadentry:
- class: Zend\Feed\Reader\Extension\Thread\Entry
+ class: Laminas\Feed\Reader\Extension\Thread\Entry
shared: false
feed.reader.podcastentry:
- class: Zend\Feed\Reader\Extension\Podcast\Entry
+ class: Laminas\Feed\Reader\Extension\Podcast\Entry
shared: false
feed.reader.podcastfeed:
- class: Zend\Feed\Reader\Extension\Podcast\Feed
+ class: Laminas\Feed\Reader\Extension\Podcast\Feed
shared: false
-# Zend Feed writer plugins. Plugins should be set as prototype scope.
+# Laminas Feed writer plugins. Plugins should be set as prototype scope.
feed.writer.atomrendererfeed:
- class: Zend\Feed\Writer\Extension\Atom\Renderer\Feed
+ class: Laminas\Feed\Writer\Extension\Atom\Renderer\Feed
shared: false
feed.writer.contentrendererentry:
- class: Zend\Feed\Writer\Extension\Content\Renderer\Entry
+ class: Laminas\Feed\Writer\Extension\Content\Renderer\Entry
shared: false
feed.writer.dublincorerendererentry:
- class: Zend\Feed\Writer\Extension\DublinCore\Renderer\Entry
+ class: Laminas\Feed\Writer\Extension\DublinCore\Renderer\Entry
shared: false
feed.writer.dublincorerendererfeed:
- class: Zend\Feed\Writer\Extension\DublinCore\Renderer\Feed
+ class: Laminas\Feed\Writer\Extension\DublinCore\Renderer\Feed
shared: false
feed.writer.itunesentry:
- class: Zend\Feed\Writer\Extension\ITunes\Entry
+ class: Laminas\Feed\Writer\Extension\ITunes\Entry
shared: false
feed.writer.itunesfeed:
- class: Zend\Feed\Writer\Extension\ITunes\Feed
+ class: Laminas\Feed\Writer\Extension\ITunes\Feed
shared: false
feed.writer.itunesrendererentry:
- class: Zend\Feed\Writer\Extension\ITunes\Renderer\Entry
+ class: Laminas\Feed\Writer\Extension\ITunes\Renderer\Entry
shared: false
feed.writer.itunesrendererfeed:
- class: Zend\Feed\Writer\Extension\ITunes\Renderer\Feed
+ class: Laminas\Feed\Writer\Extension\ITunes\Renderer\Feed
shared: false
feed.writer.slashrendererentry:
- class: Zend\Feed\Writer\Extension\Slash\Renderer\Entry
+ class: Laminas\Feed\Writer\Extension\Slash\Renderer\Entry
shared: false
feed.writer.threadingrendererentry:
- class: Zend\Feed\Writer\Extension\Threading\Renderer\Entry
+ class: Laminas\Feed\Writer\Extension\Threading\Renderer\Entry
shared: false
feed.writer.wellformedwebrendererentry:
- class: Zend\Feed\Writer\Extension\WellFormedWeb\Renderer\Entry
+ class: Laminas\Feed\Writer\Extension\WellFormedWeb\Renderer\Entry
shared: false
theme.manager:
class: Drupal\Core\Theme\ThemeManager
@@ -1546,6 +1561,8 @@ services:
session:
class: Symfony\Component\HttpFoundation\Session\Session
arguments: ['@session_manager', '@session.attribute_bag', '@session.flash_bag']
+ tags:
+ - { name: service_collector, tag: session_bag, call: registerBag }
session.flash_bag:
class: Symfony\Component\HttpFoundation\Session\Flash\FlashBag
public: false
@@ -1609,7 +1626,10 @@ services:
- { name: needs_destruction }
library.discovery.parser:
class: Drupal\Core\Asset\LibraryDiscoveryParser
- arguments: ['@app.root', '@module_handler', '@theme.manager', '@stream_wrapper_manager']
+ arguments: ['@app.root', '@module_handler', '@theme.manager', '@stream_wrapper_manager', '@library.libraries_directory_file_finder']
+ library.libraries_directory_file_finder:
+ class: Drupal\Core\Asset\LibrariesDirectoryFileFinder
+ arguments: ['@app.root', '@site.path', '@extension.list.profile', '%install_profile%']
library.dependency_resolver:
class: Drupal\Core\Asset\LibraryDependencyResolver
arguments: ['@library.discovery']
diff --git a/web/core/drupalci.yml b/web/core/drupalci.yml
index 6c388ae328..8cc5f1d488 100644
--- a/web/core/drupalci.yml
+++ b/web/core/drupalci.yml
@@ -35,6 +35,8 @@ build:
suppress-deprecations: false
halt-on-fail: false
run_tests.build:
+ # Limit concurrency due to disk space concerns.
+ concurrency: 15
types: 'PHPUnit-Build'
testgroups: '--all'
suppress-deprecations: false
diff --git a/web/core/includes/bootstrap.inc b/web/core/includes/bootstrap.inc
index 73b947f13e..d2a0313a49 100644
--- a/web/core/includes/bootstrap.inc
+++ b/web/core/includes/bootstrap.inc
@@ -60,7 +60,7 @@
* @todo Move this to an appropriate autoloadable class. See
* https://www.drupal.org/project/drupal/issues/2908079
*/
-const DRUPAL_RECOMMENDED_PHP = '7.2';
+const DRUPAL_RECOMMENDED_PHP = '7.3';
/**
* Minimum recommended value of PHP memory_limit.
diff --git a/web/core/includes/common.inc b/web/core/includes/common.inc
index 7e3738da28..5442481d38 100644
--- a/web/core/includes/common.inc
+++ b/web/core/includes/common.inc
@@ -1205,7 +1205,7 @@ function archiver_get_archiver($file) {
// Archivers can only work on local paths
$filepath = \Drupal::service('file_system')->realpath($file);
if (!is_file($filepath)) {
- throw new Exception(t('Archivers can only operate on local files: %file not supported', ['%file' => $file]));
+ throw new Exception("Archivers can only operate on local files: '$file' not supported");
}
return \Drupal::service('plugin.manager.archiver')->getInstance(['filepath' => $filepath]);
}
diff --git a/web/core/includes/install.core.inc b/web/core/includes/install.core.inc
index cfab412904..b4ec568004 100644
--- a/web/core/includes/install.core.inc
+++ b/web/core/includes/install.core.inc
@@ -20,6 +20,7 @@
use Drupal\Core\Installer\Exception\AlreadyInstalledException;
use Drupal\Core\Installer\Exception\InstallerException;
use Drupal\Core\Installer\Exception\NoProfilesException;
+use Drupal\Core\Installer\Form\SiteSettingsForm;
use Drupal\Core\Installer\InstallerKernel;
use Drupal\Core\Language\Language;
use Drupal\Core\Language\LanguageManager;
@@ -203,8 +204,6 @@ function install_state_defaults() {
'config_verified' => FALSE,
// TRUE when there is a valid database connection.
'database_verified' => FALSE,
- // TRUE if database is empty & ready to install.
- 'database_ready' => FALSE,
// TRUE when a valid settings.php exists (containing both database
// connection information and config directory names).
'settings_verified' => FALSE,
@@ -375,6 +374,11 @@ function install_begin_request($class_loader, &$install_state) {
->addArgument(Settings::getInstance())
->addArgument((new LoggerChannelFactory())->get('file'));
+ // Register the class loader so contrib and custom database drivers can be
+ // autoloaded.
+ // @see drupal_get_database_types()
+ $container->set('class_loader', $class_loader);
+
\Drupal::setContainer($container);
// Determine whether base system services are ready to operate.
@@ -390,13 +394,6 @@ function install_begin_request($class_loader, &$install_state) {
// settings like config_directories will be checked by system_requirements().
$install_state['settings_verified'] = $install_state['database_verified'] && (bool) Settings::get('hash_salt', FALSE);
- // Install factory tables only after checking the database.
- if ($install_state['database_verified'] && $install_state['database_ready']) {
- $container
- ->register('path.matcher', 'Drupal\Core\Path\PathMatcher')
- ->addArgument(new Reference('config.factory'));
- }
-
if ($install_state['settings_verified']) {
try {
$system_schema = system_schema();
@@ -517,18 +514,14 @@ function install_begin_request($class_loader, &$install_state) {
// accessing the database before it is set up yet.)
drupal_maintenance_theme();
- if ($install_state['database_verified']) {
- // Verify the last completed task in the database, if there is one.
- $task = install_verify_completed_task();
- }
- else {
- $task = NULL;
-
- // Do not install over a configured settings.php.
- if (Database::getConnectionInfo()) {
- throw new AlreadyInstalledException($container->get('string_translation'));
- }
+ if (!$install_state['database_verified']) {
+ // Do not install over an existing installation. The call to
+ // install_verify_database_ready() will throw an AlreadyInstalledException
+ // if this is the case.
+ install_verify_database_ready();
}
+ // Verify the last completed task in the database, if there is one.
+ $task = install_verify_completed_task();
// Ensure that the active configuration is empty before installation starts.
if ($install_state['config_verified'] && empty($task)) {
@@ -797,7 +790,7 @@ function install_tasks($install_state) {
],
'install_write_profile' => [],
'install_verify_database_ready' => [
- 'run' => $install_state['database_ready'] ? INSTALL_TASK_SKIP : INSTALL_TASK_RUN_IF_NOT_COMPLETED,
+ 'run' => INSTALL_TASK_RUN_IF_NOT_COMPLETED,
],
'install_base_system' => [
'run' => $install_state['base_system_verified'] ? INSTALL_TASK_SKIP : INSTALL_TASK_RUN_IF_NOT_COMPLETED,
@@ -1171,17 +1164,29 @@ function install_verify_database_settings($site_path) {
/**
* Verify that the database is ready (no existing Drupal installation).
+ *
+ * @throws \Drupal\Core\Installer\Exception\AlreadyInstalledException
+ * Thrown when the database already has a table that would be created by
+ * installing the System module.
*/
function install_verify_database_ready() {
$system_schema = system_schema();
end($system_schema);
$table = key($system_schema);
+ $existing_install = FALSE;
if ($database = Database::getConnectionInfo()) {
- if (Database::getConnection()->schema()->tableExists($table)) {
- throw new AlreadyInstalledException(\Drupal::service('string_translation'));
+ try {
+ $existing_install = Database::getConnection()->schema()->tableExists($table);
+ }
+ // Do not trigger an error if the database query fails, since the database
+ // might not be set up yet.
+ catch (\Exception $e) {
}
}
+ if ($existing_install) {
+ throw new AlreadyInstalledException(\Drupal::service('string_translation'));
+ }
}
/**
@@ -1207,7 +1212,7 @@ function install_database_errors($database, $settings_file) {
// calling function.
Database::addConnectionInfo('default', 'default', $database);
- $errors = db_installer_object($driver)->runTasks();
+ $errors = db_installer_object($driver, $database['namespace'] ?? NULL)->runTasks();
}
return $errors;
}
@@ -1238,7 +1243,7 @@ function install_select_profile(&$install_state) {
else {
// The non-interactive installer requires a profile parameter.
if (!$install_state['interactive']) {
- throw new InstallerException(t('Missing profile parameter.'));
+ throw new InstallerException('Missing profile parameter.');
}
// Otherwise, display a form to select a profile.
return install_get_form('Drupal\Core\Installer\Form\SelectProfileForm', $install_state);
@@ -1383,7 +1388,7 @@ function install_select_language(&$install_state) {
return;
}
else {
- throw new InstallerException(t('You must select a language to continue the installation.'));
+ throw new InstallerException('You must select a language to continue the installation.');
}
}
}
@@ -2099,7 +2104,7 @@ function install_check_requirements($install_state) {
'title' => $default_file_info['title_default'],
'value' => $default_file_info['description_default'],
'severity' => REQUIREMENT_ERROR,
- 'description' => t('The @drupal installer requires that the %default-file file not be modified in any way from the original download.', [
+ 'description' => t('The @drupal installer requires that the %default-file file must not be deleted or modified from the original download.', [
'@drupal' => drupal_install_profile_distribution_name(),
'%default-file' => $default_file,
]),
@@ -2218,6 +2223,25 @@ function install_check_requirements($install_state) {
];
}
}
+
+ // Check the database settings if they have been configured in settings.php
+ // before running the Drupal installer.
+ if ($database = Database::getConnectionInfo()) {
+ $request = Request::createFromGlobals();
+ $site_path = empty($install_state['site_path']) ? DrupalKernel::findSitePath($request, FALSE) : $install_state['site_path'];
+ $database = $database['default'];
+ $settings_file = './' . $site_path . '/settings.php';
+
+ $errors = install_database_errors($database, $settings_file);
+ if (count($errors)) {
+ $error_message = SiteSettingsForm::getDatabaseErrorsTemplate($errors);
+ $requirements['database_install_errors'] = [
+ 'title' => t('Database settings'),
+ 'description' => $error_message,
+ 'severity' => REQUIREMENT_ERROR,
+ ];
+ }
+ }
}
return $requirements;
}
diff --git a/web/core/includes/install.inc b/web/core/includes/install.inc
index 2c5d4167cd..ce0f94fc58 100644
--- a/web/core/includes/install.inc
+++ b/web/core/includes/install.inc
@@ -171,6 +171,8 @@ function drupal_get_database_types() {
// The internal database driver name is any valid PHP identifier.
$mask = ExtensionDiscovery::PHP_FUNCTION_PATTERN;
+
+ // Find drivers in the Drupal\Core and Drupal\Driver namespaces.
/** @var \Drupal\Core\File\FileSystemInterface $file_system */
$file_system = \Drupal::service('file_system');
$files = $file_system->scanDirectory(DRUPAL_ROOT . '/core/lib/Drupal/Core/Database/Driver', $mask, ['recurse' => FALSE]);
@@ -179,11 +181,43 @@ function drupal_get_database_types() {
}
foreach ($files as $file) {
if (file_exists($file->uri . '/Install/Tasks.php')) {
- $drivers[$file->filename] = $file->uri;
+ // The namespace doesn't need to be added here, because
+ // db_installer_object() will find it.
+ $drivers[$file->filename] = NULL;
+ }
+ }
+
+ // Find drivers in Drupal module namespaces.
+ /** @var \Composer\Autoload\ClassLoader $class_loader */
+ $class_loader = \Drupal::service('class_loader');
+ // We cannot use the file cache because it does not always exist.
+ $extension_discovery = new ExtensionDiscovery(DRUPAL_ROOT, FALSE, []);
+ $modules = $extension_discovery->scan('module');
+ foreach ($modules as $module) {
+ $module_driver_path = DRUPAL_ROOT . '/' . $module->getPath() . '/src/Driver/Database';
+ if (is_dir($module_driver_path)) {
+ $driver_files = $file_system->scanDirectory($module_driver_path, $mask, ['recurse' => FALSE]);
+ foreach ($driver_files as $driver_file) {
+ $tasks_file = $module_driver_path . '/' . $driver_file->filename . '/Install/Tasks.php';
+ if (file_exists($tasks_file)) {
+ $namespace = 'Drupal\\' . $module->getName() . '\\Driver\\Database\\' . $driver_file->filename;
+
+ // The namespace needs to be added for db_installer_object() to find
+ // it.
+ $drivers[$driver_file->filename] = $namespace;
+
+ // The directory needs to be added to the autoloader, because this is
+ // early in the installation process: the module hasn't been enabled
+ // yet and the database connection info array (including its 'autoload'
+ // key) hasn't been created yet.
+ $class_loader->addPsr4($namespace . '\\', $module->getPath() . '/src/Driver/Database/' . $driver_file->filename);
+ }
+ }
}
}
- foreach ($drivers as $driver => $file) {
- $installer = db_installer_object($driver);
+
+ foreach ($drivers as $driver => $namespace) {
+ $installer = db_installer_object($driver, $namespace);
if ($installer->installable()) {
$databases[$driver] = $installer;
}
@@ -269,6 +303,7 @@ function drupal_rewrite_settings($settings = [], $settings_file = NULL) {
$state = 'candidate_left';
}
break;
+
case 'candidate_left':
if ($value == '[') {
$state = 'array_index';
@@ -277,6 +312,7 @@ function drupal_rewrite_settings($settings = [], $settings_file = NULL) {
$state = 'candidate_right';
}
break;
+
case 'array_index':
if (_drupal_rewrite_settings_is_array_index($type, $value)) {
$index = trim($value, '\'"');
@@ -287,6 +323,7 @@ function drupal_rewrite_settings($settings = [], $settings_file = NULL) {
throw new Exception('invalid array index');
}
break;
+
case 'right_bracket':
if ($value == ']') {
if (isset($current[$index])) {
@@ -305,6 +342,7 @@ function drupal_rewrite_settings($settings = [], $settings_file = NULL) {
throw new Exception('] expected');
}
break;
+
case 'candidate_right':
if (_drupal_rewrite_settings_is_simple($type, $value)) {
$value = _drupal_rewrite_settings_dump_one($current);
@@ -317,11 +355,13 @@ function drupal_rewrite_settings($settings = [], $settings_file = NULL) {
$state = 'wait_for_semicolon';
}
break;
+
case 'wait_for_semicolon':
if ($value == ';') {
$state = 'default';
}
break;
+
case 'semicolon_skip':
if ($value == ';') {
$value = '';
@@ -343,7 +383,7 @@ function drupal_rewrite_settings($settings = [], $settings_file = NULL) {
// Write the new settings file.
if (file_put_contents($settings_file, $buffer) === FALSE) {
- throw new Exception(t('Failed to modify %settings. Verify the file permissions.', ['%settings' => $settings_file]));
+ throw new Exception("Failed to modify '$settings_file'. Verify the file permissions.");
}
else {
// In case any $settings variables were written, import them into the
@@ -360,7 +400,7 @@ function drupal_rewrite_settings($settings = [], $settings_file = NULL) {
}
}
else {
- throw new Exception(t('Failed to open %settings. Verify the file permissions.', ['%settings' => $settings_file]));
+ throw new Exception("Failed to open '$settings_file'. Verify the file permissions.");
}
}
@@ -521,10 +561,7 @@ function drupal_install_config_directories() {
// Bail out using a similar error message as in system_requirements().
if (!\Drupal::service('file_system')->prepareDirectory($config_directories[CONFIG_SYNC_DIRECTORY], FileSystemInterface::CREATE_DIRECTORY)
&& !file_exists($config_directories[CONFIG_SYNC_DIRECTORY])) {
- throw new Exception(t('The directory %directory could not be created. To proceed with the installation, either create the directory or ensure that the installer has the permissions to create it automatically. For more information, see the <a href=":handbook_url">online handbook</a>.', [
- '%directory' => config_get_config_directory(CONFIG_SYNC_DIRECTORY),
- ':handbook_url' => 'https://www.drupal.org/server-permissions',
- ]));
+ throw new Exception("The directory '" . config_get_config_directory(CONFIG_SYNC_DIRECTORY) . "' could not be created. To proceed with the installation, either create the directory or ensure that the installer has the permissions to create it automatically. For more information, see the <a href='https://www.drupal.org/server-permissions'>online handbook</a>.");
}
elseif (is_writable($config_directories[CONFIG_SYNC_DIRECTORY])) {
// Put a README.txt into the sync config directory. This is required so that
@@ -723,31 +760,37 @@ function drupal_verify_install_file($file, $mask = NULL, $type = 'file', $autofi
}
}
break;
+
case FILE_READABLE:
if (!is_readable($file)) {
$return = FALSE;
}
break;
+
case FILE_WRITABLE:
if (!is_writable($file)) {
$return = FALSE;
}
break;
+
case FILE_EXECUTABLE:
if (!is_executable($file)) {
$return = FALSE;
}
break;
+
case FILE_NOT_READABLE:
if (is_readable($file)) {
$return = FALSE;
}
break;
+
case FILE_NOT_WRITABLE:
if (is_writable($file)) {
$return = FALSE;
}
break;
+
case FILE_NOT_EXECUTABLE:
if (is_executable($file)) {
$return = FALSE;
@@ -785,9 +828,11 @@ function drupal_install_mkdir($file, $mask, $message = TRUE) {
case FILE_READABLE:
$mod |= 0444;
break;
+
case FILE_WRITABLE:
$mod |= 0222;
break;
+
case FILE_EXECUTABLE:
$mod |= 0111;
break;
@@ -846,26 +891,31 @@ function drupal_install_fix_file($file, $mask, $message = TRUE) {
$mod |= 0444;
}
break;
+
case FILE_WRITABLE:
if (!is_writable($file)) {
$mod |= 0222;
}
break;
+
case FILE_EXECUTABLE:
if (!is_executable($file)) {
$mod |= 0111;
}
break;
+
case FILE_NOT_READABLE:
if (is_readable($file)) {
$mod &= ~0444;
}
break;
+
case FILE_NOT_WRITABLE:
if (is_writable($file)) {
$mod &= ~0222;
}
break;
+
case FILE_NOT_EXECUTABLE:
if (is_executable($file)) {
$mod &= ~0111;
@@ -1169,21 +1219,36 @@ function install_profile_info($profile, $langcode = 'en') {
/**
* Returns a database installer object.
*
+ * Before calling this function it is important the database installer object
+ * is autoloadable. Database drivers provided by contributed modules are added
+ * to the autoloader in drupal_get_database_types() and Settings::initialize().
+ *
* @param $driver
* The name of the driver.
+ * @param string $namespace
+ * (optional) The database driver namespace.
*
* @return \Drupal\Core\Database\Install\Tasks
* A class defining the requirements and tasks for installing the database.
+ *
+ * @see drupal_get_database_types()
+ * @see \Drupal\Core\Site\Settings::initialize()
*/
-function db_installer_object($driver) {
+function db_installer_object($driver, $namespace = NULL) {
// We cannot use Database::getConnection->getDriverClass() here, because
// the connection object is not yet functional.
- $task_class = "Drupal\\Core\\Database\\Driver\\{$driver}\\Install\\Tasks";
+ if ($namespace) {
+ $task_class = $namespace . "\\Install\\Tasks";
+ return new $task_class();
+ }
+ // Old Drupal 8 style contrib namespace.
+ $task_class = "Drupal\\Driver\\Database\\{$driver}\\Install\\Tasks";
if (class_exists($task_class)) {
return new $task_class();
}
else {
- $task_class = "Drupal\\Driver\\Database\\{$driver}\\Install\\Tasks";
+ // Core provided driver.
+ $task_class = "Drupal\\Core\\Database\\Driver\\{$driver}\\Install\\Tasks";
return new $task_class();
}
}
diff --git a/web/core/includes/schema.inc b/web/core/includes/schema.inc
index 99576b0d2b..5c024a89d8 100644
--- a/web/core/includes/schema.inc
+++ b/web/core/includes/schema.inc
@@ -83,10 +83,9 @@ function drupal_get_installed_schema_version($module, $reset = FALSE, $array = F
}
if (!$versions) {
- $versions = \Drupal::keyValue('system.schema')->getAll();
- $enabled_modules = \Drupal::moduleHandler()->getModuleList();
- $enabled_modules = array_fill_keys(array_keys($enabled_modules), \Drupal::CORE_MINIMUM_SCHEMA_VERSION);
- $versions = array_merge($enabled_modules, $versions);
+ if (!$versions = \Drupal::keyValue('system.schema')->getAll()) {
+ $versions = [];
+ }
}
if ($array) {
diff --git a/web/core/includes/update.inc b/web/core/includes/update.inc
index 1b0899f1b3..730e028f78 100644
--- a/web/core/includes/update.inc
+++ b/web/core/includes/update.inc
@@ -9,18 +9,19 @@
*/
use Drupal\Component\Graph\Graph;
+use Drupal\Core\Extension\Exception\UnknownExtensionException;
use Drupal\Core\Update\UpdateKernel;
use Drupal\Core\Utility\Error;
/**
* Disables any extensions that are incompatible with the current core version.
*
- * @deprecated in Drupal 8.8.4 and is removed from Drupal 9.0.0.
+ * @deprecated in Drupal 8.8.5 and is removed from Drupal 9.0.0.
*
* @see https://www.drupal.org/node/3026100
*/
function update_fix_compatibility() {
- @trigger_error(__FUNCTION__ . '() is deprecated in Drupal 8.8.4 and will be removed before Drupal 9.0.0. There is no replacement. See https://www.drupal.org/node/3026100', E_USER_DEPRECATED);
+ @trigger_error(__FUNCTION__ . '() is deprecated in Drupal 8.8.5 and will be removed before Drupal 9.0.0. There is no replacement. See https://www.drupal.org/node/3026100', E_USER_DEPRECATED);
// Fix extension objects if the update is being done via Drush 8. In non-Drush
// environments this will already be fixed by the UpdateKernel this point.
UpdateKernel::fixSerializedExtensionObjects(\Drupal::getContainer());
@@ -103,12 +104,69 @@ function update_system_schema_requirements() {
* Checks update requirements and reports errors and (optionally) warnings.
*/
function update_check_requirements() {
+ // Because this is one of the earliest points in the update process,
+ // detect and fix missing schema versions for modules here to ensure
+ // it runs on all update code paths.
+ _update_fix_missing_schema();
+
// Check requirements of all loaded modules.
$requirements = \Drupal::moduleHandler()->invokeAll('requirements', ['update']);
$requirements += update_system_schema_requirements();
return $requirements;
}
+/**
+ * Helper to detect and fix 'missing' schema information.
+ *
+ * Repairs the case where a module has no schema version recorded.
+ * This has to be done prior to updates being run, otherwise the update
+ * system would detect and attempt to run all historical updates for a
+ * module.
+ *
+ * @todo: remove in a major version after
+ * https://www.drupal.org/project/drupal/issues/3130037 has been fixed.
+ */
+function _update_fix_missing_schema() {
+ $versions = \Drupal::keyValue('system.schema')->getAll();
+ $module_handler = \Drupal::moduleHandler();
+ $enabled_modules = $module_handler->getModuleList();
+
+ foreach (array_keys($enabled_modules) as $module) {
+ // All modules should have a recorded schema version, but when they
+ // don't, detect and fix the problem.
+ if (!isset($versions[$module])) {
+ // Ensure the .install file is loaded.
+ module_load_install($module);
+ $all_updates = drupal_get_schema_versions($module);
+ // If the schema version of a module hasn't been recorded, we cannot
+ // know the actual schema version a module is at, because
+ // no updates will ever have been run on the site and it was not set
+ // correctly when the module was installed, so instead set it to
+ // the same as the last update. This means that updates will proceed
+ // again the next time the module is updated and a new update is
+ // added. Updates added in between the module being installed and the
+ // schema version being fixed here (if any have been added) will never
+ // be run, but we have no way to identify which updates these are.
+ if ($all_updates) {
+ $last_update = max($all_updates);
+ }
+ else {
+ $last_update = \Drupal::CORE_MINIMUM_SCHEMA_VERSION;
+ }
+ // If the module implements hook_update_last_removed() use the
+ // value of that if it's higher than the schema versions found so
+ // far.
+ if ($last_removed = $module_handler->invoke($module, 'update_last_removed')) {
+ $last_update = max($last_update, $last_removed);
+ }
+ drupal_set_installed_schema_version($module, $last_update);
+ $args = ['%module' => $module, '%last_update_hook' => $module . '_update_' . $last_update . '()'];
+ \Drupal::messenger()->addWarning(t('Schema information for module %module was missing from the database. You should manually review the module updates and your database to check if any updates have been skipped up to, and including, %last_update_hook.', $args));
+ \Drupal::logger('update')->warning('Schema information for module %module was missing from the database. You should manually review the module updates and your database to check if any updates have been skipped up to, and including, %last_update_hook.', $args);
+ }
+ }
+}
+
/**
* Forces a module to a given schema version.
*
@@ -147,7 +205,7 @@ function update_set_schema($module, $schema_version) {
* example:
* @code
* use Drupal\Core\Utility\UpdateException;
- * throw new UpdateException(t('Description of what went wrong'));
+ * throw new UpdateException('Description of what went wrong');
* @endcode
*
* If an exception is thrown, the current update and all updates that depend on
@@ -313,11 +371,38 @@ function update_get_update_list() {
$modules = drupal_get_installed_schema_version(NULL, FALSE, TRUE);
/** @var \Drupal\Core\Extension\ExtensionList $extension_list */
$extension_list = \Drupal::service('extension.list.module');
+ /** @var array $installed_module_info */
+ $installed_module_info = $extension_list->getAllInstalledInfo();
foreach ($modules as $module => $schema_version) {
// Skip uninstalled and incompatible modules.
- if ($schema_version == SCHEMA_UNINSTALLED || $extension_list->checkIncompatibility($module)) {
+ try {
+ if ($schema_version == SCHEMA_UNINSTALLED || $extension_list->checkIncompatibility($module)) {
+ continue;
+ }
+ }
+ // It is possible that the system schema has orphaned entries, so the
+ // incompatibility checking might throw an exception.
+ catch (UnknownExtensionException $e) {
+ $args = [
+ '%name' => $module,
+ ':url' => 'https://www.drupal.org/node/3137656',
+ ];
+ \Drupal::messenger()->addWarning(t('Module %name has an entry in the system.schema key/value storage, but is missing from your site. <a href=":url">More information about this error</a>.', $args));
+ \Drupal::logger('system')->notice('Module %name has an entry in the system.schema key/value storage, but is missing from your site. <a href=":url">More information about this error</a>.', $args);
+ continue;
+ }
+ // There might be orphaned entries for modules that are in the filesystem
+ // but not installed. Also skip those, but warn site admins about it.
+ if (empty($installed_module_info[$module])) {
+ $args = [
+ '%name' => $module,
+ ':url' => 'https://www.drupal.org/node/3137656',
+ ];
+ \Drupal::messenger()->addWarning(t('Module %name has an entry in the system.schema key/value storage, but is not installed. <a href=":url">More information about this error</a>.', $args));
+ \Drupal::logger('system')->notice('Module %name has an entry in the system.schema key/value storage, but is not installed. <a href=":url">More information about this error</a>.', $args);
continue;
}
+
// Display a requirements error if the user somehow has a schema version
// from the previous Drupal major version.
if ($schema_version < \Drupal::CORE_MINIMUM_SCHEMA_VERSION) {
@@ -327,14 +412,6 @@ function update_get_update_list() {
// Otherwise, get the list of updates defined by this module.
$updates = drupal_get_schema_versions($module);
if ($updates !== FALSE) {
- // \Drupal::moduleHandler()->invoke() returns NULL for non-existing hooks,
- // so if no updates are removed, it will == 0.
- $last_removed = \Drupal::moduleHandler()->invoke($module, 'update_last_removed');
- if ($schema_version < $last_removed) {
- $ret[$module]['warning'] = '<em>' . $module . '</em> module cannot be updated. Its schema version is ' . $schema_version . '. Updates up to and including ' . $last_removed . ' have been removed in this release. In order to update <em>' . $module . '</em> module, you will first <a href="https://www.drupal.org/upgrade">need to upgrade</a> to the last version in which these updates were available.';
- continue;
- }
-
foreach ($updates as $update) {
if ($update == \Drupal::CORE_MINIMUM_SCHEMA_VERSION) {
$ret[$module]['warning'] = '<em>' . $module . '</em> module cannot be updated. It contains an update numbered as ' . \Drupal::CORE_MINIMUM_SCHEMA_VERSION . ' which is reserved for the earliest installation of a module in Drupal ' . \Drupal::CORE_COMPATIBILITY . ', before any updates. In order to update <em>' . $module . '</em> module, you will need to install a version of the module with valid updates.';
@@ -612,10 +689,19 @@ function update_already_performed($module, $number) {
*/
function update_retrieve_dependencies() {
$return = [];
+ /** @var \Drupal\Core\Extension\ModuleExtensionList */
+ $extension_list = \Drupal::service('extension.list.module');
// Get a list of installed modules, arranged so that we invoke their hooks in
// the same order that \Drupal::moduleHandler()->invokeAll() does.
- foreach (drupal_get_installed_schema_version(NULL, FALSE, TRUE) as $module => $schema) {
- if ($schema == SCHEMA_UNINSTALLED) {
+ foreach (\Drupal::keyValue('system.schema')->getAll() as $module => $schema) {
+ // Skip modules that are entirely missing from the filesystem here, since
+ // module_load_install() will call trigger_error() if invoked on a module
+ // that doesn't exist. There's no way to catch() that, so avoid it entirely.
+ // This can happen when there are orphaned entries in the system.schema k/v
+ // store for modules that have been removed from a site without first being
+ // cleanly uninstalled. We don't care here if the module has been installed
+ // or not, since we'll filter those out in update_get_update_list().
+ if ($schema == SCHEMA_UNINSTALLED || !$extension_list->exists($module)) {
// Nothing to upgrade.
continue;
}
diff --git a/web/core/lib/Drupal.php b/web/core/lib/Drupal.php
index 6f3c675634..7cc2d0c450 100644
--- a/web/core/lib/Drupal.php
+++ b/web/core/lib/Drupal.php
@@ -82,7 +82,7 @@ class Drupal {
/**
* The current system version.
*/
- const VERSION = '8.8.6';
+ const VERSION = '8.9.0';
/**
* Core API compatibility.
diff --git a/web/core/lib/Drupal/Component/Bridge/ZfExtensionManagerSfContainer.php b/web/core/lib/Drupal/Component/Bridge/ZfExtensionManagerSfContainer.php
index 59ae9f5646..396e843907 100644
--- a/web/core/lib/Drupal/Component/Bridge/ZfExtensionManagerSfContainer.php
+++ b/web/core/lib/Drupal/Component/Bridge/ZfExtensionManagerSfContainer.php
@@ -5,26 +5,27 @@
use Symfony\Component\DependencyInjection\ContainerAwareInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
-use Zend\Feed\Reader\ExtensionManagerInterface as ReaderManagerInterface;
-use Zend\Feed\Writer\ExtensionManagerInterface as WriterManagerInterface;
+use Laminas\Feed\Reader\ExtensionManagerInterface as ReaderManagerInterface;
+use Laminas\Feed\Writer\ExtensionManagerInterface as WriterManagerInterface;
/**
- * Defines a bridge between the ZF2 service manager to Symfony container.
+ * Defines a bridge between the Laminas service manager to Symfony container.
*/
class ZfExtensionManagerSfContainer implements ReaderManagerInterface, WriterManagerInterface, ContainerAwareInterface {
/**
- * This property was based from Zend Framework (http://framework.zend.com/)
+ * A map of characters to be replaced through strtr.
*
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * This property is based on Laminas service manager.
*
- * A map of characters to be replaced through strtr.
+ * @link https://github.com/laminas/laminas-servicemanager for the canonical source repository
+ * @copyright Copyright (c) 2019, Laminas Foundation. (https://getlaminas.org/)
+ * @license https://github.com/laminas/laminas-servicemanager/blob/master/LICENSE.md
*
* @var array
*
* @see \Drupal\Component\Bridge\ZfExtensionManagerSfContainer::canonicalizeName().
+ * @see https://github.com/laminas/laminas-servicemanager/blob/2.7.11/src/ServiceManager.php#L114
*/
protected $canonicalNamesReplacements = ['-' => '', '_' => '', ' ' => '', '\\' => '', '/' => ''];
@@ -50,7 +51,7 @@ class ZfExtensionManagerSfContainer implements ReaderManagerInterface, WriterMan
protected $canonicalNames;
/**
- * @var \Zend\Feed\Reader\ExtensionManagerInterface|\Zend\Feed\Writer\ExtensionManagerInterface
+ * @var \Laminas\Feed\Reader\ExtensionManagerInterface|\Laminas\Feed\Writer\ExtensionManagerInterface
*/
protected $standalone;
@@ -90,19 +91,21 @@ public function has($extension) {
}
/**
- * This method was based from Zend Framework (http://framework.zend.com/)
+ * Canonicalize the extension name to a service name.
*
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * This method is based on Laminas service manager.
*
- * Canonicalize the extension name to a service name.
+ * @link https://github.com/laminas/laminas-servicemanager for the canonical source repository
+ * @copyright Copyright (c) 2019, Laminas Foundation. (https://getlaminas.org/)
+ * @license https://github.com/laminas/laminas-servicemanager/blob/master/LICENSE.md
*
* @param string $name
* The extension name.
*
* @return string
* The service name, without the prefix.
+ *
+ * @see https://github.com/laminas/laminas-servicemanager/blob/2.7.11/src/ServiceManager.php#L900
*/
protected function canonicalizeName($name) {
if (isset($this->canonicalNames[$name])) {
@@ -124,7 +127,7 @@ public function setContainer(ContainerInterface $container = NULL) {
*/
public function setStandalone($class) {
if (!is_subclass_of($class, ReaderManagerInterface::class) && !is_subclass_of($class, WriterManagerInterface::class)) {
- throw new \RuntimeException("$class must implement Zend\Feed\Reader\ExtensionManagerInterface or Zend\Feed\Writer\ExtensionManagerInterface");
+ throw new \RuntimeException("$class must implement Laminas\Feed\Reader\ExtensionManagerInterface or Laminas\Feed\Writer\ExtensionManagerInterface");
}
$this->standalone = new $class();
}
diff --git a/web/core/lib/Drupal/Component/Bridge/composer.json b/web/core/lib/Drupal/Component/Bridge/composer.json
index 47a94a35fe..e51fe6abb1 100644
--- a/web/core/lib/Drupal/Component/Bridge/composer.json
+++ b/web/core/lib/Drupal/Component/Bridge/composer.json
@@ -6,7 +6,7 @@
"license": "GPL-2.0-or-later",
"require": {
"php": ">=7.0.8",
- "zendframework/zend-feed": "^2.12"
+ "laminas/laminas-feed": "^2.12"
},
"autoload": {
"psr-4": {
diff --git a/web/core/lib/Drupal/Component/Datetime/DateTimePlus.php b/web/core/lib/Drupal/Component/Datetime/DateTimePlus.php
index bb56ba545d..ef200d19f1 100644
--- a/web/core/lib/Drupal/Component/Datetime/DateTimePlus.php
+++ b/web/core/lib/Drupal/Component/Datetime/DateTimePlus.php
@@ -129,7 +129,8 @@ class DateTimePlus {
* @param \DateTime $datetime
* A DateTime object.
* @param array $settings
- * @see __construct()
+ * (optional) A keyed array for settings, suitable for passing on to
+ * __construct().
*
* @return static
* A new DateTimePlus object.
@@ -183,9 +184,11 @@ public static function createFromArray(array $date_parts, $timezone = NULL, $set
* @param int $timestamp
* A UNIX timestamp.
* @param mixed $timezone
- * @see __construct()
+ * (optional) \DateTimeZone object, time zone string or NULL. See
+ * __construct() for more details.
* @param array $settings
- * @see __construct()
+ * (optional) A keyed array for settings, suitable for passing on to
+ * __construct().
*
* @return static
* A new DateTimePlus object.
@@ -211,11 +214,14 @@ public static function createFromTimestamp($timestamp, $timezone = NULL, $settin
* any other specialized input with a known format. If provided the
* date will be created using the createFromFormat() method.
* @see http://php.net/manual/datetime.createfromformat.php
- * @param mixed $time
- * @see __construct()
+ * @param string $time
+ * String representing the time.
* @param mixed $timezone
- * @see __construct()
+ * (optional) \DateTimeZone object, time zone string or NULL. See
+ * __construct() for more details.
* @param array $settings
+ * (optional) A keyed array for settings, suitable for passing on to
+ * __construct(). Supports an additional key:
* - validate_format: (optional) Boolean choice to validate the
* created date using the input format. The format used in
* createFromFormat() allows slightly different values than format().
@@ -223,7 +229,6 @@ public static function createFromTimestamp($timestamp, $timezone = NULL, $settin
* possible to a validation step to confirm that the date created
* from a format string exactly matches the input. This option
* indicates the format can be used for validation. Defaults to TRUE.
- * @see __construct()
*
* @return static
* A new DateTimePlus object.
@@ -636,6 +641,7 @@ public static function checkArray($array) {
$valid_time = FALSE;
}
break;
+
case 'minute':
case 'second':
default:
diff --git a/web/core/lib/Drupal/Component/DependencyInjection/Container.php b/web/core/lib/Drupal/Component/DependencyInjection/Container.php
index 3e8b32b9c1..9594b6c796 100644
--- a/web/core/lib/Drupal/Component/DependencyInjection/Container.php
+++ b/web/core/lib/Drupal/Component/DependencyInjection/Container.php
@@ -256,60 +256,7 @@ protected function createService(array $definition, $id) {
}
else {
$class = $this->frozen ? $definition['class'] : current($this->resolveServicesAndParameters([$definition['class']]));
- $length = isset($definition['arguments_count']) ? $definition['arguments_count'] : count($arguments);
-
- // Optimize class instantiation for services with up to 10 parameters as
- // ReflectionClass is noticeably slow.
- switch ($length) {
- case 0:
- $service = new $class();
- break;
-
- case 1:
- $service = new $class($arguments[0]);
- break;
-
- case 2:
- $service = new $class($arguments[0], $arguments[1]);
- break;
-
- case 3:
- $service = new $class($arguments[0], $arguments[1], $arguments[2]);
- break;
-
- case 4:
- $service = new $class($arguments[0], $arguments[1], $arguments[2], $arguments[3]);
- break;
-
- case 5:
- $service = new $class($arguments[0], $arguments[1], $arguments[2], $arguments[3], $arguments[4]);
- break;
-
- case 6:
- $service = new $class($arguments[0], $arguments[1], $arguments[2], $arguments[3], $arguments[4], $arguments[5]);
- break;
-
- case 7:
- $service = new $class($arguments[0], $arguments[1], $arguments[2], $arguments[3], $arguments[4], $arguments[5], $arguments[6]);
- break;
-
- case 8:
- $service = new $class($arguments[0], $arguments[1], $arguments[2], $arguments[3], $arguments[4], $arguments[5], $arguments[6], $arguments[7]);
- break;
-
- case 9:
- $service = new $class($arguments[0], $arguments[1], $arguments[2], $arguments[3], $arguments[4], $arguments[5], $arguments[6], $arguments[7], $arguments[8]);
- break;
-
- case 10:
- $service = new $class($arguments[0], $arguments[1], $arguments[2], $arguments[3], $arguments[4], $arguments[5], $arguments[6], $arguments[7], $arguments[8], $arguments[9]);
- break;
-
- default:
- $r = new \ReflectionClass($class);
- $service = $r->newInstanceArgs($arguments);
- break;
- }
+ $service = new $class(...$arguments);
}
if (!isset($definition['shared']) || $definition['shared'] !== FALSE) {
diff --git a/web/core/lib/Drupal/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumper.php b/web/core/lib/Drupal/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumper.php
index 977fc2c8e9..889d266727 100644
--- a/web/core/lib/Drupal/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumper.php
+++ b/web/core/lib/Drupal/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumper.php
@@ -46,6 +46,13 @@ class OptimizedPhpArrayDumper extends Dumper {
*/
protected $serialize = TRUE;
+ /**
+ * A list of container aliases.
+ *
+ * @var array
+ */
+ protected $aliases;
+
/**
* {@inheritdoc}
*/
@@ -61,8 +68,9 @@ public function dump(array $options = []) {
*/
public function getArray() {
$definition = [];
+ // Warm aliases first.
$this->aliases = $this->getAliases();
- $definition['aliases'] = $this->getAliases();
+ $definition['aliases'] = $this->aliases;
$definition['parameters'] = $this->getParameters();
$definition['services'] = $this->getServiceDefinitions();
$definition['frozen'] = $this->container->isCompiled();
diff --git a/web/core/lib/Drupal/Component/DependencyInjection/PhpArrayContainer.php b/web/core/lib/Drupal/Component/DependencyInjection/PhpArrayContainer.php
index 8a15235771..be690488de 100644
--- a/web/core/lib/Drupal/Component/DependencyInjection/PhpArrayContainer.php
+++ b/web/core/lib/Drupal/Component/DependencyInjection/PhpArrayContainer.php
@@ -80,60 +80,7 @@ protected function createService(array $definition, $id) {
}
else {
$class = $this->frozen ? $definition['class'] : current($this->resolveServicesAndParameters([$definition['class']]));
- $length = isset($definition['arguments_count']) ? $definition['arguments_count'] : count($arguments);
-
- // Optimize class instantiation for services with up to 10 parameters as
- // reflection is noticeably slow.
- switch ($length) {
- case 0:
- $service = new $class();
- break;
-
- case 1:
- $service = new $class($arguments[0]);
- break;
-
- case 2:
- $service = new $class($arguments[0], $arguments[1]);
- break;
-
- case 3:
- $service = new $class($arguments[0], $arguments[1], $arguments[2]);
- break;
-
- case 4:
- $service = new $class($arguments[0], $arguments[1], $arguments[2], $arguments[3]);
- break;
-
- case 5:
- $service = new $class($arguments[0], $arguments[1], $arguments[2], $arguments[3], $arguments[4]);
- break;
-
- case 6:
- $service = new $class($arguments[0], $arguments[1], $arguments[2], $arguments[3], $arguments[4], $arguments[5]);
- break;
-
- case 7:
- $service = new $class($arguments[0], $arguments[1], $arguments[2], $arguments[3], $arguments[4], $arguments[5], $arguments[6]);
- break;
-
- case 8:
- $service = new $class($arguments[0], $arguments[1], $arguments[2], $arguments[3], $arguments[4], $arguments[5], $arguments[6], $arguments[7]);
- break;
-
- case 9:
- $service = new $class($arguments[0], $arguments[1], $arguments[2], $arguments[3], $arguments[4], $arguments[5], $arguments[6], $arguments[7], $arguments[8]);
- break;
-
- case 10:
- $service = new $class($arguments[0], $arguments[1], $arguments[2], $arguments[3], $arguments[4], $arguments[5], $arguments[6], $arguments[7], $arguments[8], $arguments[9]);
- break;
-
- default:
- $r = new \ReflectionClass($class);
- $service = $r->newInstanceArgs($arguments);
- break;
- }
+ $service = new $class(...$arguments);
}
if (!isset($definition['shared']) || $definition['shared'] !== FALSE) {
diff --git a/web/core/lib/Drupal/Component/FileSecurity/FileSecurity.php b/web/core/lib/Drupal/Component/FileSecurity/FileSecurity.php
index d5060cf7d7..d9996bbbca 100644
--- a/web/core/lib/Drupal/Component/FileSecurity/FileSecurity.php
+++ b/web/core/lib/Drupal/Component/FileSecurity/FileSecurity.php
@@ -72,9 +72,6 @@ protected static function htaccessPreventExecution() {
</Files>
# If we know how to do it safely, disable the PHP engine entirely.
-<IfModule mod_php5.c>
- php_flag engine off
-</IfModule>
<IfModule mod_php7.c>
php_flag engine off
</IfModule>
diff --git a/web/core/lib/Drupal/Component/FileSystem/RegexDirectoryIterator.php b/web/core/lib/Drupal/Component/FileSystem/RegexDirectoryIterator.php
index ca92422799..c6c654f2be 100644
--- a/web/core/lib/Drupal/Component/FileSystem/RegexDirectoryIterator.php
+++ b/web/core/lib/Drupal/Component/FileSystem/RegexDirectoryIterator.php
@@ -24,7 +24,7 @@ class RegexDirectoryIterator extends \FilterIterator {
* /\.yml$/ would list only files ending in .yml.
*/
public function __construct($path, $regex) {
- // Use FilesystemIterator to not iterate over the the . and .. directories.
+ // Use FilesystemIterator to not iterate over the . and .. directories.
$iterator = new \FilesystemIterator($path);
parent::__construct($iterator);
$this->regex = $regex;
diff --git a/web/core/lib/Drupal/Component/Gettext/PoHeader.php b/web/core/lib/Drupal/Component/Gettext/PoHeader.php
index 5d38de57f8..1d841cc124 100644
--- a/web/core/lib/Drupal/Component/Gettext/PoHeader.php
+++ b/web/core/lib/Drupal/Component/Gettext/PoHeader.php
@@ -400,6 +400,7 @@ private function tokenizeFormula($formula) {
$tokens[] = $formula[$i];
}
break;
+
case 5:
if ($next == '&') {
$tokens[] = '&&';
@@ -409,6 +410,7 @@ private function tokenizeFormula($formula) {
$tokens[] = $formula[$i];
}
break;
+
case 6:
if ($next == '|') {
$tokens[] = '||';
@@ -502,42 +504,55 @@ protected function evaluatePlural($element_stack, $n) {
case '==':
$f = $element_stack[$i - 2] == $element_stack[$i - 1];
break;
+
case '!=':
$f = $element_stack[$i - 2] != $element_stack[$i - 1];
break;
+
case '<=':
$f = $element_stack[$i - 2] <= $element_stack[$i - 1];
break;
+
case '>=':
$f = $element_stack[$i - 2] >= $element_stack[$i - 1];
break;
+
case '<':
$f = $element_stack[$i - 2] < $element_stack[$i - 1];
break;
+
case '>':
$f = $element_stack[$i - 2] > $element_stack[$i - 1];
break;
+
case '+':
$f = $element_stack[$i - 2] + $element_stack[$i - 1];
break;
+
case '-':
$f = $element_stack[$i - 2] - $element_stack[$i - 1];
break;
+
case '*':
$f = $element_stack[$i - 2] * $element_stack[$i - 1];
break;
+
case '/':
$f = $element_stack[$i - 2] / $element_stack[$i - 1];
break;
+
case '%':
$f = $element_stack[$i - 2] % $element_stack[$i - 1];
break;
+
case '&&':
$f = $element_stack[$i - 2] && $element_stack[$i - 1];
break;
+
case '||':
$f = $element_stack[$i - 2] || $element_stack[$i - 1];
break;
+
case ':':
$f = $element_stack[$i - 3] ? $element_stack[$i - 2] : $element_stack[$i - 1];
// This operator has 3 preceding elements, instead of the default 2.
diff --git a/web/core/lib/Drupal/Component/Plugin/LazyPluginCollection.php b/web/core/lib/Drupal/Component/Plugin/LazyPluginCollection.php
index b55b04e954..118631fb2e 100644
--- a/web/core/lib/Drupal/Component/Plugin/LazyPluginCollection.php
+++ b/web/core/lib/Drupal/Component/Plugin/LazyPluginCollection.php
@@ -21,7 +21,7 @@ abstract class LazyPluginCollection implements \IteratorAggregate, \Countable {
*
* @var array
*/
- protected $instanceIDs = [];
+ protected $instanceIds = [];
/**
* Initializes and stores a plugin.
@@ -66,7 +66,7 @@ public function clear() {
* TRUE if the plugin instance exists, FALSE otherwise.
*/
public function has($instance_id) {
- return isset($this->pluginInstances[$instance_id]) || isset($this->instanceIDs[$instance_id]);
+ return isset($this->pluginInstances[$instance_id]) || isset($this->instanceIds[$instance_id]);
}
/**
@@ -116,8 +116,8 @@ public function remove($instance_id) {
* (optional) The configuration used by this instance. Defaults to NULL.
*/
public function addInstanceId($id, $configuration = NULL) {
- if (!isset($this->instanceIDs[$id])) {
- $this->instanceIDs[$id] = $id;
+ if (!isset($this->instanceIds[$id])) {
+ $this->instanceIds[$id] = $id;
}
}
@@ -128,7 +128,7 @@ public function addInstanceId($id, $configuration = NULL) {
* An array of all available instance IDs.
*/
public function getInstanceIds() {
- return $this->instanceIDs;
+ return $this->instanceIds;
}
/**
@@ -138,7 +138,7 @@ public function getInstanceIds() {
* The ID of the plugin instance to remove.
*/
public function removeInstanceId($instance_id) {
- unset($this->instanceIDs[$instance_id]);
+ unset($this->instanceIds[$instance_id]);
$this->remove($instance_id);
}
@@ -154,7 +154,7 @@ public function getIterator() {
* {@inheritdoc}
*/
public function count() {
- return count($this->instanceIDs);
+ return count($this->instanceIds);
}
}
diff --git a/web/core/lib/Drupal/Component/Utility/Unicode.php b/web/core/lib/Drupal/Component/Utility/Unicode.php
index 171b773d45..64e066d793 100644
--- a/web/core/lib/Drupal/Component/Utility/Unicode.php
+++ b/web/core/lib/Drupal/Component/Utility/Unicode.php
@@ -103,6 +103,7 @@ public static function getStatus() {
switch (static::check()) {
case 'mb_strlen':
return Unicode::STATUS_SINGLEBYTE;
+
case '':
return Unicode::STATUS_MULTIBYTE;
}
diff --git a/web/core/lib/Drupal/Core/Access/AccessManager.php b/web/core/lib/Drupal/Core/Access/AccessManager.php
index b7b7c0bfc1..d2b7e55f99 100644
--- a/web/core/lib/Drupal/Core/Access/AccessManager.php
+++ b/web/core/lib/Drupal/Core/Access/AccessManager.php
@@ -80,7 +80,7 @@ public function __construct(RouteProviderInterface $route_provider, ParamConvert
*/
public function checkNamedRoute($route_name, array $parameters = [], AccountInterface $account = NULL, $return_as_object = FALSE) {
try {
- $route = $this->routeProvider->getRouteByName($route_name, $parameters);
+ $route = $this->routeProvider->getRouteByName($route_name);
// ParamConverterManager relies on the route name and object being
// available from the parameters array.
diff --git a/web/core/lib/Drupal/Core/Access/CsrfRequestHeaderAccessCheck.php b/web/core/lib/Drupal/Core/Access/CsrfRequestHeaderAccessCheck.php
index c9266f5736..052d9d12ff 100644
--- a/web/core/lib/Drupal/Core/Access/CsrfRequestHeaderAccessCheck.php
+++ b/web/core/lib/Drupal/Core/Access/CsrfRequestHeaderAccessCheck.php
@@ -53,9 +53,12 @@ public function applies(Route $route) {
// REST requirement.
$applicable_requirements = [
'_csrf_request_header_token',
- // @todo Remove _access_rest_csrf in Drupal 9.0.0.
+ // @todo Remove _access_rest_csrf in Drupal 10.0.0 https://www.drupal.org/node/3115308
'_access_rest_csrf',
];
+ if ($route->hasRequirement('_access_rest_csrf')) {
+ @trigger_error('Route requirement _access_rest_csrf is deprecated in drupal:8.2.0 and is removed in drupal:10.0.0. Use _csrf_request_header_token instead. See https://www.drupal.org/node/2772399', E_USER_DEPRECATED);
+ }
$requirement_keys = array_keys($requirements);
if (array_intersect($applicable_requirements, $requirement_keys)) {
diff --git a/web/core/lib/Drupal/Core/Ajax/OpenOffCanvasDialogCommand.php b/web/core/lib/Drupal/Core/Ajax/OpenOffCanvasDialogCommand.php
index 78c406b3d8..ac7f6950a5 100644
--- a/web/core/lib/Drupal/Core/Ajax/OpenOffCanvasDialogCommand.php
+++ b/web/core/lib/Drupal/Core/Ajax/OpenOffCanvasDialogCommand.php
@@ -19,7 +19,7 @@ class OpenOffCanvasDialogCommand extends OpenDialogCommand {
*
* The off-canvas dialog differs from the normal modal provided by
* OpenDialogCommand in that a off-canvas has built in positioning and
- * behaviours. Drupal provides a built-in off-canvas dialog for this purpose,
+ * behaviors. Drupal provides a built-in off-canvas dialog for this purpose,
* so the selector is hard-coded in the call to the parent constructor.
*
* @param string $title
diff --git a/web/core/lib/Drupal/Core/Archiver/Zip.php b/web/core/lib/Drupal/Core/Archiver/Zip.php
index fd769c13cf..74f6105929 100644
--- a/web/core/lib/Drupal/Core/Archiver/Zip.php
+++ b/web/core/lib/Drupal/Core/Archiver/Zip.php
@@ -29,7 +29,7 @@ class Zip implements ArchiverInterface {
public function __construct($file_path) {
$this->zip = new \ZipArchive();
if ($this->zip->open($file_path) !== TRUE) {
- throw new ArchiverException(t('Cannot open %file_path', ['%file_path' => $file_path]));
+ throw new ArchiverException("Cannot open '$file_path'");
}
}
diff --git a/web/core/lib/Drupal/Core/Asset/LibrariesDirectoryFileFinder.php b/web/core/lib/Drupal/Core/Asset/LibrariesDirectoryFileFinder.php
new file mode 100644
index 0000000000..9102efc475
--- /dev/null
+++ b/web/core/lib/Drupal/Core/Asset/LibrariesDirectoryFileFinder.php
@@ -0,0 +1,100 @@
+<?php
+
+namespace Drupal\Core\Asset;
+
+use Drupal\Core\Extension\ProfileExtensionList;
+
+/**
+ * Finds files that are located in the supported 'libraries' directories.
+ */
+class LibrariesDirectoryFileFinder {
+
+ /**
+ * The app root.
+ *
+ * @var string
+ */
+ protected $root;
+
+ /**
+ * The site path.
+ *
+ * @var string
+ */
+ protected $sitePath;
+
+ /**
+ * The profile extension list.
+ *
+ * @var \Drupal\Core\Extension\ExtensionList
+ */
+ protected $profileExtensionList;
+
+ /**
+ * The install profile.
+ *
+ * @var string
+ */
+ protected $installProfile;
+
+ /**
+ * Constructs a new LibrariesDirectoryFileFinder instance.
+ *
+ * @param string $root
+ * The app root.
+ * @param string $site_path
+ * The site path.
+ * @param \Drupal\Core\Extension\ProfileExtensionList $profile_extension_list
+ * The profile extension list.
+ * @param string $install_profile
+ * The install profile.
+ */
+ public function __construct($root, $site_path, ProfileExtensionList $profile_extension_list, $install_profile) {
+ $this->root = $root;
+ $this->sitePath = $site_path;
+ $this->profileExtensionList = $profile_extension_list;
+ $this->installProfile = $install_profile;
+ }
+
+ /**
+ * Finds files that are located in the supported 'libraries' directories.
+ *
+ * It searches the following locations:
+ * - A libraries directory in the current site directory, for example:
+ * sites/default/libraries.
+ * - The root libraries directory.
+ * - A libraries directory in the selected installation profile, for example:
+ * profiles/my_install_profile/libraries.
+ * If the same library is present in multiple locations the first location
+ * found will be used. The locations are searched in the order listed.
+ *
+ * @param string $path
+ * The path for the library file to find.
+ *
+ * @return string|false
+ * The real path to the library file relative to the root directory. If the
+ * library cannot be found then FALSE.
+ */
+ public function find($path) {
+ // Search sites/<domain>/*.
+ $directories[] = "{$this->sitePath}/libraries/";
+
+ // Always search the root 'libraries' directory.
+ $directories[] = 'libraries/';
+
+ // Installation profiles can place libraries into a 'libraries' directory.
+ if ($this->installProfile) {
+ $profile_path = $this->profileExtensionList->getPath($this->installProfile);
+ $directories[] = "$profile_path/libraries/";
+ }
+
+ foreach ($directories as $dir) {
+ if (file_exists($this->root . '/' . $dir . $path)) {
+ return $dir . $path;
+ }
+ }
+ // The library has not been found.
+ return FALSE;
+ }
+
+}
diff --git a/web/core/lib/Drupal/Core/Asset/LibraryDiscoveryParser.php b/web/core/lib/Drupal/Core/Asset/LibraryDiscoveryParser.php
index 86c22c1837..99328413da 100644
--- a/web/core/lib/Drupal/Core/Asset/LibraryDiscoveryParser.php
+++ b/web/core/lib/Drupal/Core/Asset/LibraryDiscoveryParser.php
@@ -46,6 +46,13 @@ class LibraryDiscoveryParser {
*/
protected $streamWrapperManager;
+ /**
+ * The libraries directory file finder.
+ *
+ * @var \Drupal\Core\Asset\LibrariesDirectoryFileFinder
+ */
+ protected $librariesDirectoryFileFinder;
+
/**
* Constructs a new LibraryDiscoveryParser instance.
*
@@ -57,8 +64,10 @@ class LibraryDiscoveryParser {
* The theme manager.
* @param \Drupal\Core\StreamWrapper\StreamWrapperManagerInterface $stream_wrapper_manager
* The stream wrapper manager.
+ * @param \Drupal\Core\Asset\LibrariesDirectoryFileFinder $libraries_directory_file_finder
+ * The libraries directory file finder.
*/
- public function __construct($root, ModuleHandlerInterface $module_handler, ThemeManagerInterface $theme_manager, StreamWrapperManagerInterface $stream_wrapper_manager = NULL) {
+ public function __construct($root, ModuleHandlerInterface $module_handler, ThemeManagerInterface $theme_manager, StreamWrapperManagerInterface $stream_wrapper_manager = NULL, LibrariesDirectoryFileFinder $libraries_directory_file_finder = NULL) {
$this->root = $root;
$this->moduleHandler = $module_handler;
$this->themeManager = $theme_manager;
@@ -67,6 +76,11 @@ public function __construct($root, ModuleHandlerInterface $module_handler, Theme
$stream_wrapper_manager = \Drupal::service('stream_wrapper_manager');
}
$this->streamWrapperManager = $stream_wrapper_manager;
+ if (!$libraries_directory_file_finder) {
+ @trigger_error('Calling LibraryDiscoveryParser::__construct() without the $libraries_directory_file_finder argument is deprecated in drupal:8.9.0. The $libraries_directory_file_finder argument will be required in drupal:10.0.0. See https://www.drupal.org/node/3099614', E_USER_DEPRECATED);
+ $libraries_directory_file_finder = \Drupal::service('library.libraries_directory_file_finder');
+ }
+ $this->librariesDirectoryFileFinder = $libraries_directory_file_finder;
}
/**
@@ -189,7 +203,15 @@ public function buildByExtension($extension) {
if ($source[0] === '/') {
// An absolute path maps to DRUPAL_ROOT / base_path().
if ($source[1] !== '/') {
- $options['data'] = substr($source, 1);
+ $source = substr($source, 1);
+ // Non core provided libraries can be in multiple locations.
+ if (strpos($source, 'libraries/') === 0) {
+ $path_to_source = $this->librariesDirectoryFileFinder->find(substr($source, 10));
+ if ($path_to_source) {
+ $source = $path_to_source;
+ }
+ }
+ $options['data'] = $source;
}
// A protocol-free URI (e.g., //cdn.com/example.js) is external.
else {
@@ -278,6 +300,14 @@ public function buildByExtension($extension) {
* Just like with JavaScript files, each CSS file is the key of an object
* that can define specific attributes. The format of the file path is the
* same as for the JavaScript files.
+ * If the JavaScript or CSS file starts with /libraries/ the
+ * library.libraries_directory_file_finder service is used to find the files
+ * in the following locations:
+ * - A libraries directory in the current site directory, for example:
+ * sites/default/libraries.
+ * - The root libraries directory.
+ * - A libraries directory in the selected installation profile, for
+ * example: profiles/my_install_profile/libraries.
* - dependencies: A list of libraries this library depends on.
* - version: The library version. The string "VERSION" can be used to mean
* the current Drupal core version.
diff --git a/web/core/lib/Drupal/Core/Cache/Context/ProtocolVersionCacheContext.php b/web/core/lib/Drupal/Core/Cache/Context/ProtocolVersionCacheContext.php
new file mode 100644
index 0000000000..11c20e2f88
--- /dev/null
+++ b/web/core/lib/Drupal/Core/Cache/Context/ProtocolVersionCacheContext.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace Drupal\Core\Cache\Context;
+
+use Drupal\Core\Cache\CacheableMetadata;
+
+/**
+ * Defines the ProtocolVersionCacheContext service, for "per protocol" caching.
+ *
+ * Useful to differentiate between HTTP/1.1 and HTTP/2.0 responses for example,
+ * to allow responses to be optimized for protocol-specific characteristics.
+ *
+ * Cache context ID: 'protocol_version'.
+ */
+class ProtocolVersionCacheContext extends RequestStackCacheContextBase implements CacheContextInterface {
+
+ /**
+ * {@inheritdoc}
+ */
+ public static function getLabel() {
+ return t('Protocol version');
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getContext() {
+ return $this->requestStack->getCurrentRequest()->getProtocolVersion();
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getCacheableMetadata() {
+ return new CacheableMetadata();
+ }
+
+}
diff --git a/web/core/lib/Drupal/Core/Command/DbDumpCommand.php b/web/core/lib/Drupal/Core/Command/DbDumpCommand.php
index a9b4308d79..bd6ca624ce 100644
--- a/web/core/lib/Drupal/Core/Command/DbDumpCommand.php
+++ b/web/core/lib/Drupal/Core/Command/DbDumpCommand.php
@@ -93,6 +93,8 @@ protected function generateScript(Connection $connection, array $schema_only = [
$tables .= $this->getTableScript($table, $schema, $data);
}
$script = $this->getTemplate();
+ // Substitute in the version.
+ $script = str_replace('{{VERSION}}', \Drupal::VERSION, $script);
// Substitute in the tables.
$script = str_replace('{{TABLES}}', trim($tables), $script);
return trim($script);
@@ -392,7 +394,7 @@ protected function getTemplate() {
* @file
* A database agnostic dump for testing purposes.
*
- * This file was generated by the Drupal 8.0 db-tools.php script.
+ * This file was generated by the Drupal {{VERSION}} db-tools.php script.
*/
use Drupal\Core\Database\Database;
diff --git a/web/core/lib/Drupal/Core/Command/DbImportCommand.php b/web/core/lib/Drupal/Core/Command/DbImportCommand.php
index 5cd5d92765..3401ae0f86 100644
--- a/web/core/lib/Drupal/Core/Command/DbImportCommand.php
+++ b/web/core/lib/Drupal/Core/Command/DbImportCommand.php
@@ -36,7 +36,7 @@ protected function execute(InputInterface $input, OutputInterface $output) {
$script = $input->getArgument('script');
if (!is_file($script)) {
$output->writeln('File must exist.');
- return;
+ return 1;
}
$connection = $this->getDatabaseConnection($input);
diff --git a/web/core/lib/Drupal/Core/Command/DbToolsApplication.php b/web/core/lib/Drupal/Core/Command/DbToolsApplication.php
index aa48e1c57e..7ce24272b0 100644
--- a/web/core/lib/Drupal/Core/Command/DbToolsApplication.php
+++ b/web/core/lib/Drupal/Core/Command/DbToolsApplication.php
@@ -13,7 +13,7 @@ class DbToolsApplication extends Application {
* {@inheritdoc}
*/
public function __construct() {
- parent::__construct('Database Tools', '8.0.x');
+ parent::__construct('Database Tools', \Drupal::VERSION);
}
/**
diff --git a/web/core/lib/Drupal/Core/Command/InstallCommand.php b/web/core/lib/Drupal/Core/Command/InstallCommand.php
index 839eb95fdb..2d0ec5d909 100644
--- a/web/core/lib/Drupal/Core/Command/InstallCommand.php
+++ b/web/core/lib/Drupal/Core/Command/InstallCommand.php
@@ -126,6 +126,9 @@ protected function isDrupalInstalled() {
*
* @throws \Exception
* Thrown when failing to create the $site_path directory or settings.php.
+ *
+ * @return int
+ * The command exit status.
*/
protected function install($class_loader, SymfonyStyle $io, $profile, $langcode, $site_path, $site_name) {
$password = Crypt::randomBytesBase64(12);
@@ -211,6 +214,8 @@ protected function install($class_loader, SymfonyStyle $io, $profile, $langcode,
$progress_bar->finish();
$io->writeln('<info>Username:</info> admin');
$io->writeln("<info>Password:</info> $password");
+
+ return 0;
}
/**
diff --git a/web/core/lib/Drupal/Core/Composer/Composer.php b/web/core/lib/Drupal/Core/Composer/Composer.php
index 453a2485f6..3f7f1c6d7f 100644
--- a/web/core/lib/Drupal/Core/Composer/Composer.php
+++ b/web/core/lib/Drupal/Core/Composer/Composer.php
@@ -37,6 +37,9 @@ class Composer {
'jcalderonzumba/gastonjs' => ['docs', 'examples', 'tests'],
'jcalderonzumba/mink-phantomjs-driver' => ['tests'],
'justinrainbow/json-schema' => ['demo'],
+ 'laminas/laminas-escaper' => ['doc'],
+ 'laminas/laminas-feed' => ['doc'],
+ 'laminas/laminas-stdlib' => ['doc'],
'masterminds/html5' => ['bin', 'test'],
'mikey179/vfsStream' => ['src/test'],
'myclabs/deep-copy' => ['doc'],
@@ -89,9 +92,6 @@ class Composer {
'symfony-cmf/routing' => ['Test', 'Tests'],
'theseer/tokenizer' => ['tests'],
'twig/twig' => ['doc', 'ext', 'test', 'tests'],
- 'zendframework/zend-escaper' => ['doc'],
- 'zendframework/zend-feed' => ['doc'],
- 'zendframework/zend-stdlib' => ['doc'],
];
/**
diff --git a/web/core/lib/Drupal/Core/Config/ConfigEvents.php b/web/core/lib/Drupal/Core/Config/ConfigEvents.php
index 7686197d4e..349d95824a 100644
--- a/web/core/lib/Drupal/Core/Config/ConfigEvents.php
+++ b/web/core/lib/Drupal/Core/Config/ConfigEvents.php
@@ -154,7 +154,7 @@ final class ConfigEvents {
* Together with \Drupal\Core\Config\ConfigEvents::STORAGE_TRANSFORM_EXPORT
* subscribers can alter the active configuration in a config sync workflow
* instead of just overriding at runtime via the config-override system.
- * This allows a complete customisation of the workflow including additional
+ * This allows a complete customization of the workflow including additional
* modules and editable configuration in different environments.
*
* @code
diff --git a/web/core/lib/Drupal/Core/Config/ConfigFactory.php b/web/core/lib/Drupal/Core/Config/ConfigFactory.php
index e4496f88b7..fedd62a713 100644
--- a/web/core/lib/Drupal/Core/Config/ConfigFactory.php
+++ b/web/core/lib/Drupal/Core/Config/ConfigFactory.php
@@ -160,7 +160,7 @@ protected function doLoadMultiple(array $names, $immutable = TRUE) {
// Pre-load remaining configuration files.
if (!empty($names)) {
- // Initialise override information.
+ // Initialize override information.
$module_overrides = [];
$storage_data = $this->storage->readMultiple($names);
diff --git a/web/core/lib/Drupal/Core/Config/ConfigInstaller.php b/web/core/lib/Drupal/Core/Config/ConfigInstaller.php
index da7aa9724e..b4e4129cd7 100644
--- a/web/core/lib/Drupal/Core/Config/ConfigInstaller.php
+++ b/web/core/lib/Drupal/Core/Config/ConfigInstaller.php
@@ -619,6 +619,7 @@ protected function getMissingDependencies($config_name, array $data, array $enab
case 'theme':
$list_to_check = $enabled_extensions;
break;
+
case 'config':
$list_to_check = $all_config;
break;
diff --git a/web/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php b/web/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php
index 38809c28c3..86456934f7 100644
--- a/web/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php
+++ b/web/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php
@@ -248,8 +248,7 @@ public function toArray() {
$id_key = $entity_type->getKey('id');
$property_names = $entity_type->getPropertiesToExport($this->id());
if (empty($property_names)) {
- $config_name = $entity_type->getConfigPrefix() . '.' . $this->id();
- throw new SchemaIncompleteException("Incomplete or missing schema for $config_name");
+ throw new SchemaIncompleteException(sprintf("Entity type '%s' is missing 'config_export' definition in its annotation", get_class($entity_type)));
}
foreach ($property_names as $property_name => $export_name) {
// Special handling for IDs so that computed compound IDs work.
@@ -490,7 +489,7 @@ public function onDependencyRemoval(array $dependencies) {
* already invalidates it.
*/
protected function invalidateTagsOnSave($update) {
- Cache::invalidateTags($this->getEntityType()->getListCacheTags());
+ Cache::invalidateTags($this->getListCacheTagsToInvalidate());
}
/**
@@ -500,7 +499,11 @@ protected function invalidateTagsOnSave($update) {
* config system already invalidates them.
*/
protected static function invalidateTagsOnDelete(EntityTypeInterface $entity_type, array $entities) {
- Cache::invalidateTags($entity_type->getListCacheTags());
+ $tags = $entity_type->getListCacheTags();
+ foreach ($entities as $entity) {
+ $tags = Cache::mergeTags($tags, $entity->getListCacheTagsToInvalidate());
+ }
+ Cache::invalidateTags($tags);
}
/**
diff --git a/web/core/lib/Drupal/Core/Config/Entity/ConfigEntityUpdater.php b/web/core/lib/Drupal/Core/Config/Entity/ConfigEntityUpdater.php
index 7ba77000ac..638a706ed1 100644
--- a/web/core/lib/Drupal/Core/Config/Entity/ConfigEntityUpdater.php
+++ b/web/core/lib/Drupal/Core/Config/Entity/ConfigEntityUpdater.php
@@ -83,7 +83,7 @@ public static function create(ContainerInterface $container) {
* save an entity. The callback can make changes to an entity. Note that all
* changes should comply with schema as an entity's data will not be
* validated against schema on save to avoid unexpected errors. If a
- * callback is not provided, the default behaviour is to update the
+ * callback is not provided, the default behavior is to update the
* dependencies if required.
*
* @see hook_post_update_NAME()
@@ -113,7 +113,7 @@ public function update(array &$sandbox, $entity_type_id, callable $callback = NU
$sandbox[self::SANDBOX_KEY]['count'] = count($sandbox[self::SANDBOX_KEY]['entities']);
}
- // The default behaviour is to fix dependencies.
+ // The default behavior is to fix dependencies.
if ($callback === NULL) {
$callback = function ($entity) {
/** @var \Drupal\Core\Config\Entity\ConfigEntityInterface $entity */
diff --git a/web/core/lib/Drupal/Core/Config/Entity/Query/Condition.php b/web/core/lib/Drupal/Core/Config/Entity/Query/Condition.php
index 3410a6ef53..2adfd80d5f 100644
--- a/web/core/lib/Drupal/Core/Config/Entity/Query/Condition.php
+++ b/web/core/lib/Drupal/Core/Config/Entity/Query/Condition.php
@@ -169,26 +169,37 @@ protected function match(array $condition, $value) {
switch ($condition['operator']) {
case '=':
return $value == $condition['value'];
+
case '>':
return $value > $condition['value'];
+
case '<':
return $value < $condition['value'];
+
case '>=':
return $value >= $condition['value'];
+
case '<=':
return $value <= $condition['value'];
+
case '<>':
return $value != $condition['value'];
+
case 'IN':
return array_search($value, $condition['value']) !== FALSE;
+
case 'NOT IN':
return array_search($value, $condition['value']) === FALSE;
+
case 'STARTS_WITH':
return strpos($value, $condition['value']) === 0;
+
case 'CONTAINS':
return strpos($value, $condition['value']) !== FALSE;
+
case 'ENDS_WITH':
return substr($value, -strlen($condition['value'])) === (string) $condition['value'];
+
default:
throw new QueryException('Invalid condition operator.');
}
diff --git a/web/core/lib/Drupal/Core/Config/Entity/Query/Query.php b/web/core/lib/Drupal/Core/Config/Entity/Query/Query.php
index 4566cb11d5..5c14c9ac1a 100644
--- a/web/core/lib/Drupal/Core/Config/Entity/Query/Query.php
+++ b/web/core/lib/Drupal/Core/Config/Entity/Query/Query.php
@@ -183,18 +183,21 @@ protected function loadRecords() {
return $id !== $value;
};
break;
+
case 'STARTS_WITH':
$filter = function ($name) use ($value, $prefix_length) {
$id = substr($name, $prefix_length);
return strpos($id, $value) === 0;
};
break;
+
case 'CONTAINS':
$filter = function ($name) use ($value, $prefix_length) {
$id = substr($name, $prefix_length);
return strpos($id, $value) !== FALSE;
};
break;
+
case 'ENDS_WITH':
$filter = function ($name) use ($value, $prefix_length) {
$id = substr($name, $prefix_length);
diff --git a/web/core/lib/Drupal/Core/Config/Entity/Query/QueryFactory.php b/web/core/lib/Drupal/Core/Config/Entity/Query/QueryFactory.php
index bce7bb719b..15d18cfc00 100644
--- a/web/core/lib/Drupal/Core/Config/Entity/Query/QueryFactory.php
+++ b/web/core/lib/Drupal/Core/Config/Entity/Query/QueryFactory.php
@@ -136,7 +136,7 @@ protected function deleteConfigKeyStore(ConfigEntityTypeInterface $entity_type,
*
* @param \Drupal\Core\Config\Config $config
* The configuration object.
- * @param string $key
+ * @param string $key
* The configuration key to look for.
* @param string $get_method
* Which method on the config object to call to get the value. Either 'get'
diff --git a/web/core/lib/Drupal/Core/Config/ImportStorageTransformer.php b/web/core/lib/Drupal/Core/Config/ImportStorageTransformer.php
index 58fe795dd4..039516b31d 100644
--- a/web/core/lib/Drupal/Core/Config/ImportStorageTransformer.php
+++ b/web/core/lib/Drupal/Core/Config/ImportStorageTransformer.php
@@ -12,7 +12,7 @@
* This service does not implement an interface and is final because it is not
* meant to be replaced, extended or used in a different context.
* Its single purpose is to transform a storage for the import step of a
- * configuration synchronisation by dispatching the import transformation event.
+ * configuration synchronization by dispatching the import transformation event.
*/
final class ImportStorageTransformer {
diff --git a/web/core/lib/Drupal/Core/Config/StorageCopyTrait.php b/web/core/lib/Drupal/Core/Config/StorageCopyTrait.php
index 9cd80199a0..83fb6c14aa 100644
--- a/web/core/lib/Drupal/Core/Config/StorageCopyTrait.php
+++ b/web/core/lib/Drupal/Core/Config/StorageCopyTrait.php
@@ -30,7 +30,15 @@ protected static function replaceStorageContents(StorageInterface $source, Stora
$source_collection = $source->createCollection($collection);
$target_collection = $target->createCollection($collection);
foreach ($source_collection->listAll() as $name) {
- $target_collection->write($name, $source_collection->read($name));
+ $data = $source_collection->read($name);
+ if ($data !== FALSE) {
+ $target_collection->write($name, $data);
+ }
+ else {
+ \Drupal::logger('config')->notice('Missing required data for configuration: %config', [
+ '%config' => $name,
+ ]);
+ }
}
}
diff --git a/web/core/lib/Drupal/Core/Database/Connection.php b/web/core/lib/Drupal/Core/Database/Connection.php
index 94ba8bed4e..dc96435f7e 100644
--- a/web/core/lib/Drupal/Core/Database/Connection.php
+++ b/web/core/lib/Drupal/Core/Database/Connection.php
@@ -2,6 +2,8 @@
namespace Drupal\Core\Database;
+use Drupal\Core\Database\Query\Condition;
+
/**
* Base Database API class.
*
@@ -542,7 +544,7 @@ public function makeComment($comments) {
* "/ * Exploit * / DROP TABLE node. -- * / UPDATE example SET field2=..."
* @endcode
*
- * Unless the comment is sanitised first, the SQL server would drop the
+ * Unless the comment is sanitized first, the SQL server would drop the
* node table and ignore the rest of the SQL statement.
*
* @param string $comment
@@ -583,7 +585,7 @@ protected function filterComment($comment = '') {
* Typically, $options['return'] will be set by a default or by a query
* builder, and should not be set by a user.
*
- * @return \Drupal\Core\Database\StatementInterface|int|null
+ * @return \Drupal\Core\Database\StatementInterface|int|string|null
* This method will return one of the following:
* - If either $options['return'] === self::RETURN_STATEMENT, or
* $options['return'] is not set (due to self::defaultOptions()),
@@ -592,7 +594,7 @@ protected function filterComment($comment = '') {
* returns the number of rows affected by the query
* (not the number matched).
* - If $options['return'] === self::RETURN_INSERT_ID,
- * returns the generated insert ID of the last query.
+ * returns the generated insert ID of the last query as a string.
* - If either $options['return'] === self::RETURN_NULL, or
* an exception occurs and $options['throw_exception'] evaluates to FALSE,
* returns NULL.
@@ -626,7 +628,11 @@ public function query($query, array $args = [], $options = []) {
// semicolons should only be needed for special cases like defining a
// function or stored procedure in SQL. Trim any trailing delimiter to
// minimize false positives.
- $query = rtrim($query, "; \t\n\r\0\x0B");
+ $trim_chars = " \t\n\r\0\x0B";
+ if (empty($options['allow_delimiter_in_query'])) {
+ $trim_chars .= ';';
+ }
+ $query = rtrim($query, $trim_chars);
if (strpos($query, ';') !== FALSE && empty($options['allow_delimiter_in_query'])) {
throw new \InvalidArgumentException('; is not supported in SQL strings. Use only one statement at a time.');
}
@@ -783,6 +789,11 @@ public function getDriverClass($class) {
}
$driver_class = $this->connectionOptions['namespace'] . '\\' . $class;
$this->driverClasses[$class] = class_exists($driver_class) ? $driver_class : $class;
+ if ($this->driverClasses[$class] === 'Condition') {
+ // @todo Deprecate the fallback for contrib and custom drivers in 9.1.x
+ // in https://www.drupal.org/project/drupal/issues/3120036.
+ $this->driverClasses[$class] = Condition::class;
+ }
}
return $this->driverClasses[$class];
}
@@ -944,6 +955,22 @@ public function schema() {
return $this->schema;
}
+ /**
+ * Prepares and returns a CONDITION query object.
+ *
+ * @param string $conjunction
+ * The operator to use to combine conditions: 'AND' or 'OR'.
+ *
+ * @return \Drupal\Core\Database\Query\Condition
+ * A new Condition query object.
+ *
+ * @see \Drupal\Core\Database\Query\Condition
+ */
+ public function condition($conjunction) {
+ $class = $this->getDriverClass('Condition');
+ return new $class($conjunction);
+ }
+
/**
* Escapes a database name string.
*
@@ -1355,7 +1382,7 @@ abstract public function queryTemporary($query, array $args = [], array $options
* Returns the type of database driver.
*
* This is not necessarily the same as the type of the database itself. For
- * instance, there could be two MySQL drivers, mysql and mysql_mock. This
+ * instance, there could be two MySQL drivers, mysql and mysqlMock. This
* function would return different values for each, but both would return
* "mysql" for databaseType().
*
@@ -1549,10 +1576,6 @@ public function __sleep() {
/**
* Creates an array of database connection options from a URL.
*
- * @internal
- * This method should not be called. Use
- * \Drupal\Core\Database\Database::convertDbUrlToConnectionInfo() instead.
- *
* @param string $url
* The URL.
* @param string $root
@@ -1566,6 +1589,10 @@ public function __sleep() {
* Exception thrown when the provided URL does not meet the minimum
* requirements.
*
+ * @internal
+ * This method should only be called from
+ * \Drupal\Core\Database\Database::convertDbUrlToConnectionInfo().
+ *
* @see \Drupal\Core\Database\Database::convertDbUrlToConnectionInfo()
*/
public static function createConnectionOptionsFromUrl($url, $root) {
@@ -1611,12 +1638,10 @@ public static function createConnectionOptionsFromUrl($url, $root) {
/**
* Creates a URL from an array of database connection options.
*
- * @internal
- * This method should not be called. Use
- * \Drupal\Core\Database\Database::getConnectionInfoAsUrl() instead.
- *
* @param array $connection_options
- * The array of connection options for a database connection.
+ * The array of connection options for a database connection. An additional
+ * key of 'module' is added by Database::getConnectionInfoAsUrl() for
+ * drivers provided my contributed or custom modules for convenience.
*
* @return string
* The connection info as a URL.
@@ -1625,6 +1650,10 @@ public static function createConnectionOptionsFromUrl($url, $root) {
* Exception thrown when the provided array of connection options does not
* meet the minimum requirements.
*
+ * @internal
+ * This method should only be called from
+ * \Drupal\Core\Database\Database::getConnectionInfoAsUrl().
+ *
* @see \Drupal\Core\Database\Database::getConnectionInfoAsUrl()
*/
public static function createUrlFromConnectionOptions(array $connection_options) {
@@ -1651,6 +1680,11 @@ public static function createUrlFromConnectionOptions(array $connection_options)
$db_url .= '/' . $connection_options['database'];
+ // Add the module when the driver is provided by a module.
+ if (isset($connection_options['module'])) {
+ $db_url .= '?module=' . $connection_options['module'];
+ }
+
if (isset($connection_options['prefix']['default']) && $connection_options['prefix']['default'] !== '') {
$db_url .= '#' . $connection_options['prefix']['default'];
}
diff --git a/web/core/lib/Drupal/Core/Database/Database.php b/web/core/lib/Drupal/Core/Database/Database.php
index d13ea80862..aea70a65f1 100644
--- a/web/core/lib/Drupal/Core/Database/Database.php
+++ b/web/core/lib/Drupal/Core/Database/Database.php
@@ -2,6 +2,9 @@
namespace Drupal\Core\Database;
+use Composer\Autoload\ClassLoader;
+use Drupal\Core\Extension\ExtensionDiscovery;
+
/**
* Primary front-controller for the database system.
*
@@ -448,6 +451,8 @@ public static function ignoreTarget($key, $target) {
* @throws \InvalidArgumentException
* Exception thrown when the provided URL does not meet the minimum
* requirements.
+ * @throws \RuntimeException
+ * Exception thrown when a module provided database driver does not exist.
*/
public static function convertDbUrlToConnectionInfo($url, $root) {
// Check that the URL is well formed, starting with 'scheme://', where
@@ -457,18 +462,130 @@ public static function convertDbUrlToConnectionInfo($url, $root) {
}
$driver = $matches[1];
- // Discover if the URL has a valid driver scheme. Try with core drivers
- // first.
- $connection_class = "Drupal\\Core\\Database\\Driver\\{$driver}\\Connection";
- if (!class_exists($connection_class)) {
- // If the URL is not relative to a core driver, try with custom ones.
- $connection_class = "Drupal\\Driver\\Database\\{$driver}\\Connection";
+ // Determine if the database driver is provided by a module.
+ $module = NULL;
+ $connection_class = NULL;
+ $url_components = parse_url($url);
+ if (isset($url_components['query'])) {
+ parse_str($url_components['query'], $query);
+ if (isset($query['module']) && $query['module']) {
+ $module = $query['module'];
+ // Set up an additional autoloader. We don't use the main autoloader as
+ // this method can be called before Drupal is installed and is never
+ // called during regular runtime.
+ $namespace = "Drupal\\$module\\Driver\\Database\\$driver";
+ $psr4_base_directory = Database::findDriverAutoloadDirectory($namespace, $root, TRUE);
+ $additional_class_loader = new ClassLoader();
+ $additional_class_loader->addPsr4($namespace . '\\', $psr4_base_directory);
+ $additional_class_loader->register(TRUE);
+ $connection_class = $custom_connection_class = $namespace . '\\Connection';
+ }
+ }
+
+ if (!$module) {
+ // Determine the connection class to use. Discover if the URL has a valid
+ // driver scheme. Try with Drupal 8 style custom drivers first, since
+ // those can override/extend the core ones.
+ $connection_class = $custom_connection_class = "Drupal\\Driver\\Database\\{$driver}\\Connection";
if (!class_exists($connection_class)) {
- throw new \InvalidArgumentException("Can not convert '$url' to a database connection, class '$connection_class' does not exist");
+ // If the URL is not relative to a custom driver, try with core ones.
+ $connection_class = "Drupal\\Core\\Database\\Driver\\{$driver}\\Connection";
}
}
- return $connection_class::createConnectionOptionsFromUrl($url, $root);
+ if (!class_exists($connection_class)) {
+ throw new \InvalidArgumentException("Can not convert '$url' to a database connection, class '$custom_connection_class' does not exist");
+ }
+
+ $options = $connection_class::createConnectionOptionsFromUrl($url, $root);
+
+ // If the driver is provided by a module add the necessary information to
+ // autoload the code.
+ // @see \Drupal\Core\Site\Settings::initialize()
+ if (isset($psr4_base_directory)) {
+ $options['autoload'] = $psr4_base_directory;
+ }
+
+ return $options;
+ }
+
+ /**
+ * Finds the directory to add to the autoloader for the driver's namespace.
+ *
+ * For Drupal sites that manage their codebase with Composer, the package
+ * that provides the database driver should add the driver's namespace to
+ * Composer's autoloader. However, to support sites that add Drupal modules
+ * without Composer, and because the database connection must be established
+ * before Drupal adds the module's entire namespace to the autoloader, the
+ * database connection info array can include an "autoload" key containing
+ * the autoload directory for the driver's namespace. For requests that
+ * connect to the database via a connection info array, the value of the
+ * "autoload" key is automatically added to the autoloader.
+ *
+ * This method can be called to find the default value of that key when the
+ * database connection info array isn't available. This includes:
+ * - Console commands and test runners that connect to a database specified
+ * by a database URL rather than a connection info array.
+ * - During installation, prior to the connection info array being written to
+ * settings.php.
+ *
+ * This method returns the directory that must be added to the autoloader for
+ * the given namespace.
+ * - If the namespace is a sub-namespace of a Drupal module, then this method
+ * returns the autoload directory for that namespace, allowing Drupal
+ * modules containing database drivers to be added to a Drupal website
+ * without Composer.
+ * - If the namespace is a sub-namespace of Drupal\Core or Drupal\Driver,
+ * then this method returns FALSE, because Drupal core's autoloader already
+ * includes these namespaces, so no additional autoload directory is
+ * required for any code within them.
+ * - If the namespace is anything else, then this method returns FALSE,
+ * because neither drupal_get_database_types() nor
+ * static::convertDbUrlToConnectionInfo() support that anyway. One can
+ * manually edit the connection info array in settings.php to reference
+ * any arbitrary namespace, but requests using that would use the
+ * corresponding 'autoload' key in that connection info rather than calling
+ * this method.
+ *
+ * @param string $namespace
+ * The database driver's namespace.
+ * @param string $root
+ * The root directory of the Drupal installation.
+ *
+ * @return string|false
+ * The PSR-4 directory to add to the autoloader for the namespace if the
+ * namespace is a sub-namespace of a Drupal module. FALSE otherwise, as
+ * explained above.
+ *
+ * @throws \RuntimeException
+ * Exception thrown when a module provided database driver does not exist.
+ */
+ public static function findDriverAutoloadDirectory($namespace, $root) {
+ // As explained by this method's documentation, return FALSE if the
+ // namespace is not a sub-namespace of a Drupal module.
+ if (!static::isWithinModuleNamespace($namespace)) {
+ return FALSE;
+ }
+
+ // Extract the module information from the namespace.
+ list(, $module, $module_relative_namespace) = explode('\\', $namespace, 3);
+
+ // The namespace is within a Drupal module. Find the directory where the
+ // module is located.
+ $extension_discovery = new ExtensionDiscovery($root, FALSE, []);
+ $modules = $extension_discovery->scan('module');
+ if (!isset($modules[$module])) {
+ throw new \RuntimeException(sprintf("Cannot find the module '%s' for the database driver namespace '%s'", $module, $namespace));
+ }
+ $module_directory = $modules[$module]->getPath();
+
+ // All code within the Drupal\MODULE namespace is expected to follow a
+ // PSR-4 layout within the module's "src" directory.
+ $driver_directory = $module_directory . '/src/' . str_replace('\\', '/', $module_relative_namespace) . '/';
+ if (!is_dir($root . '/' . $driver_directory)) {
+ throw new \RuntimeException(sprintf("Cannot find the database driver namespace '%s' in module '%s'", $namespace, $module));
+ }
+ return $driver_directory;
}
/**
@@ -488,7 +605,16 @@ public static function getConnectionInfoAsUrl($key = 'default') {
if (empty($db_info) || empty($db_info['default'])) {
throw new \RuntimeException("Database connection $key not defined or missing the 'default' settings");
}
- $connection_class = static::getDatabaseDriverNamespace($db_info['default']) . '\\Connection';
+ $namespace = static::getDatabaseDriverNamespace($db_info['default']);
+
+ // If the driver namespace is within a Drupal module, add the module name
+ // to the connection options to make it easy for the connection class's
+ // createUrlFromConnectionOptions() method to add it to the URL.
+ if (static::isWithinModuleNamespace($namespace)) {
+ $db_info['default']['module'] = explode('\\', $namespace)[1];
+ }
+
+ $connection_class = $namespace . '\\Connection';
return $connection_class::createUrlFromConnectionOptions($db_info['default']);
}
@@ -511,4 +637,32 @@ protected static function getDatabaseDriverNamespace(array $connection_info) {
return 'Drupal\\Core\\Database\\Driver\\' . $connection_info['driver'];
}
+ /**
+ * Checks whether a namespace is within the namespace of a Drupal module.
+ *
+ * This can be used to determine if a database driver's namespace is provided
+ * by a Drupal module.
+ *
+ * @param string $namespace
+ * The namespace (for example, of a database driver) to check.
+ *
+ * @return bool
+ * TRUE if the passed in namespace is a sub-namespace of a Drupal module's
+ * namespace.
+ *
+ * @todo https://www.drupal.org/project/drupal/issues/3125476 Remove if we
+ * add this to the extension API or if
+ * \Drupal\Core\Database\Database::getConnectionInfoAsUrl() is removed.
+ */
+ private static function isWithinModuleNamespace(string $namespace) {
+ list($first, $second) = explode('\\', $namespace, 3);
+
+ // The namespace for Drupal modules is Drupal\MODULE_NAME, and the module
+ // name must be all lowercase. Second-level namespaces containing uppercase
+ // letters (e.g., "Core", "Component", "Driver") are not modules.
+ // @see \Drupal\Core\DrupalKernel::getModuleNamespacesPsr4()
+ // @see https://www.drupal.org/docs/8/creating-custom-modules/naming-and-placing-your-drupal-8-module#s-name-your-module
+ return ($first === 'Drupal' && strtolower($second) === $second);
+ }
+
}
diff --git a/web/core/lib/Drupal/Core/Database/Driver/mysql/Schema.php b/web/core/lib/Drupal/Core/Database/Driver/mysql/Schema.php
index 64612cb0f1..ed0f9c8ffc 100644
--- a/web/core/lib/Drupal/Core/Database/Driver/mysql/Schema.php
+++ b/web/core/lib/Drupal/Core/Database/Driver/mysql/Schema.php
@@ -2,7 +2,6 @@
namespace Drupal\Core\Database\Driver\mysql;
-use Drupal\Core\Database\Query\Condition;
use Drupal\Core\Database\SchemaException;
use Drupal\Core\Database\SchemaObjectExistsException;
use Drupal\Core\Database\SchemaObjectDoesNotExistException;
@@ -75,7 +74,7 @@ protected function getPrefixInfo($table = 'default', $add_prefix = TRUE) {
protected function buildTableNameCondition($table_name, $operator = '=', $add_prefix = TRUE) {
$table_info = $this->getPrefixInfo($table_name, $add_prefix);
- $condition = new Condition('AND');
+ $condition = $this->connection->condition('AND');
$condition->condition('table_schema', $table_info['database']);
$condition->condition('table_name', $table_info['table'], $operator);
return $condition;
@@ -381,10 +380,10 @@ protected function createKeySql($fields) {
*/
public function renameTable($table, $new_name) {
if (!$this->tableExists($table)) {
- throw new SchemaObjectDoesNotExistException(t("Cannot rename @table to @table_new: table @table doesn't exist.", ['@table' => $table, '@table_new' => $new_name]));
+ throw new SchemaObjectDoesNotExistException("Cannot rename '$table' to '$new_name': table '$table' doesn't exist.");
}
if ($this->tableExists($new_name)) {
- throw new SchemaObjectExistsException(t("Cannot rename @table to @table_new: table @table_new already exists.", ['@table' => $table, '@table_new' => $new_name]));
+ throw new SchemaObjectExistsException("Cannot rename '$table' to '$new_name': table '$new_name' already exists.");
}
$info = $this->getPrefixInfo($new_name);
@@ -408,10 +407,10 @@ public function dropTable($table) {
*/
public function addField($table, $field, $spec, $keys_new = []) {
if (!$this->tableExists($table)) {
- throw new SchemaObjectDoesNotExistException(t("Cannot add field @table.@field: table doesn't exist.", ['@field' => $field, '@table' => $table]));
+ throw new SchemaObjectDoesNotExistException("Cannot add field '$table.$field': table doesn't exist.");
}
if ($this->fieldExists($table, $field)) {
- throw new SchemaObjectExistsException(t("Cannot add field @table.@field: field already exists.", ['@field' => $field, '@table' => $table]));
+ throw new SchemaObjectExistsException("Cannot add field '$table.$field': field already exists.");
}
// Fields that are part of a PRIMARY KEY must be added as NOT NULL.
@@ -492,7 +491,7 @@ public function dropField($table, $field) {
public function fieldSetDefault($table, $field, $default) {
@trigger_error('fieldSetDefault() is deprecated in drupal:8.7.0 and will be removed before drupal:9.0.0. Instead, call ::changeField() passing a full field specification. See https://www.drupal.org/node/2999035', E_USER_DEPRECATED);
if (!$this->fieldExists($table, $field)) {
- throw new SchemaObjectDoesNotExistException(t("Cannot set default value of field @table.@field: field doesn't exist.", ['@table' => $table, '@field' => $field]));
+ throw new SchemaObjectDoesNotExistException("Cannot set default value of field '$table.$field': field doesn't exist.");
}
$this->connection->query('ALTER TABLE {' . $table . '} ALTER COLUMN `' . $field . '` SET DEFAULT ' . $this->escapeDefaultValue($default));
@@ -504,7 +503,7 @@ public function fieldSetDefault($table, $field, $default) {
public function fieldSetNoDefault($table, $field) {
@trigger_error('fieldSetNoDefault() is deprecated in drupal:8.7.0 and will be removed before drupal:9.0.0. Instead, call ::changeField() passing a full field specification. See https://www.drupal.org/node/2999035', E_USER_DEPRECATED);
if (!$this->fieldExists($table, $field)) {
- throw new SchemaObjectDoesNotExistException(t("Cannot remove default value of field @table.@field: field doesn't exist.", ['@table' => $table, '@field' => $field]));
+ throw new SchemaObjectDoesNotExistException("Cannot remove default value of field '$table.$field': field doesn't exist.");
}
$this->connection->query('ALTER TABLE {' . $table . '} ALTER COLUMN `' . $field . '` DROP DEFAULT');
@@ -525,10 +524,10 @@ public function indexExists($table, $name) {
*/
public function addPrimaryKey($table, $fields) {
if (!$this->tableExists($table)) {
- throw new SchemaObjectDoesNotExistException(t("Cannot add primary key to table @table: table doesn't exist.", ['@table' => $table]));
+ throw new SchemaObjectDoesNotExistException("Cannot add primary key to table '$table': table doesn't exist.");
}
if ($this->indexExists($table, 'PRIMARY')) {
- throw new SchemaObjectExistsException(t("Cannot add primary key to table @table: primary key already exists.", ['@table' => $table]));
+ throw new SchemaObjectExistsException("Cannot add primary key to table '$table': primary key already exists.");
}
$this->connection->query('ALTER TABLE {' . $table . '} ADD PRIMARY KEY (' . $this->createKeySql($fields) . ')');
@@ -562,10 +561,10 @@ protected function findPrimaryKeyColumns($table) {
*/
public function addUniqueKey($table, $name, $fields) {
if (!$this->tableExists($table)) {
- throw new SchemaObjectDoesNotExistException(t("Cannot add unique key @name to table @table: table doesn't exist.", ['@table' => $table, '@name' => $name]));
+ throw new SchemaObjectDoesNotExistException("Cannot add unique key '$name' to table '$table': table doesn't exist.");
}
if ($this->indexExists($table, $name)) {
- throw new SchemaObjectExistsException(t("Cannot add unique key @name to table @table: unique key already exists.", ['@table' => $table, '@name' => $name]));
+ throw new SchemaObjectExistsException("Cannot add unique key '$name' to table '$table': unique key already exists.");
}
$this->connection->query('ALTER TABLE {' . $table . '} ADD UNIQUE KEY `' . $name . '` (' . $this->createKeySql($fields) . ')');
@@ -588,10 +587,10 @@ public function dropUniqueKey($table, $name) {
*/
public function addIndex($table, $name, $fields, array $spec) {
if (!$this->tableExists($table)) {
- throw new SchemaObjectDoesNotExistException(t("Cannot add index @name to table @table: table doesn't exist.", ['@table' => $table, '@name' => $name]));
+ throw new SchemaObjectDoesNotExistException("Cannot add index '$name' to table '$table': table doesn't exist.");
}
if ($this->indexExists($table, $name)) {
- throw new SchemaObjectExistsException(t("Cannot add index @name to table @table: index already exists.", ['@table' => $table, '@name' => $name]));
+ throw new SchemaObjectExistsException("Cannot add index '$name' to table '$table': index already exists.");
}
$spec['indexes'][$name] = $fields;
@@ -647,10 +646,10 @@ protected function introspectIndexSchema($table) {
*/
public function changeField($table, $field, $field_new, $spec, $keys_new = []) {
if (!$this->fieldExists($table, $field)) {
- throw new SchemaObjectDoesNotExistException(t("Cannot change the definition of field @table.@name: field doesn't exist.", ['@table' => $table, '@name' => $field]));
+ throw new SchemaObjectDoesNotExistException("Cannot change the definition of field '$table.$field': field doesn't exist.");
}
if (($field != $field_new) && $this->fieldExists($table, $field_new)) {
- throw new SchemaObjectExistsException(t("Cannot rename field @table.@name to @name_new: target field already exists.", ['@table' => $table, '@name' => $field, '@name_new' => $field_new]));
+ throw new SchemaObjectExistsException("Cannot rename field '$table.$field' to '$field_new': target field already exists.");
}
if (isset($keys_new['primary key']) && in_array($field_new, $keys_new['primary key'], TRUE)) {
$this->ensureNotNullPrimaryKey($keys_new['primary key'], [$field_new => $spec]);
diff --git a/web/core/lib/Drupal/Core/Database/Driver/pgsql/Schema.php b/web/core/lib/Drupal/Core/Database/Driver/pgsql/Schema.php
index 9b4663006c..cf1a3108c2 100644
--- a/web/core/lib/Drupal/Core/Database/Driver/pgsql/Schema.php
+++ b/web/core/lib/Drupal/Core/Database/Driver/pgsql/Schema.php
@@ -396,7 +396,8 @@ protected function processField($field) {
case 'smallint':
$field['pgsql_type'] = $map['int:medium'];
break;
- case 'int' :
+
+ case 'int':
$field['pgsql_type'] = $map['int:big'];
break;
}
@@ -546,10 +547,10 @@ public function findTables($table_expression) {
*/
public function renameTable($table, $new_name) {
if (!$this->tableExists($table)) {
- throw new SchemaObjectDoesNotExistException(t("Cannot rename @table to @table_new: table @table doesn't exist.", ['@table' => $table, '@table_new' => $new_name]));
+ throw new SchemaObjectDoesNotExistException("Cannot rename '$table' to '$new_name': table '$table' doesn't exist.");
}
if ($this->tableExists($new_name)) {
- throw new SchemaObjectExistsException(t("Cannot rename @table to @table_new: table @table_new already exists.", ['@table' => $table, '@table_new' => $new_name]));
+ throw new SchemaObjectExistsException("Cannot rename '$table' to '$new_name': table '$new_name' already exists.");
}
// Get the schema and tablename for the old table.
@@ -626,10 +627,10 @@ public function dropTable($table) {
*/
public function addField($table, $field, $spec, $new_keys = []) {
if (!$this->tableExists($table)) {
- throw new SchemaObjectDoesNotExistException(t("Cannot add field @table.@field: table doesn't exist.", ['@field' => $field, '@table' => $table]));
+ throw new SchemaObjectDoesNotExistException("Cannot add field '$table.$field': table doesn't exist.");
}
if ($this->fieldExists($table, $field)) {
- throw new SchemaObjectExistsException(t("Cannot add field @table.@field: field already exists.", ['@field' => $field, '@table' => $table]));
+ throw new SchemaObjectExistsException("Cannot add field '$table.$field': field already exists.");
}
// Fields that are part of a PRIMARY KEY must be added as NOT NULL.
@@ -702,7 +703,7 @@ public function dropField($table, $field) {
public function fieldSetDefault($table, $field, $default) {
@trigger_error('fieldSetDefault() is deprecated in drupal:8.7.0 and will be removed before drupal:9.0.0. Instead, call ::changeField() passing a full field specification. See https://www.drupal.org/node/2999035', E_USER_DEPRECATED);
if (!$this->fieldExists($table, $field)) {
- throw new SchemaObjectDoesNotExistException(t("Cannot set default value of field @table.@field: field doesn't exist.", ['@table' => $table, '@field' => $field]));
+ throw new SchemaObjectDoesNotExistException("Cannot set default value of field '$table.$field': field doesn't exist.");
}
$default = $this->escapeDefaultValue($default);
@@ -716,7 +717,7 @@ public function fieldSetDefault($table, $field, $default) {
public function fieldSetNoDefault($table, $field) {
@trigger_error('fieldSetNoDefault() is deprecated in drupal:8.7.0 and will be removed before drupal:9.0.0. Instead, call ::changeField() passing a full field specification. See https://www.drupal.org/node/2999035', E_USER_DEPRECATED);
if (!$this->fieldExists($table, $field)) {
- throw new SchemaObjectDoesNotExistException(t("Cannot remove default value of field @table.@field: field doesn't exist.", ['@table' => $table, '@field' => $field]));
+ throw new SchemaObjectDoesNotExistException("Cannot remove default value of field '$table.$field': field doesn't exist.");
}
$this->connection->query('ALTER TABLE {' . $table . '} ALTER COLUMN "' . $field . '" DROP DEFAULT');
@@ -779,10 +780,10 @@ public function constraintExists($table, $name) {
*/
public function addPrimaryKey($table, $fields) {
if (!$this->tableExists($table)) {
- throw new SchemaObjectDoesNotExistException(t("Cannot add primary key to table @table: table doesn't exist.", ['@table' => $table]));
+ throw new SchemaObjectDoesNotExistException("Cannot add primary key to table '$table': table doesn't exist.");
}
if ($this->constraintExists($table, 'pkey')) {
- throw new SchemaObjectExistsException(t("Cannot add primary key to table @table: primary key already exists.", ['@table' => $table]));
+ throw new SchemaObjectExistsException("Cannot add primary key to table '$table': primary key already exists.");
}
$this->connection->query('ALTER TABLE {' . $table . '} ADD CONSTRAINT ' . $this->ensureIdentifiersLength($table, '', 'pkey') . ' PRIMARY KEY (' . $this->createPrimaryKeySql($fields) . ')');
@@ -830,10 +831,10 @@ protected function findPrimaryKeyColumns($table) {
*/
public function addUniqueKey($table, $name, $fields) {
if (!$this->tableExists($table)) {
- throw new SchemaObjectDoesNotExistException(t("Cannot add unique key @name to table @table: table doesn't exist.", ['@table' => $table, '@name' => $name]));
+ throw new SchemaObjectDoesNotExistException("Cannot add unique key '$name' to table '$table': table doesn't exist.");
}
if ($this->constraintExists($table, $name . '__key')) {
- throw new SchemaObjectExistsException(t("Cannot add unique key @name to table @table: unique key already exists.", ['@table' => $table, '@name' => $name]));
+ throw new SchemaObjectExistsException("Cannot add unique key '$name' to table '$table': unique key already exists.");
}
$this->connection->query('ALTER TABLE {' . $table . '} ADD CONSTRAINT ' . $this->ensureIdentifiersLength($table, $name, 'key') . ' UNIQUE (' . implode(',', $fields) . ')');
@@ -858,10 +859,10 @@ public function dropUniqueKey($table, $name) {
*/
public function addIndex($table, $name, $fields, array $spec) {
if (!$this->tableExists($table)) {
- throw new SchemaObjectDoesNotExistException(t("Cannot add index @name to table @table: table doesn't exist.", ['@table' => $table, '@name' => $name]));
+ throw new SchemaObjectDoesNotExistException("Cannot add index '$name' to table '$table': table doesn't exist.");
}
if ($this->indexExists($table, $name)) {
- throw new SchemaObjectExistsException(t("Cannot add index @name to table @table: index already exists.", ['@table' => $table, '@name' => $name]));
+ throw new SchemaObjectExistsException("Cannot add index '$name' to table '$table': index already exists.");
}
$this->connection->query($this->_createIndexSql($table, $name, $fields));
@@ -918,10 +919,10 @@ protected function introspectIndexSchema($table) {
*/
public function changeField($table, $field, $field_new, $spec, $new_keys = []) {
if (!$this->fieldExists($table, $field)) {
- throw new SchemaObjectDoesNotExistException(t("Cannot change the definition of field @table.@name: field doesn't exist.", ['@table' => $table, '@name' => $field]));
+ throw new SchemaObjectDoesNotExistException("Cannot change the definition of field '$table.$field': field doesn't exist.");
}
if (($field != $field_new) && $this->fieldExists($table, $field_new)) {
- throw new SchemaObjectExistsException(t("Cannot rename field @table.@name to @name_new: target field already exists.", ['@table' => $table, '@name' => $field, '@name_new' => $field_new]));
+ throw new SchemaObjectExistsException("Cannot rename field '$table.$field' to '$field_new': target field already exists.");
}
if (isset($new_keys['primary key']) && in_array($field_new, $new_keys['primary key'], TRUE)) {
$this->ensureNotNullPrimaryKey($new_keys['primary key'], [$field_new => $spec]);
diff --git a/web/core/lib/Drupal/Core/Database/Driver/sqlite/Connection.php b/web/core/lib/Drupal/Core/Database/Driver/sqlite/Connection.php
index fe007cfe05..2f71cfdd27 100644
--- a/web/core/lib/Drupal/Core/Database/Driver/sqlite/Connection.php
+++ b/web/core/lib/Drupal/Core/Database/Driver/sqlite/Connection.php
@@ -180,7 +180,7 @@ public function __destruct() {
$count = $this->query('SELECT COUNT(*) FROM ' . $prefix . '.sqlite_master WHERE type = :type AND name NOT LIKE :pattern', [':type' => 'table', ':pattern' => 'sqlite_%'])->fetchField();
// We can prune the database file if it doesn't have any tables.
- if ($count == 0) {
+ if ($count == 0 && $this->connectionOptions['database'] != ':memory:') {
// Detaching the database fails at this point, but no other queries
// are executed after the connection is destructed so we can simply
// remove the database file.
@@ -447,7 +447,7 @@ public static function createConnectionOptionsFromUrl($url, $root) {
if ($url_components['path'][0] === '/') {
$url_components['path'] = substr($url_components['path'], 1);
}
- if ($url_components['path'][0] === '/') {
+ if ($url_components['path'][0] === '/' || $url_components['path'] === ':memory:') {
$database['database'] = $url_components['path'];
}
else {
diff --git a/web/core/lib/Drupal/Core/Database/Driver/sqlite/Schema.php b/web/core/lib/Drupal/Core/Database/Driver/sqlite/Schema.php
index 96441bc9fc..41106995f3 100644
--- a/web/core/lib/Drupal/Core/Database/Driver/sqlite/Schema.php
+++ b/web/core/lib/Drupal/Core/Database/Driver/sqlite/Schema.php
@@ -262,10 +262,10 @@ public function getFieldTypeMap() {
*/
public function renameTable($table, $new_name) {
if (!$this->tableExists($table)) {
- throw new SchemaObjectDoesNotExistException(t("Cannot rename @table to @table_new: table @table doesn't exist.", ['@table' => $table, '@table_new' => $new_name]));
+ throw new SchemaObjectDoesNotExistException("Cannot rename '$table' to '$new_name': table '$table' doesn't exist.");
}
if ($this->tableExists($new_name)) {
- throw new SchemaObjectExistsException(t("Cannot rename @table to @table_new: table @table_new already exists.", ['@table' => $table, '@table_new' => $new_name]));
+ throw new SchemaObjectExistsException("Cannot rename '$table' to '$new_name': table '$new_name' already exists.");
}
$schema = $this->introspectSchema($table);
@@ -314,10 +314,10 @@ public function dropTable($table) {
*/
public function addField($table, $field, $specification, $keys_new = []) {
if (!$this->tableExists($table)) {
- throw new SchemaObjectDoesNotExistException(t("Cannot add field @table.@field: table doesn't exist.", ['@field' => $field, '@table' => $table]));
+ throw new SchemaObjectDoesNotExistException("Cannot add field '$table.$field': table doesn't exist.");
}
if ($this->fieldExists($table, $field)) {
- throw new SchemaObjectExistsException(t("Cannot add field @table.@field: field already exists.", ['@field' => $field, '@table' => $table]));
+ throw new SchemaObjectExistsException("Cannot add field '$table.$field': field already exists.");
}
if (isset($keys_new['primary key']) && in_array($field, $keys_new['primary key'], TRUE)) {
$this->ensureNotNullPrimaryKey($keys_new['primary key'], [$field => $specification]);
@@ -586,10 +586,10 @@ public function dropField($table, $field) {
*/
public function changeField($table, $field, $field_new, $spec, $keys_new = []) {
if (!$this->fieldExists($table, $field)) {
- throw new SchemaObjectDoesNotExistException(t("Cannot change the definition of field @table.@name: field doesn't exist.", ['@table' => $table, '@name' => $field]));
+ throw new SchemaObjectDoesNotExistException("Cannot change the definition of field '$table.$field': field doesn't exist.");
}
if (($field != $field_new) && $this->fieldExists($table, $field_new)) {
- throw new SchemaObjectExistsException(t("Cannot rename field @table.@name to @name_new: target field already exists.", ['@table' => $table, '@name' => $field, '@name_new' => $field_new]));
+ throw new SchemaObjectExistsException("Cannot rename field '$table.$field' to '$field_new': target field already exists.");
}
if (isset($keys_new['primary key']) && in_array($field_new, $keys_new['primary key'], TRUE)) {
$this->ensureNotNullPrimaryKey($keys_new['primary key'], [$field_new => $spec]);
@@ -659,10 +659,10 @@ protected function mapKeyDefinition(array $key_definition, array $mapping) {
*/
public function addIndex($table, $name, $fields, array $spec) {
if (!$this->tableExists($table)) {
- throw new SchemaObjectDoesNotExistException(t("Cannot add index @name to table @table: table doesn't exist.", ['@table' => $table, '@name' => $name]));
+ throw new SchemaObjectDoesNotExistException("Cannot add index '$name' to table '$table': table doesn't exist.");
}
if ($this->indexExists($table, $name)) {
- throw new SchemaObjectExistsException(t("Cannot add index @name to table @table: index already exists.", ['@table' => $table, '@name' => $name]));
+ throw new SchemaObjectExistsException("Cannot add index '$name' to table '$table': index already exists.");
}
$schema['indexes'][$name] = $fields;
@@ -700,10 +700,10 @@ public function dropIndex($table, $name) {
*/
public function addUniqueKey($table, $name, $fields) {
if (!$this->tableExists($table)) {
- throw new SchemaObjectDoesNotExistException(t("Cannot add unique key @name to table @table: table doesn't exist.", ['@table' => $table, '@name' => $name]));
+ throw new SchemaObjectDoesNotExistException("Cannot add unique key '$name' to table '$table': table doesn't exist.");
}
if ($this->indexExists($table, $name)) {
- throw new SchemaObjectExistsException(t("Cannot add unique key @name to table @table: unique key already exists.", ['@table' => $table, '@name' => $name]));
+ throw new SchemaObjectExistsException("Cannot add unique key '$name' to table '$table': unique key already exists.");
}
$schema['unique keys'][$name] = $fields;
@@ -732,14 +732,14 @@ public function dropUniqueKey($table, $name) {
*/
public function addPrimaryKey($table, $fields) {
if (!$this->tableExists($table)) {
- throw new SchemaObjectDoesNotExistException(t("Cannot add primary key to table @table: table doesn't exist.", ['@table' => $table]));
+ throw new SchemaObjectDoesNotExistException("Cannot add primary key to table '$table': table doesn't exist.");
}
$old_schema = $this->introspectSchema($table);
$new_schema = $old_schema;
if (!empty($new_schema['primary key'])) {
- throw new SchemaObjectExistsException(t("Cannot add primary key to table @table: primary key already exists.", ['@table' => $table]));
+ throw new SchemaObjectExistsException("Cannot add primary key to table '$table': primary key already exists.");
}
$new_schema['primary key'] = $fields;
@@ -792,7 +792,7 @@ protected function introspectIndexSchema($table) {
public function fieldSetDefault($table, $field, $default) {
@trigger_error('fieldSetDefault() is deprecated in drupal:8.7.0 and will be removed before drupal:9.0.0. Instead, call ::changeField() passing a full field specification. See https://www.drupal.org/node/2999035', E_USER_DEPRECATED);
if (!$this->fieldExists($table, $field)) {
- throw new SchemaObjectDoesNotExistException(t("Cannot set default value of field @table.@field: field doesn't exist.", ['@table' => $table, '@field' => $field]));
+ throw new SchemaObjectDoesNotExistException("Cannot set default value of field '$table.$field': field doesn't exist.");
}
$old_schema = $this->introspectSchema($table);
@@ -808,7 +808,7 @@ public function fieldSetDefault($table, $field, $default) {
public function fieldSetNoDefault($table, $field) {
@trigger_error('fieldSetNoDefault() is deprecated in drupal:8.7.0 and will be removed before drupal:9.0.0. Instead, call ::changeField() passing a full field specification. See https://www.drupal.org/node/2999035', E_USER_DEPRECATED);
if (!$this->fieldExists($table, $field)) {
- throw new SchemaObjectDoesNotExistException(t("Cannot remove default value of field @table.@field: field doesn't exist.", ['@table' => $table, '@field' => $field]));
+ throw new SchemaObjectDoesNotExistException("Cannot remove default value of field '$table.$field': field doesn't exist.");
}
$old_schema = $this->introspectSchema($table);
diff --git a/web/core/lib/Drupal/Core/Database/Install/Tasks.php b/web/core/lib/Drupal/Core/Database/Install/Tasks.php
index 6ba3ba733c..16b636bdfe 100644
--- a/web/core/lib/Drupal/Core/Database/Install/Tasks.php
+++ b/web/core/lib/Drupal/Core/Database/Install/Tasks.php
@@ -150,6 +150,19 @@ public function runTasks() {
return $this->results['fail'];
}
+ /**
+ * Checks engine version requirements for the status report.
+ *
+ * This method is called during runtime and update requirements checks.
+ *
+ * @return \Drupal\Core\StringTranslation\TranslatableMarkup[]
+ * A list of error messages.
+ */
+ final public function engineVersionRequirementsCheck() {
+ $this->checkEngineVersion();
+ return $this->results['fail'];
+ }
+
/**
* Check if we can connect to the database.
*/
@@ -202,6 +215,13 @@ protected function checkEngineVersion() {
* The options form array.
*/
public function getFormOptions(array $database) {
+ // Use reflection to determine the driver name.
+ // @todo https:///www.drupal.org/node/3123240 Provide a better way to get
+ // the driver name.
+ $reflection = new \ReflectionClass($this);
+ $dir_parts = explode(DIRECTORY_SEPARATOR, dirname(dirname($reflection->getFileName())));
+ $driver = array_pop($dir_parts);
+
$form['database'] = [
'#type' => 'textfield',
'#title' => t('Database name'),
@@ -210,7 +230,7 @@ public function getFormOptions(array $database) {
'#required' => TRUE,
'#states' => [
'required' => [
- ':input[name=driver]' => ['value' => $this->pdoDriver],
+ ':input[name=driver]' => ['value' => $driver],
],
],
];
@@ -223,7 +243,7 @@ public function getFormOptions(array $database) {
'#required' => TRUE,
'#states' => [
'required' => [
- ':input[name=driver]' => ['value' => $this->pdoDriver],
+ ':input[name=driver]' => ['value' => $driver],
],
],
];
diff --git a/web/core/lib/Drupal/Core/Database/Query/Condition.php b/web/core/lib/Drupal/Core/Database/Query/Condition.php
index e7038e23c9..2515bbfdc8 100644
--- a/web/core/lib/Drupal/Core/Database/Query/Condition.php
+++ b/web/core/lib/Drupal/Core/Database/Query/Condition.php
@@ -399,7 +399,7 @@ protected function mapConditionOperator($operator) {
* {@inheritdoc}
*/
public function conditionGroupFactory($conjunction = 'AND') {
- return new Condition($conjunction);
+ return new static($conjunction);
}
/**
diff --git a/web/core/lib/Drupal/Core/Database/Query/Delete.php b/web/core/lib/Drupal/Core/Database/Query/Delete.php
index def88385e0..658b8342cc 100644
--- a/web/core/lib/Drupal/Core/Database/Query/Delete.php
+++ b/web/core/lib/Drupal/Core/Database/Query/Delete.php
@@ -36,7 +36,7 @@ public function __construct(Connection $connection, $table, array $options = [])
parent::__construct($connection, $options);
$this->table = $table;
- $this->condition = new Condition('AND');
+ $this->condition = $this->connection->condition('AND');
}
/**
diff --git a/web/core/lib/Drupal/Core/Database/Query/Merge.php b/web/core/lib/Drupal/Core/Database/Query/Merge.php
index 6d89532472..92d9c572ca 100644
--- a/web/core/lib/Drupal/Core/Database/Query/Merge.php
+++ b/web/core/lib/Drupal/Core/Database/Query/Merge.php
@@ -138,7 +138,7 @@ public function __construct(Connection $connection, $table, array $options = [])
parent::__construct($connection, $options);
$this->table = $table;
$this->conditionTable = $table;
- $this->condition = new Condition('AND');
+ $this->condition = $this->connection->condition('AND');
}
/**
@@ -359,7 +359,7 @@ public function execute() {
try {
if (!count($this->condition)) {
- throw new InvalidMergeQueryException(t('Invalid merge query: no conditions'));
+ throw new InvalidMergeQueryException('Invalid merge query: no conditions');
}
$select = $this->connection->select($this->conditionTable)
->condition($this->condition);
diff --git a/web/core/lib/Drupal/Core/Database/Query/QueryConditionTrait.php b/web/core/lib/Drupal/Core/Database/Query/QueryConditionTrait.php
index 9053a17772..83be429fa5 100644
--- a/web/core/lib/Drupal/Core/Database/Query/QueryConditionTrait.php
+++ b/web/core/lib/Drupal/Core/Database/Query/QueryConditionTrait.php
@@ -108,7 +108,7 @@ public function compiled() {
* {@inheritdoc}
*/
public function conditionGroupFactory($conjunction = 'AND') {
- return new Condition($conjunction);
+ return $this->connection->condition($conjunction);
}
/**
diff --git a/web/core/lib/Drupal/Core/Database/Query/Select.php b/web/core/lib/Drupal/Core/Database/Query/Select.php
index fe88f84172..45d0fce249 100644
--- a/web/core/lib/Drupal/Core/Database/Query/Select.php
+++ b/web/core/lib/Drupal/Core/Database/Query/Select.php
@@ -134,8 +134,8 @@ public function __construct($table, $alias, Connection $connection, $options = [
$options['return'] = Database::RETURN_STATEMENT;
parent::__construct($connection, $options);
$conjunction = isset($options['conjunction']) ? $options['conjunction'] : 'AND';
- $this->condition = new Condition($conjunction);
- $this->having = new Condition($conjunction);
+ $this->condition = $this->connection->condition($conjunction);
+ $this->having = $this->connection->condition($conjunction);
$this->addJoin(NULL, $table, $alias);
}
diff --git a/web/core/lib/Drupal/Core/Database/Query/SelectExtender.php b/web/core/lib/Drupal/Core/Database/Query/SelectExtender.php
index bc15c19e70..47099edb63 100644
--- a/web/core/lib/Drupal/Core/Database/Query/SelectExtender.php
+++ b/web/core/lib/Drupal/Core/Database/Query/SelectExtender.php
@@ -528,7 +528,7 @@ public function __call($method, $args) {
* {@inheritdoc}
*/
public function conditionGroupFactory($conjunction = 'AND') {
- return new Condition($conjunction);
+ return $this->connection->condition($conjunction);
}
/**
diff --git a/web/core/lib/Drupal/Core/Database/Query/Update.php b/web/core/lib/Drupal/Core/Database/Query/Update.php
index 5de5d682ec..2b08e20d00 100644
--- a/web/core/lib/Drupal/Core/Database/Query/Update.php
+++ b/web/core/lib/Drupal/Core/Database/Query/Update.php
@@ -65,7 +65,7 @@ public function __construct(Connection $connection, $table, array $options = [])
parent::__construct($connection, $options);
$this->table = $table;
- $this->condition = new Condition('AND');
+ $this->condition = $this->connection->condition('AND');
}
/**
diff --git a/web/core/lib/Drupal/Core/Database/Schema.php b/web/core/lib/Drupal/Core/Database/Schema.php
index 01ab753d92..620972082a 100644
--- a/web/core/lib/Drupal/Core/Database/Schema.php
+++ b/web/core/lib/Drupal/Core/Database/Schema.php
@@ -2,7 +2,6 @@
namespace Drupal\Core\Database;
-use Drupal\Core\Database\Query\Condition;
use Drupal\Core\Database\Query\PlaceholderInterface;
/**
@@ -150,7 +149,7 @@ protected function buildTableNameCondition($table_name, $operator = '=', $add_pr
// Retrieve the table name and schema
$table_info = $this->getPrefixInfo($table_name, $add_prefix);
- $condition = new Condition('AND');
+ $condition = $this->connection->condition('AND');
$condition->condition('table_catalog', $info['database']);
$condition->condition('table_schema', $table_info['schema']);
$condition->condition('table_name', $table_info['table'], $operator);
@@ -650,7 +649,7 @@ abstract public function changeField($table, $field, $field_new, $spec, $keys_ne
*/
public function createTable($name, $table) {
if ($this->tableExists($name)) {
- throw new SchemaObjectExistsException(t('Table @name already exists.', ['@name' => $name]));
+ throw new SchemaObjectExistsException("Table '$name' already exists.");
}
$statements = $this->createTableSql($name, $table);
foreach ($statements as $statement) {
diff --git a/web/core/lib/Drupal/Core/Database/Statement.php b/web/core/lib/Drupal/Core/Database/Statement.php
index 8060fbcde5..c6a120d611 100644
--- a/web/core/lib/Drupal/Core/Database/Statement.php
+++ b/web/core/lib/Drupal/Core/Database/Statement.php
@@ -153,8 +153,10 @@ public function setFetchMode($mode, $a1 = NULL, $a2 = []) {
switch (func_num_args()) {
case 1:
return parent::setFetchMode($mode);
+
case 2:
return parent::setFetchMode($mode, $a1);
+
case 3:
default:
return parent::setFetchMode($mode, $a1, $a2);
@@ -171,10 +173,13 @@ public function fetchAll($mode = NULL, $column_index = NULL, $constructor_argume
switch (func_num_args()) {
case 0:
return parent::fetchAll();
+
case 1:
return parent::fetchAll($mode);
+
case 2:
return parent::fetchAll($mode, $column_index);
+
case 3:
default:
return parent::fetchAll($mode, $column_index, $constructor_arguments);
diff --git a/web/core/lib/Drupal/Core/Database/StatementPrefetch.php b/web/core/lib/Drupal/Core/Database/StatementPrefetch.php
index 814653b3ce..90beeae143 100644
--- a/web/core/lib/Drupal/Core/Database/StatementPrefetch.php
+++ b/web/core/lib/Drupal/Core/Database/StatementPrefetch.php
@@ -242,9 +242,11 @@ public function setFetchMode($mode, $a1 = NULL, $a2 = []) {
$this->defaultFetchOptions['constructor_args'] = $a2;
}
break;
+
case \PDO::FETCH_COLUMN:
$this->defaultFetchOptions['column'] = $a1;
break;
+
case \PDO::FETCH_INTO:
$this->defaultFetchOptions['object'] = $a1;
break;
@@ -270,17 +272,21 @@ public function current() {
switch ($this->fetchStyle) {
case \PDO::FETCH_ASSOC:
return $this->currentRow;
+
case \PDO::FETCH_BOTH:
// \PDO::FETCH_BOTH returns an array indexed by both the column name
// and the column number.
return $this->currentRow + array_values($this->currentRow);
+
case \PDO::FETCH_NUM:
return array_values($this->currentRow);
+
case \PDO::FETCH_LAZY:
// We do not do lazy as everything is fetched already. Fallback to
// \PDO::FETCH_OBJ.
case \PDO::FETCH_OBJ:
return (object) $this->currentRow;
+
case \PDO::FETCH_CLASS | \PDO::FETCH_CLASSTYPE:
$class_name = array_shift($this->currentRow);
// Deliberate no break.
@@ -299,11 +305,13 @@ public function current() {
$result->$k = $v;
}
return $result;
+
case \PDO::FETCH_INTO:
foreach ($this->currentRow as $k => $v) {
$this->fetchOptions['object']->$k = $v;
}
return $this->fetchOptions['object'];
+
case \PDO::FETCH_COLUMN:
if (isset($this->columnNames[$this->fetchOptions['column']])) {
return $this->currentRow[$this->columnNames[$this->fetchOptions['column']]];
@@ -417,7 +425,10 @@ public function fetchObject($class_name = NULL, $constructor_args = []) {
}
else {
$this->fetchStyle = \PDO::FETCH_CLASS;
- $this->fetchOptions = ['constructor_args' => $constructor_args];
+ $this->fetchOptions = [
+ 'class' => $class_name,
+ 'constructor_args' => $constructor_args,
+ ];
// Grab the row in the format specified above.
$result = $this->current();
// Reset the fetch parameters to the value stored using setFetchMode().
diff --git a/web/core/lib/Drupal/Core/DrupalKernel.php b/web/core/lib/Drupal/Core/DrupalKernel.php
index ada9efec84..69972b1cce 100644
--- a/web/core/lib/Drupal/Core/DrupalKernel.php
+++ b/web/core/lib/Drupal/Core/DrupalKernel.php
@@ -491,7 +491,7 @@ public function boot() {
// Continue if the PharStreamWrapperManager is already initialized. For
// example, this occurs during a module install.
// @see \Drupal\Core\Extension\ModuleInstaller::install()
- };
+ }
stream_wrapper_unregister('phar');
stream_wrapper_register('phar', PharStreamWrapper::class);
}
diff --git a/web/core/lib/Drupal/Core/Entity/ContentEntityStorageBase.php b/web/core/lib/Drupal/Core/Entity/ContentEntityStorageBase.php
index 23e1f32c56..509a8bcaa4 100644
--- a/web/core/lib/Drupal/Core/Entity/ContentEntityStorageBase.php
+++ b/web/core/lib/Drupal/Core/Entity/ContentEntityStorageBase.php
@@ -987,7 +987,7 @@ protected function populateAffectedRevisionTranslations(ContentEntityInterface $
* @param array $ids
* The entity key values to verify.
* @param string $entity_key
- * (optional) The entity key to sanitise values for. Defaults to 'id'.
+ * (optional) The entity key to sanitize values for. Defaults to 'id'.
*
* @return array
* The sanitized list of entity key values.
diff --git a/web/core/lib/Drupal/Core/Entity/EntityAutocompleteMatcher.php b/web/core/lib/Drupal/Core/Entity/EntityAutocompleteMatcher.php
index 93a8539ced..2620699926 100644
--- a/web/core/lib/Drupal/Core/Entity/EntityAutocompleteMatcher.php
+++ b/web/core/lib/Drupal/Core/Entity/EntityAutocompleteMatcher.php
@@ -9,7 +9,7 @@
/**
* Matcher class to get autocompletion results for entity reference.
*/
-class EntityAutocompleteMatcher {
+class EntityAutocompleteMatcher implements EntityAutocompleteMatcherInterface {
/**
* The entity reference selection handler plugin manager.
@@ -29,25 +29,7 @@ public function __construct(SelectionPluginManagerInterface $selection_manager)
}
/**
- * Gets matched labels based on a given search string.
- *
- * @param string $target_type
- * The ID of the target entity type.
- * @param string $selection_handler
- * The plugin ID of the entity reference selection handler.
- * @param array $selection_settings
- * An array of settings that will be passed to the selection handler.
- * @param string $string
- * (optional) The label of the entity to query by.
- *
- * @return array
- * An array of matched entity labels, in the format required by the AJAX
- * autocomplete API (e.g. array('value' => $value, 'label' => $label)).
- *
- * @throws \Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException
- * Thrown when the current user doesn't have access to the specified entity.
- *
- * @see \Drupal\system\Controller\EntityAutocompleteController
+ * {@inheritDoc}
*/
public function getMatches($target_type, $selection_handler, $selection_settings, $string = '') {
$matches = [];
diff --git a/web/core/lib/Drupal/Core/Entity/EntityAutocompleteMatcherInterface.php b/web/core/lib/Drupal/Core/Entity/EntityAutocompleteMatcherInterface.php
new file mode 100644
index 0000000000..f339f19e75
--- /dev/null
+++ b/web/core/lib/Drupal/Core/Entity/EntityAutocompleteMatcherInterface.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Drupal\Core\Entity;
+
+interface EntityAutocompleteMatcherInterface {
+
+ /**
+ * Gets matched labels based on a given search string.
+ *
+ * @param string $target_type
+ * The ID of the target entity type.
+ * @param string $selection_handler
+ * The plugin ID of the entity reference selection handler.
+ * @param array $selection_settings
+ * An array of settings that will be passed to the selection handler.
+ * @param string $string
+ * (optional) The label of the entity to query by.
+ *
+ * @return array
+ * An array of matched entity labels, in the format required by the AJAX
+ * autocomplete API (e.g. array('value' => $value, 'label' => $label)).
+ *
+ * @throws \Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException
+ * Thrown when the current user doesn't have access to the specified entity.
+ *
+ * @see \Drupal\system\Controller\EntityAutocompleteController
+ */
+ public function getMatches($target_type, $selection_handler, $selection_settings, $string = '');
+
+}
diff --git a/web/core/lib/Drupal/Core/Entity/EntityBase.php b/web/core/lib/Drupal/Core/Entity/EntityBase.php
index 08470cbcdc..1820192d33 100644
--- a/web/core/lib/Drupal/Core/Entity/EntityBase.php
+++ b/web/core/lib/Drupal/Core/Entity/EntityBase.php
@@ -493,12 +493,24 @@ public function getCacheContexts() {
return $this->cacheContexts;
}
+ /**
+ * The list cache tags to invalidate for this entity.
+ *
+ * @return string[]
+ * Set of list cache tags.
+ */
+ protected function getListCacheTagsToInvalidate() {
+ $tags = $this->getEntityType()->getListCacheTags();
+ if ($this->getEntityType()->hasKey('bundle')) {
+ $tags[] = $this->getEntityTypeId() . '_list:' . $this->bundle();
+ }
+ return $tags;
+ }
+
/**
* {@inheritdoc}
*/
public function getCacheTagsToInvalidate() {
- // @todo Add bundle-specific listing cache tag?
- // https://www.drupal.org/node/2145751
if ($this->isNew()) {
return [];
}
@@ -563,7 +575,7 @@ protected function invalidateTagsOnSave($update) {
// updated entity may start to appear in a listing because it now meets that
// listing's filtering requirements. A newly created entity may start to
// appear in listings because it did not exist before.)
- $tags = $this->getEntityType()->getListCacheTags();
+ $tags = $this->getListCacheTagsToInvalidate();
if ($this->hasLinkTemplate('canonical')) {
// Creating or updating an entity may change a cached 403 or 404 response.
$tags = Cache::mergeTags($tags, ['4xx-response']);
@@ -592,6 +604,7 @@ protected static function invalidateTagsOnDelete(EntityTypeInterface $entity_typ
// cache tag, but subsequent list pages would not be invalidated, hence we
// must invalidate its list cache tags as well.)
$tags = Cache::mergeTags($tags, $entity->getCacheTagsToInvalidate());
+ $tags = Cache::mergeTags($tags, $entity->getListCacheTagsToInvalidate());
}
Cache::invalidateTags($tags);
}
diff --git a/web/core/lib/Drupal/Core/Entity/EntityBundleAccessCheck.php b/web/core/lib/Drupal/Core/Entity/EntityBundleAccessCheck.php
new file mode 100644
index 0000000000..1d95dfe8d5
--- /dev/null
+++ b/web/core/lib/Drupal/Core/Entity/EntityBundleAccessCheck.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace Drupal\Core\Entity;
+
+use Drupal\Core\Access\AccessResult;
+use Drupal\Core\Routing\Access\AccessInterface;
+use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Core\Session\AccountInterface;
+use Symfony\Component\Routing\Route;
+
+/**
+ * Provides an entity bundle checker for the _entity_bundles route requirement.
+ */
+class EntityBundleAccessCheck implements AccessInterface {
+
+ /**
+ * Checks entity bundle match based on the _entity_bundles route requirement.
+ *
+ * @code
+ * example.route:
+ * path: foo/{example_entity_type}/{other_parameter}
+ * requirements:
+ * _entity_bundles: 'example_entity_type:example_bundle|other_example_bundle'
+ * @endcode
+ *
+ * @param \Symfony\Component\Routing\Route $route
+ * The route to check against.
+ * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+ * The parametrized route.
+ * @param \Drupal\Core\Session\AccountInterface $account
+ * The currently logged in account.
+ *
+ * @return \Drupal\Core\Access\AccessResultInterface
+ * The access result.
+ */
+ public function access(Route $route, RouteMatchInterface $route_match, AccountInterface $account) {
+ if ($route->hasRequirement('_entity_bundles')) {
+ list($entity_type, $bundle_definition) = explode(':', $route->getRequirement('_entity_bundles'));
+ $bundles = explode('|', $bundle_definition);
+ $parameters = $route_match->getParameters();
+ if ($parameters->has($entity_type)) {
+ $entity = $parameters->get($entity_type);
+ if ($entity instanceof EntityInterface && in_array($entity->bundle(), $bundles, TRUE)) {
+ return AccessResult::allowed()->addCacheableDependency($entity);
+ }
+ }
+ }
+ return AccessResult::neutral('The entity bundle does not match the route _entity_bundles requirement.');
+ }
+
+}
diff --git a/web/core/lib/Drupal/Core/Entity/EntityType.php b/web/core/lib/Drupal/Core/Entity/EntityType.php
index f4c6d991d2..fdaab2e6cd 100644
--- a/web/core/lib/Drupal/Core/Entity/EntityType.php
+++ b/web/core/lib/Drupal/Core/Entity/EntityType.php
@@ -447,6 +447,7 @@ public function entityClassImplements($interface) {
* {@inheritdoc}
*/
public function isSubclassOf($class) {
+ @trigger_error(__METHOD__ . '() is deprecated in drupal:8.3.0 and is removed from drupal:10.0.0. Use Drupal\Core\Entity\EntityTypeInterface::entityClassImplements() instead. See https://www.drupal.org/node/2842808', E_USER_DEPRECATED);
return $this->entityClassImplements($class);
}
@@ -465,6 +466,7 @@ public function getHandlerClass($handler_type, $nested = FALSE) {
$handlers = $this->getHandlerClasses();
return $nested ? $handlers[$handler_type][$nested] : $handlers[$handler_type];
}
+ return NULL;
}
/**
@@ -819,8 +821,11 @@ public function getCountLabel($count) {
if (empty($this->label_count)) {
return $this->formatPlural($count, '@count @label', '@count @label entities', ['@label' => $this->getSingularLabel()], ['context' => 'Entity type label']);
}
- $context = isset($this->label_count['context']) ? $this->label_count['context'] : 'Entity type label';
- return $this->formatPlural($count, $this->label_count['singular'], $this->label_count['plural'], ['context' => $context]);
+ $options = [];
+ if (isset($this->label_count['context'])) {
+ $options['context'] = $this->label_count['context'];
+ }
+ return $this->formatPlural($count, $this->label_count['singular'], $this->label_count['plural'], [], $options);
}
/**
diff --git a/web/core/lib/Drupal/Core/Entity/EntityTypeInterface.php b/web/core/lib/Drupal/Core/Entity/EntityTypeInterface.php
index a4a3a416b2..bfbea3c22b 100644
--- a/web/core/lib/Drupal/Core/Entity/EntityTypeInterface.php
+++ b/web/core/lib/Drupal/Core/Entity/EntityTypeInterface.php
@@ -157,8 +157,9 @@ public function isPersistentlyCacheable();
*
* @param string $handler_type
* The type of handler to check.
- * @param bool $nested
- * (optional) If this handler has a nested definition. Defaults to FALSE.
+ * @param string|false $nested
+ * (optional) The nested handler definition key, or FALSE if the handler
+ * does not have a nested definition. Defaults to FALSE.
*
* @return bool
* TRUE if a handler of this type exists, FALSE otherwise.
@@ -168,11 +169,14 @@ public function hasHandlerClass($handler_type, $nested = FALSE);
/**
* @param string $handler_type
* The handler type to get.
+ * @param string|false $nested
+ * (optional) The nested handler definition key, or FALSE if the handler
+ * does not have a nested definition. Defaults to FALSE.
*
* @return array|string|null
* The handlers for a given type, or NULL if none exist.
*/
- public function getHandlerClass($handler_type);
+ public function getHandlerClass($handler_type, $nested = FALSE);
/**
* Gets an array of handlers.
@@ -228,8 +232,9 @@ public function setStorageClass($class);
* @param string $operation
* The name of the operation to use, e.g., 'default'.
*
- * @return string
- * The class for this operation's form for this entity type.
+ * @return string|null
+ * The class for this operation's form for this entity type or NULL if the
+ * entity type does not have a form class for this operation.
*
* @see \Drupal\Core\Entity\EntityFormBuilderInterface
*/
@@ -364,9 +369,11 @@ public function entityClassImplements($interface);
* @return bool
* TRUE if the entity type is a subclass of the class or interface.
*
- * @deprecated in drupal:8.3.0 and is removed from drupal:9.0.0.
+ * @deprecated in drupal:8.3.0 and is removed from drupal:10.0.0.
* Use Drupal\Core\Entity\EntityTypeInterface::entityClassImplements()
* instead.
+ *
+ * @see https://www.drupal.org/node/2842808
*/
public function isSubclassOf($class);
diff --git a/web/core/lib/Drupal/Core/Entity/FieldableEntityStorageInterface.php b/web/core/lib/Drupal/Core/Entity/FieldableEntityStorageInterface.php
index 79c57f9dc5..933d8e0bc6 100644
--- a/web/core/lib/Drupal/Core/Entity/FieldableEntityStorageInterface.php
+++ b/web/core/lib/Drupal/Core/Entity/FieldableEntityStorageInterface.php
@@ -16,7 +16,7 @@ interface FieldableEntityStorageInterface extends EntityStorageInterface {
* @param \Drupal\Core\Field\FieldStorageDefinitionInterface $storage_definition
* The field for which to count data records.
* @param bool $as_bool
- * (Optional) Optimises the query for checking whether there are any records
+ * (Optional) Optimizes the query for checking whether there are any records
* or not. Defaults to FALSE.
*
* @return bool|int
diff --git a/web/core/lib/Drupal/Core/Entity/Plugin/Derivative/DefaultSelectionDeriver.php b/web/core/lib/Drupal/Core/Entity/Plugin/Derivative/DefaultSelectionDeriver.php
index ae58b86400..8f59139e59 100644
--- a/web/core/lib/Drupal/Core/Entity/Plugin/Derivative/DefaultSelectionDeriver.php
+++ b/web/core/lib/Drupal/Core/Entity/Plugin/Derivative/DefaultSelectionDeriver.php
@@ -33,7 +33,7 @@ class DefaultSelectionDeriver extends DeriverBase implements ContainerDeriverInt
protected $entityTypeManager;
/**
- * Creates an SelectionBase object.
+ * Creates a DefaultSelectionDeriver object.
*
* @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
* The entity type manager.
@@ -65,7 +65,7 @@ public function getDerivativeDefinitions($base_plugin_definition) {
// definition, we have to use the alternate PhpSelection class as default
// plugin, which allows filtering the target entities by their label()
// method. The major downside of PhpSelection is that it is more expensive
- // performance-wise than SelectionBase because it has to load all the
+ // performance-wise than DefaultSelection because it has to load all the
// target entities in order to perform the filtering process, regardless
// of whether a limit has been passed.
// @see \Drupal\Core\Entity\Plugin\EntityReferenceSelection\PhpSelection
diff --git a/web/core/lib/Drupal/Core/Entity/Plugin/EntityReferenceSelection/DefaultSelection.php b/web/core/lib/Drupal/Core/Entity/Plugin/EntityReferenceSelection/DefaultSelection.php
index 9cb8642b7d..426dee11d1 100644
--- a/web/core/lib/Drupal/Core/Entity/Plugin/EntityReferenceSelection/DefaultSelection.php
+++ b/web/core/lib/Drupal/Core/Entity/Plugin/EntityReferenceSelection/DefaultSelection.php
@@ -247,13 +247,20 @@ public function buildConfigurationForm(array $form, FormStateInterface $form_sta
$form['sort']['field'] = [
'#type' => 'select',
'#title' => $this->t('Sort by'),
- '#options' => [
- '_none' => $this->t('- None -'),
- ] + $fields,
+ '#options' => $fields,
'#ajax' => TRUE,
+ '#empty_value' => '_none',
+ '#sort_options' => TRUE,
'#limit_validation_errors' => [],
'#default_value' => $configuration['sort']['field'],
];
+ if ($entity_type->hasKey('bundle')) {
+ $form['sort']['field']['#states'] = [
+ 'visible' => [
+ ':input[name^="settings[handler_settings][target_bundles]["]' => ['checked' => TRUE],
+ ],
+ ];
+ }
$form['sort']['settings'] = [
'#type' => 'container',
diff --git a/web/core/lib/Drupal/Core/Entity/Plugin/EntityReferenceSelection/PhpSelection.php b/web/core/lib/Drupal/Core/Entity/Plugin/EntityReferenceSelection/PhpSelection.php
index 52cf33d29d..0309f76bbf 100644
--- a/web/core/lib/Drupal/Core/Entity/Plugin/EntityReferenceSelection/PhpSelection.php
+++ b/web/core/lib/Drupal/Core/Entity/Plugin/EntityReferenceSelection/PhpSelection.php
@@ -93,30 +93,43 @@ protected function matchLabel($match, $match_operator, $label) {
switch ($match_operator) {
case '=':
return $label == $match;
+
case '>':
return $label > $match;
+
case '<':
return $label < $match;
+
case '>=':
return $label >= $match;
+
case '<=':
return $label <= $match;
+
case '<>':
return $label != $match;
+
case 'IN':
return array_search($label, $match) !== FALSE;
+
case 'NOT IN':
return array_search($label, $match) === FALSE;
+
case 'STARTS_WITH':
return strpos($label, $match) === 0;
+
case 'CONTAINS':
return strpos($label, $match) !== FALSE;
+
case 'ENDS_WITH':
return mb_substr($label, -mb_strlen($match)) === (string) $match;
+
case 'IS NOT NULL':
return TRUE;
+
case 'IS NULL':
return FALSE;
+
default:
// Invalid match operator.
return FALSE;
diff --git a/web/core/lib/Drupal/Core/Entity/Query/Sql/Condition.php b/web/core/lib/Drupal/Core/Entity/Query/Sql/Condition.php
index 7f9351214d..a8e530b177 100644
--- a/web/core/lib/Drupal/Core/Entity/Query/Sql/Condition.php
+++ b/web/core/lib/Drupal/Core/Entity/Query/Sql/Condition.php
@@ -110,6 +110,7 @@ public static function translateCondition(&$condition, SelectInterface $sql_quer
$condition['operator'] = 'LIKE';
}
break;
+
case '<>':
// If a field explicitly requests that queries should not be case
// sensitive, use the NOT LIKE operator, otherwise keep <>.
@@ -118,6 +119,7 @@ public static function translateCondition(&$condition, SelectInterface $sql_quer
$condition['operator'] = 'NOT LIKE';
}
break;
+
case 'STARTS_WITH':
if ($case_sensitive) {
$condition['operator'] = 'LIKE BINARY';
diff --git a/web/core/lib/Drupal/Core/Entity/Query/Sql/Query.php b/web/core/lib/Drupal/Core/Entity/Query/Sql/Query.php
index 78a4a97191..daf6bd62c0 100644
--- a/web/core/lib/Drupal/Core/Entity/Query/Sql/Query.php
+++ b/web/core/lib/Drupal/Core/Entity/Query/Sql/Query.php
@@ -326,4 +326,28 @@ public function getTables(SelectInterface $sql_query) {
return new $class($sql_query);
}
+ /**
+ * Implements the magic __toString method.
+ */
+ public function __toString() {
+ // Clone the query so the prepare and compile doesn't get repeated.
+ $clone = clone($this);
+
+ $clone->prepare()
+ ->compile()
+ ->addSort()
+ ->finish();
+
+ // Quote arguments so query is able to be run.
+ $quoted = [];
+ foreach ($clone->sqlQuery->getArguments() as $key => $value) {
+ $quoted[$key] = is_null($value) ? 'NULL' : $this->connection->quote($value);
+ }
+
+ // Replace table name brackets.
+ $sql = $clone->connection->prefixTables((string) $clone->sqlQuery);
+
+ return strtr($sql, $quoted);
+ }
+
}
diff --git a/web/core/lib/Drupal/Core/Entity/Query/Sql/Tables.php b/web/core/lib/Drupal/Core/Entity/Query/Sql/Tables.php
index 7257caa7ab..dd23ab652a 100644
--- a/web/core/lib/Drupal/Core/Entity/Query/Sql/Tables.php
+++ b/web/core/lib/Drupal/Core/Entity/Query/Sql/Tables.php
@@ -117,13 +117,14 @@ public function addField($field, $type, $langcode) {
$column = NULL;
}
- // If there is revision support, only the current revisions are being
- // queried, and the field is revisionable then use the revision id.
- // Otherwise, the entity id will do.
- if (($revision_key = $entity_type->getKey('revision')) && $all_revisions && $field_storage && $field_storage->isRevisionable()) {
+ // If there is revision support, all the revisions are being queried, and
+ // the field is revisionable or the revision ID field itself, then use the
+ // revision ID. Otherwise, the entity ID will do.
+ $query_revisions = $all_revisions && $field_storage && ($field_storage->isRevisionable() || $field_storage->getName() === $entity_type->getKey('revision'));
+ if ($query_revisions) {
// This contains the relevant SQL field to be used when joining entity
// tables.
- $entity_id_field = $revision_key;
+ $entity_id_field = $entity_type->getKey('revision');
// This contains the relevant SQL field to be used when joining field
// tables.
$field_id_field = 'revision_id';
@@ -201,7 +202,7 @@ public function addField($field, $type, $langcode) {
// it gets added before the base table.
$entity_tables = [];
$revision_table = NULL;
- if ($all_revisions && $field_storage && $field_storage->isRevisionable()) {
+ if ($query_revisions) {
$data_table = $entity_type->getRevisionDataTable();
$entity_base_table = $entity_type->getRevisionTable();
}
diff --git a/web/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php b/web/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php
index 3ca43fb71f..a3454fc365 100644
--- a/web/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php
+++ b/web/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php
@@ -568,6 +568,12 @@ protected function postUpdateEntityTypeSchema(EntityTypeInterface $entity_type,
$this->fieldStorageDefinitions = $field_storage_definitions;
$this->saveEntitySchemaData($entity_type, $new_entity_schema);
+ // The storage needs to use the updated definitions and table mapping
+ // before generating and saving the final field schema data.
+ $this->storage->setEntityType($entity_type);
+ $this->storage->setFieldStorageDefinitions($field_storage_definitions);
+ $this->storage->setTableMapping($new_table_mapping);
+
// Store the updated field schema for each field storage.
foreach ($field_storage_definitions as $field_storage_definition) {
if ($new_table_mapping->requiresDedicatedTableStorage($field_storage_definition)) {
@@ -1446,31 +1452,31 @@ protected function addTableDefaults(&$schema) {
/**
* Processes the gathered schema for a base table.
*
+ * This function will be removed in Drupal 9.0.x.
+ *
* @param \Drupal\Core\Entity\ContentEntityTypeInterface $entity_type
* The entity type.
* @param array $schema
* The table schema, passed by reference.
+ *
+ * @see https://www.drupal.org/node/3111613
*/
protected function processBaseTable(ContentEntityTypeInterface $entity_type, array &$schema) {
- // Process the schema for the 'id' entity key only if it exists.
- if ($entity_type->hasKey('id')) {
- $this->processIdentifierSchema($schema, $entity_type->getKey('id'));
- }
}
/**
* Processes the gathered schema for a base table.
*
+ * This function will be removed in Drupal 9.0.x.
+ *
* @param \Drupal\Core\Entity\ContentEntityTypeInterface $entity_type
* The entity type.
* @param array $schema
* The table schema, passed by reference.
+ *
+ * @see https://www.drupal.org/node/3111613
*/
protected function processRevisionTable(ContentEntityTypeInterface $entity_type, array &$schema) {
- // Process the schema for the 'revision' entity key only if it exists.
- if ($entity_type->hasKey('revision')) {
- $this->processIdentifierSchema($schema, $entity_type->getKey('revision'));
- }
}
/**
@@ -2089,6 +2095,7 @@ protected function getSharedTableFieldSchema(FieldStorageDefinitionInterface $st
$field_name = $storage_definition->getName();
$base_table = $this->storage->getBaseTable();
+ $revision_table = $this->storage->getRevisionTable();
// Define the initial values, if any.
$initial_value = $initial_value_from_field = [];
@@ -2167,6 +2174,13 @@ protected function getSharedTableFieldSchema(FieldStorageDefinitionInterface $st
$schema['foreign keys'] = $this->getFieldForeignKeys($field_name, $field_schema, $column_mapping);
}
+ // Process the 'id' and 'revision' entity keys for the base and revision
+ // tables.
+ if (($table_name === $base_table && $field_name === $this->entityType->getKey('id')) ||
+ ($table_name === $revision_table && $field_name === $this->entityType->getKey('revision'))) {
+ $this->processIdentifierSchema($schema, $field_name);
+ }
+
return $schema;
}
diff --git a/web/core/lib/Drupal/Core/Entity/entity.api.php b/web/core/lib/Drupal/Core/Entity/entity.api.php
index 6c1d38387e..7e1277fdd0 100644
--- a/web/core/lib/Drupal/Core/Entity/entity.api.php
+++ b/web/core/lib/Drupal/Core/Entity/entity.api.php
@@ -57,7 +57,7 @@
* hook are of the specific entity class, not the generic Entity class, so in
* your implementation, you can make the $entity argument something like $node
* and give it a specific type hint (which should normally be to the specific
- * interface, such as \Drupal\Node\NodeInterface for nodes).
+ * interface, such as \Drupal\node\NodeInterface for nodes).
* - $storage in the code examples is assumed to be an entity storage
* class. See the @link entity_api Entity API topic @endlink for
* information on how to instantiate the correct storage class for an
@@ -67,7 +67,7 @@
* information on how to instantiate the correct view builder class for
* an entity type.
* - During many operations, static methods are called on the entity class,
- * which implements \Drupal\Entity\EntityInterface.
+ * which implements \Drupal\Core\Entity\EntityInterface.
*
* @section entities_revisions_translations Entities, revisions and translations
* A content entity can have multiple stored variants: based on its definition,
@@ -498,7 +498,7 @@
* - \Drupal\Core\Entity\Routing\AdminHtmlRouteProvider provides the same
* routes, set up to use the administrative theme for edit and delete pages.
* - You can also create your own class, extending one of these two classes if
- * you only want to modify their behaviour slightly.
+ * you only want to modify their behavior slightly.
*
* To register any route provider class, add lines like the following to your
* entity class annotation:
diff --git a/web/core/lib/Drupal/Core/EventSubscriber/ConfigImportSubscriber.php b/web/core/lib/Drupal/Core/EventSubscriber/ConfigImportSubscriber.php
index f521bb1655..dd0b355c79 100644
--- a/web/core/lib/Drupal/Core/EventSubscriber/ConfigImportSubscriber.php
+++ b/web/core/lib/Drupal/Core/EventSubscriber/ConfigImportSubscriber.php
@@ -276,6 +276,7 @@ protected function validateDependencies(ConfigImporter $config_importer) {
['%name' => $name, '%module' => implode(', ', $this->getNames($diffs, $module_data))]
);
break;
+
case 'theme':
$message = $this->formatPlural(
count($diffs),
@@ -284,6 +285,7 @@ protected function validateDependencies(ConfigImporter $config_importer) {
['%name' => $name, '%theme' => implode(', ', $this->getNames($diffs, $theme_data))]
);
break;
+
case 'config':
$message = $this->formatPlural(
count($diffs),
diff --git a/web/core/lib/Drupal/Core/EventSubscriber/ExceptionLoggingSubscriber.php b/web/core/lib/Drupal/Core/EventSubscriber/ExceptionLoggingSubscriber.php
index e7b4ba4fcd..7a39969bab 100644
--- a/web/core/lib/Drupal/Core/EventSubscriber/ExceptionLoggingSubscriber.php
+++ b/web/core/lib/Drupal/Core/EventSubscriber/ExceptionLoggingSubscriber.php
@@ -38,8 +38,12 @@ public function __construct(LoggerChannelFactoryInterface $logger) {
* The event to process.
*/
public function on403(GetResponseForExceptionEvent $event) {
- $request = $event->getRequest();
- $this->logger->get('access denied')->warning('@uri', ['@uri' => $request->getRequestUri()]);
+ // Log the exception with the page where it happened so that admins know
+ // why access was denied.
+ $exception = $event->getException();
+ $error = Error::decodeException($exception);
+ $error['@uri'] = $event->getRequest()->getRequestUri();
+ $this->logger->get('access denied')->warning('Path: @uri. %type: @message in %function (line %line of %file).', $error);
}
/**
diff --git a/web/core/lib/Drupal/Core/EventSubscriber/FinishResponseSubscriber.php b/web/core/lib/Drupal/Core/EventSubscriber/FinishResponseSubscriber.php
index 747262c849..5b2eb9af33 100644
--- a/web/core/lib/Drupal/Core/EventSubscriber/FinishResponseSubscriber.php
+++ b/web/core/lib/Drupal/Core/EventSubscriber/FinishResponseSubscriber.php
@@ -222,7 +222,7 @@ protected function setResponseNotCacheable(Response $response, Request $request)
// place. Therefore remove ETag, Last-Modified and Vary in that case.
$response->setEtag(NULL);
$response->setLastModified(NULL);
- $response->setVary(NULL);
+ $response->headers->remove('Vary');
}
/**
diff --git a/web/core/lib/Drupal/Core/Extension/ModuleHandlerInterface.php b/web/core/lib/Drupal/Core/Extension/ModuleHandlerInterface.php
index c87191a894..0258ac0953 100644
--- a/web/core/lib/Drupal/Core/Extension/ModuleHandlerInterface.php
+++ b/web/core/lib/Drupal/Core/Extension/ModuleHandlerInterface.php
@@ -234,7 +234,7 @@ public function invoke($module, $hook, array $args = []);
* An array of return values of the hook implementations. If modules return
* arrays from their implementations, those are merged into one array
* recursively. Note: integer keys in arrays will be lost, as the merge is
- * done using array_merge_recursive().
+ * done using Drupal\Component\Utility\NestedArray::mergeDeepArray().
*/
public function invokeAll($hook, array $args = []);
@@ -284,7 +284,7 @@ public function invokeDeprecated($description, $module, $hook, array $args = [])
* An array of return values of the hook implementations. If modules return
* arrays from their implementations, those are merged into one array
* recursively. Note: integer keys in arrays will be lost, as the merge is
- * done using array_merge_recursive().
+ * done using Drupal\Component\Utility\NestedArray::mergeDeepArray().
*
* @see \Drupal\Core\Extension\ModuleHandlerInterface::invokeAll()
* @see https://www.drupal.org/core/deprecation#how-hook
diff --git a/web/core/lib/Drupal/Core/Extension/ModuleInstaller.php b/web/core/lib/Drupal/Core/Extension/ModuleInstaller.php
index 83522c2e2d..09f8434370 100644
--- a/web/core/lib/Drupal/Core/Extension/ModuleInstaller.php
+++ b/web/core/lib/Drupal/Core/Extension/ModuleInstaller.php
@@ -323,7 +323,7 @@ public function install(array $module_list, $enable_dependencies = TRUE) {
\Drupal::service('theme_handler')->refreshInfo();
// Allow the module to perform install tasks.
- $this->moduleHandler->invoke($module, 'install');
+ $this->moduleHandler->invoke($module, 'install', [$sync_status]);
// Record the fact that it was installed.
\Drupal::logger('system')->info('%module module installed.', ['%module' => $module]);
@@ -345,7 +345,7 @@ public function install(array $module_list, $enable_dependencies = TRUE) {
\Drupal::service('router.builder')->rebuild();
}
- $this->moduleHandler->invokeAll('modules_installed', [$modules_installed]);
+ $this->moduleHandler->invokeAll('modules_installed', [$modules_installed, $sync_status]);
}
return TRUE;
@@ -357,6 +357,7 @@ public function install(array $module_list, $enable_dependencies = TRUE) {
public function uninstall(array $module_list, $uninstall_dependents = TRUE) {
// Get all module data so we can find dependencies and sort.
$module_data = \Drupal::service('extension.list.module')->getList();
+ $sync_status = \Drupal::service('config.installer')->isSyncing();
$module_list = $module_list ? array_combine($module_list, $module_list) : [];
if (array_diff_key($module_list, $module_data)) {
// One or more of the given modules doesn't exist.
@@ -371,12 +372,14 @@ public function uninstall(array $module_list, $uninstall_dependents = TRUE) {
}
if ($uninstall_dependents) {
+ $theme_list = \Drupal::service('extension.list.theme')->getList();
+
// Add dependent modules to the list. The new modules will be processed as
// the foreach loop continues.
foreach ($module_list as $module => $value) {
foreach (array_keys($module_data[$module]->required_by) as $dependent) {
- if (!isset($module_data[$dependent])) {
- // The dependent module does not exist.
+ if (!isset($module_data[$dependent]) && !isset($theme_list[$dependent])) {
+ // The dependent module or theme does not exist.
return FALSE;
}
@@ -428,7 +431,7 @@ public function uninstall(array $module_list, $uninstall_dependents = TRUE) {
// Uninstall the module.
module_load_install($module);
- $this->moduleHandler->invoke($module, 'uninstall');
+ $this->moduleHandler->invoke($module, 'uninstall', [$sync_status]);
// Remove all configuration belonging to the module.
\Drupal::service('config.manager')->uninstall('module', $module);
@@ -514,7 +517,7 @@ public function uninstall(array $module_list, $uninstall_dependents = TRUE) {
drupal_get_installed_schema_version(NULL, TRUE);
// Let other modules react.
- $this->moduleHandler->invokeAll('modules_uninstalled', [$module_list]);
+ $this->moduleHandler->invokeAll('modules_uninstalled', [$module_list, $sync_status]);
// Flush all persistent caches.
// Any cache entry might implicitly depend on the uninstalled modules,
diff --git a/web/core/lib/Drupal/Core/Extension/ModuleRequiredByThemesUninstallValidator.php b/web/core/lib/Drupal/Core/Extension/ModuleRequiredByThemesUninstallValidator.php
new file mode 100644
index 0000000000..86499f55ca
--- /dev/null
+++ b/web/core/lib/Drupal/Core/Extension/ModuleRequiredByThemesUninstallValidator.php
@@ -0,0 +1,84 @@
+<?php
+
+namespace Drupal\Core\Extension;
+
+use Drupal\Core\StringTranslation\StringTranslationTrait;
+use Drupal\Core\StringTranslation\TranslationInterface;
+
+/**
+ * Ensures modules cannot be uninstalled if enabled themes depend on them.
+ */
+class ModuleRequiredByThemesUninstallValidator implements ModuleUninstallValidatorInterface {
+
+ use StringTranslationTrait;
+
+ /**
+ * The module extension list.
+ *
+ * @var \Drupal\Core\Extension\ModuleExtensionList
+ */
+ protected $moduleExtensionList;
+
+ /**
+ * The theme extension list.
+ *
+ * @var \Drupal\Core\Extension\ThemeExtensionList
+ */
+ protected $themeExtensionList;
+
+ /**
+ * Constructs a new ModuleRequiredByThemesUninstallValidator.
+ *
+ * @param \Drupal\Core\StringTranslation\TranslationInterface $string_translation
+ * The string translation service.
+ * @param \Drupal\Core\Extension\ModuleExtensionList $extension_list_module
+ * The module extension list.
+ * @param \Drupal\Core\Extension\ThemeExtensionList $extension_list_theme
+ * The theme extension list.
+ */
+ public function __construct(TranslationInterface $string_translation, ModuleExtensionList $extension_list_module, ThemeExtensionList $extension_list_theme) {
+ $this->stringTranslation = $string_translation;
+ $this->moduleExtensionList = $extension_list_module;
+ $this->themeExtensionList = $extension_list_theme;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function validate($module) {
+ $reasons = [];
+
+ $themes_depending_on_module = $this->getThemesDependingOnModule($module);
+ if (!empty($themes_depending_on_module)) {
+ $module_name = $this->moduleExtensionList->get($module)->info['name'];
+ $theme_names = implode(', ', $themes_depending_on_module);
+ $reasons[] = $this->formatPlural(count($themes_depending_on_module),
+ 'Required by the theme: @theme_names',
+ 'Required by the themes: @theme_names',
+ ['@module_name' => $module_name, '@theme_names' => $theme_names]);
+ }
+
+ return $reasons;
+ }
+
+ /**
+ * Returns themes that depend on a module.
+ *
+ * @param string $module
+ * The module machine name.
+ *
+ * @return string[]
+ * An array of the names of themes that depend on $module.
+ */
+ protected function getThemesDependingOnModule($module) {
+ $installed_themes = $this->themeExtensionList->getAllInstalledInfo();
+ $themes_depending_on_module = array_map(function ($theme) use ($module) {
+ if (in_array($module, $theme['dependencies'])) {
+ return $theme['name'];
+ }
+ }, $installed_themes);
+
+ return array_filter($themes_depending_on_module);
+ }
+
+}
diff --git a/web/core/lib/Drupal/Core/Extension/ModuleUninstallValidatorInterface.php b/web/core/lib/Drupal/Core/Extension/ModuleUninstallValidatorInterface.php
index 94f2d2c7fc..d5bf3d9e8f 100644
--- a/web/core/lib/Drupal/Core/Extension/ModuleUninstallValidatorInterface.php
+++ b/web/core/lib/Drupal/Core/Extension/ModuleUninstallValidatorInterface.php
@@ -14,20 +14,6 @@ interface ModuleUninstallValidatorInterface {
/**
* Determines the reasons a module can not be uninstalled.
*
- * Example implementation:
- * @code
- * public function validate($module) {
- * $entity_types = $this->entityTypeManager->getDefinitions();
- * $reasons = array();
- * foreach ($entity_types as $entity_type) {
- * if ($module == $entity_type->getProvider() && $entity_type instanceof ContentEntityTypeInterface && $this->entityTypeManager->getStorage($entity_type->id())->hasData()) {
- * $reasons[] = $this->t('There is content for the entity type: @entity_type', array('@entity_type' => $entity_type->getLabel()));
- * }
- * }
- * return $reasons;
- * }
- * @endcode
- *
* @param string $module
* A module name.
*
diff --git a/web/core/lib/Drupal/Core/Extension/ThemeExtensionList.php b/web/core/lib/Drupal/Core/Extension/ThemeExtensionList.php
index 5722d1c2fe..d23b257c87 100644
--- a/web/core/lib/Drupal/Core/Extension/ThemeExtensionList.php
+++ b/web/core/lib/Drupal/Core/Extension/ThemeExtensionList.php
@@ -47,10 +47,12 @@ class ThemeExtensionList extends ExtensionList {
'comment_user_verification',
],
'screenshot' => 'screenshot.png',
+ 'version' => NULL,
'php' => DRUPAL_MINIMUM_PHP,
'libraries' => [],
'libraries_extend' => [],
'libraries_override' => [],
+ 'dependencies' => [],
];
/**
@@ -140,6 +142,22 @@ protected function doList() {
// sub-themes.
$this->fillInSubThemeData($themes, $sub_themes);
+ foreach ($themes as $key => $theme) {
+ // After $theme is processed by buildModuleDependencies(), there can be a
+ // `$theme->requires` array containing both module and base theme
+ // dependencies. The module dependencies are copied to their own property
+ // so they are available to operations specific to module dependencies.
+ if (isset($theme->requires)) {
+ $theme->module_dependencies = array_diff_key($theme->requires, $themes);
+ }
+ else {
+ // Even if no requirements are specified, the theme installation process
+ // expects the presence of the `requires` and `module_dependencies`
+ // properties, so they should be initialized here as empty arrays.
+ $theme->requires = [];
+ $theme->module_dependencies = [];
+ }
+ }
return $themes;
}
diff --git a/web/core/lib/Drupal/Core/Extension/ThemeInstaller.php b/web/core/lib/Drupal/Core/Extension/ThemeInstaller.php
index e1149e7b66..fdcb6ed931 100644
--- a/web/core/lib/Drupal/Core/Extension/ThemeInstaller.php
+++ b/web/core/lib/Drupal/Core/Extension/ThemeInstaller.php
@@ -2,6 +2,7 @@
namespace Drupal\Core\Extension;
+use Drupal\Component\Utility\Html;
use Drupal\Core\Asset\AssetCollectionOptimizerInterface;
use Drupal\Core\Cache\Cache;
use Drupal\Core\Config\ConfigFactoryInterface;
@@ -10,6 +11,8 @@
use Drupal\Core\Extension\Exception\UnknownExtensionException;
use Drupal\Core\Routing\RouteBuilderInterface;
use Drupal\Core\State\StateInterface;
+use Drupal\Core\StringTranslation\StringTranslationTrait;
+use Drupal\system\ModuleDependencyMessageTrait;
use Psr\Log\LoggerInterface;
/**
@@ -17,6 +20,9 @@
*/
class ThemeInstaller implements ThemeInstallerInterface {
+ use ModuleDependencyMessageTrait;
+ use StringTranslationTrait;
+
/**
* @var \Drupal\Core\Extension\ThemeHandlerInterface
*/
@@ -62,6 +68,13 @@ class ThemeInstaller implements ThemeInstallerInterface {
*/
protected $logger;
+ /**
+ * The module extension list.
+ *
+ * @var \Drupal\Core\Extension\ModuleExtensionList
+ */
+ protected $moduleExtensionList;
+
/**
* Constructs a new ThemeInstaller.
*
@@ -86,8 +99,10 @@ class ThemeInstaller implements ThemeInstallerInterface {
* A logger instance.
* @param \Drupal\Core\State\StateInterface $state
* The state store.
+ * @param \Drupal\Core\Extension\ModuleExtensionList $module_extension_list
+ * The module extension list.
*/
- public function __construct(ThemeHandlerInterface $theme_handler, ConfigFactoryInterface $config_factory, ConfigInstallerInterface $config_installer, ModuleHandlerInterface $module_handler, ConfigManagerInterface $config_manager, AssetCollectionOptimizerInterface $css_collection_optimizer, RouteBuilderInterface $route_builder, LoggerInterface $logger, StateInterface $state) {
+ public function __construct(ThemeHandlerInterface $theme_handler, ConfigFactoryInterface $config_factory, ConfigInstallerInterface $config_installer, ModuleHandlerInterface $module_handler, ConfigManagerInterface $config_manager, AssetCollectionOptimizerInterface $css_collection_optimizer, RouteBuilderInterface $route_builder, LoggerInterface $logger, StateInterface $state, ModuleExtensionList $module_extension_list = NULL) {
$this->themeHandler = $theme_handler;
$this->configFactory = $config_factory;
$this->configInstaller = $config_installer;
@@ -97,6 +112,11 @@ public function __construct(ThemeHandlerInterface $theme_handler, ConfigFactoryI
$this->routeBuilder = $route_builder;
$this->logger = $logger;
$this->state = $state;
+ if ($module_extension_list === NULL) {
+ @trigger_error('The extension.list.module service must be passed to ' . __NAMESPACE__ . '\ThemeInstaller::__construct(). It was added in drupal:8.9.0 and will be required before drupal:10.0.0.', E_USER_DEPRECATED);
+ $module_extension_list = \Drupal::service('extension.list.module');
+ }
+ $this->moduleExtensionList = $module_extension_list;
}
/**
@@ -106,6 +126,8 @@ public function install(array $theme_list, $install_dependencies = TRUE) {
$extension_config = $this->configFactory->getEditable('core.extension');
$theme_data = $this->themeHandler->rebuildThemeData();
+ $installed_themes = $extension_config->get('theme') ?: [];
+ $installed_modules = $extension_config->get('module') ?: [];
if ($install_dependencies) {
$theme_list = array_combine($theme_list, $theme_list);
@@ -116,16 +138,41 @@ public function install(array $theme_list, $install_dependencies = TRUE) {
}
// Only process themes that are not installed currently.
- $installed_themes = $extension_config->get('theme') ?: [];
if (!$theme_list = array_diff_key($theme_list, $installed_themes)) {
// Nothing to do. All themes already installed.
return TRUE;
}
+ $module_list = $this->moduleExtensionList->getList();
foreach ($theme_list as $theme => $value) {
- // Add dependencies to the list. The new themes will be processed as
- // the parent foreach loop continues.
- foreach (array_keys($theme_data[$theme]->requires) as $dependency) {
+ $module_dependencies = $theme_data[$theme]->module_dependencies;
+ // $theme_data[$theme]->requires contains both theme and module
+ // dependencies keyed by the extension machine names and
+ // $theme_data[$theme]->module_dependencies contains only modules keyed
+ // by the module extension machine name. Therefore we can find the theme
+ // dependencies by finding array keys for 'requires' that are not in
+ // $module_dependencies.
+ $theme_dependencies = array_diff_key($theme_data[$theme]->requires, $module_dependencies);
+ // We can find the unmet module dependencies by finding the module
+ // machine names keys that are not in $installed_modules keys.
+ $unmet_module_dependencies = array_diff_key($module_dependencies, $installed_modules);
+
+ // Prevent themes with unmet module dependencies from being installed.
+ if (!empty($unmet_module_dependencies)) {
+ $unmet_module_dependencies_list = implode(', ', array_keys($unmet_module_dependencies));
+ throw new MissingDependencyException("Unable to install theme: '$theme' due to unmet module dependencies: '$unmet_module_dependencies_list'.");
+ }
+
+ foreach ($module_dependencies as $dependency => $dependency_object) {
+ if ($incompatible = $this->checkDependencyMessage($module_list, $dependency, $dependency_object)) {
+ $sanitized_message = Html::decodeEntities(strip_tags($incompatible));
+ throw new MissingDependencyException("Unable to install theme: $sanitized_message");
+ }
+ }
+
+ // Add dependencies to the list of themes to install. The new themes
+ // will be processed as the parent foreach loop continues.
+ foreach (array_keys($theme_dependencies) as $dependency) {
if (!isset($theme_data[$dependency])) {
// The dependency does not exist.
return FALSE;
@@ -147,9 +194,6 @@ public function install(array $theme_list, $install_dependencies = TRUE) {
arsort($theme_list);
$theme_list = array_keys($theme_list);
}
- else {
- $installed_themes = $extension_config->get('theme') ?: [];
- }
$themes_installed = [];
foreach ($theme_list as $key) {
diff --git a/web/core/lib/Drupal/Core/Extension/ThemeInstallerInterface.php b/web/core/lib/Drupal/Core/Extension/ThemeInstallerInterface.php
index ae79b505ea..6f18248cf9 100644
--- a/web/core/lib/Drupal/Core/Extension/ThemeInstallerInterface.php
+++ b/web/core/lib/Drupal/Core/Extension/ThemeInstallerInterface.php
@@ -25,6 +25,9 @@ interface ThemeInstallerInterface {
*
* @throws \Drupal\Core\Extension\Exception\UnknownExtensionException
* Thrown when the theme does not exist.
+ *
+ * @throws \Drupal\Core\Extension\MissingDependencyException
+ * Thrown when a requested dependency can't be found.
*/
public function install(array $theme_list, $install_dependencies = TRUE);
diff --git a/web/core/lib/Drupal/Core/Extension/module.api.php b/web/core/lib/Drupal/Core/Extension/module.api.php
index 0cb6f25aa2..5998a06657 100644
--- a/web/core/lib/Drupal/Core/Extension/module.api.php
+++ b/web/core/lib/Drupal/Core/Extension/module.api.php
@@ -6,7 +6,6 @@
*/
use Drupal\Core\Database\Database;
-use Drupal\Core\File\FileSystemInterface;
use Drupal\Core\Link;
use Drupal\Core\Url;
use Drupal\Core\Utility\UpdateException;
@@ -180,14 +179,22 @@ function hook_module_preinstall($module) {
*
* @param $modules
* An array of the modules that were installed.
+ * @param bool $is_syncing
+ * TRUE if the module is being installed as part of a configuration import. In
+ * these cases, your hook implementation needs to carefully consider what
+ * changes, if any, it should make. For example, it should not make any
+ * changes to configuration objects or entities.
*
* @see \Drupal\Core\Extension\ModuleInstaller::install()
* @see hook_install()
*/
-function hook_modules_installed($modules) {
+function hook_modules_installed($modules, $is_syncing) {
if (in_array('lousy_module', $modules)) {
\Drupal::state()->set('mymodule.lousy_module_compatibility', TRUE);
}
+ if (!$is_syncing) {
+ \Drupal::service('mymodule.service')->doSomething($modules);
+ }
}
/**
@@ -220,15 +227,21 @@ function hook_modules_installed($modules) {
* Please be sure that anything added or modified in this function that can
* be removed during uninstall should be removed with hook_uninstall().
*
+ * @param bool $is_syncing
+ * TRUE if the module is being installed as part of a configuration import. In
+ * these cases, your hook implementation needs to carefully consider what
+ * changes, if any, it should make. For example, it should not make any
+ * changes to configuration objects or entities.
+ *
+ * @see \Drupal\Core\Config\ConfigInstallerInterface::isSyncing
* @see hook_schema()
* @see \Drupal\Core\Extension\ModuleInstaller::install()
* @see hook_uninstall()
* @see hook_modules_installed()
*/
-function hook_install() {
- // Create the styles directory and ensure it's writable.
- $directory = \Drupal::config('system.file')->get('default_scheme') . '://styles';
- \Drupal::service('file_system')->prepareDirectory($directory, FileSystemInterface::CREATE_DIRECTORY | FileSystemInterface::MODIFY_PERMISSIONS);
+function hook_install($is_syncing) {
+ // Set general module variables.
+ \Drupal::state()->set('mymodule.foo', 'bar');
}
/**
@@ -253,14 +266,22 @@ function hook_module_preuninstall($module) {
*
* @param $modules
* An array of the modules that were uninstalled.
+ * @param bool $is_syncing
+ * TRUE if the module is being uninstalled as part of a configuration import.
+ * In these cases, your hook implementation needs to carefully consider what
+ * changes, if any, it should make. For example, it should not make any
+ * changes to configuration objects or entities.
*
* @see hook_uninstall()
*/
-function hook_modules_uninstalled($modules) {
+function hook_modules_uninstalled($modules, $is_syncing) {
if (in_array('lousy_module', $modules)) {
\Drupal::state()->delete('mymodule.lousy_module_compatibility');
}
mymodule_cache_rebuild();
+ if (!$is_syncing) {
+ \Drupal::service('mymodule.service')->doSomething($modules);
+ }
}
/**
@@ -278,13 +299,19 @@ function hook_modules_uninstalled($modules) {
* tables are removed, allowing your module to query its own tables during
* this routine.
*
+ * @param bool $is_syncing
+ * TRUE if the module is being uninstalled as part of a configuration import.
+ * In these cases, your hook implementation needs to carefully consider what
+ * changes, if any, it should make. For example, it should not make any
+ * changes to configuration objects or entities.
+ *
* @see hook_install()
* @see hook_schema()
* @see hook_modules_uninstalled()
*/
-function hook_uninstall() {
- // Remove the styles directory and generated images.
- \Drupal::service('file_system')->deleteRecursive(\Drupal::config('system.file')->get('default_scheme') . '://styles');
+function hook_uninstall($is_syncing) {
+ // Delete remaining general module variables.
+ \Drupal::state()->delete('mymodule.foo');
}
/**
diff --git a/web/core/lib/Drupal/Core/Field/FieldConfigBase.php b/web/core/lib/Drupal/Core/Field/FieldConfigBase.php
index 44e415ace7..8f041ad025 100644
--- a/web/core/lib/Drupal/Core/Field/FieldConfigBase.php
+++ b/web/core/lib/Drupal/Core/Field/FieldConfigBase.php
@@ -381,7 +381,7 @@ public function isRequired() {
}
/**
- * [@inheritdoc}
+ * {@inheritdoc}
*/
public function setRequired($required) {
$this->required = $required;
diff --git a/web/core/lib/Drupal/Core/Field/FieldItemList.php b/web/core/lib/Drupal/Core/Field/FieldItemList.php
index 4bab6f40ac..f73872baa3 100644
--- a/web/core/lib/Drupal/Core/Field/FieldItemList.php
+++ b/web/core/lib/Drupal/Core/Field/FieldItemList.php
@@ -393,6 +393,15 @@ public function equals(FieldItemListInterface $list_to_compare) {
$callback = function (&$value) use ($non_computed_properties) {
if (is_array($value)) {
$value = array_intersect_key($value, $non_computed_properties);
+
+ // Also filter out properties with a NULL value as they might exist in
+ // one field item and not in the other, depending on how the values are
+ // set. Do not filter out empty strings or other false-y values as e.g.
+ // a NULL or FALSE in a boolean field is not the same.
+ $value = array_filter($value, function ($property) {
+ return $property !== NULL;
+ });
+
ksort($value);
}
};
diff --git a/web/core/lib/Drupal/Core/FileTransfer/Form/FileTransferAuthorizeForm.php b/web/core/lib/Drupal/Core/FileTransfer/Form/FileTransferAuthorizeForm.php
index 45b200d739..b98d78f3b4 100644
--- a/web/core/lib/Drupal/Core/FileTransfer/Form/FileTransferAuthorizeForm.php
+++ b/web/core/lib/Drupal/Core/FileTransfer/Form/FileTransferAuthorizeForm.php
@@ -51,11 +51,11 @@ public function getFormId() {
*/
public function buildForm(array $form, FormStateInterface $form_state) {
// Get all the available ways to transfer files.
- if (empty($_SESSION['authorize_filetransfer_info'])) {
+ $available_backends = $this->getRequest()->getSession()->get('authorize_filetransfer_info', []);
+ if (empty($available_backends)) {
$this->messenger()->addError($this->t('Unable to continue, no available methods of file transfer'));
return [];
}
- $available_backends = $_SESSION['authorize_filetransfer_info'];
if (!$this->getRequest()->isSecure()) {
$form['information']['https_warning'] = [
@@ -168,7 +168,7 @@ public function validateForm(array &$form, FormStateInterface $form_state) {
$filetransfer = $this->getFiletransfer($backend, $form_connection_settings[$backend]);
try {
if (!$filetransfer) {
- throw new \Exception($this->t('The connection protocol %backend does not exist.', ['%backend' => $backend]));
+ throw new \Exception("The connection protocol '$backend' does not exist.");
}
$filetransfer->connect();
}
@@ -239,10 +239,10 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
*/
protected function getFiletransfer($backend, $settings = []) {
$filetransfer = FALSE;
- if (!empty($_SESSION['authorize_filetransfer_info'][$backend])) {
- $backend_info = $_SESSION['authorize_filetransfer_info'][$backend];
- if (class_exists($backend_info['class'])) {
- $filetransfer = $backend_info['class']::factory($this->root, $settings);
+ $info = $this->getRequest()->getSession()->get('authorize_filetransfer_info', []);
+ if (!empty($info[$backend])) {
+ if (class_exists($info[$backend]['class'])) {
+ $filetransfer = $info[$backend]['class']::factory($this->root, $settings);
}
}
return $filetransfer;
@@ -307,7 +307,7 @@ protected function setConnectionSettingsDefaults(&$element, $key, array $default
}
/**
- * Runs the operation specified in $_SESSION['authorize_operation'].
+ * Runs the operation specified in 'authorize_operation' session property.
*
* @param $filetransfer
* The FileTransfer object to use for running the operation.
@@ -318,8 +318,7 @@ protected function setConnectionSettingsDefaults(&$element, $key, array $default
* that response for the current page request.
*/
protected function runOperation($filetransfer) {
- $operation = $_SESSION['authorize_operation'];
- unset($_SESSION['authorize_operation']);
+ $operation = $this->getRequest()->getSession()->remove('authorize_operation');
require_once $operation['file'];
return call_user_func_array($operation['callback'], array_merge([$filetransfer], $operation['arguments']));
diff --git a/web/core/lib/Drupal/Core/Form/FormBuilder.php b/web/core/lib/Drupal/Core/Form/FormBuilder.php
index 4d1dc27f71..ae2851ed22 100644
--- a/web/core/lib/Drupal/Core/Form/FormBuilder.php
+++ b/web/core/lib/Drupal/Core/Form/FormBuilder.php
@@ -385,6 +385,17 @@ public function rebuildForm($form_id, FormStateInterface &$form_state, $old_form
$form_state->setCached();
}
+ // \Drupal\Component\Utility\Html::getUniqueId() maintains a cache of
+ // element IDs it has seen, so it can prevent duplicates. We want to be
+ // sure we reset that cache when a form is processed, so scenarios that
+ // result in the form being built behind the scenes and again for the
+ // browser don't increment all the element IDs needlessly.
+ if (!FormState::hasAnyErrors()) {
+ // We only reset HTML ID's when there are no validation errors as this can
+ // cause ID collisions with other forms on the page otherwise.
+ Html::resetSeenIds();
+ }
+
// If only parts of the form will be returned to the browser (e.g., Ajax or
// RIA clients), or if the form already had a new build ID regenerated when
// it was retrieved from the form cache, reuse the existing #build_id.
@@ -576,16 +587,6 @@ public function processForm($form_id, &$form, FormStateInterface &$form_state) {
}
$this->formValidator->validateForm($form_id, $form, $form_state);
- // \Drupal\Component\Utility\Html::getUniqueId() maintains a cache of
- // element IDs it has seen, so it can prevent duplicates. We want to be
- // sure we reset that cache when a form is processed, so scenarios that
- // result in the form being built behind the scenes and again for the
- // browser don't increment all the element IDs needlessly.
- if (!FormState::hasAnyErrors()) {
- // In case of errors, do not break HTML IDs of other forms.
- Html::resetSeenIds();
- }
-
// If there are no errors and the form is not rebuilding, submit the form.
if (!$form_state->isRebuilding() && !FormState::hasAnyErrors()) {
$submit_response = $this->formSubmitter->doSubmitForm($form, $form_state);
diff --git a/web/core/lib/Drupal/Core/GeneratedButton.php b/web/core/lib/Drupal/Core/GeneratedButton.php
new file mode 100644
index 0000000000..52eb17c8f6
--- /dev/null
+++ b/web/core/lib/Drupal/Core/GeneratedButton.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Drupal\Core;
+
+/**
+ * This class holds a <button> generated from the <button> route.
+ *
+ * Unlike \Drupal\Core\Render\Element\Button, this is not for generating
+ * buttons for forms. This class is for putting a button in a list of links
+ * such as a multi-level menu.
+ */
+class GeneratedButton extends GeneratedLink {
+
+ /**
+ * {@inheritdoc}
+ */
+ const TAG = 'button';
+
+}
diff --git a/web/core/lib/Drupal/Core/Installer/Form/SelectProfileForm.php b/web/core/lib/Drupal/Core/Installer/Form/SelectProfileForm.php
index b0b72f6a99..c393069d24 100644
--- a/web/core/lib/Drupal/Core/Installer/Form/SelectProfileForm.php
+++ b/web/core/lib/Drupal/Core/Installer/Form/SelectProfileForm.php
@@ -94,7 +94,7 @@ public function buildForm(array $form, FormStateInterface $form_state, $install_
$extensions = $sync->read('core.extension');
$site = $sync->read('system.site');
if (isset($site['name']) && isset($extensions['profile']) && in_array($extensions['profile'], array_keys($names), TRUE)) {
- // Ensure the the profile can be installed from configuration. Install
+ // Ensure the profile can be installed from configuration. Install
// profile's which implement hook_INSTALL() are not supported.
// @todo https://www.drupal.org/project/drupal/issues/2982052 Remove
// this restriction.
diff --git a/web/core/lib/Drupal/Core/Installer/Form/SiteSettingsForm.php b/web/core/lib/Drupal/Core/Installer/Form/SiteSettingsForm.php
index 75099a2a35..8e53b9dcaf 100644
--- a/web/core/lib/Drupal/Core/Installer/Form/SiteSettingsForm.php
+++ b/web/core/lib/Drupal/Core/Installer/Form/SiteSettingsForm.php
@@ -160,6 +160,10 @@ public function validateForm(array &$form, FormStateInterface $form_state) {
// Cut the trailing \Install from namespace.
$database['namespace'] = substr($install_namespace, 0, strrpos($install_namespace, '\\'));
$database['driver'] = $driver;
+ // See default.settings.php for an explanation of the 'autoload' key.
+ if ($autoload = Database::findDriverAutoloadDirectory($database['namespace'], DRUPAL_ROOT)) {
+ $database['autoload'] = $autoload;
+ }
$form_state->set('database', $database);
foreach ($this->getDatabaseErrors($database, $form_state->getValue('settings_file')) as $name => $message) {
@@ -190,16 +194,7 @@ protected function getDatabaseErrors(array $database, $settings_file) {
$errors = array_diff_key($errors, $form_errors);
if (count($errors)) {
- $error_message = [
- '#type' => 'inline_template',
- '#template' => '{% trans %}Resolve all issues below to continue the installation. For help configuring your database server, see the <a href="https://www.drupal.org/docs/8/install">installation handbook</a>, or contact your hosting provider.{% endtrans%}{{ errors }}',
- '#context' => [
- 'errors' => [
- '#theme' => 'item_list',
- '#items' => $errors,
- ],
- ],
- ];
+ $error_message = static::getDatabaseErrorsTemplate($errors);
// These are generic errors, so we do not have any specific key of the
// database connection array to attach them to; therefore, we just put
@@ -210,6 +205,28 @@ protected function getDatabaseErrors(array $database, $settings_file) {
return $form_errors;
}
+ /**
+ * Gets the inline template render array to display the database errors.
+ *
+ * @param \Drupal\Core\StringTranslation\TranslatableMarkup[] $errors
+ * The database errors to list.
+ *
+ * @return mixed[]
+ * The inline template render array to display the database errors.
+ */
+ public static function getDatabaseErrorsTemplate(array $errors) {
+ return [
+ '#type' => 'inline_template',
+ '#template' => '{% trans %}Resolve all issues below to continue the installation. For help configuring your database server, see the <a href="https://www.drupal.org/docs/8/install">installation handbook</a>, or contact your hosting provider.{% endtrans %}{{ errors }}',
+ '#context' => [
+ 'errors' => [
+ '#theme' => 'item_list',
+ '#items' => $errors,
+ ],
+ ],
+ ];
+ }
+
/**
* {@inheritdoc}
*/
diff --git a/web/core/lib/Drupal/Core/Installer/NormalInstallerServiceProvider.php b/web/core/lib/Drupal/Core/Installer/NormalInstallerServiceProvider.php
index 472d984b22..863af57e05 100644
--- a/web/core/lib/Drupal/Core/Installer/NormalInstallerServiceProvider.php
+++ b/web/core/lib/Drupal/Core/Installer/NormalInstallerServiceProvider.php
@@ -14,7 +14,7 @@ class NormalInstallerServiceProvider implements ServiceProviderInterface {
* {@inheritdoc}
*/
public function register(ContainerBuilder $container) {
- // Use a performance optimised module extension list.
+ // Use performance-optimized extension lists.
$container->getDefinition('extension.list.module')->setClass('Drupal\Core\Installer\InstallerModuleExtensionList');
$container->getDefinition('extension.list.theme')->setClass('Drupal\Core\Installer\InstallerThemeExtensionList');
$container->getDefinition('extension.list.theme_engine')->setClass('Drupal\Core\Installer\InstallerThemeEngineExtensionList');
diff --git a/web/core/lib/Drupal/Core/Language/LanguageManagerInterface.php b/web/core/lib/Drupal/Core/Language/LanguageManagerInterface.php
index 624b5b4023..9a6b213d64 100644
--- a/web/core/lib/Drupal/Core/Language/LanguageManagerInterface.php
+++ b/web/core/lib/Drupal/Core/Language/LanguageManagerInterface.php
@@ -99,7 +99,7 @@ public function getNativeLanguages();
* @param string $langcode
* The language code.
*
- * @return \Drupal\core\Language\LanguageInterface|null
+ * @return \Drupal\Core\Language\LanguageInterface|null
* A fully-populated language object or NULL.
*/
public function getLanguage($langcode);
diff --git a/web/core/lib/Drupal/Core/Logger/LoggerChannelFactoryInterface.php b/web/core/lib/Drupal/Core/Logger/LoggerChannelFactoryInterface.php
index a75678a02d..430abc57f1 100644
--- a/web/core/lib/Drupal/Core/Logger/LoggerChannelFactoryInterface.php
+++ b/web/core/lib/Drupal/Core/Logger/LoggerChannelFactoryInterface.php
@@ -25,7 +25,7 @@ public function get($channel);
* @param int $priority
* The priority of the logger being added.
*
- * @see \Drupal\Core\DependencyInjection\Compiler\RegisterLoggersPass
+ * @see \Symfony\Component\HttpKernel\DependencyInjection\LoggerPass
*/
public function addLogger(LoggerInterface $logger, $priority = 0);
diff --git a/web/core/lib/Drupal/Core/Menu/DefaultMenuLinkTreeManipulators.php b/web/core/lib/Drupal/Core/Menu/DefaultMenuLinkTreeManipulators.php
index 7eefd12754..3b8ed1350c 100644
--- a/web/core/lib/Drupal/Core/Menu/DefaultMenuLinkTreeManipulators.php
+++ b/web/core/lib/Drupal/Core/Menu/DefaultMenuLinkTreeManipulators.php
@@ -75,7 +75,7 @@ public function __construct(AccessManagerInterface $access_manager, AccountInter
* This is why inaccessible subtrees are deleted, except at the top-level
* inaccessible link: if we didn't keep the first (depth-wise) inaccessible
* link, we wouldn't be able to know which cache contexts would cause those
- * subtrees to become accessible again, thus forcing us to conclude that that
+ * subtrees to become accessible again, thus forcing us to conclude that the
* subtree is unconditionally inaccessible.
*
* @param \Drupal\Core\Menu\MenuLinkTreeElement[] $tree
diff --git a/web/core/lib/Drupal/Core/Menu/MenuLinkManager.php b/web/core/lib/Drupal/Core/Menu/MenuLinkManager.php
index af2e4a594d..1f6f222771 100644
--- a/web/core/lib/Drupal/Core/Menu/MenuLinkManager.php
+++ b/web/core/lib/Drupal/Core/Menu/MenuLinkManager.php
@@ -38,7 +38,7 @@ class MenuLinkManager implements MenuLinkManagerInterface {
// or other safe source this may be a TranslatableMarkup object.
'title' => '',
// The description. If this came from a YAML definition or other safe source
- // this may be be a TranslatableMarkup object.
+ // this may be a TranslatableMarkup object.
'description' => '',
// The plugin ID of the parent link (or NULL for a top-level link).
'parent' => '',
diff --git a/web/core/lib/Drupal/Core/Pager/Pager.php b/web/core/lib/Drupal/Core/Pager/Pager.php
index dedeed2657..68d4b4efa1 100644
--- a/web/core/lib/Drupal/Core/Pager/Pager.php
+++ b/web/core/lib/Drupal/Core/Pager/Pager.php
@@ -112,7 +112,7 @@ public function getCurrentPage() {
* Gets the maximum number of items per page.
*
* @return int
- * The the maximum number of items per page.
+ * The maximum number of items per page.
*/
public function getLimit() {
return $this->limit;
diff --git a/web/core/lib/Drupal/Core/Password/PhpassHashedPassword.php b/web/core/lib/Drupal/Core/Password/PhpassHashedPassword.php
index 45ea3eadb4..8a53607121 100644
--- a/web/core/lib/Drupal/Core/Password/PhpassHashedPassword.php
+++ b/web/core/lib/Drupal/Core/Password/PhpassHashedPassword.php
@@ -237,6 +237,7 @@ public function check($password, $hash) {
// A normal Drupal 7 password using sha512.
$computed_hash = $this->crypt('sha512', $password, $stored_hash);
break;
+
case '$H$':
// phpBB3 uses "$H$" for the same thing as "$P$".
case '$P$':
@@ -244,6 +245,7 @@ public function check($password, $hash) {
// imported password or from an earlier Drupal version.
$computed_hash = $this->crypt('md5', $password, $stored_hash);
break;
+
default:
return FALSE;
}
diff --git a/web/core/lib/Drupal/Core/Plugin/DefaultLazyPluginCollection.php b/web/core/lib/Drupal/Core/Plugin/DefaultLazyPluginCollection.php
index 8af3b2f124..071a5648b0 100644
--- a/web/core/lib/Drupal/Core/Plugin/DefaultLazyPluginCollection.php
+++ b/web/core/lib/Drupal/Core/Plugin/DefaultLazyPluginCollection.php
@@ -64,9 +64,9 @@ public function __construct(PluginManagerInterface $manager, array $configuratio
if (!empty($configurations)) {
$instance_ids = array_keys($configurations);
- $this->instanceIDs = array_combine($instance_ids, $instance_ids);
+ $this->instanceIds = array_combine($instance_ids, $instance_ids);
// Store the original order of the instance IDs for export.
- $this->originalOrder = $this->instanceIDs;
+ $this->originalOrder = $this->instanceIds;
}
}
@@ -87,7 +87,7 @@ protected function initializePlugin($instance_id) {
* @return $this
*/
public function sort() {
- uasort($this->instanceIDs, [$this, 'sortHelper']);
+ uasort($this->instanceIds, [$this, 'sortHelper']);
return $this;
}
@@ -106,10 +106,10 @@ public function sortHelper($aID, $bID) {
public function getConfiguration() {
$instances = [];
// Store the current order of the instances.
- $current_order = $this->instanceIDs;
+ $current_order = $this->instanceIds;
// Reorder the instances to match the original order, adding new instances
// to the end.
- $this->instanceIDs = $this->originalOrder + $current_order;
+ $this->instanceIds = $this->originalOrder + $current_order;
foreach ($this as $instance_id => $instance) {
if (PluginHelper::isConfigurable($instance)) {
@@ -120,7 +120,7 @@ public function getConfiguration() {
}
}
// Restore the current order.
- $this->instanceIDs = $current_order;
+ $this->instanceIds = $current_order;
return $instances;
}
diff --git a/web/core/lib/Drupal/Core/Plugin/DefaultSingleLazyPluginCollection.php b/web/core/lib/Drupal/Core/Plugin/DefaultSingleLazyPluginCollection.php
index 0bc119818e..df1cc78d79 100644
--- a/web/core/lib/Drupal/Core/Plugin/DefaultSingleLazyPluginCollection.php
+++ b/web/core/lib/Drupal/Core/Plugin/DefaultSingleLazyPluginCollection.php
@@ -93,7 +93,7 @@ public function setConfiguration($configuration) {
public function addInstanceId($id, $configuration = NULL) {
$this->instanceId = $id;
// Reset the list of instance IDs since there can be only one.
- $this->instanceIDs = [];
+ $this->instanceIds = [];
parent::addInstanceId($id, $configuration);
if ($configuration !== NULL) {
$this->setConfiguration($configuration);
diff --git a/web/core/lib/Drupal/Core/ProxyBuilder/ProxyBuilder.php b/web/core/lib/Drupal/Core/ProxyBuilder/ProxyBuilder.php
index f808fba223..2b94a0b3bd 100644
--- a/web/core/lib/Drupal/Core/ProxyBuilder/ProxyBuilder.php
+++ b/web/core/lib/Drupal/Core/ProxyBuilder/ProxyBuilder.php
@@ -10,7 +10,7 @@
class ProxyBuilder extends BaseProxyBuilder {
/**
- * {@inheritdoc{
+ * {@inheritdoc}
*/
protected function buildUseStatements() {
$output = parent::buildUseStatements();
diff --git a/web/core/lib/Drupal/Core/ProxyClass/Extension/ModuleRequiredByThemesUninstallValidator.php b/web/core/lib/Drupal/Core/ProxyClass/Extension/ModuleRequiredByThemesUninstallValidator.php
new file mode 100644
index 0000000000..601f482e4d
--- /dev/null
+++ b/web/core/lib/Drupal/Core/ProxyClass/Extension/ModuleRequiredByThemesUninstallValidator.php
@@ -0,0 +1,88 @@
+<?php
+// @codingStandardsIgnoreFile
+
+/**
+ * This file was generated via php core/scripts/generate-proxy-class.php 'Drupal\Core\Extension\ModuleRequiredByThemesUninstallValidator' "core/lib/Drupal/Core".
+ */
+
+namespace Drupal\Core\ProxyClass\Extension {
+
+ /**
+ * Provides a proxy class for \Drupal\Core\Extension\ModuleRequiredByThemesUninstallValidator.
+ *
+ * @see \Drupal\Component\ProxyBuilder
+ */
+ class ModuleRequiredByThemesUninstallValidator implements \Drupal\Core\Extension\ModuleUninstallValidatorInterface
+ {
+
+ use \Drupal\Core\DependencyInjection\DependencySerializationTrait;
+
+ /**
+ * The id of the original proxied service.
+ *
+ * @var string
+ */
+ protected $drupalProxyOriginalServiceId;
+
+ /**
+ * The real proxied service, after it was lazy loaded.
+ *
+ * @var \Drupal\Core\Extension\ModuleRequiredByThemesUninstallValidator
+ */
+ protected $service;
+
+ /**
+ * The service container.
+ *
+ * @var \Symfony\Component\DependencyInjection\ContainerInterface
+ */
+ protected $container;
+
+ /**
+ * Constructs a ProxyClass Drupal proxy object.
+ *
+ * @param \Symfony\Component\DependencyInjection\ContainerInterface $container
+ * The container.
+ * @param string $drupal_proxy_original_service_id
+ * The service ID of the original service.
+ */
+ public function __construct(\Symfony\Component\DependencyInjection\ContainerInterface $container, $drupal_proxy_original_service_id)
+ {
+ $this->container = $container;
+ $this->drupalProxyOriginalServiceId = $drupal_proxy_original_service_id;
+ }
+
+ /**
+ * Lazy loads the real service from the container.
+ *
+ * @return object
+ * Returns the constructed real service.
+ */
+ protected function lazyLoadItself()
+ {
+ if (!isset($this->service)) {
+ $this->service = $this->container->get($this->drupalProxyOriginalServiceId);
+ }
+
+ return $this->service;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function validate($module)
+ {
+ return $this->lazyLoadItself()->validate($module);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function setStringTranslation(\Drupal\Core\StringTranslation\TranslationInterface $translation)
+ {
+ return $this->lazyLoadItself()->setStringTranslation($translation);
+ }
+
+ }
+
+}
diff --git a/web/core/lib/Drupal/Core/Render/Element/PasswordConfirm.php b/web/core/lib/Drupal/Core/Render/Element/PasswordConfirm.php
index 07c31490f4..1b14c42849 100644
--- a/web/core/lib/Drupal/Core/Render/Element/PasswordConfirm.php
+++ b/web/core/lib/Drupal/Core/Render/Element/PasswordConfirm.php
@@ -73,7 +73,10 @@ public static function processPasswordConfirm(&$element, FormStateInterface $for
'#title' => t('Password'),
'#value' => empty($element['#value']) ? NULL : $element['#value']['pass1'],
'#required' => $element['#required'],
- '#attributes' => ['class' => ['password-field', 'js-password-field']],
+ '#attributes' => [
+ 'class' => ['password-field', 'js-password-field'],
+ 'autocomplete' => ['new-password'],
+ ],
'#error_no_message' => TRUE,
];
$element['pass2'] = [
@@ -81,7 +84,10 @@ public static function processPasswordConfirm(&$element, FormStateInterface $for
'#title' => t('Confirm password'),
'#value' => empty($element['#value']) ? NULL : $element['#value']['pass2'],
'#required' => $element['#required'],
- '#attributes' => ['class' => ['password-confirm', 'js-password-confirm']],
+ '#attributes' => [
+ 'class' => ['password-confirm', 'js-password-confirm'],
+ 'autocomplete' => ['new-password'],
+ ],
'#error_no_message' => TRUE,
];
$element['#element_validate'] = [[get_called_class(), 'validatePasswordConfirm']];
diff --git a/web/core/lib/Drupal/Core/Render/Renderer.php b/web/core/lib/Drupal/Core/Render/Renderer.php
index 6f9ab71cc2..8df43985ed 100644
--- a/web/core/lib/Drupal/Core/Render/Renderer.php
+++ b/web/core/lib/Drupal/Core/Render/Renderer.php
@@ -739,7 +739,7 @@ protected function ensureMarkupIsSafe(array $elements) {
$elements['#markup'] = Markup::create(Html::escape($elements['#plain_text']));
}
elseif (!($elements['#markup'] instanceof MarkupInterface)) {
- // The default behaviour is to XSS filter using the admin tag list.
+ // The default behavior is to XSS filter using the admin tag list.
$tags = isset($elements['#allowed_tags']) ? $elements['#allowed_tags'] : Xss::getAdminTagList();
$elements['#markup'] = Markup::create(Xss::filter($elements['#markup'], $tags));
}
diff --git a/web/core/lib/Drupal/Core/Render/theme.api.php b/web/core/lib/Drupal/Core/Render/theme.api.php
index 8cb8116b9c..ecb76b7d21 100644
--- a/web/core/lib/Drupal/Core/Render/theme.api.php
+++ b/web/core/lib/Drupal/Core/Render/theme.api.php
@@ -433,7 +433,7 @@
*
* There are in fact multiple render pipelines:
* - Drupal always uses the Symfony render pipeline. See
- * http://symfony.com/doc/2.7/components/http_kernel/introduction.html
+ * https://symfony.com/doc/3.4/components/http_kernel.html
* - Within the Symfony render pipeline, there is a Drupal render pipeline,
* which handles controllers that return render arrays. (Symfony's render
* pipeline only knows how to deal with Response objects; this pipeline
diff --git a/web/core/lib/Drupal/Core/Site/Settings.php b/web/core/lib/Drupal/Core/Site/Settings.php
index ad8713a752..a9ac950e16 100644
--- a/web/core/lib/Drupal/Core/Site/Settings.php
+++ b/web/core/lib/Drupal/Core/Site/Settings.php
@@ -125,8 +125,21 @@ public static function initialize($app_root, $site_path, &$class_loader) {
require $app_root . '/' . $site_path . '/settings.php';
}
- // Initialize Database.
- Database::setMultipleConnectionInfo($databases);
+ // Initialize databases.
+ foreach ($databases as $key => $targets) {
+ foreach ($targets as $target => $info) {
+ Database::addConnectionInfo($key, $target, $info);
+ // If the database driver is provided by a module, then its code may
+ // need to be instantiated prior to when the module's root namespace
+ // is added to the autoloader, because that happens during service
+ // container initialization but the container definition is likely in
+ // the database. Therefore, allow the connection info to specify an
+ // autoload directory for the driver.
+ if (isset($info['autoload'])) {
+ $class_loader->addPsr4($info['namespace'] . '\\', $info['autoload']);
+ }
+ }
+ }
// For BC ensure the $config_directories global is set both in the global
// and settings.
diff --git a/web/core/lib/Drupal/Core/Template/TwigExtension.php b/web/core/lib/Drupal/Core/Template/TwigExtension.php
index b14653b8bd..9694d00556 100644
--- a/web/core/lib/Drupal/Core/Template/TwigExtension.php
+++ b/web/core/lib/Drupal/Core/Template/TwigExtension.php
@@ -651,8 +651,9 @@ public function createAttribute(array $attributes = []) {
*
* @param array|object $element
* The parent renderable array to exclude the child items.
- * @param string[] ...
- * The string keys of $element to prevent printing.
+ * @param string[]|string ...
+ * The string keys of $element to prevent printing. Arguments can include
+ * string keys directly, or arrays of string keys to hide.
*
* @return array
* The filtered renderable array.
@@ -666,10 +667,12 @@ public function withoutFilter($element) {
}
$args = func_get_args();
unset($args[0]);
- foreach ($args as $arg) {
- if (isset($filtered_element[$arg])) {
- unset($filtered_element[$arg]);
- }
+ // Since the remaining arguments can be a mix of arrays and strings, we use
+ // some native PHP iterator classes to allow us to recursively iterate over
+ // everything in a single pass.
+ $iterator = new \RecursiveIteratorIterator(new \RecursiveArrayIterator($args));
+ foreach ($iterator as $key) {
+ unset($filtered_element[$key]);
}
return $filtered_element;
}
diff --git a/web/core/lib/Drupal/Core/Test/TestDiscovery.php b/web/core/lib/Drupal/Core/Test/TestDiscovery.php
index 7c6242f950..2899c9d4f7 100644
--- a/web/core/lib/Drupal/Core/Test/TestDiscovery.php
+++ b/web/core/lib/Drupal/Core/Test/TestDiscovery.php
@@ -128,7 +128,7 @@ public function registerTestNamespaces() {
* An array of included test types.
*
* @return array
- * An array of tests keyed by the the group name. If a test is annotated to
+ * An array of tests keyed by the group name. If a test is annotated to
* belong to multiple groups, it will appear under all group keys it belongs
* to.
* @code
diff --git a/web/core/lib/Drupal/Core/Theme/ActiveTheme.php b/web/core/lib/Drupal/Core/Theme/ActiveTheme.php
index 968b0c36ae..07a0287044 100644
--- a/web/core/lib/Drupal/Core/Theme/ActiveTheme.php
+++ b/web/core/lib/Drupal/Core/Theme/ActiveTheme.php
@@ -209,11 +209,18 @@ public function getLibraries() {
/**
* Returns the removed stylesheets by the theme.
*
- * @return mixed
+ * This method is used as a BC layer to access the contents of the deprecated
+ * stylesheets-remove key in theme info.yml files. It will be removed once it
+ * is no longer needed in Drupal 10.
*
- * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
+ * @return mixed
+ * The removed stylesheets.
*
* @see https://www.drupal.org/node/2497313
+ *
+ * @todo Remove in Drupal 10.0.x.
+ *
+ * @internal
*/
public function getStyleSheetsRemove() {
return $this->styleSheetsRemove;
diff --git a/web/core/lib/Drupal/Core/Theme/Registry.php b/web/core/lib/Drupal/Core/Theme/Registry.php
index 940716af77..38e1006561 100644
--- a/web/core/lib/Drupal/Core/Theme/Registry.php
+++ b/web/core/lib/Drupal/Core/Theme/Registry.php
@@ -134,6 +134,13 @@ class Registry implements DestructableInterface {
*/
protected $themeHandler;
+ /**
+ * The theme initialization.
+ *
+ * @var \Drupal\Core\Theme\ThemeInitializationInterface
+ */
+ protected $themeInitialization;
+
/**
* The theme manager.
*
@@ -488,6 +495,7 @@ protected function processExtension(array &$cache, $name, $type, $theme, $path)
// if the theme hook specifies a function callback instead, check to
// ensure the function actually exists.
if (isset($info['function'])) {
+ @trigger_error(sprintf('Theme functions are deprecated in drupal:8.0.0 and are removed from drupal:10.0.0. Use Twig templates instead of %s(). See https://www.drupal.org/node/1831138', $info['function']), E_USER_DEPRECATED);
if (!function_exists($info['function'])) {
throw new \BadFunctionCallException(sprintf(
'Theme hook "%s" refers to a theme function callback that does not exist: "%s"',
diff --git a/web/core/lib/Drupal/Core/Theme/ThemeInitialization.php b/web/core/lib/Drupal/Core/Theme/ThemeInitialization.php
index 0bf20d7e8e..34b95e955c 100644
--- a/web/core/lib/Drupal/Core/Theme/ThemeInitialization.php
+++ b/web/core/lib/Drupal/Core/Theme/ThemeInitialization.php
@@ -182,7 +182,7 @@ public function getActiveTheme(Extension $theme, array $base_themes = []) {
$values['logo'] = $theme->getPath() . '/logo.svg';
}
- // @todo Remove in Drupal 9.0.x.
+ // @todo Remove in Drupal 10.0.x.
$values['stylesheets_remove'] = $this->prepareStylesheetsRemove($theme, $base_themes);
// Prepare libraries overrides from this theme and ancestor themes. This
@@ -312,6 +312,10 @@ protected function resolveStyleSheetPlaceholders($css_file) {
/**
* Prepares stylesheets-remove specified in the *.info.yml file.
*
+ * This method is used as a BC layer to access the contents of the deprecated
+ * stylesheets-remove key in theme info.yml files. It will be removed once it
+ * is no longer needed in Drupal 10.
+ *
* @param \Drupal\Core\Extension\Extension $theme
* The theme extension object.
* @param \Drupal\Core\Extension\Extension[] $base_themes
@@ -320,7 +324,9 @@ protected function resolveStyleSheetPlaceholders($css_file) {
* @return string[]
* The list of stylesheets-remove specified in the *.info.yml file.
*
- * @todo Remove in Drupal 9.0.x.
+ * @todo Remove in Drupal 10.0.x.
+ *
+ * @internal
*/
protected function prepareStylesheetsRemove(Extension $theme, $base_themes) {
// Prepare stylesheets from this theme as well as all ancestor themes.
@@ -330,6 +336,7 @@ protected function prepareStylesheetsRemove(Extension $theme, $base_themes) {
// Grab stylesheets from base theme.
foreach ($base_themes as $base) {
if (!empty($base->info['stylesheets-remove'])) {
+ @trigger_error('The theme info key stylesheets-remove implemented by theme ' . $base->getName() . ' is deprecated in drupal:8.0.0 and is removed from drupal:10.0.0. See https://www.drupal.org/node/2497313', E_USER_DEPRECATED);
foreach ($base->info['stylesheets-remove'] as $css_file) {
$css_file = $this->resolveStyleSheetPlaceholders($css_file);
$stylesheets_remove[$css_file] = $css_file;
@@ -339,6 +346,7 @@ protected function prepareStylesheetsRemove(Extension $theme, $base_themes) {
// Add stylesheets used by this theme.
if (!empty($theme->info['stylesheets-remove'])) {
+ @trigger_error('The theme info key stylesheets-remove implemented by theme ' . $theme->getName() . ' is deprecated in drupal:8.0.0 and is removed from drupal:10.0.0. See https://www.drupal.org/node/2497313', E_USER_DEPRECATED);
foreach ($theme->info['stylesheets-remove'] as $css_file) {
$css_file = $this->resolveStyleSheetPlaceholders($css_file);
$stylesheets_remove[$css_file] = $css_file;
diff --git a/web/core/lib/Drupal/Core/TypedData/TypedDataInterface.php b/web/core/lib/Drupal/Core/TypedData/TypedDataInterface.php
index f6da49d8c1..0d1099acad 100644
--- a/web/core/lib/Drupal/Core/TypedData/TypedDataInterface.php
+++ b/web/core/lib/Drupal/Core/TypedData/TypedDataInterface.php
@@ -43,6 +43,7 @@ public function getDataDefinition();
* Gets the data value.
*
* @return mixed
+ * The data value.
*/
public function getValue();
@@ -68,6 +69,7 @@ public function setValue($value, $notify = TRUE);
* Returns a string representation of the data.
*
* @return string
+ * The string representation of the data.
*/
public function getString();
@@ -105,7 +107,7 @@ public function applyDefaultValue($notify = TRUE);
/**
* Returns the name of a property or item.
*
- * @return string
+ * @return string|int|null
* If the data is a property of some complex data, the name of the property.
* If the data is an item of a list, the name is the numeric position of the
* item in the list, starting with 0. Otherwise, NULL is returned.
diff --git a/web/core/lib/Drupal/Core/TypedData/Validation/TypedDataMetadata.php b/web/core/lib/Drupal/Core/TypedData/Validation/TypedDataMetadata.php
index 60702b7c10..e878d20c98 100644
--- a/web/core/lib/Drupal/Core/TypedData/Validation/TypedDataMetadata.php
+++ b/web/core/lib/Drupal/Core/TypedData/Validation/TypedDataMetadata.php
@@ -3,11 +3,9 @@
namespace Drupal\Core\TypedData\Validation;
use Drupal\Core\TypedData\TypedDataInterface;
-use Symfony\Component\Validator\Exception\BadMethodCallException;
use Symfony\Component\Validator\Mapping\CascadingStrategy;
use Symfony\Component\Validator\Mapping\MetadataInterface;
use Symfony\Component\Validator\Mapping\TraversalStrategy;
-use Symfony\Component\Validator\ValidationVisitorInterface;
/**
* Validator metadata for typed data objects.
@@ -33,13 +31,6 @@ public function __construct(TypedDataInterface $typed_data) {
$this->typedData = $typed_data;
}
- /**
- * {@inheritdoc}
- */
- public function accept(ValidationVisitorInterface $visitor, $typed_data, $group, $propertyPath) {
- throw new BadMethodCallException('Not supported.');
- }
-
/**
* {@inheritdoc}
*/
diff --git a/web/core/lib/Drupal/Core/Update/UpdateServiceProvider.php b/web/core/lib/Drupal/Core/Update/UpdateServiceProvider.php
index c663e9ae64..ca1d66b87c 100644
--- a/web/core/lib/Drupal/Core/Update/UpdateServiceProvider.php
+++ b/web/core/lib/Drupal/Core/Update/UpdateServiceProvider.php
@@ -10,7 +10,7 @@
use Symfony\Component\DependencyInjection\Reference;
/**
- * Customises the container for running updates.
+ * Customizes the container for running updates.
*/
class UpdateServiceProvider implements ServiceProviderInterface, ServiceModifierInterface {
diff --git a/web/core/lib/Drupal/Core/Updater/Updater.php b/web/core/lib/Drupal/Core/Updater/Updater.php
index 9f63291ca1..1d3fdb59a0 100644
--- a/web/core/lib/Drupal/Core/Updater/Updater.php
+++ b/web/core/lib/Drupal/Core/Updater/Updater.php
@@ -64,7 +64,7 @@ public static function factory($source, $root) {
$updater = self::getUpdaterFromDirectory($source);
}
else {
- throw new UpdaterException(t('Unable to determine the type of the source directory.'));
+ throw new UpdaterException('Unable to determine the type of the source directory.');
}
return new $updater($source, $root);
}
@@ -89,7 +89,7 @@ public static function getUpdaterFromDirectory($directory) {
return $class;
}
}
- throw new UpdaterException(t('Cannot determine the type of project.'));
+ throw new UpdaterException('Cannot determine the type of project.');
}
/**
@@ -142,7 +142,7 @@ protected static function getExtensionInfo($directory) {
$info_file = static::findInfoFile($directory);
$info = \Drupal::service('info_parser')->parse($info_file);
if (empty($info)) {
- throw new UpdaterException(t('Unable to parse info file: %info_file.', ['%info_file' => $info_file]));
+ throw new UpdaterException("Unable to parse info file: '$info_file'.");
}
return $info;
@@ -178,7 +178,7 @@ public static function getProjectTitle($directory) {
$info_file = self::findInfoFile($directory);
$info = \Drupal::service('info_parser')->parse($info_file);
if (empty($info)) {
- throw new UpdaterException(t('Unable to parse info file: %info_file.', ['%info_file' => $info_file]));
+ throw new UpdaterException("Unable to parse info file: '$info_file'.");
}
return $info['name'];
}
@@ -228,7 +228,7 @@ public function update(&$filetransfer, $overrides = []) {
if (!$this->name) {
// This is bad, don't want to delete the install directory.
- throw new UpdaterException(t('Fatal error in update, cowardly refusing to wipe out the install directory.'));
+ throw new UpdaterException('Fatal error in update, cowardly refusing to wipe out the install directory.');
}
// Make sure the installation parent directory exists and is writable.
@@ -253,7 +253,7 @@ public function update(&$filetransfer, $overrides = []) {
return $this->postUpdateTasks();
}
catch (FileTransferException $e) {
- throw new UpdaterFileTransferException(t('File Transfer failed, reason: @reason', ['@reason' => strtr($e->getMessage(), $e->arguments)]));
+ throw new UpdaterFileTransferException("File Transfer failed, reason: '" . strtr($e->getMessage(), $e->arguments) . "'");
}
}
@@ -291,7 +291,7 @@ public function install(&$filetransfer, $overrides = []) {
return $this->postInstallTasks();
}
catch (FileTransferException $e) {
- throw new UpdaterFileTransferException(t('File Transfer failed, reason: @reason', ['@reason' => strtr($e->getMessage(), $e->arguments)]));
+ throw new UpdaterFileTransferException("File Transfer failed, reason: '" . strtr($e->getMessage(), $e->arguments)) . "'";
}
}
diff --git a/web/core/lib/Drupal/Core/Url.php b/web/core/lib/Drupal/Core/Url.php
index ea552bf4cb..82c2c600b3 100644
--- a/web/core/lib/Drupal/Core/Url.php
+++ b/web/core/lib/Drupal/Core/Url.php
@@ -15,6 +15,14 @@
/**
* Defines an object that holds information about a URL.
+ *
+ * In most cases, these should be created with the following methods:
+ * - \Drupal\Core\Url::fromRoute()
+ * - \Drupal\Core\Url::fromRouteMatch()
+ * - \Drupal\Core\Url::fromUri()
+ * - \Drupal\Core\Url::fromUserInput()
+ *
+ * @see \Drupal\Core\Entity\EntityBase::toUrl()
*/
class Url implements TrustedCallbackInterface {
use DependencySerializationTrait;
diff --git a/web/core/lib/Drupal/Core/Utility/LinkGenerator.php b/web/core/lib/Drupal/Core/Utility/LinkGenerator.php
index cfe0d19d13..665e1d3192 100644
--- a/web/core/lib/Drupal/Core/Utility/LinkGenerator.php
+++ b/web/core/lib/Drupal/Core/Utility/LinkGenerator.php
@@ -7,6 +7,7 @@
use Drupal\Component\Render\MarkupInterface;
use Drupal\Core\Extension\ModuleHandlerInterface;
use Drupal\Core\GeneratedLink;
+use Drupal\Core\GeneratedButton;
use Drupal\Core\GeneratedNoLink;
use Drupal\Core\Link;
use Drupal\Core\Render\RendererInterface;
@@ -165,19 +166,41 @@ public function generate($text, Url $url) {
if ($url->isExternal()) {
$generated_link = new GeneratedLink();
$attributes['href'] = $url->toString(FALSE);
+ return $this->doGenerate($generated_link, $attributes, $variables);
}
- elseif ($url->isRouted() && $url->getRouteName() === '<nolink>') {
+ if ($url->isRouted() && $url->getRouteName() === '<nolink>') {
$generated_link = new GeneratedNoLink();
unset($attributes['href']);
+ return $this->doGenerate($generated_link, $attributes, $variables);
}
- else {
- $generated_url = $url->toString(TRUE);
- $generated_link = GeneratedLink::createFromObject($generated_url);
- // The result of the URL generator is a plain-text URL to use as the href
- // attribute, and it is escaped by \Drupal\Core\Template\Attribute.
- $attributes['href'] = $generated_url->getGeneratedUrl();
+ if ($url->isRouted() && $url->getRouteName() === '<button>') {
+ $generated_link = new GeneratedButton();
+ $attributes['type'] = 'button';
+ unset($attributes['href']);
+ return $this->doGenerate($generated_link, $attributes, $variables);
}
+ $generated_url = $url->toString(TRUE);
+ $generated_link = GeneratedLink::createFromObject($generated_url);
+ // The result of the URL generator is a plain-text URL to use as the href
+ // attribute, and it is escaped by \Drupal\Core\Template\Attribute.
+ $attributes['href'] = $generated_url->getGeneratedUrl();
+ return $this->doGenerate($generated_link, $attributes, $variables);
+ }
+ /**
+ * Generates the link.
+ *
+ * @param Drupal\Core\GeneratedLink $generated_link
+ * The generated link, along with its associated cacheability metadata.
+ * @param array $attributes
+ * The attributes of the generated link.
+ * @param array $variables
+ * The link text, url, and other options.
+ *
+ * @return Drupal\Core\GeneratedLink
+ * The generated link, along with its associated cacheability metadata.
+ */
+ protected function doGenerate($generated_link, $attributes, $variables) {
if (!($variables['text'] instanceof MarkupInterface)) {
$variables['text'] = Html::escape($variables['text']);
}
diff --git a/web/core/lib/Drupal/Core/Utility/TableSort.php b/web/core/lib/Drupal/Core/Utility/TableSort.php
index 7e02c14c32..b513a2b8a5 100644
--- a/web/core/lib/Drupal/Core/Utility/TableSort.php
+++ b/web/core/lib/Drupal/Core/Utility/TableSort.php
@@ -81,7 +81,7 @@ public static function header(&$cell_content, array &$cell_attributes, array $he
$image = '';
}
$cell_content = Link::createFromRoute(new FormattableMarkup('@cell_content@image', ['@cell_content' => $cell_content, '@image' => $image]), '<current>', [], [
- 'attributes' => ['title' => $title],
+ 'attributes' => ['title' => $title, 'rel' => 'nofollow'],
'query' => array_merge($context['query'], [
'sort' => $context['sort'],
'order' => $cell_content,
diff --git a/web/core/misc/ajax.es6.js b/web/core/misc/ajax.es6.js
index fdf000adca..6eeddf3df7 100644
--- a/web/core/misc/ajax.es6.js
+++ b/web/core/misc/ajax.es6.js
@@ -102,7 +102,9 @@
if (xmlhttp.status) {
statusCode = `\n${Drupal.t('An AJAX HTTP error occurred.')}\n${Drupal.t(
'HTTP Result Code: !status',
- { '!status': xmlhttp.status },
+ {
+ '!status': xmlhttp.status,
+ },
)}`;
} else {
statusCode = `\n${Drupal.t(
@@ -1131,12 +1133,14 @@
(response.effect || ajax.effect) !== 'none' &&
$newContent.filter(
i =>
- !// We can not consider HTML comments or whitespace text as separate
- // roots, since they do not cause visual regression with effect.
- (
- $newContent[i].nodeName === '#comment' ||
- ($newContent[i].nodeName === '#text' &&
- /^(\s|\n|\r)*$/.test($newContent[i].textContent))
+ !(
+ // We can not consider HTML comments or whitespace text as separate
+ // roots, since they do not cause visual regression with effect.
+ (
+ $newContent[i].nodeName === '#comment' ||
+ ($newContent[i].nodeName === '#text' &&
+ /^(\s|\n|\r)*$/.test($newContent[i].textContent))
+ )
),
).length > 1
? Drupal.theme('ajaxWrapperMultipleRootElements', $newContent)
@@ -1534,10 +1538,6 @@
/**
* Command to add css.
*
- * Uses the proprietary addImport method if available as browsers which
- * support that method ignore @import statements in dynamically added
- * stylesheets.
- *
* @param {Drupal.Ajax} [ajax]
* {@link Drupal.Ajax} object created by {@link Drupal.ajax}.
* @param {object} response
@@ -1548,21 +1548,7 @@
* The XMLHttpRequest status.
*/
add_css(ajax, response, status) {
- // Add the styles in the normal way.
$('head').prepend(response.data);
- // Add imports in the styles using the addImport method if available.
- let match;
- const importMatch = /^@import url\("(.*)"\);$/gim;
- if (
- document.styleSheets[0].addImport &&
- importMatch.test(response.data)
- ) {
- importMatch.lastIndex = 0;
- do {
- match = importMatch.exec(response.data);
- document.styleSheets[0].addImport(match[1]);
- } while (match);
- }
},
/**
diff --git a/web/core/misc/ajax.js b/web/core/misc/ajax.js
index 7df2501987..cc3936ca6a 100644
--- a/web/core/misc/ajax.js
+++ b/web/core/misc/ajax.js
@@ -57,7 +57,9 @@ function _toConsumableArray(arr) { if (Array.isArray(arr)) { for (var i = 0, arr
var statusText = void 0;
var responseText = void 0;
if (xmlhttp.status) {
- statusCode = '\n' + Drupal.t('An AJAX HTTP error occurred.') + '\n' + Drupal.t('HTTP Result Code: !status', { '!status': xmlhttp.status });
+ statusCode = '\n' + Drupal.t('An AJAX HTTP error occurred.') + '\n' + Drupal.t('HTTP Result Code: !status', {
+ '!status': xmlhttp.status
+ });
} else {
statusCode = '\n' + Drupal.t('An AJAX HTTP request terminated abnormally.');
}
@@ -629,16 +631,6 @@ function _toConsumableArray(arr) { if (Array.isArray(arr)) { for (var i = 0, arr
},
add_css: function add_css(ajax, response, status) {
$('head').prepend(response.data);
-
- var match = void 0;
- var importMatch = /^@import url\("(.*)"\);$/gim;
- if (document.styleSheets[0].addImport && importMatch.test(response.data)) {
- importMatch.lastIndex = 0;
- do {
- match = importMatch.exec(response.data);
- document.styleSheets[0].addImport(match[1]);
- } while (match);
- }
},
message: function message(ajax, response) {
var messages = new Drupal.Message(document.querySelector(response.messageWrapperQuerySelector));
diff --git a/web/core/misc/dialog/dialog.ajax.es6.js b/web/core/misc/dialog/dialog.ajax.es6.js
index cd1c4708d5..5de4f4cf74 100644
--- a/web/core/misc/dialog/dialog.ajax.es6.js
+++ b/web/core/misc/dialog/dialog.ajax.es6.js
@@ -23,7 +23,7 @@
// Add 'ui-front' jQuery UI class so jQuery UI widgets like autocomplete
// sit on top of dialogs. For more information see
// http://api.jqueryui.com/theming/stacking-elements/.
- $('<div id="drupal-modal" class="ui-front"/>')
+ $('<div id="drupal-modal" class="ui-front"></div>')
.hide()
.appendTo('body');
}
@@ -109,7 +109,10 @@
if (!$dialog.length) {
// Create the element if needed.
$dialog = $(
- `<div id="${response.selector.replace(/^#/, '')}" class="ui-front"/>`,
+ `<div id="${response.selector.replace(
+ /^#/,
+ '',
+ )}" class="ui-front"></div>`,
).appendTo('body');
}
// Set up the wrapper, if there isn't one.
diff --git a/web/core/misc/dialog/dialog.ajax.js b/web/core/misc/dialog/dialog.ajax.js
index 3f01d49394..948bfead0a 100644
--- a/web/core/misc/dialog/dialog.ajax.js
+++ b/web/core/misc/dialog/dialog.ajax.js
@@ -11,7 +11,7 @@
var $context = $(context);
if (!$('#drupal-modal').length) {
- $('<div id="drupal-modal" class="ui-front"/>').hide().appendTo('body');
+ $('<div id="drupal-modal" class="ui-front"></div>').hide().appendTo('body');
}
var $dialog = $context.closest('.ui-dialog-content');
@@ -62,7 +62,7 @@
}
var $dialog = $(response.selector);
if (!$dialog.length) {
- $dialog = $('<div id="' + response.selector.replace(/^#/, '') + '" class="ui-front"/>').appendTo('body');
+ $dialog = $('<div id="' + response.selector.replace(/^#/, '') + '" class="ui-front"></div>').appendTo('body');
}
if (!ajax.wrapper) {
diff --git a/web/core/misc/entity-form.es6.js b/web/core/misc/entity-form.es6.js
index a9a10c273c..6ccae70bcb 100644
--- a/web/core/misc/entity-form.es6.js
+++ b/web/core/misc/entity-form.es6.js
@@ -10,7 +10,7 @@
* @type {Drupal~behavior}
*
* @prop {Drupal~behaviorAttach} attach
- * Attaches summary behaviour entity form tabs.
+ * Attaches summary behavior entity form tabs.
*
* Specifically, it updates summaries to the revision information and the
* translation options.
diff --git a/web/core/misc/jquery.cookie.shim.es6.js b/web/core/misc/jquery.cookie.shim.es6.js
new file mode 100644
index 0000000000..4a3c3c86a6
--- /dev/null
+++ b/web/core/misc/jquery.cookie.shim.es6.js
@@ -0,0 +1,224 @@
+/**
+ * @file
+ * Defines a backwards-compatible shim for jquery.cookie.
+ */
+
+/**
+ * The core/js-cookie library object.
+ *
+ * @global
+ *
+ * @var {object} Cookies
+ */
+
+(($, Drupal, cookies) => {
+ /**
+ * Determines if an object is a function.
+ *
+ * @param {Object} obj
+ * The object to check.
+ *
+ * @return {boolean}
+ * True if the object is a function.
+ */
+ const isFunction = obj =>
+ Object.prototype.toString.call(obj) === '[object Function]';
+
+ /**
+ * Decodes cookie value for compatibility with jquery.cookie.
+ *
+ * @param {string} value
+ * The cookie value to parse.
+ * @param {boolean} parseJson
+ * Whether cookie value should be parsed from JSON.
+ *
+ * @return {string}
+ * The cookie value for the reader to return.
+ */
+ const parseCookieValue = (value, parseJson) => {
+ if (value.indexOf('"') === 0) {
+ value = value
+ .slice(1, -1)
+ .replace(/\\"/g, '"')
+ .replace(/\\\\/g, '\\');
+ }
+
+ try {
+ value = decodeURIComponent(value.replace(/\+/g, ' '));
+ return parseJson ? JSON.parse(value) : value;
+ } catch (e) {
+ // Exceptions on JSON parsing should be ignored.
+ }
+ };
+
+ /**
+ * Wraps the cookie value to support unsanitized values.
+ *
+ * Decoding strings is the job of the converter when using js-cookie, and
+ * the shim uses the same decode function as that library when the deprecated
+ * raw option is not used.
+ *
+ * @param {string} cookieValue
+ * The cookie value.
+ * @param {string} cookieName
+ * The cookie name.
+ * @param {reader~converterCallback} converter
+ * A function that takes the cookie value for further processing.
+ * @param {boolean} readUnsanitized
+ * Uses the unsanitized value when set to true.
+ * @param {boolean} parseJson
+ * Whether cookie value should be parsed from JSON.
+ *
+ * @return {string}
+ * The cookie value that js-cookie will return.
+ */
+ const reader = (
+ cookieValue,
+ cookieName,
+ converter,
+ readUnsanitized,
+ parseJson,
+ ) => {
+ const value = readUnsanitized
+ ? cookieValue
+ : parseCookieValue(cookieValue, parseJson);
+
+ if (converter !== undefined && isFunction(converter)) {
+ return converter(value, cookieName);
+ }
+
+ return value;
+ };
+
+ /**
+ * Gets or sets a browser cookie.
+ *
+ * @example
+ * // Returns 'myCookie=myCookieValue'.
+ * $.cookie('myCookie', 'myCookieValue');
+ * @example
+ * // Returns 'myCookieValue'.
+ * $.cookie('myCookie');
+ *
+ * @example
+ * // Returns the literal URI-encoded value of {"key": "value"} as the cookie
+ * // value along with the path as in the above example.
+ * $.cookie('myCookie', { key: 'value' });
+ * @example
+ * $.cookie.json = true;
+ * // Returns { key: 'value' }.
+ * $.cookie('myCookie');
+ *
+ * @param {string} key
+ * The name of the cookie.
+ * @param {string|Object|Function|undefined} value
+ * A js-cookie converter callback when used as a getter. This callback must
+ * be a function when using this shim for backwards-compatibility with
+ * jquery.cookie. When used as a setter, value is the string or JSON object
+ * to be used as the cookie value.
+ * @param {Object|undefined} options
+ * Overrides the default options when used as a setter. See the js-cookie
+ * library README.md file for details.
+ *
+ * @return {string}
+ * Returns the cookie name, value, and other properties based on the
+ * return value of the document.cookie setter.
+ *
+ * @see https://www.drupal.org/node/3104677
+ * @see https://github.com/js-cookie/js-cookie/blob/v3.0.0-rc.0/README.md
+ */
+ $.cookie = (key, value = undefined, options = undefined) => {
+ // Key should be only encoded if it exists and when not in a raw mode.
+ key = key && !$.cookie.raw ? encodeURIComponent(key) : key;
+ if (value !== undefined && !isFunction(value)) {
+ // The caller is setting a cookie value and not trying to retrieve the
+ // cookie value using a converter callback.
+ const attributes = Object.assign({}, $.cookie.defaults, options);
+
+ if (typeof attributes.expires === 'string' && attributes.expires !== '') {
+ attributes.expires = new Date(attributes.expires);
+ }
+
+ const cookieSetter = cookies.withConverter({
+ write: cookieValue => encodeURIComponent(cookieValue),
+ });
+
+ value =
+ $.cookie.json && !$.cookie.raw ? JSON.stringify(value) : String(value);
+
+ return cookieSetter.set(key, value, attributes);
+ }
+
+ // Use either js-cookie or pass in a converter to get the raw cookie value,
+ // which has security implications, but remains in place for
+ // backwards-compatibility.
+ const userProvidedConverter = value;
+ const cookiesShim = cookies.withConverter({
+ read: (cookieValue, cookieName) =>
+ reader(
+ cookieValue,
+ cookieName,
+ userProvidedConverter,
+ $.cookie.raw,
+ $.cookie.json,
+ ),
+ });
+
+ if (key !== undefined) {
+ return cookiesShim.get(key);
+ }
+
+ const results = cookiesShim.get();
+ Object.keys(results).forEach(resultKey => {
+ if (results[resultKey] === undefined) {
+ delete results[resultKey];
+ }
+ });
+
+ return results;
+ };
+
+ /**
+ * @prop {Object} defaults
+ * The default options when setting a cookie.
+ * @prop {string} defaults.path
+ * The default path for the cookie is ''.
+ * @prop {undefined} defaults.expires
+ * There is no default value for the expires option. The default expiration
+ * is set to an empty string.
+ */
+ $.cookie.defaults = Object.assign({ path: '' }, cookies.defaults);
+
+ /**
+ * @prop {boolean} json
+ * True if the cookie value should be parsed as JSON.
+ */
+ $.cookie.json = false;
+
+ /**
+ * @prop {boolean} json
+ * True if the cookie value should be returned as-is without decoding
+ * URI entities. In jquery.cookie, this also would not encode the cookie
+ * name, but js-cookie does not allow this.
+ */
+ $.cookie.raw = false;
+
+ /**
+ * Removes a browser cookie.
+ *
+ * @param {string} key
+ * The name of the cookie.
+ * @param {Object} options
+ * Optional options. See the js-cookie library README.md for more details.
+ *
+ * @return {boolean}
+ * Returns true when the cookie is successfully removed.
+ *
+ * @see https://www.drupal.org/node/3104677
+ * @see https://github.com/js-cookie/js-cookie/blob/v3.0.0-rc.0/README.md
+ */
+ $.removeCookie = (key, options) => {
+ cookies.remove(key, Object.assign({}, $.cookie.defaults, options));
+ return !cookies.get(key);
+ };
+})(jQuery, Drupal, window.Cookies);
diff --git a/web/core/misc/jquery.cookie.shim.js b/web/core/misc/jquery.cookie.shim.js
new file mode 100644
index 0000000000..a8df6ee679
--- /dev/null
+++ b/web/core/misc/jquery.cookie.shim.js
@@ -0,0 +1,88 @@
+/**
+* DO NOT EDIT THIS FILE.
+* See the following change record for more information,
+* https://www.drupal.org/node/2815083
+* @preserve
+**/
+
+(function ($, Drupal, cookies) {
+ var isFunction = function isFunction(obj) {
+ return Object.prototype.toString.call(obj) === '[object Function]';
+ };
+
+ var parseCookieValue = function parseCookieValue(value, parseJson) {
+ if (value.indexOf('"') === 0) {
+ value = value.slice(1, -1).replace(/\\"/g, '"').replace(/\\\\/g, '\\');
+ }
+
+ try {
+ value = decodeURIComponent(value.replace(/\+/g, ' '));
+ return parseJson ? JSON.parse(value) : value;
+ } catch (e) {}
+ };
+
+ var reader = function reader(cookieValue, cookieName, converter, readUnsanitized, parseJson) {
+ var value = readUnsanitized ? cookieValue : parseCookieValue(cookieValue, parseJson);
+
+ if (converter !== undefined && isFunction(converter)) {
+ return converter(value, cookieName);
+ }
+
+ return value;
+ };
+
+ $.cookie = function (key) {
+ var value = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : undefined;
+ var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : undefined;
+
+ key = key && !$.cookie.raw ? encodeURIComponent(key) : key;
+ if (value !== undefined && !isFunction(value)) {
+ var attributes = Object.assign({}, $.cookie.defaults, options);
+
+ if (typeof attributes.expires === 'string' && attributes.expires !== '') {
+ attributes.expires = new Date(attributes.expires);
+ }
+
+ var cookieSetter = cookies.withConverter({
+ write: function write(cookieValue) {
+ return encodeURIComponent(cookieValue);
+ }
+ });
+
+ value = $.cookie.json && !$.cookie.raw ? JSON.stringify(value) : String(value);
+
+ return cookieSetter.set(key, value, attributes);
+ }
+
+ var userProvidedConverter = value;
+ var cookiesShim = cookies.withConverter({
+ read: function read(cookieValue, cookieName) {
+ return reader(cookieValue, cookieName, userProvidedConverter, $.cookie.raw, $.cookie.json);
+ }
+ });
+
+ if (key !== undefined) {
+ return cookiesShim.get(key);
+ }
+
+ var results = cookiesShim.get();
+ Object.keys(results).forEach(function (resultKey) {
+ if (results[resultKey] === undefined) {
+ delete results[resultKey];
+ }
+ });
+
+ return results;
+ };
+
+ $.cookie.defaults = Object.assign({ path: '' }, cookies.defaults);
+
+ $.cookie.json = false;
+
+ $.cookie.raw = false;
+
+ $.removeCookie = function (key, options) {
+ cookies.remove(key, Object.assign({}, $.cookie.defaults, options));
+ return !cookies.get(key);
+ };
+})(jQuery, Drupal, window.Cookies);
\ No newline at end of file
diff --git a/web/core/misc/machine-name.es6.js b/web/core/misc/machine-name.es6.js
index 0fee7f6b5f..77339d53cd 100644
--- a/web/core/misc/machine-name.es6.js
+++ b/web/core/misc/machine-name.es6.js
@@ -88,7 +88,6 @@
}
Object.keys(settings.machineName).forEach(sourceId => {
- let machine = '';
const options = settings.machineName[sourceId];
const $source = $context
@@ -117,14 +116,8 @@
options.maxlength = $target.attr('maxlength');
// Hide the form item container of the machine name form element.
$wrapper.addClass('visually-hidden');
- // Determine the initial machine name value. Unless the machine name
- // form element is disabled or not empty, the initial default value is
- // based on the human-readable form element value.
- if ($target.is(':disabled') || $target.val() !== '') {
- machine = $target.val();
- } else if ($source.val() !== '') {
- machine = self.transliterate($source.val(), options);
- }
+ // Initial machine name from the target field default value.
+ const machine = $target.val();
// Append the machine name preview to the source field.
const $preview = $(
`<span class="machine-name-value">${
@@ -152,6 +145,18 @@
$preview,
options,
};
+
+ // If no initial value, determine machine name based on the
+ // human-readable form element value.
+ if (machine === '' && $source.val() !== '') {
+ self.transliterate($source.val(), options).done(machineName => {
+ self.showMachineName(
+ machineName.substr(0, options.maxlength),
+ eventData,
+ );
+ });
+ }
+
// If it is editable, append an edit link.
const $link = $(
`<span class="admin-link"><button type="button" class="link">${Drupal.t(
diff --git a/web/core/misc/machine-name.js b/web/core/misc/machine-name.js
index 636250f976..36d1aaff33 100644
--- a/web/core/misc/machine-name.js
+++ b/web/core/misc/machine-name.js
@@ -50,7 +50,6 @@
}
Object.keys(settings.machineName).forEach(function (sourceId) {
- var machine = '';
var options = settings.machineName[sourceId];
var $source = $context.find(sourceId).addClass('machine-name-source').once('machine-name');
@@ -70,11 +69,7 @@
$wrapper.addClass('visually-hidden');
- if ($target.is(':disabled') || $target.val() !== '') {
- machine = $target.val();
- } else if ($source.val() !== '') {
- machine = self.transliterate($source.val(), options);
- }
+ var machine = $target.val();
var $preview = $('<span class="machine-name-value">' + options.field_prefix + Drupal.checkPlain(machine) + options.field_suffix + '</span>');
$suffix.empty();
@@ -96,6 +91,12 @@
options: options
};
+ if (machine === '' && $source.val() !== '') {
+ self.transliterate($source.val(), options).done(function (machineName) {
+ self.showMachineName(machineName.substr(0, options.maxlength), eventData);
+ });
+ }
+
var $link = $('<span class="admin-link"><button type="button" class="link">' + Drupal.t('Edit') + '</button></span>').on('click', eventData, clickEditHandler);
$suffix.append($link);
diff --git a/web/core/misc/message.es6.js b/web/core/misc/message.es6.js
index 3f42ca66fe..41489e5733 100644
--- a/web/core/misc/message.es6.js
+++ b/web/core/misc/message.es6.js
@@ -42,7 +42,7 @@
wrapper = document.querySelector('[data-drupal-messages-fallback]');
wrapper.removeAttribute('data-drupal-messages-fallback');
wrapper.setAttribute('data-drupal-messages', '');
- wrapper.removeAttribute('class');
+ wrapper.classList.remove('hidden');
}
return wrapper.innerHTML === ''
? Drupal.Message.messageInternalWrapper(wrapper)
diff --git a/web/core/misc/message.js b/web/core/misc/message.js
index 9178ee6bf4..d9bbe3e141 100644
--- a/web/core/misc/message.js
+++ b/web/core/misc/message.js
@@ -76,7 +76,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
wrapper = document.querySelector('[data-drupal-messages-fallback]');
wrapper.removeAttribute('data-drupal-messages-fallback');
wrapper.setAttribute('data-drupal-messages', '');
- wrapper.removeAttribute('class');
+ wrapper.classList.remove('hidden');
}
return wrapper.innerHTML === '' ? Drupal.Message.messageInternalWrapper(wrapper) : wrapper.firstElementChild;
}
diff --git a/web/core/misc/polyfills/object.assign.es6.js b/web/core/misc/polyfills/object.assign.es6.js
new file mode 100644
index 0000000000..1dbb8bb5e9
--- /dev/null
+++ b/web/core/misc/polyfills/object.assign.es6.js
@@ -0,0 +1,42 @@
+/**
+ * @file
+ * Provides a polyfill for Object.assign().
+ *
+ * This is needed for Internet Explorer 11 and Opera Mini.
+ *
+ * This has been copied from MDN Web Docs code samples. Code samples in the MDN
+ * Web Docs are licensed under CC0.
+ *
+ * @see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/assign#Polyfill
+ * @see https://developer.mozilla.org/en-US/docs/MDN/About#Code_samples_and_snippets
+ */
+if (typeof Object.assign !== 'function') {
+ // Must be writable: true, enumerable: false, configurable: true
+ Object.defineProperty(Object, 'assign', {
+ value: function assign(target, varArgs) {
+ // .length of function is 2
+ 'use strict';
+ if (target === null || target === undefined) {
+ throw new TypeError('Cannot convert undefined or null to object');
+ }
+
+ var to = Object(target);
+
+ for (var index = 1; index < arguments.length; index++) {
+ var nextSource = arguments[index];
+
+ if (nextSource !== null && nextSource !== undefined) {
+ for (var nextKey in nextSource) {
+ // Avoid bugs when hasOwnProperty is shadowed
+ if (Object.prototype.hasOwnProperty.call(nextSource, nextKey)) {
+ to[nextKey] = nextSource[nextKey];
+ }
+ }
+ }
+ }
+ return to;
+ },
+ writable: true,
+ configurable: true,
+ });
+}
diff --git a/web/core/misc/polyfills/object.assign.js b/web/core/misc/polyfills/object.assign.js
new file mode 100644
index 0000000000..d207f045bb
--- /dev/null
+++ b/web/core/misc/polyfills/object.assign.js
@@ -0,0 +1,35 @@
+/**
+* DO NOT EDIT THIS FILE.
+* See the following change record for more information,
+* https://www.drupal.org/node/2815083
+* @preserve
+**/
+
+if (typeof Object.assign !== 'function') {
+ Object.defineProperty(Object, 'assign', {
+ value: function assign(target, varArgs) {
+ 'use strict';
+
+ if (target === null || target === undefined) {
+ throw new TypeError('Cannot convert undefined or null to object');
+ }
+
+ var to = Object(target);
+
+ for (var index = 1; index < arguments.length; index++) {
+ var nextSource = arguments[index];
+
+ if (nextSource !== null && nextSource !== undefined) {
+ for (var nextKey in nextSource) {
+ if (Object.prototype.hasOwnProperty.call(nextSource, nextKey)) {
+ to[nextKey] = nextSource[nextKey];
+ }
+ }
+ }
+ }
+ return to;
+ },
+ writable: true,
+ configurable: true
+ });
+}
\ No newline at end of file
diff --git a/web/core/misc/tabledrag.es6.js b/web/core/misc/tabledrag.es6.js
index 8045d128ad..eadc59a863 100644
--- a/web/core/misc/tabledrag.es6.js
+++ b/web/core/misc/tabledrag.es6.js
@@ -111,9 +111,9 @@
/**
* Used to determine up or down direction from last mouse move.
*
- * @type {number}
+ * @type {?number}
*/
- this.oldY = 0;
+ this.oldY = null;
/**
* Whether anything in the entire table has changed.
@@ -202,10 +202,10 @@
// manually append 2 indentations in the first draggable row, measure
// the offset, then remove.
const indent = Drupal.theme('tableDragIndentation');
- const testRow = $('<tr/>')
+ const testRow = $('<tr></tr>')
.addClass('draggable')
.appendTo(table);
- const testCell = $('<td/>')
+ const testCell = $('<td></td>')
.appendTo(testRow)
.prepend(indent)
.prepend(indent);
@@ -721,7 +721,7 @@
* @param {Drupal.tableDrag} self
* The drag handle.
* @param {HTMLElement} item
- * The item that that is being dragged.
+ * The item that is being dragged.
*/
Drupal.tableDrag.prototype.dragStart = function(event, self, item) {
// Create a new dragObject recording the pointer information.
@@ -760,6 +760,10 @@
if (self.oldRowElement) {
$(self.oldRowElement).removeClass('drag-previous');
}
+
+ // Set the initial y coordinate so the direction can be calculated in
+ // dragRow().
+ self.oldY = self.pointerCoords(event).y;
};
/**
diff --git a/web/core/misc/tabledrag.js b/web/core/misc/tabledrag.js
index b42e4475fe..29c21f762a 100644
--- a/web/core/misc/tabledrag.js
+++ b/web/core/misc/tabledrag.js
@@ -41,7 +41,7 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
this.oldRowElement = null;
- this.oldY = 0;
+ this.oldY = null;
this.changed = false;
@@ -74,8 +74,8 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
this.indentCount = 1;
var indent = Drupal.theme('tableDragIndentation');
- var testRow = $('<tr/>').addClass('draggable').appendTo(table);
- var testCell = $('<td/>').appendTo(testRow).prepend(indent).prepend(indent);
+ var testRow = $('<tr></tr>').addClass('draggable').appendTo(table);
+ var testCell = $('<td></td>').appendTo(testRow).prepend(indent).prepend(indent);
var $indentation = testCell.find('.js-indentation');
this.indentAmount = $indentation.get(1).offsetLeft - $indentation.get(0).offsetLeft;
@@ -417,6 +417,8 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
if (self.oldRowElement) {
$(self.oldRowElement).removeClass('drag-previous');
}
+
+ self.oldY = self.pointerCoords(event).y;
};
Drupal.tableDrag.prototype.dragRow = function (event, self) {
diff --git a/web/core/misc/tableheader.es6.js b/web/core/misc/tableheader.es6.js
index c43d1dece3..9d3bceecbc 100644
--- a/web/core/misc/tableheader.es6.js
+++ b/web/core/misc/tableheader.es6.js
@@ -210,7 +210,7 @@
// Clone the table header so it inherits original jQuery properties.
const $stickyHeader = this.$originalHeader.clone(true);
// Hide the table to avoid a flash of the header clone upon page load.
- this.$stickyTable = $('<table class="sticky-header"/>')
+ this.$stickyTable = $('<table class="sticky-header"></table>')
.css({
visibility: 'hidden',
position: 'fixed',
diff --git a/web/core/misc/tableheader.js b/web/core/misc/tableheader.js
index d5ad0a235e..6c31845cc0 100644
--- a/web/core/misc/tableheader.js
+++ b/web/core/misc/tableheader.js
@@ -98,7 +98,7 @@
createSticky: function createSticky() {
var $stickyHeader = this.$originalHeader.clone(true);
- this.$stickyTable = $('<table class="sticky-header"/>').css({
+ this.$stickyTable = $('<table class="sticky-header"></table>').css({
visibility: 'hidden',
position: 'fixed',
top: '0px'
diff --git a/web/core/modules/action/action.info.yml b/web/core/modules/action/action.info.yml
index 7559efbcb2..70590e85ad 100644
--- a/web/core/modules/action/action.info.yml
+++ b/web/core/modules/action/action.info.yml
@@ -1,6 +1,6 @@
name: Actions
type: module
-description: 'Perform tasks on specific events triggered within the system.'
+description: 'Allows configuration of tasks to be executed in response to events.'
package: Core
version: VERSION
core: 8.x
diff --git a/web/core/modules/action/action.post_update.php b/web/core/modules/action/action.post_update.php
index b88b0dbcac..f5370dcc32 100644
--- a/web/core/modules/action/action.post_update.php
+++ b/web/core/modules/action/action.post_update.php
@@ -22,3 +22,10 @@ function action_post_update_move_plugins(&$sandbox = NULL) {
return $action->isConfigurable() && in_array($action->getPlugin()->getPluginId(), $resave_ids, TRUE);
});
}
+
+/**
+ * Removes action settings.
+ */
+function action_post_update_remove_settings() {
+ \Drupal::configFactory()->getEditable('action.settings')->delete();
+}
diff --git a/web/core/modules/action/config/schema/action.schema.yml b/web/core/modules/action/config/schema/action.schema.yml
deleted file mode 100644
index 934df120f4..0000000000
--- a/web/core/modules/action/config/schema/action.schema.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-# Schema for the configuration files of the Action module.
-
-action.settings:
- type: config_object
- label: 'Action settings'
- mapping:
- recursion_limit:
- type: integer
- label: 'Recursion limit for actions'
diff --git a/web/core/modules/action/migrations/action_settings.yml b/web/core/modules/action/migrations/action_settings.yml
index ae97dc607e..acc446ed64 100644
--- a/web/core/modules/action/migrations/action_settings.yml
+++ b/web/core/modules/action/migrations/action_settings.yml
@@ -10,7 +10,11 @@ source:
- actions_max_stack
source_module: system
process:
- recursion_limit: actions_max_stack
+ recursion_limit:
+ plugin: skip_on_empty
+ method: row
+ source: empty
destination:
plugin: config
- config_name: action.settings
+ config_name: null
+ destination_module: action
diff --git a/web/core/modules/action/config/install/action.settings.yml b/web/core/modules/action/tests/fixtures/update/action.settings_3022401.yml
similarity index 100%
rename from web/core/modules/action/config/install/action.settings.yml
rename to web/core/modules/action/tests/fixtures/update/action.settings_3022401.yml
diff --git a/web/core/modules/action/tests/fixtures/update/drupal-8.action-3022401.php b/web/core/modules/action/tests/fixtures/update/drupal-8.action-3022401.php
new file mode 100644
index 0000000000..bfebb360ea
--- /dev/null
+++ b/web/core/modules/action/tests/fixtures/update/drupal-8.action-3022401.php
@@ -0,0 +1,41 @@
+<?php
+
+/**
+ * @file
+ * Contains database additions to for testing upgrade path for action settings.
+ *
+ * @see https://www.drupal.org/node/3022401
+ */
+
+use Drupal\Core\Database\Database;
+use Drupal\Core\Serialization\Yaml;
+
+$connection = Database::getConnection();
+
+$action_settings = Yaml::decode(file_get_contents(__DIR__ . '/action.settings_3022401.yml'));
+$connection->insert('config')
+ ->fields([
+ 'collection',
+ 'name',
+ 'data',
+ ])
+ ->values([
+ 'collection' => '',
+ 'name' => 'action.settings',
+ 'data' => serialize($action_settings),
+ ])
+ ->execute();
+
+// Enable action module.
+$extensions = $connection->select('config')
+ ->fields('config', ['data'])
+ ->condition('name', 'core.extension')
+ ->execute()
+ ->fetchField();
+$extensions = unserialize($extensions);
+$connection->update('config')
+ ->fields([
+ 'data' => serialize(array_merge_recursive($extensions, ['module' => ['action' => 0]])),
+ ])
+ ->condition('name', 'core.extension')
+ ->execute();
diff --git a/web/core/modules/action/tests/src/Functional/ConfigurationTest.php b/web/core/modules/action/tests/src/Functional/ConfigurationTest.php
index 05421b7b0d..9cd34dc84a 100644
--- a/web/core/modules/action/tests/src/Functional/ConfigurationTest.php
+++ b/web/core/modules/action/tests/src/Functional/ConfigurationTest.php
@@ -38,7 +38,7 @@ public function testActionConfiguration() {
$edit = [];
$edit['action'] = 'action_goto_action';
$this->drupalPostForm('admin/config/system/actions', $edit, t('Create'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Make a POST request to the individual action configuration page.
$edit = [];
@@ -47,7 +47,7 @@ public function testActionConfiguration() {
$edit['id'] = strtolower($action_label);
$edit['url'] = 'admin';
$this->drupalPostForm('admin/config/system/actions/add/action_goto_action', $edit, t('Save'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$action_id = $edit['id'];
@@ -63,7 +63,7 @@ public function testActionConfiguration() {
$edit['label'] = $new_action_label;
$edit['url'] = 'admin';
$this->drupalPostForm(NULL, $edit, t('Save'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Make sure that the action updated properly.
$this->assertText(t('The action has been successfully saved.'), "Make sure we get a confirmation that we've successfully updated the complex action.");
@@ -77,15 +77,15 @@ public function testActionConfiguration() {
// Make sure that deletions work properly.
$this->drupalGet('admin/config/system/actions');
$this->clickLink(t('Delete'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$edit = [];
$this->drupalPostForm(NULL, $edit, t('Delete'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Make sure that the action was actually deleted.
$this->assertRaw(t('The action %action has been deleted.', ['%action' => $new_action_label]), 'Make sure that we get a delete confirmation message.');
$this->drupalGet('admin/config/system/actions');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertNoText($new_action_label, "Make sure the action label does not appear on the overview page after we've deleted the action.");
$action = Action::load($action_id);
diff --git a/web/core/modules/action/tests/src/Functional/Update/ActionConfigTest.php b/web/core/modules/action/tests/src/Functional/Update/ActionConfigTest.php
new file mode 100644
index 0000000000..7784fc23e0
--- /dev/null
+++ b/web/core/modules/action/tests/src/Functional/Update/ActionConfigTest.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace Drupal\Tests\action\Functional\Update;
+
+use Drupal\FunctionalTests\Update\UpdatePathTestBase;
+
+/**
+ * Tests removing action module's configuration.
+ *
+ * @group Update
+ * @group legacy
+ */
+class ActionConfigTest extends UpdatePathTestBase {
+
+ /**
+ * {@inheritdoc}
+ */
+ protected $defaultTheme = 'stark';
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function setDatabaseDumpFiles() {
+ $this->databaseDumpFiles = [
+ __DIR__ . '/../../../../../system/tests/fixtures/update/drupal-8.8.0.bare.standard.php.gz',
+ __DIR__ . '/../../../../tests/fixtures/update/drupal-8.action-3022401.php',
+ ];
+ }
+
+ /**
+ * Tests upgrading action settings.
+ *
+ * @see \action_post_update_remove_settings()
+ */
+ public function testUpdateActionPlugins() {
+ $config = $this->config('action.settings');
+ $this->assertSame(35, $config->get('recursion_limit'));
+
+ // Run updates.
+ $this->runUpdates();
+
+ $config = $this->config('action.settings');
+ $this->assertTrue($config->isNew());
+ }
+
+}
diff --git a/web/core/modules/action/tests/src/Kernel/Migrate/d6/MigrateActionConfigsTest.php b/web/core/modules/action/tests/src/Kernel/Migrate/d6/MigrateActionConfigsTest.php
index bd87724cf2..d33218a854 100644
--- a/web/core/modules/action/tests/src/Kernel/Migrate/d6/MigrateActionConfigsTest.php
+++ b/web/core/modules/action/tests/src/Kernel/Migrate/d6/MigrateActionConfigsTest.php
@@ -6,7 +6,7 @@
use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
/**
- * Upgrade variables to action.settings.yml.
+ * Upgrade variables to null.
*
* @group migrate_drupal_6
*/
@@ -28,12 +28,11 @@ protected function setUp() {
}
/**
- * Tests migration of action variables to action.settings.yml.
+ * Tests migration of action variables to null.
*/
public function testActionSettings() {
$config = $this->config('action.settings');
- $this->assertIdentical(35, $config->get('recursion_limit'));
- $this->assertConfigSchema(\Drupal::service('config.typed'), 'action.settings', $config->get());
+ $this->assertTrue($config->isNew());
}
}
diff --git a/web/core/modules/action/tests/src/Kernel/Migrate/d6/MigrateActionsTest.php b/web/core/modules/action/tests/src/Kernel/Migrate/d6/MigrateActionsTest.php
index 928b3c9b81..9f7db1511c 100644
--- a/web/core/modules/action/tests/src/Kernel/Migrate/d6/MigrateActionsTest.php
+++ b/web/core/modules/action/tests/src/Kernel/Migrate/d6/MigrateActionsTest.php
@@ -61,7 +61,7 @@ public function testActions() {
protected function assertEntity($id, $label, $type, $configuration) {
$action = Action::load($id);
- $this->assertTrue($action instanceof Action);
+ $this->assertInstanceOf(Action::class, $action);
/** @var \Drupal\system\Entity\Action $action */
$this->assertIdentical($id, $action->id());
$this->assertIdentical($label, $action->label());
diff --git a/web/core/modules/action/tests/src/Kernel/Migrate/d7/MigrateActionConfigsTest.php b/web/core/modules/action/tests/src/Kernel/Migrate/d7/MigrateActionConfigsTest.php
index 0b1a2caae5..80b08dbf60 100644
--- a/web/core/modules/action/tests/src/Kernel/Migrate/d7/MigrateActionConfigsTest.php
+++ b/web/core/modules/action/tests/src/Kernel/Migrate/d7/MigrateActionConfigsTest.php
@@ -6,7 +6,7 @@
use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
/**
- * Upgrade variables to action.settings.yml.
+ * Upgrade variables to null.
*
* @group migrate_drupal_7
*/
@@ -28,12 +28,11 @@ protected function setUp() {
}
/**
- * Tests migration of action variables to action.settings.yml.
+ * Tests migration of action variables to null.
*/
public function testActionSettings() {
$config = $this->config('action.settings');
- $this->assertSame(28, $config->get('recursion_limit'));
- $this->assertConfigSchema(\Drupal::service('config.typed'), 'action.settings', $config->get());
+ $this->assertTrue($config->isNew());
}
}
diff --git a/web/core/modules/action/tests/src/Kernel/Migrate/d7/MigrateActionsTest.php b/web/core/modules/action/tests/src/Kernel/Migrate/d7/MigrateActionsTest.php
index 47049f33c6..8ce450c98a 100644
--- a/web/core/modules/action/tests/src/Kernel/Migrate/d7/MigrateActionsTest.php
+++ b/web/core/modules/action/tests/src/Kernel/Migrate/d7/MigrateActionsTest.php
@@ -61,7 +61,7 @@ public function testActions() {
protected function assertEntity($id, $label, $type, $configuration) {
$action = Action::load($id);
- $this->assertTrue($action instanceof Action);
+ $this->assertInstanceOf(Action::class, $action);
/** @var \Drupal\system\Entity\Action $action */
$this->assertIdentical($id, $action->id());
$this->assertIdentical($label, $action->label());
diff --git a/web/core/modules/aggregator/aggregator.info.yml b/web/core/modules/aggregator/aggregator.info.yml
index d6ffbaa85b..1976ab339a 100644
--- a/web/core/modules/aggregator/aggregator.info.yml
+++ b/web/core/modules/aggregator/aggregator.info.yml
@@ -1,6 +1,6 @@
name: Aggregator
type: module
-description: 'Aggregates syndicated content (RSS, RDF, and Atom feeds) from external sources.'
+description: 'Gathers and displays syndicated content (RSS, RDF, and Atom feeds) from external sources.'
package: Core
version: VERSION
core: 8.x
diff --git a/web/core/modules/aggregator/src/Plugin/aggregator/parser/DefaultParser.php b/web/core/modules/aggregator/src/Plugin/aggregator/parser/DefaultParser.php
index 2694042104..66448fa5a6 100644
--- a/web/core/modules/aggregator/src/Plugin/aggregator/parser/DefaultParser.php
+++ b/web/core/modules/aggregator/src/Plugin/aggregator/parser/DefaultParser.php
@@ -5,8 +5,8 @@
use Drupal\aggregator\Plugin\ParserInterface;
use Drupal\aggregator\FeedInterface;
use Drupal\Core\Messenger\MessengerTrait;
-use Zend\Feed\Reader\Reader;
-use Zend\Feed\Reader\Exception\ExceptionInterface;
+use Laminas\Feed\Reader\Reader;
+use Laminas\Feed\Reader\Exception\ExceptionInterface;
/**
* Defines a default parser implementation.
@@ -27,7 +27,7 @@ class DefaultParser implements ParserInterface {
* {@inheritdoc}
*/
public function parse(FeedInterface $feed) {
- // Set our bridge extension manager to Zend Feed.
+ // Set our bridge extension manager to Laminas Feed.
Reader::setExtensionManager(\Drupal::service('feed.bridge.reader'));
try {
$channel = Reader::importString($feed->source_string);
diff --git a/web/core/modules/aggregator/src/Tests/AggregatorTestBase.php b/web/core/modules/aggregator/src/Tests/AggregatorTestBase.php
index 6b39f37b06..ba229d6bfd 100644
--- a/web/core/modules/aggregator/src/Tests/AggregatorTestBase.php
+++ b/web/core/modules/aggregator/src/Tests/AggregatorTestBase.php
@@ -34,7 +34,13 @@ abstract class AggregatorTestBase extends WebTestBase {
*
* @var array
*/
- public static $modules = ['block', 'node', 'aggregator', 'aggregator_test', 'views'];
+ public static $modules = [
+ 'block',
+ 'node',
+ 'aggregator',
+ 'aggregator_test',
+ 'views',
+ ];
/**
* {@inheritdoc}
diff --git a/web/core/modules/aggregator/tests/src/Functional/AddFeedTest.php b/web/core/modules/aggregator/tests/src/Functional/AddFeedTest.php
index 8809690b9e..694fae14e4 100644
--- a/web/core/modules/aggregator/tests/src/Functional/AddFeedTest.php
+++ b/web/core/modules/aggregator/tests/src/Functional/AddFeedTest.php
@@ -35,7 +35,7 @@ public function testAddFeed() {
// Check feed source.
$this->drupalGet('aggregator/sources/' . $feed->id());
- $this->assertResponse(200, 'Feed source exists.');
+ $this->assertSession()->statusCodeEquals(200);
$this->assertText($feed->label(), 'Page title');
$this->assertRaw($feed->getWebsiteUrl());
@@ -61,13 +61,13 @@ public function testFeedLabelEscaping() {
$this->checkForMetaRefresh();
$this->drupalGet('aggregator/sources/' . $feed->id());
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertEscaped('Test feed title <script>alert(123);</script>');
$this->assertNoRaw('Test feed title <script>alert(123);</script>');
// Ensure the feed icon title is escaped.
- $this->assertTrue(strpos(str_replace(["\n", "\r"], '', $this->getSession()->getPage()->getContent()), 'class="feed-icon"> Subscribe to Test feed title <script>alert(123);</script> feed</a>') !== FALSE);
+ $this->assertStringContainsString('class="feed-icon"> Subscribe to Test feed title <script>alert(123);</script> feed</a>', str_replace(["\n", "\r"], '', $this->getSession()->getPage()->getContent()));
}
/**
@@ -91,7 +91,7 @@ public function testAddLongFeed() {
// Check feed source.
$this->drupalGet('aggregator/sources/' . $feed->id());
- $this->assertResponse(200, 'Long URL feed source exists.');
+ $this->assertSession()->statusCodeEquals(200);
$this->assertText($feed->label(), 'Page title');
// Delete feeds.
diff --git a/web/core/modules/aggregator/tests/src/Functional/AggregatorAdminTest.php b/web/core/modules/aggregator/tests/src/Functional/AggregatorAdminTest.php
index 0378cf733c..aa9b297342 100644
--- a/web/core/modules/aggregator/tests/src/Functional/AggregatorAdminTest.php
+++ b/web/core/modules/aggregator/tests/src/Functional/AggregatorAdminTest.php
@@ -60,7 +60,7 @@ public function testSettingsPage() {
$this->container->get('module_installer')->uninstall(['aggregator_test']);
$this->resetAll();
$this->drupalGet('admin/config/services/aggregator/settings');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
}
/**
@@ -72,7 +72,7 @@ public function testOverviewPage() {
$result = $this->xpath('//table/tbody/tr');
// Check if the amount of feeds in the overview matches the amount created.
- $this->assertEqual(1, count($result), 'Created feed is found in the overview');
+ $this->assertCount(1, $result, 'Created feed is found in the overview');
// Check if the fields in the table match with what's expected.
$link = $this->xpath('//table/tbody/tr//td[1]/a');
$this->assertEquals($feed->label(), $link[0]->getText());
diff --git a/web/core/modules/aggregator/tests/src/Functional/AggregatorRenderingTest.php b/web/core/modules/aggregator/tests/src/Functional/AggregatorRenderingTest.php
index 522ea02f34..65747e316d 100644
--- a/web/core/modules/aggregator/tests/src/Functional/AggregatorRenderingTest.php
+++ b/web/core/modules/aggregator/tests/src/Functional/AggregatorRenderingTest.php
@@ -70,16 +70,16 @@ public function testBlockLinks() {
$this->assert(isset($links[0]), new FormattableMarkup('Link to href %href found.', ['%href' => $href]));
$cache_tags_header = $this->drupalGetHeader('X-Drupal-Cache-Tags');
$cache_tags = explode(' ', $cache_tags_header);
- $this->assertTrue(in_array('aggregator_feed:' . $feed->id(), $cache_tags));
+ $this->assertContains('aggregator_feed:' . $feed->id(), $cache_tags);
// Visit that page.
$this->drupalGet($feed->toUrl()->getInternalPath());
$correct_titles = $this->xpath('//h1[normalize-space(text())=:title]', [':title' => $feed->label()]);
$this->assertFalse(empty($correct_titles), 'Aggregator feed page is available and has the correct title.');
$cache_tags = explode(' ', $this->drupalGetHeader('X-Drupal-Cache-Tags'));
- $this->assertTrue(in_array('aggregator_feed:' . $feed->id(), $cache_tags));
- $this->assertTrue(in_array('aggregator_feed_view', $cache_tags));
- $this->assertTrue(in_array('aggregator_item_view', $cache_tags));
+ $this->assertContains('aggregator_feed:' . $feed->id(), $cache_tags);
+ $this->assertContains('aggregator_feed_view', $cache_tags);
+ $this->assertContains('aggregator_item_view', $cache_tags);
// Set the number of news items to 0 to test that the block does not show
// up.
@@ -122,17 +122,17 @@ public function testFeedPage() {
$this->assertTrue(isset($links[0]), new FormattableMarkup('Link to href %href found.', ['%href' => $href]));
$cache_tags_header = $this->drupalGetHeader('X-Drupal-Cache-Tags');
$cache_tags = explode(' ', $cache_tags_header);
- $this->assertTrue(in_array('aggregator_feed:' . $feed->id(), $cache_tags));
+ $this->assertContains('aggregator_feed:' . $feed->id(), $cache_tags);
// Check the rss aggregator page as anonymous user.
$this->drupalLogout();
$this->drupalGet('aggregator/rss');
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
// Check the rss aggregator page as admin.
$this->drupalLogin($this->adminUser);
$this->drupalGet('aggregator/rss');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertEqual($this->drupalGetHeader('Content-type'), 'application/rss+xml; charset=utf-8');
// Check the opml aggregator page.
@@ -151,9 +151,9 @@ public function testFeedPage() {
$elements = $this->xpath("//ul[contains(@class, :class)]", [':class' => 'pager__items']);
$this->assertTrue(!empty($elements), 'Individual source page contains a pager.');
$cache_tags = explode(' ', $this->drupalGetHeader('X-Drupal-Cache-Tags'));
- $this->assertTrue(in_array('aggregator_feed:' . $feed->id(), $cache_tags));
- $this->assertTrue(in_array('aggregator_feed_view', $cache_tags));
- $this->assertTrue(in_array('aggregator_item_view', $cache_tags));
+ $this->assertContains('aggregator_feed:' . $feed->id(), $cache_tags);
+ $this->assertContains('aggregator_feed_view', $cache_tags);
+ $this->assertContains('aggregator_item_view', $cache_tags);
}
}
diff --git a/web/core/modules/aggregator/tests/src/Functional/AggregatorTestBase.php b/web/core/modules/aggregator/tests/src/Functional/AggregatorTestBase.php
index baac8f69bf..f58ec5fce2 100644
--- a/web/core/modules/aggregator/tests/src/Functional/AggregatorTestBase.php
+++ b/web/core/modules/aggregator/tests/src/Functional/AggregatorTestBase.php
@@ -27,7 +27,13 @@ abstract class AggregatorTestBase extends BrowserTestBase {
*
* @var array
*/
- public static $modules = ['block', 'node', 'aggregator', 'aggregator_test', 'views'];
+ public static $modules = [
+ 'block',
+ 'node',
+ 'aggregator',
+ 'aggregator_test',
+ 'views',
+ ];
/**
* {@inheritdoc}
@@ -175,11 +181,11 @@ public function getDefaultFeedItemCount() {
public function updateFeedItems(FeedInterface $feed, $expected_count = NULL) {
// First, let's ensure we can get to the rss xml.
$this->drupalGet($feed->getUrl());
- $this->assertResponse(200, new FormattableMarkup(':url is reachable.', [':url' => $feed->getUrl()]));
+ $this->assertSession()->statusCodeEquals(200);
// Attempt to access the update link directly without an access token.
$this->drupalGet('admin/config/services/aggregator/update/' . $feed->id());
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
// Refresh the feed (simulated link click).
$this->drupalGet('admin/config/services/aggregator');
diff --git a/web/core/modules/aggregator/tests/src/Functional/DeleteFeedTest.php b/web/core/modules/aggregator/tests/src/Functional/DeleteFeedTest.php
index 9ff7b3435b..beea755807 100644
--- a/web/core/modules/aggregator/tests/src/Functional/DeleteFeedTest.php
+++ b/web/core/modules/aggregator/tests/src/Functional/DeleteFeedTest.php
@@ -45,7 +45,7 @@ public function testDeleteFeed() {
// Check feed source.
$this->drupalGet('aggregator/sources/' . $feed1->id());
- $this->assertResponse(404, 'Deleted feed source does not exist.');
+ $this->assertSession()->statusCodeEquals(404);
// Check database for feed.
$result = \Drupal::entityQuery('aggregator_feed')->condition('title', $feed1->label())->condition('url', $feed1->getUrl())->count()->execute();
diff --git a/web/core/modules/aggregator/tests/src/Functional/FeedAdminDisplayTest.php b/web/core/modules/aggregator/tests/src/Functional/FeedAdminDisplayTest.php
index ec327a595e..f02a227156 100644
--- a/web/core/modules/aggregator/tests/src/Functional/FeedAdminDisplayTest.php
+++ b/web/core/modules/aggregator/tests/src/Functional/FeedAdminDisplayTest.php
@@ -22,7 +22,7 @@ public function testFeedUpdateFields() {
$scheduled_feed = $this->createFeed(NULL, ['refresh' => '900']);
$this->drupalGet('admin/config/services/aggregator');
- $this->assertResponse(200, 'Aggregator feed overview page exists.');
+ $this->assertSession()->statusCodeEquals(200);
// The scheduled feed shows that it has not been updated yet and is
// scheduled.
diff --git a/web/core/modules/aggregator/tests/src/Functional/FeedParserTest.php b/web/core/modules/aggregator/tests/src/Functional/FeedParserTest.php
index 82cea3ff9e..4e76ad76c0 100644
--- a/web/core/modules/aggregator/tests/src/Functional/FeedParserTest.php
+++ b/web/core/modules/aggregator/tests/src/Functional/FeedParserTest.php
@@ -2,7 +2,6 @@
namespace Drupal\Tests\aggregator\Functional;
-use Drupal\Component\Render\FormattableMarkup;
use Drupal\aggregator\FeedStorageInterface;
use Drupal\Core\Url;
use Drupal\aggregator\Entity\Feed;
@@ -38,7 +37,7 @@ public function testRSS091Sample() {
$feed = $this->createFeed($this->getRSS091Sample());
$feed->refreshItems();
$this->drupalGet('aggregator/sources/' . $feed->id());
- $this->assertResponse(200, new FormattableMarkup('Feed %name exists.', ['%name' => $feed->label()]));
+ $this->assertSession()->statusCodeEquals(200);
$this->assertText('First example feed item title');
$this->assertLinkByHref('http://example.com/example-turns-one');
$this->assertText('First example feed item description.');
@@ -61,7 +60,7 @@ public function testAtomSample() {
$feed = $this->createFeed($this->getAtomSample());
$feed->refreshItems();
$this->drupalGet('aggregator/sources/' . $feed->id());
- $this->assertResponse(200, new FormattableMarkup('Feed %name exists.', ['%name' => $feed->label()]));
+ $this->assertSession()->statusCodeEquals(200);
$this->assertText('Atom-Powered Robots Run Amok');
$this->assertLinkByHref('http://example.org/2003/12/13/atom03');
$this->assertText('Some text.');
@@ -85,7 +84,7 @@ public function testHtmlEntitiesSample() {
$feed = $this->createFeed($this->getHtmlEntitiesSample());
$feed->refreshItems();
$this->drupalGet('aggregator/sources/' . $feed->id());
- $this->assertResponse(200, new FormattableMarkup('Feed %name exists.', ['%name' => $feed->label()]));
+ $this->assertSession()->statusCodeEquals(200);
$this->assertRaw("Quote" Amp&");
}
diff --git a/web/core/modules/aggregator/tests/src/Functional/FeedProcessorPluginTest.php b/web/core/modules/aggregator/tests/src/Functional/FeedProcessorPluginTest.php
index c21f30573b..69140c8f5d 100644
--- a/web/core/modules/aggregator/tests/src/Functional/FeedProcessorPluginTest.php
+++ b/web/core/modules/aggregator/tests/src/Functional/FeedProcessorPluginTest.php
@@ -38,7 +38,7 @@ public function testProcess() {
$this->updateFeedItems($feed);
foreach ($feed->items as $iid) {
$item = Item::load($iid);
- $this->assertTrue(strpos($item->label(), 'testProcessor') === 0);
+ $this->assertStringStartsWith('testProcessor', $item->label());
}
}
diff --git a/web/core/modules/aggregator/tests/src/Functional/Hal/ItemHalJsonTestBase.php b/web/core/modules/aggregator/tests/src/Functional/Hal/ItemHalJsonTestBase.php
index c786b7b181..6ae5f850ba 100644
--- a/web/core/modules/aggregator/tests/src/Functional/Hal/ItemHalJsonTestBase.php
+++ b/web/core/modules/aggregator/tests/src/Functional/Hal/ItemHalJsonTestBase.php
@@ -60,7 +60,7 @@ protected function getExpectedNormalizedEntity() {
],
'_links' => [
'self' => [
- 'href' => '',
+ 'href' => $this->baseUrl . '/entity/aggregator_item/1?_format=hal_json',
],
'type' => [
'href' => $this->baseUrl . '/rest/type/aggregator_item/aggregator_item',
diff --git a/web/core/modules/aggregator/tests/src/Functional/Rest/FeedResourceTestBase.php b/web/core/modules/aggregator/tests/src/Functional/Rest/FeedResourceTestBase.php
index fefa75e1ff..5469fda647 100644
--- a/web/core/modules/aggregator/tests/src/Functional/Rest/FeedResourceTestBase.php
+++ b/web/core/modules/aggregator/tests/src/Functional/Rest/FeedResourceTestBase.php
@@ -38,6 +38,7 @@ protected function setUpAuthorization($method) {
case 'GET':
$this->grantPermissionsToTestedRole(['access news feeds']);
break;
+
case 'POST':
case 'PATCH':
case 'DELETE':
@@ -180,10 +181,12 @@ protected function getExpectedUnauthorizedAccessMessage($method) {
switch ($method) {
case 'GET':
return "The 'access news feeds' permission is required.";
+
case 'POST':
case 'PATCH':
case 'DELETE':
return "The 'administer news feeds' permission is required.";
+
default:
return parent::getExpectedUnauthorizedAccessMessage($method);
}
diff --git a/web/core/modules/aggregator/tests/src/Functional/UpdateFeedItemTest.php b/web/core/modules/aggregator/tests/src/Functional/UpdateFeedItemTest.php
index 7aef9ac0f9..fdbcc04eab 100644
--- a/web/core/modules/aggregator/tests/src/Functional/UpdateFeedItemTest.php
+++ b/web/core/modules/aggregator/tests/src/Functional/UpdateFeedItemTest.php
@@ -41,7 +41,7 @@ public function testUpdateFeedItem() {
];
$this->drupalGet($edit['url[0][value]']);
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->drupalPostForm('aggregator/sources/add', $edit, t('Save'));
$this->assertText(t('The feed @name has been added.', ['@name' => $edit['title[0][value]']]), new FormattableMarkup('The feed @name has been added.', ['@name' => $edit['title[0][value]']]));
@@ -75,7 +75,7 @@ public function testUpdateFeedItem() {
$this->enableTestPlugins();
$this->container->get('module_installer')->uninstall(['aggregator_test']);
$this->updateFeedItems($feed);
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
}
}
diff --git a/web/core/modules/aggregator/tests/src/Functional/UpdateFeedTest.php b/web/core/modules/aggregator/tests/src/Functional/UpdateFeedTest.php
index a7ee2436ca..798bc55781 100644
--- a/web/core/modules/aggregator/tests/src/Functional/UpdateFeedTest.php
+++ b/web/core/modules/aggregator/tests/src/Functional/UpdateFeedTest.php
@@ -44,7 +44,7 @@ public function testUpdateFeed() {
// Check feed source.
$this->drupalGet('aggregator/sources/' . $feed->id());
- $this->assertResponse(200, 'Feed source exists.');
+ $this->assertSession()->statusCodeEquals(200);
$this->assertText($edit['title[0][value]'], 'Page title');
// Set correct title so deleteFeed() will work.
diff --git a/web/core/modules/aggregator/tests/src/Kernel/AggregatorPluginManagerTest.php b/web/core/modules/aggregator/tests/src/Kernel/AggregatorPluginManagerTest.php
index 01e69b51c7..3645a0e5c6 100644
--- a/web/core/modules/aggregator/tests/src/Kernel/AggregatorPluginManagerTest.php
+++ b/web/core/modules/aggregator/tests/src/Kernel/AggregatorPluginManagerTest.php
@@ -35,7 +35,7 @@ public function testParserInfoAlter() {
$widget_definition = \Drupal::service('plugin.manager.aggregator.parser')->getDefinition('aggregator_test_parser');
// Test if hook_aggregator_parser_info_alter is being called.
- $this->assertTrue($widget_definition['definition_altered'], "The 'aggregator_test_parser' plugin definition was updated in in `hook_aggregator_parser_info_alter()`");
+ $this->assertTrue($widget_definition['definition_altered'], "The 'aggregator_test_parser' plugin definition was updated in `hook_aggregator_parser_info_alter()`");
}
/**
@@ -45,7 +45,7 @@ public function testProcessorInfoAlter() {
$widget_definition = \Drupal::service('plugin.manager.aggregator.processor')->getDefinition('aggregator_test_processor');
// Test if hook_aggregator_processor_info_alter is being called.
- $this->assertTrue($widget_definition['definition_altered'], "The 'aggregator_test_processor' plugin definition was updated in in `hook_aggregator_processor_info_alter()`");
+ $this->assertTrue($widget_definition['definition_altered'], "The 'aggregator_test_processor' plugin definition was updated in `hook_aggregator_processor_info_alter()`");
}
}
diff --git a/web/core/modules/aggregator/tests/src/Kernel/AggregatorTitleTest.php b/web/core/modules/aggregator/tests/src/Kernel/AggregatorTitleTest.php
index 4493c5c8d7..75ec99723c 100644
--- a/web/core/modules/aggregator/tests/src/Kernel/AggregatorTitleTest.php
+++ b/web/core/modules/aggregator/tests/src/Kernel/AggregatorTitleTest.php
@@ -18,7 +18,13 @@ class AggregatorTitleTest extends KernelTestBase {
*
* @var array
*/
- public static $modules = ['file', 'field', 'options', 'aggregator', 'system'];
+ public static $modules = [
+ 'file',
+ 'field',
+ 'options',
+ 'aggregator',
+ 'system',
+ ];
/**
* The field name that is tested.
@@ -65,25 +71,25 @@ public function testStringFormatter() {
$build = $aggregator_feed->{$this->fieldName}->view(['type' => 'aggregator_title', 'settings' => ['display_as_link' => TRUE]]);
$result = $this->render($build);
- $this->assertContains('testing title', $result);
- $this->assertContains('href="' . $aggregator_feed->getUrl() . '"', $result);
+ $this->assertStringContainsString('testing title', $result);
+ $this->assertStringContainsString('href="' . $aggregator_feed->getUrl() . '"', $result);
$build = $aggregator_feed->{$this->fieldName}->view(['type' => 'aggregator_title', 'settings' => ['display_as_link' => FALSE]]);
$result = $this->render($build);
- $this->assertContains('testing title', $result);
- $this->assertNotContains($aggregator_feed->getUrl(), $result);
+ $this->assertStringContainsString('testing title', $result);
+ $this->assertStringNotContainsString($aggregator_feed->getUrl(), $result);
// Verify aggregator item title with and without links.
$build = $aggregator_item->{$this->fieldName}->view(['type' => 'aggregator_title', 'settings' => ['display_as_link' => TRUE]]);
$result = $this->render($build);
- $this->assertContains('test title', $result);
- $this->assertContains('href="' . $aggregator_item->getLink() . '"', $result);
+ $this->assertStringContainsString('test title', $result);
+ $this->assertStringContainsString('href="' . $aggregator_item->getLink() . '"', $result);
$build = $aggregator_item->{$this->fieldName}->view(['type' => 'aggregator_title', 'settings' => ['display_as_link' => FALSE]]);
$result = $this->render($build);
- $this->assertContains('test title', $result);
- $this->assertNotContains($aggregator_item->getLink(), $result);
+ $this->assertStringContainsString('test title', $result);
+ $this->assertStringNotContainsString($aggregator_item->getLink(), $result);
}
}
diff --git a/web/core/modules/aggregator/tests/src/Kernel/FeedValidationTest.php b/web/core/modules/aggregator/tests/src/Kernel/FeedValidationTest.php
index d8804dd9c3..210197d71a 100644
--- a/web/core/modules/aggregator/tests/src/Kernel/FeedValidationTest.php
+++ b/web/core/modules/aggregator/tests/src/Kernel/FeedValidationTest.php
@@ -39,7 +39,7 @@ public function testValidation() {
]);
$violations = $feed->validate();
- $this->assertEqual(count($violations), 0);
+ $this->assertCount(0, $violations);
$feed->save();
@@ -53,7 +53,7 @@ public function testValidation() {
$violations = $feed->validate();
- $this->assertEqual(count($violations), 2);
+ $this->assertCount(2, $violations);
$this->assertEqual($violations[0]->getPropertyPath(), 'title');
$this->assertEqual($violations[0]->getMessage(), t('A feed named %value already exists. Enter a unique title.', [
'%value' => $feed->label(),
diff --git a/web/core/modules/aggregator/tests/src/Kernel/Migrate/d7/MigrateAggregatorFeedTest.php b/web/core/modules/aggregator/tests/src/Kernel/Migrate/d7/MigrateAggregatorFeedTest.php
index 401ea048fe..2835cec7a6 100644
--- a/web/core/modules/aggregator/tests/src/Kernel/Migrate/d7/MigrateAggregatorFeedTest.php
+++ b/web/core/modules/aggregator/tests/src/Kernel/Migrate/d7/MigrateAggregatorFeedTest.php
@@ -39,7 +39,7 @@ public function testAggregatorFeedImport() {
// The feed's last checked time can change as the fixture is updated, so
// assert that its format is correct.
$checked_time = $feed->getLastCheckedTime();
- $this->assertTrue(is_numeric($checked_time));
+ $this->assertIsNumeric($checked_time);
$this->assertTrue($checked_time > 1000000000);
$this->assertIdentical('0', $feed->getQueuedTime());
$this->assertIdentical('http://knowyourmeme.com', $feed->link->value);
diff --git a/web/core/modules/aggregator/tests/src/Kernel/Views/IntegrationTest.php b/web/core/modules/aggregator/tests/src/Kernel/Views/IntegrationTest.php
index 7459cee66d..1b1029d87f 100644
--- a/web/core/modules/aggregator/tests/src/Kernel/Views/IntegrationTest.php
+++ b/web/core/modules/aggregator/tests/src/Kernel/Views/IntegrationTest.php
@@ -22,7 +22,14 @@ class IntegrationTest extends ViewsKernelTestBase {
*
* @var array
*/
- public static $modules = ['aggregator', 'aggregator_test_views', 'system', 'field', 'options', 'user'];
+ public static $modules = [
+ 'aggregator',
+ 'aggregator_test_views',
+ 'system',
+ 'field',
+ 'options',
+ 'user',
+ ];
/**
* Views used by this test.
diff --git a/web/core/modules/ban/ban.info.yml b/web/core/modules/ban/ban.info.yml
index ba6300de1c..dbe644c34d 100644
--- a/web/core/modules/ban/ban.info.yml
+++ b/web/core/modules/ban/ban.info.yml
@@ -1,6 +1,6 @@
name: Ban
type: module
-description: 'Enables banning of IP addresses.'
+description: 'Allows administrators to ban visits from specific IP addresses.'
package: Core
version: VERSION
core: 8.x
diff --git a/web/core/modules/ban/src/Plugin/migrate/destination/BlockedIp.php b/web/core/modules/ban/src/Plugin/migrate/destination/BlockedIp.php
index 203905f27a..68f932c802 100644
--- a/web/core/modules/ban/src/Plugin/migrate/destination/BlockedIp.php
+++ b/web/core/modules/ban/src/Plugin/migrate/destination/BlockedIp.php
@@ -16,7 +16,7 @@
* id = "blocked_ip"
* )
*/
-class BlockedIP extends DestinationBase implements ContainerFactoryPluginInterface {
+class BlockedIp extends DestinationBase implements ContainerFactoryPluginInterface {
/**
* The IP ban manager.
@@ -26,7 +26,7 @@ class BlockedIP extends DestinationBase implements ContainerFactoryPluginInterfa
protected $banManager;
/**
- * Constructs a BlockedIP object.
+ * Constructs a BlockedIp object.
*
* @param array $configuration
* Plugin configuration.
diff --git a/web/core/modules/ban/tests/src/Functional/IpAddressBlockingTest.php b/web/core/modules/ban/tests/src/Functional/IpAddressBlockingTest.php
index 344678c30e..0df08b0f74 100644
--- a/web/core/modules/ban/tests/src/Functional/IpAddressBlockingTest.php
+++ b/web/core/modules/ban/tests/src/Functional/IpAddressBlockingTest.php
@@ -93,7 +93,7 @@ public function testIPAddressValidation() {
$query->fields('bip', ['iid']);
$query->condition('bip.ip', $ip);
$ip_count = $query->execute()->fetchAll();
- $this->assertEqual(1, count($ip_count));
+ $this->assertCount(1, $ip_count);
$ip = '';
$banIp->banIp($ip);
$banIp->banIp($ip);
@@ -101,7 +101,7 @@ public function testIPAddressValidation() {
$query->fields('bip', ['iid']);
$query->condition('bip.ip', $ip);
$ip_count = $query->execute()->fetchAll();
- $this->assertEqual(1, count($ip_count));
+ $this->assertCount(1, $ip_count);
}
}
diff --git a/web/core/modules/ban/tests/src/Kernel/Migrate/d7/MigrateBlockedIPsTest.php b/web/core/modules/ban/tests/src/Kernel/Migrate/d7/MigrateBlockedIPsTest.php
index 48f35a7e11..8c7fe971e9 100644
--- a/web/core/modules/ban/tests/src/Kernel/Migrate/d7/MigrateBlockedIPsTest.php
+++ b/web/core/modules/ban/tests/src/Kernel/Migrate/d7/MigrateBlockedIPsTest.php
@@ -10,7 +10,7 @@
*
* @group ban
*/
-class MigrateBlockedIPsTest extends MigrateDrupal7TestBase {
+class MigrateBlockedIpsTest extends MigrateDrupal7TestBase {
use SchemaCheckTestTrait;
@@ -33,7 +33,7 @@ protected function setUp() {
/**
* Tests migration of blocked IPs.
*/
- public function testBlockedIPs() {
+ public function testBlockedIps() {
$this->assertTrue(\Drupal::service('ban.ip_manager')->isBanned('111.111.111.111'));
}
diff --git a/web/core/modules/basic_auth/basic_auth.info.yml b/web/core/modules/basic_auth/basic_auth.info.yml
index f1ddb67c52..a8783cc5ba 100644
--- a/web/core/modules/basic_auth/basic_auth.info.yml
+++ b/web/core/modules/basic_auth/basic_auth.info.yml
@@ -1,6 +1,6 @@
name: 'HTTP Basic Authentication'
type: module
-description: 'Provides the HTTP Basic authentication provider'
+description: 'Supplies an HTTP Basic authentication provider.'
package: Web services
version: VERSION
core: 8.x
diff --git a/web/core/modules/basic_auth/src/Authentication/Provider/BasicAuth.php b/web/core/modules/basic_auth/src/Authentication/Provider/BasicAuth.php
index 8e50c13de9..b3fe6b38ae 100644
--- a/web/core/modules/basic_auth/src/Authentication/Provider/BasicAuth.php
+++ b/web/core/modules/basic_auth/src/Authentication/Provider/BasicAuth.php
@@ -143,10 +143,10 @@ public function challengeException(Request $request, \Exception $previous) {
// A 403 is converted to a 401 here, but it doesn't matter what the
// cacheability was of the 403 exception: what matters here is that
- // authentication credentials are missing, i.e. that this request was made
- // as the anonymous user.
- // Therefore, all we must do, is make this response:
- // 1. vary by whether the current user has the 'anonymous' role or not. This
+ // authentication credentials are missing, i.e. this request was made
+ // as an anonymous user.
+ // Therefore, the following actions will be taken:
+ // 1. Verify whether the current user has the 'anonymous' role or not. This
// works fine because:
// - Thanks to \Drupal\basic_auth\PageCache\DisallowBasicAuthRequests,
// Page Cache never caches a response whose request has Basic Auth
@@ -154,9 +154,9 @@ public function challengeException(Request $request, \Exception $previous) {
// - Dynamic Page Cache will cache a different result for when the
// request is unauthenticated (this 401) versus authenticated (some
// other response)
- // 2. have the 'config:user.role.anonymous' cache tag, because the only
+ // 2. Have the 'config:user.role.anonymous' cache tag, because the only
// reason this 401 would no longer be a 401 is if permissions for the
- // 'anonymous' role change, causing that cache tag to be invalidated.
+ // 'anonymous' role change, causing the cache tag to be invalidated.
// @see \Drupal\Core\EventSubscriber\AuthenticationSubscriber::onExceptionSendChallenge()
// @see \Drupal\Core\EventSubscriber\ClientErrorResponseSubscriber()
// @see \Drupal\Core\EventSubscriber\FinishResponseSubscriber::onAllResponds()
diff --git a/web/core/modules/basic_auth/tests/src/Functional/BasicAuthTest.php b/web/core/modules/basic_auth/tests/src/Functional/BasicAuthTest.php
index 16446ad332..84089e78cf 100644
--- a/web/core/modules/basic_auth/tests/src/Functional/BasicAuthTest.php
+++ b/web/core/modules/basic_auth/tests/src/Functional/BasicAuthTest.php
@@ -23,7 +23,12 @@ class BasicAuthTest extends BrowserTestBase {
*
* @var array
*/
- public static $modules = ['basic_auth', 'router_test', 'locale', 'basic_auth_test'];
+ public static $modules = [
+ 'basic_auth',
+ 'router_test',
+ 'locale',
+ 'basic_auth_test',
+ ];
/**
* {@inheritdoc}
@@ -42,30 +47,37 @@ public function testBasicAuth() {
$account = $this->drupalCreateUser();
$url = Url::fromRoute('router_test.11');
+ // Ensure we can log in with valid authentication details.
$this->basicAuthGet($url, $account->getAccountName(), $account->pass_raw);
$this->assertText($account->getAccountName(), 'Account name is displayed.');
- $this->assertResponse('200', 'HTTP response is OK');
+ $this->assertSession()->statusCodeEquals(200);
$this->mink->resetSessions();
$this->assertNull($this->drupalGetHeader('X-Drupal-Cache'));
- $this->assertIdentical(strpos($this->drupalGetHeader('Cache-Control'), 'public'), FALSE, 'Cache-Control is not set to public');
+ // Check that Cache-Control is not set to public.
+ $this->assertSession()->responseHeaderNotContains('Cache-Control', 'public');
+ // Ensure that invalid authentication details give access denied.
$this->basicAuthGet($url, $account->getAccountName(), $this->randomMachineName());
$this->assertNoText($account->getAccountName(), 'Bad basic auth credentials do not authenticate the user.');
- $this->assertResponse('403', 'Access is not granted.');
+ $this->assertSession()->statusCodeEquals(403);
$this->mink->resetSessions();
+ // Ensure that the user is prompted to authenticate if they are not yet
+ // authenticated and the route only allows basic auth.
$this->drupalGet($url);
$this->assertEqual($this->drupalGetHeader('WWW-Authenticate'), new FormattableMarkup('Basic realm="@realm"', ['@realm' => \Drupal::config('system.site')->get('name')]));
- $this->assertResponse('401', 'Not authenticated on the route that allows only basic_auth. Prompt to authenticate received.');
+ $this->assertSession()->statusCodeEquals(401);
+ // Ensure that a route without basic auth defined doesn't prompt for auth.
$this->drupalGet('admin');
- $this->assertResponse('403', 'No authentication prompt for routes not explicitly defining authentication providers.');
+ $this->assertSession()->statusCodeEquals(403);
$account = $this->drupalCreateUser(['access administration pages']);
+ // Ensure that a route without basic auth defined doesn't allow login.
$this->basicAuthGet(Url::fromRoute('system.admin'), $account->getAccountName(), $account->pass_raw);
$this->assertNoLink('Log out', 'User is not logged in');
- $this->assertResponse('403', 'No basic authentication for routes not explicitly defining authentication providers.');
+ $this->assertSession()->statusCodeEquals(403);
$this->mink->resetSessions();
// Ensure that pages already in the page cache aren't returned from page
@@ -75,7 +87,8 @@ public function testBasicAuth() {
$this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'MISS');
$this->basicAuthGet($url, $account->getAccountName(), $account->pass_raw);
$this->assertNull($this->drupalGetHeader('X-Drupal-Cache'));
- $this->assertIdentical(strpos($this->drupalGetHeader('Cache-Control'), 'public'), FALSE, 'No page cache response when requesting a cached page with basic auth credentials.');
+ // Check that Cache-Control is not set to public.
+ $this->assertSession()->responseHeaderNotContains('Cache-Control', 'public');
}
/**
@@ -100,7 +113,7 @@ public function testGlobalLoginFloodControl() {
// IP limit has reached to its limit. Even valid user credentials will fail.
$this->basicAuthGet($url, $user->getAccountName(), $user->pass_raw);
- $this->assertResponse('403', 'Access is blocked because of IP based flood prevention.');
+ $this->assertSession()->statusCodeEquals(403);
}
/**
@@ -124,7 +137,7 @@ public function testPerUserLoginFloodControl() {
// A successful login will reset the per-user flood control count.
$this->basicAuthGet($url, $user->getAccountName(), $user->pass_raw);
- $this->assertResponse('200', 'Per user flood prevention gets reset on a successful login.');
+ $this->assertSession()->statusCodeEquals(200);
// Try 2 failed logins for a user. They will trigger flood control.
for ($i = 0; $i < 2; $i++) {
@@ -133,12 +146,12 @@ public function testPerUserLoginFloodControl() {
// Now the user account is blocked.
$this->basicAuthGet($url, $user->getAccountName(), $user->pass_raw);
- $this->assertResponse('403', 'The user account is blocked due to per user flood prevention.');
+ $this->assertSession()->statusCodeEquals(403);
// Try one successful attempt for a different user, it should not trigger
// any flood control.
$this->basicAuthGet($url, $user2->getAccountName(), $user2->pass_raw);
- $this->assertResponse('200', 'Per user flood prevention does not block access for other users.');
+ $this->assertSession()->statusCodeEquals(200);
}
/**
@@ -153,7 +166,7 @@ public function testLocale() {
$this->basicAuthGet($url, $account->getAccountName(), $account->pass_raw);
$this->assertText($account->getAccountName(), 'Account name is displayed.');
- $this->assertResponse('200', 'HTTP response is OK');
+ $this->assertSession()->statusCodeEquals(200);
}
/**
@@ -165,24 +178,24 @@ public function testUnauthorizedErrorMessage() {
// Case when no credentials are passed.
$this->drupalGet($url);
- $this->assertResponse('401', 'The user is blocked when no credentials are passed.');
+ $this->assertSession()->statusCodeEquals(401);
$this->assertNoText('Exception', "No raw exception is displayed on the page.");
$this->assertText('Please log in to access this page.', "A user friendly access unauthorized message is displayed.");
// Case when empty credentials are passed.
$this->basicAuthGet($url, NULL, NULL);
- $this->assertResponse('403', 'The user is blocked when empty credentials are passed.');
+ $this->assertSession()->statusCodeEquals(403);
$this->assertText('Access denied', "A user friendly access denied message is displayed");
// Case when wrong credentials are passed.
$this->basicAuthGet($url, $account->getAccountName(), $this->randomMachineName());
- $this->assertResponse('403', 'The user is blocked when wrong credentials are passed.');
+ $this->assertSession()->statusCodeEquals(403);
$this->assertText('Access denied', "A user friendly access denied message is displayed");
// Case when correct credentials but hasn't access to the route.
$url = Url::fromRoute('router_test.15');
$this->basicAuthGet($url, $account->getAccountName(), $account->pass_raw);
- $this->assertResponse('403', 'The used authentication method is not allowed on this route.');
+ $this->assertSession()->statusCodeEquals(403);
$this->assertText('Access denied', "A user friendly access denied message is displayed");
}
@@ -234,19 +247,19 @@ public function testCacheabilityOf401Response() {
*/
public function testControllerNotCalledBeforeAuth() {
$this->drupalGet('/basic_auth_test/state/modify');
- $this->assertResponse(401);
+ $this->assertSession()->statusCodeEquals(401);
$this->drupalGet('/basic_auth_test/state/read');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertRaw('nope');
$account = $this->drupalCreateUser();
$this->basicAuthGet('/basic_auth_test/state/modify', $account->getAccountName(), $account->pass_raw);
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertRaw('Done');
$this->mink->resetSessions();
$this->drupalGet('/basic_auth_test/state/read');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertRaw('yep');
}
diff --git a/web/core/modules/big_pipe/tests/src/Functional/BigPipeTest.php b/web/core/modules/big_pipe/tests/src/Functional/BigPipeTest.php
index a9b5eb4a44..42a9acb6e8 100644
--- a/web/core/modules/big_pipe/tests/src/Functional/BigPipeTest.php
+++ b/web/core/modules/big_pipe/tests/src/Functional/BigPipeTest.php
@@ -188,15 +188,15 @@ public function testBigPipe() {
$this->pass('Verifying BigPipe assets are present…', 'Debug');
$this->assertFalse(empty($this->getDrupalSettings()), 'drupalSettings present.');
- $this->assertTrue(in_array('big_pipe/big_pipe', explode(',', $this->getDrupalSettings()['ajaxPageState']['libraries'])), 'BigPipe asset library is present.');
+ $this->assertContains('big_pipe/big_pipe', explode(',', $this->getDrupalSettings()['ajaxPageState']['libraries']), 'BigPipe asset library is present.');
// Verify that the two expected exceptions are logged as errors.
$this->assertEqual($log_count + 2, $connection->query('SELECT COUNT(*) FROM {watchdog}')->fetchField(), 'Two new watchdog entries.');
$records = $connection->query('SELECT * FROM {watchdog} ORDER BY wid DESC LIMIT 2')->fetchAll();
$this->assertEqual(RfcLogLevel::ERROR, $records[0]->severity);
- $this->assertTrue(FALSE !== strpos((string) unserialize($records[0]->variables)['@message'], 'Oh noes!'));
+ $this->assertStringContainsString('Oh noes!', (string) unserialize($records[0]->variables)['@message']);
$this->assertEqual(RfcLogLevel::ERROR, $records[1]->severity);
- $this->assertTrue(FALSE !== strpos((string) unserialize($records[1]->variables)['@message'], 'You are not allowed to say llamas are not cool!'));
+ $this->assertStringContainsString('You are not allowed to say llamas are not cool!', (string) unserialize($records[1]->variables)['@message']);
// Verify that 4xx responses work fine. (4xx responses are handled by
// subrequests to a route pointing to a controller with the desired output.)
@@ -321,7 +321,8 @@ public function testBigPipeMultiOccurrencePlaceholders() {
protected function assertBigPipeResponseHeadersPresent() {
$this->pass('Verifying BigPipe response headers…', 'Debug');
- $this->assertTrue(FALSE !== strpos($this->drupalGetHeader('Cache-Control'), 'private'), 'Cache-Control header set to "private".');
+ // Check that Cache-Control header set to "private".
+ $this->assertSession()->responseHeaderContains('Cache-Control', 'private');
$this->assertEqual('no-store, content="BigPipe/1.0"', $this->drupalGetHeader('Surrogate-Control'));
$this->assertEqual('no', $this->drupalGetHeader('X-Accel-Buffering'));
}
@@ -370,7 +371,7 @@ protected function assertBigPipePlaceholders(array $expected_big_pipe_placeholde
$expected_placeholder_replacement = '<script type="application/vnd.drupal-ajax" data-big-pipe-replacement-for-placeholder-with-id="' . $big_pipe_placeholder_id . '">';
$result = $this->xpath('//script[@data-big-pipe-replacement-for-placeholder-with-id=:id]', [':id' => Html::decodeEntities($big_pipe_placeholder_id)]);
if ($expected_ajax_response === NULL) {
- $this->assertEqual(0, count($result));
+ $this->assertCount(0, $result);
$this->assertNoRaw($expected_placeholder_replacement);
continue;
}
@@ -477,7 +478,7 @@ protected function assertBigPipeNoJsMetaRefreshRedirect() {
// First response: redirect.
$this->assertEqual(302, $statuses[0], 'The first response was a 302 (redirect).');
- $this->assertIdentical(0, strpos($headers[0]['Set-Cookie'][0], 'big_pipe_nojs=1'), 'The first response sets the big_pipe_nojs cookie.');
+ $this->assertStringStartsWith('big_pipe_nojs=1', $headers[0]['Set-Cookie'][0], 'The first response sets the big_pipe_nojs cookie.');
$this->assertEqual($original_url, $headers[0]['Location'][0], 'The first response redirected back to the original page.');
$this->assertTrue(empty(array_diff(['cookies:big_pipe_nojs', 'session.exists'], explode(' ', $headers[0]['X-Drupal-Cache-Contexts'][0]))), 'The first response varies by the "cookies:big_pipe_nojs" and "session.exists" cache contexts.');
$this->assertFalse(isset($headers[0]['Surrogate-Control']), 'The first response has no "Surrogate-Control" header.');
diff --git a/web/core/modules/big_pipe/tests/src/Unit/Render/Placeholder/BigPipeStrategyTest.php b/web/core/modules/big_pipe/tests/src/Unit/Render/Placeholder/BigPipeStrategyTest.php
index 733d265ddd..dd41f836a4 100644
--- a/web/core/modules/big_pipe/tests/src/Unit/Render/Placeholder/BigPipeStrategyTest.php
+++ b/web/core/modules/big_pipe/tests/src/Unit/Render/Placeholder/BigPipeStrategyTest.php
@@ -54,7 +54,7 @@ public function testProcessPlaceholders(array $placeholders, $method, $route_mat
}
}
else {
- $this->assertSame(0, count($processed_placeholders));
+ $this->assertCount(0, $processed_placeholders);
}
}
diff --git a/web/core/modules/block/js/block.es6.js b/web/core/modules/block/js/block.es6.js
index 68af99546b..2fe26a6dce 100644
--- a/web/core/modules/block/js/block.es6.js
+++ b/web/core/modules/block/js/block.es6.js
@@ -73,7 +73,7 @@
* @type {Drupal~behavior}
*
* @prop {Drupal~behaviorAttach} attach
- * Attaches the tableDrag behaviour for blocks in block administration.
+ * Attaches the tableDrag behavior for blocks in block administration.
*/
Drupal.behaviors.blockDrag = {
attach(context, settings) {
diff --git a/web/core/modules/block/src/BlockForm.php b/web/core/modules/block/src/BlockForm.php
index 5624fc577e..c021c9074a 100644
--- a/web/core/modules/block/src/BlockForm.php
+++ b/web/core/modules/block/src/BlockForm.php
@@ -173,7 +173,7 @@ public function form(array $form, FormStateInterface $form_state) {
$form['theme'] = [
'#type' => 'select',
'#options' => $theme_options,
- '#title' => t('Theme'),
+ '#title' => $this->t('Theme'),
'#default_value' => $theme,
'#ajax' => [
'callback' => '::themeSwitch',
diff --git a/web/core/modules/block/src/Plugin/migrate/process/BlockSettings.php b/web/core/modules/block/src/Plugin/migrate/process/BlockSettings.php
index 68e8f186ba..5e146d7837 100644
--- a/web/core/modules/block/src/Plugin/migrate/process/BlockSettings.php
+++ b/web/core/modules/block/src/Plugin/migrate/process/BlockSettings.php
@@ -35,21 +35,26 @@ public function transform($value, MigrateExecutableInterface $migrate_executable
$settings['block_count'] = $old_settings['aggregator']['item_count'];
$settings['feed'] = $id;
break;
+
case 'book_navigation':
$settings['block_mode'] = $old_settings['book']['block_mode'];
break;
+
case 'forum_active_block':
case 'forum_new_block':
$settings['block_count'] = $old_settings['forum']['block_num'];
break;
+
case 'statistics_popular_block':
$settings['top_day_num'] = $old_settings['statistics']['statistics_block_top_day_num'];
$settings['top_all_num'] = $old_settings['statistics']['statistics_block_top_all_num'];
$settings['top_last_num'] = $old_settings['statistics']['statistics_block_top_last_num'];
break;
+
case 'views_block:who_s_new-block_1':
$settings['items_per_page'] = $old_settings['user']['block_whois_new_count'];
break;
+
case 'views_block:who_s_online-who_s_online_block':
$settings['items_per_page'] = $old_settings['user']['max_list_count'];
break;
diff --git a/web/core/modules/block/src/Plugin/migrate/source/Block.php b/web/core/modules/block/src/Plugin/migrate/source/Block.php
index 2ef0beff0c..da06acee3a 100644
--- a/web/core/modules/block/src/Plugin/migrate/source/Block.php
+++ b/web/core/modules/block/src/Plugin/migrate/source/Block.php
@@ -145,23 +145,28 @@ public function prepareRow(Row $row) {
}
$settings['aggregator']['item_count'] = $item_count;
break;
+
case 'book':
$settings['book']['block_mode'] = $this->variableGet('book_block_mode', 'all pages');
break;
+
case 'forum':
$settings['forum']['block_num'] = $this->variableGet('forum_block_num_' . $delta, 5);
break;
+
case 'statistics':
foreach (['statistics_block_top_day_num', 'statistics_block_top_all_num', 'statistics_block_top_last_num'] as $name) {
$settings['statistics'][$name] = $this->variableGet($name, 0);
}
break;
+
case 'user':
switch ($delta) {
case 2:
case 'new':
$settings['user']['block_whois_new_count'] = $this->variableGet('user_block_whois_new_count', 5);
break;
+
case 3:
case 'online':
$settings['user']['block_seconds_online'] = $this->variableGet('user_block_seconds_online', 900);
diff --git a/web/core/modules/block/src/Tests/BlockTestBase.php b/web/core/modules/block/src/Tests/BlockTestBase.php
index b250fff04c..a22eba665d 100644
--- a/web/core/modules/block/src/Tests/BlockTestBase.php
+++ b/web/core/modules/block/src/Tests/BlockTestBase.php
@@ -22,7 +22,13 @@ abstract class BlockTestBase extends WebTestBase {
*
* @var array
*/
- public static $modules = ['block', 'filter', 'test_page_test', 'help', 'block_test'];
+ public static $modules = [
+ 'block',
+ 'filter',
+ 'test_page_test',
+ 'help',
+ 'block_test',
+ ];
/**
* A list of theme regions to test.
diff --git a/web/core/modules/block/tests/src/Functional/BlockAdminThemeTest.php b/web/core/modules/block/tests/src/Functional/BlockAdminThemeTest.php
index 52dbc4d4c5..a217396aee 100644
--- a/web/core/modules/block/tests/src/Functional/BlockAdminThemeTest.php
+++ b/web/core/modules/block/tests/src/Functional/BlockAdminThemeTest.php
@@ -34,14 +34,14 @@ public function testAdminTheme() {
// Ensure that access to block admin page is denied when theme is not
// installed.
$this->drupalGet('admin/structure/block/list/bartik');
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
// Install admin theme and confirm that tab is accessible.
\Drupal::service('theme_installer')->install(['bartik']);
$edit['admin_theme'] = 'bartik';
$this->drupalPostForm('admin/appearance', $edit, t('Save configuration'));
$this->drupalGet('admin/structure/block/list/bartik');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
}
/**
diff --git a/web/core/modules/block/tests/src/Functional/BlockCacheTest.php b/web/core/modules/block/tests/src/Functional/BlockCacheTest.php
index 513fcddc0c..4e8f239728 100644
--- a/web/core/modules/block/tests/src/Functional/BlockCacheTest.php
+++ b/web/core/modules/block/tests/src/Functional/BlockCacheTest.php
@@ -210,10 +210,10 @@ public function testCachePerPage() {
\Drupal::state()->set('block_test.content', $current_content);
$this->drupalGet('user');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertNoText($old_content, 'Block content cached for the test page does not show up for the user page.');
$this->drupalGet('test-page');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertText($old_content, 'Block content cached for the test page.');
}
diff --git a/web/core/modules/block/tests/src/Functional/BlockDemoTest.php b/web/core/modules/block/tests/src/Functional/BlockDemoTest.php
index 313fc93c47..fcc2bd5200 100644
--- a/web/core/modules/block/tests/src/Functional/BlockDemoTest.php
+++ b/web/core/modules/block/tests/src/Functional/BlockDemoTest.php
@@ -35,7 +35,7 @@ public function testBlockDemo() {
$config = $this->container->get('config.factory')->get('system.theme');
$default_theme = $config->get('default');
$this->drupalGet('admin/structure/block/demo/' . $default_theme);
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertLinkByHref('admin/structure/block');
$this->assertNoLinkByHref('admin/structure/block/list/' . $default_theme);
@@ -55,14 +55,14 @@ public function testBlockDemo() {
$this->container->get('theme_installer')->install([$theme]);
// Confirm access to the block demo page for the theme.
$this->drupalGet('admin/structure/block/demo/' . $theme);
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Confirm existence of link for "Exit block region demonstration".
$this->assertLinkByHref('admin/structure/block/list/' . $theme);
}
// Confirm access to the block demo page is denied for an invalid theme.
$this->drupalGet('admin/structure/block/demo/invalid_theme');
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
}
}
diff --git a/web/core/modules/block/tests/src/Functional/BlockFormInBlockTest.php b/web/core/modules/block/tests/src/Functional/BlockFormInBlockTest.php
index 6da8579ebf..66bdeaed4f 100644
--- a/web/core/modules/block/tests/src/Functional/BlockFormInBlockTest.php
+++ b/web/core/modules/block/tests/src/Functional/BlockFormInBlockTest.php
@@ -42,7 +42,7 @@ public function testCachePerPage() {
// Go to "test-page" and test if the block is enabled.
$this->drupalGet('test-page');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertText('Your .com email address.', 'form found');
// Make sure that we're currently still on /test-page after submitting the
@@ -53,7 +53,7 @@ public function testCachePerPage() {
// Go to a different page and see if the block is enabled there as well.
$this->drupalGet('test-render-title');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertText('Your .com email address.', 'form found');
// Make sure that submitting the form didn't redirect us to the first page
diff --git a/web/core/modules/block/tests/src/Functional/BlockTest.php b/web/core/modules/block/tests/src/Functional/BlockTest.php
index 8494946a2f..5570af1673 100644
--- a/web/core/modules/block/tests/src/Functional/BlockTest.php
+++ b/web/core/modules/block/tests/src/Functional/BlockTest.php
@@ -155,7 +155,7 @@ public function testAddBlockFromLibraryWithWeight() {
'theme' => $default_theme,
]);
$links = $this->xpath('//a[contains(@href, :href)]', [':href' => $add_url->toString()]);
- $this->assertEqual(1, count($links), 'Found one matching link.');
+ $this->assertCount(1, $links, 'Found one matching link.');
$this->assertEqual(t('Place block'), $links[0]->getText(), 'Found the expected link text.');
list($path, $query_string) = explode('?', $links[0]->getAttribute('href'), 2);
@@ -253,7 +253,7 @@ public function testBlockThemeSelector() {
$theme_settings = $this->config('system.theme');
foreach (['bartik', 'seven', 'stark'] as $theme) {
$this->drupalGet('admin/structure/block/list/' . $theme);
- $this->assertTitle(t('Block layout') . ' | Drupal');
+ $this->assertTitle('Block layout | Drupal');
// Select the 'Powered by Drupal' block to be placed.
$block = [];
$block['id'] = strtolower($this->randomMachineName());
@@ -417,7 +417,7 @@ public function testBlockCacheTags() {
$this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'HIT');
// Place the "Powered by Drupal" block another time; verify a cache miss.
- $block_2 = $this->drupalPlaceBlock('system_powered_by_block', ['id' => 'powered-2']);
+ $this->drupalPlaceBlock('system_powered_by_block', ['id' => 'powered-2']);
$this->drupalGet('<front>');
$this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'MISS');
diff --git a/web/core/modules/block/tests/src/Functional/BlockTestBase.php b/web/core/modules/block/tests/src/Functional/BlockTestBase.php
index e1ccd1a365..1cb1a34dbf 100644
--- a/web/core/modules/block/tests/src/Functional/BlockTestBase.php
+++ b/web/core/modules/block/tests/src/Functional/BlockTestBase.php
@@ -15,7 +15,13 @@ abstract class BlockTestBase extends BrowserTestBase {
*
* @var array
*/
- public static $modules = ['block', 'filter', 'test_page_test', 'help', 'block_test'];
+ public static $modules = [
+ 'block',
+ 'filter',
+ 'test_page_test',
+ 'help',
+ 'block_test',
+ ];
/**
* A list of theme regions to test.
diff --git a/web/core/modules/block/tests/src/Functional/BlockUiTest.php b/web/core/modules/block/tests/src/Functional/BlockUiTest.php
index 7e98e70938..7ec5f3b132 100644
--- a/web/core/modules/block/tests/src/Functional/BlockUiTest.php
+++ b/web/core/modules/block/tests/src/Functional/BlockUiTest.php
@@ -89,13 +89,15 @@ public function testBlockDemoUiPage() {
$elements = $this->xpath('//div[contains(@class, "region-highlighted")]/div[contains(@class, "block-region") and contains(text(), :title)]', [':title' => 'Highlighted']);
$this->assertTrue(!empty($elements), 'Block demo regions are shown.');
+ // Ensure that other themes can use the block demo page.
\Drupal::service('theme_installer')->install(['test_theme']);
$this->drupalGet('admin/structure/block/demo/test_theme');
$this->assertEscaped('<strong>Test theme</strong>');
+ // Ensure that a hidden theme cannot use the block demo page.
\Drupal::service('theme_installer')->install(['stable']);
$this->drupalGet('admin/structure/block/demo/stable');
- $this->assertResponse(404, 'Hidden themes that are not the default theme are not supported by the block demo screen');
+ $this->assertSession()->statusCodeEquals(404);
}
/**
@@ -154,16 +156,19 @@ public function testBlockAdminUiPage() {
$this->assertLink($theme_handler->getName('stark'));
$this->assertNoLink($theme_handler->getName('stable'));
+ // Ensure that a hidden theme cannot use the block demo page.
$this->drupalGet('admin/structure/block/list/stable');
- $this->assertResponse(404, 'Placing blocks through UI is not possible for a hidden base theme.');
+ $this->assertSession()->statusCodeEquals(404);
+ // Ensure that a hidden theme set as the admin theme can use the block demo
+ // page.
\Drupal::configFactory()->getEditable('system.theme')->set('admin', 'stable')->save();
\Drupal::service('router.builder')->rebuildIfNeeded();
$this->drupalPlaceBlock('local_tasks_block', ['region' => 'header', 'theme' => 'stable']);
$this->drupalGet('admin/structure/block');
$this->assertLink($theme_handler->getName('stable'));
$this->drupalGet('admin/structure/block/list/stable');
- $this->assertResponse(200, 'Placing blocks through UI is possible for a hidden base theme that is the admin theme.');
+ $this->assertSession()->statusCodeEquals(200);
}
/**
@@ -372,9 +377,9 @@ public function testRouteProtection() {
$block = reset($this->blocks);
// Ensure that the enable and disable routes are protected.
$this->drupalGet('admin/structure/block/manage/' . $block->id() . '/disable');
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
$this->drupalGet('admin/structure/block/manage/' . $block->id() . '/enable');
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
}
}
diff --git a/web/core/modules/block/tests/src/Functional/Rest/BlockResourceTestBase.php b/web/core/modules/block/tests/src/Functional/Rest/BlockResourceTestBase.php
index a6af25805e..06d3396af3 100644
--- a/web/core/modules/block/tests/src/Functional/Rest/BlockResourceTestBase.php
+++ b/web/core/modules/block/tests/src/Functional/Rest/BlockResourceTestBase.php
@@ -31,9 +31,11 @@ protected function setUpAuthorization($method) {
case 'GET':
$this->entity->setVisibilityConfig('user_role', [])->save();
break;
+
case 'POST':
$this->grantPermissionsToTestedRole(['administer blocks']);
break;
+
case 'PATCH':
$this->grantPermissionsToTestedRole(['administer blocks']);
break;
@@ -137,6 +139,7 @@ protected function getExpectedUnauthorizedAccessMessage($method) {
switch ($method) {
case 'GET':
return "The block visibility condition 'user_role' denied access.";
+
default:
return parent::getExpectedUnauthorizedAccessMessage($method);
}
diff --git a/web/core/modules/block/tests/src/Functional/Views/DisplayBlockTest.php b/web/core/modules/block/tests/src/Functional/Views/DisplayBlockTest.php
index 211847c5d0..b9125ffc14 100644
--- a/web/core/modules/block/tests/src/Functional/Views/DisplayBlockTest.php
+++ b/web/core/modules/block/tests/src/Functional/Views/DisplayBlockTest.php
@@ -31,7 +31,13 @@ class DisplayBlockTest extends ViewTestBase {
*
* @var array
*/
- public static $modules = ['node', 'block_test_views', 'test_page_test', 'contextual', 'views_ui'];
+ public static $modules = [
+ 'node',
+ 'block_test_views',
+ 'test_page_test',
+ 'contextual',
+ 'views_ui',
+ ];
/**
* {@inheritdoc}
@@ -195,7 +201,7 @@ public function testViewsBlockForm() {
$this->drupalGet('admin/structure/block/add/views_block:test_view_block-block_1/' . $default_theme);
$elements = $this->xpath('//input[@name="label"]');
$this->assertTrue(empty($elements), 'The label field is not found for Views blocks.');
- // Test that that machine name field is hidden from display and has been
+ // Test that the machine name field is hidden from display and has been
// saved as expected from the default value.
$this->assertNoFieldById('edit-machine-name', 'views_block__test_view_block_1', 'The machine name is hidden on the views block form.');
@@ -291,14 +297,14 @@ public function testBlockEmptyRendering() {
$block = $this->drupalPlaceBlock('views_block:test_view_block-block_1', ['label' => 'test_view_block-block_1:1', 'views_label' => 'Custom title']);
$this->drupalGet('');
- $this->assertEqual(1, count($this->xpath('//div[contains(@class, "block-views-blocktest-view-block-block-1")]')));
+ $this->assertCount(1, $this->xpath('//div[contains(@class, "block-views-blocktest-view-block-block-1")]'));
$display = &$view->getDisplay('block_1');
$display['display_options']['block_hide_empty'] = TRUE;
$view->save();
$this->drupalGet($url);
- $this->assertEqual(0, count($this->xpath('//div[contains(@class, "block-views-blocktest-view-block-block-1")]')));
+ $this->assertCount(0, $this->xpath('//div[contains(@class, "block-views-blocktest-view-block-block-1")]'));
// Ensure that the view cacheability metadata is propagated even, for an
// empty block.
$this->assertCacheTags(array_merge($block->getCacheTags(), ['block_view', 'config:block_list', 'config:views.view.test_view_block', 'http_response', 'rendered']));
@@ -318,7 +324,7 @@ public function testBlockEmptyRendering() {
$view->save();
$this->drupalGet($url);
- $this->assertEqual(1, count($this->xpath('//div[contains(@class, "block-views-blocktest-view-block-block-1")]')));
+ $this->assertCount(1, $this->xpath('//div[contains(@class, "block-views-blocktest-view-block-block-1")]'));
$this->assertCacheTags(array_merge($block->getCacheTags(), ['block_view', 'config:block_list', 'config:views.view.test_view_block', 'http_response', 'rendered']));
$this->assertCacheContexts(['url.query_args:_wrapper_format']);
@@ -336,7 +342,7 @@ public function testBlockEmptyRendering() {
$view->save();
$this->drupalGet($url);
- $this->assertEqual(0, count($this->xpath('//div[contains(@class, "block-views-blocktest-view-block-block-1")]')));
+ $this->assertCount(0, $this->xpath('//div[contains(@class, "block-views-blocktest-view-block-block-1")]'));
$this->assertCacheTags(array_merge($block->getCacheTags(), ['block_view', 'config:block_list', 'config:views.view.test_view_block', 'http_response', 'rendered']));
$this->assertCacheContexts(['url.query_args:_wrapper_format']);
@@ -353,7 +359,7 @@ public function testBlockEmptyRendering() {
$view->save();
$this->drupalGet($url);
- $this->assertEqual(1, count($this->xpath('//div[contains(@class, "block-views-blocktest-view-block-block-1")]')));
+ $this->assertCount(1, $this->xpath('//div[contains(@class, "block-views-blocktest-view-block-block-1")]'));
$this->assertCacheTags(array_merge($block->getCacheTags(), ['block_view', 'config:block_list', 'config:views.view.test_view_block', 'http_response', 'rendered']));
$this->assertCacheContexts(['url.query_args:_wrapper_format']);
}
@@ -380,7 +386,7 @@ public function testBlockContextualLinks() {
$post = ['ids[0]' => $id, 'ids[1]' => $cached_id, 'tokens[0]' => $id_token, 'tokens[1]' => $cached_id_token];
$url = 'contextual/render?_format=json,destination=test-page';
$this->getSession()->getDriver()->getClient()->request('POST', $url, $post);
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$json = Json::decode($this->getSession()->getPage()->getContent());
$this->assertIdentical($json[$id], '<ul class="contextual-links"><li class="block-configure"><a href="' . base_path() . 'admin/structure/block/manage/' . $block->id() . '">Configure block</a></li><li class="entityviewedit-form"><a href="' . base_path() . 'admin/structure/views/view/test_view_block/edit/block_1">Edit view</a></li></ul>');
$this->assertIdentical($json[$cached_id], '<ul class="contextual-links"><li class="block-configure"><a href="' . base_path() . 'admin/structure/block/manage/' . $cached_block->id() . '">Configure block</a></li><li class="entityviewedit-form"><a href="' . base_path() . 'admin/structure/views/view/test_view_block/edit/block_1">Edit view</a></li></ul>');
diff --git a/web/core/modules/block/tests/src/FunctionalJavascript/BlockFilterTest.php b/web/core/modules/block/tests/src/FunctionalJavascript/BlockFilterTest.php
index ee9ff5fd31..17a33e6b52 100644
--- a/web/core/modules/block/tests/src/FunctionalJavascript/BlockFilterTest.php
+++ b/web/core/modules/block/tests/src/FunctionalJavascript/BlockFilterTest.php
@@ -67,7 +67,7 @@ public function testBlockFilter() {
$filter->setValue('Powered by');
$session->wait(10000, 'jQuery("#drupal-live-announce").html().indexOf("block is available") > -1');
$visible_rows = $this->filterVisibleElements($block_rows);
- $this->assertEquals(1, count($visible_rows));
+ $this->assertCount(1, $visible_rows);
$expected_message = '1 block is available in the modified list.';
$assertSession->elementTextContains('css', '#drupal-live-announce', $expected_message);
@@ -75,7 +75,7 @@ public function testBlockFilter() {
$filter->setValue('Pan-Galactic Gargle Blaster');
$session->wait(10000, 'jQuery("#drupal-live-announce").html().indexOf("0 blocks are available") > -1');
$visible_rows = $this->filterVisibleElements($block_rows);
- $this->assertEquals(0, count($visible_rows));
+ $this->assertCount(0, $visible_rows);
$expected_message = '0 blocks are available in the modified list.';
$assertSession->elementTextContains('css', '#drupal-live-announce', $expected_message);
}
diff --git a/web/core/modules/block/tests/src/Kernel/BlockStorageUnitTest.php b/web/core/modules/block/tests/src/Kernel/BlockStorageUnitTest.php
index 09abf2ad3a..83898dca7a 100644
--- a/web/core/modules/block/tests/src/Kernel/BlockStorageUnitTest.php
+++ b/web/core/modules/block/tests/src/Kernel/BlockStorageUnitTest.php
@@ -42,7 +42,7 @@ protected function setUp() {
* Tests CRUD operations.
*/
public function testBlockCRUD() {
- $this->assertTrue($this->controller instanceof ConfigEntityStorage, 'The block storage is loaded.');
+ $this->assertInstanceOf(ConfigEntityStorage::class, $this->controller);
// Run each test method in the same installation.
$this->createTests();
@@ -73,7 +73,7 @@ protected function createTests() {
]);
$entity->save();
- $this->assertTrue($entity instanceof Block, 'The newly created entity is a Block.');
+ $this->assertInstanceOf(Block::class, $entity);
// Verify all of the block properties.
$actual_properties = $this->config('block.block.test_block')->get();
@@ -102,7 +102,7 @@ protected function createTests() {
$this->assertIdentical($actual_properties, $expected_properties);
- $this->assertTrue($entity->getPlugin() instanceof TestHtmlBlock, 'The entity has an instance of the correct block plugin.');
+ $this->assertInstanceOf(TestHtmlBlock::class, $entity->getPlugin());
}
/**
@@ -111,7 +111,7 @@ protected function createTests() {
protected function loadTests() {
$entity = $this->controller->load('test_block');
- $this->assertTrue($entity instanceof Block, 'The loaded entity is a Block.');
+ $this->assertInstanceOf(Block::class, $entity);
// Verify several properties of the block.
$this->assertSame('content', $entity->getRegion());
diff --git a/web/core/modules/block/tests/src/Kernel/Migrate/d6/MigrateBlockContentTranslationTest.php b/web/core/modules/block/tests/src/Kernel/Migrate/d6/MigrateBlockContentTranslationTest.php
index be66745fdb..cfd524115f 100644
--- a/web/core/modules/block/tests/src/Kernel/Migrate/d6/MigrateBlockContentTranslationTest.php
+++ b/web/core/modules/block/tests/src/Kernel/Migrate/d6/MigrateBlockContentTranslationTest.php
@@ -27,8 +27,6 @@ class MigrateBlockContentTranslationTest extends MigrateDrupal6TestBase {
'path_alias',
'statistics',
'taxonomy',
- // Required for translation migrations.
- 'migrate_drupal_multilingual',
];
/**
diff --git a/web/core/modules/block/tests/src/Kernel/Migrate/d6/MigrateBlockTest.php b/web/core/modules/block/tests/src/Kernel/Migrate/d6/MigrateBlockTest.php
index 2e3e55ee37..6ed4006b1c 100644
--- a/web/core/modules/block/tests/src/Kernel/Migrate/d6/MigrateBlockTest.php
+++ b/web/core/modules/block/tests/src/Kernel/Migrate/d6/MigrateBlockTest.php
@@ -78,7 +78,7 @@ protected function setUp() {
*/
public function assertEntity($id, $visibility, $region, $theme, $weight, array $settings = NULL, $status = TRUE) {
$block = Block::load($id);
- $this->assertTrue($block instanceof Block);
+ $this->assertInstanceOf(Block::class, $block);
$this->assertSame($visibility, $block->getVisibility());
$this->assertSame($region, $block->getRegion());
$this->assertSame($theme, $block->getTheme());
@@ -303,7 +303,7 @@ public function testBlockMigration() {
// Custom block with php code is not migrated.
$block = Block::load('block_3');
- $this->assertFalse($block instanceof Block);
+ $this->assertNotInstanceOf(Block::class, $block);
}
}
diff --git a/web/core/modules/block/tests/src/Kernel/Migrate/d7/MigrateBlockContentTranslationTest.php b/web/core/modules/block/tests/src/Kernel/Migrate/d7/MigrateBlockContentTranslationTest.php
index cb24a69ab3..6caeb03c11 100644
--- a/web/core/modules/block/tests/src/Kernel/Migrate/d7/MigrateBlockContentTranslationTest.php
+++ b/web/core/modules/block/tests/src/Kernel/Migrate/d7/MigrateBlockContentTranslationTest.php
@@ -31,8 +31,6 @@ class MigrateBlockContentTranslationTest extends MigrateDrupal7TestBase {
'path_alias',
'statistics',
'taxonomy',
- // Required for translation migrations.
- 'migrate_drupal_multilingual',
];
/**
diff --git a/web/core/modules/block/tests/src/Kernel/Migrate/d7/MigrateBlockTest.php b/web/core/modules/block/tests/src/Kernel/Migrate/d7/MigrateBlockTest.php
index fca92af331..f684310c9d 100644
--- a/web/core/modules/block/tests/src/Kernel/Migrate/d7/MigrateBlockTest.php
+++ b/web/core/modules/block/tests/src/Kernel/Migrate/d7/MigrateBlockTest.php
@@ -84,7 +84,7 @@ protected function setUp() {
*/
public function assertEntity($id, $plugin_id, array $roles, $pages, $region, $theme, $weight, $label, $label_display, $status = TRUE) {
$block = Block::load($id);
- $this->assertTrue($block instanceof Block);
+ $this->assertInstanceOf(Block::class, $block);
/** @var \Drupal\block\BlockInterface $block */
$this->assertSame($plugin_id, $block->getPluginId());
diff --git a/web/core/modules/block_content/block_content.info.yml b/web/core/modules/block_content/block_content.info.yml
index 3315a2738e..96ea4de483 100644
--- a/web/core/modules/block_content/block_content.info.yml
+++ b/web/core/modules/block_content/block_content.info.yml
@@ -1,6 +1,6 @@
name: 'Custom Block'
type: module
-description: 'Allows the creation of custom blocks through the user interface.'
+description: 'Allows the creation of custom blocks and block types.'
package: Core
version: VERSION
core: 8.x
diff --git a/web/core/modules/block_content/src/Tests/Views/BlockContentTestBase.php b/web/core/modules/block_content/src/Tests/Views/BlockContentTestBase.php
index 80fa92fb76..3aaa7d0cea 100644
--- a/web/core/modules/block_content/src/Tests/Views/BlockContentTestBase.php
+++ b/web/core/modules/block_content/src/Tests/Views/BlockContentTestBase.php
@@ -39,7 +39,11 @@ abstract class BlockContentTestBase extends ViewTestBase {
*
* @var array
*/
- public static $modules = ['block', 'block_content', 'block_content_test_views'];
+ public static $modules = [
+ 'block',
+ 'block_content',
+ 'block_content_test_views',
+ ];
protected function setUp($import_test_views = TRUE) {
parent::setUp($import_test_views);
diff --git a/web/core/modules/block_content/tests/src/Functional/BlockContentCreationTest.php b/web/core/modules/block_content/tests/src/Functional/BlockContentCreationTest.php
index 7f3b251381..109a69ad0a 100644
--- a/web/core/modules/block_content/tests/src/Functional/BlockContentCreationTest.php
+++ b/web/core/modules/block_content/tests/src/Functional/BlockContentCreationTest.php
@@ -82,7 +82,7 @@ public function testBlockContentCreation() {
$this->assertRaw(new FormattableMarkup('A custom block with block description %value already exists.', [
'%value' => $edit['info[0][value]'],
]));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
}
/**
@@ -164,7 +164,7 @@ public function testBlockContentCreationMultipleViewModes() {
$this->assertRaw(new FormattableMarkup('A custom block with block description %value already exists.', [
'%value' => $edit['info[0][value]'],
]));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
}
/**
@@ -256,7 +256,7 @@ public function testBlockDelete() {
$block = BlockContent::load(1);
// Test getInstances method.
- $this->assertEqual(1, count($block->getInstances()));
+ $this->assertCount(1, $block->getInstances());
// Navigate to home page.
$this->drupalGet('');
diff --git a/web/core/modules/block_content/tests/src/Functional/BlockContentListTest.php b/web/core/modules/block_content/tests/src/Functional/BlockContentListTest.php
index 61edfdaefd..c598972663 100644
--- a/web/core/modules/block_content/tests/src/Functional/BlockContentListTest.php
+++ b/web/core/modules/block_content/tests/src/Functional/BlockContentListTest.php
@@ -35,7 +35,7 @@ public function testListing() {
$this->drupalGet('admin/structure/block/block-content');
// Test for the page title.
- $this->assertTitle(t('Custom block library') . ' | Drupal');
+ $this->assertTitle('Custom block library | Drupal');
// Test for the table.
$element = $this->xpath('//div[@class="layout-content"]//table');
@@ -43,7 +43,7 @@ public function testListing() {
// Test the table header.
$elements = $this->xpath('//div[@class="layout-content"]//table/thead/tr/th');
- $this->assertEqual(count($elements), 2, 'Correct number of table header cells found.');
+ $this->assertCount(2, $elements, 'Correct number of table header cells found.');
// Test the contents of each th cell.
$expected_items = [t('Block description'), t('Operations')];
@@ -57,7 +57,7 @@ public function testListing() {
$link_text = t('Add custom block');
$this->assertLink($link_text);
$this->clickLink($link_text);
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$edit = [];
$edit['info[0][value]'] = $label;
$edit['body[0][value]'] = $this->randomMachineName(16);
@@ -69,7 +69,7 @@ public function testListing() {
// Check the number of table row cells.
$elements = $this->xpath('//div[@class="layout-content"]//table/tbody/tr[@class="odd"]/td');
- $this->assertEqual(count($elements), 2, 'Correct number of table row cells found.');
+ $this->assertCount(2, $elements, 'Correct number of table row cells found.');
// Check the contents of each row cell. The first cell contains the label,
// the second contains the machine name, and the third contains the
// operations list.
@@ -84,8 +84,8 @@ public function testListing() {
if (!empty($block)) {
$this->assertLinkByHref('block/' . $block->id());
$this->clickLink(t('Edit'));
- $this->assertResponse(200);
- $this->assertTitle(strip_tags(t('Edit custom block %label', ['%label' => $label]) . ' | Drupal'));
+ $this->assertSession()->statusCodeEquals(200);
+ $this->assertTitle("Edit custom block $label | Drupal");
$edit = ['info[0][value]' => $new_label];
$this->drupalPostForm(NULL, $edit, t('Save'));
}
@@ -101,8 +101,8 @@ public function testListing() {
$this->assertLinkByHref('block/' . $block->id() . '/delete');
$delete_text = t('Delete');
$this->clickLink($delete_text);
- $this->assertResponse(200);
- $this->assertTitle(strip_tags(t('Are you sure you want to delete the custom block %label?', ['%label' => $new_label]) . ' | Drupal'));
+ $this->assertSession()->statusCodeEquals(200);
+ $this->assertTitle("Are you sure you want to delete the custom block $new_label? | Drupal");
$this->drupalPostForm(NULL, [], $delete_text);
// Verify that the text of the label and machine name does not appear in
diff --git a/web/core/modules/block_content/tests/src/Functional/BlockContentListViewsTest.php b/web/core/modules/block_content/tests/src/Functional/BlockContentListViewsTest.php
index 61f2984718..c7ba748847 100644
--- a/web/core/modules/block_content/tests/src/Functional/BlockContentListViewsTest.php
+++ b/web/core/modules/block_content/tests/src/Functional/BlockContentListViewsTest.php
@@ -18,7 +18,12 @@ class BlockContentListViewsTest extends BlockContentTestBase {
*
* @var array
*/
- public static $modules = ['block', 'block_content', 'config_translation', 'views'];
+ public static $modules = [
+ 'block',
+ 'block_content',
+ 'config_translation',
+ 'views',
+ ];
/**
* {@inheritdoc}
@@ -33,7 +38,7 @@ public function testListing() {
$this->drupalGet('admin/structure/block/block-content');
// Test for the page title.
- $this->assertTitle(t('Custom block library') . ' | Drupal');
+ $this->assertTitle('Custom block library | Drupal');
// Test for the exposed filters.
$this->assertFieldByName('info');
@@ -45,7 +50,7 @@ public function testListing() {
// Test the table header.
$elements = $this->xpath('//div[@class="layout-content"]//table/thead/tr/th');
- $this->assertEqual(count($elements), 4, 'Correct number of table header cells found.');
+ $this->assertCount(4, $elements, 'Correct number of table header cells found.');
// Test the contents of each th cell.
$expected_items = ['Block description', 'Block type', 'Updated Sort ascending', 'Operations'];
@@ -64,7 +69,7 @@ public function testListing() {
$link_text = t('Add custom block');
$this->assertLink($link_text);
$this->clickLink($link_text);
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$edit = [];
$edit['info[0][value]'] = $label;
$edit['body[0][value]'] = $this->randomMachineName(16);
@@ -76,7 +81,7 @@ public function testListing() {
// Check the number of table row cells.
$elements = $this->xpath('//div[@class="layout-content"]//table/tbody/tr/td');
- $this->assertEqual(count($elements), 4, 'Correct number of table row cells found.');
+ $this->assertCount(4, $elements, 'Correct number of table row cells found.');
// Check the contents of each row cell. The first cell contains the label,
// the second contains the machine name, and the third contains the
// operations list.
@@ -91,8 +96,8 @@ public function testListing() {
if (!empty($block)) {
$this->assertLinkByHref('block/' . $block->id());
$this->clickLink(t('Edit'));
- $this->assertResponse(200);
- $this->assertTitle(strip_tags(t('Edit custom block %label', ['%label' => $label]) . ' | Drupal'));
+ $this->assertSession()->statusCodeEquals(200);
+ $this->assertTitle("Edit custom block $label | Drupal");
$edit = ['info[0][value]' => $new_label];
$this->drupalPostForm(NULL, $edit, t('Save'));
}
@@ -108,8 +113,8 @@ public function testListing() {
$this->assertLinkByHref('block/' . $block->id() . '/delete');
$delete_text = t('Delete');
$this->clickLink($delete_text);
- $this->assertResponse(200);
- $this->assertTitle(strip_tags(t('Are you sure you want to delete the custom block %label?', ['%label' => $new_label]) . ' | Drupal'));
+ $this->assertSession()->statusCodeEquals(200);
+ $this->assertTitle("Are you sure you want to delete the custom block $new_label? | Drupal");
$this->drupalPostForm(NULL, [], $delete_text);
// Verify that the text of the label and machine name does not appear in
diff --git a/web/core/modules/block_content/tests/src/Functional/BlockContentPageViewTest.php b/web/core/modules/block_content/tests/src/Functional/BlockContentPageViewTest.php
index c9bc68b0f3..296f0a3bfa 100644
--- a/web/core/modules/block_content/tests/src/Functional/BlockContentPageViewTest.php
+++ b/web/core/modules/block_content/tests/src/Functional/BlockContentPageViewTest.php
@@ -31,8 +31,8 @@ public function testPageEdit() {
// Attempt to view the block.
$this->drupalGet('block-content/' . $block->id());
- // Assert response was '200' and not '403 Access denied'.
- $this->assertResponse('200', 'User was able the view the block');
+ // Ensure user was able to view the block.
+ $this->assertSession()->statusCodeEquals(200);
$this->drupalGet('<front>');
$this->assertRaw(t('This block is broken or missing. You may be missing content or you might need to enable the original module.'));
}
diff --git a/web/core/modules/block_content/tests/src/Functional/BlockContentRevisionsTest.php b/web/core/modules/block_content/tests/src/Functional/BlockContentRevisionsTest.php
index 743f85a381..c767e8a902 100644
--- a/web/core/modules/block_content/tests/src/Functional/BlockContentRevisionsTest.php
+++ b/web/core/modules/block_content/tests/src/Functional/BlockContentRevisionsTest.php
@@ -84,9 +84,9 @@ public function testRevisions() {
'@revision' => $loaded->getRevisionId(),
]));
if ($delta > 0) {
- $this->assertTrue($loaded->getRevisionUser() instanceof UserInterface, 'Revision User found.');
- $this->assertTrue(is_numeric($loaded->getRevisionUserId()), 'Revision User ID found.');
- $this->assertTrue(is_numeric($loaded->getRevisionCreationTime()), 'Revision time found.');
+ $this->assertInstanceOf(UserInterface::class, $loaded->getRevisionUser());
+ $this->assertIsNumeric($loaded->getRevisionUserId());
+ $this->assertIsNumeric($loaded->getRevisionCreationTime());
}
}
diff --git a/web/core/modules/block_content/tests/src/Functional/BlockContentTranslationUITest.php b/web/core/modules/block_content/tests/src/Functional/BlockContentTranslationUITest.php
index 09d0fd95ac..44560f9248 100644
--- a/web/core/modules/block_content/tests/src/Functional/BlockContentTranslationUITest.php
+++ b/web/core/modules/block_content/tests/src/Functional/BlockContentTranslationUITest.php
@@ -177,7 +177,7 @@ public function testDisabledBundle() {
// Make sure that only a single row was inserted into the block table.
$rows = Database::getConnection()->query('SELECT * FROM {block_content_field_data} WHERE id = :id', [':id' => $enabled_block_content->id()])->fetchAll();
- $this->assertEqual(1, count($rows));
+ $this->assertCount(1, $rows);
}
/**
diff --git a/web/core/modules/block_content/tests/src/Functional/BlockContentTypeTest.php b/web/core/modules/block_content/tests/src/Functional/BlockContentTypeTest.php
index 9a8f6b5964..fbe11028ca 100644
--- a/web/core/modules/block_content/tests/src/Functional/BlockContentTypeTest.php
+++ b/web/core/modules/block_content/tests/src/Functional/BlockContentTypeTest.php
@@ -2,7 +2,6 @@
namespace Drupal\Tests\block_content\Functional;
-use Drupal\Component\Render\FormattableMarkup;
use Drupal\block_content\Entity\BlockContentType;
use Drupal\Component\Utility\Html;
use Drupal\Core\Url;
@@ -60,7 +59,7 @@ public function testBlockContentTypeCreation() {
// Test the page with no block-types.
$this->drupalGet('block/add');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertText('You have not created any block types yet');
$this->clickLink('block type creation page');
@@ -71,7 +70,7 @@ public function testBlockContentTypeCreation() {
];
$this->drupalPostForm(NULL, $edit, t('Save'));
$block_type = BlockContentType::load('foo');
- $this->assertInstanceOf(BlockContentType::class, $block_type, 'The new block type has been created.');
+ $this->assertInstanceOf(BlockContentType::class, $block_type);
$field_definitions = \Drupal::service('entity_field.manager')->getFieldDefinitions('block_content', 'foo');
$this->assertTrue(isset($field_definitions['body']), 'Body field created when using the UI to create block content types.');
@@ -90,10 +89,10 @@ public function testBlockContentTypeCreation() {
$this->assertFalse(isset($field_definitions['body']), "Body field for 'other' block type not created when using the testing API to create block content types.");
$block_type = BlockContentType::load('other');
- $this->assertInstanceOf(BlockContentType::class, $block_type, 'The new block type has been created.');
+ $this->assertInstanceOf(BlockContentType::class, $block_type);
$this->drupalGet('block/add/' . $block_type->id());
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
}
/**
@@ -121,7 +120,7 @@ public function testBlockContentTypeEditing() {
'label' => 'Bar',
];
$this->drupalGet('admin/structure/block/block-content/manage/basic');
- $this->assertTitle(new FormattableMarkup('Edit @type custom block type | Drupal', ['@type' => 'basic']));
+ $this->assertTitle('Edit basic custom block type | Drupal');
$this->drupalPostForm(NULL, $edit, t('Save'));
$front_page_path = Url::fromRoute('<front>')->toString();
$this->assertBreadcrumb('admin/structure/block/block-content/manage/basic/fields', [
diff --git a/web/core/modules/block_content/tests/src/Functional/BlockContentValidationTest.php b/web/core/modules/block_content/tests/src/Functional/BlockContentValidationTest.php
index 293234ba52..c89887c35b 100644
--- a/web/core/modules/block_content/tests/src/Functional/BlockContentValidationTest.php
+++ b/web/core/modules/block_content/tests/src/Functional/BlockContentValidationTest.php
@@ -26,7 +26,7 @@ public function testValidation() {
// Validate the block.
$violations = $block->validate();
// Make sure we have no violations.
- $this->assertEqual(count($violations), 0);
+ $this->assertCount(0, $violations);
// Save the block.
$block->save();
@@ -35,7 +35,7 @@ public function testValidation() {
// Validate this block.
$violations = $block->validate();
// Make sure we have 1 violation.
- $this->assertEqual(count($violations), 1);
+ $this->assertCount(1, $violations);
// Make sure the violation is on the info property
$this->assertEqual($violations[0]->getPropertyPath(), 'info');
// Make sure the message is correct.
diff --git a/web/core/modules/block_content/tests/src/Functional/Update/BlockContentUpdateTest.php b/web/core/modules/block_content/tests/src/Functional/Update/BlockContentUpdateTest.php
index 9f9f1d1fe7..82fd8a8470 100644
--- a/web/core/modules/block_content/tests/src/Functional/Update/BlockContentUpdateTest.php
+++ b/web/core/modules/block_content/tests/src/Functional/Update/BlockContentUpdateTest.php
@@ -34,8 +34,8 @@ public function testSimpleUpdates() {
$post_revision_created = $entity_definition_update_manager->getFieldStorageDefinition('revision_created', 'block_content');
$post_revision_user = $entity_definition_update_manager->getFieldStorageDefinition('revision_user', 'block_content');
- $this->assertTrue($post_revision_created instanceof BaseFieldDefinition, "Revision created field found");
- $this->assertTrue($post_revision_user instanceof BaseFieldDefinition, "Revision user field found");
+ $this->assertInstanceOf(BaseFieldDefinition::class, $post_revision_created);
+ $this->assertInstanceOf(BaseFieldDefinition::class, $post_revision_user);
$this->assertEqual('created', $post_revision_created->getType(), "Field is type created");
$this->assertEqual('entity_reference', $post_revision_user->getType(), "Field is type entity_reference");
diff --git a/web/core/modules/block_content/tests/src/Functional/Views/BlockContentFieldFilterTest.php b/web/core/modules/block_content/tests/src/Functional/Views/BlockContentFieldFilterTest.php
index 2a612839af..9d1cbedcf0 100644
--- a/web/core/modules/block_content/tests/src/Functional/Views/BlockContentFieldFilterTest.php
+++ b/web/core/modules/block_content/tests/src/Functional/Views/BlockContentFieldFilterTest.php
@@ -56,7 +56,7 @@ public function setUp($import_test_views = TRUE) {
$this->blockContentInfos = [
'en' => 'Food in Paris',
'es' => 'Comida en Paris',
- 'fr' => 'Nouriture en Paris',
+ 'fr' => 'Nourriture en Paris',
];
// Create block_content with translations.
diff --git a/web/core/modules/block_content/tests/src/Functional/Views/BlockContentIntegrationTest.php b/web/core/modules/block_content/tests/src/Functional/Views/BlockContentIntegrationTest.php
index 8f9e03d257..6857ee8453 100644
--- a/web/core/modules/block_content/tests/src/Functional/Views/BlockContentIntegrationTest.php
+++ b/web/core/modules/block_content/tests/src/Functional/Views/BlockContentIntegrationTest.php
@@ -42,10 +42,10 @@ public function testBlockContentViewTypeArgument() {
}
$this->drupalGet('test-block_content-view');
- $this->assertResponse(404);
+ $this->assertSession()->statusCodeEquals(404);
$this->drupalGet('test-block_content-view/all');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertIds($all_ids);
/* @var \Drupal\block_content\Entity\BlockContentType[] $types*/
foreach ($types as $type) {
diff --git a/web/core/modules/block_content/tests/src/Functional/Views/BlockContentTestBase.php b/web/core/modules/block_content/tests/src/Functional/Views/BlockContentTestBase.php
index 254fc408f8..63c27b4d66 100644
--- a/web/core/modules/block_content/tests/src/Functional/Views/BlockContentTestBase.php
+++ b/web/core/modules/block_content/tests/src/Functional/Views/BlockContentTestBase.php
@@ -34,7 +34,11 @@ abstract class BlockContentTestBase extends ViewTestBase {
*
* @var array
*/
- public static $modules = ['block', 'block_content', 'block_content_test_views'];
+ public static $modules = [
+ 'block',
+ 'block_content',
+ 'block_content_test_views',
+ ];
protected function setUp($import_test_views = TRUE) {
parent::setUp($import_test_views);
diff --git a/web/core/modules/block_content/tests/src/Kernel/Migrate/MigrateBlockContentBodyFieldTest.php b/web/core/modules/block_content/tests/src/Kernel/Migrate/MigrateBlockContentBodyFieldTest.php
index 8eb60a6c44..8cc02d14f1 100644
--- a/web/core/modules/block_content/tests/src/Kernel/Migrate/MigrateBlockContentBodyFieldTest.php
+++ b/web/core/modules/block_content/tests/src/Kernel/Migrate/MigrateBlockContentBodyFieldTest.php
@@ -36,14 +36,14 @@ protected function setUp() {
public function testBlockContentBodyFieldMigration() {
/** @var \Drupal\field\FieldStorageConfigInterface $storage */
$storage = FieldStorageConfig::load('block_content.body');
- $this->assertTrue($storage instanceof FieldStorageConfigInterface);
+ $this->assertInstanceOf(FieldStorageConfigInterface::class, $storage);
$this->assertIdentical('block_content', $storage->getTargetEntityTypeId());
$this->assertIdentical(['basic'], array_values($storage->getBundles()));
$this->assertIdentical('body', $storage->getName());
/** @var \Drupal\field\FieldConfigInterface $field */
$field = FieldConfig::load('block_content.basic.body');
- $this->assertTrue($field instanceof FieldConfigInterface);
+ $this->assertInstanceOf(FieldConfigInterface::class, $field);
$this->assertIdentical('block_content', $field->getTargetEntityTypeId());
$this->assertIdentical('basic', $field->getTargetBundle());
$this->assertIdentical('body', $field->getName());
diff --git a/web/core/modules/block_content/tests/src/Kernel/Migrate/MigrateBlockContentEntityDisplayTest.php b/web/core/modules/block_content/tests/src/Kernel/Migrate/MigrateBlockContentEntityDisplayTest.php
index 5a05637a1c..2872b1a87d 100644
--- a/web/core/modules/block_content/tests/src/Kernel/Migrate/MigrateBlockContentEntityDisplayTest.php
+++ b/web/core/modules/block_content/tests/src/Kernel/Migrate/MigrateBlockContentEntityDisplayTest.php
@@ -41,7 +41,7 @@ protected function setUp() {
*/
protected function assertDisplay($id, $component_id) {
$component = EntityViewDisplay::load($id)->getComponent($component_id);
- $this->assertInternalType('array', $component);
+ $this->assertIsArray($component);
$this->assertSame('hidden', $component['label']);
}
diff --git a/web/core/modules/block_content/tests/src/Kernel/Migrate/MigrateBlockContentEntityFormDisplayTest.php b/web/core/modules/block_content/tests/src/Kernel/Migrate/MigrateBlockContentEntityFormDisplayTest.php
index 645f70bc97..fb2492cf90 100644
--- a/web/core/modules/block_content/tests/src/Kernel/Migrate/MigrateBlockContentEntityFormDisplayTest.php
+++ b/web/core/modules/block_content/tests/src/Kernel/Migrate/MigrateBlockContentEntityFormDisplayTest.php
@@ -41,7 +41,7 @@ protected function setUp() {
*/
protected function assertDisplay($id, $component_id) {
$component = EntityFormDisplay::load($id)->getComponent($component_id);
- $this->assertInternalType('array', $component);
+ $this->assertIsArray($component);
$this->assertSame('text_textarea_with_summary', $component['type']);
}
diff --git a/web/core/modules/block_content/tests/src/Kernel/Migrate/MigrateBlockContentStubTest.php b/web/core/modules/block_content/tests/src/Kernel/Migrate/MigrateBlockContentStubTest.php
index 1958039acb..124d0b38b9 100644
--- a/web/core/modules/block_content/tests/src/Kernel/Migrate/MigrateBlockContentStubTest.php
+++ b/web/core/modules/block_content/tests/src/Kernel/Migrate/MigrateBlockContentStubTest.php
@@ -35,7 +35,7 @@ protected function setUp() {
public function testStubFailure() {
$message = 'Expected MigrateException thrown when no bundles exist.';
try {
- $this->createStub('block_content');
+ $this->createEntityStub('block_content');
$this->fail($message);
}
catch (MigrateException $e) {
diff --git a/web/core/modules/block_content/tests/src/Kernel/Migrate/MigrateBlockContentTypeTest.php b/web/core/modules/block_content/tests/src/Kernel/Migrate/MigrateBlockContentTypeTest.php
index 046284dbf0..30e6ceec0d 100644
--- a/web/core/modules/block_content/tests/src/Kernel/Migrate/MigrateBlockContentTypeTest.php
+++ b/web/core/modules/block_content/tests/src/Kernel/Migrate/MigrateBlockContentTypeTest.php
@@ -31,7 +31,7 @@ protected function setUp() {
public function testBlockContentTypeMigration() {
/** @var \Drupal\block_content\BlockContentTypeInterface $entity */
$entity = BlockContentType::load('basic');
- $this->assertTrue($entity instanceof BlockContentTypeInterface);
+ $this->assertInstanceOf(BlockContentTypeInterface::class, $entity);
$this->assertIdentical('Basic', $entity->label());
}
diff --git a/web/core/modules/block_content/tests/src/Kernel/Migrate/d6/MigrateCustomBlockContentTranslationTest.php b/web/core/modules/block_content/tests/src/Kernel/Migrate/d6/MigrateCustomBlockContentTranslationTest.php
index 99bbc42855..9a49f33058 100644
--- a/web/core/modules/block_content/tests/src/Kernel/Migrate/d6/MigrateCustomBlockContentTranslationTest.php
+++ b/web/core/modules/block_content/tests/src/Kernel/Migrate/d6/MigrateCustomBlockContentTranslationTest.php
@@ -19,8 +19,6 @@ class MigrateCustomBlockContentTranslationTest extends MigrateDrupal6TestBase {
'block_content',
'content_translation',
'language',
- // Required for translation migrations.
- 'migrate_drupal_multilingual',
];
/**
diff --git a/web/core/modules/block_content/tests/src/Kernel/Migrate/d7/MigrateCustomBlockContentTranslationTest.php b/web/core/modules/block_content/tests/src/Kernel/Migrate/d7/MigrateCustomBlockContentTranslationTest.php
index 5f3b98b9c1..03453c823f 100644
--- a/web/core/modules/block_content/tests/src/Kernel/Migrate/d7/MigrateCustomBlockContentTranslationTest.php
+++ b/web/core/modules/block_content/tests/src/Kernel/Migrate/d7/MigrateCustomBlockContentTranslationTest.php
@@ -21,8 +21,6 @@ class MigrateCustomBlockContentTranslationTest extends MigrateDrupal7TestBase {
'filter',
'language',
'text',
- // Required for translation migrations.
- 'migrate_drupal_multilingual',
];
/**
diff --git a/web/core/modules/block_content/tests/src/Kernel/Migrate/d7/MigrateCustomBlockTest.php b/web/core/modules/block_content/tests/src/Kernel/Migrate/d7/MigrateCustomBlockTest.php
index 9147b382e9..0d29762cbe 100644
--- a/web/core/modules/block_content/tests/src/Kernel/Migrate/d7/MigrateCustomBlockTest.php
+++ b/web/core/modules/block_content/tests/src/Kernel/Migrate/d7/MigrateCustomBlockTest.php
@@ -40,7 +40,7 @@ protected function setUp() {
*/
public function testCustomBlockMigration() {
$block = BlockContent::load(1);
- $this->assertTrue($block instanceof BlockContentInterface);
+ $this->assertInstanceOf(BlockContentInterface::class, $block);
/** @var \Drupal\block_content\BlockContentInterface $block */
$this->assertIdentical('Limerick', $block->label());
diff --git a/web/core/modules/block_content/tests/src/Unit/Access/DependentAccessTest.php b/web/core/modules/block_content/tests/src/Unit/Access/DependentAccessTest.php
index 89810abc41..56e1bee9ce 100644
--- a/web/core/modules/block_content/tests/src/Unit/Access/DependentAccessTest.php
+++ b/web/core/modules/block_content/tests/src/Unit/Access/DependentAccessTest.php
@@ -64,7 +64,7 @@ public function testSetAccessDependency($use_set_first) {
// Calling setAccessDependency() replaces the existing dependency.
$testRefinable->setAccessDependency($this->neutral);
$dependency = $testRefinable->getAccessDependency();
- $this->assertFalse($dependency instanceof AccessGroupAnd);
+ $this->assertNotInstanceOf(AccessGroupAnd::class, $dependency);
$accessResult = $dependency->access('view', $this->account, TRUE);
$this->assertTrue($accessResult->isNeutral());
$this->assertEquals('I have no opinion', $accessResult->getReason());
@@ -92,7 +92,7 @@ public function testMergeNonGroup($use_set_first) {
/** @var \Drupal\block_content\Access\AccessGroupAnd $dependency */
$dependency = $testRefinable->getAccessDependency();
// Ensure the new dependency create a new AND group when merged.
- $this->assertTrue($dependency instanceof AccessGroupAnd);
+ $this->assertInstanceOf(AccessGroupAnd::class, $dependency);
$dependencies = $dependency->getDependencies();
$accessResultForbidden = $dependencies[0]->access('view', $this->account, TRUE);
$this->assertTrue($accessResultForbidden->isForbidden());
@@ -123,7 +123,7 @@ public function testMergeGroup($use_set_first) {
$dependency = $testRefinable->getAccessDependency();
// Ensure the new dependency is merged with the existing group.
- $this->assertTrue($dependency instanceof AccessGroupAnd);
+ $this->assertInstanceOf(AccessGroupAnd::class, $dependency);
$dependencies = $dependency->getDependencies();
$accessResultForbidden = $dependencies[0]->access('view', $this->account, TRUE);
$this->assertTrue($accessResultForbidden->isForbidden());
diff --git a/web/core/modules/block_place/block_place.module b/web/core/modules/block_place/block_place.module
index c91c9c2d57..902486881b 100644
--- a/web/core/modules/block_place/block_place.module
+++ b/web/core/modules/block_place/block_place.module
@@ -13,8 +13,6 @@
use Drupal\Core\Routing\RouteMatchInterface;
use Drupal\Core\Url;
-@trigger_error('The Place Blocks module is deprecated in drupal:8.8.0 and will be removed from drupal:9.0.0. See the change record for a list of alternatives. See https://www.drupal.org/node/3081957.', E_USER_DEPRECATED);
-
/**
* Implements hook_help().
*/
diff --git a/web/core/modules/block_place/tests/src/Functional/BlockPlaceTest.php b/web/core/modules/block_place/tests/src/Functional/BlockPlaceTest.php
index 8eb78254c8..5763f915cb 100644
--- a/web/core/modules/block_place/tests/src/Functional/BlockPlaceTest.php
+++ b/web/core/modules/block_place/tests/src/Functional/BlockPlaceTest.php
@@ -49,7 +49,7 @@ public function testPlacingBlocksAdmin() {
foreach ($visible_regions as $region => $name) {
$block_library_url->setOption('query', ['region' => $region]);
$links = $this->xpath('//a[contains(@href, :href)]', [':href' => $block_library_url->toString()]);
- $this->assertEquals(1, count($links));
+ $this->assertCount(1, $links);
list(, $query_string) = explode('?', $links[0]->getAttribute('href'), 2);
parse_str($query_string, $query_parts);
@@ -57,7 +57,7 @@ public function testPlacingBlocksAdmin() {
// Get the text inside the div->a->span->em.
$demo_block = $this->xpath('//div[@class="block-place-region"]/a/span[text()="Place block in the "]/em[text()="' . $name . '"]');
- $this->assertEquals(1, count($demo_block));
+ $this->assertCount(1, $demo_block);
}
}
diff --git a/web/core/modules/book/src/BookManager.php b/web/core/modules/book/src/BookManager.php
index 36bc38b892..d577e1414d 100644
--- a/web/core/modules/book/src/BookManager.php
+++ b/web/core/modules/book/src/BookManager.php
@@ -602,8 +602,7 @@ protected function buildItems(array $tree) {
// Allow book-specific theme overrides.
$element['attributes'] = new Attribute();
$element['title'] = $data['link']['title'];
- $node = $this->entityTypeManager->getStorage('node')->load($data['link']['nid']);
- $element['url'] = $node->toUrl();
+ $element['url'] = 'entity:node/' . $data['link']['nid'];
$element['localized_options'] = !empty($data['link']['localized_options']) ? $data['link']['localized_options'] : [];
$element['localized_options']['set_active_class'] = TRUE;
$element['below'] = $data['below'] ? $this->buildItems($data['below']) : [];
diff --git a/web/core/modules/book/src/BookManagerInterface.php b/web/core/modules/book/src/BookManagerInterface.php
index 155e2a86ce..bee18c0459 100644
--- a/web/core/modules/book/src/BookManagerInterface.php
+++ b/web/core/modules/book/src/BookManagerInterface.php
@@ -15,7 +15,7 @@ interface BookManagerInterface {
* Gets the data structure representing a named menu tree.
*
* Since this can be the full tree including hidden items, the data returned
- * may be used for generating an an admin interface or a select.
+ * may be used for generating an admin interface or a select.
*
* Note: based on menu_tree_all_data().
*
diff --git a/web/core/modules/book/tests/src/Functional/BookBreadcrumbTest.php b/web/core/modules/book/tests/src/Functional/BookBreadcrumbTest.php
index e539867a23..b2355aa25d 100644
--- a/web/core/modules/book/tests/src/Functional/BookBreadcrumbTest.php
+++ b/web/core/modules/book/tests/src/Functional/BookBreadcrumbTest.php
@@ -156,7 +156,7 @@ public function testBreadcrumbTitleUpdates() {
$got_breadcrumb[] = $link->getText();
}
// Home link and four parent book nodes should be in the breadcrumb.
- $this->assertEqual(5, count($got_breadcrumb));
+ $this->assertCount(5, $got_breadcrumb);
$this->assertEqual($nodes[3]->getTitle(), end($got_breadcrumb));
$edit = [
'title[0][value]' => 'Updated node5 title',
@@ -169,7 +169,7 @@ public function testBreadcrumbTitleUpdates() {
foreach ($links as $link) {
$got_breadcrumb[] = $link->getText();
}
- $this->assertEqual(5, count($got_breadcrumb));
+ $this->assertCount(5, $got_breadcrumb);
$this->assertEqual($edit['title[0][value]'], end($got_breadcrumb));
}
@@ -190,7 +190,7 @@ public function testBreadcrumbAccessUpdates() {
foreach ($links as $link) {
$got_breadcrumb[] = $link->getText();
}
- $this->assertEqual(5, count($got_breadcrumb));
+ $this->assertCount(5, $got_breadcrumb);
$this->assertEqual($edit['title[0][value]'], end($got_breadcrumb));
$config = $this->container->get('config.factory')->getEditable('book_breadcrumb_test.settings');
$config->set('hide', TRUE)->save();
@@ -200,10 +200,10 @@ public function testBreadcrumbAccessUpdates() {
foreach ($links as $link) {
$got_breadcrumb[] = $link->getText();
}
- $this->assertEqual(4, count($got_breadcrumb));
+ $this->assertCount(4, $got_breadcrumb);
$this->assertEqual($nodes[2]->getTitle(), end($got_breadcrumb));
$this->drupalGet($nodes[3]->toUrl());
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
}
}
diff --git a/web/core/modules/book/tests/src/Functional/BookContentModerationTest.php b/web/core/modules/book/tests/src/Functional/BookContentModerationTest.php
index 6a1ce9c78b..2dde866577 100644
--- a/web/core/modules/book/tests/src/Functional/BookContentModerationTest.php
+++ b/web/core/modules/book/tests/src/Functional/BookContentModerationTest.php
@@ -20,7 +20,12 @@ class BookContentModerationTest extends BrowserTestBase {
*
* @var array
*/
- public static $modules = ['book', 'block', 'book_test', 'content_moderation'];
+ public static $modules = [
+ 'book',
+ 'block',
+ 'book_test',
+ 'content_moderation',
+ ];
/**
* {@inheritdoc}
diff --git a/web/core/modules/book/tests/src/Functional/BookTest.php b/web/core/modules/book/tests/src/Functional/BookTest.php
index e1e81955d2..f4aaa6de12 100644
--- a/web/core/modules/book/tests/src/Functional/BookTest.php
+++ b/web/core/modules/book/tests/src/Functional/BookTest.php
@@ -209,11 +209,11 @@ public function testBookExport() {
// Make sure we can't export an unsupported format.
$this->drupalGet('book/export/foobar/' . $this->book->id());
- $this->assertResponse('404', 'Unsupported export format returned "not found".');
+ $this->assertSession()->statusCodeEquals(404);
// Make sure we get a 404 on a not existing book node.
$this->drupalGet('book/export/html/123');
- $this->assertResponse('404', 'Not existing book node returned "not found".');
+ $this->assertSession()->statusCodeEquals(404);
// Make sure an anonymous user cannot view printer-friendly version.
$this->drupalLogout();
@@ -224,14 +224,14 @@ public function testBookExport() {
// Try getting the URL directly, and verify it fails.
$this->drupalGet('book/export/html/' . $this->book->id());
- $this->assertResponse('403', 'Anonymous user properly forbidden.');
+ $this->assertSession()->statusCodeEquals(403);
// Now grant anonymous users permission to view the printer-friendly
// version and verify that node access restrictions still prevent them from
// seeing it.
user_role_grant_permissions(RoleInterface::ANONYMOUS_ID, ['access printer-friendly version']);
$this->drupalGet('book/export/html/' . $this->book->id());
- $this->assertResponse('403', 'Anonymous user properly forbidden from seeing the printer-friendly version when denied by node access.');
+ $this->assertSession()->statusCodeEquals(403);
}
/**
@@ -351,9 +351,11 @@ public function testBookDelete() {
$this->drupalLogin($this->adminUser);
$edit = [];
- // Test access to delete top-level and child book nodes.
+ // Ensure that the top-level book node cannot be deleted.
$this->drupalGet('node/' . $this->book->id() . '/outline/remove');
- $this->assertResponse('403', 'Deleting top-level book node properly forbidden.');
+ $this->assertSession()->statusCodeEquals(403);
+
+ // Ensure that a child book node can be deleted.
$this->drupalPostForm('node/' . $nodes[4]->id() . '/outline/remove', $edit, t('Remove'));
$node_storage->resetCache([$nodes[4]->id()]);
$node4 = $node_storage->load($nodes[4]->id());
@@ -379,7 +381,7 @@ public function testBookDelete() {
// Delete parent, and visit a child page.
$this->drupalPostForm($this->book->toUrl('delete-form'), [], t('Delete'));
$this->drupalGet($nodes[0]->toUrl());
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertText($nodes[0]->label());
// The book parents should be updated.
$node_storage = \Drupal::entityTypeManager()->getStorage('node');
diff --git a/web/core/modules/book/tests/src/Kernel/BookPendingRevisionTest.php b/web/core/modules/book/tests/src/Kernel/BookPendingRevisionTest.php
index ababb3daaa..d20da61554 100644
--- a/web/core/modules/book/tests/src/Kernel/BookPendingRevisionTest.php
+++ b/web/core/modules/book/tests/src/Kernel/BookPendingRevisionTest.php
@@ -18,7 +18,15 @@ class BookPendingRevisionTest extends KernelTestBase {
*
* @var array
*/
- public static $modules = ['system', 'user', 'field', 'filter', 'text', 'node', 'book'];
+ public static $modules = [
+ 'system',
+ 'user',
+ 'field',
+ 'filter',
+ 'text',
+ 'node',
+ 'book',
+ ];
/**
* {@inheritdoc}
diff --git a/web/core/modules/book/tests/src/Kernel/BookUninstallTest.php b/web/core/modules/book/tests/src/Kernel/BookUninstallTest.php
index 13cbb42287..71af212568 100644
--- a/web/core/modules/book/tests/src/Kernel/BookUninstallTest.php
+++ b/web/core/modules/book/tests/src/Kernel/BookUninstallTest.php
@@ -18,7 +18,15 @@ class BookUninstallTest extends KernelTestBase {
*
* @var array
*/
- public static $modules = ['system', 'user', 'field', 'filter', 'text', 'node', 'book'];
+ public static $modules = [
+ 'system',
+ 'user',
+ 'field',
+ 'filter',
+ 'text',
+ 'node',
+ 'book',
+ ];
/**
* {@inheritdoc}
diff --git a/web/core/modules/breakpoint/breakpoint.info.yml b/web/core/modules/breakpoint/breakpoint.info.yml
index 256740c02f..07065f7023 100644
--- a/web/core/modules/breakpoint/breakpoint.info.yml
+++ b/web/core/modules/breakpoint/breakpoint.info.yml
@@ -1,6 +1,6 @@
name: Breakpoint
type: module
-description: 'Manage breakpoints and breakpoint groups for responsive designs.'
+description: 'Manages breakpoints and breakpoint groups for responsive designs.'
package: Core
version: VERSION
core: 8.x
diff --git a/web/core/modules/ckeditor/js/ckeditor.admin.es6.js b/web/core/modules/ckeditor/js/ckeditor.admin.es6.js
index b4c2d217cd..3836a5bb39 100644
--- a/web/core/modules/ckeditor/js/ckeditor.admin.es6.js
+++ b/web/core/modules/ckeditor/js/ckeditor.admin.es6.js
@@ -7,14 +7,14 @@
Drupal.ckeditor = Drupal.ckeditor || {};
/**
- * Sets config behaviour and creates config views for the CKEditor toolbar.
+ * Sets config behavior and creates config views for the CKEditor toolbar.
*
* @type {Drupal~behavior}
*
* @prop {Drupal~behaviorAttach} attach
- * Attaches admin behaviour to the CKEditor buttons.
+ * Attaches admin behavior to the CKEditor buttons.
* @prop {Drupal~behaviorDetach} detach
- * Detaches admin behaviour from the CKEditor buttons on 'unload'.
+ * Detaches admin behavior from the CKEditor buttons on 'unload'.
*/
Drupal.behaviors.ckeditorAdmin = {
attach(context) {
@@ -412,7 +412,7 @@
* @type {Drupal~behavior}
*
* @prop {Drupal~behaviorAttach} attach
- * Attaches show/hide behaviour to Plugin Settings buttons.
+ * Attaches show/hide behavior to Plugin Settings buttons.
*/
Drupal.behaviors.ckeditorAdminButtonPluginSettings = {
attach(context) {
diff --git a/web/core/modules/ckeditor/js/ckeditor.drupalimage.admin.es6.js b/web/core/modules/ckeditor/js/ckeditor.drupalimage.admin.es6.js
index 557379436d..b07267efec 100644
--- a/web/core/modules/ckeditor/js/ckeditor.drupalimage.admin.es6.js
+++ b/web/core/modules/ckeditor/js/ckeditor.drupalimage.admin.es6.js
@@ -10,7 +10,7 @@
* @type {Drupal~behavior}
*
* @prop {Drupal~behaviorAttach} attach
- * Attaches summary behaviour to the "drupalimage" settings vertical tab.
+ * Attaches summary behavior to the "drupalimage" settings vertical tab.
*/
Drupal.behaviors.ckeditorDrupalImageSettingsSummary = {
attach() {
diff --git a/web/core/modules/ckeditor/js/ckeditor.es6.js b/web/core/modules/ckeditor/js/ckeditor.es6.js
index 7f725dbabd..5f193f60d0 100644
--- a/web/core/modules/ckeditor/js/ckeditor.es6.js
+++ b/web/core/modules/ckeditor/js/ckeditor.es6.js
@@ -346,6 +346,9 @@
// Set autoGrow to make the editor grow the moment it is created.
CKEDITOR.config.autoGrow_onStartup = true;
+ // Default max height. Will be updated as the viewport changes.
+ CKEDITOR.config.autoGrow_maxHeight = 0.7 * window.innerHeight;
+
// Set the CKEditor cache-busting string to the same value as Drupal.
CKEDITOR.timestamp = drupalSettings.ckeditor.timestamp;
diff --git a/web/core/modules/ckeditor/js/ckeditor.js b/web/core/modules/ckeditor/js/ckeditor.js
index cc12d7389e..227b3024a5 100644
--- a/web/core/modules/ckeditor/js/ckeditor.js
+++ b/web/core/modules/ckeditor/js/ckeditor.js
@@ -193,6 +193,8 @@
CKEDITOR.config.autoGrow_onStartup = true;
+ CKEDITOR.config.autoGrow_maxHeight = 0.7 * window.innerHeight;
+
CKEDITOR.timestamp = drupalSettings.ckeditor.timestamp;
if (AjaxCommands) {
diff --git a/web/core/modules/ckeditor/js/ckeditor.off-canvas-css-reset.es6.js b/web/core/modules/ckeditor/js/ckeditor.off-canvas-css-reset.es6.js
index e1d0324a44..bb47444802 100644
--- a/web/core/modules/ckeditor/js/ckeditor.off-canvas-css-reset.es6.js
+++ b/web/core/modules/ckeditor/js/ckeditor.off-canvas-css-reset.es6.js
@@ -94,6 +94,11 @@
editorCssPath.indexOf(CKEDITOR.timestamp) !== -1 &&
dialogCssPath.indexOf(CKEDITOR.timestamp) !== -1
) {
+ Object.keys(window.localStorage).forEach(key => {
+ if (key.indexOf('Drupal.off-canvas.css.') === 0) {
+ window.localStorage.removeItem(key);
+ }
+ });
window.localStorage.setItem(
`Drupal.off-canvas.css.${editorCssPath}${dialogCssPath}`,
cssToInsert,
diff --git a/web/core/modules/ckeditor/js/ckeditor.off-canvas-css-reset.js b/web/core/modules/ckeditor/js/ckeditor.off-canvas-css-reset.js
index c0738bb08f..2299c160e9 100644
--- a/web/core/modules/ckeditor/js/ckeditor.off-canvas-css-reset.js
+++ b/web/core/modules/ckeditor/js/ckeditor.off-canvas-css-reset.js
@@ -44,6 +44,11 @@
insertCss(cssToInsert);
if (CKEDITOR.timestamp && editorCssPath.indexOf(CKEDITOR.timestamp) !== -1 && dialogCssPath.indexOf(CKEDITOR.timestamp) !== -1) {
+ Object.keys(window.localStorage).forEach(function (key) {
+ if (key.indexOf('Drupal.off-canvas.css.') === 0) {
+ window.localStorage.removeItem(key);
+ }
+ });
window.localStorage.setItem('Drupal.off-canvas.css.' + editorCssPath + dialogCssPath, cssToInsert);
}
});
diff --git a/web/core/modules/ckeditor/js/ckeditor.stylescombo.admin.es6.js b/web/core/modules/ckeditor/js/ckeditor.stylescombo.admin.es6.js
index b87e6b3186..48f175db72 100644
--- a/web/core/modules/ckeditor/js/ckeditor.stylescombo.admin.es6.js
+++ b/web/core/modules/ckeditor/js/ckeditor.stylescombo.admin.es6.js
@@ -15,7 +15,7 @@
* @type {Drupal~behavior}
*
* @prop {Drupal~behaviorAttach} attach
- * Attaches admin behaviour to the "stylescombo" button.
+ * Attaches admin behavior to the "stylescombo" button.
*/
Drupal.behaviors.ckeditorStylesComboSettings = {
attach(context) {
@@ -110,7 +110,7 @@
* @type {Drupal~behavior}
*
* @prop {Drupal~behaviorAttach} attach
- * Attaches summary behaviour to the plugin settings vertical tab.
+ * Attaches summary behavior to the plugin settings vertical tab.
*/
Drupal.behaviors.ckeditorStylesComboSettingsSummary = {
attach() {
diff --git a/web/core/modules/ckeditor/js/plugins/drupalimage/plugin.es6.js b/web/core/modules/ckeditor/js/plugins/drupalimage/plugin.es6.js
index 88add4f4ba..3b19c02591 100644
--- a/web/core/modules/ckeditor/js/plugins/drupalimage/plugin.es6.js
+++ b/web/core/modules/ckeditor/js/plugins/drupalimage/plugin.es6.js
@@ -49,7 +49,7 @@
CKEDITOR.plugins.drupallink.registerLinkableWidget('image');
- // Override default behaviour of 'drupalunlink' command.
+ // Override default behavior of 'drupalunlink' command.
editor.getCommand('drupalunlink').on('exec', function(evt) {
const widget = getFocusedWidget(editor);
diff --git a/web/core/modules/ckeditor/js/views/KeyboardView.es6.js b/web/core/modules/ckeditor/js/views/KeyboardView.es6.js
index 4c9aead869..9d27539072 100644
--- a/web/core/modules/ckeditor/js/views/KeyboardView.es6.js
+++ b/web/core/modules/ckeditor/js/views/KeyboardView.es6.js
@@ -28,7 +28,7 @@
},
/**
- * @inheritdoc
+ * {@inheritdoc}
*/
render() {},
diff --git a/web/core/modules/ckeditor/src/Plugin/CKEditorPlugin/Internal.php b/web/core/modules/ckeditor/src/Plugin/CKEditorPlugin/Internal.php
index ec286a68ec..cd33f51514 100644
--- a/web/core/modules/ckeditor/src/Plugin/CKEditorPlugin/Internal.php
+++ b/web/core/modules/ckeditor/src/Plugin/CKEditorPlugin/Internal.php
@@ -349,7 +349,7 @@ public function getButtons() {
*/
protected function generateFormatTagsSetting(Editor $editor) {
// When no text format is associated yet, assume no tag is allowed.
- // @see \Drupal\Editor\EditorInterface::hasAssociatedFilterFormat()
+ // @see \Drupal\editor\EditorInterface::hasAssociatedFilterFormat()
if (!$editor->hasAssociatedFilterFormat()) {
return [];
}
diff --git a/web/core/modules/ckeditor/src/Plugin/CKEditorPlugin/Language.php b/web/core/modules/ckeditor/src/Plugin/CKEditorPlugin/Language.php
index 0cc6b58e69..8b9afe2014 100644
--- a/web/core/modules/ckeditor/src/Plugin/CKEditorPlugin/Language.php
+++ b/web/core/modules/ckeditor/src/Plugin/CKEditorPlugin/Language.php
@@ -81,12 +81,13 @@ public function getConfig(Editor $editor) {
* {@inheritdoc}
*/
public function getButtons() {
+ $label = $this->t('Language');
return [
'Language' => [
- 'label' => $this->t('Language'),
+ 'label' => $label,
'image_alternative' => [
'#type' => 'inline_template',
- '#template' => '<a href="#" class="cke-icon-only" role="button" title="' . $this->t('Language') . '" aria-label="' . $this->t('Language') . '"><span class="cke_button_icon cke_button__language_icon">' . $this->t('Language') . '</span></a>',
+ '#template' => '<a href="#" class="cke-icon-only" role="button" title="' . $label . '" aria-label="' . $label . '"><span class="cke_button_icon cke_button__language_icon">' . $label . '</span></a>',
],
],
];
diff --git a/web/core/modules/ckeditor/tests/src/Functional/CKEditorAdminTest.php b/web/core/modules/ckeditor/tests/src/Functional/CKEditorAdminTest.php
index 26b71553ec..e5c6dc39cc 100644
--- a/web/core/modules/ckeditor/tests/src/Functional/CKEditorAdminTest.php
+++ b/web/core/modules/ckeditor/tests/src/Functional/CKEditorAdminTest.php
@@ -141,7 +141,7 @@ public function testExistingFormat() {
// Ensure the styles textarea exists and is initialized empty.
$styles_textarea = $this->xpath('//textarea[@name="editor[settings][plugins][stylescombo][styles]"]');
$this->assertFieldByXPath('//textarea[@name="editor[settings][plugins][stylescombo][styles]"]', '', 'The styles textarea exists and is empty.');
- $this->assertTrue(count($styles_textarea) === 1, 'The "styles" textarea exists.');
+ $this->assertCount(1, $styles_textarea, 'The "styles" textarea exists.');
// Submit the form to save the selection of CKEditor as the chosen editor.
$this->drupalPostForm(NULL, $edit, t('Save configuration'));
@@ -150,7 +150,7 @@ public function testExistingFormat() {
$expected_settings = $expected_default_settings;
$expected_settings['plugins']['stylescombo']['styles'] = '';
$editor = Editor::load('filtered_html');
- $this->assertTrue($editor instanceof Editor, 'An Editor config entity exists now.');
+ $this->assertInstanceOf(Editor::class, $editor);
$this->assertEqual($expected_settings, $editor->getSettings(), 'The Editor config entity has the correct settings.');
// Configure the Styles plugin, and ensure the updated settings are saved.
@@ -161,7 +161,7 @@ public function testExistingFormat() {
$this->drupalPostForm(NULL, $edit, t('Save configuration'));
$expected_settings['plugins']['stylescombo']['styles'] = "h1.title|Title\np.callout|Callout\n\n";
$editor = Editor::load('filtered_html');
- $this->assertTrue($editor instanceof Editor, 'An Editor config entity exists.');
+ $this->assertInstanceOf(Editor::class, $editor);
$this->assertEqual($expected_settings, $editor->getSettings(), 'The Editor config entity has the correct settings.');
// Change the buttons that appear on the toolbar (in JavaScript, this is
@@ -177,7 +177,7 @@ public function testExistingFormat() {
];
$this->drupalPostForm(NULL, $edit, t('Save configuration'));
$editor = Editor::load('filtered_html');
- $this->assertTrue($editor instanceof Editor, 'An Editor config entity exists.');
+ $this->assertInstanceOf(Editor::class, $editor);
$this->assertEqual($expected_settings, $editor->getSettings(), 'The Editor config entity has the correct settings.');
// Check that the markup we're setting for the toolbar buttons (actually in
@@ -203,9 +203,9 @@ public function testExistingFormat() {
$this->container->get('plugin.manager.ckeditor.plugin')->clearCachedDefinitions();
$this->drupalGet('admin/config/content/formats/manage/filtered_html');
$ultra_llama_mode_checkbox = $this->xpath('//input[@type="checkbox" and @name="editor[settings][plugins][llama_contextual_and_button][ultra_llama_mode]" and not(@checked)]');
- $this->assertTrue(count($ultra_llama_mode_checkbox) === 1, 'The "Ultra llama mode" checkbox exists and is not checked.');
+ $this->assertCount(1, $ultra_llama_mode_checkbox, 'The "Ultra llama mode" checkbox exists and is not checked.');
$editor = Editor::load('filtered_html');
- $this->assertTrue($editor instanceof Editor, 'An Editor config entity exists.');
+ $this->assertInstanceOf(Editor::class, $editor);
$this->assertEqual($expected_settings, $editor->getSettings(), 'The Editor config entity has the correct settings.');
// Finally, check the "Ultra llama mode" checkbox.
@@ -216,10 +216,10 @@ public function testExistingFormat() {
$this->drupalPostForm(NULL, $edit, t('Save configuration'));
$this->drupalGet('admin/config/content/formats/manage/filtered_html');
$ultra_llama_mode_checkbox = $this->xpath('//input[@type="checkbox" and @name="editor[settings][plugins][llama_contextual_and_button][ultra_llama_mode]" and @checked="checked"]');
- $this->assertTrue(count($ultra_llama_mode_checkbox) === 1, 'The "Ultra llama mode" checkbox exists and is checked.');
+ $this->assertCount(1, $ultra_llama_mode_checkbox, 'The "Ultra llama mode" checkbox exists and is checked.');
$expected_settings['plugins']['llama_contextual_and_button']['ultra_llama_mode'] = TRUE;
$editor = Editor::load('filtered_html');
- $this->assertTrue($editor instanceof Editor, 'An Editor config entity exists.');
+ $this->assertInstanceOf(Editor::class, $editor);
$this->assertEqual($expected_settings, $editor->getSettings());
$this->drupalGet('admin/config/content/formats/add');
@@ -232,7 +232,7 @@ public function testExistingFormat() {
];
$this->submitForm($edit, 'editor_configure');
$this->submitForm($edit, 'Save configuration');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertText('The machine-readable name is already in use. It must be unique.');
}
@@ -280,12 +280,12 @@ public function testNewFormat() {
// Regression test for https://www.drupal.org/node/2606460.
$settings = $this->getDrupalSettings();
$expected = $settings['ckeditor']['toolbarAdmin'];
- $this->assertTrue(strpos($expected, '<li data-drupal-ckeditor-button-name="Bold" class="ckeditor-button"><a href="#" class="cke-icon-only cke_ltr" role="button" title="bold" aria-label="bold"><span class="cke_button_icon cke_button__bold_icon">bold</span></a></li>') !== FALSE);
+ $this->assertStringContainsString('<li data-drupal-ckeditor-button-name="Bold" class="ckeditor-button"><a href="#" class="cke-icon-only cke_ltr" role="button" title="bold" aria-label="bold"><span class="cke_button_icon cke_button__bold_icon">bold</span></a></li>', $expected);
// Ensure the styles textarea exists and is initialized empty.
$styles_textarea = $this->xpath('//textarea[@name="editor[settings][plugins][stylescombo][styles]"]');
$this->assertFieldByXPath('//textarea[@name="editor[settings][plugins][stylescombo][styles]"]', '', 'The styles textarea exists and is empty.');
- $this->assertTrue(count($styles_textarea) === 1, 'The "styles" textarea exists.');
+ $this->assertCount(1, $styles_textarea, 'The "styles" textarea exists.');
// Submit the form to create both a new text format and an associated text
// editor.
@@ -293,13 +293,13 @@ public function testNewFormat() {
// Ensure a FilterFormat object exists now.
$filter_format = FilterFormat::load('amazing_format');
- $this->assertTrue($filter_format instanceof FilterFormatInterface, 'A FilterFormat config entity exists now.');
+ $this->assertInstanceOf(FilterFormatInterface::class, $filter_format);
// Ensure an Editor object exists now, with the proper settings.
$expected_settings = $default_settings;
$expected_settings['plugins']['stylescombo']['styles'] = '';
$editor = Editor::load('amazing_format');
- $this->assertTrue($editor instanceof Editor, 'An Editor config entity exists now.');
+ $this->assertInstanceOf(Editor::class, $editor);
$this->assertEqual($this->castSafeStrings($expected_settings), $this->castSafeStrings($editor->getSettings()), 'The Editor config entity has the correct settings.');
}
diff --git a/web/core/modules/ckeditor/tests/src/Functional/CKEditorLoadingTest.php b/web/core/modules/ckeditor/tests/src/Functional/CKEditorLoadingTest.php
index 7190838348..c43280cbcb 100644
--- a/web/core/modules/ckeditor/tests/src/Functional/CKEditorLoadingTest.php
+++ b/web/core/modules/ckeditor/tests/src/Functional/CKEditorLoadingTest.php
@@ -88,10 +88,10 @@ public function testLoading() {
list($settings, $editor_settings_present, $editor_js_present, $body, $format_selector) = $this->getThingsToCheck();
$this->assertFalse($editor_settings_present, 'No Text Editor module settings.');
$this->assertFalse($editor_js_present, 'No Text Editor JavaScript.');
- $this->assertTrue(count($body) === 1, 'A body field exists.');
- $this->assertTrue(count($format_selector) === 0, 'No text format selector exists on the page.');
+ $this->assertCount(1, $body, 'A body field exists.');
+ $this->assertCount(0, $format_selector, 'No text format selector exists on the page.');
$hidden_input = $this->xpath('//input[@type="hidden" and contains(@class, "editor")]');
- $this->assertTrue(count($hidden_input) === 0, 'A single text format hidden input does not exist on the page.');
+ $this->assertCount(0, $hidden_input, 'A single text format hidden input does not exist on the page.');
$this->assertNoRaw(drupal_get_path('module', 'ckeditor') . '/js/ckeditor.js', 'CKEditor glue JS is absent.');
// On pages where there would never be a text editor, CKEditor JS is absent.
@@ -120,11 +120,11 @@ public function testLoading() {
$this->assertTrue($editor_settings_present, "Text Editor module's JavaScript settings are on the page.");
$this->assertIdentical($expected, $this->castSafeStrings($settings['editor']), "Text Editor module's JavaScript settings on the page are correct.");
$this->assertTrue($editor_js_present, 'Text Editor JavaScript is present.');
- $this->assertTrue(count($body) === 1, 'A body field exists.');
- $this->assertTrue(count($format_selector) === 1, 'A single text format selector exists on the page.');
+ $this->assertCount(1, $body, 'A body field exists.');
+ $this->assertCount(1, $format_selector, 'A single text format selector exists on the page.');
$specific_format_selector = $this->xpath('//select[contains(@class, "filter-list") and @data-editor-for="edit-body-0-value"]');
- $this->assertTrue(count($specific_format_selector) === 1, 'A single text format selector exists on the page and has a "data-editor-for" attribute with the correct value.');
- $this->assertTrue(in_array('ckeditor/drupal.ckeditor', explode(',', $settings['ajaxPageState']['libraries'])), 'CKEditor glue library is present.');
+ $this->assertCount(1, $specific_format_selector, 'A single text format selector exists on the page and has a "data-editor-for" attribute with the correct value.');
+ $this->assertContains('ckeditor/drupal.ckeditor', explode(',', $settings['ajaxPageState']['libraries']), 'CKEditor glue library is present.');
// Enable the ckeditor_test module, customize configuration. In this case,
// there is additional CSS and JS to be loaded.
@@ -153,7 +153,7 @@ public function testLoading() {
$this->assertTrue($editor_settings_present, "Text Editor module's JavaScript settings are on the page.");
$this->assertIdentical($expected, $this->castSafeStrings($settings['editor']), "Text Editor module's JavaScript settings on the page are correct.");
$this->assertTrue($editor_js_present, 'Text Editor JavaScript is present.');
- $this->assertTrue(in_array('ckeditor/drupal.ckeditor', explode(',', $settings['ajaxPageState']['libraries'])), 'CKEditor glue library is present.');
+ $this->assertContains('ckeditor/drupal.ckeditor', explode(',', $settings['ajaxPageState']['libraries']), 'CKEditor glue library is present.');
// Assert that CKEditor uses Drupal's cache-busting query string by
// comparing the setting sent with the page with the current query string.
diff --git a/web/core/modules/ckeditor/tests/src/FunctionalJavascript/CKEditorIntegrationTest.php b/web/core/modules/ckeditor/tests/src/FunctionalJavascript/CKEditorIntegrationTest.php
index 2a66b65ca2..b9c6666861 100644
--- a/web/core/modules/ckeditor/tests/src/FunctionalJavascript/CKEditorIntegrationTest.php
+++ b/web/core/modules/ckeditor/tests/src/FunctionalJavascript/CKEditorIntegrationTest.php
@@ -211,6 +211,27 @@ public function testOffCanvasStyles() {
$assert_session->elementExists('css', '.cke_button__source');
$ckeditor_source_button_bg_color = $this->getSession()->evaluateScript('window.getComputedStyle(document.getElementsByClassName(\'cke_button__source\')[0]).backgroundColor');
$this->assertEqual($ckeditor_source_button_bg_color, 'rgba(0, 0, 0, 0)');
+
+ // Check that only one off-canvas style is cached in local storage and that
+ // it gets updated with the cache-busting query string.
+ $get_cache_keys = 'Object.keys(window.localStorage).filter(function (i) {return i.indexOf(\'Drupal.off-canvas.css.\') === 0})';
+ $old_keys = $this->getSession()->evaluateScript($get_cache_keys);
+ // Flush the caches to ensure the new timestamp is altered into the
+ // drupal.ckeditor library's javascript settings.
+ drupal_flush_all_caches();
+ // Normally flushing caches regenerates the cache busting query string, but
+ // as it's based on the request time, it won't change within this test so
+ // explicitly set it.
+ \Drupal::state()->set('system.css_js_query_string', '0');
+ $this->drupalGet('/ckeditor_test/off_canvas');
+ $page->clickLink('Add Node');
+ $assert_session->waitForElementVisible('css', '#drupal-off-canvas');
+ $assert_session->assertWaitOnAjaxRequest();
+ $new_keys = $this->getSession()->evaluateScript($get_cache_keys);
+
+ $this->assertCount(1, $old_keys, 'Only one off-canvas style was cached before clearing caches.');
+ $this->assertCount(1, $new_keys, 'Only one off-canvas style was cached after clearing caches.');
+ $this->assertNotEquals($old_keys, $new_keys, 'Clearing caches changed the off-canvas style cache key.');
}
}
diff --git a/web/core/modules/ckeditor/tests/src/Kernel/CKEditorTest.php b/web/core/modules/ckeditor/tests/src/Kernel/CKEditorTest.php
index 47b3ca5685..4dc8f3a8c6 100644
--- a/web/core/modules/ckeditor/tests/src/Kernel/CKEditorTest.php
+++ b/web/core/modules/ckeditor/tests/src/Kernel/CKEditorTest.php
@@ -20,7 +20,14 @@ class CKEditorTest extends KernelTestBase {
*
* @var array
*/
- public static $modules = ['system', 'user', 'filter', 'editor', 'ckeditor', 'filter_test'];
+ public static $modules = [
+ 'system',
+ 'user',
+ 'filter',
+ 'editor',
+ 'ckeditor',
+ 'filter_test',
+ ];
/**
* An instance of the "CKEditor" text editor plugin.
@@ -282,6 +289,7 @@ public function testBuildContentsCssJSSetting() {
$expected[] = file_url_transform_relative(file_create_url('core/themes/bartik/css/components/captions.css')) . $query_string;
$expected[] = file_url_transform_relative(file_create_url('core/themes/bartik/css/components/table.css')) . $query_string;
$expected[] = file_url_transform_relative(file_create_url('core/themes/bartik/css/components/text-formatted.css')) . $query_string;
+ $expected[] = file_url_transform_relative(file_create_url('core/themes/bartik/css/classy/components/media-embed-error.css')) . $query_string;
$this->assertIdentical($expected, $this->ckeditor->buildContentsCssJSSetting($editor), '"contentsCss" configuration part of JS settings built correctly while a theme providing a CKEditor stylesheet exists.');
}
diff --git a/web/core/modules/ckeditor/tests/src/Unit/Plugin/CKEditorPlugin/LanguageTest.php b/web/core/modules/ckeditor/tests/src/Unit/Plugin/CKEditorPlugin/LanguageTest.php
index 3b18c67e79..d115f33ae3 100644
--- a/web/core/modules/ckeditor/tests/src/Unit/Plugin/CKEditorPlugin/LanguageTest.php
+++ b/web/core/modules/ckeditor/tests/src/Unit/Plugin/CKEditorPlugin/LanguageTest.php
@@ -52,13 +52,13 @@ public function testGetConfig($language_list, $expected_number) {
$config = $this->plugin->getConfig($editor);
- $this->assertInternalType('array', $config);
- $this->assertTrue(in_array('ar:Arabic:rtl', $config['language_list']));
- $this->assertTrue(in_array('zh-hans:Chinese, Simplified', $config['language_list']));
- $this->assertTrue(in_array('en:English', $config['language_list']));
- $this->assertTrue(in_array('fr:French', $config['language_list']));
- $this->assertTrue(in_array('ru:Russian', $config['language_list']));
- $this->assertTrue(in_array('ar:Arabic:rtl', $config['language_list']));
+ $this->assertIsArray($config);
+ $this->assertContains('ar:Arabic:rtl', $config['language_list']);
+ $this->assertContains('zh-hans:Chinese, Simplified', $config['language_list']);
+ $this->assertContains('en:English', $config['language_list']);
+ $this->assertContains('fr:French', $config['language_list']);
+ $this->assertContains('ru:Russian', $config['language_list']);
+ $this->assertContains('ar:Arabic:rtl', $config['language_list']);
$this->assertEquals($expected_number, count($config['language_list']));
}
diff --git a/web/core/modules/color/color.info.yml b/web/core/modules/color/color.info.yml
index 9ea6daf6b5..ba27bf60f1 100644
--- a/web/core/modules/color/color.info.yml
+++ b/web/core/modules/color/color.info.yml
@@ -1,6 +1,6 @@
name: Color
type: module
-description: 'Allows administrators to change the color scheme of compatible themes.'
+description: 'Allows users to change the color scheme of compatible themes.'
package: Core
version: VERSION
core: 8.x
diff --git a/web/core/modules/color/color.module b/web/core/modules/color/color.module
index 3ae1030203..b141114583 100644
--- a/web/core/modules/color/color.module
+++ b/web/core/modules/color/color.module
@@ -347,7 +347,7 @@ function color_palette_color_value($element, $input, FormStateInterface $form_st
* isn't.
*/
function color_valid_hexadecimal_string($color) {
- return preg_match('/^#([a-f0-9]{3}){1,2}$/iD', $color);
+ return (bool) preg_match('/^#([a-f0-9]{3}){1,2}$/iD', $color);
}
/**
diff --git a/web/core/modules/color/preview.es6.js b/web/core/modules/color/preview.es6.js
index f681dbebca..ec1da65a70 100644
--- a/web/core/modules/color/preview.es6.js
+++ b/web/core/modules/color/preview.es6.js
@@ -14,11 +14,11 @@
* The callback for when the color preview has been attached.
*
* @param {Element} context
- * The context to initiate the color behaviour.
+ * The context to initiate the color behavior.
* @param {object} settings
* Settings for the color functionality.
* @param {HTMLFormElement} form
- * The form to initiate the color behaviour on.
+ * The form to initiate the color behavior on.
* @param {object} farb
* The farbtastic object.
* @param {number} height
@@ -65,18 +65,14 @@
colorStart = farb.unpack(
form
.find(
- `.color-palette input[name="palette[${
- settings.gradients[i].colors[0]
- }]"]`,
+ `.color-palette input[name="palette[${settings.gradients[i].colors[0]}]"]`,
)
.val(),
);
colorEnd = farb.unpack(
form
.find(
- `.color-palette input[name="palette[${
- settings.gradients[i].colors[1]
- }]"]`,
+ `.color-palette input[name="palette[${settings.gradients[i].colors[1]}]"]`,
)
.val(),
);
diff --git a/web/core/modules/color/tests/src/Functional/ColorTest.php b/web/core/modules/color/tests/src/Functional/ColorTest.php
index caaa2c9fee..ba27a91712 100644
--- a/web/core/modules/color/tests/src/Functional/ColorTest.php
+++ b/web/core/modules/color/tests/src/Functional/ColorTest.php
@@ -112,7 +112,7 @@ public function _testColor($theme, $test_values) {
$this->drupalLogin($this->bigUser);
$this->drupalGet($settings_path);
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertUniqueText('Color set');
$edit['scheme'] = '';
$edit[$test_values['palette_input']] = '#123456';
@@ -123,11 +123,11 @@ public function _testColor($theme, $test_values) {
foreach ($stylesheets as $stylesheet) {
$this->assertPattern('|' . file_url_transform_relative(file_create_url($stylesheet)) . '|', 'Make sure the color stylesheet is included in the content. (' . $theme . ')');
$stylesheet_content = implode("\n", file($stylesheet));
- $this->assertTrue(strpos($stylesheet_content, 'color: #123456') !== FALSE, 'Make sure the color we changed is in the color stylesheet. (' . $theme . ')');
+ $this->assertStringContainsString('color: #123456', $stylesheet_content, 'Make sure the color we changed is in the color stylesheet. (' . $theme . ')');
}
$this->drupalGet($settings_path);
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$edit['scheme'] = $test_values['scheme'];
$this->drupalPostForm($settings_path, $edit, t('Save configuration'));
@@ -135,7 +135,7 @@ public function _testColor($theme, $test_values) {
$stylesheets = $this->config('color.theme.' . $theme)->get('stylesheets');
foreach ($stylesheets as $stylesheet) {
$stylesheet_content = implode("\n", file($stylesheet));
- $this->assertTrue(strpos($stylesheet_content, 'color: ' . $test_values['scheme_color']) !== FALSE, 'Make sure the color we changed is in the color stylesheet. (' . $theme . ')');
+ $this->assertStringContainsString('color: ' . $test_values['scheme_color'], $stylesheet_content, 'Make sure the color we changed is in the color stylesheet. (' . $theme . ')');
}
// Test with aggregated CSS turned on.
@@ -148,7 +148,7 @@ public function _testColor($theme, $test_values) {
foreach ($stylesheets as $uri) {
$stylesheet_content .= implode("\n", file(\Drupal::service('file_system')->realpath($uri)));
}
- $this->assertTrue(strpos($stylesheet_content, 'public://') === FALSE, 'Make sure the color paths have been translated to local paths. (' . $theme . ')');
+ $this->assertStringNotContainsString('public://', $stylesheet_content, 'Make sure the color paths have been translated to local paths. (' . $theme . ')');
$config->set('css.preprocess', 0);
$config->save();
}
diff --git a/web/core/modules/comment/comment.info.yml b/web/core/modules/comment/comment.info.yml
index b552cf17bf..81401d4daf 100644
--- a/web/core/modules/comment/comment.info.yml
+++ b/web/core/modules/comment/comment.info.yml
@@ -1,6 +1,6 @@
name: Comment
type: module
-description: 'Allows users to comment on and discuss published content.'
+description: 'Allows users to comment on content.'
package: Core
version: VERSION
core: 8.x
diff --git a/web/core/modules/comment/js/comment-new-indicator.es6.js b/web/core/modules/comment/js/comment-new-indicator.es6.js
index 9ae82461c8..38647ed0eb 100644
--- a/web/core/modules/comment/js/comment-new-indicator.es6.js
+++ b/web/core/modules/comment/js/comment-new-indicator.es6.js
@@ -41,7 +41,7 @@
// this is the first new comment in the DOM.
if (isFirstNewComment) {
isFirstNewComment = false;
- $comment.prev().before('<a id="new" />');
+ $comment.prev().before('<a id="new"></a>');
// If the URL points to the first new comment, then scroll to that
// comment.
if (window.location.hash === '#new') {
diff --git a/web/core/modules/comment/js/comment-new-indicator.js b/web/core/modules/comment/js/comment-new-indicator.js
index 88587d5724..a9c2e451e2 100644
--- a/web/core/modules/comment/js/comment-new-indicator.js
+++ b/web/core/modules/comment/js/comment-new-indicator.js
@@ -23,7 +23,7 @@
if (isFirstNewComment) {
isFirstNewComment = false;
- $comment.prev().before('<a id="new" />');
+ $comment.prev().before('<a id="new"></a>');
if (window.location.hash === '#new') {
window.scrollTo(0, $comment.offset().top - Drupal.displace.offsets.top);
diff --git a/web/core/modules/comment/migrations/d6_comment.yml b/web/core/modules/comment/migrations/d6_comment.yml
index e6b4e1295f..7f8e727aa4 100644
--- a/web/core/modules/comment/migrations/d6_comment.yml
+++ b/web/core/modules/comment/migrations/d6_comment.yml
@@ -24,9 +24,12 @@ process:
-
plugin: migration_lookup
migration:
+ - d6_node_complete
- d6_node
- d6_node_translation
source: nid
+ -
+ plugin: node_complete_node_lookup
-
plugin: skip_on_empty
method: row
diff --git a/web/core/modules/comment/migrations/d7_comment.yml b/web/core/modules/comment/migrations/d7_comment.yml
index eafa8e36ec..a27523f565 100644
--- a/web/core/modules/comment/migrations/d7_comment.yml
+++ b/web/core/modules/comment/migrations/d7_comment.yml
@@ -25,9 +25,12 @@ process:
-
plugin: migration_lookup
migration:
+ - d7_node_complete
- d7_node
- d7_node_translation
source: nid
+ -
+ plugin: node_complete_node_lookup
-
plugin: skip_on_empty
method: row
diff --git a/web/core/modules/comment/src/Plugin/views/field/NodeNewComments.php b/web/core/modules/comment/src/Plugin/views/field/NodeNewComments.php
index b1a3de16f4..0117da0a23 100644
--- a/web/core/modules/comment/src/Plugin/views/field/NodeNewComments.php
+++ b/web/core/modules/comment/src/Plugin/views/field/NodeNewComments.php
@@ -71,11 +71,11 @@ public function __construct(array $configuration, $plugin_id, $plugin_definition
parent::__construct($configuration, $plugin_id, $plugin_definition);
$this->database = $database;
if (!$entity_type_manager) {
- @trigger_error("Not passing the entity type manager to the NodeNewComments constructor is deprecated in drupal:8.8.0 and will be required in drupal 9.0.0. @see https://www.drupal.org/node/3047897");
+ @trigger_error("Not passing the entity type manager to the NodeNewComments constructor is deprecated in drupal:8.8.0 and will be required in drupal:9.0.0. @see https://www.drupal.org/node/3047897", E_USER_DEPRECATED);
$entity_type_manager = \Drupal::entityTypeManager();
}
if (!$entity_field_manager) {
- @trigger_error("Not passing the entity type manager to the NodeNewComments constructor is deprecated in drupal:8.8.0 and will be required in drupal 9.0.0. @see https://www.drupal.org/node/3047897");
+ @trigger_error("Not passing the entity type manager to the NodeNewComments constructor is deprecated in drupal:8.8.0 and will be required in drupal:9.0.0. @see https://www.drupal.org/node/3047897", E_USER_DEPRECATED);
$entity_field_manager = \Drupal::service('entity_field.manager');
}
$this->entityTypeManager = $entity_type_manager;
diff --git a/web/core/modules/comment/src/Tests/CommentTestBase.php b/web/core/modules/comment/src/Tests/CommentTestBase.php
index 38096bbd71..7b743766c8 100644
--- a/web/core/modules/comment/src/Tests/CommentTestBase.php
+++ b/web/core/modules/comment/src/Tests/CommentTestBase.php
@@ -30,7 +30,14 @@ abstract class CommentTestBase extends WebTestBase {
*
* @var array
*/
- public static $modules = ['block', 'comment', 'node', 'history', 'field_ui', 'datetime'];
+ public static $modules = [
+ 'block',
+ 'comment',
+ 'node',
+ 'history',
+ 'field_ui',
+ 'datetime',
+ ];
/**
* An administrative user with permission to configure comment settings.
diff --git a/web/core/modules/comment/tests/src/Functional/CommentAdminTest.php b/web/core/modules/comment/tests/src/Functional/CommentAdminTest.php
index 47a3c6494a..637eda18fd 100644
--- a/web/core/modules/comment/tests/src/Functional/CommentAdminTest.php
+++ b/web/core/modules/comment/tests/src/Functional/CommentAdminTest.php
@@ -156,12 +156,14 @@ public function testApprovalNodeInterface() {
$this->assertFalse($this->commentExists($anonymous_comment4), 'Anonymous comment was not published.');
- // Approve comment.
+ // Ensure comments cannot be approved without a valid token.
$this->drupalLogin($this->adminUser);
$this->drupalGet('comment/1/approve');
- $this->assertResponse(403, 'Forged comment approval was denied.');
+ $this->assertSession()->statusCodeEquals(403);
$this->drupalGet('comment/1/approve', ['query' => ['token' => 'forged']]);
- $this->assertResponse(403, 'Forged comment approval was denied.');
+ $this->assertSession()->statusCodeEquals(403);
+
+ // Approve comment.
$this->drupalGet('comment/1/edit');
$this->assertFieldChecked('edit-status-0');
$this->drupalGet('node/' . $this->node->id());
@@ -180,7 +182,7 @@ public function testCommentAdmin() {
$this->drupalLogin($this->adminUser);
// Browse to comment bundle overview.
$this->drupalGet('admin/structure/comment');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Make sure titles visible.
$this->assertText('Comment type');
$this->assertText('Description');
@@ -188,7 +190,7 @@ public function testCommentAdmin() {
$this->assertText('Default comment field');
// Manage fields.
$this->clickLink('Manage fields');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Make sure comment_body field is shown.
$this->assertText('comment_body');
// Rest from here on in is field_ui.
diff --git a/web/core/modules/comment/tests/src/Functional/CommentAnonymousTest.php b/web/core/modules/comment/tests/src/Functional/CommentAnonymousTest.php
index c180531834..ac30efa0f5 100644
--- a/web/core/modules/comment/tests/src/Functional/CommentAnonymousTest.php
+++ b/web/core/modules/comment/tests/src/Functional/CommentAnonymousTest.php
@@ -50,8 +50,8 @@ public function testAnonymous() {
$this->drupalPostForm($this->node->toUrl(), $edit, t('Preview'));
// Cannot use assertRaw here since both title and body are in the form.
$preview = (string) $this->cssSelect('.preview')[0]->getHtml();
- $this->assertTrue(strpos($preview, $title) !== FALSE, 'Anonymous user can preview comment title.');
- $this->assertTrue(strpos($preview, $body) !== FALSE, 'Anonymous user can preview comment body.');
+ $this->assertStringContainsString($title, $preview, 'Anonymous user can preview comment title.');
+ $this->assertStringContainsString($body, $preview, 'Anonymous user can preview comment body.');
// Preview comments (without `skip comment approval` permission).
user_role_revoke_permissions(RoleInterface::ANONYMOUS_ID, ['skip comment approval']);
@@ -63,8 +63,8 @@ public function testAnonymous() {
$this->drupalPostForm($this->node->toUrl(), $edit, t('Preview'));
// Cannot use assertRaw here since both title and body are in the form.
$preview = (string) $this->cssSelect('.preview')[0]->getHtml();
- $this->assertTrue(strpos($preview, $title) !== FALSE, 'Anonymous user can preview comment title.');
- $this->assertTrue(strpos($preview, $body) !== FALSE, 'Anonymous user can preview comment body.');
+ $this->assertStringContainsString($title, $preview, 'Anonymous user can preview comment title.');
+ $this->assertStringContainsString($body, $preview, 'Anonymous user can preview comment body.');
user_role_grant_permissions(RoleInterface::ANONYMOUS_ID, ['skip comment approval']);
// Post anonymous comment without contact info.
@@ -162,7 +162,7 @@ public function testAnonymous() {
// Comment 3 was deleted.
$this->drupalGet('comment/reply/node/' . $this->node->id() . '/comment/' . $anonymous_comment3->id());
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
// Reset.
user_role_change_permissions(RoleInterface::ANONYMOUS_ID, [
@@ -180,7 +180,7 @@ public function testAnonymous() {
// Attempt to view node-comment form while disallowed.
$this->drupalGet('comment/reply/node/' . $this->node->id() . '/comment');
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
user_role_change_permissions(RoleInterface::ANONYMOUS_ID, [
'access comments' => TRUE,
@@ -203,7 +203,7 @@ public function testAnonymous() {
$this->assertFieldByName('comment_body[0][value]', '', 'Comment field found.');
$this->drupalGet('comment/reply/node/' . $this->node->id() . '/comment/' . $anonymous_comment2->id());
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
}
}
diff --git a/web/core/modules/comment/tests/src/Functional/CommentCSSTest.php b/web/core/modules/comment/tests/src/Functional/CommentCSSTest.php
index 5f14adcf82..891ff37bf0 100644
--- a/web/core/modules/comment/tests/src/Functional/CommentCSSTest.php
+++ b/web/core/modules/comment/tests/src/Functional/CommentCSSTest.php
@@ -88,7 +88,7 @@ public function testCommentClasses() {
// Verify the data-history-node-id attribute, which is necessary for the
// by-viewer class and the "new" indicator, see below.
- $this->assertIdentical(1, count($this->xpath('//*[@data-history-node-id="' . $node->id() . '"]')), 'data-history-node-id attribute is set on node.');
+ $this->assertCount(1, $this->xpath('//*[@data-history-node-id="' . $node->id() . '"]'), 'data-history-node-id attribute is set on node.');
// Verify classes if the comment is visible for the current user.
if ($case['comment_status'] == CommentInterface::PUBLISHED || $case['user'] == 'admin') {
@@ -114,7 +114,7 @@ public function testCommentClasses() {
// drupal.comment-by-viewer library to add a by-viewer when the current
// user (the viewer) was the author of the comment. We do this in Java-
// Script to prevent breaking the render cache.
- $this->assertIdentical(1, count($this->xpath('//*[contains(@class, "comment") and @data-comment-user-id="' . $case['comment_uid'] . '"]')), 'data-comment-user-id attribute is set on comment.');
+ $this->assertCount(1, $this->xpath('//*[contains(@class, "comment") and @data-comment-user-id="' . $case['comment_uid'] . '"]'), 'data-comment-user-id attribute is set on comment.');
$this->assertRaw(drupal_get_path('module', 'comment') . '/js/comment-by-viewer.js', 'drupal.comment-by-viewer library is present.');
}
@@ -132,7 +132,7 @@ public function testCommentClasses() {
// comment that was created or changed after the last time the current
// user read the corresponding node.
if ($case['comment_status'] == CommentInterface::PUBLISHED || $case['user'] == 'admin') {
- $this->assertIdentical(1, count($this->xpath('//*[contains(@class, "comment")]/*[@data-comment-timestamp="' . $comment->getChangedTime() . '"]')), 'data-comment-timestamp attribute is set on comment');
+ $this->assertCount(1, $this->xpath('//*[contains(@class, "comment")]/*[@data-comment-timestamp="' . $comment->getChangedTime() . '"]'), 'data-comment-timestamp attribute is set on comment');
$expectedJS = ($case['user'] !== 'anonymous');
$this->assertIdentical($expectedJS, isset($settings['ajaxPageState']['libraries']) && in_array('comment/drupal.comment-new-indicator', explode(',', $settings['ajaxPageState']['libraries'])), 'drupal.comment-new-indicator library is present.');
}
diff --git a/web/core/modules/comment/tests/src/Functional/CommentEntityTest.php b/web/core/modules/comment/tests/src/Functional/CommentEntityTest.php
index 79ab591a4a..9aa45296ec 100644
--- a/web/core/modules/comment/tests/src/Functional/CommentEntityTest.php
+++ b/web/core/modules/comment/tests/src/Functional/CommentEntityTest.php
@@ -23,7 +23,15 @@ class CommentEntityTest extends CommentTestBase {
*
* @var array
*/
- public static $modules = ['block', 'comment', 'node', 'history', 'field_ui', 'datetime', 'taxonomy'];
+ public static $modules = [
+ 'block',
+ 'comment',
+ 'node',
+ 'history',
+ 'field_ui',
+ 'datetime',
+ 'taxonomy',
+ ];
/**
* {@inheritdoc}
diff --git a/web/core/modules/comment/tests/src/Functional/CommentFieldsTest.php b/web/core/modules/comment/tests/src/Functional/CommentFieldsTest.php
index 1dd250d506..46fe42d983 100644
--- a/web/core/modules/comment/tests/src/Functional/CommentFieldsTest.php
+++ b/web/core/modules/comment/tests/src/Functional/CommentFieldsTest.php
@@ -45,7 +45,7 @@ public function testCommentDefaultFields() {
// Check that the 'comment_body' field is not deleted since it is persisted
// even if it has no fields.
$field_storage = FieldStorageConfig::loadByName('comment', 'comment_body');
- $this->assertInstanceOf(FieldStorageConfig::class, $field_storage, 'The comment_body field storage was not deleted');
+ $this->assertInstanceOf(FieldStorageConfig::class, $field_storage);
// Create a new content type.
$type_name = 'test_node_type_2';
@@ -55,7 +55,7 @@ public function testCommentDefaultFields() {
// Check that the 'comment_body' field exists and has an instance on the
// new comment bundle.
$field_storage = FieldStorageConfig::loadByName('comment', 'comment_body');
- $this->assertInstanceOf(FieldStorageConfig::class, $field_storage, 'The comment_body field exists');
+ $this->assertInstanceOf(FieldStorageConfig::class, $field_storage);
$field = FieldConfig::loadByName('comment', 'comment', 'comment_body');
$this->assertTrue(isset($field), new FormattableMarkup('The comment_body field is present for comments on type @type', ['@type' => $type_name]));
@@ -86,13 +86,13 @@ public function testCommentFieldDelete() {
$this->drupalGet('node/' . $node->nid->value);
$elements = $this->cssSelect('.field--type-comment');
- $this->assertEqual(2, count($elements), 'There are two comment fields on the node.');
+ $this->assertCount(2, $elements, 'There are two comment fields on the node.');
// Delete the first comment field.
FieldStorageConfig::loadByName('node', 'comment')->delete();
$this->drupalGet('node/' . $node->nid->value);
$elements = $this->cssSelect('.field--type-comment');
- $this->assertEqual(1, count($elements), 'There is one comment field on the node.');
+ $this->assertCount(1, $elements, 'There is one comment field on the node.');
}
/**
diff --git a/web/core/modules/comment/tests/src/Functional/CommentInterfaceTest.php b/web/core/modules/comment/tests/src/Functional/CommentInterfaceTest.php
index 2d3dcaa5d1..8a7f19ee41 100644
--- a/web/core/modules/comment/tests/src/Functional/CommentInterfaceTest.php
+++ b/web/core/modules/comment/tests/src/Functional/CommentInterfaceTest.php
@@ -97,9 +97,7 @@ public function testCommentInterface() {
$this->setCommentPreview(DRUPAL_OPTIONAL);
$this->drupalGet('comment/' . $comment->id() . '/edit');
- $this->assertTitle(t('Edit comment @title | Drupal', [
- '@title' => $comment->getSubject(),
- ]));
+ $this->assertTitle('Edit comment ' . $comment->getSubject() . ' | Drupal');
// Test changing the comment author to "Anonymous".
$comment = $this->postComment(NULL, $comment->comment_body->value, $comment->getSubject(), ['uid' => '']);
@@ -174,20 +172,20 @@ public function testCommentInterface() {
$reply_loaded->setUnpublished();
$reply_loaded->save();
$this->drupalGet('comment/reply/node/' . $this->node->id() . '/comment/' . $reply_loaded->id());
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
// Attempt to post to node with comments disabled.
$this->node = $this->drupalCreateNode(['type' => 'article', 'promote' => 1, 'comment' => [['status' => CommentItemInterface::HIDDEN]]]);
$this->assertNotNull($this->node, 'Article node created.');
$this->drupalGet('comment/reply/node/' . $this->node->id() . '/comment');
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
$this->assertNoField('edit-comment', 'Comment body field found.');
// Attempt to post to node with read-only comments.
$this->node = $this->drupalCreateNode(['type' => 'article', 'promote' => 1, 'comment' => [['status' => CommentItemInterface::CLOSED]]]);
$this->assertNotNull($this->node, 'Article node created.');
$this->drupalGet('comment/reply/node/' . $this->node->id() . '/comment');
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
$this->assertNoField('edit-comment', 'Comment body field found.');
// Attempt to post to node with comments enabled (check field names etc).
diff --git a/web/core/modules/comment/tests/src/Functional/CommentLanguageTest.php b/web/core/modules/comment/tests/src/Functional/CommentLanguageTest.php
index 000ecd28c8..cb2c796683 100644
--- a/web/core/modules/comment/tests/src/Functional/CommentLanguageTest.php
+++ b/web/core/modules/comment/tests/src/Functional/CommentLanguageTest.php
@@ -27,7 +27,12 @@ class CommentLanguageTest extends BrowserTestBase {
*
* @var array
*/
- public static $modules = ['node', 'language', 'language_test', 'comment_test'];
+ public static $modules = [
+ 'node',
+ 'language',
+ 'language_test',
+ 'comment_test',
+ ];
/**
* {@inheritdoc}
diff --git a/web/core/modules/comment/tests/src/Functional/CommentNewIndicatorTest.php b/web/core/modules/comment/tests/src/Functional/CommentNewIndicatorTest.php
index 99219f1fcc..9f7b74b93d 100644
--- a/web/core/modules/comment/tests/src/Functional/CommentNewIndicatorTest.php
+++ b/web/core/modules/comment/tests/src/Functional/CommentNewIndicatorTest.php
@@ -66,7 +66,7 @@ public function testCommentNewCommentsIndicator() {
// used by the drupal.node-new-comments-link library to determine whether
// a "x new comments" link might be necessary or not. We do this in
// JavaScript to prevent breaking the render cache.
- $this->assertIdentical(0, count($this->xpath('//*[@data-history-node-last-comment-timestamp]')), 'data-history-node-last-comment-timestamp attribute is not set.');
+ $this->assertCount(0, $this->xpath('//*[@data-history-node-last-comment-timestamp]'), 'data-history-node-last-comment-timestamp attribute is not set.');
// Create a new comment. This helper function may be run with different
// comment settings so use $comment->save() to avoid complex setup.
@@ -94,8 +94,8 @@ public function testCommentNewCommentsIndicator() {
// value, the drupal.node-new-comments-link library would determine that the
// node received a comment after the user last viewed it, and hence it would
// perform an HTTP request to render the "new comments" node link.
- $this->assertIdentical(1, count($this->xpath('//*[@data-history-node-last-comment-timestamp="' . $comment->getChangedTime() . '"]')), 'data-history-node-last-comment-timestamp attribute is set to the correct value.');
- $this->assertIdentical(1, count($this->xpath('//*[@data-history-node-field-name="comment"]')), 'data-history-node-field-name attribute is set to the correct value.');
+ $this->assertCount(1, $this->xpath('//*[@data-history-node-last-comment-timestamp="' . $comment->getChangedTime() . '"]'), 'data-history-node-last-comment-timestamp attribute is set to the correct value.');
+ $this->assertCount(1, $this->xpath('//*[@data-history-node-field-name="comment"]'), 'data-history-node-field-name attribute is set to the correct value.');
// The data will be pre-seeded on this particular page in drupalSettings, to
// avoid the need for the client to make a separate request to the server.
$settings = $this->getDrupalSettings();
diff --git a/web/core/modules/comment/tests/src/Functional/CommentNodeChangesTest.php b/web/core/modules/comment/tests/src/Functional/CommentNodeChangesTest.php
index 52efd304b7..349d838d89 100644
--- a/web/core/modules/comment/tests/src/Functional/CommentNodeChangesTest.php
+++ b/web/core/modules/comment/tests/src/Functional/CommentNodeChangesTest.php
@@ -24,7 +24,7 @@ class CommentNodeChangesTest extends CommentTestBase {
public function testNodeDeletion() {
$this->drupalLogin($this->webUser);
$comment = $this->postComment($this->node, $this->randomMachineName(), $this->randomMachineName());
- $this->assertInstanceOf(Comment::class, $comment, 'The comment could be loaded.');
+ $this->assertInstanceOf(Comment::class, $comment);
$this->node->delete();
$this->assertNull(Comment::load($comment->id()), 'The comment could not be loaded after the node was deleted.');
// Make sure the comment field storage and all its fields are deleted when
diff --git a/web/core/modules/comment/tests/src/Functional/CommentNonNodeTest.php b/web/core/modules/comment/tests/src/Functional/CommentNonNodeTest.php
index 0359aa01cd..d7676cdd0e 100644
--- a/web/core/modules/comment/tests/src/Functional/CommentNonNodeTest.php
+++ b/web/core/modules/comment/tests/src/Functional/CommentNonNodeTest.php
@@ -26,7 +26,13 @@ class CommentNonNodeTest extends BrowserTestBase {
use FieldUiTestTrait;
use CommentTestTrait;
- public static $modules = ['comment', 'user', 'field_ui', 'entity_test', 'block'];
+ public static $modules = [
+ 'comment',
+ 'user',
+ 'field_ui',
+ 'entity_test',
+ 'block',
+ ];
/**
* {@inheritdoc}
@@ -211,7 +217,7 @@ public function commentExists(CommentInterface $comment = NULL, $reply = FALSE)
* Contact info is available.
*/
public function commentContactInfoAvailable() {
- return preg_match('/(input).*?(name="name").*?(input).*?(name="mail").*?(input).*?(name="homepage")/s', $this->getSession()->getPage()->getContent());
+ return (bool) preg_match('/(input).*?(name="name").*?(input).*?(name="mail").*?(input).*?(name="homepage")/s', $this->getSession()->getPage()->getContent());
}
/**
@@ -269,11 +275,11 @@ public function testCommentFunctionality() {
$this->assertLinkByHref('entity_test/structure/entity_test/fields/entity_test.entity_test.comment');
// Test widget hidden option is not visible when there's no comments.
$this->drupalGet('entity_test/structure/entity_test/fields/entity_test.entity_test.comment');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertNoField('edit-default-value-input-comment-und-0-status-0');
// Test that field to change cardinality is not available.
$this->drupalGet('entity_test/structure/entity_test/fields/entity_test.entity_test.comment/storage');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertNoField('cardinality_number');
$this->assertNoField('cardinality');
@@ -353,7 +359,7 @@ public function testCommentFunctionality() {
// Attempt to view test entity comment form while disallowed.
$this->drupalGet('comment/reply/entity_test/' . $this->entity->id() . '/comment');
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
$this->assertNoFieldByName('subject[0][value]', '', 'Subject field not found.');
$this->assertNoFieldByName('comment_body[0][value]', '', 'Comment field not found.');
@@ -385,7 +391,7 @@ public function testCommentFunctionality() {
$this->assertFieldByName('comment_body[0][value]', '', 'Comment field found.');
$this->drupalGet('comment/reply/entity_test/' . $this->entity->id() . '/comment/' . $comment1->id());
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
$this->assertNoText($comment1->getSubject(), 'Comment not displayed.');
// Test comment field widget changes.
diff --git a/web/core/modules/comment/tests/src/Functional/CommentPreviewTest.php b/web/core/modules/comment/tests/src/Functional/CommentPreviewTest.php
index c64eeaa6db..4f029a7f93 100644
--- a/web/core/modules/comment/tests/src/Functional/CommentPreviewTest.php
+++ b/web/core/modules/comment/tests/src/Functional/CommentPreviewTest.php
@@ -54,7 +54,7 @@ public function testCommentPreview() {
\Drupal::state()->set('user_hooks_test_user_format_name_alter_safe', TRUE);
$this->drupalPostForm('node/' . $this->node->id(), $edit, t('Preview'));
- $this->assertTrue($this->webUser->getDisplayName() instanceof MarkupInterface, 'Username is marked safe');
+ $this->assertInstanceOf(MarkupInterface::class, $this->webUser->getDisplayName());
$this->assertNoEscaped('<em>' . $this->webUser->id() . '</em>');
$this->assertRaw('<em>' . $this->webUser->id() . '</em>');
@@ -67,7 +67,7 @@ public function testCommentPreview() {
$this->drupalPostForm('node/' . $this->node->id(), $edit, t('Preview'));
// Check that the preview is displaying the title and body.
- $this->assertTitle(t('Preview comment | Drupal'), 'Page title is "Preview comment".');
+ $this->assertTitle('Preview comment | Drupal');
$this->assertText($edit['subject[0][value]'], 'Subject displayed.');
$this->assertText($edit['comment_body[0][value]'], 'Comment displayed.');
@@ -101,7 +101,7 @@ public function testCommentPreviewDuplicateSubmission() {
$this->drupalPostForm('node/' . $this->node->id(), $edit, t('Preview'));
// Check that the preview is displaying the title and body.
- $this->assertTitle(t('Preview comment | Drupal'), 'Page title is "Preview comment".');
+ $this->assertTitle('Preview comment | Drupal');
$this->assertText($edit['subject[0][value]'], 'Subject displayed.');
$this->assertText($edit['comment_body[0][value]'], 'Comment displayed.');
@@ -113,7 +113,7 @@ public function testCommentPreviewDuplicateSubmission() {
$this->drupalPostForm(NULL, [], 'Save');
$this->assertText('Your comment has been posted.');
$elements = $this->xpath('//section[contains(@class, "comment-wrapper")]/article');
- $this->assertEqual(1, count($elements));
+ $this->assertCount(1, $elements);
// Go back and re-submit the form.
$this->getSession()->getDriver()->back();
@@ -121,7 +121,7 @@ public function testCommentPreviewDuplicateSubmission() {
$submit_button->click();
$this->assertText('Your comment has been posted.');
$elements = $this->xpath('//section[contains(@class, "comment-wrapper")]/article');
- $this->assertEqual(2, count($elements));
+ $this->assertCount(2, $elements);
}
/**
@@ -150,7 +150,7 @@ public function testCommentEditPreviewSave() {
$this->drupalPostForm('comment/' . $comment->id() . '/edit', $edit, t('Preview'));
// Check that the preview is displaying the subject, comment, author and date correctly.
- $this->assertTitle(t('Preview comment | Drupal'), 'Page title is "Preview comment".');
+ $this->assertTitle('Preview comment | Drupal');
$this->assertText($edit['subject[0][value]'], 'Subject displayed.');
$this->assertText($edit['comment_body[0][value]'], 'Comment displayed.');
$this->assertText($web_user->getAccountName(), 'Author displayed.');
diff --git a/web/core/modules/comment/tests/src/Functional/CommentTestBase.php b/web/core/modules/comment/tests/src/Functional/CommentTestBase.php
index 245228de0d..70789e413e 100644
--- a/web/core/modules/comment/tests/src/Functional/CommentTestBase.php
+++ b/web/core/modules/comment/tests/src/Functional/CommentTestBase.php
@@ -24,7 +24,14 @@ abstract class CommentTestBase extends BrowserTestBase {
*
* @var array
*/
- public static $modules = ['block', 'comment', 'node', 'history', 'field_ui', 'datetime'];
+ public static $modules = [
+ 'block',
+ 'comment',
+ 'node',
+ 'history',
+ 'field_ui',
+ 'datetime',
+ ];
/**
* An administrative user with permission to configure comment settings.
@@ -242,8 +249,6 @@ public function setCommentSubject($enabled) {
$form_display->removeComponent('subject');
}
$form_display->save();
- // Display status message.
- $this->pass('Comment subject ' . ($enabled ? 'enabled' : 'disabled') . '.');
}
/**
@@ -329,8 +334,6 @@ public function setCommentSettings($name, $value, $message, $field_name = 'comme
$field = FieldConfig::loadByName('node', 'article', $field_name);
$field->setSetting($name, $value);
$field->save();
- // Display status message.
- $this->pass($message);
}
/**
diff --git a/web/core/modules/comment/tests/src/Functional/CommentTitleTest.php b/web/core/modules/comment/tests/src/Functional/CommentTitleTest.php
index a6af71fd0a..0565d88a27 100644
--- a/web/core/modules/comment/tests/src/Functional/CommentTitleTest.php
+++ b/web/core/modules/comment/tests/src/Functional/CommentTitleTest.php
@@ -81,7 +81,7 @@ public function testCommentPopulatedTitles() {
$comment_permalink = $this->cssSelect('.permalink');
$comment_permalink = $comment_permalink[0]->getAttribute('href');
// Tests that the comment's title link contains the url fragment.
- $this->assertContains('#comment-' . $comment1->id(), $comment_permalink, "The comment's title link contains the url fragment.");
+ $this->assertStringContainsString('#comment-' . $comment1->id(), $comment_permalink, "The comment's title link contains the url fragment.");
$this->assertEqual($comment1->permalink()->toString(), $comment_permalink, "The comment's title has the correct link.");
}
diff --git a/web/core/modules/comment/tests/src/Functional/CommentTokenReplaceTest.php b/web/core/modules/comment/tests/src/Functional/CommentTokenReplaceTest.php
index b402da57f8..fa4cd7c02b 100644
--- a/web/core/modules/comment/tests/src/Functional/CommentTokenReplaceTest.php
+++ b/web/core/modules/comment/tests/src/Functional/CommentTokenReplaceTest.php
@@ -134,7 +134,7 @@ public function testCommentTokenReplacement() {
$metadata_tests['[comment:author:name]'] = $bubbleable_metadata;
// Test to make sure that we generated something for each token.
- $this->assertFalse(in_array(0, array_map('strlen', $tests)), 'No empty tokens generated.');
+ $this->assertNotContains(0, array_map('strlen', $tests), 'No empty tokens generated.');
foreach ($tests as $input => $expected) {
$bubbleable_metadata = new BubbleableMetadata();
diff --git a/web/core/modules/comment/tests/src/Functional/CommentTranslationUITest.php b/web/core/modules/comment/tests/src/Functional/CommentTranslationUITest.php
index 8f47909403..c21086fa47 100644
--- a/web/core/modules/comment/tests/src/Functional/CommentTranslationUITest.php
+++ b/web/core/modules/comment/tests/src/Functional/CommentTranslationUITest.php
@@ -55,7 +55,12 @@ class CommentTranslationUITest extends ContentTranslationUITestBase {
*
* @var array
*/
- public static $modules = ['language', 'content_translation', 'node', 'comment'];
+ public static $modules = [
+ 'language',
+ 'content_translation',
+ 'node',
+ 'comment',
+ ];
protected function setUp() {
$this->entityTypeId = 'comment';
@@ -201,7 +206,7 @@ public function testTranslateLinkCommentAdminPage() {
// Verify translation links.
$this->drupalGet('admin/content/comment');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertLinkByHref('comment/' . $cid_translatable . '/translations');
$this->assertNoLinkByHref('comment/' . $cid_untranslatable . '/translations');
}
diff --git a/web/core/modules/comment/tests/src/Functional/CommentTypeTest.php b/web/core/modules/comment/tests/src/Functional/CommentTypeTest.php
index 8c0b35583e..b80a220ad4 100644
--- a/web/core/modules/comment/tests/src/Functional/CommentTypeTest.php
+++ b/web/core/modules/comment/tests/src/Functional/CommentTypeTest.php
@@ -59,13 +59,14 @@ public function testCommentTypeCreation() {
$type = $this->createCommentType('other');
$comment_type = CommentType::load('other');
- $this->assertInstanceOf(CommentType::class, $comment_type, 'The new comment type has been created.');
+ $this->assertInstanceOf(CommentType::class, $comment_type);
// Log in a test user.
$this->drupalLogin($this->adminUser);
+ // Ensure that the new comment type admin page can be accessed.
$this->drupalGet('admin/structure/comment/manage/' . $type->id());
- $this->assertResponse(200, 'The new comment type can be accessed at the edit form.');
+ $this->assertSession()->statusCodeEquals(200);
// Create a comment type via the user interface.
$edit = [
@@ -76,7 +77,7 @@ public function testCommentTypeCreation() {
];
$this->drupalPostForm('admin/structure/comment/types/add', $edit, t('Save'));
$comment_type = CommentType::load('foo');
- $this->assertInstanceOf(CommentType::class, $comment_type, 'The new comment type has been created.');
+ $this->assertInstanceOf(CommentType::class, $comment_type);
// Check that the comment type was created in site default language.
$default_langcode = \Drupal::languageManager()->getDefaultLanguage()->getId();
diff --git a/web/core/modules/comment/tests/src/Functional/Rest/CommentResourceTestBase.php b/web/core/modules/comment/tests/src/Functional/Rest/CommentResourceTestBase.php
index e552fb2f9e..1b9322a217 100644
--- a/web/core/modules/comment/tests/src/Functional/Rest/CommentResourceTestBase.php
+++ b/web/core/modules/comment/tests/src/Functional/Rest/CommentResourceTestBase.php
@@ -56,9 +56,11 @@ protected function setUpAuthorization($method) {
case 'GET':
$this->grantPermissionsToTestedRole(['access comments', 'view test entity']);
break;
+
case 'POST':
$this->grantPermissionsToTestedRole(['post comments']);
break;
+
case 'PATCH':
// Anonymous users are not ever allowed to edit their own comments. To
// be able to test PATCHing comments as the anonymous user, the more
@@ -71,6 +73,7 @@ protected function setUpAuthorization($method) {
$this->grantPermissionsToTestedRole(['administer comments']);
}
break;
+
case 'DELETE':
$this->grantPermissionsToTestedRole(['administer comments']);
break;
@@ -315,10 +318,13 @@ protected function getExpectedUnauthorizedAccessMessage($method) {
switch ($method) {
case 'GET';
return "The 'access comments' permission is required and the comment must be published.";
+
case 'POST';
return "The 'post comments' permission is required.";
+
case 'PATCH';
return "The 'edit own comments' permission is required, the user must be the comment author, and the comment must be published.";
+
case 'DELETE':
// \Drupal\comment\CommentAccessControlHandler::checkAccess() does not
// specify a reason for not allowing a comment to be deleted.
diff --git a/web/core/modules/comment/tests/src/Functional/Views/CommentFieldFilterTest.php b/web/core/modules/comment/tests/src/Functional/Views/CommentFieldFilterTest.php
index 18bfde3354..cffe42317c 100644
--- a/web/core/modules/comment/tests/src/Functional/Views/CommentFieldFilterTest.php
+++ b/web/core/modules/comment/tests/src/Functional/Views/CommentFieldFilterTest.php
@@ -48,7 +48,7 @@ protected function setUp($import_test_views = TRUE) {
$this->commentTitles = [
'en' => 'Food in Paris',
'es' => 'Comida en Paris',
- 'fr' => 'Nouriture en Paris',
+ 'fr' => 'Nourriture en Paris',
];
// Create a new comment. Using the one created earlier will not work,
diff --git a/web/core/modules/comment/tests/src/Functional/Views/CommentOperationsTest.php b/web/core/modules/comment/tests/src/Functional/Views/CommentOperationsTest.php
index ecd15d2a97..c3d5c6898f 100644
--- a/web/core/modules/comment/tests/src/Functional/Views/CommentOperationsTest.php
+++ b/web/core/modules/comment/tests/src/Functional/Views/CommentOperationsTest.php
@@ -28,11 +28,11 @@ public function testCommentOperations() {
$admin_account = $this->drupalCreateUser(['administer comments']);
$this->drupalLogin($admin_account);
$this->drupalGet('test-comment-operations');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$operation = $this->cssSelect('.views-field-operations li.edit a');
- $this->assertEqual(count($operation), 1, 'Found edit operation for comment.');
+ $this->assertCount(1, $operation, 'Found edit operation for comment.');
$operation = $this->cssSelect('.views-field-operations li.delete a');
- $this->assertEqual(count($operation), 1, 'Found delete operation for comment.');
+ $this->assertCount(1, $operation, 'Found delete operation for comment.');
}
}
diff --git a/web/core/modules/comment/tests/src/Functional/Views/CommentRestExportTest.php b/web/core/modules/comment/tests/src/Functional/Views/CommentRestExportTest.php
index d5046a396e..7f6145c9f5 100644
--- a/web/core/modules/comment/tests/src/Functional/Views/CommentRestExportTest.php
+++ b/web/core/modules/comment/tests/src/Functional/Views/CommentRestExportTest.php
@@ -27,7 +27,13 @@ class CommentRestExportTest extends CommentTestBase {
/**
* {@inheritdoc}
*/
- public static $modules = ['node', 'comment', 'comment_test_views', 'rest', 'hal'];
+ public static $modules = [
+ 'node',
+ 'comment',
+ 'comment_test_views',
+ 'rest',
+ 'hal',
+ ];
protected function setUp($import_test_views = TRUE) {
parent::setUp($import_test_views);
@@ -56,11 +62,11 @@ protected function setUp($import_test_views = TRUE) {
*/
public function testCommentRestExport() {
$this->drupalGet(sprintf('node/%d/comments', $this->nodeUserCommented->id()), ['query' => ['_format' => 'hal_json']]);
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$contents = Json::decode($this->getSession()->getPage()->getContent());
$this->assertEqual($contents[0]['subject'], 'How much wood would a woodchuck chuck');
$this->assertEqual($contents[1]['subject'], 'A lot, apparently');
- $this->assertEqual(count($contents), 2);
+ $this->assertCount(2, $contents);
// Ensure field-level access is respected - user shouldn't be able to see
// mail or hostname fields.
diff --git a/web/core/modules/comment/tests/src/Functional/Views/CommentRowTest.php b/web/core/modules/comment/tests/src/Functional/Views/CommentRowTest.php
index 8cf2121a5e..7b96549005 100644
--- a/web/core/modules/comment/tests/src/Functional/Views/CommentRowTest.php
+++ b/web/core/modules/comment/tests/src/Functional/Views/CommentRowTest.php
@@ -28,7 +28,7 @@ public function testCommentRow() {
$this->drupalGet('test-comment-row');
$result = $this->xpath('//article[contains(@class, "comment")]');
- $this->assertEqual(1, count($result), 'One rendered comment found.');
+ $this->assertCount(1, $result, 'One rendered comment found.');
}
}
diff --git a/web/core/modules/comment/tests/src/Functional/Views/NodeCommentsTest.php b/web/core/modules/comment/tests/src/Functional/Views/NodeCommentsTest.php
index 02c91f4ed5..131752eb56 100644
--- a/web/core/modules/comment/tests/src/Functional/Views/NodeCommentsTest.php
+++ b/web/core/modules/comment/tests/src/Functional/Views/NodeCommentsTest.php
@@ -33,9 +33,9 @@ class NodeCommentsTest extends CommentTestBase {
*/
public function testNewComments() {
$this->drupalGet('test-new-comments');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$new_comments = $this->cssSelect(".views-field-new-comments a:contains('1')");
- $this->assertEqual(count($new_comments), 1, 'Found the number of new comments for a certain node.');
+ $this->assertCount(1, $new_comments, 'Found the number of new comments for a certain node.');
}
}
diff --git a/web/core/modules/comment/tests/src/Functional/Views/RowRssTest.php b/web/core/modules/comment/tests/src/Functional/Views/RowRssTest.php
index f8a24afa4e..ea0b43e75f 100644
--- a/web/core/modules/comment/tests/src/Functional/Views/RowRssTest.php
+++ b/web/core/modules/comment/tests/src/Functional/Views/RowRssTest.php
@@ -31,7 +31,7 @@ public function testRssRow() {
// Because the response is XML we can't use the page which depends on an
// HTML tag being present.
$result = $this->getSession()->getDriver()->find('//item');
- $this->assertEqual(count($result), 1, 'Just one comment was found in the rss output.');
+ $this->assertCount(1, $result, 'Just one comment was found in the rss output.');
$this->assertEqual($result[0]->find('xpath', '//pubDate')->getHtml(), gmdate('r', $this->comment->getCreatedTime()), 'The right pubDate appears in the rss output.');
}
diff --git a/web/core/modules/comment/tests/src/Kernel/CommentIntegrationTest.php b/web/core/modules/comment/tests/src/Kernel/CommentIntegrationTest.php
index 6f62845f73..28c9b263cb 100644
--- a/web/core/modules/comment/tests/src/Kernel/CommentIntegrationTest.php
+++ b/web/core/modules/comment/tests/src/Kernel/CommentIntegrationTest.php
@@ -24,7 +24,14 @@ class CommentIntegrationTest extends KernelTestBase {
/**
* {@inheritdoc}
*/
- public static $modules = ['comment', 'field', 'entity_test', 'user', 'system', 'dblog'];
+ public static $modules = [
+ 'comment',
+ 'field',
+ 'entity_test',
+ 'user',
+ 'system',
+ 'dblog',
+ ];
/**
* {@inheritdoc}
@@ -112,14 +119,13 @@ public function testViewMode() {
'@display' => EntityViewMode::load("comment.$mode")->label(),
'@mode' => $mode,
];
- $logged = (bool) Database::getConnection()->select('watchdog')
- ->fields('watchdog', ['wid'])
+ $logged = Database::getConnection()->select('watchdog')
+ ->fields('watchdog', ['variables'])
->condition('type', 'system')
->condition('message', "View display '@id': Comment field formatter '@name' was disabled because it is using the comment view display '@display' (@mode) that was just disabled.")
- ->condition('variables', serialize($arguments))
->execute()
->fetchField();
- $this->assertTrue($logged);
+ $this->assertEquals(serialize($arguments), $logged);
// Re-enable the comment view display.
EntityViewDisplay::load($comment_display_id)->setStatus(TRUE)->save();
diff --git a/web/core/modules/comment/tests/src/Kernel/CommentItemTest.php b/web/core/modules/comment/tests/src/Kernel/CommentItemTest.php
index 9d6e1644b4..c0fb418546 100644
--- a/web/core/modules/comment/tests/src/Kernel/CommentItemTest.php
+++ b/web/core/modules/comment/tests/src/Kernel/CommentItemTest.php
@@ -48,19 +48,19 @@ public function testCommentItem() {
$storage = $this->container->get('entity_type.manager')->getStorage('entity_test');
$storage->resetCache([$id]);
$entity = $storage->load($id);
- $this->assertTrue($entity->comment instanceof FieldItemListInterface, 'Field implements interface.');
- $this->assertTrue($entity->comment[0] instanceof CommentItemInterface, 'Field item implements interface.');
+ $this->assertInstanceOf(FieldItemListInterface::class, $entity->comment);
+ $this->assertInstanceOf(CommentItemInterface::class, $entity->comment[0]);
// Test sample item generation.
/** @var \Drupal\entity_test\Entity\EntityTest $entity */
$entity = EntityTest::create();
$entity->comment->generateSampleItems();
$this->entityValidateAndSave($entity);
- $this->assertTrue(in_array($entity->get('comment')->status, [
+ $this->assertContains($entity->get('comment')->status, [
CommentItemInterface::HIDDEN,
CommentItemInterface::CLOSED,
CommentItemInterface::OPEN,
- ]), 'Comment status value in defined range');
+ ], 'Comment status value in defined range');
$mainProperty = $entity->comment[0]->mainPropertyName();
$this->assertEqual('status', $mainProperty);
diff --git a/web/core/modules/comment/tests/src/Kernel/CommentLegacyTest.php b/web/core/modules/comment/tests/src/Kernel/CommentLegacyTest.php
index 6d20b97285..7f44aff3ac 100644
--- a/web/core/modules/comment/tests/src/Kernel/CommentLegacyTest.php
+++ b/web/core/modules/comment/tests/src/Kernel/CommentLegacyTest.php
@@ -88,7 +88,7 @@ public function testCommentView() {
$this->createComment(),
$this->createComment(),
];
- $this->assertEquals(4, count(comment_view_multiple($entities)));
+ $this->assertCount(4, comment_view_multiple($entities));
}
/**
diff --git a/web/core/modules/comment/tests/src/Kernel/CommentValidationTest.php b/web/core/modules/comment/tests/src/Kernel/CommentValidationTest.php
index 411ad54608..0d5b6ec0ec 100644
--- a/web/core/modules/comment/tests/src/Kernel/CommentValidationTest.php
+++ b/web/core/modules/comment/tests/src/Kernel/CommentValidationTest.php
@@ -84,7 +84,7 @@ public function testValidation() {
]);
$violations = $comment->validate();
- $this->assertEqual(count($violations), 0, 'No violations when validating a default comment.');
+ $this->assertCount(0, $violations, 'No violations when validating a default comment.');
$comment->set('subject', $this->randomString(65));
$this->assertLengthViolation($comment, 'subject', 64);
@@ -99,7 +99,7 @@ public function testValidation() {
$comment->set('name', 'test');
$comment->set('uid', 0);
$violations = $comment->validate();
- $this->assertEqual(count($violations), 1, "Violation found on author name collision");
+ $this->assertCount(1, $violations, "Violation found on author name collision");
$this->assertEqual($violations[0]->getPropertyPath(), "name");
$this->assertEqual($violations[0]->getMessage(), t('The name you used (%name) belongs to a registered user.', ['%name' => 'test']));
@@ -107,7 +107,7 @@ public function testValidation() {
$comment->set('name', 'valid unused name');
$comment->set('mail', 'invalid');
$violations = $comment->validate();
- $this->assertEqual(count($violations), 1, 'Violation found when email is invalid');
+ $this->assertCount(1, $violations, 'Violation found when email is invalid');
$this->assertEqual($violations[0]->getPropertyPath(), 'mail.0.value');
$this->assertEqual($violations[0]->getMessage(), t('This value is not a valid email address.'));
@@ -117,7 +117,7 @@ public function testValidation() {
$comment->set('homepage', 'invalid');
$violations = $comment->validate();
- $this->assertEqual(count($violations), 1, 'Violation found when homepage is invalid');
+ $this->assertCount(1, $violations, 'Violation found when homepage is invalid');
$this->assertEqual($violations[0]->getPropertyPath(), 'homepage.0.value');
// @todo This message should be improved in
@@ -150,7 +150,7 @@ public function testValidation() {
'name' => '',
]);
$violations = $comment->validate();
- $this->assertEqual(count($violations), 1, 'Violation found when name is required, but empty and UID is anonymous.');
+ $this->assertCount(1, $violations, 'Violation found when name is required, but empty and UID is anonymous.');
$this->assertEqual($violations[0]->getPropertyPath(), 'name');
$this->assertEqual($violations[0]->getMessage(), t('You have to specify a valid author.'));
@@ -163,7 +163,7 @@ public function testValidation() {
'uid' => $user->id(),
]);
$violations = $comment->validate();
- $this->assertEqual(count($violations), 0, 'No violations when validating a default comment with an author.');
+ $this->assertCount(0, $violations, 'No violations when validating a default comment with an author.');
// Test specifying a wrong author name does not work.
$comment = $this->entityTypeManager->getStorage('comment')->create([
@@ -175,7 +175,7 @@ public function testValidation() {
'name' => 'not-test',
]);
$violations = $comment->validate();
- $this->assertEqual(count($violations), 1, 'Violation found when author name and comment author do not match.');
+ $this->assertCount(1, $violations, 'Violation found when author name and comment author do not match.');
$this->assertEqual($violations[0]->getPropertyPath(), 'name');
$this->assertEqual($violations[0]->getMessage(), t('The specified author name does not match the comment author.'));
}
@@ -192,7 +192,7 @@ public function testValidation() {
*/
protected function assertLengthViolation(CommentInterface $comment, $field_name, $length) {
$violations = $comment->validate();
- $this->assertEqual(count($violations), 1, "Violation found when $field_name is too long.");
+ $this->assertCount(1, $violations, "Violation found when $field_name is too long.");
$this->assertEqual($violations[0]->getPropertyPath(), "$field_name.0.value");
$field_label = $comment->get($field_name)->getFieldDefinition()->getLabel();
$this->assertEqual($violations[0]->getMessage(), t('%name: may not be longer than @max characters.', ['%name' => $field_label, '@max' => $length]));
diff --git a/web/core/modules/comment/tests/src/Kernel/Migrate/d6/MigrateCommentEntityDisplayTest.php b/web/core/modules/comment/tests/src/Kernel/Migrate/d6/MigrateCommentEntityDisplayTest.php
index 2c13371fb8..94f1e9fe86 100644
--- a/web/core/modules/comment/tests/src/Kernel/Migrate/d6/MigrateCommentEntityDisplayTest.php
+++ b/web/core/modules/comment/tests/src/Kernel/Migrate/d6/MigrateCommentEntityDisplayTest.php
@@ -44,7 +44,7 @@ protected function setUp() {
*/
protected function assertDisplay($id, $component_id) {
$component = EntityViewDisplay::load($id)->getComponent($component_id);
- $this->assertInternalType('array', $component);
+ $this->assertIsArray($component);
$this->assertSame('hidden', $component['label']);
$this->assertSame('comment_default', $component['type']);
$this->assertSame(20, $component['weight']);
diff --git a/web/core/modules/comment/tests/src/Kernel/Migrate/d6/MigrateCommentEntityFormDisplaySubjectTest.php b/web/core/modules/comment/tests/src/Kernel/Migrate/d6/MigrateCommentEntityFormDisplaySubjectTest.php
index 74a871521a..4999a56975 100644
--- a/web/core/modules/comment/tests/src/Kernel/Migrate/d6/MigrateCommentEntityFormDisplaySubjectTest.php
+++ b/web/core/modules/comment/tests/src/Kernel/Migrate/d6/MigrateCommentEntityFormDisplaySubjectTest.php
@@ -38,7 +38,7 @@ protected function setUp() {
*/
protected function assertSubjectVisible($id) {
$component = EntityFormDisplay::load($id)->getComponent('subject');
- $this->assertInternalType('array', $component);
+ $this->assertIsArray($component);
$this->assertSame('string_textfield', $component['type']);
$this->assertSame(10, $component['weight']);
}
diff --git a/web/core/modules/comment/tests/src/Kernel/Migrate/d6/MigrateCommentEntityFormDisplayTest.php b/web/core/modules/comment/tests/src/Kernel/Migrate/d6/MigrateCommentEntityFormDisplayTest.php
index c9e0d6b8a6..15b57de301 100644
--- a/web/core/modules/comment/tests/src/Kernel/Migrate/d6/MigrateCommentEntityFormDisplayTest.php
+++ b/web/core/modules/comment/tests/src/Kernel/Migrate/d6/MigrateCommentEntityFormDisplayTest.php
@@ -43,7 +43,7 @@ protected function setUp() {
*/
protected function assertDisplay($id, $component_id) {
$component = EntityFormDisplay::load($id)->getComponent($component_id);
- $this->assertInternalType('array', $component);
+ $this->assertIsArray($component);
$this->assertSame('comment_default', $component['type']);
$this->assertSame(20, $component['weight']);
}
diff --git a/web/core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentEntityDisplayTest.php b/web/core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentEntityDisplayTest.php
index d43b14c415..59a62c992c 100644
--- a/web/core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentEntityDisplayTest.php
+++ b/web/core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentEntityDisplayTest.php
@@ -42,7 +42,7 @@ protected function setUp() {
*/
protected function assertDisplay($id, $component_id) {
$component = EntityViewDisplay::load($id)->getComponent($component_id);
- $this->assertInternalType('array', $component);
+ $this->assertIsArray($component);
$this->assertSame('hidden', $component['label']);
$this->assertSame('comment_default', $component['type']);
$this->assertSame(20, $component['weight']);
diff --git a/web/core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentEntityFormDisplaySubjectTest.php b/web/core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentEntityFormDisplaySubjectTest.php
index 9c7dbddbf8..3ab1196da2 100644
--- a/web/core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentEntityFormDisplaySubjectTest.php
+++ b/web/core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentEntityFormDisplaySubjectTest.php
@@ -35,7 +35,7 @@ protected function setUp() {
*/
protected function assertSubjectVisible($id) {
$component = EntityFormDisplay::load($id)->getComponent('subject');
- $this->assertInternalType('array', $component);
+ $this->assertIsArray($component);
$this->assertSame('string_textfield', $component['type']);
$this->assertSame(10, $component['weight']);
}
diff --git a/web/core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentEntityFormDisplayTest.php b/web/core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentEntityFormDisplayTest.php
index 75647b1673..1425cda2e7 100644
--- a/web/core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentEntityFormDisplayTest.php
+++ b/web/core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentEntityFormDisplayTest.php
@@ -42,7 +42,7 @@ protected function setUp() {
*/
protected function assertDisplay($id, $component_id) {
$component = EntityFormDisplay::load($id)->getComponent($component_id);
- $this->assertInternalType('array', $component);
+ $this->assertIsArray($component);
$this->assertSame('comment_default', $component['type']);
$this->assertSame(20, $component['weight']);
}
diff --git a/web/core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentTest.php b/web/core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentTest.php
index c51529b689..ca23665226 100644
--- a/web/core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentTest.php
+++ b/web/core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentTest.php
@@ -26,8 +26,6 @@ class MigrateCommentTest extends MigrateDrupal7TestBase {
'language',
'link',
'menu_ui',
- // Required for translation migrations.
- 'migrate_drupal_multilingual',
'node',
'taxonomy',
'telephone',
diff --git a/web/core/modules/comment/tests/src/Kernel/Views/CommentAdminViewTest.php b/web/core/modules/comment/tests/src/Kernel/Views/CommentAdminViewTest.php
index 64ada25b27..8c887cbf84 100644
--- a/web/core/modules/comment/tests/src/Kernel/Views/CommentAdminViewTest.php
+++ b/web/core/modules/comment/tests/src/Kernel/Views/CommentAdminViewTest.php
@@ -164,7 +164,7 @@ protected function doTestFilters($display_id) {
$this->assertField('langcode');
$elements = $this->cssSelect('input[type="checkbox"]');
- $this->assertEquals(2, count($elements), 'There are two comments on the page.');
+ $this->assertCount(2, $elements, 'There are two comments on the page.');
$this->assertText($comment->label());
$this->assertText($comment_anonymous->label());
$executable->destroy();
@@ -176,7 +176,7 @@ protected function doTestFilters($display_id) {
$this->verbose($this->getRawContent());
$elements = $this->cssSelect('input[type="checkbox"]');
- $this->assertEquals(1, count($elements), 'Only anonymous comment is visible.');
+ $this->assertCount(1, $elements, 'Only anonymous comment is visible.');
$this->assertNoText($comment->label());
$this->assertText($comment_anonymous->label());
$executable->destroy();
@@ -187,7 +187,7 @@ protected function doTestFilters($display_id) {
$this->verbose($this->getRawContent());
$elements = $this->cssSelect('input[type="checkbox"]');
- $this->assertEquals(1, count($elements), 'Only admin comment is visible.');
+ $this->assertCount(1, $elements, 'Only admin comment is visible.');
$this->assertText($comment->label());
$this->assertNoText($comment_anonymous->label());
$executable->destroy();
@@ -199,7 +199,7 @@ protected function doTestFilters($display_id) {
$this->verbose($this->getRawContent());
$elements = $this->cssSelect('input[type="checkbox"]');
- $this->assertEquals(1, count($elements), 'Only anonymous comment is visible.');
+ $this->assertCount(1, $elements, 'Only anonymous comment is visible.');
$this->assertNoText($comment->label());
$this->assertText($comment_anonymous->label());
$executable->destroy();
@@ -211,7 +211,7 @@ protected function doTestFilters($display_id) {
$this->verbose($this->getRawContent());
$elements = $this->cssSelect('input[type="checkbox"]');
- $this->assertEquals(1, count($elements), 'Only admin comment is visible.');
+ $this->assertCount(1, $elements, 'Only admin comment is visible.');
$this->assertText($comment->label());
$this->assertNoText($comment_anonymous->label());
$executable->destroy();
@@ -223,7 +223,7 @@ protected function doTestFilters($display_id) {
$this->verbose($this->getRawContent());
$elements = $this->cssSelect('input[type="checkbox"]');
- $this->assertEquals(2, count($elements), 'Both comments are visible.');
+ $this->assertCount(2, $elements, 'Both comments are visible.');
$this->assertText($comment->label());
$this->assertText($comment_anonymous->label());
$executable->destroy();
@@ -258,7 +258,7 @@ protected function doTestFilters($display_id) {
$this->verbose($this->getRawContent());
$elements = $this->cssSelect('input[type="checkbox"]');
- $this->assertEquals(2, count($elements), 'Both comments are visible.');
+ $this->assertCount(2, $elements, 'Both comments are visible.');
$this->assertNoText($comment->label());
$this->assertNoText($comment_anonymous->label());
$this->assertText($comment_translation->label());
diff --git a/web/core/modules/comment/tests/src/Unit/CommentStatisticsUnitTest.php b/web/core/modules/comment/tests/src/Unit/CommentStatisticsUnitTest.php
index c57562b415..9a0e999500 100644
--- a/web/core/modules/comment/tests/src/Unit/CommentStatisticsUnitTest.php
+++ b/web/core/modules/comment/tests/src/Unit/CommentStatisticsUnitTest.php
@@ -96,7 +96,7 @@ protected function setUp() {
*/
public function testRead() {
$this->calls_to_fetch = 0;
- $results = $this->commentStatistics->read(['1' => 'boo', '2' => 'foo'], 'snafoos');
+ $results = $this->commentStatistics->read(['1' => 'boo', '2' => 'foo'], 'snafus');
$this->assertEquals($results, ['something', 'something-else']);
}
diff --git a/web/core/modules/config/config.info.yml b/web/core/modules/config/config.info.yml
index 88821cea25..0544746e7e 100644
--- a/web/core/modules/config/config.info.yml
+++ b/web/core/modules/config/config.info.yml
@@ -1,6 +1,6 @@
name: 'Configuration Manager'
type: module
-description: 'Allows administrators to manage configuration changes.'
+description: 'Allows administrators to import and export configuration changes.'
package: Core
version: VERSION
core: 8.x
diff --git a/web/core/modules/config/src/Form/ConfigSync.php b/web/core/modules/config/src/Form/ConfigSync.php
index 71fb3681f1..02d49d6e07 100644
--- a/web/core/modules/config/src/Form/ConfigSync.php
+++ b/web/core/modules/config/src/Form/ConfigSync.php
@@ -406,7 +406,7 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
* @see https://www.drupal.org/node/2897299
*/
public static function processBatch(ConfigImporter $config_importer, $sync_step, &$context) {
- @trigger_error('\Drupal\config\Form\ConfigSync::processBatch() deprecated in Drupal 8.6.0 and will be removed before 9.0.0. Use \Drupal\Core\Config\Importer\ConfigImporterBatch::process() instead. See https://www.drupal.org/node/2897299');
+ @trigger_error('\Drupal\config\Form\ConfigSync::processBatch() deprecated in drupal:8.6.0 and will be removed before drupal:9.0.0. Use \Drupal\Core\Config\Importer\ConfigImporterBatch::process() instead. See https://www.drupal.org/node/2897299', E_USER_DEPRECATED);
ConfigImporterBatch::process($config_importer, $sync_step, $context);
}
@@ -422,7 +422,7 @@ public static function processBatch(ConfigImporter $config_importer, $sync_step,
* @see https://www.drupal.org/node/2897299
*/
public static function finishBatch($success, $results, $operations) {
- @trigger_error('\Drupal\config\Form\ConfigSync::finishBatch() deprecated in Drupal 8.6.0 and will be removed before 9.0.0. Use \Drupal\Core\Config\Importer\ConfigImporterBatch::finish() instead. See https://www.drupal.org/node/2897299');
+ @trigger_error('\Drupal\config\Form\ConfigSync::finishBatch() deprecated in drupal:8.6.0 and will be removed before drupal:9.0.0. Use \Drupal\Core\Config\Importer\ConfigImporterBatch::finish() instead. See https://www.drupal.org/node/2897299', E_USER_DEPRECATED);
ConfigImporterBatch::finish($success, $results, $operations);
}
diff --git a/web/core/modules/config/tests/config_import_test/src/EventSubscriber.php b/web/core/modules/config/tests/config_import_test/src/EventSubscriber.php
index 5f8ef86c04..6b72b8ac99 100644
--- a/web/core/modules/config/tests/config_import_test/src/EventSubscriber.php
+++ b/web/core/modules/config/tests/config_import_test/src/EventSubscriber.php
@@ -87,10 +87,10 @@ public function onConfigImporterMissingContentTwo(MissingContentEvent $event) {
*/
public function onConfigSave(ConfigCrudEvent $event) {
$config = $event->getConfig();
- if ($config->getName() == 'action.settings') {
- $values = $this->state->get('ConfigImportUITest.action.settings.recursion_limit', []);
- $values[] = $config->get('recursion_limit');
- $this->state->set('ConfigImportUITest.action.settings.recursion_limit', $values);
+ if ($config->getName() == 'automated_cron.settings') {
+ $values = $this->state->get('ConfigImportUITest.automated_cron.settings.interval', []);
+ $values[] = $config->get('interval');
+ $this->state->set('ConfigImportUITest.automated_cron.settings.interval', $values);
}
if ($config->getName() == 'core.extension') {
@@ -119,9 +119,9 @@ public function onConfigSave(ConfigCrudEvent $event) {
*/
public function onConfigDelete(ConfigCrudEvent $event) {
$config = $event->getConfig();
- if ($config->getName() == 'action.settings') {
- $value = $this->state->get('ConfigImportUITest.action.settings.delete', 0);
- $this->state->set('ConfigImportUITest.action.settings.delete', $value + 1);
+ if ($config->getName() == 'automated_cron.settings') {
+ $value = $this->state->get('ConfigImportUITest.automated_cron.settings.delete', 0);
+ $this->state->set('ConfigImportUITest.automated_cron.settings.delete', $value + 1);
}
}
diff --git a/web/core/modules/config/tests/config_test/tests/src/Functional/Rest/ConfigTestResourceTestBase.php b/web/core/modules/config/tests/config_test/tests/src/Functional/Rest/ConfigTestResourceTestBase.php
index dbd71b7778..d9f94da806 100644
--- a/web/core/modules/config/tests/config_test/tests/src/Functional/Rest/ConfigTestResourceTestBase.php
+++ b/web/core/modules/config/tests/config_test/tests/src/Functional/Rest/ConfigTestResourceTestBase.php
@@ -81,6 +81,7 @@ protected function getExpectedUnauthorizedAccessMessage($method) {
switch ($method) {
case 'GET':
return "The 'view config_test' permission is required.";
+
default:
return parent::getExpectedUnauthorizedAccessMessage($method);
}
diff --git a/web/core/modules/config/tests/src/Functional/ConfigDraggableListBuilderTest.php b/web/core/modules/config/tests/src/Functional/ConfigDraggableListBuilderTest.php
index a9effb4b0f..60211b7735 100644
--- a/web/core/modules/config/tests/src/Functional/ConfigDraggableListBuilderTest.php
+++ b/web/core/modules/config/tests/src/Functional/ConfigDraggableListBuilderTest.php
@@ -41,7 +41,7 @@ public function testDraggableList() {
$this->drupalGet('admin/people/roles');
// Test for the page title.
- $this->assertSession()->titleEquals(t('Roles') . ' | Drupal');
+ $this->assertSession()->titleEquals('Roles | Drupal');
// Count the number of rows in table.
$rows = $this->xpath('//form[@class="user-admin-roles-form"]/table/tbody/tr');
diff --git a/web/core/modules/config/tests/src/Functional/ConfigEntityListTest.php b/web/core/modules/config/tests/src/Functional/ConfigEntityListTest.php
index 51611f78b4..786c6296a2 100644
--- a/web/core/modules/config/tests/src/Functional/ConfigEntityListTest.php
+++ b/web/core/modules/config/tests/src/Functional/ConfigEntityListTest.php
@@ -46,7 +46,7 @@ public function testList() {
$controller = \Drupal::entityTypeManager()->getListBuilder('config_test');
// Test getStorage() method.
- $this->assertInstanceOf(EntityStorageInterface::class, $controller->getStorage(), 'EntityStorage instance in storage.');
+ $this->assertInstanceOf(EntityStorageInterface::class, $controller->getStorage());
// Get a list of ConfigTest entities and confirm that it contains the
// ConfigTest entity provided by the config_test module.
@@ -54,7 +54,7 @@ public function testList() {
$list = $controller->load();
$this->assertCount(1, $list, '1 ConfigTest entity found.');
$entity = $list['dotted.default'];
- $this->assertInstanceOf(ConfigTest::class, $entity, '"Default" ConfigTest entity is an instance of ConfigTest.');
+ $this->assertInstanceOf(ConfigTest::class, $entity);
// Test getOperations() method.
$expected_operations = [
@@ -192,7 +192,7 @@ public function testListUI() {
// Add a new entity using the operations link.
$this->assertLink('Add test configuration');
$this->clickLink('Add test configuration');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$edit = [
'label' => 'Antelope',
'id' => 'antelope',
@@ -212,7 +212,7 @@ public function testListUI() {
// Edit the entity using the operations link.
$this->assertLinkByHref('admin/structure/config_test/manage/antelope');
$this->clickLink('Edit', 1);
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertTitle('Edit Antelope | Drupal');
$edit = ['label' => 'Albatross', 'id' => 'albatross'];
$this->drupalPostForm(NULL, $edit, t('Save'));
@@ -226,7 +226,7 @@ public function testListUI() {
// Delete the added entity using the operations link.
$this->assertLinkByHref('admin/structure/config_test/manage/albatross/delete');
$this->clickLink('Delete', 1);
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertTitle('Are you sure you want to delete the test configuration Albatross? | Drupal');
$this->drupalPostForm(NULL, [], t('Delete'));
@@ -237,7 +237,7 @@ public function testListUI() {
// Delete the original entity using the operations link.
$this->clickLink('Delete');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertTitle('Are you sure you want to delete the test configuration Default? | Drupal');
$this->drupalPostForm(NULL, [], t('Delete'));
diff --git a/web/core/modules/config/tests/src/Functional/ConfigEntityStatusUITest.php b/web/core/modules/config/tests/src/Functional/ConfigEntityStatusUITest.php
index c987551449..4b062bcd22 100644
--- a/web/core/modules/config/tests/src/Functional/ConfigEntityStatusUITest.php
+++ b/web/core/modules/config/tests/src/Functional/ConfigEntityStatusUITest.php
@@ -42,14 +42,14 @@ public function testCRUD() {
$disable_url = $entity->toUrl('disable');
$this->assertLinkByHref($disable_url->toString());
$this->drupalGet($disable_url);
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertNoLinkByHref($disable_url->toString());
// Enable an entity.
$enable_url = $entity->toUrl('enable');
$this->assertLinkByHref($enable_url->toString());
$this->drupalGet($enable_url);
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertNoLinkByHref($enable_url->toString());
}
diff --git a/web/core/modules/config/tests/src/Functional/ConfigEntityTest.php b/web/core/modules/config/tests/src/Functional/ConfigEntityTest.php
index b199832029..ef6b327539 100644
--- a/web/core/modules/config/tests/src/Functional/ConfigEntityTest.php
+++ b/web/core/modules/config/tests/src/Functional/ConfigEntityTest.php
@@ -253,7 +253,7 @@ public function testCRUDUI() {
];
$this->drupalPostForm('admin/structure/config_test/add', $edit, 'Save');
$this->assertUrl('admin/structure/config_test');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertRaw($message_insert);
$this->assertNoRaw($message_update);
$this->assertLinkByHref("admin/structure/config_test/manage/$id");
@@ -264,7 +264,7 @@ public function testCRUDUI() {
];
$this->drupalPostForm("admin/structure/config_test/manage/$id", $edit, 'Save');
$this->assertUrl('admin/structure/config_test');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertNoRaw($message_insert);
$this->assertRaw($message_update);
$this->assertLinkByHref("admin/structure/config_test/manage/$id");
@@ -276,7 +276,7 @@ public function testCRUDUI() {
$this->assertUrl("admin/structure/config_test/manage/$id/delete");
$this->drupalPostForm(NULL, [], 'Delete');
$this->assertUrl('admin/structure/config_test');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertNoRaw($message_update);
$this->assertRaw($message_delete);
$this->assertNoText($label1);
@@ -289,7 +289,7 @@ public function testCRUDUI() {
];
$this->drupalPostForm('admin/structure/config_test/add', $edit, 'Save');
$this->assertUrl('admin/structure/config_test');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertText($label1);
$this->assertLinkByHref("admin/structure/config_test/manage/$id");
@@ -300,7 +300,7 @@ public function testCRUDUI() {
];
$this->drupalPostForm("admin/structure/config_test/manage/$id", $edit, 'Save');
$this->assertUrl('admin/structure/config_test');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertNoText($label1);
$this->assertNoText($label2);
$this->assertText($label3);
@@ -314,7 +314,7 @@ public function testCRUDUI() {
'label' => '0',
];
$this->drupalPostForm('admin/structure/config_test/add', $edit, 'Save');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$message_insert = new FormattableMarkup('%label configuration has been created.', ['%label' => $edit['label']]);
$this->assertRaw($message_insert);
$this->assertLinkByHref('admin/structure/config_test/manage/0');
diff --git a/web/core/modules/config/tests/src/Functional/ConfigExportImportUITest.php b/web/core/modules/config/tests/src/Functional/ConfigExportImportUITest.php
index 9a6c3525be..a573782a54 100644
--- a/web/core/modules/config/tests/src/Functional/ConfigExportImportUITest.php
+++ b/web/core/modules/config/tests/src/Functional/ConfigExportImportUITest.php
@@ -268,12 +268,12 @@ public function testExportImportCollections() {
foreach ($content_list as $file) {
$files[] = $file['filename'];
}
- $this->assertTrue(in_array('collection/test1/config_test.create.yml', $files), 'Config export contains collection/test1/config_test.create.yml.');
- $this->assertTrue(in_array('collection/test2/config_test.another_create.yml', $files), 'Config export contains collection/test2/config_test.another_create.yml.');
- $this->assertTrue(in_array('collection/test1/config_test.update.yml', $files), 'Config export contains collection/test1/config_test.update.yml.');
- $this->assertTrue(in_array('collection/test2/config_test.another_update.yml', $files), 'Config export contains collection/test2/config_test.another_update.yml.');
- $this->assertFalse(in_array('collection/test1/config_test.delete.yml', $files), 'Config export does not contain collection/test1/config_test.delete.yml.');
- $this->assertFalse(in_array('collection/test2/config_test.another_delete.yml', $files), 'Config export does not contain collection/test2/config_test.another_delete.yml.');
+ $this->assertContains('collection/test1/config_test.create.yml', $files, 'Config export contains collection/test1/config_test.create.yml.');
+ $this->assertContains('collection/test2/config_test.another_create.yml', $files, 'Config export contains collection/test2/config_test.another_create.yml.');
+ $this->assertContains('collection/test1/config_test.update.yml', $files, 'Config export contains collection/test1/config_test.update.yml.');
+ $this->assertContains('collection/test2/config_test.another_update.yml', $files, 'Config export contains collection/test2/config_test.another_update.yml.');
+ $this->assertNotContains('collection/test1/config_test.delete.yml', $files, 'Config export does not contain collection/test1/config_test.delete.yml.');
+ $this->assertNotContains('collection/test2/config_test.another_delete.yml', $files, 'Config export does not contain collection/test2/config_test.another_delete.yml.');
$this->drupalPostForm('admin/config/development/configuration/full/import', ['files[import_tarball]' => $filename], 'Upload');
// Verify that there are configuration differences to import.
diff --git a/web/core/modules/config/tests/src/Functional/ConfigExportUITest.php b/web/core/modules/config/tests/src/Functional/ConfigExportUITest.php
index ba88e6d2d1..2c95b4e392 100644
--- a/web/core/modules/config/tests/src/Functional/ConfigExportUITest.php
+++ b/web/core/modules/config/tests/src/Functional/ConfigExportUITest.php
@@ -53,7 +53,7 @@ public function testExport() {
// Submit the export form and verify response. This will create a file in
// temporary directory with the default name config.tar.gz.
$this->drupalPostForm('admin/config/development/configuration/full/export', [], t('Export'));
- $this->assertResponse(200, 'User can access the download callback.');
+ $this->assertSession()->statusCodeEquals(200);
// Test if header contains file name with hostname and timestamp.
$request = \Drupal::request();
@@ -97,7 +97,7 @@ public function testExport() {
// permission.
$this->drupalLogout();
$this->drupalGet('system/temporary', ['query' => ['file' => 'config.tar.gz']]);
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
}
}
diff --git a/web/core/modules/config/tests/src/Functional/ConfigImportUITest.php b/web/core/modules/config/tests/src/Functional/ConfigImportUITest.php
index 500a579c44..0f80023a4f 100644
--- a/web/core/modules/config/tests/src/Functional/ConfigImportUITest.php
+++ b/web/core/modules/config/tests/src/Functional/ConfigImportUITest.php
@@ -19,7 +19,13 @@ class ConfigImportUITest extends BrowserTestBase {
*
* @var array
*/
- public static $modules = ['config', 'config_test', 'config_import_test', 'text', 'options'];
+ public static $modules = [
+ 'config',
+ 'config_test',
+ 'config_import_test',
+ 'text',
+ 'options',
+ ];
/**
* {@inheritdoc}
@@ -76,12 +82,12 @@ public function testImport() {
$sync->write($dynamic_name, $original_dynamic_data);
$this->assertIdentical($sync->exists($dynamic_name), TRUE, $dynamic_name . ' found.');
- // Enable the Action and Ban modules during import. The Ban
- // module is used because it creates a table during the install. The Action
- // module is used because it creates a single simple configuration file
- // during the install.
+ // Enable the Automated Cron and Ban modules during import. The Ban
+ // module is used because it creates a table during the install.
+ // The Automated Cron module is used because it creates a single simple
+ // configuration file during the install.
$core_extension = $this->config('core.extension')->get();
- $core_extension['module']['action'] = 0;
+ $core_extension['module']['automated_cron'] = 0;
$core_extension['module']['ban'] = 0;
$core_extension['module'] = module_config_sort($core_extension['module']);
// Bartik is a subtheme of classy so classy must be enabled.
@@ -98,10 +104,10 @@ public function testImport() {
$system_theme['default'] = 'bartik';
$sync->write('system.theme', $system_theme);
- // Read the action config from module default config folder.
- $action_settings = $install_storage->read('action.settings');
- $action_settings['recursion_limit'] = 50;
- $sync->write('action.settings', $action_settings);
+ // Read the automated_cron config from module default config folder.
+ $settings = $install_storage->read('automated_cron.settings');
+ $settings['interval'] = 10000;
+ $sync->write('automated_cron.settings', $settings);
// Uninstall the Options and Text modules to ensure that dependencies are
// handled correctly. Options depends on Text so Text should be installed
@@ -119,7 +125,7 @@ public function testImport() {
$this->assertRaw('<td>' . $dynamic_name);
$this->assertRaw('<td>core.extension');
$this->assertRaw('<td>system.theme');
- $this->assertRaw('<td>action.settings');
+ $this->assertRaw('<td>automated_cron.settings');
$this->assertFieldById('edit-submit', t('Import all'));
// Import and verify that both do not appear anymore.
@@ -128,7 +134,7 @@ public function testImport() {
$this->assertNoRaw('<td>' . $dynamic_name);
$this->assertNoRaw('<td>core.extension');
$this->assertNoRaw('<td>system.theme');
- $this->assertNoRaw('<td>action.settings');
+ $this->assertNoRaw('<td>automated_cron.settings');
$this->assertNoFieldById('edit-submit', t('Import all'));
@@ -148,7 +154,7 @@ public function testImport() {
$this->rebuildContainer();
$this->assertTrue(\Drupal::moduleHandler()->moduleExists('ban'), 'Ban module installed during import.');
$this->assertTrue(\Drupal::database()->schema()->tableExists('ban_ip'), 'The database table ban_ip exists.');
- $this->assertTrue(\Drupal::moduleHandler()->moduleExists('action'), 'Action module installed during import.');
+ $this->assertTrue(\Drupal::moduleHandler()->moduleExists('automated_cron'), 'Automated Cron module installed during import.');
$this->assertTrue(\Drupal::moduleHandler()->moduleExists('options'), 'Options module installed during import.');
$this->assertTrue(\Drupal::moduleHandler()->moduleExists('text'), 'Text module installed during import.');
$this->assertTrue(\Drupal::service('theme_handler')->themeExists('bartik'), 'Bartik theme installed during import.');
@@ -156,26 +162,26 @@ public function testImport() {
// Ensure installations and uninstallation occur as expected.
$installed = \Drupal::state()->get('ConfigImportUITest.core.extension.modules_installed', []);
$uninstalled = \Drupal::state()->get('ConfigImportUITest.core.extension.modules_uninstalled', []);
- $expected = ['action', 'ban', 'text', 'options'];
- $this->assertIdentical($expected, $installed, 'Action, Ban, Text and Options modules installed in the correct order.');
+ $expected = ['automated_cron', 'ban', 'text', 'options'];
+ $this->assertIdentical($expected, $installed, 'Automated Cron, Ban, Text and Options modules installed in the correct order.');
$this->assertTrue(empty($uninstalled), 'No modules uninstalled during import');
- // Verify that the action.settings configuration object was only written
+ // Verify that the automated_cron configuration object was only written
// once during the import process and only with the value set in the staged
// configuration. This verifies that the module's default configuration is
// used during configuration import and, additionally, that after installing
// a module, that configuration is not synced twice.
- $recursion_limit_values = \Drupal::state()->get('ConfigImportUITest.action.settings.recursion_limit', []);
- $this->assertIdentical($recursion_limit_values, [50]);
+ $interval_values = \Drupal::state()->get('ConfigImportUITest.automated_cron.settings.interval', []);
+ $this->assertIdentical($interval_values, [10000]);
$core_extension = $this->config('core.extension')->get();
- unset($core_extension['module']['action']);
+ unset($core_extension['module']['automated_cron']);
unset($core_extension['module']['ban']);
unset($core_extension['module']['options']);
unset($core_extension['module']['text']);
unset($core_extension['theme']['bartik']);
$sync->write('core.extension', $core_extension);
- $sync->delete('action.settings');
+ $sync->delete('automated_cron.settings');
$sync->delete('text.settings');
$system_theme = $this->config('system.theme')->get();
@@ -191,35 +197,35 @@ public function testImport() {
$this->drupalGet('admin/config/development/configuration');
$this->assertRaw('<td>core.extension');
$this->assertRaw('<td>system.theme');
- $this->assertRaw('<td>action.settings');
+ $this->assertRaw('<td>automated_cron.settings');
// Import and verify that both do not appear anymore.
$this->drupalPostForm(NULL, [], t('Import all'));
$this->assertNoRaw('<td>core.extension');
$this->assertNoRaw('<td>system.theme');
- $this->assertNoRaw('<td>action.settings');
+ $this->assertNoRaw('<td>automated_cron.settings');
$this->rebuildContainer();
$this->assertFalse(\Drupal::moduleHandler()->moduleExists('ban'), 'Ban module uninstalled during import.');
$this->assertFalse(\Drupal::database()->schema()->tableExists('ban_ip'), 'The database table ban_ip does not exist.');
- $this->assertFalse(\Drupal::moduleHandler()->moduleExists('action'), 'Action module uninstalled during import.');
+ $this->assertFalse(\Drupal::moduleHandler()->moduleExists('automated_cron'), 'Automated cron module uninstalled during import.');
$this->assertFalse(\Drupal::moduleHandler()->moduleExists('options'), 'Options module uninstalled during import.');
$this->assertFalse(\Drupal::moduleHandler()->moduleExists('text'), 'Text module uninstalled during import.');
// Ensure installations and uninstallation occur as expected.
$installed = \Drupal::state()->get('ConfigImportUITest.core.extension.modules_installed', []);
$uninstalled = \Drupal::state()->get('ConfigImportUITest.core.extension.modules_uninstalled', []);
- $expected = ['options', 'text', 'ban', 'action'];
- $this->assertIdentical($expected, $uninstalled, 'Options, Text, Ban and Action modules uninstalled in the correct order.');
+ $expected = ['options', 'text', 'ban', 'automated_cron'];
+ $this->assertIdentical($expected, $uninstalled, 'Options, Text, Ban and Automated Cron modules uninstalled in the correct order.');
$this->assertTrue(empty($installed), 'No modules installed during import');
$theme_info = \Drupal::service('theme_handler')->listInfo();
$this->assertFalse(isset($theme_info['bartik']), 'Bartik theme uninstalled during import.');
- // Verify that the action.settings configuration object was only deleted
- // once during the import process.
- $delete_called = \Drupal::state()->get('ConfigImportUITest.action.settings.delete', 0);
- $this->assertIdentical($delete_called, 1, "The action.settings configuration was deleted once during configuration import.");
+ // Verify that the automated_cron.settings configuration object was only
+ // deleted once during the import process.
+ $delete_called = \Drupal::state()->get('ConfigImportUITest.automated_cron.settings.delete', 0);
+ $this->assertIdentical($delete_called, 1, "The automated_cron.settings configuration was deleted once during configuration import.");
}
/**
@@ -295,7 +301,7 @@ public function testImportDiff() {
// Load the diff UI and verify that the diff reflects the change.
$this->drupalGet('admin/config/development/configuration/sync/diff/' . $config_name);
$this->assertNoRaw('&nbsp;');
- $this->assertTitle(new FormattableMarkup('View changes of @config_name | Drupal', ['@config_name' => $config_name]));
+ $this->assertTitle("View changes of $config_name | Drupal");
// The following assertions do not use $this::assertEscaped() because
// \Drupal\Component\Diff\DiffFormatter adds markup that signifies what has
diff --git a/web/core/modules/config/tests/src/Functional/ConfigImportUploadTest.php b/web/core/modules/config/tests/src/Functional/ConfigImportUploadTest.php
index ed62bd12e9..bd28666b32 100644
--- a/web/core/modules/config/tests/src/Functional/ConfigImportUploadTest.php
+++ b/web/core/modules/config/tests/src/Functional/ConfigImportUploadTest.php
@@ -47,7 +47,7 @@ protected function setUp() {
public function testImport() {
// Verify access to the config upload form.
$this->drupalGet('admin/config/development/configuration/full/import');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Attempt to upload a non-tar file.
$text_file = $this->getTestFiles('text')[0];
@@ -63,7 +63,7 @@ public function testImport() {
// Ensure submit button for \Drupal\config\Form\ConfigImportForm is
// disabled.
$submit_is_disabled = $this->cssSelect('form.config-import-form input[type="submit"]:disabled');
- $this->assertTrue(count($submit_is_disabled) === 1, 'The submit button is disabled.');
+ $this->assertCount(1, $submit_is_disabled, 'The submit button is disabled.');
}
}
diff --git a/web/core/modules/config/tests/src/Functional/ConfigInstallProfileOverrideTest.php b/web/core/modules/config/tests/src/Functional/ConfigInstallProfileOverrideTest.php
index 80a6861b33..a21ef72ce4 100644
--- a/web/core/modules/config/tests/src/Functional/ConfigInstallProfileOverrideTest.php
+++ b/web/core/modules/config/tests/src/Functional/ConfigInstallProfileOverrideTest.php
@@ -58,7 +58,7 @@ public function testInstallProfileConfigOverwrite() {
// file directly, because the install profile default system.cron.yml
// configuration file was used to create the active configuration.
$config_dir = drupal_get_path('module', 'system') . '/' . InstallStorage::CONFIG_INSTALL_DIRECTORY;
- $this->assertTrue(is_dir($config_dir));
+ $this->assertDirectoryExists($config_dir);
$source_storage = new FileStorage($config_dir);
$data = $source_storage->read($config_name);
$this->assertIdentical($data, $expected_original_data);
diff --git a/web/core/modules/config/tests/src/Functional/ConfigInstallProfileUnmetDependenciesTest.php b/web/core/modules/config/tests/src/Functional/ConfigInstallProfileUnmetDependenciesTest.php
index b9ae7bc5c9..7ea66a167f 100644
--- a/web/core/modules/config/tests/src/Functional/ConfigInstallProfileUnmetDependenciesTest.php
+++ b/web/core/modules/config/tests/src/Functional/ConfigInstallProfileUnmetDependenciesTest.php
@@ -86,8 +86,8 @@ protected function copyTestingOverrides() {
*/
public function testInstalled() {
if ($this->expectedException) {
- $this->assertContains('Configuration objects provided by <em class="placeholder">testing_config_overrides</em> have unmet dependencies: <em class="placeholder">system.action.user_block_user_action (does_not_exist)</em>', $this->expectedException->getMessage());
- $this->assertContains('Drupal\Core\Config\UnmetDependenciesException', $this->expectedException->getMessage());
+ $this->assertStringContainsString('Configuration objects provided by <em class="placeholder">testing_config_overrides</em> have unmet dependencies: <em class="placeholder">system.action.user_block_user_action (does_not_exist)</em>', $this->expectedException->getMessage());
+ $this->assertStringContainsString('Drupal\Core\Config\UnmetDependenciesException', $this->expectedException->getMessage());
}
else {
$this->fail('Expected Drupal\Core\Config\UnmetDependenciesException exception not thrown');
diff --git a/web/core/modules/config/tests/src/Functional/ConfigInstallWebTest.php b/web/core/modules/config/tests/src/Functional/ConfigInstallWebTest.php
index 52a26837e1..3cc8fda790 100644
--- a/web/core/modules/config/tests/src/Functional/ConfigInstallWebTest.php
+++ b/web/core/modules/config/tests/src/Functional/ConfigInstallWebTest.php
@@ -198,7 +198,7 @@ public function testUnmetDependenciesInstall() {
$this->drupalPostForm('admin/modules', ['modules[config_other_module_config_test][enable]' => TRUE], t('Install'));
$this->drupalPostForm('admin/modules', ['modules[config_install_dependency_test][enable]' => TRUE], t('Install'));
$this->rebuildContainer();
- $this->assertInstanceOf(ConfigTest::class, \Drupal::entityTypeManager()->getStorage('config_test')->load('other_module_test_with_dependency'), 'The config_test.dynamic.other_module_test_with_dependency configuration has been created during install.');
+ $this->assertInstanceOf(ConfigTest::class, \Drupal::entityTypeManager()->getStorage('config_test')->load('other_module_test_with_dependency'));
}
/**
diff --git a/web/core/modules/config/tests/src/Functional/ConfigLanguageOverrideWebTest.php b/web/core/modules/config/tests/src/Functional/ConfigLanguageOverrideWebTest.php
index b67d2b9400..b35821cb37 100644
--- a/web/core/modules/config/tests/src/Functional/ConfigLanguageOverrideWebTest.php
+++ b/web/core/modules/config/tests/src/Functional/ConfigLanguageOverrideWebTest.php
@@ -71,7 +71,7 @@ public function testSiteNameTranslation() {
// determine the front page. This occurs before language negotiation causing
// the configuration factory to cache an object without the correct
// overrides. We are testing that the configuration factory is
- // re-initialised after language negotiation. Ensure that it applies when
+ // re-initialized after language negotiation. Ensure that it applies when
// we access the XX front page.
// @see \Drupal\Core\PathProcessor::processInbound()
$this->drupalGet('xx');
diff --git a/web/core/modules/config/tests/src/Functional/ConfigSingleImportExportTest.php b/web/core/modules/config/tests/src/Functional/ConfigSingleImportExportTest.php
index c80af8d9e6..f5f1fa87ec 100644
--- a/web/core/modules/config/tests/src/Functional/ConfigSingleImportExportTest.php
+++ b/web/core/modules/config/tests/src/Functional/ConfigSingleImportExportTest.php
@@ -187,8 +187,8 @@ public function testImport() {
$this->drupalPostForm(NULL, [], t('Confirm'));
$entity = $storage->load('second');
$this->assertRaw(t('The configuration was imported successfully.'));
- $this->assertTrue(is_string($entity->label()), 'Entity label is a string');
- $this->assertTrue(strpos($entity->label(), 'ObjectSerialization') > 0, 'Label contains serialized object');
+ $this->assertIsString($entity->label());
+ $this->assertStringContainsString('ObjectSerialization', $entity->label(), 'Label contains serialized object');
}
else {
// If the Symfony parser is used there will be an error.
diff --git a/web/core/modules/config_translation/config_translation.info.yml b/web/core/modules/config_translation/config_translation.info.yml
index 904f57783e..e34c44c6dc 100644
--- a/web/core/modules/config_translation/config_translation.info.yml
+++ b/web/core/modules/config_translation/config_translation.info.yml
@@ -1,6 +1,6 @@
name: 'Configuration Translation'
type: module
-description: 'Provides a translation interface for configuration.'
+description: 'Allows users to translate configuration text.'
package: Multilingual
version: VERSION
core: 8.x
diff --git a/web/core/modules/config_translation/src/ConfigEntityMapper.php b/web/core/modules/config_translation/src/ConfigEntityMapper.php
index 69c1211cfe..97659a68b7 100644
--- a/web/core/modules/config_translation/src/ConfigEntityMapper.php
+++ b/web/core/modules/config_translation/src/ConfigEntityMapper.php
@@ -254,8 +254,10 @@ public function getContextualLinkGroup() {
case 'menu':
case 'block':
return $this->entityType;
+
case 'view':
return 'entity.view.edit_form';
+
default:
return NULL;
}
diff --git a/web/core/modules/config_translation/src/Controller/ConfigTranslationFieldListBuilder.php b/web/core/modules/config_translation/src/Controller/ConfigTranslationFieldListBuilder.php
index 660417d91c..d0c7765008 100644
--- a/web/core/modules/config_translation/src/Controller/ConfigTranslationFieldListBuilder.php
+++ b/web/core/modules/config_translation/src/Controller/ConfigTranslationFieldListBuilder.php
@@ -61,10 +61,12 @@ class ConfigTranslationFieldListBuilder extends ConfigTranslationEntityListBuild
*/
public static function createInstance(ContainerInterface $container, EntityTypeInterface $entity_type) {
$entity_type_manager = $container->get('entity_type.manager');
+ $entity_type_bundle_info = $container->get('entity_type.bundle.info');
return new static(
$entity_type,
$entity_type_manager->getStorage($entity_type->id()),
- $entity_type_manager
+ $entity_type_manager,
+ $entity_type_bundle_info
);
}
diff --git a/web/core/modules/config_translation/src/FormElement/FormElementBase.php b/web/core/modules/config_translation/src/FormElement/FormElementBase.php
index 3c97daf1b4..757a5f356b 100644
--- a/web/core/modules/config_translation/src/FormElement/FormElementBase.php
+++ b/web/core/modules/config_translation/src/FormElement/FormElementBase.php
@@ -138,9 +138,9 @@ protected function getSourceElement(LanguageInterface $source_language, $source_
* utilizing a form element of type 'text_format' and its #format and
* #allowed_formats properties. The access logic explained above is then
* handled by the 'text_format' element itself, specifically by
- * filter_process_format(). In case such a rich element is not available for
- * translation of complex data, similar access logic must be implemented
- * manually.
+ * \Drupal\filter\Element\TextFormat::processFormat(). In case such a rich
+ * element is not available for translation of complex data, similar access
+ * logic must be implemented manually.
*
* @param \Drupal\Core\Language\LanguageInterface $translation_language
* The language to display the translation form for.
@@ -153,7 +153,7 @@ protected function getSourceElement(LanguageInterface $source_language, $source_
* Form API array to represent the form element.
*
* @see \Drupal\config_translation\FormElement\TextFormat
- * @see filter_process_format()
+ * @see \Drupal\filter\Element\TextFormat::processFormat()
*/
protected function getTranslationElement(LanguageInterface $translation_language, $source_config, $translation_config) {
// Add basic properties that apply to all form elements.
diff --git a/web/core/modules/config_translation/tests/src/Functional/ConfigTranslationDateFormatUiTest.php b/web/core/modules/config_translation/tests/src/Functional/ConfigTranslationDateFormatUiTest.php
index c0c8873851..de0688cb8d 100644
--- a/web/core/modules/config_translation/tests/src/Functional/ConfigTranslationDateFormatUiTest.php
+++ b/web/core/modules/config_translation/tests/src/Functional/ConfigTranslationDateFormatUiTest.php
@@ -6,7 +6,7 @@
use Drupal\Tests\BrowserTestBase;
/**
- * Tests the content translation behaviours on date formats.
+ * Tests the content translation behaviors on date formats.
*
* @group config_translation
*/
@@ -40,7 +40,7 @@ protected function setUp() {
}
/**
- * Tests date format translation behaviour.
+ * Tests date format translation behavior.
*/
public function testDateFormatUI() {
$this->drupalGet('admin/config/regional/date-time');
diff --git a/web/core/modules/config_translation/tests/src/Functional/ConfigTranslationInstallTest.php b/web/core/modules/config_translation/tests/src/Functional/ConfigTranslationInstallTest.php
index 3a1fe8c60e..4594e06e80 100644
--- a/web/core/modules/config_translation/tests/src/Functional/ConfigTranslationInstallTest.php
+++ b/web/core/modules/config_translation/tests/src/Functional/ConfigTranslationInstallTest.php
@@ -68,7 +68,7 @@ public function testConfigTranslation() {
$this->drupalPostForm('admin/modules', $edit, t('Install'));
$this->drupalGet('/admin/structure/types/manage/article/fields');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
}
}
diff --git a/web/core/modules/config_translation/tests/src/Functional/ConfigTranslationOverviewTest.php b/web/core/modules/config_translation/tests/src/Functional/ConfigTranslationOverviewTest.php
index d5647d45a4..3519a5c7b3 100644
--- a/web/core/modules/config_translation/tests/src/Functional/ConfigTranslationOverviewTest.php
+++ b/web/core/modules/config_translation/tests/src/Functional/ConfigTranslationOverviewTest.php
@@ -3,7 +3,10 @@
namespace Drupal\Tests\config_translation\Functional;
use Drupal\Component\Utility\Html;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\field\Entity\FieldStorageConfig;
use Drupal\language\Entity\ConfigurableLanguage;
+use Drupal\node\Entity\NodeType;
use Drupal\Tests\BrowserTestBase;
/**
@@ -26,6 +29,8 @@ class ConfigTranslationOverviewTest extends BrowserTestBase {
'contact',
'contextual',
'entity_test_operation',
+ 'field_ui',
+ 'node',
'views',
'views_ui',
];
@@ -82,7 +87,7 @@ public function testMapperListPage() {
// Make sure there is only a single operation for each dropbutton, either
// 'List' or 'Translate'.
foreach ($this->cssSelect('ul.dropbutton') as $i => $dropbutton) {
- $this->assertIdentical(1, count($dropbutton->findAll('xpath', 'li')));
+ $this->assertCount(1, $dropbutton->findAll('xpath', 'li'));
$this->assertTrue(($dropbutton->getText() === 'Translate') || ($dropbutton->getText() === 'List'));
}
@@ -108,7 +113,7 @@ public function testMapperListPage() {
// Make sure there is only a single 'Translate' operation for each
// dropbutton.
foreach ($this->cssSelect('ul.dropbutton') as $i => $dropbutton) {
- $this->assertIdentical(1, count($dropbutton->findAll('xpath', 'li')));
+ $this->assertCount(1, $dropbutton->findAll('xpath', 'li'));
$this->assertIdentical('Translate', $dropbutton->getText());
}
@@ -171,4 +176,31 @@ public function testListingPageWithOverrides() {
$this->assertNoText($overridden_label);
}
+ /**
+ * Tests the field listing for the translate operation.
+ */
+ public function testListingFieldsPage() {
+ // Create a content type.
+ $node_type = NodeType::create([
+ 'type' => 'basic',
+ 'name' => 'Basic',
+ ]);
+ $node_type->save();
+
+ $field = FieldConfig::create([
+ // The field storage is guaranteed to exist because it is supplied by the
+ // node module.
+ 'field_storage' => FieldStorageConfig::loadByName('node', 'body'),
+ 'bundle' => $node_type->id(),
+ 'label' => 'Body',
+ 'settings' => ['display_summary' => FALSE],
+ ]);
+ $field->save();
+
+ $this->drupalGet('admin/config/regional/config-translation/node_fields');
+ $this->assertText('Body');
+ $this->assertText('Basic');
+ $this->assertLinkByHref('admin/structure/types/manage/basic/fields/node.basic.body/translate');
+ }
+
}
diff --git a/web/core/modules/config_translation/tests/src/Functional/ConfigTranslationUiTest.php b/web/core/modules/config_translation/tests/src/Functional/ConfigTranslationUiTest.php
index 097262a46b..343b348110 100644
--- a/web/core/modules/config_translation/tests/src/Functional/ConfigTranslationUiTest.php
+++ b/web/core/modules/config_translation/tests/src/Functional/ConfigTranslationUiTest.php
@@ -294,7 +294,7 @@ public function testSourceValueDuplicateSave() {
$this->drupalLogout();
$this->drupalLogin($this->translatorUser);
$this->drupalGet('admin/config/system/site-information');
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
// While translator can access the translation page, the edit link is not
// present due to lack of permissions.
@@ -430,7 +430,7 @@ public function testContactConfigEntityTranslation() {
$this->drupalLogout();
$this->drupalLogin($this->translatorUser);
$this->drupalGet('admin/structure/contact/manage/feedback');
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
// While translator can access the translation page, the edit link is not
// present due to lack of permissions.
@@ -552,7 +552,7 @@ public function testSourceAndTargetLanguage() {
// Loading translation page for not-specified language (und)
// should return 403.
$this->drupalGet('admin/config/system/site-information/translate/und/add');
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
// Check the source language doesn't have 'Add' or 'Delete' link and
// make sure source language edit goes to original configuration page
@@ -565,15 +565,15 @@ public function testSourceAndTargetLanguage() {
// Translation addition to source language should return 403.
$this->drupalGet('admin/config/system/site-information/translate/en/add');
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
// Translation editing in source language should return 403.
$this->drupalGet('admin/config/system/site-information/translate/en/edit');
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
// Translation deletion in source language should return 403.
$this->drupalGet('admin/config/system/site-information/translate/en/delete');
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
// Set default language of site information to not-specified language (und).
$this->config('system.site')
@@ -586,7 +586,7 @@ public function testSourceAndTargetLanguage() {
// If source language is not specified, translation page should be 403.
$this->drupalGet('admin/config/system/site-information/translate');
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
}
/**
@@ -877,7 +877,7 @@ public function testSingleLanguageUI() {
// Visit account setting translation page, this should not
// throw any notices.
$this->drupalGet('admin/config/people/accounts/translate');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
}
/**
@@ -1156,9 +1156,7 @@ protected function assertDisabledTextarea($id) {
':id' => $id,
]);
$textarea = reset($textarea);
- $this->assertTrue($textarea instanceof NodeElement, new FormattableMarkup('Disabled field @id exists.', [
- '@id' => $id,
- ]));
+ $this->assertInstanceOf(NodeElement::class, $textarea);
$expected = 'This field has been disabled because you do not have sufficient permissions to edit it.';
$this->assertEqual($textarea->getText(), $expected, new FormattableMarkup('Disabled textarea @id hides text in an inaccessible text format.', [
'@id' => $id,
diff --git a/web/core/modules/config_translation/tests/src/Functional/ConfigTranslationUiThemeTest.php b/web/core/modules/config_translation/tests/src/Functional/ConfigTranslationUiThemeTest.php
index 6754420c1c..501fa2bee3 100644
--- a/web/core/modules/config_translation/tests/src/Functional/ConfigTranslationUiThemeTest.php
+++ b/web/core/modules/config_translation/tests/src/Functional/ConfigTranslationUiThemeTest.php
@@ -74,7 +74,7 @@ public function testThemeDiscovery() {
$translation_base_url = 'admin/config/development/performance/translate';
$this->drupalGet($translation_base_url);
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertLinkByHref("$translation_base_url/fr/add");
}
diff --git a/web/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateSystemMaintenanceTranslationTest.php b/web/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateSystemMaintenanceTranslationTest.php
index 26d68eed99..71324a6201 100644
--- a/web/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateSystemMaintenanceTranslationTest.php
+++ b/web/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateSystemMaintenanceTranslationTest.php
@@ -15,8 +15,6 @@ class MigrateSystemMaintenanceTranslationTest extends MigrateDrupal6TestBase {
public static $modules = [
'language',
'config_translation',
- // Required for translation migrations.
- 'migrate_drupal_multilingual',
];
/**
diff --git a/web/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateSystemSiteTranslationTest.php b/web/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateSystemSiteTranslationTest.php
index e420943264..ca8404964f 100644
--- a/web/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateSystemSiteTranslationTest.php
+++ b/web/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateSystemSiteTranslationTest.php
@@ -15,8 +15,6 @@ class MigrateSystemSiteTranslationTest extends MigrateDrupal6TestBase {
public static $modules = [
'language',
'config_translation',
- // Required for translation migrations.
- 'migrate_drupal_multilingual',
];
/**
diff --git a/web/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateUserConfigsTranslationTest.php b/web/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateUserConfigsTranslationTest.php
index 5ff8402deb..c6fcc5801f 100644
--- a/web/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateUserConfigsTranslationTest.php
+++ b/web/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateUserConfigsTranslationTest.php
@@ -19,8 +19,6 @@ class MigrateUserConfigsTranslationTest extends MigrateDrupal6TestBase {
'language',
'locale',
'config_translation',
- // Required for translation migrations.
- 'migrate_drupal_multilingual',
];
/**
diff --git a/web/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateUserProfileFieldInstanceTranslationTest.php b/web/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateUserProfileFieldInstanceTranslationTest.php
index 033f22b9e8..de0094c644 100644
--- a/web/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateUserProfileFieldInstanceTranslationTest.php
+++ b/web/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateUserProfileFieldInstanceTranslationTest.php
@@ -20,8 +20,6 @@ class MigrateUserProfileFieldInstanceTranslationTest extends MigrateDrupal6TestB
'locale',
'language',
'field',
- // Required for translation migrations.
- 'migrate_drupal_multilingual',
];
/**
diff --git a/web/core/modules/config_translation/tests/src/Kernel/Migrate/d7/MigrateSystemMaintenanceTranslationTest.php b/web/core/modules/config_translation/tests/src/Kernel/Migrate/d7/MigrateSystemMaintenanceTranslationTest.php
index df44e407d4..9724cfefad 100644
--- a/web/core/modules/config_translation/tests/src/Kernel/Migrate/d7/MigrateSystemMaintenanceTranslationTest.php
+++ b/web/core/modules/config_translation/tests/src/Kernel/Migrate/d7/MigrateSystemMaintenanceTranslationTest.php
@@ -14,8 +14,6 @@ class MigrateSystemMaintenanceTranslationTest extends MigrateDrupal7TestBase {
public static $modules = [
'language',
'config_translation',
- // Required for translation migrations.
- 'migrate_drupal_multilingual',
];
/**
diff --git a/web/core/modules/config_translation/tests/src/Kernel/Migrate/d7/MigrateSystemSiteTranslationTest.php b/web/core/modules/config_translation/tests/src/Kernel/Migrate/d7/MigrateSystemSiteTranslationTest.php
index e25a0f8fb9..bb28e30244 100644
--- a/web/core/modules/config_translation/tests/src/Kernel/Migrate/d7/MigrateSystemSiteTranslationTest.php
+++ b/web/core/modules/config_translation/tests/src/Kernel/Migrate/d7/MigrateSystemSiteTranslationTest.php
@@ -17,8 +17,6 @@ class MigrateSystemSiteTranslationTest extends MigrateDrupal7TestBase {
public static $modules = [
'language',
'config_translation',
- // Required for translation migrations.
- 'migrate_drupal_multilingual',
];
/**
diff --git a/web/core/modules/config_translation/tests/src/Kernel/Migrate/d7/MigrateUserConfigsTranslationTest.php b/web/core/modules/config_translation/tests/src/Kernel/Migrate/d7/MigrateUserConfigsTranslationTest.php
index 2388fe3240..d830712acc 100644
--- a/web/core/modules/config_translation/tests/src/Kernel/Migrate/d7/MigrateUserConfigsTranslationTest.php
+++ b/web/core/modules/config_translation/tests/src/Kernel/Migrate/d7/MigrateUserConfigsTranslationTest.php
@@ -21,8 +21,6 @@ class MigrateUserConfigsTranslationTest extends MigrateDrupal7TestBase {
'language',
'locale',
'config_translation',
- // Required for translation migrations.
- 'migrate_drupal_multilingual',
];
/**
diff --git a/web/core/modules/config_translation/tests/src/Unit/ConfigEntityMapperTest.php b/web/core/modules/config_translation/tests/src/Unit/ConfigEntityMapperTest.php
index bc9e2d79b5..52a05289a4 100644
--- a/web/core/modules/config_translation/tests/src/Unit/ConfigEntityMapperTest.php
+++ b/web/core/modules/config_translation/tests/src/Unit/ConfigEntityMapperTest.php
@@ -135,7 +135,7 @@ public function testEntityGetterAndSetter() {
// Ensure that the configuration name was added to the mapper.
$plugin_definition = $this->configEntityMapper->getPluginDefinition();
- $this->assertTrue(in_array('config_prefix.entity_id', $plugin_definition['names']));
+ $this->assertContains('config_prefix.entity_id', $plugin_definition['names']);
// Make sure setEntity() returns FALSE when called a second time.
$result = $this->configEntityMapper->setEntity($this->entity);
diff --git a/web/core/modules/config_translation/tests/src/Unit/ConfigFieldMapperTest.php b/web/core/modules/config_translation/tests/src/Unit/ConfigFieldMapperTest.php
index 5ab3192d94..493939e105 100644
--- a/web/core/modules/config_translation/tests/src/Unit/ConfigFieldMapperTest.php
+++ b/web/core/modules/config_translation/tests/src/Unit/ConfigFieldMapperTest.php
@@ -111,7 +111,7 @@ public function testSetEntity() {
// Ensure that the configuration name was added to the mapper.
$plugin_definition = $this->configFieldMapper->getPluginDefinition();
- $this->assertTrue(in_array('config_prefix.field_storage_id', $plugin_definition['names']));
+ $this->assertContains('config_prefix.field_storage_id', $plugin_definition['names']);
// Make sure setEntity() returns FALSE when called a second time.
$result = $this->configFieldMapper->setEntity($this->entity);
diff --git a/web/core/modules/contact/contact.info.yml b/web/core/modules/contact/contact.info.yml
index 2507fbd167..150e1db51d 100644
--- a/web/core/modules/contact/contact.info.yml
+++ b/web/core/modules/contact/contact.info.yml
@@ -1,6 +1,6 @@
name: Contact
type: module
-description: 'Enables the use of both personal and site-wide contact forms.'
+description: 'Provides site-wide contact forms and forms to contact individual users.'
package: Core
version: VERSION
core: 8.x
diff --git a/web/core/modules/contact/src/ContactFormInterface.php b/web/core/modules/contact/src/ContactFormInterface.php
index d179c1563d..ef3b3ebfa8 100644
--- a/web/core/modules/contact/src/ContactFormInterface.php
+++ b/web/core/modules/contact/src/ContactFormInterface.php
@@ -38,7 +38,7 @@ public function getRedirectPath();
*
* Empty redirect property results a url object of front page.
*
- * @return \Drupal\core\Url
+ * @return \Drupal\Core\Url
* The redirect url object.
*/
public function getRedirectUrl();
diff --git a/web/core/modules/contact/tests/src/Functional/ContactLanguageTest.php b/web/core/modules/contact/tests/src/Functional/ContactLanguageTest.php
index 2f08a9f40b..1b2f0b164c 100644
--- a/web/core/modules/contact/tests/src/Functional/ContactLanguageTest.php
+++ b/web/core/modules/contact/tests/src/Functional/ContactLanguageTest.php
@@ -51,7 +51,7 @@ protected function setUp() {
public function testContactLanguage() {
// Ensure that contact form by default does not show the language select.
$this->drupalGet('contact');
- $this->assertResponse(200, 'The page exists');
+ $this->assertSession()->statusCodeEquals(200);
$this->assertNoField('edit-langcode-0-value');
// Enable language select from content language settings page.
@@ -62,7 +62,7 @@ public function testContactLanguage() {
// Ensure that contact form now shows the language select.
$this->drupalGet('contact');
- $this->assertResponse(200, 'The page exists');
+ $this->assertSession()->statusCodeEquals(200);
$this->assertField('edit-langcode-0-value');
}
diff --git a/web/core/modules/contact/tests/src/Functional/ContactPersonalTest.php b/web/core/modules/contact/tests/src/Functional/ContactPersonalTest.php
index d21e8e2b54..a6a5e20163 100644
--- a/web/core/modules/contact/tests/src/Functional/ContactPersonalTest.php
+++ b/web/core/modules/contact/tests/src/Functional/ContactPersonalTest.php
@@ -78,7 +78,7 @@ public function testSendPersonalContactMessage() {
$this->assertEscaped($mail);
$message = $this->submitPersonalContact($this->contactUser);
$mails = $this->getMails();
- $this->assertEqual(1, count($mails));
+ $this->assertCount(1, $mails);
$mail = $mails[0];
$this->assertEqual($mail['to'], $this->contactUser->getEmail());
$this->assertEqual($mail['from'], $this->config('system.site')->get('mail'));
@@ -91,9 +91,9 @@ public function testSendPersonalContactMessage() {
];
$subject = PlainTextOutput::renderFromHtml(t('[@site-name] @subject', $variables));
$this->assertEqual($mail['subject'], $subject, 'Subject is in sent message.');
- $this->assertTrue(strpos($mail['body'], 'Hello ' . $variables['@recipient-name']) !== FALSE, 'Recipient name is in sent message.');
- $this->assertTrue(strpos($mail['body'], $this->webUser->getDisplayName()) !== FALSE, 'Sender name is in sent message.');
- $this->assertTrue(strpos($mail['body'], $message['message[0][value]']) !== FALSE, 'Message body is in sent message.');
+ $this->assertStringContainsString('Hello ' . $variables['@recipient-name'], $mail['body'], 'Recipient name is in sent message.');
+ $this->assertStringContainsString($this->webUser->getDisplayName(), $mail['body'], 'Sender name is in sent message.');
+ $this->assertStringContainsString($message['message[0][value]'], $mail['body'], 'Message body is in sent message.');
// Check there was no problems raised during sending.
$this->drupalLogout();
@@ -117,7 +117,7 @@ public function testPersonalContactAccess() {
// Test allowed access to admin user's contact form.
$this->drupalLogin($this->webUser);
$this->drupalGet('user/' . $this->adminUser->id() . '/contact');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Check the page title is properly displayed.
$this->assertRaw(t('Contact @username', ['@username' => $this->adminUser->getDisplayName()]));
@@ -125,25 +125,25 @@ public function testPersonalContactAccess() {
$this->drupalLogout();
$this->drupalLogin($this->adminUser);
$this->drupalGet('user/' . $this->adminUser->id() . '/contact');
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
// Test allowed access to user with contact form enabled.
$this->drupalLogin($this->webUser);
$this->drupalGet('user/' . $this->contactUser->id() . '/contact');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Test that there is no access to personal contact forms for users
// without an email address configured.
$original_email = $this->contactUser->getEmail();
$this->contactUser->setEmail(FALSE)->save();
$this->drupalGet('user/' . $this->contactUser->id() . '/contact');
- $this->assertResponse(404, 'Not found (404) returned when visiting a personal contact form for a user with no email address');
+ $this->assertSession()->statusCodeEquals(404);
// Test that the 'contact tab' does not appear on the user profiles
// for users without an email address configured.
$this->drupalGet('user/' . $this->contactUser->id());
$contact_link = '/user/' . $this->contactUser->id() . '/contact';
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertNoLinkByHref($contact_link, 'The "contact" tab is hidden on profiles for users with no email address');
// Restore original email address.
@@ -151,30 +151,30 @@ public function testPersonalContactAccess() {
// Test denied access to the user's own contact form.
$this->drupalGet('user/' . $this->webUser->id() . '/contact');
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
// Test always denied access to the anonymous user contact form.
$this->drupalGet('user/0/contact');
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
// Test that anonymous users can access the contact form.
$this->drupalLogout();
user_role_grant_permissions(RoleInterface::ANONYMOUS_ID, ['access user contact forms']);
$this->drupalGet('user/' . $this->contactUser->id() . '/contact');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Test that anonymous users can access admin user's contact form.
$this->drupalGet('user/' . $this->adminUser->id() . '/contact');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertCacheContext('user');
// Revoke the personal contact permission for the anonymous user.
user_role_revoke_permissions(RoleInterface::ANONYMOUS_ID, ['access user contact forms']);
$this->drupalGet('user/' . $this->contactUser->id() . '/contact');
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
$this->assertCacheContext('user');
$this->drupalGet('user/' . $this->adminUser->id() . '/contact');
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
// Disable the personal contact form.
$this->drupalLogin($this->adminUser);
@@ -190,12 +190,12 @@ public function testPersonalContactAccess() {
// Test denied access to a user with contact form disabled.
$this->drupalLogin($this->webUser);
$this->drupalGet('user/' . $this->contactUser->id() . '/contact');
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
// Test allowed access for admin user to a user with contact form disabled.
$this->drupalLogin($this->adminUser);
$this->drupalGet('user/' . $this->contactUser->id() . '/contact');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Re-create our contacted user as a blocked user.
$this->contactUser = $this->drupalCreateUser();
@@ -204,12 +204,12 @@ public function testPersonalContactAccess() {
// Test that blocked users can still be contacted by admin.
$this->drupalGet('user/' . $this->contactUser->id() . '/contact');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Test that blocked users cannot be contacted by non-admins.
$this->drupalLogin($this->webUser);
$this->drupalGet('user/' . $this->contactUser->id() . '/contact');
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
// Test enabling and disabling the contact page through the user profile
// form.
@@ -227,7 +227,7 @@ public function testPersonalContactAccess() {
\Drupal::service('user.data')->set('contact', $this->contactUser->id(), 'enabled', 1);
$this->drupalGet('user/' . $this->contactUser->id() . '/contact');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
}
/**
@@ -301,7 +301,7 @@ protected function checkContactAccess($response, $contact_value = NULL) {
$this->drupalLogout();
$this->drupalGet('user/' . $user->id() . '/contact');
- $this->assertResponse($response);
+ $this->assertSession()->statusCodeEquals($response);
}
/**
diff --git a/web/core/modules/contact/tests/src/Functional/ContactSitewideTest.php b/web/core/modules/contact/tests/src/Functional/ContactSitewideTest.php
index 7960c2dcb5..ac8bf0ebfb 100644
--- a/web/core/modules/contact/tests/src/Functional/ContactSitewideTest.php
+++ b/web/core/modules/contact/tests/src/Functional/ContactSitewideTest.php
@@ -29,7 +29,15 @@ class ContactSitewideTest extends BrowserTestBase {
*
* @var array
*/
- public static $modules = ['text', 'contact', 'field_ui', 'contact_test', 'block', 'error_service_test', 'dblog'];
+ public static $modules = [
+ 'text',
+ 'contact',
+ 'field_ui',
+ 'contact_test',
+ 'block',
+ 'error_service_test',
+ 'dblog',
+ ];
/**
* {@inheritdoc}
@@ -115,7 +123,7 @@ public function testSiteWideContact() {
$this->assertNoLinkByHref('admin/structure/contact/manage/personal/delete');
$this->drupalGet('admin/structure/contact/manage/personal');
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
// Delete old forms to ensure that new forms are used.
$this->deleteContactForms();
@@ -127,15 +135,15 @@ public function testSiteWideContact() {
user_role_grant_permissions(RoleInterface::ANONYMOUS_ID, ['access site-wide contact form']);
$this->drupalLogout();
$this->drupalGet('contact');
- $this->assertResponse(404);
+ $this->assertSession()->statusCodeEquals(404);
$this->drupalLogin($admin_user);
$this->drupalGet('contact');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertText(t('The contact form has not been configured.'));
// Test access personal form via site-wide contact page.
$this->drupalGet('contact/personal');
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
// Add forms.
// Test invalid recipients.
@@ -224,12 +232,12 @@ public function testSiteWideContact() {
// Check to see that anonymous user cannot see contact page without permission.
user_role_revoke_permissions(RoleInterface::ANONYMOUS_ID, ['access site-wide contact form']);
$this->drupalGet('contact');
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
// Give anonymous user permission and see that page is viewable.
user_role_grant_permissions(RoleInterface::ANONYMOUS_ID, ['access site-wide contact form']);
$this->drupalGet('contact');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Submit contact form with invalid values.
$this->submitContact('', $recipients[0], $this->randomMachineName(16), $id, $this->randomMachineName(64));
@@ -252,13 +260,13 @@ public function testSiteWideContact() {
->set('default_form', '')
->save();
$this->drupalGet('contact');
- $this->assertResponse(404);
+ $this->assertSession()->statusCodeEquals(404);
// Try to access contact form with non-existing form IDs.
$this->drupalGet('contact/0');
- $this->assertResponse(404);
+ $this->assertSession()->statusCodeEquals(404);
$this->drupalGet('contact/' . $this->randomMachineName());
- $this->assertResponse(404);
+ $this->assertSession()->statusCodeEquals(404);
// Submit contact form with correct values and check flood interval.
for ($i = 0; $i < $flood_limit; $i++) {
@@ -280,7 +288,7 @@ public function testSiteWideContact() {
$this->addContactForm($contact_form, $label, $recipients, '', FALSE);
$this->drupalGet('admin/structure/contact');
$this->clickLink(t('Edit'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertFieldByName('label', $label);
// Test field UI and field integration.
@@ -301,9 +309,9 @@ public function testSiteWideContact() {
}
}
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->clickLink(t('Add field'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Create a simple textfield.
$field_name = mb_strtolower($this->randomMachineName());
@@ -329,8 +337,8 @@ public function testSiteWideContact() {
$mails = $this->getMails();
$mail = array_pop($mails);
$this->assertEqual($mail['subject'], t('[@label] @subject', ['@label' => $label, '@subject' => $edit['subject[0][value]']]));
- $this->assertContains($field_label, $mail['body']);
- $this->assertContains($edit[$field_name . '[0][value]'], $mail['body']);
+ $this->assertStringContainsString($field_label, $mail['body']);
+ $this->assertStringContainsString($edit[$field_name . '[0][value]'], $mail['body']);
// Test messages and redirect.
/** @var \Drupal\contact\ContactFormInterface $form */
@@ -369,7 +377,7 @@ public function testSiteWideContact() {
];
$this->drupalPostForm(NULL, $edit, t('Send message'));
$result = $this->xpath('//div[@role=:role]', [':role' => 'contentinfo']);
- $this->assertEqual(count($result), 0, 'Messages not found.');
+ $this->assertCount(0, $result, 'Messages not found.');
$this->assertUrl('user/' . $admin_user->id());
// Test preview and visibility of the message field and label. Submit the
@@ -434,7 +442,7 @@ public function testAutoReply() {
// We are testing the auto-reply, so there should be one email going to the sender.
$captured_emails = $this->getMails(['id' => 'contact_page_autoreply', 'to' => $email]);
- $this->assertEqual(count($captured_emails), 1);
+ $this->assertCount(1, $captured_emails);
$this->assertEqual(trim($captured_emails[0]['body']), trim(MailFormatHelper::htmlToText($foo_autoreply)));
// Test the auto-reply for form 'bar'.
@@ -443,14 +451,14 @@ public function testAutoReply() {
// Auto-reply for form 'bar' should result in one auto-reply email to the sender.
$captured_emails = $this->getMails(['id' => 'contact_page_autoreply', 'to' => $email]);
- $this->assertEqual(count($captured_emails), 1);
+ $this->assertCount(1, $captured_emails);
$this->assertEqual(trim($captured_emails[0]['body']), trim(MailFormatHelper::htmlToText($bar_autoreply)));
// Verify that no auto-reply is sent when the auto-reply field is left blank.
$email = $this->randomMachineName(32) . '@example.com';
$this->submitContact($this->randomMachineName(16), $email, $this->randomString(64), 'no_autoreply', $this->randomString(128));
$captured_emails = $this->getMails(['id' => 'contact_page_autoreply', 'to' => $email]);
- $this->assertEqual(count($captured_emails), 0);
+ $this->assertCount(0, $captured_emails);
// Verify that the current error message doesn't show, that the auto-reply
// doesn't get sent and the correct silent error gets logged.
@@ -462,7 +470,7 @@ public function testAutoReply() {
$this->submitContact($this->randomMachineName(16), $email, $this->randomString(64), 'foo', $this->randomString(128));
$this->assertNoText('Unable to send email. Contact the site administrator if the problem persists.');
$captured_emails = $this->getMails(['id' => 'contact_page_autoreply', 'to' => $email]);
- $this->assertEqual(count($captured_emails), 0);
+ $this->assertCount(0, $captured_emails);
$this->drupalLogin($admin_user);
$this->drupalGet('admin/reports/dblog');
$this->assertRaw('Error sending auto-reply, missing sender e-mail address in foo');
@@ -568,7 +576,7 @@ public function deleteContactForms() {
if ($id == 'personal') {
// Personal form could not be deleted.
$this->drupalGet("admin/structure/contact/manage/$id/delete");
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
}
else {
$this->drupalPostForm("admin/structure/contact/manage/$id/delete", [], t('Delete'));
diff --git a/web/core/modules/contact/tests/src/Kernel/Migrate/MigrateContactCategoryTest.php b/web/core/modules/contact/tests/src/Kernel/Migrate/MigrateContactCategoryTest.php
index a107893eec..d76b1b55e7 100644
--- a/web/core/modules/contact/tests/src/Kernel/Migrate/MigrateContactCategoryTest.php
+++ b/web/core/modules/contact/tests/src/Kernel/Migrate/MigrateContactCategoryTest.php
@@ -45,7 +45,7 @@ protected function setUp() {
protected function assertEntity($id, $expected_label, array $expected_recipients, $expected_reply, $expected_weight) {
/** @var \Drupal\contact\ContactFormInterface $entity */
$entity = ContactForm::load($id);
- $this->assertTrue($entity instanceof ContactFormInterface);
+ $this->assertInstanceOf(ContactFormInterface::class, $entity);
$this->assertIdentical($expected_label, $entity->label());
$this->assertIdentical($expected_recipients, $entity->getRecipients());
$this->assertIdentical($expected_reply, $entity->getReply());
diff --git a/web/core/modules/content_moderation/content_moderation.module b/web/core/modules/content_moderation/content_moderation.module
index 8e3f31733d..394a07f820 100644
--- a/web/core/modules/content_moderation/content_moderation.module
+++ b/web/core/modules/content_moderation/content_moderation.module
@@ -234,12 +234,11 @@ function content_moderation_entity_access(EntityInterface $entity, $operation, A
$access_result = $valid_transition_targets ? AccessResult::neutral() : AccessResult::forbidden('No valid transitions exist for given account.');
$access_result->addCacheableDependency($entity);
- $access_result->addCacheableDependency($account);
$workflow = $moderation_info->getWorkflowForEntity($entity);
$access_result->addCacheableDependency($workflow);
- foreach ($valid_transition_targets as $valid_transition_target) {
- $access_result->addCacheableDependency($valid_transition_target);
- }
+ // The state transition validation service returns a list of transitions
+ // based on the user's permission to use them.
+ $access_result->cachePerPermissions();
}
// Do not allow users to delete the state that is configured as the default
diff --git a/web/core/modules/content_moderation/src/ModerationInformation.php b/web/core/modules/content_moderation/src/ModerationInformation.php
index dd80ccbc01..e85a066f9d 100644
--- a/web/core/modules/content_moderation/src/ModerationInformation.php
+++ b/web/core/modules/content_moderation/src/ModerationInformation.php
@@ -181,7 +181,7 @@ public function isDefaultRevisionPublished(ContentEntityInterface $entity) {
// If no default revision could be loaded, the entity has not yet been
// saved. In this case the moderation_state of the unsaved entity can be
// used, since once saved it will become the default.
- $default_revision = $default_revision ?: $entity;
+ $default_revision = $default_revision ?: $entity;
// Ensure we are checking all translations of the default revision.
if ($default_revision instanceof TranslatableInterface && $default_revision->isTranslatable()) {
diff --git a/web/core/modules/content_moderation/src/Plugin/Field/FieldWidget/ModerationStateWidget.php b/web/core/modules/content_moderation/src/Plugin/Field/FieldWidget/ModerationStateWidget.php
index 8bfba8a35c..2f259b25cc 100644
--- a/web/core/modules/content_moderation/src/Plugin/Field/FieldWidget/ModerationStateWidget.php
+++ b/web/core/modules/content_moderation/src/Plugin/Field/FieldWidget/ModerationStateWidget.php
@@ -124,7 +124,7 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen
// If the entity already exists, grab the most recent revision and load it.
// The moderation state of the saved revision will be used to display the
- // current state as well determine the the appropriate transitions.
+ // current state as well determine the appropriate transitions.
if (!$entity->isNew()) {
/** @var \Drupal\Core\Entity\ContentEntityInterface $original_entity */
$original_entity = $this->entityTypeManager->getStorage($entity->getEntityTypeId())->loadRevision($entity->getLoadedRevisionId());
diff --git a/web/core/modules/content_moderation/tests/src/Functional/ModerationFormTest.php b/web/core/modules/content_moderation/tests/src/Functional/ModerationFormTest.php
index e825682d20..4f9afc7cb5 100644
--- a/web/core/modules/content_moderation/tests/src/Functional/ModerationFormTest.php
+++ b/web/core/modules/content_moderation/tests/src/Functional/ModerationFormTest.php
@@ -78,13 +78,13 @@ public function testModerationForm() {
// The canonical view should have a moderation form, because it is not the
// live revision.
$this->drupalGet($canonical_path);
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertField('edit-new-state', 'The node view page has a moderation form.');
// The latest version page should not show, because there is no pending
// revision.
$this->drupalGet($latest_version_path);
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
// Update the draft.
$this->drupalPostForm($edit_path, [
@@ -95,7 +95,7 @@ public function testModerationForm() {
// The canonical view should have a moderation form, because it is not the
// live revision.
$this->drupalGet($canonical_path);
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertField('edit-new-state', 'The node view page has a moderation form.');
// Preview the draft.
@@ -109,14 +109,14 @@ public function testModerationForm() {
'node_preview' => $node->uuid(),
'view_mode_id' => 'full',
]);
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertUrl($preview_url);
$this->assertNoField('edit-new-state', 'The node preview page has no moderation form.');
// The latest version page should not show, because there is still no
// pending revision.
$this->drupalGet($latest_version_path);
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
// Publish the draft.
$this->drupalPostForm($edit_path, [
@@ -140,13 +140,13 @@ public function testModerationForm() {
// The published view should not have a moderation form, because it is the
// live revision.
$this->drupalGet($canonical_path);
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertNoField('edit-new-state', 'The node view page has no moderation form.');
// The latest version page should not show, because there is still no
// pending revision.
$this->drupalGet($latest_version_path);
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
// Make a pending revision.
$this->drupalPostForm($edit_path, [
@@ -157,13 +157,13 @@ public function testModerationForm() {
// The published view should not have a moderation form, because it is the
// live revision.
$this->drupalGet($canonical_path);
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertNoField('edit-new-state', 'The node view page has no moderation form.');
// The latest version page should show the moderation form and have "Draft"
// status, because the pending revision is in "Draft".
$this->drupalGet($latest_version_path);
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertField('edit-new-state', 'The latest-version page has a moderation form.');
$this->assertText('Draft', 'Correct status found on the latest-version page.');
@@ -175,7 +175,7 @@ public function testModerationForm() {
// The latest version page should not show, because there is no
// pending revision.
$this->drupalGet($latest_version_path);
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
}
/**
@@ -192,7 +192,7 @@ public function testNonBundleModerationForm() {
// The latest version page should not show, because there is no pending
// revision.
$this->drupalGet('/entity_test_mulrevpub/manage/1/latest');
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
// Update the draft.
$this->drupalPostForm('entity_test_mulrevpub/manage/1/edit', ['moderation_state[0][state]' => 'draft'], t('Save'));
@@ -200,7 +200,7 @@ public function testNonBundleModerationForm() {
// The latest version page should not show, because there is still no
// pending revision.
$this->drupalGet('/entity_test_mulrevpub/manage/1/latest');
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
// Publish the draft.
$this->drupalPostForm('entity_test_mulrevpub/manage/1/edit', ['moderation_state[0][state]' => 'published'], t('Save'));
@@ -208,13 +208,13 @@ public function testNonBundleModerationForm() {
// The published view should not have a moderation form, because it is the
// default revision.
$this->drupalGet('entity_test_mulrevpub/manage/1');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertNoText('Status', 'The node view page has no moderation form.');
// The latest version page should not show, because there is still no
// pending revision.
$this->drupalGet('entity_test_mulrevpub/manage/1/latest');
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
// Make a pending revision.
$this->drupalPostForm('entity_test_mulrevpub/manage/1/edit', ['moderation_state[0][state]' => 'draft'], t('Save'));
@@ -222,13 +222,13 @@ public function testNonBundleModerationForm() {
// The published view should not have a moderation form, because it is the
// default revision.
$this->drupalGet('entity_test_mulrevpub/manage/1');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertNoText('Status', 'The node view page has no moderation form.');
// The latest version page should show the moderation form and have "Draft"
// status, because the pending revision is in "Draft".
$this->drupalGet('entity_test_mulrevpub/manage/1/latest');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertText('Moderation state', 'Form text found on the latest-version page.');
$this->assertText('Draft', 'Correct status found on the latest-version page.');
@@ -240,7 +240,7 @@ public function testNonBundleModerationForm() {
// The latest version page should not show, because there is no
// pending revision.
$this->drupalGet('entity_test_mulrevpub/manage/1/latest');
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
}
/**
diff --git a/web/core/modules/content_moderation/tests/src/Functional/ModerationStateNodeTypeTest.php b/web/core/modules/content_moderation/tests/src/Functional/ModerationStateNodeTypeTest.php
index 476642f0ad..8999dae122 100644
--- a/web/core/modules/content_moderation/tests/src/Functional/ModerationStateNodeTypeTest.php
+++ b/web/core/modules/content_moderation/tests/src/Functional/ModerationStateNodeTypeTest.php
@@ -79,16 +79,16 @@ public function testEnablingOnExistingContent() {
}
$node = reset($nodes);
$this->drupalGet('node/' . $node->id());
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertLinkByHref('node/' . $node->id() . '/edit');
$this->drupalGet('node/' . $node->id() . '/edit');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertSession()->optionExists('moderation_state[0][state]', 'draft');
$this->assertSession()->optionNotExists('moderation_state[0][state]', 'published');
$this->drupalLogin($editor_with_publish);
$this->drupalGet('node/' . $node->id() . '/edit');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertSession()->optionExists('moderation_state[0][state]', 'draft');
$this->assertSession()->optionExists('moderation_state[0][state]', 'published');
}
diff --git a/web/core/modules/content_moderation/tests/src/Functional/NodeAccessTest.php b/web/core/modules/content_moderation/tests/src/Functional/NodeAccessTest.php
index 5bee9bcb17..1356389b85 100644
--- a/web/core/modules/content_moderation/tests/src/Functional/NodeAccessTest.php
+++ b/web/core/modules/content_moderation/tests/src/Functional/NodeAccessTest.php
@@ -109,12 +109,12 @@ public function testPageAccess() {
$this->drupalLogin($user);
$this->drupalGet($edit_path);
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
$this->drupalGet($latest_path);
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
$this->drupalGet($view_path);
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Publish the node.
$this->drupalLogin($this->adminUser);
@@ -126,12 +126,12 @@ public function testPageAccess() {
$this->drupalLogout();
$this->drupalGet($edit_path);
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
$this->drupalGet($latest_path);
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
$this->drupalGet($view_path);
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Create a pending revision for the 'Latest revision' tab.
$this->drupalLogin($this->adminUser);
@@ -143,12 +143,12 @@ public function testPageAccess() {
$this->drupalLogin($user);
$this->drupalGet($edit_path);
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
$this->drupalGet($latest_path);
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->drupalGet($view_path);
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Now make another user, who should not be able to see pending revisions.
$user = $this->createUser([
@@ -157,12 +157,12 @@ public function testPageAccess() {
$this->drupalLogin($user);
$this->drupalGet($edit_path);
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
$this->drupalGet($latest_path);
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
$this->drupalGet($view_path);
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Now create a private node that the user is not granted access to by the
// node grants, but is granted access via hook_node_access().
@@ -181,7 +181,7 @@ public function testPageAccess() {
\Drupal::state()->set('node_access_test.allow_uid', $user->id());
$this->drupalGet($node->toUrl());
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Verify the moderation form is in place by publishing the node.
$this->drupalPostForm(NULL, [], t('Apply'));
diff --git a/web/core/modules/content_moderation/tests/src/Kernel/ContentModerationAccessTest.php b/web/core/modules/content_moderation/tests/src/Kernel/ContentModerationAccessTest.php
new file mode 100644
index 0000000000..5531b2f3fb
--- /dev/null
+++ b/web/core/modules/content_moderation/tests/src/Kernel/ContentModerationAccessTest.php
@@ -0,0 +1,97 @@
+<?php
+
+namespace Drupal\Tests\content_moderation\Kernel;
+
+use Drupal\Core\Cache\CacheBackendInterface;
+use Drupal\Core\Session\UserSession;
+use Drupal\KernelTests\KernelTestBase;
+use Drupal\node\Entity\NodeType;
+use Drupal\Tests\content_moderation\Traits\ContentModerationTestTrait;
+use Drupal\Tests\node\Traits\NodeCreationTrait;
+use Drupal\Tests\user\Traits\UserCreationTrait;
+use Drupal\user\Entity\Role;
+
+/**
+ * Tests content moderation access.
+ *
+ * @group content_moderation
+ */
+class ContentModerationAccessTest extends KernelTestBase {
+
+ use NodeCreationTrait;
+ use UserCreationTrait;
+ use ContentModerationTestTrait;
+
+ /**
+ * {@inheritdoc}
+ */
+ public static $modules = [
+ 'content_moderation',
+ 'filter',
+ 'node',
+ 'system',
+ 'user',
+ 'workflows',
+ ];
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function setUp() {
+ parent::setUp();
+
+ $this->installEntitySchema('content_moderation_state');
+ $this->installEntitySchema('node');
+ $this->installEntitySchema('user');
+ $this->installConfig(['content_moderation', 'filter']);
+ $this->installSchema('system', ['sequences']);
+ $this->installSchema('node', ['node_access']);
+
+ // Add a moderated node type.
+ $node_type = NodeType::create([
+ 'type' => 'page',
+ 'label' => 'Page',
+ ]);
+ $node_type->save();
+ $workflow = $this->createEditorialWorkflow();
+ $workflow->getTypePlugin()->addEntityTypeAndBundle('node', 'page');
+ $workflow->save();
+ }
+
+ /**
+ * Tests access cacheability.
+ */
+ public function testAccessCacheablity() {
+ $node = $this->createNode(['type' => 'page']);
+
+ /** @var \Drupal\user\RoleInterface $authenticated */
+ $authenticated = Role::create([
+ 'id' => 'authenticated',
+ ]);
+ $authenticated->grantPermission('access content');
+ $authenticated->grantPermission('edit any page content');
+ $authenticated->save();
+
+ $account = new UserSession([
+ 'uid' => 2,
+ 'roles' => ['authenticated'],
+ ]);
+
+ $result = $node->access('update', $account, TRUE);
+ $this->assertFalse($result->isAllowed());
+ $this->assertEquals(['user.permissions'], $result->getCacheContexts());
+ $this->assertEquals(['config:workflows.workflow.editorial', 'node:' . $node->id()], $result->getCacheTags());
+ $this->assertEquals(CacheBackendInterface::CACHE_PERMANENT, $result->getCacheMaxAge());
+
+ $authenticated->grantPermission('use editorial transition create_new_draft');
+ $authenticated->save();
+
+ \Drupal::entityTypeManager()->getAccessControlHandler('node')->resetCache();
+ $result = $node->access('update', $account, TRUE);
+ $this->assertTrue($result->isAllowed());
+ $this->assertEquals(['user.permissions'], $result->getCacheContexts());
+ $this->assertEquals(['config:workflows.workflow.editorial', 'node:' . $node->id()], $result->getCacheTags());
+ $this->assertEquals(CacheBackendInterface::CACHE_PERMANENT, $result->getCacheMaxAge());
+ }
+
+}
diff --git a/web/core/modules/content_moderation/tests/src/Kernel/ContentModerationStateTest.php b/web/core/modules/content_moderation/tests/src/Kernel/ContentModerationStateTest.php
index 3e17d0beda..cce80eb8a2 100644
--- a/web/core/modules/content_moderation/tests/src/Kernel/ContentModerationStateTest.php
+++ b/web/core/modules/content_moderation/tests/src/Kernel/ContentModerationStateTest.php
@@ -602,7 +602,7 @@ public function testWorkflowDependencies() {
$node_type->delete();
$workflow = Workflow::load('editorial');
$entity_types = $workflow->getTypePlugin()->getEntityTypes();
- $this->assertFalse(in_array('node', $entity_types));
+ $this->assertNotContains('node', $entity_types);
// Uninstall entity test and ensure it's removed from the workflow.
$this->container->get('config.manager')->uninstall('module', 'entity_test');
diff --git a/web/core/modules/content_moderation/tests/src/Kernel/ModerationStateFieldItemListTest.php b/web/core/modules/content_moderation/tests/src/Kernel/ModerationStateFieldItemListTest.php
index 6ae55c7916..ee03797de2 100644
--- a/web/core/modules/content_moderation/tests/src/Kernel/ModerationStateFieldItemListTest.php
+++ b/web/core/modules/content_moderation/tests/src/Kernel/ModerationStateFieldItemListTest.php
@@ -337,9 +337,9 @@ public function moderatedEntityWithExistingIdTestCases() {
}
/**
- * Test customising the default moderation state.
+ * Test customizing the default moderation state.
*/
- public function testWorkflowCustomisedInitialState() {
+ public function testWorkflowCustomizedInitialState() {
$workflow = Workflow::load('editorial');
$configuration = $workflow->getTypePlugin()->getConfiguration();
diff --git a/web/core/modules/content_moderation/tests/src/Kernel/ViewsModerationStateFilterTest.php b/web/core/modules/content_moderation/tests/src/Kernel/ViewsModerationStateFilterTest.php
index 58d1ab0edc..671b5ddc87 100644
--- a/web/core/modules/content_moderation/tests/src/Kernel/ViewsModerationStateFilterTest.php
+++ b/web/core/modules/content_moderation/tests/src/Kernel/ViewsModerationStateFilterTest.php
@@ -150,7 +150,7 @@ public function testStateFilterViewsRelationship() {
'moderation_state' => 'editorial-draft',
], 'test_content_moderation_state_filter_revision_table');
// Creating a new forward revision of node three, creates a second published
- // revision of of the original language, hence there are two published
+ // revision of the original language, hence there are two published
// revisions of node three.
$this->assertNodesWithFilters([$node, $third_node, $third_node], [
'moderation_state' => 'editorial-published',
diff --git a/web/core/modules/content_translation/content_translation.info.yml b/web/core/modules/content_translation/content_translation.info.yml
index 68d1ec0cb3..00eea2c50b 100644
--- a/web/core/modules/content_translation/content_translation.info.yml
+++ b/web/core/modules/content_translation/content_translation.info.yml
@@ -1,6 +1,6 @@
name: 'Content Translation'
type: module
-description: 'Allows users to translate content entities.'
+description: 'Allows users to translate content.'
dependencies:
- drupal:language
package: Multilingual
diff --git a/web/core/modules/content_translation/migrations/d6_entity_reference_translation.yml b/web/core/modules/content_translation/migrations/d6_entity_reference_translation.yml
index 87150ec395..945b2fa9d2 100644
--- a/web/core/modules/content_translation/migrations/d6_entity_reference_translation.yml
+++ b/web/core/modules/content_translation/migrations/d6_entity_reference_translation.yml
@@ -14,6 +14,7 @@ provider:
target_types:
node:
- d6_node_translation
+ - d6_node_complete
# The source plugin will be set by the deriver.
source:
plugin: empty
diff --git a/web/core/modules/content_translation/migrations/d6_term_node_translation.yml b/web/core/modules/content_translation/migrations/d6_term_node_translation.yml
index 8ce46e5e5d..9894b75e38 100644
--- a/web/core/modules/content_translation/migrations/d6_term_node_translation.yml
+++ b/web/core/modules/content_translation/migrations/d6_term_node_translation.yml
@@ -11,8 +11,12 @@ process:
dest_nid:
-
plugin: migration_lookup
- migration: d6_node_translation
+ migration:
+ - d6_node_complete
+ - d6_node_translation
source: nid
+ -
+ plugin: node_complete_node_translation_lookup
-
plugin: skip_on_empty
method: row
diff --git a/web/core/modules/content_translation/migrations/d7_entity_reference_translation.yml b/web/core/modules/content_translation/migrations/d7_entity_reference_translation.yml
index 2e8d548f0a..0856caf488 100644
--- a/web/core/modules/content_translation/migrations/d7_entity_reference_translation.yml
+++ b/web/core/modules/content_translation/migrations/d7_entity_reference_translation.yml
@@ -14,6 +14,7 @@ provider:
target_types:
node:
- d7_node_translation
+ - d7_node_complete
# The source plugin will be set by the deriver.
source:
plugin: empty
diff --git a/web/core/modules/content_translation/migrations/d7_taxonomy_term_translation.yml b/web/core/modules/content_translation/migrations/d7_taxonomy_term_translation.yml
index 2a5a0df846..e0d7b59de0 100644
--- a/web/core/modules/content_translation/migrations/d7_taxonomy_term_translation.yml
+++ b/web/core/modules/content_translation/migrations/d7_taxonomy_term_translation.yml
@@ -49,6 +49,7 @@ process:
destination:
plugin: entity:taxonomy_term
destination_module: content_translation
+ translations: true
migration_dependencies:
required:
- d7_taxonomy_term
diff --git a/web/core/modules/content_translation/migrations/node_translation_menu_links.yml b/web/core/modules/content_translation/migrations/node_translation_menu_links.yml
index 466ed39931..d6809f8fa6 100644
--- a/web/core/modules/content_translation/migrations/node_translation_menu_links.yml
+++ b/web/core/modules/content_translation/migrations/node_translation_menu_links.yml
@@ -61,6 +61,8 @@ process:
# d7_node_translation mapping tables to find the new node ID.
plugin: migration_lookup
migration:
+ - d6_node_complete
+ - d7_node_complete
- d6_node_translation
- d7_node_translation
no_stub: true
diff --git a/web/core/modules/content_translation/migrations/state/content_translation.migrate_drupal.yml b/web/core/modules/content_translation/migrations/state/content_translation.migrate_drupal.yml
index 85a9914073..4e21859fcb 100644
--- a/web/core/modules/content_translation/migrations/state/content_translation.migrate_drupal.yml
+++ b/web/core/modules/content_translation/migrations/state/content_translation.migrate_drupal.yml
@@ -9,6 +9,8 @@ finished:
- menu_link_content
locale: content_translation
menu: content_translation
+ # Node revision translations.
+ node: content_translation
statistics: statistics
taxonomy: content_translation
7:
@@ -20,7 +22,8 @@ finished:
locale: content_translation
menu: content_translation
statistics: statistics
-
+ # Node revision translations.
+ node: content_translation
not_finished:
# Also D6 and D7 node revision translations.
6:
@@ -29,9 +32,6 @@ not_finished:
i18n: content_translation
# Taxonomy term references.
i18ntaxonomy: content_translation
- # Node revision translations.
- # https://www.drupal.org/project/drupal/issues/2746541
- node: content_translation
7:
# @TODO: Move to finished when remaining Drupal 7 i18n issues are resolved.
# See https://www.drupal.org/project/drupal/issues/2208401
@@ -42,6 +42,3 @@ not_finished:
# @TODO: Remove when taxonomy term field translations are migrated.
# See https://www.drupal.org/project/drupal/issues/3073050
i18n_taxonomy: content_translation
- # Node revision translations.
- # https://www.drupal.org/project/drupal/issues/2746541
- node: content_translation
diff --git a/web/core/modules/content_translation/src/Plugin/Validation/Constraint/ContentTranslationSynchronizedFieldsConstraintValidator.php b/web/core/modules/content_translation/src/Plugin/Validation/Constraint/ContentTranslationSynchronizedFieldsConstraintValidator.php
index 1bdcc9956c..127b6452b2 100644
--- a/web/core/modules/content_translation/src/Plugin/Validation/Constraint/ContentTranslationSynchronizedFieldsConstraintValidator.php
+++ b/web/core/modules/content_translation/src/Plugin/Validation/Constraint/ContentTranslationSynchronizedFieldsConstraintValidator.php
@@ -72,7 +72,7 @@ public function __construct(EntityTypeManagerInterface $entity_type_manager, Con
}
/**
- * [@inheritdoc}
+ * {@inheritdoc}
*/
public static function create(ContainerInterface $container) {
return new static(
diff --git a/web/core/modules/content_translation/tests/src/Functional/ContentTranslationEntityBundleUITest.php b/web/core/modules/content_translation/tests/src/Functional/ContentTranslationEntityBundleUITest.php
index dfd291bd85..d9c0ab2306 100644
--- a/web/core/modules/content_translation/tests/src/Functional/ContentTranslationEntityBundleUITest.php
+++ b/web/core/modules/content_translation/tests/src/Functional/ContentTranslationEntityBundleUITest.php
@@ -5,13 +5,19 @@
use Drupal\Tests\BrowserTestBase;
/**
- * Tests the content translation behaviours on entity bundle UI.
+ * Tests the content translation behaviors on entity bundle UI.
*
* @group content_translation
*/
class ContentTranslationEntityBundleUITest extends BrowserTestBase {
- public static $modules = ['language', 'content_translation', 'node', 'comment', 'field_ui'];
+ public static $modules = [
+ 'language',
+ 'content_translation',
+ 'node',
+ 'comment',
+ 'field_ui',
+ ];
/**
* {@inheritdoc}
@@ -25,7 +31,7 @@ protected function setUp() {
}
/**
- * Tests content types default translation behaviour.
+ * Tests content types default translation behavior.
*/
public function testContentTypeUI() {
// Create first content type.
diff --git a/web/core/modules/content_translation/tests/src/Functional/ContentTranslationLanguageChangeTest.php b/web/core/modules/content_translation/tests/src/Functional/ContentTranslationLanguageChangeTest.php
index b72af04df8..e514f70a1e 100644
--- a/web/core/modules/content_translation/tests/src/Functional/ContentTranslationLanguageChangeTest.php
+++ b/web/core/modules/content_translation/tests/src/Functional/ContentTranslationLanguageChangeTest.php
@@ -22,7 +22,15 @@ class ContentTranslationLanguageChangeTest extends NodeTestBase {
*
* @var array
*/
- public static $modules = ['language', 'content_translation', 'content_translation_test', 'node', 'block', 'field_ui', 'image'];
+ public static $modules = [
+ 'language',
+ 'content_translation',
+ 'content_translation_test',
+ 'node',
+ 'block',
+ 'field_ui',
+ 'image',
+ ];
/**
* {@inheritdoc}
@@ -104,9 +112,9 @@ public function testLanguageChange() {
// Check that the translation languages are correct.
$node = $this->getNodeByTitle('english_title');
- $translation_languages = array_keys($node->getTranslationLanguages());
- $this->assertTrue(in_array('fr', $translation_languages));
- $this->assertTrue(in_array('de', $translation_languages));
+ $translation_languages = $node->getTranslationLanguages();
+ $this->assertArrayHasKey('fr', $translation_languages);
+ $this->assertArrayHasKey('de', $translation_languages);
}
/**
@@ -151,9 +159,9 @@ public function testTitleDoesNotChangesOnChangingLanguageWidgetAndTriggeringAjax
// Check that the translation languages are correct.
$node = $this->getNodeByTitle('english_title');
- $translation_languages = array_keys($node->getTranslationLanguages());
- $this->assertTrue(in_array('fr', $translation_languages));
- $this->assertTrue(!in_array('de', $translation_languages));
+ $translation_languages = $node->getTranslationLanguages();
+ $this->assertArrayHasKey('fr', $translation_languages);
+ $this->assertArrayNotHasKey('de', $translation_languages);
}
}
diff --git a/web/core/modules/content_translation/tests/src/Functional/ContentTranslationLinkTagTest.php b/web/core/modules/content_translation/tests/src/Functional/ContentTranslationLinkTagTest.php
index 905e26146b..cefed787d3 100644
--- a/web/core/modules/content_translation/tests/src/Functional/ContentTranslationLinkTagTest.php
+++ b/web/core/modules/content_translation/tests/src/Functional/ContentTranslationLinkTagTest.php
@@ -17,7 +17,12 @@ class ContentTranslationLinkTagTest extends BrowserTestBase {
/**
* {@inheritdoc}
*/
- public static $modules = ['entity_test', 'content_translation', 'content_translation_test', 'language'];
+ public static $modules = [
+ 'entity_test',
+ 'content_translation',
+ 'content_translation_test',
+ 'language',
+ ];
/**
* {@inheritdoc}
diff --git a/web/core/modules/content_translation/tests/src/Functional/ContentTranslationOperationsTest.php b/web/core/modules/content_translation/tests/src/Functional/ContentTranslationOperationsTest.php
index d2e4ba0224..347d4c9ec9 100644
--- a/web/core/modules/content_translation/tests/src/Functional/ContentTranslationOperationsTest.php
+++ b/web/core/modules/content_translation/tests/src/Functional/ContentTranslationOperationsTest.php
@@ -37,7 +37,13 @@ class ContentTranslationOperationsTest extends NodeTestBase {
*
* @var array
*/
- public static $modules = ['language', 'content_translation', 'node', 'views', 'block'];
+ public static $modules = [
+ 'language',
+ 'content_translation',
+ 'node',
+ 'views',
+ 'block',
+ ];
/**
* {@inheritdoc}
@@ -90,7 +96,7 @@ public function testOperationTranslateLink() {
);
$this->drupalLogin($this->baseUser1);
$this->drupalGet($node->toUrl('drupal:content-translation-overview'));
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
// Ensure that the translation overview is also not accessible when the user
// has 'access content', but the node is not published.
@@ -103,7 +109,7 @@ public function testOperationTranslateLink() {
);
$node->setUnpublished()->save();
$this->drupalGet($node->toUrl('drupal:content-translation-overview'));
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
$this->drupalLogout();
// Ensure the 'Translate' local task does not show up anymore when disabling
diff --git a/web/core/modules/content_translation/tests/src/Functional/ContentTranslationPendingRevisionTestBase.php b/web/core/modules/content_translation/tests/src/Functional/ContentTranslationPendingRevisionTestBase.php
index ef0f54aeca..6d2ae93002 100644
--- a/web/core/modules/content_translation/tests/src/Functional/ContentTranslationPendingRevisionTestBase.php
+++ b/web/core/modules/content_translation/tests/src/Functional/ContentTranslationPendingRevisionTestBase.php
@@ -17,7 +17,12 @@ abstract class ContentTranslationPendingRevisionTestBase extends ContentTranslat
/**
* {@inheritdoc}
*/
- public static $modules = ['language', 'content_translation', 'content_moderation', 'node'];
+ public static $modules = [
+ 'language',
+ 'content_translation',
+ 'content_moderation',
+ 'node',
+ ];
/**
* The entity storage.
diff --git a/web/core/modules/content_translation/tests/src/Functional/ContentTranslationSettingsTest.php b/web/core/modules/content_translation/tests/src/Functional/ContentTranslationSettingsTest.php
index 77b3c697b0..2f6455a9eb 100644
--- a/web/core/modules/content_translation/tests/src/Functional/ContentTranslationSettingsTest.php
+++ b/web/core/modules/content_translation/tests/src/Functional/ContentTranslationSettingsTest.php
@@ -25,7 +25,14 @@ class ContentTranslationSettingsTest extends BrowserTestBase {
*
* @var array
*/
- public static $modules = ['language', 'content_translation', 'node', 'comment', 'field_ui', 'entity_test'];
+ public static $modules = [
+ 'language',
+ 'content_translation',
+ 'node',
+ 'comment',
+ 'field_ui',
+ 'entity_test',
+ ];
/**
* {@inheritdoc}
diff --git a/web/core/modules/content_translation/tests/src/Functional/ContentTranslationSyncImageTest.php b/web/core/modules/content_translation/tests/src/Functional/ContentTranslationSyncImageTest.php
index 8e5734cd82..57aa3bf2c7 100644
--- a/web/core/modules/content_translation/tests/src/Functional/ContentTranslationSyncImageTest.php
+++ b/web/core/modules/content_translation/tests/src/Functional/ContentTranslationSyncImageTest.php
@@ -44,7 +44,13 @@ class ContentTranslationSyncImageTest extends ContentTranslationTestBase {
*
* @var array
*/
- public static $modules = ['language', 'content_translation', 'entity_test', 'image', 'field_ui'];
+ public static $modules = [
+ 'language',
+ 'content_translation',
+ 'entity_test',
+ 'image',
+ 'field_ui',
+ ];
protected function setUp() {
parent::setUp();
diff --git a/web/core/modules/content_translation/tests/src/Functional/ContentTranslationUITestBase.php b/web/core/modules/content_translation/tests/src/Functional/ContentTranslationUITestBase.php
index 5e7954086f..162c5d1f81 100644
--- a/web/core/modules/content_translation/tests/src/Functional/ContentTranslationUITestBase.php
+++ b/web/core/modules/content_translation/tests/src/Functional/ContentTranslationUITestBase.php
@@ -83,7 +83,7 @@ protected function doTestBasicTranslation() {
$entity = $storage->load($this->entityId);
$this->assertNotEmpty($entity, 'Entity found in the database.');
$this->drupalGet($entity->toUrl());
- $this->assertResponse(200, 'Entity URL is valid.');
+ $this->assertSession()->statusCodeEquals(200);
// Ensure that the content language cache context is not yet added to the
// page.
@@ -369,15 +369,15 @@ protected function doTestTranslationDeletion() {
$this->drupalPostForm(NULL, [], t('Delete @language translation', ['@language' => $language->getName()]));
$storage->resetCache([$this->entityId]);
$entity = $storage->load($this->entityId, TRUE);
- if ($this->assertTrue(is_object($entity), 'Entity found')) {
- $translations = $entity->getTranslationLanguages();
- $this->assertTrue(count($translations) == 2 && empty($translations[$langcode]), 'Translation successfully deleted.');
- }
+ $this->assertIsObject($entity);
+ $translations = $entity->getTranslationLanguages();
+ $this->assertCount(2, $translations);
+ $this->assertArrayNotHasKey($langcode, $translations);
// Check that the translator cannot delete the original translation.
$args = [$this->entityTypeId => $entity->id(), 'language' => 'en'];
$this->drupalGet(Url::fromRoute("entity.$this->entityTypeId.content_translation_delete", $args));
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
}
/**
diff --git a/web/core/modules/content_translation/tests/src/Functional/ContentTranslationWorkflowsTest.php b/web/core/modules/content_translation/tests/src/Functional/ContentTranslationWorkflowsTest.php
index 2efc272143..168b6a59e1 100644
--- a/web/core/modules/content_translation/tests/src/Functional/ContentTranslationWorkflowsTest.php
+++ b/web/core/modules/content_translation/tests/src/Functional/ContentTranslationWorkflowsTest.php
@@ -159,26 +159,25 @@ public function testWorkflows() {
protected function doTestWorkflows(UserInterface $user, $expected_status) {
$default_langcode = $this->langcodes[0];
$languages = $this->container->get('language_manager')->getLanguages();
- $args = ['@user_label' => $user->getAccountName()];
$options = ['language' => $languages[$default_langcode], 'absolute' => TRUE];
$this->drupalLogin($user);
// Check whether the user is allowed to access the entity form in edit mode.
$edit_url = $this->entity->toUrl('edit-form', $options);
$this->drupalGet($edit_url, $options);
- $this->assertResponse($expected_status['edit'], new FormattableMarkup('The @user_label has the expected edit access.', $args));
+ $this->assertSession()->statusCodeEquals($expected_status['edit']);
// Check whether the user is allowed to access the entity delete form.
$delete_url = $this->entity->toUrl('delete-form', $options);
$this->drupalGet($delete_url, $options);
- $this->assertResponse($expected_status['delete'], new FormattableMarkup('The @user_label has the expected delete access.', $args));
+ $this->assertSession()->statusCodeEquals($expected_status['delete']);
// Check whether the user is allowed to access the translation overview.
$langcode = $this->langcodes[1];
$options['language'] = $languages[$langcode];
$translations_url = $this->entity->toUrl('drupal:content-translation-overview', $options)->toString();
$this->drupalGet($translations_url);
- $this->assertResponse($expected_status['overview'], new FormattableMarkup('The @user_label has the expected translation overview access.', $args));
+ $this->assertSession()->statusCodeEquals($expected_status['overview']);
// Check whether the user is allowed to create a translation.
$add_translation_url = Url::fromRoute("entity.$this->entityTypeId.content_translation_add", [$this->entityTypeId => $this->entity->id(), 'source' => $default_langcode, 'target' => $langcode], $options);
@@ -194,7 +193,7 @@ protected function doTestWorkflows(UserInterface $user, $expected_status) {
else {
$this->drupalGet($add_translation_url);
}
- $this->assertResponse($expected_status['add_translation'], new FormattableMarkup('The @user_label has the expected translation creation access.', $args));
+ $this->assertSession()->statusCodeEquals($expected_status['add_translation']);
// Check whether the user is allowed to edit a translation.
$langcode = $this->langcodes[2];
@@ -222,7 +221,7 @@ protected function doTestWorkflows(UserInterface $user, $expected_status) {
else {
$this->drupalGet($edit_translation_url);
}
- $this->assertResponse($expected_status['edit_translation'], new FormattableMarkup('The @user_label has the expected translation edit access.', $args));
+ $this->assertSession()->statusCodeEquals($expected_status['edit_translation']);
// Check whether the user is allowed to delete a translation.
$langcode = $this->langcodes[2];
@@ -250,7 +249,7 @@ protected function doTestWorkflows(UserInterface $user, $expected_status) {
else {
$this->drupalGet($delete_translation_url);
}
- $this->assertResponse($expected_status['delete_translation'], new FormattableMarkup('The @user_label has the expected translation deletion access.', $args));
+ $this->assertSession()->statusCodeEquals($expected_status['delete_translation']);
}
/**
diff --git a/web/core/modules/content_translation/tests/src/Functional/Views/ContentTranslationViewsUITest.php b/web/core/modules/content_translation/tests/src/Functional/Views/ContentTranslationViewsUITest.php
index 351ff78de7..5e297ef993 100644
--- a/web/core/modules/content_translation/tests/src/Functional/Views/ContentTranslationViewsUITest.php
+++ b/web/core/modules/content_translation/tests/src/Functional/Views/ContentTranslationViewsUITest.php
@@ -35,7 +35,7 @@ class ContentTranslationViewsUITest extends UITestBase {
*/
public function testViewsUI() {
$this->drupalGet('admin/structure/views/view/test_view/edit');
- $this->assertTitle(t('@label (@table) | @site-name', ['@label' => 'Test view', '@table' => 'Views test data', '@site-name' => $this->config('system.site')->get('name')]));
+ $this->assertTitle('Test view (Views test data) | Drupal');
}
}
diff --git a/web/core/modules/content_translation/tests/src/FunctionalJavascript/ContentTranslationContextualLinksTest.php b/web/core/modules/content_translation/tests/src/FunctionalJavascript/ContentTranslationContextualLinksTest.php
index 4f8a1b5577..f9b3d999c5 100644
--- a/web/core/modules/content_translation/tests/src/FunctionalJavascript/ContentTranslationContextualLinksTest.php
+++ b/web/core/modules/content_translation/tests/src/FunctionalJavascript/ContentTranslationContextualLinksTest.php
@@ -71,7 +71,7 @@ public function testContentTranslationContextualLinks() {
$this->drupalLogin($this->translator);
$this->drupalGet('node/' . $node->id());
$link = $this->assertSession()->waitForElement('css', '[data-contextual-id^="node:node=1"] .contextual-links a:contains("Translate")');
- $this->assertContains('node/1/translations', $link->getAttribute('href'));
+ $this->assertStringContainsString('node/1/translations', $link->getAttribute('href'));
}
}
diff --git a/web/core/modules/content_translation/tests/src/Kernel/ContentTranslationConfigImportTest.php b/web/core/modules/content_translation/tests/src/Kernel/ContentTranslationConfigImportTest.php
index a3a3ad96e1..68d9c54d13 100644
--- a/web/core/modules/content_translation/tests/src/Kernel/ContentTranslationConfigImportTest.php
+++ b/web/core/modules/content_translation/tests/src/Kernel/ContentTranslationConfigImportTest.php
@@ -25,7 +25,13 @@ class ContentTranslationConfigImportTest extends KernelTestBase {
*
* @var array
*/
- public static $modules = ['system', 'user', 'entity_test', 'language', 'content_translation'];
+ public static $modules = [
+ 'system',
+ 'user',
+ 'entity_test',
+ 'language',
+ 'content_translation',
+ ];
/**
* {@inheritdoc}
diff --git a/web/core/modules/content_translation/tests/src/Kernel/ContentTranslationFieldSyncRevisionTest.php b/web/core/modules/content_translation/tests/src/Kernel/ContentTranslationFieldSyncRevisionTest.php
index 3d9d34d083..ea97937613 100644
--- a/web/core/modules/content_translation/tests/src/Kernel/ContentTranslationFieldSyncRevisionTest.php
+++ b/web/core/modules/content_translation/tests/src/Kernel/ContentTranslationFieldSyncRevisionTest.php
@@ -26,7 +26,13 @@ class ContentTranslationFieldSyncRevisionTest extends EntityKernelTestBase {
/**
* {@inheritdoc}
*/
- public static $modules = ['file', 'image', 'language', 'content_translation', 'content_translation_test'];
+ public static $modules = [
+ 'file',
+ 'image',
+ 'language',
+ 'content_translation',
+ 'content_translation_test',
+ ];
/**
* The synchronized field name.
diff --git a/web/core/modules/content_translation/tests/src/Kernel/ContentTranslationSettingsApiTest.php b/web/core/modules/content_translation/tests/src/Kernel/ContentTranslationSettingsApiTest.php
index c8fcf2d49e..31cf5aa3bb 100644
--- a/web/core/modules/content_translation/tests/src/Kernel/ContentTranslationSettingsApiTest.php
+++ b/web/core/modules/content_translation/tests/src/Kernel/ContentTranslationSettingsApiTest.php
@@ -17,7 +17,12 @@ class ContentTranslationSettingsApiTest extends KernelTestBase {
*
* @var array
*/
- public static $modules = ['language', 'content_translation', 'user', 'entity_test'];
+ public static $modules = [
+ 'language',
+ 'content_translation',
+ 'user',
+ 'entity_test',
+ ];
/**
* {@inheritdoc}
diff --git a/web/core/modules/content_translation/tests/src/Kernel/Migrate/d6/MigrateTaxonomyTermTranslationTest.php b/web/core/modules/content_translation/tests/src/Kernel/Migrate/d6/MigrateTaxonomyTermTranslationTest.php
index 1baf584efe..21b977927a 100644
--- a/web/core/modules/content_translation/tests/src/Kernel/Migrate/d6/MigrateTaxonomyTermTranslationTest.php
+++ b/web/core/modules/content_translation/tests/src/Kernel/Migrate/d6/MigrateTaxonomyTermTranslationTest.php
@@ -20,8 +20,6 @@ class MigrateTaxonomyTermTranslationTest extends MigrateDrupal6TestBase {
'content_translation',
'language',
'menu_ui',
- // Required for translation migrations.
- 'migrate_drupal_multilingual',
'node',
'taxonomy',
];
diff --git a/web/core/modules/content_translation/tests/src/Kernel/Migrate/d7/MigrateEntityTranslationSettingsTest.php b/web/core/modules/content_translation/tests/src/Kernel/Migrate/d7/MigrateEntityTranslationSettingsTest.php
index 136e5331ec..5fb6ddde60 100644
--- a/web/core/modules/content_translation/tests/src/Kernel/Migrate/d7/MigrateEntityTranslationSettingsTest.php
+++ b/web/core/modules/content_translation/tests/src/Kernel/Migrate/d7/MigrateEntityTranslationSettingsTest.php
@@ -20,8 +20,6 @@ class MigrateEntityTranslationSettingsTest extends MigrateDrupal7TestBase {
'content_translation',
'language',
'menu_ui',
- // Required for translation migrations.
- 'migrate_drupal_multilingual',
'node',
'taxonomy',
'text',
diff --git a/web/core/modules/contextual/contextual.info.yml b/web/core/modules/contextual/contextual.info.yml
index 4e11bb966b..688fb4dbf3 100644
--- a/web/core/modules/contextual/contextual.info.yml
+++ b/web/core/modules/contextual/contextual.info.yml
@@ -1,6 +1,6 @@
name: 'Contextual Links'
type: module
-description: 'Provides contextual links to perform actions related to elements on a page.'
+description: 'Provides contextual links to directly access tasks related to page elements.'
package: Core
version: VERSION
core: 8.x
diff --git a/web/core/modules/contextual/js/contextual.es6.js b/web/core/modules/contextual/js/contextual.es6.js
index 2b26ee2a83..86f76980e2 100644
--- a/web/core/modules/contextual/js/contextual.es6.js
+++ b/web/core/modules/contextual/js/contextual.es6.js
@@ -186,7 +186,9 @@
// Drupal.contextual.collection.
window.setTimeout(() => {
initContextual(
- $context.find(`[data-contextual-id="${contextualID.id}"]`),
+ $context
+ .find(`[data-contextual-id="${contextualID.id}"]:empty`)
+ .eq(0),
html,
);
});
diff --git a/web/core/modules/contextual/js/contextual.js b/web/core/modules/contextual/js/contextual.js
index 6264b74c20..10816592e2 100644
--- a/web/core/modules/contextual/js/contextual.js
+++ b/web/core/modules/contextual/js/contextual.js
@@ -107,7 +107,7 @@
var html = storage.getItem('Drupal.contextual.' + contextualID.id);
if (html && html.length) {
window.setTimeout(function () {
- initContextual($context.find('[data-contextual-id="' + contextualID.id + '"]'), html);
+ initContextual($context.find('[data-contextual-id="' + contextualID.id + '"]:empty').eq(0), html);
});
return;
}
diff --git a/web/core/modules/contextual/js/toolbar/views/AuralView.es6.js b/web/core/modules/contextual/js/toolbar/views/AuralView.es6.js
index 0fb25e17d8..56c7953336 100644
--- a/web/core/modules/contextual/js/toolbar/views/AuralView.es6.js
+++ b/web/core/modules/contextual/js/toolbar/views/AuralView.es6.js
@@ -34,7 +34,7 @@
},
/**
- * @inheritdoc
+ * {@inheritdoc}
*
* @return {Drupal.contextualToolbar.AuralView}
* The current contextual toolbar aural view.
diff --git a/web/core/modules/contextual/js/toolbar/views/VisualView.es6.js b/web/core/modules/contextual/js/toolbar/views/VisualView.es6.js
index d168d5414c..accbfce9f4 100644
--- a/web/core/modules/contextual/js/toolbar/views/VisualView.es6.js
+++ b/web/core/modules/contextual/js/toolbar/views/VisualView.es6.js
@@ -42,7 +42,7 @@
},
/**
- * @inheritdoc
+ * {@inheritdoc}
*
* @return {Drupal.contextualToolbar.VisualView}
* The current contextual toolbar visual view.
diff --git a/web/core/modules/contextual/js/views/AuralView.es6.js b/web/core/modules/contextual/js/views/AuralView.es6.js
index f480829866..ca278eeadf 100644
--- a/web/core/modules/contextual/js/views/AuralView.es6.js
+++ b/web/core/modules/contextual/js/views/AuralView.es6.js
@@ -26,7 +26,7 @@
},
/**
- * @inheritdoc
+ * {@inheritdoc}
*/
render() {
const isOpen = this.model.get('isOpen');
diff --git a/web/core/modules/contextual/js/views/RegionView.es6.js b/web/core/modules/contextual/js/views/RegionView.es6.js
index 57048a77d6..a7ab18531b 100644
--- a/web/core/modules/contextual/js/views/RegionView.es6.js
+++ b/web/core/modules/contextual/js/views/RegionView.es6.js
@@ -43,7 +43,7 @@
},
/**
- * @inheritdoc
+ * {@inheritdoc}
*
* @return {Drupal.contextual.RegionView}
* The current contextual region view.
diff --git a/web/core/modules/contextual/js/views/VisualView.es6.js b/web/core/modules/contextual/js/views/VisualView.es6.js
index 57f68cacc3..31bc79292b 100644
--- a/web/core/modules/contextual/js/views/VisualView.es6.js
+++ b/web/core/modules/contextual/js/views/VisualView.es6.js
@@ -49,7 +49,7 @@
},
/**
- * @inheritdoc
+ * {@inheritdoc}
*
* @return {Drupal.contextual.VisualView}
* The current contextual visual view.
diff --git a/web/core/modules/contextual/src/ContextualController.php b/web/core/modules/contextual/src/ContextualController.php
index 7189b0c2a1..cd6ddb40a8 100644
--- a/web/core/modules/contextual/src/ContextualController.php
+++ b/web/core/modules/contextual/src/ContextualController.php
@@ -62,12 +62,12 @@ public static function create(ContainerInterface $container) {
public function render(Request $request) {
$ids = $request->request->get('ids');
if (!isset($ids)) {
- throw new BadRequestHttpException(t('No contextual ids specified.'));
+ throw new BadRequestHttpException('No contextual ids specified.');
}
$tokens = $request->request->get('tokens');
if (!isset($tokens)) {
- throw new BadRequestHttpException(t('No contextual ID tokens specified.'));
+ throw new BadRequestHttpException('No contextual ID tokens specified.');
}
$rendered = [];
diff --git a/web/core/modules/contextual/tests/modules/contextual_test/config/optional/views.view.contextual_recent.yml b/web/core/modules/contextual/tests/modules/contextual_test/config/optional/views.view.contextual_recent.yml
new file mode 100644
index 0000000000..b3c1ea4c84
--- /dev/null
+++ b/web/core/modules/contextual/tests/modules/contextual_test/config/optional/views.view.contextual_recent.yml
@@ -0,0 +1,327 @@
+langcode: en
+status: true
+dependencies:
+ module:
+ - node
+ - user
+id: contextual_recent
+label: 'Recent content'
+module: node
+description: 'Recent content.'
+tag: default
+base_table: node_field_data
+base_field: nid
+display:
+ default:
+ display_plugin: default
+ id: default
+ display_title: Master
+ position: 0
+ display_options:
+ access:
+ type: perm
+ options:
+ perm: 'access content'
+ cache:
+ type: tag
+ options: { }
+ query:
+ type: views_query
+ options:
+ disable_sql_rewrite: false
+ distinct: false
+ replica: false
+ query_comment: ''
+ query_tags: { }
+ exposed_form:
+ type: basic
+ options:
+ submit_button: Apply
+ reset_button: false
+ reset_button_label: Reset
+ exposed_sorts_label: 'Sort by'
+ expose_sort_order: true
+ sort_asc_label: Asc
+ sort_desc_label: Desc
+ pager:
+ type: some
+ options:
+ items_per_page: 10
+ offset: 0
+ style:
+ type: html_list
+ options:
+ grouping: { }
+ row_class: ''
+ default_row_class: true
+ type: ul
+ wrapper_class: item-list
+ class: ''
+ row:
+ type: fields
+ fields:
+ title:
+ id: title
+ table: node_field_data
+ field: title
+ entity_type: node
+ entity_field: title
+ label: ''
+ exclude: false
+ alter:
+ alter_text: false
+ make_link: false
+ absolute: false
+ trim: false
+ word_boundary: false
+ ellipsis: false
+ strip_tags: false
+ html: false
+ hide_empty: false
+ empty_zero: false
+ relationship: none
+ group_type: group
+ admin_label: ''
+ element_type: ''
+ element_class: ''
+ element_label_type: ''
+ element_label_class: ''
+ element_label_colon: false
+ element_wrapper_type: ''
+ element_wrapper_class: ''
+ element_default_classes: true
+ empty: ''
+ hide_alter_empty: true
+ type: string
+ settings:
+ link_to_entity: true
+ plugin_id: field
+ changed:
+ id: changed
+ table: node_field_data
+ field: changed
+ relationship: none
+ group_type: group
+ admin_label: ''
+ label: ''
+ exclude: false
+ alter:
+ alter_text: false
+ text: ''
+ make_link: false
+ path: ''
+ absolute: false
+ external: false
+ replace_spaces: false
+ path_case: none
+ trim_whitespace: false
+ alt: ''
+ rel: ''
+ link_class: ''
+ prefix: ''
+ suffix: ''
+ target: ''
+ nl2br: false
+ max_length: 0
+ word_boundary: true
+ ellipsis: true
+ more_link: false
+ more_link_text: ''
+ more_link_path: ''
+ strip_tags: false
+ trim: false
+ preserve_tags: ''
+ html: false
+ element_type: ''
+ element_class: ''
+ element_label_type: ''
+ element_label_class: ''
+ element_label_colon: false
+ element_wrapper_type: ''
+ element_wrapper_class: ''
+ element_default_classes: true
+ empty: ''
+ hide_empty: false
+ empty_zero: false
+ hide_alter_empty: true
+ click_sort_column: value
+ type: timestamp_ago
+ settings: { }
+ group_column: value
+ group_columns: { }
+ group_rows: true
+ delta_limit: 0
+ delta_offset: 0
+ delta_reversed: false
+ delta_first_last: false
+ multi_type: separator
+ separator: ', '
+ field_api_classes: false
+ entity_type: node
+ entity_field: changed
+ plugin_id: field
+ filters:
+ status_extra:
+ id: status_extra
+ table: node_field_data
+ field: status_extra
+ relationship: none
+ group_type: group
+ admin_label: ''
+ operator: '='
+ value: false
+ group: 1
+ exposed: false
+ expose:
+ operator_id: ''
+ label: ''
+ description: ''
+ use_operator: false
+ operator: ''
+ identifier: ''
+ required: false
+ remember: false
+ multiple: false
+ remember_roles:
+ authenticated: authenticated
+ operator_limit_selection: false
+ operator_list: { }
+ is_grouped: false
+ group_info:
+ label: ''
+ description: ''
+ identifier: ''
+ optional: true
+ widget: select
+ multiple: false
+ remember: false
+ default_group: All
+ default_group_multiple: { }
+ group_items: { }
+ entity_type: node
+ plugin_id: node_status
+ langcode:
+ id: langcode
+ table: node_field_data
+ field: langcode
+ relationship: none
+ group_type: group
+ admin_label: ''
+ operator: in
+ value:
+ '***LANGUAGE_language_content***': '***LANGUAGE_language_content***'
+ group: 1
+ exposed: false
+ expose:
+ operator_id: ''
+ label: ''
+ description: ''
+ use_operator: false
+ operator: ''
+ identifier: ''
+ required: false
+ remember: false
+ multiple: false
+ remember_roles:
+ authenticated: authenticated
+ reduce: false
+ operator_limit_selection: false
+ operator_list: { }
+ is_grouped: false
+ group_info:
+ label: ''
+ description: ''
+ identifier: ''
+ optional: true
+ widget: select
+ multiple: false
+ remember: false
+ default_group: All
+ default_group_multiple: { }
+ group_items: { }
+ entity_type: node
+ entity_field: langcode
+ plugin_id: language
+ sorts:
+ changed:
+ id: changed
+ table: node_field_data
+ field: changed
+ relationship: none
+ group_type: group
+ admin_label: ''
+ order: DESC
+ exposed: false
+ expose:
+ label: ''
+ granularity: second
+ entity_type: node
+ entity_field: changed
+ plugin_id: date
+ title: 'Recent content'
+ header: { }
+ footer: { }
+ empty:
+ area_text_custom:
+ id: area_text_custom
+ table: views
+ field: area_text_custom
+ relationship: none
+ group_type: group
+ admin_label: ''
+ empty: true
+ tokenize: false
+ content: 'No content available.'
+ plugin_id: text_custom
+ relationships:
+ uid:
+ id: uid
+ table: node_field_data
+ field: uid
+ relationship: none
+ group_type: group
+ admin_label: author
+ required: true
+ entity_type: node
+ entity_field: uid
+ plugin_id: standard
+ arguments: { }
+ display_extenders: { }
+ use_more: false
+ use_more_always: false
+ use_more_text: More
+ link_url: ''
+ link_display: '0'
+ cache_metadata:
+ contexts:
+ - 'languages:language_content'
+ - 'languages:language_interface'
+ - user
+ - 'user.node_grants:view'
+ - user.permissions
+ max-age: -1
+ tags: { }
+ block_1:
+ display_plugin: block
+ id: block_1
+ display_title: Block
+ position: 2
+ display_options:
+ display_extenders: { }
+ defaults:
+ style: false
+ row: false
+ row:
+ type: 'entity:node'
+ options:
+ relationship: none
+ view_mode: teaser
+ cache_metadata:
+ contexts:
+ - 'languages:language_content'
+ - 'languages:language_interface'
+ - user
+ - 'user.node_grants:view'
+ - user.permissions
+ max-age: -1
+ tags: { }
diff --git a/web/core/modules/contextual/tests/src/Functional/ContextualDynamicContextTest.php b/web/core/modules/contextual/tests/src/Functional/ContextualDynamicContextTest.php
index 4f0ab275ff..a9e2af5a4b 100644
--- a/web/core/modules/contextual/tests/src/Functional/ContextualDynamicContextTest.php
+++ b/web/core/modules/contextual/tests/src/Functional/ContextualDynamicContextTest.php
@@ -48,7 +48,14 @@ class ContextualDynamicContextTest extends BrowserTestBase {
*
* @var array
*/
- public static $modules = ['contextual', 'node', 'views', 'views_ui', 'language', 'menu_test'];
+ public static $modules = [
+ 'contextual',
+ 'node',
+ 'views',
+ 'views_ui',
+ 'language',
+ 'menu_test',
+ ];
protected function setUp() {
parent::setUp();
@@ -97,7 +104,7 @@ public function testDifferentPermissions() {
}
$response = $this->renderContextualLinks([], 'node');
$this->assertSame(400, $response->getStatusCode());
- $this->assertContains('No contextual ids specified.', (string) $response->getBody());
+ $this->assertStringContainsString('No contextual ids specified.', (string) $response->getBody());
$response = $this->renderContextualLinks($ids, 'node');
$this->assertSame(200, $response->getStatusCode());
$json = Json::decode((string) $response->getBody());
@@ -120,7 +127,7 @@ public function testDifferentPermissions() {
}
$response = $this->renderContextualLinks([], 'node');
$this->assertSame(400, $response->getStatusCode());
- $this->assertContains('No contextual ids specified.', (string) $response->getBody());
+ $this->assertStringContainsString('No contextual ids specified.', (string) $response->getBody());
$response = $this->renderContextualLinks($ids, 'node');
$this->assertSame(200, $response->getStatusCode());
$json = Json::decode((string) $response->getBody());
@@ -177,7 +184,7 @@ public function testTokenProtection() {
'http_errors' => FALSE,
]);
$this->assertEquals('400', $response->getStatusCode());
- $this->assertContains('No contextual ID tokens specified.', (string) $response->getBody());
+ $this->assertStringContainsString('No contextual ID tokens specified.', (string) $response->getBody());
$response = $http_client->request('POST', $url, [
'cookies' => $this->getSessionCookies(),
@@ -185,7 +192,7 @@ public function testTokenProtection() {
'http_errors' => FALSE,
]);
$this->assertEquals('400', $response->getStatusCode());
- $this->assertContains('Invalid contextual ID specified.', (string) $response->getBody());
+ $this->assertStringContainsString('Invalid contextual ID specified.', (string) $response->getBody());
$response = $http_client->request('POST', $url, [
'cookies' => $this->getSessionCookies(),
@@ -193,7 +200,7 @@ public function testTokenProtection() {
'http_errors' => FALSE,
]);
$this->assertEquals('400', $response->getStatusCode());
- $this->assertContains('Invalid contextual ID specified.', (string) $response->getBody());
+ $this->assertStringContainsString('Invalid contextual ID specified.', (string) $response->getBody());
$response = $http_client->request('POST', $url, [
'cookies' => $this->getSessionCookies(),
diff --git a/web/core/modules/contextual/tests/src/FunctionalJavascript/DuplicateContextualLinksTest.php b/web/core/modules/contextual/tests/src/FunctionalJavascript/DuplicateContextualLinksTest.php
new file mode 100644
index 0000000000..d5c6274228
--- /dev/null
+++ b/web/core/modules/contextual/tests/src/FunctionalJavascript/DuplicateContextualLinksTest.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace Drupal\Tests\contextual\FunctionalJavascript;
+
+use Drupal\FunctionalJavascriptTests\WebDriverTestBase;
+
+/**
+ * Tests the UI for correct contextual links.
+ *
+ * @group contextual
+ */
+class DuplicateContextualLinksTest extends WebDriverTestBase {
+
+ /**
+ * {@inheritdoc}
+ */
+ public static $modules = [
+ 'block',
+ 'contextual',
+ 'node',
+ 'views',
+ 'views_ui',
+ 'contextual_test',
+ ];
+
+ /**
+ * {@inheritdoc}
+ */
+ protected $defaultTheme = 'stark';
+
+ /**
+ * Tests the contextual links with same id.
+ */
+ public function testSameContextualLinks() {
+ $this->drupalPlaceBlock('views_block:contextual_recent-block_1', ['id' => 'first']);
+ $this->drupalPlaceBlock('views_block:contextual_recent-block_1', ['id' => 'second']);
+ $this->drupalCreateContentType(['type' => 'page']);
+ $this->drupalCreateNode();
+ $this->drupalLogin($this->drupalCreateUser([
+ 'access content',
+ 'access contextual links',
+ 'administer nodes',
+ 'administer blocks',
+ 'administer views',
+ 'edit any page content',
+ ]));
+ // Ensure same contextual links work correct with fresh and cached page.
+ foreach (['fresh', 'cached'] as $state) {
+ $this->drupalGet('user');
+ $contextual_id = '[data-contextual-id^="node:node=1"]';
+ $this->assertJsCondition("(typeof jQuery !== 'undefined' && jQuery('[data-contextual-id]:empty').length === 0)");
+ $this->getSession()->executeScript("jQuery('#block-first $contextual_id .trigger').trigger('click');");
+ $contextual_links = $this->assertSession()->waitForElementVisible('css', "#block-first $contextual_id .contextual-links");
+ $this->assertTrue($contextual_links->isVisible(), "Contextual links are visible with $state page.");
+ }
+ }
+
+}
diff --git a/web/core/modules/contextual/tests/src/FunctionalJavascript/EditModeTest.php b/web/core/modules/contextual/tests/src/FunctionalJavascript/EditModeTest.php
index 0133bca215..c5b36aa728 100644
--- a/web/core/modules/contextual/tests/src/FunctionalJavascript/EditModeTest.php
+++ b/web/core/modules/contextual/tests/src/FunctionalJavascript/EditModeTest.php
@@ -51,7 +51,7 @@ protected function setUp() {
/**
* Tests enabling and disabling edit mode.
*/
- public function testEditModeEnableDisalbe() {
+ public function testEditModeEnableDisable() {
$web_assert = $this->assertSession();
$page = $this->getSession()->getPage();
// Get the page twice to ensure edit mode remains enabled after a new page
diff --git a/web/core/modules/datetime/tests/src/Functional/DateFilterTest.php b/web/core/modules/datetime/tests/src/Functional/DateFilterTest.php
index 0272bb25e1..4aae521bd8 100644
--- a/web/core/modules/datetime/tests/src/Functional/DateFilterTest.php
+++ b/web/core/modules/datetime/tests/src/Functional/DateFilterTest.php
@@ -85,7 +85,7 @@ protected function setUp($import_test_views = TRUE) {
public function testLimitExposedOperators() {
$this->drupalGet('test_exposed_filter_datetime');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertOption('edit-field-date-value-op', '=');
$this->assertNoOption('edit-field-date-value-op', '>');
$this->assertNoOption('edit-field-date-value-op', '>=');
@@ -103,7 +103,7 @@ public function testLimitExposedOperators() {
$this->drupalPostForm('admin/structure/views/view/test_exposed_filter_datetime/edit/default', [], t('Save'));
$this->drupalGet('test_exposed_filter_datetime');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertNoOption('edit-field-date-value-op', '<');
$this->assertNoOption('edit-field-date-value-op', '<=');
$this->assertNoOption('edit-field-date-value-op', '=');
diff --git a/web/core/modules/datetime/tests/src/Functional/DateTimeFieldTest.php b/web/core/modules/datetime/tests/src/Functional/DateTimeFieldTest.php
index fd55a918f3..2c5ed0b3db 100644
--- a/web/core/modules/datetime/tests/src/Functional/DateTimeFieldTest.php
+++ b/web/core/modules/datetime/tests/src/Functional/DateTimeFieldTest.php
@@ -127,7 +127,7 @@ public function testDateField() {
$expected_iso = $date_formatter->format($date->getTimestamp(), 'custom', 'Y-m-d\TH:i:s\Z', DateTimeItemInterface::STORAGE_TIMEZONE);
$output = $this->renderTestEntity($id);
$expected_markup = '<time datetime="' . $expected_iso . '" class="datetime">' . $expected . '</time>';
- $this->assertContains($expected_markup, $output, new FormattableMarkup('Formatted date field using %value format displayed as %expected with %expected_iso attribute in %timezone.', [
+ $this->assertStringContainsString($expected_markup, $output, new FormattableMarkup('Formatted date field using %value format displayed as %expected with %expected_iso attribute in %timezone.', [
'%value' => $new_value,
'%expected' => $expected,
'%expected_iso' => $expected_iso,
@@ -147,7 +147,7 @@ public function testDateField() {
->save();
$expected = $date->format(DateTimeItemInterface::DATE_STORAGE_FORMAT);
$output = $this->renderTestEntity($id);
- $this->assertContains($expected, $output, new FormattableMarkup('Formatted date field using plain format displayed as %expected in %timezone.', [
+ $this->assertStringContainsString($expected, $output, new FormattableMarkup('Formatted date field using plain format displayed as %expected in %timezone.', [
'%expected' => $expected,
'%timezone' => $timezone,
]));
@@ -161,7 +161,7 @@ public function testDateField() {
->save();
$expected = $date->format($this->displayOptions['settings']['date_format']);
$output = $this->renderTestEntity($id);
- $this->assertContains($expected, $output, new FormattableMarkup('Formatted date field using datetime_custom format displayed as %expected in %timezone.', [
+ $this->assertStringContainsString($expected, $output, new FormattableMarkup('Formatted date field using datetime_custom format displayed as %expected in %timezone.', [
'%expected' => $expected,
'%timezone' => $timezone,
]));
@@ -174,7 +174,7 @@ public function testDateField() {
->save();
$expected = '<strong>' . $date->format('m/d/Y') . '</strong>alert(String.fromCharCode(88,83,83))';
$output = $this->renderTestEntity($id);
- $this->assertContains($expected, $output, new FormattableMarkup('Formatted date field using daterange_custom format displayed as %expected in %timezone.', [
+ $this->assertStringContainsString($expected, $output, new FormattableMarkup('Formatted date field using daterange_custom format displayed as %expected in %timezone.', [
'%expected' => $expected,
'%timezone' => $timezone,
]));
@@ -204,7 +204,7 @@ public function testDateField() {
'@interval' => $this->dateFormatter->formatTimeDiffSince($timestamp, ['granularity' => $this->displayOptions['settings']['granularity']]),
]);
$output = $this->renderTestEntity($id);
- $this->assertContains((string) $expected, $output, new FormattableMarkup('Formatted date field using datetime_time_ago format displayed as %expected in %timezone.', [
+ $this->assertStringContainsString((string) $expected, $output, new FormattableMarkup('Formatted date field using datetime_time_ago format displayed as %expected in %timezone.', [
'%expected' => $expected,
'%timezone' => $timezone,
]));
@@ -228,7 +228,7 @@ public function testDateField() {
'@interval' => $this->dateFormatter->formatTimeDiffUntil($timestamp, ['granularity' => $this->displayOptions['settings']['granularity']]),
]);
$output = $this->renderTestEntity($id);
- $this->assertContains((string) $expected, $output, new FormattableMarkup('Formatted date field using datetime_time_ago format displayed as %expected in %timezone.', [
+ $this->assertStringContainsString((string) $expected, $output, new FormattableMarkup('Formatted date field using datetime_time_ago format displayed as %expected in %timezone.', [
'%expected' => $expected,
'%timezone' => $timezone,
]));
@@ -299,7 +299,7 @@ public function testDatetimeField() {
$expected_iso = $date_formatter->format($date->getTimestamp(), 'custom', 'Y-m-d\TH:i:s\Z', 'UTC');
$output = $this->renderTestEntity($id);
$expected_markup = '<time datetime="' . $expected_iso . '" class="datetime">' . $expected . '</time>';
- $this->assertContains($expected_markup, $output, new FormattableMarkup('Formatted date field using %value format displayed as %expected with %expected_iso attribute.', ['%value' => $new_value, '%expected' => $expected, '%expected_iso' => $expected_iso]));
+ $this->assertStringContainsString($expected_markup, $output, new FormattableMarkup('Formatted date field using %value format displayed as %expected with %expected_iso attribute.', ['%value' => $new_value, '%expected' => $expected, '%expected_iso' => $expected_iso]));
break;
}
}
@@ -314,7 +314,7 @@ public function testDatetimeField() {
->save();
$expected = $date->format(DateTimeItemInterface::DATETIME_STORAGE_FORMAT);
$output = $this->renderTestEntity($id);
- $this->assertContains($expected, $output, new FormattableMarkup('Formatted date field using plain format displayed as %expected.', ['%expected' => $expected]));
+ $this->assertStringContainsString($expected, $output, new FormattableMarkup('Formatted date field using plain format displayed as %expected.', ['%expected' => $expected]));
// Verify that the 'datetime_custom' formatter works.
$this->displayOptions['type'] = 'datetime_custom';
@@ -324,7 +324,7 @@ public function testDatetimeField() {
->save();
$expected = $date->format($this->displayOptions['settings']['date_format']);
$output = $this->renderTestEntity($id);
- $this->assertContains($expected, $output, new FormattableMarkup('Formatted date field using datetime_custom format displayed as %expected.', ['%expected' => $expected]));
+ $this->assertStringContainsString($expected, $output, new FormattableMarkup('Formatted date field using datetime_custom format displayed as %expected.', ['%expected' => $expected]));
// Verify that the 'timezone_override' setting works.
$this->displayOptions['type'] = 'datetime_custom';
@@ -334,7 +334,7 @@ public function testDatetimeField() {
->save();
$expected = $date->format($this->displayOptions['settings']['date_format'], ['timezone' => 'America/New_York']);
$output = $this->renderTestEntity($id);
- $this->assertContains($expected, $output, new FormattableMarkup('Formatted date field using datetime_custom format displayed as %expected.', ['%expected' => $expected]));
+ $this->assertStringContainsString($expected, $output, new FormattableMarkup('Formatted date field using datetime_custom format displayed as %expected.', ['%expected' => $expected]));
// Verify that the 'datetime_time_ago' formatter works for intervals in the
// past. First update the test entity so that the date difference always
@@ -361,7 +361,7 @@ public function testDatetimeField() {
'@interval' => $this->dateFormatter->formatTimeDiffSince($timestamp, ['granularity' => $this->displayOptions['settings']['granularity']]),
]);
$output = $this->renderTestEntity($id);
- $this->assertContains((string) $expected, $output, new FormattableMarkup('Formatted date field using datetime_time_ago format displayed as %expected.', ['%expected' => $expected]));
+ $this->assertStringContainsString((string) $expected, $output, new FormattableMarkup('Formatted date field using datetime_time_ago format displayed as %expected.', ['%expected' => $expected]));
// Verify that the 'datetime_time_ago' formatter works for intervals in the
// future. First update the test entity so that the date difference always
@@ -383,7 +383,7 @@ public function testDatetimeField() {
'@interval' => $this->dateFormatter->formatTimeDiffUntil($timestamp, ['granularity' => $this->displayOptions['settings']['granularity']]),
]);
$output = $this->renderTestEntity($id);
- $this->assertContains((string) $expected, $output, new FormattableMarkup('Formatted date field using datetime_time_ago format displayed as %expected.', ['%expected' => $expected]));
+ $this->assertStringContainsString((string) $expected, $output, new FormattableMarkup('Formatted date field using datetime_time_ago format displayed as %expected.', ['%expected' => $expected]));
}
/**
@@ -567,7 +567,7 @@ public function testDatelistWidget() {
}
$this->drupalPostForm(NULL, $edit, t('Save'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
foreach ($expected as $expected_text) {
$this->assertText(t($expected_text));
}
@@ -583,7 +583,7 @@ public function testDatelistWidget() {
}
$this->drupalPostForm(NULL, $edit, t('Save'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
preg_match('|entity_test/manage/(\d+)|', $this->getUrl(), $match);
$id = $match[1];
$this->assertText(t('entity_test @id has been created.', ['@id' => $id]));
@@ -598,7 +598,7 @@ public function testDatelistWidget() {
}
$this->drupalPostForm(NULL, $edit, t('Save'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertOptionSelected("edit-$field_name-0-value-minute", '0', 'Correct minute selected.');
}
@@ -905,7 +905,7 @@ public function testDateStorageSettings() {
$this->drupalPostForm('node/add/date_content', $edit, t('Save'));
$this->drupalGet('admin/structure/types/manage/date_content/fields/node.date_content.' . $field_name . '/storage');
$result = $this->xpath("//*[@id='edit-settings-datetime-type' and contains(@disabled, 'disabled')]");
- $this->assertEqual(count($result), 1, "Changing datetime setting is disabled.");
+ $this->assertCount(1, $result, "Changing datetime setting is disabled.");
$this->assertText('There is data for this field in the database. The field settings can no longer be changed.');
}
diff --git a/web/core/modules/datetime/tests/src/Functional/Views/FilterDateTest.php b/web/core/modules/datetime/tests/src/Functional/Views/FilterDateTest.php
index 213d422fe5..8a319cc2e7 100644
--- a/web/core/modules/datetime/tests/src/Functional/Views/FilterDateTest.php
+++ b/web/core/modules/datetime/tests/src/Functional/Views/FilterDateTest.php
@@ -140,13 +140,13 @@ public function testExposedGroupedFilters() {
$this->getSession()->getPage()->findField($this->fieldName . '_value')->selectOption(1);
$this->getSession()->getPage()->pressButton('Apply');
$results = $this->cssSelect('.view-content .field-content');
- $this->assertEquals(1, count($results));
+ $this->assertCount(1, $results);
// Filter the Preview by 'not empty'.
$this->getSession()->getPage()->findField($this->fieldName . '_value')->selectOption(2);
$this->getSession()->getPage()->pressButton('Apply');
$results = $this->cssSelect('.view-content .field-content');
- $this->assertEquals(3, count($results));
+ $this->assertCount(3, $results);
}
}
diff --git a/web/core/modules/datetime/tests/src/Kernel/DateTimeItemTest.php b/web/core/modules/datetime/tests/src/Kernel/DateTimeItemTest.php
index 03fc213e9d..721201a5c0 100644
--- a/web/core/modules/datetime/tests/src/Kernel/DateTimeItemTest.php
+++ b/web/core/modules/datetime/tests/src/Kernel/DateTimeItemTest.php
@@ -78,8 +78,8 @@ public function testDateTime() {
// Verify entity has been created properly.
$id = $entity->id();
$entity = EntityTest::load($id);
- $this->assertTrue($entity->field_datetime instanceof FieldItemListInterface, 'Field implements interface.');
- $this->assertTrue($entity->field_datetime[0] instanceof FieldItemInterface, 'Field item implements interface.');
+ $this->assertInstanceOf(FieldItemListInterface::class, $entity->field_datetime);
+ $this->assertInstanceOf(FieldItemInterface::class, $entity->field_datetime[0]);
$this->assertEqual($entity->field_datetime->value, $value);
$this->assertEqual($entity->field_datetime[0]->value, $value);
$this->assertEqual(DateTimeItemInterface::STORAGE_TIMEZONE, $entity->field_datetime[0]->getProperties()['value']->getDateTime()->getTimeZone()->getName());
@@ -122,8 +122,8 @@ public function testDateOnly() {
// Verify entity has been created properly.
$id = $entity->id();
$entity = EntityTest::load($id);
- $this->assertTrue($entity->field_datetime instanceof FieldItemListInterface, 'Field implements interface.');
- $this->assertTrue($entity->field_datetime[0] instanceof FieldItemInterface, 'Field item implements interface.');
+ $this->assertInstanceOf(FieldItemListInterface::class, $entity->field_datetime);
+ $this->assertInstanceOf(FieldItemInterface::class, $entity->field_datetime[0]);
$this->assertEqual($entity->field_datetime->value, $value);
$this->assertEqual($entity->field_datetime[0]->value, $value);
$this->assertEquals(DateTimeItemInterface::STORAGE_TIMEZONE, $entity->field_datetime->date->getTimeZone()->getName());
diff --git a/web/core/modules/datetime_range/tests/src/Functional/DateRangeFieldTest.php b/web/core/modules/datetime_range/tests/src/Functional/DateRangeFieldTest.php
index cdf95cce14..12e0dbe702 100644
--- a/web/core/modules/datetime_range/tests/src/Functional/DateRangeFieldTest.php
+++ b/web/core/modules/datetime_range/tests/src/Functional/DateRangeFieldTest.php
@@ -143,19 +143,19 @@ public function testDateRangeField() {
$end_expected_iso = $this->dateFormatter->format($end_date->getTimestamp(), 'custom', 'Y-m-d\TH:i:s\Z', DateTimeItemInterface::STORAGE_TIMEZONE);
$end_expected_markup = '<time datetime="' . $end_expected_iso . '" class="datetime">' . $end_expected . '</time>';
$output = $this->renderTestEntity($id);
- $this->assertContains($start_expected_markup, $output, new FormattableMarkup('Formatted date field using %value format displayed as %expected with %expected_iso attribute in %timezone.', [
+ $this->assertStringContainsString($start_expected_markup, $output, new FormattableMarkup('Formatted date field using %value format displayed as %expected with %expected_iso attribute in %timezone.', [
'%value' => 'long',
'%expected' => $start_expected,
'%expected_iso' => $start_expected_iso,
'%timezone' => $timezone,
]));
- $this->assertContains($end_expected_markup, $output, new FormattableMarkup('Formatted date field using %value format displayed as %expected with %expected_iso attribute in %timezone.', [
+ $this->assertStringContainsString($end_expected_markup, $output, new FormattableMarkup('Formatted date field using %value format displayed as %expected with %expected_iso attribute in %timezone.', [
'%value' => 'long',
'%expected' => $end_expected,
'%expected_iso' => $end_expected_iso,
'%timezone' => $timezone,
]));
- $this->assertContains(' THESEPARATOR ', $output, 'Found proper separator');
+ $this->assertStringContainsString(' THESEPARATOR ', $output, 'Found proper separator');
// Verify that hook_entity_prepare_view can add attributes.
// @see entity_test_entity_prepare_view()
@@ -171,7 +171,7 @@ public function testDateRangeField() {
->save();
$expected = $start_date->format(DateTimeItemInterface::DATE_STORAGE_FORMAT) . ' - ' . $end_date->format(DateTimeItemInterface::DATE_STORAGE_FORMAT);
$output = $this->renderTestEntity($id);
- $this->assertContains($expected, $output, new FormattableMarkup('Formatted date field using plain format displayed as %expected in %timezone.', [
+ $this->assertStringContainsString($expected, $output, new FormattableMarkup('Formatted date field using plain format displayed as %expected in %timezone.', [
'%expected' => $expected,
'%timezone' => $timezone,
]));
@@ -184,7 +184,7 @@ public function testDateRangeField() {
->save();
$expected = $start_date->format($this->displayOptions['settings']['date_format']) . ' - ' . $end_date->format($this->displayOptions['settings']['date_format']);
$output = $this->renderTestEntity($id);
- $this->assertContains($expected, $output, new FormattableMarkup('Formatted date field using daterange_custom format displayed as %expected in %timezone.', [
+ $this->assertStringContainsString($expected, $output, new FormattableMarkup('Formatted date field using daterange_custom format displayed as %expected in %timezone.', [
'%expected' => $expected,
'%timezone' => $timezone,
]));
@@ -197,7 +197,7 @@ public function testDateRangeField() {
->save();
$expected = '<strong>' . $start_date->format('m/d/Y') . '</strong>alert(String.fromCharCode(88,83,83)) - <strong>' . $end_date->format('m/d/Y') . '</strong>alert(String.fromCharCode(88,83,83))';
$output = $this->renderTestEntity($id);
- $this->assertContains($expected, $output, new FormattableMarkup('Formatted date field using daterange_custom format displayed as %expected in %timezone.', [
+ $this->assertStringContainsString($expected, $output, new FormattableMarkup('Formatted date field using daterange_custom format displayed as %expected in %timezone.', [
'%expected' => $expected,
'%timezone' => $timezone,
]));
@@ -239,13 +239,13 @@ public function testDateRangeField() {
$start_expected_iso = $this->dateFormatter->format($start_date->getTimestamp(), 'custom', 'Y-m-d\TH:i:s\Z', DateTimeItemInterface::STORAGE_TIMEZONE);
$start_expected_markup = '<time datetime="' . $start_expected_iso . '" class="datetime">' . $start_expected . '</time>';
$output = $this->renderTestEntity($id);
- $this->assertContains($start_expected_markup, $output, new FormattableMarkup('Formatted date field using %value format displayed as %expected with %expected_iso attribute in %timezone.', [
+ $this->assertStringContainsString($start_expected_markup, $output, new FormattableMarkup('Formatted date field using %value format displayed as %expected with %expected_iso attribute in %timezone.', [
'%value' => 'long',
'%expected' => $start_expected,
'%expected_iso' => $start_expected_iso,
'%timezone' => $timezone,
]));
- $this->assertNotContains(' THESEPARATOR ', $output, 'Separator not found on page in ' . $timezone);
+ $this->assertStringNotContainsString(' THESEPARATOR ', $output, 'Separator not found on page in ' . $timezone);
// Verify that hook_entity_prepare_view can add attributes.
// @see entity_test_entity_prepare_view()
@@ -260,11 +260,11 @@ public function testDateRangeField() {
->save();
$expected = $start_date->format(DateTimeItemInterface::DATE_STORAGE_FORMAT);
$output = $this->renderTestEntity($id);
- $this->assertContains($expected, $output, new FormattableMarkup('Formatted date field using plain format displayed as %expected in %timezone.', [
+ $this->assertStringContainsString($expected, $output, new FormattableMarkup('Formatted date field using plain format displayed as %expected in %timezone.', [
'%expected' => $expected,
'%timezone' => $timezone,
]));
- $this->assertNotContains(' THESEPARATOR ', $output, 'Separator not found on page');
+ $this->assertStringNotContainsString(' THESEPARATOR ', $output, 'Separator not found on page');
$this->displayOptions['type'] = 'daterange_custom';
$this->displayOptions['settings'] = ['date_format' => 'm/d/Y'] + $this->defaultSettings;
@@ -273,11 +273,11 @@ public function testDateRangeField() {
->save();
$expected = $start_date->format($this->displayOptions['settings']['date_format']);
$output = $this->renderTestEntity($id);
- $this->assertContains($expected, $output, new FormattableMarkup('Formatted date field using daterange_custom format displayed as %expected in %timezone.', [
+ $this->assertStringContainsString($expected, $output, new FormattableMarkup('Formatted date field using daterange_custom format displayed as %expected in %timezone.', [
'%expected' => $expected,
'%timezone' => $timezone,
]));
- $this->assertNotContains(' THESEPARATOR ', $output, 'Separator not found on page');
+ $this->assertStringNotContainsString(' THESEPARATOR ', $output, 'Separator not found on page');
}
}
@@ -350,9 +350,9 @@ public function testDatetimeRangeField() {
$end_expected_iso = $this->dateFormatter->format($end_date->getTimestamp(), 'custom', 'Y-m-d\TH:i:s\Z', 'UTC');
$end_expected_markup = '<time datetime="' . $end_expected_iso . '" class="datetime">' . $end_expected . '</time>';
$output = $this->renderTestEntity($id);
- $this->assertContains($start_expected_markup, $output, new FormattableMarkup('Formatted date field using %value format displayed as %expected with %expected_iso attribute.', ['%value' => 'long', '%expected' => $start_expected, '%expected_iso' => $start_expected_iso]));
- $this->assertContains($end_expected_markup, $output, new FormattableMarkup('Formatted date field using %value format displayed as %expected with %expected_iso attribute.', ['%value' => 'long', '%expected' => $end_expected, '%expected_iso' => $end_expected_iso]));
- $this->assertContains(' THESEPARATOR ', $output, 'Found proper separator');
+ $this->assertStringContainsString($start_expected_markup, $output, new FormattableMarkup('Formatted date field using %value format displayed as %expected with %expected_iso attribute.', ['%value' => 'long', '%expected' => $start_expected, '%expected_iso' => $start_expected_iso]));
+ $this->assertStringContainsString($end_expected_markup, $output, new FormattableMarkup('Formatted date field using %value format displayed as %expected with %expected_iso attribute.', ['%value' => 'long', '%expected' => $end_expected, '%expected_iso' => $end_expected_iso]));
+ $this->assertStringContainsString(' THESEPARATOR ', $output, 'Found proper separator');
// Verify that hook_entity_prepare_view can add attributes.
// @see entity_test_entity_prepare_view()
@@ -368,7 +368,7 @@ public function testDatetimeRangeField() {
->save();
$expected = $start_date->format(DateTimeItemInterface::DATETIME_STORAGE_FORMAT) . ' - ' . $end_date->format(DateTimeItemInterface::DATETIME_STORAGE_FORMAT);
$output = $this->renderTestEntity($id);
- $this->assertContains($expected, $output, new FormattableMarkup('Formatted date field using plain format displayed as %expected.', ['%expected' => $expected]));
+ $this->assertStringContainsString($expected, $output, new FormattableMarkup('Formatted date field using plain format displayed as %expected.', ['%expected' => $expected]));
// Verify that the 'datetime_custom' formatter works.
$this->displayOptions['type'] = 'daterange_custom';
@@ -378,7 +378,7 @@ public function testDatetimeRangeField() {
->save();
$expected = $start_date->format($this->displayOptions['settings']['date_format']) . ' - ' . $end_date->format($this->displayOptions['settings']['date_format']);
$output = $this->renderTestEntity($id);
- $this->assertContains($expected, $output, new FormattableMarkup('Formatted date field using daterange_custom format displayed as %expected.', ['%expected' => $expected]));
+ $this->assertStringContainsString($expected, $output, new FormattableMarkup('Formatted date field using daterange_custom format displayed as %expected.', ['%expected' => $expected]));
// Verify that the 'timezone_override' setting works.
$this->displayOptions['type'] = 'daterange_custom';
@@ -389,7 +389,7 @@ public function testDatetimeRangeField() {
$expected = $start_date->format($this->displayOptions['settings']['date_format'], ['timezone' => 'America/New_York']);
$expected .= ' - ' . $end_date->format($this->displayOptions['settings']['date_format'], ['timezone' => 'America/New_York']);
$output = $this->renderTestEntity($id);
- $this->assertContains($expected, $output, new FormattableMarkup('Formatted date field using daterange_custom format displayed as %expected.', ['%expected' => $expected]));
+ $this->assertStringContainsString($expected, $output, new FormattableMarkup('Formatted date field using daterange_custom format displayed as %expected.', ['%expected' => $expected]));
// Test formatters when start date and end date are the same
$this->drupalGet('entity_test/add');
@@ -429,8 +429,8 @@ public function testDatetimeRangeField() {
$start_expected_iso = $this->dateFormatter->format($start_date->getTimestamp(), 'custom', 'Y-m-d\TH:i:s\Z', 'UTC');
$start_expected_markup = '<time datetime="' . $start_expected_iso . '" class="datetime">' . $start_expected . '</time>';
$output = $this->renderTestEntity($id);
- $this->assertContains($start_expected_markup, $output, new FormattableMarkup('Formatted date field using %value format displayed as %expected with %expected_iso attribute.', ['%value' => 'long', '%expected' => $start_expected, '%expected_iso' => $start_expected_iso]));
- $this->assertNotContains(' THESEPARATOR ', $output, 'Separator not found on page');
+ $this->assertStringContainsString($start_expected_markup, $output, new FormattableMarkup('Formatted date field using %value format displayed as %expected with %expected_iso attribute.', ['%value' => 'long', '%expected' => $start_expected, '%expected_iso' => $start_expected_iso]));
+ $this->assertStringNotContainsString(' THESEPARATOR ', $output, 'Separator not found on page');
// Verify that hook_entity_prepare_view can add attributes.
// @see entity_test_entity_prepare_view()
@@ -445,8 +445,8 @@ public function testDatetimeRangeField() {
->save();
$expected = $start_date->format(DateTimeItemInterface::DATETIME_STORAGE_FORMAT);
$output = $this->renderTestEntity($id);
- $this->assertContains($expected, $output, new FormattableMarkup('Formatted date field using plain format displayed as %expected.', ['%expected' => $expected]));
- $this->assertNotContains(' THESEPARATOR ', $output, 'Separator not found on page');
+ $this->assertStringContainsString($expected, $output, new FormattableMarkup('Formatted date field using plain format displayed as %expected.', ['%expected' => $expected]));
+ $this->assertStringNotContainsString(' THESEPARATOR ', $output, 'Separator not found on page');
$this->displayOptions['type'] = 'daterange_custom';
$this->displayOptions['settings'] = ['date_format' => 'm/d/Y g:i:s A'] + $this->defaultSettings;
@@ -455,8 +455,8 @@ public function testDatetimeRangeField() {
->save();
$expected = $start_date->format($this->displayOptions['settings']['date_format']);
$output = $this->renderTestEntity($id);
- $this->assertContains($expected, $output, new FormattableMarkup('Formatted date field using daterange_custom format displayed as %expected.', ['%expected' => $expected]));
- $this->assertNotContains(' THESEPARATOR ', $output, 'Separator not found on page');
+ $this->assertStringContainsString($expected, $output, new FormattableMarkup('Formatted date field using daterange_custom format displayed as %expected.', ['%expected' => $expected]));
+ $this->assertStringNotContainsString(' THESEPARATOR ', $output, 'Separator not found on page');
}
/**
@@ -523,9 +523,9 @@ public function testAlldayRangeField() {
$end_expected_iso = $this->dateFormatter->format($end_date->getTimestamp(), 'custom', 'Y-m-d\TH:i:s\Z', 'UTC');
$end_expected_markup = '<time datetime="' . $end_expected_iso . '" class="datetime">' . $end_expected . '</time>';
$output = $this->renderTestEntity($id);
- $this->assertContains($start_expected_markup, $output, new FormattableMarkup('Formatted date field using %value format displayed as %expected with %expected_iso attribute.', ['%value' => 'long', '%expected' => $start_expected, '%expected_iso' => $start_expected_iso]));
- $this->assertContains($end_expected_markup, $output, new FormattableMarkup('Formatted date field using %value format displayed as %expected with %expected_iso attribute.', ['%value' => 'long', '%expected' => $end_expected, '%expected_iso' => $end_expected_iso]));
- $this->assertContains(' THESEPARATOR ', $output, 'Found proper separator');
+ $this->assertStringContainsString($start_expected_markup, $output, new FormattableMarkup('Formatted date field using %value format displayed as %expected with %expected_iso attribute.', ['%value' => 'long', '%expected' => $start_expected, '%expected_iso' => $start_expected_iso]));
+ $this->assertStringContainsString($end_expected_markup, $output, new FormattableMarkup('Formatted date field using %value format displayed as %expected with %expected_iso attribute.', ['%value' => 'long', '%expected' => $end_expected, '%expected_iso' => $end_expected_iso]));
+ $this->assertStringContainsString(' THESEPARATOR ', $output, 'Found proper separator');
// Verify that hook_entity_prepare_view can add attributes.
// @see entity_test_entity_prepare_view()
@@ -541,7 +541,7 @@ public function testAlldayRangeField() {
->save();
$expected = $start_date->format(DateTimeItemInterface::DATETIME_STORAGE_FORMAT) . ' - ' . $end_date->format(DateTimeItemInterface::DATETIME_STORAGE_FORMAT);
$output = $this->renderTestEntity($id);
- $this->assertContains($expected, $output, new FormattableMarkup('Formatted date field using plain format displayed as %expected.', ['%expected' => $expected]));
+ $this->assertStringContainsString($expected, $output, new FormattableMarkup('Formatted date field using plain format displayed as %expected.', ['%expected' => $expected]));
// Verify that the custom formatter works.
$this->displayOptions['type'] = 'daterange_custom';
@@ -551,7 +551,7 @@ public function testAlldayRangeField() {
->save();
$expected = $start_date->format($this->displayOptions['settings']['date_format']) . ' - ' . $end_date->format($this->displayOptions['settings']['date_format']);
$output = $this->renderTestEntity($id);
- $this->assertContains($expected, $output, new FormattableMarkup('Formatted date field using daterange_custom format displayed as %expected.', ['%expected' => $expected]));
+ $this->assertStringContainsString($expected, $output, new FormattableMarkup('Formatted date field using daterange_custom format displayed as %expected.', ['%expected' => $expected]));
// Verify that the 'timezone_override' setting works.
$this->displayOptions['type'] = 'daterange_custom';
@@ -562,7 +562,7 @@ public function testAlldayRangeField() {
$expected = $start_date->format($this->displayOptions['settings']['date_format'], ['timezone' => 'America/New_York']);
$expected .= ' - ' . $end_date->format($this->displayOptions['settings']['date_format'], ['timezone' => 'America/New_York']);
$output = $this->renderTestEntity($id);
- $this->assertContains($expected, $output, new FormattableMarkup('Formatted date field using daterange_custom format displayed as %expected.', ['%expected' => $expected]));
+ $this->assertStringContainsString($expected, $output, new FormattableMarkup('Formatted date field using daterange_custom format displayed as %expected.', ['%expected' => $expected]));
// Test formatters when start date and end date are the same
$this->drupalGet('entity_test/add');
@@ -604,9 +604,9 @@ public function testAlldayRangeField() {
$end_expected_iso = $this->dateFormatter->format($end_date->getTimestamp(), 'custom', 'Y-m-d\TH:i:s\Z', 'UTC');
$end_expected_markup = '<time datetime="' . $end_expected_iso . '" class="datetime">' . $end_expected . '</time>';
$output = $this->renderTestEntity($id);
- $this->assertContains($start_expected_markup, $output, new FormattableMarkup('Formatted date field using %value format displayed as %expected with %expected_iso attribute.', ['%value' => 'long', '%expected' => $start_expected, '%expected_iso' => $start_expected_iso]));
- $this->assertContains($end_expected_markup, $output, new FormattableMarkup('Formatted date field using %value format displayed as %expected with %expected_iso attribute.', ['%value' => 'long', '%expected' => $end_expected, '%expected_iso' => $end_expected_iso]));
- $this->assertContains(' THESEPARATOR ', $output, 'Found proper separator');
+ $this->assertStringContainsString($start_expected_markup, $output, new FormattableMarkup('Formatted date field using %value format displayed as %expected with %expected_iso attribute.', ['%value' => 'long', '%expected' => $start_expected, '%expected_iso' => $start_expected_iso]));
+ $this->assertStringContainsString($end_expected_markup, $output, new FormattableMarkup('Formatted date field using %value format displayed as %expected with %expected_iso attribute.', ['%value' => 'long', '%expected' => $end_expected, '%expected_iso' => $end_expected_iso]));
+ $this->assertStringContainsString(' THESEPARATOR ', $output, 'Found proper separator');
// Verify that hook_entity_prepare_view can add attributes.
// @see entity_test_entity_prepare_view()
@@ -620,8 +620,8 @@ public function testAlldayRangeField() {
->save();
$expected = $start_date->format(DateTimeItemInterface::DATETIME_STORAGE_FORMAT) . ' THESEPARATOR ' . $end_date->format(DateTimeItemInterface::DATETIME_STORAGE_FORMAT);
$output = $this->renderTestEntity($id);
- $this->assertContains($expected, $output, new FormattableMarkup('Formatted date field using plain format displayed as %expected.', ['%expected' => $expected]));
- $this->assertContains(' THESEPARATOR ', $output, 'Found proper separator');
+ $this->assertStringContainsString($expected, $output, new FormattableMarkup('Formatted date field using plain format displayed as %expected.', ['%expected' => $expected]));
+ $this->assertStringContainsString(' THESEPARATOR ', $output, 'Found proper separator');
$this->displayOptions['type'] = 'daterange_custom';
$this->displayOptions['settings']['date_format'] = 'm/d/Y';
@@ -630,8 +630,8 @@ public function testAlldayRangeField() {
->save();
$expected = $start_date->format($this->displayOptions['settings']['date_format']) . ' THESEPARATOR ' . $end_date->format($this->displayOptions['settings']['date_format']);
$output = $this->renderTestEntity($id);
- $this->assertContains($expected, $output, new FormattableMarkup('Formatted date field using daterange_custom format displayed as %expected.', ['%expected' => $expected]));
- $this->assertContains(' THESEPARATOR ', $output, 'Found proper separator');
+ $this->assertStringContainsString($expected, $output, new FormattableMarkup('Formatted date field using daterange_custom format displayed as %expected.', ['%expected' => $expected]));
+ $this->assertStringContainsString(' THESEPARATOR ', $output, 'Found proper separator');
}
@@ -869,7 +869,7 @@ public function testDatelistWidget() {
}
$this->drupalPostForm(NULL, $edit, t('Save'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
foreach ($expected as $expected_text) {
$this->assertText(t($expected_text));
}
@@ -889,7 +889,7 @@ public function testDatelistWidget() {
}
$this->drupalPostForm(NULL, $edit, t('Save'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
preg_match('|entity_test/manage/(\d+)|', $this->getUrl(), $match);
$id = $match[1];
$this->assertText(t('entity_test @id has been created.', ['@id' => $id]));
@@ -908,7 +908,7 @@ public function testDatelistWidget() {
}
$this->drupalPostForm(NULL, $edit, t('Save'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertOptionSelected("edit-$field_name-0-value-minute", '0', 'Correct minute selected.');
$this->assertOptionSelected("edit-$field_name-0-end-value-minute", '0', 'Correct minute selected.');
}
@@ -1399,7 +1399,7 @@ public function testDateStorageSettings() {
$this->drupalPostForm('node/add/date_content', $edit, t('Save'));
$this->drupalGet('admin/structure/types/manage/date_content/fields/node.date_content.' . $field_name . '/storage');
$result = $this->xpath("//*[@id='edit-settings-datetime-type' and contains(@disabled, 'disabled')]");
- $this->assertEqual(count($result), 1, "Changing datetime setting is disabled.");
+ $this->assertCount(1, $result, "Changing datetime setting is disabled.");
$this->assertText('There is data for this field in the database. The field settings can no longer be changed.');
}
diff --git a/web/core/modules/datetime_range/tests/src/Kernel/SeparatorTranslationTest.php b/web/core/modules/datetime_range/tests/src/Kernel/SeparatorTranslationTest.php
index d92a313f39..68527bcba6 100644
--- a/web/core/modules/datetime_range/tests/src/Kernel/SeparatorTranslationTest.php
+++ b/web/core/modules/datetime_range/tests/src/Kernel/SeparatorTranslationTest.php
@@ -107,7 +107,7 @@ public function testSeparatorTranslation() {
$build = $display->build($entity);
$output = $this->container->get('renderer')->renderRoot($build);
$this->verbose($output);
- $this->assertContains('UNTRANSLATED', (string) $output);
+ $this->assertStringContainsString('UNTRANSLATED', (string) $output);
// Translate the separator.
ConfigurableLanguage::createFromLangcode('nl')->save();
@@ -124,7 +124,7 @@ public function testSeparatorTranslation() {
$build = $display->build($entity);
$output = $this->container->get('renderer')->renderRoot($build);
$this->verbose($output);
- $this->assertContains('NL_TRANSLATED!', (string) $output);
+ $this->assertStringContainsString('NL_TRANSLATED!', (string) $output);
}
}
diff --git a/web/core/modules/datetime_range/tests/src/Kernel/Views/FilterDateTest.php b/web/core/modules/datetime_range/tests/src/Kernel/Views/FilterDateTest.php
index 0608bc5973..b182f8595c 100644
--- a/web/core/modules/datetime_range/tests/src/Kernel/Views/FilterDateTest.php
+++ b/web/core/modules/datetime_range/tests/src/Kernel/Views/FilterDateTest.php
@@ -18,7 +18,12 @@ class FilterDateTest extends DateTimeHandlerTestBase {
/**
* {@inheritdoc}
*/
- public static $modules = ['datetime_test', 'node', 'datetime_range', 'field'];
+ public static $modules = [
+ 'datetime_test',
+ 'node',
+ 'datetime_range',
+ 'field',
+ ];
/**
* Type of the field.
diff --git a/web/core/modules/dblog/dblog.info.yml b/web/core/modules/dblog/dblog.info.yml
index b214fb76c7..19ef8924af 100644
--- a/web/core/modules/dblog/dblog.info.yml
+++ b/web/core/modules/dblog/dblog.info.yml
@@ -1,6 +1,6 @@
name: 'Database Logging'
type: module
-description: 'Logs and records system events to the database.'
+description: 'Logs system events in the database.'
package: Core
version: VERSION
core: 8.x
diff --git a/web/core/modules/dblog/src/Controller/DbLogController.php b/web/core/modules/dblog/src/Controller/DbLogController.php
index c61e501666..64dbf36eb5 100644
--- a/web/core/modules/dblog/src/Controller/DbLogController.php
+++ b/web/core/modules/dblog/src/Controller/DbLogController.php
@@ -17,6 +17,7 @@
use Drupal\user\Entity\User;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Drupal\Core\Link;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/**
* Returns responses for dblog routes.
@@ -242,64 +243,71 @@ public function overview() {
* @return array
* If the ID is located in the Database Logging table, a build array in the
* format expected by \Drupal\Core\Render\RendererInterface::render().
+ *
+ * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
+ * If no event found for the given ID.
*/
public function eventDetails($event_id) {
- $build = [];
- if ($dblog = $this->database->query('SELECT w.*, u.uid FROM {watchdog} w LEFT JOIN {users} u ON u.uid = w.uid WHERE w.wid = :id', [':id' => $event_id])->fetchObject()) {
- $severity = RfcLogLevel::getLevels();
- $message = $this->formatMessage($dblog);
- $username = [
- '#theme' => 'username',
- '#account' => $dblog->uid ? $this->userStorage->load($dblog->uid) : User::getAnonymousUser(),
- ];
- $rows = [
- [
- ['data' => $this->t('Type'), 'header' => TRUE],
- $this->t($dblog->type),
- ],
- [
- ['data' => $this->t('Date'), 'header' => TRUE],
- $this->dateFormatter->format($dblog->timestamp, 'long'),
- ],
- [
- ['data' => $this->t('User'), 'header' => TRUE],
- ['data' => $username],
- ],
- [
- ['data' => $this->t('Location'), 'header' => TRUE],
- $this->createLink($dblog->location),
- ],
- [
- ['data' => $this->t('Referrer'), 'header' => TRUE],
- $this->createLink($dblog->referer),
- ],
- [
- ['data' => $this->t('Message'), 'header' => TRUE],
- $message,
- ],
- [
- ['data' => $this->t('Severity'), 'header' => TRUE],
- $severity[$dblog->severity],
- ],
- [
- ['data' => $this->t('Hostname'), 'header' => TRUE],
- $dblog->hostname,
- ],
- [
- ['data' => $this->t('Operations'), 'header' => TRUE],
- ['data' => ['#markup' => $dblog->link]],
- ],
- ];
- $build['dblog_table'] = [
- '#type' => 'table',
- '#rows' => $rows,
- '#attributes' => ['class' => ['dblog-event']],
- '#attached' => [
- 'library' => ['dblog/drupal.dblog'],
- ],
- ];
+ $dblog = $this->database->query('SELECT w.*, u.uid FROM {watchdog} w LEFT JOIN {users} u ON u.uid = w.uid WHERE w.wid = :id', [':id' => $event_id])->fetchObject();
+
+ if (empty($dblog)) {
+ throw new NotFoundHttpException();
}
+ $build = [];
+ $severity = RfcLogLevel::getLevels();
+ $message = $this->formatMessage($dblog);
+ $username = [
+ '#theme' => 'username',
+ '#account' => $dblog->uid ? $this->userStorage->load($dblog->uid) : User::getAnonymousUser(),
+ ];
+ $rows = [
+ [
+ ['data' => $this->t('Type'), 'header' => TRUE],
+ $this->t($dblog->type),
+ ],
+ [
+ ['data' => $this->t('Date'), 'header' => TRUE],
+ $this->dateFormatter->format($dblog->timestamp, 'long'),
+ ],
+ [
+ ['data' => $this->t('User'), 'header' => TRUE],
+ ['data' => $username],
+ ],
+ [
+ ['data' => $this->t('Location'), 'header' => TRUE],
+ $this->createLink($dblog->location),
+ ],
+ [
+ ['data' => $this->t('Referrer'), 'header' => TRUE],
+ $this->createLink($dblog->referer),
+ ],
+ [
+ ['data' => $this->t('Message'), 'header' => TRUE],
+ $message,
+ ],
+ [
+ ['data' => $this->t('Severity'), 'header' => TRUE],
+ $severity[$dblog->severity],
+ ],
+ [
+ ['data' => $this->t('Hostname'), 'header' => TRUE],
+ $dblog->hostname,
+ ],
+ [
+ ['data' => $this->t('Operations'), 'header' => TRUE],
+ ['data' => ['#markup' => $dblog->link]],
+ ],
+ ];
+ $build['dblog_table'] = [
+ '#type' => 'table',
+ '#rows' => $rows,
+ '#attributes' => ['class' => ['dblog-event']],
+ '#attached' => [
+ 'library' => ['dblog/drupal.dblog'],
+ ],
+ ];
+
return $build;
}
diff --git a/web/core/modules/dblog/src/Plugin/rest/resource/DBLogResource.php b/web/core/modules/dblog/src/Plugin/rest/resource/DBLogResource.php
index e373c01f3d..706e248b12 100644
--- a/web/core/modules/dblog/src/Plugin/rest/resource/DBLogResource.php
+++ b/web/core/modules/dblog/src/Plugin/rest/resource/DBLogResource.php
@@ -45,10 +45,10 @@ public function get($id = NULL) {
return new ResourceResponse($record);
}
- throw new NotFoundHttpException(t('Log entry with ID @id was not found', ['@id' => $id]));
+ throw new NotFoundHttpException("Log entry with ID '$id' was not found");
}
- throw new BadRequestHttpException(t('No log entry ID was provided'));
+ throw new BadRequestHttpException('No log entry ID was provided');
}
}
diff --git a/web/core/modules/dblog/tests/src/Functional/DbLogResourceTest.php b/web/core/modules/dblog/tests/src/Functional/DbLogResourceTest.php
index 5a45f63cc0..d36ab8a7d0 100644
--- a/web/core/modules/dblog/tests/src/Functional/DbLogResourceTest.php
+++ b/web/core/modules/dblog/tests/src/Functional/DbLogResourceTest.php
@@ -88,7 +88,7 @@ public function testWatchdog() {
// Request an unknown log entry.
$url->setRouteParameter('id', 9999);
$response = $this->request('GET', $url, $request_options);
- $this->assertResourceErrorResponse(404, 'Log entry with ID 9999 was not found', $response);
+ $this->assertResourceErrorResponse(404, "Log entry with ID '9999' was not found", $response);
// Make a bad request (a true malformed request would never be a route match).
$url->setRouteParameter('id', 0);
diff --git a/web/core/modules/dblog/tests/src/Functional/DbLogTest.php b/web/core/modules/dblog/tests/src/Functional/DbLogTest.php
index 9f7475b82d..fa54e14f5b 100644
--- a/web/core/modules/dblog/tests/src/Functional/DbLogTest.php
+++ b/web/core/modules/dblog/tests/src/Functional/DbLogTest.php
@@ -135,6 +135,57 @@ public function testLogEventPage() {
$this->assertText('Notice', 'The severity was properly displayed on the detail page.');
}
+ /**
+ * Tests that a 403 event is logged with the exception triggering it.
+ */
+ public function test403LogEventPage() {
+ $assert_session = $this->assertSession();
+ $uri = 'admin/reports';
+
+ $this->drupalLogin($this->webUser);
+ $this->drupalGet($uri);
+ $assert_session->statusCodeEquals(403);
+
+ $this->drupalLogin($this->adminUser);
+
+ $wid = Database::getConnection()->query("SELECT MAX(wid) FROM {watchdog} WHERE type='access denied'")->fetchField();
+ $this->drupalGet('admin/reports/dblog/event/' . $wid);
+
+ $table = $this->xpath("//table[@class='dblog-event']");
+ $this->assertCount(1, $table);
+
+ // Verify type, severity and location.
+ $type = $table[0]->findAll('xpath', "//tr/th[contains(text(), 'Type')]/../td");
+ $this->assertCount(1, $type);
+ $this->assertEquals('access denied', $type[0]->getText());
+ $severity = $table[0]->findAll('xpath', "//tr/th[contains(text(), 'Severity')]/../td");
+ $this->assertCount(1, $severity);
+ $this->assertEquals('Warning', $severity[0]->getText());
+ $location = $table[0]->findAll('xpath', "//tr/th[contains(text(), 'Location')]/../td/a");
+ $this->assertCount(1, $location);
+ $href = $location[0]->getAttribute('href');
+ $this->assertEquals($this->baseUrl . '/' . $uri, $href);
+
+ // Verify message.
+ $message = $table[0]->findAll('xpath', "//tr/th[contains(text(), 'Message')]/../td");
+ $this->assertCount(1, $message);
+ $regex = "@Path: .+admin/reports\. Drupal\\\\Core\\\\Http\\\\Exception\\\\CacheableAccessDeniedHttpException: The 'access site reports' permission is required\. in Drupal\\\\Core\\\\Routing\\\\AccessAwareRouter->checkAccess\(\) \(line \d+ of .+/core/lib/Drupal/Core/Routing/AccessAwareRouter\.php\)\.@";
+ $this->assertRegExp($regex, $message[0]->getText());
+ }
+
+ /**
+ * Test not-existing log event page.
+ */
+ public function testLogEventNotFoundPage() {
+ // Login the admin user.
+ $this->drupalLogin($this->adminUser);
+
+ // Try to read details of not existing event.
+ $this->drupalGet('admin/reports/dblog/event/999999');
+ // Verify 404 response.
+ $this->assertSession()->statusCodeEquals(404);
+ }
+
/**
* Test individual log event page with missing log attributes.
*
@@ -191,7 +242,7 @@ private function verifyRowLimit($row_limit) {
$edit = [];
$edit['dblog_row_limit'] = $row_limit;
$this->drupalPostForm('admin/config/development/logging', $edit, t('Save configuration'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Check row limit variable.
$current_limit = $this->config('dblog.settings')->get('row_limit');
@@ -233,34 +284,34 @@ protected function filterLogsEntries($type = NULL, $severity = NULL) {
private function verifyReports($response = 200) {
// View the database log help page.
$this->drupalGet('admin/help/dblog');
- $this->assertResponse($response);
+ $this->assertSession()->statusCodeEquals($response);
if ($response == 200) {
$this->assertText(t('Database Logging'), 'DBLog help was displayed');
}
// View the database log report page.
$this->drupalGet('admin/reports/dblog');
- $this->assertResponse($response);
+ $this->assertSession()->statusCodeEquals($response);
if ($response == 200) {
$this->assertText(t('Recent log messages'), 'DBLog report was displayed');
}
$this->drupalGet('admin/reports/dblog/confirm');
- $this->assertResponse($response);
+ $this->assertSession()->statusCodeEquals($response);
if ($response == 200) {
$this->assertText(t('Are you sure you want to delete the recent logs?'), 'DBLog clear logs form was displayed');
}
// View the database log page-not-found report page.
$this->drupalGet('admin/reports/page-not-found');
- $this->assertResponse($response);
+ $this->assertSession()->statusCodeEquals($response);
if ($response == 200) {
$this->assertText("Top 'page not found' errors", 'DBLog page-not-found report was displayed');
}
// View the database log access-denied report page.
$this->drupalGet('admin/reports/access-denied');
- $this->assertResponse($response);
+ $this->assertSession()->statusCodeEquals($response);
if ($response == 200) {
$this->assertText("Top 'access denied' errors", 'DBLog access-denied report was displayed');
}
@@ -268,7 +319,7 @@ private function verifyReports($response = 200) {
// View the database log event page.
$wid = Database::getConnection()->query('SELECT MIN(wid) FROM {watchdog}')->fetchField();
$this->drupalGet('admin/reports/dblog/event/' . $wid);
- $this->assertResponse($response);
+ $this->assertSession()->statusCodeEquals($response);
if ($response == 200) {
$this->assertText(t('Details'), 'DBLog event node was displayed');
}
@@ -312,7 +363,7 @@ private function verifyEvents() {
*/
public function verifySort($sort = 'asc', $order = 'Date') {
$this->drupalGet('admin/reports/dblog', ['query' => ['sort' => $sort, 'order' => $order]]);
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertText(t('Recent log messages'), 'DBLog report was displayed correctly and sorting went fine.');
}
@@ -351,7 +402,7 @@ private function doUser() {
$edit['pass[pass2]'] = $pass;
$edit['status'] = 1;
$this->drupalPostForm('admin/people/create', $edit, t('Create new account'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Retrieve the user object.
$user = user_load_by_name($name);
$this->assertNotNull($user, new FormattableMarkup('User @name was loaded', ['@name' => $name]));
@@ -377,7 +428,7 @@ private function doUser() {
// View the database log report.
$this->drupalGet('admin/reports/dblog');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Verify that the expected events were recorded.
// Add user.
@@ -408,10 +459,10 @@ private function doUser() {
// Visit random URL (to generate page not found event).
$not_found_url = $this->randomMachineName(60);
$this->drupalGet($not_found_url);
- $this->assertResponse(404);
+ $this->assertSession()->statusCodeEquals(404);
// View the database log page-not-found report page.
$this->drupalGet('admin/reports/page-not-found');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Check that full-length URL displayed.
$this->assertText($not_found_url, 'DBLog event was recorded: [page not found]');
}
@@ -434,29 +485,29 @@ private function doNode($type) {
$edit = $this->getContent($type);
$title = $edit['title[0][value]'];
$this->drupalPostForm('node/add/' . $type, $edit, t('Save'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Retrieve the node object.
$node = $this->drupalGetNodeByTitle($title);
$this->assertNotNull($node, new FormattableMarkup('Node @title was loaded', ['@title' => $title]));
// Edit the node.
$edit = $this->getContentUpdate($type);
$this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Delete the node.
$this->drupalPostForm('node/' . $node->id() . '/delete', [], t('Delete'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// View the node (to generate page not found event).
$this->drupalGet('node/' . $node->id());
- $this->assertResponse(404);
+ $this->assertSession()->statusCodeEquals(404);
// View the database log report (to generate access denied event).
$this->drupalGet('admin/reports/dblog');
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
// Log in the admin user.
$this->drupalLogin($this->adminUser);
// View the database log report.
$this->drupalGet('admin/reports/dblog');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Verify that node events were recorded.
// Was node content added?
@@ -468,13 +519,13 @@ private function doNode($type) {
// View the database log access-denied report page.
$this->drupalGet('admin/reports/access-denied');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Verify that the 'access denied' event was recorded.
$this->assertText('admin/reports/dblog', 'DBLog event was recorded: [access denied]');
// View the database log page-not-found report page.
$this->drupalGet('admin/reports/page-not-found');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Verify that the 'page not found' event was recorded.
$this->assertText('node/' . $node->id(), 'DBLog event was recorded: [page not found]');
}
@@ -626,7 +677,7 @@ public function testFilter() {
}
$this->drupalGet('admin/reports/dblog', ['query' => ['order' => 'Type']]);
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertText(t('Operations'), 'Operations text found');
// Clear all logs and make sure the confirmation message is found.
@@ -756,7 +807,7 @@ public function testTemporaryUser() {
// Delete the user.
$tempuser->delete();
$this->drupalGet('user/' . $tempuser_uid);
- $this->assertResponse(404);
+ $this->assertSession()->statusCodeEquals(404);
// Check if the full message displays on the details page.
$this->drupalGet('admin/reports/dblog/event/' . $wid);
@@ -770,7 +821,7 @@ public function testOverviewLinks() {
$this->drupalLogin($this->adminUser);
$this->generateLogEntries(1, ['message' => "<script>alert('foo');</script><strong>Lorem</strong> ipsum dolor sit amet, consectetur adipiscing & elit."]);
$this->drupalGet('admin/reports/dblog');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Make sure HTML tags are filtered out.
$this->assertRaw('title="alert('foo');Lorem');
$this->assertNoRaw("<script>alert('foo');</script>");
diff --git a/web/core/modules/dblog/tests/src/Functional/DbLogViewsTest.php b/web/core/modules/dblog/tests/src/Functional/DbLogViewsTest.php
index cbb86f8c54..8419bb3723 100644
--- a/web/core/modules/dblog/tests/src/Functional/DbLogViewsTest.php
+++ b/web/core/modules/dblog/tests/src/Functional/DbLogViewsTest.php
@@ -19,7 +19,14 @@ class DbLogViewsTest extends DbLogTest {
*
* @var array
*/
- public static $modules = ['dblog', 'node', 'forum', 'help', 'block', 'views'];
+ public static $modules = [
+ 'dblog',
+ 'node',
+ 'forum',
+ 'help',
+ 'block',
+ 'views',
+ ];
/**
* {@inheritdoc}
diff --git a/web/core/modules/dblog/tests/src/Kernel/Views/ViewsIntegrationTest.php b/web/core/modules/dblog/tests/src/Kernel/Views/ViewsIntegrationTest.php
index c579f9fe01..b5ae803fb3 100644
--- a/web/core/modules/dblog/tests/src/Kernel/Views/ViewsIntegrationTest.php
+++ b/web/core/modules/dblog/tests/src/Kernel/Views/ViewsIntegrationTest.php
@@ -93,10 +93,10 @@ public function testRelationship() {
$view = Views::getView('dblog_integration_test');
$view->setDisplay('page_1');
// The uid relationship should now join to the {users_field_data} table.
- $tables = array_keys($view->getBaseTables());
- $this->assertTrue(in_array('users_field_data', $tables));
- $this->assertFalse(in_array('users', $tables));
- $this->assertTrue(in_array('watchdog', $tables));
+ $base_tables = $view->getBaseTables();
+ $this->assertArrayHasKey('users_field_data', $base_tables);
+ $this->assertArrayNotHasKey('users', $base_tables);
+ $this->assertArrayHasKey('watchdog', $base_tables);
}
/**
diff --git a/web/core/modules/dynamic_page_cache/dynamic_page_cache.info.yml b/web/core/modules/dynamic_page_cache/dynamic_page_cache.info.yml
index 00db97de2c..304177bab4 100644
--- a/web/core/modules/dynamic_page_cache/dynamic_page_cache.info.yml
+++ b/web/core/modules/dynamic_page_cache/dynamic_page_cache.info.yml
@@ -1,6 +1,6 @@
-name: Internal Dynamic Page Cache
+name: 'Internal Dynamic Page Cache'
type: module
-description: 'Caches pages for any user, handling dynamic content correctly.'
+description: 'Caches pages, including those with dynamic content, for all users.'
package: Core
version: VERSION
core: 8.x
diff --git a/web/core/modules/editor/js/editor.formattedTextEditor.es6.js b/web/core/modules/editor/js/editor.formattedTextEditor.es6.js
index 31551648fd..8ff2fd9731 100644
--- a/web/core/modules/editor/js/editor.formattedTextEditor.es6.js
+++ b/web/core/modules/editor/js/editor.formattedTextEditor.es6.js
@@ -73,7 +73,7 @@
},
/**
- * @inheritdoc
+ * {@inheritdoc}
*
* @return {jQuery}
* The text element edited.
@@ -83,7 +83,7 @@
},
/**
- * @inheritdoc
+ * {@inheritdoc}
*
* @param {object} fieldModel
* The field model.
@@ -179,7 +179,7 @@
},
/**
- * @inheritdoc
+ * {@inheritdoc}
*
* @return {object}
* The settings for the quick edit UI.
@@ -194,7 +194,7 @@
},
/**
- * @inheritdoc
+ * {@inheritdoc}
*/
revert() {
this.$textElement.html(this.model.get('originalValue'));
diff --git a/web/core/modules/editor/src/Element.php b/web/core/modules/editor/src/Element.php
index 52db768383..91739d74a6 100644
--- a/web/core/modules/editor/src/Element.php
+++ b/web/core/modules/editor/src/Element.php
@@ -47,9 +47,9 @@ public function preRenderTextFormat(array $element) {
return $element;
}
- // filter_process_format() copies properties to the expanded 'value' child
- // element, including the #pre_render property. Skip this text format
- // widget, if it contains no 'format'.
+ // \Drupal\filter\Element\TextFormat::processFormat() copies properties to
+ // the expanded 'value' to the child element, including the #pre_render
+ // property. Skip this text format widget, if it contains no 'format'.
if (!isset($element['format'])) {
return $element;
}
diff --git a/web/core/modules/editor/tests/src/Functional/EditorAdminTest.php b/web/core/modules/editor/tests/src/Functional/EditorAdminTest.php
index 618911fcb0..3065c3fa60 100644
--- a/web/core/modules/editor/tests/src/Functional/EditorAdminTest.php
+++ b/web/core/modules/editor/tests/src/Functional/EditorAdminTest.php
@@ -68,9 +68,9 @@ public function testNoEditorAvailable() {
$select = $this->xpath('//select[@name="editor[editor]"]');
$select_is_disabled = $this->xpath('//select[@name="editor[editor]" and @disabled="disabled"]');
$options = $this->xpath('//select[@name="editor[editor]"]/option');
- $this->assertTrue(count($select) === 1, 'The Text Editor select exists.');
- $this->assertTrue(count($select_is_disabled) === 1, 'The Text Editor select is disabled.');
- $this->assertTrue(count($options) === 1, 'The Text Editor select has only one option.');
+ $this->assertCount(1, $select, 'The Text Editor select exists.');
+ $this->assertCount(1, $select_is_disabled, 'The Text Editor select is disabled.');
+ $this->assertCount(1, $options, 'The Text Editor select has only one option.');
$this->assertTrue(($options[0]->getText()) === 'None', 'Option 1 in the Text Editor select is "None".');
$this->assertRaw('This option is disabled because no modules that provide a text editor are currently enabled.', 'Description for select present that tells users to install a text editor module.');
}
@@ -94,22 +94,22 @@ public function testAddEditorToExistingFormat() {
];
$this->drupalPostForm(NULL, $edit, 'Configure');
$unicorn_setting = $this->xpath('//input[@name="editor[settings][ponies_too]" and @type="checkbox" and @checked]');
- $this->assertTrue(count($unicorn_setting) === 0, "Unicorn Editor's settings form is no longer present.");
+ $this->assertCount(0, $unicorn_setting, "Unicorn Editor's settings form is no longer present.");
}
/**
* Tests adding a text editor to a new text format.
*/
public function testAddEditorToNewFormat() {
- $this->addEditorToNewFormat('monocerus', 'Monocerus');
- $this->verifyUnicornEditorConfiguration('monocerus');
+ $this->addEditorToNewFormat('monoceros', 'Monoceros');
+ $this->verifyUnicornEditorConfiguration('monoceros');
}
/**
* Tests format disabling.
*/
public function testDisableFormatWithEditor() {
- $formats = ['monocerus' => 'Monocerus', 'tattoo' => 'Tattoo'];
+ $formats = ['monoceros' => 'Monoceros', 'tattoo' => 'Tattoo'];
// Install the node module.
$this->container->get('module_installer')->install(['node']);
@@ -127,13 +127,13 @@ public function testDisableFormatWithEditor() {
$permissions[] = "use text format $format";
}
- // Create a node having the body format value 'moncerus'.
+ // Create a node having the body format value 'monoceros'.
$node = Node::create([
'type' => $node_type->id(),
'title' => $this->randomString(),
]);
$node->body->value = $this->randomString(100);
- $node->body->format = 'monocerus';
+ $node->body->format = 'monoceros';
$node->save();
// Log in as an user able to use both formats and edit nodes of created type.
@@ -148,7 +148,7 @@ public function testDisableFormatWithEditor() {
$this->assertRaw($text);
// Disable the format assigned to the 'body' field of the node.
- FilterFormat::load('monocerus')->disable()->save();
+ FilterFormat::load('monoceros')->disable()->save();
// Edit again the node.
$this->drupalGet('node/' . $node->id() . '/edit');
@@ -196,9 +196,9 @@ protected function selectUnicornEditor() {
$select = $this->xpath('//select[@name="editor[editor]"]');
$select_is_disabled = $this->xpath('//select[@name="editor[editor]" and @disabled="disabled"]');
$options = $this->xpath('//select[@name="editor[editor]"]/option');
- $this->assertTrue(count($select) === 1, 'The Text Editor select exists.');
- $this->assertTrue(count($select_is_disabled) === 0, 'The Text Editor select is not disabled.');
- $this->assertTrue(count($options) === 2, 'The Text Editor select has two options.');
+ $this->assertCount(1, $select, 'The Text Editor select exists.');
+ $this->assertCount(0, $select_is_disabled, 'The Text Editor select is not disabled.');
+ $this->assertCount(2, $options, 'The Text Editor select has two options.');
$this->assertTrue(($options[0]->getText()) === 'None', 'Option 1 in the Text Editor select is "None".');
$this->assertTrue(($options[1]->getText()) === 'Unicorn Editor', 'Option 2 in the Text Editor select is "Unicorn Editor".');
$this->assertTrue($options[0]->hasAttribute('selected'), 'Option 1 ("None") is selected.');
@@ -233,9 +233,9 @@ protected function verifyUnicornEditorConfiguration($format_id, $ponies_too = TR
$select = $this->xpath('//select[@name="editor[editor]"]');
$select_is_disabled = $this->xpath('//select[@name="editor[editor]" and @disabled="disabled"]');
$options = $this->xpath('//select[@name="editor[editor]"]/option');
- $this->assertTrue(count($select) === 1, 'The Text Editor select exists.');
- $this->assertTrue(count($select_is_disabled) === 0, 'The Text Editor select is not disabled.');
- $this->assertTrue(count($options) === 2, 'The Text Editor select has two options.');
+ $this->assertCount(1, $select, 'The Text Editor select exists.');
+ $this->assertCount(0, $select_is_disabled, 'The Text Editor select is not disabled.');
+ $this->assertCount(2, $options, 'The Text Editor select has two options.');
$this->assertTrue($options[1]->hasAttribute('selected'), 'Option 2 ("Unicorn Editor") is selected.');
}
diff --git a/web/core/modules/editor/tests/src/Functional/EditorLoadingTest.php b/web/core/modules/editor/tests/src/Functional/EditorLoadingTest.php
index d02c744b3d..795d0daeb7 100644
--- a/web/core/modules/editor/tests/src/Functional/EditorLoadingTest.php
+++ b/web/core/modules/editor/tests/src/Functional/EditorLoadingTest.php
@@ -136,8 +136,8 @@ public function testLoading() {
list(, $editor_settings_present, $editor_js_present, $body, $format_selector) = $this->getThingsToCheck('body');
$this->assertFalse($editor_settings_present, 'No Text Editor module settings.');
$this->assertFalse($editor_js_present, 'No Text Editor JavaScript.');
- $this->assertTrue(count($body) === 1, 'A body field exists.');
- $this->assertTrue(count($format_selector) === 0, 'No text format selector exists on the page because the user only has access to a single format.');
+ $this->assertCount(1, $body, 'A body field exists.');
+ $this->assertCount(0, $format_selector, 'No text format selector exists on the page because the user only has access to a single format.');
$this->drupalLogout($this->normalUser);
// The privileged user:
@@ -160,14 +160,14 @@ public function testLoading() {
$this->assertTrue($editor_settings_present, "Text Editor module's JavaScript settings are on the page.");
$this->assertIdentical($expected, $settings['editor'], "Text Editor module's JavaScript settings on the page are correct.");
$this->assertTrue($editor_js_present, 'Text Editor JavaScript is present.');
- $this->assertTrue(count($body) === 1, 'A body field exists.');
- $this->assertTrue(count($format_selector) === 1, 'A single text format selector exists on the page.');
+ $this->assertCount(1, $body, 'A body field exists.');
+ $this->assertCount(1, $format_selector, 'A single text format selector exists on the page.');
$specific_format_selector = $this->xpath('//select[contains(@class, "filter-list") and @data-editor-for="edit-body-0-value"]');
- $this->assertTrue(count($specific_format_selector) === 1, 'A single text format selector exists on the page and has a "data-editor-for" attribute with the correct value.');
+ $this->assertCount(1, $specific_format_selector, 'A single text format selector exists on the page and has a "data-editor-for" attribute with the correct value.');
// Load the editor image dialog form and make sure it does not fatal.
$this->drupalGet('editor/dialog/image/full_html');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->drupalLogout($this->privilegedUser);
@@ -198,10 +198,10 @@ public function testLoading() {
$this->assertTrue($editor_settings_present, "Text Editor module's JavaScript settings are on the page.");
$this->assertIdentical($expected, $settings['editor'], "Text Editor module's JavaScript settings on the page are correct.");
$this->assertTrue($editor_js_present, 'Text Editor JavaScript is present.');
- $this->assertTrue(count($body) === 1, 'A body field exists.');
- $this->assertTrue(count($format_selector) === 0, 'No text format selector exists on the page.');
+ $this->assertCount(1, $body, 'A body field exists.');
+ $this->assertCount(0, $format_selector, 'No text format selector exists on the page.');
$hidden_input = $this->xpath('//input[@type="hidden" and @value="plain_text" and @data-editor-for="edit-body-0-value"]');
- $this->assertTrue(count($hidden_input) === 1, 'A single text format hidden input exists on the page and has a "data-editor-for" attribute with the correct value.');
+ $this->assertCount(1, $hidden_input, 'A single text format hidden input exists on the page and has a "data-editor-for" attribute with the correct value.');
// Create an "article" node that uses the full_html text format, then try
// to let the untrusted user edit it.
@@ -219,11 +219,11 @@ public function testLoading() {
list(, $editor_settings_present, $editor_js_present, $body, $format_selector) = $this->getThingsToCheck('body');
$this->assertTrue($editor_settings_present, 'Text Editor module settings.');
$this->assertTrue($editor_js_present, 'Text Editor JavaScript.');
- $this->assertTrue(count($body) === 1, 'A body field exists.');
+ $this->assertCount(1, $body, 'A body field exists.');
$this->assertFieldByXPath('//textarea[@id="edit-body-0-value" and @disabled="disabled"]', t('This field has been disabled because you do not have sufficient permissions to edit it.'), 'Text format access denied message found.');
- $this->assertTrue(count($format_selector) === 0, 'No text format selector exists on the page.');
+ $this->assertCount(0, $format_selector, 'No text format selector exists on the page.');
$hidden_input = $this->xpath('//input[@type="hidden" and contains(@class, "editor")]');
- $this->assertTrue(count($hidden_input) === 0, 'A single text format hidden input does not exist on the page.');
+ $this->assertCount(0, $hidden_input, 'A single text format hidden input does not exist on the page.');
}
/**
@@ -258,10 +258,10 @@ public function testSupportedElementTypes() {
list(, $editor_settings_present, $editor_js_present, $field, $format_selector) = $this->getThingsToCheck('field-text', 'input');
$this->assertTrue($editor_settings_present, "Text Editor module's JavaScript settings are on the page.");
$this->assertTrue($editor_js_present, 'Text Editor JavaScript is present.');
- $this->assertTrue(count($field) === 1, 'A text field exists.');
- $this->assertTrue(count($format_selector) === 1, 'A single text format selector exists on the page.');
+ $this->assertCount(1, $field, 'A text field exists.');
+ $this->assertCount(1, $format_selector, 'A single text format selector exists on the page.');
$specific_format_selector = $this->xpath('//select[contains(@class, "filter-list") and contains(@class, "editor") and @data-editor-for="edit-field-text-0-value"]');
- $this->assertTrue(count($specific_format_selector) === 1, 'A single text format selector exists on the page and has the "editor" class and a "data-editor-for" attribute with the correct value.');
+ $this->assertCount(1, $specific_format_selector, 'A single text format selector exists on the page and has the "editor" class and a "data-editor-for" attribute with the correct value.');
// Associate the trex text editor with the "Full HTML" text format.
$editor->delete();
@@ -274,10 +274,10 @@ public function testSupportedElementTypes() {
list(, $editor_settings_present, $editor_js_present, $field, $format_selector) = $this->getThingsToCheck('field-text', 'input');
$this->assertFalse($editor_settings_present, "Text Editor module's JavaScript settings are not on the page.");
$this->assertFalse($editor_js_present, 'Text Editor JavaScript is not present.');
- $this->assertTrue(count($field) === 1, 'A text field exists.');
- $this->assertTrue(count($format_selector) === 1, 'A single text format selector exists on the page.');
+ $this->assertCount(1, $field, 'A text field exists.');
+ $this->assertCount(1, $format_selector, 'A single text format selector exists on the page.');
$specific_format_selector = $this->xpath('//select[contains(@class, "filter-list") and contains(@class, "editor") and @data-editor-for="edit-field-text-0-value"]');
- $this->assertFalse(count($specific_format_selector) === 1, 'A single text format selector exists on the page and has the "editor" class and a "data-editor-for" attribute with the correct value.');
+ $this->assertCount(0, $specific_format_selector, 'No text format selector exists on the page with the "editor" class and a "data-editor-for" attribute with the expected value.');
}
protected function getThingsToCheck($field_name, $type = 'textarea') {
diff --git a/web/core/modules/editor/tests/src/Functional/QuickEditIntegrationLoadingTest.php b/web/core/modules/editor/tests/src/Functional/QuickEditIntegrationLoadingTest.php
index 56916776f6..bfb12e4fa9 100644
--- a/web/core/modules/editor/tests/src/Functional/QuickEditIntegrationLoadingTest.php
+++ b/web/core/modules/editor/tests/src/Functional/QuickEditIntegrationLoadingTest.php
@@ -139,7 +139,7 @@ public function testUserWithPermission() {
$this->assertEquals(200, $response->getStatusCode());
$ajax_commands = Json::decode($response->getBody());
- $this->assertIdentical(1, count($ajax_commands), 'The untransformed text POST request results in one AJAX command.');
+ $this->assertCount(1, $ajax_commands, 'The untransformed text POST request results in one AJAX command.');
$this->assertIdentical('editorGetUntransformedText', $ajax_commands[0]['command'], 'The first AJAX command is an editorGetUntransformedText command.');
$this->assertIdentical('<p>Do you also love Drupal?</p><img src="druplicon.png" data-caption="Druplicon" />', $ajax_commands[0]['data'], 'The editorGetUntransformedText command contains the expected data.');
}
diff --git a/web/core/modules/editor/tests/src/Kernel/EditorFileReferenceFilterTest.php b/web/core/modules/editor/tests/src/Kernel/EditorFileReferenceFilterTest.php
index a70a232aa8..f9bdcfa9df 100644
--- a/web/core/modules/editor/tests/src/Kernel/EditorFileReferenceFilterTest.php
+++ b/web/core/modules/editor/tests/src/Kernel/EditorFileReferenceFilterTest.php
@@ -19,7 +19,14 @@ class EditorFileReferenceFilterTest extends KernelTestBase {
*
* @var array
*/
- public static $modules = ['system', 'filter', 'editor', 'field', 'file', 'user'];
+ public static $modules = [
+ 'system',
+ 'filter',
+ 'editor',
+ 'field',
+ 'file',
+ 'user',
+ ];
/**
* @var \Drupal\filter\Plugin\FilterInterface[]
diff --git a/web/core/modules/editor/tests/src/Kernel/EditorImageDialogTest.php b/web/core/modules/editor/tests/src/Kernel/EditorImageDialogTest.php
index 0d0ecaaa60..cce78c5444 100644
--- a/web/core/modules/editor/tests/src/Kernel/EditorImageDialogTest.php
+++ b/web/core/modules/editor/tests/src/Kernel/EditorImageDialogTest.php
@@ -28,7 +28,14 @@ class EditorImageDialogTest extends EntityKernelTestBase {
*
* @var array
*/
- public static $modules = ['node', 'file', 'editor', 'editor_test', 'user', 'system'];
+ public static $modules = [
+ 'node',
+ 'file',
+ 'editor',
+ 'editor_test',
+ 'user',
+ 'system',
+ ];
/**
* Sets up the test.
diff --git a/web/core/modules/field/field.api.php b/web/core/modules/field/field.api.php
index 5663744ae2..36e5fcefe9 100644
--- a/web/core/modules/field/field.api.php
+++ b/web/core/modules/field/field.api.php
@@ -53,7 +53,7 @@
function hook_field_info_alter(&$info) {
// Change the default widget for fields of type 'foo'.
if (isset($info['foo'])) {
- $info['foo']['default widget'] = 'mymodule_widget';
+ $info['foo']['default_widget'] = 'mymodule_widget';
}
}
@@ -111,7 +111,7 @@ function hook_field_storage_config_update_forbid(\Drupal\field\FieldStorageConfi
$prior_allowed_values = $prior_field_storage->getSetting('allowed_values');
$lost_keys = array_keys(array_diff_key($prior_allowed_values, $allowed_values));
if (_options_values_in_use($field_storage->getTargetEntityTypeId(), $field_storage->getName(), $lost_keys)) {
- throw new \Drupal\Core\Entity\Exception\FieldStorageDefinitionUpdateForbiddenException(t('A list field (@field_name) with existing data cannot have its keys changed.', ['@field_name' => $field_storage->getName()]));
+ throw new \Drupal\Core\Entity\Exception\FieldStorageDefinitionUpdateForbiddenException("A list field '{$field_storage->getName()}' with existing data cannot have its keys changed.");
}
}
}
diff --git a/web/core/modules/field/field.purge.inc b/web/core/modules/field/field.purge.inc
index 11b2ac11a6..ee49fc245b 100644
--- a/web/core/modules/field/field.purge.inc
+++ b/web/core/modules/field/field.purge.inc
@@ -157,7 +157,7 @@ function field_purge_field_storage(FieldStorageDefinitionInterface $field_storag
$fields = $deleted_fields_repository->getFieldDefinitions($field_storage->getUniqueStorageIdentifier());
if (count($fields) > 0) {
- throw new FieldException(t('Attempt to purge a field storage @field_name that still has fields.', ['@field_name' => $field_storage->getName()]));
+ throw new FieldException("Attempt to purge a field storage '{$field_storage->getName()}' that still has fields.");
}
$deleted_fields_repository->removeFieldStorageDefinition($field_storage);
diff --git a/web/core/modules/field/src/Entity/FieldStorageConfig.php b/web/core/modules/field/src/Entity/FieldStorageConfig.php
index 91c619087b..fcfa7caf20 100644
--- a/web/core/modules/field/src/Entity/FieldStorageConfig.php
+++ b/web/core/modules/field/src/Entity/FieldStorageConfig.php
@@ -367,10 +367,10 @@ protected function preSaveUpdated(EntityStorageInterface $storage) {
// Some updates are always disallowed.
if ($this->getType() != $this->original->getType()) {
- throw new FieldException("Cannot change the field type for an existing field storage.");
+ throw new FieldException(sprintf('Cannot change the field type for an existing field storage. The field storage %s has the type %s.', $this->id(), $this->original->getType()));
}
if ($this->getTargetEntityTypeId() != $this->original->getTargetEntityTypeId()) {
- throw new FieldException("Cannot change the entity type for an existing field storage.");
+ throw new FieldException(sprintf('Cannot change the entity type for an existing field storage. The field storage %s has the type %s.', $this->id(), $this->original->getTargetEntityTypeId()));
}
// See if any module forbids the update by throwing an exception. This
diff --git a/web/core/modules/field/tests/modules/field_test/src/Form/NestedEntityTestForm.php b/web/core/modules/field/tests/modules/field_test/src/Form/NestedEntityTestForm.php
index a57cadd8c7..765c395598 100644
--- a/web/core/modules/field/tests/modules/field_test/src/Form/NestedEntityTestForm.php
+++ b/web/core/modules/field/tests/modules/field_test/src/Form/NestedEntityTestForm.php
@@ -16,14 +16,14 @@
class NestedEntityTestForm extends FormBase {
/**
- * {@inheritdoc]
+ * {@inheritdoc}
*/
public function getFormId() {
return 'field_test_entity_nested_form';
}
/**
- * {@inheritdoc]
+ * {@inheritdoc}
*/
public function buildForm(array $form, FormStateInterface $form_state, EntityInterface $entity_1 = NULL, EntityInterface $entity_2 = NULL) {
// First entity.
@@ -66,7 +66,7 @@ public function buildForm(array $form, FormStateInterface $form_state, EntityInt
}
/**
- * {@inheritdoc]
+ * {@inheritdoc}
*/
public function validateForm(array &$form, FormStateInterface $form_state) {
$entity_1 = $form_state->get('entity_1');
diff --git a/web/core/modules/field/tests/src/Functional/Boolean/BooleanFormatterSettingsTest.php b/web/core/modules/field/tests/src/Functional/Boolean/BooleanFormatterSettingsTest.php
index 532c399296..85ed22c873 100644
--- a/web/core/modules/field/tests/src/Functional/Boolean/BooleanFormatterSettingsTest.php
+++ b/web/core/modules/field/tests/src/Functional/Boolean/BooleanFormatterSettingsTest.php
@@ -127,7 +127,7 @@ public function testBooleanFormatterSettings() {
':class' => 'field-plugin-summary',
':text' => (string) t('Display: @true_label / @false_label', ['@true_label' => $values[0], '@false_label' => $values[1]]),
]);
- $this->assertEqual(count($result), 1, "Boolean formatter settings summary exist.");
+ $this->assertCount(1, $result, "Boolean formatter settings summary exist.");
}
}
diff --git a/web/core/modules/field/tests/src/Functional/Email/EmailFieldTest.php b/web/core/modules/field/tests/src/Functional/Email/EmailFieldTest.php
index c044ba3c1c..5d87d24c78 100644
--- a/web/core/modules/field/tests/src/Functional/Email/EmailFieldTest.php
+++ b/web/core/modules/field/tests/src/Functional/Email/EmailFieldTest.php
@@ -108,7 +108,7 @@ public function testEmailField() {
$display = $display_repository->getViewDisplay($entity->getEntityTypeId(), $entity->bundle(), 'full');
$content = $display->build($entity);
$rendered_content = (string) \Drupal::service('renderer')->renderRoot($content);
- $this->assertContains('href="mailto:test@example.com"', $rendered_content);
+ $this->assertStringContainsString('href="mailto:test@example.com"', $rendered_content);
}
}
diff --git a/web/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceAdminTest.php b/web/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceAdminTest.php
index bdb755c1d1..fe09077b90 100644
--- a/web/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceAdminTest.php
+++ b/web/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceAdminTest.php
@@ -28,7 +28,14 @@ class EntityReferenceAdminTest extends BrowserTestBase {
*
* @var array
*/
- public static $modules = ['node', 'field_ui', 'path', 'taxonomy', 'block', 'views_ui'];
+ public static $modules = [
+ 'node',
+ 'field_ui',
+ 'path',
+ 'taxonomy',
+ 'block',
+ 'views_ui',
+ ];
/**
* {@inheritdoc}
@@ -156,7 +163,7 @@ public function testFieldAdminHandler() {
'field_test_entity_ref_field[1][target_id]' => 'Foo Node (' . $node2->id() . ')',
];
$this->drupalPostForm(NULL, $edit, t('Save'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$edit = [
'title[0][value]' => 'Example',
@@ -203,7 +210,7 @@ public function testFieldAdminHandler() {
->condition('vid', 'tags')
->accessCheck(FALSE)
->execute();
- $this->assertIdentical(0, count($result), "No taxonomy terms exist with the name '$term_name'.");
+ $this->assertCount(0, $result, "No taxonomy terms exist with the name '$term_name'.");
$edit = [
// This must be set before new entities will be auto-created.
'settings[handler_settings][auto_create]' => 1,
@@ -221,7 +228,7 @@ public function testFieldAdminHandler() {
->condition('vid', 'tags')
->accessCheck(FALSE)
->execute();
- $this->assertIdentical(1, count($result), 'Taxonomy term was auto created when set as field default.');
+ $this->assertCount(1, $result, 'Taxonomy term was auto created when set as field default.');
}
/**
diff --git a/web/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceFieldDefaultValueTest.php b/web/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceFieldDefaultValueTest.php
index 9f50ed63ba..f4329f4797 100644
--- a/web/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceFieldDefaultValueTest.php
+++ b/web/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceFieldDefaultValueTest.php
@@ -148,15 +148,15 @@ public function testEntityReferenceDefaultConfigValue() {
// Check that the field has a dependency on the default value.
$config_entity = $this->config('field.field.node.reference_content.' . $field_name)->get();
- $this->assertTrue(in_array($referenced_node_type->getConfigDependencyName(), $config_entity['dependencies']['config'], TRUE), 'The node type referenced_config_to_delete is a dependency of the field.');
- $this->assertTrue(in_array($referenced_node_type2->getConfigDependencyName(), $config_entity['dependencies']['config'], TRUE), 'The node type referenced_config_to_preserve is a dependency of the field.');
+ $this->assertContains($referenced_node_type->getConfigDependencyName(), $config_entity['dependencies']['config'], 'The node type referenced_config_to_delete is a dependency of the field.');
+ $this->assertContains($referenced_node_type2->getConfigDependencyName(), $config_entity['dependencies']['config'], 'The node type referenced_config_to_preserve is a dependency of the field.');
// Check that the field does not have a dependency on the default value
// after deleting the node type.
$referenced_node_type->delete();
$config_entity = $this->config('field.field.node.reference_content.' . $field_name)->get();
- $this->assertFalse(in_array($referenced_node_type->getConfigDependencyName(), $config_entity['dependencies']['config'], TRUE), 'The node type referenced_config_to_delete not a dependency of the field.');
- $this->assertTrue(in_array($referenced_node_type2->getConfigDependencyName(), $config_entity['dependencies']['config'], TRUE), 'The node type referenced_config_to_preserve is a dependency of the field.');
+ $this->assertNotContains($referenced_node_type->getConfigDependencyName(), $config_entity['dependencies']['config'], 'The node type referenced_config_to_delete not a dependency of the field.');
+ $this->assertContains($referenced_node_type2->getConfigDependencyName(), $config_entity['dependencies']['config'], 'The node type referenced_config_to_preserve is a dependency of the field.');
}
}
diff --git a/web/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceFileUploadTest.php b/web/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceFileUploadTest.php
index 11374c9dd7..d2012e16e1 100644
--- a/web/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceFileUploadTest.php
+++ b/web/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceFileUploadTest.php
@@ -127,13 +127,13 @@ public function testFileUpload() {
$test_file = current($this->getTestFiles('text'));
$edit['files[file_field_0]'] = \Drupal::service('file_system')->realpath($test_file->uri);
$this->drupalPostForm('node/add/' . $this->referencingType, $edit, 'Upload');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$edit = [
'title[0][value]' => $this->randomMachineName(),
'test_field[0][target_id]' => $this->nodeId,
];
$this->drupalPostForm(NULL, $edit, 'Save');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
}
}
diff --git a/web/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceIntegrationTest.php b/web/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceIntegrationTest.php
index b841d502f9..cc13122746 100644
--- a/web/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceIntegrationTest.php
+++ b/web/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceIntegrationTest.php
@@ -163,7 +163,7 @@ public function testSupportedEntityTypesAndWidgets() {
// Ensure the configuration has the expected dependency on the entity that
// is being used a default value.
$field = FieldConfig::loadByName($this->entityType, $this->bundle, $this->fieldName);
- $this->assertTrue(in_array($referenced_entities[0]->getConfigDependencyName(), $field->getDependencies()[$key]), new FormattableMarkup('Expected @type dependency @name found', ['@type' => $key, '@name' => $referenced_entities[0]->getConfigDependencyName()]));
+ $this->assertContains($referenced_entities[0]->getConfigDependencyName(), $field->getDependencies()[$key], new FormattableMarkup('Expected @type dependency @name found', ['@type' => $key, '@name' => $referenced_entities[0]->getConfigDependencyName()]));
// Ensure that the field can be imported without change even after the
// default value deleted.
$referenced_entities[0]->delete();
diff --git a/web/core/modules/field/tests/src/Functional/FieldImportDeleteUninstallUiTest.php b/web/core/modules/field/tests/src/Functional/FieldImportDeleteUninstallUiTest.php
index 1307422bc0..9be5ca2440 100644
--- a/web/core/modules/field/tests/src/Functional/FieldImportDeleteUninstallUiTest.php
+++ b/web/core/modules/field/tests/src/Functional/FieldImportDeleteUninstallUiTest.php
@@ -22,7 +22,13 @@ class FieldImportDeleteUninstallUiTest extends FieldTestBase {
*
* @var array
*/
- public static $modules = ['entity_test', 'telephone', 'config', 'filter', 'datetime'];
+ public static $modules = [
+ 'entity_test',
+ 'telephone',
+ 'config',
+ 'filter',
+ 'datetime',
+ ];
/**
* {@inheritdoc}
diff --git a/web/core/modules/field/tests/src/Functional/FormTest.php b/web/core/modules/field/tests/src/Functional/FormTest.php
index b409456cf9..dd475dbec9 100644
--- a/web/core/modules/field/tests/src/Functional/FormTest.php
+++ b/web/core/modules/field/tests/src/Functional/FormTest.php
@@ -25,7 +25,13 @@ class FormTest extends FieldTestBase {
*
* @var array
*/
- public static $modules = ['node', 'field_test', 'options', 'entity_test', 'locale'];
+ public static $modules = [
+ 'node',
+ 'field_test',
+ 'options',
+ 'entity_test',
+ 'locale',
+ ];
/**
* {@inheritdoc}
@@ -660,7 +666,7 @@ public function testLabelOnMultiValueFields() {
$entity->save();
$this->drupalGet('entity_test_base_field_display/manage/' . $entity->id());
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertText('A field with multiple values');
// Test if labels were XSS filtered.
$this->assertEscaped("<script>alert('a configurable field');</script>");
diff --git a/web/core/modules/field/tests/src/Functional/NestedFormTest.php b/web/core/modules/field/tests/src/Functional/NestedFormTest.php
index 0a646e3d5c..78be016d44 100644
--- a/web/core/modules/field/tests/src/Functional/NestedFormTest.php
+++ b/web/core/modules/field/tests/src/Functional/NestedFormTest.php
@@ -199,7 +199,7 @@ public function testNestedEntityFormEntityLevelValidation() {
$page->pressButton(t('Save'));
$elements = $this->cssSelect('.entity-2.error');
- $this->assertEqual(1, count($elements), 'The whole nested entity form has been correctly flagged with an error class.');
+ $this->assertCount(1, $elements, 'The whole nested entity form has been correctly flagged with an error class.');
}
}
diff --git a/web/core/modules/field/tests/src/Functional/String/StringFieldTest.php b/web/core/modules/field/tests/src/Functional/String/StringFieldTest.php
index d12fd33819..9be6e01b7b 100644
--- a/web/core/modules/field/tests/src/Functional/String/StringFieldTest.php
+++ b/web/core/modules/field/tests/src/Functional/String/StringFieldTest.php
@@ -105,7 +105,7 @@ public function _testTextfieldWidgets($field_type, $widget_type) {
$display = $display_repository->getViewDisplay($entity->getEntityTypeId(), $entity->bundle(), 'full');
$content = $display->build($entity);
$rendered_entity = \Drupal::service('renderer')->renderRoot($content);
- $this->assertContains($value, (string) $rendered_entity);
+ $this->assertStringContainsString($value, (string) $rendered_entity);
}
}
diff --git a/web/core/modules/field/tests/src/Functional/Update/FieldUpdateTest.php b/web/core/modules/field/tests/src/Functional/Update/FieldUpdateTest.php
index bec6e96546..f141ec49ba 100644
--- a/web/core/modules/field/tests/src/Functional/Update/FieldUpdateTest.php
+++ b/web/core/modules/field/tests/src/Functional/Update/FieldUpdateTest.php
@@ -193,13 +193,13 @@ public function testFieldUpdate8500() {
$this->assertCount(1, $deleted_fields);
$this->assertArrayHasKey($field_uuid, $deleted_fields);
- $this->assertTrue($deleted_fields[$field_uuid] instanceof FieldDefinitionInterface);
+ $this->assertInstanceOf(FieldDefinitionInterface::class, $deleted_fields[$field_uuid]);
$this->assertEquals($field_name, $deleted_fields[$field_uuid]->getName());
$deleted_field_storages = $deleted_fields_repository->getFieldStorageDefinitions();
$this->assertCount(1, $deleted_field_storages);
$this->assertArrayHasKey($field_storage_uuid, $deleted_field_storages);
- $this->assertTrue($deleted_field_storages[$field_storage_uuid] instanceof FieldStorageDefinitionInterface);
+ $this->assertInstanceOf(FieldStorageDefinitionInterface::class, $deleted_field_storages[$field_storage_uuid]);
$this->assertEquals($field_name, $deleted_field_storages[$field_storage_uuid]->getName());
// Check that the installed storage schema still exists.
diff --git a/web/core/modules/field/tests/src/Functional/Views/FieldUITest.php b/web/core/modules/field/tests/src/Functional/Views/FieldUITest.php
index 8d4feaa341..864ea3f00a 100644
--- a/web/core/modules/field/tests/src/Functional/Views/FieldUITest.php
+++ b/web/core/modules/field/tests/src/Functional/Views/FieldUITest.php
@@ -111,7 +111,7 @@ public function testHandlerUIAggregation() {
$url = "admin/structure/views/nojs/handler/test_view_fieldapi/default/field/field_name_0";
$this->drupalGet($url);
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Test the click sort column options.
// Tests the available formatter options.
@@ -144,7 +144,7 @@ public function testBooleanFilterHandler() {
$url = "admin/structure/views/nojs/add-handler/test_view_fieldapi/default/filter";
$this->drupalPostForm($url, ['name[node__' . $field_name . '.' . $field_name . '_value]' => TRUE], t('Add and configure @handler', ['@handler' => t('filter criteria')]));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Verify that using a boolean field as a filter also results in using the
// boolean plugin.
$option = $this->xpath('//label[@for="edit-options-value-1"]');
diff --git a/web/core/modules/field/tests/src/Functional/reEnableModuleFieldTest.php b/web/core/modules/field/tests/src/Functional/reEnableModuleFieldTest.php
index 21b91e0ebb..ac14ccc287 100644
--- a/web/core/modules/field/tests/src/Functional/reEnableModuleFieldTest.php
+++ b/web/core/modules/field/tests/src/Functional/reEnableModuleFieldTest.php
@@ -12,7 +12,7 @@
*
* @group field
*/
-class reEnableModuleFieldTest extends BrowserTestBase {
+class ReEnableModuleFieldTest extends BrowserTestBase {
use CronRunTrait;
diff --git a/web/core/modules/field/tests/src/FunctionalJavascript/EntityReference/EntityReferenceAdminTest.php b/web/core/modules/field/tests/src/FunctionalJavascript/EntityReference/EntityReferenceAdminTest.php
index 170c103c05..6864113801 100644
--- a/web/core/modules/field/tests/src/FunctionalJavascript/EntityReference/EntityReferenceAdminTest.php
+++ b/web/core/modules/field/tests/src/FunctionalJavascript/EntityReference/EntityReferenceAdminTest.php
@@ -25,7 +25,14 @@ class EntityReferenceAdminTest extends WebDriverTestBase {
*
* @var array
*/
- public static $modules = ['node', 'field_ui', 'path', 'taxonomy', 'block', 'views_ui'];
+ public static $modules = [
+ 'node',
+ 'field_ui',
+ 'path',
+ 'taxonomy',
+ 'block',
+ 'views_ui',
+ ];
/**
* {@inheritdoc}
@@ -101,9 +108,16 @@ public function testFieldAdminHandler() {
$entity_type_id = 'node';
// Check that the type label is correctly displayed.
$assert_session->pageTextContains('Content type');
+ // Check that sort options are not yet visible.
+ $sort_by = $page->findField('settings[handler_settings][sort][field]');
+ $this->assertNotEmpty($sort_by);
+ $this->assertFalse($sort_by->isVisible(), 'The "sort by" options are hidden.');
+ // Select all bundles so that sort options are available.
$bundles = $this->container->get('entity_type.bundle.info')->getBundleInfo($entity_type_id);
foreach ($bundles as $bundle_name => $bundle_info) {
$this->assertFieldByName('settings[handler_settings][target_bundles][' . $bundle_name . ']');
+ $page->findField('settings[handler_settings][target_bundles][' . $bundle_name . ']')->setValue($bundle_name);
+ $assert_session->assertWaitOnAjaxRequest();
}
reset($bundles);
@@ -111,12 +125,25 @@ public function testFieldAdminHandler() {
// Test the sort settings.
// Option 0: no sort.
$this->assertFieldByName('settings[handler_settings][sort][field]', '_none');
+ $sort_by = $page->findField('settings[handler_settings][sort][field]');
$this->assertNoFieldByName('settings[handler_settings][sort][direction]');
// Option 1: sort by field.
- $page->findField('settings[handler_settings][sort][field]')->setValue('nid');
+ $sort_by->setValue('nid');
$assert_session->waitForField('settings[handler_settings][sort][direction]');
$this->assertFieldByName('settings[handler_settings][sort][direction]', 'ASC');
+ // Test that the sort-by options are sorted.
+ $labels = array_map(function (NodeElement $element) {
+ return $element->getText();
+ }, $sort_by->findAll('xpath', 'option'));
+ for ($i = count($labels) - 1, $sorted = TRUE; $i > 0; --$i) {
+ if ($labels[$i - 1] > $labels[$i]) {
+ $sorted = FALSE;
+ break;
+ }
+ }
+ $this->assertTrue($sorted, 'The "sort by" options are sorted.');
+
// Test that a non-translatable base field is a sort option.
$this->assertFieldByXPath("//select[@name='settings[handler_settings][sort][field]']/option[@value='nid']");
// Test that a translatable base field is a sort option.
@@ -125,13 +152,11 @@ public function testFieldAdminHandler() {
$this->assertFieldByXPath("//select[@name='settings[handler_settings][sort][field]']/option[@value='body.value']");
// Set back to no sort.
- $page->findField('settings[handler_settings][sort][field]')->setValue('_none');
+ $sort_by->setValue('_none');
$assert_session->assertWaitOnAjaxRequest();
$this->assertNoFieldByName('settings[handler_settings][sort][direction]');
// Third step: confirm.
- $page->findField('settings[handler_settings][target_bundles][' . key($bundles) . ']')->setValue(key($bundles));
- $assert_session->assertWaitOnAjaxRequest();
$this->drupalPostForm(NULL, [
'required' => '1',
], t('Save settings'));
@@ -164,6 +189,7 @@ public function testFieldAdminHandler() {
$this->drupalPostForm($bundle_path . '/fields/' . $field_name . '/storage', $edit, t('Save field settings'));
$this->drupalGet($bundle_path . '/fields/' . $field_name);
$this->assertFieldByName('settings[handler_settings][filter][type]', '_none');
+ $this->assertFieldByName('settings[handler_settings][sort][field]', '_none');
// Switch the target type to 'node'.
$field_name = 'node.' . $this->type . '.field_test';
diff --git a/web/core/modules/field/tests/src/Kernel/Boolean/BooleanItemTest.php b/web/core/modules/field/tests/src/Kernel/Boolean/BooleanItemTest.php
index 18f6c34e2c..648f67f5d4 100644
--- a/web/core/modules/field/tests/src/Kernel/Boolean/BooleanItemTest.php
+++ b/web/core/modules/field/tests/src/Kernel/Boolean/BooleanItemTest.php
@@ -57,8 +57,8 @@ public function testBooleanItem() {
// Verify entity has been created properly.
$id = $entity->id();
$entity = EntityTest::load($id);
- $this->assertTrue($entity->field_boolean instanceof FieldItemListInterface, 'Field implements interface.');
- $this->assertTrue($entity->field_boolean[0] instanceof FieldItemInterface, 'Field item implements interface.');
+ $this->assertInstanceOf(FieldItemListInterface::class, $entity->field_boolean);
+ $this->assertInstanceOf(FieldItemInterface::class, $entity->field_boolean[0]);
$this->assertEqual($entity->field_boolean->value, $value);
$this->assertEqual($entity->field_boolean[0]->value, $value);
diff --git a/web/core/modules/field/tests/src/Kernel/BulkDeleteTest.php b/web/core/modules/field/tests/src/Kernel/BulkDeleteTest.php
index f9fba84ed5..2ab7b921e4 100644
--- a/web/core/modules/field/tests/src/Kernel/BulkDeleteTest.php
+++ b/web/core/modules/field/tests/src/Kernel/BulkDeleteTest.php
@@ -170,7 +170,7 @@ public function testDeleteField() {
->getQuery()
->condition('type', $bundle)
->execute();
- $this->assertEqual(count($found), 10, 'Correct number of entities found before deleting');
+ $this->assertCount(10, $found, 'Correct number of entities found before deleting');
// Delete the field.
$field = FieldConfig::loadByName($this->entityTypeId, $bundle, $field_name);
@@ -178,7 +178,7 @@ public function testDeleteField() {
// The field still exists, deleted.
$fields = \Drupal::entityTypeManager()->getStorage('field_config')->loadByProperties(['field_storage_uuid' => $field_storage->uuid(), 'deleted' => TRUE, 'include_deleted' => TRUE]);
- $this->assertEqual(count($fields), 1, 'There is one deleted field');
+ $this->assertCount(1, $fields, 'There is one deleted field');
$field = $fields[$field->uuid()];
$this->assertEqual($field->getTargetBundle(), $bundle, 'The deleted field is for the correct bundle');
@@ -293,7 +293,7 @@ public function testPurgeWithDeletedAndActiveField() {
// The field has been removed from the system.
$fields = \Drupal::entityTypeManager()->getStorage('field_config')->loadByProperties(['field_storage_uuid' => $deleted_field_storage->uuid(), 'deleted' => TRUE, 'include_deleted' => TRUE]);
- $this->assertEqual(count($fields), 0, 'The field is gone');
+ $this->assertCount(0, $fields, 'The field is gone');
// Verify there are still 10 entries in the main table.
$count = \Drupal::database()
@@ -324,7 +324,7 @@ public function testPurgeField() {
// No field hooks were called.
$mem = field_test_memorize();
- $this->assertEqual(count($mem), 0, 'No field hooks were called');
+ $this->assertCount(0, $mem, 'No field hooks were called');
$batch_size = 2;
for ($count = 8; $count >= 0; $count -= $batch_size) {
@@ -352,14 +352,14 @@ public function testPurgeField() {
// The field still exists, deleted.
$fields = \Drupal::entityTypeManager()->getStorage('field_config')->loadByProperties(['field_storage_uuid' => $field_storage->uuid(), 'deleted' => TRUE, 'include_deleted' => TRUE]);
- $this->assertEqual(count($fields), 1, 'There is one deleted field');
+ $this->assertCount(1, $fields, 'There is one deleted field');
// Purge the field.
field_purge_batch($batch_size);
// The field is gone.
$fields = \Drupal::entityTypeManager()->getStorage('field_config')->loadByProperties(['field_storage_uuid' => $field_storage->uuid(), 'deleted' => TRUE, 'include_deleted' => TRUE]);
- $this->assertEqual(count($fields), 0, 'The field is gone');
+ $this->assertCount(0, $fields, 'The field is gone');
// The field storage still exists, not deleted, because it has a second
// field.
@@ -385,7 +385,7 @@ public function testPurgeFieldStorage() {
// Assert that FieldItemInterface::delete() was not called yet.
$mem = field_test_memorize();
- $this->assertEqual(count($mem), 0, 'No field hooks were called.');
+ $this->assertCount(0, $mem, 'No field hooks were called.');
// Purge the data.
field_purge_batch(10);
@@ -410,7 +410,7 @@ public function testPurgeFieldStorage() {
// The field is gone.
$fields = \Drupal::entityTypeManager()->getStorage('field_config')->loadByProperties(['uuid' => $field->uuid(), 'include_deleted' => TRUE]);
- $this->assertEqual(count($fields), 0, 'The field is purged.');
+ $this->assertCount(0, $fields, 'The field is purged.');
// The field storage still exists, not deleted.
$storages = \Drupal::entityTypeManager()->getStorage('field_storage_config')->loadByProperties(['uuid' => $field_storage->uuid(), 'include_deleted' => TRUE]);
$this->assertTrue(isset($storages[$field_storage->uuid()]) && !$storages[$field_storage->uuid()]->isDeleted(), 'The field storage exists and is not deleted');
@@ -422,7 +422,7 @@ public function testPurgeFieldStorage() {
// Assert that FieldItemInterface::delete() was not called yet.
$mem = field_test_memorize();
- $this->assertEqual(count($mem), 0, 'No field hooks were called.');
+ $this->assertCount(0, $mem, 'No field hooks were called.');
// Purge the data.
field_purge_batch(10);
@@ -447,9 +447,9 @@ public function testPurgeFieldStorage() {
// The field and the storage are gone.
$fields = \Drupal::entityTypeManager()->getStorage('field_config')->loadByProperties(['uuid' => $field->uuid(), 'include_deleted' => TRUE]);
- $this->assertEqual(count($fields), 0, 'The field is purged.');
+ $this->assertCount(0, $fields, 'The field is purged.');
$storages = \Drupal::entityTypeManager()->getStorage('field_storage_config')->loadByProperties(['uuid' => $field_storage->uuid(), 'include_deleted' => TRUE]);
- $this->assertEqual(count($storages), 0, 'The field storage is purged.');
+ $this->assertCount(0, $storages, 'The field storage is purged.');
}
}
diff --git a/web/core/modules/field/tests/src/Kernel/ConfigFieldDefinitionTest.php b/web/core/modules/field/tests/src/Kernel/ConfigFieldDefinitionTest.php
index 174cfca84e..9ad5557238 100644
--- a/web/core/modules/field/tests/src/Kernel/ConfigFieldDefinitionTest.php
+++ b/web/core/modules/field/tests/src/Kernel/ConfigFieldDefinitionTest.php
@@ -45,7 +45,7 @@ protected function setUp() {
public function testBundleFieldDefinition() {
$definitions = \Drupal::service('entity_field.manager')->getFieldDefinitions($this->entityType, $this->bundle);
$this->assertTrue(isset($definitions[$this->fieldTestData->field->getName()]));
- $this->assertTrue($definitions[$this->fieldTestData->field->getName()] instanceof FieldDefinitionInterface);
+ $this->assertInstanceOf(FieldDefinitionInterface::class, $definitions[$this->fieldTestData->field->getName()]);
// Make sure fields on other entity types are not exposed.
$this->assertFalse(isset($definitions[$this->fieldTestData->field_rev->getName()]));
}
@@ -56,7 +56,7 @@ public function testBundleFieldDefinition() {
public function testFieldStorageDefinition() {
$field_storage_definitions = \Drupal::service('entity_field.manager')->getFieldStorageDefinitions($this->entityType);
$this->assertTrue(isset($field_storage_definitions[$this->fieldTestData->field->getName()]));
- $this->assertTrue($field_storage_definitions[$this->fieldTestData->field->getName()] instanceof FieldStorageDefinitionInterface);
+ $this->assertInstanceOf(FieldStorageDefinitionInterface::class, $field_storage_definitions[$this->fieldTestData->field->getName()]);
// Make sure storages on other entity types are not exposed.
$this->assertFalse(isset($field_storage_definitions[$this->fieldTestData->field_rev->getName()]));
}
diff --git a/web/core/modules/field/tests/src/Kernel/Email/EmailItemTest.php b/web/core/modules/field/tests/src/Kernel/Email/EmailItemTest.php
index df971fb0d6..f67b78a6b2 100644
--- a/web/core/modules/field/tests/src/Kernel/Email/EmailItemTest.php
+++ b/web/core/modules/field/tests/src/Kernel/Email/EmailItemTest.php
@@ -54,8 +54,8 @@ public function testEmailItem() {
// Verify entity has been created properly.
$id = $entity->id();
$entity = EntityTest::load($id);
- $this->assertTrue($entity->field_email instanceof FieldItemListInterface, 'Field implements interface.');
- $this->assertTrue($entity->field_email[0] instanceof FieldItemInterface, 'Field item implements interface.');
+ $this->assertInstanceOf(FieldItemListInterface::class, $entity->field_email);
+ $this->assertInstanceOf(FieldItemInterface::class, $entity->field_email[0]);
$this->assertEqual($entity->field_email->value, $value);
$this->assertEqual($entity->field_email[0]->value, $value);
diff --git a/web/core/modules/field/tests/src/Kernel/EntityReference/EntityReferenceFormatterTest.php b/web/core/modules/field/tests/src/Kernel/EntityReference/EntityReferenceFormatterTest.php
index d93d2d238b..fa4c911039 100644
--- a/web/core/modules/field/tests/src/Kernel/EntityReference/EntityReferenceFormatterTest.php
+++ b/web/core/modules/field/tests/src/Kernel/EntityReference/EntityReferenceFormatterTest.php
@@ -178,7 +178,7 @@ public function testCustomCacheTagFormatter() {
$build = $this->buildRenderArray([$this->referencedEntity], $formatter);
$renderer->renderRoot($build);
- $this->assertTrue(in_array('custom_cache_tag', $build['#cache']['tags']));
+ $this->assertContains('custom_cache_tag', $build['#cache']['tags']);
}
/**
diff --git a/web/core/modules/field/tests/src/Kernel/EntityReference/EntityReferenceItemTest.php b/web/core/modules/field/tests/src/Kernel/EntityReference/EntityReferenceItemTest.php
index f8f57dfe8b..34d508787b 100644
--- a/web/core/modules/field/tests/src/Kernel/EntityReference/EntityReferenceItemTest.php
+++ b/web/core/modules/field/tests/src/Kernel/EntityReference/EntityReferenceItemTest.php
@@ -39,7 +39,16 @@ class EntityReferenceItemTest extends FieldKernelTestBase {
*
* @var array
*/
- public static $modules = ['node', 'comment', 'file', 'taxonomy', 'text', 'filter', 'views', 'field'];
+ public static $modules = [
+ 'node',
+ 'comment',
+ 'file',
+ 'taxonomy',
+ 'text',
+ 'filter',
+ 'views',
+ 'field',
+ ];
/**
* The taxonomy vocabulary to test with.
@@ -128,15 +137,15 @@ public function testContentEntityReferenceItem() {
$entity->save();
$entity = EntityTest::load($entity->id());
- $this->assertTrue($entity->field_test_taxonomy_term instanceof FieldItemListInterface, 'Field implements interface.');
- $this->assertTrue($entity->field_test_taxonomy_term[0] instanceof FieldItemInterface, 'Field item implements interface.');
+ $this->assertInstanceOf(FieldItemListInterface::class, $entity->field_test_taxonomy_term);
+ $this->assertInstanceOf(FieldItemInterface::class, $entity->field_test_taxonomy_term[0]);
$this->assertEqual($entity->field_test_taxonomy_term->target_id, $tid);
$this->assertEqual($entity->field_test_taxonomy_term->entity->getName(), $this->term->getName());
$this->assertEqual($entity->field_test_taxonomy_term->entity->id(), $tid);
$this->assertEqual($entity->field_test_taxonomy_term->entity->uuid(), $this->term->uuid());
// Verify that the label for the target ID property definition is correct.
$label = $entity->field_test_taxonomy_term->getFieldDefinition()->getFieldStorageDefinition()->getPropertyDefinition('target_id')->getLabel();
- $this->assertTrue($label instanceof TranslatableMarkup);
+ $this->assertInstanceOf(TranslatableMarkup::class, $label);
$this->assertEqual($label->render(), 'Taxonomy term ID');
// Change the name of the term via the reference.
@@ -247,7 +256,7 @@ public function testContentEntityReferenceItemWithStringId() {
$this->assertEqual($this->entityStringId->id(), $storage->load($entity->id())->field_test_entity_test_string_id->target_id);
// Verify that the label for the target ID property definition is correct.
$label = $entity->field_test_taxonomy_term->getFieldDefinition()->getFieldStorageDefinition()->getPropertyDefinition('target_id')->getLabel();
- $this->assertTrue($label instanceof TranslatableMarkup);
+ $this->assertInstanceOf(TranslatableMarkup::class, $label);
$this->assertEqual($label->render(), 'Taxonomy term ID');
}
@@ -264,8 +273,8 @@ public function testConfigEntityReferenceItem() {
$entity->save();
$entity = EntityTest::load($entity->id());
- $this->assertTrue($entity->field_test_taxonomy_vocabulary instanceof FieldItemListInterface, 'Field implements interface.');
- $this->assertTrue($entity->field_test_taxonomy_vocabulary[0] instanceof FieldItemInterface, 'Field item implements interface.');
+ $this->assertInstanceOf(FieldItemListInterface::class, $entity->field_test_taxonomy_vocabulary);
+ $this->assertInstanceOf(FieldItemInterface::class, $entity->field_test_taxonomy_vocabulary[0]);
$this->assertEqual($entity->field_test_taxonomy_vocabulary->target_id, $referenced_entity_id);
$this->assertEqual($entity->field_test_taxonomy_vocabulary->entity->label(), $this->vocabulary->label());
$this->assertEqual($entity->field_test_taxonomy_vocabulary->entity->id(), $referenced_entity_id);
@@ -413,7 +422,7 @@ public function testAutocreateValidation() {
]);
$errors = $entity->validate();
// Using target_id of NULL is valid with an unsaved entity.
- $this->assertEqual(0, count($errors));
+ $this->assertCount(0, $errors);
// Using target_id of NULL is not valid with a saved entity.
$term->save();
$entity = EntityTest::create([
@@ -423,13 +432,13 @@ public function testAutocreateValidation() {
],
]);
$errors = $entity->validate();
- $this->assertEqual(1, count($errors));
+ $this->assertCount(1, $errors);
$this->assertEqual($errors[0]->getMessage(), 'This value should not be null.');
$this->assertEqual($errors[0]->getPropertyPath(), 'field_test_taxonomy_term.0');
// This should rectify the issue, favoring the entity over the target_id.
$entity->save();
$errors = $entity->validate();
- $this->assertEqual(0, count($errors));
+ $this->assertCount(0, $errors);
// Test with an unpublished and unsaved node.
$title = $this->randomString();
@@ -446,14 +455,14 @@ public function testAutocreateValidation() {
]);
$errors = $entity->validate();
- $this->assertEqual(1, count($errors));
+ $this->assertCount(1, $errors);
$this->assertEqual($errors[0]->getMessage(), new FormattableMarkup('This entity (%type: %label) cannot be referenced.', ['%type' => 'node', '%label' => $title]));
$this->assertEqual($errors[0]->getPropertyPath(), 'field_test_node.0.entity');
// Publish the node and try again.
$node->setPublished();
$errors = $entity->validate();
- $this->assertEqual(0, count($errors));
+ $this->assertCount(0, $errors);
// Test with a mix of valid and invalid nodes.
$unsaved_unpublished_node_title = $this->randomString();
@@ -494,7 +503,7 @@ public function testAutocreateValidation() {
]);
$errors = $entity->validate();
- $this->assertEqual(2, count($errors));
+ $this->assertCount(2, $errors);
$this->assertEqual($errors[0]->getMessage(), new FormattableMarkup('This entity (%type: %label) cannot be referenced.', ['%type' => 'node', '%label' => $unsaved_unpublished_node_title]));
$this->assertEqual($errors[0]->getPropertyPath(), 'field_test_node.0.entity');
$this->assertEqual($errors[1]->getMessage(), new FormattableMarkup('This entity (%type: %label) cannot be referenced.', ['%type' => 'node', '%label' => $saved_unpublished_node->id()]));
@@ -504,14 +513,14 @@ public function testAutocreateValidation() {
$saved_unpublished_node->setPublished();
$saved_unpublished_node->save();
$errors = $entity->validate();
- $this->assertEqual(1, count($errors));
+ $this->assertCount(1, $errors);
$this->assertEqual($errors[0]->getMessage(), new FormattableMarkup('This entity (%type: %label) cannot be referenced.', ['%type' => 'node', '%label' => $unsaved_unpublished_node_title]));
$this->assertEqual($errors[0]->getPropertyPath(), 'field_test_node.0.entity');
// Publish the last invalid node and try again.
$unsaved_unpublished_node->setPublished();
$errors = $entity->validate();
- $this->assertEqual(0, count($errors));
+ $this->assertCount(0, $errors);
// Test with an unpublished and unsaved comment.
$title = $this->randomString();
@@ -528,14 +537,14 @@ public function testAutocreateValidation() {
]);
$errors = $entity->validate();
- $this->assertEqual(1, count($errors));
+ $this->assertCount(1, $errors);
$this->assertEqual($errors[0]->getMessage(), new FormattableMarkup('This entity (%type: %label) cannot be referenced.', ['%type' => 'comment', '%label' => $title]));
$this->assertEqual($errors[0]->getPropertyPath(), 'field_test_comment.0.entity');
// Publish the comment and try again.
$comment->setPublished();
$errors = $entity->validate();
- $this->assertEqual(0, count($errors));
+ $this->assertCount(0, $errors);
// Test with an inactive and unsaved user.
$name = $this->randomString();
@@ -551,14 +560,14 @@ public function testAutocreateValidation() {
]);
$errors = $entity->validate();
- $this->assertEqual(1, count($errors));
+ $this->assertCount(1, $errors);
$this->assertEqual($errors[0]->getMessage(), new FormattableMarkup('This entity (%type: %label) cannot be referenced.', ['%type' => 'user', '%label' => $name]));
$this->assertEqual($errors[0]->getPropertyPath(), 'field_test_user.0.entity');
// Activate the user and try again.
$user->activate();
$errors = $entity->validate();
- $this->assertEqual(0, count($errors));
+ $this->assertCount(0, $errors);
// Test with a temporary and unsaved file.
$filename = $this->randomMachineName() . '.txt';
@@ -574,14 +583,14 @@ public function testAutocreateValidation() {
]);
$errors = $entity->validate();
- $this->assertEqual(1, count($errors));
+ $this->assertCount(1, $errors);
$this->assertEqual($errors[0]->getMessage(), new FormattableMarkup('This entity (%type: %label) cannot be referenced.', ['%type' => 'file', '%label' => $filename]));
$this->assertEqual($errors[0]->getPropertyPath(), 'field_test_file.0.entity');
// Set the file as permanent and try again.
$file->setPermanent();
$errors = $entity->validate();
- $this->assertEqual(0, count($errors));
+ $this->assertCount(0, $errors);
}
}
diff --git a/web/core/modules/field/tests/src/Kernel/EntityReference/EntityReferenceSettingsTest.php b/web/core/modules/field/tests/src/Kernel/EntityReference/EntityReferenceSettingsTest.php
index dc3da86dc5..cae16a4203 100644
--- a/web/core/modules/field/tests/src/Kernel/EntityReference/EntityReferenceSettingsTest.php
+++ b/web/core/modules/field/tests/src/Kernel/EntityReference/EntityReferenceSettingsTest.php
@@ -23,7 +23,16 @@ class EntityReferenceSettingsTest extends KernelTestBase {
/**
* {@inheritdoc}
*/
- public static $modules = ['node', 'taxonomy', 'field', 'user', 'text', 'entity_reference', 'entity_test', 'system'];
+ public static $modules = [
+ 'node',
+ 'taxonomy',
+ 'field',
+ 'user',
+ 'text',
+ 'entity_reference',
+ 'entity_test',
+ 'system',
+ ];
/**
* Testing node type.
diff --git a/web/core/modules/field/tests/src/Kernel/EntityReference/Views/EntityReferenceRelationshipTest.php b/web/core/modules/field/tests/src/Kernel/EntityReference/Views/EntityReferenceRelationshipTest.php
index b93a4a9c1d..84e517204b 100644
--- a/web/core/modules/field/tests/src/Kernel/EntityReference/Views/EntityReferenceRelationshipTest.php
+++ b/web/core/modules/field/tests/src/Kernel/EntityReference/Views/EntityReferenceRelationshipTest.php
@@ -41,7 +41,13 @@ class EntityReferenceRelationshipTest extends ViewsKernelTestBase {
*
* @var array
*/
- public static $modules = ['user', 'field', 'entity_test', 'views', 'entity_reference_test_views'];
+ public static $modules = [
+ 'user',
+ 'field',
+ 'entity_test',
+ 'views',
+ 'entity_reference_test_views',
+ ];
/**
* The entity_test entities used by the test.
diff --git a/web/core/modules/field/tests/src/Kernel/FieldAttachStorageTest.php b/web/core/modules/field/tests/src/Kernel/FieldAttachStorageTest.php
index a97cf3668c..7788d5a4dc 100644
--- a/web/core/modules/field/tests/src/Kernel/FieldAttachStorageTest.php
+++ b/web/core/modules/field/tests/src/Kernel/FieldAttachStorageTest.php
@@ -355,8 +355,8 @@ public function testEntityDeleteBundle() {
$entity = $this->entitySaveReload($entity);
// Verify the fields are present on load
- $this->assertEqual(count($entity->{$this->fieldTestData->field_name}), 4, 'First field got loaded');
- $this->assertEqual(count($entity->{$field_name}), 1, 'Second field got loaded');
+ $this->assertCount(4, $entity->{$this->fieldTestData->field_name}, 'First field got loaded');
+ $this->assertCount(1, $entity->{$field_name}, 'Second field got loaded');
// Delete the bundle.
entity_test_delete_bundle($this->fieldTestData->field->getTargetBundle(), $entity_type);
diff --git a/web/core/modules/field/tests/src/Kernel/FieldCrudTest.php b/web/core/modules/field/tests/src/Kernel/FieldCrudTest.php
index c6230046ac..0dd55a866d 100644
--- a/web/core/modules/field/tests/src/Kernel/FieldCrudTest.php
+++ b/web/core/modules/field/tests/src/Kernel/FieldCrudTest.php
@@ -290,7 +290,7 @@ public function testDeleteFieldNoData() {
// Make sure the field was deleted without being marked for purging as there
// was no data.
$fields = \Drupal::entityTypeManager()->getStorage('field_config')->loadByProperties(['entity_type' => 'entity_test', 'field_name' => $this->fieldDefinition['field_name'], 'bundle' => $this->fieldDefinition['bundle'], 'include_deleted' => TRUE]);
- $this->assertEquals(0, count($fields), 'A deleted field is marked for deletion.');
+ $this->assertCount(0, $fields, 'A deleted field is marked for deletion.');
// Try to load the field normally and make sure it does not show up.
$field = FieldConfig::load('entity_test.' . '.' . $this->fieldDefinition['bundle'] . '.' . $this->fieldDefinition['field_name']);
diff --git a/web/core/modules/field/tests/src/Kernel/FieldImportCreateTest.php b/web/core/modules/field/tests/src/Kernel/FieldImportCreateTest.php
index af12c23967..c7138e0e6a 100644
--- a/web/core/modules/field/tests/src/Kernel/FieldImportCreateTest.php
+++ b/web/core/modules/field/tests/src/Kernel/FieldImportCreateTest.php
@@ -58,14 +58,14 @@ public function testImportCreateDefault() {
->condition('entity_type', 'entity_test')
->condition('bundle', 'entity_test')
->execute();
- $this->assertEqual(count($ids), 2);
+ $this->assertCount(2, $ids);
$this->assertTrue(isset($ids['entity_test.entity_test.field_test_import']));
$this->assertTrue(isset($ids['entity_test.entity_test.field_test_import_2']));
$ids = \Drupal::entityQuery('field_config')
->condition('entity_type', 'entity_test')
->condition('bundle', 'test_bundle')
->execute();
- $this->assertEqual(count($ids), 1);
+ $this->assertCount(1, $ids);
$this->assertTrue(isset($ids['entity_test.test_bundle.field_test_import_2']));
}
diff --git a/web/core/modules/field/tests/src/Kernel/FieldImportDeleteTest.php b/web/core/modules/field/tests/src/Kernel/FieldImportDeleteTest.php
index ddf31f64d3..043da28c39 100644
--- a/web/core/modules/field/tests/src/Kernel/FieldImportDeleteTest.php
+++ b/web/core/modules/field/tests/src/Kernel/FieldImportDeleteTest.php
@@ -76,7 +76,7 @@ public function testImportDelete() {
$this->assertTrue($sync->delete($field_config_name_2b), new FormattableMarkup('Deleted field: @field', ['@field' => $field_config_name_2b]));
$deletes = $this->configImporter()->getUnprocessedConfiguration('delete');
- $this->assertEqual(count($deletes), 5, 'Importing configuration will delete 3 fields and 2 field storages.');
+ $this->assertCount(5, $deletes, 'Importing configuration will delete 3 fields and 2 field storages.');
// Import the content of the sync directory.
$this->configImporter()->import();
diff --git a/web/core/modules/field/tests/src/Kernel/FieldKernelTestBase.php b/web/core/modules/field/tests/src/Kernel/FieldKernelTestBase.php
index fdc8940fd6..c20ee81884 100644
--- a/web/core/modules/field/tests/src/Kernel/FieldKernelTestBase.php
+++ b/web/core/modules/field/tests/src/Kernel/FieldKernelTestBase.php
@@ -19,7 +19,14 @@ abstract class FieldKernelTestBase extends KernelTestBase {
*
* @var array
*/
- public static $modules = ['user', 'system', 'field', 'text', 'entity_test', 'field_test'];
+ public static $modules = [
+ 'user',
+ 'system',
+ 'field',
+ 'text',
+ 'entity_test',
+ 'field_test',
+ ];
/**
* Bag of created field storages and fields.
diff --git a/web/core/modules/field/tests/src/Kernel/FieldStorageCrudTest.php b/web/core/modules/field/tests/src/Kernel/FieldStorageCrudTest.php
index 98cc95581d..738b4ef7dc 100644
--- a/web/core/modules/field/tests/src/Kernel/FieldStorageCrudTest.php
+++ b/web/core/modules/field/tests/src/Kernel/FieldStorageCrudTest.php
@@ -215,11 +215,13 @@ public function testRead() {
// Check that 'single column' criteria works.
$field_storage_config_storage = \Drupal::entityTypeManager()->getStorage('field_storage_config');
$fields = $field_storage_config_storage->loadByProperties(['field_name' => $field_storage_definition['field_name']]);
- $this->assertTrue(count($fields) == 1 && isset($fields[$id]), 'The field was properly read.');
+ $this->assertCount(1, $fields, 'The field was properly read.');
+ $this->assertArrayHasKey($id, $fields, 'The field has the correct key.');
// Check that 'multi column' criteria works.
$fields = $field_storage_config_storage->loadByProperties(['field_name' => $field_storage_definition['field_name'], 'type' => $field_storage_definition['type']]);
- $this->assertTrue(count($fields) == 1 && isset($fields[$id]), 'The field was properly read.');
+ $this->assertCount(1, $fields, 'The field was properly read.');
+ $this->assertArrayHasKey($id, $fields, 'The field has the correct key.');
$fields = $field_storage_config_storage->loadByProperties(['field_name' => $field_storage_definition['field_name'], 'type' => 'foo']);
$this->assertTrue(empty($fields), 'No field was found.');
@@ -322,12 +324,12 @@ public function testDeleteNoData() {
// Make sure that the field storage is deleted as it had no data.
$field_storages = $field_storage_config_storage->loadByProperties(['field_name' => $field_storage_definition['field_name'], 'include_deleted' => TRUE]);
- $this->assertEquals(0, count($field_storages), 'Field storage was deleted');
+ $this->assertCount(0, $field_storages, 'Field storage was deleted');
// Make sure that this field is marked as deleted when it is
// specifically loaded.
$fields = \Drupal::entityTypeManager()->getStorage('field_config')->loadByProperties(['entity_type' => 'entity_test', 'field_name' => $field_definition['field_name'], 'bundle' => $field_definition['bundle'], 'include_deleted' => TRUE]);
- $this->assertEquals(0, count($fields), 'Field storage was deleted');
+ $this->assertCount(0, $fields, 'Field storage was deleted');
// Try to load the storage normally and make sure it does not show up.
$field_storage = FieldStorageConfig::load('entity_test.' . $field_storage_definition['field_name']);
@@ -383,6 +385,42 @@ public function testUpdateFieldType() {
}
}
+ /**
+ * Test changing a field storage type.
+ */
+ public function testUpdateEntityType() {
+ $field_storage = FieldStorageConfig::create([
+ 'field_name' => 'field_type',
+ 'entity_type' => 'entity_test',
+ 'type' => 'decimal',
+ ]);
+ $field_storage->save();
+
+ $this->expectException(FieldException::class);
+ $this->expectExceptionMessage('Cannot change the field type for an existing field storage. The field storage entity_test.field_type has the type decimal.');
+
+ $field_storage->set('type', 'foobar');
+ $field_storage->save();
+ }
+
+ /**
+ * Test changing a field storage entity type.
+ */
+ public function testUpdateEntityTargetType() {
+ $field_storage = FieldStorageConfig::create([
+ 'field_name' => 'field_type',
+ 'entity_type' => 'entity_test',
+ 'type' => 'decimal',
+ ]);
+ $field_storage->save();
+
+ $this->expectException(FieldException::class);
+ $this->expectExceptionMessage('Cannot change the entity type for an existing field storage. The field storage foobar.field_type has the type entity_test.');
+
+ $field_storage->set('entity_type', 'foobar');
+ $field_storage->save();
+ }
+
/**
* Test updating a field storage.
*/
diff --git a/web/core/modules/field/tests/src/Kernel/FieldTypePluginManagerTest.php b/web/core/modules/field/tests/src/Kernel/FieldTypePluginManagerTest.php
index 4ee5f52196..a2b77bc0dc 100644
--- a/web/core/modules/field/tests/src/Kernel/FieldTypePluginManagerTest.php
+++ b/web/core/modules/field/tests/src/Kernel/FieldTypePluginManagerTest.php
@@ -51,7 +51,7 @@ public function testCreateInstance() {
$instance = $field_type_manager->createInstance($type, $configuration);
- $this->assertTrue($instance instanceof $class, new FormattableMarkup('Created a @class instance', ['@class' => $class]));
+ $this->assertInstanceOf($class, $instance);
$this->assertEqual($field_name, $instance->getName(), new FormattableMarkup('Instance name is @name', ['@name' => $field_name]));
}
}
@@ -82,7 +82,7 @@ public function testCreateInstanceWithConfig() {
$instance = $field_type_manager->createInstance($type, $configuration);
- $this->assertTrue($instance instanceof $class, new FormattableMarkup('Created a @class instance', ['@class' => $class]));
+ $this->assertInstanceOf($class, $instance);
$this->assertEqual($field_name, $instance->getName(), new FormattableMarkup('Instance name is @name', ['@name' => $field_name]));
$this->assertEqual($instance->getFieldDefinition()->getLabel(), 'Jenny', 'Instance label is Jenny');
$this->assertEqual($instance->getFieldDefinition()->getDefaultValue($entity), [['value' => 8675309]], 'Instance default_value is 8675309');
diff --git a/web/core/modules/field/tests/src/Kernel/FieldValidationTest.php b/web/core/modules/field/tests/src/Kernel/FieldValidationTest.php
index 8ab818b299..16ae5faa6e 100644
--- a/web/core/modules/field/tests/src/Kernel/FieldValidationTest.php
+++ b/web/core/modules/field/tests/src/Kernel/FieldValidationTest.php
@@ -54,7 +54,7 @@ public function testCardinalityConstraint() {
$violations = $entity->{$this->fieldTestData->field_name}->validate();
// Check that the expected constraint violations are reported.
- $this->assertEqual(count($violations), 1);
+ $this->assertCount(1, $violations);
$this->assertEqual($violations[0]->getPropertyPath(), '');
$this->assertEqual($violations[0]->getMessage(), t('%name: this field cannot hold more than @count values.', ['%name' => $this->fieldTestData->field->getLabel(), '@count' => $cardinality]));
}
diff --git a/web/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldFormatterSettingsTest.php b/web/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldFormatterSettingsTest.php
index c3f207160c..b30d3c7dd9 100644
--- a/web/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldFormatterSettingsTest.php
+++ b/web/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldFormatterSettingsTest.php
@@ -206,7 +206,7 @@ public function testEntityDisplaySettings() {
// reference field.
$display = EntityViewDisplay::load('node.employee.default');
$component = $display->getComponent('field_company');
- $this->assertInternalType('array', $component);
+ $this->assertIsArray($component);
$this->assertSame('entity_reference_label', $component['type']);
// The default node reference formatter shows the referenced node's title
// as a link.
@@ -214,14 +214,14 @@ public function testEntityDisplaySettings() {
$display = EntityViewDisplay::load('node.employee.teaser');
$component = $display->getComponent('field_company');
- $this->assertInternalType('array', $component);
+ $this->assertIsArray($component);
$this->assertSame('entity_reference_label', $component['type']);
// The plain node reference formatter shows the referenced node's title,
// unlinked.
$this->assertFalse($component['settings']['link']);
$component = $display->getComponent('field_commander');
- $this->assertInternalType('array', $component);
+ $this->assertIsArray($component);
$this->assertSame('entity_reference_label', $component['type']);
// The default user reference formatter links to the referenced user.
$this->assertTrue($component['settings']['link']);
diff --git a/web/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldWidgetSettingsTest.php b/web/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldWidgetSettingsTest.php
index 284f69dd0d..ad32ca4537 100644
--- a/web/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldWidgetSettingsTest.php
+++ b/web/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldWidgetSettingsTest.php
@@ -31,7 +31,7 @@ protected function setUp() {
public function testWidgetSettings() {
// Test the config can be loaded.
$form_display = EntityFormDisplay::load('node.story.default');
- $this->assertIdentical(FALSE, is_null($form_display), "Form display node.story.default loaded with config.");
+ $this->assertNotNull($form_display);
// Text field.
$component = $form_display->getComponent('field_test');
@@ -107,22 +107,22 @@ public function testWidgetSettings() {
$component = $display_repository->getFormDisplay('node', 'employee', 'default')
->getComponent('field_company');
- $this->assertInternalType('array', $component);
+ $this->assertIsArray($component);
$this->assertSame('options_select', $component['type']);
$component = $display_repository->getFormDisplay('node', 'employee', 'default')
->getComponent('field_company_2');
- $this->assertInternalType('array', $component);
+ $this->assertIsArray($component);
$this->assertSame('options_buttons', $component['type']);
$component = $display_repository->getFormDisplay('node', 'employee', 'default')
->getComponent('field_company_3');
- $this->assertInternalType('array', $component);
+ $this->assertIsArray($component);
$this->assertSame('entity_reference_autocomplete_tags', $component['type']);
$component = $display_repository->getFormDisplay('node', 'employee', 'default')
->getComponent('field_commander');
- $this->assertInternalType('array', $component);
+ $this->assertIsArray($component);
$this->assertSame('options_select', $component['type']);
}
diff --git a/web/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateFieldFormatterSettingsTest.php b/web/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateFieldFormatterSettingsTest.php
index c8654d4069..387a63e3cd 100644
--- a/web/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateFieldFormatterSettingsTest.php
+++ b/web/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateFieldFormatterSettingsTest.php
@@ -45,7 +45,7 @@ protected function setUp() {
*/
protected function assertEntity($id) {
$display = EntityViewDisplay::load($id);
- $this->assertTrue($display instanceof EntityViewDisplayInterface);
+ $this->assertInstanceOf(EntityViewDisplayInterface::class, $display);
}
/**
@@ -64,7 +64,7 @@ protected function assertEntity($id) {
*/
protected function assertComponent($display_id, $component_id, $type, $label, $weight) {
$component = EntityViewDisplay::load($display_id)->getComponent($component_id);
- $this->assertTrue(is_array($component));
+ $this->assertIsArray($component);
$this->assertIdentical($type, $component['type']);
$this->assertIdentical($label, $component['label']);
$this->assertIdentical($weight, $component['weight']);
@@ -80,7 +80,7 @@ protected function assertComponent($display_id, $component_id, $type, $label, $w
*/
protected function assertComponentNotExists($display_id, $component_id) {
$component = EntityViewDisplay::load($display_id)->getComponent($component_id);
- $this->assertTrue(is_null($component));
+ $this->assertNull($component);
}
/**
diff --git a/web/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateFieldInstanceLabelDescriptionTest.php b/web/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateFieldInstanceLabelDescriptionTest.php
index 17ffd2f82e..89bb556a17 100644
--- a/web/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateFieldInstanceLabelDescriptionTest.php
+++ b/web/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateFieldInstanceLabelDescriptionTest.php
@@ -29,8 +29,6 @@ class MigrateFieldInstanceLabelDescriptionTest extends MigrateDrupal7TestBase im
'link',
'locale',
'menu_ui',
- // Required for translation migrations.
- 'migrate_drupal_multilingual',
'node',
'system',
'taxonomy',
diff --git a/web/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateFieldInstanceWidgetSettingsTest.php b/web/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateFieldInstanceWidgetSettingsTest.php
index aa3a903b59..ecc2904e24 100644
--- a/web/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateFieldInstanceWidgetSettingsTest.php
+++ b/web/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateFieldInstanceWidgetSettingsTest.php
@@ -52,7 +52,7 @@ protected function setUp() {
protected function assertEntity($id, $expected_entity_type, $expected_bundle) {
/** @var \Drupal\Core\Entity\Display\EntityFormDisplayInterface $entity */
$entity = EntityFormDisplay::load($id);
- $this->assertTrue($entity instanceof EntityFormDisplayInterface);
+ $this->assertInstanceOf(EntityFormDisplayInterface::class, $entity);
$this->assertIdentical($expected_entity_type, $entity->getTargetEntityTypeId());
$this->assertIdentical($expected_bundle, $entity->getTargetBundle());
}
@@ -71,7 +71,7 @@ protected function assertEntity($id, $expected_entity_type, $expected_bundle) {
*/
protected function assertComponent($display_id, $component_id, $widget_type, $weight) {
$component = EntityFormDisplay::load($display_id)->getComponent($component_id);
- $this->assertTrue(is_array($component));
+ $this->assertIsArray($component);
$this->assertIdentical($widget_type, $component['type']);
$this->assertIdentical($weight, $component['weight']);
}
diff --git a/web/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateViewModesTest.php b/web/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateViewModesTest.php
index 518720ceb7..2f37c7d4f2 100644
--- a/web/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateViewModesTest.php
+++ b/web/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateViewModesTest.php
@@ -38,7 +38,7 @@ protected function setUp() {
protected function assertEntity($id, $label, $entity_type) {
/** @var \Drupal\Core\Entity\EntityViewModeInterface $view_mode */
$view_mode = EntityViewMode::load($id);
- $this->assertTrue($view_mode instanceof EntityViewModeInterface);
+ $this->assertInstanceOf(EntityViewModeInterface::class, $view_mode);
$this->assertIdentical($label, $view_mode->label());
$this->assertIdentical($entity_type, $view_mode->getTargetType());
}
diff --git a/web/core/modules/field/tests/src/Kernel/Number/NumberItemTest.php b/web/core/modules/field/tests/src/Kernel/Number/NumberItemTest.php
index 3864d5503b..3f31d297ed 100644
--- a/web/core/modules/field/tests/src/Kernel/Number/NumberItemTest.php
+++ b/web/core/modules/field/tests/src/Kernel/Number/NumberItemTest.php
@@ -53,7 +53,7 @@ public function testNumberItem() {
$entity->field_float = $float;
$entity->field_decimal = '20-40';
$violations = $entity->validate();
- $this->assertIdentical(1, count($violations), 'Wrong decimal value causes validation error');
+ $this->assertCount(1, $violations, 'Wrong decimal value causes validation error');
$decimal = '31.3';
$entity->field_decimal = $decimal;
$entity->name->value = $this->randomMachineName();
@@ -62,16 +62,16 @@ public function testNumberItem() {
// Verify entity has been created properly.
$id = $entity->id();
$entity = EntityTest::load($id);
- $this->assertTrue($entity->field_integer instanceof FieldItemListInterface, 'Field implements interface.');
- $this->assertTrue($entity->field_integer[0] instanceof FieldItemInterface, 'Field item implements interface.');
+ $this->assertInstanceOf(FieldItemListInterface::class, $entity->field_integer);
+ $this->assertInstanceOf(FieldItemInterface::class, $entity->field_integer[0]);
$this->assertEqual($entity->field_integer->value, $integer);
$this->assertEqual($entity->field_integer[0]->value, $integer);
- $this->assertTrue($entity->field_float instanceof FieldItemListInterface, 'Field implements interface.');
- $this->assertTrue($entity->field_float[0] instanceof FieldItemInterface, 'Field item implements interface.');
+ $this->assertInstanceOf(FieldItemListInterface::class, $entity->field_float);
+ $this->assertInstanceOf(FieldItemInterface::class, $entity->field_float[0]);
$this->assertEqual($entity->field_float->value, $float);
$this->assertEqual($entity->field_float[0]->value, $float);
- $this->assertTrue($entity->field_decimal instanceof FieldItemListInterface, 'Field implements interface.');
- $this->assertTrue($entity->field_decimal[0] instanceof FieldItemInterface, 'Field item implements interface.');
+ $this->assertInstanceOf(FieldItemListInterface::class, $entity->field_decimal);
+ $this->assertInstanceOf(FieldItemInterface::class, $entity->field_decimal[0]);
$this->assertEqual($entity->field_decimal->value, (float) $decimal);
$this->assertEqual($entity->field_decimal[0]->value, (float) $decimal);
diff --git a/web/core/modules/field/tests/src/Kernel/ShapeItemTest.php b/web/core/modules/field/tests/src/Kernel/ShapeItemTest.php
index 80ab04f3a9..9b0721f4dc 100644
--- a/web/core/modules/field/tests/src/Kernel/ShapeItemTest.php
+++ b/web/core/modules/field/tests/src/Kernel/ShapeItemTest.php
@@ -61,8 +61,8 @@ public function testShapeItem() {
// Verify entity has been created properly.
$id = $entity->id();
$entity = EntityTest::load($id);
- $this->assertTrue($entity->{$this->fieldName} instanceof FieldItemListInterface, 'Field implements interface.');
- $this->assertTrue($entity->{$this->fieldName}[0] instanceof FieldItemInterface, 'Field item implements interface.');
+ $this->assertInstanceOf(FieldItemListInterface::class, $entity->{$this->fieldName});
+ $this->assertInstanceOf(FieldItemInterface::class, $entity->{$this->fieldName}[0]);
$this->assertEqual($entity->{$this->fieldName}->shape, $shape);
$this->assertEqual($entity->{$this->fieldName}->color, $color);
$this->assertEqual($entity->{$this->fieldName}[0]->shape, $shape);
diff --git a/web/core/modules/field/tests/src/Kernel/String/RawStringFormatterTest.php b/web/core/modules/field/tests/src/Kernel/String/RawStringFormatterTest.php
index d6730f9c2f..a07084912f 100644
--- a/web/core/modules/field/tests/src/Kernel/String/RawStringFormatterTest.php
+++ b/web/core/modules/field/tests/src/Kernel/String/RawStringFormatterTest.php
@@ -22,7 +22,13 @@ class RawStringFormatterTest extends KernelTestBase {
*
* @var array
*/
- public static $modules = ['field', 'text', 'entity_test', 'system', 'filter', 'user'];
+ public static $modules = [
+ 'field', 'text',
+ 'entity_test',
+ 'system',
+ 'filter',
+ 'user',
+ ];
/**
* @var string
diff --git a/web/core/modules/field/tests/src/Kernel/String/StringFormatterTest.php b/web/core/modules/field/tests/src/Kernel/String/StringFormatterTest.php
index faa8218905..c29b565d1a 100644
--- a/web/core/modules/field/tests/src/Kernel/String/StringFormatterTest.php
+++ b/web/core/modules/field/tests/src/Kernel/String/StringFormatterTest.php
@@ -22,7 +22,14 @@ class StringFormatterTest extends KernelTestBase {
*
* @var array
*/
- public static $modules = ['field', 'text', 'entity_test', 'system', 'filter', 'user'];
+ public static $modules = [
+ 'field',
+ 'text',
+ 'entity_test',
+ 'system',
+ 'filter',
+ 'user',
+ ];
/**
* The entity type manager.
diff --git a/web/core/modules/field/tests/src/Kernel/String/UuidFormatterTest.php b/web/core/modules/field/tests/src/Kernel/String/UuidFormatterTest.php
index 0bcf2469fe..91f43c6928 100644
--- a/web/core/modules/field/tests/src/Kernel/String/UuidFormatterTest.php
+++ b/web/core/modules/field/tests/src/Kernel/String/UuidFormatterTest.php
@@ -43,7 +43,7 @@ public function testUuidStringFormatter() {
// Verify default render.
$render_array = $uuid_field->view([]);
$this->assertIdentical($render_array[0]['#context']['value'], $entity->uuid(), 'The rendered UUID matches the entity UUID.');
- $this->assertContains($entity->uuid(), $this->render($render_array), 'The rendered UUID found.');
+ $this->assertStringContainsString($entity->uuid(), $this->render($render_array), 'The rendered UUID found.');
// Verify customized render.
$render_array = $uuid_field->view(['settings' => ['link_to_entity' => TRUE]]);
@@ -51,8 +51,8 @@ public function testUuidStringFormatter() {
$this->assertIdentical($render_array[0]['#title']['#context']['value'], $entity->uuid());
$this->assertIdentical($render_array[0]['#url']->toString(), $entity->toUrl()->toString());
$rendered = $this->render($render_array);
- $this->assertContains($entity->uuid(), $rendered, 'The rendered UUID found.');
- $this->assertContains($entity->toUrl()->toString(), $rendered, 'The rendered entity URL found.');
+ $this->assertStringContainsString($entity->uuid(), $rendered, 'The rendered UUID found.');
+ $this->assertStringContainsString($entity->toUrl()->toString(), $rendered, 'The rendered entity URL found.');
}
}
diff --git a/web/core/modules/field/tests/src/Kernel/TestItemTest.php b/web/core/modules/field/tests/src/Kernel/TestItemTest.php
index 73a99486b6..8a73452510 100644
--- a/web/core/modules/field/tests/src/Kernel/TestItemTest.php
+++ b/web/core/modules/field/tests/src/Kernel/TestItemTest.php
@@ -60,8 +60,8 @@ public function testTestItem() {
// Verify entity has been created properly.
$id = $entity->id();
$entity = EntityTest::load($id);
- $this->assertTrue($entity->{$this->fieldName} instanceof FieldItemListInterface, 'Field implements interface.');
- $this->assertTrue($entity->{$this->fieldName}[0] instanceof FieldItemInterface, 'Field item implements interface.');
+ $this->assertInstanceOf(FieldItemListInterface::class, $entity->{$this->fieldName});
+ $this->assertInstanceOf(FieldItemInterface::class, $entity->{$this->fieldName}[0]);
$this->assertEqual($entity->{$this->fieldName}->value, $value);
$this->assertEqual($entity->{$this->fieldName}[0]->value, $value);
diff --git a/web/core/modules/field/tests/src/Kernel/TestObjectItemTest.php b/web/core/modules/field/tests/src/Kernel/TestObjectItemTest.php
index 1ac87fc3b7..5d5fa0d3a7 100644
--- a/web/core/modules/field/tests/src/Kernel/TestObjectItemTest.php
+++ b/web/core/modules/field/tests/src/Kernel/TestObjectItemTest.php
@@ -52,7 +52,7 @@ public function testTestObjectItem() {
// Verify that the entity has been created properly.
$id = $entity->id();
$entity = EntityTest::load($id);
- $this->assertTrue($entity->field_test->value instanceof \stdClass);
+ $this->assertInstanceOf(\stdClass::class, $entity->field_test->value);
$this->assertEquals($object, $entity->field_test->value);
}
diff --git a/web/core/modules/field/tests/src/Kernel/Timestamp/TimestampItemTest.php b/web/core/modules/field/tests/src/Kernel/Timestamp/TimestampItemTest.php
index 0aaa8d3414..ea2493cce3 100644
--- a/web/core/modules/field/tests/src/Kernel/Timestamp/TimestampItemTest.php
+++ b/web/core/modules/field/tests/src/Kernel/Timestamp/TimestampItemTest.php
@@ -64,8 +64,8 @@ public function testDateTime() {
// Verify entity has been created properly.
$id = $entity->id();
$entity = EntityTest::load($id);
- $this->assertTrue($entity->field_timestamp instanceof FieldItemListInterface, 'Field implements interface.');
- $this->assertTrue($entity->field_timestamp[0] instanceof FieldItemInterface, 'Field item implements interface.');
+ $this->assertInstanceOf(FieldItemListInterface::class, $entity->field_timestamp);
+ $this->assertInstanceOf(FieldItemInterface::class, $entity->field_timestamp[0]);
$this->assertEquals($entity->field_timestamp->value, $value);
$this->assertEquals($entity->field_timestamp[0]->value, $value);
diff --git a/web/core/modules/field/tests/src/Kernel/WidgetPluginManagerTest.php b/web/core/modules/field/tests/src/Kernel/WidgetPluginManagerTest.php
index 4c92452054..61e48dc944 100644
--- a/web/core/modules/field/tests/src/Kernel/WidgetPluginManagerTest.php
+++ b/web/core/modules/field/tests/src/Kernel/WidgetPluginManagerTest.php
@@ -18,7 +18,7 @@ public function testWidgetDefinitionAlter() {
$widget_definition = \Drupal::service('plugin.manager.field.widget')->getDefinition('test_field_widget_multiple');
// Test if hook_field_widget_info_alter is being called.
- $this->assertTrue(in_array('test_field', $widget_definition['field_types']), "The 'test_field_widget_multiple' widget is enabled for the 'test_field' field type in field_test_field_widget_info_alter().");
+ $this->assertContains('test_field', $widget_definition['field_types'], "The 'test_field_widget_multiple' widget is enabled for the 'test_field' field type in field_test_field_widget_info_alter().");
}
/**
diff --git a/web/core/modules/field/tests/src/Unit/Plugin/migrate/process/d7/FieldInstanceSettingsTest.php b/web/core/modules/field/tests/src/Unit/Plugin/migrate/process/d7/FieldInstanceSettingsTest.php
index 4199f93341..bda611c6a2 100644
--- a/web/core/modules/field/tests/src/Unit/Plugin/migrate/process/d7/FieldInstanceSettingsTest.php
+++ b/web/core/modules/field/tests/src/Unit/Plugin/migrate/process/d7/FieldInstanceSettingsTest.php
@@ -29,7 +29,7 @@ public function testTransformImageSettings() {
->getMock();
$value = $plugin->transform([[], ['type' => 'image_image'], ['data' => '']], $executable, $row, 'foo');
- $this->assertInternalType('array', $value['default_image']);
+ $this->assertIsArray($value['default_image']);
$this->assertSame('', $value['default_image']['alt']);
$this->assertSame('', $value['default_image']['title']);
$this->assertNull($value['default_image']['width']);
diff --git a/web/core/modules/field/tests/src/Unit/Plugin/migrate/process/d7/FieldSettingsTest.php b/web/core/modules/field/tests/src/Unit/Plugin/migrate/process/d7/FieldSettingsTest.php
index ceaefec366..cb12d960d0 100644
--- a/web/core/modules/field/tests/src/Unit/Plugin/migrate/process/d7/FieldSettingsTest.php
+++ b/web/core/modules/field/tests/src/Unit/Plugin/migrate/process/d7/FieldSettingsTest.php
@@ -36,7 +36,7 @@ public function testTransformImageSettings() {
]);
$value = $plugin->transform([], $executable, $row, 'foo');
- $this->assertInternalType('array', $value);
+ $this->assertIsArray($value);
$this->assertSame('', $value['default_image']['uuid']);
}
diff --git a/web/core/modules/field_layout/tests/src/Functional/FieldLayoutTest.php b/web/core/modules/field_layout/tests/src/Functional/FieldLayoutTest.php
index 47458e4583..4b8a200754 100644
--- a/web/core/modules/field_layout/tests/src/Functional/FieldLayoutTest.php
+++ b/web/core/modules/field_layout/tests/src/Functional/FieldLayoutTest.php
@@ -14,7 +14,12 @@ class FieldLayoutTest extends BrowserTestBase {
/**
* {@inheritdoc}
*/
- public static $modules = ['field_layout', 'field_ui', 'node', 'field_layout_test'];
+ public static $modules = [
+ 'field_layout',
+ 'field_ui',
+ 'node',
+ 'field_layout_test',
+ ];
/**
* {@inheritdoc}
diff --git a/web/core/modules/field_layout/tests/src/FunctionalJavascript/FieldLayoutTest.php b/web/core/modules/field_layout/tests/src/FunctionalJavascript/FieldLayoutTest.php
index 9114b93787..c232661451 100644
--- a/web/core/modules/field_layout/tests/src/FunctionalJavascript/FieldLayoutTest.php
+++ b/web/core/modules/field_layout/tests/src/FunctionalJavascript/FieldLayoutTest.php
@@ -15,7 +15,12 @@ class FieldLayoutTest extends WebDriverTestBase {
/**
* {@inheritdoc}
*/
- public static $modules = ['field_layout', 'field_ui', 'field_layout_test', 'layout_test'];
+ public static $modules = [
+ 'field_layout',
+ 'field_ui',
+ 'field_layout_test',
+ 'layout_test',
+ ];
/**
* {@inheritdoc}
diff --git a/web/core/modules/field_layout/tests/src/Kernel/FieldLayoutEntityDisplayTest.php b/web/core/modules/field_layout/tests/src/Kernel/FieldLayoutEntityDisplayTest.php
index 230493db80..1f94b9da38 100644
--- a/web/core/modules/field_layout/tests/src/Kernel/FieldLayoutEntityDisplayTest.php
+++ b/web/core/modules/field_layout/tests/src/Kernel/FieldLayoutEntityDisplayTest.php
@@ -14,7 +14,13 @@ class FieldLayoutEntityDisplayTest extends KernelTestBase {
/**
* {@inheritdoc}
*/
- protected static $modules = ['layout_discovery', 'field_layout', 'entity_test', 'field_layout_test', 'system'];
+ protected static $modules = [
+ 'layout_discovery',
+ 'field_layout',
+ 'entity_test',
+ 'field_layout_test',
+ 'system',
+ ];
/**
* @covers ::preSave
diff --git a/web/core/modules/field_ui/field_ui.info.yml b/web/core/modules/field_ui/field_ui.info.yml
index 3d8126b4e4..c89356e694 100644
--- a/web/core/modules/field_ui/field_ui.info.yml
+++ b/web/core/modules/field_ui/field_ui.info.yml
@@ -1,6 +1,6 @@
name: 'Field UI'
type: module
-description: 'User interface for the Field API.'
+description: 'Provides a user interface for the Field module.'
package: Core
version: VERSION
core: 8.x
diff --git a/web/core/modules/field_ui/src/Plugin/Derivative/FieldUiLocalTask.php b/web/core/modules/field_ui/src/Plugin/Derivative/FieldUiLocalTask.php
index 515682b786..5f6de7caa4 100644
--- a/web/core/modules/field_ui/src/Plugin/Derivative/FieldUiLocalTask.php
+++ b/web/core/modules/field_ui/src/Plugin/Derivative/FieldUiLocalTask.php
@@ -129,7 +129,7 @@ public function getDerivativeDefinitions($base_plugin_definition) {
// The same base $path for the menu item (with a placeholder) can be
// used for all bundles of a given entity type; but depending on
// administrator settings, each bundle has a different set of view
- // modes available for customisation. So we define menu items for all
+ // modes available for customization. So we define menu items for all
// view modes, and use a route requirement to determine which ones are
// actually visible for a given bundle.
$this->derivatives['field_form_display_default_' . $entity_type_id] = [
diff --git a/web/core/modules/field_ui/tests/src/Functional/EntityDisplayModeTest.php b/web/core/modules/field_ui/tests/src/Functional/EntityDisplayModeTest.php
index 2a04bf258f..72751d3bbc 100644
--- a/web/core/modules/field_ui/tests/src/Functional/EntityDisplayModeTest.php
+++ b/web/core/modules/field_ui/tests/src/Functional/EntityDisplayModeTest.php
@@ -48,16 +48,16 @@ protected function setUp() {
public function testEntityViewModeUI() {
// Test the listing page.
$this->drupalGet('admin/structure/display-modes/view');
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
$this->drupalLogin($this->drupalCreateUser(['administer display modes']));
$this->drupalGet('admin/structure/display-modes/view');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertText(t('Add view mode'));
$this->assertLinkByHref('admin/structure/display-modes/view/add');
$this->assertLinkByHref('admin/structure/display-modes/view/add/entity_test');
$this->drupalGet('admin/structure/display-modes/view/add/entity_test_mulrev');
- $this->assertResponse(404);
+ $this->assertSession()->statusCodeEquals(404);
$this->drupalGet('admin/structure/display-modes/view/add');
$this->assertNoLink(t('Test entity - revisions and data table'), 'An entity type with no view builder cannot have view modes.');
@@ -103,15 +103,15 @@ public function testEntityViewModeUI() {
public function testEntityFormModeUI() {
// Test the listing page.
$this->drupalGet('admin/structure/display-modes/form');
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
$this->drupalLogin($this->drupalCreateUser(['administer display modes']));
$this->drupalGet('admin/structure/display-modes/form');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertText(t('Add form mode'));
$this->assertLinkByHref('admin/structure/display-modes/form/add');
$this->drupalGet('admin/structure/display-modes/form/add/entity_test_no_label');
- $this->assertResponse(404);
+ $this->assertSession()->statusCodeEquals(404);
$this->drupalGet('admin/structure/display-modes/form/add');
$this->assertNoLink(t('Entity Test without label'), 'An entity type with no form cannot have form modes.');
diff --git a/web/core/modules/field_ui/tests/src/Functional/FieldUIDeleteTest.php b/web/core/modules/field_ui/tests/src/Functional/FieldUIDeleteTest.php
index ef047f6d47..742b2796b4 100644
--- a/web/core/modules/field_ui/tests/src/Functional/FieldUIDeleteTest.php
+++ b/web/core/modules/field_ui/tests/src/Functional/FieldUIDeleteTest.php
@@ -23,7 +23,13 @@ class FieldUIDeleteTest extends BrowserTestBase {
*
* @var array
*/
- public static $modules = ['node', 'field_ui', 'field_test', 'block', 'field_test_views'];
+ public static $modules = [
+ 'node',
+ 'field_ui',
+ 'field_test',
+ 'block',
+ 'field_test_views',
+ ];
/**
* {@inheritdoc}
@@ -86,7 +92,7 @@ public function testDeleteField() {
$this->assertTrue($view->status());
// Test that the View depends on the field.
$dependencies = $view->getDependencies() + ['config' => []];
- $this->assertTrue(in_array("field.storage.node.$field_name", $dependencies['config']));
+ $this->assertContains("field.storage.node.$field_name", $dependencies['config']);
// Check the config dependencies of the first field, the field storage must
// not be shown as being deleted yet.
@@ -127,7 +133,7 @@ public function testDeleteField() {
$this->assertFalse($view->status());
// Test that the View no longer depends on the deleted field.
$dependencies = $view->getDependencies() + ['config' => []];
- $this->assertFalse(in_array("field.storage.node.$field_name", $dependencies['config']));
+ $this->assertNotContains("field.storage.node.$field_name", $dependencies['config']);
}
}
diff --git a/web/core/modules/field_ui/tests/src/Functional/FieldUIRouteTest.php b/web/core/modules/field_ui/tests/src/Functional/FieldUIRouteTest.php
index 7bbc546206..ab5a0ba312 100644
--- a/web/core/modules/field_ui/tests/src/Functional/FieldUIRouteTest.php
+++ b/web/core/modules/field_ui/tests/src/Functional/FieldUIRouteTest.php
@@ -48,7 +48,7 @@ public function testFieldUIRoutes() {
// Test manage display tabs and titles.
$this->drupalGet('admin/config/people/accounts/display/compact');
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
$this->drupalGet('admin/config/people/accounts/display');
$this->assertTitle('Manage display | Drupal');
@@ -62,7 +62,7 @@ public function testFieldUIRoutes() {
// Test manage form display tabs and titles.
$this->drupalGet('admin/config/people/accounts/form-display/register');
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
$this->drupalGet('admin/config/people/accounts/form-display');
$this->assertTitle('Manage form display | Drupal');
@@ -70,11 +70,11 @@ public function testFieldUIRoutes() {
$edit = ['display_modes_custom[register]' => TRUE];
$this->drupalPostForm(NULL, $edit, t('Save'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->drupalGet('admin/config/people/accounts/form-display/register');
$this->assertTitle('Manage form display | Drupal');
$this->assertLocalTasks();
- $this->assert(count($this->xpath('//ul/li[1]/a[contains(text(), :text)]', [':text' => 'Default'])) == 1, 'Default secondary tab is in first position.');
+ $this->assertCount(1, $this->xpath('//ul/li[1]/a[contains(text(), :text)]', [':text' => 'Default']), 'Default secondary tab is in first position.');
// Create new view mode and verify it's available on the Manage Display
// screen after enabling it.
diff --git a/web/core/modules/field_ui/tests/src/Functional/ManageDisplayTest.php b/web/core/modules/field_ui/tests/src/Functional/ManageDisplayTest.php
index 60ab7c03fd..d1db9a2f4f 100644
--- a/web/core/modules/field_ui/tests/src/Functional/ManageDisplayTest.php
+++ b/web/core/modules/field_ui/tests/src/Functional/ManageDisplayTest.php
@@ -25,7 +25,15 @@ class ManageDisplayTest extends BrowserTestBase {
*
* @var array
*/
- public static $modules = ['node', 'field_ui', 'taxonomy', 'search', 'field_test', 'field_third_party_test', 'block'];
+ public static $modules = [
+ 'node',
+ 'field_ui',
+ 'taxonomy',
+ 'search',
+ 'field_test',
+ 'field_third_party_test',
+ 'block',
+ ];
/**
* {@inheritdoc}
@@ -254,9 +262,12 @@ public function assertNodeViewTextHelper(EntityInterface $node, $view_mode, $tex
$output = (string) \Drupal::service('renderer')->renderRoot($element);
$this->verbose(t('Rendered node - view mode: @view_mode', ['@view_mode' => $view_mode]) . '<hr />' . $output);
- $method = $not_exists ? 'assertNotContains' : 'assertContains';
-
- $this->{$method}((string) $text, $output, $message);
+ if ($not_exists) {
+ $this->assertStringNotContainsString((string) $text, $output, $message);
+ }
+ else {
+ $this->assertStringContainsString((string) $text, $output, $message);
+ }
}
/**
diff --git a/web/core/modules/field_ui/tests/src/Functional/ManageFieldsFunctionalTest.php b/web/core/modules/field_ui/tests/src/Functional/ManageFieldsFunctionalTest.php
index c9dcd3490c..db6634dd71 100644
--- a/web/core/modules/field_ui/tests/src/Functional/ManageFieldsFunctionalTest.php
+++ b/web/core/modules/field_ui/tests/src/Functional/ManageFieldsFunctionalTest.php
@@ -27,7 +27,14 @@ class ManageFieldsFunctionalTest extends BrowserTestBase {
*
* @var array
*/
- public static $modules = ['node', 'field_ui', 'field_test', 'taxonomy', 'image', 'block'];
+ public static $modules = [
+ 'node',
+ 'field_ui',
+ 'field_test',
+ 'taxonomy',
+ 'image',
+ 'block',
+ ];
/**
* {@inheritdoc}
@@ -165,10 +172,12 @@ public function manageFieldsPage($type = '') {
$this->assertIdentical($url, $link->getAttribute('href'));
$number_of_links_found++;
break;
+
case 'Edit storage settings.':
$this->assertIdentical("$url/storage", $link->getAttribute('href'));
$number_of_links_found++;
break;
+
case 'Delete field.':
$this->assertIdentical("$url/delete", $link->getAttribute('href'));
$number_of_links_found++;
@@ -332,7 +341,7 @@ protected function deleteField() {
$field_id = 'node.' . $this->contentType . '.' . $this->fieldName;
$this->drupalGet('admin/structure/types/manage/' . $this->contentType . '/fields/' . $field_id);
$this->clickLink(t('Delete'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
}
/**
@@ -578,7 +587,7 @@ public function testLockedField() {
$locked = $this->xpath('//tr[@id=:field_name]/td[4]', [':field_name' => $field_name]);
$this->assertSame('Locked', $locked[0]->getHtml(), 'Field is marked as Locked in the UI');
$this->drupalGet('admin/structure/types/manage/' . $this->contentType . '/fields/node.' . $this->contentType . '.' . $field_name . '/delete');
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
}
/**
@@ -608,7 +617,7 @@ public function testHiddenFields() {
->getFormDisplay('node', $this->contentType)
->setComponent($field_name)
->save();
- $this->assertInstanceOf(FieldConfig::class, FieldConfig::load('node.' . $this->contentType . '.' . $field_name), new FormattableMarkup('A field of the field storage %field was created programmatically.', ['%field' => $field_name]));
+ $this->assertInstanceOf(FieldConfig::class, FieldConfig::load('node.' . $this->contentType . '.' . $field_name));
// Check that the newly added field appears on the 'Manage Fields'
// screen.
@@ -661,7 +670,7 @@ public function testExternalDestinations() {
$this->drupalPostForm('admin/structure/types/manage/article/fields/node.article.body/storage', [], 'Save field settings', $options);
// The external redirect should not fire.
$this->assertUrl('admin/structure/types/manage/article/fields/node.article.body/storage', $options);
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertRaw('Attempt to update field <em class="placeholder">Body</em> failed: <em class="placeholder">The internal path component 'http://example.com' is external. You are not allowed to specify an external URL together with internal:/.</em>.');
}
@@ -775,10 +784,10 @@ public function testNonExistentFieldUrls() {
$field_id = 'node.foo.bar';
$this->drupalGet('admin/structure/types/manage/' . $this->contentType . '/fields/' . $field_id);
- $this->assertResponse(404);
+ $this->assertSession()->statusCodeEquals(404);
$this->drupalGet('admin/structure/types/manage/' . $this->contentType . '/fields/' . $field_id . '/storage');
- $this->assertResponse(404);
+ $this->assertSession()->statusCodeEquals(404);
}
}
diff --git a/web/core/modules/field_ui/tests/src/FunctionalJavascript/ManageDisplayTest.php b/web/core/modules/field_ui/tests/src/FunctionalJavascript/ManageDisplayTest.php
index 45fa8e818e..a55d993b6a 100644
--- a/web/core/modules/field_ui/tests/src/FunctionalJavascript/ManageDisplayTest.php
+++ b/web/core/modules/field_ui/tests/src/FunctionalJavascript/ManageDisplayTest.php
@@ -143,7 +143,7 @@ public function testFormatterUI() {
$field_test_format_type->setValue('field_test_multiple');
$assert_session->assertWaitOnAjaxRequest();
$plugin_summary = $page->find('css', '#field-test .field-plugin-summary');
- $this->assertContains("test_formatter_setting_multiple: dummy test string", $plugin_summary->getText(), 'The expected summary is displayed.');
+ $this->assertStringContainsString("test_formatter_setting_multiple: dummy test string", $plugin_summary->getText(), 'The expected summary is displayed.');
// Submit the form and assert that
// hook_field_formatter_settings_summary_alter() is called.
@@ -173,7 +173,7 @@ public function testFormatterUI() {
/** @var \Drupal\Core\Entity\Display\EntityViewDisplayInterface $display */
$display = $display_storage->loadUnchanged($id);
$this->assertEquals($display->getRenderer('field_test')->getThirdPartySetting('field_third_party_test', 'field_test_field_formatter_third_party_settings_form'), 'foo');
- $this->assertTrue(in_array('field_third_party_test', $display->calculateDependencies()->getDependencies()['module']), 'The display has a dependency on field_third_party_test module.');
+ $this->assertContains('field_third_party_test', $display->calculateDependencies()->getDependencies()['module'], 'The display has a dependency on field_third_party_test module.');
// Change the formatter to an empty setting and validate it's initialized
// correctly.
@@ -226,7 +226,7 @@ public function testFormatterUI() {
/** @var \Drupal\Core\Entity\Display\EntityViewDisplayInterface $display */
$display = $display_storage->loadUnchanged($display_id);
$component = $display->getComponent('field_test');
- $this->assertFalse(array_key_exists('field_third_party_test', $component['third_party_settings']));
+ $this->assertArrayNotHasKey('field_third_party_test', $component['third_party_settings']);
}
/**
@@ -320,7 +320,7 @@ public function testWidgetUI() {
/** @var \Drupal\Core\Entity\Display\EntityFormDisplayInterface $display */
$display = $form_storage->loadUnchanged('node.' . $this->type . '.default');
$this->assertEquals($display->getRenderer('field_test')->getThirdPartySetting('field_third_party_test', 'field_test_widget_third_party_settings_form'), 'foo');
- $this->assertTrue(in_array('field_third_party_test', $display->calculateDependencies()->getDependencies()['module']), 'Form display does not have a dependency on field_third_party_test module.');
+ $this->assertContains('field_third_party_test', $display->calculateDependencies()->getDependencies()['module'], 'Form display does not have a dependency on field_third_party_test module.');
// Creates a new field that can not be used with the multiple formatter.
// Reference: Drupal\field_test\Plugin\Field\FieldWidget\TestFieldWidgetMultiple::isApplicable().
diff --git a/web/core/modules/field_ui/tests/src/Kernel/EntityDisplayTest.php b/web/core/modules/field_ui/tests/src/Kernel/EntityDisplayTest.php
index 2e6963e0a5..d53aa992c0 100644
--- a/web/core/modules/field_ui/tests/src/Kernel/EntityDisplayTest.php
+++ b/web/core/modules/field_ui/tests/src/Kernel/EntityDisplayTest.php
@@ -28,7 +28,16 @@ class EntityDisplayTest extends KernelTestBase {
*
* @var string[]
*/
- public static $modules = ['field_ui', 'field', 'entity_test', 'user', 'text', 'field_test', 'node', 'system'];
+ public static $modules = [
+ 'field_ui',
+ 'field',
+ 'entity_test',
+ 'user',
+ 'text',
+ 'field_test',
+ 'node',
+ 'system',
+ ];
protected function setUp() {
parent::setUp();
diff --git a/web/core/modules/field_ui/tests/src/Kernel/EntityFormDisplayTest.php b/web/core/modules/field_ui/tests/src/Kernel/EntityFormDisplayTest.php
index 0d14cac2b4..d0d7e58d23 100644
--- a/web/core/modules/field_ui/tests/src/Kernel/EntityFormDisplayTest.php
+++ b/web/core/modules/field_ui/tests/src/Kernel/EntityFormDisplayTest.php
@@ -20,7 +20,14 @@ class EntityFormDisplayTest extends KernelTestBase {
*
* @var string[]
*/
- public static $modules = ['field_ui', 'field', 'entity_test', 'field_test', 'user', 'text'];
+ public static $modules = [
+ 'field_ui',
+ 'field',
+ 'entity_test',
+ 'field_test',
+ 'user',
+ 'text',
+ ];
protected function setUp() {
parent::setUp();
diff --git a/web/core/modules/file/file.info.yml b/web/core/modules/file/file.info.yml
index f9f78a703d..1ee6d85120 100644
--- a/web/core/modules/file/file.info.yml
+++ b/web/core/modules/file/file.info.yml
@@ -1,6 +1,6 @@
name: File
type: module
-description: 'Defines a file field type.'
+description: 'Defines a field type for files.'
package: Field types
version: VERSION
core: 8.x
diff --git a/web/core/modules/file/src/Plugin/rest/resource/FileUploadResource.php b/web/core/modules/file/src/Plugin/rest/resource/FileUploadResource.php
index 6979d9c7bd..2518a22967 100644
--- a/web/core/modules/file/src/Plugin/rest/resource/FileUploadResource.php
+++ b/web/core/modules/file/src/Plugin/rest/resource/FileUploadResource.php
@@ -511,7 +511,7 @@ protected function getUploadLocation(array $settings) {
* Retrieves the upload validators for a field definition.
*
* This is copied from \Drupal\file\Plugin\Field\FieldType\FileItem as there
- * is no entity instance available here that that a FileItem would exist for.
+ * is no entity instance available here that a FileItem would exist for.
*
* @param \Drupal\Core\Field\FieldDefinitionInterface $field_definition
* The field definition for which to get validators.
diff --git a/web/core/modules/file/tests/src/Functional/DownloadTest.php b/web/core/modules/file/tests/src/Functional/DownloadTest.php
index 5658cc7380..d525c5bcf6 100644
--- a/web/core/modules/file/tests/src/Functional/DownloadTest.php
+++ b/web/core/modules/file/tests/src/Functional/DownloadTest.php
@@ -72,11 +72,14 @@ protected function doPrivateFileTransferTest() {
$url = file_create_url($file->getFileUri());
// Set file_test access header to allow the download.
+ file_test_reset();
file_test_set_return('download', ['x-foo' => 'Bar']);
$this->drupalGet($url);
$this->assertEqual($this->drupalGetHeader('x-foo'), 'Bar', 'Found header set by file_test module on private download.');
$this->assertNull($this->drupalGetHeader('x-drupal-cache'), 'Page cache is disabled on private file download.');
- $this->assertResponse(200, 'Correctly allowed access to a file when file_test provides headers.');
+ $this->assertSession()->statusCodeEquals(200);
+ // Ensure hook_file_download is fired correctly.
+ $this->assertEquals($file->getFileUri(), \Drupal::state()->get('file_test.results')['download'][0][0]);
// Test that the file transferred correctly.
$this->assertSame($contents, $this->getSession()->getPage()->getContent(), 'Contents of the file are correct.');
@@ -88,9 +91,19 @@ protected function doPrivateFileTransferTest() {
$this->assertSame(403, $response->getStatusCode(), 'Correctly denied access to a file when file_test sets the header to -1.');
// Try non-existent file.
+ file_test_reset();
$url = file_create_url('private://' . $this->randomMachineName());
$response = $http_client->head($url, ['http_errors' => FALSE]);
$this->assertSame(404, $response->getStatusCode(), 'Correctly returned 404 response for a non-existent file.');
+ // Assert that hook_file_download is not called.
+ $this->assertEquals([], \Drupal::state()->get('file_test.results')['download']);
+
+ // Try requesting the private file url without a file specified.
+ file_test_reset();
+ $this->drupalGet('/system/files');
+ $this->assertSession()->statusCodeEquals(404);
+ // Assert that hook_file_download is not called.
+ $this->assertEquals([], \Drupal::state()->get('file_test.results')['download']);
}
/**
@@ -161,9 +174,8 @@ private function checkUrl($scheme, $directory, $filename, $expected_url) {
}
$this->drupalGet($url);
- if ($this->assertResponse(200) == 'pass') {
- $this->assertRaw(file_get_contents($file->getFileUri()), 'Contents of the file are correct.');
- }
+ $this->assertSession()->statusCodeEquals(200);
+ $this->assertRaw(file_get_contents($file->getFileUri()));
$file->delete();
}
diff --git a/web/core/modules/file/tests/src/Functional/FileFieldAnonymousSubmissionTest.php b/web/core/modules/file/tests/src/Functional/FileFieldAnonymousSubmissionTest.php
index 5e389e2b97..2e15b74e5b 100644
--- a/web/core/modules/file/tests/src/Functional/FileFieldAnonymousSubmissionTest.php
+++ b/web/core/modules/file/tests/src/Functional/FileFieldAnonymousSubmissionTest.php
@@ -40,7 +40,7 @@ public function testAnonymousNode() {
// Load the node form.
$this->drupalLogout();
$this->drupalGet('node/add/article');
- $this->assertResponse(200, 'Loaded the article node form.');
+ $this->assertSession()->statusCodeEquals(200);
$this->assertText(strip_tags(t('Create @name', ['@name' => $bundle_label])));
$edit = [
@@ -48,7 +48,7 @@ public function testAnonymousNode() {
'body[0][value]' => 'Test article',
];
$this->drupalPostForm(NULL, $edit, 'Save');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$t_args = ['@type' => $bundle_label, '%title' => $node_title];
$this->assertText(strip_tags(t('@type %title has been created.', $t_args)), 'The node was created.');
$matches = [];
@@ -71,7 +71,7 @@ public function testAnonymousNodeWithFile() {
// Load the node form.
$this->drupalLogout();
$this->drupalGet('node/add/article');
- $this->assertResponse(200, 'Loaded the article node form.');
+ $this->assertSession()->statusCodeEquals(200);
$this->assertText(strip_tags(t('Create @name', ['@name' => $bundle_label])));
// Generate an image file.
@@ -84,7 +84,7 @@ public function testAnonymousNodeWithFile() {
'files[field_image_0]' => $this->container->get('file_system')->realpath($image->getFileUri()),
];
$this->drupalPostForm(NULL, $edit, 'Save');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$t_args = ['@type' => $bundle_label, '%title' => $node_title];
$this->assertText(strip_tags(t('@type %title has been created.', $t_args)), 'The node was created.');
$matches = [];
@@ -93,7 +93,7 @@ public function testAnonymousNodeWithFile() {
$this->assertNotEqual($nid, 0, 'The node ID was extracted from the URL.');
$node = Node::load($nid);
$this->assertNotEqual($node, NULL, 'The node was loaded successfully.');
- $this->assertFileExists(File::load($node->field_image->target_id)->getFileUri(), 'The image was uploaded successfully.');
+ $this->assertFileExists(File::load($node->field_image->target_id)->getFileUri());
}
}
@@ -128,7 +128,7 @@ protected function doTestNodeWithFileWithoutTitle() {
// Load the node form.
$this->drupalGet('node/add/article');
- $this->assertResponse(200, 'Loaded the article node form.');
+ $this->assertSession()->statusCodeEquals(200);
$this->assertText(strip_tags(t('Create @name', ['@name' => $bundle_label])));
// Generate an image file.
@@ -146,7 +146,7 @@ protected function doTestNodeWithFileWithoutTitle() {
$label = 'Save';
}
$this->drupalPostForm(NULL, $edit, $label);
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$t_args = ['@type' => $bundle_label, '%title' => $node_title];
$this->assertNoText(strip_tags(t('@type %title has been created.', $t_args)), 'The node was created.');
$this->assertText('Title field is required.');
@@ -167,7 +167,7 @@ protected function doTestNodeWithFileWithoutTitle() {
$this->assertNotEqual($nid, 0, 'The node ID was extracted from the URL.');
$node = Node::load($nid);
$this->assertNotEqual($node, NULL, 'The node was loaded successfully.');
- $this->assertFileExists(File::load($node->field_image->target_id)->getFileUri(), 'The image was uploaded successfully.');
+ $this->assertFileExists(File::load($node->field_image->target_id)->getFileUri());
}
}
diff --git a/web/core/modules/file/tests/src/Functional/FileFieldRevisionTest.php b/web/core/modules/file/tests/src/Functional/FileFieldRevisionTest.php
index 39136b2f55..e812cd8ee4 100644
--- a/web/core/modules/file/tests/src/Functional/FileFieldRevisionTest.php
+++ b/web/core/modules/file/tests/src/Functional/FileFieldRevisionTest.php
@@ -51,7 +51,7 @@ public function testRevisions() {
$node = $node_storage->load($nid);
$node_file_r1 = File::load($node->{$field_name}->target_id);
$node_vid_r1 = $node->getRevisionId();
- $this->assertFileExists($node_file_r1->getFileUri(), 'New file saved to disk on node creation.');
+ $this->assertFileExists($node_file_r1->getFileUri());
$this->assertFileEntryExists($node_file_r1, 'File entry exists in database on node creation.');
$this->assertFileIsPermanent($node_file_r1, 'File is permanent.');
@@ -61,7 +61,7 @@ public function testRevisions() {
$node = $node_storage->load($nid);
$node_file_r2 = File::load($node->{$field_name}->target_id);
$node_vid_r2 = $node->getRevisionId();
- $this->assertFileExists($node_file_r2->getFileUri(), 'Replacement file exists on disk after creating new revision.');
+ $this->assertFileExists($node_file_r2->getFileUri());
$this->assertFileEntryExists($node_file_r2, 'Replacement file entry exists in database after creating new revision.');
$this->assertFileIsPermanent($node_file_r2, 'Replacement file is permanent.');
@@ -69,7 +69,7 @@ public function testRevisions() {
$node = node_revision_load($node_vid_r1);
$current_file = File::load($node->{$field_name}->target_id);
$this->assertEqual($node_file_r1->id(), $current_file->id(), 'Original file still in place after replacing file in new revision.');
- $this->assertFileExists($node_file_r1->getFileUri(), 'Original file still in place after replacing file in new revision.');
+ $this->assertFileExists($node_file_r1->getFileUri());
$this->assertFileEntryExists($node_file_r1, 'Original file entry still in place after replacing file in new revision');
$this->assertFileIsPermanent($node_file_r1, 'Original file is still permanent.');
@@ -94,7 +94,7 @@ public function testRevisions() {
// Delete the second revision and check that the file is kept (since it is
// still being used by the third revision).
$this->drupalPostForm('node/' . $nid . '/revisions/' . $node_vid_r2 . '/delete', [], t('Delete'));
- $this->assertFileExists($node_file_r3->getFileUri(), 'Second file is still available after deleting second revision, since it is being used by the third revision.');
+ $this->assertFileExists($node_file_r3->getFileUri());
$this->assertFileEntryExists($node_file_r3, 'Second file entry is still available after deleting second revision, since it is being used by the third revision.');
$this->assertFileIsPermanent($node_file_r3, 'Second file entry is still permanent after deleting second revision, since it is being used by the third revision.');
@@ -107,7 +107,7 @@ public function testRevisions() {
// Delete the third revision and check that the file is not deleted yet.
$this->drupalPostForm('node/' . $nid . '/revisions/' . $node_vid_r3 . '/delete', [], t('Delete'));
- $this->assertFileExists($node_file_r3->getFileUri(), 'Second file is still available after deleting third revision, since it is being used by the user.');
+ $this->assertFileExists($node_file_r3->getFileUri());
$this->assertFileEntryExists($node_file_r3, 'Second file entry is still available after deleting third revision, since it is being used by the user.');
$this->assertFileIsPermanent($node_file_r3, 'Second file entry is still permanent after deleting third revision, since it is being used by the user.');
@@ -134,7 +134,7 @@ public function testRevisions() {
->execute();
\Drupal::service('cron')->run();
- $this->assertFileNotExists($node_file_r3->getFileUri(), 'Second file is now deleted after deleting third revision, since it is no longer being used by any other nodes.');
+ $this->assertFileNotExists($node_file_r3->getFileUri());
$this->assertFileEntryNotExists($node_file_r3, 'Second file entry is now deleted after deleting third revision, since it is no longer being used by any other nodes.');
// Delete the entire node and check that the original file is deleted.
@@ -150,7 +150,7 @@ public function testRevisions() {
->condition('fid', $node_file_r1->id())
->execute();
\Drupal::service('cron')->run();
- $this->assertFileNotExists($node_file_r1->getFileUri(), 'Original file is deleted after deleting the entire node with two revisions remaining.');
+ $this->assertFileNotExists($node_file_r1->getFileUri());
$this->assertFileEntryNotExists($node_file_r1, 'Original file entry is deleted after deleting the entire node with two revisions remaining.');
}
diff --git a/web/core/modules/file/tests/src/Functional/FileFieldValidateTest.php b/web/core/modules/file/tests/src/Functional/FileFieldValidateTest.php
index ac744ea47e..7a1421125c 100644
--- a/web/core/modules/file/tests/src/Functional/FileFieldValidateTest.php
+++ b/web/core/modules/file/tests/src/Functional/FileFieldValidateTest.php
@@ -50,7 +50,7 @@ public function testRequired() {
$node = $node_storage->load($nid);
$node_file = File::load($node->{$field_name}->target_id);
- $this->assertFileExists($node_file->getFileUri(), 'File exists after uploading to the required field.');
+ $this->assertFileExists($node_file->getFileUri());
$this->assertFileEntryExists($node_file, 'File entry exists after uploading to the required field.');
// Try again with a multiple value field.
@@ -68,7 +68,7 @@ public function testRequired() {
$node_storage->resetCache([$nid]);
$node = $node_storage->load($nid);
$node_file = File::load($node->{$field_name}->target_id);
- $this->assertFileExists($node_file->getFileUri(), 'File exists after uploading to the required multiple value field.');
+ $this->assertFileExists($node_file->getFileUri());
$this->assertFileEntryExists($node_file, 'File entry exists after uploading to the required multiple value field.');
}
@@ -102,7 +102,7 @@ public function testFileMaxSize() {
$node_storage->resetCache([$nid]);
$node = $node_storage->load($nid);
$node_file = File::load($node->{$field_name}->target_id);
- $this->assertFileExists($node_file->getFileUri(), new FormattableMarkup('File exists after uploading a file (%filesize) under the max limit (%maxsize).', ['%filesize' => format_size($small_file->getSize()), '%maxsize' => $max_filesize]));
+ $this->assertFileExists($node_file->getFileUri());
$this->assertFileEntryExists($node_file, new FormattableMarkup('File entry exists after uploading a file (%filesize) under the max limit (%maxsize).', ['%filesize' => format_size($small_file->getSize()), '%maxsize' => $max_filesize]));
// Check that uploading the large file fails (1M limit).
@@ -119,7 +119,7 @@ public function testFileMaxSize() {
$node_storage->resetCache([$nid]);
$node = $node_storage->load($nid);
$node_file = File::load($node->{$field_name}->target_id);
- $this->assertFileExists($node_file->getFileUri(), new FormattableMarkup('File exists after uploading a file (%filesize) with no max limit.', ['%filesize' => format_size($large_file->getSize())]));
+ $this->assertFileExists($node_file->getFileUri());
$this->assertFileEntryExists($node_file, new FormattableMarkup('File entry exists after uploading a file (%filesize) with no max limit.', ['%filesize' => format_size($large_file->getSize())]));
}
@@ -143,7 +143,7 @@ public function testFileExtension() {
$node_storage->resetCache([$nid]);
$node = $node_storage->load($nid);
$node_file = File::load($node->{$field_name}->target_id);
- $this->assertFileExists($node_file->getFileUri(), 'File exists after uploading a file with no extension checking.');
+ $this->assertFileExists($node_file->getFileUri());
$this->assertFileEntryExists($node_file, 'File entry exists after uploading a file with no extension checking.');
// Enable extension checking for text files.
@@ -162,7 +162,7 @@ public function testFileExtension() {
$node_storage->resetCache([$nid]);
$node = $node_storage->load($nid);
$node_file = File::load($node->{$field_name}->target_id);
- $this->assertFileExists($node_file->getFileUri(), 'File exists after uploading a file with extension checking.');
+ $this->assertFileExists($node_file->getFileUri());
$this->assertFileEntryExists($node_file, 'File entry exists after uploading a file with extension checking.');
}
@@ -185,7 +185,7 @@ public function testFileRemoval() {
$node_storage->resetCache([$nid]);
$node = $node_storage->load($nid);
$node_file = File::load($node->{$field_name}->target_id);
- $this->assertFileExists($node_file->getFileUri(), 'File exists after uploading a file with no extension checking.');
+ $this->assertFileExists($node_file->getFileUri());
$this->assertFileEntryExists($node_file, 'File entry exists after uploading a file with no extension checking.');
// Enable extension checking for text files.
@@ -230,9 +230,9 @@ public function testAssertFileExistsDeprecation() {
$node_storage->resetCache([$nid]);
$node = $node_storage->load($nid);
$node_file = File::load($node->{$field_name}->target_id);
- $this->assertFileExists($node_file, 'File exists after uploading a file with no extension checking.');
+ $this->assertFileExists($node_file);
unlink($node_file->getFileUri());
- $this->assertFileNotExists($node_file, 'File does not exists after having been deleted.');
+ $this->assertFileNotExists($node_file);
}
}
diff --git a/web/core/modules/file/tests/src/Functional/FileFieldWidgetTest.php b/web/core/modules/file/tests/src/Functional/FileFieldWidgetTest.php
index ff14143a65..622c45af25 100644
--- a/web/core/modules/file/tests/src/Functional/FileFieldWidgetTest.php
+++ b/web/core/modules/file/tests/src/Functional/FileFieldWidgetTest.php
@@ -89,11 +89,11 @@ public function testSingleValuedWidget() {
$nid = $this->uploadNodeFile($test_file, $field_name, $type_name);
$node = $node_storage->loadUnchanged($nid);
$node_file = File::load($node->{$field_name}->target_id);
- $this->assertFileExists($node_file->getFileUri(), 'New file saved to disk on node creation.');
+ $this->assertFileExists($node_file->getFileUri());
// Ensure the file can be downloaded.
$this->drupalGet($node_file->createFileUrl());
- $this->assertResponse(200, 'Confirmed that the generated URL is correct by downloading the shipped file.');
+ $this->assertSession()->statusCodeEquals(200);
// Ensure the edit page has a remove button instead of an upload button.
$this->drupalGet("node/$nid/edit");
@@ -166,7 +166,7 @@ public function testMultiValuedWidget() {
// Ensure we have the expected number of Remove buttons, and that they
// are numbered sequentially.
$buttons = $this->xpath('//input[@type="submit" and @value="Remove"]');
- $this->assertTrue(is_array($buttons) && count($buttons) === $num_expected_remove_buttons, new FormattableMarkup('There are %n "Remove" buttons displayed.', ['%n' => $num_expected_remove_buttons]));
+ $this->assertCount($num_expected_remove_buttons, $buttons, new FormattableMarkup('There are %n "Remove" buttons displayed.', ['%n' => $num_expected_remove_buttons]));
foreach ($buttons as $i => $button) {
$key = $i >= $remaining ? $i - $remaining : $i;
$check_field_name = $field_name2;
@@ -187,12 +187,12 @@ public function testMultiValuedWidget() {
// correct name.
$upload_button_name = $current_field_name . '_' . $remaining . '_upload_button';
$buttons = $this->xpath('//input[@type="submit" and @value="Upload" and @name=:name]', [':name' => $upload_button_name]);
- $this->assertTrue(is_array($buttons) && count($buttons) == 1, 'The upload button is displayed with the correct name.');
+ $this->assertCount(1, $buttons, 'The upload button is displayed with the correct name.');
// Ensure only at most one button per field is displayed.
$buttons = $this->xpath('//input[@type="submit" and @value="Upload"]');
$expected = $current_field_name == $field_name ? 1 : 2;
- $this->assertTrue(is_array($buttons) && count($buttons) == $expected, 'After removing a file, only one "Upload" button for each possible field is displayed.');
+ $this->assertCount($expected, $buttons, 'After removing a file, only one "Upload" button for each possible field is displayed.');
}
}
@@ -263,11 +263,11 @@ public function testPrivateFileSetting() {
$nid = $this->uploadNodeFile($test_file, $field_name, $type_name);
$node = $node_storage->loadUnchanged($nid);
$node_file = File::load($node->{$field_name}->target_id);
- $this->assertFileExists($node_file->getFileUri(), 'New file saved to disk on node creation.');
+ $this->assertFileExists($node_file->getFileUri());
// Ensure the private file is available to the user who uploaded it.
$this->drupalGet($node_file->createFileUrl());
- $this->assertResponse(200, 'Confirmed that the generated URL is correct by downloading the shipped file.');
+ $this->assertSession()->statusCodeEquals(200);
// Ensure we can't change 'uri_scheme' field settings while there are some
// entities with uploaded files.
@@ -330,17 +330,17 @@ public function testPrivateFileComment() {
$comment = Comment::load($cid);
$comment_file = $comment->{'field_' . $name}->entity;
- $this->assertFileExists($comment_file->getFileUri(), 'New file saved to disk on node creation.');
+ $this->assertFileExists($comment_file->getFileUri());
// Test authenticated file download.
$url = $comment_file->createFileUrl();
$this->assertNotEqual($url, NULL, 'Confirmed that the URL is valid');
$this->drupalGet($comment_file->createFileUrl());
- $this->assertResponse(200, 'Confirmed that the generated URL is correct by downloading the shipped file.');
+ $this->assertSession()->statusCodeEquals(200);
- // Test anonymous file download.
+ // Ensure that the anonymous user cannot download the file.
$this->drupalLogout();
$this->drupalGet($comment_file->createFileUrl());
- $this->assertResponse(403, 'Confirmed that access is denied for the file without the needed permission.');
+ $this->assertSession()->statusCodeEquals(403);
// Unpublishes node.
$this->drupalLogin($this->adminUser);
@@ -350,7 +350,7 @@ public function testPrivateFileComment() {
// Ensures normal user can no longer download the file.
$this->drupalLogin($user);
$this->drupalGet($comment_file->createFileUrl());
- $this->assertResponse(403, 'Confirmed that access is denied for the file without the needed permission.');
+ $this->assertSession()->statusCodeEquals(403);
}
/**
@@ -399,7 +399,7 @@ public function testWidgetElement() {
$elements = $this->xpath($xpath);
// If the field has no item, the table should not be visible.
- $this->assertIdentical(count($elements), 0);
+ $this->assertCount(0, $elements);
// Upload a file.
$edit['files[' . $field_name . '_0][]'] = $this->container->get('file_system')->realpath($file->getFileUri());
@@ -408,7 +408,7 @@ public function testWidgetElement() {
$elements = $this->xpath($xpath);
// If the field has at least a item, the table should be visible.
- $this->assertIdentical(count($elements), 1);
+ $this->assertCount(1, $elements);
// Test for AJAX error when using progress bar on file field widget.
$http_client = $this->getHttpClient();
@@ -422,7 +422,7 @@ public function testWidgetElement() {
]);
$this->assertNotEquals(500, $post_request->getStatusCode());
$body = Json::decode($post_request->getBody());
- $this->assertContains('Starting upload...', $body['message']);
+ $this->assertStringContainsString('Starting upload...', $body['message']);
}
/**
@@ -507,12 +507,12 @@ protected function doTestTemporaryFileRemovalExploit(UserInterface $victim_user,
/** @var \Drupal\file\FileInterface $node_file */
$node_file = File::load($node->{$field_name}->target_id);
- $this->assertFileExists($node_file->getFileUri(), 'A file was saved to disk on node creation');
+ $this->assertFileExists($node_file->getFileUri());
$this->assertEqual($attacker_user->id(), $node_file->getOwnerId(), 'New file belongs to the attacker.');
// Ensure the file can be downloaded.
$this->drupalGet($node_file->createFileUrl());
- $this->assertResponse(200, 'Confirmed that the generated URL is correct by downloading the shipped file.');
+ $this->assertSession()->statusCodeEquals(200);
// "Click" the remove button (emulating either a nojs or js submission).
// In this POST request, the attacker "guesses" the fid of the victim's
diff --git a/web/core/modules/file/tests/src/Functional/FileListingTest.php b/web/core/modules/file/tests/src/Functional/FileListingTest.php
index 87be7ef608..95ac9aedac 100644
--- a/web/core/modules/file/tests/src/Functional/FileListingTest.php
+++ b/web/core/modules/file/tests/src/Functional/FileListingTest.php
@@ -74,7 +74,7 @@ public function testFileListingPages() {
// Users without sufficient permissions should not see file listing.
$this->drupalLogin($this->baseUser);
$this->drupalGet('admin/content/files');
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
// Log in with user with right permissions and test listing.
$this->drupalLogin($this->adminUser);
@@ -84,17 +84,17 @@ public function testFileListingPages() {
}
$this->drupalGet('admin/content/files');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertText('No files available.');
$this->drupalGet('admin/content/files');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Create a file with no usage.
$file = $this->createFile();
$this->drupalGet('admin/content/files/usage/' . $file->id());
- $this->assertResponse(200);
- $this->assertTitle(t('File usage information for @file | Drupal', ['@file' => $file->getFilename()]));
+ $this->assertSession()->statusCodeEquals(200);
+ $this->assertTitle('File usage information for ' . $file->getFilename() . ' | Drupal');
foreach ($nodes as &$node) {
$this->drupalGet('node/' . $node->id() . '/edit');
@@ -134,14 +134,14 @@ public function testFileListingPages() {
$this->assertRaw('admin/content/files/usage/' . $file->id() . '">' . $usage);
$result = $this->xpath("//td[contains(@class, 'views-field-status') and contains(text(), :value)]", [':value' => 'Temporary']);
- $this->assertEqual(1, count($result), 'Unused file marked as temporary.');
+ $this->assertCount(1, $result, 'Unused file marked as temporary.');
// Test file usage page.
foreach ($nodes as $node) {
$file = File::load($node->file->target_id);
$usage = $file_usage->listUsage($file);
$this->drupalGet('admin/content/files/usage/' . $file->id());
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertText($node->getTitle(), 'Node title found on usage page.');
$this->assertText('node', 'Registering entity type found on usage page.');
$this->assertText('file', 'Registering module found on usage page.');
@@ -197,7 +197,7 @@ public function testFileListingUsageNoLink() {
// Load the file usage page for the created and attached file.
$this->drupalGet('admin/content/files/usage/' . $file->id());
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Entity name should be displayed, but not linked if Entity::toUrl
// throws an exception
$this->assertText($entity_name, 'Entity name is added to file usage listing.');
diff --git a/web/core/modules/file/tests/src/Functional/FileManagedTestBase.php b/web/core/modules/file/tests/src/Functional/FileManagedTestBase.php
index 61099ea1c3..2a4465d811 100644
--- a/web/core/modules/file/tests/src/Functional/FileManagedTestBase.php
+++ b/web/core/modules/file/tests/src/Functional/FileManagedTestBase.php
@@ -194,7 +194,7 @@ public function createUri($filepath = NULL, $contents = NULL, $scheme = NULL) {
}
file_put_contents($filepath, $contents);
- $this->assertTrue(is_file($filepath), t('The test file exists on the disk.'), 'Create test file');
+ $this->assertFileExists($filepath);
return $filepath;
}
diff --git a/web/core/modules/file/tests/src/Functional/FilePrivateTest.php b/web/core/modules/file/tests/src/Functional/FilePrivateTest.php
index ad282e8a63..d9f30d53fa 100644
--- a/web/core/modules/file/tests/src/Functional/FilePrivateTest.php
+++ b/web/core/modules/file/tests/src/Functional/FilePrivateTest.php
@@ -60,10 +60,11 @@ public function testPrivateFile() {
$this->assertRaw($node_file->getFilename(), 'File reference is displayed after attaching it');
// Ensure the file can be downloaded.
$this->drupalGet(file_create_url($node_file->getFileUri()));
- $this->assertResponse(200, 'Confirmed that the generated URL is correct by downloading the shipped file.');
+ $this->assertSession()->statusCodeEquals(200);
$this->drupalLogOut();
+ // Ensure the file cannot be downloaded after logging out.
$this->drupalGet(file_create_url($node_file->getFileUri()));
- $this->assertResponse(403, 'Confirmed that access is denied for the file without the needed permission.');
+ $this->assertSession()->statusCodeEquals(403);
// Create a field with no view access. See
// field_test_entity_field_access().
@@ -79,7 +80,7 @@ public function testPrivateFile() {
// Ensure the file cannot be downloaded.
$file_url = file_create_url($node_file->getFileUri());
$this->drupalGet($file_url);
- $this->assertResponse(403, 'Confirmed that access is denied for the file without view field access permission.');
+ $this->assertSession()->statusCodeEquals(403);
// Attempt to reuse the file when editing a node.
$edit = [];
@@ -114,20 +115,20 @@ public function testPrivateFile() {
\Drupal::state()->set('file_test.allow_all', TRUE);
// Delete the node.
$node->delete();
- // Ensure the file can still be downloaded by the owner.
+ // Ensure the temporary file can still be downloaded by the owner.
$this->drupalGet($file_url);
- $this->assertResponse(200, 'Confirmed that the owner still has access to the temporary file.');
+ $this->assertSession()->statusCodeEquals(200);
- // Ensure the file cannot be downloaded by an anonymous user.
+ // Ensure the temporary file cannot be downloaded by an anonymous user.
$this->drupalLogout();
$this->drupalGet($file_url);
- $this->assertResponse(403, 'Confirmed that access is denied for an anonymous user to the temporary file.');
+ $this->assertSession()->statusCodeEquals(403);
- // Ensure the file cannot be downloaded by another user.
+ // Ensure the temporary file cannot be downloaded by another user.
$account = $this->drupalCreateUser();
$this->drupalLogin($account);
$this->drupalGet($file_url);
- $this->assertResponse(403, 'Confirmed that access is denied for another user to the temporary file.');
+ $this->assertSession()->statusCodeEquals(403);
// As an anonymous user, create a temporary file with no references and
// confirm that only the session that uploaded it may view it.
@@ -146,18 +147,20 @@ public function testPrivateFile() {
/** @var \Drupal\file\FileStorageInterface $file_storage */
$file_storage = $this->container->get('entity_type.manager')->getStorage('file');
$files = $file_storage->loadByProperties(['uid' => 0]);
- $this->assertEqual(1, count($files), 'Loaded one anonymous file.');
+ $this->assertCount(1, $files, 'Loaded one anonymous file.');
$file = end($files);
$this->assertTrue($file->isTemporary(), 'File is temporary.');
$usage = $this->container->get('file.usage')->listUsage($file);
$this->assertEmpty($usage, 'No file usage found.');
$file_url = file_create_url($file->getFileUri());
+ // Ensure the anonymous uploader has access to the temporary file.
$this->drupalGet($file_url);
- $this->assertResponse(200, 'Confirmed that the anonymous uploader has access to the temporary file.');
+ $this->assertSession()->statusCodeEquals(200);
// Close the prior connection and remove the session cookie.
$this->getSession()->reset();
+ // Ensure that a different anonymous user cannot access the temporary file.
$this->drupalGet($file_url);
- $this->assertResponse(403, 'Confirmed that another anonymous user cannot access the temporary file.');
+ $this->assertSession()->statusCodeEquals(403);
// As an anonymous user, create a permanent file, then remove all
// references to the file (so that it becomes temporary again) and confirm
@@ -180,12 +183,14 @@ public function testPrivateFile() {
$usage = $this->container->get('file.usage')->listUsage($file);
$this->assertEmpty($usage, 'No file usage found.');
$file_url = file_create_url($file->getFileUri());
+ // Ensure the anonymous uploader has access to the temporary file.
$this->drupalGet($file_url);
- $this->assertResponse(200, 'Confirmed that the anonymous uploader has access to the file whose references were removed.');
+ $this->assertSession()->statusCodeEquals(200);
// Close the prior connection and remove the session cookie.
$this->getSession()->reset();
+ // Ensure that a different anonymous user cannot access the temporary file.
$this->drupalGet($file_url);
- $this->assertResponse(403, 'Confirmed that another anonymous user cannot access the file whose references were removed.');
+ $this->assertSession()->statusCodeEquals(403);
// As an anonymous user, create a permanent file that is referenced by a
// published node and confirm that all anonymous users may view it.
@@ -201,12 +206,14 @@ public function testPrivateFile() {
$usage = $this->container->get('file.usage')->listUsage($file);
$this->assertCount(1, $usage, 'File usage found.');
$file_url = file_create_url($file->getFileUri());
+ // Ensure the anonymous uploader has access to the file.
$this->drupalGet($file_url);
- $this->assertResponse(200, 'Confirmed that the anonymous uploader has access to the permanent file that is referenced by a published node.');
+ $this->assertSession()->statusCodeEquals(200);
// Close the prior connection and remove the session cookie.
$this->getSession()->reset();
+ // Ensure that a different anonymous user can access the file.
$this->drupalGet($file_url);
- $this->assertResponse(200, 'Confirmed that another anonymous user also has access to the permanent file that is referenced by a published node.');
+ $this->assertSession()->statusCodeEquals(200);
// As an anonymous user, create a permanent file that is referenced by an
// unpublished node and confirm that no anonymous users may view it (even
@@ -226,12 +233,14 @@ public function testPrivateFile() {
$usage = $this->container->get('file.usage')->listUsage($file);
$this->assertCount(1, $usage, 'File usage found.');
$file_url = file_create_url($file->getFileUri());
+ // Ensure the anonymous uploader cannot access to the file.
$this->drupalGet($file_url);
- $this->assertResponse(403, 'Confirmed that the anonymous uploader cannot access the permanent file when it is referenced by an unpublished node.');
+ $this->assertSession()->statusCodeEquals(403);
// Close the prior connection and remove the session cookie.
$this->getSession()->reset();
+ // Ensure that a different anonymous user cannot access the temporary file.
$this->drupalGet($file_url);
- $this->assertResponse(403, 'Confirmed that another anonymous user cannot access the permanent file when it is referenced by an unpublished node.');
+ $this->assertSession()->statusCodeEquals(403);
}
}
diff --git a/web/core/modules/file/tests/src/Functional/FileTokenReplaceTest.php b/web/core/modules/file/tests/src/Functional/FileTokenReplaceTest.php
index 4b832ac267..5ff9d3d6f9 100644
--- a/web/core/modules/file/tests/src/Functional/FileTokenReplaceTest.php
+++ b/web/core/modules/file/tests/src/Functional/FileTokenReplaceTest.php
@@ -82,7 +82,7 @@ public function testFileTokenReplacement() {
$metadata_tests['[file:owner:uid]'] = $bubbleable_metadata;
// Test to make sure that we generated something for each token.
- $this->assertFalse(in_array(0, array_map('strlen', $tests)), 'No empty tokens generated.');
+ $this->assertNotContains(0, array_map('strlen', $tests), 'No empty tokens generated.');
foreach ($tests as $input => $expected) {
$bubbleable_metadata = new BubbleableMetadata();
diff --git a/web/core/modules/file/tests/src/Functional/MultipleFileUploadTest.php b/web/core/modules/file/tests/src/Functional/MultipleFileUploadTest.php
index 8817a66d9c..3b0bb16b98 100644
--- a/web/core/modules/file/tests/src/Functional/MultipleFileUploadTest.php
+++ b/web/core/modules/file/tests/src/Functional/MultipleFileUploadTest.php
@@ -55,10 +55,10 @@ public function testMultipleFileFieldWithAllFileExtensions() {
$client->request($form->getMethod(), $form->getUri(), $form->getPhpValues(), $edit);
$page = $this->getSession()->getPage();
- $this->assertNotContains('Only files with the following extensions are allowed', $page->getContent());
- $this->assertContains('The configuration options have been saved.', $page->getContent());
- $this->assertContains('file1.wtf', $page->getContent());
- $this->assertContains('file2.wtf', $page->getContent());
+ $this->assertStringNotContainsString('Only files with the following extensions are allowed', $page->getContent());
+ $this->assertStringContainsString('The configuration options have been saved.', $page->getContent());
+ $this->assertStringContainsString('file1.wtf', $page->getContent());
+ $this->assertStringContainsString('file2.wtf', $page->getContent());
}
}
diff --git a/web/core/modules/file/tests/src/Functional/PrivateFileOnTranslatedEntityTest.php b/web/core/modules/file/tests/src/Functional/PrivateFileOnTranslatedEntityTest.php
index a838efef66..0e31e3f96c 100644
--- a/web/core/modules/file/tests/src/Functional/PrivateFileOnTranslatedEntityTest.php
+++ b/web/core/modules/file/tests/src/Functional/PrivateFileOnTranslatedEntityTest.php
@@ -96,7 +96,7 @@ public function testPrivateLanguageFile() {
$node = Node::load($default_language_node->id());
$node_file = File::load($node->{$this->fieldName}->target_id);
$this->drupalGet(file_create_url($node_file->getFileUri()));
- $this->assertResponse(200, 'Confirmed that the file attached to the English node can be downloaded.');
+ $this->assertSession()->statusCodeEquals(200);
// Translate the node into French.
$this->drupalGet('node/' . $default_language_node->id() . '/translations');
@@ -123,7 +123,7 @@ public function testPrivateLanguageFile() {
$french_node = $default_language_node->getTranslation('fr');
$node_file = File::load($french_node->{$this->fieldName}->target_id);
$this->drupalGet(file_create_url($node_file->getFileUri()));
- $this->assertResponse(200, 'Confirmed that the file attached to the French node can be downloaded.');
+ $this->assertSession()->statusCodeEquals(200);
}
}
diff --git a/web/core/modules/file/tests/src/Functional/SaveUploadFormTest.php b/web/core/modules/file/tests/src/Functional/SaveUploadFormTest.php
index 7dccfeb318..407b1a01c1 100644
--- a/web/core/modules/file/tests/src/Functional/SaveUploadFormTest.php
+++ b/web/core/modules/file/tests/src/Functional/SaveUploadFormTest.php
@@ -71,10 +71,10 @@ protected function setUp() {
$this->image = File::create((array) current($image_files));
list(, $this->imageExtension) = explode('.', $this->image->getFilename());
- $this->assertTrue(is_file($this->image->getFileUri()), "The image file we're going to upload exists.");
+ $this->assertFileExists($this->image->getFileUri());
$this->phpfile = current($this->drupalGetTestFiles('php'));
- $this->assertTrue(is_file($this->phpfile->uri), 'The PHP file we are going to upload exists.');
+ $this->assertFileExists($this->phpfile->uri);
$this->maxFidBefore = (int) \Drupal::entityQueryAggregate('file')->aggregate('fid', 'max')->execute()[0]['fid_max'];
@@ -86,7 +86,7 @@ protected function setUp() {
'files[file_test_upload][]' => $file_system->realpath($this->image->getFileUri()),
];
$this->drupalPostForm('file-test/save_upload_from_form_test', $edit, t('Submit'));
- $this->assertResponse(200, 'Received a 200 response for posted test file.');
+ $this->assertSession()->statusCodeEquals(200);
$this->assertRaw(t('You WIN!'), 'Found the success message.');
// Check that the correct hooks were called then clean out the hook
@@ -102,7 +102,7 @@ public function testNormal() {
$max_fid_after = (int) \Drupal::entityQueryAggregate('file')->aggregate('fid', 'max')->execute()[0]['fid_max'];
$this->assertTrue($max_fid_after > $this->maxFidBefore, 'A new file was created.');
$file1 = File::load($max_fid_after);
- $this->assertInstanceOf(File::class, $file1, 'Loaded the file.');
+ $this->assertInstanceOf(File::class, $file1);
// MIME type of the uploaded image may be either image/jpeg or image/png.
$this->assertEqual(substr($file1->getMimeType(), 0, 5), 'image', 'A MIME type was set.');
@@ -115,7 +115,7 @@ public function testNormal() {
$file_system = \Drupal::service('file_system');
$edit = ['files[file_test_upload][]' => $file_system->realpath($image2->uri)];
$this->drupalPostForm('file-test/save_upload_from_form_test', $edit, t('Submit'));
- $this->assertResponse(200, 'Received a 200 response for posted test file.');
+ $this->assertSession()->statusCodeEquals(200);
$this->assertRaw(t('You WIN!'));
$max_fid_after = (int) \Drupal::entityQueryAggregate('file')->aggregate('fid', 'max')->execute()[0]['fid_max'];
@@ -123,7 +123,7 @@ public function testNormal() {
$this->assertFileHooksCalled(['validate', 'insert']);
$file2 = File::load($max_fid_after);
- $this->assertInstanceOf(File::class, $file2, 'Loaded the file');
+ $this->assertInstanceOf(File::class, $file2);
// MIME type of the uploaded image may be either image/jpeg or image/png.
$this->assertEqual(substr($file2->getMimeType(), 0, 5), 'image', 'A MIME type was set.');
@@ -141,9 +141,9 @@ public function testNormal() {
'file_subdir' => $dir,
];
$this->drupalPostForm('file-test/save_upload_from_form_test', $edit, t('Submit'));
- $this->assertResponse(200, 'Received a 200 response for posted test file.');
+ $this->assertSession()->statusCodeEquals(200);
$this->assertRaw(t('You WIN!'));
- $this->assertTrue(is_file('temporary://' . $dir . '/' . trim(\Drupal::service('file_system')->basename($image3_realpath))));
+ $this->assertFileExists('temporary://' . $dir . '/' . trim(\Drupal::service('file_system')->basename($image3_realpath)));
}
/**
@@ -164,7 +164,7 @@ public function testHandleExtension() {
];
$this->drupalPostForm('file-test/save_upload_from_form_test', $edit, t('Submit'));
- $this->assertResponse(200, 'Received a 200 response for posted test file.');
+ $this->assertSession()->statusCodeEquals(200);
$message = t('Only files with the following extensions are allowed:') . ' <em class="placeholder">' . $extensions . '</em>';
$this->assertRaw($message, 'Cannot upload a disallowed extension');
$this->assertRaw(t('Epic upload FAIL!'), 'Found the failure message.');
@@ -184,7 +184,7 @@ public function testHandleExtension() {
];
$this->drupalPostForm('file-test/save_upload_from_form_test', $edit, t('Submit'));
- $this->assertResponse(200, 'Received a 200 response for posted test file.');
+ $this->assertSession()->statusCodeEquals(200);
$this->assertNoRaw(t('Only files with the following extensions are allowed:'), 'Can upload an allowed extension.');
$this->assertRaw(t('You WIN!'), 'Found the success message.');
@@ -201,7 +201,7 @@ public function testHandleExtension() {
'allow_all_extensions' => TRUE,
];
$this->drupalPostForm('file-test/save_upload_from_form_test', $edit, t('Submit'));
- $this->assertResponse(200, 'Received a 200 response for posted test file.');
+ $this->assertSession()->statusCodeEquals(200);
$this->assertNoRaw(t('Only files with the following extensions are allowed:'), 'Can upload any extension.');
$this->assertRaw(t('You WIN!'), 'Found the success message.');
@@ -226,7 +226,7 @@ public function testHandleDangerousFile() {
];
$this->drupalPostForm('file-test/save_upload_from_form_test', $edit, t('Submit'));
- $this->assertResponse(200, 'Received a 200 response for posted test file.');
+ $this->assertSession()->statusCodeEquals(200);
$message = t('For security reasons, your upload has been renamed to') . ' <em class="placeholder">' . $this->phpfile->filename . '.txt' . '</em>';
$this->assertRaw($message, 'Dangerous file was renamed.');
$this->assertRaw(t('File MIME type is text/plain.'), "Dangerous file's MIME type was changed.");
@@ -242,7 +242,7 @@ public function testHandleDangerousFile() {
file_test_reset();
$this->drupalPostForm('file-test/save_upload_from_form_test', $edit, t('Submit'));
- $this->assertResponse(200, 'Received a 200 response for posted test file.');
+ $this->assertSession()->statusCodeEquals(200);
$this->assertNoRaw(t('For security reasons, your upload has been renamed'), 'Found no security message.');
$this->assertRaw(t('File name is @filename', ['@filename' => $this->phpfile->filename]), 'Dangerous file was not renamed when insecure uploads is TRUE.');
$this->assertRaw(t('You WIN!'), 'Found the success message.');
@@ -278,7 +278,7 @@ public function testHandleFileMunge() {
$munged_filename .= '_.' . $this->imageExtension;
$this->drupalPostForm('file-test/save_upload_from_form_test', $edit, t('Submit'));
- $this->assertResponse(200, 'Received a 200 response for posted test file.');
+ $this->assertSession()->statusCodeEquals(200);
$this->assertRaw(t('For security reasons, your upload has been renamed'), 'Found security message.');
$this->assertRaw(t('File name is @filename', ['@filename' => $munged_filename]), 'File was successfully munged.');
$this->assertRaw(t('You WIN!'), 'Found the success message.');
@@ -296,7 +296,7 @@ public function testHandleFileMunge() {
];
$this->drupalPostForm('file-test/save_upload_from_form_test', $edit, t('Submit'));
- $this->assertResponse(200, 'Received a 200 response for posted test file.');
+ $this->assertSession()->statusCodeEquals(200);
$this->assertNoRaw(t('For security reasons, your upload has been renamed'), 'Found no security message.');
$this->assertRaw(t('File name is @filename', ['@filename' => $this->image->getFilename()]), 'File was not munged when allowing any extension.');
$this->assertRaw(t('You WIN!'), 'Found the success message.');
@@ -316,7 +316,7 @@ public function testExistingRename() {
'files[file_test_upload][]' => $file_system->realpath($this->image->getFileUri()),
];
$this->drupalPostForm('file-test/save_upload_from_form_test', $edit, t('Submit'));
- $this->assertResponse(200, 'Received a 200 response for posted test file.');
+ $this->assertSession()->statusCodeEquals(200);
$this->assertRaw(t('You WIN!'), 'Found the success message.');
// Check that the correct hooks were called.
@@ -334,7 +334,7 @@ public function testExistingReplace() {
'files[file_test_upload][]' => $file_system->realpath($this->image->getFileUri()),
];
$this->drupalPostForm('file-test/save_upload_from_form_test', $edit, t('Submit'));
- $this->assertResponse(200, 'Received a 200 response for posted test file.');
+ $this->assertSession()->statusCodeEquals(200);
$this->assertRaw(t('You WIN!'), 'Found the success message.');
// Check that the correct hooks were called.
@@ -352,7 +352,7 @@ public function testExistingError() {
'files[file_test_upload][]' => $file_system->realpath($this->image->getFileUri()),
];
$this->drupalPostForm('file-test/save_upload_from_form_test', $edit, t('Submit'));
- $this->assertResponse(200, 'Received a 200 response for posted test file.');
+ $this->assertSession()->statusCodeEquals(200);
$this->assertRaw(t('Epic upload FAIL!'), 'Found the failure message.');
// Check that the no hooks were called while failing.
@@ -374,7 +374,7 @@ public function testDrupalMovingUploadedFileError() {
// Create a directory and make it not writable.
$test_directory = 'test_drupal_move_uploaded_file_fail';
\Drupal::service('file_system')->mkdir('temporary://' . $test_directory, 0000);
- $this->assertTrue(is_dir('temporary://' . $test_directory));
+ $this->assertDirectoryExists('temporary://' . $test_directory);
/** @var \Drupal\Core\File\FileSystemInterface $file_system */
$file_system = \Drupal::service('file_system');
@@ -385,13 +385,13 @@ public function testDrupalMovingUploadedFileError() {
\Drupal::state()->set('file_test.disable_error_collection', TRUE);
$this->drupalPostForm('file-test/save_upload_from_form_test', $edit, t('Submit'));
- $this->assertResponse(200, 'Received a 200 response for posted test file.');
+ $this->assertSession()->statusCodeEquals(200);
$this->assertRaw(t('File upload error. Could not move uploaded file.'), 'Found the failure message.');
$this->assertRaw(t('Epic upload FAIL!'), 'Found the failure message.');
// Uploading failed. Now check the log.
$this->drupalGet('admin/reports/dblog');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertRaw(t('Upload error. Could not move uploaded file @file to destination @destination.', [
'@file' => $this->image->getFilename(),
'@destination' => 'temporary://' . $test_directory . '/' . $this->image->getFilename(),
@@ -411,7 +411,7 @@ public function testErrorMessagesAreNotChanged() {
'error_message' => $error,
];
$this->drupalPostForm('file-test/save_upload_from_form_test', $edit, t('Submit'));
- $this->assertResponse(200, 'Received a 200 response for posted test file.');
+ $this->assertSession()->statusCodeEquals(200);
$this->assertRaw(t('You WIN!'), 'Found the success message.');
// Ensure the expected error message is present and the counts before and
@@ -427,7 +427,7 @@ public function testErrorMessagesAreNotChanged() {
'extensions' => 'foo',
];
$this->drupalPostForm('file-test/save_upload_from_form_test', $edit, t('Submit'));
- $this->assertResponse(200, 'Received a 200 response for posted test file.');
+ $this->assertSession()->statusCodeEquals(200);
$this->assertRaw(t('Epic upload FAIL!'), 'Found the failure message.');
// Ensure the expected error message is present and the counts before and
@@ -441,7 +441,7 @@ public function testErrorMessagesAreNotChanged() {
'files[file_test_upload][]' => $file_system->realpath($this->image->getFileUri()),
];
$this->drupalPostForm('file-test/save_upload_from_form_test', $edit, t('Submit'));
- $this->assertResponse(200, 'Received a 200 response for posted test file.');
+ $this->assertSession()->statusCodeEquals(200);
$this->assertRaw(t('You WIN!'), 'Found the success message.');
// Ensure the error message is not present and the counts before and after
@@ -456,7 +456,7 @@ public function testErrorMessagesAreNotChanged() {
*/
public function testCombinedErrorMessages() {
$textfile = current($this->drupalGetTestFiles('text'));
- $this->assertTrue(is_file($textfile->uri), 'The text file we are going to upload exists.');
+ $this->assertFileExists($textfile->uri);
/** @var \Drupal\Core\File\FileSystemInterface $file_system */
$file_system = \Drupal::service('file_system');
@@ -475,8 +475,7 @@ public function testCombinedErrorMessages() {
$files['files']['file_test_upload'][0] = $file_system->realpath($this->phpfile->uri);
$files['files']['file_test_upload'][1] = $file_system->realpath($textfile->uri);
$client->request($form->getMethod(), $form->getUri(), $edit, $files);
-
- $this->assertResponse(200, 'Received a 200 response for posted test file.');
+ $this->assertSession()->statusCodeEquals(200);
$this->assertRaw(t('Epic upload FAIL!'), 'Found the failure message.');
// Search for combined error message followed by a formatted list of messages.
@@ -487,7 +486,7 @@ public function testCombinedErrorMessages() {
* Tests highlighting of file upload field when it has an error.
*/
public function testUploadFieldIsHighlighted() {
- $this->assertEqual(0, count($this->cssSelect('input[name="files[file_test_upload][]"].error')), 'Successful file upload has no error.');
+ $this->assertCount(0, $this->cssSelect('input[name="files[file_test_upload][]"].error'), 'Successful file upload has no error.');
/** @var \Drupal\Core\File\FileSystemInterface $file_system */
$file_system = \Drupal::service('file_system');
@@ -496,9 +495,9 @@ public function testUploadFieldIsHighlighted() {
'extensions' => 'foo',
];
$this->drupalPostForm('file-test/save_upload_from_form_test', $edit, t('Submit'));
- $this->assertResponse(200, 'Received a 200 response for posted test file.');
+ $this->assertSession()->statusCodeEquals(200);
$this->assertRaw(t('Epic upload FAIL!'), 'Found the failure message.');
- $this->assertEqual(1, count($this->cssSelect('input[name="files[file_test_upload][]"].error')), 'File upload field has error.');
+ $this->assertCount(1, $this->cssSelect('input[name="files[file_test_upload][]"].error'), 'File upload field has error.');
}
}
diff --git a/web/core/modules/file/tests/src/Functional/SaveUploadTest.php b/web/core/modules/file/tests/src/Functional/SaveUploadTest.php
index 446b565dc1..17c87e2f94 100644
--- a/web/core/modules/file/tests/src/Functional/SaveUploadTest.php
+++ b/web/core/modules/file/tests/src/Functional/SaveUploadTest.php
@@ -68,10 +68,10 @@ protected function setUp() {
$this->image = File::create((array) current($image_files));
list(, $this->imageExtension) = explode('.', $this->image->getFilename());
- $this->assertTrue(is_file($this->image->getFileUri()), "The image file we're going to upload exists.");
+ $this->assertFileExists($this->image->getFileUri());
$this->phpfile = current($this->drupalGetTestFiles('php'));
- $this->assertTrue(is_file($this->phpfile->uri), 'The PHP file we are going to upload exists.');
+ $this->assertFileExists($this->phpfile->uri);
$this->maxFidBefore = (int) \Drupal::entityQueryAggregate('file')->aggregate('fid', 'max')->execute()[0]['fid_max'];
@@ -81,7 +81,7 @@ protected function setUp() {
'files[file_test_upload]' => \Drupal::service('file_system')->realpath($this->image->getFileUri()),
];
$this->drupalPostForm('file-test/upload', $edit, t('Submit'));
- $this->assertResponse(200, 'Received a 200 response for posted test file.');
+ $this->assertSession()->statusCodeEquals(200);
$this->assertRaw(t('You WIN!'), 'Found the success message.');
// Check that the correct hooks were called then clean out the hook
@@ -97,7 +97,7 @@ public function testNormal() {
$max_fid_after = (int) \Drupal::entityQueryAggregate('file')->aggregate('fid', 'max')->execute()[0]['fid_max'];
$this->assertTrue($max_fid_after > $this->maxFidBefore, 'A new file was created.');
$file1 = File::load($max_fid_after);
- $this->assertInstanceOf(File::class, $file1, 'Loaded the file.');
+ $this->assertInstanceOf(File::class, $file1);
// MIME type of the uploaded image may be either image/jpeg or image/png.
$this->assertEqual(substr($file1->getMimeType(), 0, 5), 'image', 'A MIME type was set.');
@@ -108,7 +108,7 @@ public function testNormal() {
$image2 = current($this->drupalGetTestFiles('image'));
$edit = ['files[file_test_upload]' => \Drupal::service('file_system')->realpath($image2->uri)];
$this->drupalPostForm('file-test/upload', $edit, t('Submit'));
- $this->assertResponse(200, 'Received a 200 response for posted test file.');
+ $this->assertSession()->statusCodeEquals(200);
$this->assertRaw(t('You WIN!'));
$max_fid_after = (int) \Drupal::entityQueryAggregate('file')->aggregate('fid', 'max')->execute()[0]['fid_max'];
@@ -116,7 +116,7 @@ public function testNormal() {
$this->assertFileHooksCalled(['validate', 'insert']);
$file2 = File::load($max_fid_after);
- $this->assertInstanceOf(File::class, $file2, 'Loaded the file');
+ $this->assertInstanceOf(File::class, $file2);
// MIME type of the uploaded image may be either image/jpeg or image/png.
$this->assertEqual(substr($file2->getMimeType(), 0, 5), 'image', 'A MIME type was set.');
@@ -134,9 +134,9 @@ public function testNormal() {
'file_subdir' => $dir,
];
$this->drupalPostForm('file-test/upload', $edit, t('Submit'));
- $this->assertResponse(200, 'Received a 200 response for posted test file.');
+ $this->assertSession()->statusCodeEquals(200);
$this->assertRaw(t('You WIN!'));
- $this->assertTrue(is_file('temporary://' . $dir . '/' . trim(\Drupal::service('file_system')->basename($image3_realpath))));
+ $this->assertFileExists('temporary://' . $dir . '/' . trim(\Drupal::service('file_system')->basename($image3_realpath)));
}
/**
@@ -160,7 +160,7 @@ public function testDuplicate() {
$edit = ['files[file_test_upload]' => \Drupal::service('file_system')->realpath($image2->uri)];
$this->drupalPostForm('file-test/upload', $edit, t('Submit'));
// Received a 200 response for posted test file.
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$message = t('The file %file already exists. Enter a unique file URI.', ['%file' => $file1->getFileUri()]);
$this->assertRaw($message);
$max_fid_before_duplicate = $max_fid_after;
@@ -184,7 +184,7 @@ public function testHandleExtension() {
];
$this->drupalPostForm('file-test/upload', $edit, t('Submit'));
- $this->assertResponse(200, 'Received a 200 response for posted test file.');
+ $this->assertSession()->statusCodeEquals(200);
$message = t('Only files with the following extensions are allowed:') . ' <em class="placeholder">' . $extensions . '</em>';
$this->assertRaw($message, 'Cannot upload a disallowed extension');
$this->assertRaw(t('Epic upload FAIL!'), 'Found the failure message.');
@@ -204,7 +204,7 @@ public function testHandleExtension() {
];
$this->drupalPostForm('file-test/upload', $edit, t('Submit'));
- $this->assertResponse(200, 'Received a 200 response for posted test file.');
+ $this->assertSession()->statusCodeEquals(200);
$this->assertNoRaw(t('Only files with the following extensions are allowed:'), 'Can upload an allowed extension.');
$this->assertRaw(t('You WIN!'), 'Found the success message.');
@@ -221,7 +221,7 @@ public function testHandleExtension() {
'allow_all_extensions' => TRUE,
];
$this->drupalPostForm('file-test/upload', $edit, t('Submit'));
- $this->assertResponse(200, 'Received a 200 response for posted test file.');
+ $this->assertSession()->statusCodeEquals(200);
$this->assertNoRaw(t('Only files with the following extensions are allowed:'), 'Can upload any extension.');
$this->assertRaw(t('You WIN!'), 'Found the success message.');
@@ -244,7 +244,7 @@ public function testHandleDangerousFile() {
];
$this->drupalPostForm('file-test/upload', $edit, t('Submit'));
- $this->assertResponse(200, 'Received a 200 response for posted test file.');
+ $this->assertSession()->statusCodeEquals(200);
$message = t('For security reasons, your upload has been renamed to') . ' <em class="placeholder">' . $this->phpfile->filename . '.txt' . '</em>';
$this->assertRaw($message, 'Dangerous file was renamed.');
$this->assertSession()->pageTextContains('File name is php-2.php.txt.');
@@ -261,7 +261,7 @@ public function testHandleDangerousFile() {
file_test_reset();
$this->drupalPostForm('file-test/upload', $edit, t('Submit'));
- $this->assertResponse(200, 'Received a 200 response for posted test file.');
+ $this->assertSession()->statusCodeEquals(200);
$this->assertNoRaw(t('For security reasons, your upload has been renamed'), 'Found no security message.');
$this->assertSession()->pageTextContains('File name is php-2.php.');
$this->assertRaw(t('You WIN!'), 'Found the success message.');
@@ -295,7 +295,7 @@ public function testHandleFileMunge() {
$munged_filename .= '_.' . $this->imageExtension;
$this->drupalPostForm('file-test/upload', $edit, t('Submit'));
- $this->assertResponse(200, 'Received a 200 response for posted test file.');
+ $this->assertSession()->statusCodeEquals(200);
$this->assertRaw(t('For security reasons, your upload has been renamed'), 'Found security message.');
$this->assertRaw(t('File name is @filename', ['@filename' => $munged_filename]), 'File was successfully munged.');
$this->assertRaw(t('You WIN!'), 'Found the success message.');
@@ -313,7 +313,7 @@ public function testHandleFileMunge() {
];
$this->drupalPostForm('file-test/upload', $edit, t('Submit'));
- $this->assertResponse(200, 'Received a 200 response for posted test file.');
+ $this->assertSession()->statusCodeEquals(200);
$this->assertNoRaw(t('For security reasons, your upload has been renamed'), 'Found no security message.');
$this->assertRaw(t('File name is @filename', ['@filename' => $this->image->getFilename()]), 'File was not munged when allowing any extension.');
$this->assertRaw(t('You WIN!'), 'Found the success message.');
@@ -331,7 +331,7 @@ public function testExistingRename() {
'files[file_test_upload]' => \Drupal::service('file_system')->realpath($this->image->getFileUri()),
];
$this->drupalPostForm('file-test/upload', $edit, t('Submit'));
- $this->assertResponse(200, 'Received a 200 response for posted test file.');
+ $this->assertSession()->statusCodeEquals(200);
$this->assertRaw(t('You WIN!'), 'Found the success message.');
$this->assertSession()->pageTextContains('File name is image-test_0.png.');
@@ -348,7 +348,7 @@ public function testExistingReplace() {
'files[file_test_upload]' => \Drupal::service('file_system')->realpath($this->image->getFileUri()),
];
$this->drupalPostForm('file-test/upload', $edit, t('Submit'));
- $this->assertResponse(200, 'Received a 200 response for posted test file.');
+ $this->assertSession()->statusCodeEquals(200);
$this->assertRaw(t('You WIN!'), 'Found the success message.');
$this->assertSession()->pageTextContains('File name is image-test.png.');
@@ -365,7 +365,7 @@ public function testExistingError() {
'files[file_test_upload]' => \Drupal::service('file_system')->realpath($this->image->getFileUri()),
];
$this->drupalPostForm('file-test/upload', $edit, t('Submit'));
- $this->assertResponse(200, 'Received a 200 response for posted test file.');
+ $this->assertSession()->statusCodeEquals(200);
$this->assertRaw(t('Epic upload FAIL!'), 'Found the failure message.');
// Check that the no hooks were called while failing.
@@ -389,7 +389,7 @@ public function testDrupalMovingUploadedFileError() {
/** @var \Drupal\Core\File\FileSystemInterface $file_system */
$file_system = \Drupal::service('file_system');
$file_system->mkdir('temporary://' . $test_directory, 0000);
- $this->assertTrue(is_dir('temporary://' . $test_directory));
+ $this->assertDirectoryExists('temporary://' . $test_directory);
$edit = [
'file_subdir' => $test_directory,
@@ -398,13 +398,13 @@ public function testDrupalMovingUploadedFileError() {
\Drupal::state()->set('file_test.disable_error_collection', TRUE);
$this->drupalPostForm('file-test/upload', $edit, t('Submit'));
- $this->assertResponse(200, 'Received a 200 response for posted test file.');
+ $this->assertSession()->statusCodeEquals(200);
$this->assertRaw(t('File upload error. Could not move uploaded file.'), 'Found the failure message.');
$this->assertRaw(t('Epic upload FAIL!'), 'Found the failure message.');
// Uploading failed. Now check the log.
$this->drupalGet('admin/reports/dblog');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertRaw(t('Upload error. Could not move uploaded file @file to destination @destination.', [
'@file' => $this->image->getFilename(),
'@destination' => 'temporary://' . $test_directory . '/' . $this->image->getFilename(),
@@ -462,8 +462,8 @@ public function testInvalidUtf8FilenameUpload() {
$content = (string) $response->getBody();
$this->htmlOutput($content);
$error_text = new FormattableMarkup('The file %filename could not be uploaded because the name is invalid.', ['%filename' => $filename]);
- $this->assertContains((string) $error_text, $content);
- $this->assertContains('Epic upload FAIL!', $content);
+ $this->assertStringContainsString((string) $error_text, $content);
+ $this->assertStringContainsString('Epic upload FAIL!', $content);
$this->assertFileNotExists('temporary://' . $filename);
}
diff --git a/web/core/modules/file/tests/src/FunctionalJavascript/FileFieldWidgetTest.php b/web/core/modules/file/tests/src/FunctionalJavascript/FileFieldWidgetTest.php
index b24b381369..c563337ddd 100644
--- a/web/core/modules/file/tests/src/FunctionalJavascript/FileFieldWidgetTest.php
+++ b/web/core/modules/file/tests/src/FunctionalJavascript/FileFieldWidgetTest.php
@@ -89,7 +89,7 @@ public function testMultiValuedWidget() {
// Ensure we have the expected number of Remove buttons, and that they
// are numbered sequentially.
$buttons = $this->xpath('//input[@type="submit" and @value="Remove"]');
- $this->assertTrue(is_array($buttons) && count($buttons) === $num_expected_remove_buttons, new FormattableMarkup('There are %n "Remove" buttons displayed.', ['%n' => $num_expected_remove_buttons]));
+ $this->assertCount($num_expected_remove_buttons, $buttons, new FormattableMarkup('There are %n "Remove" buttons displayed.', ['%n' => $num_expected_remove_buttons]));
foreach ($buttons as $i => $button) {
$key = $i >= $remaining ? $i - $remaining : $i;
$check_field_name = $field_name2;
@@ -112,12 +112,12 @@ public function testMultiValuedWidget() {
$upload_button_name = $current_field_name . '_' . $remaining . '_upload_button';
$this->assertNotNull($assert_session->waitForButton($upload_button_name));
$buttons = $this->xpath('//input[@type="submit" and @value="Upload" and @name=:name]', [':name' => $upload_button_name]);
- $this->assertTrue(is_array($buttons) && count($buttons) == 1, 'The upload button is displayed with the correct name.');
+ $this->assertCount(1, $buttons, 'The upload button is displayed with the correct name.');
// Ensure only at most one button per field is displayed.
$buttons = $this->xpath('//input[@type="submit" and @value="Upload"]');
$expected = $current_field_name == $field_name ? 1 : 2;
- $this->assertTrue(is_array($buttons) && count($buttons) == $expected, 'After removing a file, only one "Upload" button for each possible field is displayed.');
+ $this->assertCount($expected, $buttons, 'After removing a file, only one "Upload" button for each possible field is displayed.');
}
}
}
diff --git a/web/core/modules/file/tests/src/Kernel/CopyTest.php b/web/core/modules/file/tests/src/Kernel/CopyTest.php
index f5093508ed..e196508ccd 100644
--- a/web/core/modules/file/tests/src/Kernel/CopyTest.php
+++ b/web/core/modules/file/tests/src/Kernel/CopyTest.php
@@ -33,8 +33,8 @@ public function testNormal() {
$this->assertDifferentFile($source, $result);
$this->assertEqual($result->getFileUri(), $desired_uri, 'The copied file entity has the desired filepath.');
- $this->assertTrue(file_exists($source->getFileUri()), 'The original file still exists.');
- $this->assertTrue(file_exists($result->getFileUri()), 'The copied file exists.');
+ $this->assertFileExists($source->getFileUri());
+ $this->assertFileExists($result->getFileUri());
// Reload the file from the database and check that the changes were
// actually saved.
diff --git a/web/core/modules/file/tests/src/Kernel/DeleteTest.php b/web/core/modules/file/tests/src/Kernel/DeleteTest.php
index e8be244534..39343e5234 100644
--- a/web/core/modules/file/tests/src/Kernel/DeleteTest.php
+++ b/web/core/modules/file/tests/src/Kernel/DeleteTest.php
@@ -19,10 +19,10 @@ public function testUnused() {
$file = $this->createFile();
// Check that deletion removes the file and database record.
- $this->assertTrue(is_file($file->getFileUri()), 'File exists.');
+ $this->assertFileExists($file->getFileUri());
$file->delete();
$this->assertFileHooksCalled(['delete']);
- $this->assertFalse(file_exists($file->getFileUri()), 'Test file has actually been deleted.');
+ $this->assertFileNotExists($file->getFileUri());
$this->assertNull(File::load($file->id()), 'File was removed from the database.');
}
@@ -43,7 +43,7 @@ public function testInUse() {
$file_usage->delete($file, 'testing', 'test', 1);
$usage = $file_usage->listUsage($file);
$this->assertEqual($usage['testing']['test'], [1 => 1], 'Test file is still in use.');
- $this->assertTrue(file_exists($file->getFileUri()), 'File still exists on the disk.');
+ $this->assertFileExists($file->getFileUri());
$this->assertNotEmpty(File::load($file->id()), 'File still exists in the database.');
// Clear out the call to hook_file_load().
@@ -53,7 +53,7 @@ public function testInUse() {
$usage = $file_usage->listUsage($file);
$this->assertFileHooksCalled(['load', 'update']);
$this->assertTrue(empty($usage), 'File usage data was removed.');
- $this->assertTrue(file_exists($file->getFileUri()), 'File still exists on the disk.');
+ $this->assertFileExists($file->getFileUri());
$file = File::load($file->id());
$this->assertNotEmpty($file, 'File still exists in the database.');
$this->assertTrue($file->isTemporary(), 'File is temporary.');
@@ -73,7 +73,7 @@ public function testInUse() {
// file_cron() loads
$this->assertFileHooksCalled(['delete']);
- $this->assertFalse(file_exists($file->getFileUri()), 'File has been deleted after its last usage was removed.');
+ $this->assertFileNotExists($file->getFileUri());
$this->assertNull(File::load($file->id()), 'File was removed from the database.');
}
@@ -84,8 +84,8 @@ public function testCronDeleteNonExistingTemporary() {
$file = $this->createFile();
// Delete the file, but leave it in the file_managed table.
\Drupal::service('file_system')->delete($file->getFileUri());
- $this->assertFalse(file_exists($file->getFileUri()), 'File is deleted from the filesystem.');
- $this->assertInstanceOf(File::class, File::load($file->id()), 'File exist in file_managed table');
+ $this->assertFileNotExists($file->getFileUri());
+ $this->assertInstanceOf(File::class, File::load($file->id()));
// Call file_cron() to clean up the file. Make sure the changed timestamp
// of the file is older than the system.file.temporary_maximum_age
diff --git a/web/core/modules/file/tests/src/Kernel/FileItemTest.php b/web/core/modules/file/tests/src/Kernel/FileItemTest.php
index 4d9e83bc4d..a94f2f72b0 100644
--- a/web/core/modules/file/tests/src/Kernel/FileItemTest.php
+++ b/web/core/modules/file/tests/src/Kernel/FileItemTest.php
@@ -93,8 +93,8 @@ public function testFileItem() {
$entity->save();
$entity = EntityTest::load($entity->id());
- $this->assertTrue($entity->file_test instanceof FieldItemListInterface, 'Field implements interface.');
- $this->assertTrue($entity->file_test[0] instanceof FieldItemInterface, 'Field item implements interface.');
+ $this->assertInstanceOf(FieldItemListInterface::class, $entity->file_test);
+ $this->assertInstanceOf(FieldItemInterface::class, $entity->file_test[0]);
$this->assertEqual($entity->file_test->target_id, $this->file->id());
$this->assertEqual($entity->file_test->display, 1);
$this->assertEqual($entity->file_test->description, $description);
diff --git a/web/core/modules/file/tests/src/Kernel/FileItemValidationTest.php b/web/core/modules/file/tests/src/Kernel/FileItemValidationTest.php
index 6fbc82f39a..5716c5ef77 100644
--- a/web/core/modules/file/tests/src/Kernel/FileItemValidationTest.php
+++ b/web/core/modules/file/tests/src/Kernel/FileItemValidationTest.php
@@ -20,7 +20,14 @@ class FileItemValidationTest extends KernelTestBase {
/**
* {@inheritdoc}
*/
- public static $modules = ['file', 'image', 'entity_test', 'field', 'user', 'system'];
+ public static $modules = [
+ 'file',
+ 'image',
+ 'entity_test',
+ 'field',
+ 'user',
+ 'system',
+ ];
/**
* A user.
diff --git a/web/core/modules/file/tests/src/Kernel/FileManagedUnitTestBase.php b/web/core/modules/file/tests/src/Kernel/FileManagedUnitTestBase.php
index da8194a8d6..aa336f1e2c 100644
--- a/web/core/modules/file/tests/src/Kernel/FileManagedUnitTestBase.php
+++ b/web/core/modules/file/tests/src/Kernel/FileManagedUnitTestBase.php
@@ -207,7 +207,7 @@ public function createUri($filepath = NULL, $contents = NULL, $scheme = NULL) {
}
file_put_contents($filepath, $contents);
- $this->assertTrue(is_file($filepath), t('The test file exists on the disk.'), 'Create test file');
+ $this->assertFileExists($filepath);
return $filepath;
}
diff --git a/web/core/modules/file/tests/src/Kernel/LoadTest.php b/web/core/modules/file/tests/src/Kernel/LoadTest.php
index 56212b4bf0..84de3e391d 100644
--- a/web/core/modules/file/tests/src/Kernel/LoadTest.php
+++ b/web/core/modules/file/tests/src/Kernel/LoadTest.php
@@ -46,7 +46,7 @@ public function testSingleValues() {
$file = $this->createFile('druplicon.txt', NULL, 'public');
$by_fid_file = File::load($file->id());
$this->assertFileHookCalled('load');
- $this->assertTrue(is_object($by_fid_file), '\Drupal\file\Entity\File::load() returned an object.');
+ $this->assertIsObject($by_fid_file);
$this->assertEqual($by_fid_file->id(), $file->id(), 'Loading by fid got the same fid.', 'File');
$this->assertEqual($by_fid_file->getFileUri(), $file->getFileUri(), 'Loading by fid got the correct filepath.', 'File');
$this->assertEqual($by_fid_file->getFilename(), $file->getFilename(), 'Loading by fid got the correct filename.', 'File');
@@ -66,7 +66,7 @@ public function testMultiple() {
file_test_reset();
$by_path_files = \Drupal::entityTypeManager()->getStorage('file')->loadByProperties(['uri' => $file->getFileUri()]);
$this->assertFileHookCalled('load');
- $this->assertEqual(1, count($by_path_files), '\Drupal::entityTypeManager()->getStorage(\'file\')->loadByProperties() returned an array of the correct size.');
+ $this->assertCount(1, $by_path_files, '\Drupal::entityTypeManager()->getStorage(\'file\')->loadByProperties() returned an array of the correct size.');
$by_path_file = reset($by_path_files);
$this->assertTrue($by_path_file->file_test['loaded'], 'file_test_file_load() was able to modify the file during load.');
$this->assertEqual($by_path_file->id(), $file->id(), 'Loading by filepath got the correct fid.', 'File');
@@ -75,7 +75,7 @@ public function testMultiple() {
file_test_reset();
$by_fid_files = File::loadMultiple([$file->id()]);
$this->assertFileHooksCalled([]);
- $this->assertEqual(1, count($by_fid_files), '\Drupal\file\Entity\File::loadMultiple() returned an array of the correct size.');
+ $this->assertCount(1, $by_fid_files, '\Drupal\file\Entity\File::loadMultiple() returned an array of the correct size.');
$by_fid_file = reset($by_fid_files);
$this->assertTrue($by_fid_file->file_test['loaded'], 'file_test_file_load() was able to modify the file during load.');
$this->assertEqual($by_fid_file->getFileUri(), $file->getFileUri(), 'Loading by fid got the correct filepath.', 'File');
diff --git a/web/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateFileTest.php b/web/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateFileTest.php
index df713443a8..dcbb4d35cb 100644
--- a/web/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateFileTest.php
+++ b/web/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateFileTest.php
@@ -53,7 +53,7 @@ protected function setUp() {
protected function assertEntity($fid, $name, $size, $uri, $type, $uid) {
/** @var \Drupal\file\FileInterface $file */
$file = File::load($fid);
- $this->assertTrue($file instanceof FileInterface);
+ $this->assertInstanceOf(FileInterface::class, $file);
$this->assertIdentical($name, $file->getFilename());
$this->assertIdentical($size, $file->getSize());
$this->assertIdentical($uri, $file->getFileUri());
@@ -133,7 +133,7 @@ public function testFiles() {
// then it would have an fid of 9.
$this->assertNull(File::load(9));
- $this->assertEquals(8, count(File::loadMultiple()));
+ $this->assertCount(8, File::loadMultiple());
}
/**
diff --git a/web/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadEntityDisplayTest.php b/web/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadEntityDisplayTest.php
index 1e114ae201..b7007f2c8c 100644
--- a/web/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadEntityDisplayTest.php
+++ b/web/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadEntityDisplayTest.php
@@ -42,7 +42,7 @@ public function testUploadEntityDisplay() {
// Assure this doesn't exist.
$display = EntityViewDisplay::load('node.article.default');
$component = $display->getComponent('upload');
- $this->assertTrue(is_null($component));
+ $this->assertNull($component);
$this->assertIdentical([['node', 'page', 'default', 'upload']], $this->getMigration('d6_upload_entity_display')->getIdMap()->lookupDestinationIds(['page']));
}
diff --git a/web/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadEntityFormDisplayTest.php b/web/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadEntityFormDisplayTest.php
index 5058112459..6de614f5c4 100644
--- a/web/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadEntityFormDisplayTest.php
+++ b/web/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadEntityFormDisplayTest.php
@@ -42,7 +42,7 @@ public function testUploadEntityFormDisplay() {
// Assure this doesn't exist.
$display = EntityFormDisplay::load('node.article.default');
$component = $display->getComponent('upload');
- $this->assertTrue(is_null($component));
+ $this->assertNull($component);
$this->assertIdentical([['node', 'page', 'default', 'upload']], $this->getMigration('d6_upload_entity_form_display')->getIdMap()->lookupDestinationIds(['page']));
}
diff --git a/web/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadInstanceTest.php b/web/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadInstanceTest.php
index 356c226b70..3558e108d9 100644
--- a/web/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadInstanceTest.php
+++ b/web/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadInstanceTest.php
@@ -41,7 +41,7 @@ public function testUploadFieldInstance() {
// Shouldn't exist.
$field = FieldConfig::load('node.article.upload');
- $this->assertTrue(is_null($field));
+ $this->assertNull($field);
$this->assertIdentical([['node', 'page', 'upload']], $this->getMigration('d6_upload_field_instance')->getIdMap()->lookupDestinationIds(['page']));
}
diff --git a/web/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadTest.php b/web/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadTest.php
index 0d9981ab1e..76f6649184 100644
--- a/web/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadTest.php
+++ b/web/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadTest.php
@@ -20,8 +20,6 @@ class MigrateUploadTest extends MigrateDrupal6TestBase {
'language',
'content_translation',
'menu_ui',
- // Required for translation migrations.
- 'migrate_drupal_multilingual',
];
/**
@@ -76,14 +74,14 @@ public function testUpload() {
$nodes = Node::loadMultiple([1, 2, 12]);
$node = $nodes[1];
$this->assertEquals('en', $node->langcode->value);
- $this->assertIdentical(1, count($node->upload));
+ $this->assertCount(1, $node->upload);
$this->assertIdentical('1', $node->upload[0]->target_id);
$this->assertIdentical('file 1-1-1', $node->upload[0]->description);
$this->assertIdentical(FALSE, $node->upload[0]->isDisplayed());
$node = $nodes[2];
$this->assertEquals('en', $node->langcode->value);
- $this->assertIdentical(2, count($node->upload));
+ $this->assertCount(2, $node->upload);
$this->assertIdentical('3', $node->upload[0]->target_id);
$this->assertIdentical('file 2-3-3', $node->upload[0]->description);
$this->assertIdentical(FALSE, $node->upload[0]->isDisplayed());
@@ -93,7 +91,7 @@ public function testUpload() {
$node = $nodes[12];
$this->assertEquals('zu', $node->langcode->value);
- $this->assertEquals(1, count($node->upload));
+ $this->assertCount(1, $node->upload);
$this->assertEquals('3', $node->upload[0]->target_id);
$this->assertEquals('file 12-15-3', $node->upload[0]->description);
$this->assertEquals(FALSE, $node->upload[0]->isDisplayed());
diff --git a/web/core/modules/file/tests/src/Kernel/MoveTest.php b/web/core/modules/file/tests/src/Kernel/MoveTest.php
index 94ef5a6975..c841d36c5f 100644
--- a/web/core/modules/file/tests/src/Kernel/MoveTest.php
+++ b/web/core/modules/file/tests/src/Kernel/MoveTest.php
@@ -27,7 +27,7 @@ public function testNormal() {
// Check the return status and that the contents changed.
$this->assertNotFalse($result, 'File moved successfully.');
- $this->assertFalse(file_exists($source->getFileUri()));
+ $this->assertFileNotExists($source->getFileUri());
$this->assertEqual($contents, file_get_contents($result->getFileUri()), 'Contents of file correctly written.');
// Check that the correct hooks were called.
@@ -59,7 +59,7 @@ public function testExistingRename() {
// Check the return status and that the contents changed.
$this->assertNotFalse($result, 'File moved successfully.');
- $this->assertFalse(file_exists($source->getFileUri()));
+ $this->assertFileNotExists($source->getFileUri());
$this->assertEqual($contents, file_get_contents($result->getFileUri()), 'Contents of file correctly written.');
// Check that the correct hooks were called.
@@ -94,7 +94,7 @@ public function testExistingReplace() {
// Look at the results.
$this->assertEqual($contents, file_get_contents($result->getFileUri()), 'Contents of file were overwritten.');
- $this->assertFalse(file_exists($source->getFileUri()));
+ $this->assertFileNotExists($source->getFileUri());
$this->assertNotEmpty($result, 'File moved successfully.');
// Check that the correct hooks were called.
@@ -147,7 +147,7 @@ public function testExistingError() {
// Check the return status and that the contents did not change.
$this->assertFalse($result, 'File move failed.');
- $this->assertTrue(file_exists($source->getFileUri()));
+ $this->assertFileExists($source->getFileUri());
$this->assertEqual($contents, file_get_contents($target->getFileUri()), 'Contents of file were not altered.');
// Check that no hooks were called while failing.
diff --git a/web/core/modules/file/tests/src/Kernel/SaveTest.php b/web/core/modules/file/tests/src/Kernel/SaveTest.php
index 73e8b25a53..f091566bc3 100644
--- a/web/core/modules/file/tests/src/Kernel/SaveTest.php
+++ b/web/core/modules/file/tests/src/Kernel/SaveTest.php
@@ -63,14 +63,14 @@ public function testFileSave() {
$uppercase_file = File::create($uppercase_values);
file_put_contents($uppercase_file->getFileUri(), 'hello world');
$violations = $uppercase_file->validate();
- $this->assertEqual(count($violations), 0, 'No violations when adding an URI with an existing filename in upper case.');
+ $this->assertCount(0, $violations, 'No violations when adding an URI with an existing filename in upper case.');
$uppercase_file->save();
// Ensure the database URI uniqueness constraint is triggered.
$uppercase_file_duplicate = File::create($uppercase_values);
file_put_contents($uppercase_file_duplicate->getFileUri(), 'hello world');
$violations = $uppercase_file_duplicate->validate();
- $this->assertEqual(count($violations), 1);
+ $this->assertCount(1, $violations);
$this->assertEqual($violations[0]->getMessage(), t('The file %value already exists. Enter a unique file URI.', [
'%value' => $uppercase_file_duplicate->getFileUri(),
]));
@@ -79,7 +79,7 @@ public function testFileSave() {
->condition('uri', $uppercase_file->getFileUri())
->execute();
- $this->assertEqual(1, count($fids));
+ $this->assertCount(1, $fids);
$this->assertEqual([$uppercase_file->id() => $uppercase_file->id()], $fids);
// Save a file with zero bytes.
diff --git a/web/core/modules/file/tests/src/Kernel/UsageTest.php b/web/core/modules/file/tests/src/Kernel/UsageTest.php
index cc64cd8107..ae0110f022 100644
--- a/web/core/modules/file/tests/src/Kernel/UsageTest.php
+++ b/web/core/modules/file/tests/src/Kernel/UsageTest.php
@@ -44,7 +44,7 @@ public function testGetUsage() {
$usage = $this->container->get('file.usage')->listUsage($file);
- $this->assertEqual(count($usage['testing']), 2, 'Returned the correct number of items.');
+ $this->assertCount(2, $usage['testing'], 'Returned the correct number of items.');
$this->assertTrue(isset($usage['testing']['foo'][1]), 'Returned the correct id.');
$this->assertTrue(isset($usage['testing']['bar'][2]), 'Returned the correct id.');
$this->assertEqual($usage['testing']['foo'][1], 1, 'Returned the correct count.');
@@ -68,7 +68,7 @@ public function testAddUsage() {
->condition('f.fid', $file->id())
->execute()
->fetchAllAssoc('id');
- $this->assertEqual(count($usage), 2, 'Created two records');
+ $this->assertCount(2, $usage, 'Created two records');
$this->assertEqual($usage[1]->module, 'testing', 'Correct module');
$this->assertEqual($usage[2]->module, 'testing', 'Correct module');
$this->assertEqual($usage[1]->type, 'foo', 'Correct type');
@@ -163,7 +163,7 @@ public function createTempFiles() {
])
->condition('fid', $temp_old->id())
->execute();
- $this->assertTrue(file_exists($temp_old->getFileUri()), 'Old temp file was created correctly.');
+ $this->assertFileExists($temp_old->getFileUri());
// Temporary file that is new.
$temp_new = file_save_data('');
@@ -171,7 +171,7 @@ public function createTempFiles() {
->fields(['status' => 0])
->condition('fid', $temp_new->id())
->execute();
- $this->assertTrue(file_exists($temp_new->getFileUri()), 'New temp file was created correctly.');
+ $this->assertFileExists($temp_new->getFileUri());
// Permanent file that is old.
$perm_old = file_save_data('');
@@ -179,11 +179,11 @@ public function createTempFiles() {
->fields(['changed' => REQUEST_TIME - $this->config('system.file')->get('temporary_maximum_age') - 1])
->condition('fid', $temp_old->id())
->execute();
- $this->assertTrue(file_exists($perm_old->getFileUri()), 'Old permanent file was created correctly.');
+ $this->assertFileExists($perm_old->getFileUri());
// Permanent file that is new.
$perm_new = file_save_data('');
- $this->assertTrue(file_exists($perm_new->getFileUri()), 'New permanent file was created correctly.');
+ $this->assertFileExists($perm_new->getFileUri());
return [$temp_old, $temp_new, $perm_old, $perm_new];
}
@@ -195,10 +195,10 @@ public function testTempFileCleanupDefault() {
// Run cron and then ensure that only the old, temp file was deleted.
$this->container->get('cron')->run();
- $this->assertFalse(file_exists($temp_old->getFileUri()), 'Old temp file was correctly removed.');
- $this->assertTrue(file_exists($temp_new->getFileUri()), 'New temp file was correctly ignored.');
- $this->assertTrue(file_exists($perm_old->getFileUri()), 'Old permanent file was correctly ignored.');
- $this->assertTrue(file_exists($perm_new->getFileUri()), 'New permanent file was correctly ignored.');
+ $this->assertFileNotExists($temp_old->getFileUri());
+ $this->assertFileExists($temp_new->getFileUri());
+ $this->assertFileExists($perm_old->getFileUri());
+ $this->assertFileExists($perm_new->getFileUri());
}
/**
@@ -214,10 +214,10 @@ public function testTempFileNoCleanup() {
// Run cron and then ensure that no file was deleted.
$this->container->get('cron')->run();
- $this->assertTrue(file_exists($temp_old->getFileUri()), 'Old temp file was correctly ignored.');
- $this->assertTrue(file_exists($temp_new->getFileUri()), 'New temp file was correctly ignored.');
- $this->assertTrue(file_exists($perm_old->getFileUri()), 'Old permanent file was correctly ignored.');
- $this->assertTrue(file_exists($perm_new->getFileUri()), 'New permanent file was correctly ignored.');
+ $this->assertFileExists($temp_old->getFileUri());
+ $this->assertFileExists($temp_new->getFileUri());
+ $this->assertFileExists($perm_old->getFileUri());
+ $this->assertFileExists($perm_new->getFileUri());
}
/**
@@ -233,10 +233,10 @@ public function testTempFileCustomCleanup() {
// Run cron and then ensure that more files were deleted.
$this->container->get('cron')->run();
- $this->assertTrue(file_exists($temp_old->getFileUri()), 'Old temp file was correctly ignored.');
- $this->assertTrue(file_exists($temp_new->getFileUri()), 'New temp file was correctly ignored.');
- $this->assertTrue(file_exists($perm_old->getFileUri()), 'Old permanent file was correctly ignored.');
- $this->assertTrue(file_exists($perm_new->getFileUri()), 'New permanent file was correctly ignored.');
+ $this->assertFileExists($temp_old->getFileUri());
+ $this->assertFileExists($temp_new->getFileUri());
+ $this->assertFileExists($perm_old->getFileUri());
+ $this->assertFileExists($perm_new->getFileUri());
}
/**
diff --git a/web/core/modules/file/tests/src/Kernel/ValidatorTest.php b/web/core/modules/file/tests/src/Kernel/ValidatorTest.php
index e8f2c3709f..e77e9957a2 100644
--- a/web/core/modules/file/tests/src/Kernel/ValidatorTest.php
+++ b/web/core/modules/file/tests/src/Kernel/ValidatorTest.php
@@ -45,24 +45,24 @@ protected function setUp() {
public function testFileValidateExtensions() {
$file = File::create(['filename' => 'asdf.txt']);
$errors = file_validate_extensions($file, 'asdf txt pork');
- $this->assertEqual(count($errors), 0, 'Valid extension accepted.', 'File');
+ $this->assertCount(0, $errors, 'Valid extension accepted.');
$file->setFilename('asdf.txt');
$errors = file_validate_extensions($file, 'exe png');
- $this->assertEqual(count($errors), 1, 'Invalid extension blocked.', 'File');
+ $this->assertCount(1, $errors, 'Invalid extension blocked.');
}
/**
* This ensures a specific file is actually an image.
*/
public function testFileValidateIsImage() {
- $this->assertTrue(file_exists($this->image->getFileUri()), 'The image being tested exists.', 'File');
+ $this->assertFileExists($this->image->getFileUri());
$errors = file_validate_is_image($this->image);
- $this->assertEqual(count($errors), 0, 'No error reported for our image file.', 'File');
+ $this->assertCount(0, $errors, 'No error reported for our image file.');
- $this->assertTrue(file_exists($this->nonImage->getFileUri()), 'The non-image being tested exists.', 'File');
+ $this->assertFileExists($this->nonImage->getFileUri());
$errors = file_validate_is_image($this->nonImage);
- $this->assertEqual(count($errors), 1, 'An error reported for our non-image file.', 'File');
+ $this->assertCount(1, $errors, 'An error reported for our non-image file.');
}
/**
@@ -73,19 +73,19 @@ public function testFileValidateIsImage() {
public function testFileValidateImageResolution() {
// Non-images.
$errors = file_validate_image_resolution($this->nonImage);
- $this->assertEqual(count($errors), 0, 'Should not get any errors for a non-image file.', 'File');
+ $this->assertCount(0, $errors, 'Should not get any errors for a non-image file.');
$errors = file_validate_image_resolution($this->nonImage, '50x50', '100x100');
- $this->assertEqual(count($errors), 0, 'Do not check the resolution on non files.', 'File');
+ $this->assertCount(0, $errors, 'Do not check the resolution on non files.');
// Minimum size.
$errors = file_validate_image_resolution($this->image);
- $this->assertEqual(count($errors), 0, 'No errors for an image when there is no minimum or maximum resolution.', 'File');
+ $this->assertCount(0, $errors, 'No errors for an image when there is no minimum or maximum resolution.');
$errors = file_validate_image_resolution($this->image, 0, '200x1');
- $this->assertEqual(count($errors), 1, 'Got an error for an image that was not wide enough.', 'File');
+ $this->assertCount(1, $errors, 'Got an error for an image that was not wide enough.');
$errors = file_validate_image_resolution($this->image, 0, '1x200');
- $this->assertEqual(count($errors), 1, 'Got an error for an image that was not tall enough.', 'File');
+ $this->assertCount(1, $errors, 'Got an error for an image that was not tall enough.');
$errors = file_validate_image_resolution($this->image, 0, '200x200');
- $this->assertEqual(count($errors), 1, 'Small images report an error.', 'File');
+ $this->assertCount(1, $errors, 'Small images report an error.');
// Maximum size.
if ($this->container->get('image.factory')->getToolkitId()) {
@@ -94,7 +94,7 @@ public function testFileValidateImageResolution() {
$this->image->setFileUri('temporary://druplicon.png');
$errors = file_validate_image_resolution($this->image, '10x5');
- $this->assertEqual(count($errors), 0, 'No errors should be reported when an oversized image can be scaled down.', 'File');
+ $this->assertCount(0, $errors, 'No errors should be reported when an oversized image can be scaled down.');
$image = $this->container->get('image.factory')->get($this->image->getFileUri());
$this->assertTrue($image->getWidth() <= 10, 'Image scaled to correct width.', 'File');
@@ -104,14 +104,14 @@ public function testFileValidateImageResolution() {
copy('core/misc/druplicon.png', 'temporary://druplicon.png');
$this->image->setFileUri('temporary://druplicon.png');
$errors = file_validate_image_resolution($this->image, '-10x-5');
- $this->assertEqual(count($errors), 1, 'An error reported for an oversized image that can not be scaled down.', 'File');
+ $this->assertCount(1, $errors, 'An error reported for an oversized image that can not be scaled down.');
\Drupal::service('file_system')->unlink('temporary://druplicon.png');
}
else {
// TODO: should check that the error is returned if no toolkit is available.
$errors = file_validate_image_resolution($this->image, '5x10');
- $this->assertEqual(count($errors), 1, 'Oversize images that cannot be scaled get an error.', 'File');
+ $this->assertCount(1, $errors, 'Oversize images that cannot be scaled get an error.');
}
}
@@ -126,17 +126,17 @@ public function testFileValidateNameLength() {
$file->setFilename(str_repeat('x', 240));
$this->assertEqual(strlen($file->getFilename()), 240);
$errors = file_validate_name_length($file);
- $this->assertEqual(count($errors), 0, 'No errors reported for 240 length filename.', 'File');
+ $this->assertCount(0, $errors, 'No errors reported for 240 length filename.');
// Add a filename with a length too long and test it.
$file->setFilename(str_repeat('x', 241));
$errors = file_validate_name_length($file);
- $this->assertEqual(count($errors), 1, 'An error reported for 241 length filename.', 'File');
+ $this->assertCount(1, $errors, 'An error reported for 241 length filename.');
// Add a filename with an empty string and test it.
$file->setFilename('');
$errors = file_validate_name_length($file);
- $this->assertEqual(count($errors), 1, 'An error reported for 0 length filename.', 'File');
+ $this->assertCount(1, $errors, 'An error reported for 0 length filename.');
}
/**
@@ -146,13 +146,13 @@ public function testFileValidateSize() {
// Create a file with a size of 1000 bytes, and quotas of only 1 byte.
$file = File::create(['filesize' => 1000]);
$errors = file_validate_size($file, 0, 0);
- $this->assertEqual(count($errors), 0, 'No limits means no errors.', 'File');
+ $this->assertCount(0, $errors, 'No limits means no errors.');
$errors = file_validate_size($file, 1, 0);
- $this->assertEqual(count($errors), 1, 'Error for the file being over the limit.', 'File');
+ $this->assertCount(1, $errors, 'Error for the file being over the limit.');
$errors = file_validate_size($file, 0, 1);
- $this->assertEqual(count($errors), 1, 'Error for the user being over their limit.', 'File');
+ $this->assertCount(1, $errors, 'Error for the user being over their limit.');
$errors = file_validate_size($file, 1, 1);
- $this->assertEqual(count($errors), 2, 'Errors for both the file and their limit.', 'File');
+ $this->assertCount(2, $errors, 'Errors for both the file and their limit.');
}
}
diff --git a/web/core/modules/filter/migrations/d7_filter_format.yml b/web/core/modules/filter/migrations/d7_filter_format.yml
index 0b5e0b1b5e..5b20a97be2 100644
--- a/web/core/modules/filter/migrations/d7_filter_format.yml
+++ b/web/core/modules/filter/migrations/d7_filter_format.yml
@@ -24,9 +24,14 @@ process:
plugin: filter_id
bypass: true
source: name
- # No need to map anything -- filter plugin IDs haven't changed since
- # Drupal 7.
- map: { }
+ # Although core filter plugin IDs haven't changed since Drupal 7, we map
+ # the contrib filters of the Editor module – those are the Drupal 7
+ # backport of some of the new filters in Drupal 8 core. Hence Drupal 8
+ # core is responsible for providing an upgrade path for those contrib
+ # filters.
+ map:
+ editor_caption: filter_caption
+ editor_align: filter_align
settings:
plugin: filter_settings
source: settings
diff --git a/web/core/modules/filter/src/Element/TextFormat.php b/web/core/modules/filter/src/Element/TextFormat.php
index cfdce44b24..75bcaeaab1 100644
--- a/web/core/modules/filter/src/Element/TextFormat.php
+++ b/web/core/modules/filter/src/Element/TextFormat.php
@@ -251,10 +251,11 @@ public static function processFormat(&$element, FormStateInterface $form_state,
* Render API callback: Hides the field value of 'text_format' elements.
*
* To not break form processing and previews if a user does not have access to
- * a stored text format, the expanded form elements in filter_process_format()
- * are forced to take over the stored #default_values for 'value' and
- * 'format'. However, to prevent the unfiltered, original #value from being
- * displayed to the user, we replace it with a friendly notice here.
+ * a stored text format, the expanded form elements in
+ * \Drupal\filter\Element\TextFormat::processFormat() are forced to take over
+ * the stored #default_values for 'value' and 'format'. However, to prevent
+ * the unfiltered, original #value from being displayed to the user, we
+ * replace it with a friendly notice here.
*
* @param array $element
* The render array to add the access denied message to.
diff --git a/web/core/modules/filter/src/Plugin/migrate/process/FilterID.php b/web/core/modules/filter/src/Plugin/migrate/process/FilterID.php
index 38af7a1508..8358cd6260 100644
--- a/web/core/modules/filter/src/Plugin/migrate/process/FilterID.php
+++ b/web/core/modules/filter/src/Plugin/migrate/process/FilterID.php
@@ -5,7 +5,9 @@
use Drupal\Component\Plugin\PluginManagerInterface;
use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
use Drupal\Core\StringTranslation\TranslationInterface;
+use Drupal\filter\Plugin\FilterInterface;
use Drupal\migrate\MigrateExecutableInterface;
+use Drupal\migrate\MigrateSkipProcessException;
use Drupal\migrate\Plugin\migrate\process\StaticMap;
use Drupal\migrate\Plugin\MigrationInterface;
use Drupal\migrate\Row;
@@ -75,6 +77,11 @@ public function transform($value, MigrateExecutableInterface $migrate_executable
return $plugin_id;
}
else {
+ if (in_array(static::getSourceFilterType($value), [FilterInterface::TYPE_TRANSFORM_REVERSIBLE, FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE], TRUE)) {
+ $message = sprintf('Filter %s could not be mapped to an existing filter plugin; omitted since it is a transformation-only filter. Install and configure a successor after the migration.', $plugin_id);
+ $migrate_executable->saveMessage($message, MigrationInterface::MESSAGE_INFORMATIONAL);
+ throw new MigrateSkipProcessException("The transformation-only filter $plugin_id was skipped.");
+ }
$fallback = $this->filterManager->getFallbackPluginId($plugin_id);
// @see \Drupal\filter\Plugin\migrate\process\FilterSettings::transform()
@@ -85,4 +92,454 @@ public function transform($value, MigrateExecutableInterface $migrate_executable
}
}
+ /**
+ * Gets the Drupal 8 filter type for a Drupal 7 filter.
+ *
+ * @param string $filter_id
+ * A Drupal 7 filter ID.
+ *
+ * @return int
+ * One of:
+ * - FilterInterface::TYPE_MARKUP_LANGUAGE
+ * - FilterInterface::TYPE_HTML_RESTRICTOR
+ * - FilterInterface::TYPE_TRANSFORM_REVERSIBLE
+ * - FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE
+ *
+ * @see \Drupal\filter\Plugin\FilterInterface::getType()
+ */
+ protected static function getSourceFilterType($filter_id) {
+ switch ($filter_id) {
+ // Drupal 7 core filters.
+ // - https://git.drupalcode.org/project/drupal/blob/7.69/modules/filter/filter.module#L1229
+ // - https://git.drupalcode.org/project/drupal/blob/7.69/modules/php/php.module#L139
+ case 'filter_html':
+ return FilterInterface::TYPE_HTML_RESTRICTOR;
+
+ case 'filter_url':
+ return FilterInterface::TYPE_MARKUP_LANGUAGE;
+
+ case 'filter_autop':
+ return FilterInterface::TYPE_MARKUP_LANGUAGE;
+
+ case 'filter_htmlcorrector':
+ return FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE;
+
+ case 'filter_html_escape':
+ return FilterInterface::TYPE_HTML_RESTRICTOR;
+
+ case 'php_code':
+ return FilterInterface::TYPE_MARKUP_LANGUAGE;
+
+ // Drupal 7 contrib filters.
+ // https://www.drupal.org/project/abbrfilter
+ case 'abbrfilter':
+ return FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE;
+
+ // https://www.drupal.org/project/ace_editor
+ case 'ace_editor':
+ return FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE;
+
+ // https://www.drupal.org/project/adsense
+ case 'adsense':
+ return FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE;
+
+ // https://www.drupal.org/project/api
+ case 'api_filter':
+ return FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE;
+
+ // https://www.drupal.org/project/api_tokens
+ case 'api_tokens':
+ return FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE;
+
+ // https://www.drupal.org/project/autofloat
+ case 'filter_autofloat':
+ return FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE;
+
+ // https://www.drupal.org/project/bbcode
+ case 'bbcode':
+ return FilterInterface::TYPE_MARKUP_LANGUAGE;
+
+ // https://www.drupal.org/project/biblio
+ case 'biblio_filter_reference':
+ case 'biblio_filter_inline_reference':
+ return FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE;
+
+ // https://www.drupal.org/project/caption
+ case 'caption':
+ return FilterInterface::TYPE_TRANSFORM_REVERSIBLE;
+
+ // https://www.drupal.org/project/caption_filter
+ case 'caption_filter':
+ return FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE;
+
+ // https://www.drupal.org/project/cincopa
+ case 'filter_cincopa':
+ return FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE;
+
+ // https://www.drupal.org/project/ckeditor_blocks
+ case 'ckeditor_blocks':
+ return FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE;
+
+ // https://www.drupal.org/project/ckeditor_filter
+ case 'ckeditor_filter':
+ return FilterInterface::TYPE_HTML_RESTRICTOR;
+
+ // https://www.drupal.org/project/ckeditor_link
+ case 'ckeditor_link_filter':
+ return FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE;
+
+ // https://www.drupal.org/project/ckeditor_swf
+ case 'ckeditor_swf_filter':
+ return FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE;
+
+ // https://www.drupal.org/project/codefilter
+ case 'codefilter':
+ return FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE;
+
+ // https://www.drupal.org/project/collapse_text
+ case 'collapse_text_filter':
+ return FilterInterface::TYPE_TRANSFORM_REVERSIBLE;
+
+ // https://www.drupal.org/project/columns_filter
+ case 'columns_filter':
+ return FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE;
+
+ // https://www.drupal.org/project/commonmark
+ case 'commonmark':
+ return FilterInterface::TYPE_MARKUP_LANGUAGE;
+
+ // https://www.drupal.org/project/commons_hashtags
+ case 'filter_hashtags':
+ return FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE;
+
+ // https://www.drupal.org/project/deepzoom
+ case 'deepzoom':
+ return FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE;
+
+ // https://www.drupal.org/project/editor
+ case 'editor_align':
+ case 'editor_caption':
+ return FilterInterface::TYPE_TRANSFORM_REVERSIBLE;
+
+ // https://www.drupal.org/project/elf
+ case 'elf':
+ return FilterInterface::TYPE_TRANSFORM_REVERSIBLE;
+
+ // https://www.drupal.org/project/emogrifier
+ case 'filter_emogrifier':
+ return FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE;
+
+ // https://www.drupal.org/project/emptyparagraphkiller
+ case 'emptyparagraphkiller':
+ return FilterInterface::TYPE_HTML_RESTRICTOR;
+
+ // https://www.drupal.org/project/entity_embed
+ case 'emtity_embed':
+ return FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE;
+
+ case 'filter_align':
+ return FilterInterface::TYPE_TRANSFORM_REVERSIBLE;
+
+ // https://www.drupal.org/project/ext_link_page
+ case 'ext_link_page':
+ return FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE;
+
+ // https://www.drupal.org/project/filter_html_image_secure
+ case 'filter_html_image_secure':
+ return FilterInterface::TYPE_HTML_RESTRICTOR;
+
+ // https://www.drupal.org/project/filter_transliteration
+ case 'filter_transliteration':
+ return FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE;
+
+ // https://www.drupal.org/project/flickr
+ case 'flickr_filter':
+ return FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE;
+
+ // https://www.drupal.org/project/float_filter
+ case 'float_filter':
+ return FilterInterface::TYPE_TRANSFORM_REVERSIBLE;
+
+ // https://www.drupal.org/project/footnotes
+ case 'filter_footnotes':
+ return FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE;
+
+ // https://www.drupal.org/project/forena
+ case 'forena_report':
+ return FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE;
+
+ // https://www.drupal.org/project/g2
+ case 'filter_g2':
+ return FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE;
+
+ // https://www.drupal.org/project/geo_filter
+ case 'geo_filter_filter':
+ return FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE;
+
+ // https://www.drupal.org/project/google_analytics_counter
+ case 'filter_google_analytics_counter':
+ return FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE;
+
+ // https://www.drupal.org/project/google_analytics_referrer
+ case 'filter_google_analytics_referrer':
+ return FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE;
+
+ // https://www.drupal.org/project/gotwo
+ case 'gotwo_link':
+ return FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE;
+
+ // https://www.drupal.org/project/h5p
+ case 'h5p_content':
+ return FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE;
+
+ // https://www.drupal.org/project/highlightjs
+ case 'highlight_js':
+ return FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE;
+
+ // https://www.drupal.org/project/htmLawed
+ case 'htmLawed':
+ return FilterInterface::TYPE_HTML_RESTRICTOR;
+
+ // https://www.drupal.org/project/htmlpurifier
+ case 'htmlpurifier_basic':
+ case 'htmlpurifier_advanced':
+ return FilterInterface::TYPE_HTML_RESTRICTOR;
+
+ // https://www.drupal.org/project/htmltidy
+ case 'htmltidy':
+ return FilterInterface::TYPE_HTML_RESTRICTOR;
+
+ // https://www.drupal.org/project/icon
+ case 'icon_filter':
+ return FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE;
+
+ // https://www.drupal.org/project/iframe_filter
+ case 'iframe':
+ return FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE;
+
+ // https://www.drupal.org/project/image_resize_filter
+ case 'image_resize_filter':
+ return FilterInterface::TYPE_TRANSFORM_REVERSIBLE;
+
+ // https://www.drupal.org/project/insert_view
+ case 'insert_view':
+ return FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE;
+
+ // https://www.drupal.org/project/intlinks
+ case 'intlinks title':
+ case 'intlinks hide bad':
+ return FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE;
+
+ // https://www.drupal.org/project/jquery_ui_filter
+ case 'accordion':
+ case 'dialog':
+ case 'tabs':
+ return FilterInterface::TYPE_MARKUP_LANGUAGE;
+
+ // https://www.drupal.org/project/language_sections
+ case 'language_sections':
+ return FilterInterface::TYPE_MARKUP_LANGUAGE;
+
+ // https://www.drupal.org/project/lazy
+ case 'lazy_filter':
+ return FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE;
+
+ // https://www.drupal.org/project/lazyloader_filter
+ case 'lazyloader_filter':
+ return FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE;
+
+ // https://www.drupal.org/project/link_node
+ case 'filter_link_node':
+ return FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE;
+
+ // https://www.drupal.org/project/linktitle
+ case 'linktitle':
+ return FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE;
+
+ // https://www.drupal.org/project/markdown
+ case 'filter_markdown':
+ return FilterInterface::TYPE_MARKUP_LANGUAGE;
+
+ // https://www.drupal.org/project/media_wysiwyg
+ case 'media_filter':
+ case 'media_filter_paragraph_fix':
+ return FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE;
+
+ // https://www.drupal.org/project/mentions
+ case 'filter_mentions':
+ return FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE;
+
+ // https://www.drupal.org/project/menu_filter
+ case 'menu_filter':
+ return FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE;
+
+ // https://www.drupal.org/project/mobile_codes
+ case 'mobile_codes':
+ return FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE;
+
+ // https://www.drupal.org/project/multicolumn
+ case 'multicolumn':
+ return FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE;
+
+ // https://www.drupal.org/project/multilink
+ case 'multilink_filter':
+ return FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE;
+
+ // https://www.drupal.org/project/mytube
+ case 'mytube':
+ return FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE;
+
+ // https://www.drupal.org/project/node_embed
+ case 'node_embed':
+ return FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE;
+
+ // https://www.drupal.org/project/node_field_embed
+ case 'node_field_embed':
+ return FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE;
+
+ // https://www.drupal.org/project/noindex_external_links
+ case 'external_links':
+ return FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE;
+
+ // https://www.drupal.org/project/noreferrer
+ case 'noreferrer':
+ return FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE;
+
+ // https://www.drupal.org/project/oembed
+ case 'oembed':
+ case 'oembed_legacy':
+ return FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE;
+
+ // https://www.drupal.org/project/office_html
+ case 'office_html_strip':
+ return FilterInterface::TYPE_HTML_RESTRICTOR;
+
+ case 'office_html_convert':
+ return FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE;
+
+ // https://www.drupal.org/project/openlayers_filters
+ case 'openlayers':
+ return FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE;
+
+ // https://www.drupal.org/project/opengraph_filter
+ case 'opengraph_filter':
+ return FilterInterface::TYPE_TRANSFORM_REVERSIBLE;
+
+ // https://www.drupal.org/project/pathologic
+ case 'pathologic':
+ return FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE;
+
+ // https://www.drupal.org/project/popup
+ case 'popup_tags':
+ return FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE;
+
+ // https://www.drupal.org/project/prettify
+ case 'prettify':
+ return FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE;
+
+ // https://www.drupal.org/project/rel_to_abs
+ case 'rel_to_abs':
+ return FilterInterface::TYPE_TRANSFORM_REVERSIBLE;
+
+ // https://www.drupal.org/project/rollover_filter
+ case 'rollover_filter':
+ return FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE;
+
+ // https://www.drupal.org/project/sanitizable
+ case 'sanitizable':
+ return FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE;
+
+ // https://www.drupal.org/project/smart_paging
+ case 'smart_paging_filter':
+ case 'smart_paging_filter_autop':
+ return FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE;
+
+ // https://www.drupal.org/project/spamspan
+ case 'spamspan':
+ return FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE;
+
+ // https://www.drupal.org/project/scald
+ case 'mee_scald_widgets':
+ return FilterInterface::TYPE_TRANSFORM_REVERSIBLE;
+
+ // https://www.drupal.org/project/script_filter
+ case 'script_filter':
+ return FilterInterface::TYPE_TRANSFORM_REVERSIBLE;
+
+ // https://www.drupal.org/project/shortcode
+ case 'shortcode':
+ return FilterInterface::TYPE_MARKUP_LANGUAGE;
+
+ case 'shortcode_text_corrector':
+ return FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE;
+
+ // https://www.drupal.org/project/smiley
+ case 'smiley':
+ return FilterInterface::TYPE_TRANSFORM_REVERSIBLE;
+
+ // https://www.drupal.org/project/svg_embed
+ case 'filter_svg_embed':
+ return FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE;
+
+ // https://www.drupal.org/project/spoiler
+ case 'spoiler':
+ return FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE;
+
+ // https://www.drupal.org/project/tableofcontents
+ case 'filter_toc':
+ return FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE;
+
+ // https://www.drupal.org/project/tables
+ case 'filter_tables':
+ return FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE;
+
+ // https://www.drupal.org/project/target_filter_url
+ case 'target_filter_url':
+ return FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE;
+
+ // https://www.drupal.org/project/textile
+ case 'textile':
+ return FilterInterface::TYPE_MARKUP_LANGUAGE;
+
+ // https://www.drupal.org/project/theme_filter
+ case 'theme_filter':
+ return FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE;
+
+ // https://www.drupal.org/project/token_filter
+ case 'filter_tokens':
+ return FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE;
+
+ // https://www.drupal.org/project/transliteration
+ case 'transliteration':
+ return FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE;
+
+ // https://www.drupal.org/project/typogrify
+ case 'typogrify':
+ return FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE;
+
+ // https://www.drupal.org/project/uuid_link
+ case 'uuid_link_filter':
+ return FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE;
+
+ // https://www.drupal.org/project/wysiwyg
+ case 'wysiwyg':
+ case 'wysiwyg_template_cleanup':
+ return FilterInterface::TYPE_HTML_RESTRICTOR;
+
+ // https://www.drupal.org/project/word_link
+ case 'word_link':
+ return FilterInterface::TYPE_TRANSFORM_REVERSIBLE;
+
+ // https://www.drupal.org/project/wordfilter
+ case 'wordfilter':
+ return FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE;
+
+ // https://www.drupal.org/project/xbbcode
+ case 'xbbcode':
+ return FilterInterface::TYPE_MARKUP_LANGUAGE;
+ }
+
+ return NULL;
+ }
+
}
diff --git a/web/core/modules/filter/tests/src/Functional/FilterAdminTest.php b/web/core/modules/filter/tests/src/Functional/FilterAdminTest.php
index 3f608265ad..ea18cffa77 100644
--- a/web/core/modules/filter/tests/src/Functional/FilterAdminTest.php
+++ b/web/core/modules/filter/tests/src/Functional/FilterAdminTest.php
@@ -20,7 +20,13 @@ class FilterAdminTest extends BrowserTestBase {
/**
* {@inheritdoc}
*/
- public static $modules = ['block', 'filter', 'node', 'filter_test_plugin', 'dblog'];
+ public static $modules = [
+ 'block',
+ 'filter',
+ 'node',
+ 'filter_test_plugin',
+ 'dblog',
+ ];
/**
* {@inheritdoc}
@@ -157,7 +163,7 @@ public function testFormatAdmin() {
// Verify that disabled text format no longer exists.
$this->drupalGet('admin/config/content/formats/manage/' . $format_id);
- $this->assertResponse(404, 'Disabled text format no longer exists.');
+ $this->assertSession()->statusCodeEquals(404);
// Attempt to create a format of the same machine name as the disabled
// format but with a different human readable name.
@@ -197,7 +203,7 @@ public function testFilterAdmin() {
$this->drupalGet('admin/config/content/formats');
$this->assertNoRaw('admin/config/content/formats/manage/' . $plain . '/disable', 'Disable link for the fallback format not found.');
$this->drupalGet('admin/config/content/formats/manage/' . $plain . '/disable');
- $this->assertResponse(403, 'The fallback format cannot be disabled.');
+ $this->assertSession()->statusCodeEquals(403);
// Verify access permissions to Full HTML format.
$full_format = FilterFormat::load($full);
diff --git a/web/core/modules/filter/tests/src/Functional/FilterFormatAccessTest.php b/web/core/modules/filter/tests/src/Functional/FilterFormatAccessTest.php
index c6ef59b69f..422cff573a 100644
--- a/web/core/modules/filter/tests/src/Functional/FilterFormatAccessTest.php
+++ b/web/core/modules/filter/tests/src/Functional/FilterFormatAccessTest.php
@@ -136,9 +136,9 @@ public function testFormatPermissions() {
// Perform similar checks as above, but now against the entire list of
// available formats for this user.
- $this->assertTrue(in_array($this->allowedFormat->id(), array_keys(filter_formats($this->webUser))), 'The allowed format appears in the list of available formats for a regular user.');
- $this->assertFalse(in_array($this->disallowedFormat->id(), array_keys(filter_formats($this->webUser))), 'The disallowed format does not appear in the list of available formats for a regular user.');
- $this->assertTrue(in_array(filter_fallback_format(), array_keys(filter_formats($this->webUser))), 'The fallback format appears in the list of available formats for a regular user.');
+ $this->assertContains($this->allowedFormat->id(), array_keys(filter_formats($this->webUser)), 'The allowed format appears in the list of available formats for a regular user.');
+ $this->assertNotContains($this->disallowedFormat->id(), array_keys(filter_formats($this->webUser)), 'The disallowed format does not appear in the list of available formats for a regular user.');
+ $this->assertContains(filter_fallback_format(), array_keys(filter_formats($this->webUser)), 'The fallback format appears in the list of available formats for a regular user.');
// Make sure that a regular user only has permission to use the format
// they were granted access to.
@@ -163,24 +163,24 @@ public function testFormatPermissions() {
// Check regular user access to the filter tips pages.
$this->drupalGet('filter/tips/' . $this->allowedFormat->id());
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->drupalGet('filter/tips/' . $this->disallowedFormat->id());
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
$this->drupalGet('filter/tips/' . filter_fallback_format());
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->drupalGet('filter/tips/invalid-format');
- $this->assertResponse(404);
+ $this->assertSession()->statusCodeEquals(404);
// Check admin user access to the filter tips pages.
$this->drupalLogin($this->adminUser);
$this->drupalGet('filter/tips/' . $this->allowedFormat->id());
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->drupalGet('filter/tips/' . $this->disallowedFormat->id());
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->drupalGet('filter/tips/' . filter_fallback_format());
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->drupalGet('filter/tips/invalid-format');
- $this->assertResponse(404);
+ $this->assertSession()->statusCodeEquals(404);
}
/**
@@ -194,17 +194,17 @@ public function testFormatRoles() {
// Check that this role appears in the list of roles that have access to an
// allowed text format, but does not appear in the list of roles that have
// access to a disallowed text format.
- $this->assertTrue(in_array($rid, array_keys(filter_get_roles_by_format($this->allowedFormat))), 'A role which has access to a text format appears in the list of roles that have access to that format.');
- $this->assertFalse(in_array($rid, array_keys(filter_get_roles_by_format($this->disallowedFormat))), 'A role which does not have access to a text format does not appear in the list of roles that have access to that format.');
+ $this->assertContains($rid, array_keys(filter_get_roles_by_format($this->allowedFormat)), 'A role which has access to a text format appears in the list of roles that have access to that format.');
+ $this->assertNotContains($rid, array_keys(filter_get_roles_by_format($this->disallowedFormat)), 'A role which does not have access to a text format does not appear in the list of roles that have access to that format.');
// Check that the correct text format appears in the list of formats
// available to that role.
- $this->assertTrue(in_array($this->allowedFormat->id(), array_keys(filter_get_formats_by_role($rid))), 'A text format which a role has access to appears in the list of formats available to that role.');
- $this->assertFalse(in_array($this->disallowedFormat->id(), array_keys(filter_get_formats_by_role($rid))), 'A text format which a role does not have access to does not appear in the list of formats available to that role.');
+ $this->assertContains($this->allowedFormat->id(), array_keys(filter_get_formats_by_role($rid)), 'A text format which a role has access to appears in the list of formats available to that role.');
+ $this->assertNotContains($this->disallowedFormat->id(), array_keys(filter_get_formats_by_role($rid)), 'A text format which a role does not have access to does not appear in the list of formats available to that role.');
// Check that the fallback format is always allowed.
$this->assertEqual(filter_get_roles_by_format(FilterFormat::load(filter_fallback_format())), user_role_names(), 'All roles have access to the fallback format.');
- $this->assertTrue(in_array(filter_fallback_format(), array_keys(filter_get_formats_by_role($rid))), 'The fallback format appears in the list of allowed formats for any role.');
+ $this->assertContains(filter_fallback_format(), array_keys(filter_get_formats_by_role($rid)), 'The fallback format appears in the list of allowed formats for any role.');
}
/**
diff --git a/web/core/modules/filter/tests/src/Functional/Rest/FilterFormatResourceTestBase.php b/web/core/modules/filter/tests/src/Functional/Rest/FilterFormatResourceTestBase.php
index 5a0174a65a..0987ba58f9 100644
--- a/web/core/modules/filter/tests/src/Functional/Rest/FilterFormatResourceTestBase.php
+++ b/web/core/modules/filter/tests/src/Functional/Rest/FilterFormatResourceTestBase.php
@@ -34,7 +34,7 @@ protected function setUpAuthorization($method) {
*/
protected function createEntity() {
$pablo_format = FilterFormat::create([
- 'name' => 'Pablo Piccasso',
+ 'name' => 'Pablo Picasso',
'format' => 'pablo',
'langcode' => 'es',
'filters' => [
@@ -71,7 +71,7 @@ protected function getExpectedNormalizedEntity() {
],
'format' => 'pablo',
'langcode' => 'es',
- 'name' => 'Pablo Piccasso',
+ 'name' => 'Pablo Picasso',
'status' => TRUE,
'uuid' => $this->entity->uuid(),
'weight' => 0,
diff --git a/web/core/modules/filter/tests/src/Kernel/FilterAPITest.php b/web/core/modules/filter/tests/src/Kernel/FilterAPITest.php
index 7d2d4a8e13..936fe05536 100644
--- a/web/core/modules/filter/tests/src/Kernel/FilterAPITest.php
+++ b/web/core/modules/filter/tests/src/Kernel/FilterAPITest.php
@@ -335,7 +335,7 @@ public function testTypedDataAPI() {
$definition = DataDefinition::create('filter_format');
$data = \Drupal::typedDataManager()->create($definition);
- $this->assertTrue($data instanceof OptionsProviderInterface, 'Typed data object implements \Drupal\Core\TypedData\OptionsProviderInterface');
+ $this->assertInstanceOf(OptionsProviderInterface::class, $data);
$filtered_html_user = $this->createUser(['uid' => 2], [
FilterFormat::load('filtered_html')->getPermissionName(),
@@ -374,7 +374,7 @@ public function testTypedDataAPI() {
$data->setValue('plain_text');
$violations = $data->validate();
- $this->assertEqual(count($violations), 0, "No validation violation for format 'plain_text' found");
+ $this->assertCount(0, $violations, "No validation violation for format 'plain_text' found");
// Anonymous doesn't have access to the 'filtered_html' format.
$data->setValue('filtered_html');
@@ -384,7 +384,7 @@ public function testTypedDataAPI() {
// Set user with access to 'filtered_html' format.
\Drupal::currentUser()->setAccount($filtered_html_user);
$violations = $data->validate();
- $this->assertEqual(count($violations), 0, "No validation violation for accessible format 'filtered_html' found.");
+ $this->assertCount(0, $violations, "No validation violation for accessible format 'filtered_html' found.");
$allowed_values = $data->getSettableValues($filtered_html_user);
$this->assertEqual($allowed_values, ['filtered_html', 'plain_text']);
diff --git a/web/core/modules/filter/tests/src/Kernel/FilterCaptionTwigDebugTest.php b/web/core/modules/filter/tests/src/Kernel/FilterCaptionTwigDebugTest.php
index 495ba4d0ec..26200118c7 100644
--- a/web/core/modules/filter/tests/src/Kernel/FilterCaptionTwigDebugTest.php
+++ b/web/core/modules/filter/tests/src/Kernel/FilterCaptionTwigDebugTest.php
@@ -55,8 +55,8 @@ public function testCaptionFilter() {
$input = '<img src="llama.jpg" data-caption="Loquacious llama!" />';
$expected = '<img src="llama.jpg" /><figcaption>Loquacious llama!</figcaption>';
$output = $test($input)->getProcessedText();
- $this->assertContains($expected, $output);
- $this->assertContains("<!-- THEME HOOK: 'filter_caption' -->", $output);
+ $this->assertStringContainsString($expected, $output);
+ $this->assertStringContainsString("<!-- THEME HOOK: 'filter_caption' -->", $output);
}
}
diff --git a/web/core/modules/filter/tests/src/Kernel/FilterKernelTest.php b/web/core/modules/filter/tests/src/Kernel/FilterKernelTest.php
index 735521caeb..5c2ea33a12 100644
--- a/web/core/modules/filter/tests/src/Kernel/FilterKernelTest.php
+++ b/web/core/modules/filter/tests/src/Kernel/FilterKernelTest.php
@@ -879,28 +879,20 @@ public function assertFilteredString($filter, $tests) {
foreach ($tests as $source => $tasks) {
$result = $filter->process($source, $filter)->getProcessedText();
foreach ($tasks as $value => $is_expected) {
- // Not using assertIdentical, since combination with strpos() is hard to grok.
if ($is_expected) {
- $success = $this->assertTrue(strpos($result, $value) !== FALSE, new FormattableMarkup('@source: @value found. Filtered result: @result.', [
+ $this->assertStringContainsString($value, $result, new FormattableMarkup('@source: @value found. Filtered result: @result.', [
'@source' => var_export($source, TRUE),
'@value' => var_export($value, TRUE),
'@result' => var_export($result, TRUE),
]));
}
else {
- $success = $this->assertTrue(strpos($result, $value) === FALSE, new FormattableMarkup('@source: @value not found. Filtered result: @result.', [
+ $this->assertStringNotContainsString($value, $result, new FormattableMarkup('@source: @value not found. Filtered result: @result.', [
'@source' => var_export($source, TRUE),
'@value' => var_export($value, TRUE),
'@result' => var_export($result, TRUE),
]));
}
- if (!$success) {
- $this->verbose('Source:<pre>' . Html::escape(var_export($source, TRUE)) . '</pre>'
- . '<hr />' . 'Result:<pre>' . Html::escape(var_export($result, TRUE)) . '</pre>'
- . '<hr />' . ($is_expected ? 'Expected:' : 'Not expected:')
- . '<pre>' . Html::escape(var_export($value, TRUE)) . '</pre>'
- );
- }
}
}
}
@@ -1151,7 +1143,7 @@ public function testHtmlCorrectorFilter() {
* TRUE on pass, FALSE on fail.
*/
public function assertNormalized($haystack, $needle, $message = '', $group = 'Other') {
- return $this->assertTrue(strpos(strtolower(Html::decodeEntities($haystack)), $needle) !== FALSE, $message, $group);
+ return $this->assertStringContainsString($needle, strtolower(Html::decodeEntities($haystack)), $message);
}
/**
@@ -1176,7 +1168,7 @@ public function assertNormalized($haystack, $needle, $message = '', $group = 'Ot
* TRUE on pass, FALSE on fail.
*/
public function assertNoNormalized($haystack, $needle, $message = '', $group = 'Other') {
- return $this->assertTrue(strpos(strtolower(Html::decodeEntities($haystack)), $needle) === FALSE, $message, $group);
+ return $this->assertStringNotContainsString($needle, strtolower(Html::decodeEntities($haystack)), $message);
}
}
diff --git a/web/core/modules/filter/tests/src/Kernel/Plugin/migrate/process/FilterIdTest.php b/web/core/modules/filter/tests/src/Kernel/Plugin/migrate/process/FilterIdTest.php
index 2f8cee39bc..62d1909bfc 100644
--- a/web/core/modules/filter/tests/src/Kernel/Plugin/migrate/process/FilterIdTest.php
+++ b/web/core/modules/filter/tests/src/Kernel/Plugin/migrate/process/FilterIdTest.php
@@ -5,6 +5,7 @@
use Drupal\filter\Plugin\migrate\process\FilterID;
use Drupal\KernelTests\KernelTestBase;
use Drupal\migrate\MigrateExecutableInterface;
+use Drupal\migrate\MigrateSkipProcessException;
use Drupal\migrate\Plugin\MigrationInterface;
use Drupal\migrate\Row;
@@ -46,12 +47,15 @@ protected function setUp() {
* @param string $invalid_id
* (optional) The invalid plugin ID which is expected to be logged by the
* MigrateExecutable object.
+ * @param bool $skip_exception
+ * (optional) Set to TRUE if we expect the filter to be skipped because it
+ * is a transformation-only filter.
*
* @dataProvider provideFilters
*
* @covers ::transform
*/
- public function testTransform($value, $expected_value, $invalid_id = NULL) {
+ public function testTransform($value, $expected_value, $invalid_id = NULL, $skip_exception = FALSE) {
$configuration = [
'bypass' => TRUE,
'map' => [
@@ -61,6 +65,18 @@ public function testTransform($value, $expected_value, $invalid_id = NULL) {
];
$plugin = FilterID::create($this->container, $configuration, 'filter_id', []);
+ if ($skip_exception) {
+ $this->executable
+ ->expects($this->exactly(1))
+ ->method('saveMessage')
+ ->with(
+ sprintf('Filter %s could not be mapped to an existing filter plugin; omitted since it is a transformation-only filter. Install and configure a successor after the migration.', $value),
+ MigrationInterface::MESSAGE_INFORMATIONAL
+ );
+ $this->expectException(MigrateSkipProcessException::class);
+ $this->expectExceptionMessage(sprintf("The transformation-only filter %s was skipped.", $value));
+ }
+
if (isset($invalid_id)) {
$this->executable
->expects($this->exactly(1))
@@ -110,6 +126,16 @@ public function provideFilters() {
'filter_null',
'filter:1',
],
+ 'transformation-only D7 contrib filter' => [
+ 'editor_align',
+ '',
+ NULL,
+ TRUE,
+ ],
+ 'non-transformation-only D7 contrib filter' => [
+ 'bbcode',
+ 'filter_null',
+ ],
];
}
diff --git a/web/core/modules/filter/tests/src/Kernel/TextFormatElementFormTest.php b/web/core/modules/filter/tests/src/Kernel/TextFormatElementFormTest.php
index 8fca62e965..cb90f5e0f4 100644
--- a/web/core/modules/filter/tests/src/Kernel/TextFormatElementFormTest.php
+++ b/web/core/modules/filter/tests/src/Kernel/TextFormatElementFormTest.php
@@ -28,7 +28,13 @@ class TextFormatElementFormTest extends KernelTestBase implements FormInterface
*
* @var array
*/
- public static $modules = ['system', 'user', 'filter', 'filter_test', 'editor'];
+ public static $modules = [
+ 'system',
+ 'user',
+ 'filter',
+ 'filter_test',
+ 'editor',
+ ];
/**
* Sets up the test.
diff --git a/web/core/modules/forum/forum.install b/web/core/modules/forum/forum.install
index 4a16a8939a..1cc8ca3e58 100644
--- a/web/core/modules/forum/forum.install
+++ b/web/core/modules/forum/forum.install
@@ -11,7 +11,7 @@
/**
* Implements hook_install().
*/
-function forum_install() {
+function forum_install($is_syncing) {
// Set the weight of the forum.module to 1 so it is loaded after the taxonomy.module.
module_set_weight('forum', 1);
// Do not allow to delete the forum's node type machine name.
@@ -19,7 +19,7 @@ function forum_install() {
$locked['forum'] = 'forum';
\Drupal::state()->set('node.type.locked', $locked);
- if (!\Drupal::service('config.installer')->isSyncing()) {
+ if (!$is_syncing) {
// Create a default forum so forum posts can be created.
$term = Term::create([
'name' => t('General discussion'),
diff --git a/web/core/modules/forum/src/Breadcrumb/ForumListingBreadcrumbBuilder.php b/web/core/modules/forum/src/Breadcrumb/ForumListingBreadcrumbBuilder.php
index 91ea1a01c3..cb3bd89f89 100644
--- a/web/core/modules/forum/src/Breadcrumb/ForumListingBreadcrumbBuilder.php
+++ b/web/core/modules/forum/src/Breadcrumb/ForumListingBreadcrumbBuilder.php
@@ -25,7 +25,7 @@ public function build(RouteMatchInterface $route_match) {
$breadcrumb->addCacheContexts(['route']);
// Add all parent forums to breadcrumbs.
- /** @var \Drupal\Taxonomy\TermInterface $term */
+ /** @var \Drupal\taxonomy\TermInterface $term */
$term = $route_match->getParameter('taxonomy_term');
$term_id = $term->id();
$breadcrumb->addCacheableDependency($term);
diff --git a/web/core/modules/forum/tests/src/Functional/ForumNodeAccessTest.php b/web/core/modules/forum/tests/src/Functional/ForumNodeAccessTest.php
index 212bbdd2b5..e18efd9367 100644
--- a/web/core/modules/forum/tests/src/Functional/ForumNodeAccessTest.php
+++ b/web/core/modules/forum/tests/src/Functional/ForumNodeAccessTest.php
@@ -17,7 +17,15 @@ class ForumNodeAccessTest extends BrowserTestBase {
*
* @var array
*/
- public static $modules = ['node', 'comment', 'forum', 'taxonomy', 'tracker', 'node_access_test', 'block'];
+ public static $modules = [
+ 'node',
+ 'comment',
+ 'forum',
+ 'taxonomy',
+ 'tracker',
+ 'node_access_test',
+ 'block',
+ ];
/**
* {@inheritdoc}
diff --git a/web/core/modules/forum/tests/src/Functional/ForumTest.php b/web/core/modules/forum/tests/src/Functional/ForumTest.php
index d906baf278..fd54ff9998 100644
--- a/web/core/modules/forum/tests/src/Functional/ForumTest.php
+++ b/web/core/modules/forum/tests/src/Functional/ForumTest.php
@@ -26,7 +26,15 @@ class ForumTest extends BrowserTestBase {
*
* @var array
*/
- public static $modules = ['taxonomy', 'comment', 'forum', 'node', 'block', 'menu_ui', 'help'];
+ public static $modules = [
+ 'taxonomy',
+ 'comment',
+ 'forum',
+ 'node',
+ 'block',
+ 'menu_ui',
+ 'help',
+ ];
/**
* {@inheritdoc}
@@ -209,7 +217,7 @@ public function testForum() {
$this->assertStringStartsWith('6 new posts', $elements[0]->getText(), 'Number of unread topics found.');
// Verify that the forum name is in the unread topics text.
$elements = $this->xpath('//tr[@id=:forum]//em[@class="placeholder"]', $forum_arg);
- $this->assertContains($this->forum['name'], $elements[0]->getText(), 'Forum name found in unread topics text.');
+ $this->assertStringContainsString($this->forum['name'], $elements[0]->getText(), 'Forum name found in unread topics text.');
// Verify total number of posts in forum.
$elements = $this->xpath('//tr[@id=:forum]//td[@class="forum__posts"]', $forum_arg);
@@ -227,23 +235,23 @@ public function testForum() {
$edit = [];
$edit['comment_body[0][value]'] = $this->randomMachineName();
$this->drupalPostForm('node/' . $node->id(), $edit, t('Save'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Test editing a forum topic that has a comment.
$this->drupalLogin($this->editAnyTopicsUser);
$this->drupalGet('forum/' . $this->forum['tid']);
$this->drupalPostForm('node/' . $node->id() . '/edit', [], t('Save'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Test the root forum page title change.
$this->drupalGet('forum');
$this->assertCacheTag('config:taxonomy.vocabulary.' . $this->forum['vid']);
- $this->assertTitle(t('Forums | Drupal'));
+ $this->assertTitle('Forums | Drupal');
$vocabulary = Vocabulary::load($this->forum['vid']);
$vocabulary->set('name', 'Discussions');
$vocabulary->save();
$this->drupalGet('forum');
- $this->assertTitle(t('Discussions | Drupal'));
+ $this->assertTitle('Discussions | Drupal');
// Test anonymous action link.
$this->drupalLogout();
@@ -299,7 +307,7 @@ private function doAdminTests($user) {
// Add forum to the Tools menu.
$edit = [];
$this->drupalPostForm('admin/structure/menu/manage/tools', $edit, t('Save'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Edit forum taxonomy.
// Restoration of the settings fails and causes subsequent tests to fail.
@@ -382,7 +390,7 @@ public function editForumVocabulary() {
// Edit the vocabulary.
$this->drupalPostForm('admin/structure/taxonomy/manage/' . $original_vocabulary->id(), $edit, t('Save'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertRaw(t('Updated vocabulary %name.', ['%name' => $edit['name']]), 'Vocabulary was edited');
// Grab the newly edited vocabulary.
@@ -426,7 +434,7 @@ public function createForum($type, $parent = 0) {
// Create forum.
$this->drupalPostForm('admin/structure/forum/add/' . $type, $edit, t('Save'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$type = ($type == 'container') ? 'forum container' : 'forum';
$this->assertText(
t(
@@ -483,7 +491,7 @@ public function deleteForum($tid) {
// Assert that the forum no longer exists.
$this->drupalGet('forum/' . $tid);
- $this->assertResponse(404, 'The forum was not found');
+ $this->assertSession()->statusCodeEquals(404);
}
/**
@@ -525,18 +533,18 @@ public function testForumWithNewPost() {
$edit['subject[0][value]'] = $this->randomMachineName();
$edit['comment_body[0][value]'] = $this->randomMachineName();
$this->drupalPostForm('node/' . $node->id(), $edit, t('Save'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Test replying to a comment.
$this->clickLink('Reply');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertFieldByName('comment_body[0][value]');
// Log in as the first user.
$this->drupalLogin($this->adminUser);
// Check that forum renders properly.
$this->drupalGet("forum/{$this->forum['tid']}");
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Verify there is no unintentional HTML tag escaping.
$this->assertNoEscaped('<', '');
@@ -610,9 +618,9 @@ private function verifyForums(EntityInterface $node, $admin, $response = 200) {
// View forum help node.
$this->drupalGet('admin/help/forum');
- $this->assertResponse($response2);
+ $this->assertSession()->statusCodeEquals($response2);
if ($response2 == 200) {
- $this->assertTitle(t('Forum | Drupal'), 'Forum help title was displayed');
+ $this->assertTitle('Forum | Drupal');
$this->assertText(t('Forum'), 'Forum help node was displayed');
}
@@ -625,8 +633,8 @@ private function verifyForums(EntityInterface $node, $admin, $response = 200) {
// View forum node.
$this->drupalGet('node/' . $node->id());
- $this->assertResponse(200);
- $this->assertTitle($node->label() . ' | Drupal', 'Forum node was displayed');
+ $this->assertSession()->statusCodeEquals(200);
+ $this->assertTitle($node->label() . ' | Drupal');
$breadcrumb_build = [
Link::createFromRoute(t('Home'), '<front>'),
Link::createFromRoute(t('Forums'), 'forum.index'),
@@ -641,9 +649,9 @@ private function verifyForums(EntityInterface $node, $admin, $response = 200) {
// View forum edit node.
$this->drupalGet('node/' . $node->id() . '/edit');
- $this->assertResponse($response);
+ $this->assertSession()->statusCodeEquals($response);
if ($response == 200) {
- $this->assertTitle('Edit Forum topic ' . $node->label() . ' | Drupal', 'Forum edit node was displayed');
+ $this->assertTitle('Edit Forum topic ' . $node->label() . ' | Drupal');
}
if ($response == 200) {
@@ -670,7 +678,7 @@ private function verifyForums(EntityInterface $node, $admin, $response = 200) {
// Delete forum node.
$this->drupalPostForm('node/' . $node->id() . '/delete', [], t('Delete'));
- $this->assertResponse($response);
+ $this->assertSession()->statusCodeEquals($response);
$this->assertRaw(t('Forum topic %title has been deleted.', ['%title' => $edit['title[0][value]']]), 'Forum node was deleted');
}
}
@@ -686,7 +694,7 @@ private function verifyForums(EntityInterface $node, $admin, $response = 200) {
private function verifyForumView($forum, $parent = NULL) {
// View forum page.
$this->drupalGet('forum/' . $forum['tid']);
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertTitle($forum['name'] . ' | Drupal');
$breadcrumb_build = [
diff --git a/web/core/modules/forum/tests/src/Functional/ForumUninstallTest.php b/web/core/modules/forum/tests/src/Functional/ForumUninstallTest.php
index 84c81c8933..78e4492f6d 100644
--- a/web/core/modules/forum/tests/src/Functional/ForumUninstallTest.php
+++ b/web/core/modules/forum/tests/src/Functional/ForumUninstallTest.php
@@ -118,7 +118,7 @@ public function testForumUninstallWithField() {
$this->drupalGet('admin/structure/types/manage/forum');
$this->clickLink(t('Delete'));
$this->drupalPostForm(NULL, [], t('Delete'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertFalse((bool) NodeType::load('forum'), 'Node type with machine forum deleted.');
// Double check everything by reinstalling the forum module again.
diff --git a/web/core/modules/forum/tests/src/Kernel/ForumValidationTest.php b/web/core/modules/forum/tests/src/Kernel/ForumValidationTest.php
index 9b9661b5a2..0dc47ebe25 100644
--- a/web/core/modules/forum/tests/src/Kernel/ForumValidationTest.php
+++ b/web/core/modules/forum/tests/src/Kernel/ForumValidationTest.php
@@ -45,18 +45,18 @@ public function testValidation() {
]);
$violations = $forum_post->validate();
- $this->assertEqual(count($violations), 1);
+ $this->assertCount(1, $violations);
$this->assertEqual($violations[0]->getMessage(), 'This value should not be null.');
// Add the forum term.
$forum_post->set('taxonomy_forums', $forum);
$violations = $forum_post->validate();
- $this->assertEqual(count($violations), 0);
+ $this->assertCount(0, $violations);
// Try to use a container.
$forum_post->set('taxonomy_forums', $container);
$violations = $forum_post->validate();
- $this->assertEqual(count($violations), 1);
+ $this->assertCount(1, $violations);
$this->assertEqual($violations[0]->getMessage(), t('The item %forum is a forum container, not a forum. Select one of the forums below instead.', [
'%forum' => $container->label(),
]));
diff --git a/web/core/modules/forum/tests/src/Kernel/Migrate/d6/MigrateForumTest.php b/web/core/modules/forum/tests/src/Kernel/Migrate/d6/MigrateForumTest.php
index 6f5d48c1dd..f70725a132 100644
--- a/web/core/modules/forum/tests/src/Kernel/Migrate/d6/MigrateForumTest.php
+++ b/web/core/modules/forum/tests/src/Kernel/Migrate/d6/MigrateForumTest.php
@@ -63,11 +63,11 @@ public function testForumMigration() {
// Tests that the taxonomy_forums entity view display component exists.
$entity_view_display = EntityViewDisplay::load('node.forum.default')->getComponent('taxonomy_forums');
- $this->assertTrue(is_array($entity_view_display));
+ $this->assertIsArray($entity_view_display);
// Tests that the taxonomy_forums entity form display component exists.
$entity_form_display = EntityFormDisplay::load('node.forum.default')->getComponent('taxonomy_forums');
- $this->assertTrue(is_array($entity_form_display));
+ $this->assertIsArray($entity_form_display);
// Test that the taxonomy_forums field has the right value.
$node = Node::load(19);
diff --git a/web/core/modules/hal/src/Normalizer/ContentEntityNormalizer.php b/web/core/modules/hal/src/Normalizer/ContentEntityNormalizer.php
index aec86c9124..80a71f7151 100644
--- a/web/core/modules/hal/src/Normalizer/ContentEntityNormalizer.php
+++ b/web/core/modules/hal/src/Normalizer/ContentEntityNormalizer.php
@@ -11,6 +11,7 @@
use Drupal\Core\Entity\EntityTypeRepositoryInterface;
use Drupal\Core\Extension\ModuleHandlerInterface;
use Drupal\Core\TypedData\TypedDataInternalPropertiesHelper;
+use Drupal\Core\Url;
use Drupal\hal\LinkManager\LinkManagerInterface;
use Drupal\serialization\Normalizer\FieldableEntityNormalizerTrait;
use Symfony\Component\Serializer\Exception\UnexpectedValueException;
@@ -213,10 +214,22 @@ public function denormalize($data, $class, $format = NULL, array $context = [])
*/
protected function getEntityUri(EntityInterface $entity, array $context = []) {
// Some entity types don't provide a canonical link template.
- if ($entity->isNew() || !$entity->hasLinkTemplate('canonical')) {
+ if ($entity->isNew()) {
return '';
}
- $url = $entity->toUrl('canonical', ['absolute' => TRUE]);
+
+ $route_name = 'rest.entity.' . $entity->getEntityTypeId() . '.GET';
+ if ($entity->hasLinkTemplate('canonical')) {
+ $url = $entity->toUrl('canonical');
+ }
+ elseif (\Drupal::service('router.route_provider')->getRoutesByNames([$route_name])) {
+ $url = Url::fromRoute('rest.entity.' . $entity->getEntityTypeId() . '.GET', [$entity->getEntityTypeId() => $entity->id()]);
+ }
+ else {
+ return '';
+ }
+
+ $url->setAbsolute(TRUE);
if (!$url->isExternal()) {
$url->setRouteParameter('_format', 'hal_json');
}
diff --git a/web/core/modules/hal/src/Normalizer/EntityReferenceItemNormalizer.php b/web/core/modules/hal/src/Normalizer/EntityReferenceItemNormalizer.php
index c2d65bfdbc..1c9d529570 100644
--- a/web/core/modules/hal/src/Normalizer/EntityReferenceItemNormalizer.php
+++ b/web/core/modules/hal/src/Normalizer/EntityReferenceItemNormalizer.php
@@ -84,7 +84,7 @@ public function normalize($field_item, $format = NULL, array $context = []) {
$embedded = $this->serializer->normalize($target_entity, $format, $context);
// @todo https://www.drupal.org/project/drupal/issues/3110815 $embedded will
// be NULL if the target entity does not exist. Use null coalescence
- // operator to preserve behaviour in PHP 7.4.
+ // operator to preserve behavior in PHP 7.4.
$link = $embedded['_links']['self'] ?? NULL;
// If the field is translatable, add the langcode to the link relation
// object. This does not indicate the language of the target entity.
diff --git a/web/core/modules/hal/tests/src/Kernel/HalLinkManagerTest.php b/web/core/modules/hal/tests/src/Kernel/HalLinkManagerTest.php
index 05a6b39f1e..2cd9f6834d 100644
--- a/web/core/modules/hal/tests/src/Kernel/HalLinkManagerTest.php
+++ b/web/core/modules/hal/tests/src/Kernel/HalLinkManagerTest.php
@@ -20,7 +20,15 @@ class HalLinkManagerTest extends KernelTestBase {
/**
* {@inheritdoc}
*/
- public static $modules = ['hal', 'hal_test', 'serialization', 'system', 'node', 'user', 'field'];
+ public static $modules = [
+ 'hal',
+ 'hal_test',
+ 'serialization',
+ 'system',
+ 'node',
+ 'user',
+ 'field',
+ ];
/**
* {@inheritdoc}
diff --git a/web/core/modules/hal/tests/src/Kernel/NormalizerTestBase.php b/web/core/modules/hal/tests/src/Kernel/NormalizerTestBase.php
index ef51a077c9..ca00820f0c 100644
--- a/web/core/modules/hal/tests/src/Kernel/NormalizerTestBase.php
+++ b/web/core/modules/hal/tests/src/Kernel/NormalizerTestBase.php
@@ -17,7 +17,17 @@ abstract class NormalizerTestBase extends KernelTestBase {
*
* @var array
*/
- public static $modules = ['entity_test', 'field', 'hal', 'language', 'serialization', 'system', 'text', 'user', 'filter'];
+ public static $modules = [
+ 'entity_test',
+ 'field',
+ 'hal',
+ 'language',
+ 'serialization',
+ 'system',
+ 'text',
+ 'user',
+ 'filter',
+ ];
/**
* The mock serializer.
diff --git a/web/core/modules/help/tests/modules/help_page_test/help_page_test.module b/web/core/modules/help/tests/modules/help_page_test/help_page_test.module
index f57728d53f..49aac7a6b7 100644
--- a/web/core/modules/help/tests/modules/help_page_test/help_page_test.module
+++ b/web/core/modules/help/tests/modules/help_page_test/help_page_test.module
@@ -17,8 +17,10 @@ function help_page_test_help($route_name, RouteMatchInterface $route_match) {
// Make the help text conform to core standards. See
// \Drupal\system\Tests\Module\InstallUninstallTest::assertHelp().
return t('Read the <a href=":url">online documentation for the Help Page Test module</a>.', [':url' => 'http://www.example.com']);
+
case 'help_page_test.has_help':
return t('I have help!');
+
case 'help_page_test.test_array':
return ['#markup' => 'Help text from help_page_test_help module.'];
}
diff --git a/web/core/modules/help/tests/src/Functional/ExperimentalHelpTest.php b/web/core/modules/help/tests/src/Functional/ExperimentalHelpTest.php
index ab8d2aca2f..1c981f3cda 100644
--- a/web/core/modules/help/tests/src/Functional/ExperimentalHelpTest.php
+++ b/web/core/modules/help/tests/src/Functional/ExperimentalHelpTest.php
@@ -19,7 +19,11 @@ class ExperimentalHelpTest extends BrowserTestBase {
*
* @var array
*/
- public static $modules = ['help', 'experimental_module_test', 'help_page_test'];
+ public static $modules = [
+ 'help',
+ 'experimental_module_test',
+ 'help_page_test',
+ ];
/**
* {@inheritdoc}
@@ -34,7 +38,7 @@ class ExperimentalHelpTest extends BrowserTestBase {
protected $adminUser;
/**
- * {@inheritoc}
+ * {@inheritdoc}
*/
protected function setUp() {
parent::setUp();
@@ -54,7 +58,7 @@ public function testExperimentalHelp() {
$this->assertNoText('This module is experimental.');
// Ensure the actual help page is displayed to avoid a false positive.
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertText('online documentation for the Help Page Test module');
}
diff --git a/web/core/modules/help/tests/src/Functional/HelpBlockTest.php b/web/core/modules/help/tests/src/Functional/HelpBlockTest.php
index f4f8db5b13..8400e00fc2 100644
--- a/web/core/modules/help/tests/src/Functional/HelpBlockTest.php
+++ b/web/core/modules/help/tests/src/Functional/HelpBlockTest.php
@@ -14,7 +14,12 @@ class HelpBlockTest extends BrowserTestBase {
/**
* {@inheritdoc}
*/
- public static $modules = ['help', 'help_page_test', 'block', 'more_help_page_test'];
+ public static $modules = [
+ 'help',
+ 'help_page_test',
+ 'block',
+ 'more_help_page_test',
+ ];
/**
* {@inheritdoc}
diff --git a/web/core/modules/help/tests/src/Functional/HelpTest.php b/web/core/modules/help/tests/src/Functional/HelpTest.php
index c78d18cf6f..199f6809c1 100644
--- a/web/core/modules/help/tests/src/Functional/HelpTest.php
+++ b/web/core/modules/help/tests/src/Functional/HelpTest.php
@@ -114,7 +114,7 @@ public function testHelp() {
*/
protected function verifyHelp($response = 200) {
$this->drupalGet('admin/index');
- $this->assertResponse($response);
+ $this->assertSession()->statusCodeEquals($response);
if ($response == 200) {
$this->assertText('This page shows you all available administration tasks for each module.');
}
@@ -125,9 +125,9 @@ protected function verifyHelp($response = 200) {
foreach ($this->getModuleList() as $module => $name) {
// View module help page.
$this->drupalGet('admin/help/' . $module);
- $this->assertResponse($response);
+ $this->assertSession()->statusCodeEquals($response);
if ($response == 200) {
- $this->assertTitle($name . ' | Drupal', new FormattableMarkup('%module title was displayed', ['%module' => $module]));
+ $this->assertTitle("$name | Drupal");
$this->assertEquals($name, $this->cssSelect('h1.page-title')[0]->getText(), "$module heading was displayed");
$info = \Drupal::service('extension.list.module')->getExtensionInfo($module);
$admin_tasks = system_get_module_admin_tasks($module, $info);
diff --git a/web/core/modules/help/tests/src/Functional/NoHelpTest.php b/web/core/modules/help/tests/src/Functional/NoHelpTest.php
index 0b68c0d225..637cc4848e 100644
--- a/web/core/modules/help/tests/src/Functional/NoHelpTest.php
+++ b/web/core/modules/help/tests/src/Functional/NoHelpTest.php
@@ -42,13 +42,15 @@ public function testMainPageNoHelp() {
$this->drupalLogin($this->adminUser);
$this->drupalGet('admin/help');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertText('Module overviews are provided by modules');
$this->assertFalse(\Drupal::moduleHandler()->implementsHook('menu_test', 'help'), 'The menu_test module does not implement hook_help');
$this->assertNoText(\Drupal::moduleHandler()->getName('menu_test'), 'Making sure the test module menu_test does not display a help link on admin/help.');
+ // Ensure that the module overview help page for a module that does not
+ // implement hook_help() results in a 404.
$this->drupalGet('admin/help/menu_test');
- $this->assertResponse(404, 'Getting a module overview help page for a module that does not implement hook_help() results in a 404.');
+ $this->assertSession()->statusCodeEquals(404);
}
}
diff --git a/web/core/modules/help_topics/help_topics/ban.banning_ips.html.twig b/web/core/modules/help_topics/help_topics/ban.banning_ips.html.twig
new file mode 100644
index 0000000000..ef10c82e64
--- /dev/null
+++ b/web/core/modules/help_topics/help_topics/ban.banning_ips.html.twig
@@ -0,0 +1,14 @@
+---
+label: 'Banning IP addresses'
+related:
+ - user.overview
+---
+{% set ban = render_var(url('ban.admin_page')) %}
+<h2>{% trans %}Goal{% endtrans %}</h2>
+<p>{% trans %}Ban visitors from one or more IP addresses from accessing and viewing your site.{% endtrans %}</p>
+<h2>{% trans %}Steps{% endtrans %}</h2>
+<ol>
+ <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Configuration</em> > <em>People</em> > <a href="{{ ban }}"><em>IP address bans</em></a>{% endtrans %}</li>
+ <li>{% trans %}Enter an <em>IP address</em> and click <em>Add</em>.{% endtrans %}</li>
+ <li>{% trans %}You should see the IP address you entered listed under <em>Banned IP addresses</em>. Repeat the above steps to ban additional IP addresses.{% endtrans %}</li>
+</ol>
diff --git a/web/core/modules/help_topics/help_topics/block.overview.html.twig b/web/core/modules/help_topics/help_topics/block.overview.html.twig
index 055ee6c374..6bf8e630f8 100644
--- a/web/core/modules/help_topics/help_topics/block.overview.html.twig
+++ b/web/core/modules/help_topics/help_topics/block.overview.html.twig
@@ -1,6 +1,8 @@
---
label: 'Managing blocks'
top_level: true
+related:
+ - core.content_structure
---
<h2>{% trans %}What are blocks?{% endtrans %}</h2>
<p>{% trans %}Blocks are boxes of content rendered into an area, or region, of a web page of your site. Blocks are placed and configured specifically for each theme.{% endtrans %}</p>
diff --git a/web/core/modules/help_topics/help_topics/block_content.type.html.twig b/web/core/modules/help_topics/help_topics/block_content.type.html.twig
index 7ef57a1d6d..5b7400db08 100644
--- a/web/core/modules/help_topics/help_topics/block_content.type.html.twig
+++ b/web/core/modules/help_topics/help_topics/block_content.type.html.twig
@@ -5,6 +5,9 @@ related:
- block.configure
- block.place
- block_content.add
+ - field_ui.add_field
+ - field_ui.manage_form
+ - field_ui.manage_display
---
{% set types_url = render_var(url('entity.block_content_type.collection')) %}
<h2>{% trans %}Goal{% endtrans %}</h2>
diff --git a/web/core/modules/help_topics/help_topics/book.about.html.twig b/web/core/modules/help_topics/help_topics/book.about.html.twig
new file mode 100644
index 0000000000..c689dec71a
--- /dev/null
+++ b/web/core/modules/help_topics/help_topics/book.about.html.twig
@@ -0,0 +1,28 @@
+---
+label: 'Managing books'
+top_level: true
+---
+{% set user_topic = render_var(url('help.help_topic', {'id': 'user.overview'})) %}
+<h2>{% trans %}What is a book?{% endtrans %}</h2>
+<p>{% trans %}A book is a structured group of content pages, arranged in a hierarchical structure called a <em>book outline</em>. A book hierarchy can be up to nine levels deep, and a book can include <em>Book page</em> content items or other content items. Every book has a default book-specific navigation block, which contains links that lead to the previous and next pages in the book and to the level above the current page in the book's structure.{% endtrans %}</p>
+<h2>{% trans %}What are the permissions for books?{% endtrans %}</h2>
+<p>{% trans %}The following permissions are needed to create and manage books; see <a href="{{ user_topic }}">Managing user accounts and site visitors</a> and its related topics for more about permissions.{% endtrans %}</p>
+<dl>
+ <dt>{% trans %}Create new books{% endtrans %}</dt>
+ <dd>{% trans %}Allows users to add new books to the site.{% endtrans %}</dd>
+ <dt>{% trans %}Add content and child pages to books and manage their hierarchies{% endtrans %}</dt>
+ <dd>{% trans %}Allows users to add configured types of content to existing books.{% endtrans %}</dd>
+ <dt>{% trans %}Administer book outlines{% endtrans %}</dt>
+ <dd>{% trans %}Allows users to add <em>any</em> type of content to a book, use the book overview administration page, and rearrange the pages of a book from the book outline page.{% endtrans %}
+ <dt>{% trans %}Administer site configuration (in the System module section){% endtrans %}</dt>
+ <dd>{% trans %}Allows users to do many site configuration tasks, including configuring books. This permission has security implications.{% endtrans %}
+ </dd>
+ <dt>{% trans %}View printer-friendly books{% endtrans %}</dt>
+ <dd>{% trans %}Allows users to click the <em>printer-friendly version</em> link to generate a printer-friendly display of the page, which includes pages below it in the book outline.{% endtrans %}
+ </dd>
+ <dt>{% trans %}<em>Book page</em> content permissions (in the Node module section){% endtrans %}</dt>
+ <dd>{% trans %}Like other content types, the <em>Book page</em> content type has separate permissions for creating, editing, and deleting a user's own and any content items of this type.{% endtrans %}
+ </dd>
+</dl>
+<h2>{% trans %}Managing books{% endtrans %}</h2>
+<p>{% trans %}Book management is handled by the core Book module. The topics listed below will help you create, edit, and configure books.{% endtrans %}</p>
diff --git a/web/core/modules/help_topics/help_topics/book.adding.html.twig b/web/core/modules/help_topics/help_topics/book.adding.html.twig
new file mode 100644
index 0000000000..8100782d9b
--- /dev/null
+++ b/web/core/modules/help_topics/help_topics/book.adding.html.twig
@@ -0,0 +1,20 @@
+---
+label: 'Adding content to a book'
+related:
+ - book.about
+ - book.configuring
+ - book.creating
+ - book.organizing
+---
+{% set node_add = render_var(url('node.add_page')) %}
+{% set config = render_var(url('help.help_topic', {'id': 'book.configuring'})) %}
+<h2>{% trans %}Goal{% endtrans %}</h2>
+<p>{% trans %}Add a page to an existing book.{% endtrans %}</p>
+<h2>{% trans %}Steps{% endtrans %}</h2>
+<ol>
+ <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Content</em> > <a href="{{ node_add }}"><em>Add content</em></a> > <em>Book page</em>. If you have configured additional content types that can be added to books, you can substitute a different content type for <em>Book page</em> (see the <a href="{{ config }}">Configuring books</a> topic for more information).{% endtrans %}</li>
+ <li>{% trans %}Enter a title for the page and some text for the body of the page.{% endtrans %}</li>
+ <li>{% trans %}In the vertical tabs area, click <em>Book Outline</em>. Select the book you want to add the page to in the <em>Book</em> select list. If you want to insert this page into the book hierarchy, also select the desired parent page in the <em>Parent item</em> select list.{% endtrans %}</li>
+ <li>{% trans %}Select the desired weight for the page in the <em>Weight</em> select list (pages with the same parent item are ordered from lowest to highest weight).{% endtrans %}</li>
+ <li>{% trans %}Click <em>Save</em> to add the page to the book.{% endtrans %}</li>
+</ol>
diff --git a/web/core/modules/help_topics/help_topics/book.configuring.html.twig b/web/core/modules/help_topics/help_topics/book.configuring.html.twig
new file mode 100644
index 0000000000..e92143fc69
--- /dev/null
+++ b/web/core/modules/help_topics/help_topics/book.configuring.html.twig
@@ -0,0 +1,18 @@
+---
+label: 'Configuring books'
+related:
+ - book.about
+ - book.adding
+ - book.creating
+ - book.organizing
+---
+{% set settings = render_var(url('book.settings')) %}
+<h2>{% trans %}Goal{% endtrans %}</h2>
+<p>{% trans %}Configure settings related to books.{% endtrans %}</p>
+<h2>{% trans %}Steps{% endtrans %}</h2>
+<ol>
+ <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Structure</em> > <em>Books</em> > <a href="{{ settings }}"><em>Settings</em></a>.{% endtrans %}</li>
+ <li>{% trans %}Check all of the content types that you would like to use as book pages in the <em>Content types allowed in book outlines</em> field.{% endtrans %}</li>
+ <li>{% trans %}In the <em>Content type for the Add child page link</em> field, select the content type that will be created from the <em>Add child page</em> link on a book page.{% endtrans %}</li>
+ <li>{% trans %}Click <em>Save configuration</em>.{% endtrans %}</li>
+</ol>
diff --git a/web/core/modules/help_topics/help_topics/book.creating.html.twig b/web/core/modules/help_topics/help_topics/book.creating.html.twig
new file mode 100644
index 0000000000..30cd656d1f
--- /dev/null
+++ b/web/core/modules/help_topics/help_topics/book.creating.html.twig
@@ -0,0 +1,17 @@
+---
+label: 'Creating a book'
+related:
+ - book.about
+ - book.adding
+ - book.organizing
+ - book.configuring
+---
+<h2>{% trans %}Goal{% endtrans %}</h2>
+<p>{% trans %}Create a new book.{% endtrans %}</p>
+<h2>{% trans %}Steps{% endtrans %}</h2>
+<ol>
+ <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Content</em> > <em>Add content</em> > <em>Book page</em>. If you have configured additional content types that can be added to books, you can substitute a different content type for <em>Book page</em>.{% endtrans %}</li>
+ <li>{% trans %}Enter a title for the book, and if desired, some text for the body of the book's title page.{% endtrans %}</li>
+ <li>{% trans %}In the vertical tabs area, click <em>Book Outline</em>. Select <em>- Create a new book -</em> from the <em>Book</em> select list.{% endtrans %}</li>
+ <li>{% trans %}Click <em>Save</em> to create the book.{% endtrans %}</li>
+</ol>
diff --git a/web/core/modules/help_topics/help_topics/book.organizing.html.twig b/web/core/modules/help_topics/help_topics/book.organizing.html.twig
new file mode 100644
index 0000000000..a07774b4c2
--- /dev/null
+++ b/web/core/modules/help_topics/help_topics/book.organizing.html.twig
@@ -0,0 +1,19 @@
+---
+label: 'Changing the outline of a book'
+related:
+ - book.about
+ - book.adding
+ - book.creating
+ - book.configuring
+---
+{% set overview = render_var(url('book.admin')) %}
+<h2>{% trans %}Goal{% endtrans %}</h2>
+<p>{% trans %}Change the order and titles of pages within a book.{% endtrans %}</p>
+<h2>{% trans %}Steps{% endtrans %}</h2>
+<ol>
+ <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Structure</em> > <a href="{{ overview }}"><em>Books</em></a>.{% endtrans %}</li>
+ <li>{% trans %}Click <em>Edit order and titles</em> for the book you would like to change.{% endtrans %}</li>
+ <li>{% trans %}Drag the book pages to the desired order.{% endtrans %}</li>
+ <li>{% trans %}If desired, enter new text for one or more of the page titles within the book.{% endtrans %}</li>
+ <li>{% trans %}Click <em>Save book pages</em>.{% endtrans %}</li>
+</ol>
diff --git a/web/core/modules/help_topics/help_topics/breakpoint.overview.html.twig b/web/core/modules/help_topics/help_topics/breakpoint.overview.html.twig
new file mode 100644
index 0000000000..19b95698ef
--- /dev/null
+++ b/web/core/modules/help_topics/help_topics/breakpoint.overview.html.twig
@@ -0,0 +1,21 @@
+---
+label: 'Managing height, width, and resolution breakpoints'
+related:
+ - core.appearance
+---
+<h2>{% trans %}What are breakpoints?{% endtrans %}</h2>
+<p>{% trans %}Breakpoints are the point at which your site's content will respond to provide the user with the best possible layout to consume the information. A breakpoint separates the height or width of viewports (screens, printers, and other media output types) into steps. For instance, a width breakpoint of 40em creates two steps: one for widths up to 40em and one for widths above 40em. Breakpoints can be used to define when layouts should shift from one form to another, when images should be resized, and other changes that need to respond to changes in viewport height or width.{% endtrans %}</p>
+<h2>{% trans %}What are media queries?{% endtrans %}</h2>
+<p>{% trans %}Media queries are a formal way to encode breakpoints. For instance, a width breakpoint at 40em would be written as the media query "(min-width: 40em)". Breakpoints are really just media queries with some additional meta-data, such as a name and multiplier information.{% endtrans %}</p>
+<h2>{% trans %}What are resolution multipliers?{% endtrans %}</h2>
+<p>{% trans %}Resolution multipliers are a measure of the viewport's device resolution, defined to be the ratio between the physical pixel size of the active device and the <a href="http://en.wikipedia.org/wiki/Device_independent_pixel">device-independent pixel</a> size. The Breakpoint module defines multipliers of 1, 1.5, and 2; when defining breakpoints, modules and themes can define which multipliers apply to each breakpoint.{% endtrans %}</p>
+<h2>{% trans %}What is a breakpoint group?{% endtrans %}</h2>
+<p>{% trans %}Breakpoints can be organized into groups. Modules and themes should use groups to separate out breakpoints that are meant to be used for different purposes, such as breakpoints for layouts or breakpoints for image sizing.{% endtrans %}</p>
+<h2>{% trans %}Managing breakpoints and breakpoint groups overview{% endtrans %}</h2>
+<p>{% trans %}The <em>Breakpoint</em> module allows you to define breakpoints and breakpoint groups in YAML files. Modules and themes can use the API provided by the <em>Breakpoint</em> module to define breakpoints and breakpoint groups, and to assign resolution multipliers to breakpoints.{% endtrans %}
+</p>
+<h2>{% trans %}Additional resources{% endtrans %}</h2>
+<ul>
+ <li><a href="https://www.drupal.org/documentation/modules/breakpoint">{% trans %}Working with breakpoints in Drupal 8{% endtrans %}</a></li>
+ <li><a href="http://www.w3.org/TR/css3-mediaqueries/">{% trans %}W3C standards for media queries{% endtrans %}</a></li>
+</ul>
diff --git a/web/core/modules/help_topics/help_topics/color.changing.html.twig b/web/core/modules/help_topics/help_topics/color.changing.html.twig
new file mode 100644
index 0000000000..49cf90d7ad
--- /dev/null
+++ b/web/core/modules/help_topics/help_topics/color.changing.html.twig
@@ -0,0 +1,20 @@
+---
+label: 'Changing the color palette of a theme'
+related:
+ - core.appearance
+---
+{% set appearance = render_var(url('system.themes_page')) %}
+<h2>{% trans %}Goal{% endtrans %}</h2>
+<p>{% trans %}Change the colors for links, backgrounds, and text in a theme that supports the Color module. Color-specific stylesheets will be generated and saved; you will need to follow these steps again to regenerate the stylesheets if you make any changes to the base stylesheets of your theme.{% endtrans %}</p>
+<h2>{% trans %}Steps{% endtrans %}</h2>
+<ol>
+ <li>{% trans %}In the Manage administrative menu, navigate to <a href="{{ appearance }}">Appearance</a>.{% endtrans %}</li>
+ <li>{% trans %}Click the <em>Settings</em> link for the theme you want to change the colors of.{% endtrans %}</li>
+ <li>{% trans %}In the <em>Color scheme</em> section, choose new colors for the backgrounds, text, and links that your theme defines colors for. However, if you do not see color settings, then your theme does not support the Color module.{% endtrans %}</li>
+ <li>{% trans %}Click <em>Save configuration</em>. Color-specific stylesheets will be generated and saved in the file system.{% endtrans %}</li>
+</ol>
+
+<h2>{% trans %}Additional resources{% endtrans %}</h2>
+<ul>
+ <li><a href="https://www.drupal.org/docs/8/core/modules/color/overview">{% trans %}Color module overview{% endtrans %}</a></li>
+</ul>
diff --git a/web/core/modules/help_topics/help_topics/core.appearance.html.twig b/web/core/modules/help_topics/help_topics/core.appearance.html.twig
new file mode 100644
index 0000000000..cb4711f4db
--- /dev/null
+++ b/web/core/modules/help_topics/help_topics/core.appearance.html.twig
@@ -0,0 +1,20 @@
+---
+label: 'Changing the appearance of your site'
+top_level: true
+related:
+ - core.content_structure
+---
+{% set entities = render_var(url('help.help_topic', {'id': 'core.content_structure'})) %}
+<h2>{% trans %}What is a theme?{% endtrans %}</h2>
+<p>{% trans %}A <em>theme</em> is a set of files that define the visual look and feel of your site. The core software and modules that run on your site determine which content (including HTML text and other data stored in the database, uploaded images, and any other asset files) is displayed on the pages of your site. The theme determines the HTML markup and CSS styling that wraps the content. Several basic themes are supplied with the core software; additional <em>contributed themes</em> can be downloaded separately from the <a href="https://www.drupal.org/project/project_theme">Download & Extend page on drupal.org</a>, or you can create your own theme.{% endtrans %}</p>
+<h2>{% trans %}What is a base theme?{% endtrans %}</h2>
+<p>{% trans %}A base theme is a theme that is not meant to be used directly on a site, but instead acts as a scaffolding for building other themes. The core Classy theme is one example; other base themes can be downloaded from the <a href="https://www.drupal.org/project/project_theme">Download & Extend page on drupal.org</a>.{% endtrans %}</p>
+<h2>{% trans %}What is a layout?{% endtrans %}</h2>
+<p>{% trans %}A <em>layout</em> is a template that defines where blocks and other pieces of content should be displayed. The core Layout Discovery module allows modules and themes to register layouts, and the core Layout Builder module provides a visual interface for placing fields and blocks in layouts for entity sub-types and individual entity items (see <a href="{{ entities }}">Managing content structure</a> for more on entities and fields).{% endtrans %}</p>
+<h2>{% trans %}Changing site appearance overview{% endtrans %}</h2>
+<p>{% trans %}The main way to change the overall appearance of your site is to switch the default theme. You can also change the color palette of some themes, if the core Color module is installed and the theme supports it; some themes also have other settings. The core Layout Builder and Layout Discovery modules allow you to define layouts for your site's content, and the core Breakpoint module helps themes change appearance for different-sized devices. See the related topics listed below for specific tasks.{% endtrans %}</p>
+<h2>{% trans %}Additional resources{% endtrans %}</h2>
+<ul>
+ <li><a href="https://www.drupal.org/docs/user_guide/en/extend-chapter.html">{% trans %}Extending and Customizing Your Site chapter in the User Guide{% endtrans %}</a></li>
+ <li><a href="https://www.drupal.org/docs/8/theming">{% trans %}Theming Drupal 8{% endtrans %}</a></li>
+</ul>
diff --git a/web/core/modules/help_topics/help_topics/core.content_structure.html.twig b/web/core/modules/help_topics/help_topics/core.content_structure.html.twig
new file mode 100644
index 0000000000..14796ea131
--- /dev/null
+++ b/web/core/modules/help_topics/help_topics/core.content_structure.html.twig
@@ -0,0 +1,46 @@
+---
+label: 'Managing content structure'
+top_level: true
+---
+{% set help_url = render_var(url('help.main')) %}
+<h2>{% trans %}What types of data does a site have?{% endtrans %}</h2>
+<p>{% trans %}There are four main types of data. <em>Content</em> is the information (text, images, etc.) meant to be displayed to web site visitors. <em>Configuration</em> is data that defines how the content is displayed; some configuration (such as field labels) may also be visible to site visitors. <em>State</em> is temporary data about the state of your site, such as the last time the system <em>cron</em> jobs ran. <em>Session</em> is a subset of State information, related to users' interactions with the site, such as site cookies and whether or not they are logged in.{% endtrans %}</p>
+<h2>{% trans %}What is a content entity?{% endtrans %}</h2>
+<p>{% trans %}A <em>content entity</em> (or more commonly, <em>entity</em>) is an item of content data, which can consist of text, HTML markup, images, attached files, and other data. Content entities are grouped into <em>entity types</em>, which have different purposes and are displayed in very different ways on the site. Most entity types are also divided into <em>entity sub-types</em>, which are divisions within an entity type to allow for smaller variations in how the entities are used and displayed. For example, the <em>Content item</em> entity type that stores page-level content is divided into <em>content type</em> sub-types; the <em>Custom block</em> entity type has <em>custom block types</em>; but the <em>User</em> entity type (for user profile information) does not have sub-types.{% endtrans %}</p>
+<h2>{% trans %}What is a field?{% endtrans %}</h2>
+<p>{% trans %}Within entity items, the data is stored in individual <em>fields</em>, each of which holds one type of data, such as formatted or plain text, images or other files, or dates. Fields can be added by an administrator on entity sub-types, so that all entity items of a given entity sub-type have the same collection of fields available, and they can be single-valued or multiple-valued. When you create or edit entity items, you are specifying the values for the fields on the entity item.{% endtrans %}</p>
+<h2>{% trans %}What is a reference field?{% endtrans %}</h2>
+<p>{% trans %}A <em>reference field</em> is a field that stores a relationship between an entity and one or more other entities, which may belong to the same or different entity type. For example, a <em>Content reference</em> field on a content type stores a relationship between one content item and one or more other content items.{% endtrans %}</p>
+<h2>{% trans %}What field types are available?{% endtrans %}</h2>
+<p>{% trans %}The following field types are provided by the core system and core modules (many more are provided by contributed modules):{% endtrans %}</p>
+<ul>
+ <li>{% trans %}Boolean, Number (provided by the core system): Stores true/false values and numbers{% endtrans %}</li>
+ <li>{% trans %}Comment (provided by the core Comment module): Allows users to add comments to an entity{% endtrans %}</li>
+ <li>{% trans %}Date, Timestamp (Datetime module): Stores dates and times{% endtrans %}</li>
+ <li>{% trans %}Date range (Datetime range module): Stores time/date periods with a start and and an end{% endtrans %}</li>
+ <li>{% trans %}Email (core system): Stores email addresses{% endtrans %}</li>
+ <li>{% trans %}Link (Link module): Stores URLs and link text{% endtrans %}</li>
+ <li>{% trans %}List (Options module): Stores values chosen from pre-defined lists; the values can be numbers or text{% endtrans %}</li>
+ <li>{% trans %}Reference (core system): Stores entity references{% endtrans %}</li>
+ <li>{% trans %}Telephone (Telephone module): Stores telephone numbers{% endtrans %}</li>
+ <li>{% trans %}Text (Text module): Stores formatted and unformatted text{% endtrans %}</li>
+</ul>
+<h2>{% trans %}What is a formatter?{% endtrans %}</h2>
+<p>{% trans %}A <em>formatter</em> is a way to display a field; most field types offer several types of formatters, and most formatters have settings that further define how the field is displayed. It is also possible to completely hide a field from display, and you have the option of showing or hiding the field's label when it is displayed.{% endtrans %}</p>
+<h2>{% trans %}What is a widget?{% endtrans %}</h2>
+<p>{% trans %}A <em>widget</em> is a way to edit a field. Some field types, such as plain text single-line fields, have only one widget available (in this case, a single-line text input field). Other field types offer choices for the widget; for example, single-valued <em>List</em> fields can use a <em>Select</em> or <em>Radio button</em> widget for editing. Many widget types have settings that further define how the field can be edited.{% endtrans %}</p>
+<h2>{% trans %}Managing content structure overview{% endtrans %}</h2>
+<p>{% trans %}Besides the field modules listed in the previous section, there are additional core modules that you can use to manage your content structure:{% endtrans %}</p>
+<ul>
+ <li>{% trans %}The core Node, Comment, Custom Block, Custom Menu Links, User, File, Image, Media, Taxonomy, Contact, and Aggregator modules all provide content entity types.{% endtrans %}</li>
+ <li>{% trans %}The core Field UI module provides a user interface for managing fields and their display on entities.{% endtrans %}</li>
+ <li>{% trans %}The core Layout Builder module provides a more flexible user interface for configuring the display of entities.{% endtrans %}</li>
+ <li>{% trans %}The core Filter, RDF, Responsive Image, and Path modules provide settings and display options for entities and fields.{% endtrans %}</li>
+</ul>
+<p>{% trans %}Depending on the core and contributed modules that you currently have installed on your site, the related topics below, and other topics listed on the main <a href="{{ help_url }}">Help page</a>, will help you with tasks related to content structure.{% endtrans %}</p>
+<h2>{% trans %}Additional resources{% endtrans %}</h2>
+<ul>
+ <li>{% trans %}<a href="https://www.drupal.org/docs/user_guide/en/understanding-data.html">Concept: Types of Data topic in the User Guide</a>{% endtrans %}</li>
+ <li>{% trans %}<a href="https://www.drupal.org/docs/user_guide/en/planning-chapter.html">Planning your Site chapter in the User Guide</a>{% endtrans %}</li>
+ <li>{% trans %}<a href="https://www.drupal.org/docs/user_guide/en/structure-reference-fields.html">Concept: Reference Fields topic in the User Guide</a>{% endtrans %}</li>
+</ul>
diff --git a/web/core/modules/help_topics/help_topics/core.cron.html.twig b/web/core/modules/help_topics/help_topics/core.cron.html.twig
new file mode 100644
index 0000000000..0e94a38e02
--- /dev/null
+++ b/web/core/modules/help_topics/help_topics/core.cron.html.twig
@@ -0,0 +1,28 @@
+---
+label: 'Running and configuring cron'
+related:
+ - core.maintenance
+---
+{% set cron = render_var(url('system.cron_settings')) %}
+<h2>{% trans %}Goal{% endtrans %}</h2>
+<p>{% trans %}Configure your system so that cron will run automatically.{% endtrans %}</p>
+<h2>{% trans %}What are cron tasks?{% endtrans %}</h2>
+<p>{% trans %}To ensure that your site and its modules continue to function well, a group of administrative operations should be run periodically. These operations are called <em>cron</em> tasks, and running the tasks is known as <em>running cron</em>. Depending on how often content is updated on your site, you might need to run cron on a schedule ranging from hourly to weekly to keep your site running well.{% endtrans %}</p>
+<h2>{% trans %}What options are available for running cron?{% endtrans %}</h2>
+<ul>
+ <li>{% trans %}If the core Automated Cron module is installed, your site will run cron periodically, on a schedule you can configure.{% endtrans %}</li>
+ <li>{% trans %}You can set up a task on your web server to visit the <em> cron URL</em>, which is unique to your site, on a schedule.{% endtrans %}</li>
+ <li>{% trans %}You can also run cron manually, but this is not the recommended way to make sure it is run periodically.{% endtrans %}</li>
+</ul>
+<h2>{% trans %}Steps{% endtrans %}</h2>
+<ol>
+ <li>{% trans %}In the <em>Manage</em> administration menu, navigate to <em>Configuration</em> > <em>System</em> > <a href="{{ cron }}"><em>Cron</em></a>. Note the <em>Last run</em> time on the page.{% endtrans %}</li>
+ <li>{% trans %}If you want to run cron right now, click <em>Run cron</em> and wait for cron to finish.{% endtrans %}</li>
+ <li>{% trans %}If you have a way to configure tasks on your web server, copy the link where it says <em>To run cron from outside the site, go to</em>. Set up a task to visit that URL on your desired cron schedule, such as once an hour or once a week. (On Linux-like servers, you can use the <em>wget</em> command to visit a URL.) If you configure an outside task, you should uninstall the Automated Cron module.{% endtrans %}</li>
+ <li>{% trans %}If you are not configuring an outside task, and you have the core Automated Cron module installed, select a schedule for automated cron runs in <em>Cron settings</em> > <em>Run cron every</em>. Click <em>Save configuration</em>.{% endtrans %}</li>
+</ol>
+<h2>{% trans %}Additional resources{% endtrans %}</h2>
+<ul>
+ <li>{% trans %}<a href="https://www.drupal.org/docs/user_guide/en/security-cron-concept.html">Concept: Cron in the User Guide</a>{% endtrans %}</li>
+ <li>{% trans %}<a href="https://www.drupal.org/docs/user_guide/en/security-cron.html">Configuring Cron Maintenance Tasks in the User Guide</a>{% endtrans %}</li>
+</ul>
diff --git a/web/core/modules/help_topics/help_topics/core.extending.html.twig b/web/core/modules/help_topics/help_topics/core.extending.html.twig
new file mode 100644
index 0000000000..2cf4d761e9
--- /dev/null
+++ b/web/core/modules/help_topics/help_topics/core.extending.html.twig
@@ -0,0 +1,17 @@
+---
+label: 'Extending and modifying your site functionality'
+top_level: true
+---
+<h2>{% trans %}What is a module?{% endtrans %}</h2>
+<p>{% trans %}A <em>module</em> is a set of PHP, JavaScript, and/or CSS files that extends site features and adds functionality. A set of <em>Core modules</em> is distributed as part of the core software download. Additional <em>Contributed modules</em> can be downloaded separately from the <a href="https://www.drupal.org/project/project_module">Download & Extend page on drupal.org</a>.{% endtrans %}</p>
+<h2>{% trans %}What is an Experimental module?{% endtrans %}</h2>
+<p>{% trans %}An <em>Experimental</em> module is a module that is still in development and is not yet stable. Using Experimental modules on production sites is not recommended.{% endtrans %}</p>
+<h2>{% trans %}What are installing and uninstalling?{% endtrans %}</h2>
+<p>{% trans %}Installing a core or downloaded contributed module means turning it on, so that you can use its features and functionality. Uninstalling means turning it off and removing all of its configuration. A module cannot be uninstalled if another installed module depends on it, or if you have created content on your site using the module -- you would need to delete the content and uninstall dependent modules first.{% endtrans %}</p>
+<h2>{% trans %}Extending overview{% endtrans %}</h2>
+<p>{% trans %}See the related topics listed below for help performing tasks related to extending the functionality of your site.{% endtrans %}</p>
+<h2>{% trans %}Additional resources{% endtrans %}</h2>
+<ul>
+ <li>{% trans %}<a href="https://www.drupal.org/docs/user_guide/en/understanding-modules.html">Concept: Modules topic in the User Guide</a>{% endtrans %}</li>
+ <li>{% trans %}<a href="https://www.drupal.org/docs/user_guide/en/extend-chapter.html">Extending and customizing your site chapter in the User Guide</a>{% endtrans %}</li>
+</ul>
diff --git a/web/core/modules/help_topics/help_topics/core.maintenance.html.twig b/web/core/modules/help_topics/help_topics/core.maintenance.html.twig
new file mode 100644
index 0000000000..2a822d104e
--- /dev/null
+++ b/web/core/modules/help_topics/help_topics/core.maintenance.html.twig
@@ -0,0 +1,24 @@
+---
+label: 'Maintaining and troubleshooting your site'
+top_level: true
+related:
+ - core.cron
+ - core.extending
+ - core.security
+ - system.cache
+ - system.config_error
+ - system.maintenance_mode
+---
+<h2>{% trans %}Maintaining and troubleshooting overview{% endtrans %}</h2>
+<p>{% trans %}Here are some tasks and hints related to maintaining your site, and troubleshooting problems that may come up on your site. See the related topics below for more information.{% endtrans %}</p>
+<ul>
+ <li>{% trans %}When performing maintenance, such as installing, uninstalling, or upgrading a module, put your site in maintenance mode.{% endtrans %}</li>
+ <li>{% trans %}Configure your site so that cron runs periodically.{% endtrans %}</li>
+ <li>{% trans %}If your site is not behaving as expected, clear the cache before trying to diagnose the problem.{% endtrans %}</li>
+ <li>{% trans %}There are several site reports that can help you diagnose problems with your site. There are also two core modules that can be used for error logging: Database Logging and Syslog.{% endtrans %}</li>
+</ul>
+<h2>{% trans %}Additional resources{% endtrans %}</h2>
+<ul>
+ <li>{% trans %}<a href="https://www.drupal.org/docs/user_guide/en/prevent-chapter.html">Preventing and Fixing Problems chapter in the User Guide</a>{% endtrans %}</li>
+ <li>{% trans %}<a href="https://www.drupal.org/docs/user_guide/en/security-chapter.html">Security and Maintenance chapter in the User Guide</a>{% endtrans %}</li>
+</ul>
diff --git a/web/core/modules/help_topics/help_topics/core.performance.html.twig b/web/core/modules/help_topics/help_topics/core.performance.html.twig
new file mode 100644
index 0000000000..191e1d1f6b
--- /dev/null
+++ b/web/core/modules/help_topics/help_topics/core.performance.html.twig
@@ -0,0 +1,29 @@
+---
+label: 'Optimizing site performance'
+top_level: true
+---
+<h2>{% trans %}What is site performance?{% endtrans %}</h2>
+<p>{% trans %}Site performance, in this context, refers to speed factors such as the page load time and the response time after a user action on a page.{% endtrans %}</p>
+<h2>{% trans %}What is caching?{% endtrans %}</h2>
+<p>{% trans %}Caching is saving already-rendered HTML output and other calculated data for later use the first time it is needed. This saves time, because the next time the same data is needed it can be quickly retrieved instead of recalculated. Automatic caching systems also include mechanisms to delete cached calculations or mark them as no longer valid when the underlying data changes. To facilitate that, cached data has a <em>lifetime</em>, which is the maximum time before the data will be deleted from the cache (forcing recalculation).{% endtrans %}</p>
+<h2>{% trans %}What is file aggregation?{% endtrans %}</h2>
+<p>{% trans %}Aggregation is when CSS and JavaScript files are merged together and compressed into a format that is much smaller than the original. This allows for faster transmission and faster rendering on the other end.{% endtrans %}</p>
+<h2>{% trans %}What can I do to improve my site's performance?{% endtrans %}</h2>
+<p>{% trans %}The following Drupal core modules and mechanisms can improve your site's performance:{% endtrans %}</p>
+<dl>
+ <dt>{% trans %}Internal Page Cache module{% endtrans %}</dt>
+ <dd>{% trans %}Caches pages requested by users who are not logged in (anonymous users). Do not use if your site needs to send different output to different anonymous users.{% endtrans %}</dd>
+ <dt>{% trans %}Internal Dynamic Page Cache module{% endtrans %}</dt>
+ <dd>{% trans %}Caches data for both authenticated and anonymous users, with non-cacheable data in the page converted to placeholders and calculated when the page is requested.{% endtrans %}</dd>
+ <dt>{% trans %}Big Pipe module{% endtrans %}</dt>
+ <dd>{% trans %}Changes the way pages are sent to users, so that cacheable parts are sent out first with placeholders, and the uncacheable or personalized parts of the page are streamed afterwards. This allows the browser to render the bulk of the page quickly and fill in the details later.{% endtrans %}</dd>
+ <dt>{% trans %}Performance page settings{% endtrans %}</dt>
+ <dd>{% trans %}In the <em>Manage</em> administrative menu, if you navigate to <em>Configuration</em> > <em>Development</em> > <em>Performance</em>, you will find a setting for the maximum cache lifetime, as well as the ability to turn on CSS and JavaScript file aggregation.{% endtrans %}</dd>
+</dl>
+
+<h2>{% trans %}Additional resources{% endtrans %}</h2>
+<ul>
+ <li><a href="https://www.drupal.org/documentation/modules/internal_page_cache">{% trans %}Online documentation for the Internal Page Cache module{% endtrans %}</a></li>
+ <li><a href="https://www.drupal.org/documentation/modules/dynamic_page_cache">{% trans %}Online documentation for the Internal Dynamic Page Cache module{% endtrans %}</a></li>
+ <li><a href="https://www.drupal.org/documentation/modules/big_pipe">{% trans %}Online documentation for the BigPipe module{% endtrans %}</a></li>
+</ul>
diff --git a/web/core/modules/help_topics/help_topics/core.security.html.twig b/web/core/modules/help_topics/help_topics/core.security.html.twig
index 25ef43cf24..81b684cd21 100644
--- a/web/core/modules/help_topics/help_topics/core.security.html.twig
+++ b/web/core/modules/help_topics/help_topics/core.security.html.twig
@@ -8,5 +8,5 @@ top_level: true
<p>{% trans %}Keeping track of updates, updating the core software, and updating contributed modules and/or themes are all part of keeping your site secure. See the related topics listed below for specific tasks.{% endtrans %}</p>
<h2>{% trans %}Additional resources{% endtrans %}</h2>
<ul>
- <li>{% trans %}<a href="https://www.drupal.org/docs/user_guide/en/security-chapter.html">Drupal 8 User Guide: Chapter 13. Security and Maintenance</a>{% endtrans %}</li>
+ <li>{% trans %}<a href="https://www.drupal.org/docs/user_guide/en/security-chapter.html">Security and Maintenance chapter in the User Guide</a>{% endtrans %}</li>
</ul>
diff --git a/web/core/modules/help_topics/help_topics/field_ui.add_field.html.twig b/web/core/modules/help_topics/help_topics/field_ui.add_field.html.twig
new file mode 100644
index 0000000000..daf93634a2
--- /dev/null
+++ b/web/core/modules/help_topics/help_topics/field_ui.add_field.html.twig
@@ -0,0 +1,23 @@
+---
+label: 'Adding a field to an entity sub-type'
+related:
+ - core.content_structure
+ - field_ui.manage_display
+ - field_ui.manage_form
+---
+{% set content_types = render_var(url('entity.node_type.collection')) %}
+{% set content_structure = render_var(url('help.help_topic', {'id': 'core.content_structure'})) %}
+<h2>{% trans %}Goal{% endtrans %}</h2>
+<p>{% trans %}Add a field to an entity sub-type; see <a href="{{ content_structure }}">Managing content structure</a> for an overview of entity types and sub-types.{% endtrans %}</p>
+<h2>{% trans %}Steps{% endtrans %}</h2>
+<ol>
+ <li>{% trans %}Navigate to the page for managing the entity sub-type you want to add the field to. For example, to add a field to a content type, in the <em>Manage</em> administrative menu, navigate to <em>Structure</em> > <a href="{{ content_types }}"><em>Content types</em></a>.{% endtrans %}</li>
+ <li>{% trans %}Find the particular sub-type that you want to add the field to, and click <em>Manage fields</em>.{% endtrans %}</li>
+ <li>{% trans %}Click <em>Add field</em>.{% endtrans %}</li>
+ <li>{% trans %}In <em>Add a new field</em>, select the type of field you want to add; see <a href="{{ content_structure }}">Managing content structure</a> for an overview of field types.{% endtrans %}</li>
+ <li>{% trans %}The <em>Label</em> field should now be visible; enter a label for the field, which is used as the field label for both content editing and content display.{% endtrans %}</li>
+ <li>{% trans %}Click <em>Save and continue</em>.{% endtrans %}</li>
+ <li>{% trans %}On the next screen, enter a value for <em>Allowed number of values</em>. You can limit the field to one value per entity item, a set number of values, or set it to have unlimited values. Click <em>Save field settings</em>.{% endtrans %}</li>
+ <li>{% trans %}On the next screen, optionally edit the settings for the field, which vary depending on what field type you are creating. For all fields, you can edit the <em>Label</em>, <em>Help text</em> (text to be displayed below the field on the content editing page), and <em>Required field</em> (to make it so a value must be entered in order to save the content when editing). You can also configure a default value for the field.{% endtrans %}</li>
+ <li>{% trans %}Click <em>Save settings</em>. You should be returned to the <em>Manage fields</em> page, with your new field in the list.{% endtrans %}</li>
+</ol>
diff --git a/web/core/modules/help_topics/help_topics/field_ui.manage_display.html.twig b/web/core/modules/help_topics/help_topics/field_ui.manage_display.html.twig
new file mode 100644
index 0000000000..59e93602c8
--- /dev/null
+++ b/web/core/modules/help_topics/help_topics/field_ui.manage_display.html.twig
@@ -0,0 +1,24 @@
+---
+label: 'Configuring field display for an entity sub-type'
+related:
+ - core.content_structure
+ - field_ui.add_field
+ - field_ui.manage_form
+ - core.ui_accessibility
+---
+{% set content_types = render_var(url('entity.node_type.collection')) %}
+{% set content_structure = render_var(url('help.help_topic', {'id': 'core.content_structure'})) %}
+<h2>{% trans %}Goal{% endtrans %}</h2>
+<p>{% trans %}Configure the <em>formatters</em> used to display the fields of an entity sub-type, their order in the display, and the formatter settings. See <a href="{{ content_structure }}">Managing content structure</a> for background information.{% endtrans %}</p>
+<h2>{% trans %}Steps{% endtrans %}</h2>
+<ol>
+ <li>{% trans %}Navigate to the page for managing the entity type you want to add the field to. For example, to add a field to a content type, in the <em>Manage</em> administrative menu, navigate to <em>Structure</em> > <a href="{{ content_types }}"><em>Content types</em></a>.{% endtrans %}</li>
+ <li>{% trans %}Find the particular sub-type that you want to configure the display of, and click <em>Manage display</em> in the <em>Operations</em> list.{% endtrans %}</li>
+ <li>{% trans %}Use the drag arrows to order the fields in your preferred order.{% endtrans %}</li>
+ <li>{% trans %}Drag any fields that you do not wish to see in the display to the <em>Disabled</em> section.{% endtrans %}</li>
+ <li>{% trans %}In the <em>Label</em> column, select the position for each field label in the display, or <em>- Hidden -</em> to hide a label. You can also choose <em>- Visually Hidden-</em> if you want the label's text to appear in the HTML page, so that screen readers and search engines can read it, but it will not be visible.{% endtrans %}</li>
+ <li>{% trans %}In the <em>Format</em> column, select the formatter for displaying each field.{% endtrans %}</li>
+ <li>{% trans %}After selecting the desired formatters, click the settings gear in each row to change the settings for the formatter.{% endtrans %}</li>
+ <li>{% trans %}When you are done making changes, click <em>Save</em>.{% endtrans %}</li>
+ <li>{% trans %}Test the display for your entity sub-type by viewing an entity. If needed, return to these steps to further refine the display.{% endtrans %}</li>
+</ol>
diff --git a/web/core/modules/help_topics/help_topics/field_ui.manage_form.html.twig b/web/core/modules/help_topics/help_topics/field_ui.manage_form.html.twig
new file mode 100644
index 0000000000..6cc1ed057d
--- /dev/null
+++ b/web/core/modules/help_topics/help_topics/field_ui.manage_form.html.twig
@@ -0,0 +1,23 @@
+---
+label: 'Configuring the edit form for an entity sub-type'
+related:
+ - core.content_structure
+ - field_ui.add_field
+ - field_ui.manage_display
+ - core.ui_accessibility
+---
+{% set content_types = render_var(url('entity.node_type.collection')) %}
+{% set content_structure = render_var(url('help.help_topic', {'id': 'core.content_structure'})) %}
+<h2>{% trans %}Goal{% endtrans %}</h2>
+<p>{% trans %}Configure the <em>widgets</em> used to edit the fields of an entity sub-type, their order on the form, and the widget settings. See <a href="{{ content_structure }}">Managing content structure</a> for background information.{% endtrans %}</p>
+<h2>{% trans %}Steps{% endtrans %}</h2>
+<ol>
+ <li>{% trans %}Navigate to the page for managing the entity type you want to add the field to. For example, to add a field to a content type, in the <em>Manage</em> administrative menu, navigate to <em>Structure</em> > <a href="{{ content_types }}"><em>Content types</em></a>.{% endtrans %}</li>
+ <li>{% trans %}Find the particular sub-type that you want to configure the editing form for, and click <em>Manage form display</em> in the <em>Operations</em> list.{% endtrans %}</li>
+ <li>{% trans %}Use the drag arrows to order the fields in your preferred order.{% endtrans %}</li>
+ <li>{% trans %}Drag any fields that you do not wish to see on the editing form to the <em>Disabled</em> section.{% endtrans %}</li>
+ <li>{% trans %}In the <em>Widget</em> column, select the widget for editing each field.{% endtrans %}</li>
+ <li>{% trans %}After selecting the desired widgets, click the settings gear in each row to change the settings for the widget.{% endtrans %}</li>
+ <li>{% trans %}When you are done making changes, click <em>Save</em>.{% endtrans %}</li>
+ <li>{% trans %}Test the editing form for your entity sub-type by editing or creating an entity. If needed, return to these steps to further refine the form.{% endtrans %}</li>
+</ol>
diff --git a/web/core/modules/help_topics/help_topics/field_ui.reference_field.html.twig b/web/core/modules/help_topics/help_topics/field_ui.reference_field.html.twig
new file mode 100644
index 0000000000..c2dd8ddfdd
--- /dev/null
+++ b/web/core/modules/help_topics/help_topics/field_ui.reference_field.html.twig
@@ -0,0 +1,25 @@
+---
+label: 'Adding a reference field to an entity sub-type'
+related:
+ - core.content_structure
+ - field_ui.add_field
+ - field_ui.manage_display
+ - field_ui.manage_form
+---
+{% set content_structure = render_var(url('help.help_topic', {'id': 'core.content_structure'})) %}
+{% set content_types = render_var(url('entity.node_type.collection')) %}
+<h2>{% trans %}Goal{% endtrans %}</h2>
+<p>{% trans %}Add an entity reference field to an entity sub-type; see <a href="{{ content_structure}}">Managing content structure</a> for more information on entities and reference fields.{% endtrans %}</p>
+<h2>{% trans %}Steps{% endtrans %}</h2>
+<ol>
+ <li>{% trans %}Navigate to the page for managing the entity sub-type you want to add the field to. For example, to add a field to a content type, in the <em>Manage</em> administrative menu, navigate to <em>Structure</em> > <a href="{{ content_types }}"><em>Content types</em></a>.{% endtrans %}</li>
+ <li>{% trans %}Find the particular sub-type that you want to add the field to, and click <em>Manage fields</em>.{% endtrans %}</li>
+ <li>{% trans %}Click <em>Add field</em>.{% endtrans %}</li>
+ <li>{% trans %}In <em>Add a new field</em>, select the type of reference field you want to add. The <em>Reference</em> section of the select list shows the most common types of reference field; choose <em>Other...</em> if the entity type you want to reference is not listed.{% endtrans %}</li>
+ <li>{% trans %}The <em>Label</em> field should now be visible; enter a label for the field, which is used as the field label for both content editing and content display.{% endtrans %}</li>
+ <li>{% trans %}Click <em>Save and continue</em>.{% endtrans %}</li>
+ <li>{% trans %}On the next screen, verify that the type of entity you want to reference is shown in <em>Type of item to reference</em>, or select it if not. Enter a value for <em>Allowed number of values</em>. You can limit the field to one value per entity item, a set number of values, or set it to have unlimited values. Click <em>Save field settings</em>.{% endtrans %}</li>
+ <li>{% trans %}On the next screen, optionally edit the settings for <em>Label</em>, <em>Help text</em> (text to be displayed below the field on the content editing page), and <em>Required field</em> (to make it so a value must be entered in order to save the content when editing).{% endtrans %}</li>
+ <li>{% trans %}In the <em>Reference type</em> section, you will usually want to limit the entity sub-types that can be referenced; for example, if you are creating a <em>Content</em> reference, you can check one or two <em>Content type</em> choices. The choices will be easier for content editors to scan if you also choose a sort value (normally the entity title or label field).{% endtrans %}</li>
+ <li>{% trans %}Click <em>Save settings</em>. You should be returned to the <em>Manage fields</em> page, with your new field in the list.{% endtrans %}</li>
+</ol>
diff --git a/web/core/modules/help_topics/help_topics/help.help_topic_search.html.twig b/web/core/modules/help_topics/help_topics/help.help_topic_search.html.twig
index 48461da978..ae57d5eb73 100644
--- a/web/core/modules/help_topics/help_topics/help.help_topic_search.html.twig
+++ b/web/core/modules/help_topics/help_topics/help.help_topic_search.html.twig
@@ -3,9 +3,13 @@ label: 'Configuring help search'
top_level: true
related:
- block.place
+ - system.cache
+ - core.cron
---
{% set extend_url = render_var(url('system.modules_list')) %}
{% set help_url = render_var(url('help.main')) %}
+{% set cache_help = render_var(url('help.help_topic', {'id': 'system.cache'})) %}
+{% set cron_help = render_var(url('help.help_topic', {'id': 'core.cron'})) %}
<h2>{% trans %}Goal{% endtrans %}</h2>
<p>{% trans %}Set up your site so that users can search for help.{% endtrans %}</p>
<h2>{% trans %}Steps{% endtrans %}</h2>
@@ -13,8 +17,8 @@ related:
<li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em><a href="{{ extend_url }}">Extend</a></em>. Verify that the Search, Help, Help Topics, and Block modules are installed (or install them if they are not already installed).{% endtrans %}</li>
<li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Configuration</em> > <em>Search and metadata</em> > <em>Search pages</em>.{% endtrans %}</li>
<li>{% trans %}Verify that a Help search page is listed in the <em>Search pages</em> section. If not, add a new page of type <em>Help</em>.{% endtrans %}</li>
- <li>{% trans %}Check the indexing status of the Help search page. If it is not fully indexed, run Cron until indexing is complete.{% endtrans %}</li>
- <li>{% trans %}In the future, you can click <em>Rebuild search index</em> on this page, or clear the site cache, in order to force help topic text to be reindexed for searching. This should be done whenever a module, theme, language, or string translation is updated.{% endtrans %}</li>
+ <li>{% trans %}Check the indexing status of the Help search page. If it is not fully indexed, <a href="{{ cron_help }}">run Cron</a> until indexing is complete.{% endtrans %}</li>
+ <li>{% trans %}In the future, you can click <em>Rebuild search index</em> on this page, or <a href="{{ cache_help }}">clear the site cache</a>, in order to force help topic text to be reindexed for searching. This should be done whenever a module, theme, language, or string translation is updated.{% endtrans %}</li>
<li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Structure</em> > <em>Block layout</em>.{% endtrans %}</li>
<li>{% trans %}Click the link for your administrative theme (such as the core Seven theme), near the top of the page, and verify that there is already a search block for help located in the Help region. If not, follow the steps in the related topic to place the <em>Search form</em> block in the Help region. When configuring the block, choose <em>Help</em> as the search page, and in the <em>Pages</em> tab under <em>Visibility</em>, enter <em>/admin/help</em> to make the search form only visible on the main <em>Help</em> page.{% endtrans %}</li>
<li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em><a href="{{ help_url }}">Help</a></em>. Verify that the search block is visible, and try a search.{% endtrans %}</li>
diff --git a/web/core/modules/help_topics/help_topics/layout_builder.overview.html.twig b/web/core/modules/help_topics/help_topics/layout_builder.overview.html.twig
new file mode 100644
index 0000000000..5b376cbff6
--- /dev/null
+++ b/web/core/modules/help_topics/help_topics/layout_builder.overview.html.twig
@@ -0,0 +1,35 @@
+---
+label: 'Changing the layout for an entity'
+related:
+ - core.appearance
+ - core.content_structure
+ - field_ui.manage_display
+ - block.overview
+---
+{% set content_types = render_var(url('entity.node_type.collection')) %}
+{% set entities = render_var(url('help.help_topic', {'id': 'core.content_structure'})) %}
+{% set blocks = render_var(url('help.help_topic', {'id': 'block.overview'})) %}
+<h2>{% trans %}Goal{% endtrans %}</h2>
+<p>{% trans %}Configure an entity sub-type to have its fields displayed using a layout (see <a href="{{ entities }}">Managing content structure</a> for more on entities and fields).{% endtrans %}</p>
+<h2>{% trans %}What are the parts of a layout?{% endtrans %}</h2>
+<p>{% trans %}A layout consists of one or more <em>sections</em>. Each section can have from one to four <em>columns</em>. You can place blocks, including special blocks for the fields on the entity sub-type, in each column of each section (see <a href="{{ blocks }}">Managing blocks</a> for more on blocks).{% endtrans %}</p>
+<h2>{% trans %}Steps{% endtrans %}</h2>
+<ol>
+ <li>{% trans %}Navigate to the page for managing the entity type you want to add the field to. For example, to add a field to a content type, in the <em>Manage</em> administrative menu, navigate to <em>Structure</em> > <a href="{{ content_types }}"><em>Content types</em></a>.{% endtrans %}</li>
+ <li>{% trans %}Find the particular sub-type that you want to create a layout for, and click <em>Manage display</em> in the <em>Operations</em> list.{% endtrans %}</li>
+ <li>{% trans %}Under <em>Layout options</em>, check <em>Use Layout Builder</em>. You can also check the box below to allow each entity item to have its layout individually customized (if it is left unchecked, the site will use the same layout for all items of this entity sub-type).{% endtrans %}</li>
+ <li>{% trans %}Click <em>Save</em>. You will be returned to the <em>Manage display</em> page, but you will no longer see the table of fields of the classic display manager.{% endtrans %}</li>
+ <li>{% trans %}Click <em>Manage layout</em> to enter layout management view. A default layout will be set up for you, with a single one-column section containing the fields on your entity sub-type.{% endtrans %}</li>
+ <li>{% trans %}To remove the default section and start from an empty layout, find and click the <em>Remove</em> button for the default section, which looks like an X. Confirm by clicking <em>Remove</em> in the pop-up dialog.{% endtrans %}</li>
+ <li>{% trans %}Add new sections, each with one to four columns, to your layout. For instance, you might want a one-column section at the top, a two-column section in the middle, and then a one-column section at the bottom. To add a section, click <em>Add section</em> and click the desired number of columns. For multi-column sections, set the column width percentages and click <em>Add section</em> in the pop-up dialog.{% endtrans %}</li>
+ <li>{% trans %}In each section, click <em>Add block</em> to add a block. You will see a list of the blocks available on your site, plus a section called <em>Content fields</em> with a block for each field on your content item. Each block can be configured, if desired, with a <em>Title</em>, and for content field blocks, you can also configure the field formatter. Continue to add blocks to your sections until all the desired blocks and fields are displayed.{% endtrans %}</li>
+ <li>{% trans %}Verify your layout. You can check <em>Show content preview</em> to show a preview of what your layout will look like, or uncheck it to see the names of the fields and blocks in each section.{% endtrans %}</li>
+ <li>{% trans %}If needed, reorder the blocks by dragging them to new locations. If you hover over a block, a contextual menu will appear that will let you change the configuration of the block, remove the block, or <em>Move</em> blocks within the section using a more compact interface.{% endtrans %}</li>
+ <li>{% trans %}When you are satisfied with your layout, click <em>Save layout</em>.{% endtrans %}</li>
+</ol>
+
+<h2>{% trans %}Additional resources{% endtrans %}</h2>
+<ul>
+ <li><a href="https://www.drupal.org/docs/8/core/modules/layout-builder/creating-layout-defaults">{% trans %}Creating layout defaults{% endtrans %}</a></li>
+ <li><a href="https://www.drupal.org/docs/8/core/modules/layout-builder/building-layouts-using-the-layout-builder-ui">{% trans %}Building Layouts Using the Layout Builder UI{% endtrans %}</a></li>
+</ul>
diff --git a/web/core/modules/help_topics/help_topics/system.cache.html.twig b/web/core/modules/help_topics/help_topics/system.cache.html.twig
new file mode 100644
index 0000000000..3e3eead979
--- /dev/null
+++ b/web/core/modules/help_topics/help_topics/system.cache.html.twig
@@ -0,0 +1,19 @@
+---
+label: 'Clearing the site cache'
+related:
+ - core.maintenance
+---
+{% set performance_url = render_var(url('system.performance_settings')) %}
+<h2>{% trans %}Goal{% endtrans %}</h2>
+<p>{% trans %}Clear the data in the site cache.{% endtrans %}</p>
+<h2>{% trans %}What is the cache?{% endtrans %}</h2>
+<p>{% trans %}Some of the calculations that are done when your site loads a page take a long time to run. To save time when these calculations would need to be done again, their results can be <em>cached</em> in your site's database. There are internal mechanisms to <em>clear</em> cached data when the conditions or assumptions that went into the calculation have changed, but you can also clear cached data manually. When your site is misbehaving, a good first step is to clear the cache and see if the problem goes away.{% endtrans %}</p>
+<h2>{% trans %}Steps{% endtrans %}</h2>
+<ol>
+ <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Configuration</em> > <em>Development</em> > <em><a href="{{ performance_url }}"><em>Performance</em></a></em>.{% endtrans %}</li>
+ <li>{% trans %}Click <em>Clear all caches</em>. Your site's cached data will be cleared.{% endtrans %}</li>
+</ol>
+<h2>{% trans %}Additional resources{% endtrans %}</h2>
+<ul>
+ <li>{% trans %}<a href="https://www.drupal.org/docs/user_guide/en/prevent-cache.html">Concept: Cache in the User Guide</a>{% endtrans %}</li>
+</ul>
diff --git a/web/core/modules/help_topics/help_topics/system.config_error.html.twig b/web/core/modules/help_topics/help_topics/system.config_error.html.twig
index c4bed14887..2d72056332 100644
--- a/web/core/modules/help_topics/help_topics/system.config_error.html.twig
+++ b/web/core/modules/help_topics/help_topics/system.config_error.html.twig
@@ -2,6 +2,7 @@
label: 'Configuring error responses, including 403/404 pages'
related:
- system.config_basic
+ - core.maintenance
---
{% set log_settings_url = render_var(url('system.logging_settings')) %}
{% set information_url = render_var(url('system.site_information_settings')) %}
@@ -20,5 +21,4 @@ related:
<li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Configuration</em> > <em>Development</em> > <em><a href="{{ log_settings_url }}">Logging and errors</a></em>.{% endtrans %}</li>
<li>{% trans %}For a production site, select <em>None</em> under <em>Error messages to display</em>. For a site that is in development, select one of the other options, so that you are more aware of the errors the site is generating.{% endtrans %}</li>
<li>{% trans %}Click <em>Save configuration</em>. You should see a message indicating that the settings were saved.{% endtrans %}</li>
- <li>{% trans %}If you have the Database Logging module installed, in the <em>Manage</em> administrative menu, navigate to <em>Reports</em> > <em>Recent log messages</em> to see a report of the error and informational messages your site has generated.{% endtrans %}</li>
</ol>
diff --git a/web/core/modules/help_topics/help_topics/system.maintenance_mode.html.twig b/web/core/modules/help_topics/help_topics/system.maintenance_mode.html.twig
new file mode 100644
index 0000000000..1f6efa1617
--- /dev/null
+++ b/web/core/modules/help_topics/help_topics/system.maintenance_mode.html.twig
@@ -0,0 +1,21 @@
+---
+label: 'Enabling and disabling maintenance mode'
+related:
+ - core.maintenance
+ - system.cache
+---
+{% set maintenance_url = render_var(url('system.site_maintenance_mode')) %}
+{% set cache_help = render_var(url('help.help_topic', {'id': 'system.cache'})) %}
+<h2>{% trans %}Goal{% endtrans %}</h2>
+<p>{% trans %}Put your site in maintenance mode to perform maintenance operations, and then return to normal mode when finished.{% endtrans %}</p>
+<h2>{% trans %}What is maintenance mode?{% endtrans %}</h2>
+<p>{% trans %}When your site is in maintenance mode, most site visitors will see a simple maintenance mode message page, rather than being able to use the full functionality of the site. Users with <em>Use the site in maintenance mode</em> permission who are already logged in will be able to use the full site, and the log in page at <em>/user</em> will also be accessible to anyone.{% endtrans %}</p>
+<h2>{% trans %}Steps{% endtrans %}</h2>
+<ol>
+ <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Configuration</em> > <em>Development</em> > <a href="{{ maintenance_url }}"><em>Maintenance mode</em></a>.{% endtrans %}</li>
+ <li>{% trans %}Check <em>Put site into maintenance mode</em>, optionally change the <em>Message to display when in maintenance mode</em>, and click <em>Save configuration</em>. Your site will be in maintenance mode.{% endtrans %}</li>
+ <li>{% trans %}Perform your maintenance operations.{% endtrans %}</li>
+ <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Configuration</em> > <em>Development</em> > <em><a href="{{ maintenance_url }}">Maintenance mode</a></em>.{% endtrans %}</li>
+ <li>{% trans %}Uncheck <em>Put site into maintenance mode</em> and click <em>Save configuration</em>. Your site will be back in normal operation mode.{% endtrans %}</li>
+ <li>{% trans %}Clear the site cache. See <a href="{{ cache_help }}">Clearing the site cache</a> for instructions.{% endtrans %}</li>
+</ol>
diff --git a/web/core/modules/help_topics/help_topics/system.module_install.html.twig b/web/core/modules/help_topics/help_topics/system.module_install.html.twig
new file mode 100644
index 0000000000..92e2b06d54
--- /dev/null
+++ b/web/core/modules/help_topics/help_topics/system.module_install.html.twig
@@ -0,0 +1,17 @@
+---
+label: 'Installing a module'
+related:
+ - core.extending
+ - system.module_uninstall
+---
+{% set extend_url = render_var(url('system.modules_list')) %}
+<h2>{% trans %}Goal{% endtrans %}</h2>
+<p>{% trans %}Install a core module, or a contributed module that has already been downloaded.{% endtrans %}</p>
+<h2>{% trans %}Steps{% endtrans %}</h2>
+<ol>
+ <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <a href="{{ extend_url }}"><em>Extend</em></a>.{% endtrans %}</li>
+ <li>{% trans %}Enter a word from the module name or description into the filter box, to make the list of modules smaller. Locate the module you want to install.{% endtrans %}</li>
+ <li>{% trans %}Check the box next to the name of the module you want to install; you can also check more than one box to install multiple modules at the same time. If the checkbox is disabled for the module you are trying to install, expand the information to see why -- you may need to download an additional module that your module requires.{% endtrans %}</li>
+ <li>{% trans %}Click <em>Install</em> at the bottom of the page. If you chose to install a module with dependencies that were not already installed, or if you chose an Experimental module, confirm your choice on the next page.{% endtrans %}</li>
+ <li>{% trans %}Wait for the module (or modules) to be installed. You should be returned to the <em>Extend</em> page with a message saying the module or modules were installed.{% endtrans %}</li>
+</ol>
diff --git a/web/core/modules/help_topics/help_topics/system.module_uninstall.html.twig b/web/core/modules/help_topics/help_topics/system.module_uninstall.html.twig
new file mode 100644
index 0000000000..8e014f4d75
--- /dev/null
+++ b/web/core/modules/help_topics/help_topics/system.module_uninstall.html.twig
@@ -0,0 +1,19 @@
+---
+label: 'Uninstalling a module'
+related:
+ - core.extending
+ - system.module_install
+ - system.maintenance_mode
+---
+{% set uninstall_url = render_var(url('system.modules_uninstall')) %}
+{% set maintenance_topic = render_var(url('help.help_topic', {'id': 'system.maintenance_mode'})) %}<h2>{% trans %}Goal{% endtrans %}</h2>
+<p>{% trans %}Uninstall a module. Your site should be in <a href="{{ maintenance_topic }}">maintenance mode</a> when you uninstall modules.{% endtrans %}</p>
+<h2>{% trans %}Steps{% endtrans %}</h2>
+<ol>
+ <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Extend</em> > <a href="{{ uninstall_url }}"><em>Uninstall</em></a>.{% endtrans %}</li>
+ <li>{% trans %}Enter a word from the module name or description into the filter box, to make the list of modules smaller. Locate the module you want to uninstall.{% endtrans %}</li>
+ <li>{% trans %}In the <em>Description</em> column, see if there are reasons that this module cannot be uninstalled. For example, you may have created content using this module (which you would need to delete first), or there may be another module installed that requires this module to be installed (you would need to uninstall the other module first).{% endtrans %}</li>
+ <li>{% trans %}If there are no reasons listed, the module can be uninstalled. Check the box in the <em>Uninstall</em> column, next to the module's name.{% endtrans %}</li>
+ <li>{% trans %}Click <em>Uninstall</em> at the bottom of the page. Verify the list of modules to be uninstalled and configuration to be deleted on the confirmation page, and click <em>Uninstall</em>.{% endtrans %}</li>
+ <li>{% trans %}Wait for the module to be uninstalled. You should be returned to the <em>Uninstall</em> page with a message saying the module was uninstalled.{% endtrans %}</li>
+</ol>
diff --git a/web/core/modules/help_topics/help_topics/system.reports.html.twig b/web/core/modules/help_topics/help_topics/system.reports.html.twig
new file mode 100644
index 0000000000..411acff825
--- /dev/null
+++ b/web/core/modules/help_topics/help_topics/system.reports.html.twig
@@ -0,0 +1,20 @@
+---
+label: 'Running reports on your site'
+related:
+ - core.maintenance
+ - core.security
+ - system.config_error
+---
+{% set status_url = render_var(url('system.status')) %}
+<h2>{% trans %}Goal{% endtrans %}</h2>
+<p>{% trans %}Run reports to learn about the status and health of your site.{% endtrans %}</p>
+<h2>{% trans %}Steps{% endtrans %}</h2>
+<ol>
+ <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Reports</em> > <a href="{{ status_url }}"><em>Status report</em></a> to see a report that summarizes the health and status of your site. If there are any warnings or errors, you will need to fix them.{% endtrans %}</li>
+ <li>{% trans %}If you have the core Database Logging module installed, in the <em>Manage</em> administrative menu, navigate to <em>Reports</em> > <em>Recent log messages</em> to see a report of the error and informational messages your site has generated. You can filter the report by <em>Severity</em> to see only the most critical messages, if desired.{% endtrans %}</li>
+ <li>{% trans %}If you have the core Update Manager module installed, in the <em>Manage</em> administrative menu, navigate to <em>Reports</em> > <em>Available updates</em> to see a report of the updates that are available for your site software. If <em>Last checked</em> is far in the past, click <em>Check manually</em> to update the report. Scan the report; if Drupal core or any modules or themes have security updates available, you should update them as soon as possible.{% endtrans %}</li>
+</ol>
+<h2>{% trans %}Additional resources{% endtrans %}</h2>
+<ul>
+ <li>{% trans %}<a href="https://www.drupal.org/docs/user_guide/en/security-chapter.html">Security and Maintenance chapter in the User Guide</a>, which includes information on how to update your site's core software, modules, and themes{% endtrans %}</li>
+</ul>
diff --git a/web/core/modules/help_topics/help_topics/system.theme_install.html.twig b/web/core/modules/help_topics/help_topics/system.theme_install.html.twig
new file mode 100644
index 0000000000..97dc7a796c
--- /dev/null
+++ b/web/core/modules/help_topics/help_topics/system.theme_install.html.twig
@@ -0,0 +1,18 @@
+---
+label: 'Installing a theme and setting default themes'
+related:
+ - core.appearance
+ - system.theme_uninstall
+---
+{% set themes_url = render_var(url('system.themes_page')) %}
+<h2>{% trans %}Goal{% endtrans %}</h2>
+<p>{% trans %}Install a core theme, or a contributed theme that has already been downloaded. Choose the default themes to use for the site and for administrative pages.{% endtrans %}</p>
+<h2>{% trans %}Steps{% endtrans %}</h2>
+<ol>
+ <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <a href="{{ themes_url }}"><em>Appearance</em></a>.{% endtrans %}</li>
+ <li>{% trans %}Locate the themes that you want to use as the site default theme and for administrative pages.{% endtrans %}</li>
+ <li>{% trans %}For each of these themes, if the theme is in the <em>Uninstalled themes</em> section, click the <em>Install</em> link to install the theme. Wait for the theme to be installed (translations might be downloaded). You should be returned to the <em>Appearance</em> page.{% endtrans %}</li>
+ <li>{% trans %}Locate the theme that you want to be your default theme, which should now be in the <em>Installed themes</em> section. If it is not already labeled as the <em>default theme</em>, click the <em>Set as default</em> link.{% endtrans %}</li>
+ <li>{% trans %}At the bottom of the page, select the <em>Administration theme</em> that you want to use on administrative pages. Click <em>Save configuration</em> if you selected a new theme.{% endtrans %}</li>
+ <li>{% trans %}If you changed the default theme for your site, visit the site home page or another page on the non-administration part of your site and verify that the site is using the new theme. If you changed the administration theme, verify that the new theme is used on administrative pages.{% endtrans %}</li>
+</ol>
diff --git a/web/core/modules/help_topics/help_topics/system.theme_uninstall.html.twig b/web/core/modules/help_topics/help_topics/system.theme_uninstall.html.twig
new file mode 100644
index 0000000000..72bb7b8818
--- /dev/null
+++ b/web/core/modules/help_topics/help_topics/system.theme_uninstall.html.twig
@@ -0,0 +1,15 @@
+---
+label: 'Uninstalling an unused theme'
+related:
+ - core.appearance
+ - system.theme_install
+---
+{% set themes_url = render_var(url('system.themes_page')) %}
+<h2>{% trans %}Goal{% endtrans %}</h2>
+<p>{% trans %}Uninstall a theme that was previously installed, but is no longer being used on the site.{% endtrans %}</p>
+<h2>{% trans %}Steps{% endtrans %}</h2>
+<ol>
+ <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <a href="{{ themes_url }}"><em>Appearance</em></a>.{% endtrans %}</li>
+ <li>{% trans %}Locate the theme that you want to uninstall, in the <em>Installed themes</em> section.{% endtrans %}</li>
+ <li>{% trans %}Click the <em>Uninstall</em> link to install the theme. If there is not an <em>Uninstall</em> link, the theme cannot be uninstalled because it is either being used as the site default theme, being used as the <em>Administration theme</em>, or is the base theme for another installed theme.{% endtrans %}</li>
+</ol>
diff --git a/web/core/modules/help_topics/help_topics/user.create.html.twig b/web/core/modules/help_topics/help_topics/user.create.html.twig
new file mode 100644
index 0000000000..bba66515cb
--- /dev/null
+++ b/web/core/modules/help_topics/help_topics/user.create.html.twig
@@ -0,0 +1,20 @@
+---
+label: 'Creating a user account'
+related:
+ - user.security_account_settings
+ - user.overview
+---
+{% set people_url = render_var(url('entity.user.collection')) %}
+<h2>{% trans %}Goal{% endtrans %}</h2>
+<p>{% trans %}Create a new user account.{% endtrans %}</p>
+<h2>{% trans %}Steps{% endtrans %}</h2>
+<ol>
+ <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <a href="{{ people_url}}"><em>People</em></a>.{% endtrans %}</li>
+ <li>{% trans %}Click <em>Add user</em>.{% endtrans %}</li>
+ <li>{% trans %}Enter the <em>Email address</em>, <em>Username</em>, and <em>Password</em> (twice) for the new user.{% endtrans %}</li>
+ <li>{% trans %}Verify that the <em>Roles</em> checked for the new user are correct.{% endtrans %}</li>
+ <li>{% trans %}If you want the new user to receive an email message notifying them of the new account, check <em>Notify user of new account</em>.{% endtrans %}</li>
+ <li>{% trans %}Optionally, change other settings on the form.{% endtrans %}</li>
+ <li>{% trans %}Click <em>Create new account</em>.{% endtrans %}</li>
+ <li>{% trans %}You will be left on the <em>Add user</em> page; repeat these steps if you have more user accounts to create.{% endtrans %}</li>
+</ol>
diff --git a/web/core/modules/help_topics/help_topics/user.new_role.html.twig b/web/core/modules/help_topics/help_topics/user.new_role.html.twig
new file mode 100644
index 0000000000..899e4a4259
--- /dev/null
+++ b/web/core/modules/help_topics/help_topics/user.new_role.html.twig
@@ -0,0 +1,16 @@
+---
+label: 'Adding a new role'
+related:
+ - user.overview
+ - user.permissions
+---
+{% set roles_url = render_var(url('entity.user_role.collection')) %}
+<h2>{% trans %}Goal{% endtrans %}</h2>
+<p>{% trans %}Create a new role.{% endtrans %}</p>
+<h2>{% trans %}Steps{% endtrans %}</h2>
+<ol>
+ <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>People</em> > <a href="{{ roles_url}}"><em>Roles</em></a>.{% endtrans %}</li>
+ <li>{% trans %}Click <em>Add role</em>.{% endtrans %}</li>
+ <li>{% trans %}Enter the desired <em>Role name</em>. If desired, click <em>Edit</em> to change the <em>Machine name</em> for the role.{% endtrans %}</li>
+ <li>{% trans %}Click <em>Save</em>. You should be returned to the <em>Roles</em> page and your new role should be in the role list.{% endtrans %}</li>
+</ol>
diff --git a/web/core/modules/help_topics/help_topics/user.overview.html.twig b/web/core/modules/help_topics/help_topics/user.overview.html.twig
new file mode 100644
index 0000000000..44428f2447
--- /dev/null
+++ b/web/core/modules/help_topics/help_topics/user.overview.html.twig
@@ -0,0 +1,12 @@
+---
+label: 'Managing user accounts and site visitors'
+top_level: true
+---
+<h2>{% trans %}What is a user?{% endtrans %}</h2>
+<p>{% trans %}A user is anyone accessing or viewing your site. <em>Anonymous</em> users are users who are not logged in, and <em>Authenticated</em> users are users who are logged in.{% endtrans %}</p>
+<h2>{% trans %}What is a role?{% endtrans %}</h2>
+<p>{% trans %}<em>Roles</em> are used to group and classify users; each user can be assigned one or more roles. There are also special roles for all anonymous and all authenticated users.{% endtrans %}</p>
+<h2>{% trans %}What is a permission?{% endtrans %}</h2>
+<p>{% trans %}Granting a <em>permission</em> to a role allows users who have been assigned that role to perform an action on the site, such as viewing content, editing or creating a particular type of content, administering settings for a particular module, or using a particular function of the site (such as search).{% endtrans %}</p>
+<h2>{% trans %}Overview of managing user accounts and visitors{% endtrans %}</h2>
+<p>{% trans %}The core User module allows users to register, log in, and log out, and administrators to manage user roles and permissions. The core Ban module allows administrators to ban certain IP addresses from accessing the site. Depending on which modules you have installed on your site, the related topics below will help you with tasks related to managing user accounts and visitors.{% endtrans %}</p>
diff --git a/web/core/modules/help_topics/help_topics/user.permissions.html.twig b/web/core/modules/help_topics/help_topics/user.permissions.html.twig
new file mode 100644
index 0000000000..b3e3f451db
--- /dev/null
+++ b/web/core/modules/help_topics/help_topics/user.permissions.html.twig
@@ -0,0 +1,16 @@
+---
+label: 'Modifying the permissions for a role'
+related:
+ - user.overview
+ - user.new_role
+ - core.security
+---
+{% set permissions_url = render_var(url('user.admin_permissions')) %}
+<h2>{% trans %}Goal{% endtrans %}</h2>
+<p>{% trans %}Modify the permissions for an existing role.{% endtrans %}</p>
+<h2>{% trans %}Steps{% endtrans %}</h2>
+<ol>
+ <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>People</em> > <a href="{{ permissions_url}}"><em>Permissions</em></a>.{% endtrans %}</li>
+ <li>{% trans %}Review the permissions for the role, paying particular attention to the permissions marked with <em>Warning: Give to trusted roles only; this permission has security implications.</em> Uncheck permissions that this role should not have, in the row of the permission and the column of the role; check permissions that this role should have.{% endtrans %}</li>
+ <li>{% trans %}Click <em>Save permissions</em>.{% endtrans %}</li>
+</ol>
diff --git a/web/core/modules/help_topics/help_topics/user.security_account_settings.html.twig b/web/core/modules/help_topics/help_topics/user.security_account_settings.html.twig
index 3898cc9d1a..944a13c442 100644
--- a/web/core/modules/help_topics/help_topics/user.security_account_settings.html.twig
+++ b/web/core/modules/help_topics/help_topics/user.security_account_settings.html.twig
@@ -2,6 +2,7 @@
label: 'Configuring how user accounts are created and deleted'
related:
- core.security
+ - user.overview
---
{% set account_settings_url = render_var(url('entity.user.admin_form')) %}
<h2>{% trans %}Goal{% endtrans %}</h2>
@@ -25,7 +26,7 @@ related:
</ul>
<h2>{% trans %}Steps{% endtrans %}</h2>
<ol>
- <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Configuration</em> > <em>People</em> > <em><a href="{{ account_settings_url}}">Account settings</a></em>.{% endtrans %}</li>
+ <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Configuration</em> > <em>People</em> > <a href="{{ account_settings_url}}"><em>Account settings</em></a>.{% endtrans %}</li>
<li>{% trans %}Select the method you want to use for creating user accounts, and check or uncheck the box that requires email verification, to match the settings you want for your site.{% endtrans %}</li>
<li>{% trans %}Select the desired option for what happens to content that a user created if their account is canceled.{% endtrans %}</li>
<li>{% trans %}Optionally, edit the text of email messages related to user accounts.{% endtrans %}</li>
diff --git a/web/core/modules/help_topics/help_topics/user.update.html.twig b/web/core/modules/help_topics/help_topics/user.update.html.twig
new file mode 100644
index 0000000000..362bea6b18
--- /dev/null
+++ b/web/core/modules/help_topics/help_topics/user.update.html.twig
@@ -0,0 +1,17 @@
+---
+label: 'Modifying or deleting a user account'
+related:
+ - user.security_account_settings
+ - user.overview
+---
+{% set people_url = render_var(url('entity.user.collection')) %}
+<h2>{% trans %}Goal{% endtrans %}</h2>
+<p>{% trans %}Update or delete an existing user account.{% endtrans %}</p>
+<h2>{% trans %}Steps{% endtrans %}</h2>
+<ol>
+ <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <a href="{{ people_url}}"><em>People</em></a>.{% endtrans %}</li>
+ <li>{% trans %}Enter all or part of the user name or email address of the user account you want to update or delete, and click <em>Filter</em>. A short list of user accounts, including the account of interest, should be shown in the table; if not, modify the filter text until you can find the account of interest.{% endtrans %}</li>
+ <li>{% trans %}Click <em>Edit</em> in the <em>Operations</em> area of the account of interest.{% endtrans %}</li>
+ <li>{% trans %}To delete the user account, scroll to the bottom and click <em>Cancel account</em>. Select what you want to happen to the user's content on the next screen, and click <em>Cancel account</em>.{% endtrans %}</li>
+ <li>{% trans %}To update the user account, enter new values in the form and click <em>Save</em>.{% endtrans %}</li>
+</ol>
diff --git a/web/core/modules/help_topics/tests/src/Functional/HelpTopicSearchTest.php b/web/core/modules/help_topics/tests/src/Functional/HelpTopicSearchTest.php
index 2f6765c151..23012158d0 100644
--- a/web/core/modules/help_topics/tests/src/Functional/HelpTopicSearchTest.php
+++ b/web/core/modules/help_topics/tests/src/Functional/HelpTopicSearchTest.php
@@ -250,7 +250,7 @@ public function testUninstall() {
$this->drupalPostForm(NULL, NULL, t('Uninstall'));
$this->assertText(t('The selected modules have been uninstalled.'), 'Modules status has been updated.');
$this->drupalGet('admin/help');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
}
/**
diff --git a/web/core/modules/help_topics/tests/src/Functional/HelpTopicTest.php b/web/core/modules/help_topics/tests/src/Functional/HelpTopicTest.php
index 3dcbbd21c3..0bea9175f3 100644
--- a/web/core/modules/help_topics/tests/src/Functional/HelpTopicTest.php
+++ b/web/core/modules/help_topics/tests/src/Functional/HelpTopicTest.php
@@ -189,7 +189,7 @@ protected function verifyHelpLinks() {
// Verify theme provided help topics work and can be related.
$this->drupalGet('admin/help/topic/help_topics_test_theme.test');
$session->pageTextContains('This is a theme provided topic.');
- $this->assertContains('This is a theme provided topic.', $session->elementExists('css', 'article')->getText());
+ $this->assertStringContainsString('This is a theme provided topic.', $session->elementExists('css', 'article')->getText());
$this->clickLink('Additional topic');
$session->linkExists('XYZ Help Test theme');
diff --git a/web/core/modules/help_topics/tests/src/Functional/HelpTopicsSyntaxTest.php b/web/core/modules/help_topics/tests/src/Functional/HelpTopicsSyntaxTest.php
index 6127dd4e8c..6586054c60 100644
--- a/web/core/modules/help_topics/tests/src/Functional/HelpTopicsSyntaxTest.php
+++ b/web/core/modules/help_topics/tests/src/Functional/HelpTopicsSyntaxTest.php
@@ -196,31 +196,31 @@ protected function verifyBadTopic($id, $definitions) {
$message = $e->getMessage();
switch ($bad_topic_type) {
case 'related':
- $this->assertContains('only related to topics that exist', $message);
+ $this->assertStringContainsString('only related to topics that exist', $message);
break;
case 'bad_html':
- $this->assertContains('Unexpected end tag', $message);
+ $this->assertStringContainsString('Unexpected end tag', $message);
break;
case 'top_level':
- $this->assertContains('is either top-level or related to at least one other top-level topic', $message);
+ $this->assertStringContainsString('is either top-level or related to at least one other top-level topic', $message);
break;
case 'empty':
- $this->assertContains('contains some text outside of front matter', $message);
+ $this->assertStringContainsString('contains some text outside of front matter', $message);
break;
case 'translated':
- $this->assertContains('Twig file has all of its text translated', $message);
+ $this->assertStringContainsString('Twig file has all of its text translated', $message);
break;
case 'h1':
- $this->assertContains('has no H1 tag', $message);
+ $this->assertStringContainsString('has no H1 tag', $message);
break;
case 'hierarchy':
- $this->assertContains('has the correct H2-H6 heading hierarchy', $message);
+ $this->assertStringContainsString('has the correct H2-H6 heading hierarchy', $message);
break;
default:
diff --git a/web/core/modules/help_topics/tests/src/Unit/HelpTopicTwigLoaderTest.php b/web/core/modules/help_topics/tests/src/Unit/HelpTopicTwigLoaderTest.php
index 2f5258d054..f8b29d5ac1 100644
--- a/web/core/modules/help_topics/tests/src/Unit/HelpTopicTwigLoaderTest.php
+++ b/web/core/modules/help_topics/tests/src/Unit/HelpTopicTwigLoaderTest.php
@@ -47,9 +47,9 @@ public function testConstructor() {
// Verify that the module/theme directories were added in the constructor,
// and non-existent directories were omitted.
$paths = $this->helpLoader->getPaths(HelpTopicTwigLoader::MAIN_NAMESPACE);
- $this->assertEquals(count($paths), 2);
- $this->assertTrue(in_array($this->directories['module']['test'] . '/help_topics', $paths));
- $this->assertTrue(in_array($this->directories['theme']['test'] . '/help_topics', $paths));
+ $this->assertCount(2, $paths);
+ $this->assertContains($this->directories['module']['test'] . '/help_topics', $paths);
+ $this->assertContains($this->directories['theme']['test'] . '/help_topics', $paths);
}
/**
diff --git a/web/core/modules/history/tests/src/Functional/HistoryTest.php b/web/core/modules/history/tests/src/Functional/HistoryTest.php
index e6c681620c..ab9b3562bf 100644
--- a/web/core/modules/history/tests/src/Functional/HistoryTest.php
+++ b/web/core/modules/history/tests/src/Functional/HistoryTest.php
@@ -112,14 +112,14 @@ public function testHistory() {
// JavaScript present to record the node read.
$settings = $this->getDrupalSettings();
$libraries = explode(',', $settings['ajaxPageState']['libraries']);
- $this->assertTrue(in_array('history/mark-as-read', $libraries), 'history/mark-as-read library is present.');
+ $this->assertContains('history/mark-as-read', $libraries, 'history/mark-as-read library is present.');
$this->assertEqual([$nid => TRUE], $settings['history']['nodesToMarkAsRead'], 'drupalSettings to mark node as read are present.');
// Simulate JavaScript: perform HTTP request to mark node as read.
$response = $this->markNodeAsRead($nid);
$this->assertEquals(200, $response->getStatusCode());
$timestamp = Json::decode($response->getBody());
- $this->assertTrue(is_numeric($timestamp), 'Node has been marked as read. Timestamp received.');
+ $this->assertIsNumeric($timestamp);
// Retrieve "last read" timestamp for test node, for the current user.
$response = $this->getNodeReadTimestamps([$nid]);
diff --git a/web/core/modules/history/tests/src/Kernel/Views/HistoryTimestampTest.php b/web/core/modules/history/tests/src/Kernel/Views/HistoryTimestampTest.php
index 9baeff7b29..71809fcee3 100644
--- a/web/core/modules/history/tests/src/Kernel/Views/HistoryTimestampTest.php
+++ b/web/core/modules/history/tests/src/Kernel/Views/HistoryTimestampTest.php
@@ -91,17 +91,17 @@ public function testHandlers() {
$view = Views::getView('test_history');
$view->setDisplay('page_1');
$this->executeView($view);
- $this->assertEqual(count($view->result), 2);
+ $this->assertCount(2, $view->result);
$output = $view->preview();
$this->setRawContent(\Drupal::service('renderer')->renderRoot($output));
$result = $this->xpath('//span[@class=:class]', [':class' => 'marker']);
- $this->assertEqual(count($result), 1, 'Just one node is marked as new');
+ $this->assertCount(1, $result, 'Just one node is marked as new');
// Test the history filter.
$view = Views::getView('test_history');
$view->setDisplay('page_2');
$this->executeView($view);
- $this->assertEqual(count($view->result), 1);
+ $this->assertCount(1, $view->result);
$this->assertIdenticalResultset($view, [['nid' => $nodes[0]->id()]], $column_map);
// Install Comment module and make sure that content types without comment
diff --git a/web/core/modules/image/image.info.yml b/web/core/modules/image/image.info.yml
index c17c7e09a1..d003f1c629 100644
--- a/web/core/modules/image/image.info.yml
+++ b/web/core/modules/image/image.info.yml
@@ -1,6 +1,6 @@
name: Image
type: module
-description: 'Defines an image field type and provides image manipulation tools.'
+description: 'Defines a field type for image media and provides display configuration tools.'
package: Field types
version: VERSION
core: 8.x
diff --git a/web/core/modules/image/js/editors/image.es6.js b/web/core/modules/image/js/editors/image.es6.js
index b43f75f014..df6a5e282c 100644
--- a/web/core/modules/image/js/editors/image.es6.js
+++ b/web/core/modules/image/js/editors/image.es6.js
@@ -40,7 +40,7 @@
},
/**
- * @inheritdoc
+ * {@inheritdoc}
*
* @param {Drupal.quickedit.FieldModel} fieldModel
* The field model that holds the state.
@@ -329,14 +329,14 @@
},
/**
- * @inheritdoc
+ * {@inheritdoc}
*/
revert() {
this.$el.html(this.model.get('originalValue'));
},
/**
- * @inheritdoc
+ * {@inheritdoc}
*/
getQuickEditUISettings() {
return {
@@ -348,7 +348,7 @@
},
/**
- * @inheritdoc
+ * {@inheritdoc}
*/
showValidationErrors() {
const errors = Drupal.theme('quickeditImageErrors', {
@@ -363,7 +363,7 @@
},
/**
- * @inheritdoc
+ * {@inheritdoc}
*/
removeValidationErrors() {
$(`#${this.fieldModel.toolbarView.getMainWysiwygToolgroupId()}`)
diff --git a/web/core/modules/image/src/Controller/ImageStyleDownloadController.php b/web/core/modules/image/src/Controller/ImageStyleDownloadController.php
index 2913b9fe51..c7cf65cdf4 100644
--- a/web/core/modules/image/src/Controller/ImageStyleDownloadController.php
+++ b/web/core/modules/image/src/Controller/ImageStyleDownloadController.php
@@ -157,7 +157,7 @@ public function deliver(Request $request, $scheme, ImageStyleInterface $image_st
if (!$lock_acquired) {
// Tell client to retry again in 3 seconds. Currently no browsers are
// known to support Retry-After.
- throw new ServiceUnavailableHttpException(3, $this->t('Image generation in progress. Try again shortly.'));
+ throw new ServiceUnavailableHttpException(3, 'Image generation in progress. Try again shortly.');
}
}
diff --git a/web/core/modules/image/src/Plugin/migrate/destination/EntityImageStyle.php b/web/core/modules/image/src/Plugin/migrate/destination/EntityImageStyle.php
index 3fc1e7f4ed..51c73b5ad6 100644
--- a/web/core/modules/image/src/Plugin/migrate/destination/EntityImageStyle.php
+++ b/web/core/modules/image/src/Plugin/migrate/destination/EntityImageStyle.php
@@ -30,7 +30,7 @@ public function import(Row $row, array $old_destination_id_values = []) {
$row->setDestinationProperty('effects', []);
}
- /** @var \Drupal\Image\Entity\ImageStyle $style */
+ /** @var \Drupal\image\Entity\ImageStyle $style */
$style = $this->getEntity($row, $old_destination_id_values);
// Iterate the effects array so each effect plugin can be initialized.
diff --git a/web/core/modules/image/tests/src/Functional/FileMoveTest.php b/web/core/modules/image/tests/src/Functional/FileMoveTest.php
index c2a3a1bbe4..8945b0c302 100644
--- a/web/core/modules/image/tests/src/Functional/FileMoveTest.php
+++ b/web/core/modules/image/tests/src/Functional/FileMoveTest.php
@@ -47,7 +47,7 @@ public function testNormal() {
$style->createDerivative($original_uri, $derivative_uri);
// Check if derivative image exists.
- $this->assertTrue(file_exists($derivative_uri), 'Make sure derivative image is generated successfully.');
+ $this->assertFileExists($derivative_uri);
// Clone the object so we don't have to worry about the function changing
// our reference copy.
@@ -55,10 +55,10 @@ public function testNormal() {
$result = file_move(clone $file, $desired_filepath, FileSystemInterface::EXISTS_ERROR);
// Check if image has been moved.
- $this->assertTrue(file_exists($result->getFileUri()), 'Make sure image is moved successfully.');
+ $this->assertFileExists($result->getFileUri());
// Check if derivative image has been flushed.
- $this->assertFalse(file_exists($derivative_uri), 'Make sure derivative image has been flushed.');
+ $this->assertFileNotExists($derivative_uri);
}
}
diff --git a/web/core/modules/image/tests/src/Functional/ImageAdminStylesTest.php b/web/core/modules/image/tests/src/Functional/ImageAdminStylesTest.php
index 46c96ca243..117f959d99 100644
--- a/web/core/modules/image/tests/src/Functional/ImageAdminStylesTest.php
+++ b/web/core/modules/image/tests/src/Functional/ImageAdminStylesTest.php
@@ -70,7 +70,7 @@ public function testNumericStyleName() {
$this->drupalPostForm('admin/config/media/image-styles/add', $edit, t('Create new style'));
$this->assertRaw(t('Style %name was created.', ['%name' => $style_label]));
$options = image_style_options();
- $this->assertTrue(array_key_exists($style_name, $options), new FormattableMarkup('Array key %key exists.', ['%key' => $style_name]));
+ $this->assertArrayHasKey($style_name, $options);
}
/**
@@ -152,7 +152,7 @@ public function testStyle() {
// Ensure that the image style URI matches our expected path.
$style_uri_path = $style->toUrl()->toString();
- $this->assertTrue(strpos($style_uri_path, $style_path) !== FALSE, 'The image style URI is correct.');
+ $this->assertStringContainsString($style_path, $style_uri_path, 'The image style URI is correct.');
// Confirm that all effects on the image style have settings that match
// what was saved.
@@ -216,8 +216,7 @@ public function testStyle() {
// Check that the URL was updated.
$this->drupalGet($style_path);
- $this->assertTitle(t('Edit style @name | Drupal', ['@name' => $style_label]));
- $this->assertResponse(200, new FormattableMarkup('Image style %original renamed to %new', ['%original' => $style->id(), '%new' => $style_name]));
+ $this->assertTitle("Edit style $style_label | Drupal");
// Check that the available image effects are properly sorted.
$option = $this->xpath('//select[@id=:id]//option', [':id' => 'edit-new--2']);
@@ -252,7 +251,7 @@ public function testStyle() {
// Delete the 'image_crop' effect from the style.
$this->drupalPostForm($style_path . '/effects/' . $uuids['image_crop'] . '/delete', [], t('Delete'));
// Confirm that the form submission was successful.
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$image_crop_effect = $style->getEffect($uuids['image_crop']);
$this->assertRaw(t('The image effect %name has been deleted.', ['%name' => $image_crop_effect->label()]));
// Confirm that there is no longer a link to the effect.
@@ -278,7 +277,7 @@ public function testStyle() {
$this->drupalPostForm(NULL, $edit, t('Add effect'));
$entity_type_manager = $this->container->get('entity_type.manager');
$style = $entity_type_manager->getStorage('image_style')->loadUnchanged($style_name);
- $this->assertEqual(count($style->getEffects()), 6, 'Rotate effect with transparent background was added.');
+ $this->assertCount(6, $style->getEffects(), 'Rotate effect with transparent background was added.');
// Style deletion form.
@@ -287,7 +286,7 @@ public function testStyle() {
// Confirm the style directory has been removed.
$directory = 'public://styles/' . $style_name;
- $this->assertFalse(is_dir($directory), new FormattableMarkup('Image style %style directory removed on style deletion.', ['%style' => $style->label()]));
+ $this->assertDirectoryNotExists($directory);
$this->assertNull(ImageStyle::load($style_name), new FormattableMarkup('Image style %style successfully deleted.', ['%style' => $style->label()]));
@@ -419,7 +418,7 @@ public function testEditEffect() {
// Try to edit a nonexistent effect.
$uuid = $this->container->get('uuid');
$this->drupalGet('admin/config/media/image-styles/manage/' . $style_name . '/effects/' . $uuid->generate());
- $this->assertResponse(404);
+ $this->assertSession()->statusCodeEquals(404);
}
/**
diff --git a/web/core/modules/image/tests/src/Functional/ImageDimensionsTest.php b/web/core/modules/image/tests/src/Functional/ImageDimensionsTest.php
index 6a969e5720..a124b0d544 100644
--- a/web/core/modules/image/tests/src/Functional/ImageDimensionsTest.php
+++ b/web/core/modules/image/tests/src/Functional/ImageDimensionsTest.php
@@ -78,10 +78,10 @@ public function testImageDimensions() {
$style->addImageEffect($effect);
$style->save();
$this->assertEqual($this->getImageTag($variables), '<img src="' . $url . '" width="120" height="60" alt="" class="image-style-test" />');
- $this->assertFalse(file_exists($generated_uri), 'Generated file does not exist.');
+ $this->assertFileNotExists($generated_uri);
$this->drupalGet($this->getAbsoluteUrl($url));
- $this->assertResponse(200, 'Image was generated at the URL.');
- $this->assertTrue(file_exists($generated_uri), 'Generated file does exist after we accessed it.');
+ $this->assertSession()->statusCodeEquals(200);
+ $this->assertFileExists($generated_uri);
$image_file = $image_factory->get($generated_uri);
$this->assertEqual($image_file->getWidth(), 120);
$this->assertEqual($image_file->getHeight(), 60);
@@ -99,10 +99,10 @@ public function testImageDimensions() {
$style->addImageEffect($effect);
$style->save();
$this->assertEqual($this->getImageTag($variables), '<img src="' . $url . '" width="60" height="120" alt="" class="image-style-test" />');
- $this->assertFalse(file_exists($generated_uri), 'Generated file does not exist.');
+ $this->assertFileNotExists($generated_uri);
$this->drupalGet($this->getAbsoluteUrl($url));
- $this->assertResponse(200, 'Image was generated at the URL.');
- $this->assertTrue(file_exists($generated_uri), 'Generated file does exist after we accessed it.');
+ $this->assertSession()->statusCodeEquals(200);
+ $this->assertFileExists($generated_uri);
$image_file = $image_factory->get($generated_uri);
$this->assertEqual($image_file->getWidth(), 60);
$this->assertEqual($image_file->getHeight(), 120);
@@ -121,10 +121,10 @@ public function testImageDimensions() {
$style->addImageEffect($effect);
$style->save();
$this->assertEqual($this->getImageTag($variables), '<img src="' . $url . '" width="45" height="90" alt="" class="image-style-test" />');
- $this->assertFalse(file_exists($generated_uri), 'Generated file does not exist.');
+ $this->assertFileNotExists($generated_uri);
$this->drupalGet($this->getAbsoluteUrl($url));
- $this->assertResponse(200, 'Image was generated at the URL.');
- $this->assertTrue(file_exists($generated_uri), 'Generated file does exist after we accessed it.');
+ $this->assertSession()->statusCodeEquals(200);
+ $this->assertFileExists($generated_uri);
$image_file = $image_factory->get($generated_uri);
$this->assertEqual($image_file->getWidth(), 45);
$this->assertEqual($image_file->getHeight(), 90);
@@ -143,10 +143,10 @@ public function testImageDimensions() {
$style->addImageEffect($effect);
$style->save();
$this->assertEqual($this->getImageTag($variables), '<img src="' . $url . '" width="45" height="90" alt="" class="image-style-test" />');
- $this->assertFalse(file_exists($generated_uri), 'Generated file does not exist.');
+ $this->assertFileNotExists($generated_uri);
$this->drupalGet($this->getAbsoluteUrl($url));
- $this->assertResponse(200, 'Image was generated at the URL.');
- $this->assertTrue(file_exists($generated_uri), 'Generated file does exist after we accessed it.');
+ $this->assertSession()->statusCodeEquals(200);
+ $this->assertFileExists($generated_uri);
$image_file = $image_factory->get($generated_uri);
$this->assertEqual($image_file->getWidth(), 45);
$this->assertEqual($image_file->getHeight(), 90);
@@ -161,10 +161,10 @@ public function testImageDimensions() {
$style->addImageEffect($effect);
$style->save();
$this->assertEqual($this->getImageTag($variables), '<img src="' . $url . '" width="45" height="90" alt="" class="image-style-test" />');
- $this->assertFalse(file_exists($generated_uri), 'Generated file does not exist.');
+ $this->assertFileNotExists($generated_uri);
$this->drupalGet($this->getAbsoluteUrl($url));
- $this->assertResponse(200, 'Image was generated at the URL.');
- $this->assertTrue(file_exists($generated_uri), 'Generated file does exist after we accessed it.');
+ $this->assertSession()->statusCodeEquals(200);
+ $this->assertFileExists($generated_uri);
$image_file = $image_factory->get($generated_uri);
$this->assertEqual($image_file->getWidth(), 45);
$this->assertEqual($image_file->getHeight(), 90);
@@ -182,10 +182,10 @@ public function testImageDimensions() {
$style->addImageEffect($effect);
$style->save();
$this->assertEqual($this->getImageTag($variables), '<img src="' . $url . '" alt="" class="image-style-test" />');
- $this->assertFalse(file_exists($generated_uri), 'Generated file does not exist.');
+ $this->assertFileNotExists($generated_uri);
$this->drupalGet($this->getAbsoluteUrl($url));
- $this->assertResponse(200, 'Image was generated at the URL.');
- $this->assertTrue(file_exists($generated_uri), 'Generated file does exist after we accessed it.');
+ $this->assertSession()->statusCodeEquals(200);
+ $this->assertFileExists($generated_uri);
// Add a crop effect.
$effect = [
@@ -201,10 +201,10 @@ public function testImageDimensions() {
$style->addImageEffect($effect);
$style->save();
$this->assertEqual($this->getImageTag($variables), '<img src="' . $url . '" width="30" height="30" alt="" class="image-style-test" />');
- $this->assertFalse(file_exists($generated_uri), 'Generated file does not exist.');
+ $this->assertFileNotExists($generated_uri);
$this->drupalGet($this->getAbsoluteUrl($url));
- $this->assertResponse(200, 'Image was generated at the URL.');
- $this->assertTrue(file_exists($generated_uri), 'Generated file does exist after we accessed it.');
+ $this->assertSession()->statusCodeEquals(200);
+ $this->assertFileExists($generated_uri);
$image_file = $image_factory->get($generated_uri);
$this->assertEqual($image_file->getWidth(), 30);
$this->assertEqual($image_file->getHeight(), 30);
@@ -224,10 +224,10 @@ public function testImageDimensions() {
// @todo Uncomment this once
// https://www.drupal.org/project/drupal/issues/2670966 is resolved.
// $this->assertEqual($this->getImageTag($variables), '<img src="' . $url . '" width="41" height="41" alt="" class="image-style-test" />');
- $this->assertFalse(file_exists($generated_uri), 'Generated file does not exist.');
+ $this->assertFileNotExists($generated_uri);
$this->drupalGet($this->getAbsoluteUrl($url));
- $this->assertResponse(200, 'Image was generated at the URL.');
- $this->assertTrue(file_exists($generated_uri), 'Generated file does exist after we accessed it.');
+ $this->assertSession()->statusCodeEquals(200);
+ $this->assertFileExists($generated_uri);
$image_file = $image_factory->get($generated_uri);
// @todo Uncomment this once
// https://www.drupal.org/project/drupal/issues/2670966 is resolved.
@@ -268,10 +268,10 @@ public function testImageDimensions() {
$generated_uri = 'public://styles/test_uri/public/' . $file_system->basename($original_uri);
$url = file_url_transform_relative($style->buildUrl($original_uri));
$this->assertEqual($this->getImageTag($variables), '<img src="' . $url . '" width="100" height="100" alt="" class="image-style-test-uri" />');
- $this->assertFalse(file_exists($generated_uri), 'Generated file does not exist.');
+ $this->assertFileNotExists($generated_uri);
$this->drupalGet($this->getAbsoluteUrl($url));
- $this->assertResponse(200, 'Image was generated at the URL.');
- $this->assertTrue(file_exists($generated_uri), 'Generated file does exist after we accessed it.');
+ $this->assertSession()->statusCodeEquals(200);
+ $this->assertFileExists($generated_uri);
$image_file = $image_factory->get($generated_uri);
$this->assertEqual($image_file->getWidth(), 100);
$this->assertEqual($image_file->getHeight(), 100);
@@ -282,10 +282,10 @@ public function testImageDimensions() {
$url = file_url_transform_relative($style->buildUrl($original_uri));
$variables['#uri'] = $original_uri;
$this->assertEqual($this->getImageTag($variables), '<img src="' . $url . '" width="50" height="50" alt="" class="image-style-test-uri" />');
- $this->assertFalse(file_exists($generated_uri), 'Generated file does not exist.');
+ $this->assertFileNotExists($generated_uri);
$this->drupalGet($this->getAbsoluteUrl($url));
- $this->assertResponse(200, 'Image was generated at the URL.');
- $this->assertTrue(file_exists($generated_uri), 'Generated file does exist after we accessed it.');
+ $this->assertSession()->statusCodeEquals(200);
+ $this->assertFileExists($generated_uri);
$image_file = $image_factory->get($generated_uri);
$this->assertEqual($image_file->getWidth(), 50);
$this->assertEqual($image_file->getHeight(), 50);
diff --git a/web/core/modules/image/tests/src/Functional/ImageEffectsTest.php b/web/core/modules/image/tests/src/Functional/ImageEffectsTest.php
index 08713f0057..5ba4054381 100644
--- a/web/core/modules/image/tests/src/Functional/ImageEffectsTest.php
+++ b/web/core/modules/image/tests/src/Functional/ImageEffectsTest.php
@@ -150,7 +150,7 @@ public function testDesaturateEffect() {
// Check the parameters.
$calls = $this->imageTestGetAllCalls();
- $this->assertEqual(count($calls['desaturate'][0]), 0, 'No parameters were passed.');
+ $this->assertCount(0, $calls['desaturate'][0], 'No parameters were passed.');
}
/**
diff --git a/web/core/modules/image/tests/src/Functional/ImageFieldDisplayTest.php b/web/core/modules/image/tests/src/Functional/ImageFieldDisplayTest.php
index 96baad54a2..0db5b9ebf1 100644
--- a/web/core/modules/image/tests/src/Functional/ImageFieldDisplayTest.php
+++ b/web/core/modules/image/tests/src/Functional/ImageFieldDisplayTest.php
@@ -152,10 +152,10 @@ public function _testImageFieldFormatters($scheme) {
$this->assertEqual($this->drupalGetHeader('Content-Type'), 'image/png', 'Content-Type header was sent.');
$this->assertTrue(strstr($this->drupalGetHeader('Cache-Control'), 'private') !== FALSE, 'Cache-Control header was sent.');
- // Log out and try to access the file.
+ // Log out and ensure the file cannot be accessed.
$this->drupalLogout();
$this->drupalGet(file_create_url($image_uri));
- $this->assertResponse('403', 'Access denied to original image as anonymous user.');
+ $this->assertSession()->statusCodeEquals(403);
// Log in again.
$this->drupalLogin($this->adminUser);
@@ -185,7 +185,7 @@ public function _testImageFieldFormatters($scheme) {
':alt' => $alt,
]
);
- $this->assertEqual(count($elements), 1, 'Image linked to content formatter displaying correctly on full node view.');
+ $this->assertCount(1, $elements, 'Image linked to content formatter displaying correctly on full node view.');
// Test the image style 'thumbnail' formatter.
$display_options['settings']['image_link'] = '';
@@ -211,10 +211,10 @@ public function _testImageFieldFormatters($scheme) {
$this->assertRaw($default_output, 'Image style thumbnail formatter displaying correctly on full node view.');
if ($scheme == 'private') {
- // Log out and try to access the file.
+ // Log out and ensure the file cannot be accessed.
$this->drupalLogout();
$this->drupalGet(ImageStyle::load('thumbnail')->buildUrl($image_uri));
- $this->assertResponse('403', 'Access denied to image style thumbnail as anonymous user.');
+ $this->assertSession()->statusCodeEquals(403);
}
// Test the image URL formatter without an image style.
diff --git a/web/core/modules/image/tests/src/Functional/ImageFieldValidateTest.php b/web/core/modules/image/tests/src/Functional/ImageFieldValidateTest.php
index 59627521a5..e02b0ed604 100644
--- a/web/core/modules/image/tests/src/Functional/ImageFieldValidateTest.php
+++ b/web/core/modules/image/tests/src/Functional/ImageFieldValidateTest.php
@@ -38,7 +38,7 @@ public function testValid() {
// Create a node with a valid image.
$node = $this->uploadNodeImage($image_files[0], $field_name, 'article', $alt);
- $this->assertTrue(file_exists($expected_path . '/' . $image_files[0]->filename));
+ $this->assertFileExists($expected_path . '/' . $image_files[0]->filename);
// Remove the image.
$this->drupalPostForm('node/' . $node . '/edit', [], t('Remove'));
@@ -61,7 +61,7 @@ public function testValid() {
'files[' . $field_name . '_0]' => $file_system->realpath($zero_size_image->uri),
];
$this->drupalPostForm('node/' . $node . '/edit', $edit, t('Upload'));
- $this->assertFalse(file_exists($expected_path . '/' . $zero_size_image->filename));
+ $this->assertFileNotExists($expected_path . '/' . $zero_size_image->filename);
// Try uploading an invalid image.
$invalid_image = $invalid_image_files['invalid-img-test.png'];
@@ -69,7 +69,7 @@ public function testValid() {
'files[' . $field_name . '_0]' => $file_system->realpath($invalid_image->uri),
];
$this->drupalPostForm('node/' . $node . '/edit', $edit, t('Upload'));
- $this->assertFalse(file_exists($expected_path . '/' . $invalid_image->filename));
+ $this->assertFileNotExists($expected_path . '/' . $invalid_image->filename);
// Upload a valid image again.
$valid_image = $image_files[0];
@@ -77,7 +77,7 @@ public function testValid() {
'files[' . $field_name . '_0]' => $file_system->realpath($valid_image->uri),
];
$this->drupalPostForm('node/' . $node . '/edit', $edit, t('Upload'));
- $this->assertTrue(file_exists($expected_path . '/' . $valid_image->filename));
+ $this->assertFileExists($expected_path . '/' . $valid_image->filename);
}
/**
diff --git a/web/core/modules/image/tests/src/Functional/ImageFieldWidgetTest.php b/web/core/modules/image/tests/src/Functional/ImageFieldWidgetTest.php
index 655e7ab8a8..451beee9a6 100644
--- a/web/core/modules/image/tests/src/Functional/ImageFieldWidgetTest.php
+++ b/web/core/modules/image/tests/src/Functional/ImageFieldWidgetTest.php
@@ -31,8 +31,8 @@ public function testWidgetElement() {
];
$this->createImageField($field_name, 'article', [], $field_settings, [], [], 'Image test on [site:name]');
$this->drupalGet('node/add/article');
- $this->assertNotEqual(0, count($this->xpath('//div[contains(@class, "field--widget-image-image")]')), 'Image field widget found on add/node page', 'Browser');
- $this->assertNotEqual(0, count($this->xpath('//input[contains(@accept, "image/*")]')), 'Image field widget limits accepted files.', 'Browser');
+ $this->assertNotCount(0, $this->xpath('//div[contains(@class, "field--widget-image-image")]'), 'Image field widget found on add/node page', NULL);
+ $this->assertNotCount(0, $this->xpath('//input[contains(@accept, "image/*")]'), 'Image field widget limits accepted files.', NULL);
$this->assertNoText('Image test on [site:name]');
// Check for allowed image file extensions - default.
diff --git a/web/core/modules/image/tests/src/Functional/ImageStyleDeleteTest.php b/web/core/modules/image/tests/src/Functional/ImageStyleDeleteTest.php
index 71554333b6..fd19893b1f 100644
--- a/web/core/modules/image/tests/src/Functional/ImageStyleDeleteTest.php
+++ b/web/core/modules/image/tests/src/Functional/ImageStyleDeleteTest.php
@@ -45,15 +45,14 @@ public function testDelete() {
/** @var \Drupal\Core\Entity\Display\EntityViewDisplayInterface $view_display */
$view_display = EntityViewDisplay::load('node.page.default');
// Checks that the formatter setting is replaced.
- if ($this->assertNotNull($component = $view_display->getComponent('foo'))) {
- $this->assertIdentical($component['settings']['image_style'], 'thumbnail');
- }
+ $this->assertNotNull($component = $view_display->getComponent('foo'));
+ $this->assertSame('thumbnail', $component['settings']['image_style']);
+
/** @var \Drupal\Core\Entity\Display\EntityFormDisplayInterface $form_display */
$form_display = EntityFormDisplay::load('node.page.default');
// Check that the widget setting is replaced.
- if ($this->assertNotNull($component = $form_display->getComponent('foo'))) {
- $this->assertIdentical($component['settings']['preview_image_style'], 'thumbnail');
- }
+ $this->assertNotNull($component = $form_display->getComponent('foo'));
+ $this->assertSame('thumbnail', $component['settings']['preview_image_style']);
$this->drupalGet('admin/config/media/image-styles/manage/thumbnail/delete');
// Checks that the 'replacement' select element is displayed.
diff --git a/web/core/modules/image/tests/src/Functional/ImageStyleFlushTest.php b/web/core/modules/image/tests/src/Functional/ImageStyleFlushTest.php
index a5036eec8f..75a799645e 100644
--- a/web/core/modules/image/tests/src/Functional/ImageStyleFlushTest.php
+++ b/web/core/modules/image/tests/src/Functional/ImageStyleFlushTest.php
@@ -112,9 +112,9 @@ public function testFlush() {
$uuids[$effect->getPluginId()] = $uuid;
}
$this->drupalPostForm($style_path . '/effects/' . $uuids['image_scale'] . '/delete', [], t('Delete'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->drupalPostForm($style_path, [], t('Save'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Post flush, expected 1 image in the 'public' wrapper (sample.png).
$this->assertEqual($this->getImageCount($style, 'public'), 1, new FormattableMarkup('Image style %style flushed correctly for %wrapper wrapper.', ['%style' => $style->label(), '%wrapper' => 'public']));
diff --git a/web/core/modules/image/tests/src/Functional/ImageStylesPathAndUrlTest.php b/web/core/modules/image/tests/src/Functional/ImageStylesPathAndUrlTest.php
index 194f6e57a2..eeb56038ad 100644
--- a/web/core/modules/image/tests/src/Functional/ImageStylesPathAndUrlTest.php
+++ b/web/core/modules/image/tests/src/Functional/ImageStylesPathAndUrlTest.php
@@ -126,7 +126,7 @@ public function testImageStyleUrlForMissingSourceImage() {
$non_existent_uri = 'public://foo.png';
$generated_url = $this->style->buildUrl($non_existent_uri);
$this->drupalGet($generated_url);
- $this->assertResponse(404, 'Accessing an image style URL with a source image that does not exist provides a 404 error response.');
+ $this->assertSession()->statusCodeEquals(404);
}
/**
@@ -164,12 +164,12 @@ public function doImageStyleUrlAndPathTests($scheme, $clean_url = TRUE, $extra_s
// Get the URL of a file that has not been generated and try to create it.
$generated_uri = $this->style->buildUri($original_uri);
- $this->assertFalse(file_exists($generated_uri), 'Generated file does not exist.');
+ $this->assertFileNotExists($generated_uri);
$generate_url = $this->style->buildUrl($original_uri, $clean_url);
// Make sure that language prefix is never added to the image style URL.
if ($langcode) {
- $this->assertTrue(strpos($generate_url, "/$langcode/") === FALSE, 'Langcode was not found in the image style URL.');
+ $this->assertStringNotContainsString("/$langcode/", $generate_url, 'Langcode was not found in the image style URL.');
}
// Ensure that the tests still pass when the file is generated by accessing
@@ -181,14 +181,14 @@ public function doImageStyleUrlAndPathTests($scheme, $clean_url = TRUE, $extra_s
$generate_url = $this->style->buildUrl($modified_uri, $clean_url);
}
if (!$clean_url) {
- $this->assertTrue(strpos($generate_url, 'index.php/') !== FALSE, 'When using non-clean URLS, the system path contains the script name.');
+ $this->assertStringContainsString('index.php/', $generate_url, 'When using non-clean URLS, the system path contains the script name.');
}
// Add some extra chars to the token.
$this->drupalGet(str_replace(IMAGE_DERIVATIVE_TOKEN . '=', IMAGE_DERIVATIVE_TOKEN . '=Zo', $generate_url));
- $this->assertResponse(404, 'Image was inaccessible at the URL with an invalid token.');
+ $this->assertSession()->statusCodeEquals(404);
// Change the parameter name so the token is missing.
$this->drupalGet(str_replace(IMAGE_DERIVATIVE_TOKEN . '=', 'wrongparam=', $generate_url));
- $this->assertResponse(404, 'Image was inaccessible at the URL with a missing token.');
+ $this->assertSession()->statusCodeEquals(404);
// Check that the generated URL is the same when we pass in a relative path
// rather than a URI. We need to temporarily switch the default scheme to
@@ -202,8 +202,8 @@ public function doImageStyleUrlAndPathTests($scheme, $clean_url = TRUE, $extra_s
// Fetch the URL that generates the file.
$this->drupalGet($generate_url);
- $this->assertResponse(200, 'Image was generated at the URL.');
- $this->assertTrue(file_exists($generated_uri), 'Generated file does exist after we accessed it.');
+ $this->assertSession()->statusCodeEquals(200);
+ $this->assertFileExists($generated_uri);
// assertRaw can't be used with string containing non UTF-8 chars.
$this->assertNotEmpty(file_get_contents($generated_uri), 'URL returns expected file.');
$image = $this->container->get('image.factory')->get($generated_uri);
@@ -217,13 +217,14 @@ public function doImageStyleUrlAndPathTests($scheme, $clean_url = TRUE, $extra_s
if ($scheme == 'private') {
$this->assertEqual($this->drupalGetHeader('Expires'), 'Sun, 19 Nov 1978 05:00:00 GMT', 'Expires header was sent.');
- $this->assertNotEqual(strpos($this->drupalGetHeader('Cache-Control'), 'no-cache'), FALSE, 'Cache-Control header contains \'no-cache\' to prevent caching.');
+ // Check that Cache-Control header contains 'no-cache' to prevent caching.
+ $this->assertSession()->responseHeaderContains('Cache-Control', 'no-cache');
$this->assertEqual($this->drupalGetHeader('X-Image-Owned-By'), 'image_module_test', 'Expected custom header has been added.');
// Make sure that a second request to the already existing derivative
// works too.
$this->drupalGet($generate_url);
- $this->assertResponse(200, 'Image was generated at the URL.');
+ $this->assertSession()->statusCodeEquals(200);
// Check that the second request also returned the generated image.
$this->assertEqual($this->drupalGetHeader('Content-Length'), $image->getFileSize());
@@ -235,18 +236,18 @@ public function doImageStyleUrlAndPathTests($scheme, $clean_url = TRUE, $extra_s
// have access.
\Drupal::state()->delete('image.test_file_download');
$this->drupalGet($generate_url);
- $this->assertResponse(403, 'Confirmed that access is denied for the private image style.');
+ $this->assertSession()->statusCodeEquals(403);
// Repeat this with a different file that we do not have access to and
// make sure that access is denied.
$file_noaccess = array_shift($files);
$original_uri_noaccess = $file_system->copy($file_noaccess->uri, $scheme . '://', FileSystemInterface::EXISTS_RENAME);
$generated_uri_noaccess = $scheme . '://styles/' . $this->style->id() . '/' . $scheme . '/' . $file_system->basename($original_uri_noaccess);
- $this->assertFalse(file_exists($generated_uri_noaccess), 'Generated file does not exist.');
+ $this->assertFileNotExists($generated_uri_noaccess);
$generate_url_noaccess = $this->style->buildUrl($original_uri_noaccess);
$this->drupalGet($generate_url_noaccess);
- $this->assertResponse(403, 'Confirmed that access is denied for the private image style.');
+ $this->assertSession()->statusCodeEquals(403);
// Verify that images are not appended to the response.
// Currently this test only uses PNG images.
if (strpos($generate_url, '.png') === FALSE) {
@@ -257,17 +258,17 @@ public function doImageStyleUrlAndPathTests($scheme, $clean_url = TRUE, $extra_s
// (cf. http://www.libpng.org/pub/png/book/chapter08.html#png.ch08.div.2)
// in the response body.
$raw = $this->getSession()->getPage()->getContent();
- $this->assertFalse(strpos($raw, chr(137) . chr(80) . chr(78) . chr(71) . chr(13) . chr(10) . chr(26) . chr(10)));
+ $this->assertStringNotContainsString(chr(137) . chr(80) . chr(78) . chr(71) . chr(13) . chr(10) . chr(26) . chr(10), $raw);
}
}
else {
$this->assertEqual($this->drupalGetHeader('Expires'), 'Sun, 19 Nov 1978 05:00:00 GMT', 'Expires header was sent.');
- $this->assertEqual(strpos($this->drupalGetHeader('Cache-Control'), 'no-cache'), FALSE, 'Cache-Control header contains \'no-cache\' to prevent caching.');
+ $this->assertStringNotContainsString('no-cache', $this->drupalGetHeader('Cache-Control'), 'Cache-Control header contains \'no-cache\' to prevent caching.');
if ($clean_url) {
// Add some extra chars to the token.
$this->drupalGet(str_replace(IMAGE_DERIVATIVE_TOKEN . '=', IMAGE_DERIVATIVE_TOKEN . '=Zo', $generate_url));
- $this->assertResponse(200, 'Existing image was accessible at the URL with an invalid token.');
+ $this->assertSession()->statusCodeEquals(200);
}
}
@@ -290,11 +291,11 @@ public function doImageStyleUrlAndPathTests($scheme, $clean_url = TRUE, $extra_s
// is not present in the URL but that the image is still accessible.
$this->config('image.settings')->set('suppress_itok_output', TRUE)->save();
$generated_uri = $this->style->buildUri($original_uri);
- $this->assertFalse(file_exists($generated_uri), 'Generated file does not exist.');
+ $this->assertFileNotExists($generated_uri);
$generate_url = $this->style->buildUrl($original_uri, $clean_url);
- $this->assertIdentical(strpos($generate_url, IMAGE_DERIVATIVE_TOKEN . '='), FALSE, 'The security token does not appear in the image style URL.');
+ $this->assertStringNotContainsString(IMAGE_DERIVATIVE_TOKEN . '=', $generate_url, 'The security token does not appear in the image style URL.');
$this->drupalGet($generate_url);
- $this->assertResponse(200, 'Image was accessible at the URL with a missing token.');
+ $this->assertSession()->statusCodeEquals(200);
// Stop suppressing the security token in the URL.
$this->config('image.settings')->set('suppress_itok_output', FALSE)->save();
@@ -308,22 +309,22 @@ public function doImageStyleUrlAndPathTests($scheme, $clean_url = TRUE, $extra_s
$this->assertTrue($matches_expected_url_format, "URL for a derivative of an image style matches expected format.");
$nested_url_with_wrong_token = str_replace(IMAGE_DERIVATIVE_TOKEN . '=', 'wrongparam=', $nested_url);
$this->drupalGet($nested_url_with_wrong_token);
- $this->assertResponse(404, 'Image generated from an earlier derivative was inaccessible at the URL with a missing token.');
+ $this->assertSession()->statusCodeEquals(404);
// Check that this restriction cannot be bypassed by adding extra slashes
// to the URL.
$this->drupalGet(substr_replace($nested_url_with_wrong_token, '//styles/', strrpos($nested_url_with_wrong_token, '/styles/'), strlen('/styles/')));
- $this->assertResponse(404, 'Image generated from an earlier derivative was inaccessible at the URL with a missing token, even with an extra forward slash in the URL.');
+ $this->assertSession()->statusCodeEquals(404);
$this->drupalGet(substr_replace($nested_url_with_wrong_token, '////styles/', strrpos($nested_url_with_wrong_token, '/styles/'), strlen('/styles/')));
- $this->assertResponse(404, 'Image generated from an earlier derivative was inaccessible at the URL with a missing token, even with multiple forward slashes in the URL.');
+ $this->assertSession()->statusCodeEquals(404);
// Make sure the image can still be generated if a correct token is used.
$this->drupalGet($nested_url);
- $this->assertResponse(200, 'Image was accessible when a correct token was provided in the URL.');
+ $this->assertSession()->statusCodeEquals(200);
// Check that requesting a nonexistent image does not create any new
// directories in the file system.
$directory = $scheme . '://styles/' . $this->style->id() . '/' . $scheme . '/' . $this->randomMachineName();
$this->drupalGet(file_create_url($directory . '/' . $this->randomString()));
- $this->assertFalse(file_exists($directory), 'New directory was not created in the filesystem when requesting an unauthorized image.');
+ $this->assertDirectoryNotExists($directory);
}
}
diff --git a/web/core/modules/image/tests/src/Functional/QuickEditImageControllerTest.php b/web/core/modules/image/tests/src/Functional/QuickEditImageControllerTest.php
index 853a030b89..851c47a9ff 100644
--- a/web/core/modules/image/tests/src/Functional/QuickEditImageControllerTest.php
+++ b/web/core/modules/image/tests/src/Functional/QuickEditImageControllerTest.php
@@ -86,7 +86,7 @@ public function testAccess() {
'title' => t('Test Node'),
]);
$this->drupalGet('quickedit/image/info/node/' . $node->id() . '/' . $this->fieldName . '/' . $node->language()->getId() . '/default');
- $this->assertResponse('403');
+ $this->assertSession()->statusCodeEquals(403);
/** @var \Symfony\Component\BrowserKit\Client $client */
$client = $this->getSession()->getDriver()->getClient();
@@ -135,7 +135,7 @@ public function testValidImageUpload() {
$this->drupalLogin($this->contentAuthorUser);
$this->uploadImage($valid_image, $node->id(), $this->fieldName, $node->language()->getId());
- $this->assertContains('"fid":"1"', $this->getSession()->getPage()->getContent(), 'Valid upload completed successfully.');
+ $this->assertStringContainsString('"fid":"1"', $this->getSession()->getPage()->getContent(), 'Valid upload completed successfully.');
}
/**
@@ -164,7 +164,7 @@ public function testInvalidUpload() {
$this->drupalLogin($this->contentAuthorUser);
$this->uploadImage($invalid_image, $node->id(), $this->fieldName, $node->language()->getId());
- $this->assertContains('"main_error":"The image failed validation."', $this->getSession()->getPage()->getContent(), 'Invalid upload returned errors.');
+ $this->assertStringContainsString('"main_error":"The image failed validation."', $this->getSession()->getPage()->getContent(), 'Invalid upload returned errors.');
}
/**
diff --git a/web/core/modules/image/tests/src/FunctionalJavascript/ImageFieldValidateTest.php b/web/core/modules/image/tests/src/FunctionalJavascript/ImageFieldValidateTest.php
index a8907d74c9..397e6db97e 100644
--- a/web/core/modules/image/tests/src/FunctionalJavascript/ImageFieldValidateTest.php
+++ b/web/core/modules/image/tests/src/FunctionalJavascript/ImageFieldValidateTest.php
@@ -36,7 +36,7 @@ public function testAJAXValidationMessage() {
$elements = $this->xpath('//div[contains(@class, :class)]', [
':class' => 'messages--error',
]);
- $this->assertEqual(count($elements), 1, 'Ajax validation messages are displayed once.');
+ $this->assertCount(1, $elements, 'Ajax validation messages are displayed once.');
}
/**
diff --git a/web/core/modules/image/tests/src/Kernel/ImageFormatterTest.php b/web/core/modules/image/tests/src/Kernel/ImageFormatterTest.php
index 5d97cdf77d..f7f74df152 100644
--- a/web/core/modules/image/tests/src/Kernel/ImageFormatterTest.php
+++ b/web/core/modules/image/tests/src/Kernel/ImageFormatterTest.php
@@ -154,9 +154,9 @@ public function testImageFormatterSvg() {
$this->assertEquals('medium', $build[$this->fieldName][0]['#image_style']);
// We check that the image URL contains the expected style directory
// structure.
- $this->assertTrue(strpos($build[$this->fieldName][0]['#markup'], 'styles/medium/public/test-image.png') !== FALSE);
- $this->assertTrue(strpos($build[$this->fieldName][0]['#markup'], 'width="220"') !== FALSE);
- $this->assertTrue(strpos($build[$this->fieldName][0]['#markup'], 'height="220"') !== FALSE);
+ $this->assertStringContainsString('styles/medium/public/test-image.png', $build[$this->fieldName][0]['#markup']);
+ $this->assertStringContainsString('width="220"', $build[$this->fieldName][0]['#markup']);
+ $this->assertStringContainsString('height="220"', $build[$this->fieldName][0]['#markup']);
// The second image is an SVG, which is not supported by the GD toolkit.
// The image style should still be applied with its cache tags, but image
@@ -167,11 +167,11 @@ public function testImageFormatterSvg() {
$this->assertEquals('medium', $build[$this->fieldName][1]['#image_style']);
// We check that the image URL does not contain the style directory
// structure.
- $this->assertFalse(strpos($build[$this->fieldName][1]['#markup'], 'styles/medium/public/test-image.svg'));
+ $this->assertStringNotContainsString('styles/medium/public/test-image.svg', $build[$this->fieldName][1]['#markup']);
// Since we did not store original image dimensions, width and height
// HTML attributes will not be present.
- $this->assertFalse(strpos($build[$this->fieldName][1]['#markup'], 'width'));
- $this->assertFalse(strpos($build[$this->fieldName][1]['#markup'], 'height'));
+ $this->assertStringNotContainsString('width', $build[$this->fieldName][1]['#markup']);
+ $this->assertStringNotContainsString('height', $build[$this->fieldName][1]['#markup']);
}
/**
@@ -196,7 +196,7 @@ public function testImageFormatterUrlOptions() {
$renderer = $this->container->get('renderer');
$output = $renderer->renderRoot($build[$this->fieldName][0]);
- $this->assertContains('<a href="' . $entity->toUrl()->toString() . '" data-attributes-test="test123"', (string) $output);
+ $this->assertStringContainsString('<a href="' . $entity->toUrl()->toString() . '" data-attributes-test="test123"', (string) $output);
}
/**
diff --git a/web/core/modules/image/tests/src/Kernel/ImageImportTest.php b/web/core/modules/image/tests/src/Kernel/ImageImportTest.php
index 9cf69570b6..542bfd7b98 100644
--- a/web/core/modules/image/tests/src/Kernel/ImageImportTest.php
+++ b/web/core/modules/image/tests/src/Kernel/ImageImportTest.php
@@ -29,7 +29,7 @@ public function testImport() {
$style->addImageEffect(['id' => 'image_module_test_null']);
$style->save();
- $this->assertEqual(count($style->getEffects()), 2);
+ $this->assertCount(2, $style->getEffects());
$uuid = \Drupal::service('uuid')->generate();
$style->set('effects', [
@@ -40,7 +40,7 @@ public function testImport() {
$style->save();
$style = ImageStyle::load('test');
- $this->assertEqual(count($style->getEffects()), 1);
+ $this->assertCount(1, $style->getEffects());
}
}
diff --git a/web/core/modules/image/tests/src/Kernel/ImageItemTest.php b/web/core/modules/image/tests/src/Kernel/ImageItemTest.php
index 5f095bb8a8..a8aab4a5c9 100644
--- a/web/core/modules/image/tests/src/Kernel/ImageItemTest.php
+++ b/web/core/modules/image/tests/src/Kernel/ImageItemTest.php
@@ -89,8 +89,8 @@ public function testImageItem() {
$entity->save();
$entity = EntityTest::load($entity->id());
- $this->assertTrue($entity->image_test instanceof FieldItemListInterface, 'Field implements interface.');
- $this->assertTrue($entity->image_test[0] instanceof FieldItemInterface, 'Field item implements interface.');
+ $this->assertInstanceOf(FieldItemListInterface::class, $entity->image_test);
+ $this->assertInstanceOf(FieldItemInterface::class, $entity->image_test[0]);
$this->assertEqual($entity->image_test->target_id, $this->image->id());
$this->assertEqual($entity->image_test->alt, $alt);
$this->assertEqual($entity->image_test->title, $title);
diff --git a/web/core/modules/image/tests/src/Kernel/ImageStyleIntegrationTest.php b/web/core/modules/image/tests/src/Kernel/ImageStyleIntegrationTest.php
index a37fa32358..03f497e820 100644
--- a/web/core/modules/image/tests/src/Kernel/ImageStyleIntegrationTest.php
+++ b/web/core/modules/image/tests/src/Kernel/ImageStyleIntegrationTest.php
@@ -20,7 +20,14 @@ class ImageStyleIntegrationTest extends KernelTestBase {
/**
* {@inheritdoc}
*/
- public static $modules = ['image', 'file', 'field', 'system', 'user', 'node'];
+ public static $modules = [
+ 'image',
+ 'file',
+ 'field',
+ 'system',
+ 'user',
+ 'node',
+ ];
/**
* {@inheritdoc}
diff --git a/web/core/modules/image/tests/src/Kernel/ImageThemeFunctionTest.php b/web/core/modules/image/tests/src/Kernel/ImageThemeFunctionTest.php
index 0d21969429..ffcc4792ad 100644
--- a/web/core/modules/image/tests/src/Kernel/ImageThemeFunctionTest.php
+++ b/web/core/modules/image/tests/src/Kernel/ImageThemeFunctionTest.php
@@ -30,7 +30,14 @@ class ImageThemeFunctionTest extends KernelTestBase {
*
* @var array
*/
- public static $modules = ['entity_test', 'field', 'file', 'image', 'system', 'user'];
+ public static $modules = [
+ 'entity_test',
+ 'field',
+ 'file',
+ 'image',
+ 'system',
+ 'user',
+ ];
/**
* Created file entity.
@@ -109,7 +116,7 @@ public function testImageFormatterTheme() {
$element = $base_element;
$this->setRawContent($renderer->renderRoot($element));
$elements = $this->xpath('//a[@href=:path]/img[@src=:url and @width=:width and @height=:height]', [':path' => base_path() . $path, ':url' => $url, ':width' => $image->getWidth(), ':height' => $image->getHeight()]);
- $this->assertEqual(count($elements), 1, 'theme_image_formatter() correctly renders with a NULL value for the alt option.');
+ $this->assertCount(1, $elements, 'theme_image_formatter() correctly renders with a NULL value for the alt option.');
// Test using theme_image_formatter() without an image title, alt text, or
// link options.
@@ -117,7 +124,7 @@ public function testImageFormatterTheme() {
$element['#item']->alt = '';
$this->setRawContent($renderer->renderRoot($element));
$elements = $this->xpath('//a[@href=:path]/img[@src=:url and @width=:width and @height=:height and @alt=""]', [':path' => base_path() . $path, ':url' => $url, ':width' => $image->getWidth(), ':height' => $image->getHeight()]);
- $this->assertEqual(count($elements), 1, 'theme_image_formatter() correctly renders without title, alt, or path options.');
+ $this->assertCount(1, $elements, 'theme_image_formatter() correctly renders without title, alt, or path options.');
// Link the image to a fragment on the page, and not a full URL.
$fragment = $this->randomMachineName();
@@ -130,7 +137,7 @@ public function testImageFormatterTheme() {
':width' => $image->getWidth(),
':height' => $image->getHeight(),
]);
- $this->assertEqual(count($elements), 1, 'theme_image_formatter() correctly renders a link fragment.');
+ $this->assertCount(1, $elements, 'theme_image_formatter() correctly renders a link fragment.');
}
/**
@@ -160,14 +167,14 @@ public function testImageStyleTheme() {
$element = $base_element;
$this->setRawContent($renderer->renderRoot($element));
$elements = $this->xpath('//img[@src=:url and @alt=""]', [':url' => $url]);
- $this->assertEqual(count($elements), 1, 'theme_image_style() renders an image correctly.');
+ $this->assertCount(1, $elements, 'theme_image_style() renders an image correctly.');
// Test using theme_image_style() with a NULL value for the alt option.
$element = $base_element;
$element['#alt'] = NULL;
$this->setRawContent($renderer->renderRoot($element));
$elements = $this->xpath('//img[@src=:url]', [':url' => $url]);
- $this->assertEqual(count($elements), 1, 'theme_image_style() renders an image correctly with a NULL value for the alt option.');
+ $this->assertCount(1, $elements, 'theme_image_style() renders an image correctly with a NULL value for the alt option.');
}
/**
@@ -190,7 +197,7 @@ public function testImageAltFunctionality() {
$this->setRawContent($renderer->renderRoot($image_with_alt_property));
$elements = $this->xpath('//img[contains(@class, class) and contains(@alt, :alt)]', [":class" => "image-with-regular-alt", ":alt" => "Regular alt"]);
- $this->assertEqual(count($elements), 1, 'Regular alt displays correctly');
+ $this->assertCount(1, $elements, 'Regular alt displays correctly');
// Test using alt attribute inside attributes.
$image_with_alt_attribute_alt_attribute = [
@@ -208,7 +215,7 @@ public function testImageAltFunctionality() {
$this->setRawContent($renderer->renderRoot($image_with_alt_attribute_alt_attribute));
$elements = $this->xpath('//img[contains(@class, class) and contains(@alt, :alt)]', [":class" => "image-with-attribute-alt", ":alt" => "Attribute alt"]);
- $this->assertEqual(count($elements), 1, 'Attribute alt displays correctly');
+ $this->assertCount(1, $elements, 'Attribute alt displays correctly');
// Test using alt attribute as property and inside attributes.
$image_with_alt_attribute_both = [
@@ -227,7 +234,7 @@ public function testImageAltFunctionality() {
$this->setRawContent($renderer->renderRoot($image_with_alt_attribute_both));
$elements = $this->xpath('//img[contains(@class, class) and contains(@alt, :alt)]', [":class" => "image-with-attribute-alt", ":alt" => "Attribute alt"]);
- $this->assertEqual(count($elements), 1, 'Attribute alt overrides alt property if both set.');
+ $this->assertCount(1, $elements, 'Attribute alt overrides alt property if both set.');
}
}
diff --git a/web/core/modules/image/tests/src/Kernel/Migrate/d6/MigrateImageCacheTest.php b/web/core/modules/image/tests/src/Kernel/Migrate/d6/MigrateImageCacheTest.php
index de7a276050..53ae63455d 100644
--- a/web/core/modules/image/tests/src/Kernel/Migrate/d6/MigrateImageCacheTest.php
+++ b/web/core/modules/image/tests/src/Kernel/Migrate/d6/MigrateImageCacheTest.php
@@ -107,7 +107,7 @@ public function testMissingEffectPlugin() {
$this->executeMigration('d6_imagecache_presets');
$messages = iterator_to_array($this->migration->getIdMap()->getMessages());
$this->assertCount(1, $messages);
- $this->assertContains('The "image_deprecated_scale" plugin does not exist.', $messages[0]->message);
+ $this->assertStringContainsString('The "image_deprecated_scale" plugin does not exist.', $messages[0]->message);
$this->assertEqual($messages[0]->level, MigrationInterface::MESSAGE_ERROR);
}
diff --git a/web/core/modules/image/tests/src/Kernel/Migrate/d7/MigrateImageStylesTest.php b/web/core/modules/image/tests/src/Kernel/Migrate/d7/MigrateImageStylesTest.php
index a15d49e761..b0b101b1c4 100644
--- a/web/core/modules/image/tests/src/Kernel/Migrate/d7/MigrateImageStylesTest.php
+++ b/web/core/modules/image/tests/src/Kernel/Migrate/d7/MigrateImageStylesTest.php
@@ -51,7 +51,7 @@ public function testImageStylesMigration() {
*/
protected function assertEntity($id, $label, array $expected_effect_plugins, array $expected_effect_config) {
$style = ImageStyle::load($id);
- $this->assertTrue($style instanceof ImageStyleInterface);
+ $this->assertInstanceOf(ImageStyleInterface::class, $style);
/** @var \Drupal\image\ImageStyleInterface $style */
$this->assertIdentical($id, $style->id());
$this->assertIdentical($label, $style->label());
@@ -62,7 +62,7 @@ protected function assertEntity($id, $label, array $expected_effect_plugins, arr
$index = 0;
foreach ($effects as $effect) {
- $this->assertTrue($effect instanceof ImageEffectBase);
+ $this->assertInstanceOf(ImageEffectBase::class, $effect);
$this->assertIdentical($expected_effect_plugins[$index], $effect->getPluginId());
$config = $effect->getConfiguration();
$this->assertIdentical($expected_effect_config[$index], $config['data']);
diff --git a/web/core/modules/image/tests/src/Kernel/Views/ImageViewsDataTest.php b/web/core/modules/image/tests/src/Kernel/Views/ImageViewsDataTest.php
index b7fe074a6b..c5216ebcec 100644
--- a/web/core/modules/image/tests/src/Kernel/Views/ImageViewsDataTest.php
+++ b/web/core/modules/image/tests/src/Kernel/Views/ImageViewsDataTest.php
@@ -19,7 +19,14 @@ class ImageViewsDataTest extends ViewsKernelTestBase {
*
* @var array
*/
- public static $modules = ['image', 'file', 'views', 'entity_test', 'user', 'field'];
+ public static $modules = [
+ 'image',
+ 'file',
+ 'views',
+ 'entity_test',
+ 'user',
+ 'field',
+ ];
/**
* {@inheritdoc}
diff --git a/web/core/modules/image/tests/src/Kernel/Views/RelationshipUserImageDataTest.php b/web/core/modules/image/tests/src/Kernel/Views/RelationshipUserImageDataTest.php
index 36e12972ce..03cfed7793 100644
--- a/web/core/modules/image/tests/src/Kernel/Views/RelationshipUserImageDataTest.php
+++ b/web/core/modules/image/tests/src/Kernel/Views/RelationshipUserImageDataTest.php
@@ -22,7 +22,14 @@ class RelationshipUserImageDataTest extends ViewsKernelTestBase {
*
* @var array
*/
- public static $modules = ['file', 'field', 'image', 'image_test_views', 'system', 'user'];
+ public static $modules = [
+ 'file',
+ 'field',
+ 'image',
+ 'image_test_views',
+ 'system',
+ 'user',
+ ];
/**
* Views used by this test.
diff --git a/web/core/modules/inline_form_errors/tests/src/FunctionalJavascript/FormErrorHandlerCKEditorTest.php b/web/core/modules/inline_form_errors/tests/src/FunctionalJavascript/FormErrorHandlerCKEditorTest.php
index a99c1b8387..fca18103a5 100644
--- a/web/core/modules/inline_form_errors/tests/src/FunctionalJavascript/FormErrorHandlerCKEditorTest.php
+++ b/web/core/modules/inline_form_errors/tests/src/FunctionalJavascript/FormErrorHandlerCKEditorTest.php
@@ -20,7 +20,12 @@ class FormErrorHandlerCKEditorTest extends WebDriverTestBase {
/**
* {@inheritdoc}
*/
- public static $modules = ['node', 'ckeditor', 'inline_form_errors', 'filter'];
+ public static $modules = [
+ 'node',
+ 'ckeditor',
+ 'inline_form_errors',
+ 'filter',
+ ];
/**
* {@inheritdoc}
diff --git a/web/core/modules/jsonapi/src/Context/FieldResolver.php b/web/core/modules/jsonapi/src/Context/FieldResolver.php
index 7f65f3d8aa..b67c1cc752 100644
--- a/web/core/modules/jsonapi/src/Context/FieldResolver.php
+++ b/web/core/modules/jsonapi/src/Context/FieldResolver.php
@@ -242,9 +242,9 @@ public static function resolveInternalIncludePath(ResourceType $resource_type, a
* elide the "entity" keyword from them (this word is used by the entity query
* system to traverse entity references).
*
- * This method takes this external field expression and and attempts to
- * resolve any aliases and/or abbreviations into a field expression that will
- * be compatible with the entity query system.
+ * This method takes this external field expression and attempts to resolve
+ * any aliases and/or abbreviations into a field expression that will be
+ * compatible with the entity query system.
*
* @link http://jsonapi.org/recommendations/#urls-reference-document
*
diff --git a/web/core/modules/jsonapi/src/Controller/EntryPoint.php b/web/core/modules/jsonapi/src/Controller/EntryPoint.php
index 4f98708fb3..a564580523 100644
--- a/web/core/modules/jsonapi/src/Controller/EntryPoint.php
+++ b/web/core/modules/jsonapi/src/Controller/EntryPoint.php
@@ -14,7 +14,6 @@
use Drupal\jsonapi\ResourceResponse;
use Drupal\jsonapi\ResourceType\ResourceType;
use Drupal\jsonapi\ResourceType\ResourceTypeRepositoryInterface;
-use Drupal\user\Entity\User;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\Routing\Exception\RouteNotFoundException;
@@ -104,7 +103,7 @@ public function index() {
$meta = [];
if ($this->user->isAuthenticated()) {
- $current_user_uuid = User::load($this->user->id())->uuid();
+ $current_user_uuid = $this->entityTypeManager()->getStorage('user')->load($this->user->id())->uuid();
$meta['links']['me'] = ['meta' => ['id' => $current_user_uuid]];
$cacheability->addCacheContexts(['user']);
try {
diff --git a/web/core/modules/jsonapi/src/Controller/TemporaryJsonapiFileFieldUploader.php b/web/core/modules/jsonapi/src/Controller/TemporaryJsonapiFileFieldUploader.php
index 389b4659da..2847e17e53 100644
--- a/web/core/modules/jsonapi/src/Controller/TemporaryJsonapiFileFieldUploader.php
+++ b/web/core/modules/jsonapi/src/Controller/TemporaryJsonapiFileFieldUploader.php
@@ -287,6 +287,10 @@ protected function streamUploadData() {
$file_data = fopen('php://input', 'rb');
$temp_file_path = $this->fileSystem->tempnam('temporary://', 'file');
+ if ($temp_file_path === FALSE) {
+ $this->logger->error('Temporary file could not be created for file upload.');
+ throw new HttpException(500, 'Temporary file could not be created');
+ }
$temp_file = fopen($temp_file_path, 'wb');
if ($temp_file) {
@@ -425,7 +429,7 @@ protected function getUploadLocation(array $settings) {
* Retrieves the upload validators for a field definition.
*
* This is copied from \Drupal\file\Plugin\Field\FieldType\FileItem as there
- * is no entity instance available here that that a FileItem would exist for.
+ * is no entity instance available here that a FileItem would exist for.
*
* @param \Drupal\Core\Field\FieldDefinitionInterface $field_definition
* The field definition for which to get validators.
diff --git a/web/core/modules/jsonapi/src/Exception/EntityAccessDeniedHttpException.php b/web/core/modules/jsonapi/src/Exception/EntityAccessDeniedHttpException.php
index 6b067ebe6f..3365326aac 100644
--- a/web/core/modules/jsonapi/src/Exception/EntityAccessDeniedHttpException.php
+++ b/web/core/modules/jsonapi/src/Exception/EntityAccessDeniedHttpException.php
@@ -30,7 +30,7 @@ class EntityAccessDeniedHttpException extends CacheableAccessDeniedHttpException
* The error which caused the 403.
*
* The error contains:
- * - entity: The entity which the current user doens't have access to.
+ * - entity: The entity which the current user does not have access to.
* - pointer: A path in the JSON:API response structure pointing to the
* entity.
* - reason: (Optional) An optional reason for this failure.
diff --git a/web/core/modules/jsonapi/src/JsonApiResource/ResourceIdentifierTrait.php b/web/core/modules/jsonapi/src/JsonApiResource/ResourceIdentifierTrait.php
index 5db7403d44..e4942cfb8f 100644
--- a/web/core/modules/jsonapi/src/JsonApiResource/ResourceIdentifierTrait.php
+++ b/web/core/modules/jsonapi/src/JsonApiResource/ResourceIdentifierTrait.php
@@ -23,7 +23,7 @@ trait ResourceIdentifierTrait {
protected $resourceIdentifier;
/**
- * The JSON:API resource type of of the identified resource object.
+ * The JSON:API resource type of the identified resource object.
*
* @var \Drupal\jsonapi\ResourceType\ResourceType
*/
diff --git a/web/core/modules/jsonapi/src/Query/EntityConditionGroup.php b/web/core/modules/jsonapi/src/Query/EntityConditionGroup.php
index ad4f0f8865..fcefe2a278 100644
--- a/web/core/modules/jsonapi/src/Query/EntityConditionGroup.php
+++ b/web/core/modules/jsonapi/src/Query/EntityConditionGroup.php
@@ -61,7 +61,7 @@ public function conjunction() {
}
/**
- * The members which belong to the the condition group.
+ * The members which belong to the condition group.
*
* @return \Drupal\jsonapi\Query\EntityCondition[]
* The member conditions of this condition group.
diff --git a/web/core/modules/jsonapi/src/Query/Sort.php b/web/core/modules/jsonapi/src/Query/Sort.php
index 5052623346..c127a9230a 100644
--- a/web/core/modules/jsonapi/src/Query/Sort.php
+++ b/web/core/modules/jsonapi/src/Query/Sort.php
@@ -68,7 +68,7 @@ class Sort {
* ]
*
* @param array $fields
- * The the entity query sort fields.
+ * The entity query sort fields.
*/
public function __construct(array $fields) {
$this->fields = $fields;
diff --git a/web/core/modules/jsonapi/tests/src/Functional/FileUploadTest.php b/web/core/modules/jsonapi/tests/src/Functional/FileUploadTest.php
index 3561ebae65..47bd338add 100644
--- a/web/core/modules/jsonapi/tests/src/Functional/FileUploadTest.php
+++ b/web/core/modules/jsonapi/tests/src/Functional/FileUploadTest.php
@@ -501,7 +501,7 @@ public function testFileUploadStrippedFilePath() {
// Check the actual file data. It should have been written to the configured
// directory, not /foobar/directory/example.txt.
$this->assertSame($this->testFileData, file_get_contents('public://foobar/example_2.txt'));
- $this->assertFalse(file_exists('../../example_2.txt'));
+ $this->assertFileNotExists('../../example_2.txt');
// Check a path from the root. Extensions have to be empty to allow a file
// with no extension to pass validation.
@@ -575,7 +575,7 @@ public function testFileUploadInvalidFileType() {
// Make sure that no file was saved.
$this->assertEmpty(File::load(1));
- $this->assertFalse(file_exists('public://foobar/example.txt'));
+ $this->assertFileNotExists('public://foobar/example.txt');
}
/**
@@ -598,7 +598,7 @@ public function testFileUploadLargerFileSize() {
// Make sure that no file was saved.
$this->assertEmpty(File::load(1));
- $this->assertFalse(file_exists('public://foobar/example.txt'));
+ $this->assertFileNotExists('public://foobar/example.txt');
}
/**
@@ -625,7 +625,7 @@ public function testFileUploadMaliciousExtension() {
// Override the expected filesize.
$expected['data']['attributes']['filesize'] = strlen($php_string);
$this->assertResponseData($expected, $response);
- $this->assertTrue(file_exists('public://foobar/example.php.txt'));
+ $this->assertFileExists('public://foobar/example.php.txt');
// Add php as an allowed format. Allow insecure uploads still being FALSE
// should still not allow this. So it should still have a .txt extension
@@ -639,8 +639,8 @@ public function testFileUploadMaliciousExtension() {
// Override the expected filesize.
$expected['data']['attributes']['filesize'] = strlen($php_string);
$this->assertResponseData($expected, $response);
- $this->assertTrue(file_exists('public://foobar/example_2.php.txt'));
- $this->assertFalse(file_exists('public://foobar/example_2.php'));
+ $this->assertFileExists('public://foobar/example_2.php.txt');
+ $this->assertFileNotExists('public://foobar/example_2.php');
// Allow .doc file uploads and ensure even a mis-configured apache will not
// fallback to php because the filename will be munged.
@@ -656,8 +656,8 @@ public function testFileUploadMaliciousExtension() {
// The file mime should be 'application/msword'.
$expected['data']['attributes']['filemime'] = 'application/msword';
$this->assertResponseData($expected, $response);
- $this->assertTrue(file_exists('public://foobar/example_3.php_.doc'));
- $this->assertFalse(file_exists('public://foobar/example_3.php.doc'));
+ $this->assertFileExists('public://foobar/example_3.php_.doc');
+ $this->assertFileNotExists('public://foobar/example_3.php.doc');
// Now allow insecure uploads.
\Drupal::configFactory()
@@ -675,7 +675,7 @@ public function testFileUploadMaliciousExtension() {
// The file mime should also now be PHP.
$expected['data']['attributes']['filemime'] = 'application/x-httpd-php';
$this->assertResponseData($expected, $response);
- $this->assertTrue(file_exists('public://foobar/example_4.php'));
+ $this->assertFileExists('public://foobar/example_4.php');
}
/**
@@ -695,7 +695,7 @@ public function testFileUploadNoExtensionSetting() {
$expected = $this->getExpectedDocument(1, 'example.txt', TRUE);
$this->assertResponseData($expected, $response);
- $this->assertTrue(file_exists('public://foobar/example.txt'));
+ $this->assertFileExists('public://foobar/example.txt');
}
/**
diff --git a/web/core/modules/jsonapi/tests/src/Functional/FilterFormatTest.php b/web/core/modules/jsonapi/tests/src/Functional/FilterFormatTest.php
index c5b581d9ac..a68b108dc8 100644
--- a/web/core/modules/jsonapi/tests/src/Functional/FilterFormatTest.php
+++ b/web/core/modules/jsonapi/tests/src/Functional/FilterFormatTest.php
@@ -51,7 +51,7 @@ protected function setUpAuthorization($method) {
*/
protected function createEntity() {
$pablo_format = FilterFormat::create([
- 'name' => 'Pablo Piccasso',
+ 'name' => 'Pablo Picasso',
'format' => 'pablo',
'langcode' => 'es',
'filters' => [
@@ -106,7 +106,7 @@ protected function getExpectedDocument() {
],
],
'langcode' => 'es',
- 'name' => 'Pablo Piccasso',
+ 'name' => 'Pablo Picasso',
'status' => TRUE,
'weight' => 0,
'drupal_internal__format' => 'pablo',
diff --git a/web/core/modules/jsonapi/tests/src/Functional/JsonApiFunctionalMultilingualTest.php b/web/core/modules/jsonapi/tests/src/Functional/JsonApiFunctionalMultilingualTest.php
index 1cc79ac757..89eb2cef8c 100644
--- a/web/core/modules/jsonapi/tests/src/Functional/JsonApiFunctionalMultilingualTest.php
+++ b/web/core/modules/jsonapi/tests/src/Functional/JsonApiFunctionalMultilingualTest.php
@@ -161,7 +161,7 @@ public function testPatchTranslation() {
// Changing the langcode of the default ('en') translation is possible:
// first verify that it currently is 'en', then change it to 'ca-fr', and
- // verify that the the title is unchanged, but the langcode is updated.
+ // verify that the title is unchanged, but the langcode is updated.
$response = $this->request('GET', Url::fromUri('base:/jsonapi/node/article/' . $this->nodes[0]->uuid()), $request_options);
$this->assertSame(200, $response->getStatusCode());
$document = Json::decode((string) $response->getBody());
diff --git a/web/core/modules/jsonapi/tests/src/Functional/JsonApiFunctionalTest.php b/web/core/modules/jsonapi/tests/src/Functional/JsonApiFunctionalTest.php
index 3acde839e7..6cc88ad4e3 100644
--- a/web/core/modules/jsonapi/tests/src/Functional/JsonApiFunctionalTest.php
+++ b/web/core/modules/jsonapi/tests/src/Functional/JsonApiFunctionalTest.php
@@ -48,7 +48,7 @@ public function testRead() {
'query' => $default_sort,
]));
$this->assertSession()->statusCodeEquals(200);
- $this->assertEquals(OffsetPage::SIZE_MAX, count($collection_output['data']));
+ $this->assertCount(OffsetPage::SIZE_MAX, $collection_output['data']);
$this->assertSession()
->responseHeaderEquals('Content-Type', 'application/vnd.api+json');
// 2. Load all articles (Offset 3).
@@ -57,13 +57,13 @@ public function testRead() {
]));
$this->assertSession()->statusCodeEquals(200);
$this->assertEquals(OffsetPage::SIZE_MAX, count($collection_output['data']));
- $this->assertContains('page%5Boffset%5D=53', $collection_output['links']['next']['href']);
+ $this->assertStringContainsString('page%5Boffset%5D=53', $collection_output['links']['next']['href']);
// 3. Load all articles (1st page, 2 items)
$collection_output = Json::decode($this->drupalGet('/jsonapi/node/article', [
'query' => ['page' => ['limit' => 2]] + $default_sort,
]));
$this->assertSession()->statusCodeEquals(200);
- $this->assertEquals(2, count($collection_output['data']));
+ $this->assertCount(2, $collection_output['data']);
// 4. Load all articles (2nd page, 2 items).
$collection_output = Json::decode($this->drupalGet('/jsonapi/node/article', [
'query' => [
@@ -74,8 +74,8 @@ public function testRead() {
] + $default_sort,
]));
$this->assertSession()->statusCodeEquals(200);
- $this->assertEquals(2, count($collection_output['data']));
- $this->assertContains('page%5Boffset%5D=4', $collection_output['links']['next']['href']);
+ $this->assertCount(2, $collection_output['data']);
+ $this->assertStringContainsString('page%5Boffset%5D=4', $collection_output['links']['next']['href']);
// 5. Single article.
$uuid = $this->nodes[0]->uuid();
$single_output = Json::decode($this->drupalGet('/jsonapi/node/article/' . $uuid));
@@ -123,7 +123,7 @@ public function testRead() {
$this->assertSession()->statusCodeEquals(200);
$this->assertEquals('taxonomy_term--tags', $single_output['data'][0]['type']);
$this->assertArrayNotHasKey('tid', $single_output['data'][0]['attributes']);
- $this->assertContains(
+ $this->assertStringContainsString(
'/taxonomy_term/tags/',
$single_output['data'][0]['links']['self']['href']
);
@@ -189,10 +189,11 @@ public function testRead() {
'query' => ['page' => ['limit' => 2]] + $default_sort,
]));
$this->assertSession()->statusCodeEquals(200);
- $this->assertEquals(1, count($single_output['data']));
- $this->assertEquals(1, count(array_filter(array_keys($single_output['meta']['omitted']['links']), function ($key) {
+ $this->assertCount(1, $single_output['data']);
+ $non_help_links = array_filter(array_keys($single_output['meta']['omitted']['links']), function ($key) {
return $key !== 'help';
- })));
+ });
+ $this->assertCount(1, $non_help_links);
$link_keys = array_keys($single_output['meta']['omitted']['links']);
$this->assertSame('help', reset($link_keys));
$this->assertRegExp('/^item--[a-zA-Z0-9]{7}$/', next($link_keys));
@@ -511,7 +512,7 @@ public function testRead() {
'query' => ['filter' => $filter] + $default_sort,
]));
$this->assertSession()->statusCodeEquals(200);
- $this->assertEquals(0, count($collection_output['data']));
+ $this->assertCount(0, $collection_output['data']);
}
/**
@@ -523,7 +524,7 @@ public function testReferencingTwiceRead() {
// 1. Load all articles (1st page).
$collection_output = Json::decode($this->drupalGet('/jsonapi/node/article'));
$this->assertSession()->statusCodeEquals(200);
- $this->assertEquals(1, count($collection_output['data']));
+ $this->assertCount(1, $collection_output['data']);
$this->assertSession()
->responseHeaderEquals('Content-Type', 'application/vnd.api+json');
}
@@ -575,7 +576,7 @@ public function testWrite() {
$this->assertEquals(201, $response->getStatusCode());
$this->assertArrayNotHasKey('uuid', $created_response['data']['attributes']);
$uuid = $created_response['data']['id'];
- $this->assertEquals(2, count($created_response['data']['relationships']['field_tags']['data']));
+ $this->assertCount(2, $created_response['data']['relationships']['field_tags']['data']);
$this->assertEquals($created_response['data']['links']['self']['href'], $response->getHeader('Location')[0]);
// 2. Authorization error.
@@ -773,7 +774,7 @@ public function testWrite() {
]);
$updated_response = Json::decode($response->getBody()->__toString());
$this->assertEquals(200, $response->getStatusCode());
- $this->assertEquals(3, count($updated_response['data']));
+ $this->assertCount(3, $updated_response['data']);
$this->assertEquals('taxonomy_term--tags', $updated_response['data'][2]['type']);
$this->assertEquals($this->tags[2]->uuid(), $updated_response['data'][2]['id']);
// 10. Successful PATCH to related endpoint.
@@ -861,7 +862,7 @@ public function testWrite() {
'id' => $uuid,
'type' => 'node--article',
'attributes' => [
- 'field_that_doesnt_exist' => 'foobar',
+ 'field_that_does_not_exist' => 'foobar',
],
],
];
@@ -875,7 +876,7 @@ public function testWrite() {
]);
$updated_response = Json::decode($response->getBody()->__toString());
$this->assertEquals(422, $response->getStatusCode());
- $this->assertEquals("The attribute field_that_doesnt_exist does not exist on the node--article resource type.",
+ $this->assertEquals("The attribute field_that_does_not_exist does not exist on the node--article resource type.",
$updated_response['errors']['0']['detail']);
// 14. Successful DELETE.
$response = $this->request('DELETE', $individual_url, [
diff --git a/web/core/modules/jsonapi/tests/src/Functional/JsonApiRegressionTest.php b/web/core/modules/jsonapi/tests/src/Functional/JsonApiRegressionTest.php
index 2aec3d96a5..f117de6a88 100644
--- a/web/core/modules/jsonapi/tests/src/Functional/JsonApiRegressionTest.php
+++ b/web/core/modules/jsonapi/tests/src/Functional/JsonApiRegressionTest.php
@@ -334,7 +334,7 @@ public function testGetNodeCollectionWithHookNodeGrantsImplementationsFromIssue2
],
]);
$this->assertSame(200, $response->getStatusCode());
- $this->assertTrue(in_array('user.node_grants:view', explode(' ', $response->getHeader('X-Drupal-Cache-Contexts')[0]), TRUE));
+ $this->assertContains('user.node_grants:view', explode(' ', $response->getHeader('X-Drupal-Cache-Contexts')[0]));
}
/**
diff --git a/web/core/modules/jsonapi/tests/src/Functional/MenuLinkContentTest.php b/web/core/modules/jsonapi/tests/src/Functional/MenuLinkContentTest.php
index 847c49ff93d579ada017d090f8533f6fb5492dd2..fdb07f71dd12920acabe520f06ae4d3c93b3de6d 100644
GIT binary patch
delta 337
zcmccU@Wo-nb`cIGe=8Fcs~Dxp{$eVV<wbe;W0b5ctg4HxObvmeF)=W4%@~8U%$(HX
z7$xgOD?_X5Oe+KHVk={ynza0UpkOUfhdD@x0ZfNHM2AOWUJ6W~fmJm~ohgbs-57(S
z)Wj60$`YvQMj+D-twA<qS{Z?9kS<FUUB)p6DVfEINja(hr6mQWB|s-6ft>_0ydbjx
zY8KQ+3z%L*paV1Wfa;w})6!ClfVzsU3_y|~hN%%;nJ82lP}~nB0}3Lr*9?VX43cv4
Ule1G(z*ZVs*D7t67dPSr0QsO}<^TWy
delta 285
zcmez3aM5AIb`dspe=8FctI7LB40)BTEUc=FtxOHAlwx8g?-wypW=PA-Ni9~gPP8(#
zs?M}Bur9VTwo*#V&sVap1u8VRQept9lLo8vNX$!tsy48y2FaU3<uw_KQWI00DoY?{
z8G+0)v<8`%X=MbaL8>jGs&yGsGK&+Fa#H<EOA1O$l&q7$76T0{$Si=E05#tNq~pJs
zp$tQ29#ExIX<AxpkrL3623ATS%G3y|KoFup$=VMjY62A%U`WczPtHzF0a;;aU8_Dh
MQO;m<kvJ140NGkrUH||9
diff --git a/web/core/modules/jsonapi/tests/src/Functional/NodeTest.php b/web/core/modules/jsonapi/tests/src/Functional/NodeTest.php
index 8493da6717..266e220023 100644
--- a/web/core/modules/jsonapi/tests/src/Functional/NodeTest.php
+++ b/web/core/modules/jsonapi/tests/src/Functional/NodeTest.php
@@ -508,7 +508,7 @@ public function testCollectionFilterAccess() {
node_access_rebuild();
$this->rebuildAll();
$response = $this->request('GET', $collection_filter_url, $request_options);
- $this->assertTrue(in_array('user.node_grants:view', explode(' ', $response->getHeader('X-Drupal-Cache-Contexts')[0]), TRUE));
+ $this->assertContains('user.node_grants:view', explode(' ', $response->getHeader('X-Drupal-Cache-Contexts')[0]));
}
}
diff --git a/web/core/modules/jsonapi/tests/src/Functional/ResourceTestBase.php b/web/core/modules/jsonapi/tests/src/Functional/ResourceTestBase.php
index 18944192d5..c38211d813 100644
--- a/web/core/modules/jsonapi/tests/src/Functional/ResourceTestBase.php
+++ b/web/core/modules/jsonapi/tests/src/Functional/ResourceTestBase.php
@@ -1118,7 +1118,7 @@ public function testCollection() {
'related_author_id' => [
'operator' => '<>',
'path' => 'field_jsonapi_test_entity_ref.status',
- 'value' => 'doesnt@matter.com',
+ 'value' => 'does_not@matter.com',
],
],
]);
@@ -3017,9 +3017,9 @@ public function testRevisions() {
$forward_revision_id_url = $forward_revision_id_url->setOption('query', ['resourceVersion' => "id:$forward_revision_id"]);
$expected_document['data']['links']['self']['href'] = $forward_revision_id_url->setAbsolute()->toString();
$amend_relationship_urls($expected_document, $forward_revision_id);
- // Since the the working copy is not the default revision. A
- // `latest-version` link is required to indicate that the requested version
- // is not the default revision.
+ // Since the working copy is not the default revision. A `latest-version`
+ // link is required to indicate that the requested version is not the
+ // default revision.
unset($expected_document['data']['links']['working-copy']);
$expected_document['data']['links']['latest-version']['href'] = $rel_latest_version_url->setAbsolute()->toString();
$expected_cache_tags = $this->getExpectedCacheTags();
@@ -3330,7 +3330,7 @@ protected static function entityFieldAccess(EntityInterface $entity, $field_name
}
/**
- * Gets an array of of all nested include paths to be tested.
+ * Gets an array of all nested include paths to be tested.
*
* @param int $depth
* (optional) The maximum depth to which included paths should be nested.
diff --git a/web/core/modules/jsonapi/tests/src/Kernel/Revisions/VersionNegotiatorTest.php b/web/core/modules/jsonapi/tests/src/Kernel/Revisions/VersionNegotiatorTest.php
index 774b51ec51..057149ea87 100644
--- a/web/core/modules/jsonapi/tests/src/Kernel/Revisions/VersionNegotiatorTest.php
+++ b/web/core/modules/jsonapi/tests/src/Kernel/Revisions/VersionNegotiatorTest.php
@@ -67,9 +67,7 @@ class VersionNegotiatorTest extends JsonapiKernelTestBase {
];
/**
- * Initialization tasks for the test.
- *
- * @inheritdoc
+ * {@inheritdoc}
*/
protected function setUp() {
parent::setUp();
diff --git a/web/core/modules/jsonapi/tests/src/Kernel/Serializer/SerializerTest.php b/web/core/modules/jsonapi/tests/src/Kernel/Serializer/SerializerTest.php
index e0cd524b97..22763c53b2 100644
--- a/web/core/modules/jsonapi/tests/src/Kernel/Serializer/SerializerTest.php
+++ b/web/core/modules/jsonapi/tests/src/Kernel/Serializer/SerializerTest.php
@@ -102,7 +102,7 @@ public function testFallbackNormalizer() {
];
$value = $this->sut->normalize($this->node->field_text, 'api_json', $context);
- $this->assertTrue($value instanceof CacheableNormalization);
+ $this->assertInstanceOf(CacheableNormalization::class, $value);
$nested_field = [
$this->node->field_text,
@@ -117,7 +117,7 @@ public function testFallbackNormalizer() {
// When wrapped in an array, we should still be using the JSON:API
// serializer.
$value = $this->sut->normalize($nested_field, 'api_json', $context);
- $this->assertTrue($value[0] instanceof CacheableNormalization);
+ $this->assertInstanceOf(CacheableNormalization::class, $value[0]);
// Continue to use the fallback normalizer when we need it.
$data = Markup::create('<h2>Test Markup</h2>');
diff --git a/web/core/modules/jsonapi/tests/src/Unit/Query/EntityConditionTest.php b/web/core/modules/jsonapi/tests/src/Unit/Query/EntityConditionTest.php
index 1659b6f80b..d89b6c3376 100644
--- a/web/core/modules/jsonapi/tests/src/Unit/Query/EntityConditionTest.php
+++ b/web/core/modules/jsonapi/tests/src/Unit/Query/EntityConditionTest.php
@@ -79,7 +79,7 @@ public function testValidation($input, $exception) {
$this->expectExceptionMessage($exception->getMessage());
}
EntityCondition::createFromQueryParameter($input);
- $this->assertTrue(is_null($exception), 'No exception was expected.');
+ $this->assertNull($exception, 'No exception was expected.');
}
/**
diff --git a/web/core/modules/language/language.info.yml b/web/core/modules/language/language.info.yml
index 30770401ad..aaf68c41b8 100644
--- a/web/core/modules/language/language.info.yml
+++ b/web/core/modules/language/language.info.yml
@@ -1,6 +1,6 @@
name: Language
type: module
-description: 'Allows users to configure languages and apply them to content.'
+description: 'Allows users to configure available languages.'
package: Multilingual
version: VERSION
core: 8.x
diff --git a/web/core/modules/language/src/Form/LanguageAddForm.php b/web/core/modules/language/src/Form/LanguageAddForm.php
index 8e0b9b3963..22d569f64e 100644
--- a/web/core/modules/language/src/Form/LanguageAddForm.php
+++ b/web/core/modules/language/src/Form/LanguageAddForm.php
@@ -19,7 +19,7 @@ class LanguageAddForm extends LanguageFormBase {
* {@inheritdoc}
*/
public function getFormId() {
- // @todo Remove in favour of base method.
+ // @todo Remove in favor of base method.
return 'language_admin_add_form';
}
diff --git a/web/core/modules/language/src/Form/LanguageEditForm.php b/web/core/modules/language/src/Form/LanguageEditForm.php
index 80b6a21450..c27b379cdf 100644
--- a/web/core/modules/language/src/Form/LanguageEditForm.php
+++ b/web/core/modules/language/src/Form/LanguageEditForm.php
@@ -15,7 +15,7 @@ class LanguageEditForm extends LanguageFormBase {
* {@inheritdoc}
*/
public function getFormId() {
- // @todo Remove in favour of base method.
+ // @todo Remove in favor of base method.
return 'language_admin_edit_form';
}
diff --git a/web/core/modules/language/src/Plugin/LanguageNegotiation/LanguageNegotiationBrowser.php b/web/core/modules/language/src/Plugin/LanguageNegotiation/LanguageNegotiationBrowser.php
index 49b56ead74..abee150c57 100644
--- a/web/core/modules/language/src/Plugin/LanguageNegotiation/LanguageNegotiationBrowser.php
+++ b/web/core/modules/language/src/Plugin/LanguageNegotiation/LanguageNegotiationBrowser.php
@@ -3,7 +3,9 @@
namespace Drupal\language\Plugin\LanguageNegotiation;
use Drupal\Component\Utility\UserAgent;
+use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
use Drupal\language\LanguageNegotiationMethodBase;
+use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\HttpFoundation\Request;
/**
@@ -17,13 +19,29 @@
* config_route_name = "language.negotiation_browser"
* )
*/
-class LanguageNegotiationBrowser extends LanguageNegotiationMethodBase {
+class LanguageNegotiationBrowser extends LanguageNegotiationMethodBase implements ContainerFactoryPluginInterface {
/**
* The language negotiation method id.
*/
const METHOD_ID = 'language-browser';
+ /**
+ * The page cache disabling policy.
+ *
+ * @var \Drupal\Core\PageCache\ResponsePolicy\KillSwitch
+ */
+ protected $pageCacheKillSwitch;
+
+ /**
+ * {@inheritdoc}
+ */
+ public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
+ $instance = new static();
+ $instance->pageCacheKillSwitch = $container->get('page_cache_kill_switch');
+ return $instance;
+ }
+
/**
* {@inheritdoc}
*/
@@ -41,7 +59,7 @@ public function getLangcode(Request $request = NULL) {
// could lead to wrong cached sites. Therefore disabling the internal page
// cache.
// @todo Solve more elegantly in https://www.drupal.org/node/2430335.
- \Drupal::service('page_cache_kill_switch')->trigger();
+ $this->pageCacheKillSwitch->trigger();
return $langcode;
}
diff --git a/web/core/modules/language/src/Plugin/LanguageNegotiation/LanguageNegotiationContentEntity.php b/web/core/modules/language/src/Plugin/LanguageNegotiation/LanguageNegotiationContentEntity.php
index d028444797..cf28297484 100644
--- a/web/core/modules/language/src/Plugin/LanguageNegotiation/LanguageNegotiationContentEntity.php
+++ b/web/core/modules/language/src/Plugin/LanguageNegotiation/LanguageNegotiationContentEntity.php
@@ -170,8 +170,8 @@ public function getLanguageSwitchLinks(Request $request, $type, Url $url) {
* \Drupal\language\Plugin\LanguageNegotiation\LanguageNegotiationContentEntity::processOutbound().
*
* @return bool
- * TRUE if the the content entity language negotiator has higher priority
- * than the url language negotiator, FALSE otherwise.
+ * TRUE if the content entity language negotiator has higher priority than
+ * the url language negotiator, FALSE otherwise.
*/
protected function hasLowerLanguageNegotiationWeight() {
if (!isset($this->hasLowerLanguageNegotiationWeightResult)) {
diff --git a/web/core/modules/language/src/Plugin/migrate/process/LanguageNegotiation.php b/web/core/modules/language/src/Plugin/migrate/process/LanguageNegotiation.php
index 837dbbbc60..ad8af296ca 100644
--- a/web/core/modules/language/src/Plugin/migrate/process/LanguageNegotiation.php
+++ b/web/core/modules/language/src/Plugin/migrate/process/LanguageNegotiation.php
@@ -61,18 +61,25 @@ protected function mapNewMethods($value) {
switch ($value) {
case 'language-default':
return 'language-selected';
+
case 'locale-browser':
return 'language-browser';
+
case 'locale-interface':
return 'language-interface';
+
case 'locale-session':
return 'language-session';
+
case 'locale-url':
return 'language-url';
+
case 'locale-url-fallback':
return 'language-url-fallback';
+
case 'locale-user':
return 'language-user';
+
default:
return $value;
}
diff --git a/web/core/modules/language/tests/src/Functional/LanguageBrowserDetectionAcceptLanguageTest.php b/web/core/modules/language/tests/src/Functional/LanguageBrowserDetectionAcceptLanguageTest.php
index b2ac07895f..fae8acafa5 100644
--- a/web/core/modules/language/tests/src/Functional/LanguageBrowserDetectionAcceptLanguageTest.php
+++ b/web/core/modules/language/tests/src/Functional/LanguageBrowserDetectionAcceptLanguageTest.php
@@ -17,7 +17,12 @@ class LanguageBrowserDetectionAcceptLanguageTest extends BrowserTestBase {
*
* @var array
*/
- public static $modules = ['language', 'locale', 'content_translation', 'system_test'];
+ public static $modules = [
+ 'language',
+ 'locale',
+ 'content_translation',
+ 'system_test',
+ ];
/**
* {@inheritdoc}
diff --git a/web/core/modules/language/tests/src/Functional/LanguageConfigOverrideImportTest.php b/web/core/modules/language/tests/src/Functional/LanguageConfigOverrideImportTest.php
index 03f3df28b5..e18168760a 100644
--- a/web/core/modules/language/tests/src/Functional/LanguageConfigOverrideImportTest.php
+++ b/web/core/modules/language/tests/src/Functional/LanguageConfigOverrideImportTest.php
@@ -17,7 +17,12 @@ class LanguageConfigOverrideImportTest extends BrowserTestBase {
*
* @var array
*/
- public static $modules = ['language', 'config', 'locale', 'config_translation'];
+ public static $modules = [
+ 'language',
+ 'config',
+ 'locale',
+ 'config_translation',
+ ];
/**
* {@inheritdoc}
diff --git a/web/core/modules/language/tests/src/Functional/LanguageConfigurationElementTest.php b/web/core/modules/language/tests/src/Functional/LanguageConfigurationElementTest.php
index 386f6d93e0..8e70032900 100644
--- a/web/core/modules/language/tests/src/Functional/LanguageConfigurationElementTest.php
+++ b/web/core/modules/language/tests/src/Functional/LanguageConfigurationElementTest.php
@@ -20,7 +20,13 @@ class LanguageConfigurationElementTest extends BrowserTestBase {
*
* @var array
*/
- public static $modules = ['taxonomy', 'node', 'language', 'language_elements_test', 'field_ui'];
+ public static $modules = [
+ 'taxonomy',
+ 'node',
+ 'language',
+ 'language_elements_test',
+ 'field_ui',
+ ];
/**
* {@inheritdoc}
diff --git a/web/core/modules/language/tests/src/Functional/LanguageListTest.php b/web/core/modules/language/tests/src/Functional/LanguageListTest.php
index 45ec251ba2..bdaf682592 100644
--- a/web/core/modules/language/tests/src/Functional/LanguageListTest.php
+++ b/web/core/modules/language/tests/src/Functional/LanguageListTest.php
@@ -88,12 +88,12 @@ public function testLanguageList() {
// Ensure we can't delete the default language.
$this->drupalGet('admin/config/regional/language/delete/' . $langcode);
- $this->assertResponse(403, 'Failed to delete the default language.');
+ $this->assertSession()->statusCodeEquals(403);
// Ensure 'Edit' link works.
$this->drupalGet('admin/config/regional/language');
$this->clickLink(t('Edit'));
- $this->assertTitle(t('Edit language | Drupal'), 'Page title is "Edit language".');
+ $this->assertTitle('Edit language | Drupal');
// Edit a language.
$name = $this->randomMachineName(16);
$edit = [
@@ -128,7 +128,7 @@ public function testLanguageList() {
$this->assertUrl(Url::fromRoute('entity.configurable_language.collection', [], ['absolute' => TRUE, 'language' => $english])->toString());
// Verify that language is no longer found.
$this->drupalGet('admin/config/regional/language/delete/' . $langcode);
- $this->assertResponse(404, 'Language no longer found.');
+ $this->assertSession()->statusCodeEquals(404);
// Delete French.
$this->drupalPostForm('admin/config/regional/language/delete/fr', [], t('Delete'));
@@ -140,7 +140,7 @@ public function testLanguageList() {
$this->assertUrl(Url::fromRoute('entity.configurable_language.collection', [], ['absolute' => TRUE])->toString());
// Verify that language is no longer found.
$this->drupalGet('admin/config/regional/language/delete/fr');
- $this->assertResponse(404, 'Language no longer found.');
+ $this->assertSession()->statusCodeEquals(404);
// Make sure the "language_count" state has not changed.
// Ensure we can delete the English language. Right now English is the only
@@ -179,7 +179,7 @@ public function testLanguageList() {
// Ensure we can't delete a locked language.
$this->drupalGet('admin/config/regional/language/delete/und');
- $this->assertResponse(403, 'Can not delete locked language');
+ $this->assertSession()->statusCodeEquals(403);
// Ensure that NL cannot be set default when it's not available.
// First create the NL language.
diff --git a/web/core/modules/language/tests/src/Functional/LanguageNegotiationContentEntityTest.php b/web/core/modules/language/tests/src/Functional/LanguageNegotiationContentEntityTest.php
index 66ea59ac1e..45d142576e 100644
--- a/web/core/modules/language/tests/src/Functional/LanguageNegotiationContentEntityTest.php
+++ b/web/core/modules/language/tests/src/Functional/LanguageNegotiationContentEntityTest.php
@@ -25,7 +25,12 @@ class LanguageNegotiationContentEntityTest extends BrowserTestBase {
*
* @var array
*/
- public static $modules = ['language', 'language_test', 'entity_test', 'system'];
+ public static $modules = [
+ 'language',
+ 'language_test',
+ 'entity_test',
+ 'system',
+ ];
/**
* {@inheritdoc}
diff --git a/web/core/modules/language/tests/src/Functional/LanguageNegotiationInfoTest.php b/web/core/modules/language/tests/src/Functional/LanguageNegotiationInfoTest.php
index bab82fd8fd..35974cfd51 100644
--- a/web/core/modules/language/tests/src/Functional/LanguageNegotiationInfoTest.php
+++ b/web/core/modules/language/tests/src/Functional/LanguageNegotiationInfoTest.php
@@ -85,7 +85,7 @@ public function testInfoAlterations() {
$type = LanguageInterface::TYPE_CONTENT;
$language_types = $this->languageManager()->getLanguageTypes();
- $this->assertTrue(in_array($type, $language_types), 'Content language type is configurable.');
+ $this->assertContains($type, $language_types, 'Content language type is configurable.');
// Enable some core and custom language negotiation methods. The test
// language type is supposed to be configurable.
@@ -141,7 +141,7 @@ public function testInfoAlterations() {
// Check that only the core language types are available.
foreach ($this->languageManager()->getDefinedLanguageTypes() as $type) {
- $this->assertTrue(strpos($type, 'test') === FALSE, new FormattableMarkup('The %type language is still available', ['%type' => $type]));
+ $this->assertStringNotContainsString('test', $type, new FormattableMarkup('The %type language is still available', ['%type' => $type]));
}
// Check that fixed language types are properly configured, even those
diff --git a/web/core/modules/language/tests/src/Functional/LanguagePathMonolingualTest.php b/web/core/modules/language/tests/src/Functional/LanguagePathMonolingualTest.php
index 5c4bcfa016..06affc01f8 100644
--- a/web/core/modules/language/tests/src/Functional/LanguagePathMonolingualTest.php
+++ b/web/core/modules/language/tests/src/Functional/LanguagePathMonolingualTest.php
@@ -71,7 +71,7 @@ public function testPageLinks() {
// Verify that links in this page can be followed and work.
$this->clickLink(t('Languages'));
- $this->assertResponse(200, 'Clicked link results in a valid page');
+ $this->assertSession()->statusCodeEquals(200);
$this->assertText(t('Add language'), 'Page contains the add language text');
}
diff --git a/web/core/modules/language/tests/src/Functional/LanguageSwitchingTest.php b/web/core/modules/language/tests/src/Functional/LanguageSwitchingTest.php
index 6e0fa3b2f0..7f20d47d12 100644
--- a/web/core/modules/language/tests/src/Functional/LanguageSwitchingTest.php
+++ b/web/core/modules/language/tests/src/Functional/LanguageSwitchingTest.php
@@ -20,7 +20,14 @@ class LanguageSwitchingTest extends BrowserTestBase {
*
* @var array
*/
- public static $modules = ['locale', 'locale_test', 'language', 'block', 'language_test', 'menu_ui'];
+ public static $modules = [
+ 'locale',
+ 'locale_test',
+ 'language',
+ 'block',
+ 'language_test',
+ 'menu_ui',
+ ];
/**
* {@inheritdoc}
diff --git a/web/core/modules/language/tests/src/Functional/LanguageUILanguageNegotiationTest.php b/web/core/modules/language/tests/src/Functional/LanguageUILanguageNegotiationTest.php
index 239a561427..62e0ae5e72 100644
--- a/web/core/modules/language/tests/src/Functional/LanguageUILanguageNegotiationTest.php
+++ b/web/core/modules/language/tests/src/Functional/LanguageUILanguageNegotiationTest.php
@@ -58,7 +58,13 @@ class LanguageUILanguageNegotiationTest extends BrowserTestBase {
*
* @var array
*/
- public static $modules = ['locale', 'language_test', 'block', 'user', 'content_translation'];
+ public static $modules = [
+ 'locale',
+ 'language_test',
+ 'block',
+ 'user',
+ 'content_translation',
+ ];
/**
* {@inheritdoc}
@@ -251,7 +257,7 @@ public function testUILanguageNegotiation() {
->set('negotiation.' . LanguageInterface::TYPE_INTERFACE . '.enabled', array_flip(array_keys($language_interface_method_definitions)))
->save();
$this->drupalGet("$langcode_unknown/admin/config", [], $http_header_browser_fallback);
- $this->assertResponse(404, "Unknown language path prefix should return 404");
+ $this->assertSession()->statusCodeEquals(404);
// Set preferred langcode for user to NULL.
$account = $this->loggedInUser;
@@ -406,7 +412,7 @@ protected function doRunTest($test) {
// match.
Cache::invalidateTags(['route_match']);
$this->drupalGet('system/files/test/private-file-test.txt');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
}
/**
@@ -548,12 +554,12 @@ public function testContentCustomization() {
// Check if configurability persisted.
$config = $this->config('language.types');
- $this->assertTrue(in_array('language_interface', $config->get('configurable')), 'Interface language is configurable.');
- $this->assertTrue(in_array('language_content', $config->get('configurable')), 'Content language is configurable.');
+ $this->assertContains('language_interface', $config->get('configurable'), 'Interface language is configurable.');
+ $this->assertContains('language_content', $config->get('configurable'), 'Content language is configurable.');
// Ensure configuration was saved.
- $this->assertFalse(array_key_exists('language-url', $config->get('negotiation.language_content.enabled')), 'URL negotiation is not enabled for content.');
- $this->assertTrue(array_key_exists('language-session', $config->get('negotiation.language_content.enabled')), 'Session negotiation is enabled for content.');
+ $this->assertArrayNotHasKey('language-url', $config->get('negotiation.language_content.enabled'));
+ $this->assertArrayHasKey('language-session', $config->get('negotiation.language_content.enabled'));
}
/**
@@ -574,7 +580,7 @@ public function testDisableLanguageSwitcher() {
'language_content[configurable]' => FALSE,
];
$this->drupalPostForm('admin/config/regional/language/detection', $edit, t('Save settings'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Check if the language switcher block has been removed.
$block = Block::load($block_id);
diff --git a/web/core/modules/language/tests/src/Functional/LanguageUrlRewritingTest.php b/web/core/modules/language/tests/src/Functional/LanguageUrlRewritingTest.php
index 49007619df..456c5b6202 100644
--- a/web/core/modules/language/tests/src/Functional/LanguageUrlRewritingTest.php
+++ b/web/core/modules/language/tests/src/Functional/LanguageUrlRewritingTest.php
@@ -62,7 +62,7 @@ protected function setUp() {
public function testUrlRewritingEdgeCases() {
// Check URL rewriting with a non-installed language.
$non_existing = new Language(['id' => $this->randomMachineName()]);
- $this->checkUrl($non_existing, 'Path language is ignored if language is not installed.', 'URL language negotiation does not work with non-installed languages');
+ $this->checkUrl($non_existing, 'Path language is ignored if language is not installed.');
// Check that URL rewriting is not applied to subrequests.
$this->drupalGet('language_test/subrequest');
@@ -78,12 +78,10 @@ public function testUrlRewritingEdgeCases() {
*
* @param \Drupal\Core\Language\LanguageInterface $language
* The language object.
- * @param string $message1
+ * @param string $message
* Message to display in assertion that language prefixes are not added.
- * @param string $message2
- * The message to display confirming prefixed URL is not working.
*/
- private function checkUrl(LanguageInterface $language, $message1, $message2) {
+ private function checkUrl(LanguageInterface $language, $message) {
$options = ['language' => $language, 'script' => ''];
$base_path = trim(base_path(), '/');
$rewritten_path = trim(str_replace($base_path, '', Url::fromRoute('<front>', [], $options)->toString()), '/');
@@ -95,11 +93,11 @@ private function checkUrl(LanguageInterface $language, $message1, $message2) {
// we can always check the prefixed URL.
$prefixes = $this->config('language.negotiation')->get('url.prefixes');
$stored_prefix = isset($prefixes[$language->getId()]) ? $prefixes[$language->getId()] : $this->randomMachineName();
- $this->assertNotEqual($stored_prefix, $prefix, $message1);
+ $this->assertNotEqual($stored_prefix, $prefix, $message);
$prefix = $stored_prefix;
$this->drupalGet("$prefix/$path");
- $this->assertResponse(404, $message2);
+ $this->assertSession()->statusCodeEquals(404);
}
/**
diff --git a/web/core/modules/language/tests/src/Kernel/EntityDefaultLanguageTest.php b/web/core/modules/language/tests/src/Kernel/EntityDefaultLanguageTest.php
index 06047dfaf0..5c27002308 100644
--- a/web/core/modules/language/tests/src/Kernel/EntityDefaultLanguageTest.php
+++ b/web/core/modules/language/tests/src/Kernel/EntityDefaultLanguageTest.php
@@ -18,7 +18,14 @@ class EntityDefaultLanguageTest extends KernelTestBase {
*
* @var array
*/
- public static $modules = ['language', 'node', 'field', 'text', 'user', 'system'];
+ public static $modules = [
+ 'language',
+ 'node',
+ 'field',
+ 'text',
+ 'user',
+ 'system',
+ ];
/**
* {@inheritdoc}
diff --git a/web/core/modules/language/tests/src/Kernel/EntityUrlLanguageTest.php b/web/core/modules/language/tests/src/Kernel/EntityUrlLanguageTest.php
index 802d1a2431..4d81efd3e9 100644
--- a/web/core/modules/language/tests/src/Kernel/EntityUrlLanguageTest.php
+++ b/web/core/modules/language/tests/src/Kernel/EntityUrlLanguageTest.php
@@ -56,9 +56,9 @@ protected function setUp() {
* Ensures that entity URLs in a language have the right language prefix.
*/
public function testEntityUrlLanguage() {
- $this->assertTrue(strpos($this->entity->toUrl()->toString(), '/en/entity_test/' . $this->entity->id()) !== FALSE);
- $this->assertTrue(strpos($this->entity->getTranslation('es')->toUrl()->toString(), '/es/entity_test/' . $this->entity->id()) !== FALSE);
- $this->assertTrue(strpos($this->entity->getTranslation('fr')->toUrl()->toString(), '/fr/entity_test/' . $this->entity->id()) !== FALSE);
+ $this->assertStringContainsString('/en/entity_test/' . $this->entity->id(), $this->entity->toUrl()->toString());
+ $this->assertStringContainsString('/es/entity_test/' . $this->entity->id(), $this->entity->getTranslation('es')->toUrl()->toString());
+ $this->assertStringContainsString('/fr/entity_test/' . $this->entity->id(), $this->entity->getTranslation('fr')->toUrl()->toString());
}
/**
@@ -89,9 +89,9 @@ public function testEntityUrlLanguageWithLanguageContentEnabled() {
// The method language-content-entity should run before language-url and
// append query parameter for the content language and prevent language-url
// from overwriting the url.
- $this->assertTrue(strpos($this->entity->toUrl('canonical')->toString(), '/en/entity_test/' . $this->entity->id() . '?' . LanguageNegotiationContentEntity::QUERY_PARAMETER . '=en') !== FALSE);
- $this->assertTrue(strpos($this->entity->getTranslation('es')->toUrl('canonical')->toString(), '/en/entity_test/' . $this->entity->id() . '?' . LanguageNegotiationContentEntity::QUERY_PARAMETER . '=es') !== FALSE);
- $this->assertTrue(strpos($this->entity->getTranslation('fr')->toUrl('canonical')->toString(), '/en/entity_test/' . $this->entity->id() . '?' . LanguageNegotiationContentEntity::QUERY_PARAMETER . '=fr') !== FALSE);
+ $this->assertStringContainsString('/en/entity_test/' . $this->entity->id() . '?' . LanguageNegotiationContentEntity::QUERY_PARAMETER . '=en', $this->entity->toUrl('canonical')->toString());
+ $this->assertStringContainsString('/en/entity_test/' . $this->entity->id() . '?' . LanguageNegotiationContentEntity::QUERY_PARAMETER . '=es', $this->entity->getTranslation('es')->toUrl('canonical')->toString());
+ $this->assertStringContainsString('/en/entity_test/' . $this->entity->id() . '?' . LanguageNegotiationContentEntity::QUERY_PARAMETER . '=fr', $this->entity->getTranslation('fr')->toUrl('canonical')->toString());
// Define the method language-url with a higher priority than
// language-content-entity. This configuration should match the default one,
diff --git a/web/core/modules/language/tests/src/Kernel/Migrate/d6/MigrateLanguageContentSettingsTest.php b/web/core/modules/language/tests/src/Kernel/Migrate/d6/MigrateLanguageContentSettingsTest.php
index 57439d588d..3e8b7ac59b 100644
--- a/web/core/modules/language/tests/src/Kernel/Migrate/d6/MigrateLanguageContentSettingsTest.php
+++ b/web/core/modules/language/tests/src/Kernel/Migrate/d6/MigrateLanguageContentSettingsTest.php
@@ -16,7 +16,13 @@ class MigrateLanguageContentSettingsTest extends MigrateDrupal6TestBase {
/**
* {@inheritdoc}
*/
- public static $modules = ['node', 'text', 'language', 'content_translation', 'menu_ui'];
+ public static $modules = [
+ 'node',
+ 'text',
+ 'language',
+ 'content_translation',
+ 'menu_ui',
+ ];
/**
* {@inheritdoc}
diff --git a/web/core/modules/language/tests/src/Kernel/Migrate/d6/MigrateLanguageTest.php b/web/core/modules/language/tests/src/Kernel/Migrate/d6/MigrateLanguageTest.php
index 72d7ab8df3..eeb2d31a7d 100644
--- a/web/core/modules/language/tests/src/Kernel/Migrate/d6/MigrateLanguageTest.php
+++ b/web/core/modules/language/tests/src/Kernel/Migrate/d6/MigrateLanguageTest.php
@@ -32,7 +32,7 @@ class MigrateLanguageTest extends MigrateDrupal6TestBase {
protected function assertLanguage($id, $label, $direction = ConfigurableLanguageInterface::DIRECTION_LTR, $weight = 0) {
/** @var \Drupal\language\ConfigurableLanguageInterface $language */
$language = ConfigurableLanguage::load($id);
- $this->assertTrue($language instanceof ConfigurableLanguageInterface);
+ $this->assertInstanceOf(ConfigurableLanguageInterface::class, $language);
$this->assertIdentical($label, $language->label());
$this->assertIdentical($direction, $language->getDirection());
$this->assertIdentical(0, $language->getWeight());
diff --git a/web/core/modules/language/tests/src/Kernel/Migrate/d7/MigrateLanguageContentSettingsTest.php b/web/core/modules/language/tests/src/Kernel/Migrate/d7/MigrateLanguageContentSettingsTest.php
index 1e05e9193d..9978b7b724 100644
--- a/web/core/modules/language/tests/src/Kernel/Migrate/d7/MigrateLanguageContentSettingsTest.php
+++ b/web/core/modules/language/tests/src/Kernel/Migrate/d7/MigrateLanguageContentSettingsTest.php
@@ -16,7 +16,13 @@ class MigrateLanguageContentSettingsTest extends MigrateDrupal7TestBase {
/**
* {@inheritdoc}
*/
- public static $modules = ['node', 'text', 'language', 'content_translation', 'menu_ui'];
+ public static $modules = [
+ 'node',
+ 'text',
+ 'language',
+ 'content_translation',
+ 'menu_ui',
+ ];
/**
* {@inheritdoc}
diff --git a/web/core/modules/layout_builder/layout_builder.post_update.php b/web/core/modules/layout_builder/layout_builder.post_update.php
index 1b4a2acb03..ded21ee897 100644
--- a/web/core/modules/layout_builder/layout_builder.post_update.php
+++ b/web/core/modules/layout_builder/layout_builder.post_update.php
@@ -190,6 +190,13 @@ function layout_builder_post_update_update_permissions() {
}
}
+/**
+ * Clear caches due to addition of service decorator for entity form controller.
+ */
+function layout_builder_post_update_override_entity_form_controller() {
+ // Empty post-update hook.
+}
+
/**
* Set the layout builder field as non-translatable where possible.
*/
diff --git a/web/core/modules/layout_builder/layout_builder.routing.yml b/web/core/modules/layout_builder/layout_builder.routing.yml
index b59e2a036d..6dcf0c9f05 100644
--- a/web/core/modules/layout_builder/layout_builder.routing.yml
+++ b/web/core/modules/layout_builder/layout_builder.routing.yml
@@ -81,7 +81,7 @@ layout_builder.choose_inline_block:
path: '/layout_builder/choose/inline-block/{section_storage_type}/{section_storage}/{delta}/{region}'
defaults:
_controller: '\Drupal\layout_builder\Controller\ChooseBlockController::inlineBlockList'
- _title: 'Add a new Inline Block'
+ _title: 'Add a new custom block'
requirements:
_layout_builder_access: 'view'
options:
diff --git a/web/core/modules/layout_builder/layout_builder.services.yml b/web/core/modules/layout_builder/layout_builder.services.yml
index 6e94ed74d2..b2ee1fe13e 100644
--- a/web/core/modules/layout_builder/layout_builder.services.yml
+++ b/web/core/modules/layout_builder/layout_builder.services.yml
@@ -51,3 +51,10 @@ services:
inline_block.usage:
class: Drupal\layout_builder\InlineBlockUsage
arguments: ['@database']
+ layout_builder.controller.entity_form:
+ # Override the entity form controller to handle the entity layout_builder
+ # operation.
+ decorates: controller.entity_form
+ class: Drupal\layout_builder\Controller\LayoutBuilderHtmlEntityFormController
+ public: false
+ arguments: ['@layout_builder.controller.entity_form.inner']
diff --git a/web/core/modules/layout_builder/src/Controller/ChooseSectionController.php b/web/core/modules/layout_builder/src/Controller/ChooseSectionController.php
index ec27e92626..29778eb386 100644
--- a/web/core/modules/layout_builder/src/Controller/ChooseSectionController.php
+++ b/web/core/modules/layout_builder/src/Controller/ChooseSectionController.php
@@ -69,8 +69,8 @@ public function build(SectionStorageInterface $section_storage, $delta) {
$item = [
'#type' => 'link',
'#title' => [
- $definition->getIcon(60, 80, 1, 3),
- [
+ 'icon' => $definition->getIcon(60, 80, 1, 3),
+ 'label' => [
'#type' => 'container',
'#children' => $definition->getLabel(),
],
@@ -90,10 +90,10 @@ public function build(SectionStorageInterface $section_storage, $delta) {
$item['#attributes']['data-dialog-type'][] = 'dialog';
$item['#attributes']['data-dialog-renderer'][] = 'off_canvas';
}
- $items[] = $item;
+ $items[$plugin_id] = $item;
}
$output['layouts'] = [
- '#theme' => 'item_list',
+ '#theme' => 'item_list__layouts',
'#items' => $items,
'#attributes' => [
'class' => [
diff --git a/web/core/modules/layout_builder/src/Controller/LayoutBuilderHtmlEntityFormController.php b/web/core/modules/layout_builder/src/Controller/LayoutBuilderHtmlEntityFormController.php
new file mode 100644
index 0000000000..eac8695a64
--- /dev/null
+++ b/web/core/modules/layout_builder/src/Controller/LayoutBuilderHtmlEntityFormController.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace Drupal\layout_builder\Controller;
+
+use Drupal\Component\Utility\NestedArray;
+use Drupal\Core\Controller\FormController;
+use Drupal\Core\DependencyInjection\DependencySerializationTrait;
+use Drupal\Core\Routing\RouteMatchInterface;
+use Symfony\Component\HttpFoundation\Request;
+
+/**
+ * Overrides the entity form controller service for layout builder operations.
+ */
+class LayoutBuilderHtmlEntityFormController {
+
+ use DependencySerializationTrait;
+
+ /**
+ * The entity form controller being decorated.
+ *
+ * @var \Drupal\Core\Controller\FormController
+ */
+ protected $entityFormController;
+
+ /**
+ * Constructs a LayoutBuilderHtmlEntityFormController object.
+ *
+ * @param \Drupal\Core\Controller\FormController $entity_form_controller
+ * The entity form controller being decorated.
+ */
+ public function __construct(FormController $entity_form_controller) {
+ $this->entityFormController = $entity_form_controller;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getContentResult(Request $request, RouteMatchInterface $route_match) {
+ $form = $this->entityFormController->getContentResult($request, $route_match);
+
+ // If the form render element has a #layout_builder_element_keys property,
+ // first set the form element as a child of the root render array. Use the
+ // keys to get the layout builder element from the form render array and
+ // copy it to a separate child element of the root element to prevent any
+ // forms within the layout builder element from being nested.
+ if (isset($form['#layout_builder_element_keys'])) {
+ $build['form'] = &$form;
+ $layout_builder_element = &NestedArray::getValue($form, $form['#layout_builder_element_keys']);
+ $build['layout_builder'] = $layout_builder_element;
+ // Remove the layout builder element within the form.
+ $layout_builder_element = [];
+ return $build;
+ }
+
+ // If no #layout_builder_element_keys property, return form as is.
+ return $form;
+ }
+
+}
diff --git a/web/core/modules/layout_builder/src/Form/DefaultsEntityForm.php b/web/core/modules/layout_builder/src/Form/DefaultsEntityForm.php
index 8fb71c52f9..71c19a3ff7 100644
--- a/web/core/modules/layout_builder/src/Form/DefaultsEntityForm.php
+++ b/web/core/modules/layout_builder/src/Form/DefaultsEntityForm.php
@@ -84,6 +84,7 @@ public function buildForm(array $form, FormStateInterface $form_state, SectionSt
$form['layout_builder'] = [
'#type' => 'layout_builder',
'#section_storage' => $section_storage,
+ '#process' => [[static::class, 'layoutBuilderElementGetKeys']],
];
$form['layout_builder_message'] = $this->buildMessage($section_storage->getContextValue('display'));
@@ -91,6 +92,20 @@ public function buildForm(array $form, FormStateInterface $form_state, SectionSt
return parent::buildForm($form, $form_state);
}
+ /**
+ * Form element #process callback.
+ *
+ * Save the layout builder element array parents as a property on the top form
+ * element so that they can be used to access the element within the whole
+ * render array later.
+ *
+ * @see \Drupal\layout_builder\Controller\LayoutBuilderHtmlEntityFormController
+ */
+ public static function layoutBuilderElementGetKeys(array $element, FormStateInterface $form_state, &$form) {
+ $form['#layout_builder_element_keys'] = $element['#array_parents'];
+ return $element;
+ }
+
/**
* Renders a message to display at the top of the layout builder.
*
diff --git a/web/core/modules/layout_builder/src/Plugin/Field/FieldWidget/LayoutBuilderWidget.php b/web/core/modules/layout_builder/src/Plugin/Field/FieldWidget/LayoutBuilderWidget.php
index 38ffb79250..0195065ff5 100644
--- a/web/core/modules/layout_builder/src/Plugin/Field/FieldWidget/LayoutBuilderWidget.php
+++ b/web/core/modules/layout_builder/src/Plugin/Field/FieldWidget/LayoutBuilderWidget.php
@@ -32,6 +32,21 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen
'#type' => 'layout_builder',
'#section_storage' => $this->getSectionStorage($form_state),
];
+ $element['#process'][] = [static::class, 'layoutBuilderElementGetKeys'];
+ return $element;
+ }
+
+ /**
+ * Form element #process callback.
+ *
+ * Save the layout builder element array parents as a property on the top form
+ * element so that they can be used to access the element within the whole
+ * render array later.
+ *
+ * @see \Drupal\layout_builder\Controller\LayoutBuilderHtmlEntityFormController
+ */
+ public static function layoutBuilderElementGetKeys(array $element, FormStateInterface $form_state, &$form) {
+ $form['#layout_builder_element_keys'] = $element['#array_parents'];
return $element;
}
diff --git a/web/core/modules/layout_builder/src/Plugin/Layout/MultiWidthLayoutBase.php b/web/core/modules/layout_builder/src/Plugin/Layout/MultiWidthLayoutBase.php
index 9ad23e0a22..1693a6de14 100644
--- a/web/core/modules/layout_builder/src/Plugin/Layout/MultiWidthLayoutBase.php
+++ b/web/core/modules/layout_builder/src/Plugin/Layout/MultiWidthLayoutBase.php
@@ -19,9 +19,8 @@ abstract class MultiWidthLayoutBase extends LayoutDefault implements PluginFormI
*/
public function defaultConfiguration() {
$configuration = parent::defaultConfiguration();
- $width_classes = array_keys($this->getWidthOptions());
return $configuration + [
- 'column_widths' => array_shift($width_classes),
+ 'column_widths' => $this->getDefaultWidth(),
];
}
@@ -72,4 +71,16 @@ public function build(array $regions) {
*/
abstract protected function getWidthOptions();
+ /**
+ * Provides a default value for the width options.
+ *
+ * @return string
+ * A key from the array returned by ::getWidthOptions().
+ */
+ protected function getDefaultWidth() {
+ // Return the first available key from the list of options.
+ $width_classes = array_keys($this->getWidthOptions());
+ return array_shift($width_classes);
+ }
+
}
diff --git a/web/core/modules/layout_builder/src/Plugin/Layout/ThreeColumnLayout.php b/web/core/modules/layout_builder/src/Plugin/Layout/ThreeColumnLayout.php
index b42121f78e..e214f29001 100644
--- a/web/core/modules/layout_builder/src/Plugin/Layout/ThreeColumnLayout.php
+++ b/web/core/modules/layout_builder/src/Plugin/Layout/ThreeColumnLayout.php
@@ -22,4 +22,11 @@ protected function getWidthOptions() {
];
}
+ /**
+ * {@inheritdoc}
+ */
+ protected function getDefaultWidth() {
+ return '33-34-33';
+ }
+
}
diff --git a/web/core/modules/layout_builder/src/Plugin/Layout/TwoColumnLayout.php b/web/core/modules/layout_builder/src/Plugin/Layout/TwoColumnLayout.php
index 68296af7d1..2dfd16291a 100644
--- a/web/core/modules/layout_builder/src/Plugin/Layout/TwoColumnLayout.php
+++ b/web/core/modules/layout_builder/src/Plugin/Layout/TwoColumnLayout.php
@@ -23,4 +23,11 @@ protected function getWidthOptions() {
];
}
+ /**
+ * {@inheritdoc}
+ */
+ protected function getDefaultWidth() {
+ return '50-50';
+ }
+
}
diff --git a/web/core/modules/layout_builder/tests/modules/layout_builder_field_block_theme_suggestions_test/layout_builder_field_block_theme_suggestions_test.module b/web/core/modules/layout_builder/tests/modules/layout_builder_field_block_theme_suggestions_test/layout_builder_field_block_theme_suggestions_test.module
deleted file mode 100644
index 729f3a3331..0000000000
--- a/web/core/modules/layout_builder/tests/modules/layout_builder_field_block_theme_suggestions_test/layout_builder_field_block_theme_suggestions_test.module
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-/**
- * @file
- * For testing Field Block theme suggestions.
- */
-
-/**
- * Implements hook_theme().
- */
-function layout_builder_field_block_theme_suggestions_test_theme() {
- // It is necessary to explicitly register the template via hook_theme()
- // because it is added via a module, not a theme.
- return [
- 'field__node__body__bundle_with_section_field__default' => [
- 'base hook' => 'field',
- ],
- ];
-}
diff --git a/web/core/modules/layout_builder/tests/modules/layout_builder_form_block_test/layout_builder_form_block_test.info.yml b/web/core/modules/layout_builder/tests/modules/layout_builder_form_block_test/layout_builder_form_block_test.info.yml
new file mode 100644
index 0000000000..a2aada4451
--- /dev/null
+++ b/web/core/modules/layout_builder/tests/modules/layout_builder_form_block_test/layout_builder_form_block_test.info.yml
@@ -0,0 +1,5 @@
+name: 'Layout Builder form block test'
+type: module
+description: 'Support module for testing layout building using blocks with forms.'
+package: Testing
+version: VERSION
diff --git a/web/core/modules/layout_builder/tests/modules/layout_builder_form_block_test/src/Plugin/Block/TestFormApiFormBlock.php b/web/core/modules/layout_builder/tests/modules/layout_builder_form_block_test/src/Plugin/Block/TestFormApiFormBlock.php
new file mode 100644
index 0000000000..791ccbba9b
--- /dev/null
+++ b/web/core/modules/layout_builder/tests/modules/layout_builder_form_block_test/src/Plugin/Block/TestFormApiFormBlock.php
@@ -0,0 +1,115 @@
+<?php
+
+namespace Drupal\layout_builder_form_block_test\Plugin\Block;
+
+use Drupal\Core\Block\BlockBase;
+use Drupal\Core\Form\FormBuilderInterface;
+use Drupal\Core\Form\FormInterface;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Provides a block containing a Form API form for use in Layout Builder tests.
+ *
+ * @Block(
+ * id = "layout_builder_form_block_test_form_api_form_block",
+ * admin_label = @Translation("Layout Builder form block test form api form block"),
+ * category = @Translation("Layout Builder form block test")
+ * )
+ */
+class TestFormApiFormBlock extends BlockBase implements ContainerFactoryPluginInterface, FormInterface {
+
+ /**
+ * The form builder service.
+ *
+ * @var \Drupal\Core\Form\FormBuilderInterface
+ */
+ protected $formBuilder;
+
+ /**
+ * TestFormApiFormBlock constructor.
+ *
+ * @param array $configuration
+ * The plugin configuration, i.e. an array with configuration values keyed
+ * by configuration option name. The special key 'context' may be used to
+ * initialize the defined contexts by setting it to an array of context
+ * values keyed by context names.
+ * @param string $plugin_id
+ * The plugin ID for the plugin instance.
+ * @param mixed $plugin_definition
+ * The plugin implementation definition.
+ * @param \Drupal\Core\Form\FormBuilderInterface $form_builder
+ * The form builder service.
+ */
+ public function __construct(array $configuration, $plugin_id, $plugin_definition, FormBuilderInterface $form_builder) {
+ parent::__construct($configuration, $plugin_id, $plugin_definition);
+ $this->formBuilder = $form_builder;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
+ return new static(
+ $configuration,
+ $plugin_id,
+ $plugin_definition,
+ $container->get('form_builder'));
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function build() {
+ return $this->formBuilder->getForm($this);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getFormId() {
+ return 'layout_builder_form_block_test_search_form';
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function buildForm(array $form, FormStateInterface $form_state) {
+ $form['keywords'] = [
+ '#title' => $this->t('Keywords'),
+ '#type' => 'textfield',
+ '#attributes' => [
+ 'placeholder' => $this->t('Keywords'),
+ ],
+ '#required' => TRUE,
+ '#title_display' => 'invisible',
+ '#weight' => 1,
+ ];
+
+ $form['actions'] = [
+ '#type' => 'actions',
+ 'submit' => [
+ '#name' => '',
+ '#type' => 'submit',
+ '#value' => $this->t('Search'),
+ ],
+ '#weight' => 2,
+ ];
+
+ return $form;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function validateForm(array &$form, FormStateInterface $form_state) {
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function submitForm(array &$form, FormStateInterface $form_state) {
+ }
+
+}
diff --git a/web/core/modules/layout_builder/tests/modules/layout_builder_form_block_test/src/Plugin/Block/TestInlineTemplateFormBlock.php b/web/core/modules/layout_builder/tests/modules/layout_builder_form_block_test/src/Plugin/Block/TestInlineTemplateFormBlock.php
new file mode 100644
index 0000000000..c93f55d3cd
--- /dev/null
+++ b/web/core/modules/layout_builder/tests/modules/layout_builder_form_block_test/src/Plugin/Block/TestInlineTemplateFormBlock.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Drupal\layout_builder_form_block_test\Plugin\Block;
+
+use Drupal\Core\Block\BlockBase;
+
+/**
+ * Provides a block containing inline template with <form> tag.
+ *
+ * For use in Layout Builder tests.
+ *
+ * @Block(
+ * id = "layout_builder_form_block_test_inline_template_form_block",
+ * admin_label = @Translation("Layout Builder form block test inline template form block"),
+ * category = @Translation("Layout Builder form block test")
+ * )
+ */
+class TestInlineTemplateFormBlock extends BlockBase {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function build() {
+ $build['form'] = [
+ '#type' => 'inline_template',
+ '#template' => '<form method="POST"><label>{{ "Keywords"|t }}<input name="keyword" type="text" required /></label><input name="submit" type="submit" value="{{ "Submit"|t }}" /></form>',
+ ];
+
+ return $build;
+ }
+
+}
diff --git a/web/core/modules/layout_builder/tests/modules/layout_builder_field_block_theme_suggestions_test/layout_builder_field_block_theme_suggestions_test.info.yml b/web/core/modules/layout_builder/tests/modules/layout_builder_theme_suggestions_test/layout_builder_theme_suggestions_test.info.yml
similarity index 100%
rename from web/core/modules/layout_builder/tests/modules/layout_builder_field_block_theme_suggestions_test/layout_builder_field_block_theme_suggestions_test.info.yml
rename to web/core/modules/layout_builder/tests/modules/layout_builder_theme_suggestions_test/layout_builder_theme_suggestions_test.info.yml
diff --git a/web/core/modules/layout_builder/tests/modules/layout_builder_theme_suggestions_test/layout_builder_theme_suggestions_test.module b/web/core/modules/layout_builder/tests/modules/layout_builder_theme_suggestions_test/layout_builder_theme_suggestions_test.module
new file mode 100644
index 0000000000..1308d4887a
--- /dev/null
+++ b/web/core/modules/layout_builder/tests/modules/layout_builder_theme_suggestions_test/layout_builder_theme_suggestions_test.module
@@ -0,0 +1,30 @@
+<?php
+
+/**
+ * @file
+ * For testing theme suggestions.
+ */
+
+/**
+ * Implements hook_theme().
+ */
+function layout_builder_theme_suggestions_test_theme() {
+ // It is necessary to explicitly register the template via hook_theme()
+ // because it is added via a module, not a theme.
+ return [
+ 'field__node__body__bundle_with_section_field__default' => [
+ 'base hook' => 'field',
+ ],
+ ];
+}
+
+/**
+ * Implements hook_preprocess_HOOK() for the list of layouts.
+ */
+function layout_builder_theme_suggestions_test_preprocess_item_list__layouts(&$variables) {
+ foreach (array_keys($variables['items']) as $layout_id) {
+ if (isset($variables['items'][$layout_id]['value']['#title']['icon'])) {
+ $variables['items'][$layout_id]['value']['#title']['icon'] = ['#markup' => __FUNCTION__];
+ }
+ }
+}
diff --git a/web/core/modules/layout_builder/tests/modules/layout_builder_field_block_theme_suggestions_test/templates/field--node--body--bundle-with-section-field--default.html.twig b/web/core/modules/layout_builder/tests/modules/layout_builder_theme_suggestions_test/templates/field--node--body--bundle-with-section-field--default.html.twig
similarity index 100%
rename from web/core/modules/layout_builder/tests/modules/layout_builder_field_block_theme_suggestions_test/templates/field--node--body--bundle-with-section-field--default.html.twig
rename to web/core/modules/layout_builder/tests/modules/layout_builder_theme_suggestions_test/templates/field--node--body--bundle-with-section-field--default.html.twig
diff --git a/web/core/modules/layout_builder/tests/modules/layout_builder_views_test/config/install/views.view.test_block_view.yml b/web/core/modules/layout_builder/tests/modules/layout_builder_views_test/config/install/views.view.test_block_view.yml
index 2e9311ad01..20de98411c 100644
--- a/web/core/modules/layout_builder/tests/modules/layout_builder_views_test/config/install/views.view.test_block_view.yml
+++ b/web/core/modules/layout_builder/tests/modules/layout_builder_views_test/config/install/views.view.test_block_view.yml
@@ -203,3 +203,76 @@ display:
- 'user.node_grants:view'
- user.permissions
tags: { }
+ block_3:
+ display_plugin: block
+ id: block_3
+ display_title: 'Exposed form block'
+ position: 3
+ display_options:
+ display_extenders: { }
+ display_description: ''
+ filters:
+ status:
+ id: status
+ table: node_field_data
+ field: status
+ relationship: none
+ group_type: group
+ admin_label: ''
+ operator: '='
+ value: '1'
+ group: 1
+ exposed: true
+ expose:
+ operator_id: ''
+ label: 'Published status'
+ description: ''
+ use_operator: false
+ operator: status_op
+ operator_limit_selection: false
+ operator_list: { }
+ identifier: status
+ required: true
+ remember: false
+ multiple: false
+ remember_roles:
+ authenticated: authenticated
+ anonymous: '0'
+ administrator: '0'
+ author: '0'
+ editor: '0'
+ is_grouped: false
+ group_info:
+ label: ''
+ description: ''
+ identifier: ''
+ optional: true
+ widget: select
+ multiple: false
+ remember: false
+ default_group: All
+ default_group_multiple: { }
+ group_items: { }
+ plugin_id: boolean
+ entity_type: node
+ entity_field: status
+ defaults:
+ filters: false
+ filter_groups: false
+ use_ajax: false
+ title: false
+ filter_groups:
+ operator: AND
+ groups:
+ 1: AND
+ use_ajax: true
+ title: 'Test Block View: Exposed form block'
+ cache_metadata:
+ max-age: -1
+ contexts:
+ - 'languages:language_content'
+ - 'languages:language_interface'
+ - url
+ - 'user.node_grants:view'
+ - user.permissions
+ tags: { }
diff --git a/web/core/modules/layout_builder/tests/src/Functional/LayoutBuilderFieldBlockThemeSuggestionsTest.php b/web/core/modules/layout_builder/tests/src/Functional/LayoutBuilderThemeSuggestionsTest.php
similarity index 74%
rename from web/core/modules/layout_builder/tests/src/Functional/LayoutBuilderFieldBlockThemeSuggestionsTest.php
rename to web/core/modules/layout_builder/tests/src/Functional/LayoutBuilderThemeSuggestionsTest.php
index 9e465fc0c4..3e2eea0846 100644
--- a/web/core/modules/layout_builder/tests/src/Functional/LayoutBuilderFieldBlockThemeSuggestionsTest.php
+++ b/web/core/modules/layout_builder/tests/src/Functional/LayoutBuilderThemeSuggestionsTest.php
@@ -5,11 +5,11 @@
use Drupal\Tests\BrowserTestBase;
/**
- * Tests field block template suggestions.
+ * Tests template suggestions.
*
* @group layout_builder
*/
-class LayoutBuilderFieldBlockThemeSuggestionsTest extends BrowserTestBase {
+class LayoutBuilderThemeSuggestionsTest extends BrowserTestBase {
/**
* {@inheritdoc}
@@ -17,7 +17,7 @@ class LayoutBuilderFieldBlockThemeSuggestionsTest extends BrowserTestBase {
public static $modules = [
'layout_builder',
'node',
- 'layout_builder_field_block_theme_suggestions_test',
+ 'layout_builder_theme_suggestions_test',
];
/**
@@ -54,6 +54,18 @@ protected function setUp() {
$this->drupalPostForm(NULL, ['layout[enabled]' => TRUE], 'Save');
}
+ /**
+ * Tests alterations of the layout list via preprocess functions.
+ */
+ public function testLayoutListSuggestion() {
+ $page = $this->getSession()->getPage();
+ $assert_session = $this->assertSession();
+
+ $this->drupalGet('admin/structure/types/manage/bundle_with_section_field/display/default/layout');
+ $page->clickLink('Add section');
+ $assert_session->pageTextContains('layout_builder_theme_suggestions_test_preprocess_item_list__layouts');
+ }
+
/**
* Tests that of view mode specific field templates are suggested.
*/
diff --git a/web/core/modules/layout_builder/tests/src/Functional/LayoutSectionTest.php b/web/core/modules/layout_builder/tests/src/Functional/LayoutSectionTest.php
index dc7956238d..16d168c9aa 100644
--- a/web/core/modules/layout_builder/tests/src/Functional/LayoutSectionTest.php
+++ b/web/core/modules/layout_builder/tests/src/Functional/LayoutSectionTest.php
@@ -18,7 +18,12 @@ class LayoutSectionTest extends BrowserTestBase {
/**
* {@inheritdoc}
*/
- public static $modules = ['field_ui', 'layout_builder', 'node', 'block_test'];
+ public static $modules = [
+ 'field_ui',
+ 'layout_builder',
+ 'node',
+ 'block_test',
+ ];
/**
* {@inheritdoc}
diff --git a/web/core/modules/layout_builder/tests/src/FunctionalJavascript/AjaxBlockTest.php b/web/core/modules/layout_builder/tests/src/FunctionalJavascript/AjaxBlockTest.php
index 99580cdef7..4ecf86b4c0 100644
--- a/web/core/modules/layout_builder/tests/src/FunctionalJavascript/AjaxBlockTest.php
+++ b/web/core/modules/layout_builder/tests/src/FunctionalJavascript/AjaxBlockTest.php
@@ -95,7 +95,7 @@ public function testAddAjaxBlock() {
$assert_session->assertWaitOnAjaxRequest();
$block_elements = $this->cssSelect('.block-layout-builder-test-testajax');
// Should be exactly one of these in there.
- $this->assertEquals(1, count($block_elements));
+ $this->assertCount(1, $block_elements);
$assert_session->pageTextContains('Every word is like an unnecessary stain on silence and nothingness.');
}
diff --git a/web/core/modules/layout_builder/tests/src/FunctionalJavascript/ContentPreviewToggleTest.php b/web/core/modules/layout_builder/tests/src/FunctionalJavascript/ContentPreviewToggleTest.php
index ee5dfb1f05..515b741537 100644
--- a/web/core/modules/layout_builder/tests/src/FunctionalJavascript/ContentPreviewToggleTest.php
+++ b/web/core/modules/layout_builder/tests/src/FunctionalJavascript/ContentPreviewToggleTest.php
@@ -4,7 +4,7 @@
use Drupal\FunctionalJavascriptTests\WebDriverTestBase;
use Drupal\Tests\contextual\FunctionalJavascript\ContextualLinkClickTrait;
-use Zend\Stdlib\ArrayUtils;
+use Laminas\Stdlib\ArrayUtils;
/**
* Tests toggling of content preview.
diff --git a/web/core/modules/layout_builder/tests/src/FunctionalJavascript/InlineBlockTest.php b/web/core/modules/layout_builder/tests/src/FunctionalJavascript/InlineBlockTest.php
index a9356bacba..d266386130 100644
--- a/web/core/modules/layout_builder/tests/src/FunctionalJavascript/InlineBlockTest.php
+++ b/web/core/modules/layout_builder/tests/src/FunctionalJavascript/InlineBlockTest.php
@@ -141,7 +141,7 @@ public function testNoLayoutSave($operation, $no_save_button_text, $confirm_butt
$this->drupalGet('node/1');
$assert_session->pageTextContains('The block body');
$blocks = $this->blockStorage->loadMultiple();
- $this->assertEquals(count($blocks), 1);
+ $this->assertCount(1, $blocks);
/* @var \Drupal\Core\Entity\ContentEntityBase $block */
$block = array_pop($blocks);
$revision_id = $block->getRevisionId();
@@ -163,7 +163,7 @@ public function testNoLayoutSave($operation, $no_save_button_text, $confirm_butt
// When discarding the original block body should appear.
$assert_session->pageTextContains('The block body');
- $this->assertEquals(count($blocks), 1);
+ $this->assertCount(1, $blocks);
$block = array_pop($blocks);
$this->assertEquals($block->getRevisionId(), $revision_id);
$this->assertEquals($block->get('body')->getValue()[0]['value'], 'The block body');
@@ -547,7 +547,6 @@ public function testAddInlineBlocksPermission() {
* Tests 'create and edit custom blocks' permission to edit an existing block.
*/
public function testEditInlineBlocksPermission() {
- $assert_session = $this->assertSession();
LayoutBuilderEntityViewDisplay::load('node.bundle_with_section_field.default')
->enableLayoutBuilder()
diff --git a/web/core/modules/layout_builder/tests/src/FunctionalJavascript/LayoutBuilderDisableInteractionsTest.php b/web/core/modules/layout_builder/tests/src/FunctionalJavascript/LayoutBuilderDisableInteractionsTest.php
index 4445b3ac95..3770aa426a 100644
--- a/web/core/modules/layout_builder/tests/src/FunctionalJavascript/LayoutBuilderDisableInteractionsTest.php
+++ b/web/core/modules/layout_builder/tests/src/FunctionalJavascript/LayoutBuilderDisableInteractionsTest.php
@@ -179,7 +179,7 @@ protected function assertElementUnclickable(NodeElement $element) {
$this->fail(new FormattableMarkup("@tag_name was clickable when it shouldn't have been", ['@tag_name' => $tag_name]));
}
catch (\Exception $e) {
- $this->assertContains('is not clickable at point', $e->getMessage());
+ $this->assertStringContainsString('is not clickable at point', $e->getMessage());
}
}
@@ -291,7 +291,7 @@ protected function assertContextualLinkRetainsMouseup() {
* The element position.
*/
protected function getElementVerticalPosition($css_selector, $position_type) {
- $this->assertTrue(in_array($position_type, ['top', 'bottom']), 'Expected position type.');
+ $this->assertContains($position_type, ['top', 'bottom'], 'Expected position type.');
return (int) $this->getSession()->evaluateScript("document.querySelector('$css_selector').getBoundingClientRect().$position_type + window.pageYOffset");
}
diff --git a/web/core/modules/layout_builder/tests/src/FunctionalJavascript/LayoutBuilderNestedFormUiTest.php b/web/core/modules/layout_builder/tests/src/FunctionalJavascript/LayoutBuilderNestedFormUiTest.php
new file mode 100644
index 0000000000..acc95e7331
--- /dev/null
+++ b/web/core/modules/layout_builder/tests/src/FunctionalJavascript/LayoutBuilderNestedFormUiTest.php
@@ -0,0 +1,165 @@
+<?php
+
+namespace Drupal\Tests\layout_builder\FunctionalJavascript;
+
+use Drupal\FunctionalJavascriptTests\WebDriverTestBase;
+
+/**
+ * Tests placing blocks containing forms in theLayout Builder UI.
+ *
+ * @group layout_builder
+ */
+class LayoutBuilderNestedFormUiTest extends WebDriverTestBase {
+
+ /**
+ * The form block labels used as text for links to add blocks.
+ */
+ const FORM_BLOCK_LABELS = [
+ 'Layout Builder form block test form api form block',
+ 'Layout Builder form block test inline template form block',
+ 'Test Block View: Exposed form block',
+ ];
+
+ /**
+ * {@inheritdoc}
+ */
+ public static $modules = [
+ 'block',
+ 'node',
+ 'layout_builder',
+ 'layout_builder_form_block_test',
+ 'views',
+ 'layout_builder_views_test',
+ ];
+
+ /**
+ * {@inheritdoc}
+ */
+ protected $defaultTheme = 'stark';
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function setUp() {
+ parent::setUp();
+
+ $this->drupalPlaceBlock('local_tasks_block');
+
+ // Create a separate node to add a form block to, respectively.
+ // - Block with form api form will be added to first node layout.
+ // - Block with inline template with <form> tag added to second node layout.
+ // - Views block exposed form added to third node layout.
+ $this->createContentType([
+ 'type' => 'bundle_with_section_field',
+ 'name' => 'Bundle with section field',
+ ]);
+ for ($i = 1; $i <= count(static::FORM_BLOCK_LABELS); $i++) {
+ $this->createNode([
+ 'type' => 'bundle_with_section_field',
+ 'title' => "Node $i title",
+ ]);
+ }
+ }
+
+ /**
+ * Test blocks containing forms can be successfully saved editing defaults.
+ */
+ public function testAddingFormBlocksToDefaults() {
+ $this->drupalLogin($this->drupalCreateUser([
+ 'configure any layout',
+ 'administer node display',
+ ]));
+
+ // From the manage display page, enable Layout Builder.
+ $field_ui_prefix = 'admin/structure/types/manage/bundle_with_section_field';
+ $this->drupalGet("$field_ui_prefix/display/default");
+ $this->drupalPostForm(NULL, ['layout[enabled]' => TRUE], 'Save');
+ $this->drupalPostForm(NULL, ['layout[allow_custom]' => TRUE], 'Save');
+
+ // Save the entity view display so that it can be reverted to later.
+ /** @var \Drupal\Core\Config\StorageInterface $active_config_storage */
+ $active_config_storage = $this->container->get('config.storage');
+ $original_display_config_data = $active_config_storage->read('core.entity_view_display.node.bundle_with_section_field.default');
+ /** @var \Drupal\Core\Config\Entity\ConfigEntityStorageInterface $entity_view_display_storage */
+ $entity_view_display_storage = $this->container->get('entity_type.manager')->getStorage('entity_view_display');
+ $entity_view_display = $entity_view_display_storage->load('node.bundle_with_section_field.default');
+
+ $expected_save_message = 'The layout has been saved.';
+ foreach (static::FORM_BLOCK_LABELS as $label) {
+ $this->addFormBlock($label, "$field_ui_prefix/display/default", $expected_save_message);
+ // Revert the entity view display back to remove the previously added form
+ // block.
+ $entity_view_display = $entity_view_display_storage
+ ->updateFromStorageRecord($entity_view_display, $original_display_config_data);
+ $entity_view_display->save();
+ }
+ }
+
+ /**
+ * Test blocks containing forms can be successfully saved editing overrides.
+ */
+ public function testAddingFormBlocksToOverrides() {
+ $this->drupalLogin($this->drupalCreateUser([
+ 'configure any layout',
+ 'administer node display',
+ ]));
+
+ // From the manage display page, enable Layout Builder.
+ $field_ui_prefix = 'admin/structure/types/manage/bundle_with_section_field';
+ $this->drupalGet("$field_ui_prefix/display/default");
+ $this->drupalPostForm(NULL, ['layout[enabled]' => TRUE], 'Save');
+ $this->drupalPostForm(NULL, ['layout[allow_custom]' => TRUE], 'Save');
+
+ $expected_save_message = 'The layout override has been saved.';
+ $nid = 1;
+ foreach (static::FORM_BLOCK_LABELS as $label) {
+ $this->addFormBlock($label, "node/$nid", $expected_save_message);
+ $nid++;
+ }
+ }
+
+ /**
+ * Adds a form block specified by label layout and checks it can be saved.
+ *
+ * Need to test saving and resaving, because nested forms can cause issues
+ * on the second save.
+ *
+ * @param string $label
+ * The form block label that will be used to identify link to add block.
+ * @param string $path
+ * Root path of the entity (i.e. node/{NID) or the entity view display path.
+ * @param string $expected_save_message
+ * The message that should be displayed after successful layout save.
+ */
+ protected function addFormBlock($label, $path, $expected_save_message) {
+ $assert_session = $this->assertSession();
+ $page = $this->getSession()->getPage();
+
+ // Go to edit the layout.
+ $this->drupalGet($path . '/layout');
+
+ // Add the form block.
+ $assert_session->linkExists('Add block');
+ $this->clickLink('Add block');
+ $assert_session->assertWaitOnAjaxRequest();
+ $assert_session->linkExists($label);
+ $this->clickLink($label);
+ $assert_session->assertWaitOnAjaxRequest();
+ $page->pressButton('Add block');
+ $assert_session->assertWaitOnAjaxRequest();
+ $assert_session->pageTextContains($label);
+ $assert_session->addressEquals($path . '/layout');
+
+ // Save the defaults.
+ $page->pressButton('Save layout');
+ $assert_session->pageTextContains($expected_save_message);
+ $assert_session->addressEquals($path);
+
+ // Go back to edit layout and try to re-save.
+ $this->drupalGet($path . '/layout');
+ $page->pressButton('Save layout');
+ $assert_session->pageTextContains($expected_save_message);
+ $assert_session->addressEquals($path);
+ }
+
+}
diff --git a/web/core/modules/layout_builder/tests/src/FunctionalJavascript/TestMultiWidthLayoutsTest.php b/web/core/modules/layout_builder/tests/src/FunctionalJavascript/TestMultiWidthLayoutsTest.php
index 0049edc1e0..b33d3ea281 100644
--- a/web/core/modules/layout_builder/tests/src/FunctionalJavascript/TestMultiWidthLayoutsTest.php
+++ b/web/core/modules/layout_builder/tests/src/FunctionalJavascript/TestMultiWidthLayoutsTest.php
@@ -64,8 +64,8 @@ public function testWidthChange() {
$width_options = [
[
'label' => 'Two column',
- 'widths' => [
- '50-50',
+ 'default_width' => '50-50',
+ 'additional_widths' => [
'33-67',
'67-33',
'25-75',
@@ -75,9 +75,9 @@ public function testWidthChange() {
],
[
'label' => 'Three column',
- 'widths' => [
+ 'default_width' => '33-34-33',
+ 'additional_widths' => [
'25-50-25',
- '33-34-33',
'25-25-50',
'50-25-25',
],
@@ -85,7 +85,7 @@ public function testWidthChange() {
],
];
foreach ($width_options as $width_option) {
- $width = array_shift($width_option['widths']);
+ $width = $width_option['default_width'];
$assert_session->linkExists('Add section');
$page->clickLink('Add section');
$this->assertNotEmpty($assert_session->waitForElementVisible('css', "#drupal-off-canvas a:contains(\"{$width_option['label']}\")"));
@@ -93,7 +93,7 @@ public function testWidthChange() {
$this->assertNotEmpty($assert_session->waitForElementVisible('css', '#drupal-off-canvas input[type="submit"][value="Add section"]'));
$page->pressButton("Add section");
$this->assertWidthClassApplied($width_option['class'] . $width);
- foreach ($width_option['widths'] as $width) {
+ foreach ($width_option['additional_widths'] as $width) {
$width_class = $width_option['class'] . $width;
$assert_session->linkExists('Configure Section 1');
$page->clickLink('Configure Section 1');
diff --git a/web/core/modules/layout_discovery/tests/src/Kernel/LayoutTest.php b/web/core/modules/layout_discovery/tests/src/Kernel/LayoutTest.php
index c7be49ba2b..89cf708467 100644
--- a/web/core/modules/layout_discovery/tests/src/Kernel/LayoutTest.php
+++ b/web/core/modules/layout_discovery/tests/src/Kernel/LayoutTest.php
@@ -41,7 +41,7 @@ public function testThemeProvidedLayout() {
$this->config('system.theme')->set('default', 'test_layout_theme')->save();
$theme_definitions = $this->container->get('theme.registry')->get();
- $this->assertTrue(in_array('template_preprocess_layout', $theme_definitions['test_layout_theme']['preprocess functions']));
+ $this->assertContains('template_preprocess_layout', $theme_definitions['test_layout_theme']['preprocess functions']);
}
/**
diff --git a/web/core/modules/link/config/schema/link.schema.yml b/web/core/modules/link/config/schema/link.schema.yml
index fd2edb1921..f45ed1c38e 100644
--- a/web/core/modules/link/config/schema/link.schema.yml
+++ b/web/core/modules/link/config/schema/link.schema.yml
@@ -74,10 +74,10 @@ field.value.link:
label: 'URL fragment'
absolute:
type: boolean
- label: 'Is this URL absolute'
+ label: 'Whether to force the output to be an absolute link (beginning with http: or https:)'
https:
type: boolean
- label: 'If the URL should use a secure protocol'
+ label: 'Whether to force this URL to point to a secure location (beginning with https:)'
attributes:
type: sequence
label: 'Link attributes'
diff --git a/web/core/modules/link/src/Plugin/Field/FieldType/LinkItem.php b/web/core/modules/link/src/Plugin/Field/FieldType/LinkItem.php
index 90585a66a0..50f64ae942 100644
--- a/web/core/modules/link/src/Plugin/Field/FieldType/LinkItem.php
+++ b/web/core/modules/link/src/Plugin/Field/FieldType/LinkItem.php
@@ -127,9 +127,11 @@ public static function generateSampleValue(FieldDefinitionInterface $field_defin
case DRUPAL_DISABLED:
$values['title'] = '';
break;
+
case DRUPAL_REQUIRED:
$values['title'] = $random->sentences(4);
break;
+
case DRUPAL_OPTIONAL:
// In case of optional title, randomize its generation.
$values['title'] = mt_rand(0, 1) ? $random->sentences(4) : '';
diff --git a/web/core/modules/link/src/Plugin/migrate/cckfield/d7/LinkField.php b/web/core/modules/link/src/Plugin/migrate/cckfield/d7/LinkField.php
index 5e13b95526..f004a986a3 100644
--- a/web/core/modules/link/src/Plugin/migrate/cckfield/d7/LinkField.php
+++ b/web/core/modules/link/src/Plugin/migrate/cckfield/d7/LinkField.php
@@ -38,7 +38,7 @@ public function getFieldWidgetMap() {
}
/**
- * @inheritdoc}
+ * {@inheritdoc}
*/
public function alterFieldInstanceMigration(MigrationInterface $migration) {
$process = [
diff --git a/web/core/modules/link/tests/src/Functional/LinkFieldTest.php b/web/core/modules/link/tests/src/Functional/LinkFieldTest.php
index fda83fd564..a1d067dc90 100644
--- a/web/core/modules/link/tests/src/Functional/LinkFieldTest.php
+++ b/web/core/modules/link/tests/src/Functional/LinkFieldTest.php
@@ -352,7 +352,7 @@ public function testLinkTitle() {
$output = $this->renderTestEntity($id);
$expected_link = (string) Link::fromTextAndUrl($value, Url::fromUri($value))->toString();
- $this->assertContains($expected_link, $output);
+ $this->assertStringContainsString($expected_link, $output);
// Verify that a link with text is rendered using the link text.
$title = $this->randomMachineName();
@@ -364,7 +364,7 @@ public function testLinkTitle() {
$output = $this->renderTestEntity($id);
$expected_link = (string) Link::fromTextAndUrl($title, Url::fromUri($value))->toString();
- $this->assertContains($expected_link, $output);
+ $this->assertStringContainsString($expected_link, $output);
}
/**
@@ -468,51 +468,51 @@ public function testLinkFormatter() {
case 'trim_length':
$url = $url1;
$title = isset($new_value) ? Unicode::truncate($title1, $new_value, FALSE, TRUE) : $title1;
- $this->assertContains('<a href="' . Html::escape($url) . '">' . Html::escape($title) . '</a>', $output);
+ $this->assertStringContainsString('<a href="' . Html::escape($url) . '">' . Html::escape($title) . '</a>', $output);
$url = $url2;
$title = isset($new_value) ? Unicode::truncate($title2, $new_value, FALSE, TRUE) : $title2;
- $this->assertContains('<a href="' . Html::escape($url) . '">' . Html::escape($title) . '</a>', $output);
+ $this->assertStringContainsString('<a href="' . Html::escape($url) . '">' . Html::escape($title) . '</a>', $output);
$url = $url3;
$title = isset($new_value) ? Unicode::truncate($title3, $new_value, FALSE, TRUE) : $title3;
- $this->assertContains('<a href="' . Html::escape($url) . '">' . Html::escape($title) . '</a>', $output);
+ $this->assertStringContainsString('<a href="' . Html::escape($url) . '">' . Html::escape($title) . '</a>', $output);
break;
case 'rel':
$rel = isset($new_value) ? ' rel="' . $new_value . '"' : '';
- $this->assertContains('<a href="' . Html::escape($url1) . '"' . $rel . '>' . Html::escape($title1) . '</a>', $output);
- $this->assertContains('<a href="' . Html::escape($url2) . '"' . $rel . '>' . Html::escape($title2) . '</a>', $output);
- $this->assertContains('<a href="' . Html::escape($url3) . '"' . $rel . '>' . Html::escape($title3) . '</a>', $output);
+ $this->assertStringContainsString('<a href="' . Html::escape($url1) . '"' . $rel . '>' . Html::escape($title1) . '</a>', $output);
+ $this->assertStringContainsString('<a href="' . Html::escape($url2) . '"' . $rel . '>' . Html::escape($title2) . '</a>', $output);
+ $this->assertStringContainsString('<a href="' . Html::escape($url3) . '"' . $rel . '>' . Html::escape($title3) . '</a>', $output);
break;
case 'target':
$target = isset($new_value) ? ' target="' . $new_value . '"' : '';
- $this->assertContains('<a href="' . Html::escape($url1) . '"' . $target . '>' . Html::escape($title1) . '</a>', $output);
- $this->assertContains('<a href="' . Html::escape($url2) . '"' . $target . '>' . Html::escape($title2) . '</a>', $output);
- $this->assertContains('<a href="' . Html::escape($url3) . '"' . $target . '>' . Html::escape($title3) . '</a>', $output);
+ $this->assertStringContainsString('<a href="' . Html::escape($url1) . '"' . $target . '>' . Html::escape($title1) . '</a>', $output);
+ $this->assertStringContainsString('<a href="' . Html::escape($url2) . '"' . $target . '>' . Html::escape($title2) . '</a>', $output);
+ $this->assertStringContainsString('<a href="' . Html::escape($url3) . '"' . $target . '>' . Html::escape($title3) . '</a>', $output);
break;
case 'url_only':
// In this case, $new_value is an array.
if (!$new_value['url_only']) {
- $this->assertContains('<a href="' . Html::escape($url1) . '">' . Html::escape($title1) . '</a>', $output);
- $this->assertContains('<a href="' . Html::escape($url2) . '">' . Html::escape($title2) . '</a>', $output);
- $this->assertContains('<a href="' . Html::escape($url3) . '">' . Html::escape($title3) . '</a>', $output);
+ $this->assertStringContainsString('<a href="' . Html::escape($url1) . '">' . Html::escape($title1) . '</a>', $output);
+ $this->assertStringContainsString('<a href="' . Html::escape($url2) . '">' . Html::escape($title2) . '</a>', $output);
+ $this->assertStringContainsString('<a href="' . Html::escape($url3) . '">' . Html::escape($title3) . '</a>', $output);
}
else {
if (empty($new_value['url_plain'])) {
- $this->assertContains('<a href="' . Html::escape($url1) . '">' . Html::escape($url1) . '</a>', $output);
- $this->assertContains('<a href="' . Html::escape($url2) . '">' . Html::escape($url2) . '</a>', $output);
- $this->assertContains('<a href="' . Html::escape($url3) . '">' . Html::escape($url3) . '</a>', $output);
+ $this->assertStringContainsString('<a href="' . Html::escape($url1) . '">' . Html::escape($url1) . '</a>', $output);
+ $this->assertStringContainsString('<a href="' . Html::escape($url2) . '">' . Html::escape($url2) . '</a>', $output);
+ $this->assertStringContainsString('<a href="' . Html::escape($url3) . '">' . Html::escape($url3) . '</a>', $output);
}
else {
- $this->assertNotContains('<a href="' . Html::escape($url1) . '">' . Html::escape($url1) . '</a>', $output);
- $this->assertNotContains('<a href="' . Html::escape($url2) . '">' . Html::escape($url2) . '</a>', $output);
- $this->assertNotContains('<a href="' . Html::escape($url3) . '">' . Html::escape($url3) . '</a>', $output);
- $this->assertContains(Html::escape($url1), $output);
- $this->assertContains(Html::escape($url2), $output);
- $this->assertContains(Html::escape($url3), $output);
+ $this->assertStringNotContainsString('<a href="' . Html::escape($url1) . '">' . Html::escape($url1) . '</a>', $output);
+ $this->assertStringNotContainsString('<a href="' . Html::escape($url2) . '">' . Html::escape($url2) . '</a>', $output);
+ $this->assertStringNotContainsString('<a href="' . Html::escape($url3) . '">' . Html::escape($url3) . '</a>', $output);
+ $this->assertStringContainsString(Html::escape($url1), $output);
+ $this->assertStringContainsString(Html::escape($url2), $output);
+ $this->assertStringContainsString(Html::escape($url3), $output);
}
}
break;
@@ -607,7 +607,7 @@ public function testLinkSeparateFormatter() {
$expected = '<div class="link-item">';
$expected .= '<div class="link-url"><a href="' . Html::escape($url) . '">' . Html::escape($url_title) . '</a></div>';
$expected .= '</div>';
- $this->assertContains($expected, $output);
+ $this->assertStringContainsString($expected, $output);
$url = $url2;
$url_title = isset($new_value) ? Unicode::truncate($url, $new_value, FALSE, TRUE) : $url;
@@ -616,7 +616,7 @@ public function testLinkSeparateFormatter() {
$expected .= '<div class="link-title">' . Html::escape($title) . '</div>';
$expected .= '<div class="link-url"><a href="' . Html::escape($url) . '">' . Html::escape($url_title) . '</a></div>';
$expected .= '</div>';
- $this->assertContains($expected, $output);
+ $this->assertStringContainsString($expected, $output);
$url = $url3;
$url_title = isset($new_value) ? Unicode::truncate($url, $new_value, FALSE, TRUE) : $url;
@@ -625,21 +625,21 @@ public function testLinkSeparateFormatter() {
$expected .= '<div class="link-title">' . Html::escape($title) . '</div>';
$expected .= '<div class="link-url"><a href="' . Html::escape($url) . '">' . Html::escape($url_title) . '</a></div>';
$expected .= '</div>';
- $this->assertContains($expected, $output);
+ $this->assertStringContainsString($expected, $output);
break;
case 'rel':
$rel = isset($new_value) ? ' rel="' . $new_value . '"' : '';
- $this->assertContains('<div class="link-url"><a href="' . Html::escape($url1) . '"' . $rel . '>' . Html::escape($url1) . '</a></div>', $output);
- $this->assertContains('<div class="link-url"><a href="' . Html::escape($url2) . '"' . $rel . '>' . Html::escape($url2) . '</a></div>', $output);
- $this->assertContains('<div class="link-url"><a href="' . Html::escape($url3) . '"' . $rel . '>' . Html::escape($url3) . '</a></div>', $output);
+ $this->assertStringContainsString('<div class="link-url"><a href="' . Html::escape($url1) . '"' . $rel . '>' . Html::escape($url1) . '</a></div>', $output);
+ $this->assertStringContainsString('<div class="link-url"><a href="' . Html::escape($url2) . '"' . $rel . '>' . Html::escape($url2) . '</a></div>', $output);
+ $this->assertStringContainsString('<div class="link-url"><a href="' . Html::escape($url3) . '"' . $rel . '>' . Html::escape($url3) . '</a></div>', $output);
break;
case 'target':
$target = isset($new_value) ? ' target="' . $new_value . '"' : '';
- $this->assertContains('<div class="link-url"><a href="' . Html::escape($url1) . '"' . $target . '>' . Html::escape($url1) . '</a></div>', $output);
- $this->assertContains('<div class="link-url"><a href="' . Html::escape($url2) . '"' . $target . '>' . Html::escape($url2) . '</a></div>', $output);
- $this->assertContains('<div class="link-url"><a href="' . Html::escape($url3) . '"' . $target . '>' . Html::escape($url3) . '</a></div>', $output);
+ $this->assertStringContainsString('<div class="link-url"><a href="' . Html::escape($url1) . '"' . $target . '>' . Html::escape($url1) . '</a></div>', $output);
+ $this->assertStringContainsString('<div class="link-url"><a href="' . Html::escape($url2) . '"' . $target . '>' . Html::escape($url2) . '</a></div>', $output);
+ $this->assertStringContainsString('<div class="link-url"><a href="' . Html::escape($url3) . '"' . $target . '>' . Html::escape($url3) . '</a></div>', $output);
break;
}
}
@@ -800,7 +800,7 @@ public function testNoLinkUri() {
$id = $match[1];
$output = $this->renderTestEntity($id);
$expected_link = (string) $this->container->get('link_generator')->generate('Title, no link', Url::fromUri('route:<nolink>'));
- $this->assertContains($expected_link, $output);
+ $this->assertStringContainsString($expected_link, $output);
// Test a link with <none> uri.
$edit = [
@@ -813,7 +813,7 @@ public function testNoLinkUri() {
$id = $match[1];
$output = $this->renderTestEntity($id);
$expected_link = (string) $this->container->get('link_generator')->generate('Title, none', Url::fromUri('route:<none>'));
- $this->assertContains($expected_link, $output);
+ $this->assertStringContainsString($expected_link, $output);
}
/**
diff --git a/web/core/modules/link/tests/src/Kernel/LinkItemTest.php b/web/core/modules/link/tests/src/Kernel/LinkItemTest.php
index b2bd2cf4da..8dc783286e 100644
--- a/web/core/modules/link/tests/src/Kernel/LinkItemTest.php
+++ b/web/core/modules/link/tests/src/Kernel/LinkItemTest.php
@@ -92,8 +92,8 @@ public function testLinkItem() {
// Verify that the field value is changed.
$id = $entity->id();
$entity = EntityTest::load($id);
- $this->assertTrue($entity->field_test instanceof FieldItemListInterface, 'Field implements interface.');
- $this->assertTrue($entity->field_test[0] instanceof FieldItemInterface, 'Field item implements interface.');
+ $this->assertInstanceOf(FieldItemListInterface::class, $entity->field_test);
+ $this->assertInstanceOf(FieldItemInterface::class, $entity->field_test[0]);
$this->assertEqual($entity->field_test->uri, $parsed_url['path']);
$this->assertEqual($entity->field_test[0]->uri, $parsed_url['path']);
$this->assertEqual($entity->field_test->title, $title);
diff --git a/web/core/modules/locale/locale.admin.es6.js b/web/core/modules/locale/locale.admin.es6.js
index 47db4bd650..d6d6301d84 100644
--- a/web/core/modules/locale/locale.admin.es6.js
+++ b/web/core/modules/locale/locale.admin.es6.js
@@ -74,7 +74,7 @@
// Open/close the description details by toggling a tr class.
$tbodies.on('click keydown', '.description', function(e) {
- if (e.keyCode && (e.keyCode !== 13 && e.keyCode !== 32)) {
+ if (e.keyCode && e.keyCode !== 13 && e.keyCode !== 32) {
return;
}
e.preventDefault();
diff --git a/web/core/modules/locale/locale.batch.inc b/web/core/modules/locale/locale.batch.inc
index 4829363b6b..64c72244f6 100644
--- a/web/core/modules/locale/locale.batch.inc
+++ b/web/core/modules/locale/locale.batch.inc
@@ -84,7 +84,7 @@ function locale_translation_batch_status_check($project, $langcode, array $optio
if ($failure && !$checked) {
$context['results']['failed_files'][] = $source->name;
}
- $context['message'] = t('Checked translation for %project.', ['%project' => $source->project]);
+ $context['message'] = t('Checked %langcode translation for %project.', ['%langcode' => $langcode, '%project' => $source->project]);
}
/**
@@ -146,7 +146,7 @@ function locale_translation_batch_fetch_download($project, $langcode, &$context)
$source = $sources[$project][$langcode];
if (isset($source->type) && $source->type == LOCALE_TRANSLATION_REMOTE) {
if ($file = locale_translation_download_source($source->files[LOCALE_TRANSLATION_REMOTE], 'translations://')) {
- $context['message'] = t('Downloaded translation for %project.', ['%project' => $source->project]);
+ $context['message'] = t('Downloaded %langcode translation for %project.', ['%langcode' => $langcode, '%project' => $source->project]);
locale_translation_status_save($source->name, $source->langcode, LOCALE_TRANSLATION_LOCAL, $file);
}
else {
@@ -183,7 +183,7 @@ function locale_translation_batch_fetch_import($project, $langcode, $options, &$
$file = $source->files[LOCALE_TRANSLATION_LOCAL];
module_load_include('bulk.inc', 'locale');
$options += [
- 'message' => t('Importing translation for %project.', ['%project' => $source->project]),
+ 'message' => t('Importing %langcode translation for %project.', ['%langcode' => $langcode, '%project' => $source->project]),
];
// Import the translation file. For large files the batch operations is
// progressive and will be called repeatedly until finished.
@@ -193,7 +193,7 @@ function locale_translation_batch_fetch_import($project, $langcode, $options, &$
if (isset($context['finished']) && $context['finished'] == 1) {
// The import is successful.
if (isset($context['results']['files'][$file->uri])) {
- $context['message'] = t('Imported translation for %project.', ['%project' => $source->project]);
+ $context['message'] = t('Imported %langcode translation for %project.', ['%langcode' => $langcode, '%project' => $source->project]);
// Save the data of imported source into the {locale_file} table and
// update the current translation status.
diff --git a/web/core/modules/locale/tests/modules/locale_test/locale_test.module b/web/core/modules/locale/tests/modules/locale_test/locale_test.module
index 4a0a786445..ff7c3dccc8 100644
--- a/web/core/modules/locale/tests/modules/locale_test/locale_test.module
+++ b/web/core/modules/locale/tests/modules/locale_test/locale_test.module
@@ -204,6 +204,7 @@ function locale_test_tokens($type, $tokens, array $data = [], array $options = [
case 'security_test1':
$return[$original] = "javascript:alert('Mooooh!');";
break;
+
case 'security_test2':
$return[$original] = "<script>alert('Mooooh!');</script>";
break;
diff --git a/web/core/modules/locale/tests/modules/locale_test_development_release/locale_test_development_release.info.yml b/web/core/modules/locale/tests/modules/locale_test_development_release/locale_test_development_release.info.yml
index fd1481ca16..7a79c9a633 100644
--- a/web/core/modules/locale/tests/modules/locale_test_development_release/locale_test_development_release.info.yml
+++ b/web/core/modules/locale/tests/modules/locale_test_development_release/locale_test_development_release.info.yml
@@ -1,6 +1,6 @@
name: 'Locale Test Development Release'
type: module
-description: 'Helper module to test the behaviour when the core verison is a development release.'
+description: 'Helper module to test the behavior when the core verison is a development release.'
package: Testing
version: VERSION
core: 8.x
diff --git a/web/core/modules/locale/tests/src/Functional/LocaleConfigTranslationTest.php b/web/core/modules/locale/tests/src/Functional/LocaleConfigTranslationTest.php
index eeb22ef3d9..c555099bcc 100644
--- a/web/core/modules/locale/tests/src/Functional/LocaleConfigTranslationTest.php
+++ b/web/core/modules/locale/tests/src/Functional/LocaleConfigTranslationTest.php
@@ -90,7 +90,7 @@ public function testConfigTranslation() {
// Get translation and check we've only got the message.
$translation = \Drupal::languageManager()->getLanguageConfigOverride($this->langcode, 'system.maintenance')->get();
- $this->assertEqual(count($translation), 1, 'Got the right number of properties after translation.');
+ $this->assertCount(1, $translation, 'Got the right number of properties after translation.');
$this->assertEqual($translation['message'], $message);
// Check default medium date format exists and create a translation for it.
@@ -135,7 +135,7 @@ public function testConfigTranslation() {
// Check the string is unique and has no translation yet.
$translations = $this->storage->getTranslations(['language' => $this->langcode, 'type' => 'configuration', 'name' => 'image.style.medium']);
- $this->assertEqual(count($translations), 1);
+ $this->assertCount(1, $translations);
$translation = reset($translations);
$this->assertEqual($translation->source, $string->source);
$this->assertEmpty($translation->translation);
@@ -158,7 +158,9 @@ public function testConfigTranslation() {
// Check the right single translation has been created.
$translations = $this->storage->getTranslations(['language' => $this->langcode, 'type' => 'configuration', 'name' => 'image.style.medium']);
$translation = reset($translations);
- $this->assertTrue(count($translations) == 1 && $translation->source == $string->source && $translation->translation == $image_style_label, 'Got only one translation for image configuration.');
+ $this->assertCount(1, $translations, 'Got only one translation for image configuration.');
+ $this->assertEquals($string->source, $translation->source);
+ $this->assertEquals($image_style_label, $translation->translation);
// Try more complex configuration data.
$translation = \Drupal::languageManager()->getLanguageConfigOverride($this->langcode, 'image.style.medium')->get();
diff --git a/web/core/modules/locale/tests/src/Functional/LocaleLocaleLookupTest.php b/web/core/modules/locale/tests/src/Functional/LocaleLocaleLookupTest.php
index 02edcb7676..358860e039 100644
--- a/web/core/modules/locale/tests/src/Functional/LocaleLocaleLookupTest.php
+++ b/web/core/modules/locale/tests/src/Functional/LocaleLocaleLookupTest.php
@@ -44,7 +44,7 @@ protected function setUp() {
public function testCircularDependency() {
// Ensure that we can enable early_translation_test on a non-english site.
$this->drupalPostForm('admin/modules', ['modules[early_translation_test][enable]' => TRUE], t('Install'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
}
/**
@@ -84,7 +84,7 @@ public function testFixOldPluralStyle($translation_value, $expected) {
// Check that 'count[2]' was saved for source value.
$translation = $string_storage->findTranslation(['language' => 'fr', 'lid' => $lid])->translation;
$this->assertSame($translation_value, $translation, 'Source value not changed');
- $this->assertNotFalse(strpos($translation, '@count[2]'), 'Source value contains @count[2]');
+ $this->assertStringContainsString('@count[2]', $translation, 'Source value contains @count[2]');
}
/**
diff --git a/web/core/modules/locale/tests/src/Functional/LocalePathTest.php b/web/core/modules/locale/tests/src/Functional/LocalePathTest.php
index 036b957470..8ec53c666b 100644
--- a/web/core/modules/locale/tests/src/Functional/LocalePathTest.php
+++ b/web/core/modules/locale/tests/src/Functional/LocalePathTest.php
@@ -69,7 +69,7 @@ public function testPathLanguageConfiguration() {
// Check that the "xx" front page is readily available because path prefix
// negotiation is pre-configured.
$this->drupalGet($prefix);
- $this->assertText(t('Welcome to Drupal'), 'The "xx" front page is readibly available.');
+ $this->assertText(t('Welcome to Drupal'), 'The "xx" front page is readily available.');
// Create a node.
$node = $this->drupalCreateNode(['type' => 'page']);
diff --git a/web/core/modules/locale/tests/src/Functional/LocaleTranslationDownloadTest.php b/web/core/modules/locale/tests/src/Functional/LocaleTranslationDownloadTest.php
index 7b727518a8..ad9274f485 100644
--- a/web/core/modules/locale/tests/src/Functional/LocaleTranslationDownloadTest.php
+++ b/web/core/modules/locale/tests/src/Functional/LocaleTranslationDownloadTest.php
@@ -62,9 +62,9 @@ public function testUpdateImportSourceRemote() {
$result = locale_translation_download_source($source_file, 'translations://');
$this->assertEquals('translations://contrib_module_one-8.x-1.1.de._po', $result->uri);
- $this->assertFalse(file_exists('translations://contrib_module_one-8.x-1.1.de_0._po'));
- $this->assertTrue(file_exists('translations://contrib_module_one-8.x-1.1.de._po'));
- $this->assertNotContains('__old_content__', file_get_contents('translations://contrib_module_one-8.x-1.1.de._po'));
+ $this->assertFileNotExists('translations://contrib_module_one-8.x-1.1.de_0._po');
+ $this->assertFileExists('translations://contrib_module_one-8.x-1.1.de._po');
+ $this->assertStringNotContainsString('__old_content__', file_get_contents('translations://contrib_module_one-8.x-1.1.de._po'));
}
}
diff --git a/web/core/modules/locale/tests/src/Functional/LocaleTranslationUiTest.php b/web/core/modules/locale/tests/src/Functional/LocaleTranslationUiTest.php
index f8fe9c6db1..3905116eae 100644
--- a/web/core/modules/locale/tests/src/Functional/LocaleTranslationUiTest.php
+++ b/web/core/modules/locale/tests/src/Functional/LocaleTranslationUiTest.php
@@ -7,7 +7,6 @@
use Drupal\language\Entity\ConfigurableLanguage;
use Drupal\Tests\BrowserTestBase;
use Drupal\Core\Language\LanguageInterface;
-use Drupal\Component\Render\FormattableMarkup;
/**
* Adds a new locale and translates its name. Checks the validation of
@@ -183,7 +182,7 @@ public function testStringTranslation() {
// Reload to remove $name.
$this->drupalGet($path);
// Verify that language is no longer found.
- $this->assertResponse(404, 'Language no longer found.');
+ $this->assertSession()->statusCodeEquals(404);
$this->drupalLogout();
// Delete the string.
@@ -266,13 +265,13 @@ public function testJavaScriptTranslation() {
$locale_javascripts = \Drupal::state()->get('locale.translation.javascript') ?: [];
$js_file = 'public://' . $config->get('javascript.directory') . '/' . $langcode . '_' . $locale_javascripts[$langcode] . '.js';
- $this->assertTrue($result = file_exists($js_file), new FormattableMarkup('JavaScript file created: %file', ['%file' => $result ? $js_file : 'not found']));
+ $this->assertFileExists($js_file);
// Test JavaScript translation rebuilding.
\Drupal::service('file_system')->delete($js_file);
- $this->assertTrue($result = !file_exists($js_file), new FormattableMarkup('JavaScript file deleted: %file', ['%file' => $result ? $js_file : 'found']));
+ $this->assertFileNotExists($js_file);
_locale_rebuild_js($langcode);
- $this->assertTrue($result = file_exists($js_file), new FormattableMarkup('JavaScript file rebuilt: %file', ['%file' => $result ? $js_file : 'not found']));
+ $this->assertFileExists($js_file);
}
/**
@@ -324,7 +323,7 @@ public function testStringValidation() {
$this->drupalPostForm('admin/config/regional/translate', $edit, t('Save translations'));
// Check for a form error on the textarea.
$form_class = $this->xpath('//form[@id="locale-translate-edit-form"]//textarea/@class');
- $this->assertContains('error', $form_class[0]->getText(), 'The string was rejected as unsafe.');
+ $this->assertStringContainsString('error', $form_class[0]->getText(), 'The string was rejected as unsafe.');
$this->assertNoText(t('The string has been saved.'), 'The string was not saved.');
}
}
diff --git a/web/core/modules/locale/tests/src/Kernel/LocaleConfigManagerTest.php b/web/core/modules/locale/tests/src/Kernel/LocaleConfigManagerTest.php
index 8389b6e973..d1552edcea 100644
--- a/web/core/modules/locale/tests/src/Kernel/LocaleConfigManagerTest.php
+++ b/web/core/modules/locale/tests/src/Kernel/LocaleConfigManagerTest.php
@@ -18,7 +18,13 @@ class LocaleConfigManagerTest extends KernelTestBase {
*
* @var array
*/
- public static $modules = ['system', 'language', 'locale', 'locale_test', 'block'];
+ public static $modules = [
+ 'system',
+ 'language',
+ 'locale',
+ 'locale_test',
+ 'block',
+ ];
/**
* This test creates simple config on the fly breaking schema checking.
diff --git a/web/core/modules/locale/tests/src/Kernel/LocaleConfigSubscriberTest.php b/web/core/modules/locale/tests/src/Kernel/LocaleConfigSubscriberTest.php
index d77d91d6b1..55f3e77c12 100644
--- a/web/core/modules/locale/tests/src/Kernel/LocaleConfigSubscriberTest.php
+++ b/web/core/modules/locale/tests/src/Kernel/LocaleConfigSubscriberTest.php
@@ -470,13 +470,13 @@ protected function assertTranslation($config_name, $translation, $langcode, $cus
'language' => $langcode,
'translated' => TRUE,
]);
- $this->assertIdentical(1, count($strings));
+ $this->assertCount(1, $strings);
$string = reset($strings);
- $this->assertTrue($string instanceof StringInterface);
+ $this->assertInstanceOf(StringInterface::class, $string);
/** @var \Drupal\locale\StringInterface $string */
$this->assertIdentical($translation, $string->getString());
$this->assertTrue($string->isTranslation());
- $this->assertTrue($string instanceof TranslationString);
+ $this->assertInstanceOf(TranslationString::class, $string);
/** @var \Drupal\locale\TranslationString $string */
// Make sure the string is marked as customized so that it does not get
// overridden when the string translations are updated.
diff --git a/web/core/modules/locale/tests/src/Unit/LocaleLookupTest.php b/web/core/modules/locale/tests/src/Unit/LocaleLookupTest.php
index 944137fd56..f548d635b8 100644
--- a/web/core/modules/locale/tests/src/Unit/LocaleLookupTest.php
+++ b/web/core/modules/locale/tests/src/Unit/LocaleLookupTest.php
@@ -304,7 +304,12 @@ public function testFixOldPluralStyleTranslations($translations, $langcode, $str
->with('locale:' . $langcode . '::anonymous', FALSE);
$locale_lookup = new LocaleLookup($langcode, '', $this->storage, $this->cache, $this->lock, $this->configFactory, $this->languageManager, $this->requestStack);
- $this->assertSame($is_fix, strpos($locale_lookup->get($string), '@count[2]') === FALSE);
+ if ($is_fix) {
+ $this->assertStringNotContainsString('@count[2]', $locale_lookup->get($string));
+ }
+ else {
+ $this->assertStringContainsString('@count[2]', $locale_lookup->get($string));
+ }
}
/**
diff --git a/web/core/modules/media/media.module b/web/core/modules/media/media.module
index 116c6f50a6..49df4f3f79 100644
--- a/web/core/modules/media/media.module
+++ b/web/core/modules/media/media.module
@@ -426,7 +426,7 @@ function media_filter_format_edit_form_validate($form, FormStateInterface $form_
return (string) $form['filters']['order'][$filter_plugin_id]['filter']['#markup'];
};
- if ($filter_html_enabled && $allowed_html = $form_state->getValue($allowed_html_path)) {
+ if ($filter_html_enabled && $form_state->getValue($allowed_html_path)) {
/** @var \Drupal\filter\Entity\FilterFormat $filter_format */
$filter_format = $form_state->getFormObject()->getEntity();
diff --git a/web/core/modules/media/src/Access/MediaRevisionAccessCheck.php b/web/core/modules/media/src/Access/MediaRevisionAccessCheck.php
index fb3d560c88..25695b43cb 100644
--- a/web/core/modules/media/src/Access/MediaRevisionAccessCheck.php
+++ b/web/core/modules/media/src/Access/MediaRevisionAccessCheck.php
@@ -132,7 +132,7 @@ public function checkAccess(MediaInterface $media, AccountInterface $account, $o
* Counts the number of revisions in the default language.
*
* @param \Drupal\media\MediaInterface $media
- * The media item for which to to count the revisions.
+ * The media item for which to count the revisions.
*
* @return int
* The number of revisions in the default language.
diff --git a/web/core/modules/media/src/Form/EditorMediaDialog.php b/web/core/modules/media/src/Form/EditorMediaDialog.php
index efe9cccbbb..fe7e07d5d4 100644
--- a/web/core/modules/media/src/Form/EditorMediaDialog.php
+++ b/web/core/modules/media/src/Form/EditorMediaDialog.php
@@ -77,7 +77,7 @@ public function getFormId() {
/**
* {@inheritdoc}
*
- * @param \Drupal\editor\Entity\Editor $editor
+ * @param \Drupal\editor\EditorInterface $editor
* The text editor to which this dialog corresponds.
*/
public function buildForm(array $form, FormStateInterface $form_state, EditorInterface $editor = NULL) {
diff --git a/web/core/modules/media/src/MediaSourceBase.php b/web/core/modules/media/src/MediaSourceBase.php
index 5da82a6443..5cc284835e 100644
--- a/web/core/modules/media/src/MediaSourceBase.php
+++ b/web/core/modules/media/src/MediaSourceBase.php
@@ -330,8 +330,12 @@ public function getSourceFieldValue(MediaInterface $media) {
throw new \RuntimeException('Source field for media source is not defined.');
}
- /** @var \Drupal\Core\Field\FieldItemInterface $field_item */
- $field_item = $media->get($source_field)->first();
+ $items = $media->get($source_field);
+ if ($items->isEmpty()) {
+ return NULL;
+ }
+
+ $field_item = $items->first();
return $field_item->{$field_item->mainPropertyName()};
}
diff --git a/web/core/modules/media/src/MediaSourceInterface.php b/web/core/modules/media/src/MediaSourceInterface.php
index a2dea535a7..3154eb064d 100644
--- a/web/core/modules/media/src/MediaSourceInterface.php
+++ b/web/core/modules/media/src/MediaSourceInterface.php
@@ -186,7 +186,7 @@ public function prepareFormDisplay(MediaTypeInterface $type, EntityFormDisplayIn
* A media item.
*
* @return mixed
- * The source value.
+ * The source value, or NULL if the media item's source field is empty.
*
* @throws \RuntimeException
* If the source field for the media source is not defined.
diff --git a/web/core/modules/media/src/OEmbed/Resource.php b/web/core/modules/media/src/OEmbed/Resource.php
index 190a013eb0..ac3e7510cd 100644
--- a/web/core/modules/media/src/OEmbed/Resource.php
+++ b/web/core/modules/media/src/OEmbed/Resource.php
@@ -441,7 +441,7 @@ public function getThumbnailHeight() {
*
* @return int|null
* The width of the resource in pixels, or NULL if the resource has no
- * dimensions
+ * width.
*/
public function getWidth() {
return $this->width;
@@ -452,7 +452,7 @@ public function getWidth() {
*
* @return int|null
* The height of the resource in pixels, or NULL if the resource has no
- * dimensions.
+ * height.
*/
public function getHeight() {
return $this->height;
@@ -510,25 +510,20 @@ protected function setThumbnailDimensions($width, $height) {
/**
* Sets the dimensions.
*
- * @param int $width
+ * @param int|null $width
* The width of the resource.
- * @param int $height
+ * @param int|null $height
* The height of the resource.
*
* @throws \InvalidArgumentException
* If either $width or $height are not numbers greater than zero.
*/
protected function setDimensions($width, $height) {
- $width = (int) $width;
- $height = (int) $height;
-
- if ($width > 0 && $height > 0) {
- $this->width = $width;
- $this->height = $height;
- }
- else {
- throw new \InvalidArgumentException('The dimensions must be numbers greater than zero.');
+ if ((isset($width) && $width <= 0) || (isset($height) && $height <= 0)) {
+ throw new \InvalidArgumentException('The dimensions must be NULL or numbers greater than zero.');
}
+ $this->width = isset($width) ? (int) $width : NULL;
+ $this->height = isset($height) ? (int) $height : NULL;
}
}
diff --git a/web/core/modules/media/src/OEmbed/ResourceFetcher.php b/web/core/modules/media/src/OEmbed/ResourceFetcher.php
index e58e7e26ad..155eb02dd6 100644
--- a/web/core/modules/media/src/OEmbed/ResourceFetcher.php
+++ b/web/core/modules/media/src/OEmbed/ResourceFetcher.php
@@ -168,6 +168,7 @@ protected function createResource(array $data, $url) {
$data['thumbnail_width'],
$data['thumbnail_height']
);
+
case Resource::TYPE_VIDEO:
return Resource::video(
$data['html'],
diff --git a/web/core/modules/media/src/Plugin/Validation/Constraint/OEmbedResourceConstraintValidator.php b/web/core/modules/media/src/Plugin/Validation/Constraint/OEmbedResourceConstraintValidator.php
index 99f6faba5e..3b885cce8f 100644
--- a/web/core/modules/media/src/Plugin/Validation/Constraint/OEmbedResourceConstraintValidator.php
+++ b/web/core/modules/media/src/Plugin/Validation/Constraint/OEmbedResourceConstraintValidator.php
@@ -83,6 +83,11 @@ public function validate($value, Constraint $constraint) {
throw new \LogicException('Media source must implement ' . OEmbedInterface::class);
}
$url = $source->getSourceFieldValue($media);
+ // The URL may be NULL if the source field is empty, which is invalid input.
+ if (empty($url)) {
+ $this->context->addViolation($constraint->invalidResourceMessage);
+ return;
+ }
// Ensure that the URL matches a provider.
try {
diff --git a/web/core/modules/media/src/Plugin/media/Source/OEmbed.php b/web/core/modules/media/src/Plugin/media/Source/OEmbed.php
index 9fbea0b16c..6a3621a3b5 100644
--- a/web/core/modules/media/src/Plugin/media/Source/OEmbed.php
+++ b/web/core/modules/media/src/Plugin/media/Source/OEmbed.php
@@ -220,6 +220,11 @@ public function getMetadataAttributes() {
*/
public function getMetadata(MediaInterface $media, $name) {
$media_url = $this->getSourceFieldValue($media);
+ // The URL may be NULL if the source field is empty, in which case just
+ // return NULL.
+ if (empty($media_url)) {
+ return NULL;
+ }
try {
$resource_url = $this->urlResolver->getResourceUrl($media_url);
diff --git a/web/core/modules/media/tests/fixtures/oembed/photo_flickr_no_dimensions.json b/web/core/modules/media/tests/fixtures/oembed/photo_flickr_no_dimensions.json
new file mode 100644
index 0000000000..e7f6b41b20
--- /dev/null
+++ b/web/core/modules/media/tests/fixtures/oembed/photo_flickr_no_dimensions.json
@@ -0,0 +1,10 @@
+{
+ "type": "photo",
+ "title": "Druplicon FTW!",
+ "url": "internal:\/core\/misc\/druplicon.png",
+ "thumbnail_url": "internal:\/core\/misc\/druplicon.png",
+ "thumbnail_width": 88,
+ "thumbnail_height": 100,
+ "provider_name": "Flickr",
+ "version": "1.0"
+}
diff --git a/web/core/modules/media/tests/fixtures/oembed/video_collegehumor.xml b/web/core/modules/media/tests/fixtures/oembed/video_collegehumor.xml
index 9c0b08bfcc..696b5bf84e 100644
--- a/web/core/modules/media/tests/fixtures/oembed/video_collegehumor.xml
+++ b/web/core/modules/media/tests/fixtures/oembed/video_collegehumor.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<oembed>
<type>video</type>
- <version type="float">1.0</version>
+ <version>1.0</version>
<title>Let's Not Get a Drink Sometime</title>
<https/>
<author_name>CollegeHumor</author_name>
diff --git a/web/core/modules/media/tests/src/Functional/FieldFormatter/OEmbedFormatterTest.php b/web/core/modules/media/tests/src/Functional/FieldFormatter/OEmbedFormatterTest.php
index b4e5767614..50b574b27b 100644
--- a/web/core/modules/media/tests/src/Functional/FieldFormatter/OEmbedFormatterTest.php
+++ b/web/core/modules/media/tests/src/Functional/FieldFormatter/OEmbedFormatterTest.php
@@ -119,6 +119,16 @@ public function providerRender() {
],
],
],
+ 'Flickr photo (no dimensions)' => [
+ 'https://www.flickr.com/photos/amazeelabs/26497866357',
+ 'photo_flickr_no_dimensions.json',
+ [],
+ [
+ 'img' => [
+ 'src' => '/core/misc/druplicon.png',
+ ],
+ ],
+ ],
];
}
@@ -194,7 +204,7 @@ public function testRender($url, $resource_url, array $formatter_settings, array
$element = $assert->elementExists('css', $selector);
foreach ($attributes as $attribute => $value) {
if (isset($value)) {
- $this->assertContains($value, $element->getAttribute($attribute));
+ $this->assertStringContainsString($value, $element->getAttribute($attribute));
}
else {
$this->assertFalse($element->hasAttribute($attribute));
diff --git a/web/core/modules/media/tests/src/Functional/Rest/MediaResourceTestBase.php b/web/core/modules/media/tests/src/Functional/Rest/MediaResourceTestBase.php
index 9dae018a02..0eeba0dfe8 100644
--- a/web/core/modules/media/tests/src/Functional/Rest/MediaResourceTestBase.php
+++ b/web/core/modules/media/tests/src/Functional/Rest/MediaResourceTestBase.php
@@ -52,6 +52,19 @@ public function setUp() {
->set('standalone_url', TRUE)
->save(TRUE);
+ // Provisioning the Media REST resource without the File REST resource does
+ // not make sense.
+ $this->resourceConfigStorage->create([
+ 'id' => 'entity.file',
+ 'granularity' => RestResourceConfigInterface::RESOURCE_GRANULARITY,
+ 'configuration' => [
+ 'methods' => ['GET'],
+ 'formats' => [static::$format],
+ 'authentication' => isset(static::$auth) ? [static::$auth] : [],
+ ],
+ 'status' => TRUE,
+ ])->save();
+
$this->container->get('router.builder')->rebuild();
}
diff --git a/web/core/modules/media/tests/src/Functional/UrlResolverTest.php b/web/core/modules/media/tests/src/Functional/UrlResolverTest.php
index 5073625811..06906876ed 100644
--- a/web/core/modules/media/tests/src/Functional/UrlResolverTest.php
+++ b/web/core/modules/media/tests/src/Functional/UrlResolverTest.php
@@ -85,7 +85,7 @@ public function testResourceUrlAlterHook() {
$resource_url = $this->container->get('media.oembed.url_resolver')
->getResourceUrl('https://vimeo.com/14782834');
- $this->assertContains('altered=1', parse_url($resource_url, PHP_URL_QUERY));
+ $this->assertStringContainsString('altered=1', parse_url($resource_url, PHP_URL_QUERY));
}
/**
diff --git a/web/core/modules/media/tests/src/FunctionalJavascript/CKEditorIntegrationTest.php b/web/core/modules/media/tests/src/FunctionalJavascript/CKEditorIntegrationTest.php
index 1a0e7201d4..3909303322 100644
--- a/web/core/modules/media/tests/src/FunctionalJavascript/CKEditorIntegrationTest.php
+++ b/web/core/modules/media/tests/src/FunctionalJavascript/CKEditorIntegrationTest.php
@@ -453,8 +453,8 @@ public function testEditableCaption() {
$this->pressEditorButton('source');
$source = $assert_session->elementExists('css', "textarea.cke_source");
$value = $source->getValue();
- $this->assertContains('https://www.drupal.org/project/drupal', $value);
- $this->assertNotContains('data-cke-saved-href', $value);
+ $this->assertStringContainsString('https://www.drupal.org/project/drupal', $value);
+ $this->assertStringNotContainsString('data-cke-saved-href', $value);
// Save the entity.
$assert_session->buttonExists('Save')->press();
diff --git a/web/core/modules/media/tests/src/FunctionalJavascript/MediaDisplayTest.php b/web/core/modules/media/tests/src/FunctionalJavascript/MediaDisplayTest.php
index 9c08566705..51ac71f6bc 100644
--- a/web/core/modules/media/tests/src/FunctionalJavascript/MediaDisplayTest.php
+++ b/web/core/modules/media/tests/src/FunctionalJavascript/MediaDisplayTest.php
@@ -102,7 +102,7 @@ public function testMediaDisplay() {
$assert_session->elementTextContains('css', 'h1', $image_media_name);
// Here we expect to see only the image, nothing else.
// Assert only one element in the content region.
- $this->assertSame(1, count($page->findAll('css', '.media--type-image > div')));
+ $this->assertCount(1, $page->findAll('css', '.media--type-image > div'));
// Assert the image is present inside the media element.
$media_item = $assert_session->elementExists('css', '.media--type-image > div');
$assert_session->elementExists('css', 'img', $media_item);
@@ -110,7 +110,7 @@ public function testMediaDisplay() {
// visually hidden, and there is no link to the image file.
$media_image = $assert_session->elementExists('css', '.media--type-image img');
$expected_image_src = file_url_transform_relative(file_create_url(\Drupal::token()->replace('public://styles/large/public/[date:custom:Y]-[date:custom:m]/example_1.jpeg')));
- $this->assertContains($expected_image_src, $media_image->getAttribute('src'));
+ $this->assertStringContainsString($expected_image_src, $media_image->getAttribute('src'));
$field = $assert_session->elementExists('css', '.field--name-field-media-image');
$assert_session->elementExists('css', '.field__label.visually-hidden', $field);
$assert_session->elementNotExists('css', 'a', $field);
@@ -131,7 +131,7 @@ public function testMediaDisplay() {
$assert_session->elementTextContains('css', 'h1', $test_filename);
// Here we expect to see only the linked filename.
// Assert only one element in the content region.
- $this->assertSame(1, count($page->findAll('css', 'article.media--type-document > div')));
+ $this->assertCount(1, $page->findAll('css', 'article.media--type-document > div'));
// Assert the file link is present, and its text matches the filename.
$assert_session->elementExists('css', 'article.media--type-document .field--name-field-media-document a');
$link = $page->find('css', 'article.media--type-document .field--name-field-media-document a');
@@ -195,7 +195,7 @@ public function testMediaDisplay() {
$assert_session->elementNotExists('css', '.field--name-name');
$assert_session->pageTextNotContains($image_media_name);
// Only one element is present inside the media container.
- $this->assertSame(1, count($page->findAll('css', '.field--name-field-related-media article.media--type-image > div')));
+ $this->assertCount(1, $page->findAll('css', '.field--name-field-related-media article.media--type-image > div'));
// Assert the image is present.
$assert_session->elementExists('css', '.field--name-field-related-media article.media--type-image img');
}
diff --git a/web/core/modules/media/tests/src/FunctionalJavascript/MediaSourceImageTest.php b/web/core/modules/media/tests/src/FunctionalJavascript/MediaSourceImageTest.php
index 19233736cc..5b2a929d77 100644
--- a/web/core/modules/media/tests/src/FunctionalJavascript/MediaSourceImageTest.php
+++ b/web/core/modules/media/tests/src/FunctionalJavascript/MediaSourceImageTest.php
@@ -73,7 +73,7 @@ public function testMediaImageSource() {
// and there is no link to the image file.
$image_element = $assert_session->elementExists('css', '.field--name-field-media-image img');
$expected_image_src = file_url_transform_relative(file_create_url(\Drupal::token()->replace('public://styles/large/public/[date:custom:Y]-[date:custom:m]/example_1.jpeg')));
- $this->assertContains($expected_image_src, $image_element->getAttribute('src'));
+ $this->assertStringContainsString($expected_image_src, $image_element->getAttribute('src'));
$field = $assert_session->elementExists('css', '.field--name-field-media-image');
$assert_session->elementExists('css', '.field__label.visually-hidden', $field);
$assert_session->elementNotExists('css', 'a', $field);
diff --git a/web/core/modules/media/tests/src/FunctionalJavascript/MediaSourceOEmbedVideoTest.php b/web/core/modules/media/tests/src/FunctionalJavascript/MediaSourceOEmbedVideoTest.php
index 4237271366..3698781ecb 100644
--- a/web/core/modules/media/tests/src/FunctionalJavascript/MediaSourceOEmbedVideoTest.php
+++ b/web/core/modules/media/tests/src/FunctionalJavascript/MediaSourceOEmbedVideoTest.php
@@ -101,7 +101,7 @@ public function testMediaOEmbedVideoSource() {
$display = \Drupal::service('entity_display.repository')->getViewDisplay('media', $media_type_id);
$this->assertFalse($display->isNew());
$component = $display->getComponent('field_media_oembed_video');
- $this->assertInternalType('array', $component);
+ $this->assertIsArray($component);
$component['settings']['max_width'] = 240;
$display->setComponent('field_media_oembed_video', $component);
$this->assertSame(SAVED_UPDATED, $display->save());
diff --git a/web/core/modules/media/tests/src/FunctionalJavascript/MediaStandardProfileTest.php b/web/core/modules/media/tests/src/FunctionalJavascript/MediaStandardProfileTest.php
index 0453460ba5..c353ace4fb 100644
--- a/web/core/modules/media/tests/src/FunctionalJavascript/MediaStandardProfileTest.php
+++ b/web/core/modules/media/tests/src/FunctionalJavascript/MediaStandardProfileTest.php
@@ -239,7 +239,7 @@ protected function imageTest() {
// and there is no link to the image file.
$image_element = $assert_session->elementExists('css', 'article.media--type-image img');
$expected_image_src = file_url_transform_relative(file_create_url(\Drupal::token()->replace('public://styles/large/public/[date:custom:Y]-[date:custom:m]/' . $image_media_name)));
- $this->assertContains($expected_image_src, $image_element->getAttribute('src'));
+ $this->assertStringContainsString($expected_image_src, $image_element->getAttribute('src'));
$assert_session->elementExists('css', '.field--name-field-media-image .field__label.visually-hidden');
$assert_session->elementNotExists('css', '.field--name-field-media-image a');
@@ -271,7 +271,7 @@ protected function imageTest() {
// and there is no link to the image file.
$image_element = $assert_session->elementExists('css', 'article.media--type-image img');
$expected_image_src = file_url_transform_relative(file_create_url(\Drupal::token()->replace('public://styles/large/public/[date:custom:Y]-[date:custom:m]/' . $image_media_name_updated)));
- $this->assertContains($expected_image_src, $image_element->getAttribute('src'));
+ $this->assertStringContainsString($expected_image_src, $image_element->getAttribute('src'));
$assert_session->elementExists('css', '.field--name-field-media-image .field__label.visually-hidden');
$assert_session->elementNotExists('css', '.field--name-field-media-image a');
}
diff --git a/web/core/modules/media/tests/src/FunctionalJavascript/MediaUiJavascriptTest.php b/web/core/modules/media/tests/src/FunctionalJavascript/MediaUiJavascriptTest.php
index 0bf7692420..30afeda7d3 100644
--- a/web/core/modules/media/tests/src/FunctionalJavascript/MediaUiJavascriptTest.php
+++ b/web/core/modules/media/tests/src/FunctionalJavascript/MediaUiJavascriptTest.php
@@ -86,7 +86,7 @@ public function testMediaTypes() {
$source = $media_type->getSource();
/** @var \Drupal\field\FieldConfigInterface $source_field */
$source_field = $source->getSourceFieldDefinition($media_type);
- $this->assertInstanceOf(FieldConfigInterface::class, $source_field, 'Source field exists.');
+ $this->assertInstanceOf(FieldConfigInterface::class, $source_field);
$this->assertFalse($source_field->isNew(), 'Source field was saved.');
/** @var \Drupal\field\FieldStorageConfigInterface $storage */
$storage = $source_field->getFieldStorageDefinition();
diff --git a/web/core/modules/media/tests/src/Kernel/MediaCreationTest.php b/web/core/modules/media/tests/src/Kernel/MediaCreationTest.php
index 7eac84e498..1255f766d9 100644
--- a/web/core/modules/media/tests/src/Kernel/MediaCreationTest.php
+++ b/web/core/modules/media/tests/src/Kernel/MediaCreationTest.php
@@ -22,12 +22,12 @@ class MediaCreationTest extends MediaKernelTestBase {
public function testMediaTypeCreation() {
$media_type_storage = $this->container->get('entity_type.manager')->getStorage('media_type');
- $this->assertInstanceOf(MediaTypeInterface::class, MediaType::load($this->testMediaType->id()), 'The new media type has not been correctly created in the database.');
+ $this->assertInstanceOf(MediaTypeInterface::class, MediaType::load($this->testMediaType->id()));
// Test a media type created from default configuration.
$this->container->get('module_installer')->install(['media_test_type']);
$test_media_type = $media_type_storage->load('test');
- $this->assertInstanceOf(MediaTypeInterface::class, $test_media_type, 'The media type from default configuration has not been created in the database.');
+ $this->assertInstanceOf(MediaTypeInterface::class, $test_media_type);
$this->assertSame('Test type', $test_media_type->get('label'), 'Could not assure the correct type name.');
$this->assertSame('Test type.', $test_media_type->get('description'), 'Could not assure the correct type description.');
$this->assertSame('test', $test_media_type->get('source'), 'Could not assure the correct media source.');
@@ -69,9 +69,9 @@ public function testMediaEntityCreation() {
]);
$media->save();
- $this->assertNotInstanceOf(MediaInterface::class, Media::load(rand(1000, 9999)), 'Failed asserting a non-existent media.');
+ $this->assertNotInstanceOf(MediaInterface::class, Media::load(rand(1000, 9999)));
- $this->assertInstanceOf(MediaInterface::class, Media::load($media->id()), 'The new media item has not been created in the database.');
+ $this->assertInstanceOf(MediaInterface::class, Media::load($media->id()));
$this->assertSame($this->testMediaType->id(), $media->bundle(), 'The media item was not created with the correct type.');
$this->assertSame('Unnamed', $media->getName(), 'The media item was not created with the correct name.');
$source_field_name = $media->bundle->entity->getSource()->getSourceFieldDefinition($media->bundle->entity)->getName();
diff --git a/web/core/modules/media/tests/src/Kernel/MediaEmbedFilterTestBase.php b/web/core/modules/media/tests/src/Kernel/MediaEmbedFilterTestBase.php
index 675223c3d2..99e637c639 100644
--- a/web/core/modules/media/tests/src/Kernel/MediaEmbedFilterTestBase.php
+++ b/web/core/modules/media/tests/src/Kernel/MediaEmbedFilterTestBase.php
@@ -178,12 +178,12 @@ protected function createEmbedCode(array $attributes) {
* @see \Drupal\KernelTests\AssertContentTrait::setRawContent()
*/
protected function applyFilter($text, $langcode = 'en') {
- $this->assertContains('<drupal-media', $text);
- $this->assertContains('This placeholder should not be rendered.', $text);
+ $this->assertStringContainsString('<drupal-media', $text);
+ $this->assertStringContainsString('This placeholder should not be rendered.', $text);
$filter_result = $this->processText($text, $langcode);
$output = $filter_result->getProcessedText();
- $this->assertNotContains('<drupal-media', $output);
- $this->assertNotContains('This placeholder should not be rendered.', $output);
+ $this->assertStringNotContainsString('<drupal-media', $output);
+ $this->assertStringNotContainsString('This placeholder should not be rendered.', $output);
$this->setRawContent($output);
return $filter_result;
}
diff --git a/web/core/modules/media/tests/src/Kernel/MediaKernelTestBase.php b/web/core/modules/media/tests/src/Kernel/MediaKernelTestBase.php
index 1c6a879eea..d203d39f58 100644
--- a/web/core/modules/media/tests/src/Kernel/MediaKernelTestBase.php
+++ b/web/core/modules/media/tests/src/Kernel/MediaKernelTestBase.php
@@ -85,7 +85,7 @@ protected function setUp() {
* @param string $filename
* String filename with extension.
* @param \Drupal\media\MediaTypeInterface $media_type
- * The the media type.
+ * The media type.
*
* @return \Drupal\media\Entity\Media
* A media item.
diff --git a/web/core/modules/media/tests/src/Kernel/MediaSourceFileTest.php b/web/core/modules/media/tests/src/Kernel/MediaSourceFileTest.php
index 973e752246..f2076ef948 100644
--- a/web/core/modules/media/tests/src/Kernel/MediaSourceFileTest.php
+++ b/web/core/modules/media/tests/src/Kernel/MediaSourceFileTest.php
@@ -19,7 +19,7 @@ public function testFileExtensionConstraint() {
$result = $media->validate();
$this->assertCount(1, $result);
$this->assertSame('field_media_file.0', $result->get(0)->getPropertyPath());
- $this->assertContains('Only files with the following extensions are allowed:', (string) $result->get(0)->getMessage());
+ $this->assertStringContainsString('Only files with the following extensions are allowed:', (string) $result->get(0)->getMessage());
// Create a random file that should pass.
$media = $this->generateMedia('test.txt', $mediaType);
diff --git a/web/core/modules/media/tests/src/Kernel/MediaSourceTest.php b/web/core/modules/media/tests/src/Kernel/MediaSourceTest.php
index b998927a40..cf6a75cae7 100644
--- a/web/core/modules/media/tests/src/Kernel/MediaSourceTest.php
+++ b/web/core/modules/media/tests/src/Kernel/MediaSourceTest.php
@@ -218,6 +218,10 @@ public function testGetSourceFieldValue() {
$media->save();
$media_source = $media->getSource();
$this->assertSame('some_value', $media_source->getSourceFieldValue($media));
+
+ // Test that NULL is returned if there is no value in the source field.
+ $media->set('field_media_test', NULL)->save();
+ $this->assertNull($media_source->getSourceFieldValue($media));
}
/**
diff --git a/web/core/modules/media/tests/src/Kernel/OEmbedIframeControllerTest.php b/web/core/modules/media/tests/src/Kernel/OEmbedIframeControllerTest.php
index 3b71cdc92f..3dc099be20 100644
--- a/web/core/modules/media/tests/src/Kernel/OEmbedIframeControllerTest.php
+++ b/web/core/modules/media/tests/src/Kernel/OEmbedIframeControllerTest.php
@@ -43,7 +43,7 @@ public function testBadHashParameter($hash) {
->get('controller_resolver')
->getControllerFromDefinition('\Drupal\media\Controller\OEmbedIframeController::render');
- $this->assertInternalType('callable', $controller);
+ $this->assertIsCallable($controller);
$this->expectException('\Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException');
$this->expectExceptionMessage('This resource is not available');
diff --git a/web/core/modules/media/tests/src/Kernel/OEmbedResourceConstraintValidatorTest.php b/web/core/modules/media/tests/src/Kernel/OEmbedResourceConstraintValidatorTest.php
new file mode 100644
index 0000000000..692c9bb6cf
--- /dev/null
+++ b/web/core/modules/media/tests/src/Kernel/OEmbedResourceConstraintValidatorTest.php
@@ -0,0 +1,76 @@
+<?php
+
+namespace Drupal\Tests\media\Kernel;
+
+use Drupal\KernelTests\KernelTestBase;
+use Drupal\media\Entity\Media;
+use Drupal\media\OEmbed\UrlResolverInterface;
+use Drupal\media\Plugin\Validation\Constraint\OEmbedResourceConstraint;
+use Drupal\media\Plugin\Validation\Constraint\OEmbedResourceConstraintValidator;
+use Drupal\Tests\media\Traits\MediaTypeCreationTrait;
+use Prophecy\Argument;
+use Symfony\Component\Validator\Context\ExecutionContextInterface;
+
+/**
+ * @coversDefaultClass \Drupal\media\Plugin\Validation\Constraint\OEmbedResourceConstraintValidator
+ *
+ * @group media
+ */
+class OEmbedResourceConstraintValidatorTest extends KernelTestBase {
+
+ use MediaTypeCreationTrait;
+
+ /**
+ * {@inheritdoc}
+ */
+ protected static $modules = ['field', 'file', 'image', 'media', 'user'];
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function setUp() {
+ parent::setUp();
+ $this->installEntitySchema('file');
+ $this->installEntitySchema('user');
+ }
+
+ /**
+ * @covers ::validate
+ */
+ public function testValidate() {
+ $media = Media::create([
+ 'bundle' => $this->createMediaType('oembed:video')->id(),
+ ]);
+
+ $constraint = new OEmbedResourceConstraint();
+
+ // The media item has an empty source value, so the constraint validator
+ // should add a violation and return early before invoking the URL resolver.
+ $context = $this->prophesize(ExecutionContextInterface::class);
+ $context->addViolation($constraint->invalidResourceMessage)->shouldBeCalled();
+
+ $url_resolver = $this->prophesize(UrlResolverInterface::class);
+ $url_resolver->getProviderByUrl(Argument::any())->shouldNotBeCalled();
+
+ $value = new class ($media) {
+
+ public function __construct($entity) {
+ $this->entity = $entity;
+ }
+
+ public function getEntity() {
+ return $this->entity;
+ }
+
+ };
+
+ $validator = new OEmbedResourceConstraintValidator(
+ $url_resolver->reveal(),
+ $this->container->get('media.oembed.resource_fetcher'),
+ $this->container->get('logger.factory')
+ );
+ $validator->initialize($context->reveal());
+ $validator->validate($value, $constraint);
+ }
+
+}
diff --git a/web/core/modules/media/tests/src/Kernel/OEmbedSourceTest.php b/web/core/modules/media/tests/src/Kernel/OEmbedSourceTest.php
new file mode 100644
index 0000000000..180085ae04
--- /dev/null
+++ b/web/core/modules/media/tests/src/Kernel/OEmbedSourceTest.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace Drupal\Tests\media\Kernel;
+
+use Drupal\KernelTests\KernelTestBase;
+use Drupal\media\Plugin\media\Source\OEmbed;
+
+/**
+ * @coversDefaultClass \Drupal\media\Plugin\media\Source\OEmbed
+ *
+ * @group media
+ */
+class OEmbedSourceTest extends KernelTestBase {
+
+ /**
+ * {@inheritdoc}
+ */
+ protected static $modules = ['media'];
+
+ /**
+ * @covers ::getMetadata
+ */
+ public function testGetMetadata() {
+ $configuration = [
+ 'source_field' => 'field_test_oembed',
+ ];
+ $plugin = OEmbed::create($this->container, $configuration, 'oembed', []);
+
+ // Test that NULL is returned for a media item with no source value.
+ $media = $this->prophesize('\Drupal\media\MediaInterface');
+ $field_items = $this->prophesize('\Drupal\Core\Field\FieldItemListInterface');
+ $field_items->isEmpty()->willReturn(TRUE);
+ $media->get($configuration['source_field'])->willReturn($field_items->reveal());
+ $this->assertNull($plugin->getMetadata($media->reveal(), 'type'));
+ }
+
+}
diff --git a/web/core/modules/media/tests/src/Unit/ResourceTest.php b/web/core/modules/media/tests/src/Unit/ResourceTest.php
new file mode 100644
index 0000000000..5043565cd3
--- /dev/null
+++ b/web/core/modules/media/tests/src/Unit/ResourceTest.php
@@ -0,0 +1,88 @@
+<?php
+
+namespace Drupal\Tests\media\Unit;
+
+use Drupal\media\OEmbed\Resource;
+use Drupal\Tests\UnitTestCase;
+
+/**
+ * @coversDefaultClass \Drupal\media\OEmbed\Resource
+ * @group media
+ */
+class ResourceTest extends UnitTestCase {
+
+ /**
+ * Test cases for ::testSetDimensions.
+ */
+ public function setDimensionsTestCases() {
+ return [
+ 'Standard rich dimensions' => [
+ 'rich',
+ 5,
+ 10,
+ ],
+ 'Negative width and height' => [
+ 'rich',
+ -5,
+ -10,
+ 'The dimensions must be NULL or numbers greater than zero.',
+ ],
+ 'Zero width' => [
+ 'rich',
+ 0,
+ 5,
+ 'The dimensions must be NULL or numbers greater than zero.',
+ ],
+ 'NULL width' => [
+ 'rich',
+ NULL,
+ 10,
+ ],
+ 'NULL height' => [
+ 'rich',
+ NULL,
+ 10,
+ ],
+ 'NULL width and height' => [
+ 'rich',
+ NULL,
+ NULL,
+ ],
+ 'Cast numeric dimensions' => [
+ 'rich',
+ "1",
+ "45",
+ NULL,
+ 1,
+ 45,
+ ],
+ 'Cast invalid zero value' => [
+ 'rich',
+ "0",
+ 10,
+ 'The dimensions must be NULL or numbers greater than zero.',
+ ],
+ 'Cast negative value' => [
+ 'rich',
+ "-10",
+ 10,
+ 'The dimensions must be NULL or numbers greater than zero.',
+ ],
+ ];
+ }
+
+ /**
+ * @covers ::setDimensions
+ * @dataProvider setDimensionsTestCases
+ */
+ public function testSetDimensions($factory, $width, $height, $exception = NULL, $expected_width = NULL, $expected_height = NULL) {
+ if ($exception) {
+ $this->expectException(\InvalidArgumentException::class);
+ $this->expectExceptionMessage($exception);
+ }
+ $resource = Resource::$factory('foo', $width, $height);
+ $this->assertSame($expected_width ?: $width, $resource->getWidth());
+ $this->assertSame($expected_height ?: $height, $resource->getHeight());
+ }
+
+}
diff --git a/web/core/modules/media_library/js/media_library.ui.es6.js b/web/core/modules/media_library/js/media_library.ui.es6.js
index be05e79ab2..717984be4a 100644
--- a/web/core/modules/media_library/js/media_library.ui.es6.js
+++ b/web/core/modules/media_library/js/media_library.ui.es6.js
@@ -35,30 +35,6 @@
});
};
- /**
- * Warn users when clicking outgoing links from the library or widget.
- *
- * @type {Drupal~behavior}
- *
- * @prop {Drupal~behaviorAttach} attach
- * Attaches behavior to links in the media library.
- */
- Drupal.behaviors.MediaLibraryWidgetWarn = {
- attach(context) {
- $('.js-media-library-item a[href]', context)
- .once('media-library-warn-link')
- .on('click', e => {
- const message = Drupal.t(
- 'Unsaved changes to the form will be lost. Are you sure you want to leave?',
- );
- const confirmation = window.confirm(message);
- if (!confirmation) {
- e.preventDefault();
- }
- });
- },
- };
-
/**
* Load media library content through AJAX.
*
diff --git a/web/core/modules/media_library/js/media_library.ui.js b/web/core/modules/media_library/js/media_library.ui.js
index 9573e94cff..8d7b4571bf 100644
--- a/web/core/modules/media_library/js/media_library.ui.js
+++ b/web/core/modules/media_library/js/media_library.ui.js
@@ -16,18 +16,6 @@
});
};
- Drupal.behaviors.MediaLibraryWidgetWarn = {
- attach: function attach(context) {
- $('.js-media-library-item a[href]', context).once('media-library-warn-link').on('click', function (e) {
- var message = Drupal.t('Unsaved changes to the form will be lost. Are you sure you want to leave?');
- var confirmation = window.confirm(message);
- if (!confirmation) {
- e.preventDefault();
- }
- });
- }
- };
-
Drupal.behaviors.MediaLibraryTabs = {
attach: function attach(context) {
var $menu = $('.js-media-library-menu');
diff --git a/web/core/modules/media_library/media_library.info.yml b/web/core/modules/media_library/media_library.info.yml
index dc6e63e4f8..d24527fdd3 100644
--- a/web/core/modules/media_library/media_library.info.yml
+++ b/web/core/modules/media_library/media_library.info.yml
@@ -4,6 +4,7 @@ description: 'Enhances the media list with additional features to more easily fi
package: Core
version: VERSION
core: 8.x
+configure: media_library.settings
dependencies:
- drupal:media
- drupal:views
diff --git a/web/core/modules/media_library/media_library.install b/web/core/modules/media_library/media_library.install
index 05ba1cb196..dd83c4a884 100644
--- a/web/core/modules/media_library/media_library.install
+++ b/web/core/modules/media_library/media_library.install
@@ -10,8 +10,8 @@
/**
* Implements hook_install().
*/
-function media_library_install() {
- if (!\Drupal::isConfigSyncing()) {
+function media_library_install($is_syncing) {
+ if (!$is_syncing) {
foreach (MediaType::loadMultiple() as $type) {
_media_library_configure_form_display($type);
_media_library_configure_view_display($type);
diff --git a/web/core/modules/media_library/media_library.module b/web/core/modules/media_library/media_library.module
index 84c0f67732..19ef3c2131 100644
--- a/web/core/modules/media_library/media_library.module
+++ b/web/core/modules/media_library/media_library.module
@@ -69,7 +69,6 @@ function media_library_help($route_name, RouteMatchInterface $route_match) {
$output .= t('Both the table-style and grid-style interfaces are regular views and can be customized via the Views UI, including sorting and filtering. This is the case for both the administration page and the modal dialog.');
}
$output .= '</li>';
- $output .= '<li>' . t('Both the table-style and grid-style interfaces are regular views and can be customized via the Views UI, including sorting and filtering. This is the case for both the administration page and the modal dialog.') . '</li>';
$output .= '<li>' . t('In the grid-style interface, the fields that are displayed (including which image style is used for images) can be customized by configuring the "Media library" view mode for each of your <a href=":media-types">media types</a>. The thumbnail images in the grid-style interface can be customized by configuring the "Media Library thumbnail (220×220)" image style.', [
':media-types' => Url::fromRoute('entity.media_type.collection')->toString(),
]) . '</li>';
diff --git a/web/core/modules/media_library/src/Form/AddFormBase.php b/web/core/modules/media_library/src/Form/AddFormBase.php
index 9a1b2a1544..e5ead24cd7 100644
--- a/web/core/modules/media_library/src/Form/AddFormBase.php
+++ b/web/core/modules/media_library/src/Form/AddFormBase.php
@@ -343,7 +343,7 @@ protected function buildEntityFormElement(MediaInterface $media, array $form, Fo
}
/**
- * {@inheritdodc}
+ * {@inheritdoc}
*/
public static function trustedCallbacks() {
return ['preRenderAddedMedia'];
@@ -476,13 +476,11 @@ protected function buildActions(array $form, FormStateInterface $form_state) {
if ($this->isAdvancedUi()) {
$actions['save_select']['#value'] = $this->t('Save and select');
$actions['save_insert'] = [
- 'save_insert' => [
- '#type' => 'submit',
- '#value' => $this->t('Save and insert'),
- '#ajax' => [
- 'callback' => '::updateWidget',
- 'wrapper' => 'media-library-add-form-wrapper',
- ],
+ '#type' => 'submit',
+ '#value' => $this->t('Save and insert'),
+ '#ajax' => [
+ 'callback' => '::updateWidget',
+ 'wrapper' => 'media-library-add-form-wrapper',
],
];
}
diff --git a/web/core/modules/media_library/tests/fixtures/update/drupal-8.8.x-media_library-update-views-classnames-3049943.php b/web/core/modules/media_library/tests/fixtures/update/drupal-8.8.x-media_library-update-views-classnames-3049943.php
index c91f8010fd..6896bb2dfd 100644
--- a/web/core/modules/media_library/tests/fixtures/update/drupal-8.8.x-media_library-update-views-classnames-3049943.php
+++ b/web/core/modules/media_library/tests/fixtures/update/drupal-8.8.x-media_library-update-views-classnames-3049943.php
@@ -3,7 +3,7 @@
/**
* @file
* Contains database additions to drupal-8.4.0-media_installed.php for testing
- * the the addition of BEM classes to the media library views config.
+ * the addition of BEM classes to the media library views config.
*/
use Drupal\Core\Database\Database;
diff --git a/web/core/modules/media_library/tests/src/Functional/MediaLibraryDisplayModeTest.php b/web/core/modules/media_library/tests/src/Functional/MediaLibraryDisplayModeTest.php
index 7ebc2bb1b1..2ca50fb5a9 100644
--- a/web/core/modules/media_library/tests/src/Functional/MediaLibraryDisplayModeTest.php
+++ b/web/core/modules/media_library/tests/src/Functional/MediaLibraryDisplayModeTest.php
@@ -239,7 +239,7 @@ protected function assertViewDisplay($type_id, $image_style) {
$this->assertSame(['thumbnail'], array_keys($view_display->getComponents()));
// Assert the thumbnail image style.
$thumbnail = $view_display->getComponent('thumbnail');
- $this->assertInternalType('array', $thumbnail);
+ $this->assertIsArray($thumbnail);
$this->assertSame($image_style, $thumbnail['settings']['image_style']);
}
diff --git a/web/core/modules/media_library/tests/src/FunctionalJavascript/CKEditorIntegrationTest.php b/web/core/modules/media_library/tests/src/FunctionalJavascript/CKEditorIntegrationTest.php
index 57a556fde6..d30e1bbf78 100644
--- a/web/core/modules/media_library/tests/src/FunctionalJavascript/CKEditorIntegrationTest.php
+++ b/web/core/modules/media_library/tests/src/FunctionalJavascript/CKEditorIntegrationTest.php
@@ -187,7 +187,7 @@ public function testConfigurationValidation() {
$page->checkField('filters[filter_html][status]');
$expected = 'drupal-media data-entity-type data-entity-uuid data-view-mode data-align data-caption alt title';
$allowed_html = $assert_session->fieldExists('filters[filter_html][settings][allowed_html]')->getValue();
- $this->assertContains($expected, $allowed_html);
+ $this->assertStringContainsString($expected, $allowed_html);
$page->pressButton('Save configuration');
$assert_session->pageTextContains('The text format Sulaco has been updated.');
diff --git a/web/core/modules/menu_link_content/menu_link_content.info.yml b/web/core/modules/menu_link_content/menu_link_content.info.yml
index c001f5eb53..246f9f8277 100644
--- a/web/core/modules/menu_link_content/menu_link_content.info.yml
+++ b/web/core/modules/menu_link_content/menu_link_content.info.yml
@@ -1,6 +1,6 @@
name: 'Custom Menu Links'
type: module
-description: 'Allows administrators to create custom menu links.'
+description: 'Allows users to create menu links.'
package: Core
version: VERSION
core: 8.x
diff --git a/web/core/modules/menu_link_content/menu_link_content.install b/web/core/modules/menu_link_content/menu_link_content.install
index 148bda3549..e47bac2d3f 100644
--- a/web/core/modules/menu_link_content/menu_link_content.install
+++ b/web/core/modules/menu_link_content/menu_link_content.install
@@ -39,18 +39,6 @@ function menu_link_content_requirements($phase) {
return $requirements;
}
-/**
- * Implements hook_install().
- */
-function menu_link_content_install() {
- // Add a higher weight so that menu_link_content_path_alias_update() is called
- // after system_path_alias_update() clears the path alias cache.
- // @todo remove this when the cache clearing is moved to path module or if
- // caching is removed for path aliases due to
- // https://www.drupal.org/node/1965074
- module_set_weight('menu_link_content', 1);
-}
-
/**
* Add the publishing status entity key to custom menu links.
*/
diff --git a/web/core/modules/menu_link_content/tests/src/Functional/MenuLinkContentFormTest.php b/web/core/modules/menu_link_content/tests/src/Functional/MenuLinkContentFormTest.php
index 128cd4195e..8b58f4ff28 100644
--- a/web/core/modules/menu_link_content/tests/src/Functional/MenuLinkContentFormTest.php
+++ b/web/core/modules/menu_link_content/tests/src/Functional/MenuLinkContentFormTest.php
@@ -67,12 +67,12 @@ public function testMenuLinkContentFormLinkToAnyPage() {
// The user should be able to edit a menu link to the page, even though
// the user cannot access the page itself.
$this->drupalGet('/admin/structure/menu/item/' . $menu_link->id() . '/edit');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->drupalLogin($this->basicUser);
$this->drupalGet('/admin/structure/menu/item/' . $menu_link->id() . '/edit');
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
}
/**
diff --git a/web/core/modules/menu_link_content/tests/src/Functional/Rest/MenuLinkContentResourceTestBase.php b/web/core/modules/menu_link_content/tests/src/Functional/Rest/MenuLinkContentResourceTestBase.php
index 7e3a86ec20..5a8102644e 100644
--- a/web/core/modules/menu_link_content/tests/src/Functional/Rest/MenuLinkContentResourceTestBase.php
+++ b/web/core/modules/menu_link_content/tests/src/Functional/Rest/MenuLinkContentResourceTestBase.php
@@ -220,6 +220,7 @@ protected function getExpectedUnauthorizedAccessMessage($method) {
switch ($method) {
case 'DELETE':
return "The 'administer menu' permission is required.";
+
default:
return parent::getExpectedUnauthorizedAccessMessage($method);
}
diff --git a/web/core/modules/menu_link_content/tests/src/Kernel/MenuLinkContentCacheabilityBubblingTest.php b/web/core/modules/menu_link_content/tests/src/Kernel/MenuLinkContentCacheabilityBubblingTest.php
index c783d852df..1e091274d5 100644
--- a/web/core/modules/menu_link_content/tests/src/Kernel/MenuLinkContentCacheabilityBubblingTest.php
+++ b/web/core/modules/menu_link_content/tests/src/Kernel/MenuLinkContentCacheabilityBubblingTest.php
@@ -27,7 +27,14 @@ class MenuLinkContentCacheabilityBubblingTest extends KernelTestBase {
/**
* {@inheritdoc}
*/
- public static $modules = ['menu_link_content', 'system', 'link', 'outbound_processing_test', 'url_alter_test', 'user'];
+ public static $modules = [
+ 'menu_link_content',
+ 'system',
+ 'link',
+ 'outbound_processing_test',
+ 'url_alter_test',
+ 'user',
+ ];
/**
* {@inheritdoc}
diff --git a/web/core/modules/menu_link_content/tests/src/Kernel/MenuLinkContentDeriverTest.php b/web/core/modules/menu_link_content/tests/src/Kernel/MenuLinkContentDeriverTest.php
index a5202f3174..4287631b7f 100644
--- a/web/core/modules/menu_link_content/tests/src/Kernel/MenuLinkContentDeriverTest.php
+++ b/web/core/modules/menu_link_content/tests/src/Kernel/MenuLinkContentDeriverTest.php
@@ -18,7 +18,13 @@ class MenuLinkContentDeriverTest extends KernelTestBase {
/**
* {@inheritdoc}
*/
- public static $modules = ['menu_link_content', 'link', 'system', 'menu_link_content_dynamic_route', 'user'];
+ public static $modules = [
+ 'menu_link_content',
+ 'link',
+ 'system',
+ 'menu_link_content_dynamic_route',
+ 'user',
+ ];
/**
* {@inheritdoc}
@@ -47,7 +53,7 @@ public function testRediscover() {
]);
$parent->save();
$menu_tree = \Drupal::menuTree()->load('tools', new MenuTreeParameters());
- $this->assertEqual(1, count($menu_tree));
+ $this->assertCount(1, $menu_tree);
/** @var \Drupal\Core\Menu\MenuLinkTreeElement $tree_element */
$tree_element = reset($menu_tree);
$this->assertEqual('route_name_1', $tree_element->link->getRouteName());
@@ -60,12 +66,12 @@ public function testRediscover() {
// Ensure that the new route name / parameters are captured by the tree.
$menu_tree = \Drupal::menuTree()->load('tools', new MenuTreeParameters());
- $this->assertEqual(1, count($menu_tree));
+ $this->assertCount(1, $menu_tree);
/** @var \Drupal\Core\Menu\MenuLinkTreeElement $tree_element */
$tree_element = reset($menu_tree);
$this->assertEqual('route_name_2', $tree_element->link->getRouteName());
$title = $tree_element->link->getTitle();
- $this->assertFalse($title instanceof TranslatableMarkup);
+ $this->assertNotInstanceOf(TranslatableMarkup::class, $title);
$this->assertIdentical('<script>alert("Welcome to the discovered jungle!")</script>', $title);
// Create a hierarchy.
@@ -83,11 +89,11 @@ public function testRediscover() {
$parent->set('link', [['uri' => 'entity:/example-path']]);
$parent->save();
$menu_tree = \Drupal::menuTree()->load('tools', new MenuTreeParameters());
- $this->assertEqual(1, count($menu_tree));
+ $this->assertCount(1, $menu_tree);
/** @var \Drupal\Core\Menu\MenuLinkTreeElement $tree_element */
$tree_element = reset($menu_tree);
$this->assertTrue($tree_element->hasChildren);
- $this->assertEqual(1, count($tree_element->subtree));
+ $this->assertCount(1, $tree_element->subtree);
// Edit child element link to use 'internal' instead of 'entity'.
$child->set('link', [['uri' => 'internal:/example-path/child']]);
@@ -95,11 +101,11 @@ public function testRediscover() {
\Drupal::service('plugin.manager.menu.link')->rebuild();
$menu_tree = \Drupal::menuTree()->load('tools', new MenuTreeParameters());
- $this->assertEqual(1, count($menu_tree));
+ $this->assertCount(1, $menu_tree);
/** @var \Drupal\Core\Menu\MenuLinkTreeElement $tree_element */
$tree_element = reset($menu_tree);
$this->assertTrue($tree_element->hasChildren);
- $this->assertEqual(1, count($tree_element->subtree));
+ $this->assertCount(1, $tree_element->subtree);
}
}
diff --git a/web/core/modules/menu_link_content/tests/src/Kernel/MenuLinksTest.php b/web/core/modules/menu_link_content/tests/src/Kernel/MenuLinksTest.php
index c5bf428eb7..d7d3812f70 100644
--- a/web/core/modules/menu_link_content/tests/src/Kernel/MenuLinksTest.php
+++ b/web/core/modules/menu_link_content/tests/src/Kernel/MenuLinksTest.php
@@ -21,7 +21,13 @@ class MenuLinksTest extends KernelTestBase {
*
* @var array
*/
- public static $modules = ['link', 'menu_link_content', 'router_test', 'system', 'user'];
+ public static $modules = [
+ 'link',
+ 'menu_link_content',
+ 'router_test',
+ 'system',
+ 'user',
+ ];
/**
* The menu link plugin manager.
@@ -299,7 +305,7 @@ public function testModuleUninstalledMenuLinks() {
\Drupal::service('router.builder')->rebuild();
\Drupal::service('plugin.manager.menu.link')->rebuild();
$menu_links = $this->menuLinkManager->loadLinksByRoute('menu_test.menu_test');
- $this->assertEqual(count($menu_links), 1);
+ $this->assertCount(1, $menu_links);
$menu_link = reset($menu_links);
$this->assertEqual($menu_link->getPluginId(), 'menu_test');
@@ -307,7 +313,7 @@ public function testModuleUninstalledMenuLinks() {
\Drupal::service('module_installer')->uninstall(['menu_test']);
\Drupal::service('plugin.manager.menu.link')->rebuild();
$menu_links = $this->menuLinkManager->loadLinksByRoute('menu_test.menu_test');
- $this->assertEqual(count($menu_links), 0);
+ $this->assertCount(0, $menu_links);
}
/**
diff --git a/web/core/modules/menu_link_content/tests/src/Kernel/Migrate/d6/MigrateMenuLinkTest.php b/web/core/modules/menu_link_content/tests/src/Kernel/Migrate/d6/MigrateMenuLinkTest.php
index 34ea62a03a..7a4aa6f1c9 100644
--- a/web/core/modules/menu_link_content/tests/src/Kernel/Migrate/d6/MigrateMenuLinkTest.php
+++ b/web/core/modules/menu_link_content/tests/src/Kernel/Migrate/d6/MigrateMenuLinkTest.php
@@ -23,8 +23,6 @@ class MigrateMenuLinkTest extends MigrateNodeTestBase {
'content_translation',
'language',
'menu_link_content',
- // Required for translation migrations.
- 'migrate_drupal_multilingual',
'menu_ui',
];
diff --git a/web/core/modules/menu_link_content/tests/src/Kernel/Migrate/d6/MigrateMenuLinkTranslationTest.php b/web/core/modules/menu_link_content/tests/src/Kernel/Migrate/d6/MigrateMenuLinkTranslationTest.php
index 2eab72a439..20d259e685 100644
--- a/web/core/modules/menu_link_content/tests/src/Kernel/Migrate/d6/MigrateMenuLinkTranslationTest.php
+++ b/web/core/modules/menu_link_content/tests/src/Kernel/Migrate/d6/MigrateMenuLinkTranslationTest.php
@@ -23,8 +23,6 @@ class MigrateMenuLinkTranslationTest extends MigrateDrupal6TestBase {
'menu_link_content',
'language',
'content_translation',
- // Required for translation migrations.
- 'migrate_drupal_multilingual',
];
/**
diff --git a/web/core/modules/menu_link_content/tests/src/Kernel/Migrate/d7/MigrateMenuLinkTest.php b/web/core/modules/menu_link_content/tests/src/Kernel/Migrate/d7/MigrateMenuLinkTest.php
index 36904bd5f4..8e87e6ce51 100644
--- a/web/core/modules/menu_link_content/tests/src/Kernel/Migrate/d7/MigrateMenuLinkTest.php
+++ b/web/core/modules/menu_link_content/tests/src/Kernel/Migrate/d7/MigrateMenuLinkTest.php
@@ -27,8 +27,6 @@ class MigrateMenuLinkTest extends MigrateDrupal7TestBase {
'link',
'menu_ui',
'menu_link_content',
- // Required for translation migrations.
- 'migrate_drupal_multilingual',
'node',
'text',
];
diff --git a/web/core/modules/menu_link_content/tests/src/Kernel/PathAliasMenuLinkContentTest.php b/web/core/modules/menu_link_content/tests/src/Kernel/PathAliasMenuLinkContentTest.php
index 7980de9765..db6f2da11a 100644
--- a/web/core/modules/menu_link_content/tests/src/Kernel/PathAliasMenuLinkContentTest.php
+++ b/web/core/modules/menu_link_content/tests/src/Kernel/PathAliasMenuLinkContentTest.php
@@ -21,7 +21,14 @@ class PathAliasMenuLinkContentTest extends KernelTestBase {
/**
* {@inheritdoc}
*/
- public static $modules = ['menu_link_content', 'system', 'link', 'path_alias', 'test_page_test', 'user'];
+ public static $modules = [
+ 'menu_link_content',
+ 'system',
+ 'link',
+ 'path_alias',
+ 'test_page_test',
+ 'user',
+ ];
/**
* {@inheritdoc}
diff --git a/web/core/modules/menu_ui/menu_ui.module b/web/core/modules/menu_ui/menu_ui.module
index 9729df0b61..17320f500b 100644
--- a/web/core/modules/menu_ui/menu_ui.module
+++ b/web/core/modules/menu_ui/menu_ui.module
@@ -464,7 +464,7 @@ function menu_ui_preprocess_block(&$variables) {
/**
* Implements hook_system_breadcrumb_alter().
*/
-function menu_ui_system_breadcrumb_alter(Breadcrumb &$breadcrumb, RouteMatchInterface $route_match, array $context) {
+function menu_ui_system_breadcrumb_alter(Breadcrumb $breadcrumb, RouteMatchInterface $route_match, array $context) {
// Custom breadcrumb behavior for editing menu links, we append a link to
// the menu in which the link is found.
if (($route_match->getRouteName() == 'menu_ui.link_edit') && $menu_link = $route_match->getParameter('menu_link_plugin')) {
diff --git a/web/core/modules/menu_ui/src/MenuForm.php b/web/core/modules/menu_ui/src/MenuForm.php
index 5a2044e8a0..62edfaf1c3 100644
--- a/web/core/modules/menu_ui/src/MenuForm.php
+++ b/web/core/modules/menu_ui/src/MenuForm.php
@@ -271,7 +271,7 @@ protected function buildOverviewForm(array &$form, FormStateInterface $form_stat
'subgroup' => 'menu-parent',
'source' => 'menu-id',
'hidden' => TRUE,
- 'limit' => \Drupal::menuTree()->maxDepth() - 1,
+ 'limit' => $this->menuTree->maxDepth() - 1,
],
[
'action' => 'order',
diff --git a/web/core/modules/menu_ui/src/Plugin/Validation/Constraint/MenuSettingsConstraintValidator.php b/web/core/modules/menu_ui/src/Plugin/Validation/Constraint/MenuSettingsConstraintValidator.php
index 33bd6eb854..3fa8f2695c 100644
--- a/web/core/modules/menu_ui/src/Plugin/Validation/Constraint/MenuSettingsConstraintValidator.php
+++ b/web/core/modules/menu_ui/src/Plugin/Validation/Constraint/MenuSettingsConstraintValidator.php
@@ -16,7 +16,6 @@ class MenuSettingsConstraintValidator extends ConstraintValidator {
public function validate($entity, Constraint $constraint) {
if (isset($entity) && !$entity->isNew() && !$entity->isDefaultRevision()) {
$defaults = menu_ui_get_menu_link_defaults($entity);
- $violation_path = NULL;
// If the menu UI entity builder is not present and the menu property has
// not been set, do not attempt to validate the menu settings since they
diff --git a/web/core/modules/menu_ui/tests/src/Functional/MenuUiContentModerationTest.php b/web/core/modules/menu_ui/tests/src/Functional/MenuUiContentModerationTest.php
index 6aadd29080..cbced8d4ac 100644
--- a/web/core/modules/menu_ui/tests/src/Functional/MenuUiContentModerationTest.php
+++ b/web/core/modules/menu_ui/tests/src/Functional/MenuUiContentModerationTest.php
@@ -19,7 +19,13 @@ class MenuUiContentModerationTest extends BrowserTestBase {
*
* @var array
*/
- public static $modules = ['block', 'content_moderation', 'node', 'menu_ui', 'test_page_test'];
+ public static $modules = [
+ 'block',
+ 'content_moderation',
+ 'node',
+ 'menu_ui',
+ 'test_page_test',
+ ];
/**
* {@inheritdoc}
diff --git a/web/core/modules/menu_ui/tests/src/Functional/MenuUiNodeTest.php b/web/core/modules/menu_ui/tests/src/Functional/MenuUiNodeTest.php
index c1392b0136..5909ee0db5 100644
--- a/web/core/modules/menu_ui/tests/src/Functional/MenuUiNodeTest.php
+++ b/web/core/modules/menu_ui/tests/src/Functional/MenuUiNodeTest.php
@@ -26,7 +26,15 @@ class MenuUiNodeTest extends BrowserTestBase {
*
* @var array
*/
- public static $modules = ['menu_ui', 'test_page_test', 'node', 'block', 'locale', 'language', 'content_translation'];
+ public static $modules = [
+ 'menu_ui',
+ 'test_page_test',
+ 'node',
+ 'block',
+ 'locale',
+ 'language',
+ 'content_translation',
+ ];
/**
* {@inheritdoc}
@@ -222,7 +230,7 @@ public function testMenuNodeFormWidget() {
// Assert that the link is still in the Administration menu after save.
$this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save'));
$link = MenuLinkContent::load($item->id());
- $this->assertInstanceOf(MenuLinkContent::class, $link, 'Link in not allowed menu still exists after saving node');
+ $this->assertInstanceOf(MenuLinkContent::class, $link);
// Move the menu link back to the Tools menu.
$item->menu_name->value = 'tools';
diff --git a/web/core/modules/menu_ui/tests/src/Functional/MenuUiTest.php b/web/core/modules/menu_ui/tests/src/Functional/MenuUiTest.php
index 63626bbf43..38823057fc 100644
--- a/web/core/modules/menu_ui/tests/src/Functional/MenuUiTest.php
+++ b/web/core/modules/menu_ui/tests/src/Functional/MenuUiTest.php
@@ -134,9 +134,9 @@ public function testMenu() {
$this->assertNoLinkByHref(Url::fromRoute('menu_ui.link_reset', ['menu_link_plugin' => $this->items[0]->getPluginId()])->toString());
// Check delete and reset access.
$this->drupalGet('admin/structure/menu/item/' . $this->items[0]->id() . '/delete');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->drupalGet('admin/structure/menu/link/' . $this->items[0]->getPluginId() . '/reset');
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
// Delete menu links.
foreach ($this->items as $item) {
@@ -154,7 +154,7 @@ public function testMenu() {
$edit['weight'] = 10;
$id = $instance->getPluginId();
$this->drupalPostForm("admin/structure/menu/link/$id/edit", $edit, t('Save'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertText('The menu link has been saved.');
$menu_link_manager->resetDefinitions();
@@ -255,7 +255,7 @@ public function deleteCustomMenu() {
// Delete custom menu.
$this->drupalPostForm("admin/structure/menu/manage/$menu_name/delete", [], t('Delete'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertRaw(t('The menu %title has been deleted.', ['%title' => $label]), 'Custom menu was deleted');
$this->assertNull(Menu::load($menu_name), 'Custom menu was deleted');
// Test if all menu links associated with the menu were removed from
@@ -474,10 +474,10 @@ public function doMenuTests() {
$item8 = $this->addMenuLink('', '/', $menu_name);
$this->assertMenuLink(['route_name' => '<front>'], $item8->getPluginId());
$this->drupalGet('');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Make sure we get routed correctly.
$this->clickLink($item8->getTitle());
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Check invalid menu link parents.
$this->checkInvalidParentMenuLinks();
@@ -492,7 +492,7 @@ public function doMenuTests() {
*/
protected function doMenuLinkFormDefaultsTest() {
$this->drupalGet("admin/structure/menu/manage/tools/add");
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertFieldByName('title[0][value]', '');
$this->assertFieldByName('link[0][uri]', '');
@@ -600,7 +600,7 @@ public function testUnpublishedNodeMenuItem() {
public function addMenuLink($parent = '', $path = '/', $menu_name = 'tools', $expanded = FALSE, $weight = '0') {
// View add menu link page.
$this->drupalGet("admin/structure/menu/manage/$menu_name/add");
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$title = '!link_' . $this->randomMachineName(16);
$edit = [
@@ -615,13 +615,13 @@ public function addMenuLink($parent = '', $path = '/', $menu_name = 'tools', $ex
// Add menu link.
$this->drupalPostForm(NULL, $edit, t('Save'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertText('The menu link has been saved.');
$menu_links = \Drupal::entityTypeManager()->getStorage('menu_link_content')->loadByProperties(['title' => $title]);
$menu_link = reset($menu_links);
- $this->assertInstanceOf(MenuLinkContent::class, $menu_link, 'Menu link was found in database.');
+ $this->assertInstanceOf(MenuLinkContent::class, $menu_link);
$this->assertMenuLink(['menu_name' => $menu_name, 'children' => [], 'parent' => $parent], $menu_link->getPluginId());
return $menu_link;
@@ -698,7 +698,7 @@ public function checkInvalidParentMenuLinks() {
public function verifyMenuLink(MenuLinkContent $item, $item_node, MenuLinkContent $parent = NULL, $parent_node = NULL) {
// View home page.
$this->drupalGet('');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Verify parent menu link.
if (isset($parent)) {
@@ -709,7 +709,7 @@ public function verifyMenuLink(MenuLinkContent $item, $item_node, MenuLinkConten
// Verify menu link link.
$this->clickLink($title);
$title = $parent_node->label();
- $this->assertTitle(t("@title | Drupal", ['@title' => $title]), 'Parent menu link link target was correct');
+ $this->assertTitle("$title | Drupal");
}
// Verify menu link.
@@ -719,7 +719,7 @@ public function verifyMenuLink(MenuLinkContent $item, $item_node, MenuLinkConten
// Verify menu link link.
$this->clickLink($title);
$title = $item_node->label();
- $this->assertTitle(t("@title | Drupal", ['@title' => $title]), 'Menu link link target was correct');
+ $this->assertTitle("$title | Drupal");
}
/**
@@ -739,7 +739,7 @@ public function moveMenuLink(MenuLinkContent $item, $parent, $menu_name) {
'menu_parent' => $menu_name . ':' . $parent,
];
$this->drupalPostForm("admin/structure/menu/item/$mlid/edit", $edit, t('Save'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
}
/**
@@ -758,7 +758,7 @@ public function modifyMenuLink(MenuLinkContent $item) {
$edit = [];
$edit['title[0][value]'] = $title;
$this->drupalPostForm("admin/structure/menu/item/$mlid/edit", $edit, t('Save'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertText('The menu link has been saved.');
// Verify menu link.
$this->drupalGet('admin/structure/menu/manage/' . $item->getMenuName());
@@ -776,7 +776,7 @@ public function modifyMenuLink(MenuLinkContent $item) {
public function resetMenuLink(MenuLinkInterface $menu_link, $old_weight) {
// Reset menu link.
$this->drupalPostForm("admin/structure/menu/link/{$menu_link->getPluginId()}/reset", [], t('Reset'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertRaw(t('The menu link was reset to its default settings.'), 'Menu link was reset');
// Verify menu link.
@@ -796,7 +796,7 @@ public function deleteMenuLink(MenuLinkContent $item) {
// Delete menu link.
$this->drupalPostForm("admin/structure/menu/item/$mlid/delete", [], t('Delete'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertRaw(t('The menu link %title has been deleted.', ['%title' => $title]), 'Menu link was deleted');
// Verify deletion.
@@ -937,21 +937,21 @@ private function getStandardMenuLink() {
private function verifyAccess($response = 200) {
// View menu help page.
$this->drupalGet('admin/help/menu');
- $this->assertResponse($response);
+ $this->assertSession()->statusCodeEquals($response);
if ($response == 200) {
$this->assertText(t('Menu'), 'Menu help was displayed');
}
// View menu build overview page.
$this->drupalGet('admin/structure/menu');
- $this->assertResponse($response);
+ $this->assertSession()->statusCodeEquals($response);
if ($response == 200) {
$this->assertText(t('Menus'), 'Menu build overview page was displayed');
}
// View tools menu customization page.
$this->drupalGet('admin/structure/menu/manage/' . $this->menu->id());
- $this->assertResponse($response);
+ $this->assertSession()->statusCodeEquals($response);
if ($response == 200) {
$this->assertText(t('Tools'), 'Tools menu page was displayed');
}
@@ -959,14 +959,14 @@ private function verifyAccess($response = 200) {
// View menu edit page for a static link.
$item = $this->getStandardMenuLink();
$this->drupalGet('admin/structure/menu/link/' . $item->getPluginId() . '/edit');
- $this->assertResponse($response);
+ $this->assertSession()->statusCodeEquals($response);
if ($response == 200) {
$this->assertText(t('Edit menu item'), 'Menu edit page was displayed');
}
// View add menu page.
$this->drupalGet('admin/structure/menu/add');
- $this->assertResponse($response);
+ $this->assertSession()->statusCodeEquals($response);
if ($response == 200) {
$this->assertText(t('Menus'), 'Add menu page was displayed');
}
diff --git a/web/core/modules/migrate/src/Audit/IdAuditor.php b/web/core/modules/migrate/src/Audit/IdAuditor.php
index f482acd597..17f6ffe938 100644
--- a/web/core/modules/migrate/src/Audit/IdAuditor.php
+++ b/web/core/modules/migrate/src/Audit/IdAuditor.php
@@ -3,6 +3,7 @@
namespace Drupal\migrate\Audit;
use Drupal\Core\StringTranslation\StringTranslationTrait;
+use Drupal\migrate\Plugin\migrate\destination\EntityContentComplete;
use Drupal\migrate\Plugin\MigrationInterface;
/**
@@ -33,11 +34,12 @@ public function audit(MigrationInterface $migration) {
throw new AuditException($migration, "ID map does not implement $interface");
}
- if ($destination->getHighestId() > $id_map->getHighestId()) {
+ if ($destination->getHighestId() > $id_map->getHighestId() || ($destination instanceof EntityContentComplete && !$this->auditEntityComplete($migration))) {
return AuditResult::fail($migration, [
$this->t('The destination system contains data which was not created by a migration.'),
]);
}
+
return AuditResult::pass($migration);
}
@@ -55,4 +57,44 @@ public function auditMultiple(array $migrations) {
return $conflicts;
}
+ /**
+ * Audits an EntityComplete migration.
+ *
+ * @param \Drupal\migrate\Plugin\MigrationInterface $migration
+ * The migration to audit.
+ *
+ * @return bool
+ * TRUE if the audit passes and FALSE if not.
+ *
+ * @todo Refactor in https://www.drupal.org/project/drupal/issues/3061676 or
+ * https://www.drupal.org/project/drupal/issues/3091004
+ */
+ private function auditEntityComplete(MigrationInterface $migration) {
+ $map_table = $migration->getIdMap()->mapTableName();
+
+ $database = \Drupal::database();
+ if (!$database->schema()->tableExists($map_table)) {
+ throw new \InvalidArgumentException();
+ }
+
+ $query = $database->select($map_table, 'map')
+ ->fields('map', ['destid2'])
+ ->range(0, 1)
+ ->orderBy('destid2', 'DESC');
+ $max = (int) $query->execute()->fetchField();
+
+ // Make a migration based on node_complete but with an entity_revision
+ // destination.
+ $revision_migration = $migration->getPluginDefinition();
+ $revision_migration['id'] = $migration->getPluginId() . '-revision';
+ $revision_migration['destination']['plugin'] = 'entity_revision:node';
+ $revision_migration = \Drupal::service('plugin.manager.migration')->createStubMigration($revision_migration);
+
+ // Get the highest node revision ID.
+ $destination = $revision_migration->getDestinationPlugin();
+ $highest = $destination->getHighestId();
+
+ return $max <= $highest;
+ }
+
}
diff --git a/web/core/modules/migrate/src/Plugin/Derivative/MigrateEntityComplete.php b/web/core/modules/migrate/src/Plugin/Derivative/MigrateEntityComplete.php
new file mode 100644
index 0000000000..c276a3a7b3
--- /dev/null
+++ b/web/core/modules/migrate/src/Plugin/Derivative/MigrateEntityComplete.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Drupal\migrate\Plugin\Derivative;
+
+use Drupal\migrate\Plugin\migrate\destination\EntityContentComplete;
+
+/**
+ * MigrateEntityComplete deriver.
+ */
+class MigrateEntityComplete extends MigrateEntity {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getDerivativeDefinitions($base_plugin_definition) {
+ foreach ($this->entityDefinitions as $entity_type => $entity_info) {
+ $this->derivatives[$entity_type] = [
+ 'id' => "entity_complete:$entity_type",
+ 'class' => EntityContentComplete::class,
+ 'requirements_met' => 1,
+ 'provider' => $entity_info->getProvider(),
+ ];
+ }
+ return $this->derivatives;
+ }
+
+}
diff --git a/web/core/modules/migrate/src/Plugin/MigrateDestinationInterface.php b/web/core/modules/migrate/src/Plugin/MigrateDestinationInterface.php
index 565b4af72d..f29ded5d8f 100644
--- a/web/core/modules/migrate/src/Plugin/MigrateDestinationInterface.php
+++ b/web/core/modules/migrate/src/Plugin/MigrateDestinationInterface.php
@@ -103,8 +103,11 @@ public function fields(MigrationInterface $migration = NULL);
* @param array $old_destination_id_values
* (optional) The old destination IDs. Defaults to an empty array.
*
- * @return mixed
- * The entity ID or an indication of success.
+ * @return array|bool
+ * An indexed array of destination IDs in the same order as defined in the
+ * plugin's getIds() method if the plugin wants to save the IDs to the ID
+ * map, TRUE to indicate success without saving IDs to the ID map, or
+ * FALSE to indicate a failure.
*/
public function import(Row $row, array $old_destination_id_values = []);
diff --git a/web/core/modules/migrate/src/Plugin/Migration.php b/web/core/modules/migrate/src/Plugin/Migration.php
index 607ef5eaa8..ca325f27ae 100644
--- a/web/core/modules/migrate/src/Plugin/Migration.php
+++ b/web/core/modules/migrate/src/Plugin/Migration.php
@@ -405,6 +405,10 @@ protected function getProcessNormalized(array $process) {
if (isset($configuration['plugin'])) {
$configuration = [$configuration];
}
+ if (!is_array($configuration)) {
+ $migration_id = $this->getPluginId();
+ throw new MigrateException("Invalid process for destination '$destination' in migration '$migration_id'");
+ }
$normalized_configurations[$destination] = $configuration;
}
return $normalized_configurations;
diff --git a/web/core/modules/migrate/src/Plugin/migrate/destination/EntityContentComplete.php b/web/core/modules/migrate/src/Plugin/migrate/destination/EntityContentComplete.php
new file mode 100644
index 0000000000..e11f257a34
--- /dev/null
+++ b/web/core/modules/migrate/src/Plugin/migrate/destination/EntityContentComplete.php
@@ -0,0 +1,142 @@
+<?php
+
+namespace Drupal\migrate\Plugin\migrate\destination;
+
+use Drupal\Core\Entity\ContentEntityInterface;
+use Drupal\Core\Entity\EntityChangedInterface;
+use Drupal\Core\Entity\EntityInterface;
+use Drupal\migrate\EntityFieldDefinitionTrait;
+use Drupal\migrate\Plugin\MigrateIdMapInterface;
+use Drupal\migrate\Row;
+
+/**
+ * Provides a destination for migrating the entire entity revision table.
+ *
+ * @MigrateDestination(
+ * id = "entity_complete",
+ * deriver = "Drupal\migrate\Plugin\Derivative\MigrateEntityComplete"
+ * )
+ */
+class EntityContentComplete extends EntityContentBase {
+
+ use EntityFieldDefinitionTrait;
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getIds() {
+ $ids = [];
+ $id_key = $this->getKey('id');
+ $ids[$id_key] = $this->getDefinitionFromEntity($id_key);
+
+ $revision_key = $this->getKey('revision');
+ if ($revision_key) {
+ $ids[$revision_key] = $this->getDefinitionFromEntity($revision_key);
+ }
+
+ $langcode_key = $this->getKey('langcode');
+ if ($langcode_key) {
+ $ids[$langcode_key] = $this->getDefinitionFromEntity($langcode_key);
+ }
+
+ return $ids;
+ }
+
+ /**
+ * Gets the entity.
+ *
+ * @param \Drupal\migrate\Row $row
+ * The row object.
+ * @param array $old_destination_id_values
+ * The old destination IDs.
+ *
+ * @return \Drupal\Core\Entity\EntityInterface
+ * The entity.
+ */
+ protected function getEntity(Row $row, array $old_destination_id_values) {
+ $revision_id = $old_destination_id_values
+ ? $old_destination_id_values[1]
+ : $row->getDestinationProperty($this->getKey('revision'));
+ // If we are re-running a migration with set revision IDs and the
+ // destination revision ID already exists then do not create a new revision.
+ if (!empty($revision_id) && ($entity = $this->storage->loadRevision($revision_id))) {
+ $entity->setNewRevision(FALSE);
+ }
+ elseif (($entity_id = $row->getDestinationProperty($this->getKey('id'))) && ($entity = $this->storage->load($entity_id))) {
+ // We want to create a new entity. Set enforceIsNew() FALSE is necessary
+ // to properly save a new entity while setting the ID. Without it, the
+ // system would see that the ID is already set and assume it is an update.
+ $entity->enforceIsNew(FALSE);
+ // Intentionally create a new revision. Setting new revision TRUE here may
+ // not be necessary, it is done for clarity.
+ $entity->setNewRevision(TRUE);
+ }
+ else {
+ // Attempt to set the bundle.
+ if ($bundle = $this->getBundle($row)) {
+ $row->setDestinationProperty($this->getKey('bundle'), $bundle);
+ }
+
+ // Stubs might need some required fields filled in.
+ if ($row->isStub()) {
+ $this->processStubRow($row);
+ }
+ $entity = $this->storage->create($row->getDestination());
+ $entity->enforceIsNew();
+ }
+
+ // We need to update the entity, so that the destination row IDs are
+ // correct.
+ $entity = $this->updateEntity($entity, $row);
+ $entity->isDefaultRevision(TRUE);
+ if ($entity instanceof EntityChangedInterface && $entity instanceof ContentEntityInterface) {
+ // If we updated any untranslatable fields, update the timestamp for the
+ // other translations.
+ /** @var \Drupal\Core\Entity\ContentEntityInterface|\Drupal\Core\Entity\EntityChangedInterface $entity */
+ foreach ($entity->getTranslationLanguages() as $langcode => $language) {
+ // If we updated an untranslated field, then set the changed time for
+ // for all translations to match the current row that we are saving.
+ // In this context, getChangedTime() should return the value we just
+ // set in the updateEntity() call above.
+ if ($entity->getTranslation($langcode)->hasTranslationChanges()) {
+ $entity->getTranslation($langcode)->setChangedTime($entity->getChangedTime());
+ }
+ }
+ }
+ return $entity;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function updateEntity(EntityInterface $entity, Row $row) {
+ $entity = parent::updateEntity($entity, $row);
+ // Always set the rollback action to delete. This is because the parent
+ // updateEntity will set the rollback action to preserve for the original
+ // language row, which is needed for the classic node migrations.
+ $this->setRollbackAction($row->getIdMap(), MigrateIdMapInterface::ROLLBACK_DELETE);
+ return $entity;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function save(ContentEntityInterface $entity, array $old_destination_id_values = []) {
+ parent::save($entity, $old_destination_id_values);
+ return [
+ $entity->id(),
+ $entity->getRevisionId(),
+ ];
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function rollback(array $destination_identifier) {
+ // We want to delete the entity and all the translations so use
+ // Entity:rollback because EntityContentBase::rollback will not remove the
+ // default translation.
+ Entity::rollback($destination_identifier);
+ }
+
+}
diff --git a/web/core/modules/migrate/src/Plugin/migrate/id_map/Sql.php b/web/core/modules/migrate/src/Plugin/migrate/id_map/Sql.php
index 8c4f582805..c881f51b3d 100644
--- a/web/core/modules/migrate/src/Plugin/migrate/id_map/Sql.php
+++ b/web/core/modules/migrate/src/Plugin/migrate/id_map/Sql.php
@@ -3,6 +3,7 @@
namespace Drupal\migrate\Plugin\migrate\id_map;
use Drupal\Core\Database\DatabaseException;
+use Drupal\Core\Database\DatabaseExceptionWrapper;
use Drupal\Core\Field\BaseFieldDefinition;
use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
use Drupal\Core\Plugin\PluginBase;
@@ -600,7 +601,16 @@ public function lookupDestinationIds(array $source_id_values) {
}
}
- return $query->execute()->fetchAll(\PDO::FETCH_NUM);
+ try {
+ return $query->execute()->fetchAll(\PDO::FETCH_NUM);
+ }
+ catch (DatabaseExceptionWrapper $e) {
+ // It's possible that the query will cause an exception to be thrown. For
+ // example, the URL alias migration uses a dummy node ID of 'INVALID_NID'
+ // to cause the lookup to return no results. On PostgreSQL this causes an
+ // exception because 'INVALID_NID' is not the expected type.
+ return [];
+ }
}
/**
@@ -912,7 +922,7 @@ public function currentDestination() {
}
/**
- * @inheritdoc
+ * {@inheritdoc}
*/
public function currentSource() {
if ($this->valid()) {
diff --git a/web/core/modules/migrate/src/Plugin/migrate/process/FileProcessBase.php b/web/core/modules/migrate/src/Plugin/migrate/process/FileProcessBase.php
index 7b2ca1196d..9ec14ae4b1 100644
--- a/web/core/modules/migrate/src/Plugin/migrate/process/FileProcessBase.php
+++ b/web/core/modules/migrate/src/Plugin/migrate/process/FileProcessBase.php
@@ -34,9 +34,11 @@ public function __construct(array $configuration, $plugin_id, array $plugin_defi
case 'use existing':
$configuration['file_exists'] = FileSystemInterface::EXISTS_ERROR;
break;
+
case 'rename':
$configuration['file_exists'] = FileSystemInterface::EXISTS_RENAME;
break;
+
default:
$configuration['file_exists'] = FileSystemInterface::EXISTS_REPLACE;
}
diff --git a/web/core/modules/migrate/src/Plugin/migrate/process/Substr.php b/web/core/modules/migrate/src/Plugin/migrate/process/Substr.php
index b8f5f497b8..bab01a6a04 100644
--- a/web/core/modules/migrate/src/Plugin/migrate/process/Substr.php
+++ b/web/core/modules/migrate/src/Plugin/migrate/process/Substr.php
@@ -75,7 +75,7 @@ public function transform($value, MigrateExecutableInterface $migrate_executable
throw new MigrateException('The start position configuration value should be an integer. Omit this key to capture from the beginning of the string.');
}
$length = isset($this->configuration['length']) ? $this->configuration['length'] : NULL;
- if (!is_null($length) && !is_int($length)) {
+ if ($length !== NULL && !is_int($length)) {
throw new MigrateException('The character length configuration value should be an integer. Omit this key to capture from the start position to the end of the string.');
}
if (!is_string($value)) {
@@ -83,8 +83,7 @@ public function transform($value, MigrateExecutableInterface $migrate_executable
}
// Use optional start or length to return a portion of $value.
- $new_value = mb_substr($value, $start, $length);
- return $new_value;
+ return mb_substr($value, $start, $length);
}
}
diff --git a/web/core/modules/migrate/tests/modules/migrate_no_migrate_drupal_test/migrate_no_migrate_drupal_test.info.yml b/web/core/modules/migrate/tests/modules/migrate_no_migrate_drupal_test/migrate_no_migrate_drupal_test.info.yml
new file mode 100644
index 0000000000..dfaccb76f9
--- /dev/null
+++ b/web/core/modules/migrate/tests/modules/migrate_no_migrate_drupal_test/migrate_no_migrate_drupal_test.info.yml
@@ -0,0 +1,8 @@
+name: 'Migrate No Migrate Drupal Test'
+type: module
+description: Provides fixture for testing without migrate_drupal.
+package: Testing
+version: VERSION
+dependencies:
+ - drupal:migrate
+ - drupal:node
diff --git a/web/core/modules/migrate/tests/modules/migrate_no_migrate_drupal_test/migrate_no_migrate_drupal_test.routing.yml b/web/core/modules/migrate/tests/modules/migrate_no_migrate_drupal_test/migrate_no_migrate_drupal_test.routing.yml
new file mode 100644
index 0000000000..20e9f4d468
--- /dev/null
+++ b/web/core/modules/migrate/tests/modules/migrate_no_migrate_drupal_test/migrate_no_migrate_drupal_test.routing.yml
@@ -0,0 +1,7 @@
+migrate_no_migrate_drupal_test.execute:
+ path: '/migrate_no_migrate_drupal_test/execute'
+ defaults:
+ _controller: '\Drupal\migrate_no_migrate_drupal_test\Controller\ExecuteMigration::execute'
+ _title: 'Execute'
+ requirements:
+ _access: 'TRUE'
diff --git a/web/core/modules/migrate/tests/modules/migrate_no_migrate_drupal_test/migrations/node_migration_no_upgrade.yml b/web/core/modules/migrate/tests/modules/migrate_no_migrate_drupal_test/migrations/node_migration_no_upgrade.yml
new file mode 100644
index 0000000000..ce95d5dd15
--- /dev/null
+++ b/web/core/modules/migrate/tests/modules/migrate_no_migrate_drupal_test/migrations/node_migration_no_upgrade.yml
@@ -0,0 +1,22 @@
+id: node_migration_no_migrate_drupal
+label: Node Migration No Migrate Drupal
+source:
+ plugin: embedded_data
+ data_rows:
+ -
+ id: 1
+ nid: 1
+ title: Node 1
+ -
+ id: 2
+ nid: 2
+ title: Node 2
+ ids:
+ id:
+ type: integer
+process:
+ nid: nid
+ title: title
+destination:
+ default_bundle: no_migrate_drupal
+ plugin: entity:node
diff --git a/web/core/modules/migrate/tests/modules/migrate_no_migrate_drupal_test/src/Controller/ExecuteMigration.php b/web/core/modules/migrate/tests/modules/migrate_no_migrate_drupal_test/src/Controller/ExecuteMigration.php
new file mode 100644
index 0000000000..b18182583f
--- /dev/null
+++ b/web/core/modules/migrate/tests/modules/migrate_no_migrate_drupal_test/src/Controller/ExecuteMigration.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace Drupal\migrate_no_migrate_drupal_test\Controller;
+
+use Drupal\Component\Plugin\Exception\InvalidPluginDefinitionException;
+use Drupal\Core\Controller\ControllerBase;
+use Drupal\migrate\MigrateExecutable;
+use Drupal\migrate\Plugin\MigrationInterface;
+
+/**
+ * Custom controller to execute the test migrations.
+ *
+ * This controller class is required for the proper functional testing of
+ * migration dependencies. Otherwise, the migration directly executed from the
+ * functional test would use the functional test's class map and autoloader. The
+ * functional test has all the classes available to it but the controller
+ * does not.
+ */
+class ExecuteMigration extends ControllerBase {
+
+ /**
+ * Run the node_migration_no_migrate_drupal test migration.
+ *
+ * @return array
+ * A renderable array.
+ */
+ public function execute() {
+ $migration_plugin_manager = \Drupal::service('plugin.manager.migration');
+ $definitions = $migration_plugin_manager->getDefinitions();
+ if ($definitions['node_migration_no_migrate_drupal']['label'] !== 'Node Migration No Migrate Drupal') {
+ throw new InvalidPluginDefinitionException('node_migration_no_migrate_drupal');
+ }
+ $migrations = $migration_plugin_manager->createInstances('');
+ $result = (new MigrateExecutable($migrations['node_migration_no_migrate_drupal']))->import();
+ if ($result !== MigrationInterface::RESULT_COMPLETED) {
+ throw new \RuntimeException('Migration failed');
+ }
+
+ return [
+ '#type' => 'markup',
+ '#markup' => 'Migration was successful.',
+ ];
+ }
+
+}
diff --git a/web/core/modules/migrate/tests/src/Functional/MigrateNoMigrateDrupalTest.php b/web/core/modules/migrate/tests/src/Functional/MigrateNoMigrateDrupalTest.php
new file mode 100644
index 0000000000..e4a5bcd78d
--- /dev/null
+++ b/web/core/modules/migrate/tests/src/Functional/MigrateNoMigrateDrupalTest.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace Drupal\Tests\migrate\Functional;
+
+use Drupal\node\Entity\Node;
+use Drupal\Tests\BrowserTestBase;
+use Drupal\Tests\node\Traits\ContentTypeCreationTrait;
+
+/**
+ * Execute migration.
+ *
+ * This is intentionally a Functional test instead of a Kernel test because
+ * Kernel tests have proven to not catch all edge cases that are encountered
+ * via a Functional test.
+ *
+ * @group migrate
+ */
+class MigrateNoMigrateDrupalTest extends BrowserTestBase {
+ use ContentTypeCreationTrait;
+
+ /**
+ * {@inheritdoc}
+ */
+ protected $defaultTheme = 'stark';
+
+ /**
+ * {@inheritdoc}
+ */
+ protected static $modules = [
+ 'migrate',
+ 'migrate_no_migrate_drupal_test',
+ 'node',
+ ];
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function setUp() {
+ parent::setUp();
+ // Ensures that code from the migrate_drupal module can not be autoloaded
+ // while testing on DrupalCI.
+ $this->writeSettings(['settings' => ['deployment_identifier' => (object) ['value' => 'force-new-apcu-key', 'required' => TRUE]]]);
+ $this->createContentType(['type' => 'no_migrate_drupal']);
+ }
+
+ /**
+ * Tests execution of a migration.
+ */
+ public function testExecutionNoMigrateDrupal() {
+ $this->drupalGet('/migrate_no_migrate_drupal_test/execute');
+ $this->assertSession()->pageTextContains('Migration was successful.');
+ $node_1 = Node::load(1);
+ $node_2 = Node::load(2);
+ $this->assertEquals('Node 1', $node_1->label());
+ $this->assertEquals('Node 2', $node_2->label());
+ }
+
+}
diff --git a/web/core/modules/migrate/tests/src/Functional/process/DownloadFunctionalTest.php b/web/core/modules/migrate/tests/src/Functional/process/DownloadFunctionalTest.php
index bf6da018c3..e6d1249330 100644
--- a/web/core/modules/migrate/tests/src/Functional/process/DownloadFunctionalTest.php
+++ b/web/core/modules/migrate/tests/src/Functional/process/DownloadFunctionalTest.php
@@ -73,7 +73,7 @@ public function testExceptionThrow() {
$messages = $id_map_plugin->getMessages(['url' => $invalid_url])->fetchAll();
$this->assertCount(1, $messages);
$message = reset($messages);
- $this->assertEquals("Cannot read from non-readable stream ($invalid_url)", $message->message);
+ $this->assertEquals("Client error: `GET $invalid_url` resulted in a `404 Not Found` response ($invalid_url)", $message->message);
$this->assertEquals(MigrationInterface::MESSAGE_ERROR, $message->level);
// Check that the second row was migrated successfully.
diff --git a/web/core/modules/migrate/tests/src/Kernel/HighWaterNotJoinableTest.php b/web/core/modules/migrate/tests/src/Kernel/HighWaterNotJoinableTest.php
index 4198579026..911e50cd19 100644
--- a/web/core/modules/migrate/tests/src/Kernel/HighWaterNotJoinableTest.php
+++ b/web/core/modules/migrate/tests/src/Kernel/HighWaterNotJoinableTest.php
@@ -13,7 +13,11 @@ class HighWaterNotJoinableTest extends MigrateSqlSourceTestBase {
/**
* {@inheritdoc}
*/
- public static $modules = ['migrate', 'migrate_drupal', 'migrate_high_water_test'];
+ public static $modules = [
+ 'migrate',
+ 'migrate_drupal',
+ 'migrate_high_water_test',
+ ];
/**
* {@inheritdoc}
diff --git a/web/core/modules/migrate/tests/src/Kernel/MigrateEntityContentValidationTest.php b/web/core/modules/migrate/tests/src/Kernel/MigrateEntityContentValidationTest.php
index f5632e24df..16ec315055 100644
--- a/web/core/modules/migrate/tests/src/Kernel/MigrateEntityContentValidationTest.php
+++ b/web/core/modules/migrate/tests/src/Kernel/MigrateEntityContentValidationTest.php
@@ -143,7 +143,7 @@ public function test2() {
/**
* Reacts to map message event.
*
- * @param \Drupal\Migrate\Event\MigrateIdMapMessageEvent $event
+ * @param \Drupal\migrate\Event\MigrateIdMapMessageEvent $event
* The migration event.
*/
public function mapMessageRecorder(MigrateIdMapMessageEvent $event) {
diff --git a/web/core/modules/migrate/tests/src/Kernel/MigrateExternalTranslatedTest.php b/web/core/modules/migrate/tests/src/Kernel/MigrateExternalTranslatedTest.php
index ea45a78fca..46207e0f1e 100644
--- a/web/core/modules/migrate/tests/src/Kernel/MigrateExternalTranslatedTest.php
+++ b/web/core/modules/migrate/tests/src/Kernel/MigrateExternalTranslatedTest.php
@@ -19,7 +19,14 @@ class MigrateExternalTranslatedTest extends MigrateTestBase {
/**
* {@inheritdoc}
*/
- public static $modules = ['system', 'user', 'language', 'node', 'field', 'migrate_external_translated_test'];
+ public static $modules = [
+ 'system',
+ 'user',
+ 'language',
+ 'node',
+ 'field',
+ 'migrate_external_translated_test',
+ ];
/**
* {@inheritdoc}
@@ -49,12 +56,12 @@ public function setUp() {
public function testMigrations() {
/** @var \Drupal\Core\Entity\ContentEntityStorageInterface $storage */
$storage = $this->container->get('entity_type.manager')->getStorage('node');
- $this->assertEquals(0, count($storage->loadMultiple()));
+ $this->assertCount(0, $storage->loadMultiple());
// Run the migrations.
$migration_ids = ['external_translated_test_node', 'external_translated_test_node_translation'];
$this->executeMigrations($migration_ids);
- $this->assertEquals(3, count($storage->loadMultiple()));
+ $this->assertCount(3, $storage->loadMultiple());
$node = $storage->load(1);
$this->assertEquals('en', $node->language()->getId());
@@ -83,7 +90,7 @@ public function testMigrations() {
$executable->rollback();
}
- $this->assertEquals(0, count($storage->loadMultiple()));
+ $this->assertCount(0, $storage->loadMultiple());
}
}
diff --git a/web/core/modules/migrate/tests/src/Kernel/MigrateMessageTest.php b/web/core/modules/migrate/tests/src/Kernel/MigrateMessageTest.php
index a4cebef64d..280bee0347 100644
--- a/web/core/modules/migrate/tests/src/Kernel/MigrateMessageTest.php
+++ b/web/core/modules/migrate/tests/src/Kernel/MigrateMessageTest.php
@@ -81,7 +81,7 @@ public function testMessagesNotTeed() {
// We don't ask for messages to be teed, so don't expect any.
$executable = new MigrateExecutable($this->migration, $this);
$executable->import();
- $this->assertIdentical(count($this->messages), 0);
+ $this->assertCount(0, $this->messages);
}
/**
@@ -93,7 +93,7 @@ public function testMessagesTeed() {
[$this, 'mapMessageRecorder']);
$executable = new MigrateExecutable($this->migration, $this);
$executable->import();
- $this->assertIdentical(count($this->messages), 1);
+ $this->assertCount(1, $this->messages);
$this->assertIdentical(reset($this->messages), "source_message: 'a message' is not an array");
}
diff --git a/web/core/modules/migrate/tests/src/Kernel/MigrateRollbackEntityConfigTest.php b/web/core/modules/migrate/tests/src/Kernel/MigrateRollbackEntityConfigTest.php
index 23ab7481dd..8e237ecf91 100644
--- a/web/core/modules/migrate/tests/src/Kernel/MigrateRollbackEntityConfigTest.php
+++ b/web/core/modules/migrate/tests/src/Kernel/MigrateRollbackEntityConfigTest.php
@@ -17,7 +17,15 @@ class MigrateRollbackEntityConfigTest extends MigrateTestBase {
*
* @var array
*/
- public static $modules = ['field', 'taxonomy', 'text', 'language', 'config_translation', 'user', 'system'];
+ public static $modules = [
+ 'field',
+ 'taxonomy',
+ 'text',
+ 'language',
+ 'config_translation',
+ 'user',
+ 'system',
+ ];
/**
* {@inheritdoc}
diff --git a/web/core/modules/migrate/tests/src/Kernel/Plugin/MigrationTest.php b/web/core/modules/migrate/tests/src/Kernel/Plugin/MigrationTest.php
index aceb73e807..9dc89d1f1f 100644
--- a/web/core/modules/migrate/tests/src/Kernel/Plugin/MigrationTest.php
+++ b/web/core/modules/migrate/tests/src/Kernel/Plugin/MigrationTest.php
@@ -42,23 +42,64 @@ public function testGetProcessPluginsException() {
}
/**
- * Tests Migration::getDestinationPlugin()
+ * Tests Migration::getProcessPlugins()
*
- * @covers ::getDestinationPlugin
+ * @param array $process
+ * The migration process pipeline.
+ *
+ * @covers ::getProcessPlugins
+ *
+ * @dataProvider getProcessPluginsExceptionMessageProvider
*/
- public function testGetProcessPluginsExceptionMessage() {
+ public function testGetProcessPluginsExceptionMessage(array $process) {
// Test with an invalid process pipeline.
$plugin_definition = [
- 'process' => [
- 'dest1' => 123,
- ],
+ 'id' => 'foo',
+ 'process' => $process,
];
- $migration = \Drupal::service('plugin.manager.migration')->createStubMigration($plugin_definition);
+
+ reset($process);
+ $destination = key(($process));
+
+ $migration = \Drupal::service('plugin.manager.migration')
+ ->createStubMigration($plugin_definition);
$this->expectException(MigrateException::class);
- $this->expectExceptionMessage("Process configuration for 'dest1' must be an array");
+ $this->expectExceptionMessage("Invalid process for destination '$destination' in migration 'foo'");
$migration->getProcessPlugins();
}
+ /**
+ * Provides data for testing invalid process pipeline.
+ */
+ public function getProcessPluginsExceptionMessageProvider() {
+ return [
+ [
+ 'Null' =>
+ [
+ 'dest' => NULL,
+ ],
+ ],
+ [
+ 'boolean' =>
+ [
+ 'dest' => TRUE,
+ ],
+ ],
+ [
+ 'integer' =>
+ [
+ 'dest' => 2370,
+ ],
+ ],
+ [
+ 'float' =>
+ [
+ 'dest' => 1.61,
+ ],
+ ],
+ ];
+ }
+
/**
* Tests Migration::getMigrationDependencies()
*
diff --git a/web/core/modules/migrate/tests/src/Kernel/process/DownloadTest.php b/web/core/modules/migrate/tests/src/Kernel/process/DownloadTest.php
index a183c0e4a8..dde839befe 100644
--- a/web/core/modules/migrate/tests/src/Kernel/process/DownloadTest.php
+++ b/web/core/modules/migrate/tests/src/Kernel/process/DownloadTest.php
@@ -40,7 +40,7 @@ public function testOverwritingDownload() {
// Test destructive download.
$actual_destination = $this->doTransform($destination_uri);
$this->assertSame($destination_uri, $actual_destination, 'Import returned a destination that was not renamed');
- $this->assertFileNotExists('public://existing_file_0.txt', 'Import did not rename the file');
+ $this->assertFileNotExists('public://existing_file_0.txt');
}
/**
@@ -53,7 +53,7 @@ public function testNonDestructiveDownload() {
// Test non-destructive download.
$actual_destination = $this->doTransform($destination_uri, ['file_exists' => 'rename']);
$this->assertSame('public://another_existing_file_0.txt', $actual_destination, 'Import returned a renamed destination');
- $this->assertFileExists($actual_destination, 'Downloaded file was created');
+ $this->assertFileExists($actual_destination);
}
/**
diff --git a/web/core/modules/migrate/tests/src/Kernel/process/FileCopyTest.php b/web/core/modules/migrate/tests/src/Kernel/process/FileCopyTest.php
index 38d92f90b4..8df623e9ee 100644
--- a/web/core/modules/migrate/tests/src/Kernel/process/FileCopyTest.php
+++ b/web/core/modules/migrate/tests/src/Kernel/process/FileCopyTest.php
@@ -67,10 +67,9 @@ public function testSuccessfulCopies() {
foreach ($data_sets as $data) {
list($source_path, $destination_path) = $data;
$actual_destination = $this->doTransform($source_path, $destination_path);
- $message = sprintf('File %s exists', $destination_path);
- $this->assertFileExists($destination_path, $message);
+ $this->assertFileExists($destination_path);
// Make sure we didn't accidentally do a move.
- $this->assertFileExists($source_path, $message);
+ $this->assertFileExists($source_path);
$this->assertSame($actual_destination, $destination_path, 'The import returned the copied filename.');
}
}
@@ -90,7 +89,7 @@ public function testSuccessfulReuse($source_path, $destination_path) {
clearstatcache(TRUE, $destination_path);
$timestamp = (new \SplFileInfo($file_reuse))->getMTime();
- $this->assertInternalType('int', $timestamp);
+ $this->assertIsInt($timestamp);
// We need to make sure the modified timestamp on the file is sooner than
// the attempted migration.
@@ -152,10 +151,8 @@ public function testSuccessfulMoves() {
foreach ($data_sets as $data) {
list($source_path, $destination_path) = $data;
$actual_destination = $this->doTransform($source_path, $destination_path, ['move' => TRUE]);
- $message = sprintf('File %s exists', $destination_path);
- $this->assertFileExists($destination_path, $message);
- $message = sprintf('File %s does not exist', $source_path);
- $this->assertFileNotExists($source_path, $message);
+ $this->assertFileExists($destination_path);
+ $this->assertFileNotExists($source_path);
$this->assertSame($actual_destination, $destination_path, 'The importer returned the moved filename.');
}
}
@@ -205,7 +202,7 @@ public function testRenameFile() {
$destination = $this->createUri('foo.txt', NULL, 'public');
$expected_destination = 'public://foo_0.txt';
$actual_destination = $this->doTransform($source, $destination, ['file_exists' => 'rename']);
- $this->assertFileExists($expected_destination, 'File was renamed on import');
+ $this->assertFileExists($expected_destination);
$this->assertSame($actual_destination, $expected_destination, 'The importer returned the renamed filename.');
}
diff --git a/web/core/modules/migrate/tests/src/Unit/MigrateSourceTest.php b/web/core/modules/migrate/tests/src/Unit/MigrateSourceTest.php
index f8dc7541fa..466786cfcc 100644
--- a/web/core/modules/migrate/tests/src/Unit/MigrateSourceTest.php
+++ b/web/core/modules/migrate/tests/src/Unit/MigrateSourceTest.php
@@ -276,7 +276,7 @@ public function testNewHighwater() {
$source = $this->getSource($configuration, [], MigrateIdMapInterface::STATUS_IMPORTED, $this->row['timestamp'] - 1);
$source->rewind();
- $this->assertInstanceOf(Row::class, $source->current(), 'Incoming row timestamp is greater than current highwater mark so we have a row.');
+ $this->assertInstanceOf(Row::class, $source->current());
}
/**
diff --git a/web/core/modules/migrate/tests/src/Unit/MigrateSqlIdMapTest.php b/web/core/modules/migrate/tests/src/Unit/MigrateSqlIdMapTest.php
index 17319bd14c..e150e610da 100644
--- a/web/core/modules/migrate/tests/src/Unit/MigrateSqlIdMapTest.php
+++ b/web/core/modules/migrate/tests/src/Unit/MigrateSqlIdMapTest.php
@@ -438,7 +438,7 @@ public function testLookupDestinationIdMapping($num_source_fields, $num_destinat
$this->assertSame([$expected_result], $destination_ids);
// Test for a miss.
$destination_ids = $id_map->lookupDestinationIds($nonexistent_id_values);
- $this->assertSame(0, count($destination_ids));
+ $this->assertCount(0, $destination_ids);
}
/**
@@ -675,7 +675,7 @@ public function testLookupSourceIdMapping($num_source_fields, $num_destination_f
$this->assertSame($expected_result, $source_id);
// Test for a miss.
$source_id = $id_map->lookupSourceId($nonexistent_id_values);
- $this->assertSame(0, count($source_id));
+ $this->assertCount(0, $source_id);
}
/**
diff --git a/web/core/modules/migrate/tests/src/Unit/MigrationPluginManagerTest.php b/web/core/modules/migrate/tests/src/Unit/MigrationPluginManagerTest.php
index c1228b281b..c54eb267e0 100644
--- a/web/core/modules/migrate/tests/src/Unit/MigrationPluginManagerTest.php
+++ b/web/core/modules/migrate/tests/src/Unit/MigrationPluginManagerTest.php
@@ -57,7 +57,7 @@ public function testDependencyBuilding($migrations_data, $result_ids) {
else {
$requirements = array_combine($requirements, $requirements);
- $this->assertEquals(1, count($migration->set));
+ $this->assertCount(1, $migration->set);
list($set_prop, $set_requirements) = reset($migration->set);
$this->assertEquals('requirements', $set_prop);
$this->assertEquals($requirements, $set_requirements);
diff --git a/web/core/modules/migrate/tests/src/Unit/process/IteratorTest.php b/web/core/modules/migrate/tests/src/Unit/process/IteratorTest.php
index 189a8ee245..49d5a0ec6d 100644
--- a/web/core/modules/migrate/tests/src/Unit/process/IteratorTest.php
+++ b/web/core/modules/migrate/tests/src/Unit/process/IteratorTest.php
@@ -76,8 +76,8 @@ public function testIterator() {
// values ended up in the proper destinations, and that the value of the
// key (@id) is the same as the destination ID (42).
$new_value = $plugin->transform($current_value, $migrate_executable, $row, 'test');
- $this->assertSame(1, count($new_value));
- $this->assertSame(2, count($new_value[42]));
+ $this->assertCount(1, $new_value);
+ $this->assertCount(2, $new_value[42]);
$this->assertSame('test', $new_value[42]['foo']);
$this->assertSame(42, $new_value[42]['id']);
}
diff --git a/web/core/modules/migrate/tests/src/Unit/process/UrlEncodeTest.php b/web/core/modules/migrate/tests/src/Unit/process/UrlEncodeTest.php
index df41e82840..7eb2aca4ef 100644
--- a/web/core/modules/migrate/tests/src/Unit/process/UrlEncodeTest.php
+++ b/web/core/modules/migrate/tests/src/Unit/process/UrlEncodeTest.php
@@ -14,7 +14,7 @@
class UrlEncodeTest extends MigrateTestCase {
/**
- * @inheritdoc
+ * {@inheritdoc}
*/
protected $migrationConfiguration = [
'id' => 'test',
diff --git a/web/core/modules/migrate_drupal/migrate_drupal.module b/web/core/modules/migrate_drupal/migrate_drupal.module
index 3f9439dd3b..ead65f9694 100644
--- a/web/core/modules/migrate_drupal/migrate_drupal.module
+++ b/web/core/modules/migrate_drupal/migrate_drupal.module
@@ -5,12 +5,14 @@
* Provides migration from other Drupal sites.
*/
-use Drupal\Core\Url;
use Drupal\Core\Database\DatabaseExceptionWrapper;
use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Core\Url;
use Drupal\migrate\Exception\RequirementsException;
use Drupal\migrate\MigrateExecutable;
use Drupal\migrate\Plugin\RequirementsInterface;
+use Drupal\migrate_drupal\MigrationConfigurationTrait;
+use Drupal\migrate_drupal\NodeMigrateType;
/**
* Implements hook_help().
@@ -28,7 +30,10 @@ function migrate_drupal_help($route_name, RouteMatchInterface $route_match) {
/**
* Implements hook_migration_plugins_alter().
*/
-function migrate_drupal_migration_plugins_alter(&$definitions) {
+function migrate_drupal_migration_plugins_alter(array &$definitions) {
+ $module_handler = \Drupal::service('module_handler');
+ $migration_plugin_manager = \Drupal::service('plugin.manager.migration');
+
// This is why the deriver can't do this: the 'd6_taxonomy_vocabulary'
// definition is not available to the deriver as it is running inside
// getDefinitions().
@@ -45,8 +50,8 @@ function migrate_drupal_migration_plugins_alter(&$definitions) {
'plugin' => 'null',
],
];
- $vocabulary_migration = \Drupal::service('plugin.manager.migration')->createStubMigration($vocabulary_migration_definition);
- $translation_active = \Drupal::service('module_handler')->moduleExists('content_translation');
+ $vocabulary_migration = $migration_plugin_manager->createStubMigration($vocabulary_migration_definition);
+ $translation_active = $module_handler->moduleExists('content_translation');
try {
$source_plugin = $vocabulary_migration->getSourcePlugin();
@@ -89,6 +94,49 @@ function migrate_drupal_migration_plugins_alter(&$definitions) {
// When the definitions are loaded it is possible the tables will not
// exist.
}
+ }
+
+ if (!$module_handler->moduleExists('node')) {
+ return;
+ }
+
+ $connection = \Drupal::database();
+ // We need to get the version of the source database in order to check
+ // if the classic or complete node tables have been used in a migration.
+ if (isset($definitions['system_site'])) {
+ // Use the source plugin of the system_site migration to get the
+ // database connection.
+ $migration = $definitions['system_site'];
+ /** @var \Drupal\migrate\Plugin\migrate\source\SqlBase $source_plugin */
+ $source_plugin = $migration_plugin_manager->createStubMigration($migration)
+ ->getSourcePlugin();
+
+ try {
+ $source_connection = $source_plugin->getDatabase();
+ $version = MigrationConfigurationTrait::getLegacyDrupalVersion($source_connection);
+ }
+ catch (\Exception $e) {
+ \Drupal::messenger()
+ ->addError(t('Failed to connect to your database server. The server reports the following message: %error.<ul><li>Is the database server running?</li><li>Does the database exist, and have you entered the correct database name?</li><li>Have you entered the correct username and password?</li><li>Have you entered the correct database hostname?</li></ul>', ['%error' => $e->getMessage()]));
+ }
+ }
+ // If this is a complete node migration then for all migrations, except the
+ // classic node migrations, replace any dependency on a classic node migration
+ // with a dependency on the complete node migration.
+ if (NodeMigrateType::getNodeMigrateType($connection, $version ?? FALSE) === NodeMigrateType::NODE_MIGRATE_TYPE_COMPLETE) {
+ $classic_migration_match = '/d([67])_(node|node_translation|node_revision|node_entity_translation)($|:.*)/';
+ $replace_with_complete_migration = function (&$value, $key, $classic_migration_match) {
+ if (is_string($value)) {
+ $value = preg_replace($classic_migration_match, 'd$1_node_complete$3', $value);
+ }
+ };
+ foreach ($definitions as &$definition) {
+ $is_node_classic_migration = preg_match($classic_migration_match, $definition['id']);
+ if (!$is_node_classic_migration && isset($definition['migration_dependencies'])) {
+ array_walk_recursive($definition['migration_dependencies'], $replace_with_complete_migration, $classic_migration_match);
+ }
+ }
}
+
}
diff --git a/web/core/modules/migrate_drupal/migrate_drupal.post_update.php b/web/core/modules/migrate_drupal/migrate_drupal.post_update.php
index b02d957a81..263b41d9d6 100644
--- a/web/core/modules/migrate_drupal/migrate_drupal.post_update.php
+++ b/web/core/modules/migrate_drupal/migrate_drupal.post_update.php
@@ -13,3 +13,10 @@
function drupal_migrate_post_update_clear_migrate_field_plugin_cache() {
// Empty post-update hook.
}
+
+/**
+ * Uninstall migrate_drupal_multilingual since migrate_drupal is installed.
+ */
+function migrate_drupal_post_update_uninstall_multilingual() {
+ \Drupal::service('module_installer')->uninstall(['migrate_drupal_multilingual']);
+}
diff --git a/web/core/modules/migrate_drupal/src/Annotation/MigrateField.php b/web/core/modules/migrate_drupal/src/Annotation/MigrateField.php
index 9e2804e3d9..f8ebadfa0b 100644
--- a/web/core/modules/migrate_drupal/src/Annotation/MigrateField.php
+++ b/web/core/modules/migrate_drupal/src/Annotation/MigrateField.php
@@ -20,7 +20,7 @@
class MigrateField extends Plugin {
/**
- * @inheritdoc
+ * {@inheritdoc}
*/
public function __construct($values) {
parent::__construct($values);
diff --git a/web/core/modules/migrate_drupal/src/MigrationConfigurationTrait.php b/web/core/modules/migrate_drupal/src/MigrationConfigurationTrait.php
index 8cb60347bc..85a546debe 100644
--- a/web/core/modules/migrate_drupal/src/MigrationConfigurationTrait.php
+++ b/web/core/modules/migrate_drupal/src/MigrationConfigurationTrait.php
@@ -121,8 +121,29 @@ protected function createDatabaseStateSettings(array $database, $drupal_version)
*/
protected function getMigrations($database_state_key, $drupal_version) {
$version_tag = 'Drupal ' . $drupal_version;
- /** @var \Drupal\migrate\Plugin\Migration[] $all_migrations */
+ /** @var \Drupal\migrate\Plugin\MigrationInterface[] $all_migrations */
$all_migrations = $this->getMigrationPluginManager()->createInstancesByTag($version_tag);
+
+ // Unset the node migrations that should not run based on the type of node
+ // migration. That is, if this is a complete node migration then unset the
+ // classic node migrations and if this is a classic node migration then
+ // unset the complete node migrations.
+ $type = NodeMigrateType::getNodeMigrateType(\Drupal::database(), $drupal_version);
+ switch ($type) {
+ case NodeMigrateType::NODE_MIGRATE_TYPE_COMPLETE:
+ $patterns = '/(d' . $drupal_version . '_node:)|(d' . $drupal_version . '_node_translation:)|(d' . $drupal_version . '_node_revision:)|(d7_node_entity_translation:)/';
+ break;
+
+ case NodeMigrateType::NODE_MIGRATE_TYPE_CLASSIC:
+ $patterns = '/(d' . $drupal_version . '_node_complete:)/';
+ break;
+ }
+ foreach ($all_migrations as $key => $migrations) {
+ if (preg_match($patterns, $key)) {
+ unset($all_migrations[$key]);
+ }
+ }
+
$migrations = [];
foreach ($all_migrations as $migration) {
// Skip migrations tagged with any of the follow-up migration tags. They
@@ -132,11 +153,6 @@ protected function getMigrations($database_state_key, $drupal_version) {
if (!empty(array_intersect($migration->getMigrationTags(), $this->getFollowUpMigrationTags()))) {
continue;
}
- // Multilingual migrations require migrate_drupal_multilingual.
- $tags = $migration->getMigrationTags() ?: [];
- if (in_array('Multilingual', $tags, TRUE) && (!\Drupal::service('module_handler')->moduleExists('migrate_drupal_multilingual'))) {
- throw new RequirementsException(sprintf("Install migrate_drupal_multilingual to run migration '%s'.", $migration->getPluginId()));
- }
try {
// @todo https://drupal.org/node/2681867 We should be able to validate
@@ -185,7 +201,7 @@ protected function getFollowUpMigrationTags() {
* A string representing the major branch of Drupal core (e.g. '6' for
* Drupal 6.x), or FALSE if no valid version is matched.
*/
- protected function getLegacyDrupalVersion(Connection $connection) {
+ public static function getLegacyDrupalVersion(Connection $connection) {
// Don't assume because a table of that name exists, that it has the columns
// we're querying. Catch exceptions and report that the source database is
// not Drupal.
diff --git a/web/core/modules/migrate_drupal/src/NodeMigrateType.php b/web/core/modules/migrate_drupal/src/NodeMigrateType.php
new file mode 100644
index 0000000000..54ff90e9ac
--- /dev/null
+++ b/web/core/modules/migrate_drupal/src/NodeMigrateType.php
@@ -0,0 +1,88 @@
+<?php
+
+namespace Drupal\migrate_drupal;
+
+use Drupal\Core\Database\Connection;
+use Drupal\Core\Site\Settings;
+
+/**
+ * Provides a class to determine the type of migration.
+ */
+final class NodeMigrateType {
+
+ use MigrationConfigurationTrait;
+
+ /**
+ * Only the complete node migration map tables are in use.
+ */
+ const NODE_MIGRATE_TYPE_COMPLETE = 'COMPLETE';
+
+ /**
+ * Only the classic node migration map tables are in use.
+ */
+ const NODE_MIGRATE_TYPE_CLASSIC = 'CLASSIC';
+
+ /**
+ * Determines the type of node migration to be used.
+ *
+ * The node complete migration is the default. It is not used when there
+ * are existing tables for dN_node.
+ *
+ * @param \Drupal\Core\Database\Connection $connection
+ * The connection to the target database.
+ * @param string|false $version
+ * The Drupal version of the source database, FALSE if it cannot be
+ * determined.
+ *
+ * @return string
+ * The migrate type.
+ *
+ * @internal
+ */
+ public static function getNodeMigrateType(Connection $connection, $version) {
+ $migrate_node_migrate_type_classic = Settings::get('migrate_node_migrate_type_classic', FALSE);
+ if ($migrate_node_migrate_type_classic) {
+ return static::NODE_MIGRATE_TYPE_CLASSIC;
+ }
+
+ $migrate_type = static::NODE_MIGRATE_TYPE_COMPLETE;
+ if ($version) {
+ // Create the variable name, 'node_has_rows' or 'node_complete_exists' and
+ // set it the default value, FALSE.
+ $node_has_rows = FALSE;
+ $node_complete_has_rows = FALSE;
+
+ // Find out what migrate map tables have rows for the node migrations.
+ // It is either the classic, 'dN_node', or the complete,
+ // 'dN_node_complete', or both. This is used to determine which migrations
+ // are run and if migrations using the node migrations in a
+ // migration_lookup are altered.
+ $bases = ['node', 'node_complete'];
+ $tables = $connection->schema()
+ ->findTables('migrate_map_d' . $version . '_node%');
+ foreach ($bases as $base) {
+ $has_rows = $base . '_has_rows';
+ $base_tables = preg_grep('/^migrate_map_d' . $version . '_' . $base . '_{2}.*$/', $tables);
+ // Set the has_rows True when a map table has rows with a positive
+ // count for the matched migration.
+ foreach ($base_tables as $base_table) {
+ if ($connection->schema()->tableExists($base_table)) {
+ $count = $connection->select($base_table)->countQuery()
+ ->execute()->fetchField();
+ if ($count > 0) {
+ $$has_rows = TRUE;
+ break;
+ }
+ }
+ }
+ }
+
+ // Set the node migration type to use.
+ if ($node_has_rows && !$node_complete_has_rows) {
+ $migrate_type = static::NODE_MIGRATE_TYPE_CLASSIC;
+ }
+ }
+ return $migrate_type;
+ }
+
+}
diff --git a/web/core/modules/migrate_drupal/src/Plugin/migrate/EntityReferenceTranslationDeriver.php b/web/core/modules/migrate_drupal/src/Plugin/migrate/EntityReferenceTranslationDeriver.php
index bc33695860..603cbbe70a 100644
--- a/web/core/modules/migrate_drupal/src/Plugin/migrate/EntityReferenceTranslationDeriver.php
+++ b/web/core/modules/migrate_drupal/src/Plugin/migrate/EntityReferenceTranslationDeriver.php
@@ -66,9 +66,9 @@ class EntityReferenceTranslationDeriver extends DeriverBase implements Container
*
* @param string $base_plugin_id
* The base plugin ID.
- * @param \Drupal\core\Entity\EntityFieldManagerInterface $entity_field_manager
+ * @param \Drupal\Core\Entity\EntityFieldManagerInterface $entity_field_manager
* The entity field manager.
- * @param \Drupal\core\Entity\EntityTypeManagerInterface $entity_type_manager
+ * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
* The entity type manager.
*/
public function __construct($base_plugin_id, EntityFieldManagerInterface $entity_field_manager, EntityTypeManagerInterface $entity_type_manager) {
diff --git a/web/core/modules/migrate_drupal/src/Plugin/migrate/process/NodeCompleteNodeLookup.php b/web/core/modules/migrate_drupal/src/Plugin/migrate/process/NodeCompleteNodeLookup.php
new file mode 100644
index 0000000000..2c2defce03
--- /dev/null
+++ b/web/core/modules/migrate_drupal/src/Plugin/migrate/process/NodeCompleteNodeLookup.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace Drupal\migrate_drupal\Plugin\migrate\process;
+
+use Drupal\migrate\MigrateExecutableInterface;
+use Drupal\migrate\ProcessPluginBase;
+use Drupal\migrate\Row;
+
+/**
+ * Returns only the nid from migration_lookup on node_complete migration.
+ *
+ * It is possible that migration_lookups that use the classic node migrations
+ * in the migration key have been altered to include the complete node
+ * migration. The classic node migration and complete node migration have a
+ * different number of destination keys. This process plugin will ensure that
+ * when the complete node migration is used in the lookup the nid value is
+ * returned. This keeps the behavior the same as the classic node migration.
+ *
+ * @see \Drupal\migrate\Plugin\MigrateProcessInterface
+ *
+ * @MigrateProcessPlugin(
+ * id = "node_complete_node_lookup"
+ * )
+ */
+class NodeCompleteNodeLookup extends ProcessPluginBase {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function transform($value, MigrateExecutableInterface $migrate_executable, Row $row, $destination_property) {
+ if (is_array($value) && count($value) === 3) {
+ return $value[0];
+ }
+ return $value;
+ }
+
+}
diff --git a/web/core/modules/migrate_drupal/src/Plugin/migrate/process/NodeCompleteNodeRevisionLookup.php b/web/core/modules/migrate_drupal/src/Plugin/migrate/process/NodeCompleteNodeRevisionLookup.php
new file mode 100644
index 0000000000..f1bc5a9d3c
--- /dev/null
+++ b/web/core/modules/migrate_drupal/src/Plugin/migrate/process/NodeCompleteNodeRevisionLookup.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace Drupal\migrate_drupal\Plugin\migrate\process;
+
+use Drupal\migrate\MigrateExecutableInterface;
+use Drupal\migrate\ProcessPluginBase;
+use Drupal\migrate\Row;
+
+/**
+ * Returns only the vid from migration_lookup on node_complete migration.
+ *
+ * It is possible that migration_lookups that use the classic node migrations
+ * in the migration key have been altered to include the complete node
+ * migration. The classic node migration and complete node migration have a
+ * different number of destination keys. This process plugin will ensure that
+ * when the complete node migration is used in the lookup the vid value is
+ * returned. This keeps the behavior the same as the classic node migration.
+ *
+ * @see \Drupal\migrate\Plugin\MigrateProcessInterface
+ *
+ * @MigrateProcessPlugin(
+ * id = "node_complete_node_revision_lookup"
+ * )
+ */
+class NodeCompleteNodeRevisionLookup extends ProcessPluginBase {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function transform($value, MigrateExecutableInterface $migrate_executable, Row $row, $destination_property) {
+ if (is_array($value) && count($value) === 3) {
+ return $value[1];
+ }
+ return $value;
+ }
+
+}
diff --git a/web/core/modules/migrate_drupal/src/Plugin/migrate/process/NodeCompleteNodeTranslationLookup.php b/web/core/modules/migrate_drupal/src/Plugin/migrate/process/NodeCompleteNodeTranslationLookup.php
new file mode 100644
index 0000000000..9722273af1
--- /dev/null
+++ b/web/core/modules/migrate_drupal/src/Plugin/migrate/process/NodeCompleteNodeTranslationLookup.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace Drupal\migrate_drupal\Plugin\migrate\process;
+
+use Drupal\migrate\MigrateExecutableInterface;
+use Drupal\migrate\ProcessPluginBase;
+use Drupal\migrate\Row;
+
+/**
+ * Returns nid and langcode from migration_lookup on node_complete migration.
+ *
+ * It is possible that migration_lookups that use the classic node migrations
+ * in the migration key have been altered to include the complete node
+ * migration. The classic node migration and complete node migration have a
+ * different number of destination keys. This process plugin will ensure that
+ * when the complete node migration is used in the lookup the nid and langcode
+ * values are returned. This keeps the behavior the same as the classic node
+ * migration.
+ *
+ * @see \Drupal\migrate\Plugin\MigrateProcessInterface
+ *
+ * @MigrateProcessPlugin(
+ * id = "node_complete_node_translation_lookup"
+ * )
+ */
+class NodeCompleteNodeTranslationLookup extends ProcessPluginBase {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function transform($value, MigrateExecutableInterface $migrate_executable, Row $row, $destination_property) {
+ if (is_array($value) && count($value) === 3) {
+ unset($value[1]);
+ return array_values($value);
+ }
+ return $value;
+ }
+
+}
diff --git a/web/core/modules/migrate_drupal/src/Plugin/migrate/source/ContentEntity.php b/web/core/modules/migrate_drupal/src/Plugin/migrate/source/ContentEntity.php
index e80de1b7f8..a2f38d180c 100644
--- a/web/core/modules/migrate_drupal/src/Plugin/migrate/source/ContentEntity.php
+++ b/web/core/modules/migrate_drupal/src/Plugin/migrate/source/ContentEntity.php
@@ -265,6 +265,10 @@ public function fields() {
public function getIds() {
$id_key = $this->entityType->getKey('id');
$ids[$id_key] = $this->getDefinitionFromEntity($id_key);
+ if ($this->entityType->isRevisionable()) {
+ $revision_key = $this->entityType->getKey('revision');
+ $ids[$revision_key] = $this->getDefinitionFromEntity($revision_key);
+ }
if ($this->entityType->isTranslatable()) {
$langcode_key = $this->entityType->getKey('langcode');
$ids[$langcode_key] = $this->getDefinitionFromEntity($langcode_key);
diff --git a/web/core/modules/migrate_drupal/src/Tests/StubTestTrait.php b/web/core/modules/migrate_drupal/src/Tests/StubTestTrait.php
index 79a2a0fef1..ff42094884 100644
--- a/web/core/modules/migrate_drupal/src/Tests/StubTestTrait.php
+++ b/web/core/modules/migrate_drupal/src/Tests/StubTestTrait.php
@@ -17,16 +17,10 @@ trait StubTestTrait {
* The entity type we are stubbing.
*/
protected function performStubTest($entity_type_id) {
- $entity_id = $this->createStub($entity_type_id);
+ $entity_id = $this->createEntityStub($entity_type_id);
$this->assertNotEmpty($entity_id, 'Stub successfully created');
- if ($entity_id) {
- $violations = $this->validateStub($entity_type_id, $entity_id);
- if (!$this->assertIdentical(count($violations), 0, 'Stub is a valid entity')) {
- foreach ($violations as $violation) {
- $this->fail((string) $violation->getMessage());
- }
- }
- }
+ // When validateStub fails, it will return an array with the violations.
+ $this->assertEmpty($this->validateStub($entity_type_id, $entity_id));
}
/**
@@ -38,7 +32,7 @@ protected function performStubTest($entity_type_id) {
* @return int
* ID of the created entity.
*/
- protected function createStub($entity_type_id) {
+ protected function createEntityStub($entity_type_id) {
// Create a dummy migration to pass to the destination plugin.
$definition = [
'migration_tags' => ['Stub test'],
diff --git a/web/core/modules/migrate_drupal/tests/fixtures/drupal-8.migrate-drupal-multilingual-enabled.php b/web/core/modules/migrate_drupal/tests/fixtures/drupal-8.migrate-drupal-multilingual-enabled.php
new file mode 100644
index 0000000000..905a8e6f4c
--- /dev/null
+++ b/web/core/modules/migrate_drupal/tests/fixtures/drupal-8.migrate-drupal-multilingual-enabled.php
@@ -0,0 +1,36 @@
+<?php
+// @codingStandardsIgnoreFile
+
+use Drupal\Core\Database\Database;
+
+$connection = Database::getConnection();
+
+// Set the schema version.
+$connection->merge('key_value')
+ ->fields([
+ 'value' => 'i:8000;',
+ 'name' => 'migrate_drupal_multilingual',
+ 'collection' => 'system.schema',
+ ])
+ ->condition('collection', 'system.schema')
+ ->condition('name', 'migrate_drupal_multilingual')
+ ->execute();
+
+// Update core.extension.
+$extensions = $connection->select('config')
+ ->fields('config', ['data'])
+ ->condition('collection', '')
+ ->condition('name', 'core.extension')
+ ->execute()
+ ->fetchField();
+$extensions = unserialize($extensions);
+$extensions['module']['migrate_drupal_multilingual'] = 8000;
+$connection->update('config')
+ ->fields([
+ 'data' => serialize($extensions),
+ 'collection' => '',
+ 'name' => 'core.extension',
+ ])
+ ->condition('collection', '')
+ ->condition('name', 'core.extension')
+ ->execute();
diff --git a/web/core/modules/migrate_drupal/tests/fixtures/drupal6.php b/web/core/modules/migrate_drupal/tests/fixtures/drupal6.php
index ca641233d9..a6e4ab7610 100644
--- a/web/core/modules/migrate_drupal/tests/fixtures/drupal6.php
+++ b/web/core/modules/migrate_drupal/tests/fixtures/drupal6.php
@@ -44473,10 +44473,10 @@
'vid' => '1',
'type' => 'story',
'language' => '',
- 'title' => 'Test title',
+ 'title' => 'Test title rev 3',
'uid' => '1',
'status' => '1',
- 'created' => '1388271197',
+ 'created' => '1390095702',
'changed' => '1420861423',
'comment' => '0',
'promote' => '0',
@@ -44507,7 +44507,7 @@
'vid' => '4',
'type' => 'test_planet',
'language' => '',
- 'title' => 'Test planet title 3',
+ 'title' => 'Test page title rev 4',
'uid' => '1',
'status' => '1',
'created' => '1388271527',
@@ -44524,7 +44524,7 @@
'vid' => '6',
'type' => 'test_planet',
'language' => '',
- 'title' => '',
+ 'title' => 'Node 4',
'uid' => '1',
'status' => '1',
'created' => '1388271527',
@@ -44541,7 +44541,7 @@
'vid' => '7',
'type' => 'test_planet',
'language' => '',
- 'title' => '',
+ 'title' => 'Node 5',
'uid' => '1',
'status' => '1',
'created' => '1388271527',
@@ -44558,7 +44558,7 @@
'vid' => '8',
'type' => 'test_planet',
'language' => '',
- 'title' => '',
+ 'title' => 'Node 6',
'uid' => '1',
'status' => '1',
'created' => '1388271527',
@@ -44575,7 +44575,7 @@
'vid' => '9',
'type' => 'test_planet',
'language' => '',
- 'title' => '',
+ 'title' => 'Node 7',
'uid' => '1',
'status' => '1',
'created' => '1388271527',
@@ -44592,7 +44592,7 @@
'vid' => '10',
'type' => 'test_planet',
'language' => '',
- 'title' => '',
+ 'title' => 'Node 8',
'uid' => '1',
'status' => '1',
'created' => '1388271527',
@@ -45288,7 +45288,7 @@
'body' => 'test',
'teaser' => 'test',
'log' => '',
- 'timestamp' => '1420861423',
+ 'timestamp' => '1390095702',
'format' => '1',
))
->values(array(
@@ -45317,10 +45317,10 @@
'nid' => '1',
'vid' => '5',
'uid' => '1',
- 'title' => 'Test title rev 3',
- 'body' => 'body test rev 3',
- 'teaser' => 'teaser test rev 3',
- 'log' => 'modified rev 3',
+ 'title' => 'Test title rev 2',
+ 'body' => 'body test rev 2',
+ 'teaser' => 'teaser test rev 2',
+ 'log' => 'modified rev 2',
'timestamp' => '1390095703',
'format' => '1',
))
@@ -45526,11 +45526,11 @@
'nid' => '1',
'vid' => '2001',
'uid' => '2',
- 'title' => 'Test title rev 2',
- 'body' => 'body test rev 2',
- 'teaser' => 'teaser test rev 2',
- 'log' => 'modified rev 2',
- 'timestamp' => '1390095702',
+ 'title' => 'Test title rev 3',
+ 'body' => 'body test rev 3',
+ 'teaser' => 'teaser test rev 3',
+ 'log' => 'modified rev 3',
+ 'timestamp' => '1420861423',
'format' => '1',
))
->values(array(
@@ -49670,29 +49670,29 @@
'value' => 'i:0;',
))
->values(array(
- 'name' => 'i18n_newnode_current_employee',
+ 'name' => 'i18n_lock_node_sponsor',
'value' => 'i:0;',
))
->values(array(
- 'name' => 'i18n_node_employee',
- 'value' => 's:1:"1";',
-))
-->values(array(
- 'name' => 'i18n_required_node_employee',
+ 'name' => 'i18n_newnode_current_employee',
'value' => 'i:0;',
))
->values(array(
- 'name' => 'i18n_lock_node_sponsor',
+ 'name' => 'i18n_newnode_current_sponsor',
'value' => 'i:0;',
))
->values(array(
- 'name' => 'i18n_newnode_current_sponsor',
- 'value' => 'i:0;',
+ 'name' => 'i18n_node_employee',
+ 'value' => 's:1:"1";',
))
->values(array(
'name' => 'i18n_node_sponsor',
'value' => 'i:1;',
))
+->values(array(
+ 'name' => 'i18n_required_node_employee',
+ 'value' => 'i:0;',
+))
->values(array(
'name' => 'i18n_required_node_sponsor',
'value' => 'i:0;',
diff --git a/web/core/modules/migrate_drupal/tests/fixtures/drupal7.php b/web/core/modules/migrate_drupal/tests/fixtures/drupal7.php
index 8df6422c67..ce6569976c 100644
--- a/web/core/modules/migrate_drupal/tests/fixtures/drupal7.php
+++ b/web/core/modules/migrate_drupal/tests/fixtures/drupal7.php
@@ -3414,6 +3414,42 @@
'created' => '1531922278',
'changed' => '1531922279',
))
+->values(array(
+ 'entity_type' => 'node',
+ 'entity_id' => '11',
+ 'revision_id' => '18',
+ 'language' => 'en',
+ 'source' => '',
+ 'uid' => '1',
+ 'status' => '1',
+ 'translate' => '0',
+ 'created' => '1568261523',
+ 'changed' => '1568261687',
+))
+->values(array(
+ 'entity_type' => 'node',
+ 'entity_id' => '11',
+ 'revision_id' => '18',
+ 'language' => 'fr',
+ 'source' => 'en',
+ 'uid' => '1',
+ 'status' => '1',
+ 'translate' => '0',
+ 'created' => '1568261721',
+ 'changed' => '1568261721',
+))
+->values(array(
+ 'entity_type' => 'node',
+ 'entity_id' => '11',
+ 'revision_id' => '18',
+ 'language' => 'is',
+ 'source' => 'en',
+ 'uid' => '1',
+ 'status' => '1',
+ 'translate' => '0',
+ 'created' => '1568261548',
+ 'changed' => '1568261548',
+))
->execute();
$connection->schema()->createTable('entity_translation_revision', array(
'fields' => array(
@@ -3491,6 +3527,128 @@
'mysql_character_set' => 'utf8',
));
+$connection->insert('entity_translation_revision')
+->fields(array(
+ 'entity_type',
+ 'entity_id',
+ 'revision_id',
+ 'language',
+ 'source',
+ 'uid',
+ 'status',
+ 'translate',
+ 'created',
+ 'changed',
+))
+->values(array(
+ 'entity_type' => 'node',
+ 'entity_id' => '1',
+ 'revision_id' => '1',
+ 'language' => 'en',
+ 'source' => '',
+ 'uid' => '1',
+ 'status' => '1',
+ 'translate' => '0',
+ 'created' => '1529615790',
+ 'changed' => '1529615790',
+))
+->values(array(
+ 'entity_type' => 'node',
+ 'entity_id' => '11',
+ 'revision_id' => '15',
+ 'language' => 'en',
+ 'source' => '',
+ 'uid' => '1',
+ 'status' => '1',
+ 'translate' => '0',
+ 'created' => '1568261523',
+ 'changed' => '1568261523',
+))
+->values(array(
+ 'entity_type' => 'node',
+ 'entity_id' => '11',
+ 'revision_id' => '16',
+ 'language' => 'en',
+ 'source' => '',
+ 'uid' => '1',
+ 'status' => '1',
+ 'translate' => '0',
+ 'created' => '1568261523',
+ 'changed' => '1568261523',
+))
+->values(array(
+ 'entity_type' => 'node',
+ 'entity_id' => '11',
+ 'revision_id' => '17',
+ 'language' => 'en',
+ 'source' => '',
+ 'uid' => '1',
+ 'status' => '1',
+ 'translate' => '0',
+ 'created' => '1568261523',
+ 'changed' => '1568261687',
+))
+->values(array(
+ 'entity_type' => 'node',
+ 'entity_id' => '11',
+ 'revision_id' => '18',
+ 'language' => 'en',
+ 'source' => '',
+ 'uid' => '1',
+ 'status' => '1',
+ 'translate' => '0',
+ 'created' => '1568261523',
+ 'changed' => '1568261687',
+))
+->values(array(
+ 'entity_type' => 'node',
+ 'entity_id' => '11',
+ 'revision_id' => '18',
+ 'language' => 'fr',
+ 'source' => 'en',
+ 'uid' => '1',
+ 'status' => '1',
+ 'translate' => '0',
+ 'created' => '1568261721',
+ 'changed' => '1568261721',
+))
+->values(array(
+ 'entity_type' => 'node',
+ 'entity_id' => '11',
+ 'revision_id' => '16',
+ 'language' => 'is',
+ 'source' => 'en',
+ 'uid' => '1',
+ 'status' => '1',
+ 'translate' => '0',
+ 'created' => '1568261548',
+ 'changed' => '1568261548',
+))
+->values(array(
+ 'entity_type' => 'node',
+ 'entity_id' => '11',
+ 'revision_id' => '17',
+ 'language' => 'is',
+ 'source' => 'en',
+ 'uid' => '1',
+ 'status' => '1',
+ 'translate' => '0',
+ 'created' => '1568261548',
+ 'changed' => '1568261548',
+))
+->values(array(
+ 'entity_type' => 'node',
+ 'entity_id' => '11',
+ 'revision_id' => '18',
+ 'language' => 'is',
+ 'source' => 'en',
+ 'uid' => '1',
+ 'status' => '1',
+ 'translate' => '0',
+ 'created' => '1568261548',
+ 'changed' => '1568261548',
+))
+->execute();
$connection->schema()->createTable('field_config', array(
'fields' => array(
'id' => array(
@@ -4294,6 +4452,66 @@
'translatable' => '1',
'deleted' => '0',
))
+->values(array(
+ 'id' => '50',
+ 'field_name' => 'field_training',
+ 'type' => 'text',
+ 'module' => 'text',
+ 'active' => '1',
+ 'storage_type' => 'field_sql_storage',
+ 'storage_module' => 'field_sql_storage',
+ 'storage_active' => '1',
+ 'locked' => '0',
+ 'data' => 'a:7:{s:12:"translatable";i:1;s:12:"entity_types";a:0:{}s:8:"settings";a:2:{s:10:"max_length";s:3:"255";s:23:"entity_translation_sync";b:0;}s:7:"storage";a:5:{s:4:"type";s:17:"field_sql_storage";s:8:"settings";a:0:{}s:6:"module";s:17:"field_sql_storage";s:6:"active";s:1:"1";s:7:"details";a:1:{s:3:"sql";a:2:{s:18:"FIELD_LOAD_CURRENT";a:1:{s:25:"field_data_field_training";a:2:{s:5:"value";s:20:"field_training_value";s:6:"format";s:21:"field_training_format";}}s:19:"FIELD_LOAD_REVISION";a:1:{s:29:"field_revision_field_training";a:2:{s:5:"value";s:20:"field_training_value";s:6:"format";s:21:"field_training_format";}}}}}s:12:"foreign keys";a:1:{s:6:"format";a:2:{s:5:"table";s:13:"filter_format";s:7:"columns";a:1:{s:6:"format";s:6:"format";}}}s:7:"indexes";a:1:{s:6:"format";a:1:{i:0;s:6:"format";}}s:2:"id";s:2:"50";}',
+ 'cardinality' => '1',
+ 'translatable' => '1',
+ 'deleted' => '0',
+))
+->values(array(
+ 'id' => '51',
+ 'field_name' => 'field_sector',
+ 'type' => 'text',
+ 'module' => 'text',
+ 'active' => '1',
+ 'storage_type' => 'field_sql_storage',
+ 'storage_module' => 'field_sql_storage',
+ 'storage_active' => '1',
+ 'locked' => '0',
+ 'data' => 'a:7:{s:12:"translatable";s:1:"0";s:12:"entity_types";a:0:{}s:8:"settings";a:1:{s:10:"max_length";s:3:"255";}s:7:"storage";a:5:{s:4:"type";s:17:"field_sql_storage";s:8:"settings";a:0:{}s:6:"module";s:17:"field_sql_storage";s:6:"active";s:1:"1";s:7:"details";a:1:{s:3:"sql";a:2:{s:18:"FIELD_LOAD_CURRENT";a:1:{s:23:"field_data_field_sector";a:2:{s:5:"value";s:18:"field_sector_value";s:6:"format";s:19:"field_sector_format";}}s:19:"FIELD_LOAD_REVISION";a:1:{s:27:"field_revision_field_sector";a:2:{s:5:"value";s:18:"field_sector_value";s:6:"format";s:19:"field_sector_format";}}}}}s:12:"foreign keys";a:1:{s:6:"format";a:2:{s:5:"table";s:13:"filter_format";s:7:"columns";a:1:{s:6:"format";s:6:"format";}}}s:7:"indexes";a:1:{s:6:"format";a:1:{i:0;s:6:"format";}}s:2:"id";s:2:"51";}',
+ 'cardinality' => '1',
+ 'translatable' => '0',
+ 'deleted' => '0',
+))
+->values(array(
+ 'id' => '52',
+ 'field_name' => 'field_chancellor',
+ 'type' => 'text',
+ 'module' => 'text',
+ 'active' => '1',
+ 'storage_type' => 'field_sql_storage',
+ 'storage_module' => 'field_sql_storage',
+ 'storage_active' => '1',
+ 'locked' => '0',
+ 'data' => 'a:7:{s:12:"translatable";s:1:"0";s:12:"entity_types";a:0:{}s:8:"settings";a:1:{s:10:"max_length";s:3:"255";}s:7:"storage";a:5:{s:4:"type";s:17:"field_sql_storage";s:8:"settings";a:0:{}s:6:"module";s:17:"field_sql_storage";s:6:"active";s:1:"1";s:7:"details";a:1:{s:3:"sql";a:2:{s:18:"FIELD_LOAD_CURRENT";a:1:{s:27:"field_data_field_chancellor";a:2:{s:5:"value";s:22:"field_chancellor_value";s:6:"format";s:23:"field_chancellor_format";}}s:19:"FIELD_LOAD_REVISION";a:1:{s:31:"field_revision_field_chancellor";a:2:{s:5:"value";s:22:"field_chancellor_value";s:6:"format";s:23:"field_chancellor_format";}}}}}s:12:"foreign keys";a:1:{s:6:"format";a:2:{s:5:"table";s:13:"filter_format";s:7:"columns";a:1:{s:6:"format";s:6:"format";}}}s:7:"indexes";a:1:{s:6:"format";a:1:{i:0;s:6:"format";}}s:2:"id";s:2:"52";}',
+ 'cardinality' => '1',
+ 'translatable' => '0',
+ 'deleted' => '0',
+))
+->values(array(
+ 'id' => '53',
+ 'field_name' => 'field_tree',
+ 'type' => 'text',
+ 'module' => 'text',
+ 'active' => '1',
+ 'storage_type' => 'field_sql_storage',
+ 'storage_module' => 'field_sql_storage',
+ 'storage_active' => '1',
+ 'locked' => '0',
+ 'data' => 'a:7:{s:12:"translatable";i:1;s:12:"entity_types";a:0:{}s:8:"settings";a:2:{s:10:"max_length";s:3:"255";s:23:"entity_translation_sync";b:0;}s:7:"storage";a:5:{s:4:"type";s:17:"field_sql_storage";s:8:"settings";a:0:{}s:6:"module";s:17:"field_sql_storage";s:6:"active";s:1:"1";s:7:"details";a:1:{s:3:"sql";a:2:{s:18:"FIELD_LOAD_CURRENT";a:1:{s:21:"field_data_field_tree";a:2:{s:5:"value";s:16:"field_tree_value";s:6:"format";s:17:"field_tree_format";}}s:19:"FIELD_LOAD_REVISION";a:1:{s:25:"field_revision_field_tree";a:2:{s:5:"value";s:16:"field_tree_value";s:6:"format";s:17:"field_tree_format";}}}}}s:12:"foreign keys";a:1:{s:6:"format";a:2:{s:5:"table";s:13:"filter_format";s:7:"columns";a:1:{s:6:"format";s:6:"format";}}}s:7:"indexes";a:1:{s:6:"format";a:1:{i:0;s:6:"format";}}s:2:"id";s:1:"5";}',
+ 'cardinality' => '1',
+ 'translatable' => '1',
+ 'deleted' => '0',
+))
->execute();
$connection->schema()->createTable('field_config_instance', array(
'fields' => array(
@@ -5028,6 +5246,42 @@
'data' => 'a:6:{s:5:"label";s:7:"Boolean";s:6:"widget";a:4:{s:4:"type";s:13:"options_onoff";s:6:"weight";s:2:"14";s:8:"settings";a:1:{s:13:"display_label";i:0;}s:6:"module";s:7:"options";}s:8:"settings";a:2:{s:18:"user_register_form";b:0;s:23:"entity_translation_sync";b:0;}s:7:"display";a:1:{s:7:"default";a:5:{s:5:"label";s:5:"above";s:4:"type";s:12:"list_default";s:8:"settings";a:0:{}s:6:"module";s:4:"list";s:6:"weight";i:12;}}s:8:"required";b:0;s:11:"description";s:0:"";}',
'deleted' => '0',
))
+->values(array(
+ 'id' => '79',
+ 'field_id' => '50',
+ 'field_name' => 'field_training',
+ 'entity_type' => 'taxonomy_term',
+ 'bundle' => 'vocabfixed',
+ 'data' => 'a:7:{s:5:"label";s:8:"Training";s:6:"widget";a:5:{s:6:"weight";s:1:"1";s:4:"type";s:14:"text_textfield";s:6:"module";s:4:"text";s:6:"active";i:1;s:8:"settings";a:1:{s:4:"size";s:2:"60";}}s:8:"settings";a:3:{s:15:"text_processing";s:1:"0";s:18:"user_register_form";b:0;s:23:"entity_translation_sync";b:0;}s:7:"display";a:1:{s:7:"default";a:5:{s:5:"label";s:5:"above";s:4:"type";s:12:"text_default";s:8:"settings";a:0:{}s:6:"module";s:4:"text";s:6:"weight";i:0;}}s:8:"required";i:0;s:11:"description";s:0:"";s:13:"default_value";N;}',
+ 'deleted' => '0',
+))
+->values(array(
+ 'id' => '80',
+ 'field_id' => '51',
+ 'field_name' => 'field_sector',
+ 'entity_type' => 'taxonomy_term',
+ 'bundle' => 'vocablocalized',
+ 'data' => 'a:7:{s:5:"label";s:6:"Sector";s:6:"widget";a:5:{s:6:"weight";s:1:"1";s:4:"type";s:14:"text_textfield";s:6:"module";s:4:"text";s:6:"active";i:1;s:8:"settings";a:1:{s:4:"size";s:2:"60";}}s:8:"settings";a:2:{s:15:"text_processing";s:1:"0";s:18:"user_register_form";b:0;}s:7:"display";a:1:{s:7:"default";a:5:{s:5:"label";s:5:"above";s:4:"type";s:12:"text_default";s:8:"settings";a:0:{}s:6:"module";s:4:"text";s:6:"weight";i:0;}}s:8:"required";i:0;s:11:"description";s:0:"";s:13:"default_value";N;}',
+ 'deleted' => '0',
+))
+->values(array(
+ 'id' => '81',
+ 'field_id' => '52',
+ 'field_name' => 'field_chancellor',
+ 'entity_type' => 'taxonomy_term',
+ 'bundle' => 'vocabtranslate',
+ 'data' => 'a:7:{s:5:"label";s:10:"Chancellor";s:6:"widget";a:5:{s:6:"weight";s:1:"1";s:4:"type";s:14:"text_textfield";s:6:"module";s:4:"text";s:6:"active";i:1;s:8:"settings";a:1:{s:4:"size";s:2:"60";}}s:8:"settings";a:2:{s:15:"text_processing";s:1:"0";s:18:"user_register_form";b:0;}s:7:"display";a:1:{s:7:"default";a:5:{s:5:"label";s:5:"above";s:4:"type";s:12:"text_default";s:8:"settings";a:0:{}s:6:"module";s:4:"text";s:6:"weight";i:0;}}s:8:"required";i:0;s:11:"description";s:0:"";s:13:"default_value";N;}',
+ 'deleted' => '0',
+))
+->values(array(
+ 'id' => '82',
+ 'field_id' => '53',
+ 'field_name' => 'field_tree',
+ 'entity_type' => 'node',
+ 'bundle' => 'et',
+ 'data' => 'a:7:{s:5:"label";s:4:"tree";s:6:"widget";a:5:{s:6:"weight";s:2:"-3";s:4:"type";s:14:"text_textfield";s:6:"module";s:4:"text";s:6:"active";i:1;s:8:"settings";a:1:{s:4:"size";s:2:"60";}}s:8:"settings";a:3:{s:15:"text_processing";s:1:"0";s:18:"user_register_form";b:0;s:23:"entity_translation_sync";b:0;}s:7:"display";a:1:{s:7:"default";a:5:{s:5:"label";s:5:"above";s:4:"type";s:12:"text_default";s:8:"settings";a:0:{}s:6:"module";s:4:"text";s:6:"weight";i:1;}}s:8:"required";i:0;s:11:"description";s:0:"";s:13:"default_value";N;}',
+ 'deleted' => '0',
+))
->execute();
$connection->schema()->createTable('field_data_body', array(
'fields' => array(
@@ -5117,7 +5371,7 @@
'bundle' => 'article',
'deleted' => '0',
'entity_id' => '2',
- 'revision_id' => '2',
+ 'revision_id' => '11',
'language' => 'und',
'delta' => '0',
'body_value' => "...is that it's the absolute best show ever. Trust me, I would know.",
@@ -5129,7 +5383,7 @@
'bundle' => 'article',
'deleted' => '0',
'entity_id' => '3',
- 'revision_id' => '3',
+ 'revision_id' => '12',
'language' => 'und',
'delta' => '0',
'body_value' => "is - ...is that it's the absolute best show ever. Trust me, I would know.",
@@ -5172,6 +5426,18 @@
'body_summary' => '',
'body_format' => 'filtered_html',
))
+->values(array(
+ 'entity_type' => 'node',
+ 'bundle' => 'et',
+ 'deleted' => '0',
+ 'entity_id' => '11',
+ 'revision_id' => '18',
+ 'language' => 'und',
+ 'delta' => '0',
+ 'body_value' => '2nd',
+ 'body_summary' => '',
+ 'body_format' => 'filtered_html',
+))
->execute();
$connection->schema()->createTable('field_data_comment_body', array(
'fields' => array(
@@ -5557,6 +5823,129 @@
'field_boolean_value' => '1',
))
->execute();
+$connection->schema()->createTable('field_data_field_chancellor', array(
+ 'fields' => array(
+ 'entity_type' => array(
+ 'type' => 'varchar',
+ 'not null' => TRUE,
+ 'length' => '128',
+ 'default' => '',
+ ),
+ 'bundle' => array(
+ 'type' => 'varchar',
+ 'not null' => TRUE,
+ 'length' => '128',
+ 'default' => '',
+ ),
+ 'deleted' => array(
+ 'type' => 'int',
+ 'not null' => TRUE,
+ 'size' => 'tiny',
+ 'default' => '0',
+ ),
+ 'entity_id' => array(
+ 'type' => 'int',
+ 'not null' => TRUE,
+ 'size' => 'normal',
+ 'unsigned' => TRUE,
+ ),
+ 'revision_id' => array(
+ 'type' => 'int',
+ 'not null' => FALSE,
+ 'size' => 'normal',
+ 'unsigned' => TRUE,
+ ),
+ 'language' => array(
+ 'type' => 'varchar',
+ 'not null' => TRUE,
+ 'length' => '32',
+ 'default' => '',
+ ),
+ 'delta' => array(
+ 'type' => 'int',
+ 'not null' => TRUE,
+ 'size' => 'normal',
+ 'unsigned' => TRUE,
+ ),
+ 'field_chancellor_value' => array(
+ 'type' => 'varchar',
+ 'not null' => FALSE,
+ 'length' => '255',
+ ),
+ 'field_chancellor_format' => array(
+ 'type' => 'varchar',
+ 'not null' => FALSE,
+ 'length' => '255',
+ ),
+ ),
+ 'primary key' => array(
+ 'entity_type',
+ 'entity_id',
+ 'deleted',
+ 'delta',
+ 'language',
+ ),
+ 'indexes' => array(
+ 'entity_type' => array(
+ 'entity_type',
+ ),
+ 'bundle' => array(
+ 'bundle',
+ ),
+ 'deleted' => array(
+ 'deleted',
+ ),
+ 'entity_id' => array(
+ 'entity_id',
+ ),
+ 'revision_id' => array(
+ 'revision_id',
+ ),
+ 'language' => array(
+ 'language',
+ ),
+ 'field_chancellor_format' => array(
+ 'field_chancellor_format',
+ ),
+ ),
+ 'mysql_character_set' => 'utf8',
+));
+
+$connection->insert('field_data_field_chancellor')
+->fields(array(
+ 'entity_type',
+ 'bundle',
+ 'deleted',
+ 'entity_id',
+ 'revision_id',
+ 'language',
+ 'delta',
+ 'field_chancellor_value',
+ 'field_chancellor_format',
+))
+->values(array(
+ 'entity_type' => 'taxonomy_term',
+ 'bundle' => 'vocabtranslate',
+ 'deleted' => '0',
+ 'entity_id' => '21',
+ 'revision_id' => '21',
+ 'language' => 'und',
+ 'delta' => '0',
+ 'field_chancellor_value' => "K'mpec",
+ 'field_chancellor_format' => NULL,
+))
+->values(array(
+ 'entity_type' => 'taxonomy_term',
+ 'bundle' => 'vocabtranslate',
+ 'deleted' => '0',
+ 'entity_id' => '22',
+ 'revision_id' => '22',
+ 'language' => 'und',
+ 'delta' => '0',
+ 'field_chancellor_value' => "fr - K'mpec",
+ 'field_chancellor_format' => NULL,
+))
+->execute();
$connection->schema()->createTable('field_data_field_color', array(
'fields' => array(
'entity_type' => array(
@@ -6994,23 +7383,23 @@
'bundle' => 'article',
'deleted' => '0',
'entity_id' => '2',
- 'revision_id' => '2',
+ 'revision_id' => '11',
'language' => 'und',
'delta' => '0',
'field_link_url' => '<front>',
- 'field_link_title' => 'Home',
- 'field_link_attributes' => 'a:0:{}',
+ 'field_link_title' => NULL,
+ 'field_link_attributes' => 'a:1:{s:5:"title";s:0:"";}',
))
->values(array(
'entity_type' => 'node',
'bundle' => 'article',
'deleted' => '0',
'entity_id' => '3',
- 'revision_id' => '3',
+ 'revision_id' => '12',
'language' => 'und',
'delta' => '0',
'field_link_url' => '<front>',
- 'field_link_title' => 'Home',
+ 'field_link_title' => NULL,
'field_link_attributes' => 'a:1:{s:5:"title";s:0:"";}',
))
->execute();
@@ -7622,7 +8011,7 @@
'bundle' => 'article',
'deleted' => '0',
'entity_id' => '2',
- 'revision_id' => '2',
+ 'revision_id' => '11',
'language' => 'und',
'delta' => '0',
'field_reference_target_id' => '5',
@@ -7632,7 +8021,7 @@
'bundle' => 'article',
'deleted' => '0',
'entity_id' => '3',
- 'revision_id' => '3',
+ 'revision_id' => '12',
'language' => 'und',
'delta' => '0',
'field_reference_target_id' => '4',
@@ -7642,7 +8031,7 @@
'bundle' => 'article',
'deleted' => '0',
'entity_id' => '4',
- 'revision_id' => '4',
+ 'revision_id' => '13',
'language' => 'und',
'delta' => '0',
'field_reference_target_id' => '3',
@@ -7652,7 +8041,7 @@
'bundle' => 'article',
'deleted' => '0',
'entity_id' => '5',
- 'revision_id' => '5',
+ 'revision_id' => '14',
'language' => 'und',
'delta' => '0',
'field_reference_target_id' => '2',
@@ -7758,7 +8147,7 @@
'bundle' => 'article',
'deleted' => '0',
'entity_id' => '2',
- 'revision_id' => '2',
+ 'revision_id' => '11',
'language' => 'und',
'delta' => '0',
'field_reference_2_target_id' => '5',
@@ -7768,7 +8157,7 @@
'bundle' => 'article',
'deleted' => '0',
'entity_id' => '3',
- 'revision_id' => '3',
+ 'revision_id' => '12',
'language' => 'und',
'delta' => '0',
'field_reference_2_target_id' => '4',
@@ -7778,7 +8167,7 @@
'bundle' => 'article',
'deleted' => '0',
'entity_id' => '4',
- 'revision_id' => '4',
+ 'revision_id' => '13',
'language' => 'und',
'delta' => '0',
'field_reference_2_target_id' => '3',
@@ -7788,12 +8177,124 @@
'bundle' => 'article',
'deleted' => '0',
'entity_id' => '5',
- 'revision_id' => '5',
+ 'revision_id' => '14',
'language' => 'und',
'delta' => '0',
'field_reference_2_target_id' => '2',
))
->execute();
+$connection->schema()->createTable('field_data_field_sector', array(
+ 'fields' => array(
+ 'entity_type' => array(
+ 'type' => 'varchar',
+ 'not null' => TRUE,
+ 'length' => '128',
+ 'default' => '',
+ ),
+ 'bundle' => array(
+ 'type' => 'varchar',
+ 'not null' => TRUE,
+ 'length' => '128',
+ 'default' => '',
+ ),
+ 'deleted' => array(
+ 'type' => 'int',
+ 'not null' => TRUE,
+ 'size' => 'tiny',
+ 'default' => '0',
+ ),
+ 'entity_id' => array(
+ 'type' => 'int',
+ 'not null' => TRUE,
+ 'size' => 'normal',
+ 'unsigned' => TRUE,
+ ),
+ 'revision_id' => array(
+ 'type' => 'int',
+ 'not null' => FALSE,
+ 'size' => 'normal',
+ 'unsigned' => TRUE,
+ ),
+ 'language' => array(
+ 'type' => 'varchar',
+ 'not null' => TRUE,
+ 'length' => '32',
+ 'default' => '',
+ ),
+ 'delta' => array(
+ 'type' => 'int',
+ 'not null' => TRUE,
+ 'size' => 'normal',
+ 'unsigned' => TRUE,
+ ),
+ 'field_sector_value' => array(
+ 'type' => 'varchar',
+ 'not null' => FALSE,
+ 'length' => '255',
+ ),
+ 'field_sector_format' => array(
+ 'type' => 'varchar',
+ 'not null' => FALSE,
+ 'length' => '255',
+ ),
+ ),
+ 'primary key' => array(
+ 'entity_type',
+ 'entity_id',
+ 'deleted',
+ 'delta',
+ 'language',
+ ),
+ 'indexes' => array(
+ 'entity_type' => array(
+ 'entity_type',
+ ),
+ 'bundle' => array(
+ 'bundle',
+ ),
+ 'deleted' => array(
+ 'deleted',
+ ),
+ 'entity_id' => array(
+ 'entity_id',
+ ),
+ 'revision_id' => array(
+ 'revision_id',
+ ),
+ 'language' => array(
+ 'language',
+ ),
+ 'field_sector_format' => array(
+ 'field_sector_format',
+ ),
+ ),
+ 'mysql_character_set' => 'utf8',
+));
+
+$connection->insert('field_data_field_sector')
+->fields(array(
+ 'entity_type',
+ 'bundle',
+ 'deleted',
+ 'entity_id',
+ 'revision_id',
+ 'language',
+ 'delta',
+ 'field_sector_value',
+ 'field_sector_format',
+))
+->values(array(
+ 'entity_type' => 'taxonomy_term',
+ 'bundle' => 'vocablocalized',
+ 'deleted' => '0',
+ 'entity_id' => '20',
+ 'revision_id' => '20',
+ 'language' => 'und',
+ 'delta' => '0',
+ 'field_sector_value' => 'Bajor',
+ 'field_sector_format' => NULL,
+))
+->execute();
$connection->schema()->createTable('field_data_field_tags', array(
'fields' => array(
'entity_type' => array(
@@ -7871,7 +8372,7 @@
'bundle' => 'article',
'deleted' => '0',
'entity_id' => '2',
- 'revision_id' => '2',
+ 'revision_id' => '11',
'language' => 'und',
'delta' => '0',
'field_tags_tid' => '9',
@@ -7881,7 +8382,7 @@
'bundle' => 'article',
'deleted' => '0',
'entity_id' => '3',
- 'revision_id' => '3',
+ 'revision_id' => '12',
'language' => 'und',
'delta' => '0',
'field_tags_tid' => '9',
@@ -7891,7 +8392,7 @@
'bundle' => 'article',
'deleted' => '0',
'entity_id' => '2',
- 'revision_id' => '2',
+ 'revision_id' => '11',
'language' => 'und',
'delta' => '1',
'field_tags_tid' => '14',
@@ -7901,7 +8402,7 @@
'bundle' => 'article',
'deleted' => '0',
'entity_id' => '3',
- 'revision_id' => '3',
+ 'revision_id' => '12',
'language' => 'und',
'delta' => '1',
'field_tags_tid' => '14',
@@ -7911,7 +8412,7 @@
'bundle' => 'article',
'deleted' => '0',
'entity_id' => '2',
- 'revision_id' => '2',
+ 'revision_id' => '11',
'language' => 'und',
'delta' => '2',
'field_tags_tid' => '17',
@@ -7921,7 +8422,7 @@
'bundle' => 'article',
'deleted' => '0',
'entity_id' => '3',
- 'revision_id' => '3',
+ 'revision_id' => '12',
'language' => 'und',
'delta' => '2',
'field_tags_tid' => '17',
@@ -8579,6 +9080,63 @@
),
'mysql_character_set' => 'utf8',
));
+$connection->insert('field_data_field_text_long_plain')
+->fields(array(
+ 'entity_type',
+ 'bundle',
+ 'deleted',
+ 'entity_id',
+ 'revision_id',
+ 'language',
+ 'delta',
+ 'field_text_long_plain_value',
+ 'field_text_long_plain_format',
+))
+->values(array(
+ 'entity_type' => 'node',
+ 'bundle' => 'article',
+ 'deleted' => '0',
+ 'entity_id' => '2',
+ 'revision_id' => '11',
+ 'language' => 'und',
+ 'delta' => '0',
+ 'field_text_long_plain_value' => 'DS9 2nd rev',
+ 'field_text_long_plain_format' => NULL,
+))
+->values(array(
+ 'entity_type' => 'node',
+ 'bundle' => 'article',
+ 'deleted' => '0',
+ 'entity_id' => '3',
+ 'revision_id' => '12',
+ 'language' => 'und',
+ 'delta' => '0',
+ 'field_text_long_plain_value' => 'is - DS9 2nd rev',
+ 'field_text_long_plain_format' => NULL,
+))
+->values(array(
+ 'entity_type' => 'node',
+ 'bundle' => 'article',
+ 'deleted' => '0',
+ 'entity_id' => '4',
+ 'revision_id' => '13',
+ 'language' => 'und',
+ 'delta' => '0',
+ 'field_text_long_plain_value' => 'is - Firefly 2nd rev',
+ 'field_text_long_plain_format' => NULL,
+))
+->values(array(
+ 'entity_type' => 'node',
+ 'bundle' => 'article',
+ 'deleted' => '0',
+ 'entity_id' => '5',
+ 'revision_id' => '14',
+ 'language' => 'und',
+ 'delta' => '0',
+ 'field_text_long_plain_value' => 'Firefly 2nd rev',
+ 'field_text_long_plain_format' => NULL,
+))
+->execute();
$connection->schema()->createTable('field_data_field_text_long_plain_filtered', array(
'fields' => array(
@@ -8763,40 +9321,40 @@
));
$connection->insert('field_data_field_text_plain')
- ->fields(array(
- 'entity_type',
- 'bundle',
- 'deleted',
- 'entity_id',
- 'revision_id',
- 'language',
- 'delta',
- 'field_text_plain_value',
- 'field_text_plain_format',
- ))
- ->values(array(
- 'entity_type' => 'node',
- 'bundle' => 'article',
- 'deleted' => '0',
- 'entity_id' => '2',
- 'revision_id' => '2',
- 'language' => 'und',
- 'delta' => '0',
- 'field_text_plain_value' => 'Kai Opaka',
- 'field_text_plain_format' => NULL,
- ))
- ->values(array(
- 'entity_type' => 'node',
- 'bundle' => 'article',
- 'deleted' => '0',
- 'entity_id' => '3',
- 'revision_id' => '3',
- 'language' => 'und',
- 'delta' => '0',
- 'field_text_plain_value' => 'Kai Opaka',
- 'field_text_plain_format' => NULL,
- ))
- ->execute();
+->fields(array(
+ 'entity_type',
+ 'bundle',
+ 'deleted',
+ 'entity_id',
+ 'revision_id',
+ 'language',
+ 'delta',
+ 'field_text_plain_value',
+ 'field_text_plain_format',
+))
+->values(array(
+ 'entity_type' => 'node',
+ 'bundle' => 'article',
+ 'deleted' => '0',
+ 'entity_id' => '2',
+ 'revision_id' => '11',
+ 'language' => 'und',
+ 'delta' => '0',
+ 'field_text_plain_value' => 'Kai Opaka',
+ 'field_text_plain_format' => NULL,
+))
+->values(array(
+ 'entity_type' => 'node',
+ 'bundle' => 'article',
+ 'deleted' => '0',
+ 'entity_id' => '3',
+ 'revision_id' => '12',
+ 'language' => 'und',
+ 'delta' => '0',
+ 'field_text_plain_value' => 'Kai Opaka',
+ 'field_text_plain_format' => NULL,
+))
+->execute();
$connection->schema()->createTable('field_data_field_text_plain_filtered', array(
'fields' => array(
'entity_type' => array(
@@ -9176,7 +9734,7 @@
'mysql_character_set' => 'utf8',
));
-$connection->schema()->createTable('field_data_field_user_entityreference', array(
+$connection->schema()->createTable('field_data_field_training', array(
'fields' => array(
'entity_type' => array(
'type' => 'varchar',
@@ -9220,11 +9778,15 @@
'size' => 'normal',
'unsigned' => TRUE,
),
- 'field_user_entityreference_target_id' => array(
- 'type' => 'int',
- 'not null' => TRUE,
- 'size' => 'normal',
- 'unsigned' => TRUE,
+ 'field_training_value' => array(
+ 'type' => 'varchar',
+ 'not null' => FALSE,
+ 'length' => '255',
+ ),
+ 'field_training_format' => array(
+ 'type' => 'varchar',
+ 'not null' => FALSE,
+ 'length' => '255',
),
),
'primary key' => array(
@@ -9253,14 +9815,14 @@
'language' => array(
'language',
),
- 'field_user_entityreference_target_id' => array(
- 'field_user_entityreference_target_id',
+ 'field_training_format' => array(
+ 'field_training_format',
),
),
'mysql_character_set' => 'utf8',
));
-$connection->insert('field_data_field_user_entityreference')
+$connection->insert('field_data_field_training')
->fields(array(
'entity_type',
'bundle',
@@ -9269,20 +9831,22 @@
'revision_id',
'language',
'delta',
- 'field_user_entityreference_target_id',
+ 'field_training_value',
+ 'field_training_format',
))
->values(array(
- 'entity_type' => 'node',
- 'bundle' => 'test_content_type',
+ 'entity_type' => 'taxonomy_term',
+ 'bundle' => 'vocabfixed',
'deleted' => '0',
- 'entity_id' => '1',
- 'revision_id' => '1',
- 'language' => 'und',
+ 'entity_id' => '24',
+ 'revision_id' => '24',
+ 'language' => 'fr',
'delta' => '0',
- 'field_user_entityreference_target_id' => '2',
+ 'field_training_value' => 'fr - specialist',
+ 'field_training_format' => NULL,
))
->execute();
-$connection->schema()->createTable('field_data_field_vocab_fixed', array(
+$connection->schema()->createTable('field_data_field_tree', array(
'fields' => array(
'entity_type' => array(
'type' => 'varchar',
@@ -9326,11 +9890,15 @@
'size' => 'normal',
'unsigned' => TRUE,
),
- 'field_vocab_fixed_tid' => array(
- 'type' => 'int',
+ 'field_tree_value' => array(
+ 'type' => 'varchar',
'not null' => FALSE,
- 'size' => 'normal',
- 'unsigned' => TRUE,
+ 'length' => '255',
+ ),
+ 'field_tree_format' => array(
+ 'type' => 'varchar',
+ 'not null' => FALSE,
+ 'length' => '255',
),
),
'primary key' => array(
@@ -9359,14 +9927,17 @@
'language' => array(
'language',
),
- 'field_vocab_fixed_tid' => array(
- 'field_vocab_fixed_tid',
+ 'field_tree_format' => array(
+ array(
+ 'field_tree_format',
+ '191',
+ ),
),
),
'mysql_character_set' => 'utf8',
));
-$connection->insert('field_data_field_vocab_fixed')
+$connection->insert('field_data_field_tree')
->fields(array(
'entity_type',
'bundle',
@@ -9375,20 +9946,256 @@
'revision_id',
'language',
'delta',
- 'field_vocab_fixed_tid',
+ 'field_tree_value',
+ 'field_tree_format',
))
->values(array(
'entity_type' => 'node',
- 'bundle' => 'article',
+ 'bundle' => 'et',
'deleted' => '0',
- 'entity_id' => '2',
- 'revision_id' => '2',
- 'language' => 'und',
+ 'entity_id' => '11',
+ 'revision_id' => '18',
+ 'language' => 'en',
'delta' => '0',
- 'field_vocab_fixed_tid' => '24',
+ 'field_tree_value' => 'lancewood',
+ 'field_tree_format' => NULL,
+))
+->values(array(
+ 'entity_type' => 'node',
+ 'bundle' => 'et',
+ 'deleted' => '0',
+ 'entity_id' => '11',
+ 'revision_id' => '18',
+ 'language' => 'fr',
+ 'delta' => '0',
+ 'field_tree_value' => 'fr - lancewood',
+ 'field_tree_format' => NULL,
+))
+->values(array(
+ 'entity_type' => 'node',
+ 'bundle' => 'et',
+ 'deleted' => '0',
+ 'entity_id' => '11',
+ 'revision_id' => '18',
+ 'language' => 'is',
+ 'delta' => '0',
+ 'field_tree_value' => 'is - lancewood',
+ 'field_tree_format' => NULL,
))
->execute();
-$connection->schema()->createTable('field_data_field_vocab_localize', array(
+$connection->schema()->createTable('field_data_field_user_entityreference', array(
+ 'fields' => array(
+ 'entity_type' => array(
+ 'type' => 'varchar',
+ 'not null' => TRUE,
+ 'length' => '128',
+ 'default' => '',
+ ),
+ 'bundle' => array(
+ 'type' => 'varchar',
+ 'not null' => TRUE,
+ 'length' => '128',
+ 'default' => '',
+ ),
+ 'deleted' => array(
+ 'type' => 'int',
+ 'not null' => TRUE,
+ 'size' => 'tiny',
+ 'default' => '0',
+ ),
+ 'entity_id' => array(
+ 'type' => 'int',
+ 'not null' => TRUE,
+ 'size' => 'normal',
+ 'unsigned' => TRUE,
+ ),
+ 'revision_id' => array(
+ 'type' => 'int',
+ 'not null' => FALSE,
+ 'size' => 'normal',
+ 'unsigned' => TRUE,
+ ),
+ 'language' => array(
+ 'type' => 'varchar',
+ 'not null' => TRUE,
+ 'length' => '32',
+ 'default' => '',
+ ),
+ 'delta' => array(
+ 'type' => 'int',
+ 'not null' => TRUE,
+ 'size' => 'normal',
+ 'unsigned' => TRUE,
+ ),
+ 'field_user_entityreference_target_id' => array(
+ 'type' => 'int',
+ 'not null' => TRUE,
+ 'size' => 'normal',
+ 'unsigned' => TRUE,
+ ),
+ ),
+ 'primary key' => array(
+ 'entity_type',
+ 'entity_id',
+ 'deleted',
+ 'delta',
+ 'language',
+ ),
+ 'indexes' => array(
+ 'entity_type' => array(
+ 'entity_type',
+ ),
+ 'bundle' => array(
+ 'bundle',
+ ),
+ 'deleted' => array(
+ 'deleted',
+ ),
+ 'entity_id' => array(
+ 'entity_id',
+ ),
+ 'revision_id' => array(
+ 'revision_id',
+ ),
+ 'language' => array(
+ 'language',
+ ),
+ 'field_user_entityreference_target_id' => array(
+ 'field_user_entityreference_target_id',
+ ),
+ ),
+ 'mysql_character_set' => 'utf8',
+));
+
+$connection->insert('field_data_field_user_entityreference')
+->fields(array(
+ 'entity_type',
+ 'bundle',
+ 'deleted',
+ 'entity_id',
+ 'revision_id',
+ 'language',
+ 'delta',
+ 'field_user_entityreference_target_id',
+))
+->values(array(
+ 'entity_type' => 'node',
+ 'bundle' => 'test_content_type',
+ 'deleted' => '0',
+ 'entity_id' => '2',
+ 'revision_id' => '11',
+ 'language' => 'und',
+ 'delta' => '0',
+ 'field_user_entityreference_target_id' => '2',
+))
+->execute();
+$connection->schema()->createTable('field_data_field_vocab_fixed', array(
+ 'fields' => array(
+ 'entity_type' => array(
+ 'type' => 'varchar',
+ 'not null' => TRUE,
+ 'length' => '128',
+ 'default' => '',
+ ),
+ 'bundle' => array(
+ 'type' => 'varchar',
+ 'not null' => TRUE,
+ 'length' => '128',
+ 'default' => '',
+ ),
+ 'deleted' => array(
+ 'type' => 'int',
+ 'not null' => TRUE,
+ 'size' => 'tiny',
+ 'default' => '0',
+ ),
+ 'entity_id' => array(
+ 'type' => 'int',
+ 'not null' => TRUE,
+ 'size' => 'normal',
+ 'unsigned' => TRUE,
+ ),
+ 'revision_id' => array(
+ 'type' => 'int',
+ 'not null' => FALSE,
+ 'size' => 'normal',
+ 'unsigned' => TRUE,
+ ),
+ 'language' => array(
+ 'type' => 'varchar',
+ 'not null' => TRUE,
+ 'length' => '32',
+ 'default' => '',
+ ),
+ 'delta' => array(
+ 'type' => 'int',
+ 'not null' => TRUE,
+ 'size' => 'normal',
+ 'unsigned' => TRUE,
+ ),
+ 'field_vocab_fixed_tid' => array(
+ 'type' => 'int',
+ 'not null' => FALSE,
+ 'size' => 'normal',
+ 'unsigned' => TRUE,
+ ),
+ ),
+ 'primary key' => array(
+ 'entity_type',
+ 'entity_id',
+ 'deleted',
+ 'delta',
+ 'language',
+ ),
+ 'indexes' => array(
+ 'entity_type' => array(
+ 'entity_type',
+ ),
+ 'bundle' => array(
+ 'bundle',
+ ),
+ 'deleted' => array(
+ 'deleted',
+ ),
+ 'entity_id' => array(
+ 'entity_id',
+ ),
+ 'revision_id' => array(
+ 'revision_id',
+ ),
+ 'language' => array(
+ 'language',
+ ),
+ 'field_vocab_fixed_tid' => array(
+ 'field_vocab_fixed_tid',
+ ),
+ ),
+ 'mysql_character_set' => 'utf8',
+));
+
+$connection->insert('field_data_field_vocab_fixed')
+->fields(array(
+ 'entity_type',
+ 'bundle',
+ 'deleted',
+ 'entity_id',
+ 'revision_id',
+ 'language',
+ 'delta',
+ 'field_vocab_fixed_tid',
+))
+->values(array(
+ 'entity_type' => 'node',
+ 'bundle' => 'article',
+ 'deleted' => '0',
+ 'entity_id' => '2',
+ 'revision_id' => '11',
+ 'language' => 'und',
+ 'delta' => '0',
+ 'field_vocab_fixed_tid' => '24',
+))
+->execute();
+$connection->schema()->createTable('field_data_field_vocab_localize', array(
'fields' => array(
'entity_type' => array(
'type' => 'varchar',
@@ -9488,7 +10295,7 @@
'bundle' => 'article',
'deleted' => '0',
'entity_id' => '2',
- 'revision_id' => '2',
+ 'revision_id' => '11',
'language' => 'und',
'delta' => '0',
'field_vocab_localize_tid' => '20',
@@ -9498,7 +10305,7 @@
'bundle' => 'article',
'deleted' => '0',
'entity_id' => '3',
- 'revision_id' => '3',
+ 'revision_id' => '12',
'language' => 'und',
'delta' => '0',
'field_vocab_localize_tid' => '20',
@@ -9604,7 +10411,7 @@
'bundle' => 'article',
'deleted' => '0',
'entity_id' => '2',
- 'revision_id' => '2',
+ 'revision_id' => '11',
'language' => 'und',
'delta' => '0',
'field_vocab_translate_tid' => '21',
@@ -9614,7 +10421,7 @@
'bundle' => 'article',
'deleted' => '0',
'entity_id' => '3',
- 'revision_id' => '3',
+ 'revision_id' => '12',
'language' => 'und',
'delta' => '0',
'field_vocab_translate_tid' => '23',
@@ -10275,6 +11082,18 @@
'body_summary' => '',
'body_format' => 'filtered_html',
))
+->values(array(
+ 'entity_type' => 'node',
+ 'bundle' => 'article',
+ 'deleted' => '0',
+ 'entity_id' => '2',
+ 'revision_id' => '11',
+ 'language' => 'und',
+ 'delta' => '0',
+ 'body_value' => "...is that it's the absolute best show ever. Trust me, I would know.",
+ 'body_summary' => '',
+ 'body_format' => 'filtered_html',
+))
->values(array(
'entity_type' => 'node',
'bundle' => 'article',
@@ -10291,11 +11110,11 @@
'entity_type' => 'node',
'bundle' => 'article',
'deleted' => '0',
- 'entity_id' => '4',
- 'revision_id' => '4',
+ 'entity_id' => '3',
+ 'revision_id' => '12',
'language' => 'und',
'delta' => '0',
- 'body_value' => 'is - Is that is it awesome.',
+ 'body_value' => "is - ...is that it's the absolute best show ever. Trust me, I would know.",
'body_summary' => '',
'body_format' => 'filtered_html',
))
@@ -10303,11 +11122,11 @@
'entity_type' => 'node',
'bundle' => 'article',
'deleted' => '0',
- 'entity_id' => '5',
- 'revision_id' => '5',
+ 'entity_id' => '4',
+ 'revision_id' => '4',
'language' => 'und',
'delta' => '0',
- 'body_value' => 'en - Is that is it awesome.',
+ 'body_value' => 'is - Is that is it awesome.',
'body_summary' => '',
'body_format' => 'filtered_html',
))
@@ -10347,6 +11166,54 @@
'body_summary' => '',
'body_format' => 'filtered_html',
))
+->values(array(
+ 'entity_type' => 'node',
+ 'bundle' => 'et',
+ 'deleted' => '0',
+ 'entity_id' => '11',
+ 'revision_id' => '15',
+ 'language' => 'und',
+ 'delta' => '0',
+ 'body_value' => '1st',
+ 'body_summary' => '',
+ 'body_format' => 'filtered_html',
+))
+->values(array(
+ 'entity_type' => 'node',
+ 'bundle' => 'et',
+ 'deleted' => '0',
+ 'entity_id' => '11',
+ 'revision_id' => '16',
+ 'language' => 'und',
+ 'delta' => '0',
+ 'body_value' => '1st',
+ 'body_summary' => '',
+ 'body_format' => 'filtered_html',
+))
+->values(array(
+ 'entity_type' => 'node',
+ 'bundle' => 'et',
+ 'deleted' => '0',
+ 'entity_id' => '11',
+ 'revision_id' => '17',
+ 'language' => 'und',
+ 'delta' => '0',
+ 'body_value' => '2nd',
+ 'body_summary' => '',
+ 'body_format' => 'filtered_html',
+))
+->values(array(
+ 'entity_type' => 'node',
+ 'bundle' => 'et',
+ 'deleted' => '0',
+ 'entity_id' => '11',
+ 'revision_id' => '18',
+ 'language' => 'und',
+ 'delta' => '0',
+ 'body_value' => '2nd',
+ 'body_summary' => '',
+ 'body_format' => 'filtered_html',
+))
->execute();
$connection->schema()->createTable('field_revision_comment_body', array(
'fields' => array(
@@ -10745,6 +11612,130 @@
'field_boolean_value' => '1',
))
->execute();
+$connection->schema()->createTable('field_revision_field_chancellor', array(
+ 'fields' => array(
+ 'entity_type' => array(
+ 'type' => 'varchar',
+ 'not null' => TRUE,
+ 'length' => '128',
+ 'default' => '',
+ ),
+ 'bundle' => array(
+ 'type' => 'varchar',
+ 'not null' => TRUE,
+ 'length' => '128',
+ 'default' => '',
+ ),
+ 'deleted' => array(
+ 'type' => 'int',
+ 'not null' => TRUE,
+ 'size' => 'tiny',
+ 'default' => '0',
+ ),
+ 'entity_id' => array(
+ 'type' => 'int',
+ 'not null' => TRUE,
+ 'size' => 'normal',
+ 'unsigned' => TRUE,
+ ),
+ 'revision_id' => array(
+ 'type' => 'int',
+ 'not null' => TRUE,
+ 'size' => 'normal',
+ 'unsigned' => TRUE,
+ ),
+ 'language' => array(
+ 'type' => 'varchar',
+ 'not null' => TRUE,
+ 'length' => '32',
+ 'default' => '',
+ ),
+ 'delta' => array(
+ 'type' => 'int',
+ 'not null' => TRUE,
+ 'size' => 'normal',
+ 'unsigned' => TRUE,
+ ),
+ 'field_chancellor_value' => array(
+ 'type' => 'varchar',
+ 'not null' => FALSE,
+ 'length' => '255',
+ ),
+ 'field_chancellor_format' => array(
+ 'type' => 'varchar',
+ 'not null' => FALSE,
+ 'length' => '255',
+ ),
+ ),
+ 'primary key' => array(
+ 'entity_type',
+ 'entity_id',
+ 'revision_id',
+ 'deleted',
+ 'delta',
+ 'language',
+ ),
+ 'indexes' => array(
+ 'entity_type' => array(
+ 'entity_type',
+ ),
+ 'bundle' => array(
+ 'bundle',
+ ),
+ 'deleted' => array(
+ 'deleted',
+ ),
+ 'entity_id' => array(
+ 'entity_id',
+ ),
+ 'revision_id' => array(
+ 'revision_id',
+ ),
+ 'language' => array(
+ 'language',
+ ),
+ 'field_chancellor_format' => array(
+ 'field_chancellor_format',
+ ),
+ ),
+ 'mysql_character_set' => 'utf8',
+));
+
+$connection->insert('field_revision_field_chancellor')
+->fields(array(
+ 'entity_type',
+ 'bundle',
+ 'deleted',
+ 'entity_id',
+ 'revision_id',
+ 'language',
+ 'delta',
+ 'field_chancellor_value',
+ 'field_chancellor_format',
+))
+->values(array(
+ 'entity_type' => 'taxonomy_term',
+ 'bundle' => 'vocabtranslate',
+ 'deleted' => '0',
+ 'entity_id' => '21',
+ 'revision_id' => '21',
+ 'language' => 'und',
+ 'delta' => '0',
+ 'field_chancellor_value' => "K'mpec",
+ 'field_chancellor_format' => NULL,
+))
+->values(array(
+ 'entity_type' => 'taxonomy_term',
+ 'bundle' => 'vocabtranslate',
+ 'deleted' => '0',
+ 'entity_id' => '22',
+ 'revision_id' => '22',
+ 'language' => 'und',
+ 'delta' => '0',
+ 'field_chancellor_value' => "fr - K'mpec",
+ 'field_chancellor_format' => NULL,
+))
+->execute();
$connection->schema()->createTable('field_revision_field_color', array(
'fields' => array(
'entity_type' => array(
@@ -12180,6 +13171,18 @@
'language' => 'und',
'delta' => '0',
'field_link_url' => '<front>',
+ 'field_link_title' => 'Home;',
+ 'field_link_attributes' => 'a:0:{}',
+))
+->values(array(
+ 'entity_type' => 'node',
+ 'bundle' => 'article',
+ 'deleted' => '0',
+ 'entity_id' => '2',
+ 'revision_id' => '11',
+ 'language' => 'und',
+ 'delta' => '0',
+ 'field_link_url' => '<front>',
'field_link_title' => 'Home',
'field_link_attributes' => 'a:0:{}',
))
@@ -12195,6 +13198,18 @@
'field_link_title' => 'Home',
'field_link_attributes' => 'a:1:{s:5:"title";s:0:"";}',
))
+->values(array(
+ 'entity_type' => 'node',
+ 'bundle' => 'article',
+ 'deleted' => '0',
+ 'entity_id' => '3',
+ 'revision_id' => '12',
+ 'language' => 'und',
+ 'delta' => '0',
+ 'field_link_url' => '<front>',
+ 'field_link_title' => 'Home',
+ 'field_link_attributes' => 'a:1:{s:5:"title";s:0:"";}',
+))
->execute();
$connection->schema()->createTable('field_revision_field_long_text', array(
'fields' => array(
@@ -12829,171 +13844,74 @@
'entity_type' => 'node',
'bundle' => 'article',
'deleted' => '0',
- 'entity_id' => '3',
- 'revision_id' => '3',
+ 'entity_id' => '2',
+ 'revision_id' => '11',
'language' => 'und',
'delta' => '0',
- 'field_reference_target_id' => '4',
+ 'field_reference_target_id' => '5',
))
->values(array(
'entity_type' => 'node',
'bundle' => 'article',
'deleted' => '0',
- 'entity_id' => '4',
- 'revision_id' => '4',
+ 'entity_id' => '3',
+ 'revision_id' => '3',
'language' => 'und',
'delta' => '0',
- 'field_reference_target_id' => '3',
+ 'field_reference_target_id' => '4',
))
->values(array(
'entity_type' => 'node',
'bundle' => 'article',
'deleted' => '0',
- 'entity_id' => '5',
- 'revision_id' => '5',
+ 'entity_id' => '3',
+ 'revision_id' => '12',
'language' => 'und',
'delta' => '0',
- 'field_reference_target_id' => '2',
-))
-->execute();
-$connection->schema()->createTable('field_revision_field_reference_2', array(
- 'fields' => array(
- 'entity_type' => array(
- 'type' => 'varchar',
- 'not null' => TRUE,
- 'length' => '128',
- 'default' => '',
- ),
- 'bundle' => array(
- 'type' => 'varchar',
- 'not null' => TRUE,
- 'length' => '128',
- 'default' => '',
- ),
- 'deleted' => array(
- 'type' => 'int',
- 'not null' => TRUE,
- 'size' => 'tiny',
- 'default' => '0',
- ),
- 'entity_id' => array(
- 'type' => 'int',
- 'not null' => TRUE,
- 'size' => 'normal',
- 'unsigned' => TRUE,
- ),
- 'revision_id' => array(
- 'type' => 'int',
- 'not null' => TRUE,
- 'size' => 'normal',
- 'unsigned' => TRUE,
- ),
- 'language' => array(
- 'type' => 'varchar',
- 'not null' => TRUE,
- 'length' => '32',
- 'default' => '',
- ),
- 'delta' => array(
- 'type' => 'int',
- 'not null' => TRUE,
- 'size' => 'normal',
- 'unsigned' => TRUE,
- ),
- 'field_reference_2_target_id' => array(
- 'type' => 'int',
- 'not null' => TRUE,
- 'size' => 'normal',
- 'unsigned' => TRUE,
- ),
- ),
- 'primary key' => array(
- 'entity_type',
- 'entity_id',
- 'revision_id',
- 'deleted',
- 'delta',
- 'language',
- ),
- 'indexes' => array(
- 'entity_type' => array(
- 'entity_type',
- ),
- 'bundle' => array(
- 'bundle',
- ),
- 'deleted' => array(
- 'deleted',
- ),
- 'entity_id' => array(
- 'entity_id',
- ),
- 'revision_id' => array(
- 'revision_id',
- ),
- 'language' => array(
- 'language',
- ),
- 'field_reference_2_target_id' => array(
- 'field_reference_2_target_id',
- ),
- ),
- 'mysql_character_set' => 'utf8',
-));
-
-$connection->insert('field_revision_field_reference_2')
-->fields(array(
- 'entity_type',
- 'bundle',
- 'deleted',
- 'entity_id',
- 'revision_id',
- 'language',
- 'delta',
- 'field_reference_2_target_id',
+ 'field_reference_target_id' => '4',
))
->values(array(
'entity_type' => 'node',
'bundle' => 'article',
'deleted' => '0',
- 'entity_id' => '2',
- 'revision_id' => '2',
+ 'entity_id' => '4',
+ 'revision_id' => '4',
'language' => 'und',
'delta' => '0',
- 'field_reference_2_target_id' => '5',
+ 'field_reference_target_id' => '3',
))
->values(array(
'entity_type' => 'node',
'bundle' => 'article',
'deleted' => '0',
- 'entity_id' => '3',
- 'revision_id' => '3',
+ 'entity_id' => '4',
+ 'revision_id' => '13',
'language' => 'und',
'delta' => '0',
- 'field_reference_2_target_id' => '4',
+ 'field_reference_target_id' => '3',
))
->values(array(
'entity_type' => 'node',
'bundle' => 'article',
'deleted' => '0',
- 'entity_id' => '4',
- 'revision_id' => '4',
+ 'entity_id' => '5',
+ 'revision_id' => '5',
'language' => 'und',
'delta' => '0',
- 'field_reference_2_target_id' => '3',
+ 'field_reference_target_id' => '2',
))
->values(array(
'entity_type' => 'node',
'bundle' => 'article',
'deleted' => '0',
'entity_id' => '5',
- 'revision_id' => '5',
+ 'revision_id' => '14',
'language' => 'und',
'delta' => '0',
- 'field_reference_2_target_id' => '2',
+ 'field_reference_target_id' => '2',
))
->execute();
-$connection->schema()->createTable('field_revision_field_tags', array(
+$connection->schema()->createTable('field_revision_field_reference_2', array(
'fields' => array(
'entity_type' => array(
'type' => 'varchar',
@@ -13010,7 +13928,297 @@
'deleted' => array(
'type' => 'int',
'not null' => TRUE,
- 'size' => 'normal',
+ 'size' => 'tiny',
+ 'default' => '0',
+ ),
+ 'entity_id' => array(
+ 'type' => 'int',
+ 'not null' => TRUE,
+ 'size' => 'normal',
+ 'unsigned' => TRUE,
+ ),
+ 'revision_id' => array(
+ 'type' => 'int',
+ 'not null' => TRUE,
+ 'size' => 'normal',
+ 'unsigned' => TRUE,
+ ),
+ 'language' => array(
+ 'type' => 'varchar',
+ 'not null' => TRUE,
+ 'length' => '32',
+ 'default' => '',
+ ),
+ 'delta' => array(
+ 'type' => 'int',
+ 'not null' => TRUE,
+ 'size' => 'normal',
+ 'unsigned' => TRUE,
+ ),
+ 'field_reference_2_target_id' => array(
+ 'type' => 'int',
+ 'not null' => TRUE,
+ 'size' => 'normal',
+ 'unsigned' => TRUE,
+ ),
+ ),
+ 'primary key' => array(
+ 'entity_type',
+ 'entity_id',
+ 'revision_id',
+ 'deleted',
+ 'delta',
+ 'language',
+ ),
+ 'indexes' => array(
+ 'entity_type' => array(
+ 'entity_type',
+ ),
+ 'bundle' => array(
+ 'bundle',
+ ),
+ 'deleted' => array(
+ 'deleted',
+ ),
+ 'entity_id' => array(
+ 'entity_id',
+ ),
+ 'revision_id' => array(
+ 'revision_id',
+ ),
+ 'language' => array(
+ 'language',
+ ),
+ 'field_reference_2_target_id' => array(
+ 'field_reference_2_target_id',
+ ),
+ ),
+ 'mysql_character_set' => 'utf8',
+));
+
+$connection->insert('field_revision_field_reference_2')
+->fields(array(
+ 'entity_type',
+ 'bundle',
+ 'deleted',
+ 'entity_id',
+ 'revision_id',
+ 'language',
+ 'delta',
+ 'field_reference_2_target_id',
+))
+->values(array(
+ 'entity_type' => 'node',
+ 'bundle' => 'article',
+ 'deleted' => '0',
+ 'entity_id' => '2',
+ 'revision_id' => '2',
+ 'language' => 'und',
+ 'delta' => '0',
+ 'field_reference_2_target_id' => '5',
+))
+->values(array(
+ 'entity_type' => 'node',
+ 'bundle' => 'article',
+ 'deleted' => '0',
+ 'entity_id' => '2',
+ 'revision_id' => '11',
+ 'language' => 'und',
+ 'delta' => '0',
+ 'field_reference_2_target_id' => '5',
+))
+->values(array(
+ 'entity_type' => 'node',
+ 'bundle' => 'article',
+ 'deleted' => '0',
+ 'entity_id' => '3',
+ 'revision_id' => '3',
+ 'language' => 'und',
+ 'delta' => '0',
+ 'field_reference_2_target_id' => '4',
+))
+->values(array(
+ 'entity_type' => 'node',
+ 'bundle' => 'article',
+ 'deleted' => '0',
+ 'entity_id' => '3',
+ 'revision_id' => '12',
+ 'language' => 'und',
+ 'delta' => '0',
+ 'field_reference_2_target_id' => '4',
+))
+->values(array(
+ 'entity_type' => 'node',
+ 'bundle' => 'article',
+ 'deleted' => '0',
+ 'entity_id' => '4',
+ 'revision_id' => '4',
+ 'language' => 'und',
+ 'delta' => '0',
+ 'field_reference_2_target_id' => '3',
+))
+->values(array(
+ 'entity_type' => 'node',
+ 'bundle' => 'article',
+ 'deleted' => '0',
+ 'entity_id' => '4',
+ 'revision_id' => '13',
+ 'language' => 'und',
+ 'delta' => '0',
+ 'field_reference_2_target_id' => '3',
+))
+->values(array(
+ 'entity_type' => 'node',
+ 'bundle' => 'article',
+ 'deleted' => '0',
+ 'entity_id' => '5',
+ 'revision_id' => '5',
+ 'language' => 'und',
+ 'delta' => '0',
+ 'field_reference_2_target_id' => '2',
+))
+->values(array(
+ 'entity_type' => 'node',
+ 'bundle' => 'article',
+ 'deleted' => '0',
+ 'entity_id' => '5',
+ 'revision_id' => '14',
+ 'language' => 'und',
+ 'delta' => '0',
+ 'field_reference_2_target_id' => '2',
+))
+->execute();
+$connection->schema()->createTable('field_revision_field_sector', array(
+ 'fields' => array(
+ 'entity_type' => array(
+ 'type' => 'varchar',
+ 'not null' => TRUE,
+ 'length' => '128',
+ 'default' => '',
+ ),
+ 'bundle' => array(
+ 'type' => 'varchar',
+ 'not null' => TRUE,
+ 'length' => '128',
+ 'default' => '',
+ ),
+ 'deleted' => array(
+ 'type' => 'int',
+ 'not null' => TRUE,
+ 'size' => 'tiny',
+ 'default' => '0',
+ ),
+ 'entity_id' => array(
+ 'type' => 'int',
+ 'not null' => TRUE,
+ 'size' => 'normal',
+ 'unsigned' => TRUE,
+ ),
+ 'revision_id' => array(
+ 'type' => 'int',
+ 'not null' => TRUE,
+ 'size' => 'normal',
+ 'unsigned' => TRUE,
+ ),
+ 'language' => array(
+ 'type' => 'varchar',
+ 'not null' => TRUE,
+ 'length' => '32',
+ 'default' => '',
+ ),
+ 'delta' => array(
+ 'type' => 'int',
+ 'not null' => TRUE,
+ 'size' => 'normal',
+ 'unsigned' => TRUE,
+ ),
+ 'field_sector_value' => array(
+ 'type' => 'varchar',
+ 'not null' => FALSE,
+ 'length' => '255',
+ ),
+ 'field_sector_format' => array(
+ 'type' => 'varchar',
+ 'not null' => FALSE,
+ 'length' => '255',
+ ),
+ ),
+ 'primary key' => array(
+ 'entity_type',
+ 'entity_id',
+ 'revision_id',
+ 'deleted',
+ 'delta',
+ 'language',
+ ),
+ 'indexes' => array(
+ 'entity_type' => array(
+ 'entity_type',
+ ),
+ 'bundle' => array(
+ 'bundle',
+ ),
+ 'deleted' => array(
+ 'deleted',
+ ),
+ 'entity_id' => array(
+ 'entity_id',
+ ),
+ 'revision_id' => array(
+ 'revision_id',
+ ),
+ 'language' => array(
+ 'language',
+ ),
+ 'field_sector_format' => array(
+ 'field_sector_format',
+ ),
+ ),
+ 'mysql_character_set' => 'utf8',
+));
+
+$connection->insert('field_revision_field_sector')
+->fields(array(
+ 'entity_type',
+ 'bundle',
+ 'deleted',
+ 'entity_id',
+ 'revision_id',
+ 'language',
+ 'delta',
+ 'field_sector_value',
+ 'field_sector_format',
+))
+->values(array(
+ 'entity_type' => 'taxonomy_term',
+ 'bundle' => 'vocablocalized',
+ 'deleted' => '0',
+ 'entity_id' => '20',
+ 'revision_id' => '20',
+ 'language' => 'und',
+ 'delta' => '0',
+ 'field_sector_value' => 'Bajor',
+ 'field_sector_format' => NULL,
+))
+->execute();
+$connection->schema()->createTable('field_revision_field_tags', array(
+ 'fields' => array(
+ 'entity_type' => array(
+ 'type' => 'varchar',
+ 'not null' => TRUE,
+ 'length' => '128',
+ 'default' => '',
+ ),
+ 'bundle' => array(
+ 'type' => 'varchar',
+ 'not null' => TRUE,
+ 'length' => '128',
+ 'default' => '',
+ ),
+ 'deleted' => array(
+ 'type' => 'int',
+ 'not null' => TRUE,
+ 'size' => 'normal',
'default' => '0',
),
'entity_id' => array(
@@ -13066,6 +14274,16 @@
'delta',
'field_tags_tid',
))
+->values(array(
+ 'entity_type' => 'node',
+ 'bundle' => 'article',
+ 'deleted' => '0',
+ 'entity_id' => '3',
+ 'revision_id' => '12',
+ 'language' => 'und',
+ 'delta' => '0',
+ 'field_tags_tid' => '9',
+))
->values(array(
'entity_type' => 'node',
'bundle' => 'article',
@@ -13076,6 +14294,16 @@
'delta' => '0',
'field_tags_tid' => '9',
))
+->values(array(
+ 'entity_type' => 'node',
+ 'bundle' => 'article',
+ 'deleted' => '0',
+ 'entity_id' => '2',
+ 'revision_id' => '11',
+ 'language' => 'und',
+ 'delta' => '0',
+ 'field_tags_tid' => '9',
+))
->values(array(
'entity_type' => 'node',
'bundle' => 'article',
@@ -13086,6 +14314,16 @@
'delta' => '0',
'field_tags_tid' => '9',
))
+->values(array(
+ 'entity_type' => 'node',
+ 'bundle' => 'article',
+ 'deleted' => '0',
+ 'entity_id' => '3',
+ 'revision_id' => '12',
+ 'language' => 'und',
+ 'delta' => '1',
+ 'field_tags_tid' => '14',
+))
->values(array(
'entity_type' => 'node',
'bundle' => 'article',
@@ -13096,6 +14334,16 @@
'delta' => '1',
'field_tags_tid' => '14',
))
+->values(array(
+ 'entity_type' => 'node',
+ 'bundle' => 'article',
+ 'deleted' => '0',
+ 'entity_id' => '2',
+ 'revision_id' => '11',
+ 'language' => 'und',
+ 'delta' => '1',
+ 'field_tags_tid' => '14',
+))
->values(array(
'entity_type' => 'node',
'bundle' => 'article',
@@ -13116,6 +14364,16 @@
'delta' => '2',
'field_tags_tid' => '17',
))
+->values(array(
+ 'entity_type' => 'node',
+ 'bundle' => 'article',
+ 'deleted' => '0',
+ 'entity_id' => '2',
+ 'revision_id' => '11',
+ 'language' => 'und',
+ 'delta' => '2',
+ 'field_tags_tid' => '17',
+))
->values(array(
'entity_type' => 'node',
'bundle' => 'article',
@@ -13126,6 +14384,16 @@
'delta' => '2',
'field_tags_tid' => '17',
))
+->values(array(
+ 'entity_type' => 'node',
+ 'bundle' => 'article',
+ 'deleted' => '0',
+ 'entity_id' => '3',
+ 'revision_id' => '12',
+ 'language' => 'und',
+ 'delta' => '2',
+ 'field_tags_tid' => '17',
+))
->execute();
$connection->schema()->createTable('field_revision_field_term_entityreference', array(
'fields' => array(
@@ -13472,12 +14740,279 @@
'size' => 'normal',
'unsigned' => TRUE,
),
- 'field_text_filtered_value' => array(
- 'type' => 'varchar',
+ 'field_text_filtered_value' => array(
+ 'type' => 'varchar',
+ 'not null' => FALSE,
+ 'length' => '255',
+ ),
+ 'field_text_filtered_format' => array(
+ 'type' => 'varchar',
+ 'not null' => FALSE,
+ 'length' => '255',
+ ),
+ ),
+ 'primary key' => array(
+ 'entity_type',
+ 'entity_id',
+ 'revision_id',
+ 'deleted',
+ 'delta',
+ 'language',
+ ),
+ 'indexes' => array(
+ 'entity_type' => array(
+ 'entity_type',
+ ),
+ 'bundle' => array(
+ 'bundle',
+ ),
+ 'deleted' => array(
+ 'deleted',
+ ),
+ 'entity_id' => array(
+ 'entity_id',
+ ),
+ 'revision_id' => array(
+ 'revision_id',
+ ),
+ 'language' => array(
+ 'language',
+ ),
+ 'field_text_filtered_format' => array(
+ array(
+ 'field_text_filtered_format',
+ '191',
+ ),
+ ),
+ ),
+ 'mysql_character_set' => 'utf8',
+));
+
+$connection->schema()->createTable('field_revision_field_text_list', array(
+ 'fields' => array(
+ 'entity_type' => array(
+ 'type' => 'varchar',
+ 'not null' => TRUE,
+ 'length' => '128',
+ 'default' => '',
+ ),
+ 'bundle' => array(
+ 'type' => 'varchar',
+ 'not null' => TRUE,
+ 'length' => '128',
+ 'default' => '',
+ ),
+ 'deleted' => array(
+ 'type' => 'int',
+ 'not null' => TRUE,
+ 'size' => 'normal',
+ 'default' => '0',
+ ),
+ 'entity_id' => array(
+ 'type' => 'int',
+ 'not null' => TRUE,
+ 'size' => 'normal',
+ 'unsigned' => TRUE,
+ ),
+ 'revision_id' => array(
+ 'type' => 'int',
+ 'not null' => TRUE,
+ 'size' => 'normal',
+ 'unsigned' => TRUE,
+ ),
+ 'language' => array(
+ 'type' => 'varchar',
+ 'not null' => TRUE,
+ 'length' => '32',
+ 'default' => '',
+ ),
+ 'delta' => array(
+ 'type' => 'int',
+ 'not null' => TRUE,
+ 'size' => 'normal',
+ 'unsigned' => TRUE,
+ ),
+ 'field_text_list_value' => array(
+ 'type' => 'varchar',
+ 'not null' => FALSE,
+ 'length' => '255',
+ ),
+ ),
+ 'primary key' => array(
+ 'entity_type',
+ 'deleted',
+ 'entity_id',
+ 'revision_id',
+ 'language',
+ 'delta',
+ ),
+ 'mysql_character_set' => 'utf8',
+));
+
+$connection->insert('field_revision_field_text_list')
+->fields(array(
+ 'entity_type',
+ 'bundle',
+ 'deleted',
+ 'entity_id',
+ 'revision_id',
+ 'language',
+ 'delta',
+ 'field_text_list_value',
+))
+->values(array(
+ 'entity_type' => 'node',
+ 'bundle' => 'test_content_type',
+ 'deleted' => '0',
+ 'entity_id' => '1',
+ 'revision_id' => '1',
+ 'language' => 'und',
+ 'delta' => '0',
+ 'field_text_list_value' => 'Some more text',
+))
+->execute();
+$connection->schema()->createTable('field_revision_field_text_long_filtered', array(
+ 'fields' => array(
+ 'entity_type' => array(
+ 'type' => 'varchar',
+ 'not null' => TRUE,
+ 'length' => '128',
+ 'default' => '',
+ ),
+ 'bundle' => array(
+ 'type' => 'varchar',
+ 'not null' => TRUE,
+ 'length' => '128',
+ 'default' => '',
+ ),
+ 'deleted' => array(
+ 'type' => 'int',
+ 'not null' => TRUE,
+ 'size' => 'tiny',
+ 'default' => '0',
+ ),
+ 'entity_id' => array(
+ 'type' => 'int',
+ 'not null' => TRUE,
+ 'size' => 'normal',
+ 'unsigned' => TRUE,
+ ),
+ 'revision_id' => array(
+ 'type' => 'int',
+ 'not null' => TRUE,
+ 'size' => 'normal',
+ 'unsigned' => TRUE,
+ ),
+ 'language' => array(
+ 'type' => 'varchar',
+ 'not null' => TRUE,
+ 'length' => '32',
+ 'default' => '',
+ ),
+ 'delta' => array(
+ 'type' => 'int',
+ 'not null' => TRUE,
+ 'size' => 'normal',
+ 'unsigned' => TRUE,
+ ),
+ 'field_text_long_filtered_value' => array(
+ 'type' => 'text',
+ 'not null' => FALSE,
+ 'size' => 'big',
+ ),
+ 'field_text_long_filtered_format' => array(
+ 'type' => 'varchar',
+ 'not null' => FALSE,
+ 'length' => '255',
+ ),
+ ),
+ 'primary key' => array(
+ 'entity_type',
+ 'entity_id',
+ 'revision_id',
+ 'deleted',
+ 'delta',
+ 'language',
+ ),
+ 'indexes' => array(
+ 'entity_type' => array(
+ 'entity_type',
+ ),
+ 'bundle' => array(
+ 'bundle',
+ ),
+ 'deleted' => array(
+ 'deleted',
+ ),
+ 'entity_id' => array(
+ 'entity_id',
+ ),
+ 'revision_id' => array(
+ 'revision_id',
+ ),
+ 'language' => array(
+ 'language',
+ ),
+ 'field_text_long_filtered_format' => array(
+ array(
+ 'field_text_long_filtered_format',
+ '191',
+ ),
+ ),
+ ),
+ 'mysql_character_set' => 'utf8',
+));
+
+$connection->schema()->createTable('field_revision_field_text_long_plain', array(
+ 'fields' => array(
+ 'entity_type' => array(
+ 'type' => 'varchar',
+ 'not null' => TRUE,
+ 'length' => '128',
+ 'default' => '',
+ ),
+ 'bundle' => array(
+ 'type' => 'varchar',
+ 'not null' => TRUE,
+ 'length' => '128',
+ 'default' => '',
+ ),
+ 'deleted' => array(
+ 'type' => 'int',
+ 'not null' => TRUE,
+ 'size' => 'tiny',
+ 'default' => '0',
+ ),
+ 'entity_id' => array(
+ 'type' => 'int',
+ 'not null' => TRUE,
+ 'size' => 'normal',
+ 'unsigned' => TRUE,
+ ),
+ 'revision_id' => array(
+ 'type' => 'int',
+ 'not null' => TRUE,
+ 'size' => 'normal',
+ 'unsigned' => TRUE,
+ ),
+ 'language' => array(
+ 'type' => 'varchar',
+ 'not null' => TRUE,
+ 'length' => '32',
+ 'default' => '',
+ ),
+ 'delta' => array(
+ 'type' => 'int',
+ 'not null' => TRUE,
+ 'size' => 'normal',
+ 'unsigned' => TRUE,
+ ),
+ 'field_text_long_plain_value' => array(
+ 'type' => 'text',
'not null' => FALSE,
- 'length' => '255',
+ 'size' => 'big',
),
- 'field_text_filtered_format' => array(
+ 'field_text_long_plain_format' => array(
'type' => 'varchar',
'not null' => FALSE,
'length' => '255',
@@ -13510,78 +15045,16 @@
'language' => array(
'language',
),
- 'field_text_filtered_format' => array(
+ 'field_text_long_plain_format' => array(
array(
- 'field_text_filtered_format',
+ 'field_text_long_plain_format',
'191',
),
),
),
'mysql_character_set' => 'utf8',
));
-
-$connection->schema()->createTable('field_revision_field_text_list', array(
- 'fields' => array(
- 'entity_type' => array(
- 'type' => 'varchar',
- 'not null' => TRUE,
- 'length' => '128',
- 'default' => '',
- ),
- 'bundle' => array(
- 'type' => 'varchar',
- 'not null' => TRUE,
- 'length' => '128',
- 'default' => '',
- ),
- 'deleted' => array(
- 'type' => 'int',
- 'not null' => TRUE,
- 'size' => 'normal',
- 'default' => '0',
- ),
- 'entity_id' => array(
- 'type' => 'int',
- 'not null' => TRUE,
- 'size' => 'normal',
- 'unsigned' => TRUE,
- ),
- 'revision_id' => array(
- 'type' => 'int',
- 'not null' => TRUE,
- 'size' => 'normal',
- 'unsigned' => TRUE,
- ),
- 'language' => array(
- 'type' => 'varchar',
- 'not null' => TRUE,
- 'length' => '32',
- 'default' => '',
- ),
- 'delta' => array(
- 'type' => 'int',
- 'not null' => TRUE,
- 'size' => 'normal',
- 'unsigned' => TRUE,
- ),
- 'field_text_list_value' => array(
- 'type' => 'varchar',
- 'not null' => FALSE,
- 'length' => '255',
- ),
- ),
- 'primary key' => array(
- 'entity_type',
- 'deleted',
- 'entity_id',
- 'revision_id',
- 'language',
- 'delta',
- ),
- 'mysql_character_set' => 'utf8',
-));
-
-$connection->insert('field_revision_field_text_list')
+$connection->insert('field_revision_field_text_long_plain')
->fields(array(
'entity_type',
'bundle',
@@ -13590,20 +15063,89 @@
'revision_id',
'language',
'delta',
- 'field_text_list_value',
+ 'field_text_long_plain_value',
+ 'field_text_long_plain_format',
))
->values(array(
'entity_type' => 'node',
- 'bundle' => 'test_content_type',
+ 'bundle' => 'article',
'deleted' => '0',
- 'entity_id' => '1',
- 'revision_id' => '1',
+ 'entity_id' => '2',
+ 'revision_id' => '2',
'language' => 'und',
'delta' => '0',
- 'field_text_list_value' => 'Some more text',
+ 'field_text_long_plain_value' => 'DS9 1st rev',
+ 'field_text_long_plain_format' => NULL,
+))
+->values(array(
+ 'entity_type' => 'node',
+ 'bundle' => 'article',
+ 'deleted' => '0',
+ 'entity_id' => '2',
+ 'revision_id' => '11',
+ 'language' => 'und',
+ 'delta' => '0',
+ 'field_text_long_plain_value' => 'DS9 2nd rev',
+ 'field_text_long_plain_format' => NULL,
+))
+->values(array(
+ 'entity_type' => 'node',
+ 'bundle' => 'article',
+ 'deleted' => '0',
+ 'entity_id' => '3',
+ 'revision_id' => '3',
+ 'language' => 'und',
+ 'delta' => '0',
+ 'field_text_long_plain_value' => 'is - DS9 1st rev',
+ 'field_text_long_plain_format' => NULL,
+))
+->values(array(
+ 'entity_type' => 'node',
+ 'bundle' => 'article',
+ 'deleted' => '0',
+ 'entity_id' => '3',
+ 'revision_id' => '12',
+ 'language' => 'und',
+ 'delta' => '0',
+ 'field_text_long_plain_value' => 'is - DS9 2nd rev',
+ 'field_text_long_plain_format' => NULL,
+))
+->values(array(
+ 'entity_type' => 'node',
+ 'bundle' => 'article',
+ 'deleted' => '0',
+ 'entity_id' => '4',
+ 'revision_id' => '13',
+ 'language' => 'und',
+ 'delta' => '0',
+ 'field_text_long_plain_value' => 'is - Firefly 2nd rev',
+ 'field_text_long_plain_format' => NULL,
+))
+->values(array(
+ 'entity_type' => 'node',
+ 'bundle' => 'article',
+ 'deleted' => '0',
+ 'entity_id' => '5',
+ 'revision_id' => '5',
+ 'language' => 'und',
+ 'delta' => '0',
+ 'field_text_long_plain_value' => 'Firefly 1st rev',
+ 'field_text_long_plain_format' => NULL,
+))
+->values(array(
+ 'entity_type' => 'node',
+ 'bundle' => 'article',
+ 'deleted' => '0',
+ 'entity_id' => '5',
+ 'revision_id' => '14',
+ 'language' => 'und',
+ 'delta' => '0',
+ 'field_text_long_plain_value' => 'Firefly 2nd rev',
+ 'field_text_long_plain_format' => NULL,
))
->execute();
-$connection->schema()->createTable('field_revision_field_text_long_filtered', array(
+
+$connection->schema()->createTable('field_revision_field_text_long_plain_filtered', array(
'fields' => array(
'entity_type' => array(
'type' => 'varchar',
@@ -13647,12 +15189,12 @@
'size' => 'normal',
'unsigned' => TRUE,
),
- 'field_text_long_filtered_value' => array(
+ 'field_text_long_plain_filtered_value' => array(
'type' => 'text',
'not null' => FALSE,
'size' => 'big',
),
- 'field_text_long_filtered_format' => array(
+ 'field_text_long_plain_filtered_format' => array(
'type' => 'varchar',
'not null' => FALSE,
'length' => '255',
@@ -13685,9 +15227,9 @@
'language' => array(
'language',
),
- 'field_text_long_filtered_format' => array(
+ 'field_text_long_plain_filtered_format' => array(
array(
- 'field_text_long_filtered_format',
+ 'field_text_long_plain_filtered_format',
'191',
),
),
@@ -13695,7 +15237,7 @@
'mysql_character_set' => 'utf8',
));
-$connection->schema()->createTable('field_revision_field_text_long_plain', array(
+$connection->schema()->createTable('field_revision_field_text_plain', array(
'fields' => array(
'entity_type' => array(
'type' => 'varchar',
@@ -13739,12 +15281,12 @@
'size' => 'normal',
'unsigned' => TRUE,
),
- 'field_text_long_plain_value' => array(
- 'type' => 'text',
+ 'field_text_plain_value' => array(
+ 'type' => 'varchar',
'not null' => FALSE,
- 'size' => 'big',
+ 'length' => '255',
),
- 'field_text_long_plain_format' => array(
+ 'field_text_plain_format' => array(
'type' => 'varchar',
'not null' => FALSE,
'length' => '255',
@@ -13777,9 +15319,9 @@
'language' => array(
'language',
),
- 'field_text_long_plain_format' => array(
+ 'field_text_plain_format' => array(
array(
- 'field_text_long_plain_format',
+ 'field_text_plain_format',
'191',
),
),
@@ -13787,7 +15329,42 @@
'mysql_character_set' => 'utf8',
));
-$connection->schema()->createTable('field_revision_field_text_long_plain_filtered', array(
+$connection->insert('field_revision_field_text_plain')
+->fields(array(
+ 'entity_type',
+ 'bundle',
+ 'deleted',
+ 'entity_id',
+ 'revision_id',
+ 'language',
+ 'delta',
+ 'field_text_plain_value',
+ 'field_text_plain_format',
+))
+->values(array(
+ 'entity_type' => 'node',
+ 'bundle' => 'article',
+ 'deleted' => '0',
+ 'entity_id' => '2',
+ 'revision_id' => '11',
+ 'language' => 'und',
+ 'delta' => '0',
+ 'field_text_plain_value' => 'Kai Opaka',
+ 'field_text_plain_format' => NULL,
+))
+->values(array(
+ 'entity_type' => 'node',
+ 'bundle' => 'article',
+ 'deleted' => '0',
+ 'entity_id' => '3',
+ 'revision_id' => '12',
+ 'language' => 'und',
+ 'delta' => '0',
+ 'field_text_plain_value' => 'Kai Opaka',
+ 'field_text_plain_format' => NULL,
+))
+->execute();
+$connection->schema()->createTable('field_revision_field_text_plain_filtered', array(
'fields' => array(
'entity_type' => array(
'type' => 'varchar',
@@ -13831,12 +15408,12 @@
'size' => 'normal',
'unsigned' => TRUE,
),
- 'field_text_long_plain_filtered_value' => array(
- 'type' => 'text',
+ 'field_text_plain_filtered_value' => array(
+ 'type' => 'varchar',
'not null' => FALSE,
- 'size' => 'big',
+ 'length' => '255',
),
- 'field_text_long_plain_filtered_format' => array(
+ 'field_text_plain_filtered_format' => array(
'type' => 'varchar',
'not null' => FALSE,
'length' => '255',
@@ -13869,9 +15446,9 @@
'language' => array(
'language',
),
- 'field_text_long_plain_filtered_format' => array(
+ 'field_text_plain_filtered_format' => array(
array(
- 'field_text_long_plain_filtered_format',
+ 'field_text_plain_filtered_format',
'191',
),
),
@@ -13879,7 +15456,7 @@
'mysql_character_set' => 'utf8',
));
-$connection->schema()->createTable('field_revision_field_text_plain', array(
+$connection->schema()->createTable('field_revision_field_text_sum_filtered', array(
'fields' => array(
'entity_type' => array(
'type' => 'varchar',
@@ -13923,12 +15500,17 @@
'size' => 'normal',
'unsigned' => TRUE,
),
- 'field_text_plain_value' => array(
- 'type' => 'varchar',
+ 'field_text_sum_filtered_value' => array(
+ 'type' => 'text',
'not null' => FALSE,
- 'length' => '255',
+ 'size' => 'big',
),
- 'field_text_plain_format' => array(
+ 'field_text_sum_filtered_summary' => array(
+ 'type' => 'text',
+ 'not null' => FALSE,
+ 'size' => 'big',
+ ),
+ 'field_text_sum_filtered_format' => array(
'type' => 'varchar',
'not null' => FALSE,
'length' => '255',
@@ -13961,51 +15543,17 @@
'language' => array(
'language',
),
- 'field_text_plain_format' => array(
+ 'field_text_sum_filtered_format' => array(
array(
- 'field_text_plain_format',
+ 'field_text_sum_filtered_format',
'191',
),
),
),
'mysql_character_set' => 'utf8',
));
-$connection->insert('field_revision_field_text_plain')
- ->fields(array(
- 'entity_type',
- 'bundle',
- 'deleted',
- 'entity_id',
- 'revision_id',
- 'language',
- 'delta',
- 'field_text_plain_value',
- 'field_text_plain_format',
- ))
- ->values(array(
- 'entity_type' => 'node',
- 'bundle' => 'article',
- 'deleted' => '0',
- 'entity_id' => '2',
- 'revision_id' => '2',
- 'language' => 'und',
- 'delta' => '0',
- 'field_text_plain_value' => 'Kai Opaka',
- 'field_text_plain_format' => NULL,
- ))
- ->values(array(
- 'entity_type' => 'node',
- 'bundle' => 'article',
- 'deleted' => '0',
- 'entity_id' => '3',
- 'revision_id' => '3',
- 'language' => 'und',
- 'delta' => '0',
- 'field_text_plain_value' => 'Kai Opaka',
- 'field_text_plain_format' => NULL,
- ))
- ->execute();
-$connection->schema()->createTable('field_revision_field_text_plain_filtered', array(
+
+$connection->schema()->createTable('field_revision_field_text_sum_plain', array(
'fields' => array(
'entity_type' => array(
'type' => 'varchar',
@@ -14049,12 +15597,17 @@
'size' => 'normal',
'unsigned' => TRUE,
),
- 'field_text_plain_filtered_value' => array(
- 'type' => 'varchar',
+ 'field_text_sum_plain_value' => array(
+ 'type' => 'text',
'not null' => FALSE,
- 'length' => '255',
+ 'size' => 'big',
),
- 'field_text_plain_filtered_format' => array(
+ 'field_text_sum_plain_summary' => array(
+ 'type' => 'text',
+ 'not null' => FALSE,
+ 'size' => 'big',
+ ),
+ 'field_text_sum_plain_format' => array(
'type' => 'varchar',
'not null' => FALSE,
'length' => '255',
@@ -14087,9 +15640,9 @@
'language' => array(
'language',
),
- 'field_text_plain_filtered_format' => array(
+ 'field_text_sum_plain_format' => array(
array(
- 'field_text_plain_filtered_format',
+ 'field_text_sum_plain_format',
'191',
),
),
@@ -14097,7 +15650,7 @@
'mysql_character_set' => 'utf8',
));
-$connection->schema()->createTable('field_revision_field_text_sum_filtered', array(
+$connection->schema()->createTable('field_revision_field_text_sum_plain_filtered', array(
'fields' => array(
'entity_type' => array(
'type' => 'varchar',
@@ -14141,17 +15694,17 @@
'size' => 'normal',
'unsigned' => TRUE,
),
- 'field_text_sum_filtered_value' => array(
+ 'field_text_sum_plain_filtered_value' => array(
'type' => 'text',
'not null' => FALSE,
'size' => 'big',
),
- 'field_text_sum_filtered_summary' => array(
+ 'field_text_sum_plain_filtered_summary' => array(
'type' => 'text',
'not null' => FALSE,
'size' => 'big',
),
- 'field_text_sum_filtered_format' => array(
+ 'field_text_sum_plain_filtered_format' => array(
'type' => 'varchar',
'not null' => FALSE,
'length' => '255',
@@ -14184,9 +15737,9 @@
'language' => array(
'language',
),
- 'field_text_sum_filtered_format' => array(
+ 'field_text_sum_plain_filtered_format' => array(
array(
- 'field_text_sum_filtered_format',
+ 'field_text_sum_plain_filtered_format',
'191',
),
),
@@ -14194,7 +15747,7 @@
'mysql_character_set' => 'utf8',
));
-$connection->schema()->createTable('field_revision_field_text_sum_plain', array(
+$connection->schema()->createTable('field_revision_field_training', array(
'fields' => array(
'entity_type' => array(
'type' => 'varchar',
@@ -14238,114 +15791,12 @@
'size' => 'normal',
'unsigned' => TRUE,
),
- 'field_text_sum_plain_value' => array(
- 'type' => 'text',
- 'not null' => FALSE,
- 'size' => 'big',
- ),
- 'field_text_sum_plain_summary' => array(
- 'type' => 'text',
- 'not null' => FALSE,
- 'size' => 'big',
- ),
- 'field_text_sum_plain_format' => array(
+ 'field_training_value' => array(
'type' => 'varchar',
'not null' => FALSE,
'length' => '255',
),
- ),
- 'primary key' => array(
- 'entity_type',
- 'entity_id',
- 'revision_id',
- 'deleted',
- 'delta',
- 'language',
- ),
- 'indexes' => array(
- 'entity_type' => array(
- 'entity_type',
- ),
- 'bundle' => array(
- 'bundle',
- ),
- 'deleted' => array(
- 'deleted',
- ),
- 'entity_id' => array(
- 'entity_id',
- ),
- 'revision_id' => array(
- 'revision_id',
- ),
- 'language' => array(
- 'language',
- ),
- 'field_text_sum_plain_format' => array(
- array(
- 'field_text_sum_plain_format',
- '191',
- ),
- ),
- ),
- 'mysql_character_set' => 'utf8',
-));
-
-$connection->schema()->createTable('field_revision_field_text_sum_plain_filtered', array(
- 'fields' => array(
- 'entity_type' => array(
- 'type' => 'varchar',
- 'not null' => TRUE,
- 'length' => '128',
- 'default' => '',
- ),
- 'bundle' => array(
- 'type' => 'varchar',
- 'not null' => TRUE,
- 'length' => '128',
- 'default' => '',
- ),
- 'deleted' => array(
- 'type' => 'int',
- 'not null' => TRUE,
- 'size' => 'tiny',
- 'default' => '0',
- ),
- 'entity_id' => array(
- 'type' => 'int',
- 'not null' => TRUE,
- 'size' => 'normal',
- 'unsigned' => TRUE,
- ),
- 'revision_id' => array(
- 'type' => 'int',
- 'not null' => TRUE,
- 'size' => 'normal',
- 'unsigned' => TRUE,
- ),
- 'language' => array(
- 'type' => 'varchar',
- 'not null' => TRUE,
- 'length' => '32',
- 'default' => '',
- ),
- 'delta' => array(
- 'type' => 'int',
- 'not null' => TRUE,
- 'size' => 'normal',
- 'unsigned' => TRUE,
- ),
- 'field_text_sum_plain_filtered_value' => array(
- 'type' => 'text',
- 'not null' => FALSE,
- 'size' => 'big',
- ),
- 'field_text_sum_plain_filtered_summary' => array(
- 'type' => 'text',
- 'not null' => FALSE,
- 'size' => 'big',
- ),
- 'field_text_sum_plain_filtered_format' => array(
+ 'field_training_format' => array(
'type' => 'varchar',
'not null' => FALSE,
'length' => '255',
@@ -14378,16 +15829,48 @@
'language' => array(
'language',
),
- 'field_text_sum_plain_filtered_format' => array(
- array(
- 'field_text_sum_plain_filtered_format',
- '191',
- ),
+ 'field_training_format' => array(
+ 'field_training_format',
),
),
'mysql_character_set' => 'utf8',
));
+$connection->insert('field_revision_field_training')
+->fields(array(
+ 'entity_type',
+ 'bundle',
+ 'deleted',
+ 'entity_id',
+ 'revision_id',
+ 'language',
+ 'delta',
+ 'field_training_value',
+ 'field_training_format',
+))
+->values(array(
+ 'entity_type' => 'taxonomy_term',
+ 'bundle' => 'vocabfixed',
+ 'deleted' => '0',
+ 'entity_id' => '24',
+ 'revision_id' => '24',
+ 'language' => 'fr',
+ 'delta' => '0',
+ 'field_training_value' => 'is this french',
+ 'field_training_format' => NULL,
+))
+->values(array(
+ 'entity_type' => 'taxonomy_term',
+ 'bundle' => 'vocabfixed',
+ 'deleted' => '0',
+ 'entity_id' => '24',
+ 'revision_id' => '24',
+ 'language' => 'und',
+ 'delta' => '0',
+ 'field_training_value' => 'specialist',
+ 'field_training_format' => NULL,
+))
+->execute();
$connection->schema()->createTable('field_revision_field_user_entityreference', array(
'fields' => array(
'entity_type' => array(
@@ -14579,6 +16062,16 @@
'delta' => '0',
'field_vocab_fixed_tid' => '24',
))
+->values(array(
+ 'entity_type' => 'node',
+ 'bundle' => 'article',
+ 'deleted' => '0',
+ 'entity_id' => '2',
+ 'revision_id' => '11',
+ 'language' => 'und',
+ 'delta' => '0',
+ 'field_vocab_fixed_tid' => '24',
+))
->execute();
$connection->schema()->createTable('field_revision_field_vocab_localize', array(
'fields' => array(
@@ -14686,6 +16179,16 @@
'delta' => '0',
'field_vocab_localize_tid' => '20',
))
+->values(array(
+ 'entity_type' => 'node',
+ 'bundle' => 'article',
+ 'deleted' => '0',
+ 'entity_id' => '2',
+ 'revision_id' => '11',
+ 'language' => 'und',
+ 'delta' => '0',
+ 'field_vocab_localize_tid' => '20',
+))
->values(array(
'entity_type' => 'node',
'bundle' => 'article',
@@ -14696,6 +16199,16 @@
'delta' => '0',
'field_vocab_localize_tid' => '20',
))
+->values(array(
+ 'entity_type' => 'node',
+ 'bundle' => 'article',
+ 'deleted' => '0',
+ 'entity_id' => '3',
+ 'revision_id' => '12',
+ 'language' => 'und',
+ 'delta' => '0',
+ 'field_vocab_localize_tid' => '20',
+))
->execute();
$connection->schema()->createTable('field_revision_field_vocab_translate', array(
'fields' => array(
@@ -14803,6 +16316,16 @@
'delta' => '0',
'field_vocab_translate_tid' => '21',
))
+->values(array(
+ 'entity_type' => 'node',
+ 'bundle' => 'article',
+ 'deleted' => '0',
+ 'entity_id' => '2',
+ 'revision_id' => '11',
+ 'language' => 'und',
+ 'delta' => '0',
+ 'field_vocab_translate_tid' => '21',
+))
->values(array(
'entity_type' => 'node',
'bundle' => 'article',
@@ -14813,6 +16336,16 @@
'delta' => '0',
'field_vocab_translate_tid' => '23',
))
+->values(array(
+ 'entity_type' => 'node',
+ 'bundle' => 'article',
+ 'deleted' => '0',
+ 'entity_id' => '3',
+ 'revision_id' => '12',
+ 'language' => 'und',
+ 'delta' => '0',
+ 'field_vocab_translate_tid' => '23',
+))
->execute();
$connection->schema()->createTable('field_revision_name_field', array(
'fields' => array(
@@ -15189,25 +16722,149 @@
'size' => 'normal',
'unsigned' => TRUE,
),
- 'taxonomy_forums_tid' => array(
- 'type' => 'int',
+ 'taxonomy_forums_tid' => array(
+ 'type' => 'int',
+ 'not null' => FALSE,
+ 'size' => 'normal',
+ 'unsigned' => TRUE,
+ ),
+ ),
+ 'primary key' => array(
+ 'entity_type',
+ 'deleted',
+ 'entity_id',
+ 'revision_id',
+ 'language',
+ 'delta',
+ ),
+ 'mysql_character_set' => 'utf8',
+));
+
+$connection->insert('field_revision_taxonomy_forums')
+->fields(array(
+ 'entity_type',
+ 'bundle',
+ 'deleted',
+ 'entity_id',
+ 'revision_id',
+ 'language',
+ 'delta',
+ 'taxonomy_forums_tid',
+))
+->values(array(
+ 'entity_type' => 'node',
+ 'bundle' => 'forum',
+ 'deleted' => '0',
+ 'entity_id' => '6',
+ 'revision_id' => '6',
+ 'language' => 'und',
+ 'delta' => '0',
+ 'taxonomy_forums_tid' => '1',
+))
+->values(array(
+ 'entity_type' => 'node',
+ 'bundle' => 'forum',
+ 'deleted' => '0',
+ 'entity_id' => '7',
+ 'revision_id' => '7',
+ 'language' => 'und',
+ 'delta' => '0',
+ 'taxonomy_forums_tid' => '1',
+))
+->execute();
+$connection->schema()->createTable('field_revision_title_field', array(
+ 'fields' => array(
+ 'entity_type' => array(
+ 'type' => 'varchar',
+ 'not null' => TRUE,
+ 'length' => '128',
+ 'default' => '',
+ ),
+ 'bundle' => array(
+ 'type' => 'varchar',
+ 'not null' => TRUE,
+ 'length' => '128',
+ 'default' => '',
+ ),
+ 'deleted' => array(
+ 'type' => 'int',
+ 'not null' => TRUE,
+ 'size' => 'tiny',
+ 'default' => '0',
+ ),
+ 'entity_id' => array(
+ 'type' => 'int',
+ 'not null' => TRUE,
+ 'size' => 'normal',
+ 'unsigned' => TRUE,
+ ),
+ 'revision_id' => array(
+ 'type' => 'int',
+ 'not null' => TRUE,
+ 'size' => 'normal',
+ 'unsigned' => TRUE,
+ ),
+ 'language' => array(
+ 'type' => 'varchar',
+ 'not null' => TRUE,
+ 'length' => '32',
+ 'default' => '',
+ ),
+ 'delta' => array(
+ 'type' => 'int',
+ 'not null' => TRUE,
+ 'size' => 'normal',
+ 'unsigned' => TRUE,
+ ),
+ 'title_field_value' => array(
+ 'type' => 'varchar',
'not null' => FALSE,
- 'size' => 'normal',
- 'unsigned' => TRUE,
+ 'length' => '255',
+ ),
+ 'title_field_format' => array(
+ 'type' => 'varchar',
+ 'not null' => FALSE,
+ 'length' => '255',
),
),
'primary key' => array(
'entity_type',
- 'deleted',
'entity_id',
'revision_id',
- 'language',
+ 'deleted',
'delta',
+ 'language',
+ ),
+ 'indexes' => array(
+ 'entity_type' => array(
+ 'entity_type',
+ ),
+ 'bundle' => array(
+ 'bundle',
+ ),
+ 'deleted' => array(
+ 'deleted',
+ ),
+ 'entity_id' => array(
+ 'entity_id',
+ ),
+ 'revision_id' => array(
+ 'revision_id',
+ ),
+ 'language' => array(
+ 'language',
+ ),
+ 'title_field_format' => array(
+ array(
+ 'title_field_format',
+ '191',
+ ),
+ ),
),
'mysql_character_set' => 'utf8',
));
-$connection->insert('field_revision_taxonomy_forums')
+$connection->insert('field_revision_title_field')
->fields(array(
'entity_type',
'bundle',
@@ -15216,30 +16873,44 @@
'revision_id',
'language',
'delta',
- 'taxonomy_forums_tid',
+ 'title_field_value',
+ 'title_field_format',
))
->values(array(
'entity_type' => 'node',
- 'bundle' => 'forum',
+ 'bundle' => 'test_content_type',
'deleted' => '0',
- 'entity_id' => '6',
- 'revision_id' => '6',
- 'language' => 'und',
+ 'entity_id' => '1',
+ 'revision_id' => '1',
+ 'language' => 'en',
'delta' => '0',
- 'taxonomy_forums_tid' => '1',
+ 'title_field_value' => 'An English Node',
+ 'title_field_format' => NULL,
))
->values(array(
'entity_type' => 'node',
- 'bundle' => 'forum',
+ 'bundle' => 'test_content_type',
'deleted' => '0',
- 'entity_id' => '7',
- 'revision_id' => '7',
- 'language' => 'und',
+ 'entity_id' => '1',
+ 'revision_id' => '1',
+ 'language' => 'fr',
'delta' => '0',
- 'taxonomy_forums_tid' => '1',
+ 'title_field_value' => 'A French Node',
+ 'title_field_format' => NULL,
+))
+->values(array(
+ 'entity_type' => 'node',
+ 'bundle' => 'test_content_type',
+ 'deleted' => '0',
+ 'entity_id' => '1',
+ 'revision_id' => '1',
+ 'language' => 'is',
+ 'delta' => '0',
+ 'title_field_value' => 'An Icelandic Node',
+ 'title_field_format' => NULL,
))
->execute();
-$connection->schema()->createTable('field_revision_title_field', array(
+$connection->schema()->createTable('field_revision_field_tree', array(
'fields' => array(
'entity_type' => array(
'type' => 'varchar',
@@ -15283,12 +16954,12 @@
'size' => 'normal',
'unsigned' => TRUE,
),
- 'title_field_value' => array(
+ 'field_tree_value' => array(
'type' => 'varchar',
'not null' => FALSE,
'length' => '255',
),
- 'title_field_format' => array(
+ 'field_tree_format' => array(
'type' => 'varchar',
'not null' => FALSE,
'length' => '255',
@@ -15321,9 +16992,9 @@
'language' => array(
'language',
),
- 'title_field_format' => array(
+ 'field_tree_format' => array(
array(
- 'title_field_format',
+ 'field_tree_format',
'191',
),
),
@@ -15331,7 +17002,7 @@
'mysql_character_set' => 'utf8',
));
-$connection->insert('field_revision_title_field')
+$connection->insert('field_revision_field_tree')
->fields(array(
'entity_type',
'bundle',
@@ -15340,41 +17011,96 @@
'revision_id',
'language',
'delta',
- 'title_field_value',
- 'title_field_format',
+ 'field_tree_value',
+ 'field_tree_format',
))
->values(array(
'entity_type' => 'node',
- 'bundle' => 'test_content_type',
+ 'bundle' => 'et',
'deleted' => '0',
- 'entity_id' => '1',
- 'revision_id' => '1',
+ 'entity_id' => '11',
+ 'revision_id' => '15',
'language' => 'en',
'delta' => '0',
- 'title_field_value' => 'An English Node',
- 'title_field_format' => NULL,
+ 'field_tree_value' => 'lancewood',
+ 'field_tree_format' => NULL,
))
->values(array(
'entity_type' => 'node',
- 'bundle' => 'test_content_type',
+ 'bundle' => 'et',
'deleted' => '0',
- 'entity_id' => '1',
- 'revision_id' => '1',
+ 'entity_id' => '11',
+ 'revision_id' => '16',
+ 'language' => 'en',
+ 'delta' => '0',
+ 'field_tree_value' => 'lancewood',
+ 'field_tree_format' => NULL,
+))
+->values(array(
+ 'entity_type' => 'node',
+ 'bundle' => 'et',
+ 'deleted' => '0',
+ 'entity_id' => '11',
+ 'revision_id' => '17',
+ 'language' => 'en',
+ 'delta' => '0',
+ 'field_tree_value' => 'lancewood',
+ 'field_tree_format' => NULL,
+))
+->values(array(
+ 'entity_type' => 'node',
+ 'bundle' => 'et',
+ 'deleted' => '0',
+ 'entity_id' => '11',
+ 'revision_id' => '18',
+ 'language' => 'en',
+ 'delta' => '0',
+ 'field_tree_value' => 'lancewood',
+ 'field_tree_format' => NULL,
+))
+->values(array(
+ 'entity_type' => 'node',
+ 'bundle' => 'et',
+ 'deleted' => '0',
+ 'entity_id' => '11',
+ 'revision_id' => '18',
'language' => 'fr',
'delta' => '0',
- 'title_field_value' => 'A French Node',
- 'title_field_format' => NULL,
+ 'field_tree_value' => 'fr - lancewood',
+ 'field_tree_format' => NULL,
))
->values(array(
'entity_type' => 'node',
- 'bundle' => 'test_content_type',
+ 'bundle' => 'et',
'deleted' => '0',
- 'entity_id' => '1',
- 'revision_id' => '1',
+ 'entity_id' => '11',
+ 'revision_id' => '16',
'language' => 'is',
'delta' => '0',
- 'title_field_value' => 'An Icelandic Node',
- 'title_field_format' => NULL,
+ 'field_tree_value' => 'is - lancewood',
+ 'field_tree_format' => NULL,
+))
+->values(array(
+ 'entity_type' => 'node',
+ 'bundle' => 'et',
+ 'deleted' => '0',
+ 'entity_id' => '11',
+ 'revision_id' => '17',
+ 'language' => 'is',
+ 'delta' => '0',
+ 'field_tree_value' => 'is - lancewood',
+ 'field_tree_format' => NULL,
+))
+->values(array(
+ 'entity_type' => 'node',
+ 'bundle' => 'et',
+ 'deleted' => '0',
+ 'entity_id' => '11',
+ 'revision_id' => '18',
+ 'language' => 'is',
+ 'delta' => '0',
+ 'field_tree_value' => 'is - lancewood',
+ 'field_tree_format' => NULL,
))
->execute();
$connection->schema()->createTable('file_managed', array(
@@ -17617,6 +19343,36 @@
'objectindex' => '0',
'format' => '',
))
+->values(array(
+ 'lid' => '194',
+ 'textgroup' => 'field',
+ 'context' => 'field_training:vocabfixed:label',
+ 'objectid' => 'vocabfixed',
+ 'type' => 'field_training',
+ 'property' => 'label',
+ 'objectindex' => '0',
+ 'format' => '',
+))
+->values(array(
+ 'lid' => '195',
+ 'textgroup' => 'field',
+ 'context' => 'field_sector:vocablocalized:label',
+ 'objectid' => 'vocablocalized',
+ 'type' => 'field_sector',
+ 'property' => 'label',
+ 'objectindex' => '0',
+ 'format' => '',
+))
+->values(array(
+ 'lid' => '196',
+ 'textgroup' => 'field',
+ 'context' => 'field_chancellor:vocabtranslate:label',
+ 'objectid' => 'vocabtranslate',
+ 'type' => 'field_chancellor',
+ 'property' => 'label',
+ 'objectindex' => '0',
+ 'format' => '',
+))
->execute();
$connection->schema()->createTable('i18n_translation_set', array(
'fields' => array(
@@ -40720,14 +42476,14 @@
))
->values(array(
'nid' => '2',
- 'vid' => '2',
+ 'vid' => '11',
'type' => 'article',
'language' => 'en',
'title' => 'The thing about Deep Space 9',
'uid' => '2',
'status' => '1',
'created' => '1441306772',
- 'changed' => '1441306832',
+ 'changed' => '1564543637',
'comment' => '2',
'promote' => '1',
'sticky' => '0',
@@ -40736,14 +42492,14 @@
))
->values(array(
'nid' => '3',
- 'vid' => '3',
+ 'vid' => '12',
'type' => 'article',
'language' => 'is',
'title' => 'is - The thing about Deep Space 9',
'uid' => '1',
'status' => '1',
'created' => '1471428152',
- 'changed' => '1471428152',
+ 'changed' => '1564543706',
'comment' => '2',
'promote' => '1',
'sticky' => '0',
@@ -40752,14 +42508,14 @@
))
->values(array(
'nid' => '4',
- 'vid' => '4',
+ 'vid' => '13',
'type' => 'article',
'language' => 'is',
'title' => 'is - The thing about Firefly',
'uid' => '1',
'status' => '1',
'created' => '1478755274',
- 'changed' => '1478755274',
+ 'changed' => '1564543810',
'comment' => '1',
'promote' => '1',
'sticky' => '0',
@@ -40768,14 +42524,14 @@
))
->values(array(
'nid' => '5',
- 'vid' => '5',
+ 'vid' => '14',
'type' => 'article',
'language' => 'en',
'title' => 'en - The thing about Firefly',
'uid' => '1',
'status' => '1',
'created' => '1478755314',
- 'changed' => '1478755314',
+ 'changed' => '1564543929',
'comment' => '1',
'promote' => '1',
'sticky' => '0',
@@ -40862,6 +42618,22 @@
'tnid' => '8',
'translate' => '0',
))
+->values(array(
+ 'nid' => '11',
+ 'vid' => '18',
+ 'type' => 'et',
+ 'language' => 'en',
+ 'title' => 'Page one',
+ 'uid' => '1',
+ 'status' => '1',
+ 'created' => '1568261523',
+ 'changed' => '1568261721',
+ 'comment' => '1',
+ 'promote' => '0',
+ 'sticky' => '0',
+ 'tnid' => '0',
+ 'translate' => '0',
+))
->execute();
$connection->schema()->createTable('node_access', array(
'fields' => array(
@@ -41237,9 +43009,9 @@
'nid' => '2',
'vid' => '2',
'uid' => '1',
- 'title' => 'The thing about Deep Space 9',
- 'log' => '',
- 'timestamp' => '1441306832',
+ 'title' => 'The thing about Deep Space 9 (1st rev)',
+ 'log' => 'DS9 1st rev',
+ 'timestamp' => '1564543588',
'status' => '1',
'comment' => '2',
'promote' => '1',
@@ -41249,9 +43021,9 @@
'nid' => '3',
'vid' => '3',
'uid' => '1',
- 'title' => 'is - The thing about Deep Space 9',
- 'log' => '',
- 'timestamp' => '1471428152',
+ 'title' => 'is - The thing about Deep Space 9 (1st rev)',
+ 'log' => 'is - DS9 1st rev',
+ 'timestamp' => '1564543677',
'status' => '1',
'comment' => '2',
'promote' => '1',
@@ -41261,8 +43033,8 @@
'nid' => '4',
'vid' => '4',
'uid' => '1',
- 'title' => 'is - The thing about Firefly',
- 'log' => '',
+ 'title' => 'is - The thing about Firefly (1st rev)',
+ 'log' => 'is - Firefly 1st rev',
'timestamp' => '1478755274',
'status' => '1',
'comment' => '1',
@@ -41273,9 +43045,9 @@
'nid' => '5',
'vid' => '5',
'uid' => '1',
- 'title' => 'en - The thing about Firefly',
- 'log' => '',
- 'timestamp' => '1478755314',
+ 'title' => 'en - The thing about Firefly (1st rev)',
+ 'log' => 'Firefly 1st rev',
+ 'timestamp' => '1564543887',
'status' => '1',
'comment' => '1',
'promote' => '1',
@@ -41341,6 +43113,102 @@
'promote' => '1',
'sticky' => '0',
))
+->values(array(
+ 'nid' => '2',
+ 'vid' => '11',
+ 'uid' => '1',
+ 'title' => 'The thing about Deep Space 9',
+ 'log' => 'DS9 2nd rev',
+ 'timestamp' => '1564543637',
+ 'status' => '1',
+ 'comment' => '2',
+ 'promote' => '1',
+ 'sticky' => '0',
+))
+->values(array(
+ 'nid' => '3',
+ 'vid' => '12',
+ 'uid' => '1',
+ 'title' => 'is - The thing about Deep Space 9',
+ 'log' => 'is - DS9 2nd rev',
+ 'timestamp' => '1564543706',
+ 'status' => '1',
+ 'comment' => '2',
+ 'promote' => '1',
+ 'sticky' => '0',
+))
+->values(array(
+ 'nid' => '4',
+ 'vid' => '13',
+ 'uid' => '1',
+ 'title' => 'is - The thing about Firefly',
+ 'log' => 'is - Firefly 2nd rev',
+ 'timestamp' => '1564543810',
+ 'status' => '1',
+ 'comment' => '1',
+ 'promote' => '1',
+ 'sticky' => '0',
+))
+->values(array(
+ 'nid' => '5',
+ 'vid' => '14',
+ 'uid' => '1',
+ 'title' => 'en - The thing about Firefly',
+ 'log' => 'Firefly 2nd rev',
+ 'timestamp' => '1564543929',
+ 'status' => '1',
+ 'comment' => '1',
+ 'promote' => '1',
+ 'sticky' => '0',
+))
+->values(array(
+ 'nid' => '11',
+ 'vid' => '15',
+ 'uid' => '1',
+ 'title' => 'Page one',
+ 'log' => '',
+ 'timestamp' => '1568261523',
+ 'status' => '1',
+ 'comment' => '1',
+ 'promote' => '0',
+ 'sticky' => '0',
+))
+->values(array(
+ 'nid' => '11',
+ 'vid' => '16',
+ 'uid' => '1',
+ 'title' => 'Page one',
+ 'log' => '',
+ 'timestamp' => '1568261548',
+ 'status' => '1',
+ 'comment' => '1',
+ 'promote' => '0',
+ 'sticky' => '0',
+))
+->values(array(
+ 'nid' => '11',
+ 'vid' => '17',
+ 'uid' => '1',
+ 'title' => 'Page one',
+ 'log' => '2nd',
+ 'timestamp' => '1568261687',
+ 'status' => '1',
+ 'comment' => '1',
+ 'promote' => '0',
+ 'sticky' => '0',
+))
+->values(array(
+ 'nid' => '11',
+ 'vid' => '18',
+ 'uid' => '1',
+ 'title' => 'Page one',
+ 'log' => '',
+ 'timestamp' => '1568261721',
+ 'status' => '1',
+ 'comment' => '1',
+ 'promote' => '0',
+ 'sticky' => '0',
+))
->execute();
$connection->schema()->createTable('node_type', array(
'fields' => array(
@@ -41530,6 +43398,21 @@
'disabled' => '0',
'orig_type' => 'test_content_type',
))
+->values(array(
+ 'type' => 'et',
+ 'name' => 'Entity translation test',
+ 'base' => 'node_content',
+ 'module' => 'node',
+ 'description' => 'Entity translation test',
+ 'help' => 'Help text foret pages',
+ 'has_title' => '1',
+ 'title_label' => 'Title',
+ 'custom' => '1',
+ 'modified' => '1',
+ 'locked' => '0',
+ 'disabled' => '0',
+ 'orig_type' => 'et',
+))
->execute();
$connection->schema()->createTable('queue', array(
'fields' => array(
@@ -54858,6 +56741,18 @@
'name' => 'field_bundle_settings_node__test_content_type',
'value' => 'a:2:{s:10:"view_modes";a:6:{s:6:"teaser";a:1:{s:15:"custom_settings";b:1;}s:4:"full";a:1:{s:15:"custom_settings";b:0;}s:3:"rss";a:1:{s:15:"custom_settings";b:0;}s:12:"search_index";a:1:{s:15:"custom_settings";b:0;}s:13:"search_result";a:1:{s:15:"custom_settings";b:0;}s:5:"print";a:1:{s:15:"custom_settings";b:0;}}s:12:"extra_fields";a:2:{s:4:"form";a:1:{s:5:"title";a:1:{s:6:"weight";s:1:"0";}}s:7:"display";a:0:{}}}',
))
+->values(array(
+ 'name' => 'field_bundle_settings_taxonomy_term__vocabfixed',
+ 'value' => 'a:2:{s:10:"view_modes";a:0:{}s:12:"extra_fields";a:2:{s:4:"form";a:2:{s:4:"name";a:1:{s:6:"weight";s:2:"-5";}s:11:"description";a:1:{s:6:"weight";s:1:"0";}}s:7:"display";a:0:{}}}',
+))
+->values(array(
+ 'name' => 'field_bundle_settings_taxonomy_term__vocablocalized',
+ 'value' => 'a:2:{s:10:"view_modes";a:0:{}s:12:"extra_fields";a:2:{s:4:"form";a:2:{s:4:"name";a:1:{s:6:"weight";s:2:"-5";}s:11:"description";a:1:{s:6:"weight";s:1:"0";}}s:7:"display";a:0:{}}}',
+))
+->values(array(
+ 'name' => 'field_bundle_settings_taxonomy_term__vocabtranslate',
+ 'value' => 'a:2:{s:10:"view_modes";a:0:{}s:12:"extra_fields";a:2:{s:4:"form";a:3:{s:4:"name";a:1:{s:6:"weight";s:2:"-5";}s:11:"description";a:1:{s:6:"weight";s:1:"0";}s:8:"language";a:1:{s:6:"weight";s:1:"0";}}s:7:"display";a:0:{}}}',
+))
->values(array(
'name' => 'field_bundle_settings_user__user',
'value' => 'a:2:{s:10:"view_modes";a:0:{}s:12:"extra_fields";a:2:{s:4:"form";a:2:{s:7:"account";a:1:{s:6:"weight";s:3:"-10";}s:8:"timezone";a:1:{s:6:"weight";s:1:"6";}}s:7:"display";a:0:{}}}',
@@ -54990,6 +56885,10 @@
'name' => 'language_content_type_blog',
'value' => 's:1:"2";',
))
+->values(array(
+ 'name' => 'language_content_type_et',
+ 'value' => 's:1:"4";',
+))
->values(array(
'name' => 'language_content_type_forum',
'value' => 's:1:"0";',
diff --git a/web/core/modules/migrate_drupal/tests/src/Functional/MigrateDrupalUpdateTest.php b/web/core/modules/migrate_drupal/tests/src/Functional/MigrateDrupalUpdateTest.php
new file mode 100644
index 0000000000..a7aabdc946
--- /dev/null
+++ b/web/core/modules/migrate_drupal/tests/src/Functional/MigrateDrupalUpdateTest.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace Drupal\Tests\migrate_drupal\Functional;
+
+use Drupal\FunctionalTests\Update\UpdatePathTestBase;
+
+/**
+ * Tests that migrate_drupal_multilingual is uninstalled.
+ *
+ * @group migrate_drupal
+ * @group legacy
+ */
+class MigrateDrupalUpdateTest extends UpdatePathTestBase {
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function setDatabaseDumpFiles() {
+ $this->databaseDumpFiles = [
+ __DIR__ . '/../../../../system/tests/fixtures/update/drupal-8.8.0.filled.standard.php.gz',
+ __DIR__ . '/../../fixtures/drupal-8.migrate-drupal-multilingual-enabled.php',
+ ];
+ }
+
+ /**
+ * Tests migrate_drupal_multilingual uninstallation.
+ *
+ * @see migrate_drupal_post_update_uninstall_multilingual()
+ */
+ public function testSourceFeedRequired() {
+ $this->assertTrue(\Drupal::moduleHandler()->moduleExists('migrate_drupal_multilingual'));
+ // Run updates.
+ $this->runUpdates();
+
+ $this->assertFalse(\Drupal::moduleHandler()->moduleExists('migrate_drupal_multilingual'));
+ }
+
+}
diff --git a/web/core/modules/migrate_drupal/tests/src/Kernel/MigrateCckFieldPluginManagerTest.php b/web/core/modules/migrate_drupal/tests/src/Kernel/MigrateCckFieldPluginManagerTest.php
index 7eb68ba338..3829c0b96b 100644
--- a/web/core/modules/migrate_drupal/tests/src/Kernel/MigrateCckFieldPluginManagerTest.php
+++ b/web/core/modules/migrate_drupal/tests/src/Kernel/MigrateCckFieldPluginManagerTest.php
@@ -14,7 +14,16 @@ class MigrateCckFieldPluginManagerTest extends MigrateDrupalTestBase {
/**
* {@inheritdoc}
*/
- public static $modules = ['system', 'user', 'field', 'migrate_drupal', 'options', 'file', 'text', 'migrate_cckfield_plugin_manager_test'];
+ public static $modules = [
+ 'system',
+ 'user',
+ 'field',
+ 'migrate_drupal',
+ 'options',
+ 'file',
+ 'text',
+ 'migrate_cckfield_plugin_manager_test',
+ ];
/**
* Tests that the correct MigrateCckField plugins are used.
diff --git a/web/core/modules/migrate_drupal/tests/src/Kernel/MigrateDrupalTestBase.php b/web/core/modules/migrate_drupal/tests/src/Kernel/MigrateDrupalTestBase.php
index f361fb16ef..532ba1ba1a 100644
--- a/web/core/modules/migrate_drupal/tests/src/Kernel/MigrateDrupalTestBase.php
+++ b/web/core/modules/migrate_drupal/tests/src/Kernel/MigrateDrupalTestBase.php
@@ -15,7 +15,14 @@ abstract class MigrateDrupalTestBase extends MigrateTestBase {
*
* @var array
*/
- public static $modules = ['system', 'user', 'field', 'migrate_drupal', 'options', 'file'];
+ public static $modules = [
+ 'system',
+ 'user',
+ 'field',
+ 'migrate_drupal',
+ 'options',
+ 'file',
+ ];
/**
* {@inheritdoc}
diff --git a/web/core/modules/migrate_drupal/tests/src/Kernel/MigrationPluginAlterTest.php b/web/core/modules/migrate_drupal/tests/src/Kernel/MigrationPluginAlterTest.php
deleted file mode 100644
index 335c44cab7..0000000000
--- a/web/core/modules/migrate_drupal/tests/src/Kernel/MigrationPluginAlterTest.php
+++ /dev/null
@@ -1,377 +0,0 @@
-<?php
-
-namespace Drupal\Tests\migrate_drupal\Kernel;
-
-use Drupal\Tests\migrate\Kernel\MigrateTestBase;
-
-/**
- * Tests migrate_drupal_migrations_plugin_alter for d6 term node migrations.
- *
- * @group migrate_drupal
- */
-class MigrationPluginAlterTest extends MigrateTestBase {
-
- /**
- * {@inheritdoc}
- */
- public static $modules = ['migrate_drupal', 'taxonomy'];
-
- /**
- * {@inheritdoc}
- */
- protected function setUp() {
- parent::setUp();
- $this->setupDb();
- }
-
- /**
- * Tests migrate_drupal_migrations_plugin_alter without content_translation.
- *
- * @dataProvider providerMigrationPluginAlter
- */
- public function testMigrationPluginAlterNoTranslation($source, $expected) {
- $definitions = $source;
- migrate_drupal_migration_plugins_alter($definitions);
- // Ensure the results have an 'id' key.
- foreach ($definitions as $definition) {
- $this->assertArrayHasKey('id', $definition);
- }
- $this->assertSame($expected, $definitions);
- }
-
- /**
- * Data provider for testMigrationPluginAlter().
- */
- public function providerMigrationPluginAlter() {
- $tests = [];
-
- // Test without a d6_taxonomy_vocabulary definition.
- $tests[0]['source_data'] = [
- 'test' => [
- 'id' => 'test',
- 'process' => [
- 'nid' => 'nid',
- ],
- ],
- ];
- $tests[0]['expected_data'] = $tests[0]['source_data'];
-
- // Test with a d6_taxonomy_vocabulary definition.
- $tests[1]['source_data'] = [
- 'd6_taxonomy_vocabulary' => [
- 'id' => 'd6_taxonomy_vocabulary',
- 'process' => [
- 'vid' => [
- 'plugin' => 'machine_name',
- ],
- ],
- ],
- 'test' => [
- 'id' => 'test',
- 'process' => [
- 'nid' => 'nid',
- ],
- ],
- ];
- $tests[1]['expected_data'] = $tests[1]['source_data'];
-
- // Test with a d6_taxonomy_vocabulary and term_node definitions.
- $tests[2] = $tests[1];
- $tests[2]['source_data']['d6_term_node:2'] = [
- 'id' => 'd6_term_node:2',
- 'process' => [
- 'vid' => [
- 'plugin' => 'machine_name',
- ],
- ],
- ];
- $tests[2]['source_data']['d6_term_node_revision:4'] = [
- 'id' => 'd6_term_node_revision:4',
- 'process' => [
- 'vid' => [
- 'plugin' => 'machine_name',
- ],
- ],
- ];
-
- $tests[2]['expected_data'] = $tests[2]['source_data'];
- $tests[2]['expected_data']['d6_term_node:2']['process']['taxonomy_forums'] = 'tid';
- $tests[2]['expected_data']['d6_term_node_revision:4']['process']['field_'] = 'tid';
-
- // Test with a d6_taxonomy_vocabulary and term_node_translation definition.
- $tests[3] = $tests[1];
- $tests[3]['source_data']['d6_term_node_translation:2'] = [
- 'id' => 'd6_term_node_translation:2',
- 'process' => [
- 'vid' => [
- 'plugin' => 'machine_name',
- ],
- ],
- ];
-
- $tests[3]['expected_data'] = $tests[3]['source_data'];
- return $tests;
- }
-
- /**
- * Tests migrate_drupal_migrations_plugin_alter.
- *
- * @dataProvider providerMigrationPluginAlterTranslation
- */
- public function testMigrationPluginAlterTranslation($source, $expected) {
- /** @var \Drupal\Core\Extension\ModuleInstaller $module_installer */
- $module_installer = \Drupal::service('module_installer');
- $module_installer->install(['content_translation']);
- $definitions = $source;
- migrate_drupal_migration_plugins_alter($definitions);
- // Ensure the results have an 'id' key.
- foreach ($definitions as $definition) {
- $this->assertArrayHasKey('id', $definition);
- }
- $this->assertSame($expected, $definitions);
-
- }
-
- /**
- * Data provider for providerMigrationPluginAlterTranslation().
- */
- public function providerMigrationPluginAlterTranslation() {
- $tests = [];
-
- // Test with a d6_taxonomy_vocabulary definition and
- // d6_term_node_translation definitions.
- $tests[0]['source_data'] = [
- 'd6_taxonomy_vocabulary' => [
- 'id' => 'd6_taxonomy_vocabulary',
- 'process' => [
- 'vid' => [
- 'plugin' => 'machine_name',
- ],
- ],
- ],
- 'test' => [
- 'id' => 'test',
- 'process' => [
- 'nid' => 'nid',
- ],
- ],
- 'd6_term_node_translation:2' => [
- 'id' => 'd6_term_node_translation:2',
- 'process' => [
- 'vid' => [
- 'plugin' => 'machine_name',
- ],
- ],
- ],
- 'd6_term_node_translation:4' => [
- 'id' => 'd6_term_node_translation:4',
- 'process' => [
- 'vid' => [
- 'plugin' => 'machine_name',
- ],
- ],
- ],
- ];
-
- $tests[0]['expected_data'] = $tests[0]['source_data'];
- $tests[0]['expected_data']['d6_term_node_translation:2']['process']['taxonomy_forums'] = 'tid';
- $tests[0]['expected_data']['d6_term_node_translation:4']['process']['field_'] = 'tid';
- return $tests;
- }
-
- /**
- * Creates data in the source database.
- */
- protected function setupDb() {
- $this->sourceDatabase->schema()->createTable('system', [
- 'fields' => [
- 'name' => [
- 'type' => 'varchar',
- 'not null' => TRUE,
- 'length' => '255',
- 'default' => '',
- ],
- 'type' => [
- 'type' => 'varchar',
- 'not null' => TRUE,
- 'length' => '255',
- 'default' => '',
- ],
- 'status' => [
- 'type' => 'int',
- 'not null' => TRUE,
- 'size' => 'normal',
- 'default' => '0',
- ],
- ],
- ]);
- $this->sourceDatabase->insert('system')
- ->fields([
- 'name',
- 'type',
- 'status',
- ])
- ->values([
- 'name' => 'taxonomy',
- 'type' => 'module',
- 'status' => '1',
- ])
- ->execute();
-
- $this->sourceDatabase->schema()->createTable('variable', [
- 'fields' => [
- 'name' => [
- 'type' => 'varchar',
- 'not null' => TRUE,
- 'length' => '128',
- 'default' => '',
- ],
- 'value' => [
- 'type' => 'text',
- 'not null' => TRUE,
- 'size' => 'normal',
- ],
- ],
- ]);
- $this->sourceDatabase->insert('variable')
- ->fields([
- 'name',
- 'value',
- ])
- ->values([
- 'name' => 'forum_nav_vocabulary',
- 'value' => 's:1:"2";',
- ])
- ->execute();
-
- $this->sourceDatabase->schema()->createTable('vocabulary', [
- 'fields' => [
- 'vid' => [
- 'type' => 'serial',
- 'not null' => TRUE,
- 'size' => 'normal',
- 'unsigned' => TRUE,
- ],
- 'name' => [
- 'type' => 'varchar',
- 'not null' => TRUE,
- 'length' => '255',
- 'default' => '',
- ],
- 'description' => [
- 'type' => 'text',
- 'not null' => FALSE,
- 'size' => 'normal',
- ],
- 'help' => [
- 'type' => 'varchar',
- 'not null' => TRUE,
- 'length' => '255',
- 'default' => '',
- ],
- 'relations' => [
- 'type' => 'int',
- 'not null' => TRUE,
- 'size' => 'normal',
- 'default' => '0',
- 'unsigned' => TRUE,
- ],
- 'hierarchy' => [
- 'type' => 'int',
- 'not null' => TRUE,
- 'size' => 'normal',
- 'default' => '0',
- 'unsigned' => TRUE,
- ],
- 'multiple' => [
- 'type' => 'int',
- 'not null' => TRUE,
- 'size' => 'normal',
- 'default' => '0',
- 'unsigned' => TRUE,
- ],
- 'required' => [
- 'type' => 'int',
- 'not null' => TRUE,
- 'size' => 'normal',
- 'default' => '0',
- 'unsigned' => TRUE,
- ],
- 'tags' => [
- 'type' => 'int',
- 'not null' => TRUE,
- 'size' => 'normal',
- 'default' => '0',
- 'unsigned' => TRUE,
- ],
- 'module' => [
- 'type' => 'varchar',
- 'not null' => TRUE,
- 'length' => '255',
- 'default' => '',
- ],
- 'weight' => [
- 'type' => 'int',
- 'not null' => TRUE,
- 'size' => 'normal',
- 'default' => '0',
- ],
- ],
- 'primary key' => ['vid'],
- ]);
-
- $this->sourceDatabase->insert('vocabulary')
- ->fields([
- 'vid',
- 'name',
- ])
- ->values([
- 'vid' => '4',
- 'name' => 'Tags',
- ])
- ->values([
- 'vid' => '2',
- 'name' => 'Forums',
- ])
- ->execute();
-
- $this->sourceDatabase->schema()->createTable('vocabulary_node_types', [
- 'fields' => [
- 'vid' => [
- 'type' => 'int',
- 'not null' => TRUE,
- 'size' => 'normal',
- 'default' => '0',
- 'unsigned' => TRUE,
- ],
- 'type' => [
- 'type' => 'varchar',
- 'not null' => TRUE,
- 'length' => '32',
- 'default' => '',
- ],
- ],
- 'primary key' => [
- 'vid',
- 'type',
- ],
- 'mysql_character_set' => 'utf8',
- ]);
-
- $this->sourceDatabase->insert('vocabulary_node_types')
- ->fields([
- 'vid',
- 'type',
- ])
- ->values([
- 'vid' => '4',
- 'type' => 'article',
- ])
- ->values([
- 'vid' => '2',
- 'type' => 'forum',
- ])
- ->execute();
- }
-
-}
diff --git a/web/core/modules/migrate_drupal/tests/src/Kernel/NodeMigrationTypePluginAlterTest.php b/web/core/modules/migrate_drupal/tests/src/Kernel/NodeMigrationTypePluginAlterTest.php
new file mode 100644
index 0000000000..c682530c98
--- /dev/null
+++ b/web/core/modules/migrate_drupal/tests/src/Kernel/NodeMigrationTypePluginAlterTest.php
@@ -0,0 +1,169 @@
+<?php
+
+namespace Drupal\Tests\migrate_drupal\Kernel;
+
+use Drupal\migrate_drupal\NodeMigrateType;
+use Drupal\Tests\migrate\Kernel\MigrateTestBase;
+use Drupal\Tests\migrate_drupal\Traits\NodeMigrateTypeTestTrait;
+
+/**
+ * Tests the assignment of the node migration type in migrations_plugin_alter.
+ *
+ * @group migrate_drupal
+ */
+class NodeMigrationTypePluginAlterTest extends MigrateTestBase {
+
+ use NodeMigrateTypeTestTrait;
+
+ /**
+ * {@inheritdoc}
+ */
+ public static $modules = ['migrate_drupal', 'node'];
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function setUp() {
+ parent::setUp();
+ $this->setupDb();
+ }
+
+ /**
+ * Tests the assignment of the node migration type.
+ *
+ * @param string $type
+ * The type of node migration, 'classic' or 'complete'.
+ * @param array $migration_definitions
+ * An array of migration definitions.
+ * @param array $expected
+ * The expected results.
+ *
+ * @dataProvider providerMigrationPluginAlter
+ *
+ * @throws \Exception
+ */
+ public function testMigrationPluginAlter($type, array $migration_definitions, array $expected) {
+ $this->makeNodeMigrateMapTable($type, '7');
+ migrate_drupal_migration_plugins_alter($migration_definitions);
+ $this->assertSame($expected, $migration_definitions);
+ }
+
+ /**
+ * Data provider for testMigrationPluginAlter().
+ */
+ public function providerMigrationPluginAlter() {
+ $tests = [];
+
+ $migrations = [
+ // The 'system_site' migration is needed to get the legacy Drupal version.
+ 'system_site' => [
+ 'id' => 'system_site',
+ 'source' => [
+ 'plugin' => 'variable',
+ 'variables' => [
+ 'site_name',
+ 'site_mail',
+ ],
+ 'source_module' => 'system',
+ ],
+ 'process' => [],
+ ],
+ 'no_dependencies_not_altered' => [
+ 'id' => 'no_dependencies_not_altered',
+ 'no_dependencies' => 'test',
+ 'process' => [
+ 'nid' => 'nid',
+ ],
+ ],
+ 'dependencies_altered_if_complete' => [
+ 'id' => 'test',
+ 'migration_dependencies' => [
+ 'required' => [
+ 'd7_node',
+ ],
+ 'optional' => [
+ 'd7_node_translation',
+ ],
+ ],
+ ],
+ 'dependencies_not_altered' => [
+ 'id' => 'd7_node',
+ 'migration_dependencies' => [
+ 'required' => [
+ 'd7_node',
+ ],
+ 'optional' => [
+ 'd7_node_translation',
+ ],
+ ],
+ ],
+ ];
+
+ // Test migrations are not altered when classic node migrations is in use.
+ $tests[0]['type'] = NodeMigrateType::NODE_MIGRATE_TYPE_CLASSIC;
+ $tests[0]['migrations'] = $migrations;
+ $tests[0]['expected_data'] = $tests[0]['migrations'];
+
+ // Test migrations are altered when complete node migrations is in use.
+ $tests[1] = $tests[0];
+ $tests[1]['type'] = NodeMigrateType::NODE_MIGRATE_TYPE_COMPLETE;
+ $tests[1]['expected_data']['dependencies_altered_if_complete']['migration_dependencies'] = [
+ 'required' => [
+ 'd7_node_complete',
+ ],
+ 'optional' => [
+ 'd7_node_complete',
+ ],
+ ];
+ return $tests;
+ }
+
+ /**
+ * Creates data in the source database.
+ */
+ protected function setupDb() {
+ $this->sourceDatabase->schema()->createTable('system', [
+ 'fields' => [
+ 'name' => [
+ 'type' => 'varchar',
+ 'not null' => TRUE,
+ 'length' => '255',
+ 'default' => '',
+ ],
+ 'type' => [
+ 'type' => 'varchar',
+ 'not null' => TRUE,
+ 'length' => '255',
+ 'default' => '',
+ ],
+ 'status' => [
+ 'type' => 'int',
+ 'not null' => TRUE,
+ 'size' => 'normal',
+ 'default' => '0',
+ ],
+ 'schema_version' => [
+ 'type' => 'int',
+ 'not null' => TRUE,
+ 'size' => 'normal',
+ 'default' => '-1',
+ ],
+ ],
+ ]);
+ $this->sourceDatabase->insert('system')
+ ->fields([
+ 'name',
+ 'type',
+ 'status',
+ 'schema_version',
+ ])
+ ->values([
+ 'name' => 'system',
+ 'type' => 'module',
+ 'status' => '1',
+ 'schema_version' => '7001',
+ ])
+ ->execute();
+ }
+
+}
diff --git a/web/core/modules/migrate_drupal/tests/src/Kernel/Plugin/migrate/DestinationCategoryTest.php b/web/core/modules/migrate_drupal/tests/src/Kernel/Plugin/migrate/DestinationCategoryTest.php
index 2bec0cc1b1..adda5e3398 100644
--- a/web/core/modules/migrate_drupal/tests/src/Kernel/Plugin/migrate/DestinationCategoryTest.php
+++ b/web/core/modules/migrate_drupal/tests/src/Kernel/Plugin/migrate/DestinationCategoryTest.php
@@ -2,7 +2,7 @@
namespace Drupal\Tests\migrate_drupal\Kernel\Plugin\migrate;
-use Drupal\ban\Plugin\migrate\destination\BlockedIP;
+use Drupal\ban\Plugin\migrate\destination\BlockedIp;
use Drupal\color\Plugin\migrate\destination\Color;
use Drupal\KernelTests\FileSystemModuleDiscoveryDataProviderTrait;
use Drupal\migrate\Plugin\migrate\destination\ComponentEntityDisplayBase;
@@ -124,7 +124,7 @@ protected function getContentClasses() {
return [
EntityContentBase::class,
UrlAlias::class,
- BlockedIP::class,
+ BlockedIp::class,
NodeCounter::class,
UserData::class,
];
diff --git a/web/core/modules/migrate_drupal/tests/src/Kernel/Plugin/migrate/source/ContentEntityTest.php b/web/core/modules/migrate_drupal/tests/src/Kernel/Plugin/migrate/source/ContentEntityTest.php
index 84bb7cae3b..2bcf11ff03 100644
--- a/web/core/modules/migrate_drupal/tests/src/Kernel/Plugin/migrate/source/ContentEntityTest.php
+++ b/web/core/modules/migrate_drupal/tests/src/Kernel/Plugin/migrate/source/ContentEntityTest.php
@@ -321,6 +321,7 @@ public function testNodeSource() {
$values = $node_source->current()->getSource();
$this->assertEquals($this->bundle, $values['type'][0]['target_id']);
$this->assertEquals(1, $values['nid']);
+ $this->assertEquals(1, $values['vid']);
$this->assertEquals('en', $values['langcode']);
$this->assertEquals(1, $values['status'][0]['value']);
$this->assertEquals('Apples', $values['title'][0]['value']);
@@ -330,6 +331,7 @@ public function testNodeSource() {
$values = $node_source->current()->getSource();
$this->assertEquals($this->bundle, $values['type'][0]['target_id']);
$this->assertEquals(1, $values['nid']);
+ $this->assertEquals(1, $values['vid']);
$this->assertEquals('fr', $values['langcode']);
$this->assertEquals(1, $values['status'][0]['value']);
$this->assertEquals('Pommes', $values['title'][0]['value']);
@@ -369,11 +371,13 @@ public function testMediaSource() {
$fields = $media_source->fields();
$this->assertArrayHasKey('bundle', $fields);
$this->assertArrayHasKey('mid', $fields);
+ $this->assertArrayHasKey('vid', $fields);
$this->assertArrayHasKey('name', $fields);
$this->assertArrayHasKey('status', $fields);
$media_source->rewind();
$values = $media_source->current()->getSource();
$this->assertEquals(1, $values['mid']);
+ $this->assertEquals(1, $values['vid']);
$this->assertEquals('Foo media', $values['name'][0]['value']);
$this->assertNull($values['thumbnail'][0]['title']);
$this->assertEquals(1, $values['uid'][0]['target_id']);
@@ -402,9 +406,11 @@ public function testTermSource() {
$this->assertEquals(2, $term_source->count());
$ids = $term_source->getIds();
$this->assertArrayHasKey('langcode', $ids);
+ $this->assertArrayHasKey('revision_id', $ids);
$this->assertArrayHasKey('tid', $ids);
$fields = $term_source->fields();
$this->assertArrayHasKey('vid', $fields);
+ $this->assertArrayHasKey('revision_id', $fields);
$this->assertArrayHasKey('tid', $fields);
$this->assertArrayHasKey('name', $fields);
$term_source->rewind();
diff --git a/web/core/modules/migrate_drupal/tests/src/Kernel/d6/FieldDiscoveryTest.php b/web/core/modules/migrate_drupal/tests/src/Kernel/d6/FieldDiscoveryTest.php
index 83ae30e908..413eed3cb7 100644
--- a/web/core/modules/migrate_drupal/tests/src/Kernel/d6/FieldDiscoveryTest.php
+++ b/web/core/modules/migrate_drupal/tests/src/Kernel/d6/FieldDiscoveryTest.php
@@ -271,11 +271,11 @@ public function testGetAllFields() {
$actual_fields = $field_discovery_test->getAllFields('6');
$this->assertSame(['node'], array_keys($actual_fields));
$this->assertSame(['employee', 'test_planet', 'page', 'story', 'test_page'], array_keys($actual_fields['node']));
- $this->assertSame(21, count($actual_fields['node']['story']));
+ $this->assertCount(21, $actual_fields['node']['story']);
foreach ($actual_fields['node'] as $bundle => $fields) {
foreach ($fields as $field_name => $field_info) {
$this->assertArrayHasKey('type', $field_info);
- $this->assertSame(22, count($field_info));
+ $this->assertCount(22, $field_info);
$this->assertEquals($bundle, $field_info['type_name']);
}
}
diff --git a/web/core/modules/migrate_drupal/tests/src/Kernel/d6/MigrateDrupal6AuditIdsTest.php b/web/core/modules/migrate_drupal/tests/src/Kernel/d6/MigrateDrupal6AuditIdsTest.php
index 3620f0c3bf..d1acc0cc33 100644
--- a/web/core/modules/migrate_drupal/tests/src/Kernel/d6/MigrateDrupal6AuditIdsTest.php
+++ b/web/core/modules/migrate_drupal/tests/src/Kernel/d6/MigrateDrupal6AuditIdsTest.php
@@ -138,6 +138,7 @@ function (AuditResult $result) {
'd6_file',
'd6_menu_links',
'd6_node',
+ 'd6_node_complete',
'd6_node_revision',
'd6_taxonomy_term',
'd6_term_node_revision',
diff --git a/web/core/modules/migrate_drupal/tests/src/Kernel/d6/MigrateDrupal6TestBase.php b/web/core/modules/migrate_drupal/tests/src/Kernel/d6/MigrateDrupal6TestBase.php
index 0b2735c8ea..9bbd93316d 100644
--- a/web/core/modules/migrate_drupal/tests/src/Kernel/d6/MigrateDrupal6TestBase.php
+++ b/web/core/modules/migrate_drupal/tests/src/Kernel/d6/MigrateDrupal6TestBase.php
@@ -2,13 +2,16 @@
namespace Drupal\Tests\migrate_drupal\Kernel\d6;
+use Drupal\migrate_drupal\NodeMigrateType;
use Drupal\Tests\migrate_drupal\Kernel\MigrateDrupalTestBase;
+use Drupal\Tests\migrate_drupal\Traits\NodeMigrateTypeTestTrait;
/**
* Base class for Drupal 6 migration tests.
*/
abstract class MigrateDrupal6TestBase extends MigrateDrupalTestBase {
+ use NodeMigrateTypeTestTrait;
/**
* {@inheritdoc}
*/
@@ -28,6 +31,9 @@ abstract class MigrateDrupal6TestBase extends MigrateDrupalTestBase {
*/
protected function setUp() {
parent::setUp();
+ // Add a node classic migrate table to the destination site so that tests
+ // run by default with the classic node migrations.
+ $this->makeNodeMigrateMapTable(NodeMigrateType::NODE_MIGRATE_TYPE_CLASSIC, '6');
$this->loadFixture($this->getFixtureFilePath());
}
diff --git a/web/core/modules/migrate_drupal/tests/src/Kernel/d7/FieldDiscoveryTest.php b/web/core/modules/migrate_drupal/tests/src/Kernel/d7/FieldDiscoveryTest.php
index d3ac665d64..4cab54d0ee 100644
--- a/web/core/modules/migrate_drupal/tests/src/Kernel/d7/FieldDiscoveryTest.php
+++ b/web/core/modules/migrate_drupal/tests/src/Kernel/d7/FieldDiscoveryTest.php
@@ -78,6 +78,7 @@ public function setUp() {
'article' => 'comment_node_article',
'blog' => 'comment_node_blog',
'book' => 'comment_node_book',
+ 'et' => 'comment_node_et',
'forum' => 'comment_forum',
'test_content_type' => 'comment_node_test_content_type',
];
@@ -95,7 +96,11 @@ public function setUp() {
}
Vocabulary::create(['vid' => 'test_vocabulary'])->save();
- $this->executeMigrations(['d7_field', 'd7_field_instance']);
+ $this->executeMigrations([
+ 'd7_field',
+ 'd7_taxonomy_vocabulary',
+ 'd7_field_instance',
+ ]);
$this->fieldDiscovery = $this->container->get('migrate_drupal.field_discovery');
$this->migrationPluginManager = $this->container->get('plugin.manager.migration');
@@ -148,6 +153,9 @@ public function testAddAllFieldProcesses() {
'field_datetime_without_time',
'field_date_without_time',
'field_float_list',
+ 'field_training',
+ 'field_sector',
+ 'field_chancellor',
];
$this->assertFieldProcessKeys($this->fieldDiscovery, $this->migrationPluginManager, '7', $expected_process_keys);
}
@@ -274,9 +282,9 @@ public function testGetAllFields() {
$this->assertArrayHasKey('test_vocabulary', $actual_fields['taxonomy_term']);
$this->assertArrayHasKey('user', $actual_fields['user']);
$this->assertArrayHasKey('test_content_type', $actual_fields['node']);
- $this->assertSame(6, count($actual_fields['node']));
- $this->assertSame(6, count($actual_fields['comment']));
- $this->assertSame(22, count($actual_fields['node']['test_content_type']));
+ $this->assertCount(7, $actual_fields['node']);
+ $this->assertCount(6, $actual_fields['comment']);
+ $this->assertCount(22, $actual_fields['node']['test_content_type']);
foreach ($actual_fields as $entity_type_id => $bundles) {
foreach ($bundles as $bundle => $fields) {
foreach ($fields as $field_name => $field_info) {
diff --git a/web/core/modules/migrate_drupal/tests/src/Kernel/d7/MigrateDrupal7AuditIdsTest.php b/web/core/modules/migrate_drupal/tests/src/Kernel/d7/MigrateDrupal7AuditIdsTest.php
index b53ffa4d78..79f22739db 100644
--- a/web/core/modules/migrate_drupal/tests/src/Kernel/d7/MigrateDrupal7AuditIdsTest.php
+++ b/web/core/modules/migrate_drupal/tests/src/Kernel/d7/MigrateDrupal7AuditIdsTest.php
@@ -138,6 +138,7 @@ function (AuditResult $result) {
'd7_file_private',
'd7_menu_links',
'd7_node',
+ 'd7_node_complete',
'd7_node_revision',
'd7_taxonomy_term',
'd7_user',
diff --git a/web/core/modules/migrate_drupal/tests/src/Kernel/d7/MigrateDrupal7TestBase.php b/web/core/modules/migrate_drupal/tests/src/Kernel/d7/MigrateDrupal7TestBase.php
index 535421cd84..d3cc3ead90 100644
--- a/web/core/modules/migrate_drupal/tests/src/Kernel/d7/MigrateDrupal7TestBase.php
+++ b/web/core/modules/migrate_drupal/tests/src/Kernel/d7/MigrateDrupal7TestBase.php
@@ -2,18 +2,25 @@
namespace Drupal\Tests\migrate_drupal\Kernel\d7;
+use Drupal\migrate_drupal\NodeMigrateType;
use Drupal\Tests\migrate_drupal\Kernel\MigrateDrupalTestBase;
+use Drupal\Tests\migrate_drupal\Traits\NodeMigrateTypeTestTrait;
/**
* Base class for Drupal 7 migration tests.
*/
abstract class MigrateDrupal7TestBase extends MigrateDrupalTestBase {
+ use NodeMigrateTypeTestTrait;
+
/**
* {@inheritdoc}
*/
protected function setUp() {
parent::setUp();
+ // Add a node classic migrate table to the destination site so that tests
+ // run by default with the classic node migrations.
+ $this->makeNodeMigrateMapTable(NodeMigrateType::NODE_MIGRATE_TYPE_CLASSIC, '7');
$this->loadFixture($this->getFixtureFilePath());
}
diff --git a/web/core/modules/migrate_drupal/tests/src/Traits/NodeMigrateTypeTestTrait.php b/web/core/modules/migrate_drupal/tests/src/Traits/NodeMigrateTypeTestTrait.php
new file mode 100644
index 0000000000..21cba11551
--- /dev/null
+++ b/web/core/modules/migrate_drupal/tests/src/Traits/NodeMigrateTypeTestTrait.php
@@ -0,0 +1,209 @@
+<?php
+
+namespace Drupal\Tests\migrate_drupal\Traits;
+
+use Drupal\migrate_drupal\NodeMigrateType;
+
+/**
+ * Helper functions to test complete and classic node migrations.
+ */
+trait NodeMigrateTypeTestTrait {
+
+ /**
+ * The migrate_map table name.
+ *
+ * @var string
+ */
+ public $tableName = NULL;
+
+ /**
+ * Gets the numbers of complete and classic node migrate_map tables.
+ *
+ * @param string $version
+ * The source database version.
+ *
+ * @return array
+ * An associative array with the total number of complete and classic
+ * node migrate_map tables.
+ */
+ protected function nodeMigrateMapTableCount($version) {
+ $results = [];
+ $bases = ['node', 'node_complete'];
+ $tables = \Drupal::database()->schema()
+ ->findTables('migrate_map_d' . $version . '_node%');
+
+ foreach ($bases as $base) {
+ $base_tables = preg_grep('/^migrate_map_d' . $version . '_' . $base . '_{2}.*$/', $tables);
+ $results[$base] = count($base_tables);
+ }
+ return $results;
+ }
+
+ /**
+ * Remove the node migrate map table.
+ *
+ * @param string $type
+ * The type of node migration, 'complete' or 'classic'.
+ * @param string $version
+ * The source database version.
+ *
+ * @throws \Exception
+ */
+ protected function removeNodeMigrateMapTable($type, $version) {
+ $name = $this->getTableName($type, $version);
+ \Drupal::database()->schema()->dropTable($name);
+ }
+
+ /**
+ * Gets the migrate_map table name.
+ *
+ * @param string $type
+ * The type of node migration, 'complete' or 'classic'.
+ * @param string $version
+ * The source database version.
+ *
+ * @return string
+ * The migrate_map table name.
+ */
+ protected function getTableName($type, $version) {
+ if (!$this->tableName) {
+ // PostgreSQL table names are automatically converted lowercase. If this
+ // string is not lowercase then we can't remove the table in
+ // \Drupal\Tests\migrate_drupal\Traits\NodeMigrateTypeTestTrait::removeNodeMigrateMapTable().
+ $content_type = strtolower($this->randomMachineName());
+ $this->tableName = 'migrate_map_d' . $version . '_node_complete__' . $content_type;
+ if ($type == NodeMigrateType::NODE_MIGRATE_TYPE_CLASSIC) {
+ $this->tableName = 'migrate_map_d' . $version . '_node__' . $content_type;
+ }
+ }
+ return $this->tableName;
+ }
+
+ /**
+ * Create a node migrate_map table.
+ *
+ * @param string $type
+ * The type of node migration, 'complete' or 'classic'.
+ * @param string $version
+ * The source database version.
+ *
+ * @throws \Exception
+ */
+ protected function makeNodeMigrateMapTable($type, $version) {
+ $name = $this->getTableName($type, $version);
+ $fields = [
+ 'source_ids_hash' => [
+ 'type' => 'varchar',
+ 'not null' => TRUE,
+ 'length' => '64',
+ ],
+ 'sourceid1' => [
+ 'type' => 'int',
+ 'not null' => TRUE,
+ 'size' => 'normal',
+ ],
+ 'sourceid2' => [
+ 'type' => 'int',
+ 'not null' => TRUE,
+ 'size' => 'normal',
+ ],
+ 'sourceid3' => [
+ 'type' => 'varchar',
+ 'not null' => TRUE,
+ 'length' => '255',
+ ],
+ 'destid1' => [
+ 'type' => 'int',
+ 'not null' => FALSE,
+ 'size' => 'normal',
+ 'unsigned' => TRUE,
+ ],
+ 'destid2' => [
+ 'type' => 'int',
+ 'not null' => FALSE,
+ 'size' => 'normal',
+ 'unsigned' => TRUE,
+ ],
+ 'destid3' => [
+ 'type' => 'varchar_ascii',
+ 'not null' => FALSE,
+ 'length' => '12',
+ ],
+ 'source_row_status' => [
+ 'type' => 'int',
+ 'not null' => TRUE,
+ 'size' => 'tiny',
+ 'default' => '0',
+ 'unsigned' => TRUE,
+ ],
+ 'rollback_action' => [
+ 'type' => 'int',
+ 'not null' => TRUE,
+ 'size' => 'tiny',
+ 'default' => '0',
+ 'unsigned' => TRUE,
+ ],
+ 'last_imported' => [
+ 'type' => 'int',
+ 'not null' => TRUE,
+ 'size' => 'normal',
+ 'default' => '0',
+ 'unsigned' => TRUE,
+ ],
+ 'hash' => [
+ 'type' => 'varchar',
+ 'not null' => FALSE,
+ 'length' => '64',
+ ],
+ ];
+ $values = [
+ 'source_ids_hash' => '123',
+ 'sourceid1' => '4242',
+ 'sourceid2' => '4242',
+ 'sourceid3' => 'en',
+ 'destid1' => '4242',
+ 'destid2' => '4242',
+ 'destid3' => 'en',
+ 'source_row_status' => '1',
+ 'rollback_action' => '1',
+ 'last_imported' => time(),
+ 'hash' => 'abc',
+ ];
+ $indexes = [
+ 'source' => [
+ 'sourceid1',
+ 'sourceid2',
+ 'sourceid3',
+ ],
+ ];
+
+ // Remove keys not used.
+ if ($type == NodeMigrateType::NODE_MIGRATE_TYPE_CLASSIC) {
+ $keys = ['sourceid2', 'sourceid3', 'destid2', 'destid3'];
+ foreach ($keys as $key) {
+ unset($fields[$key]);
+ unset($values[$key]);
+ if (strstr($key, 'sourceid')) {
+ $index_key = substr($key, -1) - 1;
+ unset($indexes['source'][$index_key]);
+ }
+ }
+ }
+ $connection = \Drupal::database();
+ $connection->schema()->createTable($name, [
+ 'fields' => $fields,
+ 'primary key' => [
+ 'source_ids_hash',
+ ],
+ 'indexes' => $indexes,
+ 'mysql_character_set' => 'utf8mb4',
+ ]);
+
+ $field_names = array_keys($fields);
+ $connection->insert($name)
+ ->fields($field_names)
+ ->values($values)
+ ->execute();
+ }
+
+}
diff --git a/web/core/modules/migrate_drupal/tests/src/Unit/source/d6/Drupal6SqlBaseTest.php b/web/core/modules/migrate_drupal/tests/src/Unit/source/d6/Drupal6SqlBaseTest.php
index 9e97fe24cd..eba4627ac0 100644
--- a/web/core/modules/migrate_drupal/tests/src/Unit/source/d6/Drupal6SqlBaseTest.php
+++ b/web/core/modules/migrate_drupal/tests/src/Unit/source/d6/Drupal6SqlBaseTest.php
@@ -82,8 +82,8 @@ protected function setUp() {
public function testGetSystemData() {
$system_data = $this->base->getSystemData();
// Should be 1 theme and 2 modules.
- $this->assertEquals(1, count($system_data['theme']));
- $this->assertEquals(2, count($system_data['module']));
+ $this->assertCount(1, $system_data['theme']);
+ $this->assertCount(2, $system_data['module']);
// Calling again should be identical.
$this->assertSame($system_data, $this->base->getSystemData());
diff --git a/web/core/modules/migrate_drupal_multilingual/migrate_drupal_multilingual.info.yml b/web/core/modules/migrate_drupal_multilingual/migrate_drupal_multilingual.info.yml
index 75a79dc285..fcf9aed610 100644
--- a/web/core/modules/migrate_drupal_multilingual/migrate_drupal_multilingual.info.yml
+++ b/web/core/modules/migrate_drupal_multilingual/migrate_drupal_multilingual.info.yml
@@ -5,3 +5,4 @@ package: 'Core (Experimental)'
core: 8.x
dependencies:
- migrate_drupal
+hidden: true
diff --git a/web/core/modules/migrate_drupal_multilingual/migrate_drupal_multilingual.install b/web/core/modules/migrate_drupal_multilingual/migrate_drupal_multilingual.install
new file mode 100644
index 0000000000..7256494eec
--- /dev/null
+++ b/web/core/modules/migrate_drupal_multilingual/migrate_drupal_multilingual.install
@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * @file
+ * Install, update and uninstall functions for the migrate drupal multilingual module.
+ */
+
+/**
+ * Implements hook_requirements().
+ *
+ * @see migrate_drupal_post_update_uninstall_multilingual()
+ */
+function migrate_drupal_multilingual_requirements($phase) {
+ $requirements = [];
+ if ($phase === 'runtime') {
+ $requirements['migrate_drupal_multilingual'] = [
+ 'title' => t('Migrate Drupal Multilingual'),
+ 'severity' => REQUIREMENT_ERROR,
+ 'description' => t('The Migrate Drupal Multilingual module is deprecated and should not be installed.'),
+ ];
+ }
+ return $requirements;
+}
diff --git a/web/core/modules/migrate_drupal_ui/src/Form/IdConflictForm.php b/web/core/modules/migrate_drupal_ui/src/Form/IdConflictForm.php
index ec58b94081..1ac25a629a 100644
--- a/web/core/modules/migrate_drupal_ui/src/Form/IdConflictForm.php
+++ b/web/core/modules/migrate_drupal_ui/src/Form/IdConflictForm.php
@@ -94,7 +94,10 @@ protected function conflictsForm(array &$form, array $conflicts) {
$form['warning'] = [
'#type' => 'markup',
- '#markup' => '<p>' . $this->t('It looks like you have content on your new site which <strong>may be overwritten</strong> if you continue to run this upgrade. The upgrade should be performed on a clean Drupal 8 installation. For more information see the <a target="_blank" href=":id-conflicts-handbook">upgrade handbook</a>.', [':id-conflicts-handbook' => 'https://www.drupal.org/docs/8/upgrade/known-issues-when-upgrading-from-drupal-6-or-7-to-drupal-8#id_conflicts']) . '</p>',
+ '#markup' => '<p>' . $this->t('It looks like you have content on your new site which <strong>may be overwritten</strong> if you continue to run this upgrade. The upgrade should be performed on a clean Drupal @version installation. For more information see the <a target="_blank" href=":id-conflicts-handbook">upgrade handbook</a>.', [
+ '@version' => $this->destinationSiteVersion,
+ ':id-conflicts-handbook' => 'https://www.drupal.org/docs/8/upgrade/known-issues-when-upgrading-from-drupal-6-or-7-to-drupal-8#id_conflicts',
+ ]) . '</p>',
];
return $form;
@@ -123,7 +126,7 @@ protected function formatConflicts(array $conflicts) {
}
sort($items, SORT_STRING);
- return $items;
+ return array_unique($items);
}
/**
diff --git a/web/core/modules/migrate_drupal_ui/src/Form/IncrementalForm.php b/web/core/modules/migrate_drupal_ui/src/Form/IncrementalForm.php
index 3807a280d1..21c82bc576 100644
--- a/web/core/modules/migrate_drupal_ui/src/Form/IncrementalForm.php
+++ b/web/core/modules/migrate_drupal_ui/src/Form/IncrementalForm.php
@@ -82,7 +82,10 @@ public function buildForm(array $form, FormStateInterface $form_state) {
// https://www.drupal.org/node/2687849
$form['upgrade_option_item'] = [
'#type' => 'item',
- '#prefix' => $this->t('An upgrade has already been performed on this site. To perform a new migration, create a clean and empty new install of Drupal 8. Rollbacks are not yet supported through the user interface. For more information, see the <a href=":url">upgrading handbook</a>.', [':url' => 'https://www.drupal.org/upgrade/migrate']),
+ '#prefix' => $this->t('An upgrade has already been performed on this site. To perform a new migration, create a clean and empty new install of Drupal @version. Rollbacks are not yet supported through the user interface. For more information, see the <a href=":url">upgrading handbook</a>.', [
+ '@version' => $this->destinationSiteVersion,
+ ':url' => 'https://www.drupal.org/upgrade/migrate',
+ ]),
'#description' => $this->t('Last upgrade: @date', ['@date' => $this->dateFormatter->format($date_performed)]),
];
return $form;
diff --git a/web/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeFormBase.php b/web/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeFormBase.php
index 193620dfcd..30c1091b10 100644
--- a/web/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeFormBase.php
+++ b/web/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeFormBase.php
@@ -25,6 +25,13 @@ abstract class MigrateUpgradeFormBase extends FormBase {
*/
protected $store;
+ /**
+ * The destination site major version.
+ *
+ * @var string
+ */
+ protected $destinationSiteVersion;
+
/**
* Constructs the Migrate Upgrade Form Base.
*
@@ -60,6 +67,8 @@ public static function create(ContainerInterface $container) {
* {@inheritdoc}
*/
public function buildForm(array $form, FormStateInterface $form_state) {
+ // Get the current major version.
+ list($this->destinationSiteVersion) = explode('.', \Drupal::VERSION, 2);
$form = [];
$form['actions']['#type'] = 'actions';
$form['actions']['submit'] = [
diff --git a/web/core/modules/migrate_drupal_ui/src/Form/OverviewForm.php b/web/core/modules/migrate_drupal_ui/src/Form/OverviewForm.php
index 91c9fb2ab4..f5df55570c 100644
--- a/web/core/modules/migrate_drupal_ui/src/Form/OverviewForm.php
+++ b/web/core/modules/migrate_drupal_ui/src/Form/OverviewForm.php
@@ -34,7 +34,8 @@ public function buildForm(array $form, FormStateInterface $form_state) {
$form['#title'] = $this->t('Upgrade');
$form['info_header'] = [
- '#markup' => '<p>' . $this->t('Upgrade a site by importing its files and the data from its database into a clean and empty new install of Drupal 8. See the <a href=":url">Drupal site upgrades handbook</a> for more information.', [
+ '#markup' => '<p>' . $this->t('Upgrade a site by importing its files and the data from its database into a clean and empty new install of Drupal @version. See the <a href=":url">Drupal site upgrades handbook</a> for more information.', [
+ '@version' => $this->destinationSiteVersion,
':url' => 'https://www.drupal.org/upgrade/migrate',
]),
];
@@ -45,12 +46,12 @@ public function buildForm(array $form, FormStateInterface $form_state) {
$form['legend']['#markup'] .= '<dt>' . $this->t('Old site') . '</dt>';
$form['legend']['#markup'] .= '<dd>' . $this->t('The site you want to upgrade.') . '</dd>';
$form['legend']['#markup'] .= '<dt>' . $this->t('New site') . '</dt>';
- $form['legend']['#markup'] .= '<dd>' . $this->t('This empty Drupal 8 installation you will import the old site to.') . '</dd>';
+ $form['legend']['#markup'] .= '<dd>' . $this->t('This empty Drupal @version installation you will import the old site to.', ['@version' => $this->destinationSiteVersion]) . '</dd>';
$form['legend']['#markup'] .= '</dl>';
$info[] = $this->t('Make sure that <strong>access to the database</strong> for the old site is available from this new site.');
$info[] = $this->t('<strong>If the old site has private files</strong>, a copy of its files directory must also be accessible on the host of this new site.');
- $info[] = $this->t('<strong>Enable all modules on this new site</strong> that are enabled on the old site. For example, if the old site uses the book module, then enable the book module on this new site so that the existing data can be imported to it.');
+ $info[] = $this->t('<strong>Enable all modules on this new site</strong> that are enabled on the old site. For example, if the old site uses the Book module, then enable the Book module on this new site so that the existing data can be imported to it.');
$info[] = $this->t('<strong>Do not add any content to the new site</strong> before upgrading. Any existing content is likely to be overwritten by the upgrade process. See <a href=":url">the upgrade preparation guide</a>.', [
':url' => 'https://www.drupal.org/docs/8/upgrade/preparing-an-upgrade#dont_create_content',
]);
diff --git a/web/core/modules/migrate_drupal_ui/src/Form/ReviewForm.php b/web/core/modules/migrate_drupal_ui/src/Form/ReviewForm.php
index 5be85c42f2..040f39eaa1 100644
--- a/web/core/modules/migrate_drupal_ui/src/Form/ReviewForm.php
+++ b/web/core/modules/migrate_drupal_ui/src/Form/ReviewForm.php
@@ -120,7 +120,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
'#type' => 'table',
'#header' => [
$this->t('Drupal @version', ['@version' => $version]),
- $this->t('Drupal 8'),
+ $this->t('Drupal @version', ['@version' => $this->destinationSiteVersion]),
],
];
@@ -161,7 +161,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
'#type' => 'table',
'#header' => [
$this->t('Drupal @version', ['@version' => $version]),
- $this->t('Drupal 8'),
+ $this->t('Drupal @version', ['@version' => $this->destinationSiteVersion]),
],
];
diff --git a/web/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateAccessTest.php b/web/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateAccessTest.php
index 5a568aec0f..ce3fbffc93 100644
--- a/web/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateAccessTest.php
+++ b/web/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateAccessTest.php
@@ -29,13 +29,13 @@ class MigrateAccessTest extends BrowserTestBase {
public function testAccess() {
$this->drupalLogin($this->rootUser);
$this->drupalGet('upgrade');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertText(t('Upgrade'));
$user = $this->createUser(['administer software updates']);
$this->drupalLogin($user);
$this->drupalGet('upgrade');
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
$this->assertNoText(t('Upgrade'));
}
diff --git a/web/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeExecuteTestBase.php b/web/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeExecuteTestBase.php
index 7038e7b378..446a0913b3 100644
--- a/web/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeExecuteTestBase.php
+++ b/web/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeExecuteTestBase.php
@@ -11,6 +11,13 @@ abstract class MigrateUpgradeExecuteTestBase extends MigrateUpgradeTestBase {
use CreateTestContentEntitiesTrait;
+ /**
+ * The destination site major version.
+ *
+ * @var string
+ */
+ protected $destinationSiteVersion;
+
/**
* {@inheritdoc}
*/
@@ -19,6 +26,9 @@ protected function setUp() {
// Create content.
$this->createContent();
+
+ // Get the current major version.
+ list($this->destinationSiteVersion) = explode('.', \Drupal::VERSION, 2);
}
/**
@@ -34,7 +44,7 @@ public function testMigrateUpgradeExecute() {
$connection_options = $this->sourceDatabase->getConnectionOptions();
$this->drupalGet('/upgrade');
$session = $this->assertSession();
- $session->responseContains('Upgrade a site by importing its files and the data from its database into a clean and empty new install of Drupal 8.');
+ $session->responseContains("Upgrade a site by importing its files and the data from its database into a clean and empty new install of Drupal $this->destinationSiteVersion.");
$this->drupalPostForm(NULL, [], t('Continue'));
$session->pageTextContains('Provide credentials for the database of the Drupal site you want to upgrade.');
@@ -99,7 +109,7 @@ public function testMigrateUpgradeExecute() {
// Restart the upgrade process.
$this->drupalGet('/upgrade');
- $session->responseContains('Upgrade a site by importing its files and the data from its database into a clean and empty new install of Drupal 8.');
+ $session->responseContains("Upgrade a site by importing its files and the data from its database into a clean and empty new install of Drupal $this->destinationSiteVersion.");
$this->drupalPostForm(NULL, [], t('Continue'));
$session->pageTextContains('Provide credentials for the database of the Drupal site you want to upgrade.');
@@ -112,8 +122,6 @@ public function testMigrateUpgradeExecute() {
'file',
'taxonomy_term',
'user',
- 'comment',
- 'node',
];
$this->assertIdConflict($session, $entity_types);
@@ -142,15 +150,14 @@ public function testMigrateUpgradeExecute() {
$this->createContentPostUpgrade();
$this->drupalGet('/upgrade');
- $session->pageTextContains('An upgrade has already been performed on this site. To perform a new migration, create a clean and empty new install of Drupal 8. Rollbacks are not yet supported through the user interface.');
+ $session->pageTextContains("An upgrade has already been performed on this site. To perform a new migration, create a clean and empty new install of Drupal $this->destinationSiteVersion. Rollbacks are not yet supported through the user interface.");
$this->drupalPostForm(NULL, [], t('Import new configuration and content from old site'));
$this->drupalPostForm(NULL, $edits, t('Review upgrade'));
$session->pageTextContains('WARNING: Content may be overwritten on your new site.');
$session->pageTextContains('There is conflicting content of these types:');
$session->pageTextContains('files');
- $session->pageTextContains('content item revisions');
$session->pageTextContains('There is translated content of these types:');
- $session->pageTextContains('content items');
+ $session->pageTextContainsOnce('content items');
$this->drupalPostForm(NULL, [], t('I acknowledge I may lose data. Continue anyway.'));
$session->statusCodeEquals(200);
diff --git a/web/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeFormStepsTest.php b/web/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeFormStepsTest.php
index 4ef2738351..9b9401b1dd 100644
--- a/web/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeFormStepsTest.php
+++ b/web/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeFormStepsTest.php
@@ -62,7 +62,9 @@ public function testMigrateUpgradeReviewPage() {
// Overview form and for an incremental migration it is the Incremental
// form.
$session = $this->assertSession();
- $expected['initial'] = 'Upgrade a site by importing its files and the data from its database into a clean and empty new install of Drupal 8.';
+ // Get the current major version.
+ list($destination_site_version) = explode('.', \Drupal::VERSION, 2);
+ $expected['initial'] = "Upgrade a site by importing its files and the data from its database into a clean and empty new install of Drupal $destination_site_version.";
$expected['incremental'] = "An upgrade has already been performed on this site.";
foreach (['/upgrade', '/upgrade/incremental'] as $expected) {
@@ -113,7 +115,7 @@ public function testMigrateUpgradeReviewPage() {
// Test that the credential form is displayed for incremental migrations.
$store->set('step', 'overview');
$this->drupalGet('/upgrade');
- $session->pageTextContains('An upgrade has already been performed on this site. To perform a new migration, create a clean and empty new install of Drupal 8. Rollbacks are not yet supported through the user interface.');
+ $session->pageTextContains("An upgrade has already been performed on this site. To perform a new migration, create a clean and empty new install of Drupal $destination_site_version. Rollbacks are not yet supported through the user interface.");
$this->drupalPostForm(NULL, [], t('Import new configuration and content from old site'));
$session->pageTextContains('Provide credentials for the database of the Drupal site you want to upgrade.');
}
diff --git a/web/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeTestBase.php b/web/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeTestBase.php
index db75e036a8..4b6754487c 100644
--- a/web/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeTestBase.php
+++ b/web/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeTestBase.php
@@ -196,17 +196,18 @@ protected function assertReviewPage(WebAssert $session, array $available_paths,
* @param array $entity_types
* An array of entity types
*/
- protected function assertIdConflict(WebAssert $session, $entity_types) {
+ protected function assertIdConflict(WebAssert $session, array $entity_types) {
/** @var \Drupal\ $entity_type_manager */
$entity_type_manager = \Drupal::service('entity_type.manager');
$session->pageTextContains('WARNING: Content may be overwritten on your new site.');
$session->pageTextContains('There is conflicting content of these types:');
+ $this->assertNotEmpty($entity_types, 'No entity types provided to \Drupal\Tests\migrate_drupal_ui\Functional\MigrateUpgradeTestBase::assertIdConflict()');
foreach ($entity_types as $entity_type) {
$label = $entity_type_manager->getDefinition($entity_type)->getPluralLabel();
$session->pageTextContains($label);
}
- $session->pageTextContains('content item revisions');
+ $session->pageTextContainsOnce('content items');
$session->pageTextContains('There is translated content of these types:');
}
diff --git a/web/core/modules/migrate_drupal_ui/tests/src/Functional/MultilingualReviewPageTestBase.php b/web/core/modules/migrate_drupal_ui/tests/src/Functional/MultilingualReviewPageTestBase.php
index b9f11b20e3..bde8ad62a6 100644
--- a/web/core/modules/migrate_drupal_ui/tests/src/Functional/MultilingualReviewPageTestBase.php
+++ b/web/core/modules/migrate_drupal_ui/tests/src/Functional/MultilingualReviewPageTestBase.php
@@ -69,7 +69,7 @@ public function testMigrateUpgradeReviewPage() {
$this->assertUpgradePaths($session, $available_paths, $missing_paths);
// Check there are no errors when a module does not have any migrations and
- // does not need any. Test with a module that is was in both Drupal 6 and
+ // does not need any. Test with a module that is in both Drupal 6 and
// Drupal 7 core.
$module = 'help';
$query = $this->sourceDatabase->delete('system');
diff --git a/web/core/modules/migrate_drupal_ui/tests/src/Functional/NoMultilingualReviewPageTestBase.php b/web/core/modules/migrate_drupal_ui/tests/src/Functional/NoMultilingualReviewPageTestBase.php
index d5e41ed293..81f618ce6c 100644
--- a/web/core/modules/migrate_drupal_ui/tests/src/Functional/NoMultilingualReviewPageTestBase.php
+++ b/web/core/modules/migrate_drupal_ui/tests/src/Functional/NoMultilingualReviewPageTestBase.php
@@ -23,8 +23,8 @@ public function testMigrateUpgradeReviewPage() {
$session->pageTextContains('WARNING: Content may be overwritten on your new site.');
$session->pageTextContains('There is conflicting content of these types:');
$session->pageTextContains('taxonomy terms');
- $session->pageTextNotContains('There is translated content of these types:');
- $session->pageTextNotContains('custom menu links');
+ $session->pageTextContains('There is translated content of these types:');
+ $session->pageTextContainsOnce('content items');
$this->drupalPostForm(NULL, [], t('I acknowledge I may lose data. Continue anyway.'));
$session->statusCodeEquals(200);
diff --git a/web/core/modules/migrate_drupal_ui/tests/src/Functional/d6/IdConflictTest.php b/web/core/modules/migrate_drupal_ui/tests/src/Functional/d6/IdConflictTest.php
index 204e02314f..43d08c7a53 100644
--- a/web/core/modules/migrate_drupal_ui/tests/src/Functional/d6/IdConflictTest.php
+++ b/web/core/modules/migrate_drupal_ui/tests/src/Functional/d6/IdConflictTest.php
@@ -74,7 +74,7 @@ public function testMigrateUpgradeExecute() {
$connection_options = $this->sourceDatabase->getConnectionOptions();
$this->drupalGet('/upgrade');
$session = $this->assertSession();
- $session->responseContains('Upgrade a site by importing its files and the data from its database into a clean and empty new install of Drupal 8.');
+ $session->responseContains("Upgrade a site by importing its files and the data from its database into a clean and empty new install of Drupal $this->destinationSiteVersion.");
$this->drupalPostForm(NULL, [], t('Continue'));
$session->pageTextContains('Provide credentials for the database of the Drupal site you want to upgrade.');
@@ -102,7 +102,7 @@ public function testMigrateUpgradeExecute() {
// Start the upgrade process.
$this->drupalGet('/upgrade');
- $session->responseContains('Upgrade a site by importing its files and the data from its database into a clean and empty new install of Drupal 8.');
+ $session->responseContains("Upgrade a site by importing its files and the data from its database into a clean and empty new install of Drupal $this->destinationSiteVersion.");
$this->drupalPostForm(NULL, [], t('Continue'));
$session->pageTextContains('Provide credentials for the database of the Drupal site you want to upgrade.');
diff --git a/web/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MultilingualReviewPageTest.php b/web/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MultilingualReviewPageTest.php
index dc3a6d68eb..ea7c6bac6f 100644
--- a/web/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MultilingualReviewPageTest.php
+++ b/web/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MultilingualReviewPageTest.php
@@ -31,8 +31,6 @@ class MultilingualReviewPageTest extends MultilingualReviewPageTestBase {
'syslog',
'tracker',
'update',
- // Required for translation migrations.
- 'migrate_drupal_multilingual',
// Test migrations states.
'migrate_state_finished_test',
'migrate_state_not_finished_test',
@@ -109,6 +107,7 @@ protected function getAvailablePaths() {
'jquery_ui',
'link',
'menu',
+ 'node',
'nodeaccess',
'nodereference',
'number',
@@ -158,7 +157,6 @@ protected function getMissingPaths() {
'i18nviews',
'locale',
'migrate_status_active_test',
- 'node',
'views',
];
}
diff --git a/web/core/modules/migrate_drupal_ui/tests/src/Functional/d6/NoMultilingualTest.php b/web/core/modules/migrate_drupal_ui/tests/src/Functional/d6/NoMultilingualTest.php
deleted file mode 100644
index 20f7098bd3..0000000000
--- a/web/core/modules/migrate_drupal_ui/tests/src/Functional/d6/NoMultilingualTest.php
+++ /dev/null
@@ -1,209 +0,0 @@
-<?php
-
-namespace Drupal\Tests\migrate_drupal_ui\Functional\d6;
-
-use Drupal\Tests\migrate_drupal_ui\Functional\MigrateUpgradeExecuteTestBase;
-
-/**
- * Tests Drupal 6 upgrade without translations.
- *
- * The test method is provided by the MigrateUpgradeTestBase class.
- *
- * @group migrate_drupal_ui
- */
-class NoMultilingualTest extends MigrateUpgradeExecuteTestBase {
-
- /**
- * {@inheritdoc}
- */
- public static $modules = [
- 'language',
- 'content_translation',
- 'config_translation',
- 'migrate_drupal_ui',
- 'telephone',
- 'aggregator',
- 'book',
- 'forum',
- 'statistics',
- ];
-
- /**
- * {@inheritdoc}
- */
- protected function setUp() {
- parent::setUp();
- $this->loadFixture(drupal_get_path('module', 'migrate_drupal') . '/tests/fixtures/drupal6.php');
- }
-
- /**
- * {@inheritdoc}
- */
- protected function getSourceBasePath() {
- return __DIR__ . '/files';
- }
-
- /**
- * {@inheritdoc}
- */
- protected function getEntityCounts() {
- return [
- 'aggregator_item' => 1,
- 'aggregator_feed' => 2,
- 'block' => 35,
- 'block_content' => 2,
- 'block_content_type' => 1,
- 'comment' => 6,
- // The 'standard' profile provides the 'comment' comment type, and the
- // migration creates 12 comment types, one per node type.
- 'comment_type' => 13,
- 'contact_form' => 5,
- 'configurable_language' => 5,
- 'editor' => 2,
- 'field_config' => 89,
- 'field_storage_config' => 63,
- 'file' => 8,
- 'filter_format' => 7,
- 'image_style' => 5,
- 'language_content_settings' => 3,
- 'migration' => 105,
- 'node' => 17,
- // The 'book' module provides the 'book' node type, and the migration
- // creates 12 node types.
- 'node_type' => 13,
- 'rdf_mapping' => 7,
- 'search_page' => 2,
- 'shortcut' => 2,
- 'shortcut_set' => 1,
- 'action' => 23,
- 'menu' => 8,
- 'taxonomy_term' => 8,
- 'taxonomy_vocabulary' => 7,
- 'tour' => 4,
- 'user' => 7,
- 'user_role' => 6,
- 'menu_link_content' => 8,
- 'view' => 16,
- 'date_format' => 11,
- 'entity_form_display' => 29,
- 'entity_form_mode' => 1,
- 'entity_view_display' => 55,
- 'entity_view_mode' => 14,
- 'base_field_override' => 38,
- ];
- }
-
- /**
- * {@inheritdoc}
- */
- protected function getEntityCountsIncremental() {
- $counts = $this->getEntityCounts();
- $counts['block_content'] = 3;
- $counts['comment'] = 7;
- $counts['file'] = 9;
- $counts['menu_link_content'] = 9;
- $counts['node'] = 18;
- $counts['taxonomy_term'] = 9;
- $counts['user'] = 8;
- $counts['view'] = 16;
- return $counts;
- }
-
- /**
- * {@inheritdoc}
- */
- protected function getAvailablePaths() {
- return [
- 'aggregator',
- 'block',
- 'book',
- 'comment',
- 'contact',
- 'content',
- 'date',
- 'dblog',
- 'email',
- 'filefield',
- 'filter',
- 'forum',
- 'imagecache',
- 'imagefield',
- 'link',
- 'locale',
- 'menu',
- 'node',
- 'nodereference',
- 'optionwidgets',
- 'path',
- 'profile',
- 'search',
- 'statistics',
- 'system',
- 'taxonomy',
- 'text',
- 'upload',
- 'user',
- 'userreference',
- // Include modules that do not have an upgrade path and are enabled in the
- // source database.
- 'date_api',
- 'date_timezone',
- 'event',
- 'i18n',
- 'i18nstrings',
- 'imageapi',
- 'number',
- 'php',
- 'profile',
- 'variable_admin',
- ];
- }
-
- /**
- * {@inheritdoc}
- */
- protected function getMissingPaths() {
- return [
- 'i18nblocks',
- 'i18ncck',
- 'i18ncontent',
- 'i18nmenu',
- 'i18nprofile',
- ];
- }
-
- /**
- * {@inheritdoc}
- */
- public function testMigrateUpgradeExecute() {
- $connection_options = $this->sourceDatabase->getConnectionOptions();
- $this->drupalGet('/upgrade');
- $session = $this->assertSession();
- $session->responseContains('Upgrade a site by importing its files and the data from its database into a clean and empty new install of Drupal 8.');
-
- $button = $session->buttonExists('Continue');
- $button->click();
- $session->pageTextContains('Provide credentials for the database of the Drupal site you want to upgrade.');
-
- $driver = $connection_options['driver'];
- $connection_options['prefix'] = $connection_options['prefix']['default'];
-
- // Use the driver connection form to get the correct options out of the
- // database settings. This supports all of the databases we test against.
- $drivers = drupal_get_database_types();
- $form = $drivers[$driver]->getFormOptions($connection_options);
- $connection_options = array_intersect_key($connection_options, $form + $form['advanced_options']);
- $version = $this->getLegacyDrupalVersion($this->sourceDatabase);
- $edit = [
- $driver => $connection_options,
- 'version' => $version,
- ];
- if (count($drivers) !== 1) {
- $edit['driver'] = $driver;
- }
- $edits = $this->translatePostValues($edit);
- $this->drupalPostForm(NULL, $edits, t('Review upgrade'));
- $session->pageTextContains("Install migrate_drupal_multilingual to run migration 'd6_system_maintenance_translation'.");
- }
-
-}
diff --git a/web/core/modules/migrate_drupal_ui/tests/src/Functional/d6/NodeClassicTest.php b/web/core/modules/migrate_drupal_ui/tests/src/Functional/d6/NodeClassicTest.php
new file mode 100644
index 0000000000..c1c8b94027
--- /dev/null
+++ b/web/core/modules/migrate_drupal_ui/tests/src/Functional/d6/NodeClassicTest.php
@@ -0,0 +1,131 @@
+<?php
+
+namespace Drupal\Tests\migrate_drupal_ui\Functional\d6;
+
+use Drupal\migrate_drupal\NodeMigrateType;
+use Drupal\Tests\migrate_drupal\Traits\NodeMigrateTypeTestTrait;
+use Drupal\Tests\migrate_drupal_ui\Functional\MigrateUpgradeExecuteTestBase;
+
+/**
+ * Tests the classic node migration runs.
+ *
+ * The classic node migration will run and not the complete node migration
+ * when there is a pre-existing classic node migrate map table.
+ *
+ * @group migrate_drupal_ui
+ */
+class NodeClassicTest extends MigrateUpgradeExecuteTestBase {
+
+ use NodeMigrateTypeTestTrait;
+
+ /**
+ * {@inheritdoc}
+ */
+ public static $modules = [
+ 'language',
+ 'content_translation',
+ 'config_translation',
+ 'migrate_drupal_ui',
+ 'telephone',
+ 'aggregator',
+ 'book',
+ 'forum',
+ 'statistics',
+ // Required for translation migrations.
+ 'migrate_drupal_multilingual',
+ ];
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function setUp() {
+ parent::setUp();
+ $this->loadFixture(drupal_get_path('module', 'migrate_drupal') . '/tests/fixtures/drupal6.php');
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function getSourceBasePath() {
+ return __DIR__ . '/files';
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function getEntityCounts() {
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function getEntityCountsIncremental() {
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function getAvailablePaths() {
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function getMissingPaths() {
+ }
+
+ /**
+ * Tests ID Conflict form.
+ */
+ public function testMigrateUpgradeExecute() {
+ // Add a node classic migrate table to d8.
+ $this->makeNodeMigrateMapTable(NodeMigrateType::NODE_MIGRATE_TYPE_CLASSIC, '6');
+
+ $connection_options = $this->sourceDatabase->getConnectionOptions();
+ $this->drupalGet('/upgrade');
+ $session = $this->assertSession();
+ $session->responseContains("Upgrade a site by importing its files and the data from its database into a clean and empty new install of Drupal $this->destinationSiteVersion.");
+
+ $this->drupalPostForm(NULL, [], t('Continue'));
+ $session->pageTextContains('Provide credentials for the database of the Drupal site you want to upgrade.');
+ $session->fieldExists('mysql[host]');
+
+ $driver = $connection_options['driver'];
+ $connection_options['prefix'] = $connection_options['prefix']['default'];
+
+ // Use the driver connection form to get the correct options out of the
+ // database settings. This supports all of the databases we test against.
+ $drivers = drupal_get_database_types();
+ $form = $drivers[$driver]->getFormOptions($connection_options);
+ $connection_options = array_intersect_key($connection_options, $form + $form['advanced_options']);
+ $version = $this->getLegacyDrupalVersion($this->sourceDatabase);
+ $edit = [
+ $driver => $connection_options,
+ 'source_private_file_path' => $this->getSourceBasePath(),
+ 'version' => $version,
+ ];
+ $edit['d6_source_base_path'] = $this->getSourceBasePath();
+ if (count($drivers) !== 1) {
+ $edit['driver'] = $driver;
+ }
+ $edits = $this->translatePostValues($edit);
+
+ // Start the upgrade process.
+ $this->drupalGet('/upgrade');
+ $session->responseContains("Upgrade a site by importing its files and the data from its database into a clean and empty new install of Drupal $this->destinationSiteVersion.");
+
+ $this->drupalPostForm(NULL, [], t('Continue'));
+ $session->pageTextContains('Provide credentials for the database of the Drupal site you want to upgrade.');
+ $session->fieldExists('mysql[host]');
+
+ // When the Credential form is submitted the migrate map tables are created.
+ $this->drupalPostForm(NULL, $edits, t('Review upgrade'));
+
+ // Confirm there are only classic node migration map tables. This shows
+ // that only the classic migration will run.
+ $results = $this->nodeMigrateMapTableCount('6');
+ $this->assertSame(13, $results['node']);
+ $this->assertSame(0, $results['node_complete']);
+ }
+
+}
diff --git a/web/core/modules/migrate_drupal_ui/tests/src/Functional/d6/Upgrade6Test.php b/web/core/modules/migrate_drupal_ui/tests/src/Functional/d6/Upgrade6Test.php
index 0731f12aff..7d8822d5d1 100644
--- a/web/core/modules/migrate_drupal_ui/tests/src/Functional/d6/Upgrade6Test.php
+++ b/web/core/modules/migrate_drupal_ui/tests/src/Functional/d6/Upgrade6Test.php
@@ -33,15 +33,30 @@ class Upgrade6Test extends MigrateUpgradeExecuteTestBase {
'forum',
'statistics',
'migration_provider_test',
- // Required for translation migrations.
- 'migrate_drupal_multilingual',
];
+ /**
+ * The entity storage for node.
+ *
+ * @var \Drupal\Core\Entity\EntityStorageInterface
+ */
+ protected $nodeStorage;
+
/**
* {@inheritdoc}
*/
protected function setUp() {
parent::setUp();
+
+ // Delete the existing content made to test the ID Conflict form. Migrations
+ // are to be done on a site without content. The test of the ID Conflict
+ // form is being moved to its own issue which will remove the deletion
+ // of the created nodes.
+ // See https://www.drupal.org/project/drupal/issues/3087061.
+ $this->nodeStorage = $this->container->get('entity_type.manager')
+ ->getStorage('node');
+ $this->nodeStorage->delete($this->nodeStorage->loadMultiple());
+
$this->loadFixture(drupal_get_path('module', 'migrate_drupal') . '/tests/fixtures/drupal6.php');
}
@@ -145,6 +160,7 @@ protected function getAvailablePaths() {
'imagecache',
'imagefield',
'menu',
+ 'node',
'nodereference',
'optionwidgets',
'path',
@@ -180,7 +196,6 @@ protected function getMissingPaths() {
'i18nstrings',
'i18ntaxonomy',
'locale',
- 'node',
];
}
diff --git a/web/core/modules/migrate_drupal_ui/tests/src/Functional/d7/IdConflictTest.php b/web/core/modules/migrate_drupal_ui/tests/src/Functional/d7/IdConflictTest.php
index 4c923e8532..8c728bdab8 100644
--- a/web/core/modules/migrate_drupal_ui/tests/src/Functional/d7/IdConflictTest.php
+++ b/web/core/modules/migrate_drupal_ui/tests/src/Functional/d7/IdConflictTest.php
@@ -76,7 +76,7 @@ public function testMigrateUpgradeExecute() {
$connection_options = $this->sourceDatabase->getConnectionOptions();
$this->drupalGet('/upgrade');
$session = $this->assertSession();
- $session->responseContains('Upgrade a site by importing its files and the data from its database into a clean and empty new install of Drupal 8.');
+ $session->responseContains("Upgrade a site by importing its files and the data from its database into a clean and empty new install of Drupal $this->destinationSiteVersion.");
$this->drupalPostForm(NULL, [], t('Continue'));
$session->pageTextContains('Provide credentials for the database of the Drupal site you want to upgrade.');
@@ -104,7 +104,7 @@ public function testMigrateUpgradeExecute() {
// Start the upgrade process.
$this->drupalGet('/upgrade');
- $session->responseContains('Upgrade a site by importing its files and the data from its database into a clean and empty new install of Drupal 8.');
+ $session->responseContains("Upgrade a site by importing its files and the data from its database into a clean and empty new install of Drupal $this->destinationSiteVersion.");
$this->drupalPostForm(NULL, [], t('Continue'));
$session->pageTextContains('Provide credentials for the database of the Drupal site you want to upgrade.');
diff --git a/web/core/modules/migrate_drupal_ui/tests/src/Functional/d7/MultilingualReviewPageTest.php b/web/core/modules/migrate_drupal_ui/tests/src/Functional/d7/MultilingualReviewPageTest.php
index b5fdc0239b..ca1944c1e7 100644
--- a/web/core/modules/migrate_drupal_ui/tests/src/Functional/d7/MultilingualReviewPageTest.php
+++ b/web/core/modules/migrate_drupal_ui/tests/src/Functional/d7/MultilingualReviewPageTest.php
@@ -30,8 +30,6 @@ class MultilingualReviewPageTest extends MultilingualReviewPageTestBase {
'syslog',
'tracker',
'update',
- // Required for translation migrations.
- 'migrate_drupal_multilingual',
// Test migrations states.
'migrate_state_finished_test',
'migrate_state_not_finished_test',
@@ -103,6 +101,7 @@ protected function getAvailablePaths() {
'locale',
'menu',
'number',
+ 'node',
'openid',
'options',
'overlay',
@@ -168,7 +167,6 @@ protected function getMissingPaths() {
'i18n_translation',
'i18n_user',
'i18n_variable',
- 'node',
'picture',
'migrate_status_active_test',
'variable',
diff --git a/web/core/modules/migrate_drupal_ui/tests/src/Functional/d7/NoMultilingualTest.php b/web/core/modules/migrate_drupal_ui/tests/src/Functional/d7/NoMultilingualTest.php
deleted file mode 100644
index 46421a69f9..0000000000
--- a/web/core/modules/migrate_drupal_ui/tests/src/Functional/d7/NoMultilingualTest.php
+++ /dev/null
@@ -1,220 +0,0 @@
-<?php
-
-namespace Drupal\Tests\migrate_drupal_ui\Functional\d7;
-
-use Drupal\Tests\migrate_drupal_ui\Functional\MigrateUpgradeExecuteTestBase;
-
-/**
- * Tests Drupal 6 upgrade without translations.
- *
- * The test method is provided by the MigrateUpgradeTestBase class.
- *
- * @group migrate_drupal_ui
- */
-class NoMultilingualTest extends MigrateUpgradeExecuteTestBase {
-
- /**
- * {@inheritdoc}
- */
- public static $modules = [
- 'file',
- 'language',
- 'content_translation',
- 'config_translation',
- 'migrate_drupal_ui',
- 'telephone',
- 'aggregator',
- 'book',
- 'forum',
- 'statistics',
- ];
-
- /**
- * {@inheritdoc}
- */
- protected function setUp() {
- parent::setUp();
- $this->loadFixture(drupal_get_path('module', 'migrate_drupal') . '/tests/fixtures/drupal7.php');
- }
-
- /**
- * {@inheritdoc}
- */
- protected function getSourceBasePath() {
- return __DIR__ . '/files';
- }
-
- /**
- * {@inheritdoc}
- */
- protected function getEntityCounts() {
- return [
- 'aggregator_item' => 11,
- 'aggregator_feed' => 1,
- 'block' => 25,
- 'block_content' => 1,
- 'block_content_type' => 1,
- 'comment' => 2,
- // The 'standard' profile provides the 'comment' comment type, and the
- // migration creates 6 comment types, one per node type.
- 'comment_type' => 7,
- // Module 'language' comes with 'en', 'und', 'zxx'. Migration adds 'is'.
- 'configurable_language' => 4,
- 'contact_form' => 3,
- 'editor' => 2,
- 'field_config' => 68,
- 'field_storage_config' => 50,
- 'file' => 3,
- 'filter_format' => 7,
- 'image_style' => 6,
- 'language_content_settings' => 2,
- 'migration' => 73,
- 'node' => 5,
- 'node_type' => 6,
- 'rdf_mapping' => 8,
- 'search_page' => 2,
- 'shortcut' => 6,
- 'shortcut_set' => 2,
- 'action' => 17,
- 'menu' => 6,
- 'taxonomy_term' => 18,
- 'taxonomy_vocabulary' => 4,
- 'tour' => 4,
- 'user' => 4,
- 'user_role' => 3,
- 'menu_link_content' => 10,
- 'view' => 16,
- 'date_format' => 11,
- 'entity_form_display' => 17,
- 'entity_form_mode' => 1,
- 'entity_view_display' => 28,
- 'entity_view_mode' => 14,
- 'base_field_override' => 9,
- ];
- }
-
- /**
- * {@inheritdoc}
- */
- protected function getEntityCountsIncremental() {
- $counts = $this->getEntityCounts();
- $counts['block_content'] = 2;
- $counts['comment'] = 3;
- $counts['file'] = 4;
- $counts['menu_link_content'] = 11;
- $counts['node'] = 6;
- $counts['taxonomy_term'] = 19;
- $counts['user'] = 5;
- return $counts;
- }
-
- /**
- * {@inheritdoc}
- */
- protected function getAvailablePaths() {
- return [
- 'aggregator',
- 'block',
- 'book',
- 'color',
- 'comment',
- 'contact',
- 'date',
- 'dblog',
- 'email',
- 'entityreference',
- 'field',
- 'field_sql_storage',
- 'file',
- 'filter',
- 'forum',
- 'image',
- 'language',
- 'link',
- 'list',
- 'locale',
- 'menu',
- 'node',
- 'number',
- 'options',
- 'path',
- 'phone',
- 'rdf',
- 'search',
- 'shortcut',
- 'statistics',
- 'system',
- 'taxonomy',
- 'text',
- 'user',
- // Include modules that do not have an upgrade path and are enabled in the
- // source database.
- 'blog',
- 'contextual',
- 'date_api',
- 'entity',
- 'field_ui',
- 'help',
- 'php',
- 'simpletest',
- 'toolbar',
- 'translation',
- 'trigger',
- ];
- }
-
- /**
- * {@inheritdoc}
- */
- protected function getIncompletePaths() {
- return [];
- }
-
- /**
- * {@inheritdoc}
- */
- protected function getMissingPaths() {
- return [
- // These modules are in the missing path list because they are installed
- // on the source site but they are not installed on the destination site.
- 'syslog',
- 'tracker',
- 'update',
- ];
- }
-
- /**
- * {@inheritdoc}
- */
- public function testMigrateUpgradeExecute() {
- $connection_options = $this->sourceDatabase->getConnectionOptions();
- $this->drupalGet('/upgrade');
- $session = $this->assertSession();
- $session->responseContains('Upgrade a site by importing its files and the data from its database into a clean and empty new install of Drupal 8.');
-
- $button = $session->buttonExists('Continue');
- $button->click();
- $session->pageTextContains('Provide credentials for the database of the Drupal site you want to upgrade.');
-
- $driver = $connection_options['driver'];
- $connection_options['prefix'] = $connection_options['prefix']['default'];
-
- // Use the driver connection form to get the correct options out of the
- // database settings. This supports all of the databases we test against.
- $drivers = drupal_get_database_types();
- $form = $drivers[$driver]->getFormOptions($connection_options);
- $connection_options = array_intersect_key($connection_options, $form + $form['advanced_options']);
- $version = $this->getLegacyDrupalVersion($this->sourceDatabase);
- $edit = [
- $driver => $connection_options,
- 'version' => $version,
- ];
- if (count($drivers) !== 1) {
- $edit['driver'] = $driver;
- }
- $edits = $this->translatePostValues($edit);
- $this->drupalPostForm(NULL, $edits, t('Review upgrade'));
- $session->pageTextContains("Install migrate_drupal_multilingual to run migration 'd7_system_maintenance_translation'.");
- }
-
-}
diff --git a/web/core/modules/migrate_drupal_ui/tests/src/Functional/d7/Upgrade7Test.php b/web/core/modules/migrate_drupal_ui/tests/src/Functional/d7/Upgrade7Test.php
index f5178bc545..327710d15b 100644
--- a/web/core/modules/migrate_drupal_ui/tests/src/Functional/d7/Upgrade7Test.php
+++ b/web/core/modules/migrate_drupal_ui/tests/src/Functional/d7/Upgrade7Test.php
@@ -35,15 +35,30 @@ class Upgrade7Test extends MigrateUpgradeExecuteTestBase {
'rdf',
'statistics',
'migration_provider_test',
- // Required for translation migrations.
- 'migrate_drupal_multilingual',
];
+ /**
+ * The entity storage for node.
+ *
+ * @var \Drupal\Core\Entity\EntityStorageInterface
+ */
+ protected $nodeStorage;
+
/**
* {@inheritdoc}
*/
protected function setUp() {
parent::setUp();
+
+ // Delete the existing content made to test the ID Conflict form. Migrations
+ // are to be done on a site without content. The test of the ID Conflict
+ // form is being moved to its own issue which will remove the deletion
+ // of the created nodes.
+ // See https://www.drupal.org/project/drupal/issues/3087061.
+ $this->nodeStorage = $this->container->get('entity_type.manager')
+ ->getStorage('node');
+ $this->nodeStorage->delete($this->nodeStorage->loadMultiple());
+
$this->loadFixture(drupal_get_path('module', 'migrate_drupal') . '/tests/fixtures/drupal7.php');
}
@@ -67,21 +82,21 @@ protected function getEntityCounts() {
'comment' => 4,
// The 'standard' profile provides the 'comment' comment type, and the
// migration creates 6 comment types, one per node type.
- 'comment_type' => 7,
+ 'comment_type' => 8,
// Module 'language' comes with 'en', 'und', 'zxx'. Migration adds 'is'
// and 'fr'.
'configurable_language' => 5,
'contact_form' => 3,
'contact_message' => 0,
'editor' => 2,
- 'field_config' => 73,
- 'field_storage_config' => 55,
+ 'field_config' => 79,
+ 'field_storage_config' => 60,
'file' => 3,
'filter_format' => 7,
'image_style' => 6,
- 'language_content_settings' => 18,
- 'node' => 6,
- 'node_type' => 6,
+ 'language_content_settings' => 20,
+ 'node' => 7,
+ 'node_type' => 7,
'rdf_mapping' => 8,
'search_page' => 2,
'shortcut' => 6,
@@ -97,9 +112,9 @@ protected function getEntityCounts() {
'menu_link_content' => 12,
'view' => 16,
'date_format' => 11,
- 'entity_form_display' => 17,
+ 'entity_form_display' => 22,
'entity_form_mode' => 1,
- 'entity_view_display' => 28,
+ 'entity_view_display' => 33,
'entity_view_mode' => 14,
'base_field_override' => 4,
];
@@ -114,7 +129,7 @@ protected function getEntityCountsIncremental() {
$counts['comment'] = 5;
$counts['file'] = 4;
$counts['menu_link_content'] = 13;
- $counts['node'] = 7;
+ $counts['node'] = 8;
$counts['taxonomy_term'] = 25;
$counts['user'] = 5;
return $counts;
@@ -149,6 +164,7 @@ protected function getAvailablePaths() {
'link',
'list',
'menu',
+ 'node',
'number',
'options',
'path',
@@ -189,7 +205,6 @@ protected function getMissingPaths() {
'i18n_taxonomy',
'i18n_translation',
'locale',
- 'node',
'variable',
'variable_realm',
'variable_store',
diff --git a/web/core/modules/node/migrations/d6_node_complete.yml b/web/core/modules/node/migrations/d6_node_complete.yml
new file mode 100644
index 0000000000..84ef465bec
--- /dev/null
+++ b/web/core/modules/node/migrations/d6_node_complete.yml
@@ -0,0 +1,58 @@
+# Migrates all revisions and all revision translations.
+id: d6_node_complete
+label: Node Complete
+audit: true
+migration_tags:
+ - Drupal 6
+ - Content
+class: Drupal\node\Plugin\migrate\D6NodeTranslation
+deriver: Drupal\node\Plugin\migrate\D6NodeDeriver
+source:
+ plugin: d6_node_complete
+process:
+ # If you are using this file to build a custom migration consider removing
+ # the nid and vid fields to allow incremental migrations.
+ # In D6, nodes always have a tnid, but it's zero for untranslated nodes.
+ # We normalize it to equal the nid in that case.
+ # @see \Drupal\node\Plugin\migrate\source\d6\Node::prepareRow().
+ nid: tnid
+ vid: vid
+ langcode:
+ plugin: default_value
+ source: language
+ default_value: "und"
+ title: title
+ uid: node_uid
+ status: status
+ created: created
+ changed: timestamp
+ promote: promote
+ sticky: sticky
+ 'body/format':
+ plugin: migration_lookup
+ migration: d6_filter_format
+ source: format
+ 'body/value': body
+ 'body/summary': teaser
+ revision_uid: revision_uid
+ revision_log: log
+ revision_timestamp: timestamp
+ content_translation_source: source_langcode
+ # unmapped d6 fields.
+ # translate
+ # moderate
+ # comment
+destination:
+ plugin: entity_complete:node
+ translations: true
+migration_dependencies:
+ required:
+ - d6_user
+ - d6_node_type
+ - d6_node_settings
+ - d6_filter_format
+ - language
+ optional:
+ - d6_field_instance_widget_settings
+ - d6_field_formatter_settings
+ - d6_upload_field_instance
diff --git a/web/core/modules/node/migrations/d7_node_complete.yml b/web/core/modules/node/migrations/d7_node_complete.yml
new file mode 100644
index 0000000000..fb52819d59
--- /dev/null
+++ b/web/core/modules/node/migrations/d7_node_complete.yml
@@ -0,0 +1,48 @@
+# Migrates all revisions and all revision translations.
+id: d7_node_complete
+label: Node complete
+audit: true
+migration_tags:
+ - Drupal 7
+ - Content
+class: Drupal\node\Plugin\migrate\D7NodeTranslation
+deriver: Drupal\node\Plugin\migrate\D7NodeDeriver
+source:
+ plugin: d7_node_complete
+process:
+ # If you are using this file to build a custom migration consider removing
+ # the nid and vid fields to allow incremental migrations.
+ # In D7, nodes always have a tnid, but it's zero for untranslated nodes.
+ # We normalize it to equal the nid in that case.
+ # @see \Drupal\node\Plugin\migrate\source\d7\Node::prepareRow().
+ nid: tnid
+ vid: vid
+ langcode:
+ plugin: default_value
+ source: language
+ default_value: "und"
+ title: title
+ uid: node_uid
+ status: status
+ created: created
+ changed: timestamp
+ promote: promote
+ sticky: sticky
+ revision_uid: revision_uid
+ revision_log: log
+ revision_timestamp: timestamp
+ content_translation_source: source_langcode
+ # unmapped d6 fields.
+ # translate
+ # comment
+destination:
+ plugin: entity_complete:node
+ translations: true
+migration_dependencies:
+ required:
+ - d7_user
+ - d7_node_type
+ - language
+ optional:
+ - d7_field_instance
+ - d7_comment_field_instance
diff --git a/web/core/modules/node/node.module b/web/core/modules/node/node.module
index 4899ddce67..01a28cfaa0 100644
--- a/web/core/modules/node/node.module
+++ b/web/core/modules/node/node.module
@@ -1163,7 +1163,7 @@ function node_query_node_access_alter(AlterableInterface $query) {
// Bail out if the base table is missing.
if (!$base_table) {
- throw new Exception(t('Query tagged for node access but there is no node table, specify the base_table using meta data.'));
+ throw new Exception('Query tagged for node access but there is no node table, specify the base_table using meta data.');
}
}
diff --git a/web/core/modules/node/src/NodeAccessControlHandler.php b/web/core/modules/node/src/NodeAccessControlHandler.php
index b742f9c052..5511b884dc 100644
--- a/web/core/modules/node/src/NodeAccessControlHandler.php
+++ b/web/core/modules/node/src/NodeAccessControlHandler.php
@@ -3,6 +3,7 @@
namespace Drupal\node;
use Drupal\Core\Access\AccessResult;
+use Drupal\Core\Cache\RefinableCacheableDependencyInterface;
use Drupal\Core\Entity\EntityHandlerInterface;
use Drupal\Core\Entity\EntityTypeInterface;
use Drupal\Core\Field\FieldDefinitionInterface;
@@ -104,7 +105,16 @@ protected function checkAccess(EntityInterface $node, $operation, AccountInterfa
}
// Evaluate node grants.
- return $this->grantStorage->access($node, $operation, $account);
+ $access_result = $this->grantStorage->access($node, $operation, $account);
+ if ($operation === 'view' && $access_result instanceof RefinableCacheableDependencyInterface) {
+ // Node variations can affect the access to the node. For instance, the
+ // access result cache varies on the node's published status. Only the
+ // 'view' node grant can currently be cached. The 'update' and 'delete'
+ // grants are already marked as uncacheable in the node grant storage.
+ // @see \Drupal\node\NodeGrantDatabaseStorage::access()
+ $access_result->addCacheableDependency($node);
+ }
+ return $access_result;
}
/**
diff --git a/web/core/modules/node/src/NodeGrantDatabaseStorage.php b/web/core/modules/node/src/NodeGrantDatabaseStorage.php
index d273359be1..1bea256c20 100644
--- a/web/core/modules/node/src/NodeGrantDatabaseStorage.php
+++ b/web/core/modules/node/src/NodeGrantDatabaseStorage.php
@@ -71,7 +71,7 @@ public function access(NodeInterface $node, $operation, AccountInterface $accoun
// Return the equivalent of the default grant, defined by
// self::writeDefault().
if ($operation === 'view') {
- return AccessResult::allowedIf($node->isPublished())->addCacheableDependency($node);
+ return AccessResult::allowedIf($node->isPublished());
}
else {
return AccessResult::neutral();
diff --git a/web/core/modules/node/src/NodeTypeForm.php b/web/core/modules/node/src/NodeTypeForm.php
index 502c478aea..862288c199 100644
--- a/web/core/modules/node/src/NodeTypeForm.php
+++ b/web/core/modules/node/src/NodeTypeForm.php
@@ -163,7 +163,7 @@ public function form(array $form, FormStateInterface $form_state) {
'sticky' => t('Sticky at top of lists'),
'revision' => t('Create new revision'),
],
- '#description' => t('Users with the <em>Administer content</em> permission will be able to override these options.'),
+ '#description' => t('Users with sufficient access rights will be able to override these options.'),
];
if ($this->moduleHandler->moduleExists('language')) {
$form['language'] = [
diff --git a/web/core/modules/node/src/NodeViewsData.php b/web/core/modules/node/src/NodeViewsData.php
index 86db01c34f..32aa04c725 100644
--- a/web/core/modules/node/src/NodeViewsData.php
+++ b/web/core/modules/node/src/NodeViewsData.php
@@ -208,7 +208,7 @@ public function getViewsData() {
'id' => 'node_nid',
'numeric' => TRUE,
];
- // @todo the NID field needs different behaviour on revision/non-revision
+ // @todo the NID field needs different behavior on revision/non-revision
// tables. It would be neat if this could be encoded in the base field
// definition.
$data['node_field_revision']['nid']['relationship']['id'] = 'standard';
diff --git a/web/core/modules/node/src/Plugin/migrate/source/d6/NodeComplete.php b/web/core/modules/node/src/Plugin/migrate/source/d6/NodeComplete.php
new file mode 100644
index 0000000000..96d6d29db9
--- /dev/null
+++ b/web/core/modules/node/src/Plugin/migrate/source/d6/NodeComplete.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace Drupal\node\Plugin\migrate\source\d6;
+
+/**
+ * Gets all node revisions from the source, including translation revisions.
+ *
+ * @MigrateSource(
+ * id = "d6_node_complete",
+ * source_module = "node"
+ * )
+ */
+class NodeComplete extends NodeRevision {
+
+ /**
+ * The join options between the node and the node_revisions_table.
+ */
+ const JOIN = 'n.nid = nr.nid';
+
+ /**
+ * {@inheritdoc}
+ */
+ public function query() {
+ $query = parent::query();
+ $query->orderBy('nr.vid');
+ return $query;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getIds() {
+ return [
+ 'nid' => [
+ 'type' => 'integer',
+ 'alias' => 'n',
+ ],
+ 'vid' => [
+ 'type' => 'integer',
+ 'alias' => 'nr',
+ ],
+ 'language' => [
+ 'type' => 'string',
+ 'alias' => 'n',
+ ],
+ ];
+ }
+
+}
diff --git a/web/core/modules/node/src/Plugin/migrate/source/d7/Node.php b/web/core/modules/node/src/Plugin/migrate/source/d7/Node.php
index 4a8cce4408..92aa108b79 100644
--- a/web/core/modules/node/src/Plugin/migrate/source/d7/Node.php
+++ b/web/core/modules/node/src/Plugin/migrate/source/d7/Node.php
@@ -115,6 +115,13 @@ public function prepareRow(Row $row) {
$source_language = $this->getEntityTranslationSourceLanguage('node', $nid);
$language = $entity_translatable && $source_language ? $source_language : $row->getSourceProperty('language');
+ // If this is using d7_node_complete source plugin and this is a node
+ // using entity translation then set the language of this revision to the
+ // entity translation language.
+ if ($row->getSourceProperty('etr_created')) {
+ $language = $row->getSourceProperty('language');
+ }
+
// Get Field API field values.
foreach ($this->getFields('node', $type) as $field_name => $field) {
// Ensure we're using the right language if the entity and the field are
diff --git a/web/core/modules/node/src/Plugin/migrate/source/d7/NodeComplete.php b/web/core/modules/node/src/Plugin/migrate/source/d7/NodeComplete.php
new file mode 100644
index 0000000000..81e44d8f3c
--- /dev/null
+++ b/web/core/modules/node/src/Plugin/migrate/source/d7/NodeComplete.php
@@ -0,0 +1,98 @@
+<?php
+
+namespace Drupal\node\Plugin\migrate\source\d7;
+
+use Drupal\Core\Database\Query\SelectInterface;
+use Drupal\migrate\Row;
+
+/**
+ * Gets all node revisions from the source, including translation revisions.
+ *
+ * @MigrateSource(
+ * id = "d7_node_complete",
+ * source_module = "node"
+ * )
+ */
+class NodeComplete extends NodeRevision {
+
+ /**
+ * The join options between the node and the node_revisions_table.
+ */
+ const JOIN = 'n.nid = nr.nid';
+
+ /**
+ * {@inheritdoc}
+ */
+ public function query() {
+ $query = parent::query();
+ $query->orderBy('nr.vid');
+
+ // Get any entity translation revision data.
+ if ($this->getDatabase()->schema()
+ ->tableExists('entity_translation_revision')) {
+ $query->leftJoin('entity_translation_revision', 'etr', 'nr.nid = etr.entity_id AND nr.vid=etr.revision_id');
+ $query->fields('etr', [
+ 'entity_type',
+ 'entity_id',
+ 'revision_id',
+ 'source',
+ 'translate',
+ ]);
+ $conditions = $query->orConditionGroup();
+ $conditions->condition('etr.entity_type', 'node');
+ $conditions->isNull('etr.entity_type');
+ $query->condition($conditions);
+ $query->addExpression("COALESCE(etr.language, n.language)", 'language');
+ $query->addField('etr', 'uid', 'etr_uid');
+ $query->addField('etr', 'status', 'etr_status');
+ $query->addField('etr', 'created', 'etr_created');
+ $query->addField('etr', 'changed', 'etr_changed');
+
+ $query->orderBy('etr.revision_id');
+ $query->orderBy('etr.language');
+ }
+ return $query;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function prepareRow(Row $row) {
+ // Override properties when this is an entity translation revision. The tnid
+ // will be set in d7_node source plugin to the value of 'nid'.
+ if ($row->getSourceProperty('etr_created')) {
+ $row->setSourceProperty('vid', $row->getSourceProperty('revision_id'));
+ $row->setSourceProperty('created', $row->getSourceProperty('etr_created'));
+ $row->setSourceProperty('timestamp', $row->getSourceProperty('etr_changed'));
+ $row->setSourceProperty('revision_uid', $row->getSourceProperty('etr_uid'));
+ $row->setSourceProperty('source_langcode', $row->getSourceProperty('source'));
+ }
+ parent::prepareRow($row);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getIds() {
+ return [
+ 'nid' => [
+ 'type' => 'integer',
+ 'alias' => 'n',
+ ],
+ 'vid' => [
+ 'type' => 'integer',
+ 'alias' => 'nr',
+ ],
+ 'language' => [
+ 'type' => 'string',
+ 'alias' => 'n',
+ ],
+ ];
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function handleTranslations(SelectInterface $query) {}
+
+}
diff --git a/web/core/modules/node/src/Plugin/views/wizard/Node.php b/web/core/modules/node/src/Plugin/views/wizard/Node.php
index 5f53d971b1..56a84dc616 100644
--- a/web/core/modules/node/src/Plugin/views/wizard/Node.php
+++ b/web/core/modules/node/src/Plugin/views/wizard/Node.php
@@ -222,10 +222,12 @@ protected function display_options_row(&$display_options, $row_plugin, $row_opt
$display_options['row']['type'] = 'entity:node';
$display_options['row']['options']['view_mode'] = 'full';
break;
+
case 'teasers':
$display_options['row']['type'] = 'entity:node';
$display_options['row']['options']['view_mode'] = 'teaser';
break;
+
case 'titles_linked':
case 'titles':
$display_options['row']['type'] = 'fields';
diff --git a/web/core/modules/node/tests/src/Functional/AssertButtonsTrait.php b/web/core/modules/node/tests/src/Functional/AssertButtonsTrait.php
index bc2ef9078b..5b3a711d7f 100644
--- a/web/core/modules/node/tests/src/Functional/AssertButtonsTrait.php
+++ b/web/core/modules/node/tests/src/Functional/AssertButtonsTrait.php
@@ -32,7 +32,7 @@ public function assertButtons(array $buttons, $dropbutton = TRUE) {
// Dropbutton elements.
/** @var \Behat\Mink\Element\NodeElement[] $elements */
$elements = $this->xpath('//div[@class="dropbutton-wrapper"]//input[@type="submit"]');
- $this->assertEqual($count, count($elements));
+ $this->assertCount($count, $elements);
foreach ($elements as $element) {
$value = $element->getValue() ?: '';
$this->assertEqual($buttons[$i], $value);
diff --git a/web/core/modules/node/tests/src/Functional/NodeAccessBaseTableTest.php b/web/core/modules/node/tests/src/Functional/NodeAccessBaseTableTest.php
index 1cc590eb75..c5f376b73a 100644
--- a/web/core/modules/node/tests/src/Functional/NodeAccessBaseTableTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeAccessBaseTableTest.php
@@ -145,7 +145,7 @@ public function testNodeAccessBasic() {
else {
$should_be_visible = TRUE;
}
- $this->assertResponse($should_be_visible ? 200 : 403, strtr('A %private node by user %uid is %visible for user %current_uid.', [
+ $this->assertSession()->statusCodeEquals($should_be_visible ? 200 : 403, strtr('A %private node by user %uid is %visible for user %current_uid.', [
'%private' => $is_private ? 'private' : 'public',
'%uid' => $uid,
'%visible' => $should_be_visible ? 'visible' : 'not visible',
@@ -166,7 +166,7 @@ public function testNodeAccessBasic() {
foreach ($this->nodesByUser as $private_status) {
foreach ($private_status as $nid => $is_private) {
$this->drupalGet('node/' . $nid);
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
}
}
@@ -182,7 +182,7 @@ public function testNodeAccessBasic() {
foreach ($this->nodesByUser as $private_status) {
foreach ($private_status as $nid => $is_private) {
$this->drupalGet('node/' . $nid);
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
}
}
diff --git a/web/core/modules/node/tests/src/Functional/NodeAccessCacheabilityTest.php b/web/core/modules/node/tests/src/Functional/NodeAccessCacheabilityTest.php
index abaee259a1..4cb3568e59 100644
--- a/web/core/modules/node/tests/src/Functional/NodeAccessCacheabilityTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeAccessCacheabilityTest.php
@@ -21,7 +21,10 @@ class NodeAccessCacheabilityTest extends NodeTestBase {
*
* @var array
*/
- public static $modules = ['node_access_test', 'node_access_test_auto_bubbling'];
+ public static $modules = [
+ 'node_access_test',
+ 'node_access_test_auto_bubbling',
+ ];
/**
* {@inheritdoc}
diff --git a/web/core/modules/node/tests/src/Functional/NodeAccessCacheabilityWithNodeGrants.php b/web/core/modules/node/tests/src/Functional/NodeAccessCacheabilityWithNodeGrants.php
new file mode 100644
index 0000000000..d7910f4ff8
--- /dev/null
+++ b/web/core/modules/node/tests/src/Functional/NodeAccessCacheabilityWithNodeGrants.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace Drupal\Tests\node\Functional;
+
+use Drupal\Core\Entity\Entity\EntityViewDisplay;
+use Drupal\node\Entity\NodeType;
+use Drupal\Tests\BrowserTestBase;
+use Drupal\Tests\field\Traits\EntityReferenceTestTrait;
+
+/**
+ * Tests node view access cacheability with node grants.
+ *
+ * @group node
+ */
+class NodeAccessCacheabilityWithNodeGrants extends BrowserTestBase {
+
+ use EntityReferenceTestTrait;
+
+ /**
+ * {@inheritdoc}
+ */
+ protected static $modules = ['node', 'node_test'];
+
+ /**
+ * {@inheritdoc}
+ */
+ protected $defaultTheme = 'stark';
+
+ /**
+ * Tests node view access cacheability with node grants.
+ */
+ public function testAccessCacheabilityWithNodeGrants() {
+ NodeType::create(['type' => 'page'])->save();
+ $this->createEntityReferenceField('node', 'page', 'ref', 'Ref', 'node');
+ EntityViewDisplay::create([
+ 'targetEntityType' => 'node',
+ 'bundle' => 'page',
+ 'mode' => 'default',
+ 'status' => TRUE,
+ ])->setComponent('ref', ['type' => 'entity_reference_label'])
+ ->save();
+
+ // Check that at least one module implements hook_node_grants() as this test
+ // only tests this case.
+ // @see \node_test_node_grants()
+ $node_grants_implementations = \Drupal::moduleHandler()->getImplementations('node_grants');
+ $this->assertNotEmpty($node_grants_implementations);
+
+ // Create an unpublished node.
+ $referenced = $this->createNode(['status' => FALSE]);
+ // Create a node referencing $referenced.
+ $node = $this->createNode(['ref' => $referenced]);
+
+ // Check that the referenced entity link doesn't show on the host entity.
+ $this->drupalGet($node->toUrl());
+ $this->assertSession()->linkNotExists($referenced->label());
+
+ // Publish the referenced node.
+ $referenced->setPublished()->save();
+
+ // Check that the referenced entity link shows on the host entity.
+ $this->getSession()->reload();
+ $this->assertSession()->linkExists($referenced->label());
+ }
+
+}
diff --git a/web/core/modules/node/tests/src/Functional/NodeAccessLanguageFallbackTest.php b/web/core/modules/node/tests/src/Functional/NodeAccessLanguageFallbackTest.php
index b53e36666d..d0e535bda3 100644
--- a/web/core/modules/node/tests/src/Functional/NodeAccessLanguageFallbackTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeAccessLanguageFallbackTest.php
@@ -16,7 +16,11 @@ class NodeAccessLanguageFallbackTest extends NodeTestBase {
*
* @var array
*/
- public static $modules = ['language', 'node_access_test', 'content_translation'];
+ public static $modules = [
+ 'language',
+ 'node_access_test',
+ 'content_translation',
+ ];
/**
* {@inheritdoc}
diff --git a/web/core/modules/node/tests/src/Functional/NodeActionsConfigurationTest.php b/web/core/modules/node/tests/src/Functional/NodeActionsConfigurationTest.php
index c9f0949694..ad2f35eb56 100644
--- a/web/core/modules/node/tests/src/Functional/NodeActionsConfigurationTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeActionsConfigurationTest.php
@@ -36,7 +36,7 @@ public function testAssignOwnerNodeActionConfiguration() {
$edit = [];
$edit['action'] = 'node_assign_owner_action';
$this->drupalPostForm('admin/config/system/actions', $edit, t('Create'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Make a POST request to the individual action configuration page.
$edit = [];
@@ -45,7 +45,7 @@ public function testAssignOwnerNodeActionConfiguration() {
$edit['id'] = strtolower($action_label);
$edit['owner_uid'] = $user->id();
$this->drupalPostForm('admin/config/system/actions/add/node_assign_owner_action', $edit, t('Save'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$action_id = $edit['id'];
@@ -60,7 +60,7 @@ public function testAssignOwnerNodeActionConfiguration() {
$edit['label'] = $new_action_label;
$edit['owner_uid'] = $user->id();
$this->drupalPostForm(NULL, $edit, t('Save'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Make sure that the action updated properly.
$this->assertText(t('The action has been successfully saved.'), 'The node_assign_owner_action action has been successfully updated.');
@@ -70,15 +70,15 @@ public function testAssignOwnerNodeActionConfiguration() {
// Make sure that deletions work properly.
$this->drupalGet('admin/config/system/actions');
$this->clickLink(t('Delete'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$edit = [];
$this->drupalPostForm(NULL, $edit, t('Delete'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Make sure that the action was actually deleted.
$this->assertRaw(t('The action %action has been deleted.', ['%action' => $new_action_label]), 'The delete confirmation message appears after deleting the node_assign_owner_action action.');
$this->drupalGet('admin/config/system/actions');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertNoText($new_action_label, 'The label for the node_assign_owner_action action does not appear on the actions administration page after deleting.');
$action = Action::load($action_id);
diff --git a/web/core/modules/node/tests/src/Functional/NodeAdminTest.php b/web/core/modules/node/tests/src/Functional/NodeAdminTest.php
index 9cbb42d9d1..707f0b3ffb 100644
--- a/web/core/modules/node/tests/src/Functional/NodeAdminTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeAdminTest.php
@@ -133,7 +133,7 @@ public function testContentAdminPages() {
// Verify view, edit, and delete links for any content.
$this->drupalGet('admin/content');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$node_type_labels = $this->xpath('//td[contains(@class, "views-field-type")]');
$delta = 0;
@@ -163,7 +163,7 @@ public function testContentAdminPages() {
$this->drupalLogout();
$this->drupalLogin($this->baseUser1);
$this->drupalGet('admin/content');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertLinkByHref('node/' . $nodes['published_page']->id());
$this->assertLinkByHref('node/' . $nodes['published_article']->id());
$this->assertNoLinkByHref('node/' . $nodes['published_page']->id() . '/edit');
@@ -183,7 +183,7 @@ public function testContentAdminPages() {
$this->drupalLogout();
$this->drupalLogin($this->baseUser2);
$this->drupalGet('admin/content');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertLinkByHref('node/' . $nodes['unpublished_page_2']->id());
// Verify no operation links are displayed.
$this->assertNoLinkByHref('node/' . $nodes['unpublished_page_2']->id() . '/edit');
@@ -201,7 +201,7 @@ public function testContentAdminPages() {
$this->drupalLogout();
$this->drupalLogin($this->baseUser3);
$this->drupalGet('admin/content');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
foreach ($nodes as $node) {
$this->assertLinkByHref('node/' . $node->id());
$this->assertLinkByHref('node/' . $node->id() . '/edit');
diff --git a/web/core/modules/node/tests/src/Functional/NodeCreationTest.php b/web/core/modules/node/tests/src/Functional/NodeCreationTest.php
index c64ace0afe..62fb395ed4 100644
--- a/web/core/modules/node/tests/src/Functional/NodeCreationTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeCreationTest.php
@@ -44,7 +44,7 @@ public function testNodeCreation() {
// Test /node/add page with only one content type.
$node_type_storage->load('article')->delete();
$this->drupalGet('node/add');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertUrl('node/add/page');
// Create a node.
$edit = [];
@@ -233,7 +233,7 @@ public function testAuthorAutocomplete() {
$this->drupalGet('node/add/page');
$result = $this->xpath('//input[@id="edit-uid-0-value" and contains(@data-autocomplete-path, "user/autocomplete")]');
- $this->assertEqual(count($result), 0, 'No autocompletion without access user profiles.');
+ $this->assertCount(0, $result, 'No autocompletion without access user profiles.');
$admin_user = $this->drupalCreateUser(['administer nodes', 'create page content', 'access user profiles']);
$this->drupalLogin($admin_user);
@@ -241,7 +241,7 @@ public function testAuthorAutocomplete() {
$this->drupalGet('node/add/page');
$result = $this->xpath('//input[@id="edit-uid-0-target-id" and contains(@data-autocomplete-path, "/entity_reference_autocomplete/user/default")]');
- $this->assertEqual(count($result), 1, 'Ensure that the user does have access to the autocompletion');
+ $this->assertCount(1, $result, 'Ensure that the user does have access to the autocompletion');
}
/**
@@ -249,7 +249,7 @@ public function testAuthorAutocomplete() {
*/
public function testNodeAddWithoutContentTypes() {
$this->drupalGet('node/add');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertNoLinkByHref('/admin/structure/types/add');
// Test /node/add page without content types.
@@ -258,7 +258,7 @@ public function testNodeAddWithoutContentTypes() {
}
$this->drupalGet('node/add');
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
$admin_content_types = $this->drupalCreateUser(['administer content types']);
$this->drupalLogin($admin_content_types);
diff --git a/web/core/modules/node/tests/src/Functional/NodeHelpTest.php b/web/core/modules/node/tests/src/Functional/NodeHelpTest.php
index 9710300782..851610f1d5 100644
--- a/web/core/modules/node/tests/src/Functional/NodeHelpTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeHelpTest.php
@@ -69,13 +69,13 @@ protected function setUp() {
public function testNodeShowHelpText() {
// Check the node add form.
$this->drupalGet('node/add/' . $this->testType);
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertText($this->testText);
// Create node and check the node edit form.
$node = $this->drupalCreateNode(['type' => $this->testType]);
$this->drupalGet('node/' . $node->id() . '/edit');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertText($this->testText);
}
diff --git a/web/core/modules/node/tests/src/Functional/NodeLoadMultipleTest.php b/web/core/modules/node/tests/src/Functional/NodeLoadMultipleTest.php
index fa2b3deceb..5f503e358d 100644
--- a/web/core/modules/node/tests/src/Functional/NodeLoadMultipleTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeLoadMultipleTest.php
@@ -2,7 +2,6 @@
namespace Drupal\Tests\node\Functional;
-use Drupal\Component\Render\FormattableMarkup;
use Drupal\node\Entity\Node;
/**
@@ -50,18 +49,16 @@ public function testNodeMultipleLoad() {
->loadByProperties(['promote' => 0]);
$this->assertEqual($node3->label(), $nodes[$node3->id()]->label(), 'Node was loaded.');
$this->assertEqual($node4->label(), $nodes[$node4->id()]->label(), 'Node was loaded.');
- $count = count($nodes);
- $this->assertTrue($count == 2, new FormattableMarkup('@count nodes loaded.', ['@count' => $count]));
+ $this->assertCount(2, $nodes);
// Load nodes by nid. Nodes 1, 2 and 4 will be loaded.
$nodes = Node::loadMultiple([1, 2, 4]);
- $count = count($nodes);
- $this->assertTrue(count($nodes) == 3, new FormattableMarkup('@count nodes loaded', ['@count' => $count]));
+ $this->assertCount(3, $nodes);
$this->assertTrue(isset($nodes[$node1->id()]), 'Node is correctly keyed in the array');
$this->assertTrue(isset($nodes[$node2->id()]), 'Node is correctly keyed in the array');
$this->assertTrue(isset($nodes[$node4->id()]), 'Node is correctly keyed in the array');
foreach ($nodes as $node) {
- $this->assertTrue(is_object($node), 'Node is an object');
+ $this->assertIsObject($node);
}
}
diff --git a/web/core/modules/node/tests/src/Functional/NodePostSettingsTest.php b/web/core/modules/node/tests/src/Functional/NodePostSettingsTest.php
index c46558ef7f..5e788b507b 100644
--- a/web/core/modules/node/tests/src/Functional/NodePostSettingsTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodePostSettingsTest.php
@@ -41,7 +41,7 @@ public function testPagePostInfo() {
// Check that the post information is displayed.
$node = $this->drupalGetNodeByTitle($edit['title[0][value]']);
$elements = $this->xpath('//div[contains(@class, :class)]', [':class' => 'node__submitted']);
- $this->assertEqual(count($elements), 1, 'Post information is displayed.');
+ $this->assertCount(1, $elements, 'Post information is displayed.');
$node->delete();
// Set "Basic page" content type to display post information.
@@ -57,7 +57,7 @@ public function testPagePostInfo() {
// Check that the post information is displayed.
$elements = $this->xpath('//div[contains(@class, :class)]', [':class' => 'node__submitted']);
- $this->assertEqual(count($elements), 0, 'Post information is not displayed.');
+ $this->assertCount(0, $elements, 'Post information is not displayed.');
}
}
diff --git a/web/core/modules/node/tests/src/Functional/NodeQueryAlterTest.php b/web/core/modules/node/tests/src/Functional/NodeQueryAlterTest.php
index d7a0054edc..3771323006 100644
--- a/web/core/modules/node/tests/src/Functional/NodeQueryAlterTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeQueryAlterTest.php
@@ -67,7 +67,7 @@ public function testNodeQueryAlterLowLevelWithAccess() {
$query->addMetaData('account', $this->accessUser);
$result = $query->execute()->fetchAll();
- $this->assertEqual(count($result), 4, 'User with access can see correct nodes');
+ $this->assertCount(4, $result, 'User with access can see correct nodes');
}
catch (\Exception $e) {
$this->fail('Altered query is malformed');
@@ -85,7 +85,7 @@ public function testNodeQueryAlterWithRevisions() {
->allRevisions()
->execute();
- $this->assertEqual(count($result), 4, 'User with access can see correct nodes');
+ $this->assertCount(4, $result, 'User with access can see correct nodes');
}
catch (\Exception $e) {
$this->fail('Altered query is malformed');
@@ -108,7 +108,7 @@ public function testNodeQueryAlterLowLevelNoAccess() {
$query->addMetaData('account', $this->noAccessUser);
$result = $query->execute()->fetchAll();
- $this->assertEqual(count($result), 0, 'User with no access cannot see nodes');
+ $this->assertCount(0, $result, 'User with no access cannot see nodes');
}
catch (\Exception $e) {
$this->fail('Altered query is malformed');
@@ -131,7 +131,7 @@ public function testNodeQueryAlterLowLevelEditAccess() {
$query->addMetaData('account', $this->accessUser);
$result = $query->execute()->fetchAll();
- $this->assertEqual(count($result), 0, 'User with view-only access cannot edit nodes');
+ $this->assertCount(0, $result, 'User with view-only access cannot edit nodes');
}
catch (\Exception $e) {
$this->fail($e->getMessage());
@@ -172,7 +172,7 @@ public function testNodeQueryAlterOverride() {
$query->addMetaData('account', $this->noAccessUser);
$result = $query->execute()->fetchAll();
- $this->assertEqual(count($result), 0, 'User view privileges are not overridden');
+ $this->assertCount(0, $result, 'User view privileges are not overridden');
}
catch (\Exception $e) {
$this->fail('Altered query is malformed');
@@ -194,7 +194,7 @@ public function testNodeQueryAlterOverride() {
$query->addMetaData('account', $this->noAccessUser);
$result = $query->execute()->fetchAll();
- $this->assertEqual(count($result), 4, 'User view privileges are overridden');
+ $this->assertCount(4, $result, 'User view privileges are overridden');
}
catch (\Exception $e) {
$this->fail('Altered query is malformed');
diff --git a/web/core/modules/node/tests/src/Functional/NodeRevisionsTest.php b/web/core/modules/node/tests/src/Functional/NodeRevisionsTest.php
index 55d6f86721..d230613a3e 100644
--- a/web/core/modules/node/tests/src/Functional/NodeRevisionsTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeRevisionsTest.php
@@ -41,7 +41,13 @@ class NodeRevisionsTest extends NodeTestBase {
/**
* {@inheritdoc}
*/
- public static $modules = ['node', 'contextual', 'datetime', 'language', 'content_translation'];
+ public static $modules = [
+ 'node',
+ 'contextual',
+ 'datetime',
+ 'language',
+ 'content_translation',
+ ];
/**
* {@inheritdoc}
@@ -245,17 +251,17 @@ public function testRevisions() {
$this->drupalGet("node/" . $node->id() . "/revisions");
// Verify revisions is accessible since the type has revisions enabled.
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Check initial revision is shown on the node revisions overview page.
$this->assertText('Simple revision message (EN)');
// Verify that delete operation is inaccessible for the default revision.
$this->drupalGet("node/" . $node->id() . "/revisions/" . $node->getRevisionId() . "/delete");
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
// Verify that revert operation is inaccessible for the default revision.
$this->drupalGet("node/" . $node->id() . "/revisions/" . $node->getRevisionId() . "/revert");
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
// Create a new revision and new log message.
$node = Node::load($node->id());
@@ -278,7 +284,7 @@ public function testRevisions() {
$this->drupalGet("node/" . $node->id() . "/revisions");
// Verify revisions is accessible since the type has revisions enabled.
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Check initial revision is shown on the node revisions overview page.
$this->assertText('Simple revision message (EN)');
diff --git a/web/core/modules/node/tests/src/Functional/NodeRevisionsUiTest.php b/web/core/modules/node/tests/src/Functional/NodeRevisionsUiTest.php
index 861833a45d..6a3ad62e68 100644
--- a/web/core/modules/node/tests/src/Functional/NodeRevisionsUiTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeRevisionsUiTest.php
@@ -172,7 +172,7 @@ public function testNodeRevisionsTabWithDefaultRevision() {
$elements = $this->xpath('//tr[contains(@class, "revision-current")]/td/a[1]');
// The site may be installed in a subdirectory, so check if the URL is
// contained in the retrieved one.
- $this->assertContains('/node/1', current($elements)->getAttribute('href'));
+ $this->assertStringContainsString('/node/1', current($elements)->getAttribute('href'));
// Verify that the default revision can be an older revision than the latest
// one.
diff --git a/web/core/modules/node/tests/src/Functional/NodeTitleTest.php b/web/core/modules/node/tests/src/Functional/NodeTitleTest.php
index 0e490320e5..ff6c432e81 100644
--- a/web/core/modules/node/tests/src/Functional/NodeTitleTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeTitleTest.php
@@ -83,7 +83,7 @@ public function testNodeTitle() {
$node = $this->drupalCreateNode($settings);
// Test that 0 appears as <title>.
$this->drupalGet('node/' . $node->id());
- $this->assertTitle(0 . ' | Drupal', 'Page title is equal to 0.', 'Node');
+ $this->assertTitle('0 | Drupal');
// Test that 0 appears in the template <h1>.
$xpath = '//h1';
$this->assertSame('0', $this->xpath($xpath)[0]->getText(), 'Node title is displayed as 0.');
diff --git a/web/core/modules/node/tests/src/Functional/NodeTranslationUITest.php b/web/core/modules/node/tests/src/Functional/NodeTranslationUITest.php
index 2201d727d8..5be412c332 100644
--- a/web/core/modules/node/tests/src/Functional/NodeTranslationUITest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeTranslationUITest.php
@@ -46,7 +46,15 @@ class NodeTranslationUITest extends ContentTranslationUITestBase {
*
* @var array
*/
- public static $modules = ['block', 'language', 'content_translation', 'node', 'datetime', 'field_ui', 'help'];
+ public static $modules = [
+ 'block',
+ 'language',
+ 'content_translation',
+ 'node',
+ 'datetime',
+ 'field_ui',
+ 'help',
+ ];
/**
* The profile to install as a basis for testing.
@@ -253,7 +261,7 @@ public function testTranslationLinkTheme() {
$this->assertNoRaw('core/themes/seven/css/base/elements.css', 'Translation uses frontend theme if edit is frontend.');
// Assert presence of translation page itself (vs. DisabledBundle below).
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
}
/**
@@ -272,11 +280,11 @@ public function testDisabledBundle() {
// Make sure that nothing was inserted into the {content_translation} table.
$rows = Database::getConnection()->query('SELECT nid, count(nid) AS count FROM {node_field_data} WHERE type <> :type GROUP BY nid HAVING count(nid) >= 2', [':type' => $this->bundle])->fetchAll();
- $this->assertEqual(0, count($rows));
+ $this->assertCount(0, $rows);
// Ensure the translation tab is not accessible.
$this->drupalGet('node/' . $node->id() . '/translations');
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
}
/**
@@ -492,7 +500,7 @@ public function testRevisionTranslationRendering() {
// Should be different from regular node URL.
$this->assertNotIdentical($original_revision_url, $original_revision->toUrl()->toString());
$this->drupalGet($original_revision_url);
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Contents should be in English, of correct revision.
$this->assertText('First rev en title');
@@ -505,7 +513,7 @@ public function testRevisionTranslationRendering() {
$this->assertNotIdentical($url_fr, $original_revision->toUrl()->toString());
$this->assertNotIdentical($url_fr, $original_revision_url);
$this->drupalGet($url_fr);
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Contents should be in French, of correct revision.
$this->assertText('First rev fr title');
diff --git a/web/core/modules/node/tests/src/Functional/NodeTypeTest.php b/web/core/modules/node/tests/src/Functional/NodeTypeTest.php
index 2977c5970f..7e9498254e 100644
--- a/web/core/modules/node/tests/src/Functional/NodeTypeTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeTypeTest.php
@@ -64,7 +64,7 @@ public function testNodeTypeCreation() {
$this->drupalLogin($web_user);
$this->drupalGet('node/add/' . $type->id());
- $this->assertResponse(200, 'The new content type can be accessed at node/add.');
+ $this->assertSession()->statusCodeEquals(200);
// Create a content type via the user interface.
$web_user = $this->drupalCreateUser(['bypass node access', 'administer content types']);
@@ -74,7 +74,7 @@ public function testNodeTypeCreation() {
$this->assertCacheTag('config:node_type_list');
$this->assertCacheContext('user.permissions');
$elements = $this->cssSelect('dl.node-type-list dt');
- $this->assertEqual(3, count($elements));
+ $this->assertCount(3, $elements);
$edit = [
'name' => 'foo',
@@ -87,7 +87,7 @@ public function testNodeTypeCreation() {
$this->drupalGet('node/add');
$elements = $this->cssSelect('dl.node-type-list dt');
- $this->assertEqual(4, count($elements));
+ $this->assertCount(4, $elements);
}
/**
@@ -204,14 +204,14 @@ public function testNodeTypeDeletion() {
$this->drupalGet('admin/structure/types/manage/default');
$this->assertNoLink(t('Delete'));
$this->drupalGet('admin/structure/types/manage/default/delete');
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
$this->container->get('module_installer')->uninstall(['node_test_config']);
$this->container = \Drupal::getContainer();
unset($locked['default']);
\Drupal::state()->set('node.type.locked', $locked);
$this->drupalGet('admin/structure/types/manage/default');
$this->clickLink(t('Delete'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->drupalPostForm(NULL, [], t('Delete'));
$this->assertFalse((bool) NodeType::load('default'), 'Node type with machine default deleted.');
}
@@ -245,7 +245,7 @@ public function testNodeTypeFieldUiPermissions() {
public function testNodeTypeNoContentType() {
/** @var \Drupal\Core\Entity\EntityTypeBundleInfoInterface $bundle_info */
$bundle_info = \Drupal::service('entity_type.bundle.info');
- $this->assertEqual(2, count($bundle_info->getBundleInfo('node')), 'The bundle information service has 2 bundles for the Node entity type.');
+ $this->assertCount(2, $bundle_info->getBundleInfo('node'), 'The bundle information service has 2 bundles for the Node entity type.');
$web_user = $this->drupalCreateUser(['administer content types']);
$this->drupalLogin($web_user);
@@ -261,7 +261,7 @@ public function testNodeTypeNoContentType() {
]), 'Empty text when there are no content types in the system is correct.');
$bundle_info->clearCachedBundles();
- $this->assertEqual(0, count($bundle_info->getBundleInfo('node')), 'The bundle information service has 0 bundles for the Node entity type.');
+ $this->assertCount(0, $bundle_info->getBundleInfo('node'), 'The bundle information service has 0 bundles for the Node entity type.');
}
}
diff --git a/web/core/modules/node/tests/src/Functional/NodeTypeTranslationTest.php b/web/core/modules/node/tests/src/Functional/NodeTypeTranslationTest.php
index 925a5f5fcf..2de15a1f48 100644
--- a/web/core/modules/node/tests/src/Functional/NodeTypeTranslationTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeTypeTranslationTest.php
@@ -176,9 +176,9 @@ public function testNodeTypeTitleLabelTranslation() {
// Try re-using the email field.
$this->drupalGet("es/admin/structure/types/manage/$type/fields/add-field");
$this->drupalPostForm(NULL, ['existing_storage_name' => 'field_email', 'existing_storage_label' => 'Email'], 'Save and continue');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->drupalGet("es/admin/structure/types/manage/$type/fields/node.$type.field_email/translate");
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertText("The configuration objects have different language codes so they cannot be translated");
}
diff --git a/web/core/modules/node/tests/src/Functional/PagePreviewTest.php b/web/core/modules/node/tests/src/Functional/PagePreviewTest.php
index 428ae121aa..aa9c6477f4 100644
--- a/web/core/modules/node/tests/src/Functional/PagePreviewTest.php
+++ b/web/core/modules/node/tests/src/Functional/PagePreviewTest.php
@@ -32,7 +32,16 @@ class PagePreviewTest extends NodeTestBase {
*
* @var array
*/
- public static $modules = ['node', 'taxonomy', 'comment', 'image', 'file', 'text', 'node_test', 'menu_ui'];
+ public static $modules = [
+ 'node',
+ 'taxonomy',
+ 'comment',
+ 'image',
+ 'file',
+ 'text',
+ 'node_test',
+ 'menu_ui',
+ ];
/**
* {@inheritdoc}
@@ -331,7 +340,7 @@ public function testPagePreview() {
$this->clickLink(t('Back to content editing'));
$this->drupalPostForm(NULL, [], t('Save'));
$this->assertUrl($node->toUrl());
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
/** @var \Drupal\Core\File\FileSystemInterface $file_system */
$file_system = \Drupal::service('file_system');
@@ -431,7 +440,7 @@ public function testPagePreviewWithRevisions() {
$this->drupalPostForm('node/add/page', $edit, t('Preview'));
// Check that the preview is displaying the title, body and term.
- $this->assertTitle(t('@title | Drupal', ['@title' => $edit[$title_key]]), 'Basic page title is preview.');
+ $this->assertTitle($edit[$title_key] . ' | Drupal');
$this->assertText($edit[$title_key], 'Title displayed.');
$this->assertText($edit[$body_key], 'Body displayed.');
$this->assertText($edit[$term_key], 'Term displayed.');
diff --git a/web/core/modules/node/tests/src/Functional/PageViewTest.php b/web/core/modules/node/tests/src/Functional/PageViewTest.php
index 63ac3f7335..e7c302f7a9 100644
--- a/web/core/modules/node/tests/src/Functional/PageViewTest.php
+++ b/web/core/modules/node/tests/src/Functional/PageViewTest.php
@@ -26,7 +26,7 @@ public function testPageView() {
// Try to edit with anonymous user.
$this->drupalGet("node/" . $node->id() . "/edit");
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
// Create a user without permission to edit node.
$web_user = $this->drupalCreateUser(['access content']);
@@ -34,7 +34,7 @@ public function testPageView() {
// Attempt to access edit page.
$this->drupalGet("node/" . $node->id() . "/edit");
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
// Create user with permission to edit node.
$web_user = $this->drupalCreateUser(['bypass node access']);
@@ -42,7 +42,7 @@ public function testPageView() {
// Attempt to access edit page.
$this->drupalGet("node/" . $node->id() . "/edit");
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
}
}
diff --git a/web/core/modules/node/tests/src/Functional/Rest/NodeResourceTestBase.php b/web/core/modules/node/tests/src/Functional/Rest/NodeResourceTestBase.php
index ebf967ed64..fd15612d7a 100644
--- a/web/core/modules/node/tests/src/Functional/Rest/NodeResourceTestBase.php
+++ b/web/core/modules/node/tests/src/Functional/Rest/NodeResourceTestBase.php
@@ -49,9 +49,11 @@ protected function setUpAuthorization($method) {
case 'GET':
$this->grantPermissionsToTestedRole(['access content']);
break;
+
case 'POST':
$this->grantPermissionsToTestedRole(['access content', 'create camelids content']);
break;
+
case 'PATCH':
// Do not grant the 'create url aliases' permission to test the case
// when the path field is protected/not accessible, see
@@ -59,6 +61,7 @@ protected function setUpAuthorization($method) {
// for a positive test.
$this->grantPermissionsToTestedRole(['access content', 'edit any camelids content']);
break;
+
case 'DELETE':
$this->grantPermissionsToTestedRole(['access content', 'delete any camelids content']);
break;
diff --git a/web/core/modules/node/tests/src/Functional/Views/BulkFormTest.php b/web/core/modules/node/tests/src/Functional/Views/BulkFormTest.php
index 92eabee8a1..99a9534c50 100644
--- a/web/core/modules/node/tests/src/Functional/Views/BulkFormTest.php
+++ b/web/core/modules/node/tests/src/Functional/Views/BulkFormTest.php
@@ -88,13 +88,13 @@ protected function setUp($import_test_views = TRUE) {
// Check that all created translations are selected by the test view.
$view = Views::getView('test_node_bulk_form');
$view->execute();
- $this->assertEqual(count($view->result), 10, 'All created translations are selected.');
+ $this->assertCount(10, $view->result, 'All created translations are selected.');
// Check the operations are accessible to the logged in user.
$this->drupalLogin($this->drupalCreateUser(['administer nodes', 'access content overview', 'bypass node access']));
$this->drupalGet('test-node-bulk-form');
$elements = $this->xpath('//select[@id="edit-action"]//option');
- $this->assertIdentical(count($elements), 8, 'All node operations are found.');
+ $this->assertCount(8, $elements, 'All node operations are found.');
}
/**
diff --git a/web/core/modules/node/tests/src/Functional/Views/FrontPageTest.php b/web/core/modules/node/tests/src/Functional/Views/FrontPageTest.php
index 5671d1ead8..208c0e97da 100644
--- a/web/core/modules/node/tests/src/Functional/Views/FrontPageTest.php
+++ b/web/core/modules/node/tests/src/Functional/Views/FrontPageTest.php
@@ -185,7 +185,7 @@ public function testAdminFrontPage() {
$this->drupalLogin($this->rootUser);
// Test frontpage view.
$this->drupalGet('node');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Check that the frontpage view was rendered.
$this->assertPattern('/class=".+view-frontpage/', 'Frontpage view was rendered');
}
diff --git a/web/core/modules/node/tests/src/Functional/Views/NodeFieldFilterTest.php b/web/core/modules/node/tests/src/Functional/Views/NodeFieldFilterTest.php
index 43cf14e225..3edc3945d1 100644
--- a/web/core/modules/node/tests/src/Functional/Views/NodeFieldFilterTest.php
+++ b/web/core/modules/node/tests/src/Functional/Views/NodeFieldFilterTest.php
@@ -54,7 +54,7 @@ protected function setUp($import_test_views = TRUE) {
$this->nodeTitles = [
'en' => 'Food in Paris',
'es' => 'Comida en Paris',
- 'fr' => 'Nouriture en Paris',
+ 'fr' => 'Nourriture en Paris',
];
// Create node with translations.
diff --git a/web/core/modules/node/tests/src/Functional/Views/NodeIntegrationTest.php b/web/core/modules/node/tests/src/Functional/Views/NodeIntegrationTest.php
index 965e2b3b92..359ba4a626 100644
--- a/web/core/modules/node/tests/src/Functional/Views/NodeIntegrationTest.php
+++ b/web/core/modules/node/tests/src/Functional/Views/NodeIntegrationTest.php
@@ -41,10 +41,10 @@ public function testNodeViewTypeArgument() {
}
$this->drupalGet('test-node-view');
- $this->assertResponse(404);
+ $this->assertSession()->statusCodeEquals(404);
$this->drupalGet('test-node-view/all');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertNids($all_nids);
foreach ($types as $type) {
diff --git a/web/core/modules/node/tests/src/Functional/Views/PathPluginTest.php b/web/core/modules/node/tests/src/Functional/Views/PathPluginTest.php
index ee9b2acf67..7dd1a3db2e 100644
--- a/web/core/modules/node/tests/src/Functional/Views/PathPluginTest.php
+++ b/web/core/modules/node/tests/src/Functional/Views/PathPluginTest.php
@@ -84,7 +84,7 @@ public function testPathPlugin() {
$output = $view->preview();
$output = $renderer->renderRoot($output);
foreach ($this->nodes as $node) {
- $this->assertTrue(strpos($output, 'This is <strong>not escaped</strong> and this is ' . $node->toLink('the link')->toString()) !== FALSE, 'Make sure path field rewriting is not escaped.');
+ $this->assertStringContainsString('This is <strong>not escaped</strong> and this is ' . $node->toLink('the link')->toString(), $output, 'Make sure path field rewriting is not escaped.');
}
}
diff --git a/web/core/modules/node/tests/src/Functional/Views/RevisionLinkTest.php b/web/core/modules/node/tests/src/Functional/Views/RevisionLinkTest.php
index 34f1f7f7fa..55c4d0082b 100644
--- a/web/core/modules/node/tests/src/Functional/Views/RevisionLinkTest.php
+++ b/web/core/modules/node/tests/src/Functional/Views/RevisionLinkTest.php
@@ -48,7 +48,7 @@ public function testRevisionLinks() {
$second_revision = $nodes[1]->getRevisionId();
$this->drupalGet('test-node-revision-links');
- $this->assertResponse(200, 'Test view can be accessed in the path expected');
+ $this->assertSession()->statusCodeEquals(200);
// The first node revision should link to the node directly as you get an
// access denied if you link to the revision.
$url = $nodes[0]->toUrl()->toString();
diff --git a/web/core/modules/node/tests/src/Functional/Views/RowPluginTest.php b/web/core/modules/node/tests/src/Functional/Views/RowPluginTest.php
index a8627524d1..3e96fee009 100644
--- a/web/core/modules/node/tests/src/Functional/Views/RowPluginTest.php
+++ b/web/core/modules/node/tests/src/Functional/Views/RowPluginTest.php
@@ -79,8 +79,8 @@ public function testRowPlugin() {
$output = $view->preview();
$output = $renderer->renderRoot($output);
foreach ($this->nodes as $node) {
- $this->assertFalse(strpos($output, $node->body->summary) !== FALSE, 'Make sure the teaser appears in the output of the view.');
- $this->assertTrue(strpos($output, $node->body->value) !== FALSE, 'Make sure the full text appears in the output of the view.');
+ $this->assertStringNotContainsString($node->body->summary, $output, 'Make sure the teaser appears in the output of the view.');
+ $this->assertStringContainsString($node->body->value, $output, 'Make sure the full text appears in the output of the view.');
}
// Test with teasers.
@@ -88,8 +88,8 @@ public function testRowPlugin() {
$output = $view->preview();
$output = $renderer->renderRoot($output);
foreach ($this->nodes as $node) {
- $this->assertTrue(strpos($output, $node->body->summary) !== FALSE, 'Make sure the teaser appears in the output of the view.');
- $this->assertFalse(strpos($output, $node->body->value) !== FALSE, 'Make sure the full text does not appears in the output of the view if teaser is set as viewmode.');
+ $this->assertStringContainsString($node->body->summary, $output, 'Make sure the teaser appears in the output of the view.');
+ $this->assertStringNotContainsString($node->body->value, $output, 'Make sure the full text does not appears in the output of the view if teaser is set as viewmode.');
}
}
diff --git a/web/core/modules/node/tests/src/Kernel/Config/NodeImportChangeTest.php b/web/core/modules/node/tests/src/Kernel/Config/NodeImportChangeTest.php
index d670e6a44c..35e26ef5d0 100644
--- a/web/core/modules/node/tests/src/Kernel/Config/NodeImportChangeTest.php
+++ b/web/core/modules/node/tests/src/Kernel/Config/NodeImportChangeTest.php
@@ -17,7 +17,14 @@ class NodeImportChangeTest extends KernelTestBase {
*
* @var array
*/
- public static $modules = ['node', 'field', 'text', 'system', 'node_test_config', 'user'];
+ public static $modules = [
+ 'node',
+ 'field',
+ 'text',
+ 'system',
+ 'node_test_config',
+ 'user',
+ ];
/**
* Set the default field storage backend for fields created during tests.
diff --git a/web/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeCompleteTest.php b/web/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeCompleteTest.php
new file mode 100644
index 0000000000..704d7eb230
--- /dev/null
+++ b/web/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeCompleteTest.php
@@ -0,0 +1,1257 @@
+<?php
+
+namespace Drupal\Tests\node\Kernel\Migrate\d6;
+
+use Drupal\node\NodeInterface;
+use Drupal\Tests\file\Kernel\Migrate\d6\FileMigrationTestTrait;
+use Drupal\Tests\migrate_drupal\Traits\CreateTestContentEntitiesTrait;
+
+/**
+ * Test class for a complete node migration for Drupal 6.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateNodeCompleteTest extends MigrateNodeTestBase {
+
+ use FileMigrationTestTrait;
+ use CreateTestContentEntitiesTrait;
+
+ /**
+ * {@inheritdoc}
+ */
+ public static $modules = [
+ 'language',
+ 'content_translation',
+ 'menu_ui',
+ // Required for translation migrations.
+ 'migrate_drupal_multilingual',
+ ];
+
+ /**
+ * The entity storage for node.
+ *
+ * @var \Drupal\Core\Entity\EntityStorageInterface
+ */
+ protected $nodeStorage;
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function setUp() {
+ parent::setUp();
+ $this->setUpMigratedFiles();
+
+ $this->createContent();
+
+ $this->nodeStorage = $this->container->get('entity_type.manager')
+ ->getStorage('node');
+ $this->nodeStorage->delete($this->nodeStorage->loadMultiple());
+
+ $this->installSchema('file', ['file_usage']);
+ $this->executeMigrations([
+ 'language',
+ 'd6_language_content_settings',
+ 'd6_node_complete',
+ ]);
+ }
+
+ /**
+ * Tests the complete node migration.
+ */
+ public function testNodeCompleteMigration() {
+ $db = \Drupal::database();
+ $this->assertEquals($this->expectedNodeFieldRevisionTable(), $db->select('node_field_revision', 'nr')
+ ->fields('nr')
+ ->orderBy('vid')
+ ->orderBy('langcode')
+ ->execute()
+ ->fetchAll(\PDO::FETCH_ASSOC));
+ $this->assertEquals($this->expectedNodeFieldDataTable(), $db->select('node_field_data', 'nr')
+ ->fields('nr')
+ ->orderBy('nid')
+ ->orderBy('vid')
+ ->orderBy('langcode')
+ ->execute()
+ ->fetchAll(\PDO::FETCH_ASSOC));
+
+ // Now load and test each revision, including the field 'field_text_plain'
+ // which has text reflecting the revision.
+ $data = $this->expectedRevisionEntityData()[0];
+ foreach ($this->expectedNodeFieldRevisionTable() as $key => $revision) {
+ $this->assertRevision($revision, $data[$key]);
+ }
+ }
+
+ /**
+ * Asserts various aspects of a node revision.
+ *
+ * @param array $revision
+ * An array of revision data matching a node_field_revision table row.
+ * @param array $data
+ * An array of revision data.
+ */
+ protected function assertRevision(array $revision, array $data) {
+ /* @var \Drupal\node\NodeInterface $actual */
+ $actual = $this->nodeStorage->loadRevision($revision['vid'])
+ ->getTranslation($revision['langcode']);
+ $this->assertInstanceOf(NodeInterface::class, $actual);
+ $this->assertSame($revision['title'], $actual->getTitle(), sprintf("Title '%s' does not match actual '%s' for revision '%d' langcode '%s'", $revision['title'], $actual->getTitle(), $revision['vid'], $revision['langcode']));
+ $this->assertSame($revision['revision_translation_affected'], $actual->get('revision_translation_affected')->value, sprintf("revision_translation_affected '%s' does not match actual '%s' for revision '%d' langcode '%s'", $revision['revision_translation_affected'], $actual->get('revision_translation_affected')->value, $revision['vid'], $revision['langcode']));
+
+ $this->assertSame($data['created'], $actual->getRevisionCreationTime(), sprintf("Creation time '%s' does not match actual '%s' for revision '%d' langcode '%s'", $data['created'], $actual->getRevisionCreationTime(), $revision['vid'], $revision['langcode']));
+ $this->assertSame($data['changed'], $actual->getChangedTime(), sprintf("Changed time '%s' does not match actual '%s' for revision '%d' langcode '%s'", $data['changed'], $actual->getChangedTime(), $revision['vid'], $revision['langcode']));
+ $this->assertSame($data['log'], $actual->getRevisionLogMessage(), sprintf("Revision log '%s' does not match actual '%s' for revision '%d' langcode '%s'", var_export($data['log'], TRUE), $actual->getRevisionLogMessage(), $revision['vid'], $revision['langcode']));
+ }
+
+ /**
+ * Provides the expected node_field_data table.
+ *
+ * @return array
+ * The expected table rows.
+ */
+ protected function expectedNodeFieldDataTable() {
+ return [
+ 0 =>
+ [
+ 'nid' => '1',
+ 'vid' => '2001',
+ 'type' => 'story',
+ 'langcode' => 'und',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'Test title rev 3',
+ 'created' => '1390095702',
+ 'changed' => '1420861423',
+ 'promote' => '0',
+ 'sticky' => '0',
+ 'default_langcode' => '1',
+ 'revision_translation_affected' => '1',
+ 'content_translation_source' => NULL,
+ 'content_translation_outdated' => '0',
+ ],
+ 1 =>
+ [
+ 'nid' => '2',
+ 'vid' => '3',
+ 'type' => 'story',
+ 'langcode' => 'und',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'Test title rev 3',
+ 'created' => '1388271197',
+ 'changed' => '1420718386',
+ 'promote' => '0',
+ 'sticky' => '0',
+ 'default_langcode' => '1',
+ 'revision_translation_affected' => '1',
+ 'content_translation_source' => NULL,
+ 'content_translation_outdated' => '0',
+ ],
+ 2 =>
+ [
+ 'nid' => '3',
+ 'vid' => '4',
+ 'type' => 'test_planet',
+ 'langcode' => 'und',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'Test page title rev 4',
+ 'created' => '1388271527',
+ 'changed' => '1390095701',
+ 'promote' => '0',
+ 'sticky' => '0',
+ 'default_langcode' => '1',
+ 'revision_translation_affected' => '1',
+ 'content_translation_source' => NULL,
+ 'content_translation_outdated' => '0',
+ ],
+ 3 =>
+ [
+ 'nid' => '4',
+ 'vid' => '6',
+ 'type' => 'test_planet',
+ 'langcode' => 'und',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'Node 4',
+ 'created' => '1388271527',
+ 'changed' => '1390095701',
+ 'promote' => '0',
+ 'sticky' => '0',
+ 'default_langcode' => '1',
+ 'revision_translation_affected' => '1',
+ 'content_translation_source' => NULL,
+ 'content_translation_outdated' => '0',
+ ],
+ 4 =>
+ [
+ 'nid' => '5',
+ 'vid' => '7',
+ 'type' => 'test_planet',
+ 'langcode' => 'und',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'Node 5',
+ 'created' => '1388271527',
+ 'changed' => '1390095701',
+ 'promote' => '0',
+ 'sticky' => '0',
+ 'default_langcode' => '1',
+ 'revision_translation_affected' => '1',
+ 'content_translation_source' => NULL,
+ 'content_translation_outdated' => '0',
+ ],
+ 5 =>
+ [
+ 'nid' => '6',
+ 'vid' => '8',
+ 'type' => 'test_planet',
+ 'langcode' => 'und',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'Node 6',
+ 'created' => '1388271527',
+ 'changed' => '1390095701',
+ 'promote' => '0',
+ 'sticky' => '0',
+ 'default_langcode' => '1',
+ 'revision_translation_affected' => '1',
+ 'content_translation_source' => NULL,
+ 'content_translation_outdated' => '0',
+ ],
+ 6 =>
+ [
+ 'nid' => '7',
+ 'vid' => '9',
+ 'type' => 'test_planet',
+ 'langcode' => 'und',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'Node 7',
+ 'created' => '1388271527',
+ 'changed' => '1390095701',
+ 'promote' => '0',
+ 'sticky' => '0',
+ 'default_langcode' => '1',
+ 'revision_translation_affected' => '1',
+ 'content_translation_source' => NULL,
+ 'content_translation_outdated' => '0',
+ ],
+ 7 =>
+ [
+ 'nid' => '8',
+ 'vid' => '10',
+ 'type' => 'test_planet',
+ 'langcode' => 'und',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'Node 8',
+ 'created' => '1388271527',
+ 'changed' => '1390095701',
+ 'promote' => '0',
+ 'sticky' => '0',
+ 'default_langcode' => '1',
+ 'revision_translation_affected' => '1',
+ 'content_translation_source' => NULL,
+ 'content_translation_outdated' => '0',
+ ],
+ 8 =>
+ [
+ 'nid' => '9',
+ 'vid' => '12',
+ 'type' => 'story',
+ 'langcode' => 'und',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'Once upon a time',
+ 'created' => '1444671588',
+ 'changed' => '1444671588',
+ 'promote' => '1',
+ 'sticky' => '0',
+ 'default_langcode' => '1',
+ 'revision_translation_affected' => '1',
+ 'content_translation_source' => NULL,
+ 'content_translation_outdated' => '0',
+ ],
+ 9 =>
+ [
+ 'nid' => '10',
+ 'vid' => '14',
+ 'type' => 'page',
+ 'langcode' => 'en',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'The Real McCoy',
+ 'created' => '1444238800',
+ 'changed' => '1444238808',
+ 'promote' => '1',
+ 'sticky' => '0',
+ 'default_langcode' => '1',
+ 'revision_translation_affected' => NULL,
+ 'content_translation_source' => 'en',
+ 'content_translation_outdated' => '0',
+ ],
+ 10 =>
+ [
+ 'nid' => '10',
+ 'vid' => '14',
+ 'type' => 'page',
+ 'langcode' => 'fr',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'Le Vrai McCoy',
+ 'created' => '1444239050',
+ 'changed' => '1444239050',
+ 'promote' => '1',
+ 'sticky' => '0',
+ 'default_langcode' => '0',
+ 'revision_translation_affected' => '1',
+ 'content_translation_source' => 'en',
+ 'content_translation_outdated' => '0',
+ ],
+ 11 =>
+ [
+ 'nid' => '12',
+ 'vid' => '23',
+ 'type' => 'page',
+ 'langcode' => 'en',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'The Zulu People',
+ 'created' => '1444239050',
+ 'changed' => '1444239050',
+ 'promote' => '0',
+ 'sticky' => '0',
+ 'default_langcode' => '0',
+ 'revision_translation_affected' => NULL,
+ 'content_translation_source' => 'zu',
+ 'content_translation_outdated' => '0',
+ ],
+ 12 =>
+ [
+ 'nid' => '12',
+ 'vid' => '23',
+ 'type' => 'page',
+ 'langcode' => 'fr',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'Le peuple zoulou',
+ 'created' => '1520613038',
+ 'changed' => '1520613305',
+ 'promote' => '1',
+ 'sticky' => '0',
+ 'default_langcode' => '0',
+ 'revision_translation_affected' => '1',
+ 'content_translation_source' => 'zu',
+ 'content_translation_outdated' => '0',
+ ],
+ 13 =>
+ [
+ 'nid' => '12',
+ 'vid' => '23',
+ 'type' => 'page',
+ 'langcode' => 'zu',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'Abantu zulu',
+ 'created' => '1444238800',
+ 'changed' => '1444238808',
+ 'promote' => '0',
+ 'sticky' => '0',
+ 'default_langcode' => '1',
+ 'revision_translation_affected' => NULL,
+ 'content_translation_source' => 'zu',
+ 'content_translation_outdated' => '0',
+ ],
+ 14 =>
+ [
+ 'nid' => '14',
+ 'vid' => '17',
+ 'type' => 'company',
+ 'langcode' => 'und',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'United Federation of Planets',
+ 'created' => '1493066668',
+ 'changed' => '1493066668',
+ 'promote' => '1',
+ 'sticky' => '0',
+ 'default_langcode' => '1',
+ 'revision_translation_affected' => '1',
+ 'content_translation_source' => NULL,
+ 'content_translation_outdated' => '0',
+ ],
+ 15 =>
+ [
+ 'nid' => '15',
+ 'vid' => '18',
+ 'type' => 'company',
+ 'langcode' => 'und',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'Klingon Empire',
+ 'created' => '1493066677',
+ 'changed' => '1493066677',
+ 'promote' => '1',
+ 'sticky' => '0',
+ 'default_langcode' => '1',
+ 'revision_translation_affected' => '1',
+ 'content_translation_source' => NULL,
+ 'content_translation_outdated' => '0',
+ ],
+ 16 =>
+ [
+ 'nid' => '16',
+ 'vid' => '19',
+ 'type' => 'company',
+ 'langcode' => 'und',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'Romulan Empire',
+ 'created' => '1493066684',
+ 'changed' => '1493066684',
+ 'promote' => '1',
+ 'sticky' => '0',
+ 'default_langcode' => '1',
+ 'revision_translation_affected' => '1',
+ 'content_translation_source' => NULL,
+ 'content_translation_outdated' => '0',
+ ],
+ 17 =>
+ [
+ 'nid' => '17',
+ 'vid' => '20',
+ 'type' => 'company',
+ 'langcode' => 'und',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'Ferengi Commerce Authority',
+ 'created' => '1493066693',
+ 'changed' => '1493066693',
+ 'promote' => '1',
+ 'sticky' => '0',
+ 'default_langcode' => '1',
+ 'revision_translation_affected' => '1',
+ 'content_translation_source' => NULL,
+ 'content_translation_outdated' => '0',
+ ],
+ 18 =>
+ [
+ 'nid' => '18',
+ 'vid' => '21',
+ 'type' => 'employee',
+ 'langcode' => 'und',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'Ambassador Sarek',
+ 'created' => '1493066711',
+ 'changed' => '1494966544',
+ 'promote' => '1',
+ 'sticky' => '0',
+ 'default_langcode' => '1',
+ 'revision_translation_affected' => '1',
+ 'content_translation_source' => NULL,
+ 'content_translation_outdated' => '0',
+ ],
+ 19 =>
+ [
+ 'nid' => '19',
+ 'vid' => '22',
+ 'type' => 'forum',
+ 'langcode' => 'und',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'New Forum Topic',
+ 'created' => '1501955771',
+ 'changed' => '1501955771',
+ 'promote' => '0',
+ 'sticky' => '0',
+ 'default_langcode' => '1',
+ 'revision_translation_affected' => '1',
+ 'content_translation_source' => NULL,
+ 'content_translation_outdated' => '0',
+ ],
+ 20 =>
+ [
+ 'nid' => '21',
+ 'vid' => '2003',
+ 'type' => 'employee',
+ 'langcode' => 'en',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'John Smith - EN',
+ 'created' => '1534014650',
+ 'changed' => '1534014650',
+ 'promote' => '1',
+ 'sticky' => '0',
+ 'default_langcode' => '1',
+ 'revision_translation_affected' => NULL,
+ 'content_translation_source' => 'en',
+ 'content_translation_outdated' => '0',
+ ],
+ 21 =>
+ [
+ 'nid' => '21',
+ 'vid' => '2003',
+ 'type' => 'employee',
+ 'langcode' => 'fr',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'John Smith - FR',
+ 'created' => '1534014687',
+ 'changed' => '1534014687',
+ 'promote' => '1',
+ 'sticky' => '0',
+ 'default_langcode' => '0',
+ 'revision_translation_affected' => '1',
+ 'content_translation_source' => 'en',
+ 'content_translation_outdated' => '0',
+ ],
+ ];
+ }
+
+ /**
+ * Provides the expected node_field_revision table.
+ *
+ * @return array
+ * The table.
+ */
+ protected function expectedNodeFieldRevisionTable() {
+ return [
+ 0 =>
+ [
+ 'nid' => '1',
+ 'vid' => '1',
+ 'langcode' => 'und',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'Test title',
+ 'created' => '1390095702',
+ 'changed' => '1390095702',
+ 'promote' => '0',
+ 'sticky' => '0',
+ 'default_langcode' => '1',
+ 'revision_translation_affected' => '1',
+ 'content_translation_source' => NULL,
+ 'content_translation_outdated' => '0',
+ ],
+ 1 =>
+ [
+ 'nid' => '2',
+ 'vid' => '3',
+ 'langcode' => 'und',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'Test title rev 3',
+ 'created' => '1388271197',
+ 'changed' => '1420718386',
+ 'promote' => '0',
+ 'sticky' => '0',
+ 'default_langcode' => '1',
+ 'revision_translation_affected' => '1',
+ 'content_translation_source' => NULL,
+ 'content_translation_outdated' => '0',
+ ],
+ 2 =>
+ [
+ 'nid' => '3',
+ 'vid' => '4',
+ 'langcode' => 'und',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'Test page title rev 4',
+ 'created' => '1388271527',
+ 'changed' => '1390095701',
+ 'promote' => '0',
+ 'sticky' => '0',
+ 'default_langcode' => '1',
+ 'revision_translation_affected' => '1',
+ 'content_translation_source' => NULL,
+ 'content_translation_outdated' => '0',
+ ],
+ 3 =>
+ [
+ 'nid' => '1',
+ 'vid' => '5',
+ 'langcode' => 'und',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'Test title rev 2',
+ 'created' => '1390095702',
+ 'changed' => '1390095703',
+ 'promote' => '0',
+ 'sticky' => '0',
+ 'default_langcode' => '1',
+ 'revision_translation_affected' => '1',
+ 'content_translation_source' => NULL,
+ 'content_translation_outdated' => '0',
+ ],
+ 4 =>
+ [
+ 'nid' => '4',
+ 'vid' => '6',
+ 'langcode' => 'und',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'Node 4',
+ 'created' => '1388271527',
+ 'changed' => '1390095701',
+ 'promote' => '0',
+ 'sticky' => '0',
+ 'default_langcode' => '1',
+ 'revision_translation_affected' => '1',
+ 'content_translation_source' => NULL,
+ 'content_translation_outdated' => '0',
+ ],
+ 5 =>
+ [
+ 'nid' => '5',
+ 'vid' => '7',
+ 'langcode' => 'und',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'Node 5',
+ 'created' => '1388271527',
+ 'changed' => '1390095701',
+ 'promote' => '0',
+ 'sticky' => '0',
+ 'default_langcode' => '1',
+ 'revision_translation_affected' => '1',
+ 'content_translation_source' => NULL,
+ 'content_translation_outdated' => '0',
+ ],
+ 6 =>
+ [
+ 'nid' => '6',
+ 'vid' => '8',
+ 'langcode' => 'und',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'Node 6',
+ 'created' => '1388271527',
+ 'changed' => '1390095701',
+ 'promote' => '0',
+ 'sticky' => '0',
+ 'default_langcode' => '1',
+ 'revision_translation_affected' => '1',
+ 'content_translation_source' => NULL,
+ 'content_translation_outdated' => '0',
+ ],
+ 7 =>
+ [
+ 'nid' => '7',
+ 'vid' => '9',
+ 'langcode' => 'und',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'Node 7',
+ 'created' => '1388271527',
+ 'changed' => '1390095701',
+ 'promote' => '0',
+ 'sticky' => '0',
+ 'default_langcode' => '1',
+ 'revision_translation_affected' => '1',
+ 'content_translation_source' => NULL,
+ 'content_translation_outdated' => '0',
+ ],
+ 8 =>
+ [
+ 'nid' => '8',
+ 'vid' => '10',
+ 'langcode' => 'und',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'Node 8',
+ 'created' => '1388271527',
+ 'changed' => '1390095701',
+ 'promote' => '0',
+ 'sticky' => '0',
+ 'default_langcode' => '1',
+ 'revision_translation_affected' => '1',
+ 'content_translation_source' => NULL,
+ 'content_translation_outdated' => '0',
+ ],
+ 9 =>
+ [
+ 'nid' => '9',
+ 'vid' => '11',
+ 'langcode' => 'und',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'Node 9',
+ 'created' => '1444671588',
+ 'changed' => '1390095701',
+ 'promote' => '1',
+ 'sticky' => '0',
+ 'default_langcode' => '1',
+ 'revision_translation_affected' => '1',
+ 'content_translation_source' => NULL,
+ 'content_translation_outdated' => '0',
+ ],
+ 10 =>
+ [
+ 'nid' => '9',
+ 'vid' => '12',
+ 'langcode' => 'und',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'Once upon a time',
+ 'created' => '1444671588',
+ 'changed' => '1444671588',
+ 'promote' => '1',
+ 'sticky' => '0',
+ 'default_langcode' => '1',
+ 'revision_translation_affected' => '1',
+ 'content_translation_source' => NULL,
+ 'content_translation_outdated' => '0',
+ ],
+ 11 =>
+ [
+ 'nid' => '10',
+ 'vid' => '13',
+ 'langcode' => 'en',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'The Real McCoy',
+ 'created' => '1444238800',
+ 'changed' => '1444238808',
+ 'promote' => '1',
+ 'sticky' => '0',
+ 'default_langcode' => '1',
+ 'revision_translation_affected' => '1',
+ 'content_translation_source' => 'en',
+ 'content_translation_outdated' => '0',
+ ],
+ 12 =>
+ [
+ 'nid' => '10',
+ 'vid' => '14',
+ 'langcode' => 'en',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'The Real McCoy',
+ 'created' => '1444238800',
+ 'changed' => '1444238808',
+ 'promote' => '1',
+ 'sticky' => '0',
+ 'default_langcode' => '1',
+ 'revision_translation_affected' => NULL,
+ 'content_translation_source' => 'en',
+ 'content_translation_outdated' => '0',
+ ],
+ 13 =>
+ [
+ 'nid' => '10',
+ 'vid' => '14',
+ 'langcode' => 'fr',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'Le Vrai McCoy',
+ 'created' => '1444239050',
+ 'changed' => '1444239050',
+ 'promote' => '1',
+ 'sticky' => '0',
+ 'default_langcode' => '0',
+ 'revision_translation_affected' => '1',
+ 'content_translation_source' => 'en',
+ 'content_translation_outdated' => '0',
+ ],
+ 14 =>
+ [
+ 'nid' => '12',
+ 'vid' => '15',
+ 'langcode' => 'zu',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'Abantu zulu',
+ 'created' => '1444238800',
+ 'changed' => '1444238808',
+ 'promote' => '0',
+ 'sticky' => '0',
+ 'default_langcode' => '1',
+ 'revision_translation_affected' => '1',
+ 'content_translation_source' => 'zu',
+ 'content_translation_outdated' => '0',
+ ],
+ 15 =>
+ [
+ 'nid' => '12',
+ 'vid' => '16',
+ 'langcode' => 'en',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'The Zulu People',
+ 'created' => '1444239050',
+ 'changed' => '1444239050',
+ 'promote' => '0',
+ 'sticky' => '0',
+ 'default_langcode' => '0',
+ 'revision_translation_affected' => '1',
+ 'content_translation_source' => 'zu',
+ 'content_translation_outdated' => '0',
+ ],
+ 16 =>
+ [
+ 'nid' => '12',
+ 'vid' => '16',
+ 'langcode' => 'zu',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'Abantu zulu',
+ 'created' => '1444238800',
+ 'changed' => '1444238808',
+ 'promote' => '0',
+ 'sticky' => '0',
+ 'default_langcode' => '1',
+ 'revision_translation_affected' => NULL,
+ 'content_translation_source' => 'zu',
+ 'content_translation_outdated' => '0',
+ ],
+ 17 =>
+ [
+ 'nid' => '14',
+ 'vid' => '17',
+ 'langcode' => 'und',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'United Federation of Planets',
+ 'created' => '1493066668',
+ 'changed' => '1493066668',
+ 'promote' => '1',
+ 'sticky' => '0',
+ 'default_langcode' => '1',
+ 'revision_translation_affected' => '1',
+ 'content_translation_source' => NULL,
+ 'content_translation_outdated' => '0',
+ ],
+ 18 =>
+ [
+ 'nid' => '15',
+ 'vid' => '18',
+ 'langcode' => 'und',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'Klingon Empire',
+ 'created' => '1493066677',
+ 'changed' => '1493066677',
+ 'promote' => '1',
+ 'sticky' => '0',
+ 'default_langcode' => '1',
+ 'revision_translation_affected' => '1',
+ 'content_translation_source' => NULL,
+ 'content_translation_outdated' => '0',
+ ],
+ 19 =>
+ [
+ 'nid' => '16',
+ 'vid' => '19',
+ 'langcode' => 'und',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'Romulan Empire',
+ 'created' => '1493066684',
+ 'changed' => '1493066684',
+ 'promote' => '1',
+ 'sticky' => '0',
+ 'default_langcode' => '1',
+ 'revision_translation_affected' => '1',
+ 'content_translation_source' => NULL,
+ 'content_translation_outdated' => '0',
+ ],
+ 20 =>
+ [
+ 'nid' => '17',
+ 'vid' => '20',
+ 'langcode' => 'und',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'Ferengi Commerce Authority',
+ 'created' => '1493066693',
+ 'changed' => '1493066693',
+ 'promote' => '1',
+ 'sticky' => '0',
+ 'default_langcode' => '1',
+ 'revision_translation_affected' => '1',
+ 'content_translation_source' => NULL,
+ 'content_translation_outdated' => '0',
+ ],
+ 21 =>
+ [
+ 'nid' => '18',
+ 'vid' => '21',
+ 'langcode' => 'und',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'Ambassador Sarek',
+ 'created' => '1493066711',
+ 'changed' => '1494966544',
+ 'promote' => '1',
+ 'sticky' => '0',
+ 'default_langcode' => '1',
+ 'revision_translation_affected' => '1',
+ 'content_translation_source' => NULL,
+ 'content_translation_outdated' => '0',
+ ],
+ 22 =>
+ [
+ 'nid' => '19',
+ 'vid' => '22',
+ 'langcode' => 'und',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'New Forum Topic',
+ 'created' => '1501955771',
+ 'changed' => '1501955771',
+ 'promote' => '0',
+ 'sticky' => '0',
+ 'default_langcode' => '1',
+ 'revision_translation_affected' => '1',
+ 'content_translation_source' => NULL,
+ 'content_translation_outdated' => '0',
+ ],
+ 23 =>
+ [
+ 'nid' => '12',
+ 'vid' => '23',
+ 'langcode' => 'en',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'The Zulu People',
+ 'created' => '1444239050',
+ 'changed' => '1444239050',
+ 'promote' => '0',
+ 'sticky' => '0',
+ 'default_langcode' => '0',
+ 'revision_translation_affected' => NULL,
+ 'content_translation_source' => 'zu',
+ 'content_translation_outdated' => '0',
+ ],
+ 24 =>
+ [
+ 'nid' => '12',
+ 'vid' => '23',
+ 'langcode' => 'fr',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'Le peuple zoulou',
+ 'created' => '1520613038',
+ 'changed' => '1520613305',
+ 'promote' => '1',
+ 'sticky' => '0',
+ 'default_langcode' => '0',
+ 'revision_translation_affected' => '1',
+ 'content_translation_source' => 'zu',
+ 'content_translation_outdated' => '0',
+ ],
+ 25 =>
+ [
+ 'nid' => '12',
+ 'vid' => '23',
+ 'langcode' => 'zu',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'Abantu zulu',
+ 'created' => '1444238800',
+ 'changed' => '1444238808',
+ 'promote' => '0',
+ 'sticky' => '0',
+ 'default_langcode' => '1',
+ 'revision_translation_affected' => NULL,
+ 'content_translation_source' => 'zu',
+ 'content_translation_outdated' => '0',
+ ],
+ 26 =>
+ [
+ 'nid' => '1',
+ 'vid' => '2001',
+ 'langcode' => 'und',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'Test title rev 3',
+ 'created' => '1390095702',
+ 'changed' => '1420861423',
+ 'promote' => '0',
+ 'sticky' => '0',
+ 'default_langcode' => '1',
+ 'revision_translation_affected' => '1',
+ 'content_translation_source' => NULL,
+ 'content_translation_outdated' => '0',
+ ],
+ 27 =>
+ [
+ 'nid' => '21',
+ 'vid' => '2002',
+ 'langcode' => 'en',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'John Smith - EN',
+ 'created' => '1534014650',
+ 'changed' => '1534014650',
+ 'promote' => '1',
+ 'sticky' => '0',
+ 'default_langcode' => '1',
+ 'revision_translation_affected' => '1',
+ 'content_translation_source' => 'en',
+ 'content_translation_outdated' => '0',
+ ],
+ 28 =>
+ [
+ 'nid' => '21',
+ 'vid' => '2003',
+ 'langcode' => 'en',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'John Smith - EN',
+ 'created' => '1534014650',
+ 'changed' => '1534014650',
+ 'promote' => '1',
+ 'sticky' => '0',
+ 'default_langcode' => '1',
+ 'revision_translation_affected' => NULL,
+ 'content_translation_source' => 'en',
+ 'content_translation_outdated' => '0',
+ ],
+ 29 =>
+ [
+ 'nid' => '21',
+ 'vid' => '2003',
+ 'langcode' => 'fr',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'John Smith - FR',
+ 'created' => '1534014687',
+ 'changed' => '1534014687',
+ 'promote' => '1',
+ 'sticky' => '0',
+ 'default_langcode' => '0',
+ 'revision_translation_affected' => '1',
+ 'content_translation_source' => 'en',
+ 'content_translation_outdated' => '0',
+ ],
+ ];
+ }
+
+ /**
+ * Provides the expected node_field_revision table.
+ *
+ * @return array
+ * Selected properties and fields on the revision.
+ */
+ protected function expectedRevisionEntityData() {
+ return [
+ $revision_data = [
+ // Node 1, revision 1, und.
+ 0 =>
+ [
+ 'log' => NULL,
+ 'created' => '1390095702',
+ 'changed' => '1390095702',
+ ],
+ // Node 2, revision 3, und.
+ 1 =>
+ [
+ 'log' => NULL,
+ 'created' => '1420718386',
+ 'changed' => '1420718386',
+ ],
+ // Node 3, revision 4, und.
+ 2 =>
+ [
+ 'log' => NULL,
+ 'created' => '1390095701',
+ 'changed' => '1390095701',
+ ],
+ // Node 1, revision 5, und.
+ 3 =>
+ [
+ 'log' => 'modified rev 2',
+ 'created' => '1390095703',
+ 'changed' => '1390095703',
+ ],
+ // Node 4, revision 6, und.
+ 4 =>
+ [
+ 'log' => NULL,
+ 'created' => '1390095701',
+ 'changed' => '1390095701',
+ ],
+ // Node 5, revision 7, und.
+ 5 =>
+ [
+ 'log' => NULL,
+ 'created' => '1390095701',
+ 'changed' => '1390095701',
+ ],
+ // Node 6, revision 8, und.
+ 6 =>
+ [
+ 'log' => NULL,
+ 'created' => '1390095701',
+ 'changed' => '1390095701',
+ ],
+ // Node 7, revision 9, und.
+ 7 =>
+ [
+ 'log' => NULL,
+ 'created' => '1390095701',
+ 'changed' => '1390095701',
+ ],
+ // Node 8, revision 10, und.
+ 8 =>
+ [
+ 'log' => NULL,
+ 'created' => '1390095701',
+ 'changed' => '1390095701',
+ ],
+ // Node 9, revision 11, und.
+ 9 =>
+ [
+ 'log' => NULL,
+ 'created' => '1390095701',
+ 'changed' => '1390095701',
+ ],
+ // Node 9, revision 12, und.
+ 10 =>
+ [
+ 'log' => NULL,
+ 'created' => '1444671588',
+ 'changed' => '1444671588',
+ ],
+ // Node 10, revision 13, en.
+ 11 =>
+ [
+ 'log' => NULL,
+ 'created' => '1444238808',
+ 'changed' => '1444238808',
+ ],
+ // Node 10, revision 14, en.
+ 12 =>
+ [
+ 'log' => NULL,
+ 'created' => '1444239050',
+ 'changed' => '1444238808',
+ ],
+ // Node 10, revision 14, fr.
+ 13 =>
+ [
+ 'log' => NULL,
+ 'created' => '1444239050',
+ 'changed' => '1444239050',
+ ],
+ // Node 12, revision 15, zu.
+ 14 =>
+ [
+ 'log' => NULL,
+ 'created' => '1444238808',
+ 'changed' => '1444238808',
+ ],
+ // Node 12, revision 16, en.
+ 15 =>
+ [
+ 'log' => NULL,
+ 'created' => '1444239050',
+ 'changed' => '1444239050',
+ ],
+ // Node 12, revision 16, zu.
+ 16 =>
+ [
+ 'log' => NULL,
+ 'created' => '1444239050',
+ 'changed' => '1444238808',
+ ],
+ // Node 14, revision 17, und.
+ 17 =>
+ [
+ 'log' => NULL,
+ 'created' => '1493066668',
+ 'changed' => '1493066668',
+ ],
+ // Node 15, revision 18, und.
+ 18 =>
+ [
+ 'log' => NULL,
+ 'created' => '1493066677',
+ 'changed' => '1493066677',
+ ],
+ // Node 16, revision 19, und.
+ 19 =>
+ [
+ 'log' => NULL,
+ 'created' => '1493066684',
+ 'changed' => '1493066684',
+ ],
+ // Node 17, revision 20, und.
+ 20 =>
+ [
+ 'log' => NULL,
+ 'created' => '1493066693',
+ 'changed' => '1493066693',
+ ],
+ // Node 18, revision 21, und.
+ 21 =>
+ [
+ 'log' => NULL,
+ 'created' => '1494966544',
+ 'changed' => '1494966544',
+ ],
+ // Node 19, revision 22, und.
+ 22 =>
+ [
+ 'log' => NULL,
+ 'created' => '1501955771',
+ 'changed' => '1501955771',
+ ],
+ // Node 12, revision 23, en.
+ 23 =>
+ [
+ 'log' => NULL,
+ 'created' => '1520613305',
+ 'changed' => '1444239050',
+ ],
+ // Node 12, revision 23, fr.
+ 24 =>
+ [
+ 'log' => NULL,
+ 'created' => '1520613305',
+ 'changed' => '1520613305',
+ ],
+ // Node 12, revision 23, zu.
+ 25 =>
+ [
+ 'log' => NULL,
+ 'created' => '1520613305',
+ 'changed' => '1444238808',
+ ],
+ // Node 1, revision 2001, und.
+ 26 =>
+ [
+ 'log' => 'modified rev 3',
+ 'created' => '1420861423',
+ 'changed' => '1420861423',
+ ],
+ // Node 21, revision 2002, en.
+ 27 =>
+ [
+ 'log' => NULL,
+ 'created' => '1534014650',
+ 'changed' => '1534014650',
+ ],
+ // Node 21, revision 2003, en.
+ 28 =>
+ [
+ 'log' => NULL,
+ 'created' => '1534014687',
+ 'changed' => '1534014650',
+ ],
+ // Node 21, revision 2003, fr.
+ 29 =>
+ [
+ 'log' => NULL,
+ 'created' => '1534014687',
+ 'changed' => '1534014687',
+ ],
+ ],
+ ];
+ }
+
+}
diff --git a/web/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeRevisionTest.php b/web/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeRevisionTest.php
index 9dbfb54126..31571be5cc 100644
--- a/web/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeRevisionTest.php
+++ b/web/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeRevisionTest.php
@@ -66,17 +66,17 @@ public function testNodeRevision() {
$this->assertIdentical('1', $node->id());
$this->assertIdentical('2001', $node->getRevisionId());
$this->assertIdentical('und', $node->langcode->value);
- $this->assertIdentical('Test title rev 2', $node->getTitle());
- $this->assertIdentical('body test rev 2', $node->body->value);
- $this->assertIdentical('teaser test rev 2', $node->body->summary);
+ $this->assertIdentical('Test title rev 3', $node->getTitle());
+ $this->assertIdentical('body test rev 3', $node->body->value);
+ $this->assertIdentical('teaser test rev 3', $node->body->summary);
$this->assertIdentical('2', $node->getRevisionUser()->id());
- $this->assertIdentical('modified rev 2', $node->revision_log->value);
- $this->assertIdentical('1390095702', $node->getRevisionCreationTime());
+ $this->assertIdentical('modified rev 3', $node->revision_log->value);
+ $this->assertIdentical('1420861423', $node->getRevisionCreationTime());
- $this->assertRevision(1, 'und', 'Test title', NULL, '1420861423');
+ $this->assertRevision(1, 'und', 'Test title', NULL, '1390095702');
$this->assertRevision(3, 'und', 'Test title rev 3', NULL, '1420718386');
$this->assertRevision(4, 'und', 'Test page title rev 4', NULL, '1390095701');
- $this->assertRevision(5, 'und', 'Test title rev 3', 'modified rev 3', '1390095703');
+ $this->assertRevision(5, 'und', 'Test title rev 2', 'modified rev 2', '1390095703');
$this->assertRevision(6, 'und', 'Node 4', NULL, '1390095701');
$this->assertRevision(7, 'und', 'Node 5', NULL, '1390095701');
$this->assertRevision(8, 'und', 'Node 6', NULL, '1390095701');
@@ -92,7 +92,7 @@ public function testNodeRevision() {
$this->assertRevision(20, 'und', 'Ferengi Commerce Authority', NULL, '1493066693');
$this->assertRevision(21, 'und', 'Ambassador Sarek', NULL, '1494966544');
$this->assertRevision(22, 'und', 'New Forum Topic', NULL, '1501955771');
- $this->assertRevision(2001, 'und', 'Test title rev 2', 'modified rev 2', '1390095702');
+ $this->assertRevision(2001, 'und', 'Test title rev 3', 'modified rev 3', '1420861423');
$this->assertRevision(2002, 'en', 'John Smith - EN', NULL, '1534014650');
// Test that the revision translations are not migrated and there should not
@@ -101,6 +101,7 @@ public function testNodeRevision() {
foreach ($ids as $id) {
$this->assertNull($this->nodeStorage->loadRevision($id));
}
+
}
}
diff --git a/web/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeTest.php b/web/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeTest.php
index c390af2db4..1e951d0e47 100644
--- a/web/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeTest.php
+++ b/web/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeTest.php
@@ -23,8 +23,6 @@ class MigrateNodeTest extends MigrateNodeTestBase {
'language',
'content_translation',
'menu_ui',
- // Required for translation migrations.
- 'migrate_drupal_multilingual',
];
/**
@@ -46,6 +44,11 @@ protected function setUp() {
* Test node migration from Drupal 6 to 8.
*/
public function testNode() {
+ // Confirm there are only classic node migration map tables. This shows
+ // that only the classic migration ran.
+ $results = $this->nodeMigrateMapTableCount('6');
+ $this->assertSame(13, $results['node']);
+ $this->assertSame(0, $results['node_complete']);
$node = Node::load(1);
$this->assertIdentical('1', $node->id(), 'Node 1 loaded.');
$this->assertIdentical('und', $node->langcode->value);
@@ -54,10 +57,10 @@ public function testNode() {
$this->assertIdentical('filtered_html', $node->body->format);
$this->assertIdentical('story', $node->getType(), 'Node has the correct bundle.');
$this->assertIdentical('Test title', $node->getTitle(), 'Node has the correct title.');
- $this->assertIdentical('1388271197', $node->getCreatedTime(), 'Node has the correct created time.');
+ $this->assertIdentical('1390095702', $node->getCreatedTime(), 'Node has the correct created time.');
$this->assertIdentical(FALSE, $node->isSticky());
$this->assertIdentical('1', $node->getOwnerId());
- $this->assertIdentical('1420861423', $node->getRevisionCreationTime());
+ $this->assertIdentical('1390095702', $node->getRevisionCreationTime());
/** @var \Drupal\node\NodeInterface $node_revision */
$node_revision = \Drupal::entityTypeManager()->getStorage('node')->loadRevision(1);
diff --git a/web/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateViewModesTest.php b/web/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateViewModesTest.php
index 5320aef9ed..bae29de524 100644
--- a/web/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateViewModesTest.php
+++ b/web/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateViewModesTest.php
@@ -26,7 +26,7 @@ protected function setUp() {
public function testViewModes() {
// Test a new view mode.
$view_mode = EntityViewMode::load('node.preview');
- $this->assertIdentical(FALSE, is_null($view_mode), 'Preview view mode loaded.');
+ $this->assertNotNull($view_mode);
$this->assertIdentical('Preview', $view_mode->label(), 'View mode has correct label.');
// Test the ID map.
$this->assertIdentical([['node', 'preview']], $this->getMigration('d6_view_modes')->getIdMap()->lookupDestinationIds([1]));
diff --git a/web/core/modules/node/tests/src/Kernel/Migrate/d6/NodeTranslationRedirectTest.php b/web/core/modules/node/tests/src/Kernel/Migrate/d6/NodeTranslationRedirectTest.php
index 35976ee246..9dad3483f4 100644
--- a/web/core/modules/node/tests/src/Kernel/Migrate/d6/NodeTranslationRedirectTest.php
+++ b/web/core/modules/node/tests/src/Kernel/Migrate/d6/NodeTranslationRedirectTest.php
@@ -23,8 +23,6 @@ class NodeTranslationRedirectTest extends MigrateDrupal6TestBase {
'content_translation',
'language',
'menu_ui',
- // Required for translation migrations.
- 'migrate_drupal_multilingual',
];
/**
diff --git a/web/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeCompleteTest.php b/web/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeCompleteTest.php
new file mode 100644
index 0000000000..fd550f5986
--- /dev/null
+++ b/web/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeCompleteTest.php
@@ -0,0 +1,1206 @@
+<?php
+
+namespace Drupal\Tests\node\Kernel\Migrate\d7;
+
+use Drupal\migrate\MigrateExecutable;
+use Drupal\migrate_drupal\NodeMigrateType;
+use Drupal\node\NodeInterface;
+use Drupal\Tests\file\Kernel\Migrate\d7\FileMigrationSetupTrait;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
+use Drupal\Tests\migrate_drupal\Traits\CreateTestContentEntitiesTrait;
+use Drupal\Tests\migrate_drupal\Traits\NodeMigrateTypeTestTrait;
+
+/**
+ * Test class for a complete node migration for Drupal 7.
+ *
+ * @group migrate_drupal_7
+ */
+class MigrateNodeCompleteTest extends MigrateDrupal7TestBase {
+
+ use FileMigrationSetupTrait;
+ use CreateTestContentEntitiesTrait;
+ use NodeMigrateTypeTestTrait;
+
+ /**
+ * {@inheritdoc}
+ */
+ public static $modules = [
+ 'content_translation',
+ 'comment',
+ 'datetime',
+ 'image',
+ 'language',
+ 'link',
+ 'menu_ui',
+ // Required for translation migrations.
+ 'migrate_drupal_multilingual',
+ 'node',
+ 'taxonomy',
+ 'telephone',
+ 'text',
+ ];
+
+ /**
+ * The entity storage for node.
+ *
+ * @var \Drupal\Core\Entity\EntityStorageInterface
+ */
+ protected $nodeStorage;
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function setUp() {
+ parent::setUp();
+
+ // Remove the classic node table made in setup.
+ $this->removeNodeMigrateMapTable(NodeMigrateType::NODE_MIGRATE_TYPE_CLASSIC, '7');
+
+ $this->fileMigrationSetup();
+
+ $this->installEntitySchema('comment');
+ $this->installEntitySchema('taxonomy_term');
+ $this->installSchema('comment', ['comment_entity_statistics']);
+ $this->installSchema('node', ['node_access']);
+ $this->installSchema('system', ['sequences']);
+
+ $this->createContent();
+
+ $this->nodeStorage = $this->container->get('entity_type.manager')
+ ->getStorage('node');
+ $this->nodeStorage->delete($this->nodeStorage->loadMultiple());
+
+ $this->migrateUsers();
+ $this->migrateFields();
+ $this->executeMigrations([
+ 'language',
+ 'd7_language_content_settings',
+ 'd7_comment_field',
+ 'd7_comment_field_instance',
+ 'd7_node_complete',
+ ]);
+ $this->nodeStorage = $this->container->get('entity_type.manager')
+ ->getStorage('node');
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function getFileMigrationInfo() {
+ return [
+ 'path' => 'public://sites/default/files/cube.jpeg',
+ 'size' => '3620',
+ 'base_path' => 'public://',
+ 'plugin_id' => 'd7_file',
+ ];
+ }
+
+ /**
+ * Tests the complete node migration.
+ */
+ public function testNodeCompleteMigration() {
+ // Confirm there are only complete node migration map tables. This shows
+ // that only the complete migration ran.
+ $results = $this->nodeMigrateMapTableCount('7');
+ $this->assertSame(0, $results['node']);
+ $this->assertSame(7, $results['node_complete']);
+
+ $db = \Drupal::database();
+ $this->assertEquals($this->expectedNodeFieldRevisionTable(), $db->select('node_field_revision', 'nr')
+ ->fields('nr')
+ ->orderBy('vid')
+ ->orderBy('langcode')
+ ->execute()
+ ->fetchAll(\PDO::FETCH_ASSOC));
+ $this->assertEquals($this->expectedNodeFieldDataTable(), $db->select('node_field_data', 'nr')
+ ->fields('nr')
+ ->orderBy('nid')
+ ->orderBy('vid')
+ ->orderBy('langcode')
+ ->execute()
+ ->fetchAll(\PDO::FETCH_ASSOC));
+
+ // Load and test each revision.
+ $data = $this->expectedRevisionEntityData()[0];
+ foreach ($this->expectedNodeFieldRevisionTable() as $key => $revision) {
+ $this->assertRevision($revision, $data[$key]);
+ }
+ }
+
+ /**
+ * Tests rollback of the complete node migration.
+ */
+ public function testRollbackNodeComplete() {
+ $db = \Drupal::database();
+ $node_types = [
+ 'article',
+ 'blog',
+ 'book',
+ 'forum',
+ 'page',
+ 'test_content_type',
+ ];
+ foreach ($node_types as $node_type) {
+ // Execute the rollback.
+ $this->migration = $this->getMigration("d7_node_complete:$node_type");
+ (new MigrateExecutable($this->migration, $this))->rollback();
+
+ // Assert there are no nodes of node_type.
+ $count = $db->select('node_field_data')
+ ->condition('type', $node_type)
+ ->countQuery()
+ ->execute()
+ ->fetchField();
+ $this->assertSame($count, '0', "There are $count nodes of type $node_type");
+ }
+ }
+
+ /**
+ * Asserts various aspects of a node revision.
+ *
+ * @param array $revision
+ * An array of revision data matching a node_field_revision table row.
+ * @param array $data
+ * An array of revision data.
+ */
+ protected function assertRevision(array $revision, array $data) {
+ /* @var \Drupal\node\NodeInterface $actual */
+ $actual = $this->nodeStorage->loadRevision($revision['vid'])
+ ->getTranslation($revision['langcode']);
+ $this->assertInstanceOf(NodeInterface::class, $actual);
+ $this->assertSame($revision['title'], $actual->getTitle(), sprintf("Title '%s' does not match actual '%s' for revision '%d' langcode '%s'", $revision['title'], $actual->getTitle(), $revision['vid'], $revision['langcode']));
+ $this->assertSame($revision['revision_translation_affected'], $actual->get('revision_translation_affected')->value, sprintf("revision_translation_affected '%s' does not match actual '%s' for revision '%d' langcode '%s'", $revision['revision_translation_affected'], $actual->get('revision_translation_affected')->value, $revision['vid'], $revision['langcode']));
+
+ $this->assertSame($data['revision_created'], $actual->getRevisionCreationTime(), sprintf("Creation time '%s' does not match actual '%s' for revision '%d' langcode '%s'", $data['revision_created'], $actual->getRevisionCreationTime(), $revision['vid'], $revision['langcode']));
+ $this->assertSame($data['log'], $actual->getRevisionLogMessage(), sprintf("Revision log '%s' does not match actual '%s' for revision '%d' langcode '%s'", var_export($data['log'], TRUE), $actual->getRevisionLogMessage(), $revision['vid'], $revision['langcode']));
+ if (isset($data['field_text_long_plain'])) {
+ $this->assertSame($data['field_text_long_plain'], $actual->field_text_long_plain->value, sprintf("field_text_long_plain value '%s' does not match actual '%s' for revision '%d' langcode '%s'", var_export($data['field_text_long_plain'], TRUE), $actual->field_text_long_plain->value, $revision['vid'], $revision['langcode']));
+ }
+ if (isset($data['field_tree'])) {
+ $this->assertSame($data['field_tree'], $actual->field_tree->value, sprintf("field_tree value '%s' does not match actual '%s' for revision '%d' langcode '%s'", var_export($data['field_tree'], TRUE), $actual->field_tree->value, $revision['vid'], $revision['langcode']));
+ }
+
+ }
+
+ /**
+ * Provides the expected node_field_data table.
+ *
+ * @return array
+ * The expected table rows.
+ */
+ protected function expectedNodeFieldDataTable() {
+ return [
+ 0 =>
+ [
+ 'nid' => '1',
+ 'vid' => '1',
+ 'type' => 'test_content_type',
+ 'langcode' => 'en',
+ 'status' => '1',
+ 'uid' => '2',
+ 'title' => 'An English Node',
+ 'created' => '1529615790',
+ 'changed' => '1529615790',
+ 'promote' => '1',
+ 'sticky' => '0',
+ 'default_langcode' => '1',
+ 'revision_translation_affected' => '1',
+ 'content_translation_source' => NULL,
+ 'content_translation_outdated' => '0',
+ ],
+ 1 =>
+ [
+ 'nid' => '2',
+ 'vid' => '12',
+ 'type' => 'article',
+ 'langcode' => 'en',
+ 'status' => '1',
+ 'uid' => '2',
+ 'title' => 'The thing about Deep Space 9',
+ 'created' => '1441306772',
+ 'changed' => '1564543637',
+ 'promote' => '1',
+ 'sticky' => '0',
+ 'default_langcode' => '1',
+ 'revision_translation_affected' => NULL,
+ 'content_translation_source' => 'en',
+ 'content_translation_outdated' => '0',
+ ],
+ 2 =>
+ [
+ 'nid' => '2',
+ 'vid' => '12',
+ 'type' => 'article',
+ 'langcode' => 'is',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'is - The thing about Deep Space 9',
+ 'created' => '1471428152',
+ 'changed' => '1564543706',
+ 'promote' => '1',
+ 'sticky' => '0',
+ 'default_langcode' => '0',
+ 'revision_translation_affected' => '1',
+ 'content_translation_source' => 'en',
+ 'content_translation_outdated' => '0',
+ ],
+ 3 =>
+ [
+ 'nid' => '4',
+ 'vid' => '14',
+ 'type' => 'article',
+ 'langcode' => 'en',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'en - The thing about Firefly',
+ 'created' => '1478755314',
+ 'changed' => '1564543929',
+ 'promote' => '1',
+ 'sticky' => '0',
+ 'default_langcode' => '0',
+ 'revision_translation_affected' => '1',
+ 'content_translation_source' => 'is',
+ 'content_translation_outdated' => '0',
+ ],
+ 4 =>
+ [
+ 'nid' => '4',
+ 'vid' => '14',
+ 'type' => 'article',
+ 'langcode' => 'is',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'is - The thing about Firefly',
+ 'created' => '1478755274',
+ 'changed' => '1564543810',
+ 'promote' => '1',
+ 'sticky' => '0',
+ 'default_langcode' => '1',
+ 'revision_translation_affected' => NULL,
+ 'content_translation_source' => 'is',
+ 'content_translation_outdated' => '0',
+ ],
+ 5 =>
+ [
+ 'nid' => '6',
+ 'vid' => '6',
+ 'type' => 'forum',
+ 'langcode' => 'en',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'Comments are closed :-(',
+ 'created' => '1504715414',
+ 'changed' => '1504715414',
+ 'promote' => '0',
+ 'sticky' => '0',
+ 'default_langcode' => '1',
+ 'revision_translation_affected' => '1',
+ 'content_translation_source' => NULL,
+ 'content_translation_outdated' => '0',
+ ],
+ 6 =>
+ [
+ 'nid' => '7',
+ 'vid' => '7',
+ 'type' => 'forum',
+ 'langcode' => 'en',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'Comments are open :-)',
+ 'created' => '1504715432',
+ 'changed' => '1504715432',
+ 'promote' => '0',
+ 'sticky' => '0',
+ 'default_langcode' => '1',
+ 'revision_translation_affected' => '1',
+ 'content_translation_source' => NULL,
+ 'content_translation_outdated' => '0',
+ ],
+ 7 =>
+ [
+ 'nid' => '8',
+ 'vid' => '10',
+ 'type' => 'blog',
+ 'langcode' => 'en',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'The number 47',
+ 'created' => '1551000341',
+ 'changed' => '1552126247',
+ 'promote' => '1',
+ 'sticky' => '0',
+ 'default_langcode' => '1',
+ 'revision_translation_affected' => NULL,
+ 'content_translation_source' => 'en',
+ 'content_translation_outdated' => '0',
+ ],
+ 8 =>
+ [
+ 'nid' => '8',
+ 'vid' => '10',
+ 'type' => 'blog',
+ 'langcode' => 'fr',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'fr - The number 47',
+ 'created' => '1552126296',
+ 'changed' => '1552126296',
+ 'promote' => '1',
+ 'sticky' => '0',
+ 'default_langcode' => '0',
+ 'revision_translation_affected' => NULL,
+ 'content_translation_source' => 'en',
+ 'content_translation_outdated' => '0',
+ ],
+ 9 =>
+ [
+ 'nid' => '8',
+ 'vid' => '10',
+ 'type' => 'blog',
+ 'langcode' => 'is',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'is - The number 47',
+ 'created' => '1552126363',
+ 'changed' => '1552126363',
+ 'promote' => '1',
+ 'sticky' => '0',
+ 'default_langcode' => '0',
+ 'revision_translation_affected' => '1',
+ 'content_translation_source' => 'en',
+ 'content_translation_outdated' => '0',
+ ],
+ 10 =>
+ [
+ 'nid' => '11',
+ 'vid' => '18',
+ 'type' => 'et',
+ 'langcode' => 'en',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'Page one',
+ 'created' => '1568261523',
+ 'changed' => '1568261687',
+ 'promote' => '0',
+ 'sticky' => '0',
+ 'default_langcode' => '1',
+ 'revision_translation_affected' => NULL,
+ 'content_translation_source' => '',
+ 'content_translation_outdated' => '0',
+ ],
+ 11 =>
+ [
+ 'nid' => '11',
+ 'vid' => '18',
+ 'type' => 'et',
+ 'langcode' => 'fr',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'Page one',
+ 'created' => '1568261721',
+ 'changed' => '1568261721',
+ 'promote' => '0',
+ 'sticky' => '0',
+ 'default_langcode' => '0',
+ 'revision_translation_affected' => '1',
+ 'content_translation_source' => 'en',
+ 'content_translation_outdated' => '0',
+ ],
+ 12 =>
+ [
+ 'nid' => '11',
+ 'vid' => '18',
+ 'type' => 'et',
+ 'langcode' => 'is',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'Page one',
+ 'created' => '1568261548',
+ 'changed' => '1568261548',
+ 'promote' => '0',
+ 'sticky' => '0',
+ 'default_langcode' => '0',
+ 'revision_translation_affected' => NULL,
+ 'content_translation_source' => 'en',
+ 'content_translation_outdated' => '0',
+ ],
+ ];
+ }
+
+ /**
+ * Provides the expected node_field_revision table.
+ *
+ * @return array
+ * The table.
+ */
+ protected function expectedNodeFieldRevisionTable() {
+ return [
+ 0 =>
+ [
+ 'nid' => '1',
+ 'vid' => '1',
+ 'langcode' => 'en',
+ 'status' => '1',
+ 'uid' => '2',
+ 'title' => 'An English Node',
+ 'created' => '1529615790',
+ 'changed' => '1529615790',
+ 'promote' => '1',
+ 'sticky' => '0',
+ 'default_langcode' => '1',
+ 'revision_translation_affected' => '1',
+ 'content_translation_source' => NULL,
+ 'content_translation_outdated' => '0',
+ ],
+ 1 =>
+ [
+ 'nid' => '2',
+ 'vid' => '2',
+ 'langcode' => 'en',
+ 'status' => '1',
+ 'uid' => '2',
+ 'title' => 'The thing about Deep Space 9 (1st rev)',
+ 'created' => '1441306772',
+ 'changed' => '1564543588',
+ 'promote' => '1',
+ 'sticky' => '0',
+ 'default_langcode' => '1',
+ 'revision_translation_affected' => '1',
+ 'content_translation_source' => 'en',
+ 'content_translation_outdated' => '0',
+ ],
+ 2 =>
+ [
+ 'nid' => '2',
+ 'vid' => '3',
+ 'langcode' => 'en',
+ 'status' => '1',
+ 'uid' => '2',
+ 'title' => 'The thing about Deep Space 9 (1st rev)',
+ 'created' => '1441306772',
+ 'changed' => '1564543588',
+ 'promote' => '1',
+ 'sticky' => '0',
+ 'default_langcode' => '1',
+ 'revision_translation_affected' => NULL,
+ 'content_translation_source' => 'en',
+ 'content_translation_outdated' => '0',
+ ],
+ 3 =>
+ [
+ 'nid' => '2',
+ 'vid' => '3',
+ 'langcode' => 'is',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'is - The thing about Deep Space 9 (1st rev)',
+ 'created' => '1471428152',
+ 'changed' => '1564543677',
+ 'promote' => '1',
+ 'sticky' => '0',
+ 'default_langcode' => '0',
+ 'revision_translation_affected' => '1',
+ 'content_translation_source' => 'en',
+ 'content_translation_outdated' => '0',
+ ],
+ 4 =>
+ [
+ 'nid' => '4',
+ 'vid' => '4',
+ 'langcode' => 'is',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'is - The thing about Firefly (1st rev)',
+ 'created' => '1478755274',
+ 'changed' => '1478755274',
+ 'promote' => '1',
+ 'sticky' => '0',
+ 'default_langcode' => '1',
+ 'revision_translation_affected' => '1',
+ 'content_translation_source' => 'is',
+ 'content_translation_outdated' => '0',
+ ],
+ 5 =>
+ [
+ 'nid' => '4',
+ 'vid' => '5',
+ 'langcode' => 'en',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'en - The thing about Firefly (1st rev)',
+ 'created' => '1478755314',
+ 'changed' => '1564543887',
+ 'promote' => '1',
+ 'sticky' => '0',
+ 'default_langcode' => '0',
+ 'revision_translation_affected' => '1',
+ 'content_translation_source' => 'is',
+ 'content_translation_outdated' => '0',
+ ],
+ 6 =>
+ [
+ 'nid' => '4',
+ 'vid' => '5',
+ 'langcode' => 'is',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'is - The thing about Firefly (1st rev)',
+ 'created' => '1478755274',
+ 'changed' => '1478755274',
+ 'promote' => '1',
+ 'sticky' => '0',
+ 'default_langcode' => '1',
+ 'revision_translation_affected' => NULL,
+ 'content_translation_source' => 'is',
+ 'content_translation_outdated' => '0',
+ ],
+ 7 =>
+ [
+ 'nid' => '6',
+ 'vid' => '6',
+ 'langcode' => 'en',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'Comments are closed :-(',
+ 'created' => '1504715414',
+ 'changed' => '1504715414',
+ 'promote' => '0',
+ 'sticky' => '0',
+ 'default_langcode' => '1',
+ 'revision_translation_affected' => '1',
+ 'content_translation_source' => NULL,
+ 'content_translation_outdated' => '0',
+ ],
+ 8 =>
+ [
+ 'nid' => '7',
+ 'vid' => '7',
+ 'langcode' => 'en',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'Comments are open :-)',
+ 'created' => '1504715432',
+ 'changed' => '1504715432',
+ 'promote' => '0',
+ 'sticky' => '0',
+ 'default_langcode' => '1',
+ 'revision_translation_affected' => '1',
+ 'content_translation_source' => NULL,
+ 'content_translation_outdated' => '0',
+ ],
+ 9 =>
+ [
+ 'nid' => '8',
+ 'vid' => '8',
+ 'langcode' => 'en',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'The number 47',
+ 'created' => '1551000341',
+ 'changed' => '1552126247',
+ 'promote' => '1',
+ 'sticky' => '0',
+ 'default_langcode' => '1',
+ 'revision_translation_affected' => '1',
+ 'content_translation_source' => 'en',
+ 'content_translation_outdated' => '0',
+ ],
+ 10 =>
+ [
+ 'nid' => '8',
+ 'vid' => '9',
+ 'langcode' => 'en',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'The number 47',
+ 'created' => '1551000341',
+ 'changed' => '1552126247',
+ 'promote' => '1',
+ 'sticky' => '0',
+ 'default_langcode' => '1',
+ 'revision_translation_affected' => NULL,
+ 'content_translation_source' => 'en',
+ 'content_translation_outdated' => '0',
+ ],
+ 11 =>
+ [
+ 'nid' => '8',
+ 'vid' => '9',
+ 'langcode' => 'fr',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'fr - The number 47',
+ 'created' => '1552126296',
+ 'changed' => '1552126296',
+ 'promote' => '1',
+ 'sticky' => '0',
+ 'default_langcode' => '0',
+ 'revision_translation_affected' => '1',
+ 'content_translation_source' => 'en',
+ 'content_translation_outdated' => '0',
+ ],
+ 12 =>
+ [
+ 'nid' => '8',
+ 'vid' => '10',
+ 'langcode' => 'en',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'The number 47',
+ 'created' => '1551000341',
+ 'changed' => '1552126247',
+ 'promote' => '1',
+ 'sticky' => '0',
+ 'default_langcode' => '1',
+ 'revision_translation_affected' => NULL,
+ 'content_translation_source' => 'en',
+ 'content_translation_outdated' => '0',
+ ],
+ 13 =>
+ [
+ 'nid' => '8',
+ 'vid' => '10',
+ 'langcode' => 'fr',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'fr - The number 47',
+ 'created' => '1552126296',
+ 'changed' => '1552126296',
+ 'promote' => '1',
+ 'sticky' => '0',
+ 'default_langcode' => '0',
+ 'revision_translation_affected' => NULL,
+ 'content_translation_source' => 'en',
+ 'content_translation_outdated' => '0',
+ ],
+ 14 =>
+ [
+ 'nid' => '8',
+ 'vid' => '10',
+ 'langcode' => 'is',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'is - The number 47',
+ 'created' => '1552126363',
+ 'changed' => '1552126363',
+ 'promote' => '1',
+ 'sticky' => '0',
+ 'default_langcode' => '0',
+ 'revision_translation_affected' => '1',
+ 'content_translation_source' => 'en',
+ 'content_translation_outdated' => '0',
+ ],
+ 15 =>
+ [
+ 'nid' => '2',
+ 'vid' => '11',
+ 'langcode' => 'en',
+ 'status' => '1',
+ 'uid' => '2',
+ 'title' => 'The thing about Deep Space 9',
+ 'created' => '1441306772',
+ 'changed' => '1564543637',
+ 'promote' => '1',
+ 'sticky' => '0',
+ 'default_langcode' => '1',
+ 'revision_translation_affected' => '1',
+ 'content_translation_source' => 'en',
+ 'content_translation_outdated' => '0',
+ ],
+ 16 =>
+ [
+ 'nid' => '2',
+ 'vid' => '11',
+ 'langcode' => 'is',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'is - The thing about Deep Space 9 (1st rev)',
+ 'created' => '1471428152',
+ 'changed' => '1564543637',
+ 'promote' => '1',
+ 'sticky' => '0',
+ 'default_langcode' => '0',
+ 'revision_translation_affected' => '1',
+ 'content_translation_source' => 'en',
+ 'content_translation_outdated' => '0',
+ ],
+ 17 =>
+ [
+ 'nid' => '2',
+ 'vid' => '12',
+ 'langcode' => 'en',
+ 'status' => '1',
+ 'uid' => '2',
+ 'title' => 'The thing about Deep Space 9',
+ 'created' => '1441306772',
+ 'changed' => '1564543637',
+ 'promote' => '1',
+ 'sticky' => '0',
+ 'default_langcode' => '1',
+ 'revision_translation_affected' => NULL,
+ 'content_translation_source' => 'en',
+ 'content_translation_outdated' => '0',
+ ],
+ 18 =>
+ [
+ 'nid' => '2',
+ 'vid' => '12',
+ 'langcode' => 'is',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'is - The thing about Deep Space 9',
+ 'created' => '1471428152',
+ 'changed' => '1564543706',
+ 'promote' => '1',
+ 'sticky' => '0',
+ 'default_langcode' => '0',
+ 'revision_translation_affected' => '1',
+ 'content_translation_source' => 'en',
+ 'content_translation_outdated' => '0',
+ ],
+ 19 =>
+ [
+ 'nid' => '4',
+ 'vid' => '13',
+ 'langcode' => 'en',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'en - The thing about Firefly (1st rev)',
+ 'created' => '1478755314',
+ 'changed' => '1564543887',
+ 'promote' => '1',
+ 'sticky' => '0',
+ 'default_langcode' => '0',
+ 'revision_translation_affected' => NULL,
+ 'content_translation_source' => 'is',
+ 'content_translation_outdated' => '0',
+ ],
+ 20 =>
+ [
+ 'nid' => '4',
+ 'vid' => '13',
+ 'langcode' => 'is',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'is - The thing about Firefly',
+ 'created' => '1478755274',
+ 'changed' => '1564543810',
+ 'promote' => '1',
+ 'sticky' => '0',
+ 'default_langcode' => '1',
+ 'revision_translation_affected' => '1',
+ 'content_translation_source' => 'is',
+ 'content_translation_outdated' => '0',
+ ],
+ 21 =>
+ [
+ 'nid' => '4',
+ 'vid' => '14',
+ 'langcode' => 'en',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'en - The thing about Firefly',
+ 'created' => '1478755314',
+ 'changed' => '1564543929',
+ 'promote' => '1',
+ 'sticky' => '0',
+ 'default_langcode' => '0',
+ 'revision_translation_affected' => '1',
+ 'content_translation_source' => 'is',
+ 'content_translation_outdated' => '0',
+ ],
+ 22 =>
+ [
+ 'nid' => '4',
+ 'vid' => '14',
+ 'langcode' => 'is',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'is - The thing about Firefly',
+ 'created' => '1478755274',
+ 'changed' => '1564543810',
+ 'promote' => '1',
+ 'sticky' => '0',
+ 'default_langcode' => '1',
+ 'revision_translation_affected' => NULL,
+ 'content_translation_source' => 'is',
+ 'content_translation_outdated' => '0',
+ ],
+ 23 =>
+ [
+ 'nid' => '11',
+ 'vid' => '15',
+ 'langcode' => 'en',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'Page one',
+ 'created' => '1568261523',
+ 'changed' => '1568261523',
+ 'promote' => '0',
+ 'sticky' => '0',
+ 'default_langcode' => '1',
+ 'revision_translation_affected' => '1',
+ 'content_translation_source' => NULL,
+ 'content_translation_outdated' => '0',
+ ],
+ 24 =>
+ [
+ 'nid' => '11',
+ 'vid' => '16',
+ 'langcode' => 'en',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'Page one',
+ 'created' => '1568261523',
+ 'changed' => '1568261523',
+ 'promote' => '0',
+ 'sticky' => '0',
+ 'default_langcode' => '1',
+ 'revision_translation_affected' => NULL,
+ 'content_translation_source' => '',
+ 'content_translation_outdated' => '0',
+ ],
+ 25 =>
+ [
+ 'nid' => '11',
+ 'vid' => '16',
+ 'langcode' => 'is',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'Page one',
+ 'created' => '1568261548',
+ 'changed' => '1568261548',
+ 'promote' => '0',
+ 'sticky' => '0',
+ 'default_langcode' => '0',
+ 'revision_translation_affected' => '1',
+ 'content_translation_source' => 'en',
+ 'content_translation_outdated' => '0',
+ ],
+ 26 =>
+ [
+ 'nid' => '11',
+ 'vid' => '17',
+ 'langcode' => 'en',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'Page one',
+ 'created' => '1568261523',
+ 'changed' => '1568261687',
+ 'promote' => '0',
+ 'sticky' => '0',
+ 'default_langcode' => '1',
+ 'revision_translation_affected' => NULL,
+ 'content_translation_source' => '',
+ 'content_translation_outdated' => '0',
+ ],
+ 27 =>
+ [
+ 'nid' => '11',
+ 'vid' => '17',
+ 'langcode' => 'is',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'Page one',
+ 'created' => '1568261548',
+ 'changed' => '1568261548',
+ 'promote' => '0',
+ 'sticky' => '0',
+ 'default_langcode' => '0',
+ 'revision_translation_affected' => NULL,
+ 'content_translation_source' => 'en',
+ 'content_translation_outdated' => '0',
+ ],
+ 28 =>
+ [
+ 'nid' => '11',
+ 'vid' => '18',
+ 'langcode' => 'en',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'Page one',
+ 'created' => '1568261523',
+ 'changed' => '1568261687',
+ 'promote' => '0',
+ 'sticky' => '0',
+ 'default_langcode' => '1',
+ 'revision_translation_affected' => NULL,
+ 'content_translation_source' => '',
+ 'content_translation_outdated' => '0',
+ ],
+ 29 =>
+ [
+ 'nid' => '11',
+ 'vid' => '18',
+ 'langcode' => 'fr',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'Page one',
+ 'created' => '1568261721',
+ 'changed' => '1568261721',
+ 'promote' => '0',
+ 'sticky' => '0',
+ 'default_langcode' => '0',
+ 'revision_translation_affected' => '1',
+ 'content_translation_source' => 'en',
+ 'content_translation_outdated' => '0',
+ ],
+ 30 =>
+ [
+ 'nid' => '11',
+ 'vid' => '18',
+ 'langcode' => 'is',
+ 'status' => '1',
+ 'uid' => '1',
+ 'title' => 'Page one',
+ 'created' => '1568261548',
+ 'changed' => '1568261548',
+ 'promote' => '0',
+ 'sticky' => '0',
+ 'default_langcode' => '0',
+ 'revision_translation_affected' => NULL,
+ 'content_translation_source' => 'en',
+ 'content_translation_outdated' => '0',
+ ],
+ ];
+ }
+
+ /**
+ * Provides the expected node_field_revision table.
+ *
+ * @return array
+ * Selected properties and fields on the revision.
+ */
+ protected function expectedRevisionEntityData() {
+ return [
+ $revision_data = [
+ // Node 1, revision 1, en.
+ 0 =>
+ [
+ 'log' => NULL,
+ 'field_text_long_plain' => NULL,
+ 'revision_created' => '1529615790',
+ ],
+ // Node 2, revision 2, en.
+ 1 =>
+ [
+ 'log' => 'DS9 1st rev',
+ 'field_text_long_plain' => 'DS9 1st rev',
+ 'revision_created' => '1564543588',
+ ],
+ // Node 2, revision 3, en.
+ 2 =>
+ [
+ 'log' => 'is - DS9 1st rev',
+ 'field_text_long_plain' => 'DS9 1st rev',
+ 'revision_created' => '1564543677',
+ ],
+ // Node 2, revision 3, is.
+ 3 =>
+ [
+ 'log' => 'is - DS9 1st rev',
+ 'field_text_long_plain' => 'is - DS9 1st rev',
+ 'revision_created' => '1564543677',
+ ],
+ // Node 4, revision 4, is.
+ 4 =>
+ [
+ 'log' => 'is - Firefly 1st rev',
+ 'field_text_long_plain' => NULL,
+ 'revision_created' => '1478755274',
+ ],
+ // Node 4, revision 5, en.
+ 5 =>
+ [
+ 'log' => 'Firefly 1st rev',
+ 'field_text_long_plain' => NULL,
+ 'revision_created' => '1564543887',
+ ],
+ // Node 4, revision 5, is.
+ 6 =>
+ [
+ 'log' => 'Firefly 1st rev',
+ 'field_text_long_plain' => NULL,
+ 'revision_created' => '1564543887',
+ ],
+ // Node 6, revision 6, en.
+ 7 =>
+ [
+ 'log' => NULL,
+ 'field_text_long_plain' => NULL,
+ 'revision_created' => '1504715414',
+ ],
+ // Node 7, revision 7, en.
+ 8 =>
+ [
+ 'log' => NULL,
+ 'field_text_long_plain' => NULL,
+ 'revision_created' => '1504715432',
+ ],
+ // Node 8, revision 8, en.
+ 9 =>
+ [
+ 'log' => NULL,
+ 'field_text_long_plain' => NULL,
+ 'revision_created' => '1552126247',
+ ],
+ // Node 8, revision 9, en.
+ 10 =>
+ [
+ 'log' => NULL,
+ 'field_text_long_plain' => NULL,
+ 'revision_created' => '1552126296',
+ ],
+ // Node 8, revision 9, fr.
+ 11 =>
+ [
+ 'log' => NULL,
+ 'field_text_long_plain' => NULL,
+ 'revision_created' => '1552126296',
+ ],
+ // Node 8, revision 10, en.
+ 12 =>
+ [
+ 'log' => NULL,
+ 'field_text_long_plain' => NULL,
+ 'revision_created' => '1552126363',
+ ],
+ // Node 8, revision 10, fr.
+ 13 =>
+ [
+ 'log' => NULL,
+ 'field_text_long_plain' => NULL,
+ 'revision_created' => '1552126363',
+ ],
+ // Node 8, revision 10, is.
+ 14 =>
+ [
+ 'log' => NULL,
+ 'field_text_long_plain' => NULL,
+ 'revision_created' => '1552126363',
+ ],
+ // Node 2, revision 11, en.
+ 15 =>
+ [
+ 'log' => 'DS9 2nd rev',
+ 'field_text_long_plain' => NULL,
+ 'revision_created' => '1564543637',
+ ],
+ // Node 2, revision 11, is.
+ 16 =>
+ [
+ 'log' => 'DS9 2nd rev',
+ 'field_text_long_plain' => NULL,
+ 'revision_created' => '1564543637',
+ ],
+ // Node 2, revision 12, en.
+ 17 =>
+ [
+ 'log' => 'is - DS9 2nd rev',
+ 'field_text_long_plain' => NULL,
+ 'revision_created' => '1564543706',
+ ],
+ // Node 2, revision 12, is.
+ 18 =>
+ [
+ 'log' => 'is - DS9 2nd rev',
+ 'field_text_long_plain' => NULL,
+ 'revision_created' => '1564543706',
+ ],
+ // Node 4, revision 13, en.
+ 19 =>
+ [
+ 'log' => 'is - Firefly 2nd rev',
+ 'field_text_long_plain' => NULL,
+ 'revision_created' => '1564543810',
+ ],
+ // Node 4, revision 13, is.
+ 20 =>
+ [
+ 'log' => 'is - Firefly 2nd rev',
+ 'field_text_long_plain' => NULL,
+ 'revision_created' => '1564543810',
+ ],
+ // Node 4, revision 14, en.
+ 21 =>
+ [
+ 'log' => 'Firefly 2nd rev',
+ 'field_text_long_plain' => NULL,
+ 'revision_created' => '1564543929',
+ ],
+ // Node 4, revision 14, is.
+ 22 =>
+ [
+ 'log' => 'Firefly 2nd rev',
+ 'field_text_long_plain' => NULL,
+ 'revision_created' => '1564543929',
+ ],
+ // Node 11, revision 15, en.
+ 23 =>
+ [
+ 'log' => NULL,
+ 'body' => '1st',
+ 'field_tree' => 'lancewood',
+ 'revision_created' => '1568261523',
+ ],
+ // Node 11, revision 16, en.
+ 24 =>
+ [
+ 'log' => NULL,
+ 'body' => '1st',
+ 'field_tree' => 'lancewood',
+ 'revision_created' => '1568261548',
+ ],
+ // Node 11, revision 16, is.
+ 25 =>
+ [
+ 'log' => NULL,
+ 'body' => '1st',
+ 'field_tree' => 'is - lancewood',
+ 'revision_created' => '1568261548',
+ ],
+ // Node 11, revision 17, en.
+ 26 =>
+ [
+ 'log' => '2nd',
+ 'body' => '2nd',
+ 'field_tree' => 'lancewood',
+ 'revision_created' => '1568261548',
+ ],
+ // Node 11, revision 17, is.
+ 27 =>
+ [
+ 'log' => '2nd',
+ 'body' => '2nd',
+ 'field_tree' => 'is - lancewood',
+ 'revision_created' => '1568261548',
+ ],
+ // Node 11, revision 18, en.
+ 28 =>
+ [
+ 'log' => NULL,
+ 'body' => '2nd',
+ 'field_tree' => 'lancewood',
+ 'revision_created' => '1568261548',
+ ],
+ // Node 11, revision 18, f5.
+ 29 =>
+ [
+ 'log' => NULL,
+ 'body' => '2nd',
+ 'field_tree' => 'fr - lancewood',
+ 'revision_created' => '1568261548',
+ ],
+ // Node 11, revision 18, is.
+ 30 =>
+ [
+ 'log' => NULL,
+ 'body' => '2nd',
+ 'field_tree' => 'is - lancewood',
+ 'revision_created' => '1568261548',
+ ],
+ ],
+ ];
+ }
+
+}
diff --git a/web/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeRevisionTest.php b/web/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeRevisionTest.php
index 563bcf9be2..07a3f93078 100644
--- a/web/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeRevisionTest.php
+++ b/web/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeRevisionTest.php
@@ -34,8 +34,6 @@ class MigrateNodeRevisionTest extends MigrateDrupal7TestBase {
'image',
'language',
'link',
- // Required for translation migrations.
- 'migrate_drupal_multilingual',
'menu_ui',
'node',
'taxonomy',
@@ -112,8 +110,8 @@ protected function assertRevision($id, $langcode, $title, $log, $timestamp) {
*/
public function testNodeRevisions() {
$this->assertRevision(1, 'en', 'An English Node', NULL, '1441032132');
- $this->assertRevision(2, 'en', 'The thing about Deep Space 9', NULL, '1471428152');
- $this->assertRevision(4, 'is', 'is - The thing about Firefly', NULL, '1478755314');
+ $this->assertRevision(2, 'en', 'The thing about Deep Space 9 (1st rev)', 'DS9 1st rev', '1564543588');
+ $this->assertRevision(4, 'is', 'is - The thing about Firefly (1st rev)', 'is - Firefly 1st rev', '1478755274');
$this->assertRevision(6, 'en', 'Comments are closed :-(', NULL, '1504715414');
$this->assertRevision(7, 'en', 'Comments are open :-)', NULL, '1504715432');
$this->assertRevision(8, 'en', 'The number 47', NULL, '1552126363');
diff --git a/web/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTest.php b/web/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTest.php
index 25aa75654f..acad4e3c3e 100644
--- a/web/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTest.php
+++ b/web/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTest.php
@@ -29,8 +29,6 @@ class MigrateNodeTest extends MigrateDrupal7TestBase {
'language',
'link',
'menu_ui',
- // Required for translation migrations.
- 'migrate_drupal_multilingual',
'node',
'taxonomy',
'telephone',
@@ -149,6 +147,12 @@ protected function assertRevision($id, $title, $uid, $log, $timestamp) {
* Test node migration from Drupal 7 to 8.
*/
public function testNode() {
+ // Confirm there are only classic node migration map tables. This shows
+ // that only the classic migration ran.
+ $results = $this->nodeMigrateMapTableCount('7');
+ $this->assertSame(8, $results['node']);
+ $this->assertSame(0, $results['node_complete']);
+
$this->assertEntity(1, 'test_content_type', 'en', 'An English Node', '2', TRUE, '1421727515', '1441032132', TRUE, FALSE);
$this->assertRevision(1, 'An English Node', '1', NULL, '1441032132');
diff --git a/web/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTitleLabelTest.php b/web/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTitleLabelTest.php
index 5bb2f1a31f..f5c25e42b7 100644
--- a/web/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTitleLabelTest.php
+++ b/web/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTitleLabelTest.php
@@ -33,7 +33,7 @@ protected function setUp() {
*/
protected function assertEntity($id, $label) {
$override = BaseFieldOverride::load($id);
- $this->assertTrue($override instanceof BaseFieldOverride);
+ $this->assertInstanceOf(BaseFieldOverride::class, $override);
/** @var \Drupal\Core\Field\Entity\BaseFieldOverride $override */
$this->assertIdentical($label, $override->getLabel());
}
@@ -54,7 +54,7 @@ public function testMigration() {
];
foreach ($no_override_node_type as $type) {
$override = BaseFieldOverride::load("node.$type.title");
- $this->assertFalse($override instanceof BaseFieldOverride);
+ $this->assertNotInstanceOf(BaseFieldOverride::class, $override);
}
}
diff --git a/web/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTypeTest.php b/web/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTypeTest.php
index 82512568b1..c3753f01cf 100644
--- a/web/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTypeTest.php
+++ b/web/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTypeTest.php
@@ -47,7 +47,7 @@ protected function setUp() {
protected function assertEntity($id, $label, $description, $help, $display_submitted, $new_revision, $expected_available_menus, $expected_parent, $body_label = NULL) {
/** @var \Drupal\node\NodeTypeInterface $entity */
$entity = NodeType::load($id);
- $this->assertTrue($entity instanceof NodeTypeInterface);
+ $this->assertInstanceOf(NodeTypeInterface::class, $entity);
$this->assertIdentical($label, $entity->label());
$this->assertIdentical($description, $entity->getDescription());
@@ -59,7 +59,7 @@ protected function assertEntity($id, $label, $description, $help, $display_submi
if ($body_label) {
/** @var \Drupal\field\FieldConfigInterface $body */
$body = FieldConfig::load('node.' . $id . '.body');
- $this->assertTrue($body instanceof FieldConfigInterface);
+ $this->assertInstanceOf(FieldConfigInterface::class, $body);
$this->assertIdentical($body_label, $body->label());
}
diff --git a/web/core/modules/node/tests/src/Kernel/Migrate/d7/NodeTranslationRedirectTest.php b/web/core/modules/node/tests/src/Kernel/Migrate/d7/NodeTranslationRedirectTest.php
index 7b54d5b169..68f5903aa9 100644
--- a/web/core/modules/node/tests/src/Kernel/Migrate/d7/NodeTranslationRedirectTest.php
+++ b/web/core/modules/node/tests/src/Kernel/Migrate/d7/NodeTranslationRedirectTest.php
@@ -23,8 +23,6 @@ class NodeTranslationRedirectTest extends MigrateDrupal7TestBase {
'content_translation',
'language',
'menu_ui',
- // Required for translation migrations.
- 'migrate_drupal_multilingual',
'node',
'text',
'user',
diff --git a/web/core/modules/node/tests/src/Kernel/NodeAccessLanguageAwareCombinationTest.php b/web/core/modules/node/tests/src/Kernel/NodeAccessLanguageAwareCombinationTest.php
index 6886f22db6..aa47559825 100644
--- a/web/core/modules/node/tests/src/Kernel/NodeAccessLanguageAwareCombinationTest.php
+++ b/web/core/modules/node/tests/src/Kernel/NodeAccessLanguageAwareCombinationTest.php
@@ -23,7 +23,11 @@ class NodeAccessLanguageAwareCombinationTest extends NodeAccessTestBase {
*
* @var array
*/
- public static $modules = ['language', 'node_access_test_language', 'node_access_test'];
+ public static $modules = [
+ 'language',
+ 'node_access_test_language',
+ 'node_access_test',
+ ];
/**
* A set of nodes to use in testing.
@@ -262,11 +266,11 @@ public function testNodeAccessLanguageAwareCombination() {
// Four nodes should be returned with public Hungarian translations or the
// no language public node.
- $this->assertEqual(count($nids), 4, 'Query returns 4 nodes when no langcode is specified.');
- $this->assertTrue(array_key_exists($this->nodes['public_both_public']->id(), $nids), 'Returned node ID is full public node.');
- $this->assertTrue(array_key_exists($this->nodes['public_ca_private']->id(), $nids), 'Returned node ID is Hungarian public only node.');
- $this->assertTrue(array_key_exists($this->nodes['private_both_public']->id(), $nids), 'Returned node ID is both public non-language-aware private only node.');
- $this->assertTrue(array_key_exists($this->nodes['public_no_language_public']->id(), $nids), 'Returned node ID is no language public node.');
+ $this->assertCount(4, $nids, 'Query returns 4 nodes when no langcode is specified.');
+ $this->assertArrayHasKey($this->nodes['public_both_public']->id(), $nids);
+ $this->assertArrayHasKey($this->nodes['public_ca_private']->id(), $nids);
+ $this->assertArrayHasKey($this->nodes['private_both_public']->id(), $nids);
+ $this->assertArrayHasKey($this->nodes['public_no_language_public']->id(), $nids);
// Query with Hungarian (hu) specified.
$select = $connection->select('node', 'n')
@@ -277,10 +281,10 @@ public function testNodeAccessLanguageAwareCombination() {
$nids = $select->execute()->fetchAllAssoc('nid');
// Three nodes should be returned (with public Hungarian translations).
- $this->assertEqual(count($nids), 3, 'Query returns 3 nodes.');
- $this->assertTrue(array_key_exists($this->nodes['public_both_public']->id(), $nids), 'Returned node ID is both public node.');
- $this->assertTrue(array_key_exists($this->nodes['public_ca_private']->id(), $nids), 'Returned node ID is Hungarian public only node.');
- $this->assertTrue(array_key_exists($this->nodes['private_both_public']->id(), $nids), 'Returned node ID is both public non-language-aware private only node.');
+ $this->assertCount(3, $nids, 'Query returns 3 nodes.');
+ $this->assertArrayHasKey($this->nodes['public_both_public']->id(), $nids);
+ $this->assertArrayHasKey($this->nodes['public_ca_private']->id(), $nids);
+ $this->assertArrayHasKey($this->nodes['private_both_public']->id(), $nids);
// Query with Catalan (ca) specified.
$select = $connection->select('node', 'n')
@@ -291,10 +295,10 @@ public function testNodeAccessLanguageAwareCombination() {
$nids = $select->execute()->fetchAllAssoc('nid');
// Three nodes should be returned (with public Catalan translations).
- $this->assertEqual(count($nids), 3, 'Query returns 3 nodes.');
- $this->assertTrue(array_key_exists($this->nodes['public_both_public']->id(), $nids), 'Returned node ID is both public node.');
- $this->assertTrue(array_key_exists($this->nodes['public_hu_private']->id(), $nids), 'Returned node ID is Catalan public only node.');
- $this->assertTrue(array_key_exists($this->nodes['private_both_public']->id(), $nids), 'Returned node ID is both public non-language-aware private only node.');
+ $this->assertCount(3, $nids, 'Query returns 3 nodes.');
+ $this->assertArrayHasKey($this->nodes['public_both_public']->id(), $nids);
+ $this->assertArrayHasKey($this->nodes['public_hu_private']->id(), $nids);
+ $this->assertArrayHasKey($this->nodes['private_both_public']->id(), $nids);
// Query with German (de) specified.
$select = $connection->select('node', 'n')
@@ -316,7 +320,7 @@ public function testNodeAccessLanguageAwareCombination() {
$nids = $select->execute()->fetchAllAssoc('nid');
// All nodes are returned.
- $this->assertEqual(count($nids), 10, 'Query returns all nodes.');
+ $this->assertCount(10, $nids, 'Query returns all nodes.');
// Query the nodes table as admin user (full access) with the node access
// tag and langcode de.
@@ -329,7 +333,7 @@ public function testNodeAccessLanguageAwareCombination() {
// Even though there is no German translation, all nodes are returned
// because node access filtering does not occur when the user is user 1.
- $this->assertEqual(count($nids), 10, 'Query returns all nodes.');
+ $this->assertCount(10, $nids, 'Query returns all nodes.');
}
}
diff --git a/web/core/modules/node/tests/src/Kernel/NodeAccessLanguageAwareTest.php b/web/core/modules/node/tests/src/Kernel/NodeAccessLanguageAwareTest.php
index 2576060efe..b4b5c317e8 100644
--- a/web/core/modules/node/tests/src/Kernel/NodeAccessLanguageAwareTest.php
+++ b/web/core/modules/node/tests/src/Kernel/NodeAccessLanguageAwareTest.php
@@ -205,10 +205,10 @@ public function testNodeAccessLanguageAware() {
// - Node with both translations public.
// - Node with only the Catalan translation marked as private.
// - No language node marked as public.
- $this->assertEqual(count($nids), 3, 'db_select() returns 3 nodes when no langcode is specified.');
- $this->assertTrue(array_key_exists($this->nodes['both_public']->id(), $nids), 'The node with both translations public is returned.');
- $this->assertTrue(array_key_exists($this->nodes['ca_private']->id(), $nids), 'The node with only the Catalan translation private is returned.');
- $this->assertTrue(array_key_exists($this->nodes['no_language_public']->id(), $nids), 'The node with no language is returned.');
+ $this->assertCount(3, $nids, 'db_select() returns 3 nodes when no langcode is specified.');
+ $this->assertArrayHasKey($this->nodes['both_public']->id(), $nids);
+ $this->assertArrayHasKey($this->nodes['ca_private']->id(), $nids);
+ $this->assertArrayHasKey($this->nodes['no_language_public']->id(), $nids);
// Query with Hungarian (hu) specified.
$select = $connection->select('node', 'n')
@@ -220,9 +220,9 @@ public function testNodeAccessLanguageAware() {
// Two nodes should be returned: the node with both translations public, and
// the node with only the Catalan translation marked as private.
- $this->assertEqual(count($nids), 2, 'Query returns 2 nodes when the hu langcode is specified.');
- $this->assertTrue(array_key_exists($this->nodes['both_public']->id(), $nids), 'The node with both translations public is returned.');
- $this->assertTrue(array_key_exists($this->nodes['ca_private']->id(), $nids), 'The node with only the Catalan translation private is returned.');
+ $this->assertCount(2, $nids, 'Query returns 2 nodes when the hu langcode is specified.');
+ $this->assertArrayHasKey($this->nodes['both_public']->id(), $nids);
+ $this->assertArrayHasKey($this->nodes['ca_private']->id(), $nids);
// Query with Catalan (ca) specified.
$select = $connection->select('node', 'n')
@@ -234,9 +234,9 @@ public function testNodeAccessLanguageAware() {
// Two nodes should be returned: the node with both translations public, and
// the node with only the Hungarian translation marked as private.
- $this->assertEqual(count($nids), 2, 'Query returns 2 nodes when the hu langcode is specified.');
- $this->assertTrue(array_key_exists($this->nodes['both_public']->id(), $nids), 'The node with both translations public is returned.');
- $this->assertTrue(array_key_exists($this->nodes['hu_private']->id(), $nids), 'The node with only the Hungarian translation private is returned.');
+ $this->assertCount(2, $nids, 'Query returns 2 nodes when the hu langcode is specified.');
+ $this->assertArrayHasKey($this->nodes['both_public']->id(), $nids);
+ $this->assertArrayHasKey($this->nodes['hu_private']->id(), $nids);
// Query with German (de) specified.
$select = $connection->select('node', 'n')
@@ -258,7 +258,7 @@ public function testNodeAccessLanguageAware() {
$nids = $select->execute()->fetchAllAssoc('nid');
// All nodes are returned.
- $this->assertEqual(count($nids), 6, 'Query returns all nodes.');
+ $this->assertCount(6, $nids, 'Query returns all nodes.');
// Query the nodes table as admin user (full access) with the node access
// tag and langcode de.
@@ -271,7 +271,7 @@ public function testNodeAccessLanguageAware() {
// Even though there is no German translation, all nodes are returned
// because node access filtering does not occur when the user is user 1.
- $this->assertEqual(count($nids), 6, 'Query returns all nodes.');
+ $this->assertCount(6, $nids, 'Query returns all nodes.');
}
}
diff --git a/web/core/modules/node/tests/src/Kernel/NodeAccessLanguageTest.php b/web/core/modules/node/tests/src/Kernel/NodeAccessLanguageTest.php
index 269240670b..c6314385fe 100644
--- a/web/core/modules/node/tests/src/Kernel/NodeAccessLanguageTest.php
+++ b/web/core/modules/node/tests/src/Kernel/NodeAccessLanguageTest.php
@@ -214,9 +214,9 @@ public function testNodeAccessQueryTag() {
// The public node and no language node should be returned. Because no
// langcode is given it will use the fallback node.
- $this->assertEqual(count($nids), 2, 'Query returns 2 node');
- $this->assertTrue(array_key_exists($node_public->id(), $nids), 'Returned node ID is public node.');
- $this->assertTrue(array_key_exists($node_no_language->id(), $nids), 'Returned node ID is no language node.');
+ $this->assertCount(2, $nids, 'Query returns 2 node');
+ $this->assertArrayHasKey($node_public->id(), $nids);
+ $this->assertArrayHasKey($node_no_language->id(), $nids);
// Query the nodes table as the web user with the node access tag and
// langcode de.
@@ -239,7 +239,7 @@ public function testNodeAccessQueryTag() {
$nids = $select->execute()->fetchAllAssoc('nid');
// All nodes are returned.
- $this->assertEqual(count($nids), 3, 'Query returns all three nodes.');
+ $this->assertCount(3, $nids, 'Query returns all three nodes.');
// Query the nodes table as admin user (full access) with the node access
// tag and langcode de.
@@ -252,7 +252,7 @@ public function testNodeAccessQueryTag() {
// All nodes are returned because node access tag is not invoked when the
// user is user 1.
- $this->assertEqual(count($nids), 3, 'Query returns all three nodes.');
+ $this->assertCount(3, $nids, 'Query returns all three nodes.');
}
}
diff --git a/web/core/modules/node/tests/src/Kernel/NodeAccessRecordsTest.php b/web/core/modules/node/tests/src/Kernel/NodeAccessRecordsTest.php
index 714f18cb43..a5a5d6ae53 100644
--- a/web/core/modules/node/tests/src/Kernel/NodeAccessRecordsTest.php
+++ b/web/core/modules/node/tests/src/Kernel/NodeAccessRecordsTest.php
@@ -31,7 +31,7 @@ public function testNodeAccessRecords() {
// Check to see if grants added by node_test_node_access_records made it in.
$connection = Database::getConnection();
$records = $connection->query('SELECT realm, gid FROM {node_access} WHERE nid = :nid', [':nid' => $node1->id()])->fetchAll();
- $this->assertEqual(count($records), 1, 'Returned the correct number of rows.');
+ $this->assertCount(1, $records, 'Returned the correct number of rows.');
$this->assertEqual($records[0]->realm, 'test_article_realm', 'Grant with article_realm acquired for node without alteration.');
$this->assertEqual($records[0]->gid, 1, 'Grant with gid = 1 acquired for node without alteration.');
@@ -41,7 +41,7 @@ public function testNodeAccessRecords() {
// Check to see if grants added by node_test_node_access_records made it in.
$records = $connection->query('SELECT realm, gid FROM {node_access} WHERE nid = :nid', [':nid' => $node2->id()])->fetchAll();
- $this->assertEqual(count($records), 1, 'Returned the correct number of rows.');
+ $this->assertCount(1, $records, 'Returned the correct number of rows.');
$this->assertEqual($records[0]->realm, 'test_page_realm', 'Grant with page_realm acquired for node without alteration.');
$this->assertEqual($records[0]->gid, 1, 'Grant with gid = 1 acquired for node without alteration.');
@@ -51,7 +51,7 @@ public function testNodeAccessRecords() {
// Check to see if grants added by node_test_node_access_records made it in.
$records = $connection->query('SELECT realm, gid FROM {node_access} WHERE nid = :nid', [':nid' => $node3->id()])->fetchAll();
- $this->assertEqual(count($records), 1, 'Returned the correct number of rows.');
+ $this->assertCount(1, $records, 'Returned the correct number of rows.');
$this->assertEqual($records[0]->realm, 'test_page_realm', 'Grant with page_realm acquired for node without alteration.');
$this->assertEqual($records[0]->gid, 1, 'Grant with gid = 1 acquired for node without alteration.');
@@ -62,7 +62,7 @@ public function testNodeAccessRecords() {
// Check to see if grant added by node_test_node_access_records was altered
// by node_test_node_access_records_alter.
$records = $connection->query('SELECT realm, gid FROM {node_access} WHERE nid = :nid', [':nid' => $node4->id()])->fetchAll();
- $this->assertEqual(count($records), 1, 'Returned the correct number of rows.');
+ $this->assertCount(1, $records, 'Returned the correct number of rows.');
$this->assertEqual($records[0]->realm, 'test_alter_realm', 'Altered grant with alter_realm acquired for node.');
$this->assertEqual($records[0]->gid, 2, 'Altered grant with gid = 2 acquired for node.');
@@ -81,7 +81,7 @@ public function testNodeAccessRecords() {
// empty $grants array is returned.
$node6 = $this->drupalCreateNode(['status' => 0, 'disable_node_access' => TRUE]);
$records = $connection->query('SELECT realm, gid FROM {node_access} WHERE nid = :nid', [':nid' => $node6->id()])->fetchAll();
- $this->assertEqual(count($records), 0, 'Returned no records for unpublished node.');
+ $this->assertCount(0, $records, 'Returned no records for unpublished node.');
}
}
diff --git a/web/core/modules/node/tests/src/Kernel/NodeBodyFieldStorageTest.php b/web/core/modules/node/tests/src/Kernel/NodeBodyFieldStorageTest.php
index 219618e197..ab59817dc9 100644
--- a/web/core/modules/node/tests/src/Kernel/NodeBodyFieldStorageTest.php
+++ b/web/core/modules/node/tests/src/Kernel/NodeBodyFieldStorageTest.php
@@ -19,7 +19,14 @@ class NodeBodyFieldStorageTest extends KernelTestBase {
*
* @var array
*/
- public static $modules = ['user', 'system', 'field', 'node', 'text', 'filter'];
+ public static $modules = [
+ 'user',
+ 'system',
+ 'field',
+ 'node',
+ 'text',
+ 'filter',
+ ];
protected function setUp() {
parent::setUp();
@@ -41,11 +48,11 @@ public function testFieldOverrides() {
$type->save();
node_add_body_field($type);
$field_storage = FieldStorageConfig::loadByName('node', 'body');
- $this->assertTrue(count($field_storage->getBundles()) == 1, 'Node body field storage is being used on the new node type.');
+ $this->assertCount(1, $field_storage->getBundles(), 'Node body field storage is being used on the new node type.');
$field = FieldConfig::loadByName('node', 'ponies', 'body');
$field->delete();
$field_storage = FieldStorageConfig::loadByName('node', 'body');
- $this->assertTrue(count($field_storage->getBundles()) == 0, 'Node body field storage exists after deleting the only instance of a field.');
+ $this->assertCount(0, $field_storage->getBundles(), 'Node body field storage exists after deleting the only instance of a field.');
\Drupal::service('module_installer')->uninstall(['node']);
$field_storage = FieldStorageConfig::loadByName('node', 'body');
$this->assertNull($field_storage, 'Node body field storage does not exist after uninstalling the Node module.');
diff --git a/web/core/modules/node/tests/src/Kernel/NodeFieldOverridesTest.php b/web/core/modules/node/tests/src/Kernel/NodeFieldOverridesTest.php
index 1fdfea7202..16b3a2ee4b 100644
--- a/web/core/modules/node/tests/src/Kernel/NodeFieldOverridesTest.php
+++ b/web/core/modules/node/tests/src/Kernel/NodeFieldOverridesTest.php
@@ -57,7 +57,7 @@ public function testFieldOverrides() {
/** @var \Drupal\node\NodeInterface $node */
$node = Node::create(['type' => 'ponies']);
$owner = $node->getOwner();
- $this->assertTrue($owner instanceof UserInterface);
+ $this->assertInstanceOf(UserInterface::class, $owner);
$this->assertEqual($owner->id(), $this->user->id());
}
diff --git a/web/core/modules/node/tests/src/Kernel/NodeLegacyTest.php b/web/core/modules/node/tests/src/Kernel/NodeLegacyTest.php
index faefee14ab..b554df7b24 100644
--- a/web/core/modules/node/tests/src/Kernel/NodeLegacyTest.php
+++ b/web/core/modules/node/tests/src/Kernel/NodeLegacyTest.php
@@ -74,7 +74,7 @@ public function testNodeView() {
Node::create(['type' => 'page']),
Node::create(['type' => 'page']),
];
- $this->assertEquals(4, count(node_view_multiple($entities)));
+ $this->assertCount(4, node_view_multiple($entities));
}
/**
diff --git a/web/core/modules/node/tests/src/Kernel/NodeTokenReplaceTest.php b/web/core/modules/node/tests/src/Kernel/NodeTokenReplaceTest.php
index aaf5da7152..12f72f5347 100644
--- a/web/core/modules/node/tests/src/Kernel/NodeTokenReplaceTest.php
+++ b/web/core/modules/node/tests/src/Kernel/NodeTokenReplaceTest.php
@@ -99,7 +99,7 @@ public function testNodeTokenReplacement() {
$metadata_tests['[node:changed:since]'] = $bubbleable_metadata;
// Test to make sure that we generated something for each token.
- $this->assertFalse(in_array(0, array_map('strlen', $tests)), 'No empty tokens generated.');
+ $this->assertNotContains(0, array_map('strlen', $tests), 'No empty tokens generated.');
foreach ($tests as $input => $expected) {
$bubbleable_metadata = new BubbleableMetadata();
@@ -122,7 +122,7 @@ public function testNodeTokenReplacement() {
$tests['[node:summary]'] = $node->body->processed;
// Test to make sure that we generated something for each token.
- $this->assertFalse(in_array(0, array_map('strlen', $tests)), 'No empty tokens generated for node without a summary.');
+ $this->assertNotContains(0, array_map('strlen', $tests), 'No empty tokens generated for node without a summary.');
foreach ($tests as $input => $expected) {
$output = $this->tokenService->replace($input, ['node' => $node], ['language' => $this->interfaceLanguage]);
diff --git a/web/core/modules/node/tests/src/Kernel/NodeValidationTest.php b/web/core/modules/node/tests/src/Kernel/NodeValidationTest.php
index e111faeaef..a3a024a17f 100644
--- a/web/core/modules/node/tests/src/Kernel/NodeValidationTest.php
+++ b/web/core/modules/node/tests/src/Kernel/NodeValidationTest.php
@@ -38,23 +38,23 @@ public function testValidation() {
$this->createUser();
$node = Node::create(['type' => 'page', 'title' => 'test', 'uid' => 1]);
$violations = $node->validate();
- $this->assertEqual(count($violations), 0, 'No violations when validating a default node.');
+ $this->assertCount(0, $violations, 'No violations when validating a default node.');
$node->set('title', $this->randomString(256));
$violations = $node->validate();
- $this->assertEqual(count($violations), 1, 'Violation found when title is too long.');
+ $this->assertCount(1, $violations, 'Violation found when title is too long.');
$this->assertEqual($violations[0]->getPropertyPath(), 'title.0.value');
$this->assertEqual($violations[0]->getMessage(), '<em class="placeholder">Title</em>: may not be longer than 255 characters.');
$node->set('title', NULL);
$violations = $node->validate();
- $this->assertEqual(count($violations), 1, 'Violation found when title is not set.');
+ $this->assertCount(1, $violations, 'Violation found when title is not set.');
$this->assertEqual($violations[0]->getPropertyPath(), 'title');
$this->assertEqual($violations[0]->getMessage(), 'This value should not be null.');
$node->set('title', '');
$violations = $node->validate();
- $this->assertEqual(count($violations), 1, 'Violation found when title is set to an empty string.');
+ $this->assertCount(1, $violations, 'Violation found when title is set to an empty string.');
$this->assertEqual($violations[0]->getPropertyPath(), 'title');
// Make the title valid again.
@@ -64,7 +64,7 @@ public function testValidation() {
// Set the changed date to something in the far past.
$node->set('changed', 433918800);
$violations = $node->validate();
- $this->assertEqual(count($violations), 1, 'Violation found when changed date is before the last changed date.');
+ $this->assertCount(1, $violations, 'Violation found when changed date is before the last changed date.');
$this->assertEqual($violations[0]->getPropertyPath(), '');
$this->assertEqual($violations[0]->getMessage(), 'The content has either been modified by another user, or you have already submitted modifications. As a result, your changes cannot be saved.');
}
diff --git a/web/core/modules/node/tests/src/Kernel/NodeViewBuilderTest.php b/web/core/modules/node/tests/src/Kernel/NodeViewBuilderTest.php
index 3ef609b773..5499044a47 100644
--- a/web/core/modules/node/tests/src/Kernel/NodeViewBuilderTest.php
+++ b/web/core/modules/node/tests/src/Kernel/NodeViewBuilderTest.php
@@ -91,11 +91,11 @@ public function testPendingRevisionLinks() {
$build = $this->viewBuilder->view($node, 'teaser');
$output = (string) $this->renderer->renderPlain($build);
- $this->assertContains("title=\"$title\"", $output);
+ $this->assertStringContainsString("title=\"$title\"", $output);
$build = $this->viewBuilder->view($pending_revision, 'teaser');
$output = (string) $this->renderer->renderPlain($build);
- $this->assertContains("title=\"$draft_title\"", $output);
+ $this->assertStringContainsString("title=\"$draft_title\"", $output);
}
}
diff --git a/web/core/modules/node/tests/src/Kernel/Views/ArgumentUidRevisionTest.php b/web/core/modules/node/tests/src/Kernel/Views/ArgumentUidRevisionTest.php
index e658bb2fe3..8a50b16fc9 100644
--- a/web/core/modules/node/tests/src/Kernel/Views/ArgumentUidRevisionTest.php
+++ b/web/core/modules/node/tests/src/Kernel/Views/ArgumentUidRevisionTest.php
@@ -19,7 +19,13 @@ class ArgumentUidRevisionTest extends ViewsKernelTestBase {
/**
* {@inheritdoc}
*/
- public static $modules = ['node', 'field', 'text', 'user', 'node_test_views'];
+ public static $modules = [
+ 'node',
+ 'field',
+ 'text',
+ 'user',
+ 'node_test_views',
+ ];
/**
* {@inheritdoc}
diff --git a/web/core/modules/node/tests/src/Kernel/Views/NidArgumentTest.php b/web/core/modules/node/tests/src/Kernel/Views/NidArgumentTest.php
index 78ec67b19c..cdd5ebce5f 100644
--- a/web/core/modules/node/tests/src/Kernel/Views/NidArgumentTest.php
+++ b/web/core/modules/node/tests/src/Kernel/Views/NidArgumentTest.php
@@ -18,7 +18,14 @@ class NidArgumentTest extends ViewsKernelTestBase {
/**
* {@inheritdoc}
*/
- public static $modules = ['node', 'field', 'text', 'node_test_config', 'user', 'node_test_views'];
+ public static $modules = [
+ 'node',
+ 'field',
+ 'text',
+ 'node_test_config',
+ 'user',
+ 'node_test_views',
+ ];
/**
* Views used by this test.
@@ -59,7 +66,7 @@ public function testNidArgument() {
$node2->save();
$view->preview();
- $this->assertEqual(count($view->result), 2, 'Found the expected number of results.');
+ $this->assertCount(2, $view->result, 'Found the expected number of results.');
// Set an the second node id as an argument.
$view->destroy();
@@ -67,14 +74,14 @@ public function testNidArgument() {
// Verify that the title is overridden.
$this->assertEqual($view->getTitle(), $node2->getTitle());
// Verify that the argument filtering works.
- $this->assertEqual(count($view->result), 1, 'Found the expected number of results.');
+ $this->assertCount(1, $view->result, 'Found the expected number of results.');
$this->assertEqual($node2->id(), (string) $view->style_plugin->getField(0, 'nid'), 'Found the correct nid.');
// Verify that setting a non-existing id as argument results in no nodes
// being shown.
$view->destroy();
$view->preview('default', [22]);
- $this->assertEqual(count($view->result), 0, 'Found the expected number of results.');
+ $this->assertCount(0, $view->result, 'Found the expected number of results.');
}
}
diff --git a/web/core/modules/options/options.module b/web/core/modules/options/options.module
index 0face469bd..8bbb941a6b 100644
--- a/web/core/modules/options/options.module
+++ b/web/core/modules/options/options.module
@@ -113,7 +113,7 @@ function options_field_storage_config_update_forbid(FieldStorageConfigInterface
$prior_allowed_values = $prior_field_storage->getSetting('allowed_values');
$lost_keys = array_keys(array_diff_key($prior_allowed_values, $allowed_values));
if (_options_values_in_use($field_storage->getTargetEntityTypeId(), $field_storage->getName(), $lost_keys)) {
- throw new FieldStorageDefinitionUpdateForbiddenException(t('A list field (@field_name) with existing data cannot have its keys changed.', ['@field_name' => $field_storage->getName()]));
+ throw new FieldStorageDefinitionUpdateForbiddenException("A list field '{$field_storage->getName()}' with existing data cannot have its keys changed.");
}
}
}
diff --git a/web/core/modules/options/tests/src/Functional/OptionsDynamicValuesValidationTest.php b/web/core/modules/options/tests/src/Functional/OptionsDynamicValuesValidationTest.php
index d44ec39411..d865a06925 100644
--- a/web/core/modules/options/tests/src/Functional/OptionsDynamicValuesValidationTest.php
+++ b/web/core/modules/options/tests/src/Functional/OptionsDynamicValuesValidationTest.php
@@ -22,14 +22,14 @@ public function testDynamicAllowedValues() {
foreach ($this->test as $key => $value) {
$this->entity->test_options->value = $value;
$violations = $this->entity->test_options->validate();
- $this->assertEqual(count($violations), 0, "$key is a valid value");
+ $this->assertCount(0, $violations, "$key is a valid value");
}
// Now verify that validation does not pass against anything else.
foreach ($this->test as $key => $value) {
$this->entity->test_options->value = is_numeric($value) ? (100 - $value) : ('X' . $value);
$violations = $this->entity->test_options->validate();
- $this->assertEqual(count($violations), 1, "$key is not a valid value");
+ $this->assertCount(1, $violations, "$key is not a valid value");
}
}
diff --git a/web/core/modules/options/tests/src/Functional/OptionsFieldUITest.php b/web/core/modules/options/tests/src/Functional/OptionsFieldUITest.php
index 97e150407f..f4e1683b6c 100644
--- a/web/core/modules/options/tests/src/Functional/OptionsFieldUITest.php
+++ b/web/core/modules/options/tests/src/Functional/OptionsFieldUITest.php
@@ -19,7 +19,13 @@ class OptionsFieldUITest extends FieldTestBase {
*
* @var array
*/
- public static $modules = ['node', 'options', 'field_test', 'taxonomy', 'field_ui'];
+ public static $modules = [
+ 'node',
+ 'options',
+ 'field_test',
+ 'taxonomy',
+ 'field_ui',
+ ];
/**
* {@inheritdoc}
@@ -357,7 +363,7 @@ public function testNodeDisplay() {
}
$elements = $this->xpath('//div[text()="' . $output . '"]');
- $this->assertEqual(count($elements), 1, 'Correct options found.');
+ $this->assertCount(1, $elements, 'Correct options found.');
}
}
diff --git a/web/core/modules/options/tests/src/Functional/OptionsFloatFieldImportTest.php b/web/core/modules/options/tests/src/Functional/OptionsFloatFieldImportTest.php
index 556bc9ba2f..8b3ef78241 100644
--- a/web/core/modules/options/tests/src/Functional/OptionsFloatFieldImportTest.php
+++ b/web/core/modules/options/tests/src/Functional/OptionsFloatFieldImportTest.php
@@ -18,7 +18,13 @@ class OptionsFloatFieldImportTest extends FieldTestBase {
*
* @var array
*/
- public static $modules = ['node', 'options', 'field_ui', 'config', 'options_config_install_test'];
+ public static $modules = [
+ 'node',
+ 'options',
+ 'field_ui',
+ 'config',
+ 'options_config_install_test',
+ ];
/**
* {@inheritdoc}
diff --git a/web/core/modules/options/tests/src/Functional/OptionsWidgetsTest.php b/web/core/modules/options/tests/src/Functional/OptionsWidgetsTest.php
index 5902682c03..7b3ac433d0 100644
--- a/web/core/modules/options/tests/src/Functional/OptionsWidgetsTest.php
+++ b/web/core/modules/options/tests/src/Functional/OptionsWidgetsTest.php
@@ -19,7 +19,14 @@ class OptionsWidgetsTest extends FieldTestBase {
*
* @var array
*/
- public static $modules = ['node', 'options', 'entity_test', 'options_test', 'taxonomy', 'field_ui'];
+ public static $modules = [
+ 'node',
+ 'options',
+ 'entity_test',
+ 'options_test',
+ 'taxonomy',
+ 'field_ui',
+ ];
/**
* {@inheritdoc}
diff --git a/web/core/modules/options/tests/src/Kernel/Views/OptionsTestBase.php b/web/core/modules/options/tests/src/Kernel/Views/OptionsTestBase.php
index 9f53e63313..7a3237a01a 100644
--- a/web/core/modules/options/tests/src/Kernel/Views/OptionsTestBase.php
+++ b/web/core/modules/options/tests/src/Kernel/Views/OptionsTestBase.php
@@ -19,7 +19,13 @@ abstract class OptionsTestBase extends ViewsKernelTestBase {
*
* @var array
*/
- public static $modules = ['options', 'options_test_views', 'node', 'user', 'field'];
+ public static $modules = [
+ 'options',
+ 'options_test_views',
+ 'node',
+ 'user',
+ 'field',
+ ];
/**
* Stores the nodes used for the different tests.
diff --git a/web/core/modules/page_cache/page_cache.info.yml b/web/core/modules/page_cache/page_cache.info.yml
index ba18ed638c..3d168cdcbb 100644
--- a/web/core/modules/page_cache/page_cache.info.yml
+++ b/web/core/modules/page_cache/page_cache.info.yml
@@ -1,6 +1,6 @@
-name: Internal Page Cache
+name: 'Internal Page Cache'
type: module
-description: 'Caches pages for anonymous users. Use when an external page cache is not available.'
+description: 'Caches pages for anonymous users and can be used when external page cache is not available.'
package: Core
version: VERSION
core: 8.x
diff --git a/web/core/modules/page_cache/tests/src/Functional/PageCacheTest.php b/web/core/modules/page_cache/tests/src/Functional/PageCacheTest.php
index fc0421de00..95d101abcd 100644
--- a/web/core/modules/page_cache/tests/src/Functional/PageCacheTest.php
+++ b/web/core/modules/page_cache/tests/src/Functional/PageCacheTest.php
@@ -201,38 +201,47 @@ public function testConditionalRequests() {
$etag = $this->drupalGetHeader('ETag');
$last_modified = $this->drupalGetHeader('Last-Modified');
+ // Ensure a conditional request returns 304 Not Modified.
$this->drupalGet('', [], ['If-Modified-Since' => $last_modified, 'If-None-Match' => $etag]);
- $this->assertResponse(304, 'Conditional request returned 304 Not Modified.');
+ $this->assertSession()->statusCodeEquals(304);
+ // Ensure a conditional request with obsolete If-Modified-Since date
+ // returns 304 Not Modified.
$this->drupalGet('', [], [
'If-Modified-Since' => gmdate(DATE_RFC822, strtotime($last_modified)),
'If-None-Match' => $etag,
]);
- $this->assertResponse(304, 'Conditional request with obsolete If-Modified-Since date returned 304 Not Modified.');
+ $this->assertSession()->statusCodeEquals(304);
+ // Ensure a conditional request with obsolete If-Modified-Since date
+ // returns 304 Not Modified.
$this->drupalGet('', [], [
'If-Modified-Since' => gmdate(DATE_RFC850, strtotime($last_modified)),
'If-None-Match' => $etag,
]);
- $this->assertResponse(304, 'Conditional request with obsolete If-Modified-Since date returned 304 Not Modified.');
+ $this->assertSession()->statusCodeEquals(304);
+ // Ensure a conditional request without If-None-Match returns 200 OK.
$this->drupalGet('', [], ['If-Modified-Since' => $last_modified, 'If-None-Match' => NULL]);
// Verify the page is not printed twice when the cache is warm.
$this->assertSession()->responseNotMatches('#<html.*<html#');
- $this->assertResponse(200, 'Conditional request without If-None-Match returned 200 OK.');
+ $this->assertSession()->statusCodeEquals(200);
$this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'HIT', 'Page was cached.');
+ // Ensure a conditional request with If-Modified-Since newer than
+ // Last-Modified returns 200 OK.
$this->drupalGet('', [], [
'If-Modified-Since' => gmdate(DateTimePlus::RFC7231, strtotime($last_modified) + 1),
'If-None-Match' => $etag,
]);
- $this->assertResponse(200, 'Conditional request with new a If-Modified-Since date newer than Last-Modified returned 200 OK.');
+ $this->assertSession()->statusCodeEquals(200);
$this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'HIT', 'Page was cached.');
+ // Ensure a conditional request by an authenticated user returns 200 OK.
$user = $this->drupalCreateUser();
$this->drupalLogin($user);
$this->drupalGet('', [], ['If-Modified-Since' => $last_modified, 'If-None-Match' => $etag]);
- $this->assertResponse(200, 'Conditional request returned 200 OK for authenticated user.');
+ $this->assertSession()->statusCodeEquals(200);
$this->assertNull($this->drupalGetHeader('X-Drupal-Cache'), 'Absence of Page was not cached.');
}
@@ -274,7 +283,7 @@ public function testPageCache() {
$this->drupalLogin($user);
$this->drupalGet('system-test/set-header', ['query' => ['name' => 'Foo', 'value' => 'bar']]);
$this->assertNull($this->drupalGetHeader('X-Drupal-Cache'), 'Caching was bypassed.');
- $this->assertNotContains('cookie', $this->drupalGetHeader('Vary'), 'Vary: Cookie header was not sent.', TRUE);
+ $this->assertStringNotContainsString('cookie', $this->drupalGetHeader('Vary'), 'Vary: Cookie header was not sent.', TRUE);
$this->assertEqual($this->drupalGetHeader('Cache-Control'), 'must-revalidate, no-cache, private', 'Cache-Control header was sent.');
$this->assertEqual($this->drupalGetHeader('Expires'), 'Sun, 19 Nov 1978 05:00:00 GMT', 'Expires header was sent.');
$this->assertEqual($this->drupalGetHeader('Foo'), 'bar', 'Custom header was sent.');
@@ -362,11 +371,11 @@ public function testPageCacheAnonymous403404() {
foreach ($tests as $code => $content_url) {
// Anonymous user, without permissions.
$this->drupalGet($content_url);
- $this->assertResponse($code);
+ $this->assertSession()->statusCodeEquals($code);
$this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'MISS');
$this->assertCacheTag('4xx-response');
$this->drupalGet($content_url);
- $this->assertResponse($code);
+ $this->assertSession()->statusCodeEquals($code);
$this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'HIT');
$entity_values = [
'name' => $this->randomMachineName(),
@@ -382,15 +391,15 @@ public function testPageCacheAnonymous403404() {
$entity->save();
// Saving an entity clears 4xx cache tag.
$this->drupalGet($content_url);
- $this->assertResponse($code);
+ $this->assertSession()->statusCodeEquals($code);
$this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'MISS');
$this->drupalGet($content_url);
- $this->assertResponse($code);
+ $this->assertSession()->statusCodeEquals($code);
$this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'HIT');
// Rebuilding the router should invalidate the 4xx cache tag.
$this->container->get('router.builder')->rebuild();
$this->drupalGet($content_url);
- $this->assertResponse($code);
+ $this->assertSession()->statusCodeEquals($code);
$this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'MISS');
// Ensure the 'expire' field on the cache entry uses cache_ttl_4xx.
@@ -419,7 +428,7 @@ public function testPageCacheAnonymous403404() {
// Getting the 404 page twice should still result in a cache miss.
$this->drupalGet($content_url);
$this->drupalGet($content_url);
- $this->assertResponse($code);
+ $this->assertSession()->statusCodeEquals($code);
$this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'MISS');
}
}
@@ -441,13 +450,13 @@ public function testPageCacheWithoutVaryCookie() {
// Fill the cache.
$this->drupalGet('');
$this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'MISS', 'Page was not cached.');
- $this->assertNotContains('cookie', $this->drupalGetHeader('Vary'), 'Vary: Cookie header was not sent.', TRUE);
+ $this->assertStringNotContainsString('cookie', $this->drupalGetHeader('Vary'), 'Vary: Cookie header was not sent.', TRUE);
$this->assertEqual($this->drupalGetHeader('Cache-Control'), 'max-age=300, public', 'Cache-Control header was sent.');
// Check cache.
$this->drupalGet('');
$this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'HIT', 'Page was cached.');
- $this->assertNotContains('cookie', $this->drupalGetHeader('Vary'), 'Vary: Cookie header was not sent.', TRUE);
+ $this->assertStringNotContainsString('cookie', $this->drupalGetHeader('Vary'), 'Vary: Cookie header was not sent.', TRUE);
$this->assertEqual($this->drupalGetHeader('Cache-Control'), 'max-age=300, public', 'Cache-Control header was sent.');
}
@@ -492,12 +501,12 @@ public function testCacheableResponseResponses() {
$config->save();
// GET a URL, which would be marked as a cache miss if it were cacheable.
- $this->drupalGet('/system-test/respond-reponse');
+ $this->drupalGet('/system-test/respond-response');
$this->assertNull($this->drupalGetHeader('X-Drupal-Cache'), 'Drupal page cache header not found.');
$this->assertEqual($this->drupalGetHeader('Cache-Control'), 'must-revalidate, no-cache, private', 'Cache-Control header was sent');
// GET it again, verify it's still not cached.
- $this->drupalGet('/system-test/respond-reponse');
+ $this->drupalGet('/system-test/respond-response');
$this->assertNull($this->drupalGetHeader('X-Drupal-Cache'), 'Drupal page cache header not found.');
$this->assertEqual($this->drupalGetHeader('Cache-Control'), 'must-revalidate, no-cache, private', 'Cache-Control header was sent');
@@ -512,12 +521,12 @@ public function testCacheableResponseResponses() {
$this->assertEqual($this->drupalGetHeader('Cache-Control'), 'max-age=60, public', 'Cache-Control header was sent');
// GET a URL, which should be marked as a cache miss.
- $this->drupalGet('/system-test/respond-cacheable-reponse');
+ $this->drupalGet('/system-test/respond-cacheable-response');
$this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'MISS', 'Page was not cached.');
$this->assertEqual($this->drupalGetHeader('Cache-Control'), 'max-age=300, public', 'Cache-Control header was sent.');
// GET it again, it should now be a cache hit.
- $this->drupalGet('/system-test/respond-cacheable-reponse');
+ $this->drupalGet('/system-test/respond-cacheable-response');
$this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'HIT', 'Page was cached.');
$this->assertEqual($this->drupalGetHeader('Cache-Control'), 'max-age=300, public', 'Cache-Control header was sent.');
@@ -527,7 +536,7 @@ public function testCacheableResponseResponses() {
->uninstall(['page_cache']);
// GET a URL that was cached by Page Cache before, it should not be now.
- $this->drupalGet('/respond-cacheable-reponse');
+ $this->drupalGet('/respond-cacheable-response');
$this->assertNull($this->drupalGetHeader('X-Drupal-Cache'), 'Drupal page cache header not found.');
}
@@ -570,8 +579,8 @@ public function testCacheableWithCustomCacheControl() {
$config->save();
$this->drupalGet('/system-test/custom-cache-control');
- $this->assertResponse(200);
- $this->assertHeader('Cache-Control', 'bar, private');
+ $this->assertSession()->statusCodeEquals(200);
+ $this->assertSession()->responseHeaderEquals('Cache-Control', 'bar, private');
}
/**
diff --git a/web/core/modules/path/migrations/d6_url_alias.yml b/web/core/modules/path/migrations/d6_url_alias.yml
index 747a06805b..2ef20469f9 100644
--- a/web/core/modules/path/migrations/d6_url_alias.yml
+++ b/web/core/modules/path/migrations/d6_url_alias.yml
@@ -35,7 +35,11 @@ process:
- 1
-
plugin: migration_lookup
- migration: d6_node_translation
+ migration:
+ - d6_node_complete
+ - d6_node_translation
+ -
+ plugin: node_complete_node_translation_lookup
langcode:
-
plugin: null_coalesce
diff --git a/web/core/modules/path/migrations/d7_url_alias.yml b/web/core/modules/path/migrations/d7_url_alias.yml
index b49686a7fb..0add8532a3 100644
--- a/web/core/modules/path/migrations/d7_url_alias.yml
+++ b/web/core/modules/path/migrations/d7_url_alias.yml
@@ -34,7 +34,11 @@ process:
- 1
-
plugin: migration_lookup
- migration: d7_node_translation
+ migration:
+ - d7_node_complete
+ - d7_node_translation
+ -
+ plugin: node_complete_node_translation_lookup
langcode:
plugin: null_coalesce
source:
diff --git a/web/core/modules/path/tests/src/Functional/PathAliasTest.php b/web/core/modules/path/tests/src/Functional/PathAliasTest.php
index 0ef6b99304..b325069550 100644
--- a/web/core/modules/path/tests/src/Functional/PathAliasTest.php
+++ b/web/core/modules/path/tests/src/Functional/PathAliasTest.php
@@ -83,15 +83,15 @@ public function testAdminAlias() {
// Confirm that the alias works.
$this->drupalGet($edit['alias[0][value]']);
$this->assertText($node1->label(), 'Alias works.');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Confirm that the alias works in a case-insensitive way.
$this->assertTrue(ctype_lower(ltrim($edit['alias[0][value]'], '/')));
$this->drupalGet($edit['alias[0][value]']);
$this->assertText($node1->label(), 'Alias works lower case.');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->drupalGet(mb_strtoupper($edit['alias[0][value]']));
$this->assertText($node1->label(), 'Alias works upper case.');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Change alias to one containing "exotic" characters.
$pid = $this->getPID($edit['alias[0][value]']);
@@ -118,13 +118,13 @@ public function testAdminAlias() {
// Confirm that the alias works.
$this->drupalGet(mb_strtoupper($edit['alias[0][value]']));
$this->assertText($node1->label(), 'Changed alias works.');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->container->get('path_alias.manager')->cacheClear();
// Confirm that previous alias no longer works.
$this->drupalGet($previous);
$this->assertNoText($node1->label(), 'Previous alias no longer works.');
- $this->assertResponse(404);
+ $this->assertSession()->statusCodeEquals(404);
// Create second test node.
$node2 = $this->drupalCreateNode();
@@ -154,7 +154,7 @@ public function testAdminAlias() {
// Confirm that the alias no longer works.
$this->drupalGet($edit['alias[0][value]']);
$this->assertNoText($node1->label(), 'Alias was successfully deleted.');
- $this->assertResponse(404);
+ $this->assertSession()->statusCodeEquals(404);
// Create a really long alias.
$edit = [];
@@ -203,7 +203,7 @@ public function testAdminAlias() {
$this->drupalGet($edit['alias[0][value]']);
$this->assertNoText($node4->label(), 'Previous alias no longer works.');
$this->assertText($node2->label(), 'Alias works.');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Update an existing alias to use a duplicate alias.
$pid = $this->getPID($node3_alias);
@@ -242,7 +242,7 @@ public function testNodeAlias() {
// Confirm that the alias works.
$this->drupalGet($edit['path[0][alias]']);
$this->assertText($node1->label(), 'Alias works.');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Confirm the 'canonical' and 'shortlink' URLs.
$elements = $this->xpath("//link[contains(@rel, 'canonical') and contains(@href, '" . $edit['path[0][alias]'] . "')]");
@@ -273,12 +273,12 @@ public function testNodeAlias() {
// Confirm that the alias works.
$this->drupalGet(mb_strtoupper($edit['path[0][alias]']));
$this->assertText($node1->label(), 'Changed alias works.');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Make sure that previous alias no longer works.
$this->drupalGet($previous);
$this->assertNoText($node1->label(), 'Previous alias no longer works.');
- $this->assertResponse(404);
+ $this->assertSession()->statusCodeEquals(404);
// Create second test node.
$node2 = $this->drupalCreateNode();
@@ -296,7 +296,7 @@ public function testNodeAlias() {
// Confirm that the alias no longer works.
$this->drupalGet($edit['path[0][alias]']);
$this->assertNoText($node1->label(), 'Alias was successfully deleted.');
- $this->assertResponse(404);
+ $this->assertSession()->statusCodeEquals(404);
// Create third test node.
$node3 = $this->drupalCreateNode();
@@ -308,7 +308,7 @@ public function testNodeAlias() {
// Confirm that the alias was converted to a relative path.
$this->drupalGet(trim($edit['path[0][alias]'], '/'));
$this->assertText($node3->label(), 'Alias became relative.');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Create fourth test node.
$node4 = $this->drupalCreateNode();
@@ -320,7 +320,7 @@ public function testNodeAlias() {
// Confirm that the alias was converted to a relative path.
$this->drupalGet(trim($edit['path[0][alias]'], '/'));
$this->assertText($node4->label(), 'Alias trimmed trailing slash.');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Create fifth test node.
$node5 = $this->drupalCreateNode();
@@ -360,7 +360,7 @@ public function testNodeAlias() {
$link_href = $link_xpath[0]->getAttribute('href');
$this->assertEquals($link_href, base_path() . $alias);
$this->clickLink($node6->getTitle());
- $this->assertResponse(404);
+ $this->assertSession()->statusCodeEquals(404);
}
/**
diff --git a/web/core/modules/path/tests/src/Functional/PathLanguageTest.php b/web/core/modules/path/tests/src/Functional/PathLanguageTest.php
index a5982e15d8..5f428ef932 100644
--- a/web/core/modules/path/tests/src/Functional/PathLanguageTest.php
+++ b/web/core/modules/path/tests/src/Functional/PathLanguageTest.php
@@ -14,7 +14,12 @@ class PathLanguageTest extends PathTestBase {
*
* @var array
*/
- public static $modules = ['path', 'locale', 'locale_test', 'content_translation'];
+ public static $modules = [
+ 'path',
+ 'locale',
+ 'locale_test',
+ 'content_translation',
+ ];
/**
* {@inheritdoc}
@@ -124,7 +129,7 @@ public function testAliasTranslation() {
$languages = $this->container->get('language_manager')->getLanguages();
$url = $english_node_french_translation->toUrl('canonical', ['language' => $languages['fr']])->toString();
- $this->assertContains($edit['path[0][alias]'], $url, 'URL contains the path alias.');
+ $this->assertStringContainsString($edit['path[0][alias]'], $url, 'URL contains the path alias.');
// Confirm that the alias works even when changing language negotiation
// options. Enable User language detection and selection over URL one.
@@ -168,7 +173,7 @@ public function testAliasTranslation() {
// situation only aliases in the default language and language neutral ones
// should keep working.
$this->drupalGet($french_alias);
- $this->assertResponse(404, 'Alias for French translation is unavailable when URL language negotiation is disabled.');
+ $this->assertSession()->statusCodeEquals(404);
// The alias manager has an internal path lookup cache. Check to see that
// it has the appropriate contents at this point.
diff --git a/web/core/modules/path/tests/src/Functional/PathTaxonomyTermTest.php b/web/core/modules/path/tests/src/Functional/PathTaxonomyTermTest.php
index 1db6bb1885..5bb92e2e8c 100644
--- a/web/core/modules/path/tests/src/Functional/PathTaxonomyTermTest.php
+++ b/web/core/modules/path/tests/src/Functional/PathTaxonomyTermTest.php
@@ -76,7 +76,7 @@ public function testTermAlias() {
// Confirm that the old alias no longer works.
$this->drupalGet(trim($edit['path[0][alias]'], '/'));
$this->assertNoText($description, 'Old URL alias has been removed after altering.');
- $this->assertResponse(404, 'Old URL alias returns 404.');
+ $this->assertSession()->statusCodeEquals(404);
// Remove the term's URL alias.
$edit3 = [];
@@ -86,7 +86,7 @@ public function testTermAlias() {
// Confirm that the alias no longer works.
$this->drupalGet(trim($edit2['path[0][alias]'], '/'));
$this->assertNoText($description, 'Old URL alias has been removed after altering.');
- $this->assertResponse(404, 'Old URL alias returns 404.');
+ $this->assertSession()->statusCodeEquals(404);
}
}
diff --git a/web/core/modules/path/tests/src/Kernel/Migrate/d6/MigrateUrlAliasTest.php b/web/core/modules/path/tests/src/Kernel/Migrate/d6/MigrateUrlAliasTest.php
index 617fe73f0e..63a830c661 100644
--- a/web/core/modules/path/tests/src/Kernel/Migrate/d6/MigrateUrlAliasTest.php
+++ b/web/core/modules/path/tests/src/Kernel/Migrate/d6/MigrateUrlAliasTest.php
@@ -26,8 +26,6 @@ class MigrateUrlAliasTest extends MigrateDrupal6TestBase {
'path',
'path_alias',
'menu_ui',
- // Required for translation migrations.
- 'migrate_drupal_multilingual',
];
/**
diff --git a/web/core/modules/path/tests/src/Kernel/PathItemTest.php b/web/core/modules/path/tests/src/Kernel/PathItemTest.php
index 240b6cf54a..b51dc05e40 100644
--- a/web/core/modules/path/tests/src/Kernel/PathItemTest.php
+++ b/web/core/modules/path/tests/src/Kernel/PathItemTest.php
@@ -19,7 +19,15 @@ class PathItemTest extends KernelTestBase {
*
* @var array
*/
- public static $modules = ['path', 'path_alias', 'node', 'user', 'system', 'language', 'content_translation'];
+ public static $modules = [
+ 'path',
+ 'path_alias',
+ 'node',
+ 'user',
+ 'system',
+ 'language',
+ 'content_translation',
+ ];
/**
* {@inheritdoc}
diff --git a/web/core/modules/path/tests/src/Kernel/PathNoCanonicalLinkTest.php b/web/core/modules/path/tests/src/Kernel/PathNoCanonicalLinkTest.php
index 773b792f38..ce2e4a77fb 100644
--- a/web/core/modules/path/tests/src/Kernel/PathNoCanonicalLinkTest.php
+++ b/web/core/modules/path/tests/src/Kernel/PathNoCanonicalLinkTest.php
@@ -18,7 +18,14 @@ class PathNoCanonicalLinkTest extends KernelTestBase {
*
* @var array
*/
- public static $modules = ['path', 'content_translation_test', 'language', 'entity_test', 'user', 'system'];
+ public static $modules = [
+ 'path',
+ 'content_translation_test',
+ 'language',
+ 'entity_test',
+ 'user',
+ 'system',
+ ];
protected function setUp() {
parent::setUp();
@@ -48,11 +55,11 @@ public function testNoCanonicalLinkTemplate() {
$entity_type->addTranslation('de', ['name' => 'name german']);
$entity_type->save();
- $this->assertEqual(count($entity_type->getTranslationLanguages()), 2);
+ $this->assertCount(2, $entity_type->getTranslationLanguages());
$entity_type->removeTranslation('de');
$entity_type->save();
- $this->assertEqual(count($entity_type->getTranslationLanguages()), 1);
+ $this->assertCount(1, $entity_type->getTranslationLanguages());
}
}
diff --git a/web/core/modules/path_alias/tests/src/Functional/Hal/PathAliasHalJsonTestBase.php b/web/core/modules/path_alias/tests/src/Functional/Hal/PathAliasHalJsonTestBase.php
index 1e28291e02..69874cfecd 100644
--- a/web/core/modules/path_alias/tests/src/Functional/Hal/PathAliasHalJsonTestBase.php
+++ b/web/core/modules/path_alias/tests/src/Functional/Hal/PathAliasHalJsonTestBase.php
@@ -21,7 +21,7 @@ protected function getExpectedNormalizedEntity() {
return $normalization + [
'_links' => [
'self' => [
- 'href' => '',
+ 'href' => $this->baseUrl . '/entity/path_alias/1?_format=hal_json',
],
'type' => [
'href' => $this->baseUrl . '/rest/type/path_alias/path_alias',
diff --git a/web/core/modules/path_alias/tests/src/Functional/Rest/PathAliasResourceTestBase.php b/web/core/modules/path_alias/tests/src/Functional/Rest/PathAliasResourceTestBase.php
index 78a2399d81..a2ab0099ed 100644
--- a/web/core/modules/path_alias/tests/src/Functional/Rest/PathAliasResourceTestBase.php
+++ b/web/core/modules/path_alias/tests/src/Functional/Rest/PathAliasResourceTestBase.php
@@ -25,7 +25,7 @@ abstract class PathAliasResourceTestBase extends EntityResourceTestBase {
protected static $entityTypeId = 'path_alias';
/**
- * @inheritdoc
+ * {@inheritdoc}
*/
protected static $patchProtectedFieldNames = [];
diff --git a/web/core/modules/path_alias/tests/src/Functional/UrlAlterFunctionalTest.php b/web/core/modules/path_alias/tests/src/Functional/UrlAlterFunctionalTest.php
index 42f789db28..e0f969e5e2 100644
--- a/web/core/modules/path_alias/tests/src/Functional/UrlAlterFunctionalTest.php
+++ b/web/core/modules/path_alias/tests/src/Functional/UrlAlterFunctionalTest.php
@@ -47,7 +47,7 @@ public function testUrlAlter() {
// Test a single altered path.
$this->drupalGet("user/$name");
- $this->assertResponse('200', 'The user/username path gets resolved correctly');
+ $this->assertSession()->statusCodeEquals(200);
$this->assertUrlOutboundAlter("/user/$uid", "/user/$name");
// Test that a path always uses its alias.
@@ -61,7 +61,7 @@ public function testUrlAlter() {
$this->drupalPostForm('admin/config/search/path/add', $edit, t('Save'));
$this->assertText(t('The alias has been saved.'));
$this->drupalGet('alias/test2');
- $this->assertResponse('200', 'The path alias gets resolved correctly');
+ $this->assertSession()->statusCodeEquals(200);
$this->assertUrlOutboundAlter("/user/$uid/edit", '/alias/test2');
// Test a non-existent user is not altered.
diff --git a/web/core/modules/path_alias/tests/src/Kernel/AliasTest.php b/web/core/modules/path_alias/tests/src/Kernel/AliasTest.php
index 083a4cc2c8..111f9bff35 100644
--- a/web/core/modules/path_alias/tests/src/Kernel/AliasTest.php
+++ b/web/core/modules/path_alias/tests/src/Kernel/AliasTest.php
@@ -202,7 +202,7 @@ public function testWhitelistCacheDeletionMidRequest() {
$this->assertEquals(['user' => FALSE, 'admin' => TRUE], $memoryCounterBackend->get('path_alias_whitelist')->data);
$memoryCounterBackend->resetCounter();
- // Re-initialize the the whitelist and lookup an alias for the 'user' path.
+ // Re-initialize the whitelist and lookup an alias for the 'user' path.
// Whitelist should load data from its cache, see that it hasn't done a
// check for 'user' yet, perform the check, then mark the result to be
// persisted to cache.
diff --git a/web/core/modules/quickedit/js/editors/formEditor.es6.js b/web/core/modules/quickedit/js/editors/formEditor.es6.js
index 8dcf5f3513..5708339c0a 100644
--- a/web/core/modules/quickedit/js/editors/formEditor.es6.js
+++ b/web/core/modules/quickedit/js/editors/formEditor.es6.js
@@ -26,7 +26,7 @@
formSaveAjax: null,
/**
- * @inheritdoc
+ * {@inheritdoc}
*
* @param {object} fieldModel
* The field model that holds the state.
@@ -76,7 +76,7 @@
},
/**
- * @inheritdoc
+ * {@inheritdoc}
*
* @return {object}
* A settings object for the quick edit UI.
@@ -192,7 +192,7 @@
},
/**
- * @inheritdoc
+ * {@inheritdoc}
*/
save() {
const $formContainer = this.$formContainer;
@@ -265,7 +265,7 @@
},
/**
- * @inheritdoc
+ * {@inheritdoc}
*/
showValidationErrors() {
this.$formContainer
diff --git a/web/core/modules/quickedit/js/editors/plainTextEditor.es6.js b/web/core/modules/quickedit/js/editors/plainTextEditor.es6.js
index c509431b97..5e8ba8e61e 100644
--- a/web/core/modules/quickedit/js/editors/plainTextEditor.es6.js
+++ b/web/core/modules/quickedit/js/editors/plainTextEditor.es6.js
@@ -45,7 +45,7 @@
},
/**
- * @inheritdoc
+ * {@inheritdoc}
*
* @return {jQuery}
* The text element for the plain text editor.
@@ -55,7 +55,7 @@
},
/**
- * @inheritdoc
+ * {@inheritdoc}
*
* @param {object} fieldModel
* The field model that holds the state.
@@ -115,7 +115,7 @@
},
/**
- * @inheritdoc
+ * {@inheritdoc}
*
* @return {object}
* A settings object for the quick edit UI.
@@ -130,7 +130,7 @@
},
/**
- * @inheritdoc
+ * {@inheritdoc}
*/
revert() {
this.$textElement.html(this.model.get('originalValue'));
diff --git a/web/core/modules/quickedit/js/models/EntityModel.es6.js b/web/core/modules/quickedit/js/models/EntityModel.es6.js
index c3f10e95e0..2984425318 100644
--- a/web/core/modules/quickedit/js/models/EntityModel.es6.js
+++ b/web/core/modules/quickedit/js/models/EntityModel.es6.js
@@ -243,7 +243,8 @@
// proceed to set the fields to candidate state.
if (
(changedFields.length || this.get('fieldsInTempStore').length) &&
- (!options.saved && !options.confirmed)
+ !options.saved &&
+ !options.confirmed
) {
// Cancel deactivation until the user confirms save or discard.
this.set('state', 'opened', { confirming: true });
@@ -698,7 +699,7 @@
},
/**
- * @inheritdoc
+ * {@inheritdoc}
*/
sync() {
// We don't use REST updates to sync.
diff --git a/web/core/modules/quickedit/js/models/FieldModel.es6.js b/web/core/modules/quickedit/js/models/FieldModel.es6.js
index e07a9faa5f..e7f47846d9 100644
--- a/web/core/modules/quickedit/js/models/FieldModel.es6.js
+++ b/web/core/modules/quickedit/js/models/FieldModel.es6.js
@@ -150,7 +150,7 @@
},
/**
- * @inheritdoc
+ * {@inheritdoc}
*/
sync() {
// We don't use REST updates to sync.
diff --git a/web/core/modules/quickedit/js/theme.es6.js b/web/core/modules/quickedit/js/theme.es6.js
index 17640feec0..fa3a960fc0 100644
--- a/web/core/modules/quickedit/js/theme.es6.js
+++ b/web/core/modules/quickedit/js/theme.es6.js
@@ -17,7 +17,7 @@
*/
Drupal.theme.quickeditBackstage = function(settings) {
let html = '';
- html += `<div id="${settings.id}" />`;
+ html += `<div id="${settings.id}"></div>`;
return html;
};
@@ -39,10 +39,10 @@
html += '<div class="quickedit-toolbar-content">';
html +=
'<div class="quickedit-toolbar quickedit-toolbar-entity clearfix icon icon-pencil">';
- html += '<div class="quickedit-toolbar-label" />';
+ html += '<div class="quickedit-toolbar-label"></div>';
html += '</div>';
html +=
- '<div class="quickedit-toolbar quickedit-toolbar-field clearfix" />';
+ '<div class="quickedit-toolbar quickedit-toolbar-field clearfix"></div>';
html += '</div><div class="quickedit-toolbar-lining"></div></div>';
return html;
};
@@ -74,7 +74,7 @@
* The corresponding HTML.
*/
Drupal.theme.quickeditEntityToolbarFence = function() {
- return '<div id="quickedit-toolbar-fence" />';
+ return '<div id="quickedit-toolbar-fence"></div>';
};
/**
@@ -89,7 +89,7 @@
* The corresponding HTML.
*/
Drupal.theme.quickeditFieldToolbar = function(settings) {
- return `<div id="${settings.id}" />`;
+ return `<div id="${settings.id}"></div>`;
};
/**
diff --git a/web/core/modules/quickedit/js/theme.js b/web/core/modules/quickedit/js/theme.js
index 8b12cd7651..12bc3a63fe 100644
--- a/web/core/modules/quickedit/js/theme.js
+++ b/web/core/modules/quickedit/js/theme.js
@@ -8,7 +8,7 @@
(function ($, Drupal) {
Drupal.theme.quickeditBackstage = function (settings) {
var html = '';
- html += '<div id="' + settings.id + '" />';
+ html += '<div id="' + settings.id + '"></div>';
return html;
};
@@ -18,9 +18,9 @@
html += '<i class="quickedit-toolbar-pointer"></i>';
html += '<div class="quickedit-toolbar-content">';
html += '<div class="quickedit-toolbar quickedit-toolbar-entity clearfix icon icon-pencil">';
- html += '<div class="quickedit-toolbar-label" />';
+ html += '<div class="quickedit-toolbar-label"></div>';
html += '</div>';
- html += '<div class="quickedit-toolbar quickedit-toolbar-field clearfix" />';
+ html += '<div class="quickedit-toolbar quickedit-toolbar-field clearfix"></div>';
html += '</div><div class="quickedit-toolbar-lining"></div></div>';
return html;
};
@@ -30,11 +30,11 @@
};
Drupal.theme.quickeditEntityToolbarFence = function () {
- return '<div id="quickedit-toolbar-fence" />';
+ return '<div id="quickedit-toolbar-fence"></div>';
};
Drupal.theme.quickeditFieldToolbar = function (settings) {
- return '<div id="' + settings.id + '" />';
+ return '<div id="' + settings.id + '"></div>';
};
Drupal.theme.quickeditToolgroup = function (settings) {
diff --git a/web/core/modules/quickedit/js/views/EditorView.es6.js b/web/core/modules/quickedit/js/views/EditorView.es6.js
index f08d8bbab0..b31bcaaf55 100644
--- a/web/core/modules/quickedit/js/views/EditorView.es6.js
+++ b/web/core/modules/quickedit/js/views/EditorView.es6.js
@@ -41,7 +41,7 @@
},
/**
- * @inheritdoc
+ * {@inheritdoc}
*/
remove() {
// The el property is the field, which should not be removed. Remove the
diff --git a/web/core/modules/quickedit/js/views/EntityDecorationView.es6.js b/web/core/modules/quickedit/js/views/EntityDecorationView.es6.js
index 283bed33e9..824e37eb7c 100644
--- a/web/core/modules/quickedit/js/views/EntityDecorationView.es6.js
+++ b/web/core/modules/quickedit/js/views/EntityDecorationView.es6.js
@@ -18,7 +18,7 @@
},
/**
- * @inheritdoc
+ * {@inheritdoc}
*/
render() {
this.$el.toggleClass(
@@ -28,7 +28,7 @@
},
/**
- * @inheritdoc
+ * {@inheritdoc}
*/
remove() {
this.setElement(null);
diff --git a/web/core/modules/quickedit/js/views/EntityToolbarView.es6.js b/web/core/modules/quickedit/js/views/EntityToolbarView.es6.js
index eece46b5a1..35f125ed97 100644
--- a/web/core/modules/quickedit/js/views/EntityToolbarView.es6.js
+++ b/web/core/modules/quickedit/js/views/EntityToolbarView.es6.js
@@ -88,7 +88,7 @@
},
/**
- * @inheritdoc
+ * {@inheritdoc}
*
* @return {Drupal.quickedit.EntityToolbarView}
* The entity toolbar view.
@@ -151,7 +151,7 @@
},
/**
- * @inheritdoc
+ * {@inheritdoc}
*/
remove() {
// Remove additional DOM elements controlled by this View.
diff --git a/web/core/modules/quickedit/js/views/FieldDecorationView.es6.js b/web/core/modules/quickedit/js/views/FieldDecorationView.es6.js
index b3d0317beb..cb93caddb6 100644
--- a/web/core/modules/quickedit/js/views/FieldDecorationView.es6.js
+++ b/web/core/modules/quickedit/js/views/FieldDecorationView.es6.js
@@ -44,7 +44,7 @@
},
/**
- * @inheritdoc
+ * {@inheritdoc}
*/
remove() {
// The el property is the field, which should not be removed. Remove the
diff --git a/web/core/modules/quickedit/js/views/FieldToolbarView.es6.js b/web/core/modules/quickedit/js/views/FieldToolbarView.es6.js
index 76acb0d56d..192f7598de 100644
--- a/web/core/modules/quickedit/js/views/FieldToolbarView.es6.js
+++ b/web/core/modules/quickedit/js/views/FieldToolbarView.es6.js
@@ -56,7 +56,7 @@
},
/**
- * @inheritdoc
+ * {@inheritdoc}
*
* @return {Drupal.quickedit.FieldToolbarView}
* The current FieldToolbarView.
diff --git a/web/core/modules/quickedit/tests/src/Functional/QuickEditCustomPipelineTest.php b/web/core/modules/quickedit/tests/src/Functional/QuickEditCustomPipelineTest.php
index 90ae916873..a2064ee05e 100644
--- a/web/core/modules/quickedit/tests/src/Functional/QuickEditCustomPipelineTest.php
+++ b/web/core/modules/quickedit/tests/src/Functional/QuickEditCustomPipelineTest.php
@@ -96,12 +96,12 @@ public function testCustomPipeline() {
'http_errors' => FALSE,
]);
$ajax_commands = Json::decode($response->getBody());
- $this->assertIdentical(1, count($ajax_commands), 'The field form HTTP request results in one AJAX command.');
+ $this->assertCount(1, $ajax_commands, 'The field form HTTP request results in one AJAX command.');
$this->assertIdentical('quickeditFieldFormSaved', $ajax_commands[0]['command'], 'The first AJAX command is a quickeditFieldFormSaved command.');
- $this->assertContains('Fine thanks.', $ajax_commands[0]['data'], 'Form value saved and printed back.');
- $this->assertContains('<div class="quickedit-test-wrapper">', $ajax_commands[0]['data'], 'Custom render pipeline used to render the value.');
+ $this->assertStringContainsString('Fine thanks.', $ajax_commands[0]['data'], 'Form value saved and printed back.');
+ $this->assertStringContainsString('<div class="quickedit-test-wrapper">', $ajax_commands[0]['data'], 'Custom render pipeline used to render the value.');
$this->assertIdentical(array_keys($ajax_commands[0]['other_view_modes']), ['full'], 'Field was also rendered in the "full" view mode.');
- $this->assertContains('Fine thanks.', $ajax_commands[0]['other_view_modes']['full'], '"full" version of field contains the form value.');
+ $this->assertStringContainsString('Fine thanks.', $ajax_commands[0]['other_view_modes']['full'], '"full" version of field contains the form value.');
}
}
diff --git a/web/core/modules/quickedit/tests/src/FunctionalJavascript/QuickEditAutocompleteTermTest.php b/web/core/modules/quickedit/tests/src/FunctionalJavascript/QuickEditAutocompleteTermTest.php
index f08ea2d46b..ba94f6798a 100644
--- a/web/core/modules/quickedit/tests/src/FunctionalJavascript/QuickEditAutocompleteTermTest.php
+++ b/web/core/modules/quickedit/tests/src/FunctionalJavascript/QuickEditAutocompleteTermTest.php
@@ -165,8 +165,8 @@ public function testAutocompleteQuickEdit() {
$tags = $tag_field->getValue();
// Check existing terms.
- $this->assertTrue(strpos($tags, $this->term1->label()) !== FALSE);
- $this->assertTrue(strpos($tags, $this->term2->label()) !== FALSE);
+ $this->assertStringContainsString($this->term1->label(), $tags);
+ $this->assertStringContainsString($this->term2->label(), $tags);
// Add new term.
$new_tag = $this->randomMachineName();
diff --git a/web/core/modules/quickedit/tests/src/FunctionalJavascript/QuickEditLoadingTest.php b/web/core/modules/quickedit/tests/src/FunctionalJavascript/QuickEditLoadingTest.php
index 4f52c00efa..4b79785c23 100644
--- a/web/core/modules/quickedit/tests/src/FunctionalJavascript/QuickEditLoadingTest.php
+++ b/web/core/modules/quickedit/tests/src/FunctionalJavascript/QuickEditLoadingTest.php
@@ -258,7 +258,7 @@ public function testDisplayOptions() {
];
$build = $node->body->view($display_settings);
$output = \Drupal::service('renderer')->renderRoot($build);
- $this->assertFalse(strpos($output, 'data-quickedit-field-id'), 'data-quickedit-field-id attribute not added when rendering field using dynamic display options.');
+ $this->assertStringNotContainsString('data-quickedit-field-id', $output, 'data-quickedit-field-id attribute not added when rendering field using dynamic display options.');
}
/**
diff --git a/web/core/modules/quickedit/tests/src/Kernel/QuickEditTestBase.php b/web/core/modules/quickedit/tests/src/Kernel/QuickEditTestBase.php
index 127ab62d85..91dd46f082 100644
--- a/web/core/modules/quickedit/tests/src/Kernel/QuickEditTestBase.php
+++ b/web/core/modules/quickedit/tests/src/Kernel/QuickEditTestBase.php
@@ -16,7 +16,16 @@ abstract class QuickEditTestBase extends KernelTestBase {
*
* @var array
*/
- public static $modules = ['system', 'entity_test', 'field', 'field_test', 'filter', 'user', 'text', 'quickedit'];
+ public static $modules = [
+ 'system',
+ 'entity_test',
+ 'field',
+ 'field_test',
+ 'filter',
+ 'user',
+ 'text',
+ 'quickedit',
+ ];
/**
* Bag of created fields.
diff --git a/web/core/modules/rdf/rdf.module b/web/core/modules/rdf/rdf.module
index 56204e1dd6..92cc337fc1 100644
--- a/web/core/modules/rdf/rdf.module
+++ b/web/core/modules/rdf/rdf.module
@@ -117,7 +117,7 @@ function rdf_get_namespaces() {
$function = $module . '_rdf_namespaces';
foreach ($function() as $prefix => $namespace) {
if (array_key_exists($prefix, $namespaces) && $namespace !== $namespaces[$prefix]) {
- throw new Exception(t('Tried to map @prefix to @namespace, but @prefix is already mapped to @orig_namespace.', ['@prefix' => $prefix, '@namespace' => $namespace, '@orig_namespace' => $namespaces[$prefix]]));
+ throw new Exception("Tried to map '$prefix' to '$namespace', but '$prefix' is already mapped to '{$namespaces[$prefix]}'.");
}
else {
$namespaces[$prefix] = $namespace;
diff --git a/web/core/modules/rdf/tests/src/Kernel/CrudTest.php b/web/core/modules/rdf/tests/src/Kernel/CrudTest.php
index f8292a38b7..24b352a475 100644
--- a/web/core/modules/rdf/tests/src/Kernel/CrudTest.php
+++ b/web/core/modules/rdf/tests/src/Kernel/CrudTest.php
@@ -49,7 +49,7 @@ public function testMappingCreation() {
rdf_get_mapping($this->entityType, $this->bundle)->save();
// Test that config file was saved.
$mapping_config = \Drupal::configFactory()->listAll('rdf.mapping.');
- $this->assertTrue(in_array($mapping_config_name, $mapping_config), 'Rdf mapping config saved.');
+ $this->assertContains($mapping_config_name, $mapping_config, 'Rdf mapping config saved.');
}
/**
diff --git a/web/core/modules/rdf/tests/src/Traits/EasyRdf_ParsedUri.php b/web/core/modules/rdf/tests/src/Traits/EasyRdf_ParsedUri.php
index 2c2aa7893e..e433d46bfb 100644
--- a/web/core/modules/rdf/tests/src/Traits/EasyRdf_ParsedUri.php
+++ b/web/core/modules/rdf/tests/src/Traits/EasyRdf_ParsedUri.php
@@ -6,7 +6,7 @@
/**
* This is copy of \EasyRdf_ParsedUri from the easyrdf/easyrdf library.
*
- * It fixes a PHP 7.4 deprecation in \EasyRdf_ParsedUri::normalise().
+ * It fixes a PHP 7.4 deprecation in \EasyRdf_ParsedUri::normalize().
*
* @todo https://www.drupal.org/project/drupal/issues/3110972 Remove this work
* around.
@@ -204,14 +204,14 @@ public function setFragment($fragment)
/**
- * Normalises the path of this URI if it has one. Normalising a path means
+ * Normalizes the path of this URI if it has one. Normalizing a path means
* that any unnecessary '.' and '..' segments are removed. For example, the
- * URI http://example.com/a/b/../c/./d would be normalised to
+ * URI http://example.com/a/b/../c/./d would be normalized to
* http://example.com/a/c/d
*
* @return object EasyRdf_ParsedUri
*/
- public function normalise()
+ public function normalize()
{
if (empty($this->path)) {
return $this;
@@ -253,7 +253,7 @@ public function normalise()
}
}
- // Construct the new normalised path
+ // Construct the new normalized path
$this->path = implode('/', $newSegments);
// Allow easy chaining of methods
@@ -313,7 +313,7 @@ public function resolve($relUri)
$target->fragment = $relUri->fragment;
- $target->normalise();
+ $target->normalize();
return $target;
}
diff --git a/web/core/modules/rdf/tests/src/Traits/RdfParsingTrait.php b/web/core/modules/rdf/tests/src/Traits/RdfParsingTrait.php
index 2e1d80204a..143e658323 100644
--- a/web/core/modules/rdf/tests/src/Traits/RdfParsingTrait.php
+++ b/web/core/modules/rdf/tests/src/Traits/RdfParsingTrait.php
@@ -5,7 +5,7 @@
use Drupal\Core\Url;
/**
- * Override \EasyRdf_ParsedUri for PHP 7.4 compatibilty.
+ * Override \EasyRdf_ParsedUri for PHP 7.4 compatibility.
*
* @todo https://www.drupal.org/project/drupal/issues/3110972 Remove this work
* around.
diff --git a/web/core/modules/responsive_image/src/Entity/ResponsiveImageStyle.php b/web/core/modules/responsive_image/src/Entity/ResponsiveImageStyle.php
index bf1943aa1d..508c8f4330 100644
--- a/web/core/modules/responsive_image/src/Entity/ResponsiveImageStyle.php
+++ b/web/core/modules/responsive_image/src/Entity/ResponsiveImageStyle.php
@@ -237,6 +237,7 @@ public static function isEmptyImageStyleMapping(array $image_style_mapping) {
return FALSE;
}
break;
+
case 'image_style':
// The image style mapping must have an image style selected.
if ($image_style_mapping['image_mapping']) {
@@ -270,6 +271,7 @@ public function getImageStyleIds() {
case 'image_style':
$image_styles[] = $image_style_mapping['image_mapping'];
break;
+
case 'sizes':
$image_styles = array_merge($image_styles, $image_style_mapping['image_mapping']['sizes_image_styles']);
break;
diff --git a/web/core/modules/responsive_image/src/ResponsiveImageStyleListBuilder.php b/web/core/modules/responsive_image/src/ResponsiveImageStyleListBuilder.php
index e6fdcfa8db..cb69bb6250 100644
--- a/web/core/modules/responsive_image/src/ResponsiveImageStyleListBuilder.php
+++ b/web/core/modules/responsive_image/src/ResponsiveImageStyleListBuilder.php
@@ -15,7 +15,6 @@ class ResponsiveImageStyleListBuilder extends ConfigEntityListBuilder {
*/
public function buildHeader() {
$header['label'] = t('Label');
- $header['id'] = t('Machine name');
return $header + parent::buildHeader();
}
@@ -24,7 +23,6 @@ public function buildHeader() {
*/
public function buildRow(EntityInterface $entity) {
$row['label'] = $entity->label();
- $row['id'] = $entity->id();
return $row + parent::buildRow($entity);
}
diff --git a/web/core/modules/responsive_image/templates/responsive-image.html.twig b/web/core/modules/responsive_image/templates/responsive-image.html.twig
index 99fca6b8cf..986d408f8c 100644
--- a/web/core/modules/responsive_image/templates/responsive-image.html.twig
+++ b/web/core/modules/responsive_image/templates/responsive-image.html.twig
@@ -20,15 +20,9 @@
{% else %}
<picture>
{% if sources %}
- {#
- Internet Explorer 9 doesn't recognise source elements that are wrapped in
- picture tags. See http://scottjehl.github.io/picturefill/#ie9
- #}
- <!--[if IE 9]><video style="display: none;"><![endif]-->
{% for source_attributes in sources %}
<source{{ source_attributes }}/>
{% endfor %}
- <!--[if IE 9]></video><![endif]-->
{% endif %}
{# The controlling image, with the fallback image in srcset. #}
{{ img_element }}
diff --git a/web/core/modules/responsive_image/tests/src/Functional/ResponsiveImageAdminUITest.php b/web/core/modules/responsive_image/tests/src/Functional/ResponsiveImageAdminUITest.php
index e34b425e03..edfe123789 100644
--- a/web/core/modules/responsive_image/tests/src/Functional/ResponsiveImageAdminUITest.php
+++ b/web/core/modules/responsive_image/tests/src/Functional/ResponsiveImageAdminUITest.php
@@ -17,7 +17,10 @@ class ResponsiveImageAdminUITest extends BrowserTestBase {
*
* @var array
*/
- public static $modules = ['responsive_image', 'responsive_image_test_module'];
+ public static $modules = [
+ 'responsive_image',
+ 'responsive_image_test_module',
+ ];
/**
* {@inheritdoc}
@@ -58,11 +61,10 @@ public function testResponsiveImageAdmin() {
$this->drupalPostForm('admin/config/media/responsive-image-style/add', $edit, t('Save'));
// Check if the new group is created.
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->drupalGet('admin/config/media/responsive-image-style');
$this->assertNoText('There are no responsive image styles yet.');
$this->assertText('Style One');
- $this->assertText('style_one');
// Edit the group.
$this->drupalGet('admin/config/media/responsive-image-style/style_one');
diff --git a/web/core/modules/responsive_image/tests/src/Functional/ResponsiveImageFieldDisplayTest.php b/web/core/modules/responsive_image/tests/src/Functional/ResponsiveImageFieldDisplayTest.php
index 9b805d6e62..473da7cf12 100644
--- a/web/core/modules/responsive_image/tests/src/Functional/ResponsiveImageFieldDisplayTest.php
+++ b/web/core/modules/responsive_image/tests/src/Functional/ResponsiveImageFieldDisplayTest.php
@@ -40,7 +40,11 @@ class ResponsiveImageFieldDisplayTest extends ImageFieldTestBase {
*
* @var array
*/
- public static $modules = ['field_ui', 'responsive_image', 'responsive_image_test_module'];
+ public static $modules = [
+ 'field_ui',
+ 'responsive_image',
+ 'responsive_image_test_module',
+ ];
/**
* Drupal\simpletest\WebTestBase\setUp().
@@ -264,10 +268,10 @@ protected function doTestResponsiveImageFieldFormatters($scheme, $empty_styles =
$this->assertEqual($this->drupalGetHeader('Content-Type'), 'image/png', 'Content-Type header was sent.');
$this->assertTrue(strstr($this->drupalGetHeader('Cache-Control'), 'private') !== FALSE, 'Cache-Control header was sent.');
- // Log out and try to access the file.
+ // Log out and ensure the file cannot be accessed.
$this->drupalLogout();
$this->drupalGet(file_create_url($image_uri));
- $this->assertResponse('403', 'Access denied to original image as anonymous user.');
+ $this->assertSession()->statusCodeEquals(403);
// Log in again.
$this->drupalLogin($this->adminUser);
@@ -287,9 +291,6 @@ protected function doTestResponsiveImageFieldFormatters($scheme, $empty_styles =
$this->drupalGet('node/' . $nid);
if (!$empty_styles) {
$this->assertRaw('/styles/medium/');
- // Make sure the IE9 workaround is present.
- $this->assertRaw('<!--[if IE 9]><video style="display: none;"><![endif]-->');
- $this->assertRaw('<!--[if IE 9]></video><![endif]-->');
// Assert the empty image is present.
$this->assertRaw('data:image/gif;base64,R0lGODlhAQABAIABAP///wAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==');
$thumbnail_style = ImageStyle::load('thumbnail');
@@ -311,13 +312,13 @@ protected function doTestResponsiveImageFieldFormatters($scheme, $empty_styles =
}
$this->assertRaw('/styles/large/');
$cache_tags = explode(' ', $this->drupalGetHeader('X-Drupal-Cache-Tags'));
- $this->assertTrue(in_array('config:responsive_image.styles.style_one', $cache_tags));
+ $this->assertContains('config:responsive_image.styles.style_one', $cache_tags);
if (!$empty_styles) {
- $this->assertTrue(in_array('config:image.style.medium', $cache_tags));
- $this->assertTrue(in_array('config:image.style.thumbnail', $cache_tags));
+ $this->assertContains('config:image.style.medium', $cache_tags);
+ $this->assertContains('config:image.style.thumbnail', $cache_tags);
$this->assertRaw('type="image/png"');
}
- $this->assertTrue(in_array('config:image.style.large', $cache_tags));
+ $this->assertContains('config:image.style.large', $cache_tags);
// Test the fallback image style.
$image = \Drupal::service('image.factory')->get($image_uri);
@@ -333,10 +334,10 @@ protected function doTestResponsiveImageFieldFormatters($scheme, $empty_styles =
$this->assertRaw($default_output, 'Image style large formatter displaying correctly on full node view.');
if ($scheme == 'private') {
- // Log out and try to access the file.
+ // Log out and ensure the file cannot be accessed.
$this->drupalLogout();
$this->drupalGet($large_style->buildUrl($image_uri));
- $this->assertResponse('403', 'Access denied to image style large as anonymous user.');
+ $this->assertSession()->statusCodeEquals(403);
$cache_tags_header = $this->drupalGetHeader('X-Drupal-Cache-Tags');
$this->assertTrue(!preg_match('/ image_style\:/', $cache_tags_header), 'No image style cache tag found.');
}
diff --git a/web/core/modules/responsive_image/tests/src/Kernel/ResponsiveImageIntegrationTest.php b/web/core/modules/responsive_image/tests/src/Kernel/ResponsiveImageIntegrationTest.php
index b77edd8cc1..a4200099d9 100644
--- a/web/core/modules/responsive_image/tests/src/Kernel/ResponsiveImageIntegrationTest.php
+++ b/web/core/modules/responsive_image/tests/src/Kernel/ResponsiveImageIntegrationTest.php
@@ -18,7 +18,16 @@ class ResponsiveImageIntegrationTest extends KernelTestBase {
/**
* {@inheritdoc}
*/
- public static $modules = ['responsive_image', 'field', 'image', 'file', 'entity_test', 'breakpoint', 'responsive_image_test_module', 'user'];
+ public static $modules = [
+ 'responsive_image',
+ 'field',
+ 'image',
+ 'file',
+ 'entity_test',
+ 'breakpoint',
+ 'responsive_image_test_module',
+ 'user',
+ ];
/**
* {@inheritdoc}
diff --git a/web/core/modules/rest/src/Entity/ConfigDependencies.php b/web/core/modules/rest/src/Entity/ConfigDependencies.php
index 4b03057e57..5acaacd6a0 100644
--- a/web/core/modules/rest/src/Entity/ConfigDependencies.php
+++ b/web/core/modules/rest/src/Entity/ConfigDependencies.php
@@ -78,9 +78,11 @@ public function calculateDependencies(RestResourceConfigInterface $rest_config)
case RestResourceConfigInterface::METHOD_GRANULARITY:
$methods = $rest_config->getMethods();
break;
+
case RestResourceConfigInterface::RESOURCE_GRANULARITY:
$methods = array_slice($rest_config->getMethods(), 0, 1);
break;
+
default:
throw new \InvalidArgumentException('Invalid granularity specified.');
}
@@ -127,8 +129,10 @@ public function onDependencyRemoval(RestResourceConfigInterface $rest_config, ar
switch ($granularity) {
case RestResourceConfigInterface::METHOD_GRANULARITY:
return $this->onDependencyRemovalForMethodGranularity($rest_config, $dependencies);
+
case RestResourceConfigInterface::RESOURCE_GRANULARITY:
return $this->onDependencyRemovalForResourceGranularity($rest_config, $dependencies);
+
default:
throw new \InvalidArgumentException('Invalid granularity specified.');
}
diff --git a/web/core/modules/rest/src/Entity/RestResourceConfig.php b/web/core/modules/rest/src/Entity/RestResourceConfig.php
index c0a4e5c04c..bd9ce804ed 100644
--- a/web/core/modules/rest/src/Entity/RestResourceConfig.php
+++ b/web/core/modules/rest/src/Entity/RestResourceConfig.php
@@ -125,8 +125,10 @@ public function getMethods() {
switch ($this->granularity) {
case RestResourceConfigInterface::METHOD_GRANULARITY:
return $this->getMethodsForMethodGranularity();
+
case RestResourceConfigInterface::RESOURCE_GRANULARITY:
return $this->configuration['methods'];
+
default:
throw new \InvalidArgumentException('Invalid granularity specified.');
}
@@ -150,8 +152,10 @@ public function getAuthenticationProviders($method) {
switch ($this->granularity) {
case RestResourceConfigInterface::METHOD_GRANULARITY:
return $this->getAuthenticationProvidersForMethodGranularity($method);
+
case RestResourceConfigInterface::RESOURCE_GRANULARITY:
return $this->configuration['authentication'];
+
default:
throw new \InvalidArgumentException('Invalid granularity specified.');
}
@@ -181,8 +185,10 @@ public function getFormats($method) {
switch ($this->granularity) {
case RestResourceConfigInterface::METHOD_GRANULARITY:
return $this->getFormatsForMethodGranularity($method);
+
case RestResourceConfigInterface::RESOURCE_GRANULARITY:
return $this->configuration['formats'];
+
default:
throw new \InvalidArgumentException('Invalid granularity specified.');
}
@@ -215,7 +221,7 @@ public function getPluginCollections() {
}
/**
- * (@inheritdoc)
+ * {@inheritdoc}
*/
public function calculateDependencies() {
parent::calculateDependencies();
diff --git a/web/core/modules/rest/src/Plugin/rest/resource/EntityResource.php b/web/core/modules/rest/src/Plugin/rest/resource/EntityResource.php
index 0203835aa9..6b7dd26dff 100644
--- a/web/core/modules/rest/src/Plugin/rest/resource/EntityResource.php
+++ b/web/core/modules/rest/src/Plugin/rest/resource/EntityResource.php
@@ -379,13 +379,16 @@ protected function getBaseRoute($canonical_path, $method) {
case 'GET':
$route->setRequirement('_entity_access', $this->entityType->id() . '.view');
break;
+
case 'POST':
$route->setRequirement('_entity_create_any_access', $this->entityType->id());
$route->setOption('_ignore_create_bundle_access', TRUE);
break;
+
case 'PATCH':
$route->setRequirement('_entity_access', $this->entityType->id() . '.update');
break;
+
case 'DELETE':
$route->setRequirement('_entity_access', $this->entityType->id() . '.delete');
break;
diff --git a/web/core/modules/rest/src/RequestHandler.php b/web/core/modules/rest/src/RequestHandler.php
index ef4ac19d49..e1c424aa7c 100644
--- a/web/core/modules/rest/src/RequestHandler.php
+++ b/web/core/modules/rest/src/RequestHandler.php
@@ -284,9 +284,15 @@ protected function createArgumentResolver(RouteMatchInterface $route_match, $uns
}
if (in_array($request->getMethod(), ['PATCH', 'POST'], TRUE)) {
- $upcasted_route_arguments['entity'] = $unserialized;
- $upcasted_route_arguments['data'] = $unserialized;
- $upcasted_route_arguments['unserialized'] = $unserialized;
+ if (is_object($unserialized)) {
+ $upcasted_route_arguments['entity'] = $unserialized;
+ $upcasted_route_arguments['data'] = $unserialized;
+ $upcasted_route_arguments['unserialized'] = $unserialized;
+ }
+ else {
+ $raw_route_arguments['data'] = $unserialized;
+ $raw_route_arguments['unserialized'] = $unserialized;
+ }
$upcasted_route_arguments['original_entity'] = $route_arguments_entity;
}
else {
diff --git a/web/core/modules/rest/tests/modules/rest_test/rest_test.module b/web/core/modules/rest/tests/modules/rest_test/rest_test.module
index 9839edbf39..67aa7cd541 100644
--- a/web/core/modules/rest/tests/modules/rest_test/rest_test.module
+++ b/web/core/modules/rest/tests/modules/rest_test/rest_test.module
@@ -26,6 +26,7 @@ function rest_test_entity_field_access($operation, FieldDefinitionInterface $fie
// Never ever allow this field to be viewed: this lets
// EntityResourceTestBase::testGet() test in a "vanilla" way.
return AccessResult::forbidden();
+
case 'edit':
return AccessResult::forbidden();
}
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/EntityResourceTestBase.php b/web/core/modules/rest/tests/src/Functional/EntityResource/EntityResourceTestBase.php
index a7b906f50b..52ad147d7b 100644
--- a/web/core/modules/rest/tests/src/Functional/EntityResource/EntityResourceTestBase.php
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/EntityResourceTestBase.php
@@ -863,7 +863,7 @@ public function testPost() {
$response = $this->request('POST', $url, $request_options);
$this->assertSame(415, $response->getStatusCode());
$this->assertSame(['text/html; charset=UTF-8'], $response->getHeader('Content-Type'));
- $this->assertContains('A client error happened', (string) $response->getBody());
+ $this->assertStringContainsString('A client error happened', (string) $response->getBody());
$url->setOption('query', ['_format' => static::$format]);
@@ -997,7 +997,7 @@ public function testPost() {
$response = $this->request('POST', $url, $request_options);
$this->assertSame(500, $response->getStatusCode());
- $this->assertContains('Internal Server Error', (string) $response->getBody());
+ $this->assertStringContainsString('Internal Server Error', (string) $response->getBody());
// 201 when successfully creating an entity with a new UUID.
$normalized_entity = $this->getModifiedEntityForPostTesting();
@@ -1071,7 +1071,7 @@ public function testPatch() {
$this->assertSame(405, $response->getStatusCode());
$this->assertSame(['GET, POST, HEAD'], $response->getHeader('Allow'));
$this->assertSame(['text/html; charset=UTF-8'], $response->getHeader('Content-Type'));
- $this->assertContains('A client error happened', (string) $response->getBody());
+ $this->assertStringContainsString('A client error happened', (string) $response->getBody());
}
else {
$this->assertSame(404, $response->getStatusCode());
@@ -1097,7 +1097,7 @@ public function testPatch() {
$response = $this->request('PATCH', $url, $request_options);
$this->assertSame(415, $response->getStatusCode());
$this->assertSame(['text/html; charset=UTF-8'], $response->getHeader('Content-Type'));
- $this->assertContains('A client error happened', (string) $response->getBody());
+ $this->assertStringContainsString('A client error happened', (string) $response->getBody());
$url->setOption('query', ['_format' => static::$format]);
@@ -1313,7 +1313,7 @@ public function testDelete() {
$this->assertSame(405, $response->getStatusCode());
$this->assertSame(['GET, POST, HEAD'], $response->getHeader('Allow'));
$this->assertSame(['text/html; charset=UTF-8'], $response->getHeader('Content-Type'));
- $this->assertContains('A client error happened', (string) $response->getBody());
+ $this->assertStringContainsString('A client error happened', (string) $response->getBody());
}
else {
$this->assertSame(404, $response->getStatusCode());
@@ -1413,7 +1413,7 @@ protected function assertPatchProtectedFieldNamesStructure() {
};
$keys_are_field_names = Inspector::assertAllStrings(array_keys(static::$patchProtectedFieldNames));
$values_are_expected_access_denied_reasons = Inspector::assertAll($is_null_or_string, static::$patchProtectedFieldNames);
- $this->assertTrue($keys_are_field_names && $values_are_expected_access_denied_reasons, 'In Drupal 8.6, the structure of $patchProtectectedFieldNames changed. It used to be an array with field names as values. Now those values are the keys, and their values should be either NULL or a string: a string containing the reason for why the field cannot be PATCHed, or NULL otherwise.');
+ $this->assertTrue($keys_are_field_names && $values_are_expected_access_denied_reasons, 'In Drupal 8.6, the structure of $patchProtectedFieldNames changed. It used to be an array with field names as values. Now those values are the keys, and their values should be either NULL or a string: a string containing the reason for why the field cannot be PATCHed, or NULL otherwise.');
}
/**
@@ -1467,17 +1467,20 @@ protected static function getModifiedEntityForPatchTesting(EntityInterface $enti
// is valid, we only care that it's different.
$field->setValue(['target_id' => 99999]);
break;
+
case BooleanItem::class:
// BooleanItem::generateSampleValue() picks either 0 or 1. So a 50%
// chance of not picking a different value.
$field->value = ((int) $field->value) === 1 ? '0' : '1';
break;
+
case PathItem::class:
// PathItem::generateSampleValue() doesn't set a PID, which causes
// PathItem::postSave() to fail. Keep the PID (and other properties),
// just modify the alias.
$field->alias = str_replace(' ', '-', strtolower((new Random())->sentences(3)));
break;
+
default:
$original_field = clone $field;
while ($field->equals($original_field)) {
@@ -1510,9 +1513,11 @@ protected function makeNormalizationInvalid(array $normalization, $entity_key) {
$normalization[$label_field][1]['value'] = 'Second Title';
}
break;
+
case 'id':
$normalization[$entity_type->getKey('id')][0]['value'] = $this->anotherEntity->id();
break;
+
case 'uuid':
$normalization[$entity_type->getKey('uuid')][0]['value'] = $this->anotherEntity->uuid();
break;
@@ -1548,10 +1553,10 @@ protected function assert406Response(ResponseInterface $response) {
$this->assertSame(406, $response->getStatusCode());
$actual_link_header = $response->getHeader('Link');
if ($actual_link_header) {
- $this->assertTrue(is_array($actual_link_header));
+ $this->assertIsArray($actual_link_header);
$expected_type = explode(';', static::$mimeType)[0];
- $this->assertContains('?_format=' . static::$format . '>; rel="alternate"; type="' . $expected_type . '"', $actual_link_header[0]);
- $this->assertContains('?_format=foobar>; rel="alternate"', $actual_link_header[0]);
+ $this->assertStringContainsString('?_format=' . static::$format . '>; rel="alternate"; type="' . $expected_type . '"', $actual_link_header[0]);
+ $this->assertStringContainsString('?_format=foobar>; rel="alternate"', $actual_link_header[0]);
}
}
}
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/XmlEntityNormalizationQuirksTrait.php b/web/core/modules/rest/tests/src/Functional/EntityResource/XmlEntityNormalizationQuirksTrait.php
index a7e588ad35..243b01bc88 100644
--- a/web/core/modules/rest/tests/src/Functional/EntityResource/XmlEntityNormalizationQuirksTrait.php
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/XmlEntityNormalizationQuirksTrait.php
@@ -70,20 +70,24 @@ protected function applyXmlFieldDecodingQuirks(array $normalization) {
$value = &$normalization[$field_name][$i]['value'];
$value = $value === TRUE ? '1' : '0';
break;
+
case IntegerItem::class:
case ListIntegerItem::class:
$value = &$normalization[$field_name][$i]['value'];
$value = (string) $value;
break;
+
case PathItem::class:
$pid = &$normalization[$field_name][$i]['pid'];
$pid = (string) $pid;
break;
+
case EntityReferenceItem::class:
case FileItem::class:
$target_id = &$normalization[$field_name][$i]['target_id'];
$target_id = (string) $target_id;
break;
+
case ChangedItem::class:
case CreatedItem::class:
case TimestampItem::class:
@@ -92,6 +96,7 @@ protected function applyXmlFieldDecodingQuirks(array $normalization) {
$value = (string) $value;
}
break;
+
case ImageItem::class:
$height = &$normalization[$field_name][$i]['height'];
$height = (string) $height;
diff --git a/web/core/modules/rest/tests/src/Functional/FileUploadResourceTestBase.php b/web/core/modules/rest/tests/src/Functional/FileUploadResourceTestBase.php
index a092621103..eb26456192 100644
--- a/web/core/modules/rest/tests/src/Functional/FileUploadResourceTestBase.php
+++ b/web/core/modules/rest/tests/src/Functional/FileUploadResourceTestBase.php
@@ -143,6 +143,19 @@ public function setUp() {
'status' => TRUE,
])->save();
+ // Provisioning the file upload REST resource without the File REST resource
+ // does not make sense.
+ $this->resourceConfigStorage->create([
+ 'id' => 'entity.file',
+ 'granularity' => RestResourceConfigInterface::RESOURCE_GRANULARITY,
+ 'configuration' => [
+ 'methods' => ['GET'],
+ 'formats' => [static::$format],
+ 'authentication' => isset(static::$auth) ? [static::$auth] : [],
+ ],
+ 'status' => TRUE,
+ ])->save();
+
$this->refreshTestStateAfterRestConfigChange();
}
@@ -372,7 +385,7 @@ public function testFileUploadStrippedFilePath() {
// Check the actual file data. It should have been written to the configured
// directory, not /foobar/directory/example.txt.
$this->assertSame($this->testFileData, file_get_contents('public://foobar/example_2.txt'));
- $this->assertFalse(file_exists('../../example_2.txt'));
+ $this->assertFileNotExists('../../example_2.txt');
// Check a path from the root. Extensions have to be empty to allow a file
// with no extension to pass validation.
@@ -455,7 +468,7 @@ public function testFileUploadInvalidFileType() {
// Make sure that no file was saved.
$this->assertEmpty(File::load(1));
- $this->assertFalse(file_exists('public://foobar/example.txt'));
+ $this->assertFileNotExists('public://foobar/example.txt');
}
/**
@@ -481,7 +494,7 @@ public function testFileUploadLargerFileSize() {
// Make sure that no file was saved.
$this->assertEmpty(File::load(1));
- $this->assertFalse(file_exists('public://foobar/example.txt'));
+ $this->assertFileNotExists('public://foobar/example.txt');
}
/**
@@ -510,7 +523,7 @@ public function testFileUploadMaliciousExtension() {
// Override the expected filesize.
$expected['filesize'][0]['value'] = strlen($php_string);
$this->assertResponseData($expected, $response);
- $this->assertTrue(file_exists('public://foobar/example.php.txt'));
+ $this->assertFileExists('public://foobar/example.php.txt');
// Add php as an allowed format. Allow insecure uploads still being FALSE
// should still not allow this. So it should still have a .txt extension
@@ -524,8 +537,8 @@ public function testFileUploadMaliciousExtension() {
// Override the expected filesize.
$expected['filesize'][0]['value'] = strlen($php_string);
$this->assertResponseData($expected, $response);
- $this->assertTrue(file_exists('public://foobar/example_2.php.txt'));
- $this->assertFalse(file_exists('public://foobar/example_2.php'));
+ $this->assertFileExists('public://foobar/example_2.php.txt');
+ $this->assertFileNotExists('public://foobar/example_2.php');
// Allow .doc file uploads and ensure even a mis-configured apache will not
// fallback to php because the filename will be munged.
@@ -541,8 +554,8 @@ public function testFileUploadMaliciousExtension() {
// The file mime should be 'application/msword'.
$expected['filemime'][0]['value'] = 'application/msword';
$this->assertResponseData($expected, $response);
- $this->assertTrue(file_exists('public://foobar/example_3.php_.doc'));
- $this->assertFalse(file_exists('public://foobar/example_3.php.doc'));
+ $this->assertFileExists('public://foobar/example_3.php_.doc');
+ $this->assertFileNotExists('public://foobar/example_3.php.doc');
// Now allow insecure uploads.
\Drupal::configFactory()
@@ -560,7 +573,7 @@ public function testFileUploadMaliciousExtension() {
// The file mime should also now be PHP.
$expected['filemime'][0]['value'] = 'application/x-httpd-php';
$this->assertResponseData($expected, $response);
- $this->assertTrue(file_exists('public://foobar/example_4.php'));
+ $this->assertFileExists('public://foobar/example_4.php');
}
/**
@@ -583,7 +596,7 @@ public function testFileUploadNoExtensionSetting() {
$expected = $this->getExpectedNormalizedEntity(1, 'example.txt', TRUE);
$this->assertResponseData($expected, $response);
- $this->assertTrue(file_exists('public://foobar/example.txt'));
+ $this->assertFileExists('public://foobar/example.txt');
}
/**
@@ -724,6 +737,7 @@ protected function setUpAuthorization($method) {
case 'GET':
$this->grantPermissionsToTestedRole(['view test entity']);
break;
+
case 'POST':
$this->grantPermissionsToTestedRole(['create entity_test entity_test_with_bundle entities', 'access content']);
break;
diff --git a/web/core/modules/rest/tests/src/Functional/ResourceTest.php b/web/core/modules/rest/tests/src/Functional/ResourceTest.php
index 57a6840bff..6b69def2ae 100644
--- a/web/core/modules/rest/tests/src/Functional/ResourceTest.php
+++ b/web/core/modules/rest/tests/src/Functional/ResourceTest.php
@@ -83,7 +83,7 @@ public function testFormats() {
// means there's always a match and hence when there is no matching REST
// route, the non-REST route is used, but can't render into
// application/hal+json, so it returns a 406.
- $this->assertResponse('406', 'HTTP response code is 406 when the resource does not define formats, because it falls back to the canonical, non-REST route.');
+ $this->assertSession()->statusCodeEquals(406);
}
/**
@@ -109,7 +109,7 @@ public function testAuthentication() {
// means there's always a match and hence when there is no matching REST
// route, the non-REST route is used, but can't render into
// application/hal+json, so it returns a 406.
- $this->assertResponse('406', 'HTTP response code is 406 when the resource does not define formats, because it falls back to the canonical, non-REST route.');
+ $this->assertSession()->statusCodeEquals(406);
}
/**
@@ -157,7 +157,7 @@ public function testUriPaths() {
foreach ($manager->getDefinitions() as $resource => $definition) {
foreach ($definition['uri_paths'] as $key => $uri_path) {
- $this->assertFalse(strpos($uri_path, '//'), 'The resource URI path does not have duplicate slashes.');
+ $this->assertStringNotContainsString('//', $uri_path, 'The resource URI path does not have duplicate slashes.');
}
}
}
diff --git a/web/core/modules/rest/tests/src/Functional/Views/ExcludedFieldTokenTest.php b/web/core/modules/rest/tests/src/Functional/Views/ExcludedFieldTokenTest.php
index 22d583fde6..13de1c706e 100644
--- a/web/core/modules/rest/tests/src/Functional/Views/ExcludedFieldTokenTest.php
+++ b/web/core/modules/rest/tests/src/Functional/Views/ExcludedFieldTokenTest.php
@@ -72,7 +72,7 @@ protected function setUp($import_test_views = TRUE) {
*/
public function testExcludedTitleTokenDisplay() {
$actual_json = $this->drupalGet($this->view->getPath(), ['query' => ['_format' => 'json']]);
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$expected = [
['nothing' => 'Article test 10'],
diff --git a/web/core/modules/rest/tests/src/Functional/Views/FieldCounterTest.php b/web/core/modules/rest/tests/src/Functional/Views/FieldCounterTest.php
index ef8d0a034b..9dc5a03b48 100644
--- a/web/core/modules/rest/tests/src/Functional/Views/FieldCounterTest.php
+++ b/web/core/modules/rest/tests/src/Functional/Views/FieldCounterTest.php
@@ -72,7 +72,7 @@ protected function setUp($import_test_views = TRUE) {
*/
public function testExcludedTitleTokenDisplay() {
$actual_json = $this->drupalGet($this->view->getPath(), ['query' => ['_format' => 'json']]);
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$expected = [
['counter' => '1'],
diff --git a/web/core/modules/rest/tests/src/Functional/Views/StyleSerializerTest.php b/web/core/modules/rest/tests/src/Functional/Views/StyleSerializerTest.php
index 094d8797a6..40165c81b8 100644
--- a/web/core/modules/rest/tests/src/Functional/Views/StyleSerializerTest.php
+++ b/web/core/modules/rest/tests/src/Functional/Views/StyleSerializerTest.php
@@ -36,7 +36,17 @@ class StyleSerializerTest extends ViewTestBase {
*
* @var array
*/
- public static $modules = ['views_ui', 'entity_test', 'hal', 'rest_test_views', 'node', 'text', 'field', 'language', 'basic_auth'];
+ public static $modules = [
+ 'views_ui',
+ 'entity_test',
+ 'hal',
+ 'rest_test_views',
+ 'node',
+ 'text',
+ 'field',
+ 'language',
+ 'basic_auth',
+ ];
/**
* {@inheritdoc}
@@ -84,13 +94,13 @@ protected function setUp($import_test_views = TRUE) {
public function testRestViewsAuthentication() {
// Assume the view is hidden behind a permission.
$this->drupalGet('test/serialize/auth_with_perm', ['query' => ['_format' => 'json']]);
- $this->assertResponse(401);
+ $this->assertSession()->statusCodeEquals(401);
// Not even logging in would make it possible to see the view, because then
// we are denied based on authentication method (cookie).
$this->drupalLogin($this->adminUser);
$this->drupalGet('test/serialize/auth_with_perm', ['query' => ['_format' => 'json']]);
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
$this->drupalLogout();
// But if we use the basic auth authentication strategy, we should be able
@@ -106,7 +116,7 @@ public function testRestViewsAuthentication() {
// Ensure that any changes to variables in the other thread are picked up.
$this->refreshVariables();
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
}
/**
@@ -119,7 +129,7 @@ public function testSerializerResponses() {
$this->executeView($view);
$actual_json = $this->drupalGet('test/serialize/field', ['query' => ['_format' => 'json']]);
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertCacheTags($view->getCacheTags());
$this->assertCacheContexts(['languages:language_interface', 'theme', 'request_format']);
// @todo Due to https://www.drupal.org/node/2352009 we can't yet test the
@@ -150,7 +160,7 @@ public function testSerializerResponses() {
// Test a 403 callback.
$this->drupalGet('test/serialize/denied', ['query' => ['_format' => 'json']]);
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
// Test the entity rows.
$view = Views::getView('test_serializer_display_entity');
@@ -168,7 +178,7 @@ public function testSerializerResponses() {
$expected = $serializer->serialize($entities, 'json');
$actual_json = $this->drupalGet('test/serialize/entity', ['query' => ['_format' => 'json']]);
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertIdentical($actual_json, $expected, 'The expected JSON output was found.');
$expected_cache_tags = $view->getCacheTags();
$expected_cache_tags[] = 'entity_test_list';
@@ -228,20 +238,20 @@ public function testSerializerResponses() {
public function testSharedPagePath() {
// Test with no format as well as html explicitly.
$this->drupalGet('test/serialize/shared');
- $this->assertResponse(200);
- $this->assertHeader('content-type', 'text/html; charset=UTF-8');
+ $this->assertSession()->statusCodeEquals(200);
+ $this->assertSession()->responseHeaderEquals('content-type', 'text/html; charset=UTF-8');
$this->drupalGet('test/serialize/shared', ['query' => ['_format' => 'html']]);
- $this->assertResponse(200);
- $this->assertHeader('content-type', 'text/html; charset=UTF-8');
+ $this->assertSession()->statusCodeEquals(200);
+ $this->assertSession()->responseHeaderEquals('content-type', 'text/html; charset=UTF-8');
$this->drupalGet('test/serialize/shared', ['query' => ['_format' => 'json']]);
- $this->assertResponse(200);
- $this->assertHeader('content-type', 'application/json');
+ $this->assertSession()->statusCodeEquals(200);
+ $this->assertSession()->responseHeaderEquals('content-type', 'application/json');
$this->drupalGet('test/serialize/shared', ['query' => ['_format' => 'xml']]);
- $this->assertResponse(200);
- $this->assertHeader('content-type', 'text/xml; charset=UTF-8');
+ $this->assertSession()->statusCodeEquals(200);
+ $this->assertSession()->responseHeaderEquals('content-type', 'text/xml; charset=UTF-8');
}
/**
@@ -257,7 +267,7 @@ public function testSiteMaintenance() {
$this->drupalGet('test/serialize/entity', ['query' => ['_format' => 'json']]);
// Verify that the endpoint is unavailable for anonymous users.
- $this->assertResponse(503);
+ $this->assertSession()->statusCodeEquals(503);
}
/**
@@ -324,14 +334,14 @@ public function testRestRenderCaching() {
// varies by it.
$result1 = Json::decode($this->drupalGet('test/serialize/entity', ['query' => ['_format' => 'json']]));
$this->addRequestWithFormat('json');
- $this->assertHeader('content-type', 'application/json');
+ $this->assertSession()->responseHeaderEquals('content-type', 'application/json');
$this->assertCacheContexts($cache_contexts);
$this->assertCacheTags($cache_tags);
$this->assertNotEmpty($render_cache->get($original));
$result_xml = $this->drupalGet('test/serialize/entity', ['query' => ['_format' => 'xml']]);
$this->addRequestWithFormat('xml');
- $this->assertHeader('content-type', 'text/xml; charset=UTF-8');
+ $this->assertSession()->responseHeaderEquals('content-type', 'text/xml; charset=UTF-8');
$this->assertCacheContexts($cache_contexts);
$this->assertCacheTags($cache_tags);
$this->assertNotEmpty($render_cache->get($original));
@@ -342,7 +352,7 @@ public function testRestRenderCaching() {
// Ensure that the cached page works.
$result2 = Json::decode($this->drupalGet('test/serialize/entity', ['query' => ['_format' => 'json']]));
$this->addRequestWithFormat('json');
- $this->assertHeader('content-type', 'application/json');
+ $this->assertSession()->responseHeaderEquals('content-type', 'application/json');
$this->assertEqual($result2, $result1);
$this->assertCacheContexts($cache_contexts);
$this->assertCacheTags($cache_tags);
@@ -352,7 +362,7 @@ public function testRestRenderCaching() {
EntityTest::create(['name' => 'test_11', 'user_id' => $this->adminUser->id()])->save();
$result3 = Json::decode($this->drupalGet('test/serialize/entity', ['query' => ['_format' => 'json']]));
$this->addRequestWithFormat('json');
- $this->assertHeader('content-type', 'application/json');
+ $this->assertSession()->responseHeaderEquals('content-type', 'application/json');
$this->assertNotEqual($result3, $result2);
// Add the new entity cache tag and remove the first one, because we just
@@ -373,23 +383,23 @@ public function testResponseFormatConfiguration() {
$style_options = 'admin/structure/views/nojs/display/test_serializer_display_field/rest_export_1/style_options';
- // Test with no format.
+ // Ensure a request with no format returns 406 Not Acceptable.
$this->drupalGet('test/serialize/field');
- $this->assertHeader('content-type', 'text/html; charset=UTF-8');
- $this->assertResponse(406, 'A 406 response was returned when no format was requested.');
+ $this->assertSession()->responseHeaderEquals('content-type', 'text/html; charset=UTF-8');
+ $this->assertSession()->statusCodeEquals(406);
// Select only 'xml' as an accepted format.
$this->drupalPostForm($style_options, ['style_options[formats][xml]' => 'xml'], t('Apply'));
$this->drupalPostForm(NULL, [], t('Save'));
- // Should return a 406.
+ // Ensure a request for JSON returns 406 Not Acceptable.
$this->drupalGet('test/serialize/field', ['query' => ['_format' => 'json']]);
- $this->assertHeader('content-type', 'application/json');
- $this->assertResponse(406, 'A 406 response was returned when JSON was requested.');
- // Should return a 200.
+ $this->assertSession()->responseHeaderEquals('content-type', 'application/json');
+ $this->assertSession()->statusCodeEquals(406);
+ // Ensure a request for XML returns 200 OK.
$this->drupalGet('test/serialize/field', ['query' => ['_format' => 'xml']]);
- $this->assertHeader('content-type', 'text/xml; charset=UTF-8');
- $this->assertResponse(200, 'A 200 response was returned when XML was requested.');
+ $this->assertSession()->responseHeaderEquals('content-type', 'text/xml; charset=UTF-8');
+ $this->assertSession()->statusCodeEquals(200);
// Add 'json' as an accepted format, so we have multiple.
$this->drupalPostForm($style_options, ['style_options[formats][json]' => 'json'], t('Apply'));
@@ -397,40 +407,41 @@ public function testResponseFormatConfiguration() {
// Should return a 406. Emulates a sample Firefox header.
$this->drupalGet('test/serialize/field', [], ['Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8']);
- $this->assertHeader('content-type', 'text/html; charset=UTF-8');
- $this->assertResponse(406, 'A 406 response was returned when a browser accept header was requested.');
+ $this->assertSession()->responseHeaderEquals('content-type', 'text/html; charset=UTF-8');
+ $this->assertSession()->statusCodeEquals(406);
- // Should return a 406.
+ // Ensure a request for HTML returns 406 Not Acceptable.
$this->drupalGet('test/serialize/field', ['query' => ['_format' => 'html']]);
- $this->assertHeader('content-type', 'text/html; charset=UTF-8');
- $this->assertResponse(406, 'A 406 response was returned when HTML was requested.');
+ $this->assertSession()->responseHeaderEquals('content-type', 'text/html; charset=UTF-8');
+ $this->assertSession()->statusCodeEquals(406);
- // Should return a 200.
+ // Ensure a request for JSON returns 200 OK.
$this->drupalGet('test/serialize/field', ['query' => ['_format' => 'json']]);
- $this->assertHeader('content-type', 'application/json');
- $this->assertResponse(200, 'A 200 response was returned when JSON was requested.');
+ $this->assertSession()->responseHeaderEquals('content-type', 'application/json');
+ $this->assertSession()->statusCodeEquals(200);
- // Should return a 200.
+ // Ensure a request XML returns 200 OK.
$this->drupalGet('test/serialize/field', ['query' => ['_format' => 'xml']]);
- $this->assertHeader('content-type', 'text/xml; charset=UTF-8');
- $this->assertResponse(200, 'A 200 response was returned when XML was requested');
+ $this->assertSession()->responseHeaderEquals('content-type', 'text/xml; charset=UTF-8');
+ $this->assertSession()->statusCodeEquals(200);
// Now configure no format, so both serialization formats should be allowed.
$this->drupalPostForm($style_options, ['style_options[formats][json]' => '0', 'style_options[formats][xml]' => '0'], t('Apply'));
- // Should return a 200.
+ // Ensure a request for JSON returns 200 OK.
$this->drupalGet('test/serialize/field', ['query' => ['_format' => 'json']]);
- $this->assertHeader('content-type', 'application/json');
- $this->assertResponse(200, 'A 200 response was returned when JSON was requested.');
- // Should return a 200.
+ $this->assertSession()->responseHeaderEquals('content-type', 'application/json');
+ $this->assertSession()->statusCodeEquals(200);
+
+ // Ensure a request for XML returns 200 OK.
$this->drupalGet('test/serialize/field', ['query' => ['_format' => 'xml']]);
- $this->assertHeader('content-type', 'text/xml; charset=UTF-8');
- $this->assertResponse(200, 'A 200 response was returned when XML was requested');
+ $this->assertSession()->responseHeaderEquals('content-type', 'text/xml; charset=UTF-8');
+ $this->assertSession()->statusCodeEquals(200);
// Should return a 406 for HTML still.
$this->drupalGet('test/serialize/field', ['query' => ['_format' => 'html']]);
- $this->assertHeader('content-type', 'text/html; charset=UTF-8');
- $this->assertResponse(406, 'A 406 response was returned when HTML was requested.');
+ $this->assertSession()->responseHeaderEquals('content-type', 'text/html; charset=UTF-8');
+ $this->assertSession()->statusCodeEquals(406);
}
/**
@@ -625,7 +636,7 @@ public function testSerializerViewsUI() {
$this->drupalLogin($this->adminUser);
// Click the "Update preview button".
$this->drupalPostForm('admin/structure/views/view/test_serializer_display_field/edit/rest_export_1', $edit = [], t('Update preview'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Check if we receive the expected result.
$result = $this->xpath('//div[@id="views-live-preview"]/pre');
$json_preview = $result[0]->getText();
@@ -652,7 +663,7 @@ public function testFieldapiField() {
$node->save();
$result = Json::decode($this->drupalGet('test/serialize/node-field', ['query' => ['_format' => 'json']]));
$this->assertEqual($result[1]['nid'], $node->id());
- $this->assertTrue(strpos($this->getSession()->getPage()->getContent(), "<script") === FALSE, "No script tag is present in the raw page contents.");
+ $this->assertStringNotContainsString("<script", $this->getSession()->getPage()->getContent(), "No script tag is present in the raw page contents.");
$this->drupalLogin($this->adminUser);
diff --git a/web/core/modules/rest/tests/src/Kernel/Entity/RestResourceConfigTest.php b/web/core/modules/rest/tests/src/Kernel/Entity/RestResourceConfigTest.php
index 89e9b1dec5..ffab9289f8 100644
--- a/web/core/modules/rest/tests/src/Kernel/Entity/RestResourceConfigTest.php
+++ b/web/core/modules/rest/tests/src/Kernel/Entity/RestResourceConfigTest.php
@@ -16,7 +16,14 @@ class RestResourceConfigTest extends KernelTestBase {
/**
* {@inheritdoc}
*/
- public static $modules = ['rest', 'entity_test', 'serialization', 'basic_auth', 'user', 'hal'];
+ public static $modules = [
+ 'rest',
+ 'entity_test',
+ 'serialization',
+ 'basic_auth',
+ 'user',
+ 'hal',
+ ];
/**
* @covers ::calculateDependencies
diff --git a/web/core/modules/rest/tests/src/Kernel/RequestHandlerTest.php b/web/core/modules/rest/tests/src/Kernel/RequestHandlerTest.php
index a791838f9f..ebfa0ae281 100644
--- a/web/core/modules/rest/tests/src/Kernel/RequestHandlerTest.php
+++ b/web/core/modules/rest/tests/src/Kernel/RequestHandlerTest.php
@@ -2,6 +2,7 @@
namespace Drupal\Tests\rest\Kernel;
+use Drupal\Component\Serialization\Json;
use Drupal\Core\Config\ConfigFactoryInterface;
use Drupal\Core\Config\ImmutableConfig;
use Drupal\Core\Routing\RouteMatch;
@@ -10,8 +11,10 @@
use Drupal\rest\RequestHandler;
use Drupal\rest\ResourceResponse;
use Drupal\rest\RestResourceConfigInterface;
+use Prophecy\Argument;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\Routing\Route;
+use Symfony\Component\Serializer\Encoder\DecoderInterface;
use Symfony\Component\Serializer\SerializerInterface;
/**
@@ -45,6 +48,9 @@ public function setUp() {
$config_factory->get('rest.settings')
->willReturn($this->prophesize(ImmutableConfig::class)->reveal());
$serializer = $this->prophesize(SerializerInterface::class);
+ $serializer->willImplement(DecoderInterface::class);
+ $serializer->decode(Json::encode(['this is an array']), NULL, Argument::type('array'))
+ ->willReturn(['this is an array']);
$this->requestHandler = new RequestHandler($config_factory->reveal(), $serializer->reveal());
}
@@ -52,6 +58,53 @@ public function setUp() {
* @covers ::handle
*/
public function testHandle() {
+ $request = new Request([], [], [], [], [], [], Json::encode(['this is an array']));
+ $route_match = new RouteMatch('test', (new Route('/rest/test', ['_rest_resource_config' => 'restplugin', 'example' => ''], ['_format' => 'json']))->setMethods(['GET']));
+
+ $resource = $this->prophesize(StubRequestHandlerResourcePlugin::class);
+ $resource->get('', $request)
+ ->shouldBeCalled();
+ $resource->getPluginDefinition()
+ ->willReturn([])
+ ->shouldBeCalled();
+
+ // Setup the configuration.
+ $config = $this->prophesize(RestResourceConfigInterface::class);
+ $config->getResourcePlugin()->willReturn($resource->reveal());
+ $config->getCacheContexts()->willReturn([]);
+ $config->getCacheTags()->willReturn([]);
+ $config->getCacheMaxAge()->willReturn(12);
+
+ // Response returns NULL this time because response from plugin is not
+ // a ResourceResponse so it is passed through directly.
+ $response = $this->requestHandler->handle($route_match, $request, $config->reveal());
+ $this->assertEquals(NULL, $response);
+
+ // Response will return a ResourceResponse this time.
+ $response = new ResourceResponse([]);
+ $resource->get(NULL, $request)
+ ->willReturn($response);
+ $handler_response = $this->requestHandler->handle($route_match, $request, $config->reveal());
+ $this->assertEquals($response, $handler_response);
+
+ // We will call the patch method this time.
+ $route_match = new RouteMatch('test', (new Route('/rest/test', ['_rest_resource_config' => 'restplugin', 'example_original' => ''], ['_content_type_format' => 'json']))->setMethods(['PATCH']));
+ $request->setMethod('PATCH');
+ $response = new ResourceResponse([]);
+ $resource->patch(['this is an array'], $request)
+ ->shouldBeCalledTimes(1)
+ ->willReturn($response);
+ $handler_response = $this->requestHandler->handle($route_match, $request, $config->reveal());
+ $this->assertEquals($response, $handler_response);
+ }
+
+ /**
+ * @covers ::handle
+ * @covers ::getLegacyParameters
+ * @expectedDeprecation Passing in arguments the legacy way is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Provide the right parameter names in the method, similar to controllers. See https://www.drupal.org/node/2894819
+ * @group legacy
+ */
+ public function testHandleLegacy() {
$request = new Request();
$route_match = new RouteMatch('test', (new Route('/rest/test', ['_rest_resource_config' => 'restplugin'], ['_format' => 'json']))->setMethods(['GET']));
@@ -100,7 +153,7 @@ public function get($example, Request $request) {}
public function post() {}
- public function patch($example_original, Request $request) {}
+ public function patch($data, Request $request) {}
public function delete() {}
diff --git a/web/core/modules/rest/tests/src/Kernel/Views/RestExportTest.php b/web/core/modules/rest/tests/src/Kernel/Views/RestExportTest.php
index 5246e484ae..1aef642544 100644
--- a/web/core/modules/rest/tests/src/Kernel/Views/RestExportTest.php
+++ b/web/core/modules/rest/tests/src/Kernel/Views/RestExportTest.php
@@ -24,7 +24,12 @@ class RestExportTest extends ViewsKernelTestBase {
/**
* {@inheritdoc}
*/
- public static $modules = ['rest_test_views', 'serialization', 'rest', 'entity_test'];
+ public static $modules = [
+ 'rest_test_views',
+ 'serialization',
+ 'rest',
+ 'entity_test',
+ ];
/**
* {@inheritdoc}
diff --git a/web/core/modules/rest/tests/src/Unit/CollectRoutesTest.php b/web/core/modules/rest/tests/src/Unit/CollectRoutesTest.php
index 7e456130c9..2f4719395e 100644
--- a/web/core/modules/rest/tests/src/Unit/CollectRoutesTest.php
+++ b/web/core/modules/rest/tests/src/Unit/CollectRoutesTest.php
@@ -149,12 +149,12 @@ public function testRoutesRequirements() {
$requirements_1 = $this->routes->get('test_1')->getRequirements();
$requirements_2 = $this->routes->get('view.test_view.page_1')->getRequirements();
- $this->assertEquals(0, count($requirements_1), 'First route has no requirement.');
- $this->assertEquals(1, count($requirements_2), 'Views route with rest export had the format requirement added.');
+ $this->assertCount(0, $requirements_1, 'First route has no requirement.');
+ $this->assertCount(1, $requirements_2, 'Views route with rest export had the format requirement added.');
// Check auth options.
$auth = $this->routes->get('view.test_view.page_1')->getOption('_auth');
- $this->assertEquals(count($auth), 1, 'View route with rest export has an auth option added');
+ $this->assertCount(1, $auth, 'View route with rest export has an auth option added');
$this->assertEquals($auth[0], 'basic_auth', 'View route with rest export has the correct auth option added');
}
diff --git a/web/core/modules/search/search.info.yml b/web/core/modules/search/search.info.yml
index 97b7d3fe77..7125871850 100644
--- a/web/core/modules/search/search.info.yml
+++ b/web/core/modules/search/search.info.yml
@@ -1,6 +1,6 @@
name: Search
type: module
-description: 'Enables site-wide keyword searching.'
+description: 'Allows users to create search pages based on plugins provided by other modules.'
package: Core
version: VERSION
core: 8.x
diff --git a/web/core/modules/search/tests/src/Functional/SearchBlockTest.php b/web/core/modules/search/tests/src/Functional/SearchBlockTest.php
index 07791269c5..bef1643590 100644
--- a/web/core/modules/search/tests/src/Functional/SearchBlockTest.php
+++ b/web/core/modules/search/tests/src/Functional/SearchBlockTest.php
@@ -69,14 +69,14 @@ public function testSearchFormBlock() {
// Test a normal search via the block form, from the front page.
$terms = ['keys' => 'test'];
$this->drupalPostForm('', $terms, t('Search'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertText('Your search yielded no results');
// Test a search from the block on a 404 page.
$this->drupalGet('foo');
- $this->assertResponse(404);
+ $this->assertSession()->statusCodeEquals(404);
$this->drupalPostForm(NULL, $terms, t('Search'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertText('Your search yielded no results');
$visibility = $block->getVisibility();
@@ -84,7 +84,7 @@ public function testSearchFormBlock() {
$block->setVisibilityConfig('request_path', $visibility['request_path']);
$this->drupalPostForm('', $terms, t('Search'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertText('Your search yielded no results');
// Confirm that the form submits to the default search page.
@@ -100,7 +100,7 @@ public function testSearchFormBlock() {
// Test an empty search via the block form, from the front page.
$terms = ['keys' => ''];
$this->drupalPostForm('', $terms, t('Search'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertText('Please enter some keywords');
// Confirm that the user is redirected to the search page, when form is
diff --git a/web/core/modules/search/tests/src/Functional/SearchConfigSettingsFormTest.php b/web/core/modules/search/tests/src/Functional/SearchConfigSettingsFormTest.php
index e00eab9f8e..b1d119ac7b 100644
--- a/web/core/modules/search/tests/src/Functional/SearchConfigSettingsFormTest.php
+++ b/web/core/modules/search/tests/src/Functional/SearchConfigSettingsFormTest.php
@@ -18,7 +18,14 @@ class SearchConfigSettingsFormTest extends BrowserTestBase {
/**
* {@inheritdoc}
*/
- protected static $modules = ['block', 'dblog', 'node', 'search', 'search_extra_type', 'test_page_test'];
+ protected static $modules = [
+ 'block',
+ 'dblog',
+ 'node',
+ 'search',
+ 'search_extra_type',
+ 'test_page_test',
+ ];
/**
* {@inheritdoc}
@@ -166,7 +173,7 @@ public function testSearchModuleDisabling() {
// Run a search from the correct search URL.
$info = $plugin_info[$entity_id];
$this->drupalGet('search/' . $entity->getPath(), ['query' => ['keys' => $info['keys']]]);
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertNoText('no results', $entity->label() . ' search found results');
$this->assertText($info['text'], 'Correct search text found');
@@ -188,7 +195,7 @@ public function testSearchModuleDisabling() {
// Try an invalid search path, which should 404.
$this->drupalGet('search/not_a_plugin_path');
- $this->assertResponse(404);
+ $this->assertSession()->statusCodeEquals(404);
$entity->disable()->save();
}
@@ -306,14 +313,14 @@ public function testMultipleSearchPages() {
// Disable the first search page.
$this->clickLink(t('Disable'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertNoLink(t('Disable'));
$this->verifySearchPageOperations($first_id, TRUE, TRUE, FALSE, TRUE);
$this->verifySearchPageOperations($second_id, TRUE, FALSE, FALSE, FALSE);
// Enable the first search page.
$this->clickLink(t('Enable'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->verifySearchPageOperations($first_id, TRUE, TRUE, TRUE, FALSE);
$this->verifySearchPageOperations($second_id, TRUE, FALSE, FALSE, FALSE);
@@ -331,11 +338,11 @@ public function testMultipleSearchPages() {
public function testRouteProtection() {
// Ensure that the enable and disable routes are protected.
$this->drupalGet('admin/config/search/pages/manage/node_search/enable');
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
$this->drupalGet('admin/config/search/pages/manage/node_search/disable');
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
$this->drupalGet('admin/config/search/pages/manage/node_search/set-default');
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
}
/**
diff --git a/web/core/modules/search/tests/src/Functional/SearchDateIntervalTest.php b/web/core/modules/search/tests/src/Functional/SearchDateIntervalTest.php
index 22c19b9fd8..f2b05c76f4 100644
--- a/web/core/modules/search/tests/src/Functional/SearchDateIntervalTest.php
+++ b/web/core/modules/search/tests/src/Functional/SearchDateIntervalTest.php
@@ -15,7 +15,12 @@ class SearchDateIntervalTest extends BrowserTestBase {
/**
* {@inheritdoc}
*/
- protected static $modules = ['language', 'search_date_query_alter', 'node', 'search'];
+ protected static $modules = [
+ 'language',
+ 'search_date_query_alter',
+ 'node',
+ 'search',
+ ];
/**
* {@inheritdoc}
diff --git a/web/core/modules/search/tests/src/Functional/SearchKeywordsConditionsTest.php b/web/core/modules/search/tests/src/Functional/SearchKeywordsConditionsTest.php
index 38faa34e55..58e97f1c9d 100644
--- a/web/core/modules/search/tests/src/Functional/SearchKeywordsConditionsTest.php
+++ b/web/core/modules/search/tests/src/Functional/SearchKeywordsConditionsTest.php
@@ -19,7 +19,12 @@ class SearchKeywordsConditionsTest extends BrowserTestBase {
/**
* {@inheritdoc}
*/
- protected static $modules = ['comment', 'search', 'search_extra_type', 'test_page_test'];
+ protected static $modules = [
+ 'comment',
+ 'search',
+ 'search_extra_type',
+ 'test_page_test',
+ ];
/**
* {@inheritdoc}
diff --git a/web/core/modules/search/tests/src/Functional/SearchLanguageTest.php b/web/core/modules/search/tests/src/Functional/SearchLanguageTest.php
index 539fac67ff..f30787ca8b 100644
--- a/web/core/modules/search/tests/src/Functional/SearchLanguageTest.php
+++ b/web/core/modules/search/tests/src/Functional/SearchLanguageTest.php
@@ -115,7 +115,7 @@ public function testLanguages() {
$url = $this->getUrl();
$parts = parse_url($url);
$query_string = isset($parts['query']) ? rawurldecode($parts['query']) : '';
- $this->assertTrue(strpos($query_string, '=language:fr') !== FALSE, 'Language filter language:fr add to the query string.');
+ $this->assertStringContainsString('=language:fr', $query_string, 'Language filter language:fr add to the query string.');
// Search for keyword node and language filter as Spanish.
$edit = ['keys' => 'node', 'language[es]' => TRUE];
diff --git a/web/core/modules/search/tests/src/Functional/SearchMultilingualEntityTest.php b/web/core/modules/search/tests/src/Functional/SearchMultilingualEntityTest.php
index 4377ef0b75..e3197150fb 100644
--- a/web/core/modules/search/tests/src/Functional/SearchMultilingualEntityTest.php
+++ b/web/core/modules/search/tests/src/Functional/SearchMultilingualEntityTest.php
@@ -32,7 +32,13 @@ class SearchMultilingualEntityTest extends BrowserTestBase {
/**
* {@inheritdoc}
*/
- protected static $modules = ['language', 'locale', 'comment', 'node', 'search'];
+ protected static $modules = [
+ 'language',
+ 'locale',
+ 'comment',
+ 'node',
+ 'search',
+ ];
/**
* {@inheritdoc}
@@ -162,31 +168,31 @@ public function testMultilingualSearch() {
// This should find two results for the second and third node.
$this->plugin->setSearch('English OR Hungarian', [], []);
$search_result = $this->plugin->execute();
- $this->assertEqual(count($search_result), 2, 'Found two results.');
+ $this->assertCount(2, $search_result, 'Found two results.');
// Nodes are saved directly after each other and have the same created time
// so testing for the order is not possible.
$results = [$search_result[0]['title'], $search_result[1]['title']];
- $this->assertTrue(in_array('Third node this is the Hungarian title', $results), 'The search finds the correct Hungarian title.');
- $this->assertTrue(in_array('Second node this is the English title', $results), 'The search finds the correct English title.');
+ $this->assertContains('Third node this is the Hungarian title', $results, 'The search finds the correct Hungarian title.');
+ $this->assertContains('Second node this is the English title', $results, 'The search finds the correct English title.');
// Now filter for Hungarian results only.
$this->plugin->setSearch('English OR Hungarian', ['f' => ['language:hu']], []);
$search_result = $this->plugin->execute();
- $this->assertEqual(count($search_result), 1, 'The search found only one result');
+ $this->assertCount(1, $search_result, 'The search found only one result');
$this->assertEqual($search_result[0]['title'], 'Third node this is the Hungarian title', 'The search finds the correct Hungarian title.');
// Test for search with common key word across multiple languages.
$this->plugin->setSearch('node', [], []);
$search_result = $this->plugin->execute();
- $this->assertEqual(count($search_result), 6, 'The search found total six results');
+ $this->assertCount(6, $search_result, 'The search found total six results');
// Test with language filters and common key word.
$this->plugin->setSearch('node', ['f' => ['language:hu']], []);
$search_result = $this->plugin->execute();
- $this->assertEqual(count($search_result), 2, 'The search found 2 results');
+ $this->assertCount(2, $search_result, 'The search found 2 results');
// Test to check for the language of result items.
foreach ($search_result as $result) {
@@ -315,7 +321,7 @@ protected function assertDatabaseCounts($count_node, $count_foo, $message) {
->groupBy('sid')
->execute()
->fetchCol();
- $this->assertEqual($count_node, count($results), 'Node count was ' . $count_node . ' for ' . $message);
+ $this->assertCount($count_node, $results, 'Node count was ' . $count_node . ' for ' . $message);
// Count number of "foo" records.
$results = $connection->select('search_dataset', 'i')
@@ -323,7 +329,7 @@ protected function assertDatabaseCounts($count_node, $count_foo, $message) {
->condition('type', 'foo')
->execute()
->fetchCol();
- $this->assertEqual($count_foo, count($results), 'Foo count was ' . $count_foo . ' for ' . $message);
+ $this->assertCount($count_foo, $results, 'Foo count was ' . $count_foo . ' for ' . $message);
}
diff --git a/web/core/modules/search/tests/src/Functional/SearchPageTextTest.php b/web/core/modules/search/tests/src/Functional/SearchPageTextTest.php
index 148b4372ce..f9c8891f95 100644
--- a/web/core/modules/search/tests/src/Functional/SearchPageTextTest.php
+++ b/web/core/modules/search/tests/src/Functional/SearchPageTextTest.php
@@ -68,7 +68,7 @@ public function testSearchText() {
$this->drupalGet('search/node');
$this->assertText(t('Enter your keywords'));
$this->assertText(t('Search'));
- $this->assertTitle(t('Search') . ' | Drupal', 'Search page title is correct');
+ $this->assertTitle('Search | Drupal');
$edit = [];
$search_terms = 'bike shed ' . $this->randomMachineName();
@@ -77,7 +77,7 @@ public function testSearchText() {
$this->assertText('search yielded no results');
$this->assertText(t('Search'));
$title_source = 'Search for @keywords | Drupal';
- $this->assertTitle(t($title_source, ['@keywords' => Unicode::truncate($search_terms, 60, TRUE, TRUE)]), 'Search page title is correct');
+ $this->assertTitle('Search for ' . Unicode::truncate($search_terms, 60, TRUE, TRUE) . ' | Drupal');
$this->assertNoText('Node', 'Erroneous tab and breadcrumb text is not present');
$this->assertNoText(t('Node'), 'Erroneous translated tab and breadcrumb text is not present');
$this->assertText(t('Content'), 'Tab and breadcrumb text is present');
@@ -91,7 +91,7 @@ public function testSearchText() {
$search_terms = 'Every word is like an unnecessary stain on silence and nothingness.';
$edit['keys'] = $search_terms;
$this->drupalPostForm('search/node', $edit, t('Search'));
- $this->assertTitle(t($title_source, ['@keywords' => 'Every word is like an unnecessary stain on silence and…']), 'Search page title is correct');
+ $this->assertTitle('Search for Every word is like an unnecessary stain on silence and… | Drupal');
// Search for a string with a lot of special characters.
$search_terms = 'Hear nothing > "see nothing" `feel' . " '1982.";
@@ -103,7 +103,7 @@ public function testSearchText() {
$edit['keys'] = $this->searchingUser->getAccountName();
$this->drupalPostForm('search/user', $edit, t('Search'));
$this->assertText(t('Search'));
- $this->assertTitle(t($title_source, ['@keywords' => Unicode::truncate($this->searchingUser->getAccountName(), 60, TRUE, TRUE)]));
+ $this->assertTitle('Search for ' . Unicode::truncate($this->searchingUser->getAccountName(), 60, TRUE, TRUE) . ' | Drupal');
$this->clickLink('Search help');
$this->assertText('Search help', 'Correct title is on search help page');
@@ -157,13 +157,13 @@ public function testSearchText() {
// Test that if you search for a URL with .. in it, you still end up at
// the search page. See issue https://www.drupal.org/node/890058.
$this->drupalPostForm('search/node', ['keys' => '../../admin'], t('Search'));
- $this->assertResponse(200, 'Searching for ../../admin with non-admin user does not lead to a 403 error');
+ $this->assertSession()->statusCodeEquals(200);
$this->assertText('no results', 'Searching for ../../admin with non-admin user gives you a no search results page');
// Test that if you search for a URL starting with "./", you still end up
// at the search page. See issue https://www.drupal.org/node/1421560.
$this->drupalPostForm('search/node', ['keys' => '.something'], t('Search'));
- $this->assertResponse(200, 'Searching for .something does not lead to a 403 error');
+ $this->assertSession()->statusCodeEquals(200);
$this->assertText('no results', 'Searching for .something gives you a no search results page');
}
diff --git a/web/core/modules/search/tests/src/Functional/SearchRankingTest.php b/web/core/modules/search/tests/src/Functional/SearchRankingTest.php
index 884359b3d0..8b29beda67 100644
--- a/web/core/modules/search/tests/src/Functional/SearchRankingTest.php
+++ b/web/core/modules/search/tests/src/Functional/SearchRankingTest.php
@@ -81,13 +81,16 @@ public function testRankings() {
case 'promote':
$settings[$node_rank] = 1;
break;
+
case 'relevance':
$settings['body'][0]['value'] .= " really rocks";
break;
+
case 'recent':
// Node is 1 hour hold.
$settings['created'] = REQUEST_TIME - 3600;
break;
+
case 'comments':
$settings['comment'][0]['status'] = CommentItemInterface::OPEN;
break;
@@ -233,9 +236,11 @@ public function testHTMLRankings() {
case 'a':
$settings['body'] = [['value' => Link::fromTextAndUrl('Drupal Rocks', Url::fromRoute('<front>'))->toString(), 'format' => 'full_html']];
break;
+
case 'notag':
$settings['body'] = [['value' => 'Drupal Rocks']];
break;
+
default:
$settings['body'] = [['value' => "<$tag>Drupal Rocks</$tag>", 'format' => 'full_html']];
break;
diff --git a/web/core/modules/search/tests/src/Kernel/SearchExcerptTest.php b/web/core/modules/search/tests/src/Kernel/SearchExcerptTest.php
index e10075d09a..4ebcf99f92 100644
--- a/web/core/modules/search/tests/src/Kernel/SearchExcerptTest.php
+++ b/web/core/modules/search/tests/src/Kernel/SearchExcerptTest.php
@@ -53,12 +53,12 @@ public function testSearchExcerpt() {
$longtext = str_repeat($text . ' ', 10);
$result = $this->doSearchExcerpt('nothing', $longtext);
$expected = 'The quick brown fox & jumps over the lazy dog';
- $this->assertTrue(strpos($result, $expected) === 0, 'When keyword is not found in long string, return value starts as expected');
+ $this->assertStringStartsWith($expected, $result, 'When keyword is not found in long string, return value starts as expected');
$entities = str_repeat('készítése ', 20);
$result = $this->doSearchExcerpt('nothing', $entities);
- $this->assertFalse(strpos($result, '&'), 'Entities are not present in excerpt');
- $this->assertTrue(strpos($result, 'í') > 0, 'Entities are converted in excerpt');
+ $this->assertStringNotContainsString('&', $result, 'Entities are not present in excerpt');
+ $this->assertStringContainsString('í', $result, 'Entities are converted in excerpt');
// The node body that will produce this rendered $text is:
// 123456789 HTMLTest +123456789+‘ +‘ +‘ +‘ +12345678 +‘ +‘ +‘ ‘
@@ -85,37 +85,37 @@ public function testSearchExcerptSimplified() {
// Note: The search_excerpt() function adds some extra spaces -- not
// important for HTML formatting. Remove these for comparison.
$result = $this->doSearchExcerpt('123456.7890', $text);
- $this->assertTrue(strpos($result, 'Number: <strong>123456.7890</strong>') !== FALSE, 'Numeric keyword is highlighted with exact match');
+ $this->assertStringContainsString('Number: <strong>123456.7890</strong>', $result, 'Numeric keyword is highlighted with exact match');
$result = $this->doSearchExcerpt('1234567890', $text);
- $this->assertTrue(strpos($result, 'Number: <strong>123456.7890</strong>') !== FALSE, 'Numeric keyword is highlighted with simplified match');
+ $this->assertStringContainsString('Number: <strong>123456.7890</strong>', $result, 'Numeric keyword is highlighted with simplified match');
$result = $this->doSearchExcerpt('Number 1234567890', $text);
- $this->assertTrue(strpos($result, '<strong>Number</strong>: <strong>123456.7890</strong>') !== FALSE, 'Punctuated and numeric keyword is highlighted with simplified match');
+ $this->assertStringContainsString('<strong>Number</strong>: <strong>123456.7890</strong>', $result, 'Punctuated and numeric keyword is highlighted with simplified match');
$result = $this->doSearchExcerpt('"Number 1234567890"', $text);
- $this->assertTrue(strpos($result, '<strong>Number: 123456.7890</strong>') !== FALSE, 'Phrase with punctuated and numeric keyword is highlighted with simplified match');
+ $this->assertStringContainsString('<strong>Number: 123456.7890</strong>', $result, 'Phrase with punctuated and numeric keyword is highlighted with simplified match');
$result = $this->doSearchExcerpt('"Hyphenated onetwo"', $text);
- $this->assertTrue(strpos($result, '<strong>Hyphenated: one-two</strong>') !== FALSE, 'Phrase with punctuated and hyphenated keyword is highlighted with simplified match');
+ $this->assertStringContainsString('<strong>Hyphenated: one-two</strong>', $result, 'Phrase with punctuated and hyphenated keyword is highlighted with simplified match');
$result = $this->doSearchExcerpt('"abc def"', $text);
- $this->assertTrue(strpos($result, '<strong>abc,def</strong>') !== FALSE, 'Phrase with keyword simplified into two separate words is highlighted with simplified match');
+ $this->assertStringContainsString('<strong>abc,def</strong>', $result, 'Phrase with keyword simplified into two separate words is highlighted with simplified match');
// Test phrases with characters which are being truncated.
$result = $this->doSearchExcerpt('"ipsum _"', $text);
- $this->assertTrue(strpos($result, '<strong>ipsum</strong>') !== FALSE, 'Only valid part of the phrase is highlighted and invalid part containing "_" is ignored.');
+ $this->assertStringContainsString('<strong>ipsum</strong>', $result, 'Only valid part of the phrase is highlighted and invalid part containing "_" is ignored.');
$result = $this->doSearchExcerpt('"ipsum 0000"', $text);
- $this->assertTrue(strpos($result, '<strong>ipsum</strong>') !== FALSE, 'Only valid part of the phrase is highlighted and invalid part "0000" is ignored.');
+ $this->assertStringContainsString('<strong>ipsum</strong>', $result, 'Only valid part of the phrase is highlighted and invalid part "0000" is ignored.');
// Test combination of the valid keyword and keyword containing only
// characters which are being truncated during simplification.
$result = $this->doSearchExcerpt('ipsum _', $text);
- $this->assertTrue(strpos($result, '<strong>ipsum</strong>') !== FALSE, 'Only valid keyword is highlighted and invalid keyword "_" is ignored.');
+ $this->assertStringContainsString('<strong>ipsum</strong>', $result, 'Only valid keyword is highlighted and invalid keyword "_" is ignored.');
$result = $this->doSearchExcerpt('ipsum 0000', $text);
- $this->assertTrue(strpos($result, '<strong>ipsum</strong>') !== FALSE, 'Only valid keyword is highlighted and invalid keyword "0000" is ignored.');
+ $this->assertStringContainsString('<strong>ipsum</strong>', $result, 'Only valid keyword is highlighted and invalid keyword "0000" is ignored.');
// Test using the hook_search_preprocess() from the test module.
// The hook replaces "finding" or "finds" with "find".
@@ -123,54 +123,54 @@ public function testSearchExcerptSimplified() {
// highlight "finding".
$text = "this tests finding a string";
$result = $this->doSearchExcerpt('finds', $text, 'ex');
- $this->assertTrue(strpos($result, '<strong>finding</strong>') !== FALSE, 'Search excerpt works with preprocess hook, search for finds');
+ $this->assertStringContainsString('<strong>finding</strong>', $result, 'Search excerpt works with preprocess hook, search for finds');
$result = $this->doSearchExcerpt('find', $text, 'ex');
- $this->assertTrue(strpos($result, '<strong>finding</strong>') !== FALSE, 'Search excerpt works with preprocess hook, search for find');
+ $this->assertStringContainsString('<strong>finding</strong>', $result, 'Search excerpt works with preprocess hook, search for find');
// Just to be sure, test with the replacement at the beginning and end.
$text = "finding at the beginning";
$result = $this->doSearchExcerpt('finds', $text, 'ex');
- $this->assertTrue(strpos($result, '<strong>finding</strong>') !== FALSE, 'Search excerpt works with preprocess hook, text at start');
+ $this->assertStringContainsString('<strong>finding</strong>', $result, 'Search excerpt works with preprocess hook, text at start');
$text = "at the end finding";
$result = $this->doSearchExcerpt('finds', $text, 'ex');
- $this->assertTrue(strpos($result, '<strong>finding</strong>') !== FALSE, 'Search excerpt works with preprocess hook, text at end');
+ $this->assertStringContainsString('<strong>finding</strong>', $result, 'Search excerpt works with preprocess hook, text at end');
// Testing with a one-to-many replacement: the test module replaces DIC
// with Dependency Injection Container.
$text = "something about the DIC is happening";
$result = $this->doSearchExcerpt('Dependency', $text, 'ex');
- $this->assertTrue(strpos($result, '<strong>DIC</strong>') !== FALSE, 'Search excerpt works with preprocess hook, acronym first word');
+ $this->assertStringContainsString('<strong>DIC</strong>', $result, 'Search excerpt works with preprocess hook, acronym first word');
$result = $this->doSearchExcerpt('Injection', $text, 'ex');
- $this->assertTrue(strpos($result, '<strong>DIC</strong>') !== FALSE, 'Search excerpt works with preprocess hook, acronym second word');
+ $this->assertStringContainsString('<strong>DIC</strong>', $result, 'Search excerpt works with preprocess hook, acronym second word');
$result = $this->doSearchExcerpt('Container', $text, 'ex');
- $this->assertTrue(strpos($result, '<strong>DIC</strong>') !== FALSE, 'Search excerpt works with preprocess hook, acronym third word');
+ $this->assertStringContainsString('<strong>DIC</strong>', $result, 'Search excerpt works with preprocess hook, acronym third word');
// Testing with a many-to-one replacement: the test module replaces
// hypertext markup language with HTML.
$text = "we always use hypertext markup language to describe things";
$result = $this->doSearchExcerpt('html', $text, 'ex');
- $this->assertTrue(strpos($result, '<strong>hypertext markup language</strong>') !== FALSE, 'Search excerpt works with preprocess hook, acronym many to one');
+ $this->assertStringContainsString('<strong>hypertext markup language</strong>', $result, 'Search excerpt works with preprocess hook, acronym many to one');
// Test with accents and caps in a longer piece of text with the target
// near the end.
$text = str_repeat($lorem2, 20) . ' ' . $lorem1;
$result = $this->doSearchExcerpt('Lìbêró', $text);
- $this->assertTrue(strpos($result, '<strong>libero</strong>') !== FALSE, 'Search excerpt works with caps and accents in longer text');
+ $this->assertStringContainsString('<strong>libero</strong>', $result, 'Search excerpt works with caps and accents in longer text');
// Test with an acronym provided by the hook, with the target text in the
// middle of a long string.
$text = str_repeat($lorem2, 10) . ' DIC ' . str_repeat($lorem2, 10);
$result = $this->doSearchExcerpt('Dependency', $text, 'ex');
- $this->assertTrue(strpos($result, '<strong>DIC</strong>') !== FALSE, 'Search excerpt works with acronym in longer text');
+ $this->assertStringContainsString('<strong>DIC</strong>', $result, 'Search excerpt works with acronym in longer text');
// Test a long string with a lot of whitespace in it.
$lorem3 = str_replace(' ', str_repeat(" \n", 20), $lorem2);
$text = str_repeat($lorem3, 20) . ' ' . $lorem1;
$result = $this->doSearchExcerpt('Lìbêró', $text);
- $this->assertTrue(strpos($result, '<strong>libero</strong>') !== FALSE, 'Search excerpt works with caps and accents in longer text with whitespace');
+ $this->assertStringContainsString('<strong>libero</strong>', $result, 'Search excerpt works with caps and accents in longer text with whitespace');
$this->verbose('Elapsed time: ' . (microtime(TRUE) - $start_time));
}
diff --git a/web/core/modules/search/tests/src/Functional/SearchSimplifyTest.php b/web/core/modules/search/tests/src/Kernel/SearchSimplifyTest.php
similarity index 94%
rename from web/core/modules/search/tests/src/Functional/SearchSimplifyTest.php
rename to web/core/modules/search/tests/src/Kernel/SearchSimplifyTest.php
index 127539ef74..944eb717a5 100644
--- a/web/core/modules/search/tests/src/Functional/SearchSimplifyTest.php
+++ b/web/core/modules/search/tests/src/Kernel/SearchSimplifyTest.php
@@ -1,26 +1,21 @@
<?php
-namespace Drupal\Tests\search\Functional;
+namespace Drupal\Tests\search\Kernel;
-use Drupal\Tests\BrowserTestBase;
+use Drupal\KernelTests\KernelTestBase;
/**
* Tests that the search_simply() function works as intended.
*
* @group search
*/
-class SearchSimplifyTest extends BrowserTestBase {
+class SearchSimplifyTest extends KernelTestBase {
/**
* {@inheritdoc}
*/
protected static $modules = ['search'];
- /**
- * {@inheritdoc}
- */
- protected $defaultTheme = 'stark';
-
/**
* Tests that all Unicode characters simplify correctly.
*/
diff --git a/web/core/modules/search/tests/src/Functional/SearchTokenizerTest.php b/web/core/modules/search/tests/src/Kernel/SearchTokenizerTest.php
similarity index 94%
rename from web/core/modules/search/tests/src/Functional/SearchTokenizerTest.php
rename to web/core/modules/search/tests/src/Kernel/SearchTokenizerTest.php
index 8b906a7245..25b66d7baf 100644
--- a/web/core/modules/search/tests/src/Functional/SearchTokenizerTest.php
+++ b/web/core/modules/search/tests/src/Kernel/SearchTokenizerTest.php
@@ -1,26 +1,21 @@
<?php
-namespace Drupal\Tests\search\Functional;
+namespace Drupal\Tests\search\Kernel;
-use Drupal\Tests\BrowserTestBase;
+use Drupal\KernelTests\KernelTestBase;
/**
* Tests that CJK tokenizer works as intended.
*
* @group search
*/
-class SearchTokenizerTest extends BrowserTestBase {
+class SearchTokenizerTest extends KernelTestBase {
/**
* {@inheritdoc}
*/
protected static $modules = ['search'];
- /**
- * {@inheritdoc}
- */
- protected $defaultTheme = 'stark';
-
/**
* Verifies that strings of CJK characters are tokenized.
*
@@ -36,7 +31,6 @@ public function testTokenizer() {
->set('index.minimum_word_size', 1)
->set('index.overlap_cjk', TRUE)
->save();
- $this->refreshVariables();
// Create a string of CJK characters from various character ranges in
// the Unicode tables.
@@ -124,7 +118,6 @@ public function testNoTokenizer() {
->set('index.minimum_word_size', 1)
->set('index.overlap_cjk', TRUE)
->save();
- $this->refreshVariables();
$letters = 'abcdefghijklmnopqrstuvwxyz';
$out = trim(search_simplify($letters));
diff --git a/web/core/modules/serialization/tests/src/Kernel/EntitySerializationTest.php b/web/core/modules/serialization/tests/src/Kernel/EntitySerializationTest.php
index fd5702e3ec..71473d84ed 100644
--- a/web/core/modules/serialization/tests/src/Kernel/EntitySerializationTest.php
+++ b/web/core/modules/serialization/tests/src/Kernel/EntitySerializationTest.php
@@ -3,7 +3,6 @@
namespace Drupal\Tests\serialization\Kernel;
use Drupal\Component\Serialization\Json;
-use Drupal\Component\Render\FormattableMarkup;
use Drupal\entity_test\Entity\EntitySerializedField;
use Drupal\entity_test\Entity\EntityTestMulRev;
use Drupal\filter\Entity\FilterFormat;
@@ -23,7 +22,16 @@ class EntitySerializationTest extends NormalizerTestBase {
*
* @var array
*/
- public static $modules = ['serialization', 'system', 'field', 'entity_test', 'text', 'filter', 'user', 'entity_serialization_test'];
+ public static $modules = [
+ 'serialization',
+ 'system',
+ 'field',
+ 'entity_test',
+ 'text',
+ 'filter',
+ 'user',
+ 'entity_serialization_test',
+ ];
/**
* The test values.
@@ -181,8 +189,8 @@ public function testUserNormalize() {
// Test password isn't available.
$normalized = $this->serializer->normalize($this->user);
- $this->assertFalse(array_key_exists('pass', $normalized), '"pass" key does not exist in normalized user');
- $this->assertFalse(array_key_exists('mail', $normalized), '"mail" key does not exist in normalized user');
+ $this->assertArrayNotHasKey('pass', $normalized);
+ $this->assertArrayNotHasKey('mail', $normalized);
// Test again using our test user, so that our access control override will
// allow password viewing.
@@ -232,7 +240,7 @@ public function testSerialize() {
'non_rev_field' => '<non_rev_field/>',
'field_test_text' => '<field_test_text><value>' . $this->values['field_test_text']['value'] . '</value><format>' . $this->values['field_test_text']['format'] . '</format><processed><![CDATA[<p>' . $this->values['field_test_text']['value'] . '</p>]]></processed></field_test_text>',
];
- // Sort it in the same order as normalised.
+ // Sort it in the same order as normalized.
$expected = array_merge($normalized, $expected);
// Add header and footer.
array_unshift($expected, '<?xml version="1.0"?>' . PHP_EOL . '<response>');
@@ -254,7 +262,7 @@ public function testDenormalize() {
foreach (['json', 'xml'] as $type) {
$denormalized = $this->serializer->denormalize($normalized, $this->entityClass, $type, ['entity_type' => 'entity_test_mulrev']);
- $this->assertTrue($denormalized instanceof $this->entityClass, new FormattableMarkup('Denormalized entity is an instance of @class', ['@class' => $this->entityClass]));
+ $this->assertInstanceOf($this->entityClass, $denormalized);
$this->assertIdentical($denormalized->getEntityTypeId(), $this->entity->getEntityTypeId(), 'Expected entity type found.');
$this->assertIdentical($denormalized->bundle(), $this->entity->bundle(), 'Expected entity bundle found.');
$this->assertIdentical($denormalized->uuid(), $this->entity->uuid(), 'Expected entity UUID found.');
diff --git a/web/core/modules/serialization/tests/src/Kernel/FieldItemSerializationTest.php b/web/core/modules/serialization/tests/src/Kernel/FieldItemSerializationTest.php
index 0933bb4428..8ccdcb405b 100644
--- a/web/core/modules/serialization/tests/src/Kernel/FieldItemSerializationTest.php
+++ b/web/core/modules/serialization/tests/src/Kernel/FieldItemSerializationTest.php
@@ -17,7 +17,16 @@ class FieldItemSerializationTest extends NormalizerTestBase {
/**
* {@inheritdoc}
*/
- public static $modules = ['serialization', 'system', 'field', 'entity_test', 'text', 'filter', 'user', 'field_normalization_test'];
+ public static $modules = [
+ 'serialization',
+ 'system',
+ 'field',
+ 'entity_test',
+ 'text',
+ 'filter',
+ 'user',
+ 'field_normalization_test',
+ ];
/**
* The class name of the test class.
diff --git a/web/core/modules/serialization/tests/src/Kernel/NormalizerTestBase.php b/web/core/modules/serialization/tests/src/Kernel/NormalizerTestBase.php
index 25299b16f0..abf662d4c3 100644
--- a/web/core/modules/serialization/tests/src/Kernel/NormalizerTestBase.php
+++ b/web/core/modules/serialization/tests/src/Kernel/NormalizerTestBase.php
@@ -16,7 +16,15 @@ abstract class NormalizerTestBase extends KernelTestBase {
*
* @var array
*/
- public static $modules = ['serialization', 'system', 'field', 'entity_test', 'text', 'filter', 'user'];
+ public static $modules = [
+ 'serialization',
+ 'system',
+ 'field',
+ 'entity_test',
+ 'text',
+ 'filter',
+ 'user',
+ ];
protected function setUp() {
parent::setUp();
diff --git a/web/core/modules/serialization/tests/src/Unit/Normalizer/TimestampItemNormalizerTest.php b/web/core/modules/serialization/tests/src/Unit/Normalizer/TimestampItemNormalizerTest.php
index 3d74c7cf77..8c1eff0876 100644
--- a/web/core/modules/serialization/tests/src/Unit/Normalizer/TimestampItemNormalizerTest.php
+++ b/web/core/modules/serialization/tests/src/Unit/Normalizer/TimestampItemNormalizerTest.php
@@ -163,7 +163,7 @@ public function testDenormalize() {
$this->normalizer->setSerializer($serializer_prophecy->reveal());
$denormalized = $this->normalizer->denormalize($timestamp_item_normalization, TimestampItem::class, NULL, $context);
- $this->assertTrue($denormalized instanceof TimestampItem);
+ $this->assertInstanceOf(TimestampItem::class, $denormalized);
}
/**
diff --git a/web/core/modules/settings_tray/tests/src/FunctionalJavascript/OverriddenConfigurationTest.php b/web/core/modules/settings_tray/tests/src/FunctionalJavascript/OverriddenConfigurationTest.php
index ec8afac59c..6baacebdf8 100644
--- a/web/core/modules/settings_tray/tests/src/FunctionalJavascript/OverriddenConfigurationTest.php
+++ b/web/core/modules/settings_tray/tests/src/FunctionalJavascript/OverriddenConfigurationTest.php
@@ -166,7 +166,7 @@ protected function assertOverriddenBlockDisabled(Block $overridden_block, $overr
$contextual_links = $page->findAll('css', "$block_selector .contextual-links li a");
$this->assertNotEmpty($contextual_links);
foreach ($contextual_links as $link) {
- $this->assertNotContains("/admin/structure/block/manage/$block_id/off-canvas", $link->getAttribute('href'));
+ $this->assertStringNotContainsString("/admin/structure/block/manage/$block_id/off-canvas", $link->getAttribute('href'));
}
// Confirm the block is not marked as Settings Tray editable.
$this->assertFalse($page->find('css', $block_selector)
diff --git a/web/core/modules/settings_tray/tests/src/FunctionalJavascript/SettingsTrayBlockFormTest.php b/web/core/modules/settings_tray/tests/src/FunctionalJavascript/SettingsTrayBlockFormTest.php
index bad7a75d67..4eafed47cf 100644
--- a/web/core/modules/settings_tray/tests/src/FunctionalJavascript/SettingsTrayBlockFormTest.php
+++ b/web/core/modules/settings_tray/tests/src/FunctionalJavascript/SettingsTrayBlockFormTest.php
@@ -76,7 +76,7 @@ protected function doTestBlocks($theme, $block_plugin, $new_page_text, $element_
$link = $web_assert->waitForElement('css', "$block_selector .contextual-links li a");
$this->assertEquals('Quick edit', $link->getHtml(), "'Quick edit' is the first contextual link for the block.");
$destination = (string) $this->loggedInUser->toUrl()->toString();
- $this->assertContains("/admin/structure/block/manage/$block_id/settings-tray?destination=$destination", $link->getAttribute('href'));
+ $this->assertStringContainsString("/admin/structure/block/manage/$block_id/settings-tray?destination=$destination", $link->getAttribute('href'));
if (isset($toolbar_item)) {
// Check that you can open a toolbar tray and it will be closed after
diff --git a/web/core/modules/shortcut/shortcut.module b/web/core/modules/shortcut/shortcut.module
index f6da17897e..bbc1d8c120 100644
--- a/web/core/modules/shortcut/shortcut.module
+++ b/web/core/modules/shortcut/shortcut.module
@@ -8,6 +8,7 @@
use Drupal\Component\Render\FormattableMarkup;
use Drupal\Core\Access\AccessResult;
use Drupal\Core\Cache\Cache;
+use Drupal\Core\Cache\CacheableMetadata;
use Drupal\Core\Routing\RouteMatchInterface;
use Drupal\Core\Url;
use Drupal\shortcut\Entity\ShortcutSet;
@@ -306,10 +307,10 @@ function shortcut_preprocess_block(&$variables) {
*/
function shortcut_preprocess_page_title(&$variables) {
// Only display the shortcut link if the user has the ability to edit
- // shortcuts and if the page's actual content is being shown (for example,
- // we do not want to display it on "access denied" or "page not found"
- // pages).
- if (shortcut_set_edit_access()->isAllowed() && !\Drupal::request()->attributes->has('exception')) {
+ // shortcuts, the feature is enabled for the current theme and if the page's
+ // actual content is being shown (for example, we do not want to display it on
+ // "access denied" or "page not found" pages).
+ if (shortcut_set_edit_access()->isAllowed() && theme_get_setting('third_party_settings.shortcut.module_link') && !\Drupal::request()->attributes->has('exception')) {
$link = Url::fromRouteMatch(\Drupal::routeMatch())->getInternalPath();
$route_match = \Drupal::routeMatch();
@@ -324,6 +325,12 @@ function shortcut_preprocess_page_title(&$variables) {
$shortcut_set = shortcut_current_displayed_set();
+ // Pages with the add or remove shortcut button need cache invalidation when
+ // a shortcut is added, edited, or removed.
+ $cacheability_metadata = CacheableMetadata::createFromRenderArray($variables);
+ $cacheability_metadata->addCacheTags(\Drupal::entityTypeManager()->getDefinition('shortcut')->getListCacheTags());
+ $cacheability_metadata->applyTo($variables);
+
// Check if $link is already a shortcut and set $link_mode accordingly.
$shortcuts = \Drupal::entityTypeManager()->getStorage('shortcut')->loadByProperties(['shortcut_set' => $shortcut_set->id()]);
/** @var \Drupal\shortcut\ShortcutInterface $shortcut */
@@ -347,26 +354,24 @@ function shortcut_preprocess_page_title(&$variables) {
$route_parameters = ['shortcut' => $shortcut_id];
}
- if (theme_get_setting('third_party_settings.shortcut.module_link')) {
- $query += \Drupal::destination()->getAsArray();
- $variables['title_suffix']['add_or_remove_shortcut'] = [
- '#attached' => [
- 'library' => [
- 'shortcut/drupal.shortcut',
- ],
+ $query += \Drupal::destination()->getAsArray();
+ $variables['title_suffix']['add_or_remove_shortcut'] = [
+ '#attached' => [
+ 'library' => [
+ 'shortcut/drupal.shortcut',
],
- '#type' => 'link',
- '#title' => new FormattableMarkup('<span class="shortcut-action__icon"></span><span class="shortcut-action__message">@text</span>', ['@text' => $link_text]),
- '#url' => Url::fromRoute($route_name, $route_parameters),
- '#options' => ['query' => $query],
- '#attributes' => [
- 'class' => [
- 'shortcut-action',
- 'shortcut-action--' . $link_mode,
- ],
+ ],
+ '#type' => 'link',
+ '#title' => new FormattableMarkup('<span class="shortcut-action__icon"></span><span class="shortcut-action__message">@text</span>', ['@text' => $link_text]),
+ '#url' => Url::fromRoute($route_name, $route_parameters),
+ '#options' => ['query' => $query],
+ '#attributes' => [
+ 'class' => [
+ 'shortcut-action',
+ 'shortcut-action--' . $link_mode,
],
- ];
- }
+ ],
+ ];
}
}
@@ -380,52 +385,43 @@ function shortcut_toolbar() {
$items['shortcuts'] = [
'#cache' => [
'contexts' => [
- // Cacheable per user, because each user can have their own shortcut
- // set, even if they cannot create or select a shortcut set, because
- // an administrator may have assigned a non-default shortcut set.
- 'user',
+ 'user.permissions',
],
],
];
if ($user->hasPermission('access shortcuts')) {
- $links = shortcut_renderable_links();
$shortcut_set = shortcut_current_displayed_set();
- \Drupal::service('renderer')->addCacheableDependency($items['shortcuts'], $shortcut_set);
- $configure_link = NULL;
- if (shortcut_set_edit_access($shortcut_set)->isAllowed()) {
- $configure_link = [
+
+ $items['shortcuts'] += [
+ '#type' => 'toolbar_item',
+ 'tab' => [
'#type' => 'link',
- '#title' => t('Edit shortcuts'),
- '#url' => Url::fromRoute('entity.shortcut_set.customize_form', ['shortcut_set' => $shortcut_set->id()]),
- '#options' => ['attributes' => ['class' => ['edit-shortcuts']]],
- ];
- }
- if (!empty($links) || !empty($configure_link)) {
- $items['shortcuts'] += [
- '#type' => 'toolbar_item',
- 'tab' => [
- '#type' => 'link',
- '#title' => t('Shortcuts'),
- '#url' => $shortcut_set->toUrl('collection'),
- '#attributes' => [
- 'title' => t('Shortcuts'),
- 'class' => ['toolbar-icon', 'toolbar-icon-shortcut'],
- ],
- ],
- 'tray' => [
- '#heading' => t('User-defined shortcuts'),
- 'shortcuts' => $links,
- 'configure' => $configure_link,
+ '#title' => t('Shortcuts'),
+ '#url' => $shortcut_set->toUrl('collection'),
+ '#attributes' => [
+ 'title' => t('Shortcuts'),
+ 'class' => ['toolbar-icon', 'toolbar-icon-shortcut'],
],
- '#weight' => -10,
- '#attached' => [
- 'library' => [
- 'shortcut/drupal.shortcut',
+ ],
+ 'tray' => [
+ '#heading' => t('User-defined shortcuts'),
+ 'children' => [
+ '#lazy_builder' => ['shortcut.lazy_builders:lazyLinks', []],
+ '#create_placeholder' => TRUE,
+ '#cache' => [
+ 'keys' => ['shortcut_set_toolbar_links'],
+ 'contexts' => ['user'],
],
],
- ];
- }
+ ],
+ '#weight' => -10,
+ '#attached' => [
+ 'library' => [
+ 'shortcut/drupal.shortcut',
+ ],
+ ],
+ ];
}
return $items;
diff --git a/web/core/modules/shortcut/shortcut.services.yml b/web/core/modules/shortcut/shortcut.services.yml
new file mode 100644
index 0000000000..49244aa440
--- /dev/null
+++ b/web/core/modules/shortcut/shortcut.services.yml
@@ -0,0 +1,4 @@
+services:
+ shortcut.lazy_builders:
+ class: Drupal\shortcut\ShortcutLazyBuilders
+ arguments: ['@renderer']
diff --git a/web/core/modules/shortcut/src/Plugin/migrate/source/d7/Shortcut.php b/web/core/modules/shortcut/src/Plugin/migrate/source/d7/Shortcut.php
index ac2c63f29d..81b8bbe7ce 100644
--- a/web/core/modules/shortcut/src/Plugin/migrate/source/d7/Shortcut.php
+++ b/web/core/modules/shortcut/src/Plugin/migrate/source/d7/Shortcut.php
@@ -31,7 +31,7 @@ public function query() {
public function fields() {
return [
'mlid' => $this->t("The menu.mlid primary key for this menu item (= shortcut link)."),
- 'menu_name' => $this->t("The menu_name (= set name) for this shortcut link."),
+ 'menu_name' => $this->t("The menu name (= set name) for this shortcut link."),
'link_path' => $this->t("The link for this shortcut."),
'link_title' => $this->t("The title for this shortcut."),
'weight' => $this->t("The weight for this shortcut"),
diff --git a/web/core/modules/shortcut/src/ShortcutLazyBuilders.php b/web/core/modules/shortcut/src/ShortcutLazyBuilders.php
new file mode 100644
index 0000000000..e2672104c5
--- /dev/null
+++ b/web/core/modules/shortcut/src/ShortcutLazyBuilders.php
@@ -0,0 +1,68 @@
+<?php
+
+namespace Drupal\shortcut;
+
+use Drupal\Core\Render\RendererInterface;
+use Drupal\Core\Security\TrustedCallbackInterface;
+use Drupal\Core\Url;
+
+/**
+ * Lazy builders for the shortcut module.
+ */
+class ShortcutLazyBuilders implements TrustedCallbackInterface {
+
+ /**
+ * The renderer service.
+ *
+ * @var \Drupal\Core\Render\RendererInterface
+ */
+ protected $renderer;
+
+ /**
+ * Constructs a new ShortcutLazyBuilders object.
+ *
+ * @param \Drupal\Core\Render\RendererInterface $renderer
+ * The renderer service.
+ */
+ public function __construct(RendererInterface $renderer) {
+ $this->renderer = $renderer;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public static function trustedCallbacks() {
+ return ['lazyLinks'];
+ }
+
+ /**
+ * #lazy_builder callback; builds shortcut toolbar links.
+ *
+ * @return array
+ * A renderable array of shortcut links.
+ */
+ public function lazyLinks() {
+ $shortcut_set = shortcut_current_displayed_set();
+
+ $links = shortcut_renderable_links();
+
+ $configure_link = NULL;
+ if (shortcut_set_edit_access($shortcut_set)->isAllowed()) {
+ $configure_link = [
+ '#type' => 'link',
+ '#title' => t('Edit shortcuts'),
+ '#url' => Url::fromRoute('entity.shortcut_set.customize_form', ['shortcut_set' => $shortcut_set->id()]),
+ '#options' => ['attributes' => ['class' => ['edit-shortcuts']]],
+ ];
+ }
+
+ $build = [
+ 'shortcuts' => $links,
+ 'configure' => $configure_link,
+ ];
+ $this->renderer->addCacheableDependency($build, $shortcut_set);
+
+ return $build;
+ }
+
+}
diff --git a/web/core/modules/shortcut/src/ShortcutSetAccessControlHandler.php b/web/core/modules/shortcut/src/ShortcutSetAccessControlHandler.php
index 87be25d2d0..6bdb3b93c0 100644
--- a/web/core/modules/shortcut/src/ShortcutSetAccessControlHandler.php
+++ b/web/core/modules/shortcut/src/ShortcutSetAccessControlHandler.php
@@ -21,6 +21,7 @@ protected function checkAccess(EntityInterface $entity, $operation, AccountInter
switch ($operation) {
case 'view':
return AccessResult::allowedIfHasPermission($account, 'access shortcuts');
+
case 'update':
if ($account->hasPermission('administer shortcuts')) {
return AccessResult::allowed()->cachePerPermissions();
diff --git a/web/core/modules/shortcut/tests/src/Functional/Rest/ShortcutSetResourceTestBase.php b/web/core/modules/shortcut/tests/src/Functional/Rest/ShortcutSetResourceTestBase.php
index 1510df288a..591b899469 100644
--- a/web/core/modules/shortcut/tests/src/Functional/Rest/ShortcutSetResourceTestBase.php
+++ b/web/core/modules/shortcut/tests/src/Functional/Rest/ShortcutSetResourceTestBase.php
@@ -96,6 +96,7 @@ protected function getExpectedUnauthorizedAccessMessage($method) {
switch ($method) {
case 'GET':
return "The 'access shortcuts' permission is required.";
+
default:
return parent::getExpectedUnauthorizedAccessMessage($method);
}
diff --git a/web/core/modules/shortcut/tests/src/Functional/ShortcutCacheTagsTest.php b/web/core/modules/shortcut/tests/src/Functional/ShortcutCacheTagsTest.php
index 71720d4442..52876a4e37 100644
--- a/web/core/modules/shortcut/tests/src/Functional/ShortcutCacheTagsTest.php
+++ b/web/core/modules/shortcut/tests/src/Functional/ShortcutCacheTagsTest.php
@@ -3,7 +3,9 @@
namespace Drupal\Tests\shortcut\Functional;
use Drupal\Core\Cache\CacheBackendInterface;
+use Drupal\Core\Url;
use Drupal\shortcut\Entity\Shortcut;
+use Drupal\Tests\system\Functional\Cache\AssertPageCacheContextsAndTagsTrait;
use Drupal\Tests\system\Functional\Entity\EntityCacheTagsTestBase;
use Drupal\user\Entity\Role;
use Drupal\user\RoleInterface;
@@ -14,11 +16,12 @@
* @group shortcut
*/
class ShortcutCacheTagsTest extends EntityCacheTagsTestBase {
+ use AssertPageCacheContextsAndTagsTrait;
/**
* {@inheritdoc}
*/
- public static $modules = ['shortcut'];
+ public static $modules = ['toolbar', 'shortcut', 'test_page_test', 'block'];
/**
* {@inheritdoc}
@@ -73,4 +76,121 @@ public function testEntityCreation() {
$this->assertFalse(\Drupal::cache('render')->get('foo'), 'Creating a new shortcut invalidates the cache tag of the shortcut set.');
}
+ /**
+ * Tests visibility and cacheability of shortcuts in the toolbar.
+ */
+ public function testToolbar() {
+ $this->drupalPlaceBlock('page_title_block', ['id' => 'title']);
+
+ $test_page_url = Url::fromRoute('test_page_test.test_page');
+ $this->verifyPageCache($test_page_url, 'MISS');
+ $this->verifyPageCache($test_page_url, 'HIT');
+
+ // Ensure that without enabling the shortcuts-in-page-title-link feature
+ // in the theme, the shortcut_list cache tag is not added to the page.
+ $this->drupalLogin($this->rootUser);
+ $this->drupalGet('admin/config/system/cron');
+ $expected_cache_tags = [
+ 'block_view',
+ 'config:block.block.title',
+ 'config:block_list',
+ 'config:shortcut.set.default',
+ 'config:system.menu.admin',
+ 'config:user.role.authenticated',
+ 'rendered',
+ 'user:' . $this->rootUser->id(),
+ ];
+ $this->assertCacheTags($expected_cache_tags);
+
+ \Drupal::configFactory()
+ ->getEditable('stark.settings')
+ ->set('third_party_settings.shortcut.module_link', TRUE)
+ ->save(TRUE);
+
+ // Add cron to the default shortcut set, now the shortcut list cache tag
+ // is expected.
+ $this->drupalGet('admin/config/system/cron');
+ $this->clickLink('Add to Default shortcuts');
+ $expected_cache_tags[] = 'config:shortcut_set_list';
+ $this->assertCacheTags($expected_cache_tags);
+
+ // Verify that users without the 'access shortcuts' permission can't see the
+ // shortcuts.
+ $this->drupalLogin($this->drupalCreateUser(['access toolbar']));
+ $this->assertNoLink('Shortcuts');
+ $this->verifyDynamicPageCache($test_page_url, 'MISS');
+ $this->verifyDynamicPageCache($test_page_url, 'HIT');
+
+ // Verify that users without the 'administer site configuration' permission
+ // can't see the cron shortcut but can see shortcuts toolbar tab.
+ $this->drupalLogin($this->drupalCreateUser([
+ 'access toolbar',
+ 'access shortcuts',
+ ]));
+ $this->verifyDynamicPageCache($test_page_url, 'MISS');
+ $this->verifyDynamicPageCache($test_page_url, 'HIT');
+ $this->assertLink('Shortcuts');
+ $this->assertNoLink('Cron');
+
+ // Create a role with access to shortcuts as well as the necessary
+ // permissions to see specific shortcuts.
+ $site_configuration_role = $this->drupalCreateRole([
+ 'access toolbar',
+ 'access shortcuts',
+ 'administer site configuration',
+ 'access administration pages',
+ ]);
+
+ // Create two different users with the same role to assert that the second
+ // user has a cache hit despite the user cache context, as
+ // the returned cache contexts include those from lazy-builder content.
+ $site_configuration_user1 = $this->drupalCreateUser();
+ $site_configuration_user1->addRole($site_configuration_role);
+ $site_configuration_user1->save();
+ $site_configuration_user2 = $this->drupalCreateUser();
+ $site_configuration_user2->addRole($site_configuration_role);
+ $site_configuration_user2->save();
+
+ $this->drupalLogin($site_configuration_user1);
+ $this->verifyDynamicPageCache($test_page_url, 'MISS');
+ $this->verifyDynamicPageCache($test_page_url, 'HIT');
+ $this->assertCacheContexts(['user', 'url.query_args:_wrapper_format']);
+ $this->assertLink('Shortcuts');
+ $this->assertLink('Cron');
+
+ $this->drupalLogin($site_configuration_user2);
+ $this->verifyDynamicPageCache($test_page_url, 'HIT');
+ $this->assertCacheContexts(['user', 'url.query_args:_wrapper_format']);
+ $this->assertLink('Shortcuts');
+ $this->assertLink('Cron');
+
+ // Add another shortcut.
+ $shortcut = Shortcut::create([
+ 'shortcut_set' => 'default',
+ 'title' => 'Llama',
+ 'weight' => 0,
+ 'link' => [['uri' => 'internal:/admin/config']],
+ ]);
+ $shortcut->save();
+
+ // The shortcuts are displayed in a lazy builder, so the page is still a
+ // cache HIT but shows the new shortcut immediately.
+ $this->verifyDynamicPageCache($test_page_url, 'HIT');
+ $this->assertLink('Cron');
+ $this->assertLink('Llama');
+
+ // Update the shortcut title and assert that it is updated.
+ $shortcut->set('title', 'Alpaca');
+ $shortcut->save();
+ $this->verifyDynamicPageCache($test_page_url, 'HIT');
+ $this->assertLink('Cron');
+ $this->assertLink('Alpaca');
+
+ // Delete the shortcut and assert that the link is gone.
+ $shortcut->delete();
+ $this->verifyDynamicPageCache($test_page_url, 'HIT');
+ $this->assertLink('Cron');
+ $this->assertNoLink('Alpaca');
+ }
+
}
diff --git a/web/core/modules/shortcut/tests/src/Functional/ShortcutLinksTest.php b/web/core/modules/shortcut/tests/src/Functional/ShortcutLinksTest.php
index 8f7bf0aa1b..512fd2b7b1 100644
--- a/web/core/modules/shortcut/tests/src/Functional/ShortcutLinksTest.php
+++ b/web/core/modules/shortcut/tests/src/Functional/ShortcutLinksTest.php
@@ -80,11 +80,11 @@ public function testShortcutLinkAdd() {
'link[0][uri]' => $test_path,
];
$this->drupalPostForm('admin/config/user-interface/shortcut/manage/' . $set->id() . '/add-link', $form_data, t('Save'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertText(t('Added a shortcut for @title.', ['@title' => $title]));
$saved_set = ShortcutSet::load($set->id());
$paths = $this->getShortcutInformation($saved_set, 'link');
- $this->assertTrue(in_array('internal:' . $test_path, $paths), 'Shortcut created: ' . $test_path);
+ $this->assertContains('internal:' . $test_path, $paths, 'Shortcut created: ' . $test_path);
if (in_array($test_path, $test_cases_non_access)) {
$this->assertNoLink($title, new FormattableMarkup('Shortcut link %url not accessible on the page.', ['%url' => $test_path]));
@@ -113,7 +113,7 @@ public function testShortcutLinkAdd() {
'link[0][uri]' => '/admin',
];
$this->drupalPostForm('admin/config/user-interface/shortcut/manage/' . $set->id() . '/add-link', $form_data, t('Save'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertRaw(t("The path '@link_path' is inaccessible.", ['@link_path' => '/admin']));
$form_data = [
@@ -136,7 +136,7 @@ public function testShortcutLinkAdd() {
'link[0][uri]' => '/admin',
];
$this->drupalPostForm('admin/config/user-interface/shortcut/manage/' . $edit['id'] . '/add-link', $form_data, t('Save'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
}
/**
@@ -239,7 +239,7 @@ public function testShortcutLinkRename() {
$this->drupalPostForm('admin/config/user-interface/shortcut/link/' . $shortcut->id(), ['title[0][value]' => $new_link_name], t('Save'));
$saved_set = ShortcutSet::load($set->id());
$titles = $this->getShortcutInformation($saved_set, 'title');
- $this->assertTrue(in_array($new_link_name, $titles), 'Shortcut renamed: ' . $new_link_name);
+ $this->assertContains($new_link_name, $titles, 'Shortcut renamed: ' . $new_link_name);
$this->assertLink($new_link_name, 0, 'Renamed shortcut link appears on the page.');
$this->assertText(t('The shortcut @link has been updated.', ['@link' => $new_link_name]));
}
@@ -258,7 +258,7 @@ public function testShortcutLinkChangePath() {
$this->drupalPostForm('admin/config/user-interface/shortcut/link/' . $shortcut->id(), ['title[0][value]' => $shortcut->getTitle(), 'link[0][uri]' => $new_link_path], t('Save'));
$saved_set = ShortcutSet::load($set->id());
$paths = $this->getShortcutInformation($saved_set, 'link');
- $this->assertTrue(in_array('internal:' . $new_link_path, $paths), 'Shortcut path changed: ' . $new_link_path);
+ $this->assertContains('internal:' . $new_link_path, $paths, 'Shortcut path changed: ' . $new_link_path);
$this->assertLinkByHref($new_link_path, 0, 'Shortcut with new path appears on the page.');
$this->assertText(t('The shortcut @link has been updated.', ['@link' => $shortcut->getTitle()]));
}
@@ -269,14 +269,14 @@ public function testShortcutLinkChangePath() {
public function testShortcutLinkChangeRoute() {
$this->drupalLogin($this->rootUser);
$this->drupalGet('admin/content');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Disable the view.
View::load('content')->disable()->save();
/** @var \Drupal\Core\Routing\RouteBuilderInterface $router_builder */
$router_builder = \Drupal::service('router.builder');
$router_builder->rebuildIfNeeded();
$this->drupalGet('admin/content');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
}
/**
@@ -290,7 +290,7 @@ public function testShortcutLinkDelete() {
$this->drupalPostForm('admin/config/user-interface/shortcut/link/' . $shortcut->id() . '/delete', [], 'Delete');
$saved_set = ShortcutSet::load($set->id());
$ids = $this->getShortcutInformation($saved_set, 'id');
- $this->assertFalse(in_array($shortcut->id(), $ids), 'Successfully deleted a shortcut.');
+ $this->assertNotContains($shortcut->id(), $ids, 'Successfully deleted a shortcut.');
// Delete all the remaining shortcut links.
$storage = \Drupal::entityTypeManager()->getStorage('shortcut');
@@ -355,9 +355,9 @@ public function testAccessShortcutsPermission() {
$this->assertNoLink('Shortcuts', 'Shortcut link not found on page.');
// Verify that users without the 'administer site configuration' permission
- // can't see the cron shortcuts.
+ // can't see the cron shortcuts but can see shortcuts.
$this->drupalLogin($this->drupalCreateUser(['access toolbar', 'access shortcuts']));
- $this->assertNoLink('Shortcuts', 'Shortcut link not found on page.');
+ $this->assertLink('Shortcuts');
$this->assertNoLink('Cron', 'Cron shortcut link not found on page.');
// Verify that users with the 'access shortcuts' permission can see the
@@ -406,17 +406,12 @@ private function verifyAccessShortcutsPermissionForEditPages() {
// Verify that set administration pages are inaccessible without the
// 'access shortcuts' permission.
- $edit_paths = [
- 'admin/config/user-interface/shortcut/manage/default/customize',
- 'admin/config/user-interface/shortcut/manage/default',
- 'user/' . $noaccess_user->id() . '/shortcuts',
- ];
-
- foreach ($edit_paths as $path) {
- $this->drupalGet($path);
- $message = new FormattableMarkup('Access is denied on %s', ['%s' => $path]);
- $this->assertResponse(403, $message);
- }
+ $this->drupalGet('admin/config/user-interface/shortcut/manage/default/customize');
+ $this->assertSession()->statusCodeEquals(403);
+ $this->drupalGet('admin/config/user-interface/shortcut/manage/default');
+ $this->assertSession()->statusCodeEquals(403);
+ $this->drupalGet('user/' . $noaccess_user->id() . '/shortcuts');
+ $this->assertSession()->statusCodeEquals(403);
}
/**
diff --git a/web/core/modules/shortcut/tests/src/Functional/ShortcutSetsTest.php b/web/core/modules/shortcut/tests/src/Functional/ShortcutSetsTest.php
index b7bf485886..4372aeae94 100644
--- a/web/core/modules/shortcut/tests/src/Functional/ShortcutSetsTest.php
+++ b/web/core/modules/shortcut/tests/src/Functional/ShortcutSetsTest.php
@@ -60,7 +60,7 @@ public function testShortcutSetEdit() {
$this->drupalGet('admin/config/user-interface/shortcut/manage/' . $set->id() . '/customize');
// Test for the page title.
- $this->assertTitle(t('List links') . ' | Drupal');
+ $this->assertTitle('List links | Drupal');
// Test for the table.
$element = $this->xpath('//div[@class="layout-content"]//table');
@@ -68,7 +68,7 @@ public function testShortcutSetEdit() {
// Test the table header.
$elements = $this->xpath('//div[@class="layout-content"]//table/thead/tr/th');
- $this->assertEqual(count($elements), 3, 'Correct number of table header cells found.');
+ $this->assertCount(3, $elements, 'Correct number of table header cells found.');
// Test the contents of each th cell.
$expected_items = [t('Name'), t('Weight'), t('Operations')];
@@ -111,7 +111,7 @@ public function testShortcutSetSwitchOwn() {
// Attempt to switch the default shortcut set to the newly created shortcut
// set.
$this->drupalPostForm('user/' . $this->adminUser->id() . '/shortcuts', ['set' => $new_set->id()], t('Change set'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$current_set = shortcut_current_displayed_set($this->adminUser);
$this->assertTrue($new_set->id() == $current_set->id(), 'Successfully switched own shortcut set.');
}
@@ -198,7 +198,7 @@ public function testShortcutSetDelete() {
*/
public function testShortcutSetDeleteDefault() {
$this->drupalGet('admin/config/user-interface/shortcut/manage/default/delete');
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
}
/**
diff --git a/web/core/modules/shortcut/tests/src/Kernel/Migrate/d7/MigrateShortcutSetTest.php b/web/core/modules/shortcut/tests/src/Kernel/Migrate/d7/MigrateShortcutSetTest.php
index b6543723db..7aa6ebc70d 100644
--- a/web/core/modules/shortcut/tests/src/Kernel/Migrate/d7/MigrateShortcutSetTest.php
+++ b/web/core/modules/shortcut/tests/src/Kernel/Migrate/d7/MigrateShortcutSetTest.php
@@ -59,7 +59,7 @@ public function testShortcutSetMigration() {
*/
protected function assertEntity($id, $label, $expected_size) {
$shortcut_set = ShortcutSet::load($id);
- $this->assertTrue($shortcut_set instanceof ShortcutSetInterface);
+ $this->assertInstanceOf(ShortcutSetInterface::class, $shortcut_set);
/** @var \Drupal\shortcut\ShortcutSetInterface $shortcut_set */
$this->assertIdentical($id, $shortcut_set->id());
$this->assertIdentical($label, $shortcut_set->label());
diff --git a/web/core/modules/shortcut/tests/src/Kernel/Migrate/d7/MigrateShortcutTest.php b/web/core/modules/shortcut/tests/src/Kernel/Migrate/d7/MigrateShortcutTest.php
index e685151a5b..e41f4b9322 100644
--- a/web/core/modules/shortcut/tests/src/Kernel/Migrate/d7/MigrateShortcutTest.php
+++ b/web/core/modules/shortcut/tests/src/Kernel/Migrate/d7/MigrateShortcutTest.php
@@ -53,7 +53,7 @@ protected function setUp() {
*/
protected function assertEntity($id, $title, $weight, $url) {
$shortcut = Shortcut::load($id);
- $this->assertTrue($shortcut instanceof ShortcutInterface);
+ $this->assertInstanceOf(ShortcutInterface::class, $shortcut);
/** @var \Drupal\shortcut\ShortcutInterface $shortcut */
$this->assertIdentical($title, $shortcut->getTitle());
$this->assertIdentical($weight, $shortcut->getWeight());
diff --git a/web/core/modules/simpletest/src/TestDiscovery.php b/web/core/modules/simpletest/src/TestDiscovery.php
index 8ce8b7de46..5a533f3b9b 100644
--- a/web/core/modules/simpletest/src/TestDiscovery.php
+++ b/web/core/modules/simpletest/src/TestDiscovery.php
@@ -61,7 +61,7 @@ public function __construct($root, $class_loader, ModuleHandlerInterface $module
* An array of included test types.
*
* @return array
- * An array of tests keyed by the the group name. If a test is annotated to
+ * An array of tests keyed by the group name. If a test is annotated to
* belong to multiple groups, it will appear under all group keys it belongs
* to.
* @code
diff --git a/web/core/modules/simpletest/src/WebTestBase.php b/web/core/modules/simpletest/src/WebTestBase.php
index b23004d571..8d7e67b5c5 100644
--- a/web/core/modules/simpletest/src/WebTestBase.php
+++ b/web/core/modules/simpletest/src/WebTestBase.php
@@ -27,7 +27,7 @@
use Drupal\Tests\TestFileCreationTrait;
use Drupal\Tests\user\Traits\UserCreationTrait as BaseUserCreationTrait;
use Drupal\Tests\XdebugRequestTrait;
-use Zend\Diactoros\Uri;
+use Laminas\Diactoros\Uri;
/**
* Test case for typical Drupal tests.
diff --git a/web/core/modules/simpletest/tests/fixtures/simpletest_phpunit_browsertest.php b/web/core/modules/simpletest/tests/fixtures/simpletest_phpunit_browsertest.php
index 0e9c4165a2..dc7a54ea3f 100644
--- a/web/core/modules/simpletest/tests/fixtures/simpletest_phpunit_browsertest.php
+++ b/web/core/modules/simpletest/tests/fixtures/simpletest_phpunit_browsertest.php
@@ -1,5 +1,7 @@
<?php
+// phpcs:ignoreFile
+
namespace Drupal\Tests\simpletest\Functional;
use Drupal\Tests\BrowserTestBase;
diff --git a/web/core/modules/simpletest/tests/fixtures/simpletest_phpunit_run_command_test.php b/web/core/modules/simpletest/tests/fixtures/simpletest_phpunit_run_command_test.php
index 42dadfdb36..a4ded4b244 100644
--- a/web/core/modules/simpletest/tests/fixtures/simpletest_phpunit_run_command_test.php
+++ b/web/core/modules/simpletest/tests/fixtures/simpletest_phpunit_run_command_test.php
@@ -1,5 +1,7 @@
<?php
+// phpcs:ignoreFile
+
namespace Drupal\Tests\simpletest\Unit;
use Drupal\Tests\UnitTestCase;
diff --git a/web/core/modules/simpletest/tests/src/Kernel/PhpUnitErrorTest.php b/web/core/modules/simpletest/tests/src/Kernel/PhpUnitErrorTest.php
index 4f01936eeb..8a8d0d70af 100644
--- a/web/core/modules/simpletest/tests/src/Kernel/PhpUnitErrorTest.php
+++ b/web/core/modules/simpletest/tests/src/Kernel/PhpUnitErrorTest.php
@@ -28,7 +28,7 @@ public function testPhpUnitXmlParsing() {
$phpunit_error_xml = __DIR__ . '/../../fixtures/phpunit_error.xml';
$res = simpletest_phpunit_xml_to_rows(1, $phpunit_error_xml);
- $this->assertEquals(count($res), 4, 'All testcases got extracted');
+ $this->assertCount(4, $res, 'All testcases got extracted');
$this->assertNotEquals($res[0]['status'], 'pass');
$this->assertEquals($res[0]['status'], 'fail');
diff --git a/web/core/modules/statistics/migrations/statistics_node_counter.yml b/web/core/modules/statistics/migrations/statistics_node_counter.yml
index 748a4a83c0..0c2aa71d71 100644
--- a/web/core/modules/statistics/migrations/statistics_node_counter.yml
+++ b/web/core/modules/statistics/migrations/statistics_node_counter.yml
@@ -10,8 +10,14 @@ process:
nid:
-
plugin: migration_lookup
- migration: [d6_node, d7_node]
+ migration:
+ - d6_node_complete
+ - d7_node_complete
+ - d6_node
+ - d7_node
source: nid
+ -
+ plugin: node_complete_node_lookup
-
plugin: skip_on_empty
method: row
diff --git a/web/core/modules/statistics/src/Plugin/migrate/destination/NodeCounter.php b/web/core/modules/statistics/src/Plugin/migrate/destination/NodeCounter.php
index eee23bff5f..1045e4ac8c 100644
--- a/web/core/modules/statistics/src/Plugin/migrate/destination/NodeCounter.php
+++ b/web/core/modules/statistics/src/Plugin/migrate/destination/NodeCounter.php
@@ -96,7 +96,10 @@ public function import(Row $row, array $old_destination_id_values = []) {
])
->expression('daycount', 'daycount + :daycount', [':daycount' => $daycount])
->expression('totalcount', 'totalcount + :totalcount', [':totalcount' => $totalcount])
- ->expression('timestamp', 'CASE WHEN timestamp > :timestamp THEN timestamp ELSE :timestamp END', [':timestamp' => $timestamp])
+ // Per Drupal policy: "A query may have any number of placeholders, but
+ // all must have unique names even if they have the same value."
+ // https://www.drupal.org/docs/8/api/database-api/static-queries#placeholders
+ ->expression('timestamp', 'CASE WHEN timestamp > :timestamp1 THEN timestamp ELSE :timestamp2 END', [':timestamp1' => $timestamp, ':timestamp2' => $timestamp])
->execute();
return [$row->getDestinationProperty('nid')];
diff --git a/web/core/modules/statistics/tests/src/Functional/StatisticsTokenReplaceTest.php b/web/core/modules/statistics/tests/src/Functional/StatisticsTokenReplaceTest.php
index 6a67098815..60c55aaa1a 100644
--- a/web/core/modules/statistics/tests/src/Functional/StatisticsTokenReplaceTest.php
+++ b/web/core/modules/statistics/tests/src/Functional/StatisticsTokenReplaceTest.php
@@ -51,7 +51,7 @@ public function testStatisticsTokenReplacement() {
$tests['[node:last-view:short]'] = $date_formatter->format($statistics->getTimestamp(), 'short');
// Test to make sure that we generated something for each token.
- $this->assertFalse(in_array(0, array_map('strlen', $tests)), 'No empty tokens generated.');
+ $this->assertNotContains(0, array_map('strlen', $tests), 'No empty tokens generated.');
foreach ($tests as $input => $expected) {
$output = \Drupal::token()->replace($input, ['node' => $node], ['langcode' => $language_interface->getId()]);
diff --git a/web/core/modules/statistics/tests/src/Functional/Views/IntegrationTest.php b/web/core/modules/statistics/tests/src/Functional/Views/IntegrationTest.php
index ebee1ee43d..a03535f17e 100644
--- a/web/core/modules/statistics/tests/src/Functional/Views/IntegrationTest.php
+++ b/web/core/modules/statistics/tests/src/Functional/Views/IntegrationTest.php
@@ -92,7 +92,7 @@ public function testNodeCounterIntegration() {
$this->drupalLogout();
$this->drupalLogin($this->deniedUser);
$this->drupalGet('test_statistics_integration');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertSession()->pageTextNotContains('Total views:');
$this->assertSession()->pageTextNotContains('Views today:');
diff --git a/web/core/modules/statistics/tests/src/Kernel/Migrate/d6/MigrateNodeCounterTest.php b/web/core/modules/statistics/tests/src/Kernel/Migrate/d6/MigrateNodeCounterTest.php
index 9293980545..6d89f34574 100644
--- a/web/core/modules/statistics/tests/src/Kernel/Migrate/d6/MigrateNodeCounterTest.php
+++ b/web/core/modules/statistics/tests/src/Kernel/Migrate/d6/MigrateNodeCounterTest.php
@@ -18,8 +18,6 @@ class MigrateNodeCounterTest extends MigrateDrupal6TestBase {
'content_translation',
'language',
'menu_ui',
- // Required for translation migrations.
- 'migrate_drupal_multilingual',
'node',
'statistics',
'text',
diff --git a/web/core/modules/statistics/tests/src/Kernel/Migrate/d7/MigrateNodeCounterTest.php b/web/core/modules/statistics/tests/src/Kernel/Migrate/d7/MigrateNodeCounterTest.php
index 708f0a7b4d..14d83c5a98 100644
--- a/web/core/modules/statistics/tests/src/Kernel/Migrate/d7/MigrateNodeCounterTest.php
+++ b/web/core/modules/statistics/tests/src/Kernel/Migrate/d7/MigrateNodeCounterTest.php
@@ -18,8 +18,6 @@ class MigrateNodeCounterTest extends MigrateDrupal7TestBase {
'content_translation',
'language',
'menu_ui',
- // Required for translation migrations.
- 'migrate_drupal_multilingual',
'node',
'statistics',
'text',
diff --git a/web/core/modules/system/src/Controller/DbUpdateController.php b/web/core/modules/system/src/Controller/DbUpdateController.php
index 8c476329c2..0429b8caf6 100644
--- a/web/core/modules/system/src/Controller/DbUpdateController.php
+++ b/web/core/modules/system/src/Controller/DbUpdateController.php
@@ -216,8 +216,10 @@ protected function info(Request $request) {
];
$info[] = $this->t("<strong>Back up your code</strong>. Hint: when backing up module code, do not leave that backup in the 'modules' or 'sites/*/modules' directories as this may confuse Drupal's auto-discovery mechanism.");
+ // @todo Simplify with https://www.drupal.org/node/2548095
+ $base_url = str_replace('/update.php', '', $request->getBaseUrl());
$info[] = $this->t('Put your site into <a href=":url">maintenance mode</a>.', [
- ':url' => Url::fromRoute('system.site_maintenance_mode')->toString(TRUE)->getGeneratedUrl(),
+ ':url' => Url::fromRoute('system.site_maintenance_mode')->setOption('base_url', $base_url)->toString(TRUE)->getGeneratedUrl(),
]);
$info[] = $this->t('<strong>Back up your database</strong>. This process will change your database values and in case of emergency you may need to revert to a backup.');
$info[] = $this->t('Install your new files in the appropriate location, as described in the handbook.');
@@ -271,6 +273,7 @@ protected function selection(Request $request) {
case 'update':
$updates = update_get_update_list();
break;
+
case 'post_update':
$updates = $this->postUpdateRegistry->getPendingUpdateInformation();
break;
diff --git a/web/core/modules/system/src/Controller/EntityAutocompleteController.php b/web/core/modules/system/src/Controller/EntityAutocompleteController.php
index b326385d59..5921642a34 100644
--- a/web/core/modules/system/src/Controller/EntityAutocompleteController.php
+++ b/web/core/modules/system/src/Controller/EntityAutocompleteController.php
@@ -5,7 +5,7 @@
use Drupal\Component\Utility\Crypt;
use Drupal\Component\Utility\Tags;
use Drupal\Core\Controller\ControllerBase;
-use Drupal\Core\Entity\EntityAutocompleteMatcher;
+use Drupal\Core\Entity\EntityAutocompleteMatcherInterface;
use Drupal\Core\KeyValueStore\KeyValueStoreInterface;
use Drupal\Core\Site\Settings;
use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -21,7 +21,7 @@ class EntityAutocompleteController extends ControllerBase {
/**
* The autocomplete matcher for entity references.
*
- * @var \Drupal\Core\Entity\EntityAutocompleteMatcher
+ * @var \Drupal\Core\Entity\EntityAutocompleteMatcherInterface
*/
protected $matcher;
@@ -35,12 +35,12 @@ class EntityAutocompleteController extends ControllerBase {
/**
* Constructs a EntityAutocompleteController object.
*
- * @param \Drupal\Core\Entity\EntityAutocompleteMatcher $matcher
+ * @param \Drupal\Core\Entity\EntityAutocompleteMatcherInterface $matcher
* The autocomplete matcher for entity references.
* @param \Drupal\Core\KeyValueStore\KeyValueStoreInterface $key_value
* The key value factory.
*/
- public function __construct(EntityAutocompleteMatcher $matcher, KeyValueStoreInterface $key_value) {
+ public function __construct(EntityAutocompleteMatcherInterface $matcher, KeyValueStoreInterface $key_value) {
$this->matcher = $matcher;
$this->keyValue = $key_value;
}
diff --git a/web/core/modules/system/src/Controller/SystemController.php b/web/core/modules/system/src/Controller/SystemController.php
index f27cc01eb1..5942ff3ce0 100644
--- a/web/core/modules/system/src/Controller/SystemController.php
+++ b/web/core/modules/system/src/Controller/SystemController.php
@@ -4,12 +4,14 @@
use Drupal\Core\Cache\CacheableMetadata;
use Drupal\Core\Controller\ControllerBase;
+use Drupal\Core\Extension\ModuleExtensionList;
use Drupal\Core\Extension\ThemeHandlerInterface;
use Drupal\Core\Form\FormBuilderInterface;
use Drupal\Core\Menu\MenuLinkTreeInterface;
use Drupal\Core\Menu\MenuTreeParameters;
use Drupal\Core\Theme\ThemeAccessCheck;
use Drupal\Core\Url;
+use Drupal\system\ModuleDependencyMessageTrait;
use Drupal\system\SystemManager;
use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -18,6 +20,8 @@
*/
class SystemController extends ControllerBase {
+ use ModuleDependencyMessageTrait;
+
/**
* System Manager Service.
*
@@ -53,6 +57,13 @@ class SystemController extends ControllerBase {
*/
protected $menuLinkTree;
+ /**
+ * The module extension list.
+ *
+ * @var \Drupal\Core\Extension\ModuleExtensionList
+ */
+ protected $moduleExtensionList;
+
/**
* Constructs a new SystemController.
*
@@ -66,13 +77,20 @@ class SystemController extends ControllerBase {
* The theme handler.
* @param \Drupal\Core\Menu\MenuLinkTreeInterface $menu_link_tree
* The menu link tree service.
+ * @param \Drupal\Core\Extension\ModuleExtensionList $module_extension_list
+ * The module extension list.
*/
- public function __construct(SystemManager $systemManager, ThemeAccessCheck $theme_access, FormBuilderInterface $form_builder, ThemeHandlerInterface $theme_handler, MenuLinkTreeInterface $menu_link_tree) {
+ public function __construct(SystemManager $systemManager, ThemeAccessCheck $theme_access, FormBuilderInterface $form_builder, ThemeHandlerInterface $theme_handler, MenuLinkTreeInterface $menu_link_tree, ModuleExtensionList $module_extension_list = NULL) {
$this->systemManager = $systemManager;
$this->themeAccess = $theme_access;
$this->formBuilder = $form_builder;
$this->themeHandler = $theme_handler;
$this->menuLinkTree = $menu_link_tree;
+ if ($module_extension_list === NULL) {
+ @trigger_error('The extension.list.module service must be passed to ' . __NAMESPACE__ . '\SystemController::__construct. It was added in Drupal 8.9.0 and will be required before Drupal 10.0.0.', E_USER_DEPRECATED);
+ $module_extension_list = \Drupal::service('extension.list.module');
+ }
+ $this->moduleExtensionList = $module_extension_list;
}
/**
@@ -84,7 +102,8 @@ public static function create(ContainerInterface $container) {
$container->get('access_check.theme'),
$container->get('form_builder'),
$container->get('theme_handler'),
- $container->get('menu.link_tree')
+ $container->get('menu.link_tree'),
+ $container->get('extension.list.module')
);
}
@@ -231,9 +250,41 @@ public function themesPage() {
$theme->incompatible_base = (isset($theme->info['base theme']) && !($theme->base_themes === array_filter($theme->base_themes)));
// Confirm that the theme engine is available.
$theme->incompatible_engine = isset($theme->info['engine']) && !isset($theme->owner);
+ // Confirm that module dependencies are available.
+ $theme->incompatible_module = FALSE;
+ // Confirm that the user has permission to enable modules.
+ $theme->insufficient_module_permissions = FALSE;
}
+
+ // Check module dependencies.
+ if ($theme->module_dependencies) {
+ $modules = $this->moduleExtensionList->getList();
+ foreach ($theme->module_dependencies as $dependency => $dependency_object) {
+ if ($incompatible = $this->checkDependencyMessage($modules, $dependency, $dependency_object)) {
+ $theme->module_dependencies_list[$dependency] = $incompatible;
+ $theme->incompatible_module = TRUE;
+ continue;
+ }
+
+ // @todo Add logic for not displaying hidden modules in
+ // https://drupal.org/node/3117829.
+ $module_name = $modules[$dependency]->info['name'];
+ $theme->module_dependencies_list[$dependency] = $modules[$dependency]->status ? $this->t('@module_name', ['@module_name' => $module_name]) : $this->t('@module_name (<span class="admin-disabled">disabled</span>)', ['@module_name' => $module_name]);
+
+ // Create an additional property that contains only disabled module
+ // dependencies. This will determine if it is possible to install the
+ // theme, or if modules must first be enabled.
+ if (!$modules[$dependency]->status) {
+ $theme->module_dependencies_disabled[$dependency] = $module_name;
+ if (!$this->currentUser()->hasPermission('administer modules')) {
+ $theme->insufficient_module_permissions = TRUE;
+ }
+ }
+ }
+ }
+
$theme->operations = [];
- if (!empty($theme->status) || !$theme->info['core_incompatible'] && !$theme->incompatible_php && !$theme->incompatible_base && !$theme->incompatible_engine) {
+ if (!empty($theme->status) || !$theme->info['core_incompatible'] && !$theme->incompatible_php && !$theme->incompatible_base && !$theme->incompatible_engine && !$theme->incompatible_module && empty($theme->module_dependencies_disabled)) {
// Create the operations links.
$query['theme'] = $theme->getName();
if ($this->themeAccess->checkAccess($theme->getName())) {
diff --git a/web/core/modules/system/src/Controller/ThemeController.php b/web/core/modules/system/src/Controller/ThemeController.php
index 0a8ad31cf8..1f3e61865c 100644
--- a/web/core/modules/system/src/Controller/ThemeController.php
+++ b/web/core/modules/system/src/Controller/ThemeController.php
@@ -6,6 +6,7 @@
use Drupal\Core\Config\PreExistingConfigException;
use Drupal\Core\Config\UnmetDependenciesException;
use Drupal\Core\Controller\ControllerBase;
+use Drupal\Core\Extension\MissingDependencyException;
use Drupal\Core\Extension\ThemeExtensionList;
use Drupal\Core\Extension\ThemeHandlerInterface;
use Drupal\Core\Extension\ThemeInstallerInterface;
@@ -161,6 +162,9 @@ public function install(Request $request) {
catch (UnmetDependenciesException $e) {
$this->messenger()->addError($e->getTranslatedMessage($this->getStringTranslation(), $theme));
}
+ catch (MissingDependencyException $e) {
+ $this->messenger()->addError($this->t('Unable to install @theme due to missing module dependencies.', ['@theme' => $theme]));
+ }
return $this->redirect('system.themes_page');
}
diff --git a/web/core/modules/system/src/FileDownloadController.php b/web/core/modules/system/src/FileDownloadController.php
index 9bf889084a..c527aed07c 100644
--- a/web/core/modules/system/src/FileDownloadController.php
+++ b/web/core/modules/system/src/FileDownloadController.php
@@ -75,7 +75,7 @@ public function download(Request $request, $scheme = 'private') {
// Merge remaining path arguments into relative file path.
$uri = $scheme . '://' . $target;
- if ($this->streamWrapperManager->isValidScheme($scheme) && file_exists($uri)) {
+ if ($this->streamWrapperManager->isValidScheme($scheme) && is_file($uri)) {
// Let other modules provide headers and controls access to the file.
$headers = $this->moduleHandler()->invokeAll('file_download', [$uri]);
diff --git a/web/core/modules/system/src/Form/DateFormatFormBase.php b/web/core/modules/system/src/Form/DateFormatFormBase.php
index 8e6cd82c94..72a4d2e79a 100644
--- a/web/core/modules/system/src/Form/DateFormatFormBase.php
+++ b/web/core/modules/system/src/Form/DateFormatFormBase.php
@@ -7,7 +7,6 @@
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Language\LanguageInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
-use Drupal\Core\Datetime\DrupalDateTime;
use Drupal\Core\Entity\EntityForm;
/**
@@ -38,8 +37,6 @@ abstract class DateFormatFormBase extends EntityForm {
* The date format storage.
*/
public function __construct(DateFormatterInterface $date_formatter, ConfigEntityStorageInterface $date_format_storage) {
- $date = new DrupalDateTime();
-
$this->dateFormatter = $date_formatter;
$this->dateFormatStorage = $date_format_storage;
}
diff --git a/web/core/modules/system/src/Form/ModulesListForm.php b/web/core/modules/system/src/Form/ModulesListForm.php
index f32dad0909..d0c0a6fbb2 100644
--- a/web/core/modules/system/src/Form/ModulesListForm.php
+++ b/web/core/modules/system/src/Form/ModulesListForm.php
@@ -17,6 +17,7 @@
use Drupal\Core\Session\AccountInterface;
use Drupal\user\PermissionHandlerInterface;
use Drupal\Core\Url;
+use Drupal\system\ModuleDependencyMessageTrait;
use Symfony\Component\DependencyInjection\ContainerInterface;
/**
@@ -31,6 +32,8 @@
*/
class ModulesListForm extends FormBase {
+ use ModuleDependencyMessageTrait;
+
/**
* The current user.
*
@@ -326,38 +329,16 @@ protected function buildRow(array $modules, Extension $module, $distribution) {
// If this module requires other modules, add them to the array.
/** @var \Drupal\Core\Extension\Dependency $dependency_object */
foreach ($module->requires as $dependency => $dependency_object) {
- if (!isset($modules[$dependency])) {
- $row['#requires'][$dependency] = $this->t('@module (<span class="admin-missing">missing</span>)', ['@module' => $dependency]);
+ // @todo Add logic for not displaying hidden modules in
+ // https://drupal.org/node/3117829.
+ if ($incompatible = $this->checkDependencyMessage($modules, $dependency, $dependency_object)) {
+ $row['#requires'][$dependency] = $incompatible;
$row['enable']['#disabled'] = TRUE;
+ continue;
}
- // Only display visible modules.
- elseif (empty($modules[$dependency]->hidden)) {
- $name = $modules[$dependency]->info['name'];
- // Disable the module's checkbox if it is incompatible with the
- // dependency's version.
- if (!$dependency_object->isCompatible(str_replace(\Drupal::CORE_COMPATIBILITY . '-', '', $modules[$dependency]->info['version']))) {
- $row['#requires'][$dependency] = $this->t('@module (@constraint) (<span class="admin-missing">incompatible with</span> version @version)', [
- '@module' => $name,
- '@constraint' => $dependency_object->getConstraintString(),
- '@version' => $modules[$dependency]->info['version'],
- ]);
- $row['enable']['#disabled'] = TRUE;
- }
- // Disable the checkbox if the dependency is incompatible with this
- // version of Drupal core.
- elseif ($modules[$dependency]->info['core_incompatible']) {
- $row['#requires'][$dependency] = $this->t('@module (<span class="admin-missing">incompatible with</span> this version of Drupal core)', [
- '@module' => $name,
- ]);
- $row['enable']['#disabled'] = TRUE;
- }
- elseif ($modules[$dependency]->status) {
- $row['#requires'][$dependency] = $this->t('@module', ['@module' => $name]);
- }
- else {
- $row['#requires'][$dependency] = $this->t('@module (<span class="admin-disabled">disabled</span>)', ['@module' => $name]);
- }
- }
+
+ $name = $modules[$dependency]->info['name'];
+ $row['#requires'][$dependency] = $modules[$dependency]->status ? $this->t('@module', ['@module' => $name]) : $this->t('@module (<span class="admin-disabled">disabled</span>)', ['@module' => $name]);
}
// If this module is required by other modules, list those, and then make it
diff --git a/web/core/modules/system/src/Form/PrepareModulesEntityUninstallForm.php b/web/core/modules/system/src/Form/PrepareModulesEntityUninstallForm.php
index 8531653247..8746a3834f 100644
--- a/web/core/modules/system/src/Form/PrepareModulesEntityUninstallForm.php
+++ b/web/core/modules/system/src/Form/PrepareModulesEntityUninstallForm.php
@@ -227,7 +227,7 @@ public static function deleteContentEntities($entity_type_id, &$context) {
$storage->delete($entities);
}
// Sometimes deletes cause secondary deletes. For example, deleting a
- // taxonomy term can cause its children to be be deleted too.
+ // taxonomy term can cause its children to be deleted too.
$context['sandbox']['progress'] = $context['sandbox']['max'] - $storage->getQuery()->count()->execute();
// Inform the batch engine that we are not finished and provide an
diff --git a/web/core/modules/system/src/Form/RegionalForm.php b/web/core/modules/system/src/Form/RegionalForm.php
index ccd880ace0..848e928673 100644
--- a/web/core/modules/system/src/Form/RegionalForm.php
+++ b/web/core/modules/system/src/Form/RegionalForm.php
@@ -104,42 +104,6 @@ public function buildForm(array $form, FormStateInterface $form_state) {
'#options' => $zones,
];
- $configurable_timezones = $system_date->get('timezone.user.configurable');
- $form['timezone']['configurable_timezones'] = [
- '#type' => 'checkbox',
- '#title' => t('Users may set their own time zone'),
- '#default_value' => $configurable_timezones,
- ];
-
- $form['timezone']['configurable_timezones_wrapper'] = [
- '#type' => 'container',
- '#states' => [
- // Hide the user configured timezone settings when users are forced to use
- // the default setting.
- 'invisible' => [
- 'input[name="configurable_timezones"]' => ['checked' => FALSE],
- ],
- ],
- ];
- $form['timezone']['configurable_timezones_wrapper']['empty_timezone_message'] = [
- '#type' => 'checkbox',
- '#title' => t('Remind users at login if their time zone is not set'),
- '#default_value' => $system_date->get('timezone.user.warn'),
- '#description' => t('Only applied if users may set their own time zone.'),
- ];
-
- $form['timezone']['configurable_timezones_wrapper']['user_default_timezone'] = [
- '#type' => 'radios',
- '#title' => t('Time zone for new users'),
- '#default_value' => $system_date->get('timezone.user.default'),
- '#options' => [
- DRUPAL_USER_TIMEZONE_DEFAULT => t('Default time zone'),
- DRUPAL_USER_TIMEZONE_EMPTY => t('Empty time zone'),
- DRUPAL_USER_TIMEZONE_SELECT => t('Users may set their own time zone at registration'),
- ],
- '#description' => t('Only applied if users may set their own time zone.'),
- ];
-
return parent::buildForm($form, $form_state);
}
@@ -151,9 +115,6 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
->set('country.default', $form_state->getValue('site_default_country'))
->set('first_day', $form_state->getValue('date_first_day'))
->set('timezone.default', $form_state->getValue('date_default_timezone'))
- ->set('timezone.user.configurable', $form_state->getValue('configurable_timezones'))
- ->set('timezone.user.warn', $form_state->getValue('empty_timezone_message'))
- ->set('timezone.user.default', $form_state->getValue('user_default_timezone'))
->save();
parent::submitForm($form, $form_state);
diff --git a/web/core/modules/system/src/ModuleDependencyMessageTrait.php b/web/core/modules/system/src/ModuleDependencyMessageTrait.php
new file mode 100644
index 0000000000..febfbfa43f
--- /dev/null
+++ b/web/core/modules/system/src/ModuleDependencyMessageTrait.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace Drupal\system;
+
+use Drupal\Core\Extension\Dependency;
+
+/**
+ * Messages for missing or incompatible dependencies on modules.
+ *
+ * @internal The trait simply helps core classes that display user messages
+ * regarding missing or incompatible module dependencies share exact same
+ * wording and markup.
+ */
+trait ModuleDependencyMessageTrait {
+
+ /**
+ * Provides messages for missing modules or incompatible dependencies.
+ *
+ * @param array $modules
+ * The list of existing modules.
+ * @param string $dependency
+ * The module dependency to check.
+ * @param \Drupal\Core\Extension\Dependency $dependency_object
+ * Dependency object used for comparing version requirement data.
+ *
+ * @return string|null
+ * NULL if compatible, otherwise a string describing the incompatibility.
+ */
+ public function checkDependencyMessage(array $modules, $dependency, Dependency $dependency_object) {
+ if (!isset($modules[$dependency])) {
+ return $this->t('@module_name (<span class="admin-missing">missing</span>)', ['@module_name' => $dependency]);
+ }
+ else {
+ $module_name = $modules[$dependency]->info['name'];
+
+ // Check if the module is compatible with the installed version of core.
+ if ($modules[$dependency]->info['core_incompatible']) {
+ return $this->t('@module_name (<span class="admin-missing">incompatible with</span> this version of Drupal core)', [
+ '@module_name' => $module_name,
+ ]);
+ }
+
+ // Check if the module is incompatible with the dependency constraints.
+ $version = str_replace(\Drupal::CORE_COMPATIBILITY . '-', '', $modules[$dependency]->info['version']);
+ if (!$dependency_object->isCompatible($version)) {
+ $constraint_string = $dependency_object->getConstraintString();
+ return $this->t('@module_name (<span class="admin-missing">incompatible with</span> version @version)', [
+ '@module_name' => "$module_name ($constraint_string)",
+ '@version' => $modules[$dependency]->info['version'],
+ ]);
+ }
+ }
+ }
+
+}
diff --git a/web/core/modules/system/src/Tests/Cache/GenericCacheBackendUnitTestBase.php b/web/core/modules/system/src/Tests/Cache/GenericCacheBackendUnitTestBase.php
index 4abca9e576..80f37bf371 100644
--- a/web/core/modules/system/src/Tests/Cache/GenericCacheBackendUnitTestBase.php
+++ b/web/core/modules/system/src/Tests/Cache/GenericCacheBackendUnitTestBase.php
@@ -512,18 +512,18 @@ public function testInvalidate() {
$cids = $reference;
$ret = $backend->getMultiple($cids);
- $this->assertEqual(count($ret), 4, 'Four items returned.');
+ $this->assertCount(4, $ret, 'Four items returned.');
$backend->invalidate('test1');
$backend->invalidateMultiple(['test2', 'test3']);
$cids = $reference;
$ret = $backend->getMultiple($cids);
- $this->assertEqual(count($ret), 1, 'Only one item element returned.');
+ $this->assertCount(1, $ret, 'Only one item element returned.');
$cids = $reference;
$ret = $backend->getMultiple($cids, TRUE);
- $this->assertEqual(count($ret), 4, 'Four items returned.');
+ $this->assertCount(4, $ret, 'Four items returned.');
// Calling invalidateMultiple() with an empty array should not cause an
// error.
diff --git a/web/core/modules/system/src/Tests/Entity/EntityUnitTestBase.php b/web/core/modules/system/src/Tests/Entity/EntityUnitTestBase.php
index 9ec744a728..ba625f6504 100644
--- a/web/core/modules/system/src/Tests/Entity/EntityUnitTestBase.php
+++ b/web/core/modules/system/src/Tests/Entity/EntityUnitTestBase.php
@@ -22,7 +22,14 @@ abstract class EntityUnitTestBase extends KernelTestBase {
*
* @var array
*/
- public static $modules = ['user', 'system', 'field', 'text', 'filter', 'entity_test'];
+ public static $modules = [
+ 'user',
+ 'system',
+ 'field',
+ 'text',
+ 'filter',
+ 'entity_test',
+ ];
/**
* The entity manager service.
diff --git a/web/core/modules/system/system.admin.inc b/web/core/modules/system/system.admin.inc
index 661677b51a..5ae24c07fb 100644
--- a/web/core/modules/system/system.admin.inc
+++ b/web/core/modules/system/system.admin.inc
@@ -9,6 +9,7 @@
use Drupal\Core\Link;
use Drupal\Core\Render\Element;
use Drupal\Core\Template\Attribute;
+use Drupal\Core\Url;
/**
* Prepares variables for administrative content block templates.
@@ -123,7 +124,7 @@ function template_preprocess_system_admin_index(&$variables) {
* - version: The version of the module.
* - links: Administration links provided by the module.
* - #requires: A list of modules that the project requires.
- * - #required_by: A list of modules that require the project.
+ * - #required_by: A list of modules and themes that require the project.
* - #attributes: A list of attributes for the module wrapper.
*
* @see \Drupal\system\Form\ModulesListForm
@@ -131,6 +132,18 @@ function template_preprocess_system_admin_index(&$variables) {
function template_preprocess_system_modules_details(&$variables) {
$form = $variables['form'];
+ // Identify modules that are depended on by themes.
+ // Added here instead of ModuleHandler to avoid recursion.
+ $themes = \Drupal::service('extension.list.theme')->getList();
+ foreach ($themes as $theme) {
+ foreach ($theme->info['dependencies'] as $dependency) {
+ if (isset($form[$dependency])) {
+ // Add themes to the module's required by list.
+ $form[$dependency]['#required_by'][] = $theme->status ? t('@theme', ['@theme (theme)' => $theme->info['name']]) : t('@theme (theme) (<span class="admin-disabled">disabled</span>)', ['@theme' => $theme->info['name']]);
+ }
+ }
+ }
+
$variables['modules'] = [];
// Iterate through all the modules, which are children of this element.
foreach (Element::children($form) as $key) {
@@ -291,6 +304,12 @@ function template_preprocess_system_themes_page(&$variables) {
$current_theme['is_default'] = $theme->is_default;
$current_theme['is_admin'] = $theme->is_admin;
+ $current_theme['module_dependencies'] = !empty($theme->module_dependencies_list) ? [
+ '#theme' => 'item_list',
+ '#items' => $theme->module_dependencies_list,
+ '#context' => ['list_style' => 'comma-list'],
+ ] : [];
+
// Make sure to provide feedback on compatibility.
$current_theme['incompatible'] = '';
if (!empty($theme->info['core_incompatible'])) {
@@ -311,6 +330,20 @@ function template_preprocess_system_themes_page(&$variables) {
elseif (!empty($theme->incompatible_engine)) {
$current_theme['incompatible'] = t('This theme requires the theme engine @theme_engine to operate correctly.', ['@theme_engine' => $theme->info['engine']]);
}
+ elseif (!empty($theme->incompatible_module)) {
+ $current_theme['incompatible'] = t('This theme requires the listed modules to operate correctly.');
+ }
+ elseif (!empty($theme->module_dependencies_disabled)) {
+ if (!empty($theme->insufficient_module_permissions)) {
+ $current_theme['incompatible'] = t('This theme requires the listed modules to operate correctly. They must first be enabled by a user with permissions to do so.');
+ }
+ else {
+ $modules_url = (string) Url::fromRoute('system.modules_list')->toString();
+ $current_theme['incompatible'] = t('This theme requires the listed modules to operate correctly. They must first be enabled via the <a href=":modules_url">Extend page</a>.', [
+ ':modules_url' => $modules_url,
+ ]);
+ }
+ }
// Build operation links.
$current_theme['operations'] = [
diff --git a/web/core/modules/system/system.install b/web/core/modules/system/system.install
index 38a95e104e..f8f9e5509d 100644
--- a/web/core/modules/system/system.install
+++ b/web/core/modules/system/system.install
@@ -6,6 +6,7 @@
*/
use Drupal\Component\FileSystem\FileSystem as FileSystemComponent;
+use Drupal\Component\Utility\Bytes;
use Drupal\Component\Utility\Crypt;
use Drupal\Component\Utility\Environment;
use Drupal\Component\Utility\OpCodeCache;
@@ -16,15 +17,17 @@
use Drupal\Core\Entity\ContentEntityTypeInterface;
use Drupal\Core\Entity\EntityTypeInterface;
use Drupal\Core\Entity\FieldableEntityInterface;
+use Drupal\Core\Entity\Sql\SqlContentEntityStorage;
+use Drupal\Core\Entity\Sql\SqlContentEntityStorageSchema;
use Drupal\Core\Extension\Extension;
use Drupal\Core\Field\BaseFieldDefinition;
use Drupal\Core\File\FileSystemInterface;
+use Drupal\Core\StringTranslation\PluralTranslatableMarkup;
use Drupal\path_alias\Entity\PathAlias;
use Drupal\path_alias\PathAliasStorage;
use Drupal\Core\Site\Settings;
use Drupal\Core\StreamWrapper\PrivateStream;
use Drupal\Core\StreamWrapper\PublicStream;
-use Drupal\Core\StringTranslation\PluralTranslatableMarkup;
use Drupal\Core\StringTranslation\TranslatableMarkup;
use Drupal\Core\Url;
use Symfony\Component\HttpFoundation\Request;
@@ -313,6 +316,46 @@ function system_requirements($phase) {
$requirements['php_opcache']['title'] = t('PHP OPcode caching');
}
+ // Check to see if APCu is installed and configured correctly.
+ if ($phase == 'runtime' && PHP_SAPI != 'cli') {
+ $requirements['php_apcu']['title'] = t('PHP APCu caching');
+ if (extension_loaded('apcu') && filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN)) {
+ $memory_info = apcu_sma_info(TRUE);
+ $apcu_actual_size = format_size($memory_info['seg_size']);
+ $apcu_recommended_size = '32 MB';
+ $requirements['php_apcu']['value'] = t('Enabled (@size)', ['@size' => $apcu_actual_size]);
+ if (Bytes::toInt($apcu_actual_size) < Bytes::toInt($apcu_recommended_size)) {
+ $requirements['php_apcu']['severity'] = REQUIREMENT_WARNING;
+ $requirements['php_apcu']['description'] = t('Depending on your configuration, Drupal can run with a @apcu_size APCu limit. However, a @apcu_default_size APCu limit (the default) or above is recommended, especially if your site uses additional custom or contributed modules.', [
+ '@apcu_size' => $apcu_actual_size,
+ '@apcu_default_size' => $apcu_recommended_size,
+ ]);
+ }
+ else {
+ $memory_available = $memory_info['avail_mem'] / $memory_info['seg_size'];
+ if ($memory_available < 0.1) {
+ $requirements['php_apcu']['severity'] = REQUIREMENT_ERROR;
+ }
+ elseif ($memory_available < 0.25) {
+ $requirements['php_apcu']['severity'] = REQUIREMENT_WARNING;
+ }
+ else {
+ $requirements['php_apcu']['severity'] = REQUIREMENT_OK;
+ }
+ $requirements['php_apcu']['description'] = t('Memory available: @available.', [
+ '@available' => format_size($memory_info['avail_mem']),
+ ]);
+ }
+ }
+ else {
+ $requirements['php_apcu'] += [
+ 'value' => t('Not enabled'),
+ 'severity' => REQUIREMENT_INFO,
+ 'description' => t('PHP APCu caching can improve your site\'s performance considerably. It is <strong>highly recommended</strong> to have <a href="https://www.php.net/manual/apcu.installation.php" target="_blank">APCu</a> installed on your server.'),
+ ];
+ }
+ }
+
if ($phase != 'update') {
// Test whether we have a good source of random bytes.
$requirements['php_random_bytes'] = [
@@ -321,7 +364,7 @@ function system_requirements($phase) {
try {
$bytes = random_bytes(10);
if (strlen($bytes) != 10) {
- throw new \Exception(t('Tried to generate 10 random bytes, generated @count', ['@count' => strlen($bytes)]));
+ throw new \Exception("Tried to generate 10 random bytes, generated '" . strlen($bytes) . "'");
}
$requirements['php_random_bytes']['value'] = t('Successful');
}
@@ -392,9 +435,11 @@ function system_requirements($phase) {
$requirements['database_extensions']['value'] = t('Enabled');
}
}
- else {
+
+ if ($phase === 'runtime' || $phase === 'update') {
// Database information.
$class = Database::getConnection()->getDriverClass('Install\\Tasks');
+ /** @var \Drupal\Core\Database\Install\Tasks $tasks */
$tasks = new $class();
$requirements['database_system'] = [
'title' => t('Database system'),
@@ -404,6 +449,19 @@ function system_requirements($phase) {
'title' => t('Database system version'),
'value' => Database::getConnection()->version(),
];
+
+ $errors = $tasks->engineVersionRequirementsCheck();
+ $error_count = count($errors);
+ if ($error_count > 0) {
+ $error_message = [
+ '#theme' => 'item_list',
+ '#items' => $errors,
+ // Use the comma-list style to display a single error without bullets.
+ '#context' => ['list_style' => $error_count === 1 ? 'comma-list' : ''],
+ ];
+ $requirements['database_system_version']['severity'] = REQUIREMENT_ERROR;
+ $requirements['database_system_version']['description'] = $error_message;
+ }
}
// Test PHP memory_limit
@@ -912,12 +970,6 @@ function system_requirements($phase) {
$php_incompatible_extensions[$file->info['type']][] = $name;
}
- // @todo Remove this 'if' block to allow checking requirements of themes
- // https://www.drupal.org/project/drupal/issues/474684.
- if ($file->info['type'] !== 'module') {
- continue;
- }
-
// Check the module's required modules.
/** @var \Drupal\Core\Extension\Dependency $requirement */
foreach ($file->requires as $requirement) {
@@ -1266,33 +1318,67 @@ function system_requirements($phase) {
}
}
- // Check all the expected post-updates have been run.
- if ($phase === 'update') {
- $existing_updates = \Drupal::service('keyvalue')->get('post_update')->get('existing_updates', []);
- $post_update_registry = \Drupal::service('update.post_update_registry');
- $modules = \Drupal::moduleHandler()->getModuleList();
- $module_extension_list = \Drupal::service('extension.list.module');
- foreach ($modules as $module => $extension) {
- $module_info = $module_extension_list->get($module);
- $removed_post_updates = $post_update_registry->getRemovedPostUpdates($module);
- if ($missing_updates = array_diff(array_keys($removed_post_updates), $existing_updates)) {
- $versions = array_unique(array_intersect_key($removed_post_updates, array_flip($missing_updates)));
- $description = new PluralTranslatableMarkup(count($versions),
- 'The installed version of the %module module is too old to update. Update to a version prior to @versions first (missing updates: @missing_updates).',
- 'The installed version of the %module module is too old to update. Update first to a version prior to all of the following: @versions (missing updates: @missing_updates).',
- [
- '%module' => $module_info->info['name'],
- '@missing_updates' => implode(', ', $missing_updates),
- '@versions' => implode(', ', $versions),
- ]
- );
- $requirements[$module . '_post_update_removed'] = [
- 'title' => t('Missing updates for: @module', ['@module' => $module_info->info['name']]),
- 'description' => $description,
+ // Ensure that no module has a current schema version that is lower than the
+ // one that was last removed.
+ if ($phase == 'update') {
+ $module_handler = \Drupal::moduleHandler();
+ $module_list = [];
+ foreach ($module_handler->getImplementations('update_last_removed') as $module) {
+ $last_removed = $module_handler->invoke($module, 'update_last_removed');
+ if ($last_removed && $last_removed > drupal_get_installed_schema_version($module)) {
+
+ /** @var \Drupal\Core\Extension\Extension $module_info */
+ $module_info = \Drupal::service('extension.list.module')->get($module);
+ $module_list[$module_info->info['package']][$module] = [
+ 'info' => $module_info,
+ 'last_removed' => $last_removed,
+ 'installed_version' => drupal_get_installed_schema_version($module),
+ ];
+ }
+ }
+
+ foreach ($module_list as $package => $package_modules) {
+ foreach ($package_modules as $module => $data) {
+ $requirements[$module . '_update_last_removed'] = [
+ 'title' => t('Unsupported schema version: @module', ['@module' => $data['info']->info['name']]),
+ 'description' => t('The installed version of the %module module is too old to update. Update to an intermediate version first (last removed version: @last_removed_version, installed version: @installed_version).', [
+ '%module' => $data['info']->info['name'],
+ '@last_removed_version' => $data['last_removed'],
+ '@installed_version' => $data['installed_version'],
+ ]),
'severity' => REQUIREMENT_ERROR,
];
}
}
+ // Also check post-updates. Only do this if we're not already showing an
+ // error for hook_update_N().
+ if (empty($module_list)) {
+ $existing_updates = \Drupal::service('keyvalue')->get('post_update')->get('existing_updates', []);
+ $post_update_registry = \Drupal::service('update.post_update_registry');
+ $modules = \Drupal::moduleHandler()->getModuleList();
+ $module_extension_list = \Drupal::service('extension.list.module');
+ foreach ($modules as $module => $extension) {
+ $module_info = $module_extension_list->get($module);
+ $removed_post_updates = $post_update_registry->getRemovedPostUpdates($module);
+ if ($missing_updates = array_diff(array_keys($removed_post_updates), $existing_updates)) {
+ $versions = array_unique(array_intersect_key($removed_post_updates, array_flip($missing_updates)));
+ $description = new PluralTranslatableMarkup(count($versions),
+ 'The installed version of the %module module is too old to update. Update to a version prior to @versions first (missing updates: @missing_updates).',
+ 'The installed version of the %module module is too old to update. Update first to a version prior to all of the following: @versions (missing updates: @missing_updates).',
+ [
+ '%module' => $module_info->info['name'],
+ '@missing_updates' => implode(', ', $missing_updates),
+ '@versions' => implode(', ', $versions),
+ ]
+ );
+ $requirements[$module . '_post_update_removed'] = [
+ 'title' => t('Missing updates for: @module', ['@module' => $module_info->info['name']]),
+ 'description' => $description,
+ 'severity' => REQUIREMENT_ERROR,
+ ];
+ }
+ }
+ }
}
return $requirements;
@@ -2706,3 +2792,59 @@ function system_update_8805() {
}
}
}
+
+/**
+ * Update the stored schema data for entity identifier fields.
+ */
+function system_update_8901() {
+ $definition_update_manager = \Drupal::entityDefinitionUpdateManager();
+ $entity_type_manager = \Drupal::entityTypeManager();
+ $installed_storage_schema = \Drupal::keyValue('entity.storage_schema.sql');
+
+ foreach ($definition_update_manager->getEntityTypes() as $entity_type_id => $entity_type) {
+ // Ensure that we are dealing with a non-deleted entity type that uses the
+ // default SQL storage.
+ if (!$entity_type_manager->hasDefinition($entity_type_id)) {
+ continue;
+ }
+
+ $storage = $entity_type_manager->getStorage($entity_type_id);
+ if (!$storage instanceof SqlContentEntityStorage) {
+ continue;
+ }
+
+ foreach (['id', 'revision'] as $key) {
+ if (!$entity_type->hasKey($key)) {
+ continue;
+ }
+
+ $field_name = $entity_type->getKey($key);
+ $field_storage_definition = $definition_update_manager->getFieldStorageDefinition($field_name, $entity_type_id);
+ if (!$field_storage_definition) {
+ continue;
+ }
+ if ($field_storage_definition->getType() !== 'integer') {
+ continue;
+ }
+
+ // Retrieve the storage schema in order to use its own method for updating
+ // the identifier schema - ::processIdentifierSchema(). This is needed
+ // because some storage schemas might not use serial identifiers.
+ // @see \Drupal\user\UserStorageSchema::processIdentifierSchema()
+ $ref_get_storage_schema = new \ReflectionMethod($storage, 'getStorageSchema');
+ $ref_get_storage_schema->setAccessible(TRUE);
+ $storage_schema = $ref_get_storage_schema->invoke($storage);
+
+ if ($storage_schema instanceof SqlContentEntityStorageSchema) {
+ $field_schema_data = $installed_storage_schema->get($entity_type_id . '.field_schema_data.' . $field_storage_definition->getName(), []);
+ $table = $key === 'id' ? $entity_type->getBaseTable() : $entity_type->getRevisionTable();
+
+ $ref_process_identifier_schema = new \ReflectionMethod($storage_schema, 'processIdentifierSchema');
+ $ref_process_identifier_schema->setAccessible(TRUE);
+ $ref_process_identifier_schema->invokeArgs($storage_schema, [&$field_schema_data[$table], $field_name]);
+
+ $installed_storage_schema->set($entity_type_id . '.field_schema_data.' . $field_storage_definition->getName(), $field_schema_data);
+ }
+ }
+ }
+}
diff --git a/web/core/modules/system/system.module b/web/core/modules/system/system.module
index 039d3725ba..208372ccaa 100644
--- a/web/core/modules/system/system.module
+++ b/web/core/modules/system/system.module
@@ -32,7 +32,6 @@
use Drupal\Core\Site\Settings;
use Drupal\Core\Url;
use Drupal\path_alias\PathAliasInterface;
-use Drupal\user\UserInterface;
use GuzzleHttp\Exception\RequestException;
use Symfony\Component\HttpFoundation\RedirectResponse;
@@ -444,13 +443,14 @@ function template_preprocess_entity_add_list(&$variables) {
/**
* Setup a given callback to run via authorize.php with elevated privileges.
*
- * To use authorize.php, certain variables must be stashed into $_SESSION. This
- * function sets up all the necessary $_SESSION variables. The calling function
- * should then redirect to authorize.php, using the full path returned by
- * system_authorized_get_url(). That initiates the workflow that will eventually
- * lead to the callback being invoked. The callback will be invoked at a low
- * bootstrap level, without all modules being invoked, so it needs to be careful
- * not to assume any code exists. Example (system_authorized_run()):
+ * To use authorize.php, certain variables must be stashed in the user's
+ * session. This function sets up all the necessary session variables. The
+ * calling function should then redirect to authorize.php, using the full path
+ * returned by system_authorized_get_url(). That initiates the workflow that
+ * will eventually lead to the callback being invoked. The callback will be
+ * invoked at a low bootstrap level, without all modules being invoked, so it
+ * needs to be careful not to assume any code exists.
+ * Example (system_authorized_run()):
* @code
* system_authorized_init($callback, $file, $arguments, $page_title);
* return new RedirectResponse(system_authorized_get_url()->toString());
@@ -477,20 +477,21 @@ function template_preprocess_entity_add_list(&$variables) {
* Nothing, this function just initializes variables in the user's session.
*/
function system_authorized_init($callback, $file, $arguments = [], $page_title = NULL) {
+ $session = \Drupal::request()->getSession();
// First, figure out what file transfer backends the site supports, and put
// all of those in the SESSION so that authorize.php has access to all of
// them via the class autoloader, even without a full bootstrap.
- $_SESSION['authorize_filetransfer_info'] = drupal_get_filetransfer_info();
+ $session->set('authorize_filetransfer_info', drupal_get_filetransfer_info());
// Now, define the callback to invoke.
- $_SESSION['authorize_operation'] = [
+ $session->set('authorize_operation', [
'callback' => $callback,
'file' => $file,
'arguments' => $arguments,
- ];
+ ]);
if (isset($page_title)) {
- $_SESSION['authorize_page_title'] = $page_title;
+ $session->set('authorize_page_title', $page_title);
}
}
@@ -812,54 +813,14 @@ function system_form_alter(&$form, FormStateInterface $form_state) {
}
}
-/**
- * Implements hook_form_FORM_ID_alter() for \Drupal\user\AccountForm.
- */
-function system_form_user_form_alter(&$form, FormStateInterface $form_state) {
- if (\Drupal::config('system.date')->get('timezone.user.configurable')) {
- system_user_timezone($form, $form_state);
- }
-}
-
-/**
- * Implements hook_form_FORM_ID_alter() for \Drupal\user\RegisterForm.
- */
-function system_form_user_register_form_alter(&$form, FormStateInterface $form_state) {
- $config = \Drupal::config('system.date');
- if ($config->get('timezone.user.configurable') && $config->get('timezone.user.default') == DRUPAL_USER_TIMEZONE_SELECT) {
- system_user_timezone($form, $form_state);
- }
-}
-
-/**
- * Implements hook_ENTITY_TYPE_presave() for user entities.
- */
-function system_user_presave(UserInterface $account) {
- $config = \Drupal::config('system.date');
- if ($config->get('timezone.user.configurable') && !$account->getTimeZone() && !$config->get('timezone.user.default')) {
- $account->timezone = $config->get('timezone.default');
- }
-}
-
-/**
- * Implements hook_user_login().
- */
-function system_user_login(UserInterface $account) {
- $config = \Drupal::config('system.date');
- // If the user has a NULL time zone, notify them to set a time zone.
- if (!$account->getTimezone() && $config->get('timezone.user.configurable') && $config->get('timezone.user.warn')) {
- \Drupal::messenger()
- ->addStatus(t('Configure your <a href=":user-edit">account time zone setting</a>.', [
- ':user-edit' => $account->toUrl('edit-form', [
- 'query' => \Drupal::destination()->getAsArray(),
- 'fragment' => 'edit-timezone',
- ])->toString(),
- ]));
- }
-}
-
/**
* Add the time zone field to the user edit and register forms.
+ *
+ * @internal
+ * This functions exists only to be used by System module's form alters which
+ * have been removed.
+ *
+ * @see https://www.drupal.org/node/3113062
*/
function system_user_timezone(&$form, FormStateInterface $form_state) {
$user = \Drupal::currentUser();
diff --git a/web/core/modules/system/system.post_update.php b/web/core/modules/system/system.post_update.php
index dbcda940d1..242ad9d1b5 100644
--- a/web/core/modules/system/system.post_update.php
+++ b/web/core/modules/system/system.post_update.php
@@ -98,13 +98,6 @@ function system_post_update_fix_jquery_extend() {
// Empty post-update hook.
}
-/**
- * Clear the library cache and ensure aggregate files are regenerated.
- */
-function system_post_update_fix_jquery_htmlprefilter() {
- // Empty post-update hook.
-}
-
/**
* Change plugin IDs of actions.
*/
diff --git a/web/core/modules/system/system.routing.yml b/web/core/modules/system/system.routing.yml
index 9591d84d69..e0f497860e 100644
--- a/web/core/modules/system/system.routing.yml
+++ b/web/core/modules/system/system.routing.yml
@@ -412,6 +412,13 @@ system.theme_settings_theme:
requirements:
_access: 'TRUE'
+'<button>':
+ path: ''
+ options:
+ _no_path: TRUE
+ requirements:
+ _access: 'TRUE'
+
'<current>':
path: '<current>'
diff --git a/web/core/modules/system/templates/system-themes-page.html.twig b/web/core/modules/system/templates/system-themes-page.html.twig
index 6e65d7641b..aad5587076 100644
--- a/web/core/modules/system/templates/system-themes-page.html.twig
+++ b/web/core/modules/system/templates/system-themes-page.html.twig
@@ -22,6 +22,7 @@
* - notes: Identifies what context this theme is being used in, e.g.,
* default theme, admin theme.
* - incompatible: Text describing any compatibility issues.
+ * - module_dependencies: A list of modules that this theme requires.
* - operations: A list of operation links, e.g., Settings, Enable, Disable,
* etc. these links should only be displayed if the theme is compatible.
*
@@ -62,6 +63,11 @@
{%- endif -%}
</h3>
<div class="theme-info__description">{{ theme.description }}</div>
+ {% if theme.module_dependencies %}
+ <div class="theme-info__requires">
+ {{ 'Requires: @module_dependencies'|t({ '@module_dependencies': theme.module_dependencies|render }) }}
+ </div>
+ {% endif %}
{# Display operation links if the theme is compatible. #}
{% if theme.incompatible %}
<div class="incompatible">{{ theme.incompatible }}</div>
diff --git a/web/core/modules/system/tests/fixtures/update/drupal-8.entity-test-initial.php b/web/core/modules/system/tests/fixtures/update/drupal-8.entity-test-initial.php
deleted file mode 100644
index e7ab6961e6..0000000000
--- a/web/core/modules/system/tests/fixtures/update/drupal-8.entity-test-initial.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-// @codingStandardsIgnoreFile
-
-use Drupal\Core\Database\Database;
-
-$connection = Database::getConnection();
-
-// Simulate an entity type that had previously set an initial key schema for a
-// field.
-$schema = $connection->select('key_value')
- ->fields('key_value', ['value'])
- ->condition('collection', 'entity.storage_schema.sql')
- ->condition('name', 'entity_test_update.field_schema_data.name')
- ->execute()
- ->fetchField();
-
-$schema = unserialize($schema);
-$schema['entity_test_update']['fields']['name']['initial'] = 'test';
-
-$connection->update('key_value')
- ->fields(['value' => serialize($schema)])
- ->condition('collection', 'entity.storage_schema.sql')
- ->condition('name', 'entity_test_update.field_schema_data.name')
- ->execute();
diff --git a/web/core/modules/system/tests/modules/batch_test/src/Form/BatchTestMultiStepForm.php b/web/core/modules/system/tests/modules/batch_test/src/Form/BatchTestMultiStepForm.php
index 151b50b7b8..0289fc440d 100644
--- a/web/core/modules/system/tests/modules/batch_test/src/Form/BatchTestMultiStepForm.php
+++ b/web/core/modules/system/tests/modules/batch_test/src/Form/BatchTestMultiStepForm.php
@@ -56,6 +56,7 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
case 1:
batch_set(_batch_test_batch_1());
break;
+
case 2:
batch_set(_batch_test_batch_2());
break;
diff --git a/web/core/modules/system/tests/modules/cache_test/cache_test.routing.yml b/web/core/modules/system/tests/modules/cache_test/cache_test.routing.yml
index fb87d3ded0..c785e19c9e 100644
--- a/web/core/modules/system/tests/modules/cache_test/cache_test.routing.yml
+++ b/web/core/modules/system/tests/modules/cache_test/cache_test.routing.yml
@@ -4,3 +4,10 @@ cache_test.url_bubbling:
_controller: '\Drupal\cache_test\Controller\CacheTestController::urlBubbling'
requirements:
_access: 'TRUE'
+
+cache_test_list.bundle_tags:
+ path: '/cache-test-list/{entity_type_id}/{bundle}'
+ defaults:
+ _controller: '\Drupal\cache_test\Controller\CacheTestController::bundleTags'
+ requirements:
+ _access: 'TRUE'
diff --git a/web/core/modules/system/tests/modules/cache_test/src/Controller/CacheTestController.php b/web/core/modules/system/tests/modules/cache_test/src/Controller/CacheTestController.php
index de2e8fa82a..b773d5bb5a 100644
--- a/web/core/modules/system/tests/modules/cache_test/src/Controller/CacheTestController.php
+++ b/web/core/modules/system/tests/modules/cache_test/src/Controller/CacheTestController.php
@@ -19,4 +19,30 @@ public function urlBubbling() {
];
}
+ /**
+ * Bundle listing tags invalidation.
+ *
+ * @param string $entity_type_id
+ * The entity type ID.
+ * @param string $bundle
+ * The bundle.
+ *
+ * @return array
+ * Renderable array.
+ */
+ public function bundleTags($entity_type_id, $bundle) {
+ $storage = \Drupal::entityTypeManager()->getStorage($entity_type_id);
+ $entity_ids = $storage->getQuery()->condition('type', $bundle)->execute();
+ $page = [];
+
+ $entities = $storage->loadMultiple($entity_ids);
+ foreach ($entities as $entity) {
+ $page[$entity->id()] = [
+ '#markup' => $entity->label(),
+ ];
+ }
+ $page['#cache']['tags'] = [$entity_type_id . '_list:' . $bundle];
+ return $page;
+ }
+
}
diff --git a/web/core/modules/system/tests/modules/common_test/common_test.module b/web/core/modules/system/tests/modules/common_test/common_test.module
index 040e40a4e4..ea42178b72 100644
--- a/web/core/modules/system/tests/modules/common_test/common_test.module
+++ b/web/core/modules/system/tests/modules/common_test/common_test.module
@@ -121,27 +121,9 @@ function common_test_theme() {
'common_test_render_element' => [
'render element' => 'foo',
],
- 'common_test_empty' => [
- 'variables' => ['foo' => 'foo'],
- 'function' => 'theme_common_test_empty',
- ],
];
}
-/**
- * Provides a theme function for drupal_render().
- */
-function theme_common_test_foo($variables) {
- return $variables['foo'] . $variables['bar'];
-}
-
-/**
- * Always returns an empty string.
- */
-function theme_common_test_empty($variables) {
- return '';
-}
-
/**
* Implements MODULE_preprocess().
*
@@ -212,7 +194,7 @@ function common_test_library_info_alter(&$libraries, $module) {
* @see common_test_cron_helper()
*/
function common_test_cron() {
- throw new Exception(t('Uncaught exception'));
+ throw new Exception('Uncaught exception');
}
/**
diff --git a/web/core/modules/system/tests/modules/csrf_test/csrf_test.routing.yml b/web/core/modules/system/tests/modules/csrf_test/csrf_test.routing.yml
index a5a5191fc4..56e64dcd5f 100644
--- a/web/core/modules/system/tests/modules/csrf_test/csrf_test.routing.yml
+++ b/web/core/modules/system/tests/modules/csrf_test/csrf_test.routing.yml
@@ -9,7 +9,7 @@ csrf_test.protected:
# Tests deprecated _access_rest_csrf protection.
# This originally was in the REST module but now is supported in core/lib.
# @see https://www.drupal.org/node/2753681
-# @todo Remove this test route in Drupal 9.0.0.
+# @todo Remove the route in drupal:10.0.0 https://www.drupal.org/node/3115308
csrf_test.deprecated.protected:
path: csrf/deprecated/protected
defaults:
@@ -17,7 +17,7 @@ csrf_test.deprecated.protected:
requirements:
_access_rest_csrf: 'TRUE'
_method: 'POST'
-# @todo This route can be removed in 8.3.
+# @todo Remove this route in drupal:10.0.0 https://www.drupal.org/node/3115308
# @see \Drupal\Core\Access\CsrfRequestHeaderAccessCheck::access()
csrf_test.deprecated.csrftoken:
path: '/deprecated/session/token'
diff --git a/web/core/modules/system/tests/modules/csrf_test/src/Controller/DeprecatedCsrfTokenController.php b/web/core/modules/system/tests/modules/csrf_test/src/Controller/DeprecatedCsrfTokenController.php
index 7155e7a365..e7c9d70c80 100644
--- a/web/core/modules/system/tests/modules/csrf_test/src/Controller/DeprecatedCsrfTokenController.php
+++ b/web/core/modules/system/tests/modules/csrf_test/src/Controller/DeprecatedCsrfTokenController.php
@@ -12,7 +12,7 @@
*
* This controller tests using the deprecated CSRF token key 'rest'.
*
- * @todo This class can be removed in 8.3.
+ * @todo Remove this before drupal:10.0.0 https://www.drupal.org/node/3115308
*
* @see \Drupal\Core\Access\CsrfRequestHeaderAccessCheck::access()
*/
diff --git a/web/core/modules/system/tests/modules/css_disable_transitions_test/css/disable_transitions.theme.css b/web/core/modules/system/tests/modules/css_disable_transitions_test/css/disable_transitions.theme.css
index 55221fa99b..ff5df76ba1 100644
--- a/web/core/modules/system/tests/modules/css_disable_transitions_test/css/disable_transitions.theme.css
+++ b/web/core/modules/system/tests/modules/css_disable_transitions_test/css/disable_transitions.theme.css
@@ -13,12 +13,6 @@
-ms-transition-property: none !important;
-webkit-transition-property: none !important;
transition-property: none !important;
- /* CSS transforms. */
- -o-transform: none !important;
- -moz-transform: none !important;
- -ms-transform: none !important;
- -webkit-transform: none !important;
- transform: none !important;
/* CSS animations. */
-webkit-animation: none !important;
-moz-animation: none !important;
diff --git a/web/core/modules/system/tests/modules/database_statement_monitoring_test/src/LoggedStatementsTrait.php b/web/core/modules/system/tests/modules/database_statement_monitoring_test/src/LoggedStatementsTrait.php
index ceb98ea05d..d4f760e093 100644
--- a/web/core/modules/system/tests/modules/database_statement_monitoring_test/src/LoggedStatementsTrait.php
+++ b/web/core/modules/system/tests/modules/database_statement_monitoring_test/src/LoggedStatementsTrait.php
@@ -2,6 +2,8 @@
namespace Drupal\database_statement_monitoring_test;
+use Drupal\Core\Database\Query\Condition;
+
/**
* Trait for Connection classes that can store logged statements.
*/
@@ -48,7 +50,13 @@ public function getDriverClass($class) {
// based on object, which would break.
$namespace = (new \ReflectionClass(get_parent_class($this)))->getNamespaceName();
$driver_class = $namespace . '\\' . $class;
- return class_exists($driver_class) ? $driver_class : $class;
+ if (class_exists($driver_class)) {
+ return $driver_class;
+ }
+ elseif ($class == 'Condition') {
+ return Condition::class;
+ }
+ return $class;
}
/**
diff --git a/web/core/modules/system/tests/modules/database_statement_monitoring_test/src/mysql/Install/Tasks.php b/web/core/modules/system/tests/modules/database_statement_monitoring_test/src/mysql/Install/Tasks.php
new file mode 100644
index 0000000000..443072d474
--- /dev/null
+++ b/web/core/modules/system/tests/modules/database_statement_monitoring_test/src/mysql/Install/Tasks.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Drupal\database_statement_monitoring_test\mysql\Install;
+
+use Drupal\Core\Database\Driver\mysql\Install\Tasks as BaseTasks;
+
+class Tasks extends BaseTasks {
+}
diff --git a/web/core/modules/system/tests/modules/database_statement_monitoring_test/src/pgsql/Install/Tasks.php b/web/core/modules/system/tests/modules/database_statement_monitoring_test/src/pgsql/Install/Tasks.php
new file mode 100644
index 0000000000..c51bb2541a
--- /dev/null
+++ b/web/core/modules/system/tests/modules/database_statement_monitoring_test/src/pgsql/Install/Tasks.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Drupal\database_statement_monitoring_test\pgsql\Install;
+
+use Drupal\Core\Database\Driver\pgsql\Install\Tasks as BaseTasks;
+
+class Tasks extends BaseTasks {
+}
diff --git a/web/core/modules/system/tests/modules/database_statement_monitoring_test/src/sqlite/Install/Tasks.php b/web/core/modules/system/tests/modules/database_statement_monitoring_test/src/sqlite/Install/Tasks.php
new file mode 100644
index 0000000000..41d5962fef
--- /dev/null
+++ b/web/core/modules/system/tests/modules/database_statement_monitoring_test/src/sqlite/Install/Tasks.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Drupal\database_statement_monitoring_test\sqlite\Install;
+
+use Drupal\Core\Database\Driver\sqlite\Install\Tasks as BaseTasks;
+
+class Tasks extends BaseTasks {
+}
diff --git a/web/core/modules/system/tests/modules/driver_test/driver_test.info.yml b/web/core/modules/system/tests/modules/driver_test/driver_test.info.yml
new file mode 100644
index 0000000000..c36161d270
--- /dev/null
+++ b/web/core/modules/system/tests/modules/driver_test/driver_test.info.yml
@@ -0,0 +1,5 @@
+name: 'Contrib database driver test'
+type: module
+description: 'Support database contrib driver testing.'
+package: Testing
+version: VERSION
diff --git a/web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestMysql/Connection.php b/web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestMysql/Connection.php
new file mode 100644
index 0000000000..9138084acf
--- /dev/null
+++ b/web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestMysql/Connection.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Drupal\driver_test\Driver\Database\DrivertestMysql;
+
+use Drupal\Core\Database\Driver\mysql\Connection as CoreConnection;
+
+/**
+ * MySQL test implementation of \Drupal\Core\Database\Connection.
+ */
+class Connection extends CoreConnection {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function driver() {
+ return 'DrivertestMysql';
+ }
+
+}
diff --git a/web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestMysql/Delete.php b/web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestMysql/Delete.php
new file mode 100644
index 0000000000..c3f248eaaf
--- /dev/null
+++ b/web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestMysql/Delete.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Drupal\driver_test\Driver\Database\DrivertestMysql;
+
+use Drupal\Core\Database\Driver\mysql\Delete as CoreDelete;
+
+/**
+ * MySQL test implementation of \Drupal\Core\Database\Query\Delete.
+ */
+class Delete extends CoreDelete {}
diff --git a/web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestMysql/Insert.php b/web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestMysql/Insert.php
new file mode 100644
index 0000000000..a9545d77c0
--- /dev/null
+++ b/web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestMysql/Insert.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Drupal\driver_test\Driver\Database\DrivertestMysql;
+
+use Drupal\Core\Database\Driver\mysql\Insert as CoreInsert;
+
+/**
+ * MySQL test implementation of \Drupal\Core\Database\Query\Insert.
+ */
+class Insert extends CoreInsert {}
diff --git a/web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestMysql/Install/Tasks.php b/web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestMysql/Install/Tasks.php
new file mode 100644
index 0000000000..5c10c2c6be
--- /dev/null
+++ b/web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestMysql/Install/Tasks.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Drupal\driver_test\Driver\Database\DrivertestMysql\Install;
+
+use Drupal\Core\Database\Driver\mysql\Install\Tasks as CoreTasks;
+
+/**
+ * Specifies installation tasks for MySQL test databases.
+ */
+class Tasks extends CoreTasks {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function name() {
+ return t('MySQL by the driver_test module');
+ }
+
+}
diff --git a/web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestMysql/Merge.php b/web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestMysql/Merge.php
new file mode 100644
index 0000000000..2be3c0cede
--- /dev/null
+++ b/web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestMysql/Merge.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Drupal\driver_test\Driver\Database\DrivertestMysql;
+
+use Drupal\Core\Database\Driver\mysql\Merge as CoreMerge;
+
+/**
+ * MySQL test implementation of \Drupal\Core\Database\Query\Merge.
+ */
+class Merge extends CoreMerge {}
diff --git a/web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestMysql/Schema.php b/web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestMysql/Schema.php
new file mode 100644
index 0000000000..69277a1391
--- /dev/null
+++ b/web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestMysql/Schema.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Drupal\driver_test\Driver\Database\DrivertestMysql;
+
+use Drupal\Core\Database\Driver\mysql\Schema as CoreSchema;
+
+/**
+ * MySQL test implementation of \Drupal\Core\Database\Schema.
+ */
+class Schema extends CoreSchema {}
diff --git a/web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestMysql/Select.php b/web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestMysql/Select.php
new file mode 100644
index 0000000000..ffe4ada5c1
--- /dev/null
+++ b/web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestMysql/Select.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Drupal\driver_test\Driver\Database\DrivertestMysql;
+
+use Drupal\Core\Database\Driver\mysql\Select as CoreSelect;
+
+/**
+ * MySQL test implementation of \Drupal\Core\Database\Query\Select.
+ */
+class Select extends CoreSelect {}
diff --git a/web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestMysql/Transaction.php b/web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestMysql/Transaction.php
new file mode 100644
index 0000000000..1ace8d6fd3
--- /dev/null
+++ b/web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestMysql/Transaction.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Drupal\driver_test\Driver\Database\DrivertestMysql;
+
+use Drupal\Core\Database\Driver\mysql\Transaction as CoreTransaction;
+
+/**
+ * MySQL test implementation of \Drupal\Core\Database\Transaction.
+ */
+class Transaction extends CoreTransaction {}
diff --git a/web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestMysql/Truncate.php b/web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestMysql/Truncate.php
new file mode 100644
index 0000000000..33d8d85b73
--- /dev/null
+++ b/web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestMysql/Truncate.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Drupal\driver_test\Driver\Database\DrivertestMysql;
+
+use Drupal\Core\Database\Driver\mysql\Truncate as CoreTruncate;
+
+/**
+ * MySQL test implementation of \Drupal\Core\Database\Query\Truncate.
+ */
+class Truncate extends CoreTruncate {}
diff --git a/web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestMysql/Update.php b/web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestMysql/Update.php
new file mode 100644
index 0000000000..01d8e38b7f
--- /dev/null
+++ b/web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestMysql/Update.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Drupal\driver_test\Driver\Database\DrivertestMysql;
+
+use Drupal\Core\Database\Driver\mysql\Update as CoreUpdate;
+
+/**
+ * MySQL test implementation of \Drupal\Core\Database\Query\Update.
+ */
+class Update extends CoreUpdate {}
diff --git a/web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestMysql/Upsert.php b/web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestMysql/Upsert.php
new file mode 100644
index 0000000000..8b4bb48258
--- /dev/null
+++ b/web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestMysql/Upsert.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Drupal\driver_test\Driver\Database\DrivertestMysql;
+
+use Drupal\Core\Database\Driver\mysql\Upsert as CoreUpsert;
+
+/**
+ * MySQL test implementation of \Drupal\Core\Database\Query\Upsert.
+ */
+class Upsert extends CoreUpsert {}
diff --git a/web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestMysqlDeprecatedVersion/Connection.php b/web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestMysqlDeprecatedVersion/Connection.php
new file mode 100644
index 0000000000..2046865f17
--- /dev/null
+++ b/web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestMysqlDeprecatedVersion/Connection.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace Drupal\driver_test\Driver\Database\DrivertestMysqlDeprecatedVersion;
+
+use Drupal\Core\Database\Driver\mysql\Connection as CoreConnection;
+
+/**
+ * MySQL test implementation of \Drupal\Core\Database\Connection.
+ */
+class Connection extends CoreConnection {
+
+ /**
+ * Constructs a Connection object.
+ */
+ public function __construct(\PDO $connection, array $connection_options = []) {
+ // Alias the MySQL classes to avoid having unnecessary copies.
+ foreach (['Delete', 'Insert', 'Merge', 'Schema', 'Upsert', 'Select', 'Update'] as $class) {
+ class_alias('Drupal\\Core\\Database\\Driver\\mysql\\' . $class, 'Drupal\\driver_test\\Driver\\Database\\DrivertestMysqlDeprecatedVersion\\' . $class);
+ }
+ parent::__construct($connection, $connection_options);
+ }
+
+ /**
+ * Hardcoded database server version.
+ *
+ * Faking that we are on a deprecated database.
+ *
+ * @var string
+ */
+ protected $databaseVersion = '5.5.2';
+
+ /**
+ * {@inheritdoc}
+ */
+ public function driver() {
+ return 'DrivertestMysqlDeprecatedVersion';
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function version() {
+ return $this->databaseVersion;
+ }
+
+}
diff --git a/web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestMysqlDeprecatedVersion/Install/Tasks.php b/web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestMysqlDeprecatedVersion/Install/Tasks.php
new file mode 100644
index 0000000000..c768de5721
--- /dev/null
+++ b/web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestMysqlDeprecatedVersion/Install/Tasks.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Drupal\driver_test\Driver\Database\DrivertestMysqlDeprecatedVersion\Install;
+
+use Drupal\Core\Database\Driver\mysql\Install\Tasks as CoreTasks;
+
+/**
+ * Specifies installation tasks for MySQL test databases.
+ */
+class Tasks extends CoreTasks {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function name() {
+ return t('MySQL deprecated version by the driver_test module');
+ }
+
+}
diff --git a/web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestPgsql/Connection.php b/web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestPgsql/Connection.php
new file mode 100644
index 0000000000..87dcf7dd4a
--- /dev/null
+++ b/web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestPgsql/Connection.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Drupal\driver_test\Driver\Database\DrivertestPgsql;
+
+use Drupal\Core\Database\Driver\pgsql\Connection as CoreConnection;
+
+/**
+ * PostgreSQL implementation of \Drupal\Core\Database\Connection.
+ */
+class Connection extends CoreConnection {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function driver() {
+ return 'DrivertestPgsql';
+ }
+
+}
diff --git a/web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestPgsql/Delete.php b/web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestPgsql/Delete.php
new file mode 100644
index 0000000000..5340c8afb0
--- /dev/null
+++ b/web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestPgsql/Delete.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Drupal\driver_test\Driver\Database\DrivertestPgsql;
+
+use Drupal\Core\Database\Driver\pgsql\Delete as CoreDelete;
+
+/**
+ * PostgreSQL implementation of \Drupal\Core\Database\Query\Delete.
+ */
+class Delete extends CoreDelete {}
diff --git a/web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestPgsql/Insert.php b/web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestPgsql/Insert.php
new file mode 100644
index 0000000000..a2f6f0791a
--- /dev/null
+++ b/web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestPgsql/Insert.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Drupal\driver_test\Driver\Database\DrivertestPgsql;
+
+use Drupal\Core\Database\Driver\pgsql\Insert as CoreInsert;
+
+/**
+ * PostgreSQL implementation of \Drupal\Core\Database\Query\Insert.
+ */
+class Insert extends CoreInsert {}
diff --git a/web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestPgsql/Install/Tasks.php b/web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestPgsql/Install/Tasks.php
new file mode 100644
index 0000000000..55705d832a
--- /dev/null
+++ b/web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestPgsql/Install/Tasks.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Drupal\driver_test\Driver\Database\DrivertestPgsql\Install;
+
+use Drupal\Core\Database\Driver\pgsql\Install\Tasks as CoreTasks;
+
+/**
+ * Specifies installation tasks for PostgreSQL databases.
+ */
+class Tasks extends CoreTasks {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function name() {
+ return t('PostgreSQL by the driver_test module');
+ }
+
+}
diff --git a/web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestPgsql/Merge.php b/web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestPgsql/Merge.php
new file mode 100644
index 0000000000..1d79ef3714
--- /dev/null
+++ b/web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestPgsql/Merge.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Drupal\driver_test\Driver\Database\DrivertestPgsql;
+
+use Drupal\Core\Database\Driver\pgsql\Merge as CoreMerge;
+
+/**
+ * PostgreSQL implementation of \Drupal\Core\Database\Query\Merge.
+ */
+class Merge extends CoreMerge {}
diff --git a/web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestPgsql/NativeUpsert.php b/web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestPgsql/NativeUpsert.php
new file mode 100644
index 0000000000..cf955a48ac
--- /dev/null
+++ b/web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestPgsql/NativeUpsert.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Drupal\driver_test\Driver\Database\DrivertestPgsql;
+
+use Drupal\Core\Database\Driver\pgsql\NativeUpsert as CoreNativeUpsert;
+
+/**
+ * PostgreSQL implementation of native \Drupal\Core\Database\Query\Upsert.
+ */
+class NativeUpsert extends CoreNativeUpsert {}
diff --git a/web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestPgsql/Schema.php b/web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestPgsql/Schema.php
new file mode 100644
index 0000000000..8cfa969126
--- /dev/null
+++ b/web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestPgsql/Schema.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Drupal\driver_test\Driver\Database\DrivertestPgsql;
+
+use Drupal\Core\Database\Driver\pgsql\Schema as CoreSchema;
+
+/**
+ * PostgreSQL implementation of \Drupal\Core\Database\Schema.
+ */
+class Schema extends CoreSchema {}
diff --git a/web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestPgsql/Select.php b/web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestPgsql/Select.php
new file mode 100644
index 0000000000..f0faf65ca6
--- /dev/null
+++ b/web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestPgsql/Select.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Drupal\driver_test\Driver\Database\DrivertestPgsql;
+
+use Drupal\Core\Database\Driver\pgsql\Select as CoreSelect;
+
+/**
+ * PostgreSQL implementation of \Drupal\Core\Database\Query\Select.
+ */
+class Select extends CoreSelect {}
diff --git a/web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestPgsql/Transaction.php b/web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestPgsql/Transaction.php
new file mode 100644
index 0000000000..7be4dbf8db
--- /dev/null
+++ b/web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestPgsql/Transaction.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Drupal\driver_test\Driver\Database\DrivertestPgsql;
+
+use Drupal\Core\Database\Driver\pgsql\Transaction as CoreTransaction;
+
+/**
+ * PostgreSQL implementation of \Drupal\Core\Database\Transaction.
+ */
+class Transaction extends CoreTransaction {}
diff --git a/web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestPgsql/Truncate.php b/web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestPgsql/Truncate.php
new file mode 100644
index 0000000000..c1b4322d5b
--- /dev/null
+++ b/web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestPgsql/Truncate.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Drupal\driver_test\Driver\Database\DrivertestPgsql;
+
+use Drupal\Core\Database\Driver\pgsql\Truncate as CoreTruncate;
+
+/**
+ * PostgreSQL implementation of \Drupal\Core\Database\Query\Truncate.
+ */
+class Truncate extends CoreTruncate {}
diff --git a/web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestPgsql/Update.php b/web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestPgsql/Update.php
new file mode 100644
index 0000000000..d5ed1ed5f0
--- /dev/null
+++ b/web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestPgsql/Update.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Drupal\driver_test\Driver\Database\DrivertestPgsql;
+
+use Drupal\Core\Database\Driver\pgsql\Update as CoreUpdate;
+
+/**
+ * PostgreSQL implementation of \Drupal\Core\Database\Query\Update.
+ */
+class Update extends CoreUpdate {}
diff --git a/web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestPgsql/Upsert.php b/web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestPgsql/Upsert.php
new file mode 100644
index 0000000000..2237a755cf
--- /dev/null
+++ b/web/core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestPgsql/Upsert.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Drupal\driver_test\Driver\Database\DrivertestPgsql;
+
+use Drupal\Core\Database\Driver\pgsql\Upsert as CoreUpsert;
+
+/**
+ * PostgreSQL implementation of \Drupal\Core\Database\Query\Upsert.
+ */
+class Upsert extends CoreUpsert {}
diff --git a/web/core/modules/system/tests/modules/entity_test/tests/src/Functional/Hal/EntityTestLabelHalJsonAnonTest.php b/web/core/modules/system/tests/modules/entity_test/tests/src/Functional/Hal/EntityTestLabelHalJsonAnonTest.php
index 22c6212050..5d41c80e25 100644
--- a/web/core/modules/system/tests/modules/entity_test/tests/src/Functional/Hal/EntityTestLabelHalJsonAnonTest.php
+++ b/web/core/modules/system/tests/modules/entity_test/tests/src/Functional/Hal/EntityTestLabelHalJsonAnonTest.php
@@ -47,7 +47,7 @@ protected function getExpectedNormalizedEntity() {
return $normalization + [
'_links' => [
'self' => [
- 'href' => '',
+ 'href' => $this->baseUrl . '/entity/entity_test_label/1?_format=hal_json',
],
'type' => [
'href' => $this->baseUrl . '/rest/type/entity_test_label/entity_test_label',
diff --git a/web/core/modules/system/tests/modules/entity_test/tests/src/Functional/Hal/EntityTestMapFieldHalJsonAnonTest.php b/web/core/modules/system/tests/modules/entity_test/tests/src/Functional/Hal/EntityTestMapFieldHalJsonAnonTest.php
index dfee26fbd6..7d835ca7be 100644
--- a/web/core/modules/system/tests/modules/entity_test/tests/src/Functional/Hal/EntityTestMapFieldHalJsonAnonTest.php
+++ b/web/core/modules/system/tests/modules/entity_test/tests/src/Functional/Hal/EntityTestMapFieldHalJsonAnonTest.php
@@ -47,7 +47,7 @@ protected function getExpectedNormalizedEntity() {
return $normalization + [
'_links' => [
'self' => [
- 'href' => '',
+ 'href' => $this->baseUrl . '/entity/entity_test_map_field/1?_format=hal_json',
],
'type' => [
'href' => $this->baseUrl . '/rest/type/entity_test_map_field/entity_test_map_field',
diff --git a/web/core/modules/system/tests/modules/entity_test/tests/src/Functional/Rest/EntityTestLabelResourceTestBase.php b/web/core/modules/system/tests/modules/entity_test/tests/src/Functional/Rest/EntityTestLabelResourceTestBase.php
index 08a6552f65..fc4db157e2 100644
--- a/web/core/modules/system/tests/modules/entity_test/tests/src/Functional/Rest/EntityTestLabelResourceTestBase.php
+++ b/web/core/modules/system/tests/modules/entity_test/tests/src/Functional/Rest/EntityTestLabelResourceTestBase.php
@@ -39,6 +39,7 @@ protected function setUpAuthorization($method) {
case 'GET':
$this->grantPermissionsToTestedRole(['view test entity']);
break;
+
case 'POST':
$this->grantPermissionsToTestedRole([
'administer entity_test content',
@@ -46,6 +47,7 @@ protected function setUpAuthorization($method) {
'create entity_test entity_test_with_bundle entities',
]);
break;
+
case 'PATCH':
case 'DELETE':
$this->grantPermissionsToTestedRole(['administer entity_test content']);
@@ -148,11 +150,14 @@ protected function getExpectedUnauthorizedAccessMessage($method) {
switch ($method) {
case 'GET':
return "The 'view test entity' permission is required.";
+
case 'POST':
return "The following permissions are required: 'administer entity_test content' OR 'administer entity_test_with_bundle content' OR 'create entity_test_label entity_test_with_bundle entities'.";
+
case 'PATCH':
case 'DELETE':
return "The 'administer entity_test content' permission is required.";
+
default:
return parent::getExpectedUnauthorizedAccessMessage($method);
}
diff --git a/web/core/modules/system/tests/modules/entity_test/tests/src/Functional/Rest/EntityTestResourceTestBase.php b/web/core/modules/system/tests/modules/entity_test/tests/src/Functional/Rest/EntityTestResourceTestBase.php
index 6ea9998479..8fa85b3dd9 100644
--- a/web/core/modules/system/tests/modules/entity_test/tests/src/Functional/Rest/EntityTestResourceTestBase.php
+++ b/web/core/modules/system/tests/modules/entity_test/tests/src/Functional/Rest/EntityTestResourceTestBase.php
@@ -43,9 +43,11 @@ protected function setUpAuthorization($method) {
case 'GET':
$this->grantPermissionsToTestedRole(['view test entity']);
break;
+
case 'POST':
$this->grantPermissionsToTestedRole(['create entity_test entity_test_with_bundle entities']);
break;
+
case 'PATCH':
case 'DELETE':
$this->grantPermissionsToTestedRole(['administer entity_test content']);
@@ -155,8 +157,10 @@ protected function getExpectedUnauthorizedAccessMessage($method) {
switch ($method) {
case 'GET':
return "The 'view test entity' permission is required.";
+
case 'POST':
return "The following permissions are required: 'administer entity_test content' OR 'administer entity_test_with_bundle content' OR 'create entity_test entity_test_with_bundle entities'.";
+
default:
return parent::getExpectedUnauthorizedAccessMessage($method);
}
diff --git a/web/core/modules/system/tests/modules/entity_test/tests/src/Functional/Rest/EntityTestTextItemNormalizerTest.php b/web/core/modules/system/tests/modules/entity_test/tests/src/Functional/Rest/EntityTestTextItemNormalizerTest.php
index 9c3b978cc4..a32b2158a0 100644
--- a/web/core/modules/system/tests/modules/entity_test/tests/src/Functional/Rest/EntityTestTextItemNormalizerTest.php
+++ b/web/core/modules/system/tests/modules/entity_test/tests/src/Functional/Rest/EntityTestTextItemNormalizerTest.php
@@ -154,7 +154,7 @@ protected function getExpectedCacheContexts() {
*/
public function testGetWithFormat($text_format_id, array $expected_cache_tags) {
FilterFormat::create([
- 'name' => 'Pablo Piccasso',
+ 'name' => 'Pablo Picasso',
'format' => 'pablo',
'langcode' => 'es',
'filters' => [],
diff --git a/web/core/modules/system/tests/modules/entity_test_update/entity_test_update.info.yml b/web/core/modules/system/tests/modules/entity_test_update/entity_test_update.info.yml
index 330028a7a1..5b54372f87 100644
--- a/web/core/modules/system/tests/modules/entity_test_update/entity_test_update.info.yml
+++ b/web/core/modules/system/tests/modules/entity_test_update/entity_test_update.info.yml
@@ -4,3 +4,5 @@ description: 'Provides an entity type for testing definition and schema updates.
package: Testing
version: VERSION
core: 8.x
+dependencies:
+ - drupal:field
diff --git a/web/core/modules/system/tests/modules/form_test/src/EventSubscriber/FormTestEventSubscriber.php b/web/core/modules/system/tests/modules/form_test/src/EventSubscriber/FormTestEventSubscriber.php
index 3fb97507a4..a57c84d1f6 100644
--- a/web/core/modules/system/tests/modules/form_test/src/EventSubscriber/FormTestEventSubscriber.php
+++ b/web/core/modules/system/tests/modules/form_test/src/EventSubscriber/FormTestEventSubscriber.php
@@ -27,7 +27,7 @@ public function onKernelRequest(GetResponseEvent $event) {
/**
* Adds custom headers to the response.
*
- * @param \Symfony\Component\HttpKernel\Event\GetResponseEvent $event
+ * @param \Symfony\Component\HttpKernel\Event\FilterResponseEvent $event
* The kernel request event.
*/
public function onKernelResponse(FilterResponseEvent $event) {
diff --git a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestMachineNameForm.php b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestMachineNameForm.php
index 121cd31aea..3ab45f0ec4 100644
--- a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestMachineNameForm.php
+++ b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestMachineNameForm.php
@@ -48,6 +48,19 @@ public function buildForm(array $form, FormStateInterface $form_state) {
'source' => ['machine_name_2_label'],
],
];
+ $form['machine_name_3_label'] = [
+ '#type' => 'textfield',
+ '#title' => 'Machine name 3 label',
+ '#default_value' => 'Yet another machine name',
+ ];
+ $form['machine_name_3'] = [
+ '#type' => 'machine_name',
+ '#title' => 'Machine name 3',
+ '#description' => 'Another machine name.',
+ '#machine_name' => [
+ 'source' => ['machine_name_3_label'],
+ ],
+ ];
$form['submit'] = [
'#type' => 'submit',
'#value' => 'Submit',
diff --git a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestPatternForm.php b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestPatternForm.php
index 19157f5d4b..59d9a11842 100644
--- a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestPatternForm.php
+++ b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestPatternForm.php
@@ -41,7 +41,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
$form['url'] = [
'#type' => 'url',
'#title' => 'Client side validation',
- '#decription' => 'Just client side validation, using the #pattern attribute.',
+ '#description' => 'Just client side validation, using the #pattern attribute.',
'#attributes' => [
'pattern' => '.*foo.*',
],
diff --git a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestTableForm.php b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestTableForm.php
index 8196d4d6f6..2004933135 100644
--- a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestTableForm.php
+++ b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestTableForm.php
@@ -35,7 +35,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
];
$form['table']['another_row'] = [
'data' => [
- '#title' => $this->t('my favourite fruit is <strong>@fruit</strong>', ['@fruit' => 'bananas']),
+ '#title' => $this->t('my favorite fruit is <strong>@fruit</strong>', ['@fruit' => 'bananas']),
'#markup' => '<p>some more text</p>',
],
];
diff --git a/web/core/modules/system/tests/modules/js_cookie_test/js/js_cookie_shim_test.es6.js b/web/core/modules/system/tests/modules/js_cookie_test/js/js_cookie_shim_test.es6.js
new file mode 100644
index 0000000000..b8f5f373e5
--- /dev/null
+++ b/web/core/modules/system/tests/modules/js_cookie_test/js/js_cookie_shim_test.es6.js
@@ -0,0 +1,31 @@
+/**
+ * @file
+ * Tests adding and removing browser cookies using the jquery_cookie shim.
+ */
+(({ behaviors }, $) => {
+ behaviors.jqueryCookie = {
+ attach: () => {
+ if ($('body').once('js_cookie_test-init').length) {
+ $('.js_cookie_test_add_button').on('click', () => {
+ $.cookie('js_cookie_test', 'red panda');
+ });
+ $('.js_cookie_test_add_raw_button').on('click', () => {
+ $.cookie.raw = true;
+ $.cookie('js_cookie_test_raw', 'red panda');
+ });
+ $('.js_cookie_test_add_json_button').on('click', () => {
+ $.cookie.json = true;
+ $.cookie('js_cookie_test_json', { panda: 'red' });
+ $.cookie('js_cookie_test_json_simple', 'red panda');
+ });
+ $('.js_cookie_test_add_json_string_button').on('click', () => {
+ $.cookie.json = false;
+ $.cookie('js_cookie_test_json_string', { panda: 'red' });
+ });
+ $('.js_cookie_test_remove_button').on('click', () => {
+ $.removeCookie('js_cookie_test');
+ });
+ }
+ },
+ };
+})(Drupal, jQuery);
diff --git a/web/core/modules/system/tests/modules/js_cookie_test/js/js_cookie_shim_test.js b/web/core/modules/system/tests/modules/js_cookie_test/js/js_cookie_shim_test.js
new file mode 100644
index 0000000000..0cf5928ada
--- /dev/null
+++ b/web/core/modules/system/tests/modules/js_cookie_test/js/js_cookie_shim_test.js
@@ -0,0 +1,36 @@
+/**
+* DO NOT EDIT THIS FILE.
+* See the following change record for more information,
+* https://www.drupal.org/node/2815083
+* @preserve
+**/
+
+(function (_ref, $) {
+ var behaviors = _ref.behaviors;
+
+ behaviors.jqueryCookie = {
+ attach: function attach() {
+ if ($('body').once('js_cookie_test-init').length) {
+ $('.js_cookie_test_add_button').on('click', function () {
+ $.cookie('js_cookie_test', 'red panda');
+ });
+ $('.js_cookie_test_add_raw_button').on('click', function () {
+ $.cookie.raw = true;
+ $.cookie('js_cookie_test_raw', 'red panda');
+ });
+ $('.js_cookie_test_add_json_button').on('click', function () {
+ $.cookie.json = true;
+ $.cookie('js_cookie_test_json', { panda: 'red' });
+ $.cookie('js_cookie_test_json_simple', 'red panda');
+ });
+ $('.js_cookie_test_add_json_string_button').on('click', function () {
+ $.cookie.json = false;
+ $.cookie('js_cookie_test_json_string', { panda: 'red' });
+ });
+ $('.js_cookie_test_remove_button').on('click', function () {
+ $.removeCookie('js_cookie_test');
+ });
+ }
+ }
+ };
+})(Drupal, jQuery);
\ No newline at end of file
diff --git a/web/core/modules/system/tests/modules/js_cookie_test/js_cookie_test.info.yml b/web/core/modules/system/tests/modules/js_cookie_test/js_cookie_test.info.yml
new file mode 100644
index 0000000000..d33421d823
--- /dev/null
+++ b/web/core/modules/system/tests/modules/js_cookie_test/js_cookie_test.info.yml
@@ -0,0 +1,5 @@
+name: 'JS Cookie Test'
+type: module
+description: 'Module for the jsCookieTest.'
+package: Testing
+version: VERSION
diff --git a/web/core/modules/system/tests/modules/js_cookie_test/js_cookie_test.libraries.yml b/web/core/modules/system/tests/modules/js_cookie_test/js_cookie_test.libraries.yml
new file mode 100644
index 0000000000..0f15de6c68
--- /dev/null
+++ b/web/core/modules/system/tests/modules/js_cookie_test/js_cookie_test.libraries.yml
@@ -0,0 +1,9 @@
+with_shim_test:
+ version: VERSION
+ js:
+ js/js_cookie_shim_test.js: {}
+ dependencies:
+ - core/jquery
+ - core/drupal
+ - core/jquery.cookie
+ - core/jquery.once
diff --git a/web/core/modules/system/tests/modules/js_cookie_test/js_cookie_test.routing.yml b/web/core/modules/system/tests/modules/js_cookie_test/js_cookie_test.routing.yml
new file mode 100644
index 0000000000..5ee89b5496
--- /dev/null
+++ b/web/core/modules/system/tests/modules/js_cookie_test/js_cookie_test.routing.yml
@@ -0,0 +1,7 @@
+js_cookie_test.with_shim:
+ path: '/js_cookie_with_shim_test'
+ defaults:
+ _controller: '\Drupal\js_cookie_test\Controller\JsCookieTestController::jqueryCookieShimTest'
+ _title: 'JQueryCookieShimTest'
+ requirements:
+ _access: 'TRUE'
diff --git a/web/core/modules/system/tests/modules/js_cookie_test/src/Controller/JsCookieTestController.php b/web/core/modules/system/tests/modules/js_cookie_test/src/Controller/JsCookieTestController.php
new file mode 100644
index 0000000000..7cce7cbf3b
--- /dev/null
+++ b/web/core/modules/system/tests/modules/js_cookie_test/src/Controller/JsCookieTestController.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace Drupal\js_cookie_test\Controller;
+
+use Drupal\Core\Controller\ControllerBase;
+
+/**
+ * Test controller to assert js-cookie library integration.
+ */
+class JsCookieTestController extends ControllerBase {
+
+ /**
+ * Provides buttons to add and remove cookies using JavaScript.
+ *
+ * @return array
+ * The render array.
+ */
+ public function jqueryCookieShimTest() {
+ return [
+ 'add' => [
+ '#type' => 'button',
+ '#value' => $this->t('Add cookie'),
+ '#attributes' => [
+ 'class' => ['js_cookie_test_add_button'],
+ ],
+ ],
+ 'add-raw' => [
+ '#type' => 'button',
+ '#value' => $this->t('Add raw cookie'),
+ '#attributes' => [
+ 'class' => ['js_cookie_test_add_raw_button'],
+ ],
+ ],
+ 'add-json' => [
+ '#type' => 'button',
+ '#value' => $this->t('Add JSON cookie'),
+ '#attributes' => [
+ 'class' => ['js_cookie_test_add_json_button'],
+ ],
+ ],
+ 'add-json-string' => [
+ '#type' => 'button',
+ '#value' => $this->t('Add JSON cookie without json option'),
+ '#attributes' => [
+ 'class' => ['js_cookie_test_add_json_string_button'],
+ ],
+ ],
+ 'remove' => [
+ '#type' => 'button',
+ '#value' => $this->t('Remove cookie'),
+ '#attributes' => [
+ 'class' => ['js_cookie_test_remove_button'],
+ ],
+ ],
+ '#attached' => ['library' => ['js_cookie_test/with_shim_test']],
+ ];
+ }
+
+}
diff --git a/web/core/modules/system/tests/modules/js_message_test/js/js_message_test.es6.js b/web/core/modules/system/tests/modules/js_message_test/js/js_message_test.es6.js
index e9efaa6ef5..e9d910d7ac 100644
--- a/web/core/modules/system/tests/modules/js_message_test/js/js_message_test.es6.js
+++ b/web/core/modules/system/tests/modules/js_message_test/js/js_message_test.es6.js
@@ -51,7 +51,7 @@
if (action === 'add') {
messageObjects[area].indexes[type].push(
message.add(
- `This is a message of the type, ${type}. You be the the judge of its importance.`,
+ `This is a message of the type, ${type}. You be the judge of its importance.`,
{ type },
),
);
@@ -71,7 +71,7 @@
messageObjects.default.zone.add(
`This is message number ${i} of the type, ${
testMessages.types[i % testMessages.types.length]
- }. You be the the judge of its importance.`,
+ }. You be the judge of its importance.`,
{ type: testMessages.types[i % testMessages.types.length] },
),
);
diff --git a/web/core/modules/system/tests/modules/js_message_test/js/js_message_test.js b/web/core/modules/system/tests/modules/js_message_test/js/js_message_test.js
index c9b18fd965..00bedc7933 100644
--- a/web/core/modules/system/tests/modules/js_message_test/js/js_message_test.js
+++ b/web/core/modules/system/tests/modules/js_message_test/js/js_message_test.js
@@ -41,14 +41,14 @@
var action = $target.attr('data-action');
if (action === 'add') {
- messageObjects[area].indexes[type].push(message.add('This is a message of the type, ' + type + '. You be the the judge of its importance.', { type: type }));
+ messageObjects[area].indexes[type].push(message.add('This is a message of the type, ' + type + '. You be the judge of its importance.', { type: type }));
} else if (action === 'remove') {
message.remove(messageObjects[area].indexes[type].pop());
}
});
$('[data-action="add-multiple"]').once('add-multiple').on('click', function () {
[0, 1, 2, 3, 4, 5].forEach(function (i) {
- messageObjects.multiple.push(messageObjects.default.zone.add('This is message number ' + i + ' of the type, ' + testMessages.types[i % testMessages.types.length] + '. You be the the judge of its importance.', { type: testMessages.types[i % testMessages.types.length] }));
+ messageObjects.multiple.push(messageObjects.default.zone.add('This is message number ' + i + ' of the type, ' + testMessages.types[i % testMessages.types.length] + '. You be the judge of its importance.', { type: testMessages.types[i % testMessages.types.length] }));
});
});
$('[data-action="remove-multiple"]').once('remove-multiple').on('click', function () {
diff --git a/web/core/modules/system/tests/modules/plugin_test/src/Plugin/TestLazyPluginCollection.php b/web/core/modules/system/tests/modules/plugin_test/src/Plugin/TestLazyPluginCollection.php
index 1009faa540..9e47a44a51 100644
--- a/web/core/modules/system/tests/modules/plugin_test/src/Plugin/TestLazyPluginCollection.php
+++ b/web/core/modules/system/tests/modules/plugin_test/src/Plugin/TestLazyPluginCollection.php
@@ -27,7 +27,7 @@ public function __construct(PluginManagerInterface $manager) {
$this->manager = $manager;
$instance_ids = array_keys($this->manager->getDefinitions());
- $this->instanceIDs = array_combine($instance_ids, $instance_ids);
+ $this->instanceIds = array_combine($instance_ids, $instance_ids);
}
/**
diff --git a/web/core/modules/system/tests/modules/router_test_directory/src/TestControllers.php b/web/core/modules/system/tests/modules/router_test_directory/src/TestControllers.php
index adebf28ddd..fe228a336b 100644
--- a/web/core/modules/system/tests/modules/router_test_directory/src/TestControllers.php
+++ b/web/core/modules/system/tests/modules/router_test_directory/src/TestControllers.php
@@ -8,7 +8,7 @@
use Symfony\Cmf\Component\Routing\RouteObjectInterface;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
-use Zend\Diactoros\Response\HtmlResponse;
+use Laminas\Diactoros\Response\HtmlResponse;
/**
* Controller routines for testing the routing system.
diff --git a/web/core/modules/system/tests/modules/session_test/session_test.routing.yml b/web/core/modules/system/tests/modules/session_test/session_test.routing.yml
index 84978c9474..25a9321181 100644
--- a/web/core/modules/system/tests/modules/session_test/session_test.routing.yml
+++ b/web/core/modules/system/tests/modules/session_test/session_test.routing.yml
@@ -131,3 +131,33 @@ session_test.set_session:
test_value: '\s+'
requirements:
_permission: 'administer site configuration'
+
+session_test.set_bag_flag:
+ path: '/session-test/set-bag-flag'
+ defaults:
+ _title: 'Sets the test flag in the session test bag'
+ _controller: '\Drupal\session_test\Controller\SessionTestController::setSessionBagFlag'
+ options:
+ no_cache: TRUE
+ requirements:
+ _access: 'TRUE'
+
+session_test.clear_bag_flag:
+ path: '/session-test/clear-bag-flag'
+ defaults:
+ _title: 'Clears the test flag in the session test bag'
+ _controller: '\Drupal\session_test\Controller\SessionTestController::clearSessionBagFlag'
+ options:
+ no_cache: TRUE
+ requirements:
+ _access: 'TRUE'
+
+session_test.has_bag_flag:
+ path: '/session-test/has-bag-flag'
+ defaults:
+ _title: 'Prints a message if the flag in the session bag is set'
+ _controller: '\Drupal\session_test\Controller\SessionTestController::hasSessionBagFlag'
+ options:
+ no_cache: TRUE
+ requirements:
+ _access: 'TRUE'
diff --git a/web/core/modules/system/tests/modules/session_test/session_test.services.yml b/web/core/modules/system/tests/modules/session_test/session_test.services.yml
index 324199d996..9d2c8d3da0 100644
--- a/web/core/modules/system/tests/modules/session_test/session_test.services.yml
+++ b/web/core/modules/system/tests/modules/session_test/session_test.services.yml
@@ -14,3 +14,7 @@ services:
- { name: session_handler_proxy, priority: 20 }
session_test.session_handler_proxy_trace:
class: ArrayObject
+ session_test.session_bag:
+ class: Drupal\session_test\Session\TestSessionBag
+ tags:
+ - { name: session_bag }
diff --git a/web/core/modules/system/tests/modules/session_test/src/Controller/SessionTestController.php b/web/core/modules/system/tests/modules/session_test/src/Controller/SessionTestController.php
index 1094522eab..95be208a3e 100644
--- a/web/core/modules/system/tests/modules/session_test/src/Controller/SessionTestController.php
+++ b/web/core/modules/system/tests/modules/session_test/src/Controller/SessionTestController.php
@@ -3,6 +3,7 @@
namespace Drupal\session_test\Controller;
use Drupal\Core\Controller\ControllerBase;
+use Drupal\session_test\Session\TestSessionBag;
use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
@@ -195,4 +196,54 @@ public function setSession(Request $request, $test_value) {
return new JsonResponse(['session' => $session->all(), 'user' => $this->currentUser()->id()]);
}
+ /**
+ * Sets the test flag in the session test bag.
+ *
+ * @param \Symfony\Component\HttpFoundation\Request $request
+ * The request object.
+ *
+ * @return \Symfony\Component\HttpFoundation\Response
+ * The response object.
+ */
+ public function setSessionBagFlag(Request $request) {
+ /** @var \Drupal\session_test\Session\TestSessionBag */
+ $bag = $request->getSession()->getBag(TestSessionBag::BAG_NAME);
+ $bag->setFlag();
+ return new Response();
+ }
+
+ /**
+ * Clears the test flag from the session test bag.
+ *
+ * @param \Symfony\Component\HttpFoundation\Request $request
+ * The request object.
+ *
+ * @return \Symfony\Component\HttpFoundation\Response
+ * The response object.
+ */
+ public function clearSessionBagFlag(Request $request) {
+ /** @var \Drupal\session_test\Session\TestSessionBag */
+ $bag = $request->getSession()->getBag(TestSessionBag::BAG_NAME);
+ $bag->clearFlag();
+ return new Response();
+ }
+
+ /**
+ * Prints a message if the flag in the session bag is set.
+ *
+ * @param \Symfony\Component\HttpFoundation\Request $request
+ * The request object.
+ *
+ * @return \Symfony\Component\HttpFoundation\Response
+ * The response object.
+ */
+ public function hasSessionBagFlag(Request $request) {
+ /** @var \Drupal\session_test\Session\TestSessionBag */
+ $bag = $request->getSession()->getBag(TestSessionBag::BAG_NAME);
+ return new Response(empty($bag->hasFlag())
+ ? $this->t('Flag is absent from session bag')
+ : $this->t('Flag is present in session bag')
+ );
+ }
+
}
diff --git a/web/core/modules/system/tests/modules/session_test/src/Session/TestSessionBag.php b/web/core/modules/system/tests/modules/session_test/src/Session/TestSessionBag.php
new file mode 100644
index 0000000000..4b0627fa3b
--- /dev/null
+++ b/web/core/modules/system/tests/modules/session_test/src/Session/TestSessionBag.php
@@ -0,0 +1,96 @@
+<?php
+
+namespace Drupal\session_test\Session;
+
+use Symfony\Component\HttpFoundation\Session\SessionBagInterface;
+
+/**
+ * Test session container.
+ */
+class TestSessionBag implements SessionBagInterface {
+
+ /**
+ * The bag name.
+ */
+ const BAG_NAME = 'session_test';
+
+ /**
+ * Key used when persisting the session.
+ *
+ * @var string
+ */
+ protected $storageKey;
+
+ /**
+ * Storage for data to save.
+ *
+ * @var array
+ */
+ protected $attributes = [];
+
+ /**
+ * Constructs a new TestSessionBag object.
+ *
+ * @param string $storage_key
+ * The key used to store test attributes.
+ */
+ public function __construct($storage_key = '_dp_session_test') {
+ $this->storageKey = $storage_key;
+ }
+
+ /**
+ * Sets the test flag.
+ */
+ public function setFlag() {
+ $this->attributes['test_flag'] = TRUE;
+ }
+
+ /**
+ * Returns TRUE if the test flag is set.
+ *
+ * @return bool
+ * TRUE when flag is set, FALSE otherwise.
+ */
+ public function hasFlag() {
+ return !empty($this->attributes['test_flag']);
+ }
+
+ /**
+ * Clears the test flag.
+ */
+ public function clearFlag() {
+ unset($this->attributes['test_flag']);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getName() {
+ return self::BAG_NAME;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function initialize(array &$attributes) {
+ $this->attributes = &$attributes;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getStorageKey() {
+ return $this->storageKey;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function clear() {
+ $return = $this->attributes;
+ $this->attributes = [];
+
+ return $return;
+ }
+
+}
diff --git a/web/core/modules/system/tests/modules/system_test/src/Controller/SystemTestController.php b/web/core/modules/system/tests/modules/system_test/src/Controller/SystemTestController.php
index a309858d9e..dddfac8108 100644
--- a/web/core/modules/system/tests/modules/system_test/src/Controller/SystemTestController.php
+++ b/web/core/modules/system/tests/modules/system_test/src/Controller/SystemTestController.php
@@ -283,7 +283,7 @@ public function setHeader(Request $request) {
/**
* A simple page callback that uses a plain Symfony response object.
*/
- public function respondWithReponse(Request $request) {
+ public function respondWithResponse(Request $request) {
return new Response('test');
}
@@ -297,7 +297,7 @@ public function respondWithPublicResponse() {
/**
* A simple page callback that uses a CacheableResponse object.
*/
- public function respondWithCacheableReponse(Request $request) {
+ public function respondWithCacheableResponse(Request $request) {
return new CacheableResponse('test');
}
diff --git a/web/core/modules/system/tests/modules/system_test/system_test.routing.yml b/web/core/modules/system/tests/modules/system_test/system_test.routing.yml
index 521e7b2376..800a289c7c 100644
--- a/web/core/modules/system/tests/modules/system_test/system_test.routing.yml
+++ b/web/core/modules/system/tests/modules/system_test/system_test.routing.yml
@@ -131,9 +131,9 @@ system_test.permission_dependent_route_access:
_permission: 'pet llamas'
system_test.respond_response:
- path: '/system-test/respond-reponse'
+ path: '/system-test/respond-response'
defaults:
- _controller: '\Drupal\system_test\Controller\SystemTestController::respondWithReponse'
+ _controller: '\Drupal\system_test\Controller\SystemTestController::respondWithResponse'
requirements:
_access: 'TRUE'
@@ -145,9 +145,9 @@ system_test.respond_public_response:
_access: 'TRUE'
system_test.respond_cacheable_response:
- path: '/system-test/respond-cacheable-reponse'
+ path: '/system-test/respond-cacheable-response'
defaults:
- _controller: '\Drupal\system_test\Controller\SystemTestController::respondWithCacheableReponse'
+ _controller: '\Drupal\system_test\Controller\SystemTestController::respondWithCacheableResponse'
requirements:
_access: 'TRUE'
diff --git a/web/core/modules/system/tests/modules/theme_suggestions_test/theme_suggestions_test.inc b/web/core/modules/system/tests/modules/theme_legacy_suggestions_test/theme_legacy_suggestions_test.inc
similarity index 74%
rename from web/core/modules/system/tests/modules/theme_suggestions_test/theme_suggestions_test.inc
rename to web/core/modules/system/tests/modules/theme_legacy_suggestions_test/theme_legacy_suggestions_test.inc
index efc0144551..fc977ae7e3 100644
--- a/web/core/modules/system/tests/modules/theme_suggestions_test/theme_suggestions_test.inc
+++ b/web/core/modules/system/tests/modules/theme_legacy_suggestions_test/theme_legacy_suggestions_test.inc
@@ -2,7 +2,7 @@
/**
* @file
- * Include file for testing theme suggestion hooks.
+ * Include file for testing theme suggestion hooks for legacy theme functions.
*/
/**
diff --git a/web/core/modules/system/tests/modules/theme_legacy_suggestions_test/theme_legacy_suggestions_test.info.yml b/web/core/modules/system/tests/modules/theme_legacy_suggestions_test/theme_legacy_suggestions_test.info.yml
new file mode 100644
index 0000000000..cf1f0aec77
--- /dev/null
+++ b/web/core/modules/system/tests/modules/theme_legacy_suggestions_test/theme_legacy_suggestions_test.info.yml
@@ -0,0 +1,5 @@
+name: 'Legacy theme functions suggestions test'
+type: module
+description: 'Support module for testing theme suggestions for legacy theme functions.'
+package: Testing
+version: VERSION
diff --git a/web/core/modules/system/tests/modules/theme_legacy_suggestions_test/theme_legacy_suggestions_test.module b/web/core/modules/system/tests/modules/theme_legacy_suggestions_test/theme_legacy_suggestions_test.module
new file mode 100644
index 0000000000..3986663b90
--- /dev/null
+++ b/web/core/modules/system/tests/modules/theme_legacy_suggestions_test/theme_legacy_suggestions_test.module
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * @file
+ * Support module for testing theme suggestions.
+ *
+ * @todo Remove in https://www.drupal.org/project/drupal/issues/3097889
+ */
+
+/**
+ * Implements hook_theme().
+ */
+function theme_legacy_suggestions_test_theme() {
+ $items['theme_suggestions_test_include'] = [
+ 'file' => 'theme_legacy_suggestions_test.inc',
+ 'function' => 'theme_theme_suggestions_test_include',
+ ];
+ return $items;
+}
+
+/**
+ * Implements hook_theme_suggestions_HOOK_alter().
+ */
+function theme_legacy_suggestions_test_theme_suggestions_theme_test_function_suggestions_alter(array &$suggestions, array $variables) {
+ $suggestions[] = 'theme_test_function_suggestions__module_override';
+}
+
+/**
+ * Implements hook_theme_suggestions_HOOK_alter().
+ */
+function theme_legacy_suggestions_test_theme_suggestions_theme_test_suggestions_include_alter(array &$suggestions, array $variables, $hook) {
+ $suggestions[] = 'theme_suggestions_test_include';
+}
diff --git a/web/core/modules/system/tests/modules/theme_legacy_test/src/ThemeTestController.php b/web/core/modules/system/tests/modules/theme_legacy_test/src/ThemeTestController.php
new file mode 100644
index 0000000000..843858cc5f
--- /dev/null
+++ b/web/core/modules/system/tests/modules/theme_legacy_test/src/ThemeTestController.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace Drupal\theme_legacy_test;
+
+use Drupal\Core\Controller\ControllerBase;
+
+/**
+ * Controller routines for test routes for legacy theme functions.
+ *
+ * @todo Remove in https://www.drupal.org/project/drupal/issues/3097889
+ */
+class ThemeTestController extends ControllerBase {
+
+ /**
+ * A theme template that overrides a theme function.
+ *
+ * @return array
+ * Render array containing a theme.
+ */
+ public function functionTemplateOverridden() {
+ return [
+ '#theme' => 'theme_test_function_template_override',
+ ];
+ }
+
+ /**
+ * Menu callback for testing suggestion alter hooks with theme functions.
+ */
+ public function functionSuggestionAlter() {
+ return ['#theme' => 'theme_test_function_suggestions'];
+ }
+
+ /**
+ * Menu callback for testing includes with suggestion alter hooks.
+ */
+ public function suggestionAlterInclude() {
+ return ['#theme' => 'theme_test_suggestions_include'];
+ }
+
+}
diff --git a/web/core/modules/system/tests/modules/theme_legacy_test/theme_legacy_test.inc b/web/core/modules/system/tests/modules/theme_legacy_test/theme_legacy_test.inc
new file mode 100644
index 0000000000..bbf74ffb74
--- /dev/null
+++ b/web/core/modules/system/tests/modules/theme_legacy_test/theme_legacy_test.inc
@@ -0,0 +1,13 @@
+<?php
+
+/**
+ * @file
+ * Include file for testing legacy theme functions.
+ */
+
+/**
+ * Returns HTML for the 'theme_test' theme hook used by tests.
+ */
+function theme_theme_test($variables) {
+ return 'Theme hook implementor=theme_theme_test(). Foo=' . $variables['foo'];
+}
diff --git a/web/core/modules/system/tests/modules/theme_legacy_test/theme_legacy_test.info.yml b/web/core/modules/system/tests/modules/theme_legacy_test/theme_legacy_test.info.yml
new file mode 100644
index 0000000000..dd537a0a9e
--- /dev/null
+++ b/web/core/modules/system/tests/modules/theme_legacy_test/theme_legacy_test.info.yml
@@ -0,0 +1,5 @@
+name: 'Legacy theme functions test'
+type: module
+description: 'Support module for testing legacy theme functions.'
+package: Testing
+version: VERSION
diff --git a/web/core/modules/system/tests/modules/theme_legacy_test/theme_legacy_test.module b/web/core/modules/system/tests/modules/theme_legacy_test/theme_legacy_test.module
new file mode 100644
index 0000000000..6001e4fd00
--- /dev/null
+++ b/web/core/modules/system/tests/modules/theme_legacy_test/theme_legacy_test.module
@@ -0,0 +1,115 @@
+<?php
+
+/**
+ * @file
+ * Test module for legacy theme functions.
+ *
+ * @todo Remove in https://www.drupal.org/project/drupal/issues/3097889
+ */
+
+/**
+ * Implements hook_theme().
+ */
+function theme_legacy_test_theme($existing, $type, $theme, $path) {
+ $items['theme_test'] = [
+ 'file' => 'theme_legacy_test.inc',
+ 'variables' => ['foo' => ''],
+ 'function' => 'theme_theme_test',
+ ];
+ $items['theme_test_function_suggestions'] = [
+ 'variables' => [],
+ 'function' => 'theme_theme_test_function_suggestions',
+ ];
+ $items['theme_test_suggestions_include'] = [
+ 'variables' => [],
+ 'function' => 'theme_theme_test_suggestions_include',
+ ];
+ $items['theme_test_foo'] = [
+ 'variables' => ['foo' => NULL],
+ 'function' => 'theme_theme_test_foo',
+ ];
+ $items['theme_test_render_element_children'] = [
+ 'render element' => 'element',
+ 'function' => 'theme_theme_test_render_element_children',
+ ];
+ $items['theme_test_function_template_override'] = [
+ 'variables' => [],
+ 'function' => 'theme_theme_test_function_template_override',
+ ];
+ $info['test_theme_not_existing_function'] = [
+ 'function' => 'test_theme_not_existing_function',
+ ];
+ return $items;
+}
+
+/**
+ * Implements template_preprocess_HOOK() for theme_test_function_suggestions theme functions.
+ */
+function template_preprocess_theme_test_function_suggestions(&$variables) {
+}
+
+/**
+ * Theme function for hook theme_test_foo.
+ */
+function theme_theme_test_foo($variables) {
+ return $variables['foo'];
+}
+
+/**
+ * Theme function for hook theme_test_function_template_override.
+ */
+function theme_theme_test_function_template_override($variables) {
+ return 'theme_test_function_template_override test failed.';
+}
+
+/**
+ * Theme function for testing rendering of child elements via drupal_render().
+ *
+ * Theme hooks defining a 'render element' add an internal '#render_children'
+ * property. When this property is found, drupal_render() avoids calling
+ * the 'theme.manager' service 'render' method on the top-level element to
+ * prevent infinite recursion.
+ *
+ * @param array $variables
+ * An associative array containing:
+ * - element: An associative array containing the properties of the element.
+ */
+function theme_theme_test_render_element_children($variables) {
+ return \Drupal::service('renderer')->render($variables['element']);
+}
+
+/**
+ * Returns HTML for a theme function suggestion test.
+ */
+function theme_theme_test_function_suggestions($variables) {
+ return 'Original theme function.';
+}
+
+/**
+ * Implements hook_theme_suggestions_HOOK().
+ */
+function theme_legacy_test_theme_suggestions_theme_test_suggestion_provided(array $variables) {
+ return ['theme_test_suggestion_provided__foo'];
+}
+
+/**
+ * Implements hook_theme_suggestions_alter().
+ */
+function theme_legacy_test_theme_suggestions_alter(array &$suggestions, array $variables, $hook) {
+ \Drupal::messenger()
+ ->addStatus(__FUNCTION__ . '() executed for ' . $hook . '.');
+}
+
+/**
+ * Implements hook_theme_suggestions_HOOK_alter().
+ */
+function theme_legacy_test_theme_suggestions_theme_test_suggestions_alter(array &$suggestions, array $variables) {
+ \Drupal::messenger()->addStatus(__FUNCTION__ . '() executed.');
+}
+
+/**
+ * Returns HTML for a theme function include test.
+ */
+function theme_theme_test_suggestions_include($variables) {
+ return 'Original function before altering theme suggestions.';
+}
diff --git a/web/core/modules/system/tests/modules/theme_legacy_test/theme_legacy_test.routing.yml b/web/core/modules/system/tests/modules/theme_legacy_test/theme_legacy_test.routing.yml
new file mode 100644
index 0000000000..ffc6b45776
--- /dev/null
+++ b/web/core/modules/system/tests/modules/theme_legacy_test/theme_legacy_test.routing.yml
@@ -0,0 +1,22 @@
+theme_test.function_template_override:
+ path: '/theme-test/function-template-overridden'
+ options:
+ _custom_theme: 'test_theme'
+ defaults:
+ _controller: '\Drupal\theme_legacy_test\ThemeTestController::functionTemplateOverridden'
+ requirements:
+ _access: 'TRUE'
+
+function_suggestion_alter:
+ path: '/theme-test/function-suggestion-alter'
+ defaults:
+ _controller: '\Drupal\theme_legacy_test\ThemeTestController::functionSuggestionAlter'
+ requirements:
+ _access: 'TRUE'
+
+suggestion_alter_include:
+ path: '/theme-test/suggestion-alter-include'
+ defaults:
+ _controller: '\Drupal\theme_legacy_test\ThemeTestController::suggestionAlterInclude'
+ requirements:
+ _access: 'TRUE'
diff --git a/web/core/modules/system/tests/modules/theme_suggestions_test/theme_suggestions_test.module b/web/core/modules/system/tests/modules/theme_suggestions_test/theme_suggestions_test.module
index 5d4420270a..b6d2f80cf2 100644
--- a/web/core/modules/system/tests/modules/theme_suggestions_test/theme_suggestions_test.module
+++ b/web/core/modules/system/tests/modules/theme_suggestions_test/theme_suggestions_test.module
@@ -5,18 +5,6 @@
* Support module for testing theme suggestions.
*/
-/**
- * Implements hook_theme().
- */
-function theme_suggestions_test_theme() {
- $items['theme_suggestions_test_include'] = [
- 'file' => 'theme_suggestions_test.inc',
- 'variables' => [],
- 'function' => 'theme_theme_suggestions_test_include',
- ];
- return $items;
-}
-
/**
* Implements hook_theme_suggestions_alter().
*/
@@ -35,23 +23,9 @@ function theme_suggestions_test_theme_suggestions_theme_test_suggestions_alter(a
$suggestions[] = 'theme_test_suggestions__module_override';
}
-/**
- * Implements hook_theme_suggestions_HOOK_alter().
- */
-function theme_suggestions_test_theme_suggestions_theme_test_function_suggestions_alter(array &$suggestions, array $variables) {
- $suggestions[] = 'theme_test_function_suggestions__module_override';
-}
-
/**
* Implements hook_theme_suggestions_HOOK_alter().
*/
function theme_suggestions_test_theme_suggestions_theme_test_specific_suggestions_alter(array &$suggestions, array $variables) {
$suggestions[] = 'theme_test_specific_suggestions__variant__foo';
}
-
-/**
- * Implements hook_theme_suggestions_HOOK_alter().
- */
-function theme_suggestions_test_theme_suggestions_theme_test_suggestions_include_alter(array &$suggestions, array $variables, $hook) {
- $suggestions[] = 'theme_suggestions_test_include';
-}
diff --git a/web/core/modules/system/tests/modules/theme_test/src/ThemeTestController.php b/web/core/modules/system/tests/modules/theme_test/src/ThemeTestController.php
index bd46aeaed9..2da8e8022d 100644
--- a/web/core/modules/system/tests/modules/theme_test/src/ThemeTestController.php
+++ b/web/core/modules/system/tests/modules/theme_test/src/ThemeTestController.php
@@ -10,18 +10,6 @@
*/
class ThemeTestController extends ControllerBase {
- /**
- * A theme template that overrides a theme function.
- *
- * @return array
- * Render array containing a theme.
- */
- public function functionTemplateOverridden() {
- return [
- '#theme' => 'theme_test_function_template_override',
- ];
- }
-
/**
* Adds stylesheets to test theme .info.yml property processing.
*
@@ -112,20 +100,6 @@ public function specificSuggestionAlter() {
return ['#theme' => 'theme_test_specific_suggestions__variant'];
}
- /**
- * Menu callback for testing suggestion alter hooks with theme functions.
- */
- public function functionSuggestionAlter() {
- return ['#theme' => 'theme_test_function_suggestions'];
- }
-
- /**
- * Menu callback for testing includes with suggestion alter hooks.
- */
- public function suggestionAlterInclude() {
- return ['#theme' => 'theme_test_suggestions_include'];
- }
-
/**
* Controller to ensure that no theme is initialized.
*
diff --git a/web/core/modules/system/tests/modules/theme_test/templates/theme-test-foo.html.twig b/web/core/modules/system/tests/modules/theme_test/templates/theme-test-foo.html.twig
new file mode 100644
index 0000000000..cd5a265003
--- /dev/null
+++ b/web/core/modules/system/tests/modules/theme_test/templates/theme-test-foo.html.twig
@@ -0,0 +1,2 @@
+{# Output for Theme API test #}
+{{ foo -}}
diff --git a/web/core/modules/system/tests/modules/theme_test/templates/theme-test-render-element-children.html.twig b/web/core/modules/system/tests/modules/theme_test/templates/theme-test-render-element-children.html.twig
new file mode 100644
index 0000000000..6a9d0fdf25
--- /dev/null
+++ b/web/core/modules/system/tests/modules/theme_test/templates/theme-test-render-element-children.html.twig
@@ -0,0 +1,2 @@
+{# Output for Theme API test #}
+{{ element -}}
diff --git a/web/core/modules/system/tests/modules/theme_test/theme_test.inc b/web/core/modules/system/tests/modules/theme_test/theme_test.inc
index 1e0a7a654a..050d3e98a0 100644
--- a/web/core/modules/system/tests/modules/theme_test/theme_test.inc
+++ b/web/core/modules/system/tests/modules/theme_test/theme_test.inc
@@ -5,13 +5,6 @@
* Include file for test module.
*/
-/**
- * Returns HTML for the 'theme_test' theme hook used by tests.
- */
-function theme_theme_test($variables) {
- return 'Theme hook implementor=theme_theme_test(). Foo=' . $variables['foo'];
-}
-
/**
* Preprocesses variables for theme_theme_test().
*/
diff --git a/web/core/modules/system/tests/modules/theme_test/theme_test.module b/web/core/modules/system/tests/modules/theme_test/theme_test.module
index 113676cbe9..3763c3a18a 100644
--- a/web/core/modules/system/tests/modules/theme_test/theme_test.module
+++ b/web/core/modules/system/tests/modules/theme_test/theme_test.module
@@ -14,7 +14,6 @@ function theme_test_theme($existing, $type, $theme, $path) {
$items['theme_test'] = [
'file' => 'theme_test.inc',
'variables' => ['foo' => ''],
- 'function' => 'theme_theme_test',
];
$items['theme_test_template_test'] = [
'template' => 'theme_test.template_test',
@@ -34,31 +33,14 @@ function theme_test_theme($existing, $type, $theme, $path) {
$items['theme_test_general_suggestions'] = [
'variables' => [],
];
- $items['theme_test_function_suggestions'] = [
- 'variables' => [],
- 'function' => 'theme_theme_test_function_suggestions',
- ];
- $items['theme_test_suggestions_include'] = [
- 'variables' => [],
- 'function' => 'theme_theme_test_suggestions_include',
- ];
$items['theme_test_foo'] = [
'variables' => ['foo' => NULL],
- 'function' => 'theme_theme_test_foo',
];
$items['theme_test_render_element'] = [
'render element' => 'elements',
];
$items['theme_test_render_element_children'] = [
'render element' => 'element',
- 'function' => 'theme_theme_test_render_element_children',
- ];
- $items['theme_test_function_template_override'] = [
- 'variables' => [],
- 'function' => 'theme_theme_test_function_template_override',
- ];
- $info['test_theme_not_existing_function'] = [
- 'function' => 'test_theme_not_existing_function',
];
$items['theme_test_preprocess_suggestions'] = [
'variables' => [
@@ -95,26 +77,6 @@ function theme_test_page_bottom(array &$page_bottom) {
$page_bottom['theme_test_page_bottom'] = ['#markup' => 'theme test page bottom markup'];
}
-/**
- * Implements template_preprocess_HOOK() for theme_test_function_suggestions theme functions.
- */
-function template_preprocess_theme_test_function_suggestions(&$variables) {
-}
-
-/**
- * Theme function for hook theme_test_foo.
- */
-function theme_theme_test_foo($variables) {
- return $variables['foo'];
-}
-
-/**
- * Theme function for hook theme_test_function_template_override.
- */
-function theme_theme_test_function_template_override($variables) {
- return 'theme_test_function_template_override test failed.';
-}
-
/**
* Implements hook_theme_suggestions_HOOK().
*/
@@ -149,29 +111,6 @@ function template_preprocess_theme_test_render_element(&$variables) {
$variables['attributes']['data-variables-are-preprocessed'] = TRUE;
}
-/**
- * Theme function for testing rendering of child elements via drupal_render().
- *
- * Theme hooks defining a 'render element' add an internal '#render_children'
- * property. When this property is found, drupal_render() avoids calling
- * the 'theme.manager' service 'render' method on the top-level element to
- * prevent infinite recursion.
- *
- * @param array $variables
- * An associative array containing:
- * - element: An associative array containing the properties of the element.
- */
-function theme_theme_test_render_element_children($variables) {
- return \Drupal::service('renderer')->render($variables['element']);
-}
-
-/**
- * Returns HTML for a theme function suggestion test.
- */
-function theme_theme_test_function_suggestions($variables) {
- return 'Original theme function.';
-}
-
/**
* Implements hook_theme_suggestions_HOOK().
*/
@@ -193,13 +132,6 @@ function theme_test_theme_suggestions_theme_test_suggestions_alter(array &$sugge
\Drupal::messenger()->addStatus(__FUNCTION__ . '() executed.');
}
-/**
- * Returns HTML for a theme function include test.
- */
-function theme_theme_test_suggestions_include($variables) {
- return 'Original function before altering theme suggestions.';
-}
-
/**
* Implements hook_system_info_alter().
*
diff --git a/web/core/modules/system/tests/modules/theme_test/theme_test.routing.yml b/web/core/modules/system/tests/modules/theme_test/theme_test.routing.yml
index 6f880918f2..1c12fef199 100644
--- a/web/core/modules/system/tests/modules/theme_test/theme_test.routing.yml
+++ b/web/core/modules/system/tests/modules/theme_test/theme_test.routing.yml
@@ -1,12 +1,3 @@
-theme_test.function_template_override:
- path: '/theme-test/function-template-overridden'
- options:
- _custom_theme: 'test_theme'
- defaults:
- _controller: '\Drupal\theme_test\ThemeTestController::functionTemplateOverridden'
- requirements:
- _access: 'TRUE'
-
theme_test.info_stylesheets:
path: '/theme-test/info/stylesheets'
defaults:
@@ -83,20 +74,6 @@ specific_suggestion_alter:
requirements:
_access: 'TRUE'
-function_suggestion_alter:
- path: '/theme-test/function-suggestion-alter'
- defaults:
- _controller: '\Drupal\theme_test\ThemeTestController::functionSuggestionAlter'
- requirements:
- _access: 'TRUE'
-
-suggestion_alter_include:
- path: '/theme-test/suggestion-alter-include'
- defaults:
- _controller: '\Drupal\theme_test\ThemeTestController::suggestionAlterInclude'
- requirements:
- _access: 'TRUE'
-
theme_test.non_html:
path: '/theme-test/non-html'
defaults:
diff --git a/web/core/modules/system/tests/modules/twig_theme_test/templates/twig_theme_test.filter.html.twig b/web/core/modules/system/tests/modules/twig_theme_test/templates/twig_theme_test.filter.html.twig
index ea0b7afd7b..3b31238921 100644
--- a/web/core/modules/system/tests/modules/twig_theme_test/templates/twig_theme_test.filter.html.twig
+++ b/web/core/modules/system/tests/modules/twig_theme_test/templates/twig_theme_test.filter.html.twig
@@ -19,6 +19,11 @@
<div><span {{ attributes.checked }}{{ attributes|without('checked') }}>Without boolean attribute.</span></div>
<div><span data-id="{{ attributes.id }}"{{ attributes|without('id') }}>Without string attribute.</span></div>
<div><span{{ attributes|without('id', 'class') }}>Without id and class attributes.</span></div>
+{% set without_args = ['id', 'class'] %}
+<div><span{{ attributes|without(without_args) }}>Without id and class attributes via an array.</span></div>
+<div><span{{ attributes|without(without_args, 'checked') }}>Without any attributes via mixed array and string.</span></div>
+<div><span{{ attributes|without('checked', without_args) }}>Without any attributes via mixed string then array.</span></div>
+<div><span{{ attributes|without(without_args, ['id', 'checked']) }}>Without any attributes with duplicate "id" key.</span></div>
<div><span{{ attributes }}>All attributes again.</span></div>
<div id="{{ 'quotes Here!'|clean_id }}"><span class="{{ 'Gray like a bunny!'|clean_class }} {{ 'BEM__ized--Top Feature'|clean_class }}" id="{{ 'quotes Here!'|clean_id }}">ID and class. Having the same ID twice is not valid markup but we want to make sure the filter doesn't use \Drupal\Component\Utility\Html::getUniqueId().</span></div>
<div><strong>Rendered author string length:</strong> {{ quote.author|render|length }}.</div>
diff --git a/web/core/modules/system/tests/modules/update_script_test/update_script_test.install b/web/core/modules/system/tests/modules/update_script_test/update_script_test.install
index ce3874320d..b49e7cf978 100644
--- a/web/core/modules/system/tests/modules/update_script_test/update_script_test.install
+++ b/web/core/modules/system/tests/modules/update_script_test/update_script_test.install
@@ -23,6 +23,7 @@ function update_script_test_requirements($phase) {
'severity' => REQUIREMENT_WARNING,
];
break;
+
case REQUIREMENT_ERROR:
$requirements['update_script_test'] = [
'title' => 'Update script test',
diff --git a/web/core/modules/system/tests/modules/update_test_last_removed/update_test_last_removed.info.yml b/web/core/modules/system/tests/modules/update_test_last_removed/update_test_last_removed.info.yml
new file mode 100644
index 0000000000..934ded52bc
--- /dev/null
+++ b/web/core/modules/system/tests/modules/update_test_last_removed/update_test_last_removed.info.yml
@@ -0,0 +1,5 @@
+name: 'Update test with hook_update_last_removed() implementation'
+type: module
+description: 'Support module for update testing.'
+package: Testing
+version: VERSION
diff --git a/web/core/modules/system/tests/modules/update_test_last_removed/update_test_last_removed.install b/web/core/modules/system/tests/modules/update_test_last_removed/update_test_last_removed.install
new file mode 100644
index 0000000000..758ef4f505
--- /dev/null
+++ b/web/core/modules/system/tests/modules/update_test_last_removed/update_test_last_removed.install
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * @file
+ * Update functions for the update_test_last_removed module.
+ */
+
+/**
+ * Implements hook_update_last_removed().
+ */
+function update_test_last_removed_update_last_removed() {
+ return 8002;
+}
+
+/**
+ * Dummy update function to run during the tests.
+ */
+function update_test_last_removed_update_8003() {
+ return 'The update_test_last_removed_update_8003() update was executed successfully.';
+}
diff --git a/web/core/modules/system/tests/src/Functional/Batch/ProcessingTest.php b/web/core/modules/system/tests/src/Functional/Batch/ProcessingTest.php
index 6d73c1a8be..37fd7eb1d9 100644
--- a/web/core/modules/system/tests/src/Functional/Batch/ProcessingTest.php
+++ b/web/core/modules/system/tests/src/Functional/Batch/ProcessingTest.php
@@ -101,7 +101,7 @@ public function testBatchForm() {
$expected_stack = array_merge($this->_resultStack('batch_4'), $this->_resultStack('batch_7'));
$this->assertEquals($expected_stack, batch_test_stack(), 'Execution order was correct.');
$batch = \Drupal::state()->get('batch_test_nested_order_multiple_batches');
- $this->assertEquals(5, count($batch['sets']));
+ $this->assertCount(5, $batch['sets']);
// Ensure correct queue mapping.
foreach ($batch['sets'] as $index => $batch_set) {
$this->assertEquals('drupal_batch:' . $batch['id'] . ':' . $index, $batch_set['queue']['name']);
@@ -143,7 +143,7 @@ public function testBatchFormMultistep() {
$this->drupalGet('batch-test/multistep', ['query' => ['big_tree' => 'small_axe']]);
$this->drupalPostForm(NULL, [], 'Submit');
$this->assertText('step 2', 'Form is displayed in step 2.');
- $this->assertContains('batch-test/multistep?big_tree=small_axe', $this->getUrl(), 'Query argument was persisted and another extra argument was added.');
+ $this->assertStringContainsString('batch-test/multistep?big_tree=small_axe', $this->getUrl(), 'Query argument was persisted and another extra argument was added.');
}
/**
diff --git a/web/core/modules/system/tests/src/Functional/Cache/AssertPageCacheContextsAndTagsTrait.php b/web/core/modules/system/tests/src/Functional/Cache/AssertPageCacheContextsAndTagsTrait.php
index e03a90f679..1cc2cad52c 100644
--- a/web/core/modules/system/tests/src/Functional/Cache/AssertPageCacheContextsAndTagsTrait.php
+++ b/web/core/modules/system/tests/src/Functional/Cache/AssertPageCacheContextsAndTagsTrait.php
@@ -48,7 +48,7 @@ protected function getCacheHeaderValues($header_name) {
*/
protected function assertCacheContext($expected_cache_context) {
$cache_contexts = explode(' ', $this->drupalGetHeader('X-Drupal-Cache-Contexts'));
- $this->assertTrue(in_array($expected_cache_context, $cache_contexts), "'" . $expected_cache_context . "' is present in the X-Drupal-Cache-Contexts header.");
+ $this->assertContains($expected_cache_context, $cache_contexts, "'" . $expected_cache_context . "' is present in the X-Drupal-Cache-Contexts header.");
}
/**
@@ -59,7 +59,7 @@ protected function assertCacheContext($expected_cache_context) {
*/
protected function assertNoCacheContext($not_expected_cache_context) {
$cache_contexts = explode(' ', $this->drupalGetHeader('X-Drupal-Cache-Contexts'));
- $this->assertFalse(in_array($not_expected_cache_context, $cache_contexts), "'" . $not_expected_cache_context . "' is not present in the X-Drupal-Cache-Contexts header.");
+ $this->assertNotContains($not_expected_cache_context, $cache_contexts, "'" . $not_expected_cache_context . "' is not present in the X-Drupal-Cache-Contexts header.");
}
/**
@@ -157,7 +157,7 @@ protected function assertCacheContexts(array $expected_contexts, $message = NULL
*/
protected function assertCacheMaxAge($max_age) {
$cache_control_header = $this->drupalGetHeader('Cache-Control');
- $this->assertContains('max-age:' . $max_age, $cache_control_header);
+ $this->assertStringContainsString('max-age:' . $max_age, $cache_control_header);
}
}
diff --git a/web/core/modules/system/tests/src/Functional/Cache/PageCacheTagsTestBase.php b/web/core/modules/system/tests/src/Functional/Cache/PageCacheTagsTestBase.php
index 92ef5531b1..5398e218de 100644
--- a/web/core/modules/system/tests/src/Functional/Cache/PageCacheTagsTestBase.php
+++ b/web/core/modules/system/tests/src/Functional/Cache/PageCacheTagsTestBase.php
@@ -37,7 +37,6 @@ protected function setUp() {
* The page for this URL will be loaded.
* @param string $hit_or_miss
* 'HIT' if a page cache hit is expected, 'MISS' otherwise.
- *
* @param array|false $tags
* When expecting a page cache hit, you may optionally specify an array of
* expected cache tags. While FALSE, the cache tags will not be verified.
@@ -59,4 +58,18 @@ protected function verifyPageCache(Url $url, $hit_or_miss, $tags = FALSE) {
}
}
+ /**
+ * Verify that when loading a given page, it's a page cache hit or miss.
+ *
+ * @param \Drupal\Core\Url $url
+ * The page for this URL will be loaded.
+ * @param string $hit_or_miss
+ * 'HIT' if a page cache hit is expected, 'MISS' otherwise.
+ */
+ protected function verifyDynamicPageCache(Url $url, $hit_or_miss) {
+ $this->drupalGet($url);
+ $message = new FormattableMarkup('Dynamic page cache @hit_or_miss for %path.', ['@hit_or_miss' => $hit_or_miss, '%path' => $url->toString()]);
+ $this->assertSame($hit_or_miss, $this->getSession()->getResponseHeader('X-Drupal-Dynamic-Cache'), $message);
+ }
+
}
diff --git a/web/core/modules/system/tests/src/Functional/Common/EarlyRenderingControllerTest.php b/web/core/modules/system/tests/src/Functional/Common/EarlyRenderingControllerTest.php
index 9595abbfaf..f8e4dd861d 100644
--- a/web/core/modules/system/tests/src/Functional/Common/EarlyRenderingControllerTest.php
+++ b/web/core/modules/system/tests/src/Functional/Common/EarlyRenderingControllerTest.php
@@ -33,11 +33,11 @@ class EarlyRenderingControllerTest extends BrowserTestBase {
public function testEarlyRendering() {
// Render array: non-early & early.
$this->drupalGet(Url::fromRoute('early_rendering_controller_test.render_array'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertRaw('Hello world!');
$this->assertCacheTag('foo');
$this->drupalGet(Url::fromRoute('early_rendering_controller_test.render_array.early'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertRaw('Hello world!');
$this->assertCacheTag('foo');
@@ -45,66 +45,66 @@ public function testEarlyRendering() {
// @todo Add cache tags assertion when AjaxResponse is made cacheable in
// https://www.drupal.org/node/956186.
$this->drupalGet(Url::fromRoute('early_rendering_controller_test.ajax_response'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertRaw('Hello world!');
$this->drupalGet(Url::fromRoute('early_rendering_controller_test.ajax_response.early'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertRaw('Hello world!');
// Basic Response object: non-early & early.
$this->drupalGet(Url::fromRoute('early_rendering_controller_test.response'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertRaw('Hello world!');
$this->assertSession()->responseHeaderNotContains('X-Drupal-Cache-Tags', 'foo');
$this->drupalGet(Url::fromRoute('early_rendering_controller_test.response.early'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertRaw('Hello world!');
$this->assertSession()->responseHeaderNotContains('X-Drupal-Cache-Tags', 'foo');
// Response object with attachments: non-early & early.
$this->drupalGet(Url::fromRoute('early_rendering_controller_test.response-with-attachments'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertRaw('Hello world!');
$this->assertSession()->responseHeaderNotContains('X-Drupal-Cache-Tags', 'foo');
$this->drupalGet(Url::fromRoute('early_rendering_controller_test.response-with-attachments.early'));
- $this->assertResponse(500);
+ $this->assertSession()->statusCodeEquals(500);
$this->assertRaw('The controller result claims to be providing relevant cache metadata, but leaked metadata was detected. Please ensure you are not rendering content too early. Returned object class: Drupal\early_rendering_controller_test\AttachmentsTestResponse.');
// Cacheable Response object: non-early & early.
$this->drupalGet(Url::fromRoute('early_rendering_controller_test.cacheable-response'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertRaw('Hello world!');
$this->assertSession()->responseHeaderNotContains('X-Drupal-Cache-Tags', 'foo');
$this->drupalGet(Url::fromRoute('early_rendering_controller_test.cacheable-response.early'));
- $this->assertResponse(500);
+ $this->assertSession()->statusCodeEquals(500);
$this->assertRaw('The controller result claims to be providing relevant cache metadata, but leaked metadata was detected. Please ensure you are not rendering content too early. Returned object class: Drupal\early_rendering_controller_test\CacheableTestResponse.');
// Basic domain object: non-early & early.
$this->drupalGet(Url::fromRoute('early_rendering_controller_test.domain-object'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertRaw('TestDomainObject');
$this->assertSession()->responseHeaderNotContains('X-Drupal-Cache-Tags', 'foo');
$this->drupalGet(Url::fromRoute('early_rendering_controller_test.domain-object.early'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertRaw('TestDomainObject');
$this->assertSession()->responseHeaderNotContains('X-Drupal-Cache-Tags', 'foo');
// Basic domain object with attachments: non-early & early.
$this->drupalGet(Url::fromRoute('early_rendering_controller_test.domain-object-with-attachments'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertRaw('AttachmentsTestDomainObject');
$this->assertSession()->responseHeaderNotContains('X-Drupal-Cache-Tags', 'foo');
$this->drupalGet(Url::fromRoute('early_rendering_controller_test.domain-object-with-attachments.early'));
- $this->assertResponse(500);
+ $this->assertSession()->statusCodeEquals(500);
$this->assertRaw('The controller result claims to be providing relevant cache metadata, but leaked metadata was detected. Please ensure you are not rendering content too early. Returned object class: Drupal\early_rendering_controller_test\AttachmentsTestDomainObject.');
// Cacheable Response object: non-early & early.
$this->drupalGet(Url::fromRoute('early_rendering_controller_test.cacheable-domain-object'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertRaw('CacheableTestDomainObject');
$this->assertSession()->responseHeaderNotContains('X-Drupal-Cache-Tags', 'foo');
$this->drupalGet(Url::fromRoute('early_rendering_controller_test.cacheable-domain-object.early'));
- $this->assertResponse(500);
+ $this->assertSession()->statusCodeEquals(500);
$this->assertRaw('The controller result claims to be providing relevant cache metadata, but leaked metadata was detected. Please ensure you are not rendering content too early. Returned object class: Drupal\early_rendering_controller_test\CacheableTestDomainObject.');
// The exceptions are expected. Do not interpret them as a test failure.
diff --git a/web/core/modules/system/tests/src/Functional/Common/RenderWebTest.php b/web/core/modules/system/tests/src/Functional/Common/RenderWebTest.php
index 5e64bfa92c..72a0955bff 100644
--- a/web/core/modules/system/tests/src/Functional/Common/RenderWebTest.php
+++ b/web/core/modules/system/tests/src/Functional/Common/RenderWebTest.php
@@ -33,7 +33,7 @@ class RenderWebTest extends BrowserTestBase {
*/
public function testWrapperFormatCacheContext() {
$this->drupalGet('common-test/type-link-active-class');
- $this->assertIdentical(0, strpos($this->getSession()->getPage()->getContent(), "<!DOCTYPE html>\n<html"));
+ $this->assertStringStartsWith("<!DOCTYPE html>\n<html", $this->getSession()->getPage()->getContent());
$this->assertIdentical('text/html; charset=UTF-8', $this->drupalGetHeader('Content-Type'));
$this->assertTitle('Test active link class | Drupal');
$this->assertCacheContext('url.query_args:' . MainContentViewSubscriber::WRAPPER_FORMAT);
diff --git a/web/core/modules/system/tests/src/Functional/Common/UrlTest.php b/web/core/modules/system/tests/src/Functional/Common/UrlTest.php
index 7d3eadad42..cc9e4fbe3c 100644
--- a/web/core/modules/system/tests/src/Functional/Common/UrlTest.php
+++ b/web/core/modules/system/tests/src/Functional/Common/UrlTest.php
@@ -39,11 +39,13 @@ public function testLinkXSS() {
$encoded_path = "3CSCRIPT%3Ealert%28%27XSS%27%29%3C/SCRIPT%3E";
$link = Link::fromTextAndUrl($text, Url::fromUserInput('/' . $path))->toString();
- $this->assertTrue(strpos($link, $encoded_path) !== FALSE && strpos($link, $path) === FALSE, new FormattableMarkup('XSS attack @path was filtered by \Drupal\Core\Utility\LinkGeneratorInterface::generate().', ['@path' => $path]));
+ $this->assertStringContainsString($encoded_path, $link, new FormattableMarkup('XSS attack @path was filtered by \Drupal\Core\Utility\LinkGeneratorInterface::generate().', ['@path' => $path]));
+ $this->assertStringNotContainsString($path, $link, new FormattableMarkup('XSS attack @path was filtered by \Drupal\Core\Utility\LinkGeneratorInterface::generate().', ['@path' => $path]));
// Test \Drupal\Core\Url.
$link = Url::fromUri('base:' . $path)->toString();
- $this->assertTrue(strpos($link, $encoded_path) !== FALSE && strpos($link, $path) === FALSE, new FormattableMarkup('XSS attack @path was filtered by #theme', ['@path' => $path]));
+ $this->assertStringContainsString($encoded_path, $link, new FormattableMarkup('XSS attack @path was filtered by #theme', ['@path' => $path]));
+ $this->assertStringNotContainsString($path, $link, new FormattableMarkup('XSS attack @path was filtered by #theme', ['@path' => $path]));
}
/**
diff --git a/web/core/modules/system/tests/src/Functional/CsrfRequestHeaderTest.php b/web/core/modules/system/tests/src/Functional/CsrfRequestHeaderTest.php
index 9707141734..154845ad53 100644
--- a/web/core/modules/system/tests/src/Functional/CsrfRequestHeaderTest.php
+++ b/web/core/modules/system/tests/src/Functional/CsrfRequestHeaderTest.php
@@ -29,6 +29,9 @@ class CsrfRequestHeaderTest extends BrowserTestBase {
*
* This checks one route that uses _csrf_request_header_token and one that
* uses the deprecated _access_rest_csrf.
+ *
+ * @group legacy
+ * @expectedDeprecation Route requirement _access_rest_csrf is deprecated in drupal:8.2.0 and is removed in drupal:10.0.0. Use _csrf_request_header_token instead. See https://www.drupal.org/node/2772399
*/
public function testRouteAccess() {
$client = $this->getHttpClient();
diff --git a/web/core/modules/system/tests/src/Functional/Database/SelectPagerDefaultTest.php b/web/core/modules/system/tests/src/Functional/Database/SelectPagerDefaultTest.php
index a38a5f0180..2ba40a043a 100644
--- a/web/core/modules/system/tests/src/Functional/Database/SelectPagerDefaultTest.php
+++ b/web/core/modules/system/tests/src/Functional/Database/SelectPagerDefaultTest.php
@@ -102,6 +102,7 @@ public function testInnerPagerQuery() {
$outer_query = $connection->select($query);
$outer_query->addField('subquery', 'age');
+ $outer_query->orderBy('age');
$ages = $outer_query
->execute()
diff --git a/web/core/modules/system/tests/src/Functional/Database/SelectTableSortDefaultTest.php b/web/core/modules/system/tests/src/Functional/Database/SelectTableSortDefaultTest.php
index 7e2e2e9a67..eaf344cb75 100644
--- a/web/core/modules/system/tests/src/Functional/Database/SelectTableSortDefaultTest.php
+++ b/web/core/modules/system/tests/src/Functional/Database/SelectTableSortDefaultTest.php
@@ -90,7 +90,7 @@ public function testTableSortDefaultSort() {
// Verify that the header links are built properly.
$assert->linkByHrefExists('database_test/tablesort_default_sort');
- $assert->responseMatches('/\<a.*title\=\"' . t('sort by Username') . '\".*\>/');
+ $assert->responseMatches('/\<a.*title\=\"sort by Username\".*\>/');
}
}
diff --git a/web/core/modules/system/tests/src/Functional/Entity/EntityAddUITest.php b/web/core/modules/system/tests/src/Functional/Entity/EntityAddUITest.php
index 3e8d187dbe..747cfb639e 100644
--- a/web/core/modules/system/tests/src/Functional/Entity/EntityAddUITest.php
+++ b/web/core/modules/system/tests/src/Functional/Entity/EntityAddUITest.php
@@ -36,7 +36,7 @@ public function testAddPageWithBundleEntities() {
// Users without create access for bundles do not have access to the add
// page if there are no bundles.
$this->drupalGet('/entity_test_with_bundle/add');
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
$bundle_admin_user = $this->drupalCreateUser([
'administer entity_test_with_bundle content',
@@ -97,12 +97,12 @@ public function testAddPageWithBundleEntities() {
$this->assertLink('Test2 label');
$this->assertNoLink('Test3 label');
$this->clickLink(t('Test label'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Without any permissions, access must be denied.
$this->drupalLogout();
$this->drupalGet('/entity_test_with_bundle/add');
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
// Create a new user that has bundle create permissions.
$user = $this->drupalCreateUser([
diff --git a/web/core/modules/system/tests/src/Functional/Entity/EntityCacheTagsTestBase.php b/web/core/modules/system/tests/src/Functional/Entity/EntityCacheTagsTestBase.php
index a5555aa157..5ec1384a94 100644
--- a/web/core/modules/system/tests/src/Functional/Entity/EntityCacheTagsTestBase.php
+++ b/web/core/modules/system/tests/src/Functional/Entity/EntityCacheTagsTestBase.php
@@ -382,7 +382,6 @@ public function testReferencedEntity() {
$nonempty_entity_listing_cache_tags = Cache::mergeTags($nonempty_entity_listing_cache_tags, $this->getAdditionalCacheTagsForEntityListing($this->entity));
$nonempty_entity_listing_cache_tags = Cache::mergeTags($nonempty_entity_listing_cache_tags, $page_cache_tags);
- $this->pass("Test referencing entity.", 'Debug');
$this->verifyPageCache($referencing_entity_url, 'MISS');
// Verify a cache hit, but also the presence of the correct cache tags.
@@ -405,7 +404,6 @@ public function testReferencedEntity() {
}
$this->verifyRenderCache($cid, $referencing_entity_cache_tags, $redirected_cid);
- $this->pass("Test non-referencing entity.", 'Debug');
$this->verifyPageCache($non_referencing_entity_url, 'MISS');
// Verify a cache hit, but also the presence of the correct cache tags.
$this->verifyPageCache($non_referencing_entity_url, 'HIT', Cache::mergeTags($non_referencing_entity_cache_tags, $page_cache_tags));
@@ -414,7 +412,6 @@ public function testReferencedEntity() {
$cid = $this->createCacheId($cache_keys, $entity_cache_contexts);
$this->verifyRenderCache($cid, $non_referencing_entity_cache_tags);
- $this->pass("Test listing of referencing entities.", 'Debug');
// Prime the page cache for the listing of referencing entities.
$this->verifyPageCache($listing_url, 'MISS');
@@ -423,7 +420,6 @@ public function testReferencedEntity() {
$expected_tags = Cache::mergeTags($expected_tags, $page_cache_tags_referencing_entity);
$this->verifyPageCache($listing_url, 'HIT', $expected_tags);
- $this->pass("Test empty listing.", 'Debug');
// Prime the page cache for the empty listing.
$this->verifyPageCache($empty_entity_listing_url, 'MISS');
// Verify a cache hit, but also the presence of the correct cache tags.
@@ -432,7 +428,6 @@ public function testReferencedEntity() {
$contexts_in_header = $this->drupalGetHeader('X-Drupal-Cache-Contexts');
$this->assertEqual(Cache::mergeContexts($page_cache_contexts, $this->getAdditionalCacheContextsForEntityListing()), empty($contexts_in_header) ? [] : explode(' ', $contexts_in_header));
- $this->pass("Test listing containing referenced entity.", 'Debug');
// Prime the page cache for the listing containing the referenced entity.
$this->verifyPageCache($nonempty_entity_listing_url, 'MISS', $nonempty_entity_listing_cache_tags);
// Verify a cache hit, but also the presence of the correct cache tags.
@@ -443,7 +438,6 @@ public function testReferencedEntity() {
// Verify that after modifying the referenced entity, there is a cache miss
// for every route except the one for the non-referencing entity.
- $this->pass("Test modification of referenced entity.", 'Debug');
$this->entity->save();
$this->verifyPageCache($referencing_entity_url, 'MISS');
$this->verifyPageCache($listing_url, 'MISS');
@@ -460,7 +454,6 @@ public function testReferencedEntity() {
// Verify that after modifying the referencing entity, there is a cache miss
// for every route except the ones for the non-referencing entity and the
// empty entity listing.
- $this->pass("Test modification of referencing entity.", 'Debug');
$this->referencingEntity->save();
$this->verifyPageCache($referencing_entity_url, 'MISS');
$this->verifyPageCache($listing_url, 'MISS');
@@ -475,7 +468,6 @@ public function testReferencedEntity() {
// Verify that after modifying the non-referencing entity, there is a cache
// miss only for the non-referencing entity route.
- $this->pass("Test modification of non-referencing entity.", 'Debug');
$this->nonReferencingEntity->save();
$this->verifyPageCache($referencing_entity_url, 'HIT');
$this->verifyPageCache($listing_url, 'HIT');
@@ -491,7 +483,6 @@ public function testReferencedEntity() {
// for both the referencing entity, and the listing of referencing
// entities, but not for any other routes.
$referenced_entity_view_mode = $this->selectViewMode($this->entity->getEntityTypeId());
- $this->pass("Test modification of referenced entity's '$referenced_entity_view_mode' display.", 'Debug');
/** @var \Drupal\Core\Entity\EntityDisplayRepositoryInterface $display_repository */
$display_repository = \Drupal::service('entity_display.repository');
$entity_display = $display_repository->getViewDisplay($entity_type, $this->entity->bundle(), $referenced_entity_view_mode);
@@ -511,7 +502,6 @@ public function testReferencedEntity() {
// Verify that after modifying the corresponding bundle entity, there is a
// cache miss for both the referencing entity, and the listing of
// referencing entities, but not for any other routes.
- $this->pass("Test modification of referenced entity's bundle entity.", 'Debug');
$bundle_entity = $this->container->get('entity_type.manager')
->getStorage($bundle_entity_type_id)
->load($this->entity->bundle());
@@ -543,7 +533,6 @@ public function testReferencedEntity() {
if ($this->entity->getEntityType()->get('field_ui_base_route')) {
// Verify that after modifying a configurable field on the entity, there
// is a cache miss.
- $this->pass("Test modification of referenced entity's configurable field.", 'Debug');
$field_storage_name = $this->entity->getEntityTypeId() . '.configurable_field';
$field_storage = FieldStorageConfig::load($field_storage_name);
$field_storage->save();
@@ -559,7 +548,6 @@ public function testReferencedEntity() {
// Verify that after modifying a configurable field on the entity, there
// is a cache miss.
- $this->pass("Test modification of referenced entity's configurable field.", 'Debug');
$field_name = $this->entity->getEntityTypeId() . '.' . $this->entity->bundle() . '.configurable_field';
$field = FieldConfig::load($field_name);
$field->save();
@@ -577,7 +565,6 @@ public function testReferencedEntity() {
// Verify that after invalidating the entity's cache tag directly, there is
// a cache miss for every route except the ones for the non-referencing
// entity and the empty entity listing.
- $this->pass("Test invalidation of referenced entity's cache tag.", 'Debug');
Cache::invalidateTags($this->entity->getCacheTagsToInvalidate());
$this->verifyPageCache($referencing_entity_url, 'MISS');
$this->verifyPageCache($listing_url, 'MISS');
@@ -593,7 +580,6 @@ public function testReferencedEntity() {
// Verify that after invalidating the entity's list cache tag directly,
// there is a cache miss for both the empty entity listing and the non-empty
// entity listing routes, but not for other routes.
- $this->pass("Test invalidation of referenced entity's list cache tag.", 'Debug');
Cache::invalidateTags($this->entity->getEntityType()->getListCacheTags());
$this->verifyPageCache($empty_entity_listing_url, 'MISS');
$this->verifyPageCache($nonempty_entity_listing_url, 'MISS');
@@ -609,7 +595,6 @@ public function testReferencedEntity() {
// Verify that after invalidating the generic entity type's view cache tag
// directly, there is a cache miss for both the referencing entity, and the
// listing of referencing entities, but not for other routes.
- $this->pass("Test invalidation of referenced entity's 'view' cache tag.", 'Debug');
Cache::invalidateTags($view_cache_tag);
$this->verifyPageCache($referencing_entity_url, 'MISS');
$this->verifyPageCache($listing_url, 'MISS');
@@ -624,7 +609,6 @@ public function testReferencedEntity() {
// Verify that after deleting the entity, there is a cache miss for every
// route except for the non-referencing entity one.
- $this->pass('Test deletion of referenced entity.', 'Debug');
$this->entity->delete();
$this->verifyPageCache($referencing_entity_url, 'MISS');
$this->verifyPageCache($listing_url, 'MISS');
@@ -678,7 +662,7 @@ protected function createCacheId(array $keys, array $contexts) {
protected function verifyRenderCache($cid, array $tags, $redirected_cid = NULL) {
// Also verify the existence of an entity render cache entry.
$cache_entry = \Drupal::cache('render')->get($cid);
- $this->assertInstanceOf(\stdClass::class, $cache_entry, 'A render cache entry exists.');
+ $this->assertInstanceOf(\stdClass::class, $cache_entry);
sort($cache_entry->tags);
sort($tags);
$this->assertIdentical($cache_entry->tags, $tags);
diff --git a/web/core/modules/system/tests/src/Functional/Entity/EntityFormTest.php b/web/core/modules/system/tests/src/Functional/Entity/EntityFormTest.php
index eebe040584..02b8929a05 100644
--- a/web/core/modules/system/tests/src/Functional/Entity/EntityFormTest.php
+++ b/web/core/modules/system/tests/src/Functional/Entity/EntityFormTest.php
@@ -62,7 +62,7 @@ public function testMultilingualFormCRUD() {
public function testEntityFormDisplayAlter() {
$this->drupalGet('entity_test/add');
$altered_field = $this->xpath('//input[@name="field_test_text[0][value]" and @size="42"]');
- $this->assertTrue(count($altered_field) === 1, 'The altered field has the correct size value.');
+ $this->assertCount(1, $altered_field, 'The altered field has the correct size value.');
}
/**
diff --git a/web/core/modules/system/tests/src/Functional/Entity/EntityReferenceSelection/EntityReferenceSelectionAccessTest.php b/web/core/modules/system/tests/src/Functional/Entity/EntityReferenceSelection/EntityReferenceSelectionAccessTest.php
index 07468af5c5..7232456faa 100644
--- a/web/core/modules/system/tests/src/Functional/Entity/EntityReferenceSelection/EntityReferenceSelectionAccessTest.php
+++ b/web/core/modules/system/tests/src/Functional/Entity/EntityReferenceSelection/EntityReferenceSelectionAccessTest.php
@@ -36,7 +36,18 @@ class EntityReferenceSelectionAccessTest extends KernelTestBase {
*
* @var array
*/
- public static $modules = ['comment', 'field', 'file', 'image', 'node', 'media', 'system', 'taxonomy', 'text', 'user'];
+ public static $modules = [
+ 'comment',
+ 'field',
+ 'file',
+ 'image',
+ 'node',
+ 'media',
+ 'system',
+ 'taxonomy',
+ 'text',
+ 'user',
+ ];
/**
* {@inheritdoc}
diff --git a/web/core/modules/system/tests/src/Functional/Entity/EntityTranslationFormTest.php b/web/core/modules/system/tests/src/Functional/Entity/EntityTranslationFormTest.php
index 5cf93e7270..7e206f7a57 100644
--- a/web/core/modules/system/tests/src/Functional/Entity/EntityTranslationFormTest.php
+++ b/web/core/modules/system/tests/src/Functional/Entity/EntityTranslationFormTest.php
@@ -100,7 +100,7 @@ public function testEntityFormLanguage() {
// Check to make sure the node was created.
$node = $this->drupalGetNodeByTitle($edit['title[0][value]']);
- $this->assertInstanceOf(Node::class, $node, 'Node found in database.');
+ $this->assertInstanceOf(Node::class, $node);
// Make body translatable.
$field_storage = FieldStorageConfig::loadByName('node', 'body');
diff --git a/web/core/modules/system/tests/src/Functional/Entity/EntityViewControllerTest.php b/web/core/modules/system/tests/src/Functional/Entity/EntityViewControllerTest.php
index b5c1db7c3f..d3d03947a3 100644
--- a/web/core/modules/system/tests/src/Functional/Entity/EntityViewControllerTest.php
+++ b/web/core/modules/system/tests/src/Functional/Entity/EntityViewControllerTest.php
@@ -82,7 +82,7 @@ public function testEntityViewController() {
// As entity_test IDs must be integers, make sure requests for non-integer
// IDs return a page not found error.
$this->drupalGet('entity_test/invalid');
- $this->assertResponse(404);
+ $this->assertSession()->statusCodeEquals(404);
}
/**
diff --git a/web/core/modules/system/tests/src/Functional/Entity/EntityWithUriCacheTagsTestBase.php b/web/core/modules/system/tests/src/Functional/Entity/EntityWithUriCacheTagsTestBase.php
index e62d343ced..83c3bf3faa 100644
--- a/web/core/modules/system/tests/src/Functional/Entity/EntityWithUriCacheTagsTestBase.php
+++ b/web/core/modules/system/tests/src/Functional/Entity/EntityWithUriCacheTagsTestBase.php
@@ -34,7 +34,6 @@ public function testEntityUri() {
$view_cache_tag = \Drupal::entityTypeManager()->getViewBuilder($entity_type)->getCacheTags();
$render_cache_tag = 'rendered';
- $this->pass("Test entity.", 'Debug');
$this->verifyPageCache($entity_url, 'MISS');
// Verify a cache hit, but also the presence of the correct cache tags.
@@ -57,7 +56,6 @@ public function testEntityUri() {
}
// Verify that after modifying the entity, there is a cache miss.
- $this->pass("Test modification of entity.", 'Debug');
$this->entity->save();
$this->verifyPageCache($entity_url, 'MISS');
@@ -65,7 +63,6 @@ public function testEntityUri() {
$this->verifyPageCache($entity_url, 'HIT');
// Verify that after modifying the entity's display, there is a cache miss.
- $this->pass("Test modification of entity's '$view_mode' display.", 'Debug');
$entity_display = \Drupal::service('entity_display.repository')->getViewDisplay($entity_type, $this->entity->bundle(), $view_mode);
$entity_display->save();
$this->verifyPageCache($entity_url, 'MISS');
@@ -76,7 +73,6 @@ public function testEntityUri() {
if ($bundle_entity_type_id = $this->entity->getEntityType()->getBundleEntityType()) {
// Verify that after modifying the corresponding bundle entity, there is a
// cache miss.
- $this->pass("Test modification of entity's bundle entity.", 'Debug');
$bundle_entity = $this->container->get('entity_type.manager')
->getStorage($bundle_entity_type_id)
->load($this->entity->bundle());
@@ -90,7 +86,6 @@ public function testEntityUri() {
if ($this->entity->getEntityType()->get('field_ui_base_route')) {
// Verify that after modifying a configurable field on the entity, there
// is a cache miss.
- $this->pass("Test modification of entity's configurable field.", 'Debug');
$field_storage_name = $this->entity->getEntityTypeId() . '.configurable_field';
$field_storage = FieldStorageConfig::load($field_storage_name);
$field_storage->save();
@@ -101,7 +96,6 @@ public function testEntityUri() {
// Verify that after modifying a configurable field on the entity, there
// is a cache miss.
- $this->pass("Test modification of entity's configurable field.", 'Debug');
$field_name = $this->entity->getEntityTypeId() . '.' . $this->entity->bundle() . '.configurable_field';
$field = FieldConfig::load($field_name);
$field->save();
@@ -113,7 +107,6 @@ public function testEntityUri() {
// Verify that after invalidating the entity's cache tag directly, there is
// a cache miss.
- $this->pass("Test invalidation of entity's cache tag.", 'Debug');
Cache::invalidateTags($this->entity->getCacheTagsToInvalidate());
$this->verifyPageCache($entity_url, 'MISS');
@@ -122,7 +115,6 @@ public function testEntityUri() {
// Verify that after invalidating the generic entity type's view cache tag
// directly, there is a cache miss.
- $this->pass("Test invalidation of entity's 'view' cache tag.", 'Debug');
Cache::invalidateTags($view_cache_tag);
$this->verifyPageCache($entity_url, 'MISS');
@@ -130,10 +122,9 @@ public function testEntityUri() {
$this->verifyPageCache($entity_url, 'HIT');
// Verify that after deleting the entity, there is a cache miss.
- $this->pass('Test deletion of entity.', 'Debug');
$this->entity->delete();
$this->verifyPageCache($entity_url, 'MISS');
- $this->assertResponse(404);
+ $this->assertSession()->statusCodeEquals(404);
}
/**
diff --git a/web/core/modules/system/tests/src/Functional/Entity/Update/SqlContentEntityStorageSchemaConverterTestBase.php b/web/core/modules/system/tests/src/Functional/Entity/Update/SqlContentEntityStorageSchemaConverterTestBase.php
index a6b413bb17..9a8297e96f 100644
--- a/web/core/modules/system/tests/src/Functional/Entity/Update/SqlContentEntityStorageSchemaConverterTestBase.php
+++ b/web/core/modules/system/tests/src/Functional/Entity/Update/SqlContentEntityStorageSchemaConverterTestBase.php
@@ -86,7 +86,7 @@ public function testMakeRevisionable() {
/** @var \Drupal\Core\Entity\Sql\SqlEntityStorageInterface $storage */
$storage = \Drupal::entityTypeManager()->getStorage('entity_test_update');
- $this->assertEqual(count($storage->loadMultiple()), 102, 'All test entities were found.');
+ $this->assertCount(102, $storage->loadMultiple(), 'All test entities were found.');
// Check that each field value was copied correctly to the revision tables.
for ($i = 1; $i <= 102; $i++) {
diff --git a/web/core/modules/system/tests/src/Functional/Entity/Update/UpdateApiEntityDefinitionUpdateTest.php b/web/core/modules/system/tests/src/Functional/Entity/Update/UpdateApiEntityDefinitionUpdateTest.php
index 7efc11b74b..40577e73f3 100644
--- a/web/core/modules/system/tests/src/Functional/Entity/Update/UpdateApiEntityDefinitionUpdateTest.php
+++ b/web/core/modules/system/tests/src/Functional/Entity/Update/UpdateApiEntityDefinitionUpdateTest.php
@@ -48,7 +48,7 @@ public function testSingleUpdates() {
// Check that only a single value is stored for 'user_id'.
$entity = $this->reloadEntity($entity);
- $this->assertEqual(count($entity->user_id), 1);
+ $this->assertCount(1, $entity->user_id);
$this->assertEqual($entity->user_id->target_id, $user_ids[0]);
// Make 'user_id' multiple by applying updates.
@@ -60,14 +60,14 @@ public function testSingleUpdates() {
// Check that data was correctly migrated.
$entity = $this->reloadEntity($entity);
- $this->assertEqual(count($entity->user_id), 1);
+ $this->assertCount(1, $entity->user_id);
$this->assertEqual($entity->user_id->target_id, $user_ids[0]);
// Store multiple data and check it is correctly stored.
$entity->user_id = $user_ids;
$entity->save();
$entity = $this->reloadEntity($entity);
- $this->assertEqual(count($entity->user_id), 2);
+ $this->assertCount(2, $entity->user_id);
$this->assertEqual($entity->user_id[0]->target_id, $user_ids[0]);
$this->assertEqual($entity->user_id[1]->target_id, $user_ids[1]);
@@ -77,14 +77,14 @@ public function testSingleUpdates() {
// Check that data was correctly migrated/dropped.
$entity = $this->reloadEntity($entity);
- $this->assertEqual(count($entity->user_id), 1);
+ $this->assertCount(1, $entity->user_id);
$this->assertEqual($entity->user_id->target_id, $user_ids[0]);
// Check that only a single value is stored for 'user_id' again.
$entity->user_id = $user_ids;
$entity->save();
$entity = $this->reloadEntity($entity);
- $this->assertEqual(count($entity->user_id), 1);
+ $this->assertCount(1, $entity->user_id);
$this->assertEqual($entity->user_id[0]->target_id, $user_ids[0]);
}
@@ -99,7 +99,7 @@ public function testMultipleUpdates() {
// Check that only a single value is stored for 'user_id'.
$entity = $this->reloadEntity($entity);
- $this->assertEqual(count($entity->user_id), 1);
+ $this->assertCount(1, $entity->user_id);
$this->assertEqual($entity->user_id->target_id, $user_ids[0]);
// Make 'user_id' multiple and then single again by applying updates.
@@ -108,14 +108,14 @@ public function testMultipleUpdates() {
// Check that data was correctly migrated back and forth.
$entity = $this->reloadEntity($entity);
- $this->assertEqual(count($entity->user_id), 1);
+ $this->assertCount(1, $entity->user_id);
$this->assertEqual($entity->user_id->target_id, $user_ids[0]);
// Check that only a single value is stored for 'user_id' again.
$entity->user_id = $user_ids;
$entity->save();
$entity = $this->reloadEntity($entity);
- $this->assertEqual(count($entity->user_id), 1);
+ $this->assertCount(1, $entity->user_id);
$this->assertEqual($entity->user_id[0]->target_id, $user_ids[0]);
}
diff --git a/web/core/modules/system/tests/src/Functional/Form/AlterTest.php b/web/core/modules/system/tests/src/Functional/Form/AlterTest.php
index d1f9667acb..b55956168c 100644
--- a/web/core/modules/system/tests/src/Functional/Form/AlterTest.php
+++ b/web/core/modules/system/tests/src/Functional/Form/AlterTest.php
@@ -38,7 +38,7 @@ public function testExecutionOrder() {
'system_form_form_test_alter_form_alter() executed.',
];
$content = preg_replace('/\s+/', ' ', Xss::filter($this->getSession()->getPage()->getContent(), []));
- $this->assert(strpos($content, implode(' ', $expected)) !== FALSE, 'Form alter hooks executed in the expected order.');
+ $this->assertStringContainsString(implode(' ', $expected), $content, 'Form alter hooks executed in the expected order.');
}
}
diff --git a/web/core/modules/system/tests/src/Functional/Form/CheckboxTest.php b/web/core/modules/system/tests/src/Functional/Form/CheckboxTest.php
index 66f7eab1d1..52e0b836b4 100644
--- a/web/core/modules/system/tests/src/Functional/Form/CheckboxTest.php
+++ b/web/core/modules/system/tests/src/Functional/Form/CheckboxTest.php
@@ -80,7 +80,7 @@ public function testFormCheckbox() {
$this->drupalPostForm('form-test/checkboxes-zero/0', [], 'Save');
$checkboxes = $this->xpath('//input[@type="checkbox"]');
- $this->assertIdentical(count($checkboxes), 9, 'Correct number of checkboxes found.');
+ $this->assertCount(9, $checkboxes, 'Correct number of checkboxes found.');
foreach ($checkboxes as $checkbox) {
$checked = $checkbox->isChecked();
$name = $checkbox->getAttribute('name');
@@ -94,7 +94,7 @@ public function testFormCheckbox() {
$this->drupalPostForm(NULL, NULL, 'Save');
$checkboxes = $this->xpath('//input[@type="checkbox"]');
- $this->assertIdentical(count($checkboxes), 9, 'Correct number of checkboxes found.');
+ $this->assertCount(9, $checkboxes, 'Correct number of checkboxes found.');
foreach ($checkboxes as $checkbox) {
$checked = $checkbox->isChecked();
$name = (string) $checkbox->getAttribute('name');
diff --git a/web/core/modules/system/tests/src/Functional/Form/ConfirmFormTest.php b/web/core/modules/system/tests/src/Functional/Form/ConfirmFormTest.php
index 421ef4196e..bee917a8b5 100644
--- a/web/core/modules/system/tests/src/Functional/Form/ConfirmFormTest.php
+++ b/web/core/modules/system/tests/src/Functional/Form/ConfirmFormTest.php
@@ -29,7 +29,7 @@ public function testConfirmForm() {
// Test the building of the form.
$this->drupalGet('form-test/confirm-form');
$site_name = $this->config('system.site')->get('name');
- $this->assertTitle(t('ConfirmFormTestForm::getQuestion(). | @site-name', ['@site-name' => $site_name]), 'The question was found as the page title.');
+ $this->assertTitle("ConfirmFormTestForm::getQuestion(). | $site_name");
$this->assertText(t('ConfirmFormTestForm::getDescription().'), 'The description was used.');
$this->assertFieldByXPath('//input[@id="edit-submit"]', t('ConfirmFormTestForm::getConfirmText().'), 'The confirm text was used.');
diff --git a/web/core/modules/system/tests/src/Functional/Form/ElementTest.php b/web/core/modules/system/tests/src/Functional/Form/ElementTest.php
index 4d256f3c03..60f85e2b11 100644
--- a/web/core/modules/system/tests/src/Functional/Form/ElementTest.php
+++ b/web/core/modules/system/tests/src/Functional/Form/ElementTest.php
@@ -144,8 +144,8 @@ public function testWrapperIds() {
foreach (['checkboxes', 'radios'] as $type) {
$element_ids = $this->xpath('//div[@id=:id]', [':id' => 'edit-' . $type]);
$wrapper_ids = $this->xpath('//fieldset[@id=:id]', [':id' => 'edit-' . $type . '--wrapper']);
- $this->assertTrue(count($element_ids) == 1, new FormattableMarkup('A single element id found for type %type', ['%type' => $type]));
- $this->assertTrue(count($wrapper_ids) == 1, new FormattableMarkup('A single wrapper id found for type %type', ['%type' => $type]));
+ $this->assertCount(1, $element_ids, new FormattableMarkup('A single element id found for type %type', ['%type' => $type]));
+ $this->assertCount(1, $wrapper_ids, new FormattableMarkup('A single wrapper id found for type %type', ['%type' => $type]));
}
}
@@ -158,9 +158,9 @@ public function testButtonClasses() {
// "button--foo" would contain "button". Instead, check
// " button ". Make sure it matches in the beginning and the end too
// by adding a space before and after.
- $this->assertEqual(2, count($this->xpath('//*[contains(concat(" ", @class, " "), " button ")]')));
- $this->assertEqual(1, count($this->xpath('//*[contains(concat(" ", @class, " "), " button--foo ")]')));
- $this->assertEqual(1, count($this->xpath('//*[contains(concat(" ", @class, " "), " button--danger ")]')));
+ $this->assertCount(2, $this->xpath('//*[contains(concat(" ", @class, " "), " button ")]'));
+ $this->assertCount(1, $this->xpath('//*[contains(concat(" ", @class, " "), " button--foo ")]'));
+ $this->assertCount(1, $this->xpath('//*[contains(concat(" ", @class, " "), " button--danger ")]'));
}
/**
@@ -169,18 +169,18 @@ public function testButtonClasses() {
public function testGroupElements() {
$this->drupalGet('form-test/group-details');
$elements = $this->xpath('//div[@class="details-wrapper"]//div[@class="details-wrapper"]//label');
- $this->assertTrue(count($elements) == 1);
+ $this->assertCount(1, $elements);
$this->drupalGet('form-test/group-container');
$elements = $this->xpath('//div[@id="edit-container"]//div[@class="details-wrapper"]//label');
- $this->assertTrue(count($elements) == 1);
+ $this->assertCount(1, $elements);
$this->drupalGet('form-test/group-fieldset');
$elements = $this->xpath('//fieldset[@id="edit-fieldset"]//div[@id="edit-meta"]//label');
- $this->assertTrue(count($elements) == 1);
+ $this->assertCount(1, $elements);
$this->drupalGet('form-test/group-vertical-tabs');
$elements = $this->xpath('//div[@data-vertical-tabs-panes]//details[@id="edit-meta"]//label');
- $this->assertTrue(count($elements) == 1);
+ $this->assertCount(1, $elements);
$elements = $this->xpath('//div[@data-vertical-tabs-panes]//details[@id="edit-meta-2"]//label');
- $this->assertTrue(count($elements) == 1);
+ $this->assertCount(1, $elements);
}
/**
@@ -204,9 +204,9 @@ public function testFormAutocomplete() {
$this->drupalGet('form-test/autocomplete');
$result = $this->xpath('//input[@id="edit-autocomplete-1" and contains(@data-autocomplete-path, "form-test/autocomplete-1")]');
- $this->assertEqual(count($result), 0, 'Ensure that the user does not have access to the autocompletion');
+ $this->assertCount(0, $result, 'Ensure that the user does not have access to the autocompletion');
$result = $this->xpath('//input[@id="edit-autocomplete-2" and contains(@data-autocomplete-path, "form-test/autocomplete-2/value")]');
- $this->assertEqual(count($result), 0, 'Ensure that the user does not have access to the autocompletion');
+ $this->assertCount(0, $result, 'Ensure that the user does not have access to the autocompletion');
$user = $this->drupalCreateUser(['access autocomplete test']);
$this->drupalLogin($user);
@@ -216,9 +216,9 @@ public function testFormAutocomplete() {
$this->assertRaw('core/misc/autocomplete.js');
$result = $this->xpath('//input[@id="edit-autocomplete-1" and contains(@data-autocomplete-path, "form-test/autocomplete-1")]');
- $this->assertEqual(count($result), 1, 'Ensure that the user does have access to the autocompletion');
+ $this->assertCount(1, $result, 'Ensure that the user does have access to the autocompletion');
$result = $this->xpath('//input[@id="edit-autocomplete-2" and contains(@data-autocomplete-path, "form-test/autocomplete-2/value")]');
- $this->assertEqual(count($result), 1, 'Ensure that the user does have access to the autocompletion');
+ $this->assertCount(1, $result, 'Ensure that the user does have access to the autocompletion');
}
/**
diff --git a/web/core/modules/system/tests/src/Functional/Form/ElementsTableSelectTest.php b/web/core/modules/system/tests/src/Functional/Form/ElementsTableSelectTest.php
index 7ea6be2fc4..1dd34bb502 100644
--- a/web/core/modules/system/tests/src/Functional/Form/ElementsTableSelectTest.php
+++ b/web/core/modules/system/tests/src/Functional/Form/ElementsTableSelectTest.php
@@ -70,17 +70,17 @@ public function testTableSelectColSpan() {
// There should be three labeled column headers and 1 for the input.
$table_head = $this->xpath('//thead/tr/th');
- $this->assertEquals(count($table_head), 4, 'There are four column headers');
+ $this->assertCount(4, $table_head, 'There are four column headers');
// The first two body rows should each have 5 table cells: One for the
// radio, one cell in the first column, one cell in the second column,
// and two cells in the third column which has colspan 2.
for ($i = 0; $i <= 1; $i++) {
- $this->assertEquals(count($this->xpath('//tbody/tr[' . ($i + 1) . ']/td')), 5, 'There are five cells in row ' . $i);
+ $this->assertCount(5, $this->xpath('//tbody/tr[' . ($i + 1) . ']/td'), 'There are five cells in row ' . $i);
}
// The third row should have 3 cells, one for the radio, one spanning the
// first and second column, and a third in column 3 (which has colspan 3).
- $this->assertEquals(count($this->xpath('//tbody/tr[3]/td')), 3, 'There are three cells in row 3.');
+ $this->assertCount(3, $this->xpath('//tbody/tr[3]/td'), 'There are three cells in row 3.');
}
/**
diff --git a/web/core/modules/system/tests/src/Functional/Form/FormStoragePageCacheTest.php b/web/core/modules/system/tests/src/Functional/Form/FormStoragePageCacheTest.php
index 9f63ead122..9d48929191 100644
--- a/web/core/modules/system/tests/src/Functional/Form/FormStoragePageCacheTest.php
+++ b/web/core/modules/system/tests/src/Functional/Form/FormStoragePageCacheTest.php
@@ -37,7 +37,7 @@ protected function setUp() {
*/
protected function getFormBuildId() {
$build_id_fields = $this->xpath('//input[@name="form_build_id"]');
- $this->assertEqual(count($build_id_fields), 1, 'One form build id field on the page');
+ $this->assertCount(1, $build_id_fields, 'One form build id field on the page');
return (string) $build_id_fields[0]->getAttribute('value');
}
diff --git a/web/core/modules/system/tests/src/Functional/Form/ModulesListFormWebTest.php b/web/core/modules/system/tests/src/Functional/Form/ModulesListFormWebTest.php
index a210cd37a9..70af48083b 100644
--- a/web/core/modules/system/tests/src/Functional/Form/ModulesListFormWebTest.php
+++ b/web/core/modules/system/tests/src/Functional/Form/ModulesListFormWebTest.php
@@ -27,19 +27,14 @@ class ModulesListFormWebTest extends BrowserTestBase {
protected function setUp() {
parent::setUp();
\Drupal::state()->set('system_test.module_hidden', FALSE);
+ $this->drupalLogin($this->drupalCreateUser(['administer modules', 'administer permissions']));
}
/**
* Tests the module list form.
*/
public function testModuleListForm() {
- $this->drupalLogin(
- $this->drupalCreateUser(
- ['administer modules', 'administer permissions']
- )
- );
$this->drupalGet('admin/modules');
- $this->assertResponse('200');
// Check that system_test's configure link was rendered correctly.
$this->assertFieldByXPath("//a[contains(@href, '/system-test/configure/bar') and text()='Configure ']/span[contains(@class, 'visually-hidden') and text()='the System test module']");
@@ -65,13 +60,7 @@ public function testModulesListFormWithInvalidInfoFile() {
mkdir($path, 0777, TRUE);
file_put_contents("$path/broken.info.yml", $broken_info_yml);
- $this->drupalLogin(
- $this->drupalCreateUser(
- ['administer modules', 'administer permissions']
- )
- );
$this->drupalGet('admin/modules');
- $this->assertSession()->statusCodeEquals(200);
// Confirm that the error message is shown.
$this->assertSession()
@@ -81,4 +70,18 @@ public function testModulesListFormWithInvalidInfoFile() {
$this->assertSession()->elementExists('xpath', '//input[@name="text"]');
}
+ /**
+ * Confirm that module 'Required By' descriptions include dependent themes.
+ */
+ public function testRequiredByThemeMessage() {
+ $this->drupalGet('admin/modules');
+ $module_theme_depends_on_description = $this->getSession()->getPage()->findAll('css', '#edit-modules-test-module-required-by-theme-enable-description .admin-requirements li:contains("Test Theme Depending on Modules (theme) (disabled)")');
+ // Confirm that 'Test Theme Depending on Modules' is listed as being
+ // required by the module 'Test Module Required by Theme'.
+ $this->assertCount(1, $module_theme_depends_on_description);
+
+ // Confirm that the required by message does not appear anywhere else.
+ $this->assertSession()->pageTextContains('Test Theme Depending on Modules (Theme) (Disabled)');
+ }
+
}
diff --git a/web/core/modules/system/tests/src/Functional/Form/RedirectTest.php b/web/core/modules/system/tests/src/Functional/Form/RedirectTest.php
index e66cc38308..df7fc2f81d 100644
--- a/web/core/modules/system/tests/src/Functional/Form/RedirectTest.php
+++ b/web/core/modules/system/tests/src/Functional/Form/RedirectTest.php
@@ -94,17 +94,17 @@ public function testRedirectFromErrorPages() {
// at the right URL.
$expected = Url::fromRoute('form_test.route1', [], ['query' => ['test1' => 'test2'], 'absolute' => TRUE])->toString();
$this->drupalGet('foo');
- $this->assertResponse(404);
+ $this->assertSession()->statusCodeEquals(404);
$this->drupalPostForm(NULL, [], t('Submit'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertUrl($expected, [], 'Redirected to correct URL/query.');
// Visit the block admin page (403 page) and submit the form. Verify it
// ends up at the right URL.
$this->drupalGet('admin/structure/block');
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
$this->drupalPostForm(NULL, [], t('Submit'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertUrl($expected, [], 'Redirected to correct URL/query.');
}
diff --git a/web/core/modules/system/tests/src/Functional/Form/ResponseTest.php b/web/core/modules/system/tests/src/Functional/Form/ResponseTest.php
index 4707a47e50..a3fe0ec8bc 100644
--- a/web/core/modules/system/tests/src/Functional/Form/ResponseTest.php
+++ b/web/core/modules/system/tests/src/Functional/Form/ResponseTest.php
@@ -34,7 +34,7 @@ public function testFormResponse() {
];
$this->drupalPostForm('form-test/response', $edit, 'Submit');
$content = Json::decode($this->getSession()->getPage()->getContent());
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertIdentical($edit['content'], $content, 'Response content matches');
$this->assertIdentical('invoked', $this->drupalGetHeader('X-Form-Test-Response-Event'), 'Response handled by kernel response subscriber');
$this->assertIdentical('invoked', $this->drupalGetHeader('X-Form-Test-Stack-Middleware'), 'Response handled by kernel middleware');
@@ -45,7 +45,7 @@ public function testFormResponse() {
];
$this->drupalPostForm('form-test/response', $edit, 'Submit');
$content = Json::decode($this->getSession()->getPage()->getContent());
- $this->assertResponse(418);
+ $this->assertSession()->statusCodeEquals(418);
$this->assertIdentical($edit['content'], $content, 'Response content matches');
$this->assertIdentical('invoked', $this->drupalGetHeader('X-Form-Test-Response-Event'), 'Response handled by kernel response subscriber');
$this->assertIdentical('invoked', $this->drupalGetHeader('X-Form-Test-Stack-Middleware'), 'Response handled by kernel middleware');
diff --git a/web/core/modules/system/tests/src/Functional/Form/StateValuesCleanAdvancedTest.php b/web/core/modules/system/tests/src/Functional/Form/StateValuesCleanAdvancedTest.php
index 56dab576c1..cd1f6f86bf 100644
--- a/web/core/modules/system/tests/src/Functional/Form/StateValuesCleanAdvancedTest.php
+++ b/web/core/modules/system/tests/src/Functional/Form/StateValuesCleanAdvancedTest.php
@@ -47,7 +47,7 @@ public function testFormStateValuesCleanAdvanced() {
$this->image = current($image_files);
// Check if the physical file is there.
- $this->assertTrue(is_file($this->image->uri), "The image file we're going to upload exists.");
+ $this->assertFileExists($this->image->uri);
// "Browse" for the desired file.
$edit = ['files[image]' => \Drupal::service('file_system')->realpath($this->image->uri)];
@@ -56,7 +56,7 @@ public function testFormStateValuesCleanAdvanced() {
$this->drupalPostForm('form_test/form-state-values-clean-advanced', $edit, t('Submit'));
// Expecting a 200 HTTP code.
- $this->assertResponse(200, 'Received a 200 response for posted test file.');
+ $this->assertSession()->statusCodeEquals(200);
$this->assertRaw(t('You WIN!'), 'Found the success message.');
}
diff --git a/web/core/modules/system/tests/src/Functional/Form/StorageTest.php b/web/core/modules/system/tests/src/Functional/Form/StorageTest.php
index 32c915e047..8707c5e02e 100644
--- a/web/core/modules/system/tests/src/Functional/Form/StorageTest.php
+++ b/web/core/modules/system/tests/src/Functional/Form/StorageTest.php
@@ -147,7 +147,7 @@ public function testImmutableForm() {
// Request the form with 'cache' query parameter to enable form caching.
$this->drupalGet('form_test/form-storage', ['query' => ['cache' => 1, 'immutable' => 1]]);
$buildIdFields = $this->xpath('//input[@name="form_build_id"]');
- $this->assertEquals(count($buildIdFields), 1, 'One form build id field on the page');
+ $this->assertCount(1, $buildIdFields, 'One form build id field on the page');
$buildId = $buildIdFields[0]->getValue();
// Trigger validation error by submitting an empty title.
@@ -159,7 +159,7 @@ public function testImmutableForm() {
// Retrieve the new build-id.
$buildIdFields = $this->xpath('//input[@name="form_build_id"]');
- $this->assertEquals(count($buildIdFields), 1, 'One form build id field on the page');
+ $this->assertCount(1, $buildIdFields, 'One form build id field on the page');
$buildId = (string) $buildIdFields[0]->getValue();
// Trigger validation error by again submitting an empty title.
@@ -176,7 +176,7 @@ public function testImmutableForm() {
public function testImmutableFormLegacyProtection() {
$this->drupalGet('form_test/form-storage', ['query' => ['cache' => 1, 'immutable' => 1]]);
$build_id_fields = $this->xpath('//input[@name="form_build_id"]');
- $this->assertEquals(count($build_id_fields), 1, 'One form build id field on the page');
+ $this->assertCount(1, $build_id_fields, 'One form build id field on the page');
$build_id = $build_id_fields[0]->getValue();
// Try to poison the form cache.
diff --git a/web/core/modules/system/tests/src/Functional/Menu/AssertBreadcrumbTrait.php b/web/core/modules/system/tests/src/Functional/Menu/AssertBreadcrumbTrait.php
index e38dfbcb18..f4988f7891 100644
--- a/web/core/modules/system/tests/src/Functional/Menu/AssertBreadcrumbTrait.php
+++ b/web/core/modules/system/tests/src/Functional/Menu/AssertBreadcrumbTrait.php
@@ -41,7 +41,7 @@ protected function assertBreadcrumb($goto, array $trail, $page_title = NULL, arr
// Additionally assert page title, if given.
if (isset($page_title)) {
- $this->assertTitle(strtr('@title | Drupal', ['@title' => $page_title]));
+ $this->assertTitle("$page_title | Drupal");
}
// Additionally assert active trail in a menu tree output, if given.
diff --git a/web/core/modules/system/tests/src/Functional/Menu/BreadcrumbFrontCacheContextsTest.php b/web/core/modules/system/tests/src/Functional/Menu/BreadcrumbFrontCacheContextsTest.php
index 2ede1c9673..82f098d88c 100644
--- a/web/core/modules/system/tests/src/Functional/Menu/BreadcrumbFrontCacheContextsTest.php
+++ b/web/core/modules/system/tests/src/Functional/Menu/BreadcrumbFrontCacheContextsTest.php
@@ -89,7 +89,7 @@ public function testBreadcrumbsFrontPageCache() {
$this->drupalGet($this->nodeWithAlias->path->alias);
$breadcrumbs = $this->assertSession()->elementExists('css', '.block-system-breadcrumb-block');
$crumbs = $breadcrumbs->findAll('css', 'ol li');
- $this->assertTrue(count($crumbs) === 1);
+ $this->assertCount(1, $crumbs);
$this->assertTrue($crumbs[0]->getText() === 'Home');
}
diff --git a/web/core/modules/system/tests/src/Functional/Menu/BreadcrumbTest.php b/web/core/modules/system/tests/src/Functional/Menu/BreadcrumbTest.php
index 5c87347792..b1b4fc137f 100644
--- a/web/core/modules/system/tests/src/Functional/Menu/BreadcrumbTest.php
+++ b/web/core/modules/system/tests/src/Functional/Menu/BreadcrumbTest.php
@@ -296,7 +296,7 @@ public function testBreadCrumbs() {
':menu' => 'block-bartik-tools',
':href' => Url::fromUri('base:' . $link_path)->toString(),
]);
- $this->assertTrue(count($elements) == 1, "Link to {$link_path} appears only once.");
+ $this->assertCount(1, $elements, "Link to {$link_path} appears only once.");
// Next iteration should expect this tag as parent link.
// Note: Term name, not link name, due to taxonomy_term_page().
diff --git a/web/core/modules/system/tests/src/Functional/Menu/LocalActionTest.php b/web/core/modules/system/tests/src/Functional/Menu/LocalActionTest.php
index 67875aa8d1..cf3e6fb02e 100644
--- a/web/core/modules/system/tests/src/Functional/Menu/LocalActionTest.php
+++ b/web/core/modules/system/tests/src/Functional/Menu/LocalActionTest.php
@@ -55,7 +55,7 @@ public function testLocalAction() {
]);
// Verify the expected cache tag in the response headers.
$header_values = explode(' ', $this->drupalGetHeader('x-drupal-cache-tags'));
- $this->assertTrue(in_array('config:menu_test.links.action', $header_values), "Found 'config:menu_test.links.action' cache tag in header");
+ $this->assertContains('config:menu_test.links.action', $header_values, "Found 'config:menu_test.links.action' cache tag in header");
/** @var \Drupal\Core\Config\Config $config */
$config = $this->container->get('config.factory')->getEditable('menu_test.links.action');
$config->set('title', 'New title');
@@ -82,7 +82,7 @@ protected function assertLocalAction(array $actions) {
list($url, $title) = $action;
// SimpleXML gives us the unescaped text, not the actual escaped markup,
// so use a pattern instead to check the raw content.
- // This behaviour is a bug in libxml, see
+ // This behavior is a bug in libxml, see
// https://bugs.php.net/bug.php?id=49437.
$this->assertPattern('@<a [^>]*class="[^"]*button-action[^"]*"[^>]*>' . preg_quote($title, '@') . '</@');
$this->assertEqual($elements[$index]->getAttribute('href'), $url->toString());
diff --git a/web/core/modules/system/tests/src/Functional/Menu/LocalTasksTest.php b/web/core/modules/system/tests/src/Functional/Menu/LocalTasksTest.php
index 0e767d9fbd..3ca2fe911f 100644
--- a/web/core/modules/system/tests/src/Functional/Menu/LocalTasksTest.php
+++ b/web/core/modules/system/tests/src/Functional/Menu/LocalTasksTest.php
@@ -82,7 +82,7 @@ protected function assertLocalTasks(array $routes, $level = 0) {
protected function assertLocalTaskAppers($title) {
// SimpleXML gives us the unescaped text, not the actual escaped markup,
// so use a pattern instead to check the raw content.
- // This behaviour is a bug in libxml, see
+ // This behavior is a bug in libxml, see
// https://bugs.php.net/bug.php?id=49437.
return $this->assertPattern('@<a [^>]*>' . preg_quote($title, '@') . '</a>@');
}
@@ -134,7 +134,7 @@ public function testPluginLocalTask() {
// Ensure the view tab is active.
$result = $this->xpath('//ul[contains(@class, "tabs")]//li[contains(@class, "active")]/a');
- $this->assertEqual(1, count($result), 'There is just a single active tab.');
+ $this->assertCount(1, $result, 'There is just a single active tab.');
$this->assertEqual('View(active tab)', $result[0]->getText(), 'The view tab is active.');
// Verify that local tasks in the second level appear.
@@ -149,14 +149,14 @@ public function testPluginLocalTask() {
$this->assertLocalTasks($sub_tasks, 1);
$result = $this->xpath('//ul[contains(@class, "tabs")]//li[contains(@class, "active")]/a');
- $this->assertEqual(1, count($result), 'There is just a single active tab.');
+ $this->assertCount(1, $result, 'There is just a single active tab.');
$this->assertEqual('Settings(active tab)', $result[0]->getText(), 'The settings tab is active.');
$this->drupalGet(Url::fromRoute('menu_test.local_task_test_tasks_settings_sub1'));
$this->assertLocalTasks($sub_tasks, 1);
$result = $this->xpath('//ul[contains(@class, "tabs")]//a[contains(@class, "active")]');
- $this->assertEqual(2, count($result), 'There are tabs active on both levels.');
+ $this->assertCount(2, $result, 'There are tabs active on both levels.');
$this->assertEqual('Settings(active tab)', $result[0]->getText(), 'The settings tab is active.');
$this->assertEqual('Dynamic title for TestTasksSettingsSub1(active tab)', $result[1]->getText(), 'The sub1 tab is active.');
@@ -167,7 +167,7 @@ public function testPluginLocalTask() {
$this->assertLocalTasks($sub_tasks, 1);
$result = $this->xpath('//ul[contains(@class, "tabs")]//li[contains(@class, "active")]');
- $this->assertEqual(2, count($result), 'There are tabs active on both levels.');
+ $this->assertCount(2, $result, 'There are tabs active on both levels.');
$this->assertEqual('Settings(active tab)', $result[0]->getText(), 'The settings tab is active.');
$this->assertEqual('Derive 1(active tab)', $result[1]->getText(), 'The derive1 tab is active.');
@@ -195,7 +195,7 @@ public function testPluginLocalTask() {
$this->assertLocalTasks($tasks, 0);
$result = $this->xpath('//ul[contains(@class, "tabs")]//li[contains(@class, "active")]');
- $this->assertEqual(1, count($result), 'There is one active tab.');
+ $this->assertCount(1, $result, 'There is one active tab.');
$this->assertEqual('upcasting sub1(active tab)', $result[0]->getText(), 'The "upcasting sub1" tab is active.');
$this->drupalGet(Url::fromRoute('menu_test.local_task_test_upcasting_sub2', ['entity_test' => '1']));
@@ -207,7 +207,7 @@ public function testPluginLocalTask() {
$this->assertLocalTasks($tasks, 0);
$result = $this->xpath('//ul[contains(@class, "tabs")]//li[contains(@class, "active")]');
- $this->assertEqual(1, count($result), 'There is one active tab.');
+ $this->assertCount(1, $result, 'There is one active tab.');
$this->assertEqual('upcasting sub2(active tab)', $result[0]->getText(), 'The "upcasting sub2" tab is active.');
}
diff --git a/web/core/modules/system/tests/src/Functional/Menu/MenuAccessTest.php b/web/core/modules/system/tests/src/Functional/Menu/MenuAccessTest.php
index 8c0b7ca498..36eb424239 100644
--- a/web/core/modules/system/tests/src/Functional/Menu/MenuAccessTest.php
+++ b/web/core/modules/system/tests/src/Functional/Menu/MenuAccessTest.php
@@ -45,22 +45,22 @@ public function testMenuBlockLinksAccessCheck() {
$this->assertLink('Test custom route access check');
// Page is still accessible but there should be no menu link.
$this->drupalGet('menu_test_access_check_session');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertNoLink('Test custom route access check');
// Test that page is no more accessible.
$this->drupalGet('menu_test_access_check_session');
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
// Check for access to a restricted local task from a default local task.
$this->drupalGet('foo/asdf');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertLinkByHref('foo/asdf');
$this->assertLinkByHref('foo/asdf/b');
$this->assertNoLinkByHref('foo/asdf/c');
// Attempt to access a restricted local task.
$this->drupalGet('foo/asdf/c');
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
$elements = $this->xpath('//ul[@class=:class]/li/a[@href=:href]', [
':class' => 'tabs primary',
':href' => Url::fromRoute('menu_test.router_test1', ['bar' => 'asdf'])->toString(),
diff --git a/web/core/modules/system/tests/src/Functional/Menu/MenuRouterTest.php b/web/core/modules/system/tests/src/Functional/Menu/MenuRouterTest.php
index f13707fff0..1da42f1371 100644
--- a/web/core/modules/system/tests/src/Functional/Menu/MenuRouterTest.php
+++ b/web/core/modules/system/tests/src/Functional/Menu/MenuRouterTest.php
@@ -165,11 +165,11 @@ protected function doTestMenuHierarchy() {
*/
protected function doTestMenuOptionalPlaceholders() {
$this->drupalGet('menu-test/optional');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertText('Sometimes there is no placeholder.');
$this->drupalGet('menu-test/optional/foobar');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertText("Sometimes there is a placeholder: 'foobar'.");
}
diff --git a/web/core/modules/system/tests/src/Functional/Module/ClassLoaderTest.php b/web/core/modules/system/tests/src/Functional/Module/ClassLoaderTest.php
index db82fe25f8..cb855e34a9 100644
--- a/web/core/modules/system/tests/src/Functional/Module/ClassLoaderTest.php
+++ b/web/core/modules/system/tests/src/Functional/Module/ClassLoaderTest.php
@@ -40,7 +40,7 @@ public function testClassLoading() {
// Check twice to test an unprimed and primed system_list() cache.
for ($i = 0; $i < 2; $i++) {
$this->drupalGet('module-test/class-loading');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertText($this->expected, 'Autoloader loads classes from an enabled module.');
}
}
@@ -57,7 +57,7 @@ public function testClassLoadingNotInstalledModules() {
// Check twice to test an unprimed and primed system_list() cache.
for ($i = 0; $i < 2; $i++) {
$this->drupalGet('module-test/class-loading');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertNoText($this->expected, 'Autoloader does not load classes from a disabled module.');
}
}
@@ -77,7 +77,7 @@ public function testClassLoadingDisabledModules() {
// Check twice to test an unprimed and primed system_list() cache.
for ($i = 0; $i < 2; $i++) {
$this->drupalGet('module-test/class-loading');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertNoText($this->expected, 'Autoloader does not load classes from a disabled module.');
}
}
diff --git a/web/core/modules/system/tests/src/Functional/Module/DependencyTest.php b/web/core/modules/system/tests/src/Functional/Module/DependencyTest.php
index 2c1530790c..b887273f57 100644
--- a/web/core/modules/system/tests/src/Functional/Module/DependencyTest.php
+++ b/web/core/modules/system/tests/src/Functional/Module/DependencyTest.php
@@ -65,7 +65,7 @@ public function testMissingModules() {
$this->drupalGet('admin/modules');
$this->assertRaw(t('@module (<span class="admin-missing">missing</span>)', ['@module' => Unicode::ucfirst('_missing_dependency')]), 'A module with missing dependencies is marked as such.');
$checkbox = $this->xpath('//input[@type="checkbox" and @disabled="disabled" and @name="modules[system_dependencies_test][enable]"]');
- $this->assert(count($checkbox) == 1, 'Checkbox for the module is disabled.');
+ $this->assertCount(1, $checkbox, 'Checkbox for the module is disabled.');
}
/**
@@ -80,7 +80,7 @@ public function testIncompatibleModuleVersionDependency() {
'@version' => '1.0',
]), 'A module that depends on an incompatible version of a module is marked as such.');
$checkbox = $this->xpath('//input[@type="checkbox" and @disabled="disabled" and @name="modules[system_incompatible_module_version_dependencies_test][enable]"]');
- $this->assert(count($checkbox) == 1, 'Checkbox for the module is disabled.');
+ $this->assertCount(1, $checkbox, 'Checkbox for the module is disabled.');
}
/**
@@ -94,7 +94,7 @@ public function testIncompatibleCoreVersionDependency() {
'@module' => 'System incompatible core version test',
]), 'A module that depends on a module with an incompatible core version is marked as such.');
$checkbox = $this->xpath('//input[@type="checkbox" and @disabled="disabled" and @name="modules[system_incompatible_core_version_dependencies_test][enable]"]');
- $this->assert(count($checkbox) == 1, 'Checkbox for the module is disabled.');
+ $this->assertCount(1, $checkbox, 'Checkbox for the module is disabled.');
}
/**
@@ -104,7 +104,7 @@ public function testIncompatiblePhpVersionDependency() {
$this->drupalGet('admin/modules');
$this->assertRaw('This module requires PHP version 6502.* and is incompatible with PHP version ' . phpversion() . '.', 'User is informed when the PHP dependency requirement of a module is not met.');
$checkbox = $this->xpath('//input[@type="checkbox" and @disabled="disabled" and @name="modules[system_incompatible_php_version_test][enable]"]');
- $this->assert(count($checkbox) == 1, 'Checkbox for the module is disabled.');
+ $this->assertCount(1, $checkbox, 'Checkbox for the module is disabled.');
}
/**
@@ -203,7 +203,7 @@ public function testUninstallDependents() {
// Check that the comment module cannot be uninstalled.
$this->drupalGet('admin/modules/uninstall');
$checkbox = $this->xpath('//input[@type="checkbox" and @name="uninstall[comment]" and @disabled="disabled"]');
- $this->assert(count($checkbox) == 1, 'Checkbox for uninstalling the comment module is disabled.');
+ $this->assertCount(1, $checkbox, 'Checkbox for uninstalling the comment module is disabled.');
// Delete any forum terms.
$vid = $this->config('forum.settings')->get('vocabulary');
diff --git a/web/core/modules/system/tests/src/Functional/Module/InstallTest.php b/web/core/modules/system/tests/src/Functional/Module/InstallTest.php
index 08acec5b4c..0d012f9d70 100644
--- a/web/core/modules/system/tests/src/Functional/Module/InstallTest.php
+++ b/web/core/modules/system/tests/src/Functional/Module/InstallTest.php
@@ -58,7 +58,7 @@ public function testRequiredModuleSchemaVersions() {
$post_update_key_value = \Drupal::keyValue('post_update');
$existing_updates = $post_update_key_value->get('existing_updates', []);
- $this->assertTrue(in_array('module_test_post_update_test', $existing_updates));
+ $this->assertContains('module_test_post_update_test', $existing_updates);
}
/**
@@ -69,7 +69,7 @@ public function testUninstallPostUpdateFunctions() {
$post_update_key_value = \Drupal::keyValue('post_update');
$existing_updates = $post_update_key_value->get('existing_updates', []);
- $this->assertFalse(in_array('module_test_post_update_test', $existing_updates));
+ $this->assertNotContains('module_test_post_update_test', $existing_updates);
}
/**
diff --git a/web/core/modules/system/tests/src/Functional/Module/InstallUninstallTest.php b/web/core/modules/system/tests/src/Functional/Module/InstallUninstallTest.php
index 1d07a7be85..5e69fcccf7 100644
--- a/web/core/modules/system/tests/src/Functional/Module/InstallUninstallTest.php
+++ b/web/core/modules/system/tests/src/Functional/Module/InstallUninstallTest.php
@@ -22,7 +22,12 @@ class InstallUninstallTest extends ModuleTestBase {
/**
* {@inheritdoc}
*/
- public static $modules = ['system_test', 'dblog', 'taxonomy', 'update_test_postupdate'];
+ public static $modules = [
+ 'system_test',
+ 'dblog',
+ 'taxonomy',
+ 'update_test_postupdate',
+ ];
/**
* Tests that a fixed set of modules can be installed and uninstalled.
@@ -351,7 +356,7 @@ protected function assertUninstallModuleUpdates($module) {
*/
protected function assertHelp($module, $name) {
$this->drupalGet('admin/help/' . $module);
- $this->assertResponse(200, "Help for $module displayed successfully");
+ $this->assertSession()->statusCodeEquals(200);
$this->assertText($name . ' module', "'$name module' is on the help page for $module");
$this->assertLink('online documentation for the ' . $name . ' module', 0, "Correct online documentation link is in the help page for $module");
}
diff --git a/web/core/modules/system/tests/src/Functional/Module/PrepareUninstallTest.php b/web/core/modules/system/tests/src/Functional/Module/PrepareUninstallTest.php
index fdabecdbec..450537957d 100644
--- a/web/core/modules/system/tests/src/Functional/Module/PrepareUninstallTest.php
+++ b/web/core/modules/system/tests/src/Functional/Module/PrepareUninstallTest.php
@@ -151,9 +151,9 @@ public function testUninstall() {
$this->assertText('The selected modules have been uninstalled.');
$this->assertNoText('Allows content to be submitted to the site and displayed on pages.');
- // Ensure the proper response when accessing a non-existent entity type.
+ // Ensure a 404 is returned when accessing a non-existent entity type.
$this->drupalGet('admin/modules/uninstall/entity/node');
- $this->assertResponse(404, 'Entity types that do not exist result in a 404.');
+ $this->assertSession()->statusCodeEquals(404);
// Test an entity type which does not have any existing entities.
$this->drupalGet('admin/modules/uninstall/entity/entity_test_no_label');
diff --git a/web/core/modules/system/tests/src/Functional/Module/UninstallTest.php b/web/core/modules/system/tests/src/Functional/Module/UninstallTest.php
index e65fe17044..fbec6c1e57 100644
--- a/web/core/modules/system/tests/src/Functional/Module/UninstallTest.php
+++ b/web/core/modules/system/tests/src/Functional/Module/UninstallTest.php
@@ -60,7 +60,7 @@ public function testUninstallPage() {
$node->save();
$this->drupalGet('admin/modules/uninstall');
- $this->assertTitle(t('Uninstall') . ' | Drupal');
+ $this->assertTitle('Uninstall | Drupal');
foreach (\Drupal::service('extension.list.module')->getAllInstalledInfo() as $module => $info) {
$field_name = "uninstall[$module]";
@@ -136,7 +136,7 @@ public function testUninstallPage() {
// Make sure confirmation page is accessible only during uninstall process.
$this->drupalGet('admin/modules/uninstall/confirm');
$this->assertUrl('admin/modules/uninstall');
- $this->assertTitle(t('Uninstall') . ' | Drupal');
+ $this->assertTitle('Uninstall | Drupal');
// Make sure the correct error is shown when no modules are selected.
$edit = [];
diff --git a/web/core/modules/system/tests/src/Functional/Page/DefaultMetatagsTest.php b/web/core/modules/system/tests/src/Functional/Page/DefaultMetatagsTest.php
index 2493a38306..9d4e354ccd 100644
--- a/web/core/modules/system/tests/src/Functional/Page/DefaultMetatagsTest.php
+++ b/web/core/modules/system/tests/src/Functional/Page/DefaultMetatagsTest.php
@@ -23,7 +23,7 @@ public function testMetaTag() {
$this->drupalGet('');
// Ensures that the charset metatag is on the page.
$result = $this->xpath('//meta[@charset="utf-8"]');
- $this->assertEqual(count($result), 1);
+ $this->assertCount(1, $result);
// Ensure that the charset one is the first metatag.
$result = $this->xpath('//meta');
@@ -31,7 +31,7 @@ public function testMetaTag() {
// Ensure that the shortcut icon is on the page.
$result = $this->xpath('//link[@rel = "shortcut icon"]');
- $this->assertEqual(count($result), 1, 'The shortcut icon is present.');
+ $this->assertCount(1, $result, 'The shortcut icon is present.');
}
}
diff --git a/web/core/modules/system/tests/src/Functional/Pager/PagerTest.php b/web/core/modules/system/tests/src/Functional/Pager/PagerTest.php
index 4a6c9d028b..ea154ba580 100644
--- a/web/core/modules/system/tests/src/Functional/Pager/PagerTest.php
+++ b/web/core/modules/system/tests/src/Functional/Pager/PagerTest.php
@@ -75,7 +75,7 @@ public function testActiveClass() {
// Verify the pager does not render on a list without pagination.
$this->drupalGet('admin/config/media/image-styles');
- $this->assertElementNotPresent('.pager');
+ $this->assertSession()->elementNotExists('css', '.pager');
}
/**
@@ -201,7 +201,7 @@ public function testPagerEllipsis() {
}
$this->drupalGet('admin/reports/dblog');
$elements = $this->cssSelect(".pager__item--ellipsis:contains('…')");
- $this->assertEqual(count($elements), 0, 'No ellipsis has been set.');
+ $this->assertCount(0, $elements, 'No ellipsis has been set.');
// Insert an extra 50 log messages to get 10 pages.
$logger = $this->container->get('logger.factory')->get('pager_test');
@@ -210,7 +210,7 @@ public function testPagerEllipsis() {
}
$this->drupalGet('admin/reports/dblog');
$elements = $this->cssSelect(".pager__item--ellipsis:contains('…')");
- $this->assertEqual(count($elements), 1, 'Found the ellipsis.');
+ $this->assertCount(1, $elements, 'Found the ellipsis.');
}
/**
diff --git a/web/core/modules/system/tests/src/Functional/Render/HtmlResponseAttachmentsTest.php b/web/core/modules/system/tests/src/Functional/Render/HtmlResponseAttachmentsTest.php
index 382a3442e7..23b5e0e03d 100644
--- a/web/core/modules/system/tests/src/Functional/Render/HtmlResponseAttachmentsTest.php
+++ b/web/core/modules/system/tests/src/Functional/Render/HtmlResponseAttachmentsTest.php
@@ -29,36 +29,36 @@ class HtmlResponseAttachmentsTest extends BrowserTestBase {
public function testAttachments() {
// Test ['#attached']['http_header] = ['Status', $code].
$this->drupalGet('/render_attached_test/teapot');
- $this->assertResponse(418);
- $this->assertHeader('X-Drupal-Cache', 'MISS');
+ $this->assertSession()->statusCodeEquals(418);
+ $this->assertSession()->responseHeaderEquals('X-Drupal-Cache', 'MISS');
// Repeat for the cache.
$this->drupalGet('/render_attached_test/teapot');
- $this->assertResponse(418);
- $this->assertHeader('X-Drupal-Cache', 'HIT');
+ $this->assertSession()->statusCodeEquals(418);
+ $this->assertSession()->responseHeaderEquals('X-Drupal-Cache', 'HIT');
// Test ['#attached']['http_header'] with various replacement rules.
$this->drupalGet('/render_attached_test/header');
$this->assertTeapotHeaders();
- $this->assertHeader('X-Drupal-Cache', 'MISS');
+ $this->assertSession()->responseHeaderEquals('X-Drupal-Cache', 'MISS');
// Repeat for the cache.
$this->drupalGet('/render_attached_test/header');
- $this->assertHeader('X-Drupal-Cache', 'HIT');
+ $this->assertSession()->responseHeaderEquals('X-Drupal-Cache', 'HIT');
// Test ['#attached']['feed'].
$this->drupalGet('/render_attached_test/feed');
- $this->assertHeader('X-Drupal-Cache', 'MISS');
+ $this->assertSession()->responseHeaderEquals('X-Drupal-Cache', 'MISS');
$this->assertFeed();
// Repeat for the cache.
$this->drupalGet('/render_attached_test/feed');
- $this->assertHeader('X-Drupal-Cache', 'HIT');
+ $this->assertSession()->responseHeaderEquals('X-Drupal-Cache', 'HIT');
// Test ['#attached']['html_head'].
$this->drupalGet('/render_attached_test/head');
- $this->assertHeader('X-Drupal-Cache', 'MISS');
+ $this->assertSession()->responseHeaderEquals('X-Drupal-Cache', 'MISS');
$this->assertHead();
// Repeat for the cache.
$this->drupalGet('/render_attached_test/head');
- $this->assertHeader('X-Drupal-Cache', 'HIT');
+ $this->assertSession()->responseHeaderEquals('X-Drupal-Cache', 'HIT');
// Test ['#attached']['html_head_link'] when outputted as HTTP header.
$this->drupalGet('/render_attached_test/html_header_link');
@@ -83,7 +83,7 @@ public function testRenderCachedBlock() {
// Test that all our attached items are present.
$this->assertFeed();
$this->assertHead();
- $this->assertResponse(418);
+ $this->assertSession()->statusCodeEquals(418);
$this->assertTeapotHeaders();
// Reload the page, to test caching.
@@ -91,7 +91,7 @@ public function testRenderCachedBlock() {
// Make sure our block is visible.
$this->assertText('Markup from attached_rendering_block.');
// The header should be present again.
- $this->assertHeader('X-Test-Teapot', 'Teapot Mode Active');
+ $this->assertSession()->responseHeaderEquals('X-Test-Teapot', 'Teapot Mode Active');
}
/**
@@ -110,7 +110,7 @@ protected function assertTeapotHeaders() {
protected function assertFeed() {
// Discover the DOM element for the feed link.
$test_meta = $this->xpath('//head/link[@href="test://url"]');
- $this->assertEqual(1, count($test_meta), 'Link has URL.');
+ $this->assertCount(1, $test_meta, 'Link has URL.');
// Reconcile the other attributes.
$test_meta_attributes = [
'href' => 'test://url',
@@ -135,7 +135,7 @@ protected function assertFeed() {
protected function assertHead() {
// Discover the DOM element for the meta link.
$test_meta = $this->xpath('//head/meta[@test-attribute="testvalue"]');
- $this->assertEqual(1, count($test_meta), 'There\'s only one test attribute.');
+ $this->assertCount(1, $test_meta, 'There\'s only one test attribute.');
// Grab the only DOM element.
$test_meta = reset($test_meta);
if (empty($test_meta)) {
diff --git a/web/core/modules/system/tests/src/Functional/Routing/DestinationTest.php b/web/core/modules/system/tests/src/Functional/Routing/DestinationTest.php
index 98ec29b473..432b237860 100644
--- a/web/core/modules/system/tests/src/Functional/Routing/DestinationTest.php
+++ b/web/core/modules/system/tests/src/Functional/Routing/DestinationTest.php
@@ -81,7 +81,7 @@ public function testDestination() {
// external URLs.
\Drupal::configFactory()->getEditable('system.site')->set('page.404', '/system-test/get-destination')->save();
$this->drupalGet('http://example.com', ['external' => FALSE]);
- $this->assertResponse(404);
+ $this->assertSession()->statusCodeEquals(404);
$this->assertIdentical(Url::fromRoute('<front>')->toString(), $session->getPage()->getContent(), 'External URL is not allowed on 404 pages.');
}
diff --git a/web/core/modules/system/tests/src/Functional/Routing/RouterPermissionTest.php b/web/core/modules/system/tests/src/Functional/Routing/RouterPermissionTest.php
index 1985725ef3..ec391debf6 100644
--- a/web/core/modules/system/tests/src/Functional/Routing/RouterPermissionTest.php
+++ b/web/core/modules/system/tests/src/Functional/Routing/RouterPermissionTest.php
@@ -27,17 +27,18 @@ class RouterPermissionTest extends BrowserTestBase {
* Tests permission requirements on routes.
*/
public function testPermissionAccess() {
- $path = 'router_test/test7';
- $this->drupalGet($path);
- $this->assertResponse(403, "Access denied for a route where we don't have a permission");
+ // Ensure 403 Access Denied for a route without permission.
+ $this->drupalGet('router_test/test7');
+ $this->assertSession()->statusCodeEquals(403);
+ // Ensure 403 Access Denied by default if no access specified.
$this->drupalGet('router_test/test8');
- $this->assertResponse(403, 'Access denied by default if no access specified');
+ $this->assertSession()->statusCodeEquals(403);
$user = $this->drupalCreateUser(['access test7']);
$this->drupalLogin($user);
$this->drupalGet('router_test/test7');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertNoRaw('Access denied');
$this->assertRaw('test7text', 'The correct string was returned because the route was successful.');
}
diff --git a/web/core/modules/system/tests/src/Functional/Routing/RouterTest.php b/web/core/modules/system/tests/src/Functional/Routing/RouterTest.php
index 974afee865..63536c5255 100644
--- a/web/core/modules/system/tests/src/Functional/Routing/RouterTest.php
+++ b/web/core/modules/system/tests/src/Functional/Routing/RouterTest.php
@@ -46,6 +46,7 @@ public function testFinishResponseSubscriber() {
$this->assertEquals($headers['Content-language'], ['en']);
$this->assertEquals($headers['X-Content-Type-Options'], ['nosniff']);
$this->assertEquals($headers['X-Frame-Options'], ['SAMEORIGIN']);
+ $this->assertNull($this->drupalGetHeader('Vary'), 'Vary header is not set.');
$this->drupalGet('router_test/test2');
$this->assertRaw('test2', 'The correct string was returned because the route was successful.');
@@ -117,22 +118,22 @@ public function testDuplicateRoutePaths() {
// routes are declared.
// @see \Drupal\Core\Routing\RouteProvider::getRoutesByPath()
$this->drupalGet('router-test/duplicate-path2');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertRaw('router_test.two_duplicate1');
// Tests three routes with same the path. One of the routes the path has a
// different case.
$this->drupalGet('router-test/case-sensitive-duplicate-path3');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertRaw('router_test.case_sensitive_duplicate1');
// While case-insensitive matching works, exact matches are preferred.
$this->drupalGet('router-test/case-sensitive-Duplicate-PATH3');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertRaw('router_test.case_sensitive_duplicate2');
// Test that case-insensitive matching works, falling back to the first
// route defined.
$this->drupalGet('router-test/case-sensitive-Duplicate-Path3');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertRaw('router_test.case_sensitive_duplicate1');
}
@@ -144,7 +145,7 @@ public function testControllerPlaceholders() {
$values = ["0", $this->randomMachineName()];
foreach ($values as $value) {
$this->drupalGet('router_test/test3/' . $value);
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertRaw($value, 'The correct string was returned because the route was successful.');
}
@@ -162,7 +163,7 @@ public function testControllerPlaceholders() {
*/
public function testControllerPlaceholdersDefaultValues() {
$this->drupalGet('router_test/test4');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertRaw('narf', 'The correct string was returned because the route was successful.');
// Confirm that the page wrapping is being added, so we're not getting a
@@ -179,7 +180,7 @@ public function testControllerPlaceholdersDefaultValues() {
*/
public function testControllerPlaceholdersDefaultValuesProvided() {
$this->drupalGet('router_test/test4/barf');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertRaw('barf', 'The correct string was returned because the route was successful.');
// Confirm that the page wrapping is being added, so we're not getting a
@@ -199,7 +200,7 @@ public function testControllerPlaceholdersDefaultValuesProvided() {
public function testDynamicRoutes() {
// Test the altered route.
$this->drupalGet('router_test/test6');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertRaw('test5', 'The correct string was returned because the route was successful.');
}
@@ -235,12 +236,12 @@ public function testUrlGeneratorFront() {
*/
public function testRouterMatching() {
$this->drupalGet('router_test/test14/1');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertText('User route "entity.user.canonical" was matched.');
// Try to match a route for a non-existent user.
$this->drupalGet('router_test/test14/2');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertText('Route not matched.');
// Check that very long paths don't cause an error.
@@ -249,7 +250,7 @@ public function testRouterMatching() {
for ($i = 0; $i < 10; $i++) {
$path .= $suffix;
$this->drupalGet($path);
- $this->assertResponse(404);
+ $this->assertSession()->statusCodeEquals(404);
}
}
@@ -258,7 +259,7 @@ public function testRouterMatching() {
*/
public function testRouterResponsePsr7() {
$this->drupalGet('/router_test/test23');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertText('test23');
}
diff --git a/web/core/modules/system/tests/src/Functional/Session/SessionAuthenticationTest.php b/web/core/modules/system/tests/src/Functional/Session/SessionAuthenticationTest.php
index 45b40fe425..ebeca9d548 100644
--- a/web/core/modules/system/tests/src/Functional/Session/SessionAuthenticationTest.php
+++ b/web/core/modules/system/tests/src/Functional/Session/SessionAuthenticationTest.php
@@ -58,11 +58,11 @@ public function testSessionFromBasicAuthenticationDoesNotLeak() {
// Test that the route is not accessible as an anonymous user.
$this->drupalGet($protected_url);
$session = $this->getSession();
- $this->assertResponse(401, 'An anonymous user cannot access a route protected with basic authentication.');
+ $this->assertSession()->statusCodeEquals(401);
// We should be able to access the route with basic authentication.
$this->basicAuthGet($protected_url, $this->user->getAccountName(), $this->user->passRaw);
- $this->assertResponse(200, 'A route protected with basic authentication can be accessed by an authenticated user.');
+ $this->assertSession()->statusCodeEquals(200);
// Check that the correct user is logged in.
$this->assertEqual($this->user->id(), json_decode($session->getPage()->getContent())->user, 'The correct user is authenticated on a route with basic authentication.');
@@ -71,13 +71,13 @@ public function testSessionFromBasicAuthenticationDoesNotLeak() {
// If we now try to access a page without basic authentication then we
// should no longer be logged in.
$this->drupalGet($unprotected_url);
- $this->assertResponse(200, 'An unprotected route can be accessed without basic authentication.');
+ $this->assertSession()->statusCodeEquals(200);
$this->assertEquals(0, json_decode($session->getPage()->getContent())->user, 'The user is no longer authenticated after visiting a page without basic authentication.');
// If we access the protected page again without basic authentication we
// should get 401 Unauthorized.
$this->drupalGet($protected_url);
- $this->assertResponse(401, 'A subsequent request to the same route without basic authentication is not authorized.');
+ $this->assertSession()->statusCodeEquals(401);
}
/**
@@ -88,12 +88,12 @@ public function testBasicAuthSession() {
$test_value = 'alpaca';
$response = $this->basicAuthGet('session-test/set-session/' . $test_value, $this->user->getAccountName(), $this->user->pass_raw);
$this->assertSessionData($response, $test_value);
- $this->assertResponse(200, 'The request to set a session value was successful.');
+ $this->assertSession()->statusCodeEquals(200);
// Test that on a subsequent request the session value is still present.
$response = $this->basicAuthGet('session-test/get-session', $this->user->getAccountName(), $this->user->pass_raw);
$this->assertSessionData($response, $test_value);
- $this->assertResponse(200, 'The request to get a session value was successful.');
+ $this->assertSession()->statusCodeEquals(200);
}
/**
@@ -126,7 +126,7 @@ public function testBasicAuthNoSession() {
// session cookie should be set, the third party system is responsible for
// sustaining the session.
$this->basicAuthGet($no_cookie_url, $this->user->getAccountName(), $this->user->passRaw);
- $this->assertResponse(200, 'The user is successfully authenticated using basic authentication.');
+ $this->assertSession()->statusCodeEquals(200);
$this->assertEmpty($this->getSessionCookies());
// Mink stores some information in the session that breaks the next check if
// not reset.
diff --git a/web/core/modules/system/tests/src/Functional/Session/SessionHttpsTest.php b/web/core/modules/system/tests/src/Functional/Session/SessionHttpsTest.php
index f5847645bc..59dc9205de 100644
--- a/web/core/modules/system/tests/src/Functional/Session/SessionHttpsTest.php
+++ b/web/core/modules/system/tests/src/Functional/Session/SessionHttpsTest.php
@@ -88,17 +88,17 @@ public function testHttpsSession() {
// Verify that user is logged in on secure URL.
$this->drupalGet($this->httpsUrl('admin/config'));
$this->assertText(t('Configuration'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Verify that user is not logged in on non-secure URL.
$this->drupalGet($this->httpUrl('admin/config'));
$this->assertNoText(t('Configuration'));
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
// Verify that empty SID cannot be used on the non-secure site.
$browser_kit_cookie_jar->set(Cookie::fromString($this->insecureSessionName . '=', $this->baseUrl));
$this->drupalGet($this->httpUrl('admin/config'));
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
// Remove the secure session name from the cookie jar before logging in via
// HTTP on HTTPS environments.
@@ -108,13 +108,13 @@ public function testHttpsSession() {
// which creates a mock HTTP request on HTTPS test environments.
$this->loginHttp($user);
$this->drupalGet($this->httpUrl('admin/config'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertSessionIds($this->getSession()->getCookie($this->insecureSessionName), 'Session has the correct SID and an empty secure SID.');
// Verify that empty secure SID cannot be used on the secure site.
$browser_kit_cookie_jar->set(Cookie::fromString($this->secureSessionName . '=', $this->baseUrl));
$this->drupalGet($this->httpsUrl('admin/config'));
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
}
/**
@@ -160,7 +160,7 @@ protected function loginHttp(AccountInterface $account) {
// Follow the location header.
$path = $this->getPathFromLocationHeader($response, FALSE);
$this->drupalGet($this->httpUrl($path));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
}
/**
@@ -206,7 +206,7 @@ protected function loginHttps(AccountInterface $account) {
// Follow the location header.
$path = $this->getPathFromLocationHeader($response, TRUE);
$this->drupalGet($this->httpsUrl($path));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
}
/**
@@ -237,7 +237,7 @@ protected function getPathFromLocationHeader(ResponseInterface $response, $https
$this->assertSame(303, $response->getStatusCode());
$location = $response->getHeader('location')[0];
- $this->assertIdentical(strpos($location, $base_url), 0, 'Location header contains expected base URL');
+ $this->assertStringStartsWith($base_url, $location, 'Location header contains expected base URL');
return substr($location, strlen($base_url));
}
diff --git a/web/core/modules/system/tests/src/Functional/Session/SessionTest.php b/web/core/modules/system/tests/src/Functional/Session/SessionTest.php
index 8092bf1209..e0b20e7bed 100644
--- a/web/core/modules/system/tests/src/Functional/Session/SessionTest.php
+++ b/web/core/modules/system/tests/src/Functional/Session/SessionTest.php
@@ -279,7 +279,7 @@ public function testEmptySessionID() {
$user = $this->drupalCreateUser([]);
$this->drupalLogin($user);
$this->drupalGet('session-test/is-logged-in');
- $this->assertResponse(200, 'User is logged in.');
+ $this->assertSession()->statusCodeEquals(200);
// Reset the sid in {sessions} to a blank string. This may exist in the
// wild in some cases, although we normally prevent it from happening.
@@ -292,7 +292,42 @@ public function testEmptySessionID() {
$this->assertRaw("session_id:\n", 'Session ID is blank as sent from cookie header.');
// Assert that we have an anonymous session now.
$this->drupalGet('session-test/is-logged-in');
- $this->assertResponse(403, 'An empty session ID is not allowed.');
+ $this->assertSession()->statusCodeEquals(403);
+ }
+
+ /**
+ * Test session bag.
+ */
+ public function testSessionBag() {
+ // Ensure the flag is absent to start with.
+ $this->drupalGet('/session-test/has-bag-flag');
+ $this->assertSessionCookie(FALSE);
+ $this->assertSessionEmpty(TRUE);
+ $this->assertSession()->statusCodeEquals(200);
+
+ // Set the flag.
+ $this->drupalGet('/session-test/set-bag-flag');
+ $this->assertSessionCookie(TRUE);
+ $this->assertSessionEmpty(TRUE);
+ $this->assertSession()->statusCodeEquals(200);
+
+ // Ensure the flag is set.
+ $this->drupalGet('/session-test/has-bag-flag');
+ $this->assertSessionCookie(TRUE);
+ $this->assertSessionEmpty(FALSE);
+ $this->assertSession()->statusCodeEquals(200);
+
+ // Clear the flag.
+ $this->drupalGet('/session-test/clear-bag-flag');
+ $this->assertSessionCookie(FALSE);
+ $this->assertSessionEmpty(FALSE);
+ $this->assertSession()->statusCodeEquals(200);
+
+ // Ensure the flag is absent again.
+ $this->drupalGet('/session-test/has-bag-flag');
+ $this->assertSessionCookie(FALSE);
+ $this->assertSessionEmpty(TRUE);
+ $this->assertSession()->statusCodeEquals(200);
}
/**
@@ -305,7 +340,7 @@ public function sessionReset() {
// Change cookie file for user.
$this->drupalGet('session-test/get');
- $this->assertResponse(200, 'Session test module is correctly enabled.', 'Session');
+ $this->assertSession()->statusCodeEquals(200);
}
/**
diff --git a/web/core/modules/system/tests/src/Functional/System/AccessDeniedTest.php b/web/core/modules/system/tests/src/Functional/System/AccessDeniedTest.php
index 4c4b0cb1c5..10c48ef804 100644
--- a/web/core/modules/system/tests/src/Functional/System/AccessDeniedTest.php
+++ b/web/core/modules/system/tests/src/Functional/System/AccessDeniedTest.php
@@ -47,7 +47,7 @@ protected function setUp() {
public function testAccessDenied() {
$this->drupalGet('admin');
$this->assertText(t('Access denied'), 'Found the default 403 page');
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
// Ensure that users without permission are denied access and have the
// correct path information in drupalSettings.
@@ -94,7 +94,7 @@ public function testAccessDenied() {
$this->drupalLogout();
$this->drupalGet('admin');
$this->assertText(t('Access denied'), 'Found the default 403 page');
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
$this->assertText(t('Username'), 'Blocks are shown on the default 403 page');
// Log back in, set the custom 403 page to /user/login and remove the block
@@ -124,14 +124,14 @@ public function testAccessDeniedCustomPageWithAccessDenied() {
$this->drupalGet('/system-test/always-denied');
$this->assertNoText('Admin-only 4xx response');
$this->assertText('You are not authorized to access this page.');
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
// Verify the access cacheability metadata for custom 403 is bubbled.
$this->assertCacheContext('user.roles');
$this->drupalLogin($this->adminUser);
$this->drupalGet('/system-test/always-denied');
$this->assertText('Admin-only 4xx response');
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
// Verify the access cacheability metadata for custom 403 is bubbled.
$this->assertCacheContext('user.roles');
}
diff --git a/web/core/modules/system/tests/src/Functional/System/AdminTest.php b/web/core/modules/system/tests/src/Functional/System/AdminTest.php
index 2face42913..1d11616bca 100644
--- a/web/core/modules/system/tests/src/Functional/System/AdminTest.php
+++ b/web/core/modules/system/tests/src/Functional/System/AdminTest.php
@@ -157,7 +157,7 @@ public function testCompactMode() {
$frontpage_url = 'user/' . $this->adminUser->id();
$this->drupalGet('admin/compact/on');
- $this->assertResponse(200, 'A valid page is returned after turning on compact mode.');
+ $this->assertSession()->statusCodeEquals(200);
$this->assertUrl($frontpage_url, [], 'The user is redirected to the front page after turning on compact mode.');
$this->assertEquals('1', $session->getCookie('Drupal.visitor.admin_compact_mode'), 'Compact mode turns on.');
$this->drupalGet('admin/compact/on');
@@ -166,7 +166,7 @@ public function testCompactMode() {
$this->assertEquals('1', $session->getCookie('Drupal.visitor.admin_compact_mode'), 'Compact mode persists on new requests.');
$this->drupalGet('admin/compact/off');
- $this->assertResponse(200, 'A valid page is returned after turning off compact mode.');
+ $this->assertSession()->statusCodeEquals(200);
$this->assertUrl($frontpage_url, [], 'The user is redirected to the front page after turning off compact mode.');
$this->assertNull($session->getCookie('Drupal.visitor.admin_compact_mode'), 'Compact mode turns off.');
$this->drupalGet('admin/compact/off');
diff --git a/web/core/modules/system/tests/src/Functional/System/CronRunTest.php b/web/core/modules/system/tests/src/Functional/System/CronRunTest.php
index eecd9db7f7..2b3df70f77 100644
--- a/web/core/modules/system/tests/src/Functional/System/CronRunTest.php
+++ b/web/core/modules/system/tests/src/Functional/System/CronRunTest.php
@@ -19,7 +19,11 @@ class CronRunTest extends BrowserTestBase {
*
* @var array
*/
- public static $modules = ['common_test', 'common_test_cron_helper', 'automated_cron'];
+ public static $modules = [
+ 'common_test',
+ 'common_test_cron_helper',
+ 'automated_cron',
+ ];
/**
* {@inheritdoc}
@@ -32,17 +36,17 @@ class CronRunTest extends BrowserTestBase {
public function testCronRun() {
// Run cron anonymously without any cron key.
$this->drupalGet('cron');
- $this->assertResponse(404);
+ $this->assertSession()->statusCodeEquals(404);
// Run cron anonymously with a random cron key.
$key = $this->randomMachineName(16);
$this->drupalGet('cron/' . $key);
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
// Run cron anonymously with the valid cron key.
$key = \Drupal::state()->get('system.cron_key');
$this->drupalGet('cron/' . $key);
- $this->assertResponse(204);
+ $this->assertSession()->statusCodeEquals(204);
}
/**
@@ -136,11 +140,11 @@ public function testManualCron() {
$this->drupalLogin($admin_user);
$this->drupalGet('admin/reports/status/run-cron');
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
$this->drupalGet('admin/reports/status');
$this->clickLink(t('Run cron'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertText(t('Cron ran successfully.'));
}
diff --git a/web/core/modules/system/tests/src/Functional/System/DateFormatsLockedTest.php b/web/core/modules/system/tests/src/Functional/System/DateFormatsLockedTest.php
index d09d8d1348..69fb3c28f3 100644
--- a/web/core/modules/system/tests/src/Functional/System/DateFormatsLockedTest.php
+++ b/web/core/modules/system/tests/src/Functional/System/DateFormatsLockedTest.php
@@ -33,15 +33,15 @@ public function testDateLocking() {
// Locked date formats are not editable.
$this->drupalGet('admin/config/regional/date-time/formats/manage/short');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->drupalGet('admin/config/regional/date-time/formats/manage/html_date');
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
// Locked date formats are not deletable.
$this->drupalGet('admin/config/regional/date-time/formats/manage/short/delete');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->drupalGet('admin/config/regional/date-time/formats/manage/html_date/delete');
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
}
}
diff --git a/web/core/modules/system/tests/src/Functional/System/DateTimeTest.php b/web/core/modules/system/tests/src/Functional/System/DateTimeTest.php
index 7ce8db7e06..10a3bd98cc 100644
--- a/web/core/modules/system/tests/src/Functional/System/DateTimeTest.php
+++ b/web/core/modules/system/tests/src/Functional/System/DateTimeTest.php
@@ -19,7 +19,15 @@ class DateTimeTest extends BrowserTestBase {
*
* @var array
*/
- public static $modules = ['block', 'node', 'language', 'field', 'field_ui', 'datetime', 'options'];
+ public static $modules = [
+ 'block',
+ 'node',
+ 'language',
+ 'field',
+ 'field_ui',
+ 'datetime',
+ 'options',
+ ];
/**
* {@inheritdoc}
@@ -177,7 +185,7 @@ public function testEnteringDateTimeViaSelectors() {
$this->drupalCreateContentType(['type' => 'page_with_date', 'name' => 'Page with date']);
$this->drupalGet('admin/structure/types/manage/page_with_date');
- $this->assertResponse(200, 'Content type created.');
+ $this->assertSession()->statusCodeEquals(200);
$this->drupalGet('admin/structure/types/manage/page_with_date/fields/add-field');
$edit = [
diff --git a/web/core/modules/system/tests/src/Functional/System/ErrorHandlerTest.php b/web/core/modules/system/tests/src/Functional/System/ErrorHandlerTest.php
index f93468b65f..7e03031c10 100644
--- a/web/core/modules/system/tests/src/Functional/System/ErrorHandlerTest.php
+++ b/web/core/modules/system/tests/src/Functional/System/ErrorHandlerTest.php
@@ -51,7 +51,7 @@ public function testErrorHandler() {
// Set error reporting to display verbose notices.
$this->config('system.logging')->set('error_level', ERROR_REPORTING_DISPLAY_VERBOSE)->save();
$this->drupalGet('error-test/generate-warnings');
- $this->assertResponse(200, 'Received expected HTTP status code.');
+ $this->assertSession()->statusCodeEquals(200);
$this->assertErrorMessage($error_notice);
$this->assertErrorMessage($error_warning);
$this->assertErrorMessage($error_user_notice);
@@ -66,7 +66,7 @@ public function testErrorHandler() {
// Set error reporting to collect notices.
$config->set('error_level', ERROR_REPORTING_DISPLAY_ALL)->save();
$this->drupalGet('error-test/generate-warnings');
- $this->assertResponse(200, 'Received expected HTTP status code.');
+ $this->assertSession()->statusCodeEquals(200);
$this->assertErrorMessage($error_notice);
$this->assertErrorMessage($error_warning);
$this->assertErrorMessage($error_user_notice);
@@ -75,7 +75,7 @@ public function testErrorHandler() {
// Set error reporting to not collect notices.
$config->set('error_level', ERROR_REPORTING_DISPLAY_SOME)->save();
$this->drupalGet('error-test/generate-warnings');
- $this->assertResponse(200, 'Received expected HTTP status code.');
+ $this->assertSession()->statusCodeEquals(200);
$this->assertNoErrorMessage($error_notice);
$this->assertErrorMessage($error_warning);
$this->assertErrorMessage($error_user_notice);
@@ -84,7 +84,7 @@ public function testErrorHandler() {
// Set error reporting to not show any errors.
$config->set('error_level', ERROR_REPORTING_HIDE)->save();
$this->drupalGet('error-test/generate-warnings');
- $this->assertResponse(200, 'Received expected HTTP status code.');
+ $this->assertSession()->statusCodeEquals(200);
$this->assertNoErrorMessage($error_notice);
$this->assertNoErrorMessage($error_warning);
$this->assertNoErrorMessage($error_user_notice);
@@ -142,7 +142,7 @@ public function testExceptionHandler() {
$this->drupalGet('error-test/trigger-exception');
$this->assertNull($this->drupalGetHeader('X-Drupal-Cache'));
- $this->assertIdentical(strpos($this->drupalGetHeader('Cache-Control'), 'public'), FALSE, 'Received expected HTTP status line.');
+ $this->assertSession()->responseHeaderNotContains('Cache-Control', 'public');
$this->assertSession()->statusCodeEquals(500);
$this->assertNoErrorMessage($error_exception);
}
diff --git a/web/core/modules/system/tests/src/Functional/System/HtaccessTest.php b/web/core/modules/system/tests/src/Functional/System/HtaccessTest.php
index 037a92a00f..1b6fd58317 100644
--- a/web/core/modules/system/tests/src/Functional/System/HtaccessTest.php
+++ b/web/core/modules/system/tests/src/Functional/System/HtaccessTest.php
@@ -108,7 +108,7 @@ public function testFileAccess() {
// Test that adding "/1" to a .php URL does not make it accessible.
$this->drupalGet('core/lib/Drupal.php/1');
- $this->assertResponse(403, "Access to core/lib/Drupal.php/1 is denied.");
+ $this->assertSession()->statusCodeEquals(403);
// Test that it is possible to have path aliases containing .php.
$type = $this->drupalCreateContentType();
@@ -121,14 +121,14 @@ public function testFileAccess() {
]);
$node->save();
$this->drupalGet('test.php');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertText('This is a node');
// Update node's alias to test.php/test.
$node->path = '/test.php/test';
$node->save();
$this->drupalGet('test.php/test');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertText('This is a node');
}
@@ -141,9 +141,9 @@ public function testFileAccess() {
* The expected response code. For example: 200, 403 or 404.
*/
protected function assertFileAccess($path, $response_code) {
- $this->assertTrue(file_exists(\Drupal::root() . '/' . $path), "The file $path exists.");
+ $this->assertFileExists(\Drupal::root() . '/' . $path);
$this->drupalGet($path);
- $this->assertResponse($response_code, "Response code to $path is $response_code.");
+ $this->assertEquals($response_code, $this->getSession()->getStatusCode(), "Response code to $path should be $response_code");
}
/**
@@ -151,7 +151,7 @@ protected function assertFileAccess($path, $response_code) {
*/
public function testSvgzContentEncoding() {
$this->drupalGet('core/modules/system/tests/logo.svgz');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Use x-encoded-content-encoding because of Content-Encoding responses
// (gzip, deflate, etc.) are automatically decoded by Guzzle.
diff --git a/web/core/modules/system/tests/src/Functional/System/IndexPhpTest.php b/web/core/modules/system/tests/src/Functional/System/IndexPhpTest.php
index 4146d0c655..10a355ee7e 100644
--- a/web/core/modules/system/tests/src/Functional/System/IndexPhpTest.php
+++ b/web/core/modules/system/tests/src/Functional/System/IndexPhpTest.php
@@ -27,10 +27,10 @@ public function testIndexPhpHandling() {
$index_php = $GLOBALS['base_url'] . '/index.php';
$this->drupalGet($index_php, ['external' => TRUE]);
- $this->assertResponse(200, 'Make sure index.php returns a valid page.');
+ $this->assertSession()->statusCodeEquals(200);
$this->drupalGet($index_php . '/user', ['external' => TRUE]);
- $this->assertResponse(200, 'Make sure index.php/user returns a valid page.');
+ $this->assertSession()->statusCodeEquals(200);
}
}
diff --git a/web/core/modules/system/tests/src/Functional/System/PageNotFoundTest.php b/web/core/modules/system/tests/src/Functional/System/PageNotFoundTest.php
index 45522da9bd..cea415863d 100644
--- a/web/core/modules/system/tests/src/Functional/System/PageNotFoundTest.php
+++ b/web/core/modules/system/tests/src/Functional/System/PageNotFoundTest.php
@@ -74,7 +74,7 @@ public function testPageNotFoundCustomPageWithAccessDenied() {
$this->drupalGet('/this-path-does-not-exist');
$this->assertNoText('Admin-only 4xx response');
$this->assertText('The requested page could not be found.');
- $this->assertResponse(404);
+ $this->assertSession()->statusCodeEquals(404);
// Verify the access cacheability metadata for custom 404 is bubbled.
$this->assertCacheContext('user.roles');
@@ -82,7 +82,7 @@ public function testPageNotFoundCustomPageWithAccessDenied() {
$this->drupalGet('/this-path-does-not-exist');
$this->assertText('Admin-only 4xx response');
$this->assertNoText('The requested page could not be found.');
- $this->assertResponse(404);
+ $this->assertSession()->statusCodeEquals(404);
// Verify the access cacheability metadata for custom 404 is bubbled.
$this->assertCacheContext('user.roles');
}
diff --git a/web/core/modules/system/tests/src/Functional/System/ResponseGeneratorTest.php b/web/core/modules/system/tests/src/Functional/System/ResponseGeneratorTest.php
index 5c8f547c4d..7902c370e9 100644
--- a/web/core/modules/system/tests/src/Functional/System/ResponseGeneratorTest.php
+++ b/web/core/modules/system/tests/src/Functional/System/ResponseGeneratorTest.php
@@ -47,13 +47,13 @@ public function testGeneratorHeaderAdded() {
// Check to see if the header is added when viewing a normal content page
$this->drupalGet($node->toUrl());
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertEqual('text/html; charset=UTF-8', $this->drupalGetHeader('Content-Type'));
$this->assertEqual($expectedGeneratorHeader, $this->drupalGetHeader('X-Generator'));
// Check to see if the header is also added for a non-successful response
$this->drupalGet('llama');
- $this->assertResponse(404);
+ $this->assertSession()->statusCodeEquals(404);
$this->assertEqual('text/html; charset=UTF-8', $this->drupalGetHeader('Content-Type'));
$this->assertEqual($expectedGeneratorHeader, $this->drupalGetHeader('X-Generator'));
@@ -67,7 +67,7 @@ public function testGeneratorHeaderAdded() {
// Tests to see if this also works for a non-html request
$this->drupalGet($node->toUrl()->setOption('query', ['_format' => 'hal_json']));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertEqual('application/hal+json', $this->drupalGetHeader('Content-Type'));
$this->assertEqual($expectedGeneratorHeader, $this->drupalGetHeader('X-Generator'));
diff --git a/web/core/modules/system/tests/src/Functional/System/RetrieveFileTest.php b/web/core/modules/system/tests/src/Functional/System/RetrieveFileTest.php
index 25db399666..bda8c2571d 100644
--- a/web/core/modules/system/tests/src/Functional/System/RetrieveFileTest.php
+++ b/web/core/modules/system/tests/src/Functional/System/RetrieveFileTest.php
@@ -38,7 +38,7 @@ public function testFileRetrieving() {
$encoded_filename = rawurlencode($filename);
$this->assertEqual($retrieved_file, 'public://' . $encoded_filename, 'Sane path for downloaded file returned (public:// scheme).');
- $this->assertTrue(is_file($retrieved_file), 'Downloaded file does exist (public:// scheme).');
+ $this->assertFileExists($retrieved_file);
$this->assertEqual(filesize($retrieved_file), 7, 'File size of downloaded file is correct (public:// scheme).');
/** @var \Drupal\Core\File\FileSystemInterface $file_system */
$file_system = \Drupal::service('file_system');
@@ -48,7 +48,7 @@ public function testFileRetrieving() {
$file_system->mkdir($targetdir = 'temporary://' . $this->randomMachineName());
$retrieved_file = system_retrieve_file($url, $targetdir);
$this->assertEqual($retrieved_file, "$targetdir/$encoded_filename", 'Sane path for downloaded file returned (temporary:// scheme).');
- $this->assertTrue(is_file($retrieved_file), 'Downloaded file does exist (temporary:// scheme).');
+ $this->assertFileExists($retrieved_file);
$this->assertEqual(filesize($retrieved_file), 7, 'File size of downloaded file is correct (temporary:// scheme).');
$file_system->delete($retrieved_file);
diff --git a/web/core/modules/system/tests/src/Functional/System/SiteMaintenanceTest.php b/web/core/modules/system/tests/src/Functional/System/SiteMaintenanceTest.php
index ec3a4b6950..b61390a7e6 100644
--- a/web/core/modules/system/tests/src/Functional/System/SiteMaintenanceTest.php
+++ b/web/core/modules/system/tests/src/Functional/System/SiteMaintenanceTest.php
@@ -160,9 +160,9 @@ public function testNonHtmlRequest() {
foreach ($formats as $format) {
$this->pass('Testing format ' . $format);
$this->drupalGet('<front>', ['query' => ['_format' => $format]]);
- $this->assertResponse(503);
+ $this->assertSession()->statusCodeEquals(503);
$this->assertRaw('Drupal is currently under maintenance. We should be back shortly. Thank you for your patience.');
- $this->assertHeader('Content-Type', 'text/plain; charset=UTF-8');
+ $this->assertSession()->responseHeaderEquals('Content-Type', 'text/plain; charset=UTF-8');
}
}
diff --git a/web/core/modules/system/tests/src/Functional/System/SitesDirectoryHardeningTest.php b/web/core/modules/system/tests/src/Functional/System/SitesDirectoryHardeningTest.php
index ce3ac2a835..b8b25652d7 100644
--- a/web/core/modules/system/tests/src/Functional/System/SitesDirectoryHardeningTest.php
+++ b/web/core/modules/system/tests/src/Functional/System/SitesDirectoryHardeningTest.php
@@ -23,7 +23,7 @@ class SitesDirectoryHardeningTest extends BrowserTestBase {
/**
* Tests the default behavior to restrict directory permissions is enforced.
*
- * Checks both the the current sites directory and settings.php.
+ * Checks both the current sites directory and settings.php.
*/
public function testSitesDirectoryHardening() {
$site_path = $this->kernel->getSitePath();
@@ -62,11 +62,13 @@ public function testSitesDirectoryHardeningConfig() {
$this->assertEqual(REQUIREMENT_WARNING, $requirements['configuration_files']['severity'], 'Warning severity is properly set.');
$this->assertEquals('Protection disabled', (string) $requirements['configuration_files']['value']);
$description = strip_tags(\Drupal::service('renderer')->renderPlain($requirements['configuration_files']['description']));
- $this->assertContains('settings.php is not protected from modifications and poses a security risk.', $description);
- $this->assertContains('services.yml is not protected from modifications and poses a security risk.', $description);
+ $this->assertStringContainsString('settings.php is not protected from modifications and poses a security risk.', $description);
+ $this->assertStringContainsString('services.yml is not protected from modifications and poses a security risk.', $description);
- $this->assertTrue(is_writable($site_path), 'Site directory remains writable when automatically fixing permissions is disabled.');
- $this->assertTrue(is_writable($settings_file), 'settings.php remains writable when automatically fixing permissions is disabled.');
+ // Verify that site directory and the settings.php remain writable when
+ // automatically enforcing file permissions is disabled.
+ $this->assertDirectoryIsWritable($site_path);
+ $this->assertFileIsWritable($settings_file);
// Re-enable permissions enforcement.
$settings = Settings::getAll();
@@ -77,8 +79,10 @@ public function testSitesDirectoryHardeningConfig() {
$requirements = $this->checkSystemRequirements();
$this->assertEquals('Protected', (string) $requirements['configuration_files']['value']);
- $this->assertFalse(is_writable($site_path), 'Site directory is protected when automatically fixing permissions is enabled.');
- $this->assertFalse(is_writable($settings_file), 'settings.php is protected when automatically fixing permissions is enabled.');
+ // Verify that site directory and the settings.php remain protected when
+ // automatically enforcing file permissions is enabled.
+ $this->assertDirectoryNotIsWritable($site_path);
+ $this->assertFileNotIsWritable($settings_file);
}
/**
diff --git a/web/core/modules/system/tests/src/Functional/System/StatusTest.php b/web/core/modules/system/tests/src/Functional/System/StatusTest.php
index 6d4cce4c7b..ad18bb270d 100644
--- a/web/core/modules/system/tests/src/Functional/System/StatusTest.php
+++ b/web/core/modules/system/tests/src/Functional/System/StatusTest.php
@@ -48,7 +48,7 @@ protected function setUp() {
public function testStatusPage() {
// Go to Administration.
$this->drupalGet('admin/reports/status');
- $this->assertResponse(200, 'The status page is reachable.');
+ $this->assertSession()->statusCodeEquals(200);
$phpversion = phpversion();
$this->assertText($phpversion, 'Php version is shown on the page.');
@@ -81,7 +81,7 @@ public function testStatusPage() {
$this->assertText(t('Out of date'));
$this->drupalGet('admin/reports/status/php');
- $this->assertResponse(200, 'The phpinfo page is reachable.');
+ $this->assertSession()->statusCodeEquals(200);
// Check if cron error is displayed in errors section
$cron_last_run = \Drupal::state()->get('system.cron_last');
diff --git a/web/core/modules/system/tests/src/Functional/System/SystemAuthorizeTest.php b/web/core/modules/system/tests/src/Functional/System/SystemAuthorizeTest.php
index 36f7208ea7..a8db1d76aa 100644
--- a/web/core/modules/system/tests/src/Functional/System/SystemAuthorizeTest.php
+++ b/web/core/modules/system/tests/src/Functional/System/SystemAuthorizeTest.php
@@ -36,7 +36,7 @@ protected function setUp() {
* Initializing authorize.php needs to happen in the child Drupal
* installation, not the parent. So, we visit a menu callback provided by
* system_test.module which calls system_authorized_init() to initialize the
- * $_SESSION inside the test site, not the framework site. This callback
+ * user's session inside the test site, not the framework site. This callback
* redirects to authorize.php when it's done initializing.
*
* @see system_authorized_init()
@@ -51,7 +51,7 @@ public function drupalGetAuthorizePHP($page_title = 'system-test-auth') {
public function testFileTransferHooks() {
$page_title = $this->randomMachineName(16);
$this->drupalGetAuthorizePHP($page_title);
- $this->assertTitle(strtr('@title | Drupal', ['@title' => $page_title]), 'authorize.php page title is correct.');
+ $this->assertTitle("$page_title | Drupal");
$this->assertNoText('It appears you have reached this page in error.');
$this->assertText('To continue, provide your server connection details');
// Make sure we see the new connection method added by system_test.
diff --git a/web/core/modules/system/tests/src/Functional/System/ThemeTest.php b/web/core/modules/system/tests/src/Functional/System/ThemeTest.php
index 2a7b5f898c..eff90ee1a4 100644
--- a/web/core/modules/system/tests/src/Functional/System/ThemeTest.php
+++ b/web/core/modules/system/tests/src/Functional/System/ThemeTest.php
@@ -53,14 +53,16 @@ protected function setUp() {
* Test the theme settings form.
*/
public function testThemeSettings() {
- // Ensure invalid theme settings form URLs return a proper 404.
+ // Ensure a disabled theme settings form URL returns 404.
$this->drupalGet('admin/appearance/settings/bartik');
- $this->assertResponse(404, 'The theme settings form URL for a uninstalled theme could not be found.');
+ $this->assertSession()->statusCodeEquals(404);
+ // Ensure a non existent theme settings form URL returns 404.
$this->drupalGet('admin/appearance/settings/' . $this->randomMachineName());
- $this->assertResponse(404, 'The theme settings form URL for a non-existent theme could not be found.');
+ $this->assertSession()->statusCodeEquals(404);
+ // Ensure a hidden theme settings form URL returns 404.
$this->assertTrue(\Drupal::service('theme_installer')->install(['stable']));
$this->drupalGet('admin/appearance/settings/stable');
- $this->assertResponse(404, 'The theme settings form URL for a hidden theme is unavailable.');
+ $this->assertSession()->statusCodeEquals(404);
// Specify a filesystem path to be used for the logo.
$file = current($this->drupalGetTestFiles('image'));
@@ -211,7 +213,7 @@ public function testThemeSettings() {
$this->drupalGet('admin/appearance/settings');
$this->assertLink($theme_handler->getName('stable'));
$this->drupalGet('admin/appearance/settings/stable');
- $this->assertResponse(200, 'The theme settings form URL for a hidden theme that is the admin theme is available.');
+ $this->assertSession()->statusCodeEquals(200);
// Ensure default logo and favicons are not triggering custom path
// validation errors if their custom paths are set on the form.
@@ -309,7 +311,7 @@ public function testAdministrationTheme() {
$normal_user = $this->drupalCreateUser(['view the administration theme']);
$this->drupalLogin($normal_user);
$this->drupalGet('admin/config');
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
$this->assertRaw('core/themes/seven', 'Administration theme used on an administration page.');
$this->drupalLogin($this->adminUser);
diff --git a/web/core/modules/system/tests/src/Functional/System/TrustedHostsTest.php b/web/core/modules/system/tests/src/Functional/System/TrustedHostsTest.php
index 13f43b80b2..62ed131f67 100644
--- a/web/core/modules/system/tests/src/Functional/System/TrustedHostsTest.php
+++ b/web/core/modules/system/tests/src/Functional/System/TrustedHostsTest.php
@@ -34,7 +34,7 @@ protected function setUp() {
*/
public function testStatusPageWithoutConfiguration() {
$this->drupalGet('admin/reports/status');
- $this->assertResponse(200, 'The status page is reachable.');
+ $this->assertSession()->statusCodeEquals(200);
$this->assertRaw(t('Trusted Host Settings'));
$this->assertRaw(t('The trusted_host_patterns setting is not configured in settings.php.'));
@@ -52,7 +52,7 @@ public function testStatusPageWithConfiguration() {
$this->writeSettings($settings);
$this->drupalGet('admin/reports/status');
- $this->assertResponse(200, 'The status page is reachable.');
+ $this->assertSession()->statusCodeEquals(200);
$this->assertRaw(t('Trusted Host Settings'));
$this->assertRaw(t('The trusted_host_patterns setting is set to allow'));
diff --git a/web/core/modules/system/tests/src/Functional/Theme/EntityFilteringThemeTest.php b/web/core/modules/system/tests/src/Functional/Theme/EntityFilteringThemeTest.php
index f79f990de2..130c8c41f4 100644
--- a/web/core/modules/system/tests/src/Functional/Theme/EntityFilteringThemeTest.php
+++ b/web/core/modules/system/tests/src/Functional/Theme/EntityFilteringThemeTest.php
@@ -143,7 +143,7 @@ public function testThemedEntity() {
->save();
foreach ($paths as $path) {
$this->drupalGet($path);
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertNoRaw($this->xssLabel);
}
}
diff --git a/web/core/modules/system/tests/src/Functional/Theme/HtmlAttributesTest.php b/web/core/modules/system/tests/src/Functional/Theme/HtmlAttributesTest.php
index fccf2ff4d6..4caf21c357 100644
--- a/web/core/modules/system/tests/src/Functional/Theme/HtmlAttributesTest.php
+++ b/web/core/modules/system/tests/src/Functional/Theme/HtmlAttributesTest.php
@@ -30,7 +30,7 @@ public function testThemeHtmlAttributes() {
$this->drupalGet('');
$this->assertSession()->responseContains('<html lang="en" dir="ltr" theme_test_html_attribute="theme test html attribute value">');
$attributes = $this->xpath('/body[@theme_test_body_attribute="theme test body attribute value"]');
- $this->assertTrue(count($attributes) == 1, "Attribute set in the 'body' element via hook_preprocess_HOOK() found.");
+ $this->assertCount(1, $attributes, "Attribute set in the 'body' element via hook_preprocess_HOOK() found.");
}
}
diff --git a/web/core/modules/system/tests/src/Functional/Theme/LegacyStyleSheetsRemoveTest.php b/web/core/modules/system/tests/src/Functional/Theme/LegacyStyleSheetsRemoveTest.php
new file mode 100644
index 0000000000..e22ef1d1b0
--- /dev/null
+++ b/web/core/modules/system/tests/src/Functional/Theme/LegacyStyleSheetsRemoveTest.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace Drupal\Tests\system\Functional\Theme;
+
+use Drupal\Tests\BrowserTestBase;
+
+/**
+ * Tests the legacy stylesheets-remove key.
+ *
+ * @group system
+ * @group legacy
+ */
+class LegacyStyleSheetsRemoveTest extends BrowserTestBase {
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function setUp() {
+ parent::setUp();
+ \Drupal::service('theme_installer')->install(['test_legacy_stylesheets_remove']);
+ }
+
+ /**
+ * Tests the stylesheets-remove key.
+ *
+ * @throws \Behat\Mink\Exception\ExpectationException
+ *
+ * @expectedDeprecation The theme info key stylesheets-remove implemented by theme test_legacy_stylesheets_remove is deprecated in drupal:8.0.0 and is removed from drupal:10.0.0. See https://www.drupal.org/node/2497313
+ */
+ public function testStyleSheetsRemove() {
+ \Drupal::configFactory()->getEditable('system.theme')->set('default', 'classy')->save();
+ $this->drupalGet('<front>');
+ $this->assertSession()->responseContains('css/components/action-links.css?');
+ $this->assertSession()->responseContains('css/components/breadcrumb.css?');
+ \Drupal::configFactory()->getEditable('system.theme')->set('default', 'test_legacy_stylesheets_remove')->save();
+ $this->drupalGet('<front>');
+ $this->assertSession()->responseNotContains('css/components/action-links.css?');
+ $this->assertSession()->responseContains('css/components/breadcrumb.css?');
+ }
+
+}
diff --git a/web/core/modules/system/tests/src/Functional/Theme/ThemeInfoTest.php b/web/core/modules/system/tests/src/Functional/Theme/ThemeInfoTest.php
index 05fbca78b0..535ee04634 100644
--- a/web/core/modules/system/tests/src/Functional/Theme/ThemeInfoTest.php
+++ b/web/core/modules/system/tests/src/Functional/Theme/ThemeInfoTest.php
@@ -71,16 +71,16 @@ public function testStylesheets() {
// should work nevertheless.
$this->drupalGet('theme-test/info/stylesheets');
- $this->assertIdentical(1, count($this->xpath('//link[contains(@href, :href)]', [':href' => "$base/base-add.css"])), "$base/base-add.css found");
- $this->assertIdentical(0, count($this->xpath('//link[contains(@href, :href)]', [':href' => "base-remove.css"])), "base-remove.css not found");
+ $this->assertCount(1, $this->xpath('//link[contains(@href, :href)]', [':href' => "$base/base-add.css"]), "$base/base-add.css found");
+ $this->assertCount(0, $this->xpath('//link[contains(@href, :href)]', [':href' => "base-remove.css"]), "base-remove.css not found");
- $this->assertIdentical(1, count($this->xpath('//link[contains(@href, :href)]', [':href' => "$sub/sub-add.css"])), "$sub/sub-add.css found");
- $this->assertIdentical(0, count($this->xpath('//link[contains(@href, :href)]', [':href' => "sub-remove.css"])), "sub-remove.css not found");
- $this->assertIdentical(0, count($this->xpath('//link[contains(@href, :href)]', [':href' => "base-add.sub-remove.css"])), "base-add.sub-remove.css not found");
+ $this->assertCount(1, $this->xpath('//link[contains(@href, :href)]', [':href' => "$sub/sub-add.css"]), "$sub/sub-add.css found");
+ $this->assertCount(0, $this->xpath('//link[contains(@href, :href)]', [':href' => "sub-remove.css"]), "sub-remove.css not found");
+ $this->assertCount(0, $this->xpath('//link[contains(@href, :href)]', [':href' => "base-add.sub-remove.css"]), "base-add.sub-remove.css not found");
// Verify that CSS files with the same name are loaded from both the base theme and subtheme.
- $this->assertIdentical(1, count($this->xpath('//link[contains(@href, :href)]', [':href' => "$base/samename.css"])), "$base/samename.css found");
- $this->assertIdentical(1, count($this->xpath('//link[contains(@href, :href)]', [':href' => "$sub/samename.css"])), "$sub/samename.css found");
+ $this->assertCount(1, $this->xpath('//link[contains(@href, :href)]', [':href' => "$base/samename.css"]), "$base/samename.css found");
+ $this->assertCount(1, $this->xpath('//link[contains(@href, :href)]', [':href' => "$sub/samename.css"]), "$sub/samename.css found");
}
diff --git a/web/core/modules/system/tests/src/Functional/Theme/ThemeLegacyTest.php b/web/core/modules/system/tests/src/Functional/Theme/ThemeLegacyTest.php
new file mode 100644
index 0000000000..51de2eae46
--- /dev/null
+++ b/web/core/modules/system/tests/src/Functional/Theme/ThemeLegacyTest.php
@@ -0,0 +1,83 @@
+<?php
+
+namespace Drupal\Tests\system\Functional\Theme;
+
+use Drupal\Tests\BrowserTestBase;
+
+/**
+ * Tests legacy theme functions.
+ *
+ * @group Theme
+ * @group legacy
+ *
+ * @todo Remove in https://www.drupal.org/project/drupal/issues/3097889
+ */
+class ThemeLegacyTest extends BrowserTestBase {
+
+ /**
+ * Modules to enable.
+ *
+ * @var array
+ */
+ public static $modules = ['theme_test', 'theme_legacy_test'];
+
+ /**
+ * {@inheritdoc}
+ */
+ protected $defaultTheme = 'stark';
+
+ protected function setUp() {
+ parent::setUp();
+ \Drupal::service('theme_installer')->install(['test_legacy_theme']);
+ }
+
+ /**
+ * Ensures a theme template can override a theme function.
+ */
+ public function testFunctionOverride() {
+ $this->drupalGet('theme-test/function-template-overridden');
+ $this->assertText('Success: Template overrides theme function.', 'Theme function overridden by test_theme template.');
+ }
+
+ /**
+ * Tests that theme suggestion alter hooks work for theme functions.
+ */
+ public function testThemeFunctionSuggestionsAlter() {
+ $this->drupalGet('theme-test/function-suggestion-alter');
+ $this->assertText('Original theme function.');
+
+ // Install test_theme and test that themes can alter theme suggestions.
+ $this->config('system.theme')
+ ->set('default', 'test_legacy_theme')
+ ->save();
+ $this->drupalGet('theme-test/function-suggestion-alter');
+ $this->assertText('Theme function overridden based on new theme suggestion provided by the test_legacy_theme theme.');
+
+ // Enable the theme_suggestions_test module to test modules implementing
+ // suggestions alter hooks.
+ \Drupal::service('module_installer')->install(['theme_legacy_suggestions_test']);
+ $this->resetAll();
+ $this->drupalGet('theme-test/function-suggestion-alter');
+ $this->assertText('Theme function overridden based on new theme suggestion provided by a module.');
+ }
+
+ /**
+ * Tests that theme suggestion alter hooks work with theme hook includes.
+ */
+ public function testSuggestionsAlterInclude() {
+ // Check the original theme output.
+ $this->drupalGet('theme-test/suggestion-alter-include');
+ $this->assertText('Original function before altering theme suggestions.');
+
+ // Enable theme_suggestions_test module and make two requests to make sure
+ // the include file is always loaded. The file will always be included for
+ // the first request because the theme registry is being rebuilt.
+ \Drupal::service('module_installer')->install(['theme_legacy_suggestions_test']);
+ $this->resetAll();
+ $this->drupalGet('theme-test/suggestion-alter-include');
+ $this->assertText('Function suggested via suggestion alter hook found in include file.', 'Include file loaded for initial request.');
+ $this->drupalGet('theme-test/suggestion-alter-include');
+ $this->assertText('Function suggested via suggestion alter hook found in include file.', 'Include file loaded for second request.');
+ }
+
+}
diff --git a/web/core/modules/system/tests/src/Functional/Theme/ThemeSuggestionsAlterTest.php b/web/core/modules/system/tests/src/Functional/Theme/ThemeSuggestionsAlterTest.php
index c521f58e50..dcfdf15086 100644
--- a/web/core/modules/system/tests/src/Functional/Theme/ThemeSuggestionsAlterTest.php
+++ b/web/core/modules/system/tests/src/Functional/Theme/ThemeSuggestionsAlterTest.php
@@ -116,47 +116,6 @@ public function testSpecificSuggestionsAlter() {
$this->assertTrue(strpos($raw_content, 'theme_test_specific_suggestions__variant') < strpos($raw_content, 'theme_test_specific_suggestions__variant__foo'), 'Specific theme call is added to the suggestions array before the suggestions alter hook.');
}
- /**
- * Tests that theme suggestion alter hooks work for theme functions.
- */
- public function testThemeFunctionSuggestionsAlter() {
- $this->drupalGet('theme-test/function-suggestion-alter');
- $this->assertText('Original theme function.');
-
- // Install test_theme and test that themes can alter theme suggestions.
- $this->config('system.theme')
- ->set('default', 'test_theme')
- ->save();
- $this->drupalGet('theme-test/function-suggestion-alter');
- $this->assertText('Theme function overridden based on new theme suggestion provided by the test_theme theme.');
-
- // Enable the theme_suggestions_test module to test modules implementing
- // suggestions alter hooks.
- \Drupal::service('module_installer')->install(['theme_suggestions_test']);
- $this->resetAll();
- $this->drupalGet('theme-test/function-suggestion-alter');
- $this->assertText('Theme function overridden based on new theme suggestion provided by a module.');
- }
-
- /**
- * Tests that theme suggestion alter hooks work with theme hook includes.
- */
- public function testSuggestionsAlterInclude() {
- // Check the original theme output.
- $this->drupalGet('theme-test/suggestion-alter-include');
- $this->assertText('Original function before altering theme suggestions.');
-
- // Enable theme_suggestions_test module and make two requests to make sure
- // the include file is always loaded. The file will always be included for
- // the first request because the theme registry is being rebuilt.
- \Drupal::service('module_installer')->install(['theme_suggestions_test']);
- $this->resetAll();
- $this->drupalGet('theme-test/suggestion-alter-include');
- $this->assertText('Function suggested via suggestion alter hook found in include file.', 'Include file loaded for initial request.');
- $this->drupalGet('theme-test/suggestion-alter-include');
- $this->assertText('Function suggested via suggestion alter hook found in include file.', 'Include file loaded for second request.');
- }
-
/**
* Tests execution order of theme suggestion alter hooks.
*
diff --git a/web/core/modules/system/tests/src/Functional/Theme/ThemeTest.php b/web/core/modules/system/tests/src/Functional/Theme/ThemeTest.php
index fe4471a2fa..0a5f94cba7 100644
--- a/web/core/modules/system/tests/src/Functional/Theme/ThemeTest.php
+++ b/web/core/modules/system/tests/src/Functional/Theme/ThemeTest.php
@@ -37,7 +37,7 @@ protected function setUp() {
* Ensures preprocess functions run even for suggestion implementations.
*
* The theme hook used by this test has its base preprocess function in a
- * separate file, so this test also ensures that that file is correctly loaded
+ * separate file, so this test also ensures that the file is correctly loaded
* when needed.
*/
public function testPreprocessForSuggestions() {
@@ -45,7 +45,7 @@ public function testPreprocessForSuggestions() {
drupal_theme_rebuild();
for ($i = 0; $i < 2; $i++) {
$this->drupalGet('theme-test/suggestion');
- $this->assertText('Theme hook implementor=test_theme_theme_test__suggestion(). Foo=template_preprocess_theme_test', 'Theme hook suggestion ran with data available from a preprocess function for the base hook.');
+ $this->assertText('Theme hook implementor=theme-test--suggestion.html.twig. Foo=template_preprocess_theme_test', 'Theme hook suggestion ran with data available from a preprocess function for the base hook.');
}
}
@@ -56,7 +56,7 @@ public function testNegotiatorPriorities() {
$this->drupalGet('theme-test/priority');
// Ensure that the custom theme negotiator was not able to set the theme.
- $this->assertNoText('Theme hook implementor=test_theme_theme_test__suggestion(). Foo=template_preprocess_theme_test', 'Theme hook suggestion ran with data available from a preprocess function for the base hook.');
+ $this->assertNoText('Theme hook implementor=theme-test--suggestion.html.twig. Foo=template_preprocess_theme_test', 'Theme hook suggestion ran with data available from a preprocess function for the base hook.');
}
/**
@@ -82,7 +82,7 @@ public function testFrontPageThemeSuggestion() {
$suggestions = theme_get_suggestions(['user', 'login'], 'page');
// Set it back to not annoy the batch runner.
\Drupal::requestStack()->pop();
- $this->assertTrue(in_array('page__front', $suggestions), 'Front page template was suggested.');
+ $this->assertContains('page__front', $suggestions, 'Front page template was suggested.');
}
/**
@@ -141,14 +141,6 @@ public function testTemplateOverride() {
$this->assertText('Success: Template overridden.', 'Template overridden by defined \'template\' filename.');
}
- /**
- * Ensures a theme template can override a theme function.
- */
- public function testFunctionOverride() {
- $this->drupalGet('theme-test/function-template-overridden');
- $this->assertText('Success: Template overrides theme function.', 'Theme function overridden by test_theme template.');
- }
-
/**
* Tests that the page variable is not prematurely flattened.
*
@@ -158,7 +150,7 @@ public function testFunctionOverride() {
public function testPreprocessHtml() {
$this->drupalGet('');
$attributes = $this->xpath('/body[@theme_test_page_variable="Page variable is an array."]');
- $this->assertTrue(count($attributes) == 1, 'In template_preprocess_html(), the page variable is still an array (not rendered yet).');
+ $this->assertCount(1, $attributes, 'In template_preprocess_html(), the page variable is still an array (not rendered yet).');
$this->assertText('theme test page bottom markup', 'Modules are able to set the page bottom region.');
}
@@ -172,14 +164,14 @@ public function testRegionClass() {
$this->drupalPlaceBlock('system_main_block');
$this->drupalGet('');
$elements = $this->cssSelect(".region-sidebar-first.new_class");
- $this->assertEqual(count($elements), 1, 'New class found.');
+ $this->assertCount(1, $elements, 'New class found.');
}
/**
* Ensures suggestion preprocess functions run for default implementations.
*
* The theme hook used by this test has its base preprocess function in a
- * separate file, so this test also ensures that that file is correctly loaded
+ * separate file, so this test also ensures that the file is correctly loaded
* when needed.
*/
public function testSuggestionPreprocessForDefaults() {
diff --git a/web/core/modules/system/tests/src/Functional/Theme/ThemeTokenTest.php b/web/core/modules/system/tests/src/Functional/Theme/ThemeTokenTest.php
index c1d8f37d98..fe07bb50f3 100644
--- a/web/core/modules/system/tests/src/Functional/Theme/ThemeTokenTest.php
+++ b/web/core/modules/system/tests/src/Functional/Theme/ThemeTokenTest.php
@@ -53,7 +53,7 @@ public function testThemeToken() {
$settings = $this->getDrupalSettings();
$this->assertNotNull($settings['ajaxPageState']['theme_token']);
// The CSRF token is a 43 length string.
- $this->assertTrue(is_string($settings['ajaxPageState']['theme_token']));
+ $this->assertIsString($settings['ajaxPageState']['theme_token']);
$this->assertEqual(strlen($settings['ajaxPageState']['theme_token']), 43);
}
diff --git a/web/core/modules/system/tests/src/Functional/Theme/ThemeUiTest.php b/web/core/modules/system/tests/src/Functional/Theme/ThemeUiTest.php
new file mode 100644
index 0000000000..7fe799dea1
--- /dev/null
+++ b/web/core/modules/system/tests/src/Functional/Theme/ThemeUiTest.php
@@ -0,0 +1,321 @@
+<?php
+
+namespace Drupal\Tests\system\Functional\Theme;
+
+use Drupal\Tests\BrowserTestBase;
+
+/**
+ * Tests the theme UI.
+ *
+ * @group Theme
+ */
+class ThemeUiTest extends BrowserTestBase {
+
+ /**
+ * {@inheritdoc}
+ */
+ protected $defaultTheme = 'stark';
+
+ /**
+ * Modules used for testing.
+ *
+ * @var array
+ */
+ protected $testModules = [
+ 'help' => 'Help',
+ 'test_module_required_by_theme' => 'Test Module Required by Theme',
+ 'test_another_module_required_by_theme' => 'Test Another Module Required by Theme',
+ ];
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function setUp() {
+ parent::setUp();
+
+ $this->drupalLogin($this->drupalCreateUser([
+ 'administer themes',
+ 'administer modules',
+ ]));
+ }
+
+ /**
+ * Tests permissions for enabling themes depending on disabled modules.
+ */
+ public function testModulePermissions() {
+ // Log in as a user without permission to enable modules.
+ $this->drupalLogin($this->drupalCreateUser([
+ 'administer themes',
+ ]));
+ $this->drupalGet('admin/appearance');
+
+ // The links to install a theme that would enable modules should be replaced
+ // by this message.
+ $this->assertSession()->pageTextContains('This theme requires the listed modules to operate correctly. They must first be enabled by a user with permissions to do so.');
+
+ // The install page should not be reachable.
+ $this->drupalGet('admin/appearance/install?theme=test_theme_depending_on_modules');
+ $this->assertSession()->statusCodeEquals(404);
+
+ $this->drupalLogin($this->drupalCreateUser([
+ 'administer themes',
+ 'administer modules',
+ ]));
+ $this->drupalGet('admin/appearance');
+ $this->assertSession()->pageTextNotContains('This theme requires the listed modules to operate correctly. They must first be enabled by a user with permissions to do so.');
+ }
+
+ /**
+ * Tests installing a theme with module dependencies.
+ *
+ * @param string $theme_name
+ * The name of the theme being tested.
+ * @param string[] $first_modules
+ * Machine names of first modules to enable.
+ * @param string[] $second_modules
+ * Machine names of second modules to enable.
+ * @param string[] $required_by_messages
+ * Expected messages when attempting to uninstall $module_names.
+ * @param string $base_theme_to_uninstall
+ * The name of the theme $theme_name has set as a base theme.
+ * @param string[] $base_theme_module_names
+ * Machine names of the modules required by $base_theme_to_uninstall.
+ *
+ * @dataProvider providerTestThemeInstallWithModuleDependencies
+ */
+ public function testThemeInstallWithModuleDependencies($theme_name, array $first_modules, array $second_modules, array $required_by_messages, $base_theme_to_uninstall, array $base_theme_module_names) {
+ $assert_session = $this->assertSession();
+ $page = $this->getSession()->getPage();
+ $all_dependent_modules = array_merge($first_modules, $second_modules);
+ $this->drupalGet('admin/appearance');
+ $assert_module_enabled_message = function ($enabled_modules) {
+ $count = count($enabled_modules);
+ $module_enabled_text = $count === 1 ? "{$this->testModules[$enabled_modules[0]]} has been enabled." : $count . " modules have been enabled:";
+ $this->assertSession()->pageTextContains($module_enabled_text);
+ };
+ // All the modules should be listed as disabled.
+ foreach ($all_dependent_modules as $module) {
+ $expected_required_list_items[$module] = $this->testModules[$module] . " (disabled)";
+ }
+ $this->assertUninstallableTheme($expected_required_list_items, $theme_name);
+
+ // Enable the first group of dependee modules.
+ $first_module_form_post = [];
+ foreach ($first_modules as $module) {
+ $first_module_form_post["modules[$module][enable]"] = 1;
+ }
+ $this->drupalPostForm('admin/modules', $first_module_form_post, 'Install');
+ $assert_module_enabled_message($first_modules);
+
+ $this->drupalGet('admin/appearance');
+
+ // Confirm the theme is still uninstallable due to a remaining module
+ // dependency.
+ // The modules that have already been enabled will no longer be listed as
+ // disabled.
+ foreach ($first_modules as $module) {
+ $expected_required_list_items[$module] = $this->testModules[$module];
+ }
+ $this->assertUninstallableTheme($expected_required_list_items, $theme_name);
+
+ // Enable the second group of dependee modules.
+ $second_module_form_post = [];
+ foreach ($second_modules as $module) {
+ $second_module_form_post["modules[$module][enable]"] = 1;
+ }
+ $this->drupalPostForm('admin/modules', $second_module_form_post, 'Install');
+ $assert_module_enabled_message($second_modules);
+
+ // The theme should now be installable, so install it.
+ $this->drupalGet('admin/appearance');
+ $page->clickLink("Install $theme_name theme");
+ $assert_session->addressEquals('admin/appearance');
+ $assert_session->pageTextContains("The $theme_name theme has been installed");
+
+ // Confirm that the dependee modules can't be uninstalled because an enabled
+ // theme depends on them.
+ $this->drupalGet('admin/modules/uninstall');
+ foreach ($all_dependent_modules as $attribute) {
+ $assert_session->elementExists('css', "[name=\"uninstall[$attribute]\"][disabled]");
+ }
+ foreach ($required_by_messages as $selector => $message) {
+ $assert_session->elementTextContains('css', $selector, $message);
+ }
+
+ // Uninstall the theme that depends on the modules, and confirm the modules
+ // can now be uninstalled.
+ $this->uninstallTheme($theme_name);
+ $this->drupalGet('admin/modules/uninstall');
+
+ // Only attempt to uninstall modules not required by the base theme.
+ $modules_to_uninstall = array_diff($all_dependent_modules, $base_theme_module_names);
+ $this->uninstallModules($modules_to_uninstall);
+
+ if (!empty($base_theme_to_uninstall)) {
+ $this->uninstallTheme($base_theme_to_uninstall);
+ $this->drupalGet('admin/modules/uninstall');
+ $this->uninstallModules($base_theme_module_names);
+ }
+ }
+
+ /**
+ * Uninstalls modules via the admin UI.
+ *
+ * @param string[] $module_names
+ * An array of module machine names.
+ */
+ protected function uninstallModules(array $module_names) {
+ $assert_session = $this->assertSession();
+ $this->drupalGet('admin/modules/uninstall');
+ foreach ($module_names as $attribute) {
+ $assert_session->elementExists('css', "[name=\"uninstall[$attribute]\"]:not([disabled])");
+ }
+ $to_uninstall = [];
+ foreach ($module_names as $attribute) {
+ $to_uninstall["uninstall[$attribute]"] = 1;
+ }
+ if (!empty($to_uninstall)) {
+ $this->drupalPostForm('admin/modules/uninstall', $to_uninstall, 'Uninstall');
+ $assert_session->pageTextContains('The following modules will be completely uninstalled from your site, and all data from these modules will be lost!');
+ $assert_session->pageTextContains('Would you like to continue with uninstalling the above?');
+ foreach ($module_names as $module_name) {
+ $assert_session->pageTextContains($this->testModules[$module_name]);
+ }
+ $this->getSession()->getPage()->pressButton('Uninstall');
+ $assert_session->pageTextContains('The selected modules have been uninstalled.');
+ }
+ }
+
+ /**
+ * Uninstalls a theme via the admin UI.
+ *
+ * @param string $theme_name
+ * The theme name.
+ */
+ protected function uninstallTheme($theme_name) {
+ $this->drupalGet('admin/appearance');
+ $this->clickLink("Uninstall $theme_name theme");
+ $this->assertSession()->pageTextContains("The $theme_name theme has been uninstalled.");
+ }
+
+ /**
+ * Data provider for testThemeInstallWithModuleDependencies().
+ *
+ * @return array
+ * An array of arrays. Details on the specific elements can be found in the
+ * function body.
+ */
+ public function providerTestThemeInstallWithModuleDependencies() {
+ // Data provider values with the following keys:
+ // -'theme_name': The name of the theme being tested.
+ // -'first_modules': Array of module machine names to enable first.
+ // -'second_modules': Array of module machine names to enable second.
+ // -'required_by_messages': Array for checking the messages explaining why a
+ // module can't be uninstalled. The array key is the selector where the
+ // message should appear, the array value is the expected message.
+ // -'base_theme_to_uninstall': The name of a base theme that needs to be
+ // uninstalled before modules it depends on can be uninstalled.
+ // -'base_theme_module_names': Array of machine names of the modules
+ // required by base_theme_to_uninstall.
+ return [
+ 'test theme with a module dependency and base theme with a different module dependency' => [
+ 'theme_name' => 'Test Theme with a Module Dependency and Base Theme with a Different Module Dependency',
+ 'first_modules' => [
+ 'test_module_required_by_theme',
+ 'test_another_module_required_by_theme',
+ ],
+ 'second_modules' => [
+ 'help',
+ ],
+ 'required_by_messages' => [
+ '[data-drupal-selector="edit-test-another-module-required-by-theme"] .item-list' => 'Required by the theme: Test Theme Depending on Modules',
+ '[data-drupal-selector="edit-test-module-required-by-theme"] .item-list' => 'Required by the theme: Test Theme Depending on Modules',
+ '[data-drupal-selector="edit-help"] .item-list' => 'Required by the theme: Test Theme with a Module Dependency and Base Theme with a Different Module Dependency',
+ ],
+ 'base_theme_to_uninstall' => 'Test Theme Depending on Modules',
+ 'base_theme_module_names' => [
+ 'test_module_required_by_theme',
+ 'test_another_module_required_by_theme',
+ ],
+ ],
+ 'Test Theme Depending on Modules' => [
+ 'theme_name' => 'Test Theme Depending on Modules',
+ 'first_modules' => [
+ 'test_module_required_by_theme',
+ ],
+ 'second_modules' => [
+ 'test_another_module_required_by_theme',
+ ],
+ 'required_by_messages' => [
+ '[data-drupal-selector="edit-test-another-module-required-by-theme"] .item-list' => 'Required by the theme: Test Theme Depending on Modules',
+ '[data-drupal-selector="edit-test-module-required-by-theme"] .item-list' => 'Required by the theme: Test Theme Depending on Modules',
+ ],
+ 'base_theme_to_uninstall' => '',
+ 'base_theme_module_names' => [],
+ ],
+ 'test theme with a base theme depending on modules' => [
+ 'theme_name' => 'Test Theme with a Base Theme Depending on Modules',
+ 'first_modules' => [
+ 'test_module_required_by_theme',
+ ],
+ 'second_modules' => [
+ 'test_another_module_required_by_theme',
+ ],
+ 'required_by_messages' => [
+ '[data-drupal-selector="edit-test-another-module-required-by-theme"] .item-list' => 'Required by the theme: Test Theme Depending on Modules',
+ '[data-drupal-selector="edit-test-module-required-by-theme"] .item-list' => 'Required by the theme: Test Theme Depending on Modules',
+ ],
+ 'base_theme_to_uninstall' => 'Test Theme Depending on Modules',
+ 'base_theme_module_names' => [
+ 'test_module_required_by_theme',
+ 'test_another_module_required_by_theme',
+ ],
+ ],
+ ];
+ }
+
+ /**
+ * Checks related to uninstallable themes due to module dependencies.
+ *
+ * @param string[] $expected_requires_list_items
+ * The modules listed as being required to install the theme.
+ * @param string $theme_name
+ * The name of the theme.
+ */
+ protected function assertUninstallableTheme(array $expected_requires_list_items, $theme_name) {
+ $theme_container = $this->getSession()->getPage()->find('css', "h3:contains(\"$theme_name\")")->getParent();
+ $requires_list_items = $theme_container->findAll('css', '.theme-info__requires li');
+ $this->assertCount(count($expected_requires_list_items), $requires_list_items);
+
+ foreach ($requires_list_items as $key => $item) {
+ $this->assertContains($item->getText(), $expected_requires_list_items);
+ }
+
+ $incompatible = $theme_container->find('css', '.incompatible');
+ $expected_incompatible_text = 'This theme requires the listed modules to operate correctly. They must first be enabled via the Extend page.';
+ $this->assertSame($expected_incompatible_text, $incompatible->getText());
+ $this->assertFalse($theme_container->hasLink('Install Test Theme Depending on Modules theme'));
+ }
+
+ /**
+ * Tests installing a theme with missing module dependencies.
+ */
+ public function testInstallModuleWithMissingDependencies() {
+ $this->drupalGet('admin/appearance');
+ $theme_container = $this->getSession()->getPage()->find('css', 'h3:contains("Test Theme Depending on Nonexisting Module")')->getParent();
+ $this->assertStringContainsString('Requires: test_module_non_existing (missing)', $theme_container->getText());
+ $this->assertStringContainsString('This theme requires the listed modules to operate correctly.', $theme_container->getText());
+ }
+
+ /**
+ * Tests installing a theme with incompatible module dependencies.
+ */
+ public function testInstallModuleWithIncompatibleDependencies() {
+ $this->container->get('module_installer')->install(['test_module_compatible_constraint', 'test_module_incompatible_constraint']);
+ $this->drupalGet('admin/appearance');
+ $theme_container = $this->getSession()->getPage()->find('css', 'h3:contains("Test Theme Depending on Version Constrained Modules")')->getParent();
+ $this->assertStringContainsString('Requires: Test Module Theme Depends on with Compatible ConstraintTest Module Theme Depends on with Incompatible Constraint (>=8.x-2.x) (incompatible with version 8.x-1.8)', $theme_container->getText());
+ $this->assertStringContainsString('This theme requires the listed modules to operate correctly.', $theme_container->getText());
+ }
+
+}
diff --git a/web/core/modules/system/tests/src/Functional/Theme/TwigDebugMarkupTest.php b/web/core/modules/system/tests/src/Functional/Theme/TwigDebugMarkupTest.php
index 90e5cf842a..3f1646d360 100644
--- a/web/core/modules/system/tests/src/Functional/Theme/TwigDebugMarkupTest.php
+++ b/web/core/modules/system/tests/src/Functional/Theme/TwigDebugMarkupTest.php
@@ -51,19 +51,19 @@ public function testTwigDebugMarkup() {
$builder = \Drupal::entityTypeManager()->getViewBuilder('node');
$build = $builder->view($node);
$output = $renderer->renderRoot($build);
- $this->assertTrue(strpos($output, '<!-- THEME DEBUG -->') !== FALSE, 'Twig debug markup found in theme output when debug is enabled.');
- $this->assertTrue(strpos($output, "THEME HOOK: 'node'") !== FALSE, 'Theme call information found.');
- $this->assertTrue(strpos($output, '* node--1--full' . $extension . PHP_EOL . ' x node--1' . $extension . PHP_EOL . ' * node--page--full' . $extension . PHP_EOL . ' * node--page' . $extension . PHP_EOL . ' * node--full' . $extension . PHP_EOL . ' * node' . $extension) !== FALSE, 'Suggested template files found in order and node ID specific template shown as current template.');
- $this->assertContains(Html::escape('node--<script type="text/javascript">alert(\'yo\');</script>'), (string) $output);
+ $this->assertStringContainsString('<!-- THEME DEBUG -->', $output, 'Twig debug markup found in theme output when debug is enabled.');
+ $this->assertStringContainsString("THEME HOOK: 'node'", $output, 'Theme call information found.');
+ $this->assertStringContainsString('* node--1--full' . $extension . PHP_EOL . ' x node--1' . $extension . PHP_EOL . ' * node--page--full' . $extension . PHP_EOL . ' * node--page' . $extension . PHP_EOL . ' * node--full' . $extension . PHP_EOL . ' * node' . $extension, $output, 'Suggested template files found in order and node ID specific template shown as current template.');
+ $this->assertStringContainsString(Html::escape('node--<script type="text/javascript">alert(\'yo\');</script>'), (string) $output);
$template_filename = $templates['node__1']['path'] . '/' . $templates['node__1']['template'] . $extension;
- $this->assertTrue(strpos($output, "BEGIN OUTPUT from '$template_filename'") !== FALSE, 'Full path to current template file found.');
+ $this->assertStringContainsString("BEGIN OUTPUT from '$template_filename'", $output, 'Full path to current template file found.');
// Create another node and make sure the template suggestions shown in the
// debug markup are correct.
$node2 = $this->drupalCreateNode();
$build = $builder->view($node2);
$output = $renderer->renderRoot($build);
- $this->assertTrue(strpos($output, '* node--2--full' . $extension . PHP_EOL . ' * node--2' . $extension . PHP_EOL . ' * node--page--full' . $extension . PHP_EOL . ' * node--page' . $extension . PHP_EOL . ' * node--full' . $extension . PHP_EOL . ' x node' . $extension) !== FALSE, 'Suggested template files found in order and base template shown as current template.');
+ $this->assertStringContainsString('* node--2--full' . $extension . PHP_EOL . ' * node--2' . $extension . PHP_EOL . ' * node--page--full' . $extension . PHP_EOL . ' * node--page' . $extension . PHP_EOL . ' * node--full' . $extension . PHP_EOL . ' x node' . $extension, $output, 'Suggested template files found in order and base template shown as current template.');
// Create another node and make sure the template suggestions shown in the
// debug markup are correct.
@@ -71,8 +71,8 @@ public function testTwigDebugMarkup() {
$build = ['#theme' => 'node__foo__bar'];
$build += $builder->view($node3);
$output = $renderer->renderRoot($build);
- $this->assertTrue(strpos($output, "THEME HOOK: 'node__foo__bar'") !== FALSE, 'Theme call information found.');
- $this->assertTrue(strpos($output, '* node--foo--bar' . $extension . PHP_EOL . ' * node--foo' . $extension . PHP_EOL . ' * node--<script type="text/javascript">alert('yo');</script>' . $extension . PHP_EOL . ' * node--3--full' . $extension . PHP_EOL . ' * node--3' . $extension . PHP_EOL . ' * node--page--full' . $extension . PHP_EOL . ' * node--page' . $extension . PHP_EOL . ' * node--full' . $extension . PHP_EOL . ' x node' . $extension) !== FALSE, 'Suggested template files found in order and base template shown as current template.');
+ $this->assertStringContainsString("THEME HOOK: 'node__foo__bar'", $output, 'Theme call information found.');
+ $this->assertStringContainsString('* node--foo--bar' . $extension . PHP_EOL . ' * node--foo' . $extension . PHP_EOL . ' * node--<script type="text/javascript">alert('yo');</script>' . $extension . PHP_EOL . ' * node--3--full' . $extension . PHP_EOL . ' * node--3' . $extension . PHP_EOL . ' * node--page--full' . $extension . PHP_EOL . ' * node--page' . $extension . PHP_EOL . ' * node--full' . $extension . PHP_EOL . ' x node' . $extension, $output, 'Suggested template files found in order and base template shown as current template.');
// Disable debug, rebuild the service container, and clear all caches.
$parameters = $this->container->getParameter('twig.config');
@@ -83,7 +83,7 @@ public function testTwigDebugMarkup() {
$build = $builder->view($node);
$output = $renderer->renderRoot($build);
- $this->assertFalse(strpos($output, '<!-- THEME DEBUG -->') !== FALSE, 'Twig debug markup not found in theme output when debug is disabled.');
+ $this->assertStringNotContainsString('<!-- THEME DEBUG -->', $output, 'Twig debug markup not found in theme output when debug is disabled.');
}
}
diff --git a/web/core/modules/system/tests/src/Functional/Theme/TwigRegistryLoaderTest.php b/web/core/modules/system/tests/src/Functional/Theme/TwigRegistryLoaderTest.php
index c2c7642e2d..b2c19ae12f 100644
--- a/web/core/modules/system/tests/src/Functional/Theme/TwigRegistryLoaderTest.php
+++ b/web/core/modules/system/tests/src/Functional/Theme/TwigRegistryLoaderTest.php
@@ -38,8 +38,8 @@ protected function setUp() {
/**
* Checks to see if a value is a Twig template.
*/
- public function assertTwigTemplate($value, $message = '', $group = 'Other') {
- $this->assertTrue($value instanceof TemplateWrapper, $message, $group);
+ public function assertTwigTemplate($value, $message = '') {
+ $this->assertInstanceOf(TemplateWrapper::class, $value, $message);
}
/**
diff --git a/web/core/modules/system/tests/src/Functional/Theme/TwigSettingsTest.php b/web/core/modules/system/tests/src/Functional/Theme/TwigSettingsTest.php
index 2cc8e24d0c..cf517177ed 100644
--- a/web/core/modules/system/tests/src/Functional/Theme/TwigSettingsTest.php
+++ b/web/core/modules/system/tests/src/Functional/Theme/TwigSettingsTest.php
@@ -132,9 +132,9 @@ public function testTwigInlineWithAutoReload() {
$this->rebuildContainer();
$this->drupalGet('theme-test/inline-template-test');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->drupalGet('theme-test/inline-template-test');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
}
}
diff --git a/web/core/modules/system/tests/src/Functional/Theme/TwigTransTest.php b/web/core/modules/system/tests/src/Functional/Theme/TwigTransTest.php
index 9b93eb1d93..102f756bd5 100644
--- a/web/core/modules/system/tests/src/Functional/Theme/TwigTransTest.php
+++ b/web/core/modules/system/tests/src/Functional/Theme/TwigTransTest.php
@@ -113,7 +113,7 @@ public function testEmptyTwigTransTags() {
$this->fail('{% trans %}{% endtrans %} did not throw an exception.');
}
catch (\Twig_Error_Syntax $e) {
- $this->assertContains('{% trans %} tag cannot be empty', $e->getMessage(), '{% trans %}{% endtrans %} threw the expected exception.');
+ $this->assertStringContainsString('{% trans %} tag cannot be empty', $e->getMessage());
}
catch (\Exception $e) {
$this->fail('{% trans %}{% endtrans %} threw an unexpected exception.');
diff --git a/web/core/modules/system/tests/src/Functional/Update/DatabaseVersionCheckUpdateTest.php b/web/core/modules/system/tests/src/Functional/Update/DatabaseVersionCheckUpdateTest.php
new file mode 100644
index 0000000000..2d55d7fc23
--- /dev/null
+++ b/web/core/modules/system/tests/src/Functional/Update/DatabaseVersionCheckUpdateTest.php
@@ -0,0 +1,68 @@
+<?php
+
+namespace Drupal\Tests\system\Functional\Update;
+
+use Drupal\Core\Database\Database;
+use Drupal\Core\Url;
+use Drupal\Tests\BrowserTestBase;
+use Drupal\Tests\UpdatePathTestTrait;
+
+/**
+ * Tests that updates fail if the database does not meet the minimum version.
+ *
+ * @group Update
+ */
+class DatabaseVersionCheckUpdateTest extends BrowserTestBase {
+ use UpdatePathTestTrait;
+
+ /**
+ * {@inheritdoc}
+ */
+ protected $defaultTheme = 'stark';
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function setUp() {
+ parent::setUp();
+ $this->ensureUpdatesToRun();
+ }
+
+ /**
+ * Tests that updates fail if the database does not meet the minimum version.
+ */
+ public function testUpdate() {
+ if (Database::getConnection()->driver() !== 'mysql') {
+ $this->markTestSkipped('This test only works with the mysql driver');
+ }
+
+ // Use a database driver that reports a fake database version that does
+ // not meet requirements. Only change the necessary settings in the database
+ // settings array so that run-tests.sh continues to work.
+ $autoload = Database::findDriverAutoloadDirectory('Drupal\driver_test\Driver\Database\DrivertestMysqlDeprecatedVersion', \Drupal::root());
+ $settings['databases']['default']['default']['driver'] = (object) [
+ 'value' => 'DrivertestMysqlDeprecatedVersion',
+ 'required' => TRUE,
+ ];
+ $settings['databases']['default']['default']['namespace'] = (object) [
+ 'value' => 'Drupal\\driver_test\\Driver\\Database\\DrivertestMysqlDeprecatedVersion',
+ 'required' => TRUE,
+ ];
+ $settings['databases']['default']['default']['autoload'] = (object) [
+ 'value' => $autoload,
+ 'required' => TRUE,
+ ];
+ $settings['settings'] = [
+ 'update_free_access' => (object) [
+ 'value' => TRUE,
+ 'required' => TRUE,
+ ],
+ ];
+ $this->writeSettings($settings);
+
+ $this->drupalGet(Url::fromRoute('system.db_update'));
+ $this->assertSession()->pageTextContains('Errors found');
+ $this->assertSession()->pageTextContains('The database server version 5.5.2 is less than the minimum required version');
+ }
+
+}
diff --git a/web/core/modules/system/tests/src/Functional/Update/EntityUpdateInitialTest.php b/web/core/modules/system/tests/src/Functional/Update/EntityUpdateInitialTest.php
deleted file mode 100644
index 1d9a698b1b..0000000000
--- a/web/core/modules/system/tests/src/Functional/Update/EntityUpdateInitialTest.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-namespace Drupal\Tests\system\Functional\Update;
-
-use Drupal\FunctionalTests\Update\UpdatePathTestBase;
-
-/**
- * Tests handling of existing initial keys during updates.
- *
- * @see https://www.drupal.org/project/drupal/issues/2925550
- *
- * @group Update
- * @group legacy
- */
-class EntityUpdateInitialTest extends UpdatePathTestBase {
-
- /**
- * {@inheritdoc}
- */
- protected $defaultTheme = 'stark';
-
- /**
- * {@inheritdoc}
- */
- protected function setDatabaseDumpFiles() {
- $this->databaseDumpFiles = [
- __DIR__ . '/../../../fixtures/update/drupal-8.0.0-rc1-filled.standard.entity_test_update.php.gz',
- __DIR__ . '/../../../fixtures/update/drupal-8.entity-test-initial.php',
- ];
- }
-
- /**
- * Tests that a pre-existing initial key in the field schema is not a change.
- */
- public function testInitialIsIgnored() {
- $this->runUpdates();
- }
-
-}
diff --git a/web/core/modules/system/tests/src/Functional/Update/IdentifierFieldSchemaTypeUpdateTest.php b/web/core/modules/system/tests/src/Functional/Update/IdentifierFieldSchemaTypeUpdateTest.php
new file mode 100644
index 0000000000..9acc92437d
--- /dev/null
+++ b/web/core/modules/system/tests/src/Functional/Update/IdentifierFieldSchemaTypeUpdateTest.php
@@ -0,0 +1,63 @@
+<?php
+
+namespace Drupal\Tests\system\Functional\Update;
+
+use Drupal\FunctionalTests\Update\UpdatePathTestBase;
+
+/**
+ * Tests the upgrade path for updating the stored type of identifier fields.
+ *
+ * @see https://www.drupal.org/node/2928906
+ *
+ * @group Update
+ * @group legacy
+ */
+class IdentifierFieldSchemaTypeUpdateTest extends UpdatePathTestBase {
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function setDatabaseDumpFiles() {
+ $this->databaseDumpFiles = [
+ __DIR__ . '/../../../fixtures/update/drupal-8.8.0.bare.standard.php.gz',
+ ];
+ }
+
+ /**
+ * Tests system_update_8901().
+ */
+ public function testSystemUpdate8901() {
+ // The installed field storage schema is wrong before running the update.
+ $key_value_store = \Drupal::keyValue('entity.storage_schema.sql');
+ $id_schema = $key_value_store->get('node.field_schema_data.nid', []);
+ $revision_id_schema = $key_value_store->get('node.field_schema_data.vid', []);
+
+ $this->assertEquals('int', $id_schema['node']['fields']['nid']['type']);
+ $this->assertEquals('int', $id_schema['node_revision']['fields']['nid']['type']);
+ $this->assertEquals('int', $revision_id_schema['node']['fields']['vid']['type']);
+ $this->assertEquals('int', $revision_id_schema['node_revision']['fields']['vid']['type']);
+
+ $this->runUpdates();
+
+ // Now check that the schema has been corrected.
+ $id_schema = $key_value_store->get('node.field_schema_data.nid', []);
+ $revision_id_schema = $key_value_store->get('node.field_schema_data.vid', []);
+
+ $this->assertEquals('serial', $id_schema['node']['fields']['nid']['type']);
+ $this->assertEquals('int', $id_schema['node_revision']['fields']['nid']['type']);
+ $this->assertEquals('int', $revision_id_schema['node']['fields']['vid']['type']);
+ $this->assertEquals('serial', $revision_id_schema['node_revision']['fields']['vid']['type']);
+
+ // Check that creating and loading a node still works as expected.
+ $node_storage = \Drupal::entityTypeManager()->getStorage('node');
+ $node = $node_storage->create([
+ 'title' => 'Test update',
+ 'type' => 'article',
+ ]);
+ $node->save();
+
+ $node = $node_storage->load($node->id());
+ $this->assertEquals('Test update', $node->label());
+ }
+
+}
diff --git a/web/core/modules/system/tests/src/Functional/Update/MenuTreeSerializationTitleTest.php b/web/core/modules/system/tests/src/Functional/Update/MenuTreeSerializationTitleTest.php
index d9572b06e2..368fa2f238 100644
--- a/web/core/modules/system/tests/src/Functional/Update/MenuTreeSerializationTitleTest.php
+++ b/web/core/modules/system/tests/src/Functional/Update/MenuTreeSerializationTitleTest.php
@@ -58,9 +58,9 @@ public function testUpdate() {
// Verify that all the links from system module have a been updated with
// a TranslatableMarkup as title and description due to the rebuild.
if (strpos($link->id, 'system.') === 0) {
- $this->assertTrue($title instanceof TranslatableMarkup, get_class($title));
+ $this->assertInstanceOf(TranslatableMarkup::class, $title);
if ($description) {
- $this->assertTrue($description instanceof TranslatableMarkup, get_class($description));
+ $this->assertInstanceOf(TranslatableMarkup::class, $description);
}
}
}
diff --git a/web/core/modules/system/tests/src/Functional/Update/UpdatePathWithBrokenRoutingFilledTest.php b/web/core/modules/system/tests/src/Functional/Update/UpdatePathWithBrokenRoutingFilledTest.php
deleted file mode 100644
index 2f3287a3b3..0000000000
--- a/web/core/modules/system/tests/src/Functional/Update/UpdatePathWithBrokenRoutingFilledTest.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-namespace Drupal\Tests\system\Functional\Update;
-
-use Drupal\FunctionalTests\Update\UpdatePathTestBase;
-
-/**
- * Runs UpdatePathWithBrokenRoutingTest with a dump filled with content.
- *
- * @group Update
- * @group legacy
- */
-class UpdatePathWithBrokenRoutingFilledTest extends UpdatePathTestBase {
-
- /**
- * {@inheritdoc}
- */
- protected $defaultTheme = 'stark';
-
- /**
- * {@inheritdoc}
- */
- protected function setDatabaseDumpFiles() {
- $this->databaseDumpFiles = [
- __DIR__ . '/../../../../tests/fixtures/update/drupal-8.8.0.filled.standard.php.gz',
- __DIR__ . '/../../../../tests/fixtures/update/drupal-8.broken_routing.php',
- ];
- }
-
- /**
- * Tests running update.php with some form of broken routing.
- */
- public function testWithBrokenRouting() {
- // Simulate a broken router, and make sure the front page is
- // inaccessible.
- \Drupal::state()->set('update_script_test_broken_inbound', TRUE);
- \Drupal::service('cache_tags.invalidator')->invalidateTags(['route_match', 'rendered']);
- $this->drupalGet('<front>');
- $this->assertResponse(500);
-
- $this->runUpdates();
-
- // Remove the simulation of the broken router, and make sure we can get to
- // the front page again.
- \Drupal::state()->set('update_script_test_broken_inbound', FALSE);
- $this->drupalGet('<front>');
- $this->assertResponse(200);
- }
-
-}
diff --git a/web/core/modules/system/tests/src/Functional/Update/BrokenCacheUpdateTest.php b/web/core/modules/system/tests/src/Functional/UpdateSystem/BrokenCacheUpdateTest.php
similarity index 97%
rename from web/core/modules/system/tests/src/Functional/Update/BrokenCacheUpdateTest.php
rename to web/core/modules/system/tests/src/Functional/UpdateSystem/BrokenCacheUpdateTest.php
index d66c31029c..920b45446b 100644
--- a/web/core/modules/system/tests/src/Functional/Update/BrokenCacheUpdateTest.php
+++ b/web/core/modules/system/tests/src/Functional/UpdateSystem/BrokenCacheUpdateTest.php
@@ -1,6 +1,6 @@
<?php
-namespace Drupal\Tests\system\Functional\Update;
+namespace Drupal\Tests\system\Functional\UpdateSystem;
use Drupal\Core\Database\Database;
use Drupal\Tests\BrowserTestBase;
diff --git a/web/core/modules/system/tests/src/Functional/Update/DependencyHookInvocationTest.php b/web/core/modules/system/tests/src/Functional/UpdateSystem/DependencyHookInvocationTest.php
similarity index 96%
rename from web/core/modules/system/tests/src/Functional/Update/DependencyHookInvocationTest.php
rename to web/core/modules/system/tests/src/Functional/UpdateSystem/DependencyHookInvocationTest.php
index d967fa86f5..7edbe56b31 100644
--- a/web/core/modules/system/tests/src/Functional/Update/DependencyHookInvocationTest.php
+++ b/web/core/modules/system/tests/src/Functional/UpdateSystem/DependencyHookInvocationTest.php
@@ -1,6 +1,6 @@
<?php
-namespace Drupal\Tests\system\Functional\Update;
+namespace Drupal\Tests\system\Functional\UpdateSystem;
use Drupal\Tests\BrowserTestBase;
diff --git a/web/core/modules/system/tests/src/Functional/Update/DependencyMissingTest.php b/web/core/modules/system/tests/src/Functional/UpdateSystem/DependencyMissingTest.php
similarity index 96%
rename from web/core/modules/system/tests/src/Functional/Update/DependencyMissingTest.php
rename to web/core/modules/system/tests/src/Functional/UpdateSystem/DependencyMissingTest.php
index b7fced809c..84f781dd10 100644
--- a/web/core/modules/system/tests/src/Functional/Update/DependencyMissingTest.php
+++ b/web/core/modules/system/tests/src/Functional/UpdateSystem/DependencyMissingTest.php
@@ -1,6 +1,6 @@
<?php
-namespace Drupal\Tests\system\Functional\Update;
+namespace Drupal\Tests\system\Functional\UpdateSystem;
use Drupal\Tests\BrowserTestBase;
diff --git a/web/core/modules/system/tests/src/Functional/Update/DependencyOrderingTest.php b/web/core/modules/system/tests/src/Functional/UpdateSystem/DependencyOrderingTest.php
similarity index 91%
rename from web/core/modules/system/tests/src/Functional/Update/DependencyOrderingTest.php
rename to web/core/modules/system/tests/src/Functional/UpdateSystem/DependencyOrderingTest.php
index 649f9c93b5..0e1616c4ae 100644
--- a/web/core/modules/system/tests/src/Functional/Update/DependencyOrderingTest.php
+++ b/web/core/modules/system/tests/src/Functional/UpdateSystem/DependencyOrderingTest.php
@@ -1,6 +1,6 @@
<?php
-namespace Drupal\Tests\system\Functional\Update;
+namespace Drupal\Tests\system\Functional\UpdateSystem;
use Drupal\Tests\BrowserTestBase;
@@ -16,7 +16,12 @@ class DependencyOrderingTest extends BrowserTestBase {
*
* @var array
*/
- public static $modules = ['update_test_0', 'update_test_1', 'update_test_2', 'update_test_3'];
+ public static $modules = [
+ 'update_test_0',
+ 'update_test_1',
+ 'update_test_2',
+ 'update_test_3',
+ ];
/**
* {@inheritdoc}
diff --git a/web/core/modules/system/tests/src/Functional/UpdateSystem/EntityUpdateInitialTest.php b/web/core/modules/system/tests/src/Functional/UpdateSystem/EntityUpdateInitialTest.php
new file mode 100644
index 0000000000..1c148b11a8
--- /dev/null
+++ b/web/core/modules/system/tests/src/Functional/UpdateSystem/EntityUpdateInitialTest.php
@@ -0,0 +1,63 @@
+<?php
+
+namespace Drupal\Tests\system\Functional\UpdateSystem;
+
+use Drupal\Core\Database\Database;
+use Drupal\Tests\BrowserTestBase;
+use Drupal\Tests\UpdatePathTestTrait;
+
+/**
+ * Tests handling of existing initial keys during updates.
+ *
+ * @see https://www.drupal.org/project/drupal/issues/2925550
+ *
+ * @group Update
+ */
+class EntityUpdateInitialTest extends BrowserTestBase {
+ use UpdatePathTestTrait;
+
+ /**
+ * {@inheritdoc}
+ */
+ protected $defaultTheme = 'stark';
+
+ /**
+ * {@inheritdoc}
+ */
+ protected static $modules = ['entity_test_update'];
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function setUp() {
+ parent::setUp();
+ $this->ensureUpdatesToRun();
+ $connection = Database::getConnection();
+
+ // Simulate an entity type that had previously set an initial key schema for
+ // a field.
+ $schema = $connection->select('key_value')
+ ->fields('key_value', ['value'])
+ ->condition('collection', 'entity.storage_schema.sql')
+ ->condition('name', 'entity_test_update.field_schema_data.name')
+ ->execute()
+ ->fetchField();
+
+ $schema = unserialize($schema);
+ $schema['entity_test_update']['fields']['name']['initial'] = 'test';
+
+ $connection->update('key_value')
+ ->fields(['value' => serialize($schema)])
+ ->condition('collection', 'entity.storage_schema.sql')
+ ->condition('name', 'entity_test_update.field_schema_data.name')
+ ->execute();
+ }
+
+ /**
+ * Tests that a pre-existing initial key in the field schema is not a change.
+ */
+ public function testInitialIsIgnored() {
+ $this->runUpdates();
+ }
+
+}
diff --git a/web/core/modules/system/tests/src/Functional/Update/InvalidUpdateHookTest.php b/web/core/modules/system/tests/src/Functional/UpdateSystem/InvalidUpdateHookTest.php
similarity index 89%
rename from web/core/modules/system/tests/src/Functional/Update/InvalidUpdateHookTest.php
rename to web/core/modules/system/tests/src/Functional/UpdateSystem/InvalidUpdateHookTest.php
index 51fb4d2807..c3771718d5 100644
--- a/web/core/modules/system/tests/src/Functional/Update/InvalidUpdateHookTest.php
+++ b/web/core/modules/system/tests/src/Functional/UpdateSystem/InvalidUpdateHookTest.php
@@ -1,6 +1,6 @@
<?php
-namespace Drupal\Tests\system\Functional\Update;
+namespace Drupal\Tests\system\Functional\UpdateSystem;
use Drupal\Tests\BrowserTestBase;
use Drupal\Tests\RequirementsPageTrait;
@@ -20,7 +20,11 @@ class InvalidUpdateHookTest extends BrowserTestBase {
*
* @var array
*/
- public static $modules = ['update_test_invalid_hook', 'update_script_test', 'dblog'];
+ public static $modules = [
+ 'update_test_invalid_hook',
+ 'update_script_test',
+ 'dblog',
+ ];
/**
* {@inheritdoc}
diff --git a/web/core/modules/system/tests/src/Functional/Update/NoPreExistingSchemaUpdateTest.php b/web/core/modules/system/tests/src/Functional/UpdateSystem/NoPreExistingSchemaUpdateTest.php
similarity index 58%
rename from web/core/modules/system/tests/src/Functional/Update/NoPreExistingSchemaUpdateTest.php
rename to web/core/modules/system/tests/src/Functional/UpdateSystem/NoPreExistingSchemaUpdateTest.php
index 5a723d69dd..c39a930ace 100644
--- a/web/core/modules/system/tests/src/Functional/Update/NoPreExistingSchemaUpdateTest.php
+++ b/web/core/modules/system/tests/src/Functional/UpdateSystem/NoPreExistingSchemaUpdateTest.php
@@ -1,10 +1,11 @@
<?php
-namespace Drupal\Tests\system\Functional\Update;
+namespace Drupal\Tests\system\Functional\UpdateSystem;
use Drupal\Core\Database\Database;
+use Drupal\Core\Url;
use Drupal\Tests\BrowserTestBase;
-use Drupal\Tests\UpdatePathTestTrait;
+use Drupal\Tests\RequirementsPageTrait;
/**
* Tries to update a module which has no pre-existing schema.
@@ -13,7 +14,7 @@
* @group legacy
*/
class NoPreExistingSchemaUpdateTest extends BrowserTestBase {
- use UpdatePathTestTrait;
+ use RequirementsPageTrait;
protected function setUp() {
parent::setUp();
@@ -44,12 +45,28 @@ public function testNoPreExistingSchema() {
$this->assertArrayNotHasKey('update_test_no_preexisting', $schema);
$this->assertFalse(\Drupal::state()->get('update_test_no_preexisting_update_8001', FALSE));
- $this->runUpdates();
+ $update_url = Url::fromRoute('system.db_update');
+ require_once $this->root . '/core/includes/update.inc';
+ // The site might be broken at the time so logging in using the UI might
+ // not work, so we use the API itself.
+ $this->writeSettings([
+ 'settings' => [
+ 'update_free_access' => (object) [
+ 'value' => TRUE,
+ 'required' => TRUE,
+ ],
+ ],
+ ]);
+
+ $this->drupalGet($update_url);
+ $this->updateRequirementsProblem();
$schema = \Drupal::keyValue('system.schema')->getAll();
$this->assertArrayHasKey('update_test_no_preexisting', $schema);
$this->assertEquals('8001', $schema['update_test_no_preexisting']);
- $this->assertTrue(\Drupal::state()->get('update_test_no_preexisting_update_8001', FALSE));
+ // The schema version has been fixed, but the update was never run.
+ $this->assertFalse(\Drupal::state()->get('update_test_no_preexisting_update_8001', FALSE));
+ $this->assertSession()->pageTextContains('Schema information for module update_test_no_preexisting was missing from the database. You should manually review the module updates and your database to check if any updates have been skipped up to, and including, update_test_no_preexisting_update_8001().');
}
}
diff --git a/web/core/modules/system/tests/src/Functional/Update/RebuildScriptTest.php b/web/core/modules/system/tests/src/Functional/UpdateSystem/RebuildScriptTest.php
similarity index 94%
rename from web/core/modules/system/tests/src/Functional/Update/RebuildScriptTest.php
rename to web/core/modules/system/tests/src/Functional/UpdateSystem/RebuildScriptTest.php
index da036ad6e6..26ba2a3e7b 100644
--- a/web/core/modules/system/tests/src/Functional/Update/RebuildScriptTest.php
+++ b/web/core/modules/system/tests/src/Functional/UpdateSystem/RebuildScriptTest.php
@@ -1,6 +1,6 @@
<?php
-namespace Drupal\Tests\system\Functional\Update;
+namespace Drupal\Tests\system\Functional\UpdateSystem;
use Drupal\Core\Url;
use Drupal\Tests\BrowserTestBase;
diff --git a/web/core/modules/system/tests/src/Functional/Update/UpdateCacheTest.php b/web/core/modules/system/tests/src/Functional/UpdateSystem/UpdateCacheTest.php
similarity index 95%
rename from web/core/modules/system/tests/src/Functional/Update/UpdateCacheTest.php
rename to web/core/modules/system/tests/src/Functional/UpdateSystem/UpdateCacheTest.php
index 0dc56602c3..4243995987 100644
--- a/web/core/modules/system/tests/src/Functional/Update/UpdateCacheTest.php
+++ b/web/core/modules/system/tests/src/Functional/UpdateSystem/UpdateCacheTest.php
@@ -1,6 +1,6 @@
<?php
-namespace Drupal\Tests\system\Functional\Update;
+namespace Drupal\Tests\system\Functional\UpdateSystem;
use Drupal\Core\Url;
use Drupal\Tests\BrowserTestBase;
diff --git a/web/core/modules/system/tests/src/Functional/UpdateSystem/UpdatePathLastRemovedTest.php b/web/core/modules/system/tests/src/Functional/UpdateSystem/UpdatePathLastRemovedTest.php
new file mode 100644
index 0000000000..9b6cc77a4e
--- /dev/null
+++ b/web/core/modules/system/tests/src/Functional/UpdateSystem/UpdatePathLastRemovedTest.php
@@ -0,0 +1,75 @@
+<?php
+
+namespace Drupal\Tests\system\Functional\UpdateSystem;
+
+use Drupal\Core\Url;
+use Drupal\Tests\BrowserTestBase;
+use Drupal\Tests\UpdatePathTestTrait;
+
+/**
+ * Tests that modules can define their last removed update function.
+ *
+ * @group system
+ */
+class UpdatePathLastRemovedTest extends BrowserTestBase {
+ use UpdatePathTestTrait;
+
+ /**
+ * {@inheritdoc}
+ */
+ protected static $modules = ['update_test_last_removed'];
+
+ /**
+ * {@inheritdoc}
+ */
+ protected $defaultTheme = 'stark';
+
+ /**
+ * URL for the upgrade script.
+ *
+ * @var string
+ */
+ protected $updateUrl;
+
+ /**
+ * A user account with upgrade permission.
+ *
+ * @var \Drupal\user\UserInterface
+ */
+ protected $updateUser;
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function setUp() {
+ parent::setUp();
+ require_once $this->root . '/core/includes/update.inc';
+
+ $this->updateUrl = Url::fromRoute('system.db_update');
+ $this->updateUser = $this->drupalCreateUser(['administer software updates']);
+ }
+
+ /**
+ * Tests that a module with a too old schema version can not be updated.
+ */
+ public function testLastRemovedVersion() {
+ drupal_set_installed_schema_version('update_test_last_removed', 8000);
+
+ // Access the update page with a schema version that is too old for the test
+ // module.
+ $this->drupalLogin($this->updateUser);
+ $this->drupalGet($this->updateUrl);
+ $assert_session = $this->assertSession();
+ $assert_session->pageTextContains('Requirements problem');
+ $assert_session->pageTextContains('Unsupported schema version: Update test with hook_update_last_removed() implementation');
+ $assert_session->pageTextContains('The installed version of the Update test with hook_update_last_removed() implementation module is too old to update. Update to an intermediate version first (last removed version: 8002, installed version: 8000).');
+ $assert_session->linkNotExists('Continue');
+
+ // Set the expected schema version, updates are successful now.
+ drupal_set_installed_schema_version('update_test_last_removed', 8002);
+
+ $this->runUpdates();
+ $this->assertEquals(8003, drupal_get_installed_schema_version('update_test_last_removed'));
+ }
+
+}
diff --git a/web/core/modules/system/tests/src/Functional/Update/UpdatePathNewDependencyTest.php b/web/core/modules/system/tests/src/Functional/UpdateSystem/UpdatePathNewDependencyTest.php
similarity index 91%
rename from web/core/modules/system/tests/src/Functional/Update/UpdatePathNewDependencyTest.php
rename to web/core/modules/system/tests/src/Functional/UpdateSystem/UpdatePathNewDependencyTest.php
index 3a673962d6..6830c3b7f5 100644
--- a/web/core/modules/system/tests/src/Functional/Update/UpdatePathNewDependencyTest.php
+++ b/web/core/modules/system/tests/src/Functional/UpdateSystem/UpdatePathNewDependencyTest.php
@@ -1,6 +1,6 @@
<?php
-namespace Drupal\Tests\system\Functional\Update;
+namespace Drupal\Tests\system\Functional\UpdateSystem;
use Drupal\Tests\BrowserTestBase;
use Drupal\Tests\UpdatePathTestTrait;
@@ -46,8 +46,8 @@ public function testUpdateNewDependency() {
// Running the updates enables the dependency.
$this->runUpdates();
- $this->assertTrue(array_key_exists('new_dependency_test', $this->container->get('config.factory')->get('core.extension')->get('module')));
- $this->assertTrue(array_key_exists('new_dependency_test_with_service', $this->container->get('config.factory')->get('core.extension')->get('module')));
+ $this->assertArrayHasKey('new_dependency_test', $this->container->get('config.factory')->get('core.extension')->get('module'));
+ $this->assertArrayHasKey('new_dependency_test_with_service', $this->container->get('config.factory')->get('core.extension')->get('module'));
// Tests that the new services are available and working as expected.
$this->assertEquals('Hello', $this->container->get('new_dependency_test_with_service.service')->greet());
diff --git a/web/core/modules/system/tests/src/Functional/Update/UpdatePathTestBaseFilledTest.php b/web/core/modules/system/tests/src/Functional/UpdateSystem/UpdatePathTestBaseFilledTest.php
similarity index 97%
rename from web/core/modules/system/tests/src/Functional/Update/UpdatePathTestBaseFilledTest.php
rename to web/core/modules/system/tests/src/Functional/UpdateSystem/UpdatePathTestBaseFilledTest.php
index e938bbc6b2..254a9d95ce 100644
--- a/web/core/modules/system/tests/src/Functional/Update/UpdatePathTestBaseFilledTest.php
+++ b/web/core/modules/system/tests/src/Functional/UpdateSystem/UpdatePathTestBaseFilledTest.php
@@ -1,6 +1,6 @@
<?php
-namespace Drupal\Tests\system\Functional\Update;
+namespace Drupal\Tests\system\Functional\UpdateSystem;
use Drupal\FunctionalTests\Update\UpdatePathTestBaseTest;
use Drupal\node\Entity\Node;
@@ -12,7 +12,6 @@
*
* @group #slow
* @group Update
- * @group legacy
*/
class UpdatePathTestBaseFilledTest extends UpdatePathTestBaseTest {
@@ -126,7 +125,7 @@ public function testUpdatedSite() {
$this->assertText('Test 1');
$this->assertRaw('0.01');
$this->drupalPostForm('node/8/edit', [], 'Save (this translation)');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->drupalGet('node/8/edit', ['language' => $spanish]);
$this->assertText('Test title Spanish');
$this->assertText('Test body Spanish');
@@ -191,7 +190,7 @@ public function testUpdatedSite() {
$this->drupalGet('admin/config/content/formats');
$this->assertText('Test text format');
$this->drupalGet('admin/config/content/formats/manage/test_text_format');
- $this->assertResponse('200');
+ $this->assertSession()->statusCodeEquals(200);
// Make sure our feed still exists.
$this->drupalGet('admin/config/services/aggregator');
@@ -263,7 +262,7 @@ public function testUpdatedSite() {
$this->drupalGet('admin/structure/display-modes/view');
$this->assertText('New view mode');
$this->drupalGet('admin/structure/display-modes/view/manage/node.new_view_mode');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Make sure our other language is still there.
$this->drupalGet('admin/config/regional/language');
@@ -283,7 +282,7 @@ public function testUpdatedSite() {
// Make sure our custom responsive image style exists.
$this->drupalGet('admin/config/media/responsive-image-style/test');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertText('Test');
// Make sure our custom shortcut exists.
@@ -324,7 +323,7 @@ public function testUpdatedSite() {
$this->assertText('Test root term');
$this->assertText('Test child term');
$this->drupalGet('taxonomy/term/3');
- $this->assertResponse('200');
+ $this->assertSession()->statusCodeEquals(200);
// Make sure the terms are still translated.
$this->drupalGet('taxonomy/term/2/translations');
diff --git a/web/core/modules/system/tests/src/Functional/Update/UpdatePathTestJavaScriptTest.php b/web/core/modules/system/tests/src/Functional/UpdateSystem/UpdatePathTestJavaScriptTest.php
similarity index 95%
rename from web/core/modules/system/tests/src/Functional/Update/UpdatePathTestJavaScriptTest.php
rename to web/core/modules/system/tests/src/Functional/UpdateSystem/UpdatePathTestJavaScriptTest.php
index 28f727a7e6..4f53e9a2bf 100644
--- a/web/core/modules/system/tests/src/Functional/Update/UpdatePathTestJavaScriptTest.php
+++ b/web/core/modules/system/tests/src/Functional/UpdateSystem/UpdatePathTestJavaScriptTest.php
@@ -1,6 +1,6 @@
<?php
-namespace Drupal\Tests\system\Functional\Update;
+namespace Drupal\Tests\system\Functional\UpdateSystem;
use Drupal\Tests\BrowserTestBase;
use Drupal\Tests\UpdatePathTestTrait;
@@ -9,7 +9,6 @@
* Tests the presence of JavaScript at update.php.
*
* @group Update
- * @group legacy
*/
class UpdatePathTestJavaScriptTest extends BrowserTestBase {
use UpdatePathTestTrait;
diff --git a/web/core/modules/system/tests/src/Functional/Update/UpdatePathWithBrokenRoutingTest.php b/web/core/modules/system/tests/src/Functional/UpdateSystem/UpdatePathWithBrokenRoutingTest.php
similarity index 87%
rename from web/core/modules/system/tests/src/Functional/Update/UpdatePathWithBrokenRoutingTest.php
rename to web/core/modules/system/tests/src/Functional/UpdateSystem/UpdatePathWithBrokenRoutingTest.php
index 1faee31db8..d394d4803b 100644
--- a/web/core/modules/system/tests/src/Functional/Update/UpdatePathWithBrokenRoutingTest.php
+++ b/web/core/modules/system/tests/src/Functional/UpdateSystem/UpdatePathWithBrokenRoutingTest.php
@@ -1,6 +1,6 @@
<?php
-namespace Drupal\Tests\system\Functional\Update;
+namespace Drupal\Tests\system\Functional\UpdateSystem;
use Drupal\Core\Url;
use Drupal\Tests\BrowserTestBase;
@@ -36,7 +36,7 @@ public function testWithBrokenRouting() {
\Drupal::state()->set('update_script_test_broken_inbound', TRUE);
$this->resetAll();
$this->drupalGet('<front>');
- $this->assertResponse(500);
+ $this->assertSession()->statusCodeEquals(500);
$this->runUpdates(Url::fromRoute('system.db_update', [], ['path_processing' => FALSE]));
@@ -44,7 +44,7 @@ public function testWithBrokenRouting() {
// the front page again.
\Drupal::state()->set('update_script_test_broken_inbound', FALSE);
$this->drupalGet('<front>');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
}
}
diff --git a/web/core/modules/system/tests/src/Functional/Update/UpdatePostUpdateFailingTest.php b/web/core/modules/system/tests/src/Functional/UpdateSystem/UpdatePostUpdateFailingTest.php
similarity index 97%
rename from web/core/modules/system/tests/src/Functional/Update/UpdatePostUpdateFailingTest.php
rename to web/core/modules/system/tests/src/Functional/UpdateSystem/UpdatePostUpdateFailingTest.php
index a645cb457c..0e51e45d55 100644
--- a/web/core/modules/system/tests/src/Functional/Update/UpdatePostUpdateFailingTest.php
+++ b/web/core/modules/system/tests/src/Functional/UpdateSystem/UpdatePostUpdateFailingTest.php
@@ -1,6 +1,6 @@
<?php
-namespace Drupal\Tests\system\Functional\Update;
+namespace Drupal\Tests\system\Functional\UpdateSystem;
use Drupal\Core\Database\Database;
use Drupal\Tests\BrowserTestBase;
diff --git a/web/core/modules/system/tests/src/Functional/Update/UpdatePostUpdateTest.php b/web/core/modules/system/tests/src/Functional/UpdateSystem/UpdatePostUpdateTest.php
similarity index 97%
rename from web/core/modules/system/tests/src/Functional/Update/UpdatePostUpdateTest.php
rename to web/core/modules/system/tests/src/Functional/UpdateSystem/UpdatePostUpdateTest.php
index 2a18336364..83996e12b8 100644
--- a/web/core/modules/system/tests/src/Functional/Update/UpdatePostUpdateTest.php
+++ b/web/core/modules/system/tests/src/Functional/UpdateSystem/UpdatePostUpdateTest.php
@@ -1,6 +1,6 @@
<?php
-namespace Drupal\Tests\system\Functional\Update;
+namespace Drupal\Tests\system\Functional\UpdateSystem;
use Drupal\Component\Render\FormattableMarkup;
use Drupal\Core\Database\Database;
@@ -55,7 +55,7 @@ protected function setUp() {
->condition('name', 'core.extension')
->execute();
- // Mimic the behaviour of ModuleInstaller::install() for removed post
+ // Mimic the behavior of ModuleInstaller::install() for removed post
// updates. Don't include the actual post updates because we want them to
// run.
$key_value = \Drupal::service('keyvalue');
diff --git a/web/core/modules/system/tests/src/Functional/UpdateSystem/UpdateRemovedPostUpdateTest.php b/web/core/modules/system/tests/src/Functional/UpdateSystem/UpdateRemovedPostUpdateTest.php
index 096b6473c8..96f1559a05 100644
--- a/web/core/modules/system/tests/src/Functional/UpdateSystem/UpdateRemovedPostUpdateTest.php
+++ b/web/core/modules/system/tests/src/Functional/UpdateSystem/UpdateRemovedPostUpdateTest.php
@@ -63,7 +63,7 @@ protected function setUp() {
* Tests hook_post_update_NAME().
*/
public function testRemovedPostUpdate() {
- // Mimic the behaviour of ModuleInstaller::install().
+ // Mimic the behavior of ModuleInstaller::install().
$key_value = \Drupal::service('keyvalue');
$existing_updates = $key_value->get('post_update')->get('existing_updates', []);
diff --git a/web/core/modules/system/tests/src/Functional/Update/UpdateSchemaTest.php b/web/core/modules/system/tests/src/Functional/UpdateSystem/UpdateSchemaTest.php
similarity index 97%
rename from web/core/modules/system/tests/src/Functional/Update/UpdateSchemaTest.php
rename to web/core/modules/system/tests/src/Functional/UpdateSystem/UpdateSchemaTest.php
index 193704b2f6..c075e1848b 100644
--- a/web/core/modules/system/tests/src/Functional/Update/UpdateSchemaTest.php
+++ b/web/core/modules/system/tests/src/Functional/UpdateSystem/UpdateSchemaTest.php
@@ -1,6 +1,6 @@
<?php
-namespace Drupal\Tests\system\Functional\Update;
+namespace Drupal\Tests\system\Functional\UpdateSystem;
use Drupal\Core\Database\Database;
use Drupal\Core\Url;
diff --git a/web/core/modules/system/tests/src/Functional/Update/UpdateScriptTest.php b/web/core/modules/system/tests/src/Functional/UpdateSystem/UpdateScriptTest.php
similarity index 80%
rename from web/core/modules/system/tests/src/Functional/Update/UpdateScriptTest.php
rename to web/core/modules/system/tests/src/Functional/UpdateSystem/UpdateScriptTest.php
index 1acbfc2467..7c3c3bff15 100644
--- a/web/core/modules/system/tests/src/Functional/Update/UpdateScriptTest.php
+++ b/web/core/modules/system/tests/src/Functional/UpdateSystem/UpdateScriptTest.php
@@ -1,6 +1,6 @@
<?php
-namespace Drupal\Tests\system\Functional\Update;
+namespace Drupal\Tests\system\Functional\UpdateSystem;
use Drupal\Component\Serialization\Yaml;
use Drupal\Core\Url;
@@ -24,7 +24,13 @@ class UpdateScriptTest extends BrowserTestBase {
*
* @var array
*/
- public static $modules = ['update_script_test', 'dblog', 'language'];
+ protected static $modules = [
+ 'update_script_test',
+ 'dblog',
+ 'language',
+ 'test_module_required_by_theme',
+ 'test_another_module_required_by_theme',
+ ];
/**
* {@inheritdoc}
@@ -61,7 +67,11 @@ protected function setUp() {
parent::setUp();
$this->updateUrl = Url::fromRoute('system.db_update');
$this->statusReportUrl = Url::fromRoute('system.status');
- $this->updateUser = $this->drupalCreateUser(['administer software updates', 'access site in maintenance mode']);
+ $this->updateUser = $this->drupalCreateUser([
+ 'administer software updates',
+ 'access site in maintenance mode',
+ 'administer themes',
+ ]);
}
/**
@@ -72,7 +82,7 @@ public function testUpdateAccess() {
$regular_user = $this->drupalCreateUser();
$this->drupalLogin($regular_user);
$this->drupalGet($this->updateUrl, ['external' => TRUE]);
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
// Check that a link to the update page is not accessible to regular users.
$this->drupalGet('/update-script-test/database-updates-menu-item');
@@ -81,7 +91,7 @@ public function testUpdateAccess() {
// Try accessing update.php as an anonymous user.
$this->drupalLogout();
$this->drupalGet($this->updateUrl, ['external' => TRUE]);
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
// Check that a link to the update page is not accessible to anonymous
// users.
@@ -91,7 +101,7 @@ public function testUpdateAccess() {
// Access the update page with the proper permission.
$this->drupalLogin($this->updateUser);
$this->drupalGet($this->updateUrl, ['external' => TRUE]);
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Check that a link to the update page is accessible to users with proper
// permissions.
@@ -101,7 +111,7 @@ public function testUpdateAccess() {
// Access the update page as user 1.
$this->drupalLogin($this->rootUser);
$this->drupalGet($this->updateUrl, ['external' => TRUE]);
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Check that a link to the update page is accessible to user 1.
$this->drupalGet('/update-script-test/database-updates-menu-item');
@@ -175,6 +185,31 @@ public function testRequirements() {
$this->drupalGet($this->updateUrl, ['external' => TRUE]);
$this->assertSession()->assertEscaped('Node (Version <7.x-0.0-dev required)');
$this->assertSession()->responseContains('Update script test requires this module and version. Currently using Node version ' . \Drupal::VERSION);
+
+ // Test that issues with modules that themes depend on are properly
+ // displayed.
+ $this->assertSession()->responseNotContains('Test Module Required by Theme');
+ $this->drupalGet('admin/appearance');
+ $this->getSession()->getPage()->clickLink('Install Test Theme Depending on Modules theme');
+ $this->assertSession()->addressEquals('admin/appearance');
+ $this->assertSession()->pageTextContains('The Test Theme Depending on Modules theme has been installed');
+
+ // Ensure that when a theme depends on a module and that module's
+ // requirements change, errors are displayed in the same manner as modules
+ // depending on other modules.
+ \Drupal::state()->set('test_theme_depending_on_modules.system_info_alter', ['dependencies' => ['test_module_required_by_theme (<7.x-0.0-dev)']]);
+ $this->drupalGet($this->updateUrl, ['external' => TRUE]);
+ $this->assertSession()->assertEscaped('Test Module Required by Theme (Version <7.x-0.0-dev required)');
+ $this->assertSession()->responseContains('Test Theme Depending on Modules requires this module and version. Currently using Test Module Required by Theme version ' . \Drupal::VERSION);
+
+ // Ensure that when a theme is updated to depend on an unavailable module,
+ // errors are displayed in the same manner as modules depending on other
+ // modules.
+ \Drupal::state()->set('test_theme_depending_on_modules.system_info_alter', ['dependencies' => ['a_module_theme_needs_that_does_not_exist']]);
+ $this->drupalGet($this->updateUrl, ['external' => TRUE]);
+ $this->assertSession()->responseContains('a_module_theme_needs_that_does_not_exist (Missing)');
+ $this->assertSession()->responseContains('Test Theme Depending on Modules requires this module.');
+
}
/**
@@ -365,6 +400,68 @@ public function testMissingExtension($extension_type) {
$this->assertUpdateWithNoError($test_error_text, $extension_type, $extension_machine_name);
}
+ /**
+ * Tests that orphan schemas are handled properly.
+ */
+ public function testOrphanedSchemaEntries() {
+ $this->drupalLogin($this->updateUser);
+
+ // Insert a bogus value into the system.schema key/value storage for a
+ // nonexistent module. This replicates what would happen if you had a module
+ // installed and then completely remove it from the filesystem and clear it
+ // out of the core.extension config list without uninstalling it cleanly.
+ \Drupal::keyValue('system.schema')->set('my_already_removed_module', 8000);
+
+ // Visit update.php and make sure we can click through to the 'No pending
+ // updates' page without errors.
+ $assert_session = $this->assertSession();
+ $this->drupalGet($this->updateUrl, ['external' => TRUE]);
+ $this->updateRequirementsProblem();
+ $this->clickLink(t('Continue'));
+ // Make sure there are no pending updates (or uncaught exceptions).
+ $status_messages = $this->xpath('//div[@aria-label="Status message"]');
+ $this->assertCount(1, $status_messages);
+ $this->assertStringContainsString('No pending updates.', $status_messages[0]->getText());
+ // Verify that we warn the admin about this situation.
+ $warning_messages = $this->xpath('//div[@aria-label="Warning message"]');
+ $this->assertCount(1, $warning_messages);
+ $this->assertEquals('Warning message Module my_already_removed_module has an entry in the system.schema key/value storage, but is missing from your site. More information about this error.', $warning_messages[0]->getText());
+
+ // Try again with another orphaned entry, this time for a test module that
+ // does exist in the filesystem.
+ \Drupal::keyValue('system.schema')->delete('my_already_removed_module');
+ \Drupal::keyValue('system.schema')->set('update_test_0', 8000);
+ $this->drupalGet($this->updateUrl, ['external' => TRUE]);
+ $this->updateRequirementsProblem();
+ $this->clickLink(t('Continue'));
+ // There should not be any pending updates.
+ $status_messages = $this->xpath('//div[@aria-label="Status message"]');
+ $this->assertCount(1, $status_messages);
+ $this->assertStringContainsString('No pending updates.', $status_messages[0]->getText());
+ // But verify that we warn the admin about this situation.
+ $warning_messages = $this->xpath('//div[@aria-label="Warning message"]');
+ $this->assertCount(1, $warning_messages);
+ $this->assertEquals('Warning message Module update_test_0 has an entry in the system.schema key/value storage, but is not installed. More information about this error.', $warning_messages[0]->getText());
+
+ // Finally, try with both kinds of orphans and make sure we get both warnings.
+ \Drupal::keyValue('system.schema')->set('my_already_removed_module', 8000);
+ $this->drupalGet($this->updateUrl, ['external' => TRUE]);
+ $this->updateRequirementsProblem();
+ $this->clickLink(t('Continue'));
+ // There still should not be any pending updates.
+ $status_messages = $this->xpath('//div[@aria-label="Status message"]');
+ $this->assertCount(1, $status_messages);
+ $this->assertStringContainsString('No pending updates.', $status_messages[0]->getText());
+ // Verify that we warn the admin about both orphaned entries.
+ $warning_messages = $this->xpath('//div[@aria-label="Warning message"]');
+ $this->assertCount(1, $warning_messages);
+ $warning_message_text = $warning_messages[0]->getText();
+ $this->assertStringContainsString('Module update_test_0 has an entry in the system.schema key/value storage, but is not installed. More information about this error.', $warning_message_text);
+ $this->assertStringNotContainsString('Module update_test_0 has an entry in the system.schema key/value storage, but is missing from your site.', $warning_message_text);
+ $this->assertStringContainsString('Module my_already_removed_module has an entry in the system.schema key/value storage, but is missing from your site. More information about this error.', $warning_message_text);
+ $this->assertStringNotContainsString('Module my_already_removed_module has an entry in the system.schema key/value storage, but is not installed.', $warning_message_text);
+ }
+
/**
* Data provider for testMissingExtension().
*/
@@ -425,7 +522,7 @@ public function testNoUpdateFunctionality() {
$this->assertNoLink('Administration pages');
$this->assertEmpty($this->xpath('//main//a[contains(@href, :href)]', [':href' => 'update.php']));
$this->clickLink('Front page');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Click through update.php with 'access administration pages' permission.
$admin_user = $this->drupalCreateUser(['administer software updates', 'access administration pages']);
@@ -437,7 +534,7 @@ public function testNoUpdateFunctionality() {
$this->assertLink('Administration pages');
$this->assertEmpty($this->xpath('//main//a[contains(@href, :href)]', [':href' => 'update.php']));
$this->clickLink('Administration pages');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
}
/**
@@ -473,7 +570,7 @@ public function testSuccessfulUpdateFunctionality() {
$this->assertLink('Administration pages');
$this->assertEmpty($this->xpath('//main//a[contains(@href, :href)]', [':href' => 'update.php']));
$this->clickLink('Administration pages');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
}
/**
@@ -525,7 +622,7 @@ public function testSuccessfulMultilingualUpdateFunctionality() {
// Visit status report page and ensure, that link to update.php has no path prefix set.
$this->drupalGet('en/admin/reports/status', ['external' => TRUE]);
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertLinkByHref('/update.php');
$this->assertNoLinkByHref('en/update.php');
@@ -541,7 +638,24 @@ public function testSuccessfulMultilingualUpdateFunctionality() {
$this->assertLink('Administration pages');
$this->assertEmpty($this->xpath('//main//a[contains(@href, :href)]', [':href' => 'update.php']));
$this->clickLink('Administration pages');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
+ }
+
+ /**
+ * Tests maintenance mode link on update.php.
+ */
+ public function testMaintenanceModeLink() {
+ $admin_user = $this->drupalCreateUser([
+ 'administer software updates',
+ 'access administration pages',
+ 'administer site configuration',
+ ]);
+ $this->drupalLogin($admin_user);
+ $this->drupalGet($this->updateUrl, ['external' => TRUE]);
+ $this->assertSession()->statusCodeEquals(200);
+ $this->clickLink('maintenance mode');
+ $this->assertSession()->statusCodeEquals(200);
+ $this->assertEquals('Maintenance mode', $this->cssSelect('main h1')[0]->getText());
}
/**
@@ -586,7 +700,7 @@ protected function runUpdates($maintenance_mode) {
// Verify the front page can be visited following the upgrade.
$this->clickLink('Front page');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
}
/**
diff --git a/web/core/modules/system/tests/src/Functional/Update/UpdatesWith7xTest.php b/web/core/modules/system/tests/src/Functional/UpdateSystem/UpdatesWith7xTest.php
similarity index 96%
rename from web/core/modules/system/tests/src/Functional/Update/UpdatesWith7xTest.php
rename to web/core/modules/system/tests/src/Functional/UpdateSystem/UpdatesWith7xTest.php
index 6b08e685ea..0eda9dd86d 100644
--- a/web/core/modules/system/tests/src/Functional/Update/UpdatesWith7xTest.php
+++ b/web/core/modules/system/tests/src/Functional/UpdateSystem/UpdatesWith7xTest.php
@@ -1,6 +1,6 @@
<?php
-namespace Drupal\Tests\system\Functional\Update;
+namespace Drupal\Tests\system\Functional\UpdateSystem;
use Drupal\Tests\BrowserTestBase;
use Drupal\Tests\RequirementsPageTrait;
diff --git a/web/core/modules/system/tests/src/FunctionalJavascript/Form/RebuildTest.php b/web/core/modules/system/tests/src/FunctionalJavascript/Form/RebuildTest.php
index 9b38a16258..4c00b0940a 100644
--- a/web/core/modules/system/tests/src/FunctionalJavascript/Form/RebuildTest.php
+++ b/web/core/modules/system/tests/src/FunctionalJavascript/Form/RebuildTest.php
@@ -98,7 +98,7 @@ public function testPreserveFormActionAfterAJAX() {
$this->drupalGet('node/add/page');
$page->find('css', '[value="Add another item"]')->click();
$this->assertSession()->assertWaitOnAjaxRequest();
- $this->assertTrue(count($this->xpath('//div[contains(@class, "field--name-field-ajax-test")]//input[@type="text"]')) == 2, 'AJAX submission succeeded.');
+ $this->assertCount(2, $this->xpath('//div[contains(@class, "field--name-field-ajax-test")]//input[@type="text"]'), 'AJAX submission succeeded.');
// Submit the form with the non-Ajax "Save" button, leaving the file field
// blank to trigger a validation error, and ensure that a validation error
@@ -113,11 +113,11 @@ public function testPreserveFormActionAfterAJAX() {
// Ensure that the form contains two items in the multi-valued field, so we
// know we're testing a form that was correctly retrieved from cache.
- $this->assertTrue(count($this->xpath('//form[contains(@id, "node-page-form")]//div[contains(@class, "js-form-item-field-ajax-test")]//input[@type="text"]')) == 2, 'Form retained its state from cache.');
+ $this->assertCount(2, $this->xpath('//form[contains(@id, "node-page-form")]//div[contains(@class, "js-form-item-field-ajax-test")]//input[@type="text"]'), 'Form retained its state from cache.');
// Ensure that the form's action is correct.
$forms = $this->xpath('//form[contains(@class, "node-page-form")]');
- $this->assertEquals(1, count($forms));
+ $this->assertCount(1, $forms);
// Strip query params off the action before asserting.
$url = parse_url($forms[0]->getAttribute('action'))['path'];
$this->assertEquals(Url::fromRoute('node.add', ['node_type' => 'page'])->toString(), $url);
diff --git a/web/core/modules/system/tests/src/FunctionalJavascript/Form/TriggeringElementTest.php b/web/core/modules/system/tests/src/FunctionalJavascript/Form/TriggeringElementTest.php
index 3a3840d2d2..6eaf98cde5 100644
--- a/web/core/modules/system/tests/src/FunctionalJavascript/Form/TriggeringElementTest.php
+++ b/web/core/modules/system/tests/src/FunctionalJavascript/Form/TriggeringElementTest.php
@@ -22,7 +22,7 @@ class TriggeringElementTest extends WebDriverTestBase {
protected $defaultTheme = 'stark';
/**
- * Tests the the triggering element when no button information is included.
+ * Tests the triggering element when no button information is included.
*
* Test the determination of the triggering element when no button
* information is included in the POST data, as is sometimes the case when
diff --git a/web/core/modules/system/tests/src/FunctionalJavascript/FrameworkTest.php b/web/core/modules/system/tests/src/FunctionalJavascript/FrameworkTest.php
index f2ff799f88..8e1d576ca1 100644
--- a/web/core/modules/system/tests/src/FunctionalJavascript/FrameworkTest.php
+++ b/web/core/modules/system/tests/src/FunctionalJavascript/FrameworkTest.php
@@ -44,8 +44,8 @@ public function testLazyLoad() {
// Verify that the base page doesn't have the settings and files that are to
// be lazy loaded as part of the next requests.
$this->assertTrue(!isset($original_settings[$expected['setting_name']]), new FormattableMarkup('Page originally lacks the %setting, as expected.', ['%setting' => $expected['setting_name']]));
- $this->assertTrue(!in_array($expected['library_1'], $original_libraries), new FormattableMarkup('Page originally lacks the %library library, as expected.', ['%library' => $expected['library_1']]));
- $this->assertTrue(!in_array($expected['library_2'], $original_libraries), new FormattableMarkup('Page originally lacks the %library library, as expected.', ['%library' => $expected['library_2']]));
+ $this->assertNotContains($expected['library_1'], $original_libraries, new FormattableMarkup('Page originally lacks the %library library, as expected.', ['%library' => $expected['library_1']]));
+ $this->assertNotContains($expected['library_2'], $original_libraries, new FormattableMarkup('Page originally lacks the %library library, as expected.', ['%library' => $expected['library_2']]));
// Submit the AJAX request without triggering files getting added.
$page->pressButton('Submit');
@@ -55,8 +55,8 @@ public function testLazyLoad() {
// Verify the setting was not added when not expected.
$this->assertTrue(!isset($new_settings[$expected['setting_name']]), new FormattableMarkup('Page still lacks the %setting, as expected.', ['%setting' => $expected['setting_name']]));
- $this->assertTrue(!in_array($expected['library_1'], $new_libraries), new FormattableMarkup('Page still lacks the %library library, as expected.', ['%library' => $expected['library_1']]));
- $this->assertTrue(!in_array($expected['library_2'], $new_libraries), new FormattableMarkup('Page still lacks the %library library, as expected.', ['%library' => $expected['library_2']]));
+ $this->assertNotContains($expected['library_1'], $new_libraries, new FormattableMarkup('Page still lacks the %library library, as expected.', ['%library' => $expected['library_1']]));
+ $this->assertNotContains($expected['library_2'], $new_libraries, new FormattableMarkup('Page still lacks the %library library, as expected.', ['%library' => $expected['library_2']]));
// Submit the AJAX request and trigger adding files.
$page->checkField('add_files');
@@ -71,7 +71,7 @@ public function testLazyLoad() {
// Verify the expected CSS file was added, both to drupalSettings, and as
// the second AJAX command for inclusion into the HTML.
- $this->assertTrue(in_array($expected['library_1'], $new_libraries), new FormattableMarkup('Page state now has the %library library.', ['%library' => $expected['library_1']]));
+ $this->assertContains($expected['library_1'], $new_libraries, new FormattableMarkup('Page state now has the %library library.', ['%library' => $expected['library_1']]));
// Verify the expected JS file was added, both to drupalSettings, and as
// the third AJAX command for inclusion into the HTML. By testing for an
@@ -79,7 +79,7 @@ public function testLazyLoad() {
// unexpected JavaScript code, such as a jQuery.extend() that would
// potentially clobber rather than properly merge settings, didn't
// accidentally get added.
- $this->assertTrue(in_array($expected['library_2'], $new_libraries), new FormattableMarkup('Page state now has the %library library.', ['%library' => $expected['library_2']]));
+ $this->assertContains($expected['library_2'], $new_libraries, new FormattableMarkup('Page state now has the %library library.', ['%library' => $expected['library_2']]));
}
/**
diff --git a/web/core/modules/system/tests/src/FunctionalJavascript/ModalRendererTest.php b/web/core/modules/system/tests/src/FunctionalJavascript/ModalRendererTest.php
index e7ce0429ef..3b09f353d4 100644
--- a/web/core/modules/system/tests/src/FunctionalJavascript/ModalRendererTest.php
+++ b/web/core/modules/system/tests/src/FunctionalJavascript/ModalRendererTest.php
@@ -30,8 +30,8 @@ public function testModalRenderer() {
$this->clickLink('Normal Modal!');
// Neither of the wide modals should have been used.
$style = $session_assert->waitForElementVisible('css', '.ui-dialog')->getAttribute('style');
- $this->assertNotContains('700px', $style);
- $this->assertNotContains('1000px', $style);
+ $this->assertStringNotContainsString('700px', $style);
+ $this->assertStringNotContainsString('1000px', $style);
$this->drupalGet('/dialog_renderer-test-links');
$this->clickLink('Wide Modal!');
$this->assertNotEmpty($session_assert->waitForElementVisible('css', '.ui-dialog[style*="width: 700px;"]'));
diff --git a/web/core/modules/system/tests/src/Kernel/Action/ActionTest.php b/web/core/modules/system/tests/src/Kernel/Action/ActionTest.php
index dad380079f..edabd0a28e 100644
--- a/web/core/modules/system/tests/src/Kernel/Action/ActionTest.php
+++ b/web/core/modules/system/tests/src/Kernel/Action/ActionTest.php
@@ -54,19 +54,19 @@ public function testOperations() {
// Create an instance of the 'save entity' action.
$action = $this->actionManager->createInstance('action_test_save_entity');
- $this->assertTrue($action instanceof ActionInterface, 'The action implements the correct interface.');
+ $this->assertInstanceOf(ActionInterface::class, $action);
// Create a new unsaved user.
$name = $this->randomMachineName();
$user_storage = $this->container->get('entity_type.manager')->getStorage('user');
$account = $user_storage->create(['name' => $name, 'bundle' => 'user']);
$loaded_accounts = $user_storage->loadMultiple();
- $this->assertEqual(count($loaded_accounts), 0);
+ $this->assertCount(0, $loaded_accounts);
// Execute the 'save entity' action.
$action->execute($account);
$loaded_accounts = $user_storage->loadMultiple();
- $this->assertEqual(count($loaded_accounts), 1);
+ $this->assertCount(1, $loaded_accounts);
$account = reset($loaded_accounts);
$this->assertEqual($name, $account->label());
}
diff --git a/web/core/modules/system/tests/src/Kernel/Common/SystemListingTest.php b/web/core/modules/system/tests/src/Kernel/Common/SystemListingTest.php
index 1ff6a84550..45965df89a 100644
--- a/web/core/modules/system/tests/src/Kernel/Common/SystemListingTest.php
+++ b/web/core/modules/system/tests/src/Kernel/Common/SystemListingTest.php
@@ -34,7 +34,7 @@ public function testDirectoryPrecedence() {
foreach ($expected_directories as $module => $directories) {
foreach ($directories as $directory) {
$filename = "$directory/$module/$module.info.yml";
- $this->assertTrue(file_exists($this->root . '/' . $filename), new FormattableMarkup('@filename exists.', ['@filename' => $filename]));
+ $this->assertFileExists($this->root . '/' . $filename);
}
}
diff --git a/web/core/modules/system/tests/src/Kernel/Entity/EntityReferenceSelectionReferenceableTest.php b/web/core/modules/system/tests/src/Kernel/Entity/EntityReferenceSelectionReferenceableTest.php
index 54de7bf0b2..3900ae7914 100644
--- a/web/core/modules/system/tests/src/Kernel/Entity/EntityReferenceSelectionReferenceableTest.php
+++ b/web/core/modules/system/tests/src/Kernel/Entity/EntityReferenceSelectionReferenceableTest.php
@@ -41,7 +41,14 @@ class EntityReferenceSelectionReferenceableTest extends KernelTestBase {
/**
* {@inheritdoc}
*/
- public static $modules = ['system', 'user', 'field', 'entity_reference', 'node', 'entity_test'];
+ public static $modules = [
+ 'system',
+ 'user',
+ 'field',
+ 'entity_reference',
+ 'node',
+ 'entity_test',
+ ];
/**
* {@inheritdoc}
@@ -119,7 +126,7 @@ public function testReferenceablesWithNoLabelKey($match, $match_operator, $limit
// entity labels.
// @see \Drupal\Core\Entity\EntityReferenceSelection\SelectionInterface::getReferenceableEntities()
$item = is_string($item) ? Html::escape($item) : $item;
- $this->assertTrue(array_search($item, $referenceables[$this->bundle]) !== FALSE);
+ $this->assertContains($item, $referenceables[$this->bundle]);
}
// Test ::countReferenceableEntities().
diff --git a/web/core/modules/system/tests/src/Kernel/Extension/ModuleHandlerTest.php b/web/core/modules/system/tests/src/Kernel/Extension/ModuleHandlerTest.php
index fca57c4e7e..6fa6d2bfb4 100644
--- a/web/core/modules/system/tests/src/Kernel/Extension/ModuleHandlerTest.php
+++ b/web/core/modules/system/tests/src/Kernel/Extension/ModuleHandlerTest.php
@@ -324,7 +324,8 @@ public function testModuleMetaData() {
// Use 0 if mtime isn't present, to avoid an array index notice.
$test_mtime = !empty($modules['system']->info['mtime']) ? $modules['system']->info['mtime'] : 0;
// Ensure the mtime field contains a number that is greater than zero.
- $this->assertTrue(is_numeric($test_mtime) && ($test_mtime > 0), 'The system.info.yml file modification time field contains a timestamp.');
+ $this->assertIsNumeric($test_mtime);
+ $this->assertGreaterThan(0, $test_mtime);
}
/**
@@ -355,7 +356,8 @@ public function testThemeMetaData() {
// Use 0 if mtime isn't present, to avoid an array index notice.
$test_mtime = !empty($themes['bartik']->info['mtime']) ? $themes['bartik']->info['mtime'] : 0;
// Ensure the mtime field contains a number that is greater than zero.
- $this->assertTrue(is_numeric($test_mtime) && ($test_mtime > 0), 'The bartik.info.yml file modification time field contains a timestamp.');
+ $this->assertIsNumeric($test_mtime);
+ $this->assertGreaterThan(0, $test_mtime);
}
/**
diff --git a/web/core/modules/system/tests/src/Kernel/Installer/InstallerDependenciesResolutionTest.php b/web/core/modules/system/tests/src/Kernel/Installer/InstallerDependenciesResolutionTest.php
index d4d4c3194a..abe29c3ae9 100644
--- a/web/core/modules/system/tests/src/Kernel/Installer/InstallerDependenciesResolutionTest.php
+++ b/web/core/modules/system/tests/src/Kernel/Installer/InstallerDependenciesResolutionTest.php
@@ -32,11 +32,11 @@ public function testDependenciesResolution() {
]);
$message = $info['required_modules']['description']->render();
- $this->assertContains('Fictional', $message);
- $this->assertContains('Missing_module1', $message);
- $this->assertContains('Missing_module2', $message);
- $this->assertNotContains('Block', $message);
- $this->assertNotContains('Node', $message);
+ $this->assertStringContainsString('Fictional', $message);
+ $this->assertStringContainsString('Missing_module1', $message);
+ $this->assertStringContainsString('Missing_module2', $message);
+ $this->assertStringNotContainsString('Block', $message);
+ $this->assertStringNotContainsString('Node', $message);
}
}
diff --git a/web/core/modules/system/tests/src/Kernel/Installer/UninstallKernelTest.php b/web/core/modules/system/tests/src/Kernel/Installer/UninstallKernelTest.php
index f3591538c8..099d8ac612 100644
--- a/web/core/modules/system/tests/src/Kernel/Installer/UninstallKernelTest.php
+++ b/web/core/modules/system/tests/src/Kernel/Installer/UninstallKernelTest.php
@@ -16,7 +16,14 @@ class UninstallKernelTest extends KernelTestBase {
*
* @var array
*/
- public static $modules = ['system', 'user', 'field', 'file', 'image', 'media'];
+ public static $modules = [
+ 'system',
+ 'user',
+ 'field',
+ 'file',
+ 'image',
+ 'media',
+ ];
/**
* {@inheritdoc}
diff --git a/web/core/modules/system/tests/src/Kernel/Mail/MailTest.php b/web/core/modules/system/tests/src/Kernel/Mail/MailTest.php
index 7e3cf5dc37..8b3fe3b75d 100644
--- a/web/core/modules/system/tests/src/Kernel/Mail/MailTest.php
+++ b/web/core/modules/system/tests/src/Kernel/Mail/MailTest.php
@@ -116,7 +116,7 @@ public function testCancelMessage() {
public function testFromAndReplyToHeader() {
$language = \Drupal::languageManager()->getCurrentLanguage();
- // Set required site configuruation.
+ // Set required site configuration.
$this->config('system.site')
->set('mail', 'mailtest@example.com')
->set('name', 'Drupal')
diff --git a/web/core/modules/system/tests/src/Kernel/PhpStorage/PhpStorageFactoryTest.php b/web/core/modules/system/tests/src/Kernel/PhpStorage/PhpStorageFactoryTest.php
index 4d1c258b56..44b0f86eff 100644
--- a/web/core/modules/system/tests/src/Kernel/PhpStorage/PhpStorageFactoryTest.php
+++ b/web/core/modules/system/tests/src/Kernel/PhpStorage/PhpStorageFactoryTest.php
@@ -35,7 +35,7 @@ protected function setUp() {
public function testGetNoSettings() {
$php = PhpStorageFactory::get('test');
// This should be the default class used.
- $this->assertTrue($php instanceof MTimeProtectedFileStorage, 'An MTimeProtectedFileStorage instance was returned with no settings.');
+ $this->assertInstanceOf(MTimeProtectedFileStorage::class, $php);
}
/**
@@ -44,7 +44,7 @@ public function testGetNoSettings() {
public function testGetDefault() {
$this->setSettings();
$php = PhpStorageFactory::get('test');
- $this->assertTrue($php instanceof MockPhpStorage, 'A FileReadOnlyStorage instance was returned with default settings.');
+ $this->assertInstanceOf(MockPhpStorage::class, $php);
}
/**
@@ -54,24 +54,24 @@ public function testGetOverride() {
$this->setSettings('test');
$php = PhpStorageFactory::get('test');
// The FileReadOnlyStorage should be used from settings.
- $this->assertTrue($php instanceof MockPhpStorage, 'A MockPhpStorage instance was returned from overridden settings.');
+ $this->assertInstanceOf(MockPhpStorage::class, $php);
// Test that the name is used for the bin when it is NULL.
$this->setSettings('test', ['bin' => NULL]);
$php = PhpStorageFactory::get('test');
- $this->assertTrue($php instanceof MockPhpStorage, 'An MockPhpStorage instance was returned from overridden settings.');
+ $this->assertInstanceOf(MockPhpStorage::class, $php);
$this->assertSame('test', $php->getConfigurationValue('bin'), 'Name value was used for bin.');
// Test that a default directory is set if it's empty.
$this->setSettings('test', ['directory' => NULL]);
$php = PhpStorageFactory::get('test');
- $this->assertTrue($php instanceof MockPhpStorage, 'An MockPhpStorage instance was returned from overridden settings.');
+ $this->assertInstanceOf(MockPhpStorage::class, $php);
$this->assertSame(PublicStream::basePath() . '/php', $php->getConfigurationValue('directory'), 'Default file directory was used.');
// Test that a default storage class is set if it's empty.
$this->setSettings('test', ['class' => NULL]);
$php = PhpStorageFactory::get('test');
- $this->assertTrue($php instanceof MTimeProtectedFileStorage, 'An MTimeProtectedFileStorage instance was returned from overridden settings with no class.');
+ $this->assertInstanceOf(MTimeProtectedFileStorage::class, $php);
// Test that a default secret is not returned if it's set in the override.
$this->setSettings('test');
diff --git a/web/core/modules/system/tests/src/Kernel/Scripts/DbDumpCommandTest.php b/web/core/modules/system/tests/src/Kernel/Scripts/DbDumpCommandTest.php
index a2ca864862..8c3856e6fa 100644
--- a/web/core/modules/system/tests/src/Kernel/Scripts/DbDumpCommandTest.php
+++ b/web/core/modules/system/tests/src/Kernel/Scripts/DbDumpCommandTest.php
@@ -48,12 +48,14 @@ public function testDbDumpCommand() {
// Assert that insert exists and that some expected fields exist.
$output = $command_tester->getDisplay();
- $this->assertContains("createTable('router", $output, 'Table router found');
- $this->assertContains("insert('router", $output, 'Insert found');
- $this->assertContains("'name' => 'test", $output, 'Insert name field found');
- $this->assertContains("'path' => 'test", $output, 'Insert path field found');
- $this->assertContains("'pattern_outline' => 'test", $output, 'Insert pattern_outline field found');
- $this->assertContains("// @codingStandardsIgnoreFile", $output);
+ $this->assertStringContainsString("createTable('router", $output, 'Table router found');
+ $this->assertStringContainsString("insert('router", $output, 'Insert found');
+ $this->assertStringContainsString("'name' => 'test", $output, 'Insert name field found');
+ $this->assertStringContainsString("'path' => 'test", $output, 'Insert path field found');
+ $this->assertStringContainsString("'pattern_outline' => 'test", $output, 'Insert pattern_outline field found');
+ $this->assertStringContainsString("// @codingStandardsIgnoreFile", $output);
+ $version = \Drupal::VERSION;
+ $this->assertContains("This file was generated by the Drupal {$version} db-tools.php script.", $output);
}
/**
@@ -66,20 +68,20 @@ public function testSchemaOnly() {
// Assert that insert statement doesn't exist for schema only table.
$output = $command_tester->getDisplay();
- $this->assertContains("createTable('router", $output, 'Table router found');
- $this->assertNotContains("insert('router", $output, 'Insert not found');
- $this->assertNotContains("'name' => 'test", $output, 'Insert name field not found');
- $this->assertNotContains("'path' => 'test", $output, 'Insert path field not found');
- $this->assertNotContains("'pattern_outline' => 'test", $output, 'Insert pattern_outline field not found');
+ $this->assertStringContainsString("createTable('router", $output, 'Table router found');
+ $this->assertStringNotContainsString("insert('router", $output, 'Insert not found');
+ $this->assertStringNotContainsString("'name' => 'test", $output, 'Insert name field not found');
+ $this->assertStringNotContainsString("'path' => 'test", $output, 'Insert path field not found');
+ $this->assertStringNotContainsString("'pattern_outline' => 'test", $output, 'Insert pattern_outline field not found');
// Assert that insert statement doesn't exist for wildcard schema only match.
$command_tester->execute(['--schema-only' => 'route.*']);
$output = $command_tester->getDisplay();
- $this->assertContains("createTable('router", $output, 'Table router found');
- $this->assertNotContains("insert('router", $output, 'Insert not found');
- $this->assertNotContains("'name' => 'test", $output, 'Insert name field not found');
- $this->assertNotContains("'path' => 'test", $output, 'Insert path field not found');
- $this->assertNotContains("'pattern_outline' => 'test", $output, 'Insert pattern_outline field not found');
+ $this->assertStringContainsString("createTable('router", $output, 'Table router found');
+ $this->assertStringNotContainsString("insert('router", $output, 'Insert not found');
+ $this->assertStringNotContainsString("'name' => 'test", $output, 'Insert name field not found');
+ $this->assertStringNotContainsString("'path' => 'test", $output, 'Insert path field not found');
+ $this->assertStringNotContainsString("'pattern_outline' => 'test", $output, 'Insert pattern_outline field not found');
}
}
diff --git a/web/core/modules/system/tests/src/Kernel/Scripts/DbImportCommandTest.php b/web/core/modules/system/tests/src/Kernel/Scripts/DbImportCommandTest.php
index 8a292e502d..2e6fcd66c7 100644
--- a/web/core/modules/system/tests/src/Kernel/Scripts/DbImportCommandTest.php
+++ b/web/core/modules/system/tests/src/Kernel/Scripts/DbImportCommandTest.php
@@ -17,7 +17,16 @@ class DbImportCommandTest extends KernelTestBase {
/**
* {@inheritdoc}
*/
- public static $modules = ['system', 'config', 'dblog', 'menu_link_content', 'link', 'block_content', 'file', 'user'];
+ public static $modules = [
+ 'system',
+ 'config',
+ 'dblog',
+ 'menu_link_content',
+ 'link',
+ 'block_content',
+ 'file',
+ 'user',
+ ];
/**
* Tables that should be part of the exported script.
diff --git a/web/core/modules/system/tests/src/Kernel/Scripts/DbToolsApplicationTest.php b/web/core/modules/system/tests/src/Kernel/Scripts/DbToolsApplicationTest.php
index 6bf39aafc1..47c5f6aac9 100644
--- a/web/core/modules/system/tests/src/Kernel/Scripts/DbToolsApplicationTest.php
+++ b/web/core/modules/system/tests/src/Kernel/Scripts/DbToolsApplicationTest.php
@@ -22,6 +22,7 @@ public function testDumpCommandRegistration() {
$application = new DbToolsApplication();
$command = $application->find('dump');
$this->assertInstanceOf('\Drupal\Core\Command\DbDumpCommand', $command);
+ $this->assertSame(\Drupal::VERSION, $application->getVersion());
}
/**
diff --git a/web/core/modules/system/tests/src/Kernel/Theme/FunctionsTest.php b/web/core/modules/system/tests/src/Kernel/Theme/FunctionsTest.php
index 0e33530e75..57ac4314ff 100644
--- a/web/core/modules/system/tests/src/Kernel/Theme/FunctionsTest.php
+++ b/web/core/modules/system/tests/src/Kernel/Theme/FunctionsTest.php
@@ -488,8 +488,8 @@ public function testDrupalPreRenderLinks() {
$this->assertEqual($list_elements->item(0)->nodeValue, 'Parent link original', 'First expected link found.');
$this->assertEqual($list_elements->item(1)->nodeValue, 'First child link', 'Second expected link found.');
$this->assertEqual($list_elements->item(2)->nodeValue, 'Second child link', 'Third expected link found.');
- $this->assertIdentical(strpos($html, 'Parent link copy'), FALSE, '"Parent link copy" link not found.');
- $this->assertIdentical(strpos($html, 'Third child link'), FALSE, '"Third child link" link not found.');
+ $this->assertStringNotContainsString('Parent link copy', $html, '"Parent link copy" link not found.');
+ $this->assertStringNotContainsString('Third child link', $html, '"Third child link" link not found.');
// Now render 'first_child', followed by the rest of the links, and make
// sure we get two separate <ul>'s with the appropriate links contained
@@ -513,8 +513,8 @@ public function testDrupalPreRenderLinks() {
$this->assertEqual($list_elements->length, 2, 'Two "li" tags found in the rendered parent HTML.');
$this->assertEqual($list_elements->item(0)->nodeValue, 'Parent link original', 'First expected link found.');
$this->assertEqual($list_elements->item(1)->nodeValue, 'Second child link', 'Second expected link found.');
- $this->assertIdentical(strpos($parent_html, 'First child link'), FALSE, '"First child link" link not found.');
- $this->assertIdentical(strpos($parent_html, 'Third child link'), FALSE, '"Third child link" link not found.');
+ $this->assertStringNotContainsString('First child link', $parent_html, '"First child link" link not found.');
+ $this->assertStringNotContainsString('Third child link', $parent_html, '"Third child link" link not found.');
}
/**
diff --git a/web/core/modules/system/tests/src/Kernel/Theme/ThemeTest.php b/web/core/modules/system/tests/src/Kernel/Theme/ThemeTest.php
index 49b723b285..9de2dacf0f 100644
--- a/web/core/modules/system/tests/src/Kernel/Theme/ThemeTest.php
+++ b/web/core/modules/system/tests/src/Kernel/Theme/ThemeTest.php
@@ -152,7 +152,7 @@ public function testDrupalRenderChildren() {
public function testFindThemeTemplates() {
$registry = $this->container->get('theme.registry')->get();
$templates = drupal_find_theme_templates($registry, '.html.twig', drupal_get_path('theme', 'test_theme'));
- $this->assertEqual($templates['node__1']['template'], 'node--1', 'Template node--1.tpl.twig was found in test_theme.');
+ $this->assertEqual($templates['node__1']['template'], 'node--1', 'Template node--1.html.twig was found in test_theme.');
}
}
diff --git a/web/core/modules/system/tests/src/Kernel/Theme/TwigFilterTest.php b/web/core/modules/system/tests/src/Kernel/Theme/TwigFilterTest.php
index 60951bafcf..00bb8350c8 100644
--- a/web/core/modules/system/tests/src/Kernel/Theme/TwigFilterTest.php
+++ b/web/core/modules/system/tests/src/Kernel/Theme/TwigFilterTest.php
@@ -102,6 +102,22 @@ public function testTwigWithoutFilter() {
'expected' => '<div><span checked>Without id and class attributes.</span></div>',
'message' => 'Attributes printed without id and class attributes.',
],
+ [
+ 'expected' => '<div><span checked>Without id and class attributes via an array.</span></div>',
+ 'message' => 'Attributes printed without an array of things (id and class).',
+ ],
+ [
+ 'expected' => '<div><span>Without any attributes via mixed array and string.</span></div>',
+ 'message' => 'Attributes printed without an array of keys then a string key.',
+ ],
+ [
+ 'expected' => '<div><span>Without any attributes via mixed string then array.</span></div>',
+ 'message' => 'Attributes printed without a string key then an array of keys.',
+ ],
+ [
+ 'expected' => '<div><span>Without any attributes with duplicate "id" key.</span></div>',
+ 'message' => 'Attributes printed without two arrays of keys with a duplicate key present in both arrays.',
+ ],
[
'expected' => '<div><span id="quotes" checked class="red green blue">All attributes again.</span></div>',
'message' => 'All attributes printed again.',
diff --git a/web/core/modules/system/tests/src/Kernel/Theme/TwigNamespaceTest.php b/web/core/modules/system/tests/src/Kernel/Theme/TwigNamespaceTest.php
index 43ba48fb3a..afcb976e9f 100644
--- a/web/core/modules/system/tests/src/Kernel/Theme/TwigNamespaceTest.php
+++ b/web/core/modules/system/tests/src/Kernel/Theme/TwigNamespaceTest.php
@@ -17,7 +17,12 @@ class TwigNamespaceTest extends KernelTestBase {
*
* @var array
*/
- public static $modules = ['twig_theme_test', 'twig_namespace_a', 'twig_namespace_b', 'node'];
+ public static $modules = [
+ 'twig_theme_test',
+ 'twig_namespace_a',
+ 'twig_namespace_b',
+ 'node',
+ ];
/**
* @var \Drupal\Core\Template\TwigEnvironment
@@ -33,8 +38,8 @@ protected function setUp() {
/**
* Checks to see if a value is a twig template.
*/
- public function assertTwigTemplate($value, $message = '', $group = 'Other') {
- $this->assertTrue($value instanceof TemplateWrapper, $message, $group);
+ public function assertTwigTemplate($value, $message = '') {
+ $this->assertInstanceOf(TemplateWrapper::class, $value, $message);
}
/**
diff --git a/web/core/modules/system/tests/src/Kernel/Timezone/TimezoneTest.php b/web/core/modules/system/tests/src/Kernel/Timezone/TimezoneTest.php
index 24ce60ba3f..e9efa6d057 100644
--- a/web/core/modules/system/tests/src/Kernel/Timezone/TimezoneTest.php
+++ b/web/core/modules/system/tests/src/Kernel/Timezone/TimezoneTest.php
@@ -19,7 +19,7 @@ class TimezoneTest extends KernelTestBase {
public function testSystemTimeZones() {
// Test the default parameters for system_time_zones().
$result = system_time_zones();
- $this->assertInternalType('array', $result);
+ $this->assertIsArray($result);
$this->assertArrayHasKey('Africa/Dar_es_Salaam', $result);
$this->assertEquals('Africa/Dar es Salaam', $result['Africa/Dar_es_Salaam']);
@@ -27,7 +27,7 @@ public function testSystemTimeZones() {
$result = system_time_zones(NULL, TRUE);
// Check a two-level time zone.
- $this->assertInternalType('array', $result);
+ $this->assertIsArray($result);
$this->assertArrayHasKey('Africa', $result);
$this->assertArrayHasKey('Africa/Dar_es_Salaam', $result['Africa']);
$this->assertEquals('Dar es Salaam', $result['Africa']['Africa/Dar_es_Salaam']);
diff --git a/web/core/modules/system/tests/src/Kernel/Token/TokenReplaceKernelTest.php b/web/core/modules/system/tests/src/Kernel/Token/TokenReplaceKernelTest.php
index 1f86dd386a..4cc18f8aa7 100644
--- a/web/core/modules/system/tests/src/Kernel/Token/TokenReplaceKernelTest.php
+++ b/web/core/modules/system/tests/src/Kernel/Token/TokenReplaceKernelTest.php
@@ -118,7 +118,7 @@ public function testSystemSiteTokenReplacement() {
$metadata_tests['[site:login-url]'] = $bubbleable_metadata;
// Test to make sure that we generated something for each token.
- $this->assertFalse(in_array(0, array_map('strlen', $tests)), 'No empty tokens generated.');
+ $this->assertNotContains(0, array_map('strlen', $tests), 'No empty tokens generated.');
foreach ($tests as $input => $expected) {
$bubbleable_metadata = new BubbleableMetadata();
@@ -146,7 +146,7 @@ public function testSystemDateTokenReplacement() {
$tests['[date:raw]'] = Xss::filter($date);
// Test to make sure that we generated something for each token.
- $this->assertFalse(in_array(0, array_map('strlen', $tests)), 'No empty tokens generated.');
+ $this->assertNotContains(0, array_map('strlen', $tests), 'No empty tokens generated.');
foreach ($tests as $input => $expected) {
$output = $this->tokenService->replace($input, ['date' => $date], ['langcode' => $this->interfaceLanguage->getId()]);
diff --git a/web/core/modules/system/tests/themes/test_basetheme/test_basetheme.info.yml b/web/core/modules/system/tests/themes/test_basetheme/test_basetheme.info.yml
index 3efb45f3d6..b7bcf84d48 100644
--- a/web/core/modules/system/tests/themes/test_basetheme/test_basetheme.info.yml
+++ b/web/core/modules/system/tests/themes/test_basetheme/test_basetheme.info.yml
@@ -8,8 +8,6 @@ hidden: true
libraries:
- test_basetheme/global-styling
-stylesheets-remove:
- - '@theme_test/css/base-remove.css'
libraries-override:
core/drupal.dialog:
js:
@@ -18,6 +16,10 @@ libraries-override:
css:
component:
assets/vendor/farbtastic/farbtastic.css: css/farbtastic.css
+ theme_test/theme_stylesheets_override_and_remove_test:
+ css:
+ base:
+ css/base-remove.css: false
libraries-extend:
classy/base:
diff --git a/web/core/modules/system/tests/themes/test_legacy_stylesheets_remove/test_legacy_stylesheets_remove.info.yml b/web/core/modules/system/tests/themes/test_legacy_stylesheets_remove/test_legacy_stylesheets_remove.info.yml
new file mode 100644
index 0000000000..d5042ce2c2
--- /dev/null
+++ b/web/core/modules/system/tests/themes/test_legacy_stylesheets_remove/test_legacy_stylesheets_remove.info.yml
@@ -0,0 +1,9 @@
+name: 'Theme Legacy Test Stylesheets Remove'
+type: theme
+description: 'Test theme using legacy stylesheets-remove.'
+version: VERSION
+core: 8.x
+base theme: classy
+libraries: { }
+stylesheets-remove:
+ - '@classy/css/components/action-links.css'
diff --git a/web/core/modules/system/tests/themes/test_legacy_theme/test_legacy_theme.info.yml b/web/core/modules/system/tests/themes/test_legacy_theme/test_legacy_theme.info.yml
new file mode 100644
index 0000000000..d49d40105f
--- /dev/null
+++ b/web/core/modules/system/tests/themes/test_legacy_theme/test_legacy_theme.info.yml
@@ -0,0 +1,6 @@
+name: 'Test legacy theme'
+type: theme
+description: 'Test theme to test deprecated functionality.'
+version: VERSION
+core: 8.x
+base theme: test_theme
diff --git a/web/core/modules/system/tests/themes/test_legacy_theme/test_legacy_theme.theme b/web/core/modules/system/tests/themes/test_legacy_theme/test_legacy_theme.theme
new file mode 100644
index 0000000000..9802894955
--- /dev/null
+++ b/web/core/modules/system/tests/themes/test_legacy_theme/test_legacy_theme.theme
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * @file
+ * Theme to test functionality of legacy theme functions.
+ *
+ * @todo Remove in https://www.drupal.org/project/drupal/issues/3097889
+ */
+
+/**
+ * Tests a theme overriding a suggestion of a base theme hook.
+ */
+function test_legacy_theme_theme_test_preprocess_suggestions__kitten__meerkat($variables) {
+ return 'Theme hook implementor=test_theme_theme_test__suggestion(). Foo=' . $variables['foo'];
+}
+
+/**
+ * Implements hook_theme_suggestions_HOOK_alter().
+ */
+function test_legacy_theme_theme_suggestions_theme_test_function_suggestions_alter(array &$suggestions, array $variables) {
+ // Theme alter hooks run after module alter hooks, so add this theme
+ // suggestion to the beginning of the array so that the suggestion added by
+ // the theme_suggestions_test module can be picked up when that module is
+ // enabled.
+ array_unshift($suggestions, 'theme_test_function_suggestions__' . 'theme_override');
+}
+
+/**
+ * Returns HTML for a theme function suggestion test.
+ *
+ * Implements the theme_test_function_suggestions__theme_override suggestion.
+ */
+function test_legacy_theme_theme_test_function_suggestions__theme_override($variables) {
+ return 'Theme function overridden based on new theme suggestion provided by the test_legacy_theme theme.';
+}
+
+/**
+ * Returns HTML for a theme function suggestion test.
+ *
+ * Implements the theme_test_function_suggestions__module_override suggestion.
+ */
+function test_legacy_theme_theme_test_function_suggestions__module_override($variables) {
+ return 'Theme function overridden based on new theme suggestion provided by a module.';
+}
diff --git a/web/core/modules/system/tests/themes/test_subtheme/test_subtheme.info.yml b/web/core/modules/system/tests/themes/test_subtheme/test_subtheme.info.yml
index b217374234..60e29da098 100644
--- a/web/core/modules/system/tests/themes/test_subtheme/test_subtheme.info.yml
+++ b/web/core/modules/system/tests/themes/test_subtheme/test_subtheme.info.yml
@@ -6,10 +6,15 @@ core: 8.x
base theme: test_basetheme
libraries:
- test_subtheme/global-styling
-stylesheets-remove:
- - '@theme_test/css/sub-remove.css'
- - '@test_basetheme/base-add.sub-remove.css'
-
+libraries-override:
+ theme_test/theme_stylesheets_override_and_remove_test:
+ css:
+ base:
+ css/sub-remove.css: false
+ test_basetheme/global-styling:
+ css:
+ base:
+ base-add.sub-remove.css: false
libraries-extend:
classy/base:
- test_subtheme/global-styling
diff --git a/web/core/modules/system/tests/themes/test_theme/templates/theme-test--suggestion.html.twig b/web/core/modules/system/tests/themes/test_theme/templates/theme-test--suggestion.html.twig
new file mode 100644
index 0000000000..a33e7c2153
--- /dev/null
+++ b/web/core/modules/system/tests/themes/test_theme/templates/theme-test--suggestion.html.twig
@@ -0,0 +1,2 @@
+{# Output for Theme API test #}
+Theme hook implementor=theme-test--suggestion.html.twig. Foo={{ foo }}
diff --git a/web/core/modules/system/tests/themes/test_theme/test_theme.info.yml b/web/core/modules/system/tests/themes/test_theme/test_theme.info.yml
index b9660a45f5..941149ff70 100644
--- a/web/core/modules/system/tests/themes/test_theme/test_theme.info.yml
+++ b/web/core/modules/system/tests/themes/test_theme/test_theme.info.yml
@@ -15,8 +15,6 @@ version: VERSION
base theme: classy
core: 8.x
logo: images/logo2.svg
-stylesheets-remove:
- - '@stable/css/system/components/js.module.css'
libraries:
- test_theme/global-styling
libraries-override:
@@ -37,6 +35,10 @@ libraries-override:
css:
component:
css/components/dialog.css: false
+ system/base:
+ css:
+ component:
+ /core/themes/stable/css/system/components/js.module.css: false
# It works for JS as well.
core/jquery:
js:
diff --git a/web/core/modules/system/tests/themes/test_theme/test_theme.theme b/web/core/modules/system/tests/themes/test_theme/test_theme.theme
index a5af83bc87..d5bd12ed4e 100644
--- a/web/core/modules/system/tests/themes/test_theme/test_theme.theme
+++ b/web/core/modules/system/tests/themes/test_theme/test_theme.theme
@@ -12,13 +12,6 @@ function test_theme_preprocess_twig_theme_test_php_variables(&$variables) {
$variables['php_values'] = _test_theme_twig_php_values();
}
-/**
- * Tests a theme overriding a suggestion of a base theme hook.
- */
-function test_theme_theme_test__suggestion($variables) {
- return 'Theme hook implementor=test_theme_theme_test__suggestion(). Foo=' . $variables['foo'];
-}
-
/**
* Implements hook_element_info_alter().
*/
@@ -75,35 +68,6 @@ function test_theme_theme_suggestions_theme_test_suggestions_alter(array &$sugge
array_unshift($suggestions, 'theme_test_suggestions__' . 'theme_override');
}
-/**
- * Implements hook_theme_suggestions_HOOK_alter().
- */
-function test_theme_theme_suggestions_theme_test_function_suggestions_alter(array &$suggestions, array $variables) {
- // Theme alter hooks run after module alter hooks, so add this theme
- // suggestion to the beginning of the array so that the suggestion added by
- // the theme_suggestions_test module can be picked up when that module is
- // enabled.
- array_unshift($suggestions, 'theme_test_function_suggestions__' . 'theme_override');
-}
-
-/**
- * Returns HTML for a theme function suggestion test.
- *
- * Implements the theme_test_function_suggestions__theme_override suggestion.
- */
-function test_theme_theme_test_function_suggestions__theme_override($variables) {
- return 'Theme function overridden based on new theme suggestion provided by the test_theme theme.';
-}
-
-/**
- * Returns HTML for a theme function suggestion test.
- *
- * Implements the theme_test_function_suggestions__module_override suggestion.
- */
-function test_theme_theme_test_function_suggestions__module_override($variables) {
- return 'Theme function overridden based on new theme suggestion provided by a module.';
-}
-
/**
* Implements hook_theme_registry_alter().
*/
@@ -111,13 +75,6 @@ function test_theme_theme_registry_alter(&$registry) {
$registry['theme_test_template_test']['variables']['additional'] = 'value';
}
-/**
- * Tests a theme overriding a suggestion of a base theme hook.
- */
-function test_theme_theme_test_preprocess_suggestions__kitten__meerkat($variables) {
- return 'Theme hook implementor=test_theme_theme_test__suggestion(). Foo=' . $variables['foo'];
-}
-
/**
* Tests a theme overriding a default hook with a suggestion.
*
diff --git a/web/core/modules/system/tests/themes/test_theme_depending_on_constrained_modules/test_module_compatible_constraint/test_module_compatible_constraint.info.yml b/web/core/modules/system/tests/themes/test_theme_depending_on_constrained_modules/test_module_compatible_constraint/test_module_compatible_constraint.info.yml
new file mode 100644
index 0000000000..ed5cba029d
--- /dev/null
+++ b/web/core/modules/system/tests/themes/test_theme_depending_on_constrained_modules/test_module_compatible_constraint/test_module_compatible_constraint.info.yml
@@ -0,0 +1,4 @@
+name: Test Module Theme Depends on with Compatible Constraint
+type: module
+package: Testing
+version: '8.x-1.2'
diff --git a/web/core/modules/system/tests/themes/test_theme_depending_on_constrained_modules/test_module_incompatible_constraint/test_module_incompatible_constraint.info.yml b/web/core/modules/system/tests/themes/test_theme_depending_on_constrained_modules/test_module_incompatible_constraint/test_module_incompatible_constraint.info.yml
new file mode 100644
index 0000000000..11b0b62523
--- /dev/null
+++ b/web/core/modules/system/tests/themes/test_theme_depending_on_constrained_modules/test_module_incompatible_constraint/test_module_incompatible_constraint.info.yml
@@ -0,0 +1,4 @@
+name: Test Module Theme Depends on with Incompatible Constraint
+type: module
+package: Testing
+version: '8.x-1.8'
diff --git a/web/core/modules/system/tests/themes/test_theme_depending_on_constrained_modules/test_theme_depending_on_constrained_modules.info.yml b/web/core/modules/system/tests/themes/test_theme_depending_on_constrained_modules/test_theme_depending_on_constrained_modules.info.yml
new file mode 100644
index 0000000000..a0f34359bf
--- /dev/null
+++ b/web/core/modules/system/tests/themes/test_theme_depending_on_constrained_modules/test_theme_depending_on_constrained_modules.info.yml
@@ -0,0 +1,6 @@
+name: Test Theme Depending on Version Constrained Modules
+type: theme
+base theme: stark
+dependencies:
+ - test_module_compatible_constraint (>=8.x-1.x)
+ - test_module_incompatible_constraint (>=8.x-2.x)
diff --git a/web/core/modules/system/tests/themes/test_theme_depending_on_modules/test_another_module_required_by_theme/test_another_module_required_by_theme.info.yml b/web/core/modules/system/tests/themes/test_theme_depending_on_modules/test_another_module_required_by_theme/test_another_module_required_by_theme.info.yml
new file mode 100644
index 0000000000..29e2202c28
--- /dev/null
+++ b/web/core/modules/system/tests/themes/test_theme_depending_on_modules/test_another_module_required_by_theme/test_another_module_required_by_theme.info.yml
@@ -0,0 +1,4 @@
+name: Test Another Module Required by Theme
+type: module
+package: Testing
+version: VERSION
diff --git a/web/core/modules/system/tests/themes/test_theme_depending_on_modules/test_module_required_by_theme/test_module_required_by_theme.info.yml b/web/core/modules/system/tests/themes/test_theme_depending_on_modules/test_module_required_by_theme/test_module_required_by_theme.info.yml
new file mode 100644
index 0000000000..81a1c2e880
--- /dev/null
+++ b/web/core/modules/system/tests/themes/test_theme_depending_on_modules/test_module_required_by_theme/test_module_required_by_theme.info.yml
@@ -0,0 +1,4 @@
+name: Test Module Required by Theme
+type: module
+package: Testing
+version: VERSION
diff --git a/web/core/modules/system/tests/themes/test_theme_depending_on_modules/test_module_required_by_theme/test_module_required_by_theme.module b/web/core/modules/system/tests/themes/test_theme_depending_on_modules/test_module_required_by_theme/test_module_required_by_theme.module
new file mode 100644
index 0000000000..191a0cf297
--- /dev/null
+++ b/web/core/modules/system/tests/themes/test_theme_depending_on_modules/test_module_required_by_theme/test_module_required_by_theme.module
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * @file
+ * This file provides testing functionality for update.php.
+ */
+
+use Drupal\Core\Extension\Extension;
+
+/**
+ * Implements hook_system_info_alter().
+ */
+function test_module_required_by_theme_system_info_alter(array &$info, Extension $file, $type) {
+ if ($file->getName() == 'test_theme_depending_on_modules') {
+ $new_info = \Drupal::state()->get('test_theme_depending_on_modules.system_info_alter');
+ if ($new_info) {
+ $info = $new_info + $info;
+ }
+ }
+}
diff --git a/web/core/modules/system/tests/themes/test_theme_depending_on_modules/test_theme_depending_on_modules.info.yml b/web/core/modules/system/tests/themes/test_theme_depending_on_modules/test_theme_depending_on_modules.info.yml
new file mode 100644
index 0000000000..48a6af4a49
--- /dev/null
+++ b/web/core/modules/system/tests/themes/test_theme_depending_on_modules/test_theme_depending_on_modules.info.yml
@@ -0,0 +1,6 @@
+name: Test Theme Depending on Modules
+type: theme
+base theme: stark
+dependencies:
+ - test_module_required_by_theme
+ - test_another_module_required_by_theme
diff --git a/web/core/modules/system/tests/themes/test_theme_depending_on_nonexisting_module/test_theme_depending_on_nonexisting_module.info.yml b/web/core/modules/system/tests/themes/test_theme_depending_on_nonexisting_module/test_theme_depending_on_nonexisting_module.info.yml
new file mode 100644
index 0000000000..da54e8aaca
--- /dev/null
+++ b/web/core/modules/system/tests/themes/test_theme_depending_on_nonexisting_module/test_theme_depending_on_nonexisting_module.info.yml
@@ -0,0 +1,6 @@
+name: Test Theme Depending on Nonexisting Module
+type: theme
+base theme: stark
+version: VERSION
+dependencies:
+ - test_module_non_existing
diff --git a/web/core/modules/system/tests/themes/test_theme_mixed_module_dependencies/test_theme_mixed_module_dependencies.info.yml b/web/core/modules/system/tests/themes/test_theme_mixed_module_dependencies/test_theme_mixed_module_dependencies.info.yml
new file mode 100644
index 0000000000..5146e0d483
--- /dev/null
+++ b/web/core/modules/system/tests/themes/test_theme_mixed_module_dependencies/test_theme_mixed_module_dependencies.info.yml
@@ -0,0 +1,5 @@
+name: Test Theme with a Module Dependency and Base Theme with a Different Module Dependency
+type: theme
+base theme: test_theme_depending_on_modules
+dependencies:
+ - help
diff --git a/web/core/modules/system/tests/themes/test_theme_with_a_base_theme_depending_on_modules/test_theme_with_a_base_theme_depending_on_modules.info.yml b/web/core/modules/system/tests/themes/test_theme_with_a_base_theme_depending_on_modules/test_theme_with_a_base_theme_depending_on_modules.info.yml
new file mode 100644
index 0000000000..cde5b21cca
--- /dev/null
+++ b/web/core/modules/system/tests/themes/test_theme_with_a_base_theme_depending_on_modules/test_theme_with_a_base_theme_depending_on_modules.info.yml
@@ -0,0 +1,3 @@
+name: Test Theme with a Base Theme Depending on Modules
+type: theme
+base theme: test_theme_depending_on_modules
diff --git a/web/core/modules/taxonomy/migrations/d6_term_node.yml b/web/core/modules/taxonomy/migrations/d6_term_node.yml
index fdb8cc9a41..1e358bf0b4 100644
--- a/web/core/modules/taxonomy/migrations/d6_term_node.yml
+++ b/web/core/modules/taxonomy/migrations/d6_term_node.yml
@@ -10,8 +10,12 @@ process:
nid:
-
plugin: migration_lookup
- migration: d6_node
+ migration:
+ - d6_node_complete
+ - d6_node
source: nid
+ -
+ plugin: node_complete_node_lookup
-
plugin: skip_on_empty
method: row
diff --git a/web/core/modules/taxonomy/migrations/d6_term_node_revision.yml b/web/core/modules/taxonomy/migrations/d6_term_node_revision.yml
index 9487984f94..4b196ac2df 100644
--- a/web/core/modules/taxonomy/migrations/d6_term_node_revision.yml
+++ b/web/core/modules/taxonomy/migrations/d6_term_node_revision.yml
@@ -11,8 +11,12 @@ process:
vid:
-
plugin: migration_lookup
- migration: d6_node_revision
+ migration:
+ - d6_node_copmplete
+ - d6_node_revision
source: vid
+ -
+ plugin: node_complete_node_revision_lookup
-
plugin: skip_on_empty
method: row
diff --git a/web/core/modules/taxonomy/src/Form/OverviewTerms.php b/web/core/modules/taxonomy/src/Form/OverviewTerms.php
index 502900b87d..969c35af01 100644
--- a/web/core/modules/taxonomy/src/Form/OverviewTerms.php
+++ b/web/core/modules/taxonomy/src/Form/OverviewTerms.php
@@ -271,9 +271,11 @@ public function buildForm(array $form, FormStateInterface $form_state, Vocabular
case VocabularyInterface::HIERARCHY_DISABLED:
$help_message = $this->t('You can reorganize the terms in %capital_name using their drag-and-drop handles, and group terms under a parent term by sliding them under and to the right of the parent.', $args);
break;
+
case VocabularyInterface::HIERARCHY_SINGLE:
$help_message = $this->t('%capital_name contains terms grouped under parent terms. You can reorganize the terms in %capital_name using their drag-and-drop handles.', $args);
break;
+
case VocabularyInterface::HIERARCHY_MULTIPLE:
$help_message = $this->t('%capital_name contains terms with multiple parents. Drag and drop of terms with multiple parents is not supported, but you can re-enable drag-and-drop support by editing each term to include only a single parent.', $args);
break;
@@ -284,9 +286,11 @@ public function buildForm(array $form, FormStateInterface $form_state, Vocabular
case VocabularyInterface::HIERARCHY_DISABLED:
$help_message = $this->t('%capital_name contains the following terms.', $args);
break;
+
case VocabularyInterface::HIERARCHY_SINGLE:
$help_message = $this->t('%capital_name contains terms grouped under parent terms', $args);
break;
+
case VocabularyInterface::HIERARCHY_MULTIPLE:
$help_message = $this->t('%capital_name contains terms with multiple parents.', $args);
break;
diff --git a/web/core/modules/taxonomy/src/Plugin/migrate/source/d7/Term.php b/web/core/modules/taxonomy/src/Plugin/migrate/source/d7/Term.php
index 0143f5bfb6..4e347fc107 100644
--- a/web/core/modules/taxonomy/src/Plugin/migrate/source/d7/Term.php
+++ b/web/core/modules/taxonomy/src/Plugin/migrate/source/d7/Term.php
@@ -72,14 +72,18 @@ public function prepareRow(Row $row) {
// migration.
$translatable_vocabularies = array_keys(array_filter($this->variableGet('entity_translation_taxonomy', [])));
$entity_translatable = $this->isEntityTranslatable('taxonomy_term') && in_array($vocabulary, $translatable_vocabularies, TRUE);
- $source_language = $this->getEntityTranslationSourceLanguage('taxonomy_term', $tid);
- $language = $entity_translatable && $source_language ? $source_language : $default_language['language'];
+ if ($entity_translatable) {
+ $source_language = $this->getEntityTranslationSourceLanguage('taxonomy_term', $tid);
+ $language = $entity_translatable && $source_language ? $source_language : $default_language['language'];
+ }
// If this is an i18n translation use the default language when i18n_mode
// is localized.
if ($row->get('i18n_mode')) {
$language = ($row->get('i18n_mode') === '1') ? $default_language['language'] : $row->get('language');
}
+
+ $language = $language ?? $default_language['language'];
$row->setSourceProperty('language', $language);
// Get Field API field values.
diff --git a/web/core/modules/taxonomy/src/Plugin/views/argument_validator/TermName.php b/web/core/modules/taxonomy/src/Plugin/views/argument_validator/TermName.php
index 5b32531bb9..1a81b2f952 100644
--- a/web/core/modules/taxonomy/src/Plugin/views/argument_validator/TermName.php
+++ b/web/core/modules/taxonomy/src/Plugin/views/argument_validator/TermName.php
@@ -64,6 +64,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
public function validateArgument($argument) {
if ($this->options['transform']) {
$argument = str_replace('-', ' ', $argument);
+ $this->argument->argument = $argument;
}
$terms = $this->termStorage->loadByProperties(['name' => $argument]);
diff --git a/web/core/modules/taxonomy/src/TermBreadcrumbBuilder.php b/web/core/modules/taxonomy/src/TermBreadcrumbBuilder.php
index d235c78b92..bcd7b45f8a 100644
--- a/web/core/modules/taxonomy/src/TermBreadcrumbBuilder.php
+++ b/web/core/modules/taxonomy/src/TermBreadcrumbBuilder.php
@@ -40,7 +40,7 @@ class TermBreadcrumbBuilder implements BreadcrumbBuilderInterface {
/**
* The taxonomy storage.
*
- * @var \Drupal\Taxonomy\TermStorageInterface
+ * @var \Drupal\taxonomy\TermStorageInterface
*/
protected $termStorage;
diff --git a/web/core/modules/taxonomy/src/TermForm.php b/web/core/modules/taxonomy/src/TermForm.php
index 1ba191c7e5..eb3463dd89 100644
--- a/web/core/modules/taxonomy/src/TermForm.php
+++ b/web/core/modules/taxonomy/src/TermForm.php
@@ -162,6 +162,7 @@ public function save(array $form, FormStateInterface $form_state) {
$this->messenger()->addStatus($this->t('Created new term %term.', ['%term' => $view_link]));
$this->logger('taxonomy')->notice('Created new term %term.', ['%term' => $term->getName(), 'link' => $edit_link]);
break;
+
case SAVED_UPDATED:
$this->messenger()->addStatus($this->t('Updated term %term.', ['%term' => $view_link]));
$this->logger('taxonomy')->notice('Updated term %term.', ['%term' => $term->getName(), 'link' => $edit_link]);
diff --git a/web/core/modules/taxonomy/src/TermViewsData.php b/web/core/modules/taxonomy/src/TermViewsData.php
index 73e8cbc007..7ea6758ba0 100644
--- a/web/core/modules/taxonomy/src/TermViewsData.php
+++ b/web/core/modules/taxonomy/src/TermViewsData.php
@@ -157,10 +157,10 @@ public function getViewsData() {
'help' => $this->t('Relate all content tagged with a term.'),
'relationship' => [
'id' => 'standard',
- 'base' => 'node',
+ 'base' => 'node_field_data',
'base field' => 'nid',
'label' => $this->t('node'),
- 'skip base' => 'node',
+ 'skip base' => 'node_field_data',
],
];
diff --git a/web/core/modules/taxonomy/taxonomy.es6.js b/web/core/modules/taxonomy/taxonomy.es6.js
index 71225d11a2..f788835072 100644
--- a/web/core/modules/taxonomy/taxonomy.es6.js
+++ b/web/core/modules/taxonomy/taxonomy.es6.js
@@ -5,7 +5,7 @@
(function($, Drupal) {
/**
- * Move a block in the blocks table from one region to another.
+ * Reorder taxonomy terms.
*
* This behavior is dependent on the tableDrag behavior, since it uses the
* objects initialized in that behavior to update the row.
@@ -19,7 +19,7 @@
attach(context, settings) {
const backStep = settings.taxonomy.backStep;
const forwardStep = settings.taxonomy.forwardStep;
- // Get the blocks tableDrag object.
+ // Get the taxonomy tableDrag object.
const tableDrag = Drupal.tableDrag.taxonomy;
const $table = $('#taxonomy');
const rows = $table.find('tr').length;
diff --git a/web/core/modules/taxonomy/tests/src/Functional/Hal/TermHalJsonAnonTest.php b/web/core/modules/taxonomy/tests/src/Functional/Hal/TermHalJsonAnonTest.php
index 7a3a57a8ca..4f659cc29b 100644
--- a/web/core/modules/taxonomy/tests/src/Functional/Hal/TermHalJsonAnonTest.php
+++ b/web/core/modules/taxonomy/tests/src/Functional/Hal/TermHalJsonAnonTest.php
@@ -65,6 +65,7 @@ protected function getExpectedNormalizedEntity() {
NULL,
];
break;
+
case [2]:
$expected_parent_normalization_links = [
[
@@ -87,6 +88,7 @@ protected function getExpectedNormalizedEntity() {
],
];
break;
+
case [0, 2]:
$expected_parent_normalization_links = [
NULL,
@@ -111,6 +113,7 @@ protected function getExpectedNormalizedEntity() {
],
];
break;
+
case [3, 2]:
$expected_parent_normalization_links = [
[
diff --git a/web/core/modules/taxonomy/tests/src/Functional/LoadMultipleTest.php b/web/core/modules/taxonomy/tests/src/Functional/LoadMultipleTest.php
index 9dadd3391f..b1e38b9a78 100644
--- a/web/core/modules/taxonomy/tests/src/Functional/LoadMultipleTest.php
+++ b/web/core/modules/taxonomy/tests/src/Functional/LoadMultipleTest.php
@@ -55,13 +55,13 @@ public function testTaxonomyTermMultipleLoad() {
// Load terms from the vocabulary by vid.
$terms3 = $term_storage->loadByProperties(['vid' => $vocabulary->id()]);
- $this->assertEqual(count($terms3), 4, 'Correct number of terms were loaded.');
+ $this->assertCount(4, $terms3, 'Correct number of terms were loaded.');
$this->assertFalse(isset($terms3[$deleted->id()]));
// Create a single term and load it by name.
$term = $this->createTerm($vocabulary);
$loaded_terms = $term_storage->loadByProperties(['name' => $term->getName()]);
- $this->assertEqual(count($loaded_terms), 1, 'One term was loaded.');
+ $this->assertCount(1, $loaded_terms, 'One term was loaded.');
$loaded_term = reset($loaded_terms);
$this->assertEqual($term->id(), $loaded_term->id(), 'Term loaded by name successfully.');
}
diff --git a/web/core/modules/taxonomy/tests/src/Functional/Rest/TermResourceTestBase.php b/web/core/modules/taxonomy/tests/src/Functional/Rest/TermResourceTestBase.php
index 2609ecd3f3..1dd6af014d 100644
--- a/web/core/modules/taxonomy/tests/src/Functional/Rest/TermResourceTestBase.php
+++ b/web/core/modules/taxonomy/tests/src/Functional/Rest/TermResourceTestBase.php
@@ -111,6 +111,7 @@ protected function getExpectedNormalizedEntity() {
],
];
break;
+
case [2]:
$expected_parent_normalization = [
[
@@ -121,6 +122,7 @@ protected function getExpectedNormalizedEntity() {
],
];
break;
+
case [0, 2]:
$expected_parent_normalization = [
[
@@ -134,6 +136,7 @@ protected function getExpectedNormalizedEntity() {
],
];
break;
+
case [3, 2]:
$expected_parent_normalization = [
[
@@ -256,12 +259,16 @@ protected function getExpectedUnauthorizedAccessMessage($method) {
switch ($method) {
case 'GET':
return "The 'access content' permission is required and the taxonomy term must be published.";
+
case 'POST':
return "The following permissions are required: 'create terms in camelids' OR 'administer taxonomy'.";
+
case 'PATCH':
return "The following permissions are required: 'edit terms in camelids' OR 'administer taxonomy'.";
+
case 'DELETE':
return "The following permissions are required: 'delete terms in camelids' OR 'administer taxonomy'.";
+
default:
return parent::getExpectedUnauthorizedAccessMessage($method);
}
diff --git a/web/core/modules/taxonomy/tests/src/Functional/RssTest.php b/web/core/modules/taxonomy/tests/src/Functional/RssTest.php
index b0488f1d0f..d208a3a4e1 100644
--- a/web/core/modules/taxonomy/tests/src/Functional/RssTest.php
+++ b/web/core/modules/taxonomy/tests/src/Functional/RssTest.php
@@ -122,7 +122,7 @@ public function testTaxonomyRss() {
// Check that the "Exception value" is disabled by default.
$this->drupalGet('taxonomy/term/all/feed');
- $this->assertResponse(404);
+ $this->assertSession()->statusCodeEquals(404);
// Set the exception value to 'all'.
$view = Views::getView('taxonomy_term');
$arguments = $view->getDisplay()->getOption('arguments');
diff --git a/web/core/modules/taxonomy/tests/src/Functional/TaxonomyImageTest.php b/web/core/modules/taxonomy/tests/src/Functional/TaxonomyImageTest.php
index 6bd4ef5bca..4c3265192f 100644
--- a/web/core/modules/taxonomy/tests/src/Functional/TaxonomyImageTest.php
+++ b/web/core/modules/taxonomy/tests/src/Functional/TaxonomyImageTest.php
@@ -98,13 +98,17 @@ public function testTaxonomyImageAccess() {
$access_user = $this->drupalCreateUser(['access content']);
$no_access_user = $this->drupalCreateUser();
$image = File::load($term->field_test->target_id);
+
+ // Ensure a user that should be able to access the file can access it.
$this->drupalLogin($access_user);
$this->drupalGet(file_create_url($image->getFileUri()));
- $this->assertResponse(200, 'Private image on term is accessible with right permission');
+ $this->assertSession()->statusCodeEquals(200);
+ // Ensure a user that should not be able to access the file cannot access
+ // it.
$this->drupalLogin($no_access_user);
$this->drupalGet(file_create_url($image->getFileUri()));
- $this->assertResponse(403, 'Private image on term not accessible without right permission');
+ $this->assertSession()->statusCodeEquals(403);
}
}
diff --git a/web/core/modules/taxonomy/tests/src/Functional/TermAutocompleteTest.php b/web/core/modules/taxonomy/tests/src/Functional/TermAutocompleteTest.php
index d3b3845d8a..54cee4b3fb 100644
--- a/web/core/modules/taxonomy/tests/src/Functional/TermAutocompleteTest.php
+++ b/web/core/modules/taxonomy/tests/src/Functional/TermAutocompleteTest.php
@@ -179,14 +179,14 @@ public function testAutocompleteCountResults() {
$this->autocompleteUrl,
['query' => ['q' => 'aaa 10']]
);
- $this->assertEqual(1, count($data), 'Autocomplete returned 1 result');
+ $this->assertCount(1, $data, 'Autocomplete returned 1 result');
// Test the correct number of matches when multiple are partial matches.
$data = $this->drupalGetJson(
$this->autocompleteUrl,
['query' => ['q' => 'aaa 1']]
);
- $this->assertEqual(3, count($data), 'Autocomplete returned 3 results');
+ $this->assertCount(3, $data, 'Autocomplete returned 3 results');
// Tests that only 10 results are returned, even if there are more than 10
// matches.
@@ -194,7 +194,7 @@ public function testAutocompleteCountResults() {
$this->autocompleteUrl,
['query' => ['q' => 'aaa']]
);
- $this->assertEqual(10, count($data), 'Autocomplete returned only 10 results (for over 10 matches)');
+ $this->assertCount(10, $data, 'Autocomplete returned only 10 results (for over 10 matches)');
}
/**
diff --git a/web/core/modules/taxonomy/tests/src/Functional/TermTest.php b/web/core/modules/taxonomy/tests/src/Functional/TermTest.php
index 18fae67ba2..9c5b993916 100644
--- a/web/core/modules/taxonomy/tests/src/Functional/TermTest.php
+++ b/web/core/modules/taxonomy/tests/src/Functional/TermTest.php
@@ -359,7 +359,7 @@ public function testTermInterface() {
// Check the term link can be clicked through to the term page.
$this->clickLink($edit['name[0][value]']);
- $this->assertResponse(200, 'Term page can be accessed via the listing link.');
+ $this->assertSession()->statusCodeEquals(200);
// View the term and check that it is correct.
$this->drupalGet('taxonomy/term/' . $term->id());
@@ -390,7 +390,7 @@ public function testTermInterface() {
// Assert that the term no longer exists.
$this->drupalGet('taxonomy/term/' . $term->id());
- $this->assertResponse(404, 'The taxonomy term page was not found.');
+ $this->assertSession()->statusCodeEquals(404);
}
/**
@@ -529,11 +529,11 @@ public function testTaxonomyGetTermByName() {
// Load multiple terms with the same name.
$terms = taxonomy_term_load_multiple_by_name($term->getName());
- $this->assertEqual(count($terms), 2, 'Two terms loaded with the same name.');
+ $this->assertCount(2, $terms, 'Two terms loaded with the same name.');
// Load single term when restricted to one vocabulary.
$terms = taxonomy_term_load_multiple_by_name($term->getName(), $this->vocabulary->id());
- $this->assertEqual(count($terms), 1, 'One term loaded when restricted by vocabulary.');
+ $this->assertCount(1, $terms, 'One term loaded when restricted by vocabulary.');
$this->assertTrue(isset($terms[$term->id()]), 'Term loaded using exact name and vocabulary machine name.');
// Create a new term with another name.
@@ -546,7 +546,7 @@ public function testTaxonomyGetTermByName() {
// Try to load terms filtering by a non-existing vocabulary.
$terms = taxonomy_term_load_multiple_by_name($term2->getName(), 'non_existing_vocabulary');
- $this->assertEqual(count($terms), 0, 'No terms loaded when restricted by a non-existing vocabulary.');
+ $this->assertCount(0, $terms, 'No terms loaded when restricted by a non-existing vocabulary.');
}
/**
@@ -598,7 +598,7 @@ public function testTermBreadcrumbs() {
// Check the breadcrumb on the term edit page.
$this->drupalGet('taxonomy/term/' . $term->id() . '/edit');
$breadcrumbs = $this->getSession()->getPage()->findAll('css', 'nav.breadcrumb ol li a');
- $this->assertIdentical(count($breadcrumbs), 2, 'The breadcrumbs are present on the page.');
+ $this->assertCount(2, $breadcrumbs, 'The breadcrumbs are present on the page.');
$this->assertIdentical($breadcrumbs[0]->getText(), 'Home', 'First breadcrumb text is Home');
$this->assertIdentical($breadcrumbs[1]->getText(), $term->label(), 'Second breadcrumb text is term name on term edit page.');
$this->assertEscaped($breadcrumbs[1]->getText(), 'breadcrumbs displayed and escaped.');
@@ -606,7 +606,7 @@ public function testTermBreadcrumbs() {
// Check the breadcrumb on the term delete page.
$this->drupalGet('taxonomy/term/' . $term->id() . '/delete');
$breadcrumbs = $this->getSession()->getPage()->findAll('css', 'nav.breadcrumb ol li a');
- $this->assertIdentical(count($breadcrumbs), 2, 'The breadcrumbs are present on the page.');
+ $this->assertCount(2, $breadcrumbs, 'The breadcrumbs are present on the page.');
$this->assertIdentical($breadcrumbs[0]->getText(), 'Home', 'First breadcrumb text is Home');
$this->assertIdentical($breadcrumbs[1]->getText(), $term->label(), 'Second breadcrumb text is term name on term delete page.');
$this->assertEscaped($breadcrumbs[1]->getText(), 'breadcrumbs displayed and escaped.');
diff --git a/web/core/modules/taxonomy/tests/src/Functional/TermTranslationUITest.php b/web/core/modules/taxonomy/tests/src/Functional/TermTranslationUITest.php
index 74b7b2467c..8b1665fc26 100644
--- a/web/core/modules/taxonomy/tests/src/Functional/TermTranslationUITest.php
+++ b/web/core/modules/taxonomy/tests/src/Functional/TermTranslationUITest.php
@@ -131,12 +131,12 @@ public function testTranslateLinkVocabularyAdminPage() {
// Verify translation links.
$this->drupalGet('admin/structure/taxonomy/manage/' . $this->vocabulary->id() . '/overview');
- $this->assertResponse(200, 'The translatable vocabulary page was found.');
+ $this->assertSession()->statusCodeEquals(200);
$this->assertLinkByHref('term/' . $translatable_tid . '/translations', 0, 'The translations link exists for a translatable vocabulary.');
$this->assertLinkByHref('term/' . $translatable_tid . '/edit', 0, 'The edit link exists for a translatable vocabulary.');
$this->drupalGet('admin/structure/taxonomy/manage/' . $untranslatable_vocabulary->id() . '/overview');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertLinkByHref('term/' . $untranslatable_tid . '/edit');
$this->assertNoLinkByHref('term/' . $untranslatable_tid . '/translations');
}
diff --git a/web/core/modules/taxonomy/tests/src/Functional/TokenReplaceTest.php b/web/core/modules/taxonomy/tests/src/Functional/TokenReplaceTest.php
index e8c5b322bf..7474cee2d1 100644
--- a/web/core/modules/taxonomy/tests/src/Functional/TokenReplaceTest.php
+++ b/web/core/modules/taxonomy/tests/src/Functional/TokenReplaceTest.php
@@ -128,7 +128,7 @@ public function testTaxonomyTokenReplacement() {
$tests['[term:vocabulary:name]'] = $this->vocabulary->label();
// Test to make sure that we generated something for each token.
- $this->assertFalse(in_array(0, array_map('strlen', $tests)), 'No empty tokens generated.');
+ $this->assertNotContains(0, array_map('strlen', $tests), 'No empty tokens generated.');
foreach ($tests as $input => $expected) {
$output = $token_service->replace($input, ['term' => $term2], ['langcode' => $language_interface->getId()]);
@@ -144,7 +144,7 @@ public function testTaxonomyTokenReplacement() {
$tests['[vocabulary:term-count]'] = 2;
// Test to make sure that we generated something for each token.
- $this->assertFalse(in_array(0, array_map('strlen', $tests)), 'No empty tokens generated.');
+ $this->assertNotContains(0, array_map('strlen', $tests), 'No empty tokens generated.');
foreach ($tests as $input => $expected) {
$output = $token_service->replace($input, ['vocabulary' => $this->vocabulary], ['langcode' => $language_interface->getId()]);
diff --git a/web/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyFieldAllTermsTest.php b/web/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyFieldAllTermsTest.php
index 67bf8e5f34..a136d51669 100644
--- a/web/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyFieldAllTermsTest.php
+++ b/web/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyFieldAllTermsTest.php
@@ -34,13 +34,13 @@ public function testViewsHandlerAllTermsField() {
$this->drupalGet('taxonomy_all_terms_test');
$actual = $this->xpath('//a[@href="' . $this->term1->toUrl()->toString() . '"]');
- $this->assertEqual(count($actual), 2, 'Correct number of taxonomy term1 links');
+ $this->assertCount(2, $actual, 'Correct number of taxonomy term1 links');
$this->assertEqual($actual[0]->getText(), $this->term1->label());
$this->assertEqual($actual[1]->getText(), $this->term1->label());
$this->assertEscaped($this->term1->label());
$actual = $this->xpath('//a[@href="' . $this->term2->toUrl()->toString() . '"]');
- $this->assertEqual(count($actual), 2, 'Correct number of taxonomy term2 links');
+ $this->assertCount(2, $actual, 'Correct number of taxonomy term2 links');
$this->assertEqual($actual[0]->getText(), $this->term2->label());
$this->assertEqual($actual[1]->getText(), $this->term2->label());
}
diff --git a/web/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyFieldFilterTest.php b/web/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyFieldFilterTest.php
index 5df90a6893..4682177246 100644
--- a/web/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyFieldFilterTest.php
+++ b/web/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyFieldFilterTest.php
@@ -22,7 +22,14 @@ class TaxonomyFieldFilterTest extends ViewTestBase {
/**
* {@inheritdoc}
*/
- public static $modules = ['language', 'taxonomy', 'taxonomy_test_views', 'text', 'views', 'node'];
+ public static $modules = [
+ 'language',
+ 'taxonomy',
+ 'taxonomy_test_views',
+ 'text',
+ 'views',
+ 'node',
+ ];
/**
* {@inheritdoc}
@@ -61,7 +68,7 @@ public function setUp($import_test_views = TRUE) {
$this->termNames = [
'en' => 'Food in Paris',
'es' => 'Comida en Paris',
- 'fr' => 'Nouriture en Paris',
+ 'fr' => 'Nourriture en Paris',
];
// Create a vocabulary.
diff --git a/web/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyIndexTidUiTest.php b/web/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyIndexTidUiTest.php
index de81f8ba68..df286a331d 100644
--- a/web/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyIndexTidUiTest.php
+++ b/web/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyIndexTidUiTest.php
@@ -36,7 +36,13 @@ class TaxonomyIndexTidUiTest extends UITestBase {
*
* @var array
*/
- public static $modules = ['node', 'taxonomy', 'views', 'views_ui', 'taxonomy_test_views'];
+ public static $modules = [
+ 'node',
+ 'taxonomy',
+ 'views',
+ 'views_ui',
+ 'taxonomy_test_views',
+ ];
/**
* A nested array of \Drupal\taxonomy\TermInterface objects.
@@ -157,11 +163,11 @@ public function testExposedFilter() {
// Only the nodes with the selected term should be shown.
$this->drupalGet('test-filter-taxonomy-index-tid');
$xpath = $this->xpath('//div[@class="view-content"]//a');
- $this->assertIdentical(2, count($xpath));
+ $this->assertCount(2, $xpath);
$xpath = $this->xpath('//div[@class="view-content"]//a[@href=:href]', [':href' => $node2->toUrl()->toString()]);
- $this->assertIdentical(1, count($xpath));
+ $this->assertCount(1, $xpath);
$xpath = $this->xpath('//div[@class="view-content"]//a[@href=:href]', [':href' => $node3->toUrl()->toString()]);
- $this->assertIdentical(1, count($xpath));
+ $this->assertCount(1, $xpath);
// Expose the filter.
$this->drupalPostForm('admin/structure/views/nojs/handler/test_filter_taxonomy_index_tid/default/filter/tid', [], 'Expose filter');
@@ -177,9 +183,9 @@ public function testExposedFilter() {
// shown.
$this->drupalGet('test-filter-taxonomy-index-tid');
$xpath = $this->xpath('//div[@class="view-content"]//a');
- $this->assertIdentical(1, count($xpath));
+ $this->assertCount(1, $xpath);
$xpath = $this->xpath('//div[@class="view-content"]//a[@href=:href]', [':href' => $node1->toUrl()->toString()]);
- $this->assertIdentical(1, count($xpath));
+ $this->assertCount(1, $xpath);
// Set the operator to 'not empty'.
$this->drupalPostForm('admin/structure/views/nojs/handler/test_filter_taxonomy_index_tid/default/filter/tid', ['options[operator]' => 'not empty'], 'Apply');
@@ -190,13 +196,13 @@ public function testExposedFilter() {
// shown.
$this->drupalGet('test-filter-taxonomy-index-tid');
$xpath = $this->xpath('//div[@class="view-content"]//a');
- $this->assertIdentical(3, count($xpath));
+ $this->assertCount(3, $xpath);
$xpath = $this->xpath('//div[@class="view-content"]//a[@href=:href]', [':href' => $node2->toUrl()->toString()]);
- $this->assertIdentical(1, count($xpath));
+ $this->assertCount(1, $xpath);
$xpath = $this->xpath('//div[@class="view-content"]//a[@href=:href]', [':href' => $node3->toUrl()->toString()]);
- $this->assertIdentical(1, count($xpath));
+ $this->assertCount(1, $xpath);
$xpath = $this->xpath('//div[@class="view-content"]//a[@href=:href]', [':href' => $node4->toUrl()->toString()]);
- $this->assertIdentical(1, count($xpath));
+ $this->assertCount(1, $xpath);
// Select 'Term ID' as the field to be displayed.
$edit = ['name[taxonomy_term_field_data.tid]' => TRUE];
diff --git a/web/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyRelationshipTest.php b/web/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyRelationshipTest.php
index 20f467417e..a47aaba2a3 100644
--- a/web/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyRelationshipTest.php
+++ b/web/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyRelationshipTest.php
@@ -95,16 +95,23 @@ public function testTaxonomyRelationships() {
// Also check that we have the correct result entity.
$this->assertEqual($row->_entity->id(), $this->terms[$index]->id());
- $this->assertTrue($row->_entity instanceof TermInterface);
+ $this->assertInstanceOf(TermInterface::class, $row->_entity);
if (!$index) {
- $this->assertTrue($row->_relationship_entities['parent'] instanceof TermInterface);
+ $this->assertInstanceOf(TermInterface::class, $row->_relationship_entities['parent']);
$this->assertEqual($row->_relationship_entities['parent']->id(), $this->term2->id());
$this->assertEqual($row->taxonomy_term_field_data_taxonomy_term__parent_tid, $this->term2->id());
}
- $this->assertTrue($row->_relationship_entities['nid'] instanceof NodeInterface);
+ $this->assertInstanceOf(NodeInterface::class, $row->_relationship_entities['nid']);
$this->assertEqual($row->_relationship_entities['nid']->id(), $this->nodes[$index]->id());
}
+
+ // Test node fields are available through relationship.
+ \Drupal::service('module_installer')->install(['views_ui']);
+ $this->drupalLogin($this->createUser(['administer views']));
+ $this->drupalGet('admin/structure/views/view/test_taxonomy_term_relationship');
+ $this->click('#views-add-field');
+ $this->assertSession()->pageTextContains('Body');
}
}
diff --git a/web/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyTermArgumentDepthTest.php b/web/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyTermArgumentDepthTest.php
index 0107dea661..420be449e2 100644
--- a/web/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyTermArgumentDepthTest.php
+++ b/web/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyTermArgumentDepthTest.php
@@ -12,7 +12,12 @@ class TaxonomyTermArgumentDepthTest extends TaxonomyTestBase {
/**
* {@inheritdoc}
*/
- public static $modules = ['taxonomy', 'taxonomy_test_views', 'views', 'node'];
+ public static $modules = [
+ 'taxonomy',
+ 'taxonomy_test_views',
+ 'views',
+ 'node',
+ ];
/**
* {@inheritdoc}
diff --git a/web/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyTermFilterDepthTest.php b/web/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyTermFilterDepthTest.php
index 5cc1ad93db..695a974ccc 100644
--- a/web/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyTermFilterDepthTest.php
+++ b/web/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyTermFilterDepthTest.php
@@ -14,7 +14,12 @@ class TaxonomyTermFilterDepthTest extends TaxonomyTestBase {
/**
* {@inheritdoc}
*/
- public static $modules = ['taxonomy', 'taxonomy_test_views', 'views', 'node'];
+ public static $modules = [
+ 'taxonomy',
+ 'taxonomy_test_views',
+ 'views',
+ 'node',
+ ];
/**
* {@inheritdoc}
diff --git a/web/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyTermViewTest.php b/web/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyTermViewTest.php
index 13cd7286b1..e1b7f3f1c9 100644
--- a/web/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyTermViewTest.php
+++ b/web/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyTermViewTest.php
@@ -148,7 +148,7 @@ public function testTaxonomyTermView() {
$condition = $query->conditions();
// We only want to check the no. of conditions in the query.
unset($condition['#conjunction']);
- $this->assertEqual(1, count($condition));
+ $this->assertCount(1, $condition);
// Clear permissions for anonymous users to check access for default views.
Role::load(RoleInterface::ANONYMOUS_ID)->revokePermission('access content')->save();
@@ -156,9 +156,9 @@ public function testTaxonomyTermView() {
// Test the default views disclose no data by default.
$this->drupalLogout();
$this->drupalGet('taxonomy/term/' . $term->id());
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
$this->drupalGet('taxonomy/term/' . $term->id() . '/feed');
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
}
}
diff --git a/web/core/modules/taxonomy/tests/src/Functional/VocabularyLanguageTest.php b/web/core/modules/taxonomy/tests/src/Functional/VocabularyLanguageTest.php
index 17a096b2cb..4217c5677b 100644
--- a/web/core/modules/taxonomy/tests/src/Functional/VocabularyLanguageTest.php
+++ b/web/core/modules/taxonomy/tests/src/Functional/VocabularyLanguageTest.php
@@ -85,7 +85,7 @@ public function testVocabularyDefaultLanguageForTerms() {
// Check that the vocabulary was actually created.
$this->drupalGet('admin/structure/taxonomy/manage/' . $edit['vid']);
- $this->assertResponse(200, 'The vocabulary has been created.');
+ $this->assertSession()->statusCodeEquals(200);
// Check that the language settings were saved.
$language_settings = ContentLanguageSettings::loadByEntityTypeBundle('taxonomy_term', $edit['vid']);
diff --git a/web/core/modules/taxonomy/tests/src/Functional/VocabularyPermissionsTest.php b/web/core/modules/taxonomy/tests/src/Functional/VocabularyPermissionsTest.php
index 174feab7f7..9de9655c8a 100644
--- a/web/core/modules/taxonomy/tests/src/Functional/VocabularyPermissionsTest.php
+++ b/web/core/modules/taxonomy/tests/src/Functional/VocabularyPermissionsTest.php
@@ -235,7 +235,7 @@ public function testVocabularyPermissionsTaxonomyTerm() {
// Visit the main taxonomy administration page.
$this->drupalGet('admin/structure/taxonomy/manage/' . $vocabulary->id() . '/add');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertField('edit-name-0-value', 'Add taxonomy term form opened successfully.');
// Submit the term.
@@ -256,7 +256,7 @@ public function testVocabularyPermissionsTaxonomyTerm() {
// Edit the term.
$this->drupalGet('taxonomy/term/' . $term->id() . '/edit');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertText($edit['name[0][value]'], 'Edit taxonomy term form opened successfully.');
$edit['name[0][value]'] = $this->randomMachineName();
@@ -304,16 +304,16 @@ public function testVocabularyPermissionsTaxonomyTerm() {
$user = $this->drupalCreateUser(["edit terms in {$vocabulary->id()}"]);
$this->drupalLogin($user);
- // Visit the main taxonomy administration page.
+ // Ensure the taxonomy term add form is denied.
$this->drupalGet('admin/structure/taxonomy/manage/' . $vocabulary->id() . '/add');
- $this->assertResponse(403, 'Add taxonomy term form open failed.');
+ $this->assertSession()->statusCodeEquals(403);
// Create a test term.
$term = $this->createTerm($vocabulary);
// Edit the term.
$this->drupalGet('taxonomy/term/' . $term->id() . '/edit');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertText($term->getName(), 'Edit taxonomy term form opened successfully.');
$edit['name[0][value]'] = $this->randomMachineName();
@@ -324,24 +324,24 @@ public function testVocabularyPermissionsTaxonomyTerm() {
$view_link = $this->xpath('//div[@class="messages"]//a[contains(@href, :href)]', [':href' => 'term/']);
$this->assert(isset($view_link), 'The message area contains a link to a term');
- // Delete the vocabulary.
+ // Ensure the term cannot be deleted.
$this->drupalGet('taxonomy/term/' . $term->id() . '/delete');
- $this->assertResponse(403, 'Delete taxonomy term form open failed.');
+ $this->assertSession()->statusCodeEquals(403);
// Test as user with "delete" permissions.
$user = $this->drupalCreateUser(["delete terms in {$vocabulary->id()}"]);
$this->drupalLogin($user);
- // Visit the main taxonomy administration page.
+ // Ensure the taxonomy term add form is denied.
$this->drupalGet('admin/structure/taxonomy/manage/' . $vocabulary->id() . '/add');
- $this->assertResponse(403, 'Add taxonomy term form open failed.');
+ $this->assertSession()->statusCodeEquals(403);
// Create a test term.
$term = $this->createTerm($vocabulary);
- // Edit the term.
+ // Ensure that the term cannot be edited.
$this->drupalGet('taxonomy/term/' . $term->id() . '/edit');
- $this->assertResponse(403, 'Edit taxonomy term form open failed.');
+ $this->assertSession()->statusCodeEquals(403);
// Delete the vocabulary.
$this->drupalGet('taxonomy/term/' . $term->id() . '/delete');
@@ -355,20 +355,20 @@ public function testVocabularyPermissionsTaxonomyTerm() {
$user = $this->drupalCreateUser();
$this->drupalLogin($user);
- // Visit the main taxonomy administration page.
+ // Ensure the taxonomy term add form is denied.
$this->drupalGet('admin/structure/taxonomy/manage/' . $vocabulary->id() . '/add');
- $this->assertResponse(403, 'Add taxonomy term form open failed.');
+ $this->assertSession()->statusCodeEquals(403);
// Create a test term.
$term = $this->createTerm($vocabulary);
- // Edit the term.
+ // Ensure that the term cannot be edited.
$this->drupalGet('taxonomy/term/' . $term->id() . '/edit');
- $this->assertResponse(403, 'Edit taxonomy term form open failed.');
+ $this->assertSession()->statusCodeEquals(403);
- // Delete the vocabulary.
+ // Ensure the term cannot be deleted.
$this->drupalGet('taxonomy/term/' . $term->id() . '/delete');
- $this->assertResponse(403, 'Delete taxonomy term form open failed.');
+ $this->assertSession()->statusCodeEquals(403);
}
}
diff --git a/web/core/modules/taxonomy/tests/src/Functional/VocabularyUiTest.php b/web/core/modules/taxonomy/tests/src/Functional/VocabularyUiTest.php
index 7419930a51..a8cbd37889 100644
--- a/web/core/modules/taxonomy/tests/src/Functional/VocabularyUiTest.php
+++ b/web/core/modules/taxonomy/tests/src/Functional/VocabularyUiTest.php
@@ -81,7 +81,7 @@ public function testVocabularyInterface() {
$this->drupalPostForm('admin/structure/taxonomy/add', $edit, t('Save'));
$site_name = $this->config('system.site')->get('name');
- $this->assertTitle(t("Don't Panic | @site-name", ['@site-name' => $site_name]), 'The page title contains the escaped character.');
+ $this->assertTitle("Don't Panic | $site_name");
}
/**
diff --git a/web/core/modules/taxonomy/tests/src/Kernel/Migrate/MigrateTaxonomyTermStubTest.php b/web/core/modules/taxonomy/tests/src/Kernel/Migrate/MigrateTaxonomyTermStubTest.php
index d601a4b065..a71a295ff6 100644
--- a/web/core/modules/taxonomy/tests/src/Kernel/Migrate/MigrateTaxonomyTermStubTest.php
+++ b/web/core/modules/taxonomy/tests/src/Kernel/Migrate/MigrateTaxonomyTermStubTest.php
@@ -79,7 +79,7 @@ public function testStubWithWeightMapping() {
$stub_entity = Term::load(2);
$this->assertNotEmpty($stub_entity, 'Stub successfully created');
if ($stub_entity) {
- $this->assertIdentical(count($stub_entity->validate()), 0, 'Stub is a valid entity');
+ $this->assertCount(0, $stub_entity->validate(), 'Stub is a valid entity');
}
}
diff --git a/web/core/modules/taxonomy/tests/src/Kernel/Migrate/TaxonomyTermDeriverTest.php b/web/core/modules/taxonomy/tests/src/Kernel/Migrate/TaxonomyTermDeriverTest.php
new file mode 100644
index 0000000000..53dad583cd
--- /dev/null
+++ b/web/core/modules/taxonomy/tests/src/Kernel/Migrate/TaxonomyTermDeriverTest.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace Drupal\Tests\taxonomy\Kernel\Migrate;
+
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
+
+/**
+ * Tests d7 taxonomy term deriver.
+ *
+ * @group migrate_drupal_7
+ */
+class TaxonomyTermDeriverTest extends MigrateDrupal7TestBase {
+
+ public static $modules = ['taxonomy', 'text'];
+
+ /**
+ * Tests fields exist in process pipeline for term migrations.
+ */
+ public function testBuilder() {
+ // Test a field on the vocabfixed term.
+ $process = $this->getMigration('d7_taxonomy_term:vocabfixed')->getProcess();
+ $this->assertIdentical('field_training', $process['field_training'][0]['source']);
+
+ // Test a field on the vocablocalized term.
+ $process = $this->getMigration('d7_taxonomy_term:vocablocalized')->getProcess();
+ $this->assertIdentical('field_sector', $process['field_sector'][0]['source']);
+
+ // Test a field on the vocabtranslate term.
+ $process = $this->getMigration('d7_taxonomy_term:vocabtranslate')->getProcess();
+ $this->assertIdentical('field_chancellor', $process['field_chancellor'][0]['source']);
+
+ // Test a field on the test_vocabulary term.
+ $process = $this->getMigration('d7_taxonomy_term:test_vocabulary')->getProcess();
+ $this->assertIdentical('field_integer', $process['field_integer'][0]['source']);
+ $this->assertIdentical('field_term_reference', $process['field_term_reference'][0]['source']);
+ }
+
+}
diff --git a/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTaxonomyVocabularyTranslationTest.php b/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTaxonomyVocabularyTranslationTest.php
index 8472dc29f0..eba249a5bc 100644
--- a/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTaxonomyVocabularyTranslationTest.php
+++ b/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTaxonomyVocabularyTranslationTest.php
@@ -18,8 +18,6 @@ class MigrateTaxonomyVocabularyTranslationTest extends MigrateDrupal6TestBase {
'config_translation',
'language',
'taxonomy',
- // Required for translation migrations.
- 'migrate_drupal_multilingual',
];
/**
diff --git a/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTermLocalizedTranslationTest.php b/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTermLocalizedTranslationTest.php
index d52cac6994..044a906544 100644
--- a/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTermLocalizedTranslationTest.php
+++ b/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTermLocalizedTranslationTest.php
@@ -22,8 +22,6 @@ class MigrateTermLocalizedTranslationTest extends MigrateDrupal6TestBase {
'menu_ui',
'node',
'taxonomy',
- // Required for translation migrations.
- 'migrate_drupal_multilingual',
];
/**
diff --git a/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTermNodeComplete.php b/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTermNodeComplete.php
new file mode 100644
index 0000000000..f7ce2a008a
--- /dev/null
+++ b/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTermNodeComplete.php
@@ -0,0 +1,67 @@
+<?php
+
+namespace Drupal\Tests\taxonomy\Kernel\Migrate\d6;
+
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+use Drupal\migrate_drupal\NodeMigrateType;
+use Drupal\node\Entity\Node;
+
+/**
+ * Upgrade taxonomy term node associations.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateTermNodeComplete extends MigrateDrupal6TestBase {
+
+ /**
+ * {@inheritdoc}
+ */
+ public static $modules = [
+ 'content_translation',
+ 'language',
+ 'menu_ui',
+ // A requirement for d6_node_translation.
+ 'migrate_drupal_multilingual',
+ 'taxonomy',
+ ];
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function setUp() {
+ parent::setUp();
+
+ // Remove the classic node table made in setup.
+ $this->removeNodeMigrateMapTable(NodeMigrateType::NODE_MIGRATE_TYPE_CLASSIC, '6');
+
+ $this->installSchema('node', ['node_access']);
+ $this->installEntitySchema('node');
+
+ $this->executeMigration('language');
+ $this->migrateUsers(FALSE);
+ $this->migrateFields();
+ $this->executeMigrations(['d6_node_settings', 'd6_node_complete']);
+ $this->migrateTaxonomy();
+ // This is a base plugin ID and we want to run all derivatives.
+ $this->executeMigrations(['d6_term_node']);
+ }
+
+ /**
+ * Tests the Drupal 6 term-node association to Drupal 8 migration.
+ */
+ public function testTermNode() {
+ $this->container->get('entity_type.manager')
+ ->getStorage('node')
+ ->resetCache([1, 2]);
+
+ $nodes = Node::loadMultiple([1, 2]);
+ $node = $nodes[1];
+ $this->assertCount(1, $node->field_vocabulary_1_i_0_);
+ $this->assertSame('1', $node->field_vocabulary_1_i_0_[0]->target_id);
+ $node = $nodes[2];
+ $this->assertCount(2, $node->field_vocabulary_2_i_1_);
+ $this->assertSame('2', $node->field_vocabulary_2_i_1_[0]->target_id);
+ $this->assertSame('3', $node->field_vocabulary_2_i_1_[1]->target_id);
+ }
+
+}
diff --git a/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTermNodeRevisionTest.php b/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTermNodeRevisionTest.php
index 3fd755440a..f664933ab5 100644
--- a/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTermNodeRevisionTest.php
+++ b/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTermNodeRevisionTest.php
@@ -32,7 +32,7 @@ protected function setUp() {
*/
public function testTermRevisionNode() {
$node = \Drupal::entityTypeManager()->getStorage('node')->loadRevision(2001);
- $this->assertSame(2, count($node->field_vocabulary_3_i_2_));
+ $this->assertCount(2, $node->field_vocabulary_3_i_2_);
$this->assertSame('4', $node->field_vocabulary_3_i_2_[0]->target_id);
$this->assertSame('5', $node->field_vocabulary_3_i_2_[1]->target_id);
}
diff --git a/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTermNodeTest.php b/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTermNodeTest.php
index 79afe597d1..5a15bbfc08 100644
--- a/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTermNodeTest.php
+++ b/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTermNodeTest.php
@@ -40,10 +40,10 @@ public function testTermNode() {
$nodes = Node::loadMultiple([1, 2]);
$node = $nodes[1];
- $this->assertSame(1, count($node->field_vocabulary_1_i_0_));
+ $this->assertCount(1, $node->field_vocabulary_1_i_0_);
$this->assertSame('1', $node->field_vocabulary_1_i_0_[0]->target_id);
$node = $nodes[2];
- $this->assertSame(2, count($node->field_vocabulary_2_i_1_));
+ $this->assertCount(2, $node->field_vocabulary_2_i_1_);
$this->assertSame('2', $node->field_vocabulary_2_i_1_[0]->target_id);
$this->assertSame('3', $node->field_vocabulary_2_i_1_[1]->target_id);
}
diff --git a/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTermNodeTranslationTest.php b/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTermNodeTranslationTest.php
index 51efcd35d7..21e8fac702 100644
--- a/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTermNodeTranslationTest.php
+++ b/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTermNodeTranslationTest.php
@@ -20,7 +20,6 @@ class MigrateTermNodeTranslationTest extends MigrateDrupal6TestBase {
'content_translation',
'language',
'menu_ui',
- 'migrate_drupal_multilingual',
'taxonomy',
];
diff --git a/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateVocabularyEntityDisplayTest.php b/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateVocabularyEntityDisplayTest.php
index 1c47ec0441..8896f48e25 100644
--- a/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateVocabularyEntityDisplayTest.php
+++ b/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateVocabularyEntityDisplayTest.php
@@ -50,7 +50,7 @@ public function testVocabularyEntityDisplay() {
// Tests that a vocabulary named like a D8 base field will be migrated and
// prefixed with 'field_' to avoid conflicts.
$field_type = EntityViewDisplay::load('node.sponsor.default')->getComponent('field_type');
- $this->assertTrue(is_array($field_type));
+ $this->assertIsArray($field_type);
}
/**
diff --git a/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateVocabularyEntityFormDisplayTest.php b/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateVocabularyEntityFormDisplayTest.php
index 6499b61e40..9f2ebf517f 100644
--- a/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateVocabularyEntityFormDisplayTest.php
+++ b/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateVocabularyEntityFormDisplayTest.php
@@ -55,7 +55,7 @@ public function testVocabularyEntityFormDisplay() {
// Tests that a vocabulary named like a D8 base field will be migrated and
// prefixed with 'field_' to avoid conflicts.
$field_type = EntityFormDisplay::load('node.sponsor.default')->getComponent('field_type');
- $this->assertTrue(is_array($field_type));
+ $this->assertIsArray($field_type);
}
/**
diff --git a/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateVocabularyFieldInstanceTest.php b/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateVocabularyFieldInstanceTest.php
index 509ab068cd..21da507582 100644
--- a/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateVocabularyFieldInstanceTest.php
+++ b/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateVocabularyFieldInstanceTest.php
@@ -62,21 +62,21 @@ public function testVocabularyFieldInstance() {
$this->assertSame([['node', 'article', 'field_tags']], $this->getMigration('d6_vocabulary_field_instance')->getIdMap()->lookupDestinationIds([4, 'article']));
- // Test the the field vocabulary_1_i_0_ with multilingual option,
+ // Test the field vocabulary_1_i_0_ with multilingual option,
// 'per language terms'.
$field_id = 'node.story.field_vocabulary_1_i_0_';
$field = FieldConfig::load($field_id);
$this->assertFalse($field->isRequired(), 'Field is not required');
$this->assertTrue($field->isTranslatable());
- // Test the the field vocabulary_2_i_0_ with multilingual option,
+ // Test the field vocabulary_2_i_0_ with multilingual option,
// 'Set language to vocabulary'.
$field_id = 'node.story.field_vocabulary_2_i_1_';
$field = FieldConfig::load($field_id);
$this->assertFalse($field->isRequired(), 'Field is not required');
$this->assertFalse($field->isTranslatable());
- // Test the the field vocabulary_3_i_0_ with multilingual option,
+ // Test the field vocabulary_3_i_0_ with multilingual option,
// 'Localize terms'.
$field_id = 'node.story.field_vocabulary_3_i_2_';
$field = FieldConfig::load($field_id);
diff --git a/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateNodeTaxonomyTest.php b/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateNodeTaxonomyTest.php
index c3f81fdb47..66da7a1f9b 100644
--- a/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateNodeTaxonomyTest.php
+++ b/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateNodeTaxonomyTest.php
@@ -41,7 +41,7 @@ protected function setUp() {
*/
public function testMigration() {
$node = Node::load(2);
- $this->assertTrue($node instanceof NodeInterface);
+ $this->assertInstanceOf(NodeInterface::class, $node);
$this->assertEqual(9, $node->field_tags[0]->target_id);
$this->assertEqual(14, $node->field_tags[1]->target_id);
$this->assertEqual(17, $node->field_tags[2]->target_id);
diff --git a/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTaxonomyTermTest.php b/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTaxonomyTermTest.php
index a89984c25c..827893c078 100644
--- a/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTaxonomyTermTest.php
+++ b/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTaxonomyTermTest.php
@@ -21,8 +21,6 @@ class MigrateTaxonomyTermTest extends MigrateDrupal7TestBase {
'language',
'link',
'menu_ui',
- // Required for translation migrations.
- 'migrate_drupal_multilingual',
'node',
'taxonomy',
'telephone',
@@ -137,6 +135,24 @@ public function testTaxonomyTerms() {
$this->assertEntity(22, 'fr', 'fr - High council', 'vocabtranslate', NULL, NULL, 0, [], NULL, NULL, 1);
$this->assertEntity(23, 'is', 'is - High council', 'vocabtranslate', NULL, NULL, 0, [], NULL, NULL, 1);
$this->assertEntity(24, 'fr', 'FR - Crewman', 'vocabfixed', NULL, NULL, 0, [], NULL, NULL, 1);
+
+ // Localized.
+ $this->assertEntity(19, 'en', 'Jupiter Station', 'vocablocalized', 'Holographic research.', 'filtered_html', '0', []);
+ $this->assertEntity(20, 'en', 'DS9', 'vocablocalized', 'Terok Nor', 'filtered_html', '0', []);
+
+ /** @var \Drupal\taxonomy\TermInterface $entity */
+ $entity = Term::load(20);
+ $this->assertSame('Bajor', $entity->field_sector->value);
+
+ // Translate.
+ $this->assertEntity(21, 'en', 'High council', 'vocabtranslate', NULL, NULL, '0', []);
+ $entity = Term::load(21);
+ $this->assertSame("K'mpec", $entity->field_chancellor->value);
+ $this->assertEntity(22, 'fr', 'fr - High council', 'vocabtranslate', NULL, NULL, '0', []);
+ $this->assertEntity(23, 'is', 'is - High council', 'vocabtranslate', NULL, NULL, '0', []);
+
+ // Fixed.
+ $this->assertEntity(24, 'fr', 'FR - Crewman', 'vocabfixed', NULL, NULL, '0', []);
}
/**
diff --git a/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTaxonomyTermTranslationTest.php b/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTaxonomyTermTranslationTest.php
index 68f12435ce..a9f215ff20 100644
--- a/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTaxonomyTermTranslationTest.php
+++ b/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTaxonomyTermTranslationTest.php
@@ -24,8 +24,6 @@ class MigrateTaxonomyTermTranslationTest extends MigrateDrupal7TestBase {
'language',
'link',
'menu_ui',
- // Required for translation migrations.
- 'migrate_drupal_multilingual',
'node',
'taxonomy',
'telephone',
@@ -155,14 +153,24 @@ public function testTaxonomyTermTranslation() {
// Localized.
$this->assertEntity(19, 'en', 'Jupiter Station', 'vocablocalized', 'Holographic research.', 'filtered_html', '0', []);
$this->assertEntity(20, 'en', 'DS9', 'vocablocalized', 'Terok Nor', 'filtered_html', '0', []);
+ /** @var \Drupal\taxonomy\TermInterface $entity */
+ $entity = Term::load(20);
+ $this->assertSame('Bajor', $entity->field_sector->value);
// Translate.
$this->assertEntity(21, 'en', 'High council', 'vocabtranslate', NULL, NULL, '0', []);
+ $entity = Term::load(21);
+ $this->assertSame("K'mpec", $entity->field_chancellor->value);
+
$this->assertEntity(22, 'fr', 'fr - High council', 'vocabtranslate', NULL, NULL, '0', []);
+ $entity = Term::load(22);
+ $this->assertSame("fr - K'mpec", $entity->field_chancellor->value);
$this->assertEntity(23, 'is', 'is - High council', 'vocabtranslate', NULL, NULL, '0', []);
// Fixed.
$this->assertEntity(24, 'fr', 'FR - Crewman', 'vocabfixed', NULL, NULL, '0', []);
+ $entity = Term::load(24);
+ $this->assertSame('fr - specialist', $entity->field_training->value);
}
}
diff --git a/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTaxonomyVocabularyTest.php b/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTaxonomyVocabularyTest.php
index 714cdfd6dc..1e967bc767 100644
--- a/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTaxonomyVocabularyTest.php
+++ b/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTaxonomyVocabularyTest.php
@@ -41,7 +41,7 @@ protected function setUp() {
protected function assertEntity($id, $expected_label, $expected_description, $expected_weight) {
/** @var \Drupal\taxonomy\VocabularyInterface $entity */
$entity = Vocabulary::load($id);
- $this->assertTrue($entity instanceof VocabularyInterface);
+ $this->assertInstanceOf(VocabularyInterface::class, $entity);
$this->assertIdentical($expected_label, $entity->label());
$this->assertIdentical($expected_description, $entity->getDescription());
$this->assertIdentical($expected_weight, $entity->get('weight'));
diff --git a/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTaxonomyVocabularyTranslationTest.php b/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTaxonomyVocabularyTranslationTest.php
index 19b62b780b..27cb953413 100644
--- a/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTaxonomyVocabularyTranslationTest.php
+++ b/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTaxonomyVocabularyTranslationTest.php
@@ -17,8 +17,6 @@ class MigrateTaxonomyVocabularyTranslationTest extends MigrateDrupal7TestBase {
public static $modules = [
'config_translation',
'language',
- // Required for translation migrations.
- 'migrate_drupal_multilingual',
'taxonomy',
'text',
];
diff --git a/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTermLocalizedTranslationTest.php b/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTermLocalizedTranslationTest.php
index 06da1ad1df..d84c4be543 100644
--- a/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTermLocalizedTranslationTest.php
+++ b/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTermLocalizedTranslationTest.php
@@ -19,8 +19,6 @@ class MigrateTermLocalizedTranslationTest extends MigrateDrupal7TestBase {
public static $modules = [
'content_translation',
'language',
- // Required for translation migrations.
- 'migrate_drupal_multilingual',
'taxonomy',
'text',
];
diff --git a/web/core/modules/taxonomy/tests/src/Kernel/PendingRevisionTest.php b/web/core/modules/taxonomy/tests/src/Kernel/PendingRevisionTest.php
index e4b2cc051c..49e1fcd651 100644
--- a/web/core/modules/taxonomy/tests/src/Kernel/PendingRevisionTest.php
+++ b/web/core/modules/taxonomy/tests/src/Kernel/PendingRevisionTest.php
@@ -20,7 +20,14 @@ class PendingRevisionTest extends KernelTestBase {
/**
* {@inheritdoc}
*/
- public static $modules = ['taxonomy', 'node', 'user', 'text', 'field', 'system'];
+ public static $modules = [
+ 'taxonomy',
+ 'node',
+ 'user',
+ 'text',
+ 'field',
+ 'system',
+ ];
/**
* {@inheritdoc}
diff --git a/web/core/modules/taxonomy/tests/src/Kernel/TaxonomyLegacyTest.php b/web/core/modules/taxonomy/tests/src/Kernel/TaxonomyLegacyTest.php
index 6246943a4e..31833b2c99 100644
--- a/web/core/modules/taxonomy/tests/src/Kernel/TaxonomyLegacyTest.php
+++ b/web/core/modules/taxonomy/tests/src/Kernel/TaxonomyLegacyTest.php
@@ -67,7 +67,7 @@ public function testTaxonomyTermView() {
$this->createTerm($this->createVocabulary()),
$this->createTerm($this->createVocabulary()),
];
- $this->assertEquals(4, count(taxonomy_term_view_multiple($entities)));
+ $this->assertCount(4, taxonomy_term_view_multiple($entities));
}
}
diff --git a/web/core/modules/taxonomy/tests/src/Kernel/TermKernelTest.php b/web/core/modules/taxonomy/tests/src/Kernel/TermKernelTest.php
index 9d23245091..c496cad0b7 100644
--- a/web/core/modules/taxonomy/tests/src/Kernel/TermKernelTest.php
+++ b/web/core/modules/taxonomy/tests/src/Kernel/TermKernelTest.php
@@ -108,11 +108,11 @@ public function testTaxonomyVocabularyTree() {
*/
// Count $term[1] parents with $max_depth = 1.
$tree = $taxonomy_storage->loadTree($vocabulary->id(), $term[1]->id(), 1);
- $this->assertEqual(1, count($tree), 'We have one parent with depth 1.');
+ $this->assertCount(1, $tree, 'We have one parent with depth 1.');
// Count all vocabulary tree elements.
$tree = $taxonomy_storage->loadTree($vocabulary->id());
- $this->assertEqual(8, count($tree), 'We have all vocabulary tree elements.');
+ $this->assertCount(8, $tree, 'We have all vocabulary tree elements.');
// Count elements in every tree depth.
foreach ($tree as $element) {
@@ -130,19 +130,19 @@ public function testTaxonomyVocabularyTree() {
$storage = \Drupal::entityTypeManager()->getStorage('taxonomy_term');
// Count parents of $term[2].
$parents = $storage->loadParents($term[2]->id());
- $this->assertEqual(2, count($parents), 'The term has two parents.');
+ $this->assertCount(2, $parents, 'The term has two parents.');
// Count parents of $term[3].
$parents = $storage->loadParents($term[3]->id());
- $this->assertEqual(1, count($parents), 'The term has one parent.');
+ $this->assertCount(1, $parents, 'The term has one parent.');
// Identify all ancestors of $term[2].
$ancestors = $storage->loadAllParents($term[2]->id());
- $this->assertEqual(4, count($ancestors), 'The term has four ancestors including the term itself.');
+ $this->assertCount(4, $ancestors, 'The term has four ancestors including the term itself.');
// Identify all ancestors of $term[3].
$ancestors = $storage->loadAllParents($term[3]->id());
- $this->assertEqual(5, count($ancestors), 'The term has five ancestors including the term itself.');
+ $this->assertCount(5, $ancestors, 'The term has five ancestors including the term itself.');
}
/**
diff --git a/web/core/modules/taxonomy/tests/src/Kernel/TermValidationTest.php b/web/core/modules/taxonomy/tests/src/Kernel/TermValidationTest.php
index 8c0662ba42..1dad6bc4bf 100644
--- a/web/core/modules/taxonomy/tests/src/Kernel/TermValidationTest.php
+++ b/web/core/modules/taxonomy/tests/src/Kernel/TermValidationTest.php
@@ -40,30 +40,30 @@ public function testValidation() {
'vid' => 'tags',
]);
$violations = $term->validate();
- $this->assertEqual(count($violations), 0, 'No violations when validating a default term.');
+ $this->assertCount(0, $violations, 'No violations when validating a default term.');
$term->set('name', $this->randomString(256));
$violations = $term->validate();
- $this->assertEqual(count($violations), 1, 'Violation found when name is too long.');
+ $this->assertCount(1, $violations, 'Violation found when name is too long.');
$this->assertEqual($violations[0]->getPropertyPath(), 'name.0.value');
$field_label = $term->get('name')->getFieldDefinition()->getLabel();
$this->assertEqual($violations[0]->getMessage(), t('%name: may not be longer than @max characters.', ['%name' => $field_label, '@max' => 255]));
$term->set('name', NULL);
$violations = $term->validate();
- $this->assertEqual(count($violations), 1, 'Violation found when name is NULL.');
+ $this->assertCount(1, $violations, 'Violation found when name is NULL.');
$this->assertEqual($violations[0]->getPropertyPath(), 'name');
$this->assertEqual($violations[0]->getMessage(), t('This value should not be null.'));
$term->set('name', 'test');
$term->set('parent', 9999);
$violations = $term->validate();
- $this->assertEqual(count($violations), 1, 'Violation found when term parent is invalid.');
+ $this->assertCount(1, $violations, 'Violation found when term parent is invalid.');
$this->assertEqual($violations[0]->getMessage(), new FormattableMarkup('The referenced entity (%type: %id) does not exist.', ['%type' => 'taxonomy_term', '%id' => 9999]));
$term->set('parent', 0);
$violations = $term->validate();
- $this->assertEqual(count($violations), 0, 'No violations for parent id 0.');
+ $this->assertCount(0, $violations, 'No violations for parent id 0.');
}
}
diff --git a/web/core/modules/taxonomy/tests/src/Kernel/Views/ArgumentTransformTermTest.php b/web/core/modules/taxonomy/tests/src/Kernel/Views/ArgumentTransformTermTest.php
new file mode 100644
index 0000000000..04c36a6601
--- /dev/null
+++ b/web/core/modules/taxonomy/tests/src/Kernel/Views/ArgumentTransformTermTest.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace Drupal\Tests\taxonomy\Kernel\Views;
+
+use Drupal\views\Views;
+
+/**
+ * Tests taxonomy term argument transformation.
+ *
+ * @group taxonomy
+ *
+ * @see \Drupal\taxonomy\Plugin\views\argument_validator\TermName
+ */
+class ArgumentTransformTermTest extends TaxonomyTestBase {
+
+ /**
+ * {@inheritdoc}
+ */
+ public static $testViews = ['test_argument_transform_term'];
+
+ /**
+ * Tests term argument transformation of hyphens and spaces.
+ *
+ * @dataProvider termArgumentTransformationProvider
+ *
+ * @param string $name
+ * The name of the taxonomy term to use for the test.
+ */
+ public function testTermArgumentTransformation($name) {
+ /** @var \Drupal\taxonomy\TermInterface $term */
+ $term = $this->createTerm(['name' => $name]);
+
+ /** @var \Drupal\views\ViewExecutable $view */
+ $view = Views::getView('test_argument_transform_term');
+ $view->initHandlers();
+
+ /** @var string $hyphenated_term */
+ $hyphenated_term = str_replace(' ', '-', $term->label());
+ $this->assertTrue($view->argument['tid']->setArgument($hyphenated_term));
+ // Assert hyphens are converted back to spaces.
+ $this->assertEquals($term->label(), $view->argument['tid']->argument);
+ }
+
+ /**
+ * Provides data for testTermArgumentTransformation().
+ *
+ * @return array[]
+ * Test data.
+ */
+ public function termArgumentTransformationProvider() {
+ return [
+ 'space in the middle' => [
+ 'name' => $this->randomMachineName() . ' ' . $this->randomMachineName(),
+ ],
+ 'space at the start' => [
+ 'name' => ' ' . $this->randomMachineName(),
+ ],
+ 'space at the end' => [
+ 'name' => $this->randomMachineName() . ' ',
+ ],
+ ];
+ }
+
+}
diff --git a/web/core/modules/taxonomy/tests/src/Kernel/Views/TaxonomyFieldTidTest.php b/web/core/modules/taxonomy/tests/src/Kernel/Views/TaxonomyFieldTidTest.php
index 16cb19b068..12e6d43ca6 100644
--- a/web/core/modules/taxonomy/tests/src/Kernel/Views/TaxonomyFieldTidTest.php
+++ b/web/core/modules/taxonomy/tests/src/Kernel/Views/TaxonomyFieldTidTest.php
@@ -21,7 +21,12 @@ class TaxonomyFieldTidTest extends ViewsKernelTestBase {
/**
* {@inheritdoc}
*/
- public static $modules = ['taxonomy', 'taxonomy_test_views', 'text', 'filter'];
+ public static $modules = [
+ 'taxonomy',
+ 'taxonomy_test_views',
+ 'text',
+ 'filter',
+ ];
/**
* {@inheritdoc}
diff --git a/web/core/modules/taxonomy/tests/src/Kernel/Views/TaxonomyFieldVidTest.php b/web/core/modules/taxonomy/tests/src/Kernel/Views/TaxonomyFieldVidTest.php
index 4cdcc40cb7..376c1ef50b 100644
--- a/web/core/modules/taxonomy/tests/src/Kernel/Views/TaxonomyFieldVidTest.php
+++ b/web/core/modules/taxonomy/tests/src/Kernel/Views/TaxonomyFieldVidTest.php
@@ -24,7 +24,12 @@ class TaxonomyFieldVidTest extends ViewsKernelTestBase {
*
* @var array
*/
- public static $modules = ['taxonomy', 'taxonomy_test_views', 'text', 'filter'];
+ public static $modules = [
+ 'taxonomy',
+ 'taxonomy_test_views',
+ 'text',
+ 'filter',
+ ];
/**
* Views used by this test.
diff --git a/web/core/modules/telephone/tests/src/Kernel/TelephoneItemTest.php b/web/core/modules/telephone/tests/src/Kernel/TelephoneItemTest.php
index 6e635acc7d..a83a2e0328 100644
--- a/web/core/modules/telephone/tests/src/Kernel/TelephoneItemTest.php
+++ b/web/core/modules/telephone/tests/src/Kernel/TelephoneItemTest.php
@@ -54,8 +54,8 @@ public function testTestItem() {
// Verify entity has been created properly.
$id = $entity->id();
$entity = EntityTest::load($id);
- $this->assertTrue($entity->field_test instanceof FieldItemListInterface, 'Field implements interface.');
- $this->assertTrue($entity->field_test[0] instanceof FieldItemInterface, 'Field item implements interface.');
+ $this->assertInstanceOf(FieldItemListInterface::class, $entity->field_test);
+ $this->assertInstanceOf(FieldItemInterface::class, $entity->field_test[0]);
$this->assertEqual($entity->field_test->value, $value);
$this->assertEqual($entity->field_test[0]->value, $value);
diff --git a/web/core/modules/text/src/Plugin/Field/FieldWidget/TextareaWidget.php b/web/core/modules/text/src/Plugin/Field/FieldWidget/TextareaWidget.php
index 69a660e4db..11e84f1c3e 100644
--- a/web/core/modules/text/src/Plugin/Field/FieldWidget/TextareaWidget.php
+++ b/web/core/modules/text/src/Plugin/Field/FieldWidget/TextareaWidget.php
@@ -48,7 +48,8 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen
public function errorElement(array $element, ConstraintViolationInterface $violation, array $form, FormStateInterface $form_state) {
if ($violation->arrayPropertyPath == ['format'] && isset($element['format']['#access']) && !$element['format']['#access']) {
// Ignore validation errors for formats if formats may not be changed,
- // i.e. when existing formats become invalid. See filter_process_format().
+ // such as when existing formats become invalid.
+ // See \Drupal\filter\Element\TextFormat::processFormat().
return FALSE;
}
return $element;
diff --git a/web/core/modules/text/src/Plugin/Field/FieldWidget/TextfieldWidget.php b/web/core/modules/text/src/Plugin/Field/FieldWidget/TextfieldWidget.php
index af8493de08..8f4c73ba69 100644
--- a/web/core/modules/text/src/Plugin/Field/FieldWidget/TextfieldWidget.php
+++ b/web/core/modules/text/src/Plugin/Field/FieldWidget/TextfieldWidget.php
@@ -38,8 +38,9 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen
*/
public function errorElement(array $element, ConstraintViolationInterface $violation, array $form, FormStateInterface $form_state) {
if ($violation->arrayPropertyPath == ['format'] && isset($element['format']['#access']) && !$element['format']['#access']) {
- // Ignore validation errors for formats if formats may not be changed,
- // i.e. when existing formats become invalid. See filter_process_format().
+ // Ignore validation errors for formats that may not be changed,
+ // such as when existing formats become invalid.
+ // See \Drupal\filter\Element\TextFormat::processFormat().
return FALSE;
}
return $element;
diff --git a/web/core/modules/text/src/Plugin/migrate/field/d6/TextField.php b/web/core/modules/text/src/Plugin/migrate/field/d6/TextField.php
index 6eeb95f6d0..2472b29ea7 100644
--- a/web/core/modules/text/src/Plugin/migrate/field/d6/TextField.php
+++ b/web/core/modules/text/src/Plugin/migrate/field/d6/TextField.php
@@ -123,8 +123,10 @@ public function getFieldType(Row $row) {
case 'optionwidgets_buttons':
case 'optionwidgets_select':
return 'list_string';
+
case 'optionwidgets_onoff':
return 'boolean';
+
default:
return parent::getFieldType($row);
}
diff --git a/web/core/modules/text/src/Plugin/migrate/field/d7/TextField.php b/web/core/modules/text/src/Plugin/migrate/field/d7/TextField.php
index 14c36d35da..2d2396ed87 100644
--- a/web/core/modules/text/src/Plugin/migrate/field/d7/TextField.php
+++ b/web/core/modules/text/src/Plugin/migrate/field/d7/TextField.php
@@ -32,6 +32,7 @@ public function getFieldFormatterType(Row $row) {
case 'string':
$formatter_type = str_replace(['text_default', 'text_plain'], 'string', $formatter_type);
break;
+
case 'string_long':
$formatter_type = str_replace('text_default', 'basic_string', $formatter_type);
break;
@@ -51,6 +52,7 @@ public function getFieldWidgetType(Row $row) {
case 'string':
$widget_type = str_replace('text_textfield', 'string_textfield', $widget_type);
break;
+
case 'string_long':
$widget_type = str_replace('text_textarea', 'string_textarea', $widget_type);
break;
@@ -75,6 +77,7 @@ public function getFieldType(Row $row) {
case '0':
$plain_text = TRUE;
break;
+
case '1':
$filtered_text = TRUE;
break;
diff --git a/web/core/modules/text/tests/src/Functional/TextFieldTest.php b/web/core/modules/text/tests/src/Functional/TextFieldTest.php
index 3eba8c7e57..d625637038 100644
--- a/web/core/modules/text/tests/src/Functional/TextFieldTest.php
+++ b/web/core/modules/text/tests/src/Functional/TextFieldTest.php
@@ -68,10 +68,10 @@ public function testTextFieldValidation() {
$entity->{$field_name}->value = str_repeat('x', $i);
$violations = $entity->{$field_name}->validate();
if ($i <= $max_length) {
- $this->assertEqual(count($violations), 0, "Length $i does not cause validation error when max_length is $max_length");
+ $this->assertCount(0, $violations, "Length $i does not cause validation error when max_length is $max_length");
}
else {
- $this->assertEqual(count($violations), 1, "Length $i causes validation error when max_length is $max_length");
+ $this->assertCount(1, $violations, "Length $i causes validation error when max_length is $max_length");
}
}
}
@@ -127,12 +127,12 @@ public function testRequiredLongTextWithFileUpload() {
$test_file = current($this->drupalGetTestFiles('text'));
$edit['files[file_field_0]'] = \Drupal::service('file_system')->realpath($test_file->uri);
$this->drupalPostForm('entity_test/add', $edit, 'Upload');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$edit = [
'text_long[0][value]' => 'Long text',
];
$this->drupalPostForm(NULL, $edit, 'Save');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->drupalGet('entity_test/1');
$this->assertText('Long text');
}
@@ -214,8 +214,8 @@ public function _testTextfieldWidgetsFormatted($field_type, $widget_type) {
$display = $display_repository->getViewDisplay($entity->getEntityTypeId(), $entity->bundle(), 'full');
$content = $display->build($entity);
$rendered_entity = \Drupal::service('renderer')->renderRoot($content);
- $this->assertNotContains($value, (string) $rendered_entity);
- $this->assertContains(Html::escape($value), (string) $rendered_entity);
+ $this->assertStringNotContainsString($value, (string) $rendered_entity);
+ $this->assertStringContainsString(Html::escape($value), (string) $rendered_entity);
// Create a new text format that does not escape HTML, and grant the user
// access to it.
@@ -253,7 +253,7 @@ public function _testTextfieldWidgetsFormatted($field_type, $widget_type) {
$display = $display_repository->getViewDisplay($entity->getEntityTypeId(), $entity->bundle(), 'full');
$content = $display->build($entity);
$rendered_entity = \Drupal::service('renderer')->renderRoot($content);
- $this->assertContains($value, (string) $rendered_entity);
+ $this->assertStringContainsString($value, (string) $rendered_entity);
}
}
diff --git a/web/core/modules/text/tests/src/Kernel/TextWithSummaryItemTest.php b/web/core/modules/text/tests/src/Kernel/TextWithSummaryItemTest.php
index 195250abb9..24ed3a7a73 100644
--- a/web/core/modules/text/tests/src/Kernel/TextWithSummaryItemTest.php
+++ b/web/core/modules/text/tests/src/Kernel/TextWithSummaryItemTest.php
@@ -68,8 +68,8 @@ public function testCrudAndUpdate() {
$entity->save();
$entity = $storage->load($entity->id());
- $this->assertTrue($entity->summary_field instanceof FieldItemListInterface, 'Field implements interface.');
- $this->assertTrue($entity->summary_field[0] instanceof FieldItemInterface, 'Field item implements interface.');
+ $this->assertInstanceOf(FieldItemListInterface::class, $entity->summary_field);
+ $this->assertInstanceOf(FieldItemInterface::class, $entity->summary_field[0]);
$this->assertEqual($entity->summary_field->value, $value);
$this->assertEqual($entity->summary_field->summary, $summary);
$this->assertNull($entity->summary_field->format);
diff --git a/web/core/modules/toolbar/js/models/ToolbarModel.es6.js b/web/core/modules/toolbar/js/models/ToolbarModel.es6.js
index 2a18a6aee0..16e507367a 100644
--- a/web/core/modules/toolbar/js/models/ToolbarModel.es6.js
+++ b/web/core/modules/toolbar/js/models/ToolbarModel.es6.js
@@ -131,7 +131,7 @@
},
/**
- * @inheritdoc
+ * {@inheritdoc}
*
* @param {object} attributes
* Attributes for the toolbar.
diff --git a/web/core/modules/toolbar/js/views/BodyVisualView.es6.js b/web/core/modules/toolbar/js/views/BodyVisualView.es6.js
index 8a88c3ae23..c837846ba7 100644
--- a/web/core/modules/toolbar/js/views/BodyVisualView.es6.js
+++ b/web/core/modules/toolbar/js/views/BodyVisualView.es6.js
@@ -34,7 +34,7 @@
},
/**
- * @inheritdoc
+ * {@inheritdoc}
*/
render() {
$('body')
diff --git a/web/core/modules/toolbar/js/views/MenuVisualView.es6.js b/web/core/modules/toolbar/js/views/MenuVisualView.es6.js
index 4d95ac9898..a3b5bfb6a4 100644
--- a/web/core/modules/toolbar/js/views/MenuVisualView.es6.js
+++ b/web/core/modules/toolbar/js/views/MenuVisualView.es6.js
@@ -18,7 +18,7 @@
},
/**
- * @inheritdoc
+ * {@inheritdoc}
*/
render() {
const subtrees = this.model.get('subtrees');
diff --git a/web/core/modules/toolbar/js/views/ToolbarVisualView.es6.js b/web/core/modules/toolbar/js/views/ToolbarVisualView.es6.js
index 6d9350a831..716c8e8d88 100644
--- a/web/core/modules/toolbar/js/views/ToolbarVisualView.es6.js
+++ b/web/core/modules/toolbar/js/views/ToolbarVisualView.es6.js
@@ -102,7 +102,7 @@
},
/**
- * @inheritdoc
+ * {@inheritdoc}
*
* @return {Drupal.toolbar.ToolbarVisualView}
* The `ToolbarVisualView` instance.
diff --git a/web/core/modules/toolbar/tests/src/Functional/ToolbarAdminMenuTest.php b/web/core/modules/toolbar/tests/src/Functional/ToolbarAdminMenuTest.php
index f7e9955ecf..8a0a3bb7fd 100644
--- a/web/core/modules/toolbar/tests/src/Functional/ToolbarAdminMenuTest.php
+++ b/web/core/modules/toolbar/tests/src/Functional/ToolbarAdminMenuTest.php
@@ -54,7 +54,17 @@ class ToolbarAdminMenuTest extends BrowserTestBase {
*
* @var array
*/
- public static $modules = ['node', 'block', 'menu_ui', 'user', 'taxonomy', 'toolbar', 'language', 'test_page_test', 'locale'];
+ public static $modules = [
+ 'node',
+ 'block',
+ 'menu_ui',
+ 'user',
+ 'taxonomy',
+ 'toolbar',
+ 'language',
+ 'test_page_test',
+ 'locale',
+ ];
/**
* {@inheritdoc}
@@ -90,7 +100,7 @@ protected function setUp() {
$this->drupalLogin($this->adminUser);
$this->drupalGet('test-page');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Assert that the toolbar is present in the HTML.
$this->assertRaw('id="toolbar-administration"');
@@ -138,7 +148,7 @@ public function testMenuLinkUpdateSubtreesHashCacheClear() {
$edit = [];
$edit['enabled'] = FALSE;
$this->drupalPostForm("admin/structure/menu/link/" . $admin_menu_link_id . "/edit", $edit, t('Save'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertText('The menu link has been saved.');
// Assert that the subtrees hash has been altered because the subtrees
@@ -168,7 +178,7 @@ public function testUserRoleUpdateSubtreesHashCacheClear() {
// Get the hash for a second user.
$this->drupalLogin($this->adminUser2);
$this->drupalGet('test-page');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Assert that the toolbar is present in the HTML.
$this->assertRaw('id="toolbar-administration"');
@@ -178,7 +188,7 @@ public function testUserRoleUpdateSubtreesHashCacheClear() {
// Log in the first admin user again.
$this->drupalLogin($this->adminUser);
$this->drupalGet('test-page');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Assert that the toolbar is present in the HTML.
$this->assertRaw('id="toolbar-administration"');
@@ -201,7 +211,7 @@ public function testUserRoleUpdateSubtreesHashCacheClear() {
// Request a new page to refresh the drupalSettings object.
$this->drupalGet('test-page');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$new_subtree_hash = $this->getSubtreesHash();
// Assert that the old admin menu subtree hash and the new admin menu
@@ -225,7 +235,7 @@ public function testNonCurrentUserAccountUpdates() {
// Get the subtree hash for adminUser2 to check later that it has not
// changed. Request a new page to refresh the drupalSettings object.
$this->drupalGet('test-page');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$admin_user_2_hash = $this->getSubtreesHash();
// Assign the role to the user.
@@ -278,7 +288,7 @@ public function testLocaleTranslationSubtreesHashCacheClear() {
// Have the adminUser request a page in the new language.
$this->drupalGet($langcode . '/test-page');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Get a baseline hash for the admin menu subtrees before translating one
// of the menu link items.
@@ -318,7 +328,7 @@ public function testLocaleTranslationSubtreesHashCacheClear() {
$this->drupalLogin($admin_user);
// Have the adminUser request a page in the new language.
$this->drupalGet($langcode . '/test-page');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$new_subtree_hash = $this->getSubtreesHash();
// Assert that the old admin menu subtrees hash and the new admin menu
@@ -420,7 +430,7 @@ private function getSubtreesHash() {
private function assertDifferentHash() {
// Request a new page to refresh the drupalSettings object.
$this->drupalGet('test-page');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$new_subtree_hash = $this->getSubtreesHash();
// Assert that the old admin menu subtree hash and the new admin menu
diff --git a/web/core/modules/toolbar/tests/src/Functional/ToolbarCacheContextsTest.php b/web/core/modules/toolbar/tests/src/Functional/ToolbarCacheContextsTest.php
index 8b564cca07..fbc8ee4a44 100644
--- a/web/core/modules/toolbar/tests/src/Functional/ToolbarCacheContextsTest.php
+++ b/web/core/modules/toolbar/tests/src/Functional/ToolbarCacheContextsTest.php
@@ -98,11 +98,6 @@ public function testToolbarCacheContextsCaller() {
$this->adminUser2 = $this->drupalCreateUser(array_merge($this->perms, ['access tour']));
$this->assertToolbarCacheContexts(['user.permissions'], 'Expected cache contexts found with tour module enabled.');
\Drupal::service('module_installer')->uninstall(['tour']);
-
- // Test with shortcut module enabled.
- $this->installExtraModules(['shortcut']);
- $this->adminUser2 = $this->drupalCreateUser(array_merge($this->perms, ['access shortcuts', 'administer shortcuts']));
- $this->assertToolbarCacheContexts(['user'], 'Expected cache contexts found with shortcut module enabled.');
}
/**
diff --git a/web/core/modules/toolbar/tests/src/Functional/ToolbarHookToolbarTest.php b/web/core/modules/toolbar/tests/src/Functional/ToolbarHookToolbarTest.php
index 3153bbe216..a9f5a39400 100644
--- a/web/core/modules/toolbar/tests/src/Functional/ToolbarHookToolbarTest.php
+++ b/web/core/modules/toolbar/tests/src/Functional/ToolbarHookToolbarTest.php
@@ -43,7 +43,7 @@ protected function setUp() {
*/
public function testHookToolbar() {
$this->drupalGet('test-page');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Assert that the toolbar is present in the HTML.
$this->assertRaw('id="toolbar-administration"');
diff --git a/web/core/modules/toolbar/tests/src/Functional/ToolbarMenuTranslationTest.php b/web/core/modules/toolbar/tests/src/Functional/ToolbarMenuTranslationTest.php
index 57336e04b2..8ff8fd8a5d 100644
--- a/web/core/modules/toolbar/tests/src/Functional/ToolbarMenuTranslationTest.php
+++ b/web/core/modules/toolbar/tests/src/Functional/ToolbarMenuTranslationTest.php
@@ -23,7 +23,12 @@ class ToolbarMenuTranslationTest extends BrowserTestBase {
*
* @var array
*/
- public static $modules = ['toolbar', 'toolbar_test', 'locale', 'locale_test'];
+ public static $modules = [
+ 'toolbar',
+ 'toolbar_test',
+ 'locale',
+ 'locale_test',
+ ];
/**
* {@inheritdoc}
@@ -66,7 +71,7 @@ public function testToolbarClasses() {
// Check that the class is on the item before we translate it.
$xpath = $this->xpath('//a[contains(@class, "icon-system-admin-structure")]');
- $this->assertEqual(count($xpath), 1, 'The menu item class ok before translation.');
+ $this->assertCount(1, $xpath, 'The menu item class ok before translation.');
// Translate the menu item.
$menu_item_translated = $this->randomMachineName();
@@ -95,7 +100,7 @@ public function testToolbarClasses() {
// Toolbar icons are included based on the presence of a specific class on
// the menu item. Ensure that class also exists for a translated menu item.
$xpath = $this->xpath('//a[contains(@class, "icon-system-admin-structure")]');
- $this->assertEqual(count($xpath), 1, 'The menu item class is the same.');
+ $this->assertCount(1, $xpath, 'The menu item class is the same.');
}
}
diff --git a/web/core/modules/tour/js/tour.es6.js b/web/core/modules/tour/js/tour.es6.js
index b4dcb7abdb..76fa122263 100644
--- a/web/core/modules/tour/js/tour.es6.js
+++ b/web/core/modules/tour/js/tour.es6.js
@@ -125,7 +125,7 @@
},
/**
- * @inheritdoc
+ * {@inheritdoc}
*
* @return {Drupal.tour.views.ToggleTourView}
* The `ToggleTourView` view.
diff --git a/web/core/modules/tour/tests/src/Functional/TourTest.php b/web/core/modules/tour/tests/src/Functional/TourTest.php
index cba8ff2801..62bf6cb62c 100644
--- a/web/core/modules/tour/tests/src/Functional/TourTest.php
+++ b/web/core/modules/tour/tests/src/Functional/TourTest.php
@@ -18,7 +18,13 @@ class TourTest extends TourTestBasic {
*
* @var array
*/
- public static $modules = ['block', 'tour', 'locale', 'language', 'tour_test'];
+ public static $modules = [
+ 'block',
+ 'tour',
+ 'locale',
+ 'language',
+ 'tour_test',
+ ];
/**
* {@inheritdoc}
@@ -75,28 +81,28 @@ public function testTourFunctionality() {
':href' => Url::fromRoute('<front>', [], ['absolute' => TRUE])->toString(),
':text' => 'Drupal',
]);
- $this->assertEqual(count($elements), 1, 'Found Token replacement.');
+ $this->assertCount(1, $elements, 'Found Token replacement.');
$elements = $this->cssSelect("li[data-id=tour-test-1] h2:contains('The first tip')");
- $this->assertEqual(count($elements), 1, 'Found English variant of tip 1.');
+ $this->assertCount(1, $elements, 'Found English variant of tip 1.');
$elements = $this->cssSelect("li[data-id=tour-test-2] h2:contains('The quick brown fox')");
- $this->assertNotEqual(count($elements), 1, 'Did not find English variant of tip 2.');
+ $this->assertNotCount(1, $elements, 'Did not find English variant of tip 2.');
$elements = $this->cssSelect("li[data-id=tour-test-1] h2:contains('La pioggia cade in spagna')");
- $this->assertNotEqual(count($elements), 1, 'Did not find Italian variant of tip 1.');
+ $this->assertNotCount(1, $elements, 'Did not find Italian variant of tip 1.');
// Ensure that plugins work.
$elements = $this->xpath('//img[@src="http://local/image.png"]');
- $this->assertEqual(count($elements), 1, 'Image plugin tip found.');
+ $this->assertCount(1, $elements, 'Image plugin tip found.');
// Navigate to tour-test-2/subpath and verify the tour_test_2 tip is found.
$this->drupalGet('tour-test-2/subpath');
$elements = $this->cssSelect("li[data-id=tour-test-2] h2:contains('The quick brown fox')");
- $this->assertEqual(count($elements), 1, 'Found English variant of tip 2.');
+ $this->assertCount(1, $elements, 'Found English variant of tip 2.');
$elements = $this->cssSelect("li[data-id=tour-test-1] h2:contains('The first tip')");
- $this->assertNotEqual(count($elements), 1, 'Did not find English variant of tip 1.');
+ $this->assertNotCount(1, $elements, 'Did not find English variant of tip 1.');
// Enable Italian language and navigate to it/tour-test1 and verify italian
// version of tip is found.
@@ -104,10 +110,10 @@ public function testTourFunctionality() {
$this->drupalGet('it/tour-test-1');
$elements = $this->cssSelect("li[data-id=tour-test-1] h2:contains('La pioggia cade in spagna')");
- $this->assertEqual(count($elements), 1, 'Found Italian variant of tip 1.');
+ $this->assertCount(1, $elements, 'Found Italian variant of tip 1.');
$elements = $this->cssSelect("li[data-id=tour-test-2] h2:contains('The quick brown fox')");
- $this->assertNotEqual(count($elements), 1, 'Did not find English variant of tip 1.');
+ $this->assertNotCount(1, $elements, 'Did not find English variant of tip 1.');
// Programmatically create a tour for use through the remainder of the test.
$tour = Tour::create([
@@ -160,12 +166,12 @@ public function testTourFunctionality() {
// Navigate to tour-test-1 and verify the new tip is found.
$this->drupalGet('tour-test-1');
$elements = $this->cssSelect("li[data-id=tour-code-test-1] h2:contains('The rain in spain')");
- $this->assertEqual(count($elements), 1, 'Found the required tip markup for tip 4');
+ $this->assertCount(1, $elements, 'Found the required tip markup for tip 4');
// Verify that the weight sorting works by ensuring the lower weight item
// (tip 4) has the 'End tour' button.
$elements = $this->cssSelect("li[data-id=tour-code-test-1][data-text='End tour']");
- $this->assertEqual(count($elements), 1, 'Found code tip was weighted last and had "End tour".');
+ $this->assertCount(1, $elements, 'Found code tip was weighted last and had "End tour".');
// Test hook_tour_alter().
$this->assertText('Altered by hook_tour_tips_alter');
@@ -178,7 +184,7 @@ public function testTourFunctionality() {
':data_id' => 'tour-test-1',
':text' => 'The first tip',
]);
- $this->assertEqual(count($elements), 1, 'Found English variant of tip 1.');
+ $this->assertCount(1, $elements, 'Found English variant of tip 1.');
// Navigate to tour-test-3 and verify the tour_test_1 tip is not found with
// appropriate classes.
@@ -188,7 +194,7 @@ public function testTourFunctionality() {
':data_id' => 'tour-test-1',
':text' => 'The first tip',
]);
- $this->assertEqual(count($elements), 0, 'Did not find English variant of tip 1.');
+ $this->assertCount(0, $elements, 'Did not find English variant of tip 1.');
}
}
diff --git a/web/core/modules/tour/tests/src/Functional/TourTestBase.php b/web/core/modules/tour/tests/src/Functional/TourTestBase.php
index 6c1a898e2a..5c2ccbd43f 100644
--- a/web/core/modules/tour/tests/src/Functional/TourTestBase.php
+++ b/web/core/modules/tour/tests/src/Functional/TourTestBase.php
@@ -54,7 +54,7 @@ public function assertTourTips($tips = []) {
foreach ($tips as $tip) {
if (!empty($tip['data-id'])) {
$elements = $this->getSession()->getPage()->findAll('css', '#' . $tip['data-id']);
- $this->assertTrue(!empty($elements) && count($elements) === 1, new FormattableMarkup('Found corresponding page element for tour tip with id #%data-id', ['%data-id' => $tip['data-id']]));
+ $this->assertCount(1, $elements, new FormattableMarkup('Found corresponding page element for tour tip with id #%data-id', ['%data-id' => $tip['data-id']]));
}
elseif (!empty($tip['data-class'])) {
$elements = $this->getSession()->getPage()->findAll('css', '.' . $tip['data-class']);
@@ -66,7 +66,6 @@ public function assertTourTips($tips = []) {
}
$total++;
}
- $this->pass(new FormattableMarkup('Total %total Tips tested of which %modals modal(s).', ['%total' => $total, '%modals' => $modals]));
}
}
diff --git a/web/core/modules/tour/tests/src/Kernel/TourPluginTest.php b/web/core/modules/tour/tests/src/Kernel/TourPluginTest.php
index ce47467df7..a704ca248f 100644
--- a/web/core/modules/tour/tests/src/Kernel/TourPluginTest.php
+++ b/web/core/modules/tour/tests/src/Kernel/TourPluginTest.php
@@ -36,7 +36,7 @@ protected function setUp() {
* Test tour plugins.
*/
public function testTourPlugins() {
- $this->assertIdentical(count($this->pluginManager->getDefinitions()), 1, 'Only tour plugins for the enabled modules were returned.');
+ $this->assertCount(1, $this->pluginManager->getDefinitions(), 'Only tour plugins for the enabled modules were returned.');
}
}
diff --git a/web/core/modules/tour/tour.info.yml b/web/core/modules/tour/tour.info.yml
index b9131629fb..df296f1670 100644
--- a/web/core/modules/tour/tour.info.yml
+++ b/web/core/modules/tour/tour.info.yml
@@ -1,6 +1,6 @@
name: Tour
type: module
-description: Provides guided tours.
+description: 'Displays guided tours of the site interface.'
package: Core
version: VERSION
core: 8.x
diff --git a/web/core/modules/tracker/tests/src/Functional/TrackerTest.php b/web/core/modules/tracker/tests/src/Functional/TrackerTest.php
index 3d907212c8..8a8c378b99 100644
--- a/web/core/modules/tracker/tests/src/Functional/TrackerTest.php
+++ b/web/core/modules/tracker/tests/src/Functional/TrackerTest.php
@@ -29,7 +29,13 @@ class TrackerTest extends BrowserTestBase {
*
* @var array
*/
- public static $modules = ['block', 'comment', 'tracker', 'history', 'node_test'];
+ public static $modules = [
+ 'block',
+ 'comment',
+ 'tracker',
+ 'history',
+ 'node_test',
+ ];
/**
* {@inheritdoc}
@@ -206,7 +212,7 @@ public function testTrackerUser() {
$this->assertNoLink($unpublished->label());
// Verify that title and tab title have been set correctly.
$this->assertText('Activity', 'The user activity tab has the name "Activity".');
- $this->assertTitle(t('@name | @site', ['@name' => $this->user->getAccountName(), '@site' => $this->config('system.site')->get('name')]), 'The user tracker page has the correct page title.');
+ $this->assertTitle($this->user->getAccountName() . ' | Drupal');
// Verify that unpublished comments are removed from the tracker.
$admin_user = $this->drupalCreateUser(['post comments', 'administer comments', 'access user profiles']);
@@ -457,8 +463,8 @@ public function testTrackerAdminUnpublish() {
public function assertHistoryMetadata($node_id, $node_timestamp, $node_last_comment_timestamp, $library_is_present = TRUE) {
$settings = $this->getDrupalSettings();
$this->assertIdentical($library_is_present, isset($settings['ajaxPageState']) && in_array('tracker/history', explode(',', $settings['ajaxPageState']['libraries'])), 'drupal.tracker-history library is present.');
- $this->assertIdentical(1, count($this->xpath('//table/tbody/tr/td[@data-history-node-id="' . $node_id . '" and @data-history-node-timestamp="' . $node_timestamp . '"]')), 'Tracker table cell contains the data-history-node-id and data-history-node-timestamp attributes for the node.');
- $this->assertIdentical(1, count($this->xpath('//table/tbody/tr/td[@data-history-node-last-comment-timestamp="' . $node_last_comment_timestamp . '"]')), 'Tracker table cell contains the data-history-node-last-comment-timestamp attribute for the node.');
+ $this->assertCount(1, $this->xpath('//table/tbody/tr/td[@data-history-node-id="' . $node_id . '" and @data-history-node-timestamp="' . $node_timestamp . '"]'), 'Tracker table cell contains the data-history-node-id and data-history-node-timestamp attributes for the node.');
+ $this->assertCount(1, $this->xpath('//table/tbody/tr/td[@data-history-node-last-comment-timestamp="' . $node_last_comment_timestamp . '"]'), 'Tracker table cell contains the data-history-node-last-comment-timestamp attribute for the node.');
}
}
diff --git a/web/core/modules/update/src/Form/UpdateManagerUpdate.php b/web/core/modules/update/src/Form/UpdateManagerUpdate.php
index 3841474211..7b2b680ed6 100644
--- a/web/core/modules/update/src/Form/UpdateManagerUpdate.php
+++ b/web/core/modules/update/src/Form/UpdateManagerUpdate.php
@@ -8,6 +8,8 @@
use Drupal\Core\Link;
use Drupal\Core\State\StateInterface;
use Drupal\Core\Url;
+use Drupal\update\UpdateFetcherInterface;
+use Drupal\update\UpdateManagerInterface;
use Drupal\update\ModuleVersion;
use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -104,7 +106,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
$project_data = update_calculate_project_data($available);
foreach ($project_data as $name => $project) {
// Filter out projects which are up to date already.
- if ($project['status'] == UPDATE_CURRENT) {
+ if ($project['status'] == UpdateManagerInterface::CURRENT) {
continue;
}
// The project name to display can vary based on the info we have.
@@ -160,23 +162,23 @@ public function buildForm(array $form, FormStateInterface $form_state) {
];
switch ($project['status']) {
- case UPDATE_NOT_SECURE:
- case UPDATE_REVOKED:
+ case UpdateManagerInterface::NOT_SECURE:
+ case UpdateManagerInterface::REVOKED:
$entry['title'] .= ' ' . $this->t('(Security update)');
$entry['#weight'] = -2;
$type = 'security';
break;
- case UPDATE_NOT_SUPPORTED:
+ case UpdateManagerInterface::NOT_SUPPORTED:
$type = 'unsupported';
$entry['title'] .= ' ' . $this->t('(Unsupported)');
$entry['#weight'] = -1;
break;
- case UPDATE_UNKNOWN:
- case UPDATE_NOT_FETCHED:
- case UPDATE_NOT_CHECKED:
- case UPDATE_NOT_CURRENT:
+ case UpdateFetcherInterface::UNKNOWN:
+ case UpdateFetcherInterface::NOT_FETCHED:
+ case UpdateFetcherInterface::NOT_CHECKED:
+ case UpdateManagerInterface::NOT_CURRENT:
$type = 'recommended';
break;
diff --git a/web/core/modules/update/src/Form/UpdateReady.php b/web/core/modules/update/src/Form/UpdateReady.php
index 83739146d2..20f158f67b 100644
--- a/web/core/modules/update/src/Form/UpdateReady.php
+++ b/web/core/modules/update/src/Form/UpdateReady.php
@@ -118,22 +118,21 @@ public function buildForm(array $form, FormStateInterface $form_state) {
* {@inheritdoc}
*/
public function submitForm(array &$form, FormStateInterface $form_state) {
+ $session = $this->getRequest()->getSession();
// Store maintenance_mode setting so we can restore it when done.
- $_SESSION['maintenance_mode'] = $this->state->get('system.maintenance_mode');
+ $session->set('maintenance_mode', $this->state->get('system.maintenance_mode'));
if ($form_state->getValue('maintenance_mode') == TRUE) {
$this->state->set('system.maintenance_mode', TRUE);
}
- if (!empty($_SESSION['update_manager_update_projects'])) {
+ $projects = $session->remove('update_manager_update_projects');
+ if ($projects) {
// Make sure the Updater registry is loaded.
drupal_get_updaters();
$updates = [];
$directory = _update_manager_extract_directory();
- $projects = $_SESSION['update_manager_update_projects'];
- unset($_SESSION['update_manager_update_projects']);
-
$project_real_location = NULL;
foreach ($projects as $project => $url) {
$project_location = $directory . '/' . $project;
diff --git a/web/core/modules/update/src/ProjectSecurityData.php b/web/core/modules/update/src/ProjectSecurityData.php
index e86a5845c2..3d6630fc4b 100644
--- a/web/core/modules/update/src/ProjectSecurityData.php
+++ b/web/core/modules/update/src/ProjectSecurityData.php
@@ -17,6 +17,12 @@ final class ProjectSecurityData {
* For example, if this value is 2 and the existing version is 9.0.1, the
* 9.0.x branch will receive security coverage until the release of version
* 9.2.0.
+ *
+ * @todo In https://www.drupal.org/node/2998285 determine if we want this
+ * policy to be expressed in the updates.drupal.org feed, instead of relying
+ * on a hard-coded constant.
+ *
+ * @see https://www.drupal.org/core/release-cycle-overview
*/
const CORE_MINORS_WITH_SECURITY_COVERAGE = 2;
@@ -144,6 +150,12 @@ public function getCoverageInfo() {
/**
* Gets the release the current minor will receive security coverage until.
*
+ * For the sake of example, assume that the currently installed version of
+ * Drupal is 8.7.11 and that static::CORE_MINORS_WITH_SECURITY_COVERAGE is 2.
+ * When Drupal 8.9.0 is released, the supported minor versions will be 8.8
+ * and 8.9. At that point, Drupal 8.7 will no longer have security coverage.
+ * Therefore, this function would return "8.9.0".
+ *
* @todo In https://www.drupal.org/node/2998285 determine how we will know
* what the final minor release of a particular major version will be. This
* method should not return a version beyond that minor.
@@ -165,7 +177,33 @@ private function getSecurityCoverageUntilVersion() {
}
/**
- * Gets the number of additional minor security covered releases.
+ * Gets the number of additional minor releases with security coverage.
+ *
+ * This function compares the currently installed (existing) version of
+ * the project with two things:
+ * - The latest available official release of that project.
+ * - The target minor release where security coverage for the current release
+ * should expire. This target release is determined by
+ * getSecurityCoverageUntilVersion().
+ *
+ * For the sake of example, assume that the currently installed version of
+ * Drupal is 8.7.11 and that static::CORE_MINORS_WITH_SECURITY_COVERAGE is 2.
+ *
+ * Before the release of Drupal 8.8.0, this function would return 2.
+ *
+ * After the release of Drupal 8.8.0 and before the release of 8.9.0, this
+ * function would return 1 to indicate that the next minor version release
+ * will end security coverage for 8.7.
+ *
+ * When Drupal 8.9.0 is released, this function would return 0 to indicate
+ * that security coverage is over for 8.7.
+ *
+ * If the currently installed version is 9.0.0, and there is no 9.1.0 release
+ * yet, the function would return 2. Once 9.1.0 is out, it would return 1.
+ * When 9.2.0 is released, it would again return 0.
+ *
+ * Note: callers should not test this function's return value with empty()
+ * since 0 is a valid return value that has different meaning than NULL.
*
* @param string $security_covered_version
* The version until which the existing version receives security coverage.
@@ -173,6 +211,8 @@ private function getSecurityCoverageUntilVersion() {
* @return int|null
* The number of additional minor releases that receive security coverage,
* or NULL if this cannot be determined.
+ *
+ * @see \Drupal\update\ProjectSecurityData\getSecurityCoverageUntilVersion()
*/
private function getAdditionalSecurityCoveredMinors($security_covered_version) {
$security_covered_version_major = ModuleVersion::createFromVersionString($security_covered_version)->getMajorVersion();
@@ -181,17 +221,16 @@ private function getAdditionalSecurityCoveredMinors($security_covered_version) {
$release_version = ModuleVersion::createFromVersionString($release['version']);
if ($release_version->getMajorVersion() === $security_covered_version_major && $release['status'] === 'published' && !$release_version->getVersionExtra()) {
// The releases are ordered with the most recent releases first.
- // Therefore if we have found an official, published release with the
- // same major version as $security_covered_version then this release
+ // Therefore, if we have found a published, official release with the
+ // same major version as $security_covered_version, then this release
// can be used to determine the latest minor.
$latest_minor = $this->getSemanticMinorVersion($release['version']);
break;
}
}
- // If $latest_minor is set, we know that $latest_minor and
- // $security_covered_version_minor have the same major version. Therefore we
- // can simply subtract to determine the number of additional minor security
- // covered releases.
+ // If $latest_minor is set, we know that $security_covered_version_minor and
+ // $latest_minor have the same major version. Therefore, we can subtract to
+ // determine the number of additional minor releases with security coverage.
return isset($latest_minor) ? $security_covered_version_minor - $latest_minor : NULL;
}
diff --git a/web/core/modules/update/src/UpdateSettingsForm.php b/web/core/modules/update/src/UpdateSettingsForm.php
index 060f205e01..f28359d7ce 100644
--- a/web/core/modules/update/src/UpdateSettingsForm.php
+++ b/web/core/modules/update/src/UpdateSettingsForm.php
@@ -2,7 +2,6 @@
namespace Drupal\update;
-use Drupal\Component\Utility\EmailValidatorInterface;
use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
use Drupal\Core\Url;
use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -23,23 +22,13 @@ class UpdateSettingsForm extends ConfigFormBase implements ContainerInjectionInt
*/
protected $emailValidator;
- /**
- * Constructs a new UpdateSettingsForm.
- *
- * @param \Drupal\Component\Utility\EmailValidatorInterface $email_validator
- * The email validator.
- */
- public function __construct(EmailValidatorInterface $email_validator) {
- $this->emailValidator = $email_validator;
- }
-
/**
* {@inheritdoc}
*/
public static function create(ContainerInterface $container) {
- return new static(
- $container->get('email.validator')
- );
+ $instance = parent::create($container);
+ $instance->emailValidator = $container->get('email.validator');
+ return $instance;
}
/**
diff --git a/web/core/modules/update/templates/update-project-status.html.twig b/web/core/modules/update/templates/update-project-status.html.twig
index 4cc9a19e8b..e195ec2921 100644
--- a/web/core/modules/update/templates/update-project-status.html.twig
+++ b/web/core/modules/update/templates/update-project-status.html.twig
@@ -29,11 +29,11 @@
#}
{%
set status_classes = [
- project.status == constant('UPDATE_NOT_SECURE') ? 'project-update__status--security-error',
- project.status == constant('UPDATE_REVOKED') ? 'project-update__status--revoked',
- project.status == constant('UPDATE_NOT_SUPPORTED') ? 'project-update__status--not-supported',
- project.status == constant('UPDATE_NOT_CURRENT') ? 'project-update__status--not-current',
- project.status == constant('UPDATE_CURRENT') ? 'project-update__status--current',
+ project.status == constant('Drupal\\update\\UpdateManagerInterface::NOT_SECURE') ? 'project-update__status--security-error',
+ project.status == constant('Drupal\\update\\UpdateManagerInterface::REVOKED') ? 'project-update__status--revoked',
+ project.status == constant('Drupal\\update\\UpdateManagerInterface::NOT_SUPPORTED') ? 'project-update__status--not-supported',
+ project.status == constant('Drupal\\update\\UpdateManagerInterface::NOT_CURRENT') ? 'project-update__status--not-current',
+ project.status == constant('Drupal\\update\\UpdateManagerInterface::CURRENT') ? 'project-update__status--current',
]
%}
<div{{ status.attributes.addClass('project-update__status', status_classes) }}>
@@ -67,9 +67,9 @@
{%
set extra_classes = [
- project.status == constant('UPDATE_NOT_SECURE') ? 'project-not-secure',
- project.status == constant('UPDATE_REVOKED') ? 'project-revoked',
- project.status == constant('UPDATE_NOT_SUPPORTED') ? 'project-not-supported',
+ project.status == constant('Drupal\\update\\UpdateManagerInterface::NOT_SECURE') ? 'project-not-secure',
+ project.status == constant('Drupal\\update\\UpdateManagerInterface::REVOKED') ? 'project-revoked',
+ project.status == constant('Drupal\\update\\UpdateManagerInterface::NOT_SUPPORTED') ? 'project-not-supported',
]
%}
<div class="project-updates__details">
diff --git a/web/core/modules/update/tests/aaa_update_test.tar.gz b/web/core/modules/update/tests/aaa_update_test.tar.gz
index 478f038f5d..7078f3b6ac 100644
--- a/web/core/modules/update/tests/aaa_update_test.tar.gz
+++ b/web/core/modules/update/tests/aaa_update_test.tar.gz
@@ -1,2 +1,2 @@
- �^0tQ�aaa_update_test.tar.gz���Ak�0���+r<��6u��&� l;K�Q�l���ש ���9��4 i��_�ֳ�J �,�6�� d�T�ʉ��^"�2S"R�D�lL
W�x����9O���=�����ҽ�{ש�M����ܣ ���_� �����$\��K s��2�|0�N��O켋}����xՔqmXiڹ�.ئ��oѹƇ�$_4�o���H�����9=��K��};�捧���lY�.�hصO�~���m����T�K�%R�\eEQP��U9��?<=��cl4 2>�/ K�N��XU��
-����'A�b�������������������ھ�sM�(��
\ No newline at end of file
+ ��� �]����J�0� �*rV�A��DЁw� ��f.ش1M�ݽٺ�܄9E|���i�ߗ|B�ڛF8Y;9��� cUQ�MY�%O٦ܡ<+
+��r�x�V���X�>?8a�RD+_��V݁��}���؋��w��Ʒ�9�y�y�y�9�(�E^deY�:KY�C���l� ��+�4�L�И^/T+ו����������eP����
��! ]�䷷�'8��U�蓕nO����O��c�O9�8��O脖4��f���{D�ʄ�1�Fs��S}��zcz��g����Z��"���G����R5� �8�%��V���a���'��Բsa�8BZ����������������W�G��(��
\ No newline at end of file
diff --git a/web/core/modules/update/tests/modules/update_test/aaa_update_test.1_0-supported.xml b/web/core/modules/update/tests/fixtures/release-history/aaa_update_test.1_0-supported.xml
similarity index 100%
rename from web/core/modules/update/tests/modules/update_test/aaa_update_test.1_0-supported.xml
rename to web/core/modules/update/tests/fixtures/release-history/aaa_update_test.1_0-supported.xml
diff --git a/web/core/modules/update/tests/modules/update_test/aaa_update_test.1_0-unsupported.xml b/web/core/modules/update/tests/fixtures/release-history/aaa_update_test.1_0-unsupported.xml
similarity index 100%
rename from web/core/modules/update/tests/modules/update_test/aaa_update_test.1_0-unsupported.xml
rename to web/core/modules/update/tests/fixtures/release-history/aaa_update_test.1_0-unsupported.xml
diff --git a/web/core/modules/update/tests/modules/update_test/aaa_update_test.1_0.xml b/web/core/modules/update/tests/fixtures/release-history/aaa_update_test.1_0.xml
similarity index 100%
rename from web/core/modules/update/tests/modules/update_test/aaa_update_test.1_0.xml
rename to web/core/modules/update/tests/fixtures/release-history/aaa_update_test.1_0.xml
diff --git a/web/core/modules/update/tests/modules/update_test/aaa_update_test.1_1-alpha1.xml b/web/core/modules/update/tests/fixtures/release-history/aaa_update_test.1_1-alpha1.xml
similarity index 100%
rename from web/core/modules/update/tests/modules/update_test/aaa_update_test.1_1-alpha1.xml
rename to web/core/modules/update/tests/fixtures/release-history/aaa_update_test.1_1-alpha1.xml
diff --git a/web/core/modules/update/tests/modules/update_test/aaa_update_test.1_1-beta1.xml b/web/core/modules/update/tests/fixtures/release-history/aaa_update_test.1_1-beta1.xml
similarity index 100%
rename from web/core/modules/update/tests/modules/update_test/aaa_update_test.1_1-beta1.xml
rename to web/core/modules/update/tests/fixtures/release-history/aaa_update_test.1_1-beta1.xml
diff --git a/web/core/modules/update/tests/modules/update_test/aaa_update_test.1_1.xml b/web/core/modules/update/tests/fixtures/release-history/aaa_update_test.1_1.xml
similarity index 100%
rename from web/core/modules/update/tests/modules/update_test/aaa_update_test.1_1.xml
rename to web/core/modules/update/tests/fixtures/release-history/aaa_update_test.1_1.xml
diff --git a/web/core/modules/update/tests/modules/update_test/aaa_update_test.1_2-alpha1.xml b/web/core/modules/update/tests/fixtures/release-history/aaa_update_test.1_2-alpha1.xml
similarity index 100%
rename from web/core/modules/update/tests/modules/update_test/aaa_update_test.1_2-alpha1.xml
rename to web/core/modules/update/tests/fixtures/release-history/aaa_update_test.1_2-alpha1.xml
diff --git a/web/core/modules/update/tests/modules/update_test/aaa_update_test.1_2-beta1.xml b/web/core/modules/update/tests/fixtures/release-history/aaa_update_test.1_2-beta1.xml
similarity index 100%
rename from web/core/modules/update/tests/modules/update_test/aaa_update_test.1_2-beta1.xml
rename to web/core/modules/update/tests/fixtures/release-history/aaa_update_test.1_2-beta1.xml
diff --git a/web/core/modules/update/tests/modules/update_test/aaa_update_test.1_2.xml b/web/core/modules/update/tests/fixtures/release-history/aaa_update_test.1_2.xml
similarity index 100%
rename from web/core/modules/update/tests/modules/update_test/aaa_update_test.1_2.xml
rename to web/core/modules/update/tests/fixtures/release-history/aaa_update_test.1_2.xml
diff --git a/web/core/modules/update/tests/modules/update_test/aaa_update_test.2_0-alpha1.xml b/web/core/modules/update/tests/fixtures/release-history/aaa_update_test.2_0-alpha1.xml
similarity index 100%
rename from web/core/modules/update/tests/modules/update_test/aaa_update_test.2_0-alpha1.xml
rename to web/core/modules/update/tests/fixtures/release-history/aaa_update_test.2_0-alpha1.xml
diff --git a/web/core/modules/update/tests/modules/update_test/aaa_update_test.2_0-beta1.xml b/web/core/modules/update/tests/fixtures/release-history/aaa_update_test.2_0-beta1.xml
similarity index 100%
rename from web/core/modules/update/tests/modules/update_test/aaa_update_test.2_0-beta1.xml
rename to web/core/modules/update/tests/fixtures/release-history/aaa_update_test.2_0-beta1.xml
diff --git a/web/core/modules/update/tests/modules/update_test/aaa_update_test.2_0.xml b/web/core/modules/update/tests/fixtures/release-history/aaa_update_test.2_0.xml
similarity index 100%
rename from web/core/modules/update/tests/modules/update_test/aaa_update_test.2_0.xml
rename to web/core/modules/update/tests/fixtures/release-history/aaa_update_test.2_0.xml
diff --git a/web/core/modules/update/tests/modules/update_test/aaa_update_test.8.x-1.2.xml b/web/core/modules/update/tests/fixtures/release-history/aaa_update_test.8.x-1.2.xml
similarity index 79%
rename from web/core/modules/update/tests/modules/update_test/aaa_update_test.8.x-1.2.xml
rename to web/core/modules/update/tests/fixtures/release-history/aaa_update_test.8.x-1.2.xml
index 670fc5c5d2..c83a8b0daa 100644
--- a/web/core/modules/update/tests/modules/update_test/aaa_update_test.8.x-1.2.xml
+++ b/web/core/modules/update/tests/fixtures/release-history/aaa_update_test.8.x-1.2.xml
@@ -16,10 +16,15 @@
<version>8.x-1.3-beta1</version>
<tag>DRUPAL-8--1-3-beta1</tag>
<core_compatibility>8.0.0 || 8.1.1</core_compatibility>
+ <version_major>1</version_major>
+ <version_patch>3</version_patch>
+ <version_extra>beta1</version_extra>
<status>published</status>
<release_link>http://example.com/aaa_update_test-8-x-1-3-beta1-release</release_link>
<download_link>http://example.com/aaa_update_test-8-x-1-3-beta1.tar.gz</download_link>
<date>1250624521</date>
+ <mdhash>b966255555d9c9b86d480ca08cfaa98e</mdhash>
+ <filesize>1073751924</filesize>
<terms>
<term><name>Release type</name><value>New features</value></term>
<term><name>Release type</name><value>Bug fixes</value></term>
@@ -30,10 +35,14 @@
<version>8.x-1.2</version>
<tag>DRUPAL-8--1-2</tag>
<core_compatibility>^8</core_compatibility>
+ <version_major>1</version_major>
+ <version_patch>2</version_patch>
<status>published</status>
<release_link>http://example.com/aaa_update_test-8-x-1-2-release</release_link>
<download_link>http://example.com/aaa_update_test-8-x-1-2.tar.gz</download_link>
<date>1250424521</date>
+ <mdhash>b966255555d9c9b86d480ca08cfaa98e</mdhash>
+ <filesize>1073741824</filesize>
<terms>
<term><name>Release type</name><value>New features</value></term>
<term><name>Release type</name><value>Bug fixes</value></term>
@@ -43,10 +52,14 @@
<name>aaa_update_test 8.x-1.1</name>
<version>8.x-1.1</version>
<tag>DRUPAL-8--1-1</tag>
+ <version_major>1</version_major>
+ <version_patch>1</version_patch>
<status>published</status>
<release_link>http://example.com/aaa_update_test-8-x-1-1-release</release_link>
<download_link>http://example.com/aaa_update_test-8-x-1-1.tar.gz</download_link>
<date>1250424521</date>
+ <mdhash>b966255555d9c9b86d480ca08cfaa98e</mdhash>
+ <filesize>1073741824</filesize>
<terms>
<term><name>Release type</name><value>New features</value></term>
<term><name>Release type</name><value>Bug fixes</value></term>
@@ -56,10 +69,14 @@
<name>aaa_update_test 8.x-1.0</name>
<version>8.x-1.0</version>
<tag>DRUPAL-8--1-0</tag>
+ <version_major>1</version_major>
+ <version_patch>0</version_patch>
<status>published</status>
<release_link>http://example.com/aaa_update_test-8-x-1-0-release</release_link>
<download_link>http://example.com/aaa_update_test-8-x-1-0.tar.gz</download_link>
<date>1250424521</date>
+ <mdhash>b966255555d9c9b86d480ca08cfaa98e</mdhash>
+ <filesize>1073741824</filesize>
<terms>
<term><name>Release type</name><value>New features</value></term>
<term><name>Release type</name><value>Bug fixes</value></term>
diff --git a/web/core/modules/update/tests/modules/update_test/aaa_update_test.core_compatibility.8.x-1.2_8.x-2.2.xml b/web/core/modules/update/tests/fixtures/release-history/aaa_update_test.core_compatibility.8.x-1.2_8.x-2.2.xml
similarity index 100%
rename from web/core/modules/update/tests/modules/update_test/aaa_update_test.core_compatibility.8.x-1.2_8.x-2.2.xml
rename to web/core/modules/update/tests/fixtures/release-history/aaa_update_test.core_compatibility.8.x-1.2_8.x-2.2.xml
diff --git a/web/core/modules/update/tests/modules/update_test/aaa_update_test.no-releases.xml b/web/core/modules/update/tests/fixtures/release-history/aaa_update_test.no-releases.xml
similarity index 100%
rename from web/core/modules/update/tests/modules/update_test/aaa_update_test.no-releases.xml
rename to web/core/modules/update/tests/fixtures/release-history/aaa_update_test.no-releases.xml
diff --git a/web/core/modules/update/tests/modules/update_test/aaa_update_test.sec.8.x-1.1_8.x-1.2.xml b/web/core/modules/update/tests/fixtures/release-history/aaa_update_test.sec.8.x-1.1_8.x-1.2.xml
similarity index 100%
rename from web/core/modules/update/tests/modules/update_test/aaa_update_test.sec.8.x-1.1_8.x-1.2.xml
rename to web/core/modules/update/tests/fixtures/release-history/aaa_update_test.sec.8.x-1.1_8.x-1.2.xml
diff --git a/web/core/modules/update/tests/modules/update_test/aaa_update_test.sec.8.x-1.2.xml b/web/core/modules/update/tests/fixtures/release-history/aaa_update_test.sec.8.x-1.2.xml
similarity index 100%
rename from web/core/modules/update/tests/modules/update_test/aaa_update_test.sec.8.x-1.2.xml
rename to web/core/modules/update/tests/fixtures/release-history/aaa_update_test.sec.8.x-1.2.xml
diff --git a/web/core/modules/update/tests/modules/update_test/aaa_update_test.sec.8.x-1.2_8.x-2.2.xml b/web/core/modules/update/tests/fixtures/release-history/aaa_update_test.sec.8.x-1.2_8.x-2.2.xml
similarity index 100%
rename from web/core/modules/update/tests/modules/update_test/aaa_update_test.sec.8.x-1.2_8.x-2.2.xml
rename to web/core/modules/update/tests/fixtures/release-history/aaa_update_test.sec.8.x-1.2_8.x-2.2.xml
diff --git a/web/core/modules/update/tests/modules/update_test/aaa_update_test.sec.8.x-2.2_1.x_secure.xml b/web/core/modules/update/tests/fixtures/release-history/aaa_update_test.sec.8.x-2.2_1.x_secure.xml
similarity index 100%
rename from web/core/modules/update/tests/modules/update_test/aaa_update_test.sec.8.x-2.2_1.x_secure.xml
rename to web/core/modules/update/tests/fixtures/release-history/aaa_update_test.sec.8.x-2.2_1.x_secure.xml
diff --git a/web/core/modules/update/tests/modules/update_test/bbb_update_test.1_0.xml b/web/core/modules/update/tests/fixtures/release-history/bbb_update_test.1_0.xml
similarity index 100%
rename from web/core/modules/update/tests/modules/update_test/bbb_update_test.1_0.xml
rename to web/core/modules/update/tests/fixtures/release-history/bbb_update_test.1_0.xml
diff --git a/web/core/modules/update/tests/modules/update_test/bbb_update_test.1_1.xml b/web/core/modules/update/tests/fixtures/release-history/bbb_update_test.1_1.xml
similarity index 100%
rename from web/core/modules/update/tests/modules/update_test/bbb_update_test.1_1.xml
rename to web/core/modules/update/tests/fixtures/release-history/bbb_update_test.1_1.xml
diff --git a/web/core/modules/update/tests/modules/update_test/bbb_update_test.1_2.xml b/web/core/modules/update/tests/fixtures/release-history/bbb_update_test.1_2.xml
similarity index 100%
rename from web/core/modules/update/tests/modules/update_test/bbb_update_test.1_2.xml
rename to web/core/modules/update/tests/fixtures/release-history/bbb_update_test.1_2.xml
diff --git a/web/core/modules/update/tests/modules/update_test/ccc_update_test.1_0.xml b/web/core/modules/update/tests/fixtures/release-history/ccc_update_test.1_0.xml
similarity index 100%
rename from web/core/modules/update/tests/modules/update_test/ccc_update_test.1_0.xml
rename to web/core/modules/update/tests/fixtures/release-history/ccc_update_test.1_0.xml
diff --git a/web/core/modules/update/tests/modules/update_test/drupal.0.0-alpha1.xml b/web/core/modules/update/tests/fixtures/release-history/drupal.0.0-alpha1.xml
similarity index 100%
rename from web/core/modules/update/tests/modules/update_test/drupal.0.0-alpha1.xml
rename to web/core/modules/update/tests/fixtures/release-history/drupal.0.0-alpha1.xml
diff --git a/web/core/modules/update/tests/modules/update_test/drupal.0.0-beta1.xml b/web/core/modules/update/tests/fixtures/release-history/drupal.0.0-beta1.xml
similarity index 100%
rename from web/core/modules/update/tests/modules/update_test/drupal.0.0-beta1.xml
rename to web/core/modules/update/tests/fixtures/release-history/drupal.0.0-beta1.xml
diff --git a/web/core/modules/update/tests/modules/update_test/drupal.0.0.xml b/web/core/modules/update/tests/fixtures/release-history/drupal.0.0.xml
similarity index 100%
rename from web/core/modules/update/tests/modules/update_test/drupal.0.0.xml
rename to web/core/modules/update/tests/fixtures/release-history/drupal.0.0.xml
diff --git a/web/core/modules/update/tests/modules/update_test/drupal.0.1-alpha1.xml b/web/core/modules/update/tests/fixtures/release-history/drupal.0.1-alpha1.xml
similarity index 100%
rename from web/core/modules/update/tests/modules/update_test/drupal.0.1-alpha1.xml
rename to web/core/modules/update/tests/fixtures/release-history/drupal.0.1-alpha1.xml
diff --git a/web/core/modules/update/tests/modules/update_test/drupal.0.1-beta1.xml b/web/core/modules/update/tests/fixtures/release-history/drupal.0.1-beta1.xml
similarity index 100%
rename from web/core/modules/update/tests/modules/update_test/drupal.0.1-beta1.xml
rename to web/core/modules/update/tests/fixtures/release-history/drupal.0.1-beta1.xml
diff --git a/web/core/modules/update/tests/modules/update_test/drupal.0.1.xml b/web/core/modules/update/tests/fixtures/release-history/drupal.0.1.xml
similarity index 100%
rename from web/core/modules/update/tests/modules/update_test/drupal.0.1.xml
rename to web/core/modules/update/tests/fixtures/release-history/drupal.0.1.xml
diff --git a/web/core/modules/update/tests/modules/update_test/drupal.1.0-alpha1.xml b/web/core/modules/update/tests/fixtures/release-history/drupal.1.0-alpha1.xml
similarity index 100%
rename from web/core/modules/update/tests/modules/update_test/drupal.1.0-alpha1.xml
rename to web/core/modules/update/tests/fixtures/release-history/drupal.1.0-alpha1.xml
diff --git a/web/core/modules/update/tests/modules/update_test/drupal.1.0-beta1.xml b/web/core/modules/update/tests/fixtures/release-history/drupal.1.0-beta1.xml
similarity index 100%
rename from web/core/modules/update/tests/modules/update_test/drupal.1.0-beta1.xml
rename to web/core/modules/update/tests/fixtures/release-history/drupal.1.0-beta1.xml
diff --git a/web/core/modules/update/tests/modules/update_test/drupal.1.0-unsupported.xml b/web/core/modules/update/tests/fixtures/release-history/drupal.1.0-unsupported.xml
similarity index 100%
rename from web/core/modules/update/tests/modules/update_test/drupal.1.0-unsupported.xml
rename to web/core/modules/update/tests/fixtures/release-history/drupal.1.0-unsupported.xml
diff --git a/web/core/modules/update/tests/modules/update_test/drupal.1.0.xml b/web/core/modules/update/tests/fixtures/release-history/drupal.1.0.xml
similarity index 100%
rename from web/core/modules/update/tests/modules/update_test/drupal.1.0.xml
rename to web/core/modules/update/tests/fixtures/release-history/drupal.1.0.xml
diff --git a/web/core/modules/update/tests/modules/update_test/drupal.1.1-alpha1-core_compatibility.xml b/web/core/modules/update/tests/fixtures/release-history/drupal.1.1-alpha1-core_compatibility.xml
similarity index 100%
rename from web/core/modules/update/tests/modules/update_test/drupal.1.1-alpha1-core_compatibility.xml
rename to web/core/modules/update/tests/fixtures/release-history/drupal.1.1-alpha1-core_compatibility.xml
diff --git a/web/core/modules/update/tests/modules/update_test/drupal.1.1-alpha1.xml b/web/core/modules/update/tests/fixtures/release-history/drupal.1.1-alpha1.xml
similarity index 100%
rename from web/core/modules/update/tests/modules/update_test/drupal.1.1-alpha1.xml
rename to web/core/modules/update/tests/fixtures/release-history/drupal.1.1-alpha1.xml
diff --git a/web/core/modules/update/tests/modules/update_test/drupal.1.1-beta1.xml b/web/core/modules/update/tests/fixtures/release-history/drupal.1.1-beta1.xml
similarity index 100%
rename from web/core/modules/update/tests/modules/update_test/drupal.1.1-beta1.xml
rename to web/core/modules/update/tests/fixtures/release-history/drupal.1.1-beta1.xml
diff --git a/web/core/modules/update/tests/modules/update_test/drupal.1.1-core_compatibility.xml b/web/core/modules/update/tests/fixtures/release-history/drupal.1.1-core_compatibility.xml
similarity index 100%
rename from web/core/modules/update/tests/modules/update_test/drupal.1.1-core_compatibility.xml
rename to web/core/modules/update/tests/fixtures/release-history/drupal.1.1-core_compatibility.xml
diff --git a/web/core/modules/update/tests/modules/update_test/drupal.1.1.xml b/web/core/modules/update/tests/fixtures/release-history/drupal.1.1.xml
similarity index 100%
rename from web/core/modules/update/tests/modules/update_test/drupal.1.1.xml
rename to web/core/modules/update/tests/fixtures/release-history/drupal.1.1.xml
diff --git a/web/core/modules/update/tests/modules/update_test/drupal.9.xml b/web/core/modules/update/tests/fixtures/release-history/drupal.9.xml
similarity index 100%
rename from web/core/modules/update/tests/modules/update_test/drupal.9.xml
rename to web/core/modules/update/tests/fixtures/release-history/drupal.9.xml
diff --git a/web/core/modules/update/tests/modules/update_test/drupal.dev.xml b/web/core/modules/update/tests/fixtures/release-history/drupal.dev.xml
similarity index 100%
rename from web/core/modules/update/tests/modules/update_test/drupal.dev.xml
rename to web/core/modules/update/tests/fixtures/release-history/drupal.dev.xml
diff --git a/web/core/modules/update/tests/modules/update_test/drupal.sec.0.1_0.2.xml b/web/core/modules/update/tests/fixtures/release-history/drupal.sec.0.1_0.2.xml
similarity index 100%
rename from web/core/modules/update/tests/modules/update_test/drupal.sec.0.1_0.2.xml
rename to web/core/modules/update/tests/fixtures/release-history/drupal.sec.0.1_0.2.xml
diff --git a/web/core/modules/update/tests/modules/update_test/drupal.sec.0.2-rc2-b.xml b/web/core/modules/update/tests/fixtures/release-history/drupal.sec.0.2-rc2-b.xml
similarity index 100%
rename from web/core/modules/update/tests/modules/update_test/drupal.sec.0.2-rc2-b.xml
rename to web/core/modules/update/tests/fixtures/release-history/drupal.sec.0.2-rc2-b.xml
diff --git a/web/core/modules/update/tests/modules/update_test/drupal.sec.0.2-rc2.xml b/web/core/modules/update/tests/fixtures/release-history/drupal.sec.0.2-rc2.xml
similarity index 100%
rename from web/core/modules/update/tests/modules/update_test/drupal.sec.0.2-rc2.xml
rename to web/core/modules/update/tests/fixtures/release-history/drupal.sec.0.2-rc2.xml
diff --git a/web/core/modules/update/tests/modules/update_test/drupal.sec.0.2.xml b/web/core/modules/update/tests/fixtures/release-history/drupal.sec.0.2.xml
similarity index 100%
rename from web/core/modules/update/tests/modules/update_test/drupal.sec.0.2.xml
rename to web/core/modules/update/tests/fixtures/release-history/drupal.sec.0.2.xml
diff --git a/web/core/modules/update/tests/modules/update_test/drupal.sec.1.2.xml b/web/core/modules/update/tests/fixtures/release-history/drupal.sec.1.2.xml
similarity index 100%
rename from web/core/modules/update/tests/modules/update_test/drupal.sec.1.2.xml
rename to web/core/modules/update/tests/fixtures/release-history/drupal.sec.1.2.xml
diff --git a/web/core/modules/update/tests/modules/update_test/drupal.sec.1.2_insecure-unsupported.xml b/web/core/modules/update/tests/fixtures/release-history/drupal.sec.1.2_insecure-unsupported.xml
similarity index 100%
rename from web/core/modules/update/tests/modules/update_test/drupal.sec.1.2_insecure-unsupported.xml
rename to web/core/modules/update/tests/fixtures/release-history/drupal.sec.1.2_insecure-unsupported.xml
diff --git a/web/core/modules/update/tests/modules/update_test/drupal.sec.1.2_insecure.xml b/web/core/modules/update/tests/fixtures/release-history/drupal.sec.1.2_insecure.xml
similarity index 100%
rename from web/core/modules/update/tests/modules/update_test/drupal.sec.1.2_insecure.xml
rename to web/core/modules/update/tests/fixtures/release-history/drupal.sec.1.2_insecure.xml
diff --git a/web/core/modules/update/tests/modules/update_test/drupal.sec.2.0.xml b/web/core/modules/update/tests/fixtures/release-history/drupal.sec.2.0.xml
similarity index 100%
rename from web/core/modules/update/tests/modules/update_test/drupal.sec.2.0.xml
rename to web/core/modules/update/tests/fixtures/release-history/drupal.sec.2.0.xml
diff --git a/web/core/modules/update/tests/modules/update_test/drupal.sec.2.0_3.0-rc1.xml b/web/core/modules/update/tests/fixtures/release-history/drupal.sec.2.0_3.0-rc1.xml
similarity index 100%
rename from web/core/modules/update/tests/modules/update_test/drupal.sec.2.0_3.0-rc1.xml
rename to web/core/modules/update/tests/fixtures/release-history/drupal.sec.2.0_3.0-rc1.xml
diff --git a/web/core/modules/update/tests/modules/update_test/drupal.sec.2.0_9.0.0.xml b/web/core/modules/update/tests/fixtures/release-history/drupal.sec.2.0_9.0.0.xml
similarity index 100%
rename from web/core/modules/update/tests/modules/update_test/drupal.sec.2.0_9.0.0.xml
rename to web/core/modules/update/tests/fixtures/release-history/drupal.sec.2.0_9.0.0.xml
diff --git a/web/core/modules/update/tests/modules/update_test/drupal.sec.9.0.xml b/web/core/modules/update/tests/fixtures/release-history/drupal.sec.9.0.xml
similarity index 100%
rename from web/core/modules/update/tests/modules/update_test/drupal.sec.9.0.xml
rename to web/core/modules/update/tests/fixtures/release-history/drupal.sec.9.0.xml
diff --git a/web/core/modules/update/tests/modules/update_test/drupal.sec.9.9.0.xml b/web/core/modules/update/tests/fixtures/release-history/drupal.sec.9.9.0.xml
similarity index 100%
rename from web/core/modules/update/tests/modules/update_test/drupal.sec.9.9.0.xml
rename to web/core/modules/update/tests/fixtures/release-history/drupal.sec.9.9.0.xml
diff --git a/web/core/modules/update/tests/modules/update_test/update_test_basetheme.1_1-sec.xml b/web/core/modules/update/tests/fixtures/release-history/update_test_basetheme.1_1-sec.xml
similarity index 100%
rename from web/core/modules/update/tests/modules/update_test/update_test_basetheme.1_1-sec.xml
rename to web/core/modules/update/tests/fixtures/release-history/update_test_basetheme.1_1-sec.xml
diff --git a/web/core/modules/update/tests/modules/update_test/update_test_new_module.1_1.xml b/web/core/modules/update/tests/fixtures/release-history/update_test_new_module.1_1.xml
similarity index 100%
rename from web/core/modules/update/tests/modules/update_test/update_test_new_module.1_1.xml
rename to web/core/modules/update/tests/fixtures/release-history/update_test_new_module.1_1.xml
diff --git a/web/core/modules/update/tests/modules/update_test/update_test_subtheme.1_0.xml b/web/core/modules/update/tests/fixtures/release-history/update_test_subtheme.1_0.xml
similarity index 100%
rename from web/core/modules/update/tests/modules/update_test/update_test_subtheme.1_0.xml
rename to web/core/modules/update/tests/fixtures/release-history/update_test_subtheme.1_0.xml
diff --git a/web/core/modules/update/tests/modules/bbb_update_test/bbb_update_test.info.yml b/web/core/modules/update/tests/modules/bbb_update_test/bbb_update_test.info.yml
index 0c2226bcc3..3964351b81 100644
--- a/web/core/modules/update/tests/modules/bbb_update_test/bbb_update_test.info.yml
+++ b/web/core/modules/update/tests/modules/bbb_update_test/bbb_update_test.info.yml
@@ -2,5 +2,4 @@ name: 'BBB Update test'
type: module
description: 'Support module for update module testing.'
package: Testing
-version: VERSION
core: 8.x
diff --git a/web/core/modules/update/tests/modules/ccc_update_test/ccc_update_test.info.yml b/web/core/modules/update/tests/modules/ccc_update_test/ccc_update_test.info.yml
index 6fcd4ec226..0b077ed89c 100644
--- a/web/core/modules/update/tests/modules/ccc_update_test/ccc_update_test.info.yml
+++ b/web/core/modules/update/tests/modules/ccc_update_test/ccc_update_test.info.yml
@@ -2,5 +2,4 @@ name: 'CCC Update test'
type: module
description: 'Support module for update module testing.'
package: Testing
-version: VERSION
core: 8.x
diff --git a/web/core/modules/update/tests/modules/update_test/src/Controller/UpdateTestController.php b/web/core/modules/update/tests/modules/update_test/src/Controller/UpdateTestController.php
index 184edd1895..a8d15dfd67 100644
--- a/web/core/modules/update/tests/modules/update_test/src/Controller/UpdateTestController.php
+++ b/web/core/modules/update/tests/modules/update_test/src/Controller/UpdateTestController.php
@@ -63,7 +63,7 @@ public function updateTest($project_name, $version) {
$availability_scenario = '#broken#';
}
- $file = __DIR__ . "/../../$project_name.$availability_scenario.xml";
+ $file = __DIR__ . "/../../../../fixtures/release-history/$project_name.$availability_scenario.xml";
$headers = ['Content-Type' => 'text/xml; charset=utf-8'];
if (!is_file($file)) {
// Return an empty response.
diff --git a/web/core/modules/update/tests/modules/update_test/update_test.info.yml b/web/core/modules/update/tests/modules/update_test/update_test.info.yml
index 053aafcfe0..f772fb4b2e 100644
--- a/web/core/modules/update/tests/modules/update_test/update_test.info.yml
+++ b/web/core/modules/update/tests/modules/update_test/update_test.info.yml
@@ -2,5 +2,4 @@ name: 'Update test'
type: module
description: 'Support module for update module testing.'
package: Testing
-version: VERSION
core: 8.x
diff --git a/web/core/modules/update/tests/src/Functional/UpdateContribTest.php b/web/core/modules/update/tests/src/Functional/UpdateContribTest.php
index e1b86b3f6d..6410f5fde3 100644
--- a/web/core/modules/update/tests/src/Functional/UpdateContribTest.php
+++ b/web/core/modules/update/tests/src/Functional/UpdateContribTest.php
@@ -5,6 +5,7 @@
use Drupal\Core\Link;
use Drupal\Core\Url;
use Drupal\Core\Utility\ProjectInfo;
+use Drupal\update\UpdateManagerInterface;
/**
* Tests how the Update Manager module handles contributed modules and themes in
@@ -29,7 +30,13 @@ class UpdateContribTest extends UpdateTestBase {
*
* @var array
*/
- public static $modules = ['update_test', 'update', 'aaa_update_test', 'bbb_update_test', 'ccc_update_test'];
+ public static $modules = [
+ 'update_test',
+ 'update',
+ 'aaa_update_test',
+ 'bbb_update_test',
+ 'ccc_update_test',
+ ];
/**
* {@inheritdoc}
@@ -516,7 +523,7 @@ public function testHookUpdateStatusAlter() {
$update_test_config->set('system_info', $system_info)->save();
$update_status = [
'aaa_update_test' => [
- 'status' => UPDATE_NOT_SECURE,
+ 'status' => UpdateManagerInterface::NOT_SECURE,
],
];
$update_test_config->set('update_status', $update_status)->save();
@@ -708,9 +715,13 @@ public function securityUpdateAvailabilityProvider() {
'expected_update_message_type' => static::UPDATE_NONE,
'fixture' => 'sec.8.x-1.2_8.x-2.2',
],
+ '8.x-2.0, 8.x-1.2 8.x-2.2' => [
+ 'module_patch_version' => '8.x-2.0',
+ 'expected_security_releases' => ['8.x-2.2'],
+ 'expected_update_message_type' => static::SECURITY_UPDATE_REQUIRED,
+ 'fixture' => 'sec.8.x-1.2_8.x-2.2',
+ ],
// @todo In https://www.drupal.org/node/2865920 add test cases:
- // - 8.x-2.0 using fixture 'sec.8.x-1.2_8.x-2.2' to ensure that 8.x-2.2
- // is the only security update.
// - 8.x-3.0-beta1 using fixture 'sec.8.x-1.2_8.x-2.2' to ensure that
// 8.x-2.2 is the only security update.
];
@@ -846,7 +857,7 @@ protected function assertCoreCompatibilityMessage($version, $expected_range, $ex
$update_element = $this->findUpdateElementByLabel($expected_release_title);
$this->assertTrue($update_element->hasLink($version));
$compatibility_details = $update_element->find('css', '.project-update__compatibility-details details');
- $this->assertContains("Requires Drupal core: $expected_range", $compatibility_details->getText());
+ $this->assertStringContainsString("Requires Drupal core: $expected_range", $compatibility_details->getText());
$details_summary_element = $compatibility_details->find('css', 'summary');
if ($is_compatible) {
$download_version = str_replace('.', '-', $version);
diff --git a/web/core/modules/update/tests/src/Functional/UpdateCoreTest.php b/web/core/modules/update/tests/src/Functional/UpdateCoreTest.php
index d6c198f42e..a7a982f1c0 100644
--- a/web/core/modules/update/tests/src/Functional/UpdateCoreTest.php
+++ b/web/core/modules/update/tests/src/Functional/UpdateCoreTest.php
@@ -98,7 +98,7 @@ public function testNormalUpdateAvailable() {
// Ensure that the update check requires a token.
$this->drupalGet('admin/reports/updates/check');
- $this->assertResponse(403, 'Accessing admin/reports/updates/check without a CSRF token results in access denied.');
+ $this->assertSession()->statusCodeEquals(403);
foreach ([0, 1] as $minor_version) {
foreach (['-alpha1', '-beta1', ''] as $extra_version) {
@@ -134,6 +134,7 @@ public function testNormalUpdateAvailable() {
$this->assertRaw('check.svg', 'Check icon was found.');
}
break;
+
case 1:
// Both stable and unstable releases are available.
// A stable release is the latest.
@@ -355,6 +356,14 @@ public function securityUpdateAvailabilityProvider() {
'expected_update_message_type' => static::UPDATE_NONE,
'fixture' => 'sec.0.2-rc2',
],
+ // Ensure that 8.0.2 security release is not shown because it is earlier
+ // version than 1.0.
+ '1.0, 0.2 1.2' => [
+ 'site_patch_version' => '1.0',
+ 'expected_security_releases' => ['1.2', '2.0-rc2'],
+ 'expected_update_message_type' => static::SECURITY_UPDATE_REQUIRED,
+ 'fixture' => 'sec.0.2-rc2',
+ ],
];
$pre_releases = [
'2.0-alpha1',
@@ -365,24 +374,25 @@ public function securityUpdateAvailabilityProvider() {
'2.0-rc2',
];
- // If the site is on an alpha/beta/RC of an upcoming minor and none of the
- // alpha/beta/RC versions are marked insecure, no security update should be
- // required.
foreach ($pre_releases as $pre_release) {
+ // If the site is on an alpha/beta/RC of an upcoming minor and none of the
+ // alpha/beta/RC versions are marked insecure, no security update should
+ // be required.
$test_cases["Pre-release:$pre_release, no security update"] = [
'site_patch_version' => $pre_release,
'expected_security_releases' => [],
'expected_update_message_type' => $pre_release === '2.0-rc2' ? static::UPDATE_NONE : static::UPDATE_AVAILABLE,
'fixture' => 'sec.0.2-rc2-b',
];
+ // If the site is on an alpha/beta/RC of an upcoming minor and there is
+ // an RC version with a security update, it should be recommended.
+ $test_cases["Pre-release:$pre_release, security update"] = [
+ 'site_patch_version' => $pre_release,
+ 'expected_security_releases' => $pre_release === '2.0-rc2' ? [] : ['2.0-rc2'],
+ 'expected_update_message_type' => $pre_release === '2.0-rc2' ? static::UPDATE_NONE : static::SECURITY_UPDATE_REQUIRED,
+ 'fixture' => 'sec.0.2-rc2',
+ ];
}
-
- // @todo In https://www.drupal.org/node/2865920 add test cases:
- // - For all pre-releases for 8.2.0 except 8.2.0-rc2 using the
- // 'sec.0.2-rc2' fixture to ensure that 8.2.0-rc2 is the only security
- // update.
- // - For 8.1.0 using fixture 'sec.0.2-rc2' to ensure that only security
- // updates are 8.1.2 and 8.2.0-rc2.
return $test_cases;
}
@@ -854,7 +864,7 @@ public function testRevokedRelease() {
* 'supported_branches' is '8.0.,8.1.'.
* - drupal.1.0-unsupported.xml
* 'supported_branches' is '8.1.'.
- * They both have an '8.0.3' release that that has the 'Release type' value of
+ * They both have an '8.0.3' release that has the 'Release type' value of
* 'unsupported' and an '8.1.0' release that has the 'Release type' value of
* 'supported' and is the expected update.
*/
diff --git a/web/core/modules/update/tests/src/Functional/UpdateTestBase.php b/web/core/modules/update/tests/src/Functional/UpdateTestBase.php
index 5ca84d922b..80f5b2496c 100644
--- a/web/core/modules/update/tests/src/Functional/UpdateTestBase.php
+++ b/web/core/modules/update/tests/src/Functional/UpdateTestBase.php
@@ -154,8 +154,8 @@ protected function assertSecurityUpdates($project_path_part, array $expected_sec
$expected_release_urls[] = $release_url;
$expected_download_urls[] = $download_url;
// Ensure the expected links are security links.
- $this->assertTrue(in_array($release_url, $all_security_release_urls), "Release $release_url is a security release link.");
- $this->assertTrue(in_array($download_url, $all_security_download_urls), "Release $download_url is a security download link.");
+ $this->assertContains($release_url, $all_security_release_urls, "Release $release_url is a security release link.");
+ $this->assertContains($download_url, $all_security_download_urls, "Release $download_url is a security download link.");
$assert_session->linkByHrefExists($release_url);
$assert_session->linkByHrefExists($download_url);
}
diff --git a/web/core/modules/update/tests/src/Functional/UpdateUploadTest.php b/web/core/modules/update/tests/src/Functional/UpdateUploadTest.php
index a05e8a35a3..c3da558329 100644
--- a/web/core/modules/update/tests/src/Functional/UpdateUploadTest.php
+++ b/web/core/modules/update/tests/src/Functional/UpdateUploadTest.php
@@ -73,7 +73,7 @@ public function testUploadModule() {
$updaters = drupal_get_updaters();
$moduleUpdater = $updaters['module']['class'];
$installedInfoFilePath = $this->container->get('update.root') . '/' . $moduleUpdater::getRootDirectoryRelativePath() . '/update_test_new_module/update_test_new_module.info.yml';
- $this->assertFalse(file_exists($installedInfoFilePath), 'The new module does not exist in the filesystem before it is installed with the Update Manager.');
+ $this->assertFileNotExists($installedInfoFilePath);
$validArchiveFile = __DIR__ . '/../../update_test_new_module/8.x-1.0/update_test_new_module.tar.gz';
$edit = [
'files[project_upload]' => $validArchiveFile,
@@ -85,7 +85,7 @@ public function testUploadModule() {
// Check for a success message on the page, and check that the installed
// module now exists in the expected place in the filesystem.
$this->assertRaw(t('Installed %project_name successfully', ['%project_name' => 'update_test_new_module']));
- $this->assertTrue(file_exists($installedInfoFilePath), 'The new module exists in the filesystem after it is installed with the Update Manager.');
+ $this->assertFileExists($installedInfoFilePath);
// Ensure the links are relative to the site root and not
// core/authorize.php.
$this->assertLink(t('Install another module'));
@@ -96,7 +96,7 @@ public function testUploadModule() {
$this->assertLinkByHref(Url::fromRoute('system.admin')->toString());
// Ensure we can reach the "Install another module" link.
$this->clickLink(t('Install another module'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertUrl('admin/modules/install');
// Check that the module has the correct version before trying to update
diff --git a/web/core/modules/update/tests/src/Kernel/UpdateReportTest.php b/web/core/modules/update/tests/src/Kernel/UpdateReportTest.php
new file mode 100644
index 0000000000..c7719c14cc
--- /dev/null
+++ b/web/core/modules/update/tests/src/Kernel/UpdateReportTest.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace Drupal\Tests\update\Kernel;
+
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests update report functionality.
+ *
+ * @covers template_preprocess_update_report()
+ * @group update
+ */
+class UpdateReportTest extends KernelTestBase {
+
+ /**
+ * {@inheritdoc}
+ */
+ protected static $modules = [
+ 'system',
+ 'update',
+ ];
+
+ /**
+ * @dataProvider providerTemplatePreprocessUpdateReport
+ */
+ public function testTemplatePreprocessUpdateReport($variables) {
+ \Drupal::moduleHandler()->loadInclude('update', 'inc', 'update.report');
+
+ // The function should run without an exception being thrown when the value
+ // of $variables['data'] is not set or is not an array.
+ template_preprocess_update_report($variables);
+
+ // Test that the key "no_updates_message" has been set.
+ $this->assertArrayHasKey('no_updates_message', $variables);
+ }
+
+ /**
+ * Provides data for testTemplatePreprocessUpdateReport().
+ *
+ * @return array
+ * Array of $variables for template_preprocess_update_report().
+ */
+ public function providerTemplatePreprocessUpdateReport() {
+ return [
+ '$variables with data not set' => [
+ [],
+ ],
+ '$variables with data as an interger' => [
+ ['data' => 4],
+ ],
+ '$variables with data as a string' => [
+ ['data' => 'I am a string'],
+ ],
+ ];
+ }
+
+}
diff --git a/web/core/modules/update/tests/src/Unit/ProjectCoreCompatibilityTest.php b/web/core/modules/update/tests/src/Unit/ProjectCoreCompatibilityTest.php
index b1d2815632..e29771154c 100644
--- a/web/core/modules/update/tests/src/Unit/ProjectCoreCompatibilityTest.php
+++ b/web/core/modules/update/tests/src/Unit/ProjectCoreCompatibilityTest.php
@@ -140,4 +140,3 @@ public function providerSetProjectCoreCompatibilityRanges() {
}
}
-
diff --git a/web/core/modules/update/tests/update_test_new_module/8.x-1.0/update_test_new_module.tar.gz b/web/core/modules/update/tests/update_test_new_module/8.x-1.0/update_test_new_module.tar.gz
index 0cfe64e387..c05f6b2338 100644
--- a/web/core/modules/update/tests/update_test_new_module/8.x-1.0/update_test_new_module.tar.gz
+++ b/web/core/modules/update/tests/update_test_new_module/8.x-1.0/update_test_new_module.tar.gz
@@ -1,3 +1,3 @@
- ��d��U����j�0��^�)r'k��&c �����k)6j�mB�l�헶
-
-�!���|7�IM�Go�©�S��6�cZ�үT� �̻�˜�[Os�s�r."�3�i~ֻ8·���F��n��y?��S�p���㪙�x]�N�F����Ӕ��NX.#�~��]y�MQ�;:z��]�4�M��GĭMX �H�ڙ���t�����m�\[:�j�3�fU��G���b6z�Ȼ�m��m�y�cFfڪ��\��\���? �^��v���MB�3ɄL%���`�� �fiI�cB��q^���O���ޔ�n�(�Ks��é ��������������pi_�$(6�(��
\ No newline at end of file
+ ��G �]����N�0`���[��юn5�D/|�zYX�E�ծUx{�6�$�!A��7��n=�s�ȭʬjmV���j
+�P��)1�d�Ю�}�1���$�K!�x"� ��w��kmn��� �<t]^Te}`~x���K����= ����V��=�y�B��,���ǂ�bD��<���:��
�~�u���7�� ��~��F
+�NM�m���'�N���a��C��fd�XYϣ��|����B�yU��V���<bd��
��Q/�4�R����9�!�a��/���U�9�P x�RK�}�'�����p}��4!�0$4�������sU�� �!�txQ�C�����c������������������E7��(��
\ No newline at end of file
diff --git a/web/core/modules/update/tests/update_test_new_module/8.x-1.1/update_test_new_module.tar.gz b/web/core/modules/update/tests/update_test_new_module/8.x-1.1/update_test_new_module.tar.gz
index 133c9cf0fe..3638c6fe7f 100644
--- a/web/core/modules/update/tests/update_test_new_module/8.x-1.1/update_test_new_module.tar.gz
+++ b/web/core/modules/update/tests/update_test_new_module/8.x-1.1/update_test_new_module.tar.gz
@@ -1,4 +1,3 @@
- ��t��U����j�0��^�)r'k�ڤc �����k)6j�mB�l�헶
-
-�!���|7�IM�Go�©�S��6�cZ�үT� �\t#�� �"�
-ɅdBȈ�L�,��wq�o]a)�J����~Z�����O�U3��^�v�.`)����)��?�09�(��G�w��7E����ϛvyӐ7 � �6ay8"�jg�2��M�ʳ7F[�Y�sm����t�U�" S�ފE��e�"�ʶ�.���
�9�i��#r�reN��0�z������s6 ��r&�4�<�?�L�����,
!�xL�>Ϋ�������z�ڛ2�� Exiηq85Ac��������������.� ^s ��(��
\ No newline at end of file
+ ��Q �]����N�0`���[��юn5�D/|�zYX�E�ծUx{�6�$�!A��7��n=�s�ȭʬjmV���j
+�P��)1�d�Ю�}�1���$�K!�x"� ��w��kmn��� �<t]^Te}`~x���K����= ����V��=�y�B��,���ǂ�bD��<���:��
�~�u���7�� ��~��F
+�NM�m���'�N���a��C��fd�XYϣ��|����B�yU��V���<�d��
��Q/�4�R����9�!�a��/���U�9�P x�RK�}�'�����p}��4!�0$4�������sU�� �!�txQ�C�����c������������������,d7P�(��
\ No newline at end of file
diff --git a/web/core/modules/update/update.api.php b/web/core/modules/update/update.api.php
index 60ef56bfbc..1a6e0ef00b 100644
--- a/web/core/modules/update/update.api.php
+++ b/web/core/modules/update/update.api.php
@@ -5,6 +5,8 @@
* Hooks provided by the Update Manager module.
*/
+use Drupal\update\UpdateFetcherInterface;
+
/**
* @addtogroup hooks
* @{
@@ -89,7 +91,7 @@ function hook_update_status_alter(&$projects) {
($settings[$project]['check'] == 'never' ||
(isset($project_info['recommended']) &&
$settings[$project]['check'] === $project_info['recommended']))) {
- $projects[$project]['status'] = UPDATE_NOT_CHECKED;
+ $projects[$project]['status'] = UpdateFetcherInterface::NOT_CHECKED;
$projects[$project]['reason'] = t('Ignored from settings');
if (!empty($settings[$project]['notes'])) {
$projects[$project]['extra'][] = [
diff --git a/web/core/modules/update/update.authorize.inc b/web/core/modules/update/update.authorize.inc
index fea365a2cb..18b356d3f6 100644
--- a/web/core/modules/update/update.authorize.inc
+++ b/web/core/modules/update/update.authorize.inc
@@ -60,7 +60,7 @@ function update_authorize_run_update($filetransfer, $projects) {
// Since authorize.php has its own method for setting the page title, set it
// manually here rather than passing it in to batch_set() as would normally
// be done.
- $_SESSION['authorize_page_title'] = t('Installing updates');
+ \Drupal::request()->getSession()->set('authorize_page_title', t('Installing updates'));
// Invoke the batch via authorize.php.
return system_authorized_batch_process();
@@ -114,7 +114,7 @@ function update_authorize_run_install($filetransfer, $project, $updater_name, $l
// Since authorize.php has its own method for setting the page title, set it
// manually here rather than passing it in to batch_set() as would normally
// be done.
- $_SESSION['authorize_page_title'] = t('Installing %project', ['%project' => $project]);
+ \Drupal::request()->getSession()->set('authorize_page_title', t('Installing %project', ['%project' => $project]));
// Invoke the batch via authorize.php.
return system_authorized_batch_process();
@@ -213,13 +213,16 @@ function update_authorize_update_batch_finished($success, $results) {
}
}
$offline = \Drupal::state()->get('system.maintenance_mode');
+ $session = \Drupal::request()->getSession();
+ // Unset the variable since it is no longer needed.
+ $maintenance_mode = $session->remove('maintenance_mode');
if ($success) {
// Now that the update completed, we need to clear the available update data
// and recompute our status, so prevent show bogus results.
_update_authorize_clear_update_status();
// Take the site out of maintenance mode if it was previously that way.
- if ($offline && isset($_SESSION['maintenance_mode']) && $_SESSION['maintenance_mode'] == FALSE) {
+ if ($offline && $maintenance_mode === FALSE) {
\Drupal::state()->set('system.maintenance_mode', FALSE);
$page_message = [
'message' => t('Update was completed successfully. Your site has been taken out of maintenance mode.'),
@@ -264,15 +267,14 @@ function update_authorize_update_batch_finished($success, $results) {
'#access' => $url->access(\Drupal::currentUser()),
];
- // Unset the variable since it is no longer needed.
- unset($_SESSION['maintenance_mode']);
-
// Set all these values into the SESSION so authorize.php can display them.
- $_SESSION['authorize_results']['success'] = $success;
- $_SESSION['authorize_results']['page_message'] = $page_message;
- $_SESSION['authorize_results']['messages'] = $results['log'];
- $_SESSION['authorize_results']['tasks'] = $results['tasks'];
- $_SESSION['authorize_page_title'] = t('Update manager');
+ $session->set('authorize_results', [
+ 'success' => $success,
+ 'page_message' => $page_message,
+ 'messages' => $results['log'],
+ 'tasks' => $results['tasks'],
+ ]);
+ $session->set('authorize_page_title', t('Update manager'));
}
/**
@@ -296,9 +298,12 @@ function update_authorize_install_batch_finished($success, $results) {
}
}
$offline = \Drupal::state()->get('system.maintenance_mode');
+ $session = \Drupal::request()->getSession();
+ // Unset the variable since it is no longer needed.
+ $maintenance_mode = $session->remove('maintenance_mode');
if ($success) {
// Take the site out of maintenance mode if it was previously that way.
- if ($offline && isset($_SESSION['maintenance_mode']) && $_SESSION['maintenance_mode'] == FALSE) {
+ if ($offline && $maintenance_mode === FALSE) {
\Drupal::state()->set('system.maintenance_mode', FALSE);
$page_message = [
'message' => t('Installation was completed successfully. Your site has been taken out of maintenance mode.'),
@@ -325,15 +330,14 @@ function update_authorize_install_batch_finished($success, $results) {
];
}
- // Unset the variable since it is no longer needed.
- unset($_SESSION['maintenance_mode']);
-
// Set all these values into the SESSION so authorize.php can display them.
- $_SESSION['authorize_results']['success'] = $success;
- $_SESSION['authorize_results']['page_message'] = $page_message;
- $_SESSION['authorize_results']['messages'] = $results['log'];
- $_SESSION['authorize_results']['tasks'] = $results['tasks'];
- $_SESSION['authorize_page_title'] = t('Update manager');
+ $session->set('authorize_results', [
+ 'success' => $success,
+ 'page_message' => $page_message,
+ 'messages' => $results['log'],
+ 'tasks' => $results['tasks'],
+ ]);
+ $session->set('authorize_page_title', t('Update manager'));
}
/**
diff --git a/web/core/modules/update/update.compare.inc b/web/core/modules/update/update.compare.inc
index ef047f3cc9..02ca3ce816 100644
--- a/web/core/modules/update/update.compare.inc
+++ b/web/core/modules/update/update.compare.inc
@@ -5,6 +5,8 @@
* Code required only when comparing available updates to existing data.
*/
+use Drupal\update\UpdateFetcherInterface;
+use Drupal\update\UpdateManagerInterface;
use Drupal\update\ModuleVersion;
use Drupal\update\ProjectCoreCompatibility;
@@ -122,7 +124,7 @@ function update_calculate_project_data($available) {
}
}
else {
- $projects[$project]['status'] = UPDATE_UNKNOWN;
+ $projects[$project]['status'] = UpdateFetcherInterface::UNKNOWN;
$projects[$project]['reason'] = t('No available releases found');
}
}
@@ -214,7 +216,7 @@ function update_calculate_project_update_status(&$project_data, $available) {
if (isset($available['project_status'])) {
switch ($available['project_status']) {
case 'insecure':
- $project_data['status'] = UPDATE_NOT_SECURE;
+ $project_data['status'] = UpdateManagerInterface::NOT_SECURE;
if (empty($project_data['extra'])) {
$project_data['extra'] = [];
}
@@ -223,9 +225,10 @@ function update_calculate_project_update_status(&$project_data, $available) {
'data' => t('This project has been labeled insecure by the Drupal security team, and is no longer available for download. Immediately disabling everything included by this project is strongly recommended!'),
];
break;
+
case 'unpublished':
case 'revoked':
- $project_data['status'] = UPDATE_REVOKED;
+ $project_data['status'] = UpdateManagerInterface::REVOKED;
if (empty($project_data['extra'])) {
$project_data['extra'] = [];
}
@@ -234,8 +237,9 @@ function update_calculate_project_update_status(&$project_data, $available) {
'data' => t('This project has been revoked, and is no longer available for download. Disabling everything included by this project is strongly recommended!'),
];
break;
+
case 'unsupported':
- $project_data['status'] = UPDATE_NOT_SUPPORTED;
+ $project_data['status'] = UpdateManagerInterface::NOT_SUPPORTED;
if (empty($project_data['extra'])) {
$project_data['extra'] = [];
}
@@ -244,8 +248,9 @@ function update_calculate_project_update_status(&$project_data, $available) {
'data' => t('This project is no longer supported, and is no longer available for download. Disabling everything included by this project is strongly recommended!'),
];
break;
+
case 'not-fetched':
- $project_data['status'] = UPDATE_NOT_FETCHED;
+ $project_data['status'] = UpdateFetcherInterface::NOT_FETCHED;
$project_data['reason'] = t('Failed to get available update data.');
break;
@@ -266,7 +271,7 @@ function update_calculate_project_update_status(&$project_data, $available) {
// Figure out the target major version.
// Off Drupal.org, '0' could be a valid version string, so don't use empty().
if (!isset($project_data['existing_version']) || $project_data['existing_version'] === '') {
- $project_data['status'] = UPDATE_UNKNOWN;
+ $project_data['status'] = UpdateFetcherInterface::UNKNOWN;
$project_data['reason'] = t('Empty version');
return;
}
@@ -275,7 +280,7 @@ function update_calculate_project_update_status(&$project_data, $available) {
}
catch (UnexpectedValueException $exception) {
// If the version has an unexpected value we can't determine updates.
- $project_data['status'] = UPDATE_UNKNOWN;
+ $project_data['status'] = UpdateFetcherInterface::UNKNOWN;
$project_data['reason'] = t('Invalid version: @existing_version', ['@existing_version' => $project_data['existing_version']]);
return;
}
@@ -300,7 +305,7 @@ function update_calculate_project_update_status(&$project_data, $available) {
// We know the current release is unsupported since it is not in
// 'supported_branches' list. We should use the next valid supported
// branch for the target major version.
- $project_data['status'] = UPDATE_NOT_SUPPORTED;
+ $project_data['status'] = UpdateManagerInterface::NOT_SUPPORTED;
foreach ($supported_branches as $supported_branch) {
try {
$target_major = ModuleVersion::createFromSupportBranch($supported_branch)->getMajorVersion();
@@ -314,6 +319,7 @@ function update_calculate_project_update_status(&$project_data, $available) {
// If there are no valid support branches, use the current major.
$target_major = $existing_major;
}
+
}
else {
// Malformed XML file? Stick with the current branch.
@@ -329,12 +335,12 @@ function update_calculate_project_update_status(&$project_data, $available) {
// what they have is unsupported and let them figure it out.
$target_major = max($existing_major, $target_major);
- // If the project is marked as UPDATE_FETCH_PENDING, it means that the
- // data we currently have (if any) is stale, and we've got a task queued
- // up to (re)fetch the data. In that case, we mark it as such, merge in
- // whatever data we have (e.g. project title and link), and move on.
- if (!empty($available['fetch_status']) && $available['fetch_status'] == UPDATE_FETCH_PENDING) {
- $project_data['status'] = UPDATE_FETCH_PENDING;
+ // If the project is marked as UpdateFetcherInterface::FETCH_PENDING, it
+ // means that the data we currently have (if any) is stale, and we've got a
+ // task queued up to (re)fetch the data. In that case, we mark it as such,
+ // merge in whatever data we have (e.g. project title and link), and move on.
+ if (!empty($available['fetch_status']) && $available['fetch_status'] == UpdateFetcherInterface::FETCH_PENDING) {
+ $project_data['status'] = UpdateFetcherInterface::FETCH_PENDING;
$project_data['reason'] = t('No available update data');
$project_data['fetch_status'] = $available['fetch_status'];
return;
@@ -342,7 +348,7 @@ function update_calculate_project_update_status(&$project_data, $available) {
// Defend ourselves from XML history files that contain no releases.
if (empty($available['releases'])) {
- $project_data['status'] = UPDATE_UNKNOWN;
+ $project_data['status'] = UpdateFetcherInterface::UNKNOWN;
$project_data['reason'] = t('No available releases found');
return;
}
@@ -361,10 +367,10 @@ function update_calculate_project_update_status(&$project_data, $available) {
if ($project_data['existing_version'] === $version) {
if (isset($release['terms']['Release type']) &&
in_array('Insecure', $release['terms']['Release type'])) {
- $project_data['status'] = UPDATE_NOT_SECURE;
+ $project_data['status'] = UpdateManagerInterface::NOT_SECURE;
}
elseif ($release['status'] == 'unpublished') {
- $project_data['status'] = UPDATE_REVOKED;
+ $project_data['status'] = UpdateManagerInterface::REVOKED;
if (empty($project_data['extra'])) {
$project_data['extra'] = [];
}
@@ -376,7 +382,7 @@ function update_calculate_project_update_status(&$project_data, $available) {
}
elseif (isset($release['terms']['Release type']) &&
in_array('Unsupported', $release['terms']['Release type'])) {
- $project_data['status'] = UPDATE_NOT_SUPPORTED;
+ $project_data['status'] = UpdateManagerInterface::NOT_SUPPORTED;
if (empty($project_data['extra'])) {
$project_data['extra'] = [];
}
@@ -387,13 +393,14 @@ function update_calculate_project_update_status(&$project_data, $available) {
];
}
}
-
- // Otherwise, ignore unpublished, insecure, or unsupported releases.
- if ($release['status'] == 'unpublished' ||
- !$is_in_supported_branch($release['version']) ||
- (isset($release['terms']['Release type']) &&
- (in_array('Insecure', $release['terms']['Release type']) ||
- in_array('Unsupported', $release['terms']['Release type'])))) {
+ // Other than the currently installed release, ignore unpublished, insecure,
+ // or unsupported updates.
+ elseif ($release['status'] == 'unpublished' ||
+ !$is_in_supported_branch($release['version']) ||
+ (isset($release['terms']['Release type']) &&
+ (in_array('Insecure', $release['terms']['Release type']) ||
+ in_array('Unsupported', $release['terms']['Release type'])))
+ ) {
continue;
}
@@ -498,7 +505,7 @@ function update_calculate_project_update_status(&$project_data, $available) {
// If we don't know what to recommend, there's nothing we can report.
// Bail out early.
if (!isset($project_data['recommended'])) {
- $project_data['status'] = UPDATE_UNKNOWN;
+ $project_data['status'] = UpdateFetcherInterface::UNKNOWN;
$project_data['reason'] = t('No available releases found');
return;
}
@@ -520,29 +527,29 @@ function update_calculate_project_update_status(&$project_data, $available) {
switch ($project_data['install_type']) {
case 'official':
if ($project_data['existing_version'] === $project_data['recommended'] || $project_data['existing_version'] === $project_data['latest_version']) {
- $project_data['status'] = UPDATE_CURRENT;
+ $project_data['status'] = UpdateManagerInterface::CURRENT;
}
else {
- $project_data['status'] = UPDATE_NOT_CURRENT;
+ $project_data['status'] = UpdateManagerInterface::NOT_CURRENT;
}
break;
case 'dev':
$latest = $available['releases'][$project_data['latest_dev']];
if (empty($project_data['datestamp'])) {
- $project_data['status'] = UPDATE_NOT_CHECKED;
+ $project_data['status'] = UpdateFetcherInterface::NOT_CHECKED;
$project_data['reason'] = t('Unknown release date');
}
elseif (($project_data['datestamp'] + 100 > $latest['date'])) {
- $project_data['status'] = UPDATE_CURRENT;
+ $project_data['status'] = UpdateManagerInterface::CURRENT;
}
else {
- $project_data['status'] = UPDATE_NOT_CURRENT;
+ $project_data['status'] = UpdateManagerInterface::NOT_CURRENT;
}
break;
default:
- $project_data['status'] = UPDATE_UNKNOWN;
+ $project_data['status'] = UpdateFetcherInterface::UNKNOWN;
$project_data['reason'] = t('Invalid info');
}
}
diff --git a/web/core/modules/update/update.fetch.inc b/web/core/modules/update/update.fetch.inc
index 9964910b17..b418d9c3ec 100644
--- a/web/core/modules/update/update.fetch.inc
+++ b/web/core/modules/update/update.fetch.inc
@@ -5,6 +5,8 @@
* Code required only when fetching information about available updates.
*/
+use Drupal\update\UpdateManagerInterface;
+
/**
* Performs any notifications that should be done once cron fetches new data.
*
@@ -23,7 +25,7 @@ function _update_cron_notify() {
foreach (['core', 'contrib'] as $report_type) {
$type = 'update_' . $report_type;
if (isset($status[$type]['severity'])
- && ($status[$type]['severity'] == REQUIREMENT_ERROR || ($notify_all && $status[$type]['reason'] == UPDATE_NOT_CURRENT))) {
+ && ($status[$type]['severity'] == REQUIREMENT_ERROR || ($notify_all && $status[$type]['reason'] == UpdateManagerInterface::NOT_CURRENT))) {
$params[$report_type] = $status[$type]['reason'];
}
}
diff --git a/web/core/modules/update/update.install b/web/core/modules/update/update.install
index d977830df5..59de063528 100644
--- a/web/core/modules/update/update.install
+++ b/web/core/modules/update/update.install
@@ -9,6 +9,8 @@
use Drupal\Core\Url;
use Drupal\update\ProjectSecurityData;
use Drupal\update\ProjectSecurityRequirement;
+use Drupal\update\UpdateFetcherInterface;
+use Drupal\update\UpdateManagerInterface;
/**
* Implements hook_requirements().
@@ -22,13 +24,15 @@
* the fields expected by hook_requirements ('value', 'severity', and
* optionally 'description'), this array will contain a 'reason' attribute,
* which is an integer constant to indicate why the given status is being
- * returned (UPDATE_NOT_SECURE, UPDATE_NOT_CURRENT, or UPDATE_UNKNOWN). This
- * is used for generating the appropriate email notification messages during
- * update_cron(), and might be useful for other modules that invoke
+ * returned (UpdateManagerInterface::NOT_SECURE,
+ * UpdateManagerInterface::NOT_CURRENT, or UpdateManagerInterface::UNKNOWN).
+ * This is used for generating the appropriate email notification messages
+ * during update_cron(), and might be useful for other modules that invoke
* update_requirements() to find out if the site is up to date or not.
*
* @see _update_message_text()
* @see _update_cron_notify()
+ * @see \Drupal\update\UpdateManagerInterface
*/
function update_requirements($phase) {
$requirements = [];
@@ -61,7 +65,7 @@ function update_requirements($phase) {
$requirements['update_core']['title'] = t('Drupal core update status');
$requirements['update_core']['value'] = t('No update data available');
$requirements['update_core']['severity'] = REQUIREMENT_WARNING;
- $requirements['update_core']['reason'] = UPDATE_UNKNOWN;
+ $requirements['update_core']['reason'] = UpdateFetcherInterface::UNKNOWN;
$requirements['update_core']['description'] = _update_no_data();
}
}
@@ -115,14 +119,14 @@ function _update_requirement_check($project, $type) {
$requirement['title'] = t('Module and theme update status');
}
$status = $project['status'];
- if ($status != UPDATE_CURRENT) {
+ if ($status != UpdateManagerInterface::CURRENT) {
$requirement['reason'] = $status;
$requirement['severity'] = REQUIREMENT_ERROR;
// When updates are available, append the available updates link to the
// message from _update_message_text(), and format the two translated
// strings together in a single paragraph.
$requirement['description'][] = ['#markup' => _update_message_text($type, $status)];
- if (!in_array($status, [UPDATE_UNKNOWN, UPDATE_NOT_CHECKED, UPDATE_NOT_FETCHED, UPDATE_FETCH_PENDING])) {
+ if (!in_array($status, [UpdateFetcherInterface::UNKNOWN, UpdateFetcherInterface::NOT_CHECKED, UpdateFetcherInterface::NOT_FETCHED, UpdateFetcherInterface::FETCH_PENDING])) {
if (_update_manager_access()) {
$requirement['description'][] = ['#prefix' => ' ', '#markup' => t('See the <a href=":available_updates">available updates</a> page for more information and to install your missing updates.', [':available_updates' => Url::fromRoute('update.report_update')->toString()])];
}
@@ -132,30 +136,35 @@ function _update_requirement_check($project, $type) {
}
}
switch ($status) {
- case UPDATE_NOT_SECURE:
+ case UpdateManagerInterface::NOT_SECURE:
$requirement_label = t('Not secure!');
break;
- case UPDATE_REVOKED:
+
+ case UpdateManagerInterface::REVOKED:
$requirement_label = t('Revoked!');
break;
- case UPDATE_NOT_SUPPORTED:
+
+ case UpdateManagerInterface::NOT_SUPPORTED:
$requirement_label = t('Unsupported release');
break;
- case UPDATE_NOT_CURRENT:
+
+ case UpdateManagerInterface::NOT_CURRENT:
$requirement_label = t('Out of date');
$requirement['severity'] = REQUIREMENT_WARNING;
break;
- case UPDATE_UNKNOWN:
- case UPDATE_NOT_CHECKED:
- case UPDATE_NOT_FETCHED:
- case UPDATE_FETCH_PENDING:
+
+ case UpdateFetcherInterface::UNKNOWN:
+ case UpdateFetcherInterface::NOT_CHECKED:
+ case UpdateFetcherInterface::NOT_FETCHED:
+ case UpdateFetcherInterface::FETCH_PENDING:
$requirement_label = isset($project['reason']) ? $project['reason'] : t('Can not determine status');
$requirement['severity'] = REQUIREMENT_WARNING;
break;
+
default:
$requirement_label = t('Up to date');
}
- if ($status != UPDATE_CURRENT && $type == 'core' && isset($project['recommended'])) {
+ if ($status != UpdateManagerInterface::CURRENT && $type == 'core' && isset($project['recommended'])) {
$requirement_label .= ' ' . t('(version @version available)', ['@version' => $project['recommended']]);
}
$requirement['value'] = Link::fromTextAndUrl($requirement_label, Url::fromRoute(_update_manager_access() ? 'update.report_update' : 'update.status'))->toString();
diff --git a/web/core/modules/update/update.manager.inc b/web/core/modules/update/update.manager.inc
index 1b02aeffa7..d85d178627 100644
--- a/web/core/modules/update/update.manager.inc
+++ b/web/core/modules/update/update.manager.inc
@@ -60,7 +60,7 @@ function update_manager_download_batch_finished($success, $results) {
}
elseif ($success) {
\Drupal::messenger()->addStatus(t('Updates downloaded successfully.'));
- $_SESSION['update_manager_update_projects'] = $results['projects'];
+ \Drupal::request()->getSession()->set('update_manager_update_projects', $results['projects']);
return new RedirectResponse(Url::fromRoute('update.confirmation_page', [], ['absolute' => TRUE])->toString());
}
else {
@@ -156,7 +156,7 @@ function update_manager_archive_extract($file, $directory) {
'filepath' => $file,
]);
if (!$archiver) {
- throw new Exception(t('Cannot extract %file, not a valid archive.', ['%file' => $file]));
+ throw new Exception("Cannot extract '$file', not a valid archive");
}
// Remove the directory if it exists, otherwise it might contain a mixture of
diff --git a/web/core/modules/update/update.module b/web/core/modules/update/update.module
index 59ea625eb2..df1f7ef1d7 100644
--- a/web/core/modules/update/update.module
+++ b/web/core/modules/update/update.module
@@ -17,6 +17,8 @@
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Routing\RouteMatchInterface;
use Drupal\Core\Site\Settings;
+use Drupal\update\UpdateFetcherInterface;
+use Drupal\update\UpdateManagerInterface;
// These are internally used constants for this code, do not modify.
@@ -207,7 +209,7 @@ function update_page_top() {
else {
if (isset($status[$type])
&& isset($status[$type]['reason'])
- && $status[$type]['reason'] === UPDATE_NOT_SECURE) {
+ && $status[$type]['reason'] === UpdateManagerInterface::NOT_SECURE) {
\Drupal::messenger()->addError($status[$type]['description']);
}
}
@@ -382,18 +384,18 @@ function update_get_available($refresh = FALSE) {
// will be changed, so this is the only way we can be sure we're not showing
// bogus information right after they upgrade.
if ($project['info']['_info_file_ctime'] > $available[$key]['last_fetch']) {
- $available[$key]['fetch_status'] = UPDATE_FETCH_PENDING;
+ $available[$key]['fetch_status'] = UpdateFetcherInterface::FETCH_PENDING;
}
// If we have project data but no release data, we need to fetch. This
// can be triggered when we fail to contact a release history server.
if (empty($available[$key]['releases']) && !$available[$key]['last_fetch']) {
- $available[$key]['fetch_status'] = UPDATE_FETCH_PENDING;
+ $available[$key]['fetch_status'] = UpdateFetcherInterface::FETCH_PENDING;
}
// If we think this project needs to fetch, actually create the task now
// and remember that we think we're missing some data.
- if (!empty($available[$key]['fetch_status']) && $available[$key]['fetch_status'] == UPDATE_FETCH_PENDING) {
+ if (!empty($available[$key]['fetch_status']) && $available[$key]['fetch_status'] == UpdateFetcherInterface::FETCH_PENDING) {
\Drupal::service('update.processor')->createFetchTask($project);
$needs_refresh = TRUE;
}
@@ -521,12 +523,13 @@ function update_fetch_data_finished($success, $results) {
* @param $params
* Array of parameters to indicate what kind of text to include in the message
* body. This is a keyed array of message type ('core' or 'contrib') as the
- * keys, and the status reason constant (UPDATE_NOT_SECURE, etc) for the
- * values.
+ * keys, and the status reason constant (UpdateManagerInterface::NOT_SECURE,
+ * etc) for the values.
*
* @see \Drupal\Core\Mail\MailManagerInterface::mail()
* @see _update_cron_notify()
* @see _update_message_text()
+ * @see \Drupal\update\UpdateManagerInterface
*/
function update_mail($key, &$message, $params) {
$langcode = $message['langcode'];
@@ -569,7 +572,7 @@ function update_mail($key, &$message, $params) {
function _update_message_text($msg_type, $msg_reason, $langcode = NULL) {
$text = '';
switch ($msg_reason) {
- case UPDATE_NOT_SECURE:
+ case UpdateManagerInterface::NOT_SECURE:
if ($msg_type == 'core') {
$text = t('There is a security update available for your version of Drupal. To ensure the security of your server, you should update immediately!', [], ['langcode' => $langcode]);
}
@@ -578,7 +581,7 @@ function _update_message_text($msg_type, $msg_reason, $langcode = NULL) {
}
break;
- case UPDATE_REVOKED:
+ case UpdateManagerInterface::REVOKED:
if ($msg_type == 'core') {
$text = t('Your version of Drupal has been revoked and is no longer available for download. Upgrading is strongly recommended!', [], ['langcode' => $langcode]);
}
@@ -587,7 +590,7 @@ function _update_message_text($msg_type, $msg_reason, $langcode = NULL) {
}
break;
- case UPDATE_NOT_SUPPORTED:
+ case UpdateManagerInterface::NOT_SUPPORTED:
if ($msg_type == 'core') {
$text = t('Your version of Drupal is no longer supported. Upgrading is strongly recommended!', [], ['langcode' => $langcode]);
}
@@ -596,7 +599,7 @@ function _update_message_text($msg_type, $msg_reason, $langcode = NULL) {
}
break;
- case UPDATE_NOT_CURRENT:
+ case UpdateManagerInterface::NOT_CURRENT:
if ($msg_type == 'core') {
$text = t('There are updates available for your version of Drupal. To ensure the proper functioning of your site, you should update as soon as possible.', [], ['langcode' => $langcode]);
}
@@ -605,10 +608,10 @@ function _update_message_text($msg_type, $msg_reason, $langcode = NULL) {
}
break;
- case UPDATE_UNKNOWN:
- case UPDATE_NOT_CHECKED:
- case UPDATE_NOT_FETCHED:
- case UPDATE_FETCH_PENDING:
+ case UpdateFetcherInterface::UNKNOWN:
+ case UpdateFetcherInterface::NOT_CHECKED:
+ case UpdateFetcherInterface::NOT_FETCHED:
+ case UpdateFetcherInterface::FETCH_PENDING:
if ($msg_type == 'core') {
$text = t('There was a problem checking <a href=":update-report">available updates</a> for Drupal.', [':update-report' => Url::fromRoute('update.status')->toString()], ['langcode' => $langcode]);
}
diff --git a/web/core/modules/update/update.report.inc b/web/core/modules/update/update.report.inc
index 8d9fef0c55..2c7a46b8e5 100644
--- a/web/core/modules/update/update.report.inc
+++ b/web/core/modules/update/update.report.inc
@@ -7,6 +7,8 @@
use Drupal\Core\Template\Attribute;
use Drupal\Core\Url;
+use Drupal\update\UpdateFetcherInterface;
+use Drupal\update\UpdateManagerInterface;
/**
* Prepares variables for project status report templates.
@@ -18,7 +20,7 @@
* - data: An array of data about each project's status.
*/
function template_preprocess_update_report(&$variables) {
- $data = $variables['data'];
+ $data = isset($variables['data']) && is_array($variables['data']) ? $variables['data'] : [];
$last = \Drupal::state()->get('update.last_check') ?: 0;
@@ -60,19 +62,21 @@ function template_preprocess_update_report(&$variables) {
// Add project status class attribute to the table row.
switch ($project['status']) {
- case UPDATE_CURRENT:
+ case UpdateManagerInterface::CURRENT:
$rows[$project['project_type']][$row_key]['#attributes'] = ['class' => ['color-success']];
break;
- case UPDATE_UNKNOWN:
- case UPDATE_FETCH_PENDING:
- case UPDATE_NOT_FETCHED:
- case UPDATE_NOT_SECURE:
- case UPDATE_REVOKED:
- case UPDATE_NOT_SUPPORTED:
+
+ case UpdateFetcherInterface::UNKNOWN:
+ case UpdateFetcherInterface::FETCH_PENDING:
+ case UpdateFetcherInterface::NOT_FETCHED:
+ case UpdateManagerInterface::NOT_SECURE:
+ case UpdateManagerInterface::REVOKED:
+ case UpdateManagerInterface::NOT_SUPPORTED:
$rows[$project['project_type']][$row_key]['#attributes'] = ['class' => ['color-error']];
break;
- case UPDATE_NOT_CHECKED:
- case UPDATE_NOT_CURRENT:
+
+ case UpdateFetcherInterface::NOT_CHECKED:
+ case UpdateManagerInterface::NOT_CURRENT:
default:
$rows[$project['project_type']][$row_key]['#attributes'] = ['class' => ['color-warning']];
break;
@@ -157,7 +161,7 @@ function template_preprocess_update_project_status(&$variables) {
$security_class = [];
$version_class = [];
if (isset($project['recommended'])) {
- if ($project['status'] != UPDATE_CURRENT || $project['existing_version'] !== $project['recommended']) {
+ if ($project['status'] != UpdateManagerInterface::CURRENT || $project['existing_version'] !== $project['recommended']) {
// First, figure out what to recommend.
// If there's only 1 security update and it has the same version we're
@@ -216,7 +220,7 @@ function template_preprocess_update_project_status(&$variables) {
];
}
if ($project['install_type'] == 'dev'
- && $project['status'] != UPDATE_CURRENT
+ && $project['status'] != UpdateManagerInterface::CURRENT
&& isset($project['dev_version'])
&& $project['recommended'] !== $project['dev_version']) {
$versions_inner[] = [
@@ -269,19 +273,23 @@ function template_preprocess_update_project_status(&$variables) {
// Set the project status details.
$status_label = NULL;
switch ($project['status']) {
- case UPDATE_NOT_SECURE:
+ case UpdateManagerInterface::NOT_SECURE:
$status_label = t('Security update required!');
break;
- case UPDATE_REVOKED:
+
+ case UpdateManagerInterface::REVOKED:
$status_label = t('Revoked!');
break;
- case UPDATE_NOT_SUPPORTED:
+
+ case UpdateManagerInterface::NOT_SUPPORTED:
$status_label = t('Not supported!');
break;
- case UPDATE_NOT_CURRENT:
+
+ case UpdateManagerInterface::NOT_CURRENT:
$status_label = t('Update available');
break;
- case UPDATE_CURRENT:
+
+ case UpdateManagerInterface::CURRENT:
$status_label = t('Up to date');
break;
}
@@ -290,24 +298,27 @@ function template_preprocess_update_project_status(&$variables) {
$variables['status']['reason'] = (isset($project['reason'])) ? $project['reason'] : NULL;
switch ($project['status']) {
- case UPDATE_CURRENT:
+ case UpdateManagerInterface::CURRENT:
$uri = 'core/misc/icons/73b355/check.svg';
$text = t('Ok');
break;
- case UPDATE_UNKNOWN:
- case UPDATE_FETCH_PENDING:
- case UPDATE_NOT_FETCHED:
+
+ case UpdateFetcherInterface::UNKNOWN:
+ case UpdateFetcherInterface::FETCH_PENDING:
+ case UpdateFetcherInterface::NOT_FETCHED:
$uri = 'core/misc/icons/e29700/warning.svg';
$text = t('Warning');
break;
- case UPDATE_NOT_SECURE:
- case UPDATE_REVOKED:
- case UPDATE_NOT_SUPPORTED:
+
+ case UpdateManagerInterface::NOT_SECURE:
+ case UpdateManagerInterface::REVOKED:
+ case UpdateManagerInterface::NOT_SUPPORTED:
$uri = 'core/misc/icons/e32700/error.svg';
$text = t('Error');
break;
- case UPDATE_NOT_CHECKED:
- case UPDATE_NOT_CURRENT:
+
+ case UpdateFetcherInterface::NOT_CHECKED:
+ case UpdateManagerInterface::NOT_CURRENT:
default:
$uri = 'core/misc/icons/e29700/warning.svg';
$text = t('Warning');
diff --git a/web/core/modules/user/src/AccountForm.php b/web/core/modules/user/src/AccountForm.php
index 4ac72110b5..8e32dad8b1 100644
--- a/web/core/modules/user/src/AccountForm.php
+++ b/web/core/modules/user/src/AccountForm.php
@@ -252,7 +252,7 @@ public function form(array $form, FormStateInterface $form_state) {
// Only show the account setting for Administration pages language to users
// if one of the detection and selection methods uses it.
$show_admin_language = FALSE;
- if ($account->hasPermission('access administration pages') && $this->languageManager instanceof ConfigurableLanguageManagerInterface) {
+ if (($account->hasPermission('access administration pages') || $account->hasPermission('view the administration theme')) && $this->languageManager instanceof ConfigurableLanguageManagerInterface) {
$negotiator = $this->languageManager->getNegotiator();
$show_admin_language = $negotiator && $negotiator->isNegotiationMethodEnabled(LanguageNegotiationUserAdmin::METHOD_ID);
}
@@ -275,6 +275,32 @@ public function form(array $form, FormStateInterface $form_state) {
// or remove this item.
$form['#entity_builders']['sync_user_langcode'] = '::syncUserLangcode';
+ $system_date_config = \Drupal::config('system.date');
+ $form['timezone'] = [
+ '#type' => 'details',
+ '#title' => t('Locale settings'),
+ '#open' => TRUE,
+ '#weight' => 6,
+ '#access' => $system_date_config->get('timezone.user.configurable'),
+ ];
+ if ($self_register && $system_date_config->get('timezone.user.default') != UserInterface::TIMEZONE_SELECT) {
+ $form['timezone']['#access'] = FALSE;
+ }
+ $form['timezone']['timezone'] = [
+ '#type' => 'select',
+ '#title' => t('Time zone'),
+ '#default_value' => $account->getTimezone() ?: $system_date_config->get('timezone.default'),
+ '#options' => system_time_zones($account->id() != $user->id(), TRUE),
+ '#description' => t('Select the desired local time and time zone. Dates and times throughout this site will be displayed using this time zone.'),
+ ];
+
+ // If not set or selected yet, detect timezone for the current user only.
+ $user_input = $form_state->getUserInput();
+ if (!$account->getTimezone() && $account->id() == $user->id() && empty($user_input['timezone'])) {
+ $form['timezone']['#attached']['library'][] = 'core/drupal.timezone';
+ $form['timezone']['timezone']['#attributes'] = ['class' => ['timezone-detect']];
+ }
+
return parent::form($form, $form_state, $account);
}
diff --git a/web/core/modules/user/src/Plugin/LanguageNegotiation/LanguageNegotiationUserAdmin.php b/web/core/modules/user/src/Plugin/LanguageNegotiation/LanguageNegotiationUserAdmin.php
index 56186053d7..4a829906ae 100644
--- a/web/core/modules/user/src/Plugin/LanguageNegotiation/LanguageNegotiationUserAdmin.php
+++ b/web/core/modules/user/src/Plugin/LanguageNegotiation/LanguageNegotiationUserAdmin.php
@@ -101,7 +101,7 @@ public function getLangcode(Request $request = NULL) {
$langcode = NULL;
// User preference (only for administrators).
- if ($this->currentUser->hasPermission('access administration pages') && ($preferred_admin_langcode = $this->currentUser->getPreferredAdminLangcode(FALSE)) && $this->isAdminPath($request)) {
+ if (($this->currentUser->hasPermission('access administration pages') || $this->currentUser->hasPermission('view the administration theme')) && ($preferred_admin_langcode = $this->currentUser->getPreferredAdminLangcode(FALSE)) && $this->isAdminPath($request)) {
$langcode = $preferred_admin_langcode;
}
diff --git a/web/core/modules/user/src/Theme/AdminNegotiator.php b/web/core/modules/user/src/Theme/AdminNegotiator.php
index d97485242e..033418971a 100644
--- a/web/core/modules/user/src/Theme/AdminNegotiator.php
+++ b/web/core/modules/user/src/Theme/AdminNegotiator.php
@@ -79,7 +79,7 @@ public function applies(RouteMatchInterface $route_match) {
* {@inheritdoc}
*/
public function determineActiveTheme(RouteMatchInterface $route_match) {
- return $this->configFactory->get('system.theme')->get('admin');
+ return $this->configFactory->get('system.theme')->get('admin') ?: NULL;
}
}
diff --git a/web/core/modules/user/tests/src/Functional/AccessRoleUITest.php b/web/core/modules/user/tests/src/Functional/AccessRoleUITest.php
index 64615562b0..64850d3aa4 100644
--- a/web/core/modules/user/tests/src/Functional/AccessRoleUITest.php
+++ b/web/core/modules/user/tests/src/Functional/AccessRoleUITest.php
@@ -49,7 +49,7 @@ public function testAccessRoleUI() {
$entity_type_manager->getStorage('user_role')->create(['id' => 'custom_role', 'label' => 'Custom role'])->save();
$access_url = "admin/structure/views/nojs/display/test_access_role/default/access_options";
$this->drupalPostForm($access_url, ['access_options[role][custom_role]' => 1], t('Apply'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->drupalPostForm(NULL, [], t('Save'));
$view = $entity_type_manager->getStorage('view')->load('test_access_role');
diff --git a/web/core/modules/user/tests/src/Functional/Rest/UserResourceTestBase.php b/web/core/modules/user/tests/src/Functional/Rest/UserResourceTestBase.php
index 21cbc0bfe4..2b82b2b249 100644
--- a/web/core/modules/user/tests/src/Functional/Rest/UserResourceTestBase.php
+++ b/web/core/modules/user/tests/src/Functional/Rest/UserResourceTestBase.php
@@ -57,6 +57,7 @@ protected function setUpAuthorization($method) {
case 'GET':
$this->grantPermissionsToTestedRole(['access user profiles']);
break;
+
case 'POST':
case 'PATCH':
case 'DELETE':
@@ -308,10 +309,13 @@ protected function getExpectedUnauthorizedAccessMessage($method) {
switch ($method) {
case 'GET':
return "The 'access user profiles' permission is required and the user must be active.";
+
case 'PATCH':
return "Users can only update their own account, unless they have the 'administer users' permission.";
+
case 'DELETE':
return "The 'cancel account' permission is required.";
+
default:
return parent::getExpectedUnauthorizedAccessMessage($method);
}
diff --git a/web/core/modules/user/tests/src/Functional/UserAccountLinksTest.php b/web/core/modules/user/tests/src/Functional/UserAccountLinksTest.php
index 691695a090..25b4df1ef6 100644
--- a/web/core/modules/user/tests/src/Functional/UserAccountLinksTest.php
+++ b/web/core/modules/user/tests/src/Functional/UserAccountLinksTest.php
@@ -51,14 +51,14 @@ public function testSecondaryMenu() {
':href' => 'user',
':text' => 'My account',
]);
- $this->assertEqual(count($link), 1, 'My account link is in secondary menu.');
+ $this->assertCount(1, $link, 'My account link is in secondary menu.');
$link = $this->xpath('//ul[@class=:menu_class]/li/a[contains(@href, :href) and text()=:text]', [
':menu_class' => 'menu',
':href' => 'user/logout',
':text' => 'Log out',
]);
- $this->assertEqual(count($link), 1, 'Log out link is in secondary menu.');
+ $this->assertCount(1, $link, 'Log out link is in secondary menu.');
// Log out and get the homepage.
$this->drupalLogout();
@@ -70,7 +70,7 @@ public function testSecondaryMenu() {
':href' => 'user/login',
':text' => 'Log in',
]);
- $this->assertEqual(count($link), 1, 'Log in link is in secondary menu.');
+ $this->assertCount(1, $link, 'Log in link is in secondary menu.');
}
/**
@@ -87,7 +87,7 @@ public function testDisabledAccountLink() {
':href' => 'user',
':text' => 'My account',
]);
- $this->assertEqual(count($link), 1, 'My account link is in the secondary menu.');
+ $this->assertCount(1, $link, 'My account link is in the secondary menu.');
// Verify that the 'My account' link is enabled. Do not assume the value of
// auto-increment is 1. Use XPath to obtain input element id and name using
@@ -109,7 +109,7 @@ public function testDisabledAccountLink() {
':href' => 'user',
':text' => 'My account',
]);
- $this->assertEqual(count($link), 0, 'My account link is not in the secondary menu.');
+ $this->assertCount(0, $link, 'My account link is not in the secondary menu.');
}
/**
@@ -120,16 +120,16 @@ public function testAccountPageTitles() {
$title_suffix = ' | Drupal';
$this->drupalGet('user');
- $this->assertTitle('Log in' . $title_suffix, "Page title of /user is 'Log in'");
+ $this->assertTitle('Log in' . $title_suffix);
$this->drupalGet('user/login');
- $this->assertTitle('Log in' . $title_suffix, "Page title of /user/login is 'Log in'");
+ $this->assertTitle('Log in' . $title_suffix);
$this->drupalGet('user/register');
- $this->assertTitle('Create new account' . $title_suffix, "Page title of /user/register is 'Create new account' for anonymous users.");
+ $this->assertTitle('Create new account' . $title_suffix);
$this->drupalGet('user/password');
- $this->assertTitle('Reset your password' . $title_suffix, "Page title of /user/register is 'Reset your password' for anonymous users.");
+ $this->assertTitle('Reset your password' . $title_suffix);
// Check the page title for registered users is "My Account" in menus.
$this->drupalLogin($this->drupalCreateUser());
diff --git a/web/core/modules/user/tests/src/Functional/UserAdminLanguageTest.php b/web/core/modules/user/tests/src/Functional/UserAdminLanguageTest.php
index 4d5ef5b602..a99017730c 100644
--- a/web/core/modules/user/tests/src/Functional/UserAdminLanguageTest.php
+++ b/web/core/modules/user/tests/src/Functional/UserAdminLanguageTest.php
@@ -81,8 +81,9 @@ public function testUserAdminLanguageConfigurationAvailableWithAdminLanguageNego
/**
* Tests that the admin language is configurable only for administrators.
*
- * If a user has the permission "access administration pages", they should
- * be able to see the setting to pick the language they want those pages in.
+ * If a user has the permission "access administration pages" or
+ * "view the administration theme", they should be able to see the setting to
+ * pick the language they want those pages in.
*
* If a user does not have that permission, it would confusing for them to
* have a setting for pages they cannot access, so they should not be able to
@@ -98,6 +99,13 @@ public function testUserAdminLanguageConfigurationAvailableIfAdminLanguageNegoti
// Ensure administration pages language setting is visible for admin.
$this->assertFieldByXPath($this->constructFieldXpath('id', 'edit-preferred-admin-langcode'), NULL, 'Administration pages language selector available for admins.');
+ // Ensure administration pages language setting is visible for editors.
+ $editor = $this->drupalCreateUser(['view the administration theme']);
+ $this->drupalLogin($editor);
+ $path = 'user/' . $editor->id() . '/edit';
+ $this->drupalGet($path);
+ $this->assertFieldByXPath($this->constructFieldXpath('id', 'edit-preferred-admin-langcode'), NULL, 'Administration pages language selector available for editors.');
+
// Ensure administration pages language setting is hidden for non-admins.
$this->drupalLogin($this->regularUser);
$path = 'user/' . $this->regularUser->id() . '/edit';
diff --git a/web/core/modules/user/tests/src/Functional/UserAdminListingTest.php b/web/core/modules/user/tests/src/Functional/UserAdminListingTest.php
index c34e0aae8c..aac4757e49 100644
--- a/web/core/modules/user/tests/src/Functional/UserAdminListingTest.php
+++ b/web/core/modules/user/tests/src/Functional/UserAdminListingTest.php
@@ -22,8 +22,9 @@ class UserAdminListingTest extends BrowserTestBase {
* Tests the listing.
*/
public function testUserListing() {
+ // Ensure the anonymous user cannot access the admin listing.
$this->drupalGet('admin/people');
- $this->assertResponse(403, 'Anonymous user does not have access to the user admin listing.');
+ $this->assertSession()->statusCodeEquals(403);
// Create a bunch of users.
$accounts = [];
@@ -62,8 +63,9 @@ public function testUserListing() {
$this->drupalLogin($admin_user);
+ // Ensure the admin user can access the admin listing.
$this->drupalGet('admin/people');
- $this->assertResponse(200, 'The admin user has access to the user admin listing.');
+ $this->assertSession()->statusCodeEquals(200);
$result = $this->xpath('//table[contains(@class, "responsive-enabled")]/tbody/tr');
$result_accounts = [];
diff --git a/web/core/modules/user/tests/src/Functional/UserAdminTest.php b/web/core/modules/user/tests/src/Functional/UserAdminTest.php
index f0a59ed7be..c67dd6b162 100644
--- a/web/core/modules/user/tests/src/Functional/UserAdminTest.php
+++ b/web/core/modules/user/tests/src/Functional/UserAdminTest.php
@@ -76,12 +76,12 @@ public function testUserAdmin() {
// Filter the users by name/email.
$this->drupalGet('admin/people', ['query' => ['user' => $user_a->getAccountName()]]);
$result = $this->xpath('//table/tbody/tr');
- $this->assertEqual(1, count($result), 'Filter by username returned the right amount.');
+ $this->assertCount(1, $result, 'Filter by username returned the right amount.');
$this->assertEqual($user_a->getAccountName(), $result[0]->find('xpath', '/td[2]/a')->getText(), 'Filter by username returned the right user.');
$this->drupalGet('admin/people', ['query' => ['user' => $user_a->getEmail()]]);
$result = $this->xpath('//table/tbody/tr');
- $this->assertEqual(1, count($result), 'Filter by username returned the right amount.');
+ $this->assertCount(1, $result, 'Filter by username returned the right amount.');
$this->assertEqual($user_a->getAccountName(), $result[0]->find('xpath', '/td[2]/a')->getText(), 'Filter by username returned the right user.');
// Filter the users by permission 'administer taxonomy'.
diff --git a/web/core/modules/user/tests/src/Functional/UserBlocksTest.php b/web/core/modules/user/tests/src/Functional/UserBlocksTest.php
index 32d9197ac7..450f53e879 100644
--- a/web/core/modules/user/tests/src/Functional/UserBlocksTest.php
+++ b/web/core/modules/user/tests/src/Functional/UserBlocksTest.php
@@ -88,7 +88,7 @@ public function testUserLoginBlock() {
$this->assertEqual('MISS', $this->drupalGetHeader(DynamicPageCacheSubscriber::HEADER));
$this->drupalPostForm(NULL, $edit, t('Log in'));
$this->assertNoText(t('User login'), 'Logged in.');
- $this->assertPattern('!<title.*?' . t('Compose tips') . '.*?</title>!', 'Still on the same page after login for allowed page');
+ $this->assertPattern('!<title.*?Compose tips.*?</title>!', 'Still on the same page after login for allowed page');
// Log out again and repeat with a non-403 page including query arguments.
$this->drupalLogout();
@@ -96,8 +96,8 @@ public function testUserLoginBlock() {
$this->assertEqual('HIT', $this->drupalGetHeader(DynamicPageCacheSubscriber::HEADER));
$this->drupalPostForm(NULL, $edit, t('Log in'));
$this->assertNoText(t('User login'), 'Logged in.');
- $this->assertPattern('!<title.*?' . t('Compose tips') . '.*?</title>!', 'Still on the same page after login for allowed page');
- $this->assertTrue(strpos($this->getUrl(), '/filter/tips?foo=bar') !== FALSE, 'Correct query arguments are displayed after login');
+ $this->assertPattern('!<title.*?Compose tips.*?</title>!', 'Still on the same page after login for allowed page');
+ $this->assertStringContainsString('/filter/tips?foo=bar', $this->getUrl(), 'Correct query arguments are displayed after login');
// Repeat with different query arguments.
$this->drupalLogout();
@@ -105,8 +105,8 @@ public function testUserLoginBlock() {
$this->assertEqual('HIT', $this->drupalGetHeader(DynamicPageCacheSubscriber::HEADER));
$this->drupalPostForm(NULL, $edit, t('Log in'));
$this->assertNoText(t('User login'), 'Logged in.');
- $this->assertPattern('!<title.*?' . t('Compose tips') . '.*?</title>!', 'Still on the same page after login for allowed page');
- $this->assertTrue(strpos($this->getUrl(), '/filter/tips?foo=baz') !== FALSE, 'Correct query arguments are displayed after login');
+ $this->assertPattern('!<title.*?Compose tips.*?</title>!', 'Still on the same page after login for allowed page');
+ $this->assertStringContainsString('/filter/tips?foo=baz', $this->getUrl(), 'Correct query arguments are displayed after login');
// Check that the user login block is not vulnerable to information
// disclosure to third party sites.
diff --git a/web/core/modules/user/tests/src/Functional/UserCancelTest.php b/web/core/modules/user/tests/src/Functional/UserCancelTest.php
index 1d8e40c752..b800a5c2e9 100644
--- a/web/core/modules/user/tests/src/Functional/UserCancelTest.php
+++ b/web/core/modules/user/tests/src/Functional/UserCancelTest.php
@@ -61,7 +61,7 @@ public function testUserCancelWithoutPermission() {
// Attempt bogus account cancellation request confirmation.
$timestamp = $account->getLastLoginTime();
$this->drupalGet("user/" . $account->id() . "/cancel/confirm/$timestamp/" . user_pass_rehash($account, $timestamp));
- $this->assertResponse(403, 'Bogus cancelling request rejected.');
+ $this->assertSession()->statusCodeEquals(403);
$user_storage->resetCache([$account->id()]);
$account = $user_storage->load($account->id());
$this->assertTrue($account->isActive(), 'User account was not canceled.');
@@ -472,7 +472,7 @@ public function testUserDelete() {
$this->assertNull($node_storage->load($node->id()), 'Node of the user has been deleted.');
$this->assertNull(node_revision_load($revision), 'Node revision of the user has been deleted.');
$node_storage->resetCache([$revision_node->id()]);
- $this->assertInstanceOf(Node::class, $node_storage->load($revision_node->id()), "Current revision of the user's node was not deleted.");
+ $this->assertInstanceOf(Node::class, $node_storage->load($revision_node->id()));
\Drupal::entityTypeManager()->getStorage('comment')->resetCache([$comment->id()]);
$this->assertNull(Comment::load($comment->id()), 'Comment of the user has been deleted.');
diff --git a/web/core/modules/user/tests/src/Functional/UserCreateTest.php b/web/core/modules/user/tests/src/Functional/UserCreateTest.php
index fceb1af1d6..2131b867ef 100644
--- a/web/core/modules/user/tests/src/Functional/UserCreateTest.php
+++ b/web/core/modules/user/tests/src/Functional/UserCreateTest.php
@@ -109,11 +109,11 @@ public function testUserAdd() {
if ($notify) {
$this->assertText(t('A welcome message with further instructions has been emailed to the new user @name.', ['@name' => $edit['name']]), 'User created');
- $this->assertEqual(count($this->drupalGetMails()), 1, 'Notification email sent');
+ $this->assertCount(1, $this->drupalGetMails(), 'Notification email sent');
}
else {
$this->assertText(t('Created a new user account for @name. No email has been sent.', ['@name' => $edit['name']]), 'User created');
- $this->assertEqual(count($this->drupalGetMails()), 0, 'Notification email not sent');
+ $this->assertCount(0, $this->drupalGetMails(), 'Notification email not sent');
}
$this->drupalGet('admin/people');
diff --git a/web/core/modules/user/tests/src/Functional/UserLanguageCreationTest.php b/web/core/modules/user/tests/src/Functional/UserLanguageCreationTest.php
index 85e39589db..d19ae76a2f 100644
--- a/web/core/modules/user/tests/src/Functional/UserLanguageCreationTest.php
+++ b/web/core/modules/user/tests/src/Functional/UserLanguageCreationTest.php
@@ -83,8 +83,8 @@ public function testLocalUserCreation() {
$this->assertEqual($user->getPreferredLangcode(), $langcode, 'New user has correct preferred language set.');
$this->assertEqual($user->language()->getId(), $langcode, 'New user has correct profile language set.');
- // Test if the admin can use the language selector and if the
- // correct language is was saved.
+ // Test that the admin can use the language selector and if the correct
+ // language is saved.
$user_edit = $langcode . '/user/' . $user->id() . '/edit';
$this->drupalLogin($admin_user);
diff --git a/web/core/modules/user/tests/src/Functional/UserPasswordResetTest.php b/web/core/modules/user/tests/src/Functional/UserPasswordResetTest.php
index f6033a8e1e..7828e328d5 100644
--- a/web/core/modules/user/tests/src/Functional/UserPasswordResetTest.php
+++ b/web/core/modules/user/tests/src/Functional/UserPasswordResetTest.php
@@ -6,7 +6,7 @@
use Drupal\Core\Database\Database;
use Drupal\Core\Test\AssertMailTrait;
use Drupal\Core\Url;
-use Drupal\Tests\system\Functional\Cache\PageCacheTagsTestBase;
+use Drupal\Tests\BrowserTestBase;
use Drupal\user\Entity\User;
/**
@@ -14,7 +14,7 @@
*
* @group user
*/
-class UserPasswordResetTest extends PageCacheTagsTestBase {
+class UserPasswordResetTest extends BrowserTestBase {
use AssertMailTrait {
getMails as drupalGetMails;
@@ -45,6 +45,10 @@ class UserPasswordResetTest extends PageCacheTagsTestBase {
protected function setUp() {
parent::setUp();
+ // Enable page caching.
+ $config = $this->config('system.performance');
+ $config->set('cache.page.max_age', 3600);
+ $config->save();
$this->drupalPlaceBlock('system_menu_block:account');
// Create a user.
@@ -73,7 +77,7 @@ public function testUserPasswordReset() {
// Verify that accessing the password reset form without having the session
// variables set results in an access denied message.
$this->drupalGet(Url::fromRoute('user.reset.form', ['uid' => $this->account->id()]));
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
// Try to reset the password for an invalid account.
$this->drupalGet('user/password');
@@ -101,12 +105,12 @@ public function testUserPasswordReset() {
// Check the one-time login page.
$this->assertText($this->account->getAccountName(), 'One-time login page contains the correct username.');
$this->assertText(t('This login can be used only once.'), 'Found warning about one-time login.');
- $this->assertTitle(t('Reset password | Drupal'), 'Page title is "Reset password".');
+ $this->assertTitle('Reset password | Drupal');
// Check successful login.
$this->drupalPostForm(NULL, NULL, t('Log in'));
$this->assertLink(t('Log out'));
- $this->assertTitle(t('@name | @site', ['@name' => $this->account->getAccountName(), '@site' => $this->config('system.site')->get('name')]), 'Logged in using password reset link.');
+ $this->assertTitle($this->account->getAccountName() . ' | Drupal');
// Change the forgotten password.
$password = user_password();
@@ -131,7 +135,7 @@ public function testUserPasswordReset() {
$edit = ['name' => $this->account->getEmail()];
$this->drupalPostForm(NULL, $edit, t('Submit'));
$this->assertValidPasswordReset($edit['name']);
- $this->assertTrue(count($this->drupalGetMails(['id' => 'user_password_reset'])) === $before + 1, 'Email sent when requesting password reset using email address.');
+ $this->assertCount($before + 1, $this->drupalGetMails(['id' => 'user_password_reset']), 'Email sent when requesting password reset using email address.');
// Visit the user edit page without pass-reset-token and make sure it does
// not cause an error.
@@ -155,7 +159,7 @@ public function testUserPasswordReset() {
$blocked_account = $this->drupalCreateUser()->block();
$blocked_account->save();
$this->drupalGet("user/reset/" . $blocked_account->id() . "/$timestamp/" . user_pass_rehash($blocked_account, $timestamp));
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
// Verify a blocked user can not request a new password.
$this->drupalGet('user/password');
@@ -164,7 +168,7 @@ public function testUserPasswordReset() {
$edit = ['name' => $blocked_account->getAccountName()];
$this->drupalPostForm(NULL, $edit, t('Submit'));
$this->assertRaw(t('%name is blocked or has not been activated yet.', ['%name' => $blocked_account->getAccountName()]), 'Notified user blocked accounts can not request a new password');
- $this->assertTrue(count($this->drupalGetMails(['id' => 'user_password_reset'])) === $before, 'No email was sent when requesting password reset for a blocked account');
+ $this->assertCount($before, $this->drupalGetMails(['id' => 'user_password_reset']), 'No email was sent when requesting password reset for a blocked account');
// Verify a password reset link is invalidated when the user's email address changes.
$this->drupalGet('user/password');
@@ -185,7 +189,7 @@ public function testUserPasswordReset() {
$reset_url = $this->getResetURL();
$this->drupalGet($reset_url . '/login');
$this->assertLink(t('Log out'));
- $this->assertTitle(t('@name | @site', ['@name' => $this->account->getAccountName(), '@site' => $this->config('system.site')->get('name')]), 'Logged in using password reset link.');
+ $this->assertTitle($this->account->getAccountName() . ' | Drupal');
// Ensure blocked and deleted accounts can't access the user.reset.login
// route.
@@ -194,11 +198,11 @@ public function testUserPasswordReset() {
$blocked_account = $this->drupalCreateUser()->block();
$blocked_account->save();
$this->drupalGet("user/reset/" . $blocked_account->id() . "/$timestamp/" . user_pass_rehash($blocked_account, $timestamp) . '/login');
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
$blocked_account->delete();
$this->drupalGet("user/reset/" . $blocked_account->id() . "/$timestamp/" . user_pass_rehash($blocked_account, $timestamp) . '/login');
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
}
/**
@@ -259,9 +263,9 @@ public function testUserPasswordResetLoggedIn() {
// user.reset.form routes.
$timestamp = REQUEST_TIME - 1;
$this->drupalGet("user/reset/" . $this->account->id() . "/$timestamp/" . user_pass_rehash($this->account, $timestamp) . '/login');
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
$this->drupalGet("user/reset/" . $this->account->id());
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
}
/**
@@ -355,7 +359,7 @@ public function testUserResetPasswordUserFloodControlIsCleared() {
$reset_url = $this->getResetURL();
$this->drupalGet($reset_url . '/login');
$this->assertLink(t('Log out'));
- $this->assertTitle(t('@name | @site', ['@name' => $this->account->getAccountName(), '@site' => $this->config('system.site')->get('name')]), 'Logged in using password reset link.');
+ $this->assertTitle($this->account->getAccountName() . ' | Drupal');
$this->drupalLogout();
// The next request should *not* trigger flood control, since a successful
@@ -383,7 +387,7 @@ public function assertValidPasswordReset($name) {
public function assertNoValidPasswordReset($name) {
// Make sure the error text is displayed and no email sent.
$this->assertText(t('@name is not recognized as a username or an email address.', ['@name' => $name]), 'Validation error message shown when trying to request password for invalid account.');
- $this->assertEqual(count($this->drupalGetMails(['id' => 'user_password_reset'])), 0, 'No e-mail was sent when requesting a password for an invalid account.');
+ $this->assertCount(0, $this->drupalGetMails(['id' => 'user_password_reset']), 'No e-mail was sent when requesting a password for an invalid account.');
}
/**
diff --git a/web/core/modules/user/tests/src/Functional/UserPictureTest.php b/web/core/modules/user/tests/src/Functional/UserPictureTest.php
index 9aa5e45ae4..7c8c8975ff 100644
--- a/web/core/modules/user/tests/src/Functional/UserPictureTest.php
+++ b/web/core/modules/user/tests/src/Functional/UserPictureTest.php
@@ -94,7 +94,7 @@ public function testCreateDeletePicture() {
$this->assertNull(File::load($file->id()), 'File was removed from the database.');
// Clear out PHP's file stat cache so we see the current value.
clearstatcache(TRUE, $file->getFileUri());
- $this->assertFalse(is_file($file->getFileUri()), 'File was removed from the file system.');
+ $this->assertFileNotExists($file->getFileUri());
}
/**
@@ -120,7 +120,7 @@ public function testPictureOnNodeComment() {
// Verify that the image is displayed on the node page.
$this->drupalGet('node/' . $node->id());
$elements = $this->cssSelect('.node__meta .field--name-user-picture img[alt="' . $alt_text . '"][src="' . $image_url . '"]');
- $this->assertEqual(count($elements), 1, 'User picture with alt text found on node page.');
+ $this->assertCount(1, $elements, 'User picture with alt text found on node page.');
// Enable user pictures on comments, instead of nodes.
$this->config('system.theme.global')
@@ -133,7 +133,7 @@ public function testPictureOnNodeComment() {
];
$this->drupalPostForm('comment/reply/node/' . $node->id() . '/comment', $edit, t('Save'));
$elements = $this->cssSelect('.comment__meta .field--name-user-picture img[alt="' . $alt_text . '"][src="' . $image_url . '"]');
- $this->assertEqual(count($elements), 1, 'User picture with alt text found on the comment.');
+ $this->assertCount(1, $elements, 'User picture with alt text found on the comment.');
// Disable user pictures on comments and nodes.
$this->config('system.theme.global')
diff --git a/web/core/modules/user/tests/src/Functional/UserRegistrationTest.php b/web/core/modules/user/tests/src/Functional/UserRegistrationTest.php
index 760836b307..e28b40d2fd 100644
--- a/web/core/modules/user/tests/src/Functional/UserRegistrationTest.php
+++ b/web/core/modules/user/tests/src/Functional/UserRegistrationTest.php
@@ -34,10 +34,11 @@ public function testRegistrationWithEmailVerification() {
// Require email verification.
$config->set('verify_mail', TRUE)->save();
- // Set registration to administrator only.
+ // Set registration to administrator only and ensure the user registration
+ // page is inaccessible.
$config->set('register', UserInterface::REGISTER_ADMINISTRATORS_ONLY)->save();
$this->drupalGet('user/register');
- $this->assertResponse(403, 'Registration page is inaccessible when only administrators can create accounts.');
+ $this->assertSession()->statusCodeEquals(403);
// Allow registration by site visitors without administrator approval.
$config->set('register', UserInterface::REGISTER_VISITORS)->save();
@@ -54,7 +55,7 @@ public function testRegistrationWithEmailVerification() {
$this->assertTrue($new_user->isActive(), 'New account is active after registration.');
$resetURL = user_pass_reset_url($new_user);
$this->drupalGet($resetURL);
- $this->assertTitle(t('Set password | Drupal'), 'Page title is "Set password".');
+ $this->assertTitle('Set password | Drupal');
// Allow registration by site visitors, but require administrator approval.
$config->set('register', UserInterface::REGISTER_VISITORS_ADMINISTRATIVE_APPROVAL)->save();
@@ -211,7 +212,7 @@ public function testUuidFormState() {
// Create one account.
$this->drupalPostForm('user/register', $edit, t('Create new account'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$user_storage = \Drupal::entityTypeManager()->getStorage('user');
@@ -224,7 +225,7 @@ public function testUuidFormState() {
$edit['pass[pass2]'] = $edit['pass[pass1]'] = $this->randomMachineName();
$this->drupalPostForm('user/register', $edit, t('Create new account'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertNotEmpty($user_storage->loadByProperties(['name' => $edit['name']]));
}
diff --git a/web/core/modules/user/tests/src/Functional/UserRoleAdminTest.php b/web/core/modules/user/tests/src/Functional/UserRoleAdminTest.php
index 1596484b81..1ac9f214b8 100644
--- a/web/core/modules/user/tests/src/Functional/UserRoleAdminTest.php
+++ b/web/core/modules/user/tests/src/Functional/UserRoleAdminTest.php
@@ -53,7 +53,7 @@ public function testRoleAdministration() {
':classes' => 'tabs primary',
':text' => 'Roles',
]);
- $this->assertEqual(count($tabs), 1, 'Found roles tab');
+ $this->assertCount(1, $tabs, 'Found roles tab');
// Test adding a role. (In doing so, we use a role name that happens to
// correspond to an integer, to test that the role administration pages
@@ -63,7 +63,7 @@ public function testRoleAdministration() {
$this->drupalPostForm('admin/people/roles/add', $edit, t('Save'));
$this->assertRaw(t('Role %label has been added.', ['%label' => 123]));
$role = Role::load($role_name);
- $this->assertTrue(is_object($role), 'The role was successfully retrieved from the database.');
+ $this->assertIsObject($role);
// Check that the role was created in site default language.
$this->assertEqual($role->language()->getId(), $default_langcode);
@@ -93,10 +93,10 @@ public function testRoleAdministration() {
// Make sure that the system-defined roles can be edited via the user
// interface.
$this->drupalGet('admin/people/roles/manage/' . RoleInterface::ANONYMOUS_ID);
- $this->assertResponse(200, 'Access granted when trying to edit the built-in anonymous role.');
+ $this->assertSession()->statusCodeEquals(200);
$this->assertNoText(t('Delete role'), 'Delete button for the anonymous role is not present.');
$this->drupalGet('admin/people/roles/manage/' . RoleInterface::AUTHENTICATED_ID);
- $this->assertResponse(200, 'Access granted when trying to edit the built-in authenticated role.');
+ $this->assertSession()->statusCodeEquals(200);
$this->assertNoText(t('Delete role'), 'Delete button for the authenticated role is not present.');
}
diff --git a/web/core/modules/user/tests/src/Functional/UserRolesAssignmentTest.php b/web/core/modules/user/tests/src/Functional/UserRolesAssignmentTest.php
index 4a417494fc..bbda4c7914 100644
--- a/web/core/modules/user/tests/src/Functional/UserRolesAssignmentTest.php
+++ b/web/core/modules/user/tests/src/Functional/UserRolesAssignmentTest.php
@@ -89,10 +89,10 @@ private function userLoadAndCheckRoleAssigned($account, $rid, $is_assigned = TRU
$user_storage->resetCache([$account->id()]);
$account = $user_storage->load($account->id());
if ($is_assigned) {
- $this->assertFalse(array_search($rid, $account->getRoles()) === FALSE, 'The role is present in the user object.');
+ $this->assertContains($rid, $account->getRoles());
}
else {
- $this->assertTrue(array_search($rid, $account->getRoles()) === FALSE, 'The role is not present in the user object.');
+ $this->assertNotContains($rid, $account->getRoles());
}
}
diff --git a/web/core/modules/user/tests/src/Functional/UserSearchTest.php b/web/core/modules/user/tests/src/Functional/UserSearchTest.php
index 49fca33902..1c5aa6ae1f 100644
--- a/web/core/modules/user/tests/src/Functional/UserSearchTest.php
+++ b/web/core/modules/user/tests/src/Functional/UserSearchTest.php
@@ -108,17 +108,19 @@ public function testUserSearch() {
$this->drupalPostForm('search/user', $edit, t('Search'));
$this->assertText(t('Your search yielded no results.'), 'Blocked users are hidden from the user search results.');
- // Create a user without search permission, and one without user page view
- // permission. Verify that neither one can access the user search page.
+ // Ensure that a user without access to user profiles cannot access the
+ // user search page.
$user3 = $this->drupalCreateUser(['search content']);
$this->drupalLogin($user3);
$this->drupalGet('search/user');
- $this->assertResponse('403', 'User without user profile access cannot search');
+ $this->assertSession()->statusCodeEquals(403);
+ // Ensure that a user without search permission cannot access the user
+ // search page.
$user4 = $this->drupalCreateUser(['access user profiles']);
$this->drupalLogin($user4);
$this->drupalGet('search/user');
- $this->assertResponse('403', 'User without search permission cannot search');
+ $this->assertSession()->statusCodeEquals(403);
$this->drupalLogout();
}
diff --git a/web/core/modules/user/tests/src/Functional/UserTokenReplaceTest.php b/web/core/modules/user/tests/src/Functional/UserTokenReplaceTest.php
index 1bc36a6151..6d802f1c01 100644
--- a/web/core/modules/user/tests/src/Functional/UserTokenReplaceTest.php
+++ b/web/core/modules/user/tests/src/Functional/UserTokenReplaceTest.php
@@ -106,7 +106,7 @@ public function testUserTokenReplacement() {
$metadata_tests['[current-user:display-name]'] = $base_bubbleable_metadata->merge(BubbleableMetadata::createFromObject($global_account)->addCacheContexts(['user']));
// Test to make sure that we generated something for each token.
- $this->assertFalse(in_array(0, array_map('strlen', $tests)), 'No empty tokens generated.');
+ $this->assertNotContains(0, array_map('strlen', $tests), 'No empty tokens generated.');
foreach ($tests as $input => $expected) {
$bubbleable_metadata = new BubbleableMetadata();
@@ -144,7 +144,7 @@ public function testUserTokenReplacement() {
$link = Url::fromRoute('user.page', [], ['absolute' => TRUE])->toString();
foreach ($tests as $input => $expected) {
$output = $token_service->replace($input, ['user' => $account], ['langcode' => $language_interface->getId(), 'callback' => 'user_mail_tokens', 'clear' => TRUE]);
- $this->assertTrue(strpos($output, $link) === 0, 'Generated URL is in interface language.');
+ $this->assertStringStartsWith($link, $output, 'Generated URL is in interface language.');
}
// Generate tokens with the user's preferred language.
@@ -153,7 +153,7 @@ public function testUserTokenReplacement() {
$link = Url::fromRoute('user.page', [], ['language' => \Drupal::languageManager()->getLanguage($account->getPreferredLangcode()), 'absolute' => TRUE])->toString();
foreach ($tests as $input => $expected) {
$output = $token_service->replace($input, ['user' => $account], ['callback' => 'user_mail_tokens', 'clear' => TRUE]);
- $this->assertTrue(strpos($output, $link) === 0, "Generated URL is in the user's preferred language.");
+ $this->assertStringStartsWith($link, $output, "Generated URL is in the user's preferred language.");
}
// Generate tokens with one specific language.
@@ -161,7 +161,7 @@ public function testUserTokenReplacement() {
foreach ($tests as $input => $expected) {
foreach ([$user1, $user2] as $account) {
$output = $token_service->replace($input, ['user' => $account], ['langcode' => 'de', 'callback' => 'user_mail_tokens', 'clear' => TRUE]);
- $this->assertTrue(strpos($output, $link) === 0, "Generated URL in the requested language.");
+ $this->assertStringStartsWith($link, $output, "Generated URL in the requested language.");
}
}
diff --git a/web/core/modules/user/tests/src/Functional/UserTranslationUITest.php b/web/core/modules/user/tests/src/Functional/UserTranslationUITest.php
index 811a2f1744..c2a760368b 100644
--- a/web/core/modules/user/tests/src/Functional/UserTranslationUITest.php
+++ b/web/core/modules/user/tests/src/Functional/UserTranslationUITest.php
@@ -23,7 +23,12 @@ class UserTranslationUITest extends ContentTranslationUITestBase {
*
* @var array
*/
- public static $modules = ['language', 'content_translation', 'user', 'views'];
+ public static $modules = [
+ 'language',
+ 'content_translation',
+ 'user',
+ 'views',
+ ];
/**
* {@inheritdoc}
diff --git a/web/core/modules/user/tests/src/Functional/Views/AccessRoleTest.php b/web/core/modules/user/tests/src/Functional/Views/AccessRoleTest.php
index 4093fa4558..8be2ddafd3 100644
--- a/web/core/modules/user/tests/src/Functional/Views/AccessRoleTest.php
+++ b/web/core/modules/user/tests/src/Functional/Views/AccessRoleTest.php
@@ -52,7 +52,7 @@ public function testAccessRole() {
$executable->setDisplay('page_1');
$access_plugin = $executable->display_handler->getPlugin('access');
- $this->assertTrue($access_plugin instanceof Role, 'Make sure the right class got instantiated.');
+ $this->assertInstanceOf(Role::class, $access_plugin);
// Test the access() method on the access plugin.
$this->assertSame(FALSE, $executable->display_handler->access($this->webUser));
@@ -60,12 +60,12 @@ public function testAccessRole() {
$this->drupalLogin($this->webUser);
$this->drupalGet('test-role');
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
$this->assertCacheContext('user.roles');
$this->drupalLogin($this->normalUser);
$this->drupalGet('test-role');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertCacheContext('user.roles');
// Test allowing multiple roles.
@@ -89,15 +89,15 @@ public function testAccessRole() {
$this->assertIdentical($expected, $view->calculateDependencies()->getDependencies());
$this->drupalLogin($this->webUser);
$this->drupalGet('test-role');
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
$this->assertCacheContext('user.roles');
$this->drupalLogout();
$this->drupalGet('test-role');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertCacheContext('user.roles');
$this->drupalLogin($this->normalUser);
$this->drupalGet('test-role');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertCacheContext('user.roles');
}
@@ -124,7 +124,7 @@ public function testRenderCaching() {
$build = DisplayPluginBase::buildBasicRenderable('test_access_role', 'default');
$account_switcher->switchTo($this->normalUser);
$result = $renderer->renderPlain($build);
- $this->assertTrue(in_array('user.roles', $build['#cache']['contexts']));
+ $this->assertContains('user.roles', $build['#cache']['contexts']);
$this->assertEqual(['config:views.view.test_access_role'], $build['#cache']['tags']);
$this->assertEqual(Cache::PERMANENT, $build['#cache']['max-age']);
$this->assertNotEqual($result, '');
@@ -136,7 +136,7 @@ public function testRenderCaching() {
// @todo Fix this in https://www.drupal.org/node/2551037,
// DisplayPluginBase::applyDisplayCacheabilityMetadata() is not invoked when
// using buildBasicRenderable() and a Views access plugin returns FALSE.
- // $this->assertTrue(in_array('user.roles', $build['#cache']['contexts']));
+ // $this->assertContains('user.roles', $build['#cache']['contexts']);
// $this->assertEqual([], $build['#cache']['tags']);
$this->assertEqual(Cache::PERMANENT, $build['#cache']['max-age']);
$this->assertEqual($result, '');
diff --git a/web/core/modules/user/tests/src/Functional/Views/BulkFormAccessTest.php b/web/core/modules/user/tests/src/Functional/Views/BulkFormAccessTest.php
index 358ae13791..d1fe5205b9 100644
--- a/web/core/modules/user/tests/src/Functional/Views/BulkFormAccessTest.php
+++ b/web/core/modules/user/tests/src/Functional/Views/BulkFormAccessTest.php
@@ -49,7 +49,7 @@ public function testUserEditAccess() {
// Ensure that the account "no_edit" can not be edited.
$this->drupalGet('user/' . $no_edit_user->id() . '/edit');
$this->assertFalse($no_edit_user->access('update', $admin_user));
- $this->assertResponse(403, 'The user may not be edited.');
+ $this->assertSession()->statusCodeEquals(403);
// Test blocking the account "no_edit".
$edit = [
@@ -57,7 +57,7 @@ public function testUserEditAccess() {
'action' => 'user_block_user_action',
];
$this->drupalPostForm('test-user-bulk-form', $edit, t('Apply to selected items'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertRaw(new FormattableMarkup('No access to execute %action on the @entity_type_label %entity_label.', [
'%action' => 'Block the selected user(s)',
@@ -109,10 +109,10 @@ public function testUserDeleteAccess() {
// Ensure that the account "no_delete" can not be deleted.
$this->drupalGet('user/' . $account->id() . '/cancel');
- $this->assertResponse(403, 'The user "no_delete" may not be deleted.');
+ $this->assertSession()->statusCodeEquals(403);
// Ensure that the account "may_delete" *can* be deleted.
$this->drupalGet('user/' . $account2->id() . '/cancel');
- $this->assertResponse(200, 'The user "may_delete" may be deleted.');
+ $this->assertSession()->statusCodeEquals(200);
// Test deleting the accounts "no_delete" and "may_delete".
$edit = [
diff --git a/web/core/modules/user/tests/src/Functional/Views/HandlerFieldUserNameTest.php b/web/core/modules/user/tests/src/Functional/Views/HandlerFieldUserNameTest.php
index 108121e61d..10a8e90362 100644
--- a/web/core/modules/user/tests/src/Functional/Views/HandlerFieldUserNameTest.php
+++ b/web/core/modules/user/tests/src/Functional/Views/HandlerFieldUserNameTest.php
@@ -47,13 +47,13 @@ public function testUserName() {
$render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
return $view->field['name']->advancedRender($view->result[0]);
});
- $this->assertTrue(strpos($render, $anon_name) !== FALSE, 'For user 0 it should use the default anonymous name by default.');
+ $this->assertStringContainsString($anon_name, $render, 'For user 0 it should use the default anonymous name by default.');
$render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view, $new_user) {
return $view->field['name']->advancedRender($view->result[$new_user->id()]);
});
- $this->assertTrue(strpos($render, $new_user->getDisplayName()) !== FALSE, 'If link to user is checked the username should be part of the output.');
- $this->assertTrue(strpos($render, 'user/' . $new_user->id()) !== FALSE, 'If link to user is checked the link to the user should appear as well.');
+ $this->assertStringContainsString($new_user->getDisplayName(), $render, 'If link to user is checked the username should be part of the output.');
+ $this->assertStringContainsString('user/' . $new_user->id(), $render, 'If link to user is checked the link to the user should appear as well.');
$view->field['name']->options['link_to_user'] = FALSE;
$view->field['name']->options['type'] = 'string';
@@ -80,7 +80,7 @@ public function testNoAdditionalFields() {
$render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
return $view->field['name']->advancedRender($view->result[0]);
});
- $this->assertTrue(strpos($render, $username) !== FALSE, 'If link to user is checked the username should be part of the output.');
+ $this->assertStringContainsString($username, $render, 'If link to user is checked the username should be part of the output.');
}
}
diff --git a/web/core/modules/user/tests/src/Functional/Views/UserChangedTest.php b/web/core/modules/user/tests/src/Functional/Views/UserChangedTest.php
index d22d2b4710..465056bde2 100644
--- a/web/core/modules/user/tests/src/Functional/Views/UserChangedTest.php
+++ b/web/core/modules/user/tests/src/Functional/Views/UserChangedTest.php
@@ -49,7 +49,7 @@ public function testChangedField() {
$this->drupalGet($path, $options);
- $this->assertText(t('Updated date') . ': ' . date('Y-m-d', REQUEST_TIME));
+ $this->assertText('Updated date: ' . date('Y-m-d', REQUEST_TIME));
}
}
diff --git a/web/core/modules/user/tests/src/Functional/Views/UserFieldsAccessChangeTest.php b/web/core/modules/user/tests/src/Functional/Views/UserFieldsAccessChangeTest.php
index ca3e8e9ccc..70e0552bc5 100644
--- a/web/core/modules/user/tests/src/Functional/Views/UserFieldsAccessChangeTest.php
+++ b/web/core/modules/user/tests/src/Functional/Views/UserFieldsAccessChangeTest.php
@@ -72,14 +72,14 @@ public function testUserNameLink() {
$this->drupalGet('test_user_fields_access');
$this->assertText($test_user->getAccountName(), 'Found user in view');
$result = $this->xpath($xpath);
- $this->assertEqual(0, count($result), 'User is not a link');
+ $this->assertCount(0, $result, 'User is not a link');
// Assign sub-admin role to grant extra access.
$user = $this->drupalCreateUser(['sub-admin']);
$this->drupalLogin($user);
$this->drupalGet('test_user_fields_access');
$result = $this->xpath($xpath);
- $this->assertEqual(1, count($result), 'User is a link');
+ $this->assertCount(1, $result, 'User is a link');
}
}
diff --git a/web/core/modules/user/tests/src/Kernel/Migrate/d6/MigrateUserProfileValuesTest.php b/web/core/modules/user/tests/src/Kernel/Migrate/d6/MigrateUserProfileValuesTest.php
index 71acad69f2..d6d15f68a8 100644
--- a/web/core/modules/user/tests/src/Kernel/Migrate/d6/MigrateUserProfileValuesTest.php
+++ b/web/core/modules/user/tests/src/Kernel/Migrate/d6/MigrateUserProfileValuesTest.php
@@ -39,7 +39,7 @@ protected function setUp() {
*/
public function testUserProfileValues() {
$user = User::load(2);
- $this->assertFalse(is_null($user));
+ $this->assertNotNull($user);
$this->assertIdentical('red', $user->profile_color->value);
$expected = <<<EOT
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam nulla sapien, congue nec risus ut, adipiscing aliquet felis. Maecenas quis justo vel nulla varius euismod. Quisque metus metus, cursus sit amet sem non, bibendum vehicula elit. Cras dui nisl, eleifend at iaculis vitae, lacinia ut felis. Nullam aliquam ligula volutpat nulla consectetur accumsan. Maecenas tincidunt molestie diam, a accumsan enim fringilla sit amet. Morbi a tincidunt tellus. Donec imperdiet scelerisque porta. Sed quis sem bibendum eros congue sodales. Vivamus vel fermentum est, at rutrum orci. Nunc consectetur purus ut dolor pulvinar, ut volutpat felis congue. Cras tincidunt odio sed neque sollicitudin, vehicula tempor metus scelerisque.
diff --git a/web/core/modules/user/tests/src/Kernel/Migrate/d7/MigrateUserPictureFieldInstanceTest.php b/web/core/modules/user/tests/src/Kernel/Migrate/d7/MigrateUserPictureFieldInstanceTest.php
index b601da7de1..c6efa9d11a 100644
--- a/web/core/modules/user/tests/src/Kernel/Migrate/d7/MigrateUserPictureFieldInstanceTest.php
+++ b/web/core/modules/user/tests/src/Kernel/Migrate/d7/MigrateUserPictureFieldInstanceTest.php
@@ -32,7 +32,7 @@ protected function setUp() {
public function testUserPictureField() {
/** @var \Drupal\field\FieldConfigInterface $field */
$field = FieldConfig::load('user.user.user_picture');
- $this->assertTrue($field instanceof FieldConfigInterface);
+ $this->assertInstanceOf(FieldConfigInterface::class, $field);
$this->assertIdentical('user', $field->getTargetEntityTypeId());
$this->assertIdentical('user', $field->getTargetBundle());
$this->assertIdentical('user_picture', $field->getName());
diff --git a/web/core/modules/user/tests/src/Kernel/Migrate/d7/MigrateUserPictureFieldTest.php b/web/core/modules/user/tests/src/Kernel/Migrate/d7/MigrateUserPictureFieldTest.php
index 7fa3fbbd0b..36659c4d54 100644
--- a/web/core/modules/user/tests/src/Kernel/Migrate/d7/MigrateUserPictureFieldTest.php
+++ b/web/core/modules/user/tests/src/Kernel/Migrate/d7/MigrateUserPictureFieldTest.php
@@ -29,7 +29,7 @@ protected function setUp() {
public function testUserPictureField() {
/** @var \Drupal\field\FieldStorageConfigInterface $field_storage */
$field_storage = FieldStorageConfig::load('user.user_picture');
- $this->assertTrue($field_storage instanceof FieldStorageConfigInterface);
+ $this->assertInstanceOf(FieldStorageConfigInterface::class, $field_storage);
$this->assertIdentical('user.user_picture', $field_storage->id());
$this->assertIdentical('image', $field_storage->getType());
$this->assertIdentical('user', $field_storage->getTargetEntityTypeId());
diff --git a/web/core/modules/user/tests/src/Kernel/Migrate/d7/MigrateUserRoleTest.php b/web/core/modules/user/tests/src/Kernel/Migrate/d7/MigrateUserRoleTest.php
index 9b5a7725d7..b8a08b4b29 100644
--- a/web/core/modules/user/tests/src/Kernel/Migrate/d7/MigrateUserRoleTest.php
+++ b/web/core/modules/user/tests/src/Kernel/Migrate/d7/MigrateUserRoleTest.php
@@ -35,7 +35,7 @@ protected function setUp() {
protected function assertEntity($id, $label, $original_rid) {
/** @var \Drupal\user\RoleInterface $entity */
$entity = Role::load($id);
- $this->assertTrue($entity instanceof RoleInterface);
+ $this->assertInstanceOf(RoleInterface::class, $entity);
$this->assertIdentical($label, $entity->label());
if (isset($original_rid)) {
diff --git a/web/core/modules/user/tests/src/Kernel/Migrate/d7/MigrateUserTest.php b/web/core/modules/user/tests/src/Kernel/Migrate/d7/MigrateUserTest.php
index c07fde4c81..ad8f129dad 100644
--- a/web/core/modules/user/tests/src/Kernel/Migrate/d7/MigrateUserTest.php
+++ b/web/core/modules/user/tests/src/Kernel/Migrate/d7/MigrateUserTest.php
@@ -26,8 +26,6 @@ class MigrateUserTest extends MigrateDrupal7TestBase {
'language',
'link',
'menu_ui',
- // Required for translation migrations.
- 'migrate_drupal_multilingual',
'node',
'taxonomy',
'telephone',
@@ -90,7 +88,7 @@ protected function setUp() {
protected function assertEntity($id, $label, $mail, $password, $created, $access, $login, $blocked, $entity_langcode, $prefered_langcode, $timezone, $init, $roles, $field_integer, $field_file_target_id = FALSE, $has_picture = FALSE) {
/** @var \Drupal\user\UserInterface $user */
$user = User::load($id);
- $this->assertTrue($user instanceof UserInterface);
+ $this->assertInstanceOf(UserInterface::class, $user);
$this->assertSame($label, $user->label());
$this->assertSame($mail, $user->getEmail());
$this->assertSame($password, $user->getPassword());
diff --git a/web/core/modules/user/tests/src/Kernel/UserEntityReferenceTest.php b/web/core/modules/user/tests/src/Kernel/UserEntityReferenceTest.php
index b847f17c5b..24bf4b33ec 100644
--- a/web/core/modules/user/tests/src/Kernel/UserEntityReferenceTest.php
+++ b/web/core/modules/user/tests/src/Kernel/UserEntityReferenceTest.php
@@ -77,21 +77,21 @@ public function testUserSelectionByRole() {
$user3->addRole($this->role2->id());
$user3->save();
- /** @var \Drupal\Core\Entity\EntityAutocompleteMatcher $autocomplete */
+ /** @var \Drupal\Core\Entity\EntityAutocompleteMatcherInterface $autocomplete */
$autocomplete = \Drupal::service('entity.autocomplete_matcher');
$matches = $autocomplete->getMatches('user', 'default', $field_definition->getSetting('handler_settings'), 'aabb');
- $this->assertEqual(count($matches), 2);
+ $this->assertCount(2, $matches);
$users = [];
foreach ($matches as $match) {
$users[] = $match['label'];
}
- $this->assertTrue(in_array($user1->label(), $users));
- $this->assertTrue(in_array($user2->label(), $users));
- $this->assertFalse(in_array($user3->label(), $users));
+ $this->assertContains($user1->label(), $users);
+ $this->assertContains($user2->label(), $users);
+ $this->assertNotContains($user3->label(), $users);
$matches = $autocomplete->getMatches('user', 'default', $field_definition->getSetting('handler_settings'), 'aabbbb');
- $this->assertEqual(count($matches), 0, '');
+ $this->assertCount(0, $matches);
}
}
diff --git a/web/core/modules/user/tests/src/Kernel/UserLegacyTest.php b/web/core/modules/user/tests/src/Kernel/UserLegacyTest.php
index fb7fa30966..b18ff9f048 100644
--- a/web/core/modules/user/tests/src/Kernel/UserLegacyTest.php
+++ b/web/core/modules/user/tests/src/Kernel/UserLegacyTest.php
@@ -57,7 +57,7 @@ public function testUserView() {
User::create(),
User::create(),
];
- $this->assertEquals(4, count(user_view_multiple($entities)));
+ $this->assertCount(4, user_view_multiple($entities));
}
/**
diff --git a/web/core/modules/user/tests/src/Kernel/UserValidationTest.php b/web/core/modules/user/tests/src/Kernel/UserValidationTest.php
index 7435b35e28..8c4755b4f1 100644
--- a/web/core/modules/user/tests/src/Kernel/UserValidationTest.php
+++ b/web/core/modules/user/tests/src/Kernel/UserValidationTest.php
@@ -82,14 +82,14 @@ public function testValidation() {
'mail' => 'test@example.com',
]);
$violations = $user->validate();
- $this->assertEqual(count($violations), 0, 'No violations when validating a default user.');
+ $this->assertCount(0, $violations, 'No violations when validating a default user.');
// Only test one example invalid name here, the rest is already covered in
// the testUsernames() method in this class.
$name = $this->randomMachineName(61);
$user->set('name', $name);
$violations = $user->validate();
- $this->assertEqual(count($violations), 1, 'Violation found when name is too long.');
+ $this->assertCount(1, $violations, 'Violation found when name is too long.');
$this->assertEqual($violations[0]->getPropertyPath(), 'name');
$this->assertEqual($violations[0]->getMessage(), t('The username %name is too long: it must be %max characters or less.', ['%name' => $name, '%max' => 60]));
@@ -101,7 +101,7 @@ public function testValidation() {
$user2->save();
$user->set('name', 'existing');
$violations = $user->validate();
- $this->assertEqual(count($violations), 1, 'Violation found on name collision.');
+ $this->assertCount(1, $violations, 'Violation found on name collision.');
$this->assertEqual($violations[0]->getPropertyPath(), 'name');
$this->assertEqual($violations[0]->getMessage(), t('The username %name is already taken.', ['%name' => 'existing']));
@@ -110,7 +110,7 @@ public function testValidation() {
$user->set('mail', 'invalid');
$violations = $user->validate();
- $this->assertEqual(count($violations), 1, 'Violation found when email is invalid');
+ $this->assertCount(1, $violations, 'Violation found when email is invalid');
$this->assertEqual($violations[0]->getPropertyPath(), 'mail.0.value');
$this->assertEqual($violations[0]->getMessage(), t('This value is not a valid email address.'));
@@ -121,7 +121,7 @@ public function testValidation() {
// overlaps with the implicit constraint of the 'email' property type used
// in EmailItem::propertyDefinitions(). Resolve this in
// https://www.drupal.org/node/2023465.
- $this->assertEqual(count($violations), 2, 'Violations found when email is too long');
+ $this->assertCount(2, $violations, 'Violations found when email is too long');
$this->assertEqual($violations[0]->getPropertyPath(), 'mail.0.value');
$this->assertEqual($violations[0]->getMessage(), t('%name: the email address can not be longer than @max characters.', ['%name' => $user->get('mail')->getFieldDefinition()->getLabel(), '@max' => Email::EMAIL_MAX_LENGTH]));
$this->assertEqual($violations[1]->getPropertyPath(), 'mail.0.value');
@@ -130,12 +130,12 @@ public function testValidation() {
// Provoke an email collision with an existing user.
$user->set('mail', 'existing@example.com');
$violations = $user->validate();
- $this->assertEqual(count($violations), 1, 'Violation found when email already exists.');
+ $this->assertCount(1, $violations, 'Violation found when email already exists.');
$this->assertEqual($violations[0]->getPropertyPath(), 'mail');
$this->assertEqual($violations[0]->getMessage(), t('The email address %mail is already taken.', ['%mail' => 'existing@example.com']));
$user->set('mail', NULL);
$violations = $user->validate();
- $this->assertEqual(count($violations), 1, 'Email addresses may not be removed');
+ $this->assertCount(1, $violations, 'Email addresses may not be removed');
$this->assertEqual($violations[0]->getPropertyPath(), 'mail');
$this->assertEqual($violations[0]->getMessage(), t('@name field is required.', ['@name' => $user->getFieldDefinition('mail')->getLabel()]));
$user->set('mail', 'someone@example.com');
@@ -148,7 +148,7 @@ public function testValidation() {
$user->set('init', 'invalid');
$violations = $user->validate();
- $this->assertEqual(count($violations), 1, 'Violation found when init email is invalid');
+ $this->assertCount(1, $violations, 'Violation found when init email is invalid');
$user->set('init', NULL);
$user->set('langcode', 'invalid');
@@ -174,11 +174,11 @@ public function testValidation() {
'roles' => ['role1', 'role2'],
]);
$violations = $user->validate();
- $this->assertEqual(count($violations), 0);
+ $this->assertCount(0, $violations);
$user->roles[1]->target_id = 'unknown_role';
$violations = $user->validate();
- $this->assertEqual(count($violations), 1);
+ $this->assertCount(1, $violations);
$this->assertEqual($violations[0]->getPropertyPath(), 'roles.1.target_id');
$this->assertEqual($violations[0]->getMessage(), t('The referenced entity (%entity_type: %name) does not exist.', ['%entity_type' => 'user_role', '%name' => 'unknown_role']));
}
@@ -186,7 +186,7 @@ public function testValidation() {
/**
* Verifies that a length violation exists for the given field.
*
- * @param \Drupal\core\Entity\EntityInterface $entity
+ * @param \Drupal\Core\Entity\EntityInterface $entity
* The entity object to validate.
* @param string $field_name
* The field that violates the maximum length.
@@ -208,14 +208,14 @@ protected function assertLengthViolation(EntityInterface $entity, $field_name, $
/**
* Verifies that a AllowedValues violation exists for the given field.
*
- * @param \Drupal\core\Entity\EntityInterface $entity
+ * @param \Drupal\Core\Entity\EntityInterface $entity
* The entity object to validate.
* @param string $field_name
* The name of the field to verify.
*/
protected function assertAllowedValuesViolation(EntityInterface $entity, $field_name) {
$violations = $entity->validate();
- $this->assertEqual(count($violations), 1, "Allowed values violation for $field_name found.");
+ $this->assertCount(1, $violations, "Allowed values violation for $field_name found.");
$this->assertEqual($violations[0]->getPropertyPath(), $field_name === 'langcode' ? "$field_name.0" : "$field_name.0.value");
$this->assertEqual($violations[0]->getMessage(), t('The value you selected is not a valid choice.'));
}
diff --git a/web/core/modules/user/tests/src/Kernel/Views/HandlerFilterPermissionTest.php b/web/core/modules/user/tests/src/Kernel/Views/HandlerFilterPermissionTest.php
index b005f62ada..1ca7e78eab 100644
--- a/web/core/modules/user/tests/src/Kernel/Views/HandlerFilterPermissionTest.php
+++ b/web/core/modules/user/tests/src/Kernel/Views/HandlerFilterPermissionTest.php
@@ -38,7 +38,7 @@ public function testFilterPermission() {
$view->initHandlers();
$view->filter['permission']->value = ['non_existent_permission'];
$this->executeView($view);
- $this->assertEqual(count($view->result), 4, 'A non existent permission is not filtered so everything is the result.');
+ $this->assertCount(4, $view->result, 'A non existent permission is not filtered so everything is the result.');
$expected[] = ['uid' => 1];
$expected[] = ['uid' => 2];
$expected[] = ['uid' => 3];
@@ -50,7 +50,7 @@ public function testFilterPermission() {
$view->initHandlers();
$view->filter['permission']->value = ['administer permissions'];
$this->executeView($view);
- $this->assertEqual(count($view->result), 2);
+ $this->assertCount(2, $view->result);
$expected = [];
$expected[] = ['uid' => 3];
$expected[] = ['uid' => 4];
@@ -62,7 +62,7 @@ public function testFilterPermission() {
$view->filter['permission']->operator = 'not';
$view->filter['permission']->value = ['administer users'];
$this->executeView($view);
- $this->assertEqual(count($view->result), 3);
+ $this->assertCount(3, $view->result);
$expected = [];
$expected[] = ['uid' => 1];
$expected[] = ['uid' => 2];
@@ -75,7 +75,7 @@ public function testFilterPermission() {
$view->filter['permission']->operator = 'not';
$view->filter['permission']->value = ['administer users', 'administer permissions'];
$this->executeView($view);
- $this->assertEqual(count($view->result), 2);
+ $this->assertCount(2, $view->result);
$expected = [];
$expected[] = ['uid' => 1];
$expected[] = ['uid' => 2];
@@ -86,7 +86,7 @@ public function testFilterPermission() {
$view->initHandlers();
$view->filter['permission']->value = ['administer users'];
$this->executeView($view);
- $this->assertEqual(count($view->result), 1);
+ $this->assertCount(1, $view->result);
$expected = [];
$expected[] = ['uid' => 4];
$this->assertIdenticalResultset($view, $expected, $column_map);
diff --git a/web/core/modules/user/tests/src/Unit/Theme/AdminNegotiatorTest.php b/web/core/modules/user/tests/src/Unit/Theme/AdminNegotiatorTest.php
new file mode 100644
index 0000000000..ddbba3aa52
--- /dev/null
+++ b/web/core/modules/user/tests/src/Unit/Theme/AdminNegotiatorTest.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace Drupal\Tests\user\Unit\Theme;
+
+use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\Core\Routing\AdminContext;
+use Drupal\Core\Routing\RouteMatch;
+use Drupal\Core\Session\AccountInterface;
+use Drupal\Tests\UnitTestCase;
+use Drupal\user\Theme\AdminNegotiator;
+
+/**
+ * Tests AdminNegotiator class.
+ *
+ * @group user
+ * @coversDefaultClass \Drupal\user\Theme\AdminNegotiator
+ */
+class AdminNegotiatorTest extends UnitTestCase {
+
+ /**
+ * @dataProvider getThemes
+ */
+ public function testDetermineActiveTheme($admin_theme, $expected) {
+ $user = $this->prophesize(AccountInterface::class);
+ $config_factory = $this->getConfigFactoryStub(['system.theme' => ['admin' => $admin_theme]]);
+ $entity_type_manager = $this->prophesize(EntityTypeManagerInterface::class);
+ $admin_context = $this->prophesize(AdminContext::class);
+ $negotiator = new AdminNegotiator($user->reveal(), $config_factory, $entity_type_manager->reveal(), $admin_context->reveal());
+ $route_match = $this->prophesize(RouteMatch::class);
+ $this->assertSame($expected, $negotiator->determineActiveTheme($route_match->reveal()));
+ }
+
+ /**
+ * Provides a list of theme names to test.
+ */
+ public function getThemes() {
+ return [
+ ['seven', 'seven'],
+ [NULL, NULL],
+ ['', NULL],
+ ];
+ }
+
+}
diff --git a/web/core/modules/user/user.module b/web/core/modules/user/user.module
index 325d240903..74ce5de07c 100644
--- a/web/core/modules/user/user.module
+++ b/web/core/modules/user/user.module
@@ -12,6 +12,7 @@
use Drupal\Core\Asset\AttachedAssetsInterface;
use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
use Drupal\Core\Field\BaseFieldDefinition;
+use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Render\Element;
use Drupal\Core\Routing\RouteMatchInterface;
use Drupal\Core\Session\AccountInterface;
@@ -184,6 +185,19 @@ function user_entity_extra_field_info() {
return $fields;
}
+/**
+ * Implements hook_ENTITY_TYPE_presave() for user entities.
+ *
+ * @todo https://www.drupal.org/project/drupal/issues/3112704 Move to
+ * \Drupal\user\Entity\User::preSave().
+ */
+function user_user_presave(UserInterface $account) {
+ $config = \Drupal::config('system.date');
+ if ($config->get('timezone.user.configurable') && !$account->getTimeZone() && !$config->get('timezone.user.default')) {
+ $account->timezone = $config->get('timezone.default');
+ }
+}
+
/**
* Loads multiple users based on certain conditions.
*
@@ -244,9 +258,9 @@ function user_load($uid, $reset = FALSE) {
*
* @param string $mail
* String with the account's email address.
- * @return object|bool
- * A fully-loaded $user object upon successful user load or FALSE if user
- * cannot be loaded.
+ *
+ * @return \Drupal\user\UserInterface|false
+ * A user entity upon successful user load, or FALSE if user cannot be loaded.
*
* @see \Drupal\user\Entity\User::loadMultiple()
*/
@@ -261,9 +275,9 @@ function user_load_by_mail($mail) {
*
* @param string $name
* String with the account's user name.
- * @return object|bool
- * A fully-loaded $user object upon successful user load or FALSE if user
- * cannot be loaded.
+ *
+ * @return \Drupal\user\UserInterface|false
+ * A user entity upon successful user load, or FALSE if user cannot be loaded.
*
* @see \Drupal\user\Entity\User::loadMultiple()
*/
@@ -296,30 +310,26 @@ function user_validate_name($name) {
/**
* Generate a random alphanumeric password.
+ *
+ * @param int $length
+ * The desired password length, in characters.
+ *
+ * @return string
+ * The generated random password.
*/
function user_password($length = 10) {
- // This variable contains the list of allowable characters for the
- // password. Note that the number 0 and the letter 'O' have been
- // removed to avoid confusion between the two. The same is true
- // of 'I', 1, and 'l'.
- $allowable_characters = 'abcdefghijkmnopqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789';
+ // This variable contains the list of allowed characters for the password.
+ // Note that the number 0 and the letter 'O' have been removed to avoid
+ // confusion between the two. The same is true of 'I', 1, and 'l'.
+ $allowed_characters = 'abcdefghijkmnopqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789';
- // Zero-based count of characters in the allowable list:
- $len = strlen($allowable_characters) - 1;
+ // The maximum integer we want from random_int().
+ $max = strlen($allowed_characters) - 1;
- // Declare the password as a blank string.
$pass = '';
- // Loop the number of times specified by $length.
for ($i = 0; $i < $length; $i++) {
- do {
- // Find a secure random number within the range needed.
- $index = ord(random_bytes(1));
- } while ($index > $len);
-
- // Each iteration, pick a random character from the
- // allowable string and append it to the password:
- $pass .= $allowable_characters[$index];
+ $pass .= $allowed_characters[random_int(0, $max)];
}
return $pass;
@@ -578,6 +588,18 @@ function user_user_login(UserInterface $account) {
// Reset static cache of default variables in template_preprocess() to reflect
// the new user.
drupal_static_reset('template_preprocess');
+
+ // If the user has a NULL time zone, notify them to set a time zone.
+ $config = \Drupal::config('system.date');
+ if (!$account->getTimezone() && $config->get('timezone.user.configurable') && $config->get('timezone.user.warn')) {
+ \Drupal::messenger()
+ ->addStatus(t('Configure your <a href=":user-edit">account time zone setting</a>.', [
+ ':user-edit' => $account->toUrl('edit-form', [
+ 'query' => \Drupal::destination()->getAsArray(),
+ 'fragment' => 'edit-timezone',
+ ])->toString(),
+ ]));
+ }
}
/**
@@ -1254,7 +1276,7 @@ function user_role_revoke_permissions($rid, array $permissions = []) {
*
* @see user_mail_tokens()
*/
-function _user_mail_notify($op, $account, $langcode = NULL) {
+function _user_mail_notify($op, AccountInterface $account, $langcode = NULL) {
if (\Drupal::config('user.settings')->get('notify.' . $op)) {
$params['account'] = $account;
$langcode = $langcode ? $langcode : $account->getPreferredLangcode();
@@ -1459,3 +1481,58 @@ function template_preprocess_user(&$variables) {
$variables['content'][$key] = $variables['elements'][$key];
}
}
+
+/**
+ * Implements hook_form_FORM_ID_alter() for \Drupal\system\Form\RegionalForm.
+ */
+function user_form_system_regional_settings_alter(&$form, FormStateInterface $form_state) {
+ $config = \Drupal::config('system.date');
+
+ $form['timezone']['configurable_timezones'] = [
+ '#type' => 'checkbox',
+ '#title' => t('Users may set their own time zone'),
+ '#default_value' => $config->get('timezone.user.configurable'),
+ ];
+
+ $form['timezone']['configurable_timezones_wrapper'] = [
+ '#type' => 'container',
+ '#states' => [
+ // Hide the user configured timezone settings when users are forced to use
+ // the default setting.
+ 'invisible' => [
+ 'input[name="configurable_timezones"]' => ['checked' => FALSE],
+ ],
+ ],
+ ];
+ $form['timezone']['configurable_timezones_wrapper']['empty_timezone_message'] = [
+ '#type' => 'checkbox',
+ '#title' => t('Remind users at login if their time zone is not set'),
+ '#default_value' => $config->get('timezone.user.warn'),
+ '#description' => t('Only applied if users may set their own time zone.'),
+ ];
+
+ $form['timezone']['configurable_timezones_wrapper']['user_default_timezone'] = [
+ '#type' => 'radios',
+ '#title' => t('Time zone for new users'),
+ '#default_value' => $config->get('timezone.user.default'),
+ '#options' => [
+ UserInterface::TIMEZONE_DEFAULT => t('Default time zone'),
+ UserInterface::TIMEZONE_EMPTY => t('Empty time zone'),
+ UserInterface::TIMEZONE_SELECT => t('Users may set their own time zone at registration'),
+ ],
+ '#description' => t('Only applied if users may set their own time zone.'),
+ ];
+
+ $form['#submit'][] = 'user_form_system_regional_settings_submit';
+}
+
+/**
+ * Additional submit handler for \Drupal\system\Form\RegionalForm.
+ */
+function user_form_system_regional_settings_submit($form, FormStateInterface $form_state) {
+ \Drupal::configFactory()->getEditable('system.date')
+ ->set('timezone.user.configurable', $form_state->getValue('configurable_timezones'))
+ ->set('timezone.user.warn', $form_state->getValue('empty_timezone_message'))
+ ->set('timezone.user.default', $form_state->getValue('user_default_timezone'))
+ ->save();
+}
diff --git a/web/core/modules/views/js/ajax_view.es6.js b/web/core/modules/views/js/ajax_view.es6.js
index 55c85fda18..cbcec78ffc 100644
--- a/web/core/modules/views/js/ajax_view.es6.js
+++ b/web/core/modules/views/js/ajax_view.es6.js
@@ -137,7 +137,7 @@
Drupal.views.ajaxView.prototype.attachExposedFormAjax = function() {
const that = this;
this.exposedFormAjax = [];
- // Exclude the reset buttons so no AJAX behaviours are bound. Many things
+ // Exclude the reset buttons so no AJAX behaviors are bound. Many things
// break during the form reset phase if using AJAX.
$('input[type=submit], input[type=image]', this.$exposed_form)
.not('[data-drupal-selector=edit-reset]')
diff --git a/web/core/modules/views/src/EventSubscriber/ViewsEntitySchemaSubscriber.php b/web/core/modules/views/src/EventSubscriber/ViewsEntitySchemaSubscriber.php
index 85503cbcf5..0f572c8b74 100644
--- a/web/core/modules/views/src/EventSubscriber/ViewsEntitySchemaSubscriber.php
+++ b/web/core/modules/views/src/EventSubscriber/ViewsEntitySchemaSubscriber.php
@@ -180,30 +180,39 @@ public function onEntityTypeUpdate(EntityTypeInterface $entity_type, EntityTypeI
case static::BASE_TABLE_RENAME:
$this->baseTableRename($all_views, $entity_type->id(), $original->getBaseTable(), $entity_type->getBaseTable());
break;
+
case static::DATA_TABLE_RENAME:
$this->dataTableRename($all_views, $entity_type->id(), $original->getDataTable(), $entity_type->getDataTable());
break;
+
case static::DATA_TABLE_ADDITION:
$this->dataTableAddition($all_views, $entity_type, $entity_type->getDataTable(), $entity_type->getBaseTable());
break;
+
case static::DATA_TABLE_REMOVAL:
$this->dataTableRemoval($all_views, $entity_type->id(), $original->getDataTable(), $entity_type->getBaseTable());
break;
+
case static::REVISION_TABLE_RENAME:
$this->baseTableRename($all_views, $entity_type->id(), $original->getRevisionTable(), $entity_type->getRevisionTable());
break;
+
case static::REVISION_TABLE_ADDITION:
// If we add revision support we don't have to do anything.
break;
+
case static::REVISION_TABLE_REMOVAL:
$this->revisionRemoval($all_views, $original);
break;
+
case static::REVISION_DATA_TABLE_RENAME:
$this->dataTableRename($all_views, $entity_type->id(), $original->getRevisionDataTable(), $entity_type->getRevisionDataTable());
break;
+
case static::REVISION_DATA_TABLE_ADDITION:
$this->dataTableAddition($all_views, $entity_type, $entity_type->getRevisionDataTable(), $entity_type->getRevisionTable());
break;
+
case static::REVISION_DATA_TABLE_REMOVAL:
$this->dataTableRemoval($all_views, $entity_type->id(), $original->getRevisionDataTable(), $entity_type->getRevisionTable());
break;
diff --git a/web/core/modules/views/src/Plugin/views/HandlerBase.php b/web/core/modules/views/src/Plugin/views/HandlerBase.php
index 28dfbfcab7..87aa79d460 100644
--- a/web/core/modules/views/src/Plugin/views/HandlerBase.php
+++ b/web/core/modules/views/src/Plugin/views/HandlerBase.php
@@ -197,12 +197,15 @@ public function sanitizeValue($value, $type = NULL) {
case 'xss':
$value = Xss::filter($value);
break;
+
case 'xss_admin':
$value = Xss::filterAdmin($value);
break;
+
case 'url':
$value = Html::escape(UrlHelper::stripDangerousProtocols($value));
break;
+
default:
$value = Html::escape($value);
break;
@@ -231,10 +234,13 @@ protected function caseTransform($string, $option) {
return $string;
case 'upper':
return mb_strtoupper($string);
+
case 'lower':
return mb_strtolower($string);
+
case 'ucfirst':
return Unicode::ucfirst($string);
+
case 'ucwords':
return Unicode::ucwords($string);
}
diff --git a/web/core/modules/views/src/Plugin/views/argument/ArgumentPluginBase.php b/web/core/modules/views/src/Plugin/views/argument/ArgumentPluginBase.php
index d4d6665df4..da0eb95490 100644
--- a/web/core/modules/views/src/Plugin/views/argument/ArgumentPluginBase.php
+++ b/web/core/modules/views/src/Plugin/views/argument/ArgumentPluginBase.php
@@ -1096,6 +1096,7 @@ public function getPlugin($type = 'argument_default', $name = NULL) {
$plugin_name = $this->options['default_argument_type'];
$options_name = 'default_argument_options';
break;
+
case 'argument_validator':
if (!isset($this->options['validate']['type'])) {
return;
@@ -1103,6 +1104,7 @@ public function getPlugin($type = 'argument_default', $name = NULL) {
$plugin_name = $this->options['validate']['type'];
$options_name = 'validate_options';
break;
+
case 'style':
if (!isset($this->options['summary']['format'])) {
return;
diff --git a/web/core/modules/views/src/Plugin/views/cache/CachePluginBase.php b/web/core/modules/views/src/Plugin/views/cache/CachePluginBase.php
index 14ac7994fd..fd9278876a 100644
--- a/web/core/modules/views/src/Plugin/views/cache/CachePluginBase.php
+++ b/web/core/modules/views/src/Plugin/views/cache/CachePluginBase.php
@@ -106,6 +106,7 @@ public function cacheSet($type) {
case 'query':
// Not supported currently, but this is certainly where we'd put it.
break;
+
case 'results':
$data = [
'result' => $this->prepareViewResult($this->view->result),
@@ -135,6 +136,7 @@ public function cacheGet($type) {
case 'query':
// Not supported currently, but this is certainly where we'd put it.
return FALSE;
+
case 'results':
// Values to set: $view->result, $view->total_rows, $view->execute_time,
// $view->current_page.
diff --git a/web/core/modules/views/src/Plugin/views/display/Attachment.php b/web/core/modules/views/src/Plugin/views/display/Attachment.php
index 315ab59513..7dbbb2f886 100644
--- a/web/core/modules/views/src/Plugin/views/display/Attachment.php
+++ b/web/core/modules/views/src/Plugin/views/display/Attachment.php
@@ -149,6 +149,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
'#default_value' => $this->getOption('inherit_arguments'),
];
break;
+
case 'inherit_exposed_filters':
$form['#title'] .= $this->t('Inherit exposed filters');
$form['inherit_exposed_filters'] = [
@@ -158,6 +159,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
'#default_value' => $this->getOption('inherit_exposed_filters'),
];
break;
+
case 'inherit_pager':
$form['#title'] .= $this->t('Inherit pager');
$form['inherit_pager'] = [
@@ -167,6 +169,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
'#default_value' => $this->getOption('inherit_pager'),
];
break;
+
case 'render_pager':
$form['#title'] .= $this->t('Render pager');
$form['render_pager'] = [
@@ -176,6 +179,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
'#default_value' => $this->getOption('render_pager'),
];
break;
+
case 'attachment_position':
$form['#title'] .= $this->t('Position');
$form['attachment_position'] = [
@@ -186,6 +190,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
'#default_value' => $this->getOption('attachment_position'),
];
break;
+
case 'displays':
$form['#title'] .= $this->t('Attach to');
$displays = [];
@@ -254,9 +259,11 @@ public function attachTo(ViewExecutable $view, $display_id, array &$build) {
case 'before':
$this->view->attachment_before[] = $attachment;
break;
+
case 'after':
$this->view->attachment_after[] = $attachment;
break;
+
case 'both':
$this->view->attachment_before[] = $attachment;
$this->view->attachment_after[] = $attachment;
diff --git a/web/core/modules/views/src/Plugin/views/display/Block.php b/web/core/modules/views/src/Plugin/views/display/Block.php
index bcdab29ecd..6df411e3f6 100644
--- a/web/core/modules/views/src/Plugin/views/display/Block.php
+++ b/web/core/modules/views/src/Plugin/views/display/Block.php
@@ -207,6 +207,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
'#default_value' => $this->getOption('block_description'),
];
break;
+
case 'block_category':
$form['#title'] .= $this->t('Block category');
$form['block_category'] = [
@@ -216,6 +217,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
'#default_value' => $this->getOption('block_category'),
];
break;
+
case 'block_hide_empty':
$form['#title'] .= $this->t('Block empty settings');
@@ -226,6 +228,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
'#default_value' => $this->getOption('block_hide_empty'),
];
break;
+
case 'exposed_form_options':
$this->view->initHandlers();
if (!$this->usesExposed() && parent::usesExposed()) {
@@ -235,6 +238,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
];
}
break;
+
case 'allow':
$form['#title'] .= $this->t('Allow settings in the block configuration');
@@ -302,10 +306,18 @@ public function blockForm(ViewsBlock $block, array &$form, FormStateInterface $f
'#title' => $this->t('Items per block'),
'#options' => [
'none' => $this->t('@count (default setting)', ['@count' => $this->getPlugin('pager')->getItemsPerPage()]),
+ 1 => 1,
+ 2 => 2,
+ 3 => 3,
+ 4 => 4,
5 => 5,
+ 6 => 6,
10 => 10,
+ 12 => 12,
20 => 20,
+ 24 => 24,
40 => 40,
+ 48 => 48,
],
'#default_value' => $block_configuration['items_per_page'],
];
diff --git a/web/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php b/web/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php
index c8dc1f49fc..d97d6862a2 100644
--- a/web/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php
+++ b/web/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php
@@ -1404,6 +1404,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
'#size' => 64,
];
break;
+
case 'display_title':
$form['#title'] .= $this->t('The name and the description of this display');
$form['display_title'] = [
@@ -1417,6 +1418,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
'#default_value' => $this->getOption('display_description'),
];
break;
+
case 'display_comment':
$form['#title'] .= $this->t('Administrative comment');
$form['display_comment'] = [
@@ -1426,6 +1428,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
'#default_value' => $this->getOption('display_comment'),
];
break;
+
case 'title':
$form['#title'] .= $this->t('The title of this view');
$form['title'] = [
@@ -1436,6 +1439,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
'#maxlength' => 255,
];
break;
+
case 'css_class':
$form['#title'] .= $this->t('CSS class');
$form['css_class'] = [
@@ -1445,6 +1449,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
'#default_value' => $this->getOption('css_class'),
];
break;
+
case 'use_ajax':
$form['#title'] .= $this->t('AJAX');
$form['use_ajax'] = [
@@ -1454,6 +1459,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
'#default_value' => $this->getOption('use_ajax') ? 1 : 0,
];
break;
+
case 'hide_attachment_summary':
$form['#title'] .= $this->t('Hide attachments when displaying a contextual filter summary');
$form['hide_attachment_summary'] = [
@@ -1462,6 +1468,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
'#default_value' => $this->getOption('hide_attachment_summary') ? 1 : 0,
];
break;
+
case 'show_admin_links':
$form['#title'] .= $this->t('Show contextual links on this view.');
$form['show_admin_links'] = [
@@ -1470,6 +1477,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
'#default_value' => $this->getOption('show_admin_links'),
];
break;
+
case 'use_more':
$form['#title'] .= $this->t('Add a more link to the bottom of the display.');
$form['use_more'] = [
@@ -1501,6 +1509,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
],
];
break;
+
case 'group_by':
$form['#title'] .= $this->t('Allow grouping and aggregation (calculation) of fields.');
$form['group_by'] = [
@@ -1510,6 +1519,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
'#default_value' => $this->getOption('group_by'),
];
break;
+
case 'access':
$form['#title'] .= $this->t('Access restrictions');
$form['access'] = [
@@ -1537,6 +1547,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
}
break;
+
case 'access_options':
$plugin = $this->getPlugin('access');
$form['#title'] .= $this->t('Access options');
@@ -1547,6 +1558,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
$plugin->buildOptionsForm($form['access_options'], $form_state);
}
break;
+
case 'cache':
$form['#title'] .= $this->t('Caching');
$form['cache'] = [
@@ -1573,6 +1585,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
];
}
break;
+
case 'cache_options':
$plugin = $this->getPlugin('cache');
$form['#title'] .= $this->t('Caching options');
@@ -1583,6 +1596,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
$plugin->buildOptionsForm($form['cache_options'], $form_state);
}
break;
+
case 'query':
$query_options = $this->getOption('query');
$plugin_name = $query_options['type'];
@@ -1604,6 +1618,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
$this->view->query->buildOptionsForm($form['query']['options'], $form_state);
}
break;
+
case 'rendering_language':
$form['#title'] .= $this->t('Rendering language');
if (\Drupal::languageManager()->isMultilingual() && $this->isBaseTableTranslatable()) {
@@ -1620,6 +1635,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
$form['rendering_language']['#markup'] = $this->t('The view is not based on a translatable entity type or the site is not multilingual.');
}
break;
+
case 'style':
$form['#title'] .= $this->t('How should this view be styled');
$style_plugin = $this->getPlugin('style');
@@ -1646,6 +1662,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
}
break;
+
case 'style_options':
$form['#title'] .= $this->t('Style options');
$style = TRUE;
@@ -1669,6 +1686,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
$plugin->buildOptionsForm($form[$section], $form_state);
}
break;
+
case 'row':
$form['#title'] .= $this->t('How should each row in this view be styled');
$row_plugin_instance = $this->getPlugin('row');
@@ -1694,6 +1712,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
}
break;
+
case 'link_display':
$form['#title'] .= $this->t('Which display to use for path');
$options = [FALSE => $this->t('None'), 'custom_url' => $this->t('Custom URL')];
@@ -1757,6 +1776,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
],
];
break;
+
case 'exposed_block':
$form['#title'] .= $this->t('Put the exposed form in a block');
$form['description'] = [
@@ -1768,6 +1788,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
'#default_value' => $this->getOption('exposed_block') ? 1 : 0,
];
break;
+
case 'exposed_form':
$form['#title'] .= $this->t('Exposed Form');
$form['exposed_form'] = [
@@ -1794,6 +1815,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
];
}
break;
+
case 'exposed_form_options':
$plugin = $this->getPlugin('exposed_form');
$form['#title'] .= $this->t('Exposed form options');
@@ -1804,6 +1826,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
$plugin->buildOptionsForm($form['exposed_form_options'], $form_state);
}
break;
+
case 'pager':
$form['#title'] .= $this->t('Select pager');
$form['pager'] = [
@@ -1831,6 +1854,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
}
break;
+
case 'pager_options':
$plugin = $this->getPlugin('pager');
$form['#title'] .= $this->t('Pager options');
@@ -1859,16 +1883,18 @@ public function validateOptionsForm(&$form, FormStateInterface $form_state) {
$form_state->setError($form['display_title'], $this->t('Display title may not be empty.'));
}
break;
+
case 'css_class':
$css_class = $form_state->getValue('css_class');
if (preg_match('/[^a-zA-Z0-9-_ ]/', $css_class)) {
$form_state->setError($form['css_class'], $this->t('CSS classes must be alphanumeric or dashes only.'));
}
break;
+
case 'display_id':
if ($form_state->getValue('display_id')) {
if (preg_match('/[^a-z0-9_]/', $form_state->getValue('display_id'))) {
- $form_state->setError($form['display_id'], $this->t('Display name must be letters, numbers, or underscores only.'));
+ $form_state->setError($form['display_id'], $this->t('Display machine name must contain only lowercase letters, numbers, or underscores.'));
}
foreach ($this->view->displayHandlers as $id => $display) {
@@ -1878,6 +1904,7 @@ public function validateOptionsForm(&$form, FormStateInterface $form_state) {
}
}
break;
+
case 'query':
if ($this->view->query) {
$this->view->query->validateOptionsForm($form['query'], $form_state);
@@ -1917,10 +1944,12 @@ public function submitOptionsForm(&$form, FormStateInterface $form_state) {
$this->display['new_id'] = $form_state->getValue('display_id');
}
break;
+
case 'display_title':
$this->display['display_title'] = $form_state->getValue('display_title');
$this->setOption('display_description', $form_state->getValue('display_description'));
break;
+
case 'query':
$plugin = $this->getPlugin('query');
if ($plugin) {
@@ -1938,15 +1967,18 @@ public function submitOptionsForm(&$form, FormStateInterface $form_state) {
case 'group_by':
$this->setOption($section, $form_state->getValue($section));
break;
+
case 'rendering_language':
$this->setOption('rendering_language', $form_state->getValue('rendering_language'));
break;
+
case 'use_ajax':
case 'hide_attachment_summary':
case 'show_admin_links':
case 'exposed_block':
$this->setOption($section, (bool) $form_state->getValue($section));
break;
+
case 'use_more':
$this->setOption($section, intval($form_state->getValue($section)));
$this->setOption('use_more_always', intval($form_state->getValue('use_more_always')));
diff --git a/web/core/modules/views/src/Plugin/views/display/Feed.php b/web/core/modules/views/src/Plugin/views/display/Feed.php
index e269dc0bb1..f48d61361b 100644
--- a/web/core/modules/views/src/Plugin/views/display/Feed.php
+++ b/web/core/modules/views/src/Plugin/views/display/Feed.php
@@ -281,6 +281,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
],
];
break;
+
case 'displays':
$form['#title'] .= $this->t('Attach to');
$displays = [];
@@ -298,6 +299,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
'#default_value' => $this->getOption('displays'),
];
break;
+
case 'path':
$form['path']['#description'] = $this->t('This view will be displayed by visiting this path on your site. It is recommended that the path be something like "path/%/%/feed" or "path/%/%/rss.xml", putting one % in the path for each contextual filter you have defined in the view.');
}
@@ -313,6 +315,7 @@ public function submitOptionsForm(&$form, FormStateInterface $form_state) {
case 'title':
$this->setOption('sitename_title', $form_state->getValue('sitename_title'));
break;
+
case 'displays':
$this->setOption($section, $form_state->getValue($section));
break;
diff --git a/web/core/modules/views/src/Plugin/views/display/Page.php b/web/core/modules/views/src/Plugin/views/display/Page.php
index 3816ee179f..c36066677f 100644
--- a/web/core/modules/views/src/Plugin/views/display/Page.php
+++ b/web/core/modules/views/src/Plugin/views/display/Page.php
@@ -209,9 +209,11 @@ public function optionsSummary(&$categories, &$options) {
default:
$menu_str = $this->t('No menu');
break;
+
case 'normal':
$menu_str = $this->t('Normal: @title', ['@title' => $menu['title']]);
break;
+
case 'tab':
case 'default tab':
$menu_str = $this->t('Tab: @title', ['@title' => $menu['title']]);
@@ -371,6 +373,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
],
];
break;
+
case 'tab_options':
$form['#title'] .= $this->t('Default tab options');
$tab_options = $this->getOption('tab_options');
@@ -488,6 +491,7 @@ public function submitOptionsForm(&$form, FormStateInterface $form_state) {
$form_state->get('view')->addFormToStack('display', $this->display['id'], 'tab_options');
}
break;
+
case 'tab_options':
$this->setOption('tab_options', $form_state->getValue('tab_options'));
break;
diff --git a/web/core/modules/views/src/Plugin/views/exposed_form/ExposedFormPluginBase.php b/web/core/modules/views/src/Plugin/views/exposed_form/ExposedFormPluginBase.php
index 092e42edd7..d07a303058 100644
--- a/web/core/modules/views/src/Plugin/views/exposed_form/ExposedFormPluginBase.php
+++ b/web/core/modules/views/src/Plugin/views/exposed_form/ExposedFormPluginBase.php
@@ -244,7 +244,6 @@ public function exposedFormAlter(&$form, FormStateInterface $form_state) {
'#default_value' => $default_sort_order,
];
}
- $form['submit']['#weight'] = 10;
}
if (!empty($this->options['reset_button'])) {
diff --git a/web/core/modules/views/src/Plugin/views/field/BulkForm.php b/web/core/modules/views/src/Plugin/views/field/BulkForm.php
index 5719b303b8..b6f28d4b60 100644
--- a/web/core/modules/views/src/Plugin/views/field/BulkForm.php
+++ b/web/core/modules/views/src/Plugin/views/field/BulkForm.php
@@ -406,7 +406,10 @@ public function viewsFormSubmit(&$form, FormStateInterface $form_state) {
foreach ($selected as $bulk_form_key) {
$entity = $this->loadEntityFromBulkFormKey($bulk_form_key);
-
+ // Skip execution if current entity does not exist.
+ if (empty($entity)) {
+ continue;
+ }
// Skip execution if the user did not have access.
if (!$action->getPlugin()->access($entity, $this->view->getUser())) {
$this->messenger->addError($this->t('No access to execute %action on the @entity_type_label %entity_label.', [
@@ -461,8 +464,8 @@ protected function emptySelectedMessage() {
* {@inheritdoc}
*/
public function viewsFormValidate(&$form, FormStateInterface $form_state) {
- $selected = array_filter($form_state->getValue($this->options['id']));
- if (empty($selected)) {
+ $ids = $form_state->getValue($this->options['id']);
+ if (empty($ids) || empty(array_filter($ids))) {
$form_state->setErrorByName('', $this->emptySelectedMessage());
}
}
@@ -488,7 +491,7 @@ public function clickSortable() {
*
* This generates a key that is used as the checkbox return value when
* submitting a bulk form. This key allows the entity for the row to be loaded
- * totally independently of the executed view row.
+ * totally independent of the executed view row.
*
* @param \Drupal\Core\Entity\EntityInterface $entity
* The entity to calculate a bulk form key for.
diff --git a/web/core/modules/views/src/Plugin/views/field/FieldPluginBase.php b/web/core/modules/views/src/Plugin/views/field/FieldPluginBase.php
index 8030f8860a..f8c300ab40 100644
--- a/web/core/modules/views/src/Plugin/views/field/FieldPluginBase.php
+++ b/web/core/modules/views/src/Plugin/views/field/FieldPluginBase.php
@@ -1161,7 +1161,6 @@ public function advancedRender(ResultRow $values) {
}
if ($this->allowAdvancedRender()) {
- $tokens = NULL;
if ($this instanceof MultiItemsFieldHandlerInterface) {
$items = [];
foreach ($raw_items as $count => $item) {
diff --git a/web/core/modules/views/src/Plugin/views/field/FileSize.php b/web/core/modules/views/src/Plugin/views/field/FileSize.php
index c8a0b95681..5af1b94a3c 100644
--- a/web/core/modules/views/src/Plugin/views/field/FileSize.php
+++ b/web/core/modules/views/src/Plugin/views/field/FileSize.php
@@ -49,6 +49,7 @@ public function render(ResultRow $values) {
switch ($this->options['file_size_display']) {
case 'bytes':
return $value;
+
case 'formatted':
default:
return format_size($value);
diff --git a/web/core/modules/views/src/Plugin/views/filter/Combine.php b/web/core/modules/views/src/Plugin/views/filter/Combine.php
index 1af8dd45f8..3492043e92 100644
--- a/web/core/modules/views/src/Plugin/views/filter/Combine.php
+++ b/web/core/modules/views/src/Plugin/views/filter/Combine.php
@@ -76,17 +76,21 @@ public function query() {
}
}
if ($fields) {
- $count = count($fields);
- $separated_fields = [];
- foreach ($fields as $key => $field) {
- $separated_fields[] = $field;
- if ($key < $count - 1) {
- $separated_fields[] = "' '";
- }
+ // We do not use the CONCAT_WS operator when there is only a single field.
+ // Using the CONCAT_WS operator with a single field is not a problem for
+ // the by core supported databases. Only the MS SQL Server requires the
+ // CONCAT_WS operator to be used with at least three arguments.
+ if (count($fields) == 1) {
+ $expression = reset($fields);
+ }
+ else {
+ // Multiple fields are separated by 3 spaces so that so that search
+ // strings that contain spaces are still only matched to single field
+ // values and not to multi-field values that exist only because we do
+ // the concatenation/LIKE trick.
+ $expression = implode(", ' ', ", $fields);
+ $expression = "CONCAT_WS(' ', $expression)";
}
- $expression = implode(', ', $separated_fields);
- $expression = "CONCAT_WS(' ', $expression)";
-
$info = $this->operators();
if (!empty($info[$this->operator]['method'])) {
$this->{$info[$this->operator]['method']}($expression);
diff --git a/web/core/modules/views/src/Plugin/views/filter/NumericFilter.php b/web/core/modules/views/src/Plugin/views/filter/NumericFilter.php
index 05d0cc8979..ee39182077 100644
--- a/web/core/modules/views/src/Plugin/views/filter/NumericFilter.php
+++ b/web/core/modules/views/src/Plugin/views/filter/NumericFilter.php
@@ -428,6 +428,7 @@ public function acceptExposedInput($input) {
return FALSE;
}
break;
+
case 2:
if ($value['min'] === '' && $value['max'] === '') {
return FALSE;
diff --git a/web/core/modules/views/src/Plugin/views/join/JoinPluginBase.php b/web/core/modules/views/src/Plugin/views/join/JoinPluginBase.php
index a0bbedf731..6811dcddc7 100644
--- a/web/core/modules/views/src/Plugin/views/join/JoinPluginBase.php
+++ b/web/core/modules/views/src/Plugin/views/join/JoinPluginBase.php
@@ -37,6 +37,30 @@
* Note that the default join type is a LEFT join when 'type' is not supplied in
* the join plugin configuration.
*
+ * If an SQL expression is needed for the first part of the left table join
+ * condition, 'left_formula' can be used instead of 'left_field'.
+ * For this SQL:
+ * @code
+ * LEFT JOIN {two} ON MAX(one.field_a) = two.field_b AND one.field_c = 'some_val'
+ * @endcode
+ * Use this configuration:
+ * @code
+ * $configuration = array(
+ * 'table' => 'two',
+ * 'field' => 'field_b',
+ * 'left_table' => 'one',
+ * 'left_formula' => 'MAX(one.field_a)',
+ * 'operator' => '=',
+ * 'extra' => array(
+ * 0 => array(
+ * 'left_field' => 'field_c',
+ * 'value' => 'some_val',
+ * ),
+ * ),
+ * );
+ * $join = Views::pluginManager('join')->createInstance('standard', $configuration);
+ * @endcode
+ *
* For this SQL:
* @code
* INNER JOIN {two} ON one.field_a = two.field_b AND one.field_c = 'some_val'
@@ -156,6 +180,13 @@ class JoinPluginBase extends PluginBase implements JoinPluginInterface {
*/
public $leftField;
+ /**
+ * A formula to be used instead of the left field.
+ *
+ * @var string
+ */
+ public $leftFormula;
+
/**
* An array of extra conditions on the join.
*
@@ -238,6 +269,10 @@ public function __construct(array $configuration, $plugin_id, $plugin_definition
$this->leftField = $configuration['left_field'];
$this->field = $configuration['field'];
+ if (!empty($configuration['left_formula'])) {
+ $this->leftFormula = $configuration['left_formula'];
+ }
+
if (!empty($configuration['extra'])) {
$this->extra = $configuration['extra'];
}
@@ -263,7 +298,7 @@ public function buildJoin($select_query, $table, $view_query) {
if ($this->leftTable) {
$left_table = $view_query->getTableInfo($this->leftTable);
- $left_field = "$left_table[alias].$this->leftField";
+ $left_field = $this->leftFormula ?: "$left_table[alias].$this->leftField";
}
else {
// This can be used if left_field is a formula or something. It should be used only *very* rarely.
diff --git a/web/core/modules/views/src/Plugin/views/sort/Date.php b/web/core/modules/views/src/Plugin/views/sort/Date.php
index 0c7d9e14fc..3deae3ed86 100644
--- a/web/core/modules/views/src/Plugin/views/sort/Date.php
+++ b/web/core/modules/views/src/Plugin/views/sort/Date.php
@@ -51,18 +51,23 @@ public function query() {
default:
$this->query->addOrderBy($this->tableAlias, $this->realField, $this->options['order']);
return;
+
case 'minute':
$formula = $this->getDateFormat('YmdHi');
break;
+
case 'hour':
$formula = $this->getDateFormat('YmdH');
break;
+
case 'day':
$formula = $this->getDateFormat('Ymd');
break;
+
case 'month':
$formula = $this->getDateFormat('Ym');
break;
+
case 'year':
$formula = $this->getDateFormat('Y');
break;
diff --git a/web/core/modules/views/src/Routing/ViewPageController.php b/web/core/modules/views/src/Routing/ViewPageController.php
index 0eb41cbadb..a27ddbaf29 100644
--- a/web/core/modules/views/src/Routing/ViewPageController.php
+++ b/web/core/modules/views/src/Routing/ViewPageController.php
@@ -47,13 +47,13 @@ public function handle($view_id, $display_id, RouteMatchInterface $route_match)
}
}
- /** @var \Drupal\views\Plugin\views\display\DisplayPluginBase $class */
$class = $route->getOption('_view_display_plugin_class');
if ($route->getOption('returns_response')) {
/** @var \Drupal\views\Plugin\views\display\ResponseDisplayPluginInterface $class */
return $class::buildResponse($view_id, $display_id, $args);
}
else {
+ /** @var \Drupal\views\Plugin\views\display\Page $class */
$build = $class::buildBasicRenderable($view_id, $display_id, $args, $route);
Page::setPageRenderArray($build);
diff --git a/web/core/modules/views/src/Tests/ViewKernelTestBase.php b/web/core/modules/views/src/Tests/ViewKernelTestBase.php
index 918f8b503f..2a2caa39e9 100644
--- a/web/core/modules/views/src/Tests/ViewKernelTestBase.php
+++ b/web/core/modules/views/src/Tests/ViewKernelTestBase.php
@@ -29,7 +29,13 @@ abstract class ViewKernelTestBase extends KernelTestBase {
*
* @var array
*/
- public static $modules = ['system', 'views', 'views_test_config', 'views_test_data', 'user'];
+ public static $modules = [
+ 'system',
+ 'views',
+ 'views_test_config',
+ 'views_test_data',
+ 'user',
+ ];
/**
* {@inheritdoc}
diff --git a/web/core/modules/views/src/Views.php b/web/core/modules/views/src/Views.php
index d34380c078..86dcdf7a9a 100644
--- a/web/core/modules/views/src/Views.php
+++ b/web/core/modules/views/src/Views.php
@@ -308,6 +308,7 @@ public static function getViewsAsOptions($views_only = FALSE, $filter = 'all', $
$filter = ucfirst($filter);
$views = call_user_func("static::get{$filter}Views");
break;
+
default:
return [];
}
diff --git a/web/core/modules/views/src/ViewsConfigUpdater.php b/web/core/modules/views/src/ViewsConfigUpdater.php
new file mode 100644
index 0000000000..af3260405a
--- /dev/null
+++ b/web/core/modules/views/src/ViewsConfigUpdater.php
@@ -0,0 +1,415 @@
+<?php
+
+namespace Drupal\views;
+
+use Drupal\Component\Utility\NestedArray;
+use Drupal\Core\Config\Schema\ArrayElement;
+use Drupal\Core\Config\TypedConfigManagerInterface;
+use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
+use Drupal\Core\Entity\EntityFieldManagerInterface;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\Core\Entity\Sql\DefaultTableMapping;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Provides a BC layer for modules providing old configurations.
+ *
+ * @internal
+ * This class is only meant to fix outdated views configuration and its
+ * methods should not be invoked directly. It will be removed once all the
+ * public methods have been deprecated and removed.
+ */
+class ViewsConfigUpdater implements ContainerInjectionInterface {
+
+ /**
+ * The entity type manager.
+ *
+ * @var \Drupal\Core\Entity\EntityTypeManagerInterface
+ */
+ protected $entityTypeManager;
+
+ /**
+ * The entity field manager.
+ *
+ * @var \Drupal\Core\Entity\EntityFieldManagerInterface
+ */
+ protected $entityFieldManager;
+
+ /**
+ * The typed config manager.
+ *
+ * @var \Drupal\Core\Config\TypedConfigManagerInterface
+ */
+ protected $typedConfigManager;
+
+ /**
+ * The views data service.
+ *
+ * @var \Drupal\views\ViewsData
+ */
+ protected $viewsData;
+
+ /**
+ * An array of helper data for the multivalue base field update.
+ *
+ * @var array
+ */
+ protected $multivalueBaseFieldsUpdateTableInfo;
+
+ /**
+ * ViewsConfigUpdater constructor.
+ *
+ * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
+ * The entity type manager.
+ * @param \Drupal\Core\Entity\EntityFieldManagerInterface $entity_field_manager
+ * The entity field manager.
+ * @param \Drupal\Core\Config\TypedConfigManagerInterface $typed_config_manager
+ * The typed config manager.
+ * @param \Drupal\views\ViewsData $views_data
+ * The views data service.
+ */
+ public function __construct(
+ EntityTypeManagerInterface $entity_type_manager,
+ EntityFieldManagerInterface $entity_field_manager,
+ TypedConfigManagerInterface $typed_config_manager,
+ ViewsData $views_data
+ ) {
+ $this->entityTypeManager = $entity_type_manager;
+ $this->entityFieldManager = $entity_field_manager;
+ $this->typedConfigManager = $typed_config_manager;
+ $this->viewsData = $views_data;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public static function create(ContainerInterface $container) {
+ return new static(
+ $container->get('entity_type.manager'),
+ $container->get('entity_field.manager'),
+ $container->get('config.typed'),
+ $container->get('views.views_data')
+ );
+ }
+
+ /**
+ * Performs all required updates.
+ *
+ * @param \Drupal\views\ViewEntityInterface $view
+ * The View to update.
+ *
+ * @return bool
+ * Whether the view was updated.
+ */
+ public function updateAll(ViewEntityInterface $view) {
+ return $this->processDisplayHandlers($view, FALSE, function (&$handler, $handler_type, $key, $display_id) use ($view) {
+ $changed = FALSE;
+ if ($this->processEntityLinkUrlHandler($handler, $handler_type)) {
+ $changed = TRUE;
+ }
+ if ($this->processOperatorDefaultsHandler($handler, $handler_type)) {
+ $changed = TRUE;
+ }
+ if ($this->processMultivalueBaseFieldHandler($handler, $handler_type, $key, $display_id, $view)) {
+ $changed = TRUE;
+ }
+ return $changed;
+ });
+ }
+
+ /**
+ * Processes all display handlers.
+ *
+ * @param \Drupal\views\ViewEntityInterface $view
+ * The View to update.
+ * @param bool $return_on_changed
+ * Whether processing should stop after a change is detected.
+ * @param callable $handler_processor
+ * A callback performing the actual update.
+ *
+ * @return bool
+ * Whether the view was updated.
+ */
+ protected function processDisplayHandlers(ViewEntityInterface $view, $return_on_changed, callable $handler_processor) {
+ $changed = FALSE;
+ $displays = $view->get('display');
+ $handler_types = ['field', 'argument', 'sort', 'relationship', 'filter'];
+
+ foreach ($displays as $display_id => &$display) {
+ foreach ($handler_types as $handler_type) {
+ $handler_type_plural = $handler_type . 's';
+ if (!empty($display['display_options'][$handler_type_plural])) {
+ foreach ($display['display_options'][$handler_type_plural] as $key => &$handler) {
+ if ($handler_processor($handler, $handler_type, $key, $display_id)) {
+ $changed = TRUE;
+ if ($return_on_changed) {
+ return $changed;
+ }
+ }
+ }
+ }
+ }
+ }
+
+ if ($changed) {
+ $view->set('display', $displays);
+ }
+
+ return $changed;
+ }
+
+ /**
+ * Add additional settings to the entity link field.
+ *
+ * @param \Drupal\views\ViewEntityInterface $view
+ * The View to update.
+ *
+ * @return bool
+ * Whether the view was updated.
+ */
+ public function needsEntityLinkUrlUpdate(ViewEntityInterface $view) {
+ return $this->processDisplayHandlers($view, TRUE, function (&$handler, $handler_type) {
+ return $this->processEntityLinkUrlHandler($handler, $handler_type);
+ });
+ }
+
+ /**
+ * Processes entity link URL fields.
+ *
+ * @param array $handler
+ * A display handler.
+ * @param string $handler_type
+ * The handler type.
+ *
+ * @return bool
+ * Whether the handler was updated.
+ */
+ protected function processEntityLinkUrlHandler(array &$handler, $handler_type) {
+ $changed = FALSE;
+
+ if ($handler_type === 'field') {
+ if (isset($handler['plugin_id']) && $handler['plugin_id'] === 'entity_link') {
+ // Add any missing settings for entity_link.
+ if (!isset($handler['output_url_as_text'])) {
+ $handler['output_url_as_text'] = FALSE;
+ $changed = TRUE;
+ }
+ if (!isset($handler['absolute'])) {
+ $handler['absolute'] = FALSE;
+ $changed = TRUE;
+ }
+ }
+ elseif (isset($handler['plugin_id']) && $handler['plugin_id'] === 'node_path') {
+ // Convert the use of node_path to entity_link.
+ $handler['plugin_id'] = 'entity_link';
+ $handler['field'] = 'view_node';
+ $handler['output_url_as_text'] = TRUE;
+ $changed = TRUE;
+ }
+ }
+
+ return $changed;
+ }
+
+ /**
+ * Add additional settings to the entity link field.
+ *
+ * @param \Drupal\views\ViewEntityInterface $view
+ * The View to update.
+ *
+ * @return bool
+ * Whether the view was updated.
+ */
+ public function needsOperatorDefaultsUpdate(ViewEntityInterface $view) {
+ return $this->processDisplayHandlers($view, TRUE, function (&$handler, $handler_type) {
+ return $this->processOperatorDefaultsHandler($handler, $handler_type);
+ });
+ }
+
+ /**
+ * Processes operator defaults.
+ *
+ * @param array $handler
+ * A display handler.
+ * @param string $handler_type
+ * The handler type.
+ *
+ * @return bool
+ * Whether the handler was updated.
+ */
+ protected function processOperatorDefaultsHandler(array &$handler, $handler_type) {
+ $changed = FALSE;
+
+ if ($handler_type === 'filter') {
+ if (!isset($handler['expose']['operator_limit_selection'])) {
+ $handler['expose']['operator_limit_selection'] = FALSE;
+ $changed = TRUE;
+ }
+ if (!isset($handler['expose']['operator_list'])) {
+ $handler['expose']['operator_list'] = [];
+ $changed = TRUE;
+ }
+ }
+
+ return $changed;
+ }
+
+ /**
+ * Update field names for multi-value base fields.
+ *
+ * @param \Drupal\views\ViewEntityInterface $view
+ * The View to update.
+ *
+ * @return bool
+ * Whether the view was updated.
+ */
+ public function needsMultivalueBaseFieldUpdate(ViewEntityInterface $view) {
+ if ($this->getMultivalueBaseFieldUpdateTableInfo()) {
+ return $this->processDisplayHandlers($view, TRUE, function (&$handler, $handler_type, $key, $display_id) use ($view) {
+ return $this->processMultivalueBaseFieldHandler($handler, $handler_type, $key, $display_id, $view);
+ });
+ }
+ return FALSE;
+ }
+
+ /**
+ * Returns the multivalue base fields update table info.
+ *
+ * @return array
+ * An array of multivalue base field info.
+ */
+ protected function getMultivalueBaseFieldUpdateTableInfo() {
+ $table_info = &$this->multivalueBaseFieldsUpdateTableInfo;
+
+ if (!isset($table_info)) {
+ $table_info = [];
+
+ foreach ($this->entityTypeManager->getDefinitions() as $entity_type_id => $entity_type) {
+ if ($entity_type->hasHandlerClass('views_data')) {
+ $base_field_definitions = $this->entityFieldManager->getBaseFieldDefinitions($entity_type_id);
+
+ $entity_storage = $this->entityTypeManager->getStorage($entity_type_id);
+ $table_mapping = $entity_storage->getTableMapping($base_field_definitions);
+ if (!$table_mapping instanceof DefaultTableMapping) {
+ continue;
+ }
+
+ foreach ($base_field_definitions as $field_name => $base_field_definition) {
+ $base_field_storage_definition = $base_field_definition->getFieldStorageDefinition();
+
+ // Skip single value and custom storage base fields.
+ if (!$base_field_storage_definition->isMultiple() || $base_field_storage_definition->hasCustomStorage()) {
+ continue;
+ }
+
+ // Get the actual table, as well as the column for the main property
+ // name, so we can perform an update on the views in
+ // ::updateFieldNamesForMultivalueBaseFields().
+ $table_name = $table_mapping->getFieldTableName($field_name);
+ $main_property_name = $base_field_storage_definition->getMainPropertyName();
+
+ $table_info[$table_name][$field_name] = $table_mapping->getFieldColumnName($base_field_storage_definition, $main_property_name);
+ }
+ }
+ }
+ }
+
+ return $table_info;
+ }
+
+ /**
+ * Processes handlers affected by the multivalue base field update.
+ *
+ * @param array $handler
+ * A display handler.
+ * @param string $handler_type
+ * The handler type.
+ * @param string $key
+ * The handler key.
+ * @param string $display_id
+ * The handler display ID.
+ * @param \Drupal\views\ViewEntityInterface $view
+ * The view being updated.
+ *
+ * @return bool
+ * Whether the handler was updated.
+ */
+ protected function processMultivalueBaseFieldHandler(array &$handler, $handler_type, $key, $display_id, ViewEntityInterface $view) {
+ $changed = FALSE;
+
+ // If there are no multivalue base fields we have nothing to do.
+ $table_info = $this->getMultivalueBaseFieldUpdateTableInfo();
+ if (!$table_info) {
+ return $changed;
+ }
+
+ // Only if the wrong field name is set do we process the field. It
+ // could already be using the correct field. Like "user__roles" vs
+ // "roles_target_id".
+ if (isset($handler['table']) && isset($table_info[$handler['table']]) && isset($table_info[$handler['table']][$handler['field']])) {
+ $changed = TRUE;
+ $original_field_name = $handler['field'];
+ $handler['field'] = $table_info[$handler['table']][$original_field_name];
+ $handler['plugin_id'] = $this->viewsData->get($handler['table'])[$table_info[$handler['table']][$original_field_name]][$handler_type]['id'];
+
+ // Retrieve type data information about the handler to clean it up
+ // reliably. We need to manually create a typed view rather than
+ // instantiating the current one, as the schema will be affected by the
+ // updated values.
+ $id = 'views.view.' . $view->id();
+ $path_to_handler = "display.$display_id.display_options.{$handler_type}s.$key";
+ $view_config = $view->toArray();
+ $keys = explode('.', $path_to_handler);
+ NestedArray::setValue($view_config, $keys, $handler);
+ /** @var \Drupal\Core\Config\Schema\TypedConfigInterface $typed_view */
+ $typed_view = $this->typedConfigManager->createFromNameAndData($id, $view_config);
+ /** @var \Drupal\Core\Config\Schema\ArrayElement $typed_handler */
+ $typed_handler = $typed_view->get($path_to_handler);
+
+ // Filter values we want to convert from a string to an array.
+ if ($handler_type === 'filter' && $typed_handler->get('value') instanceof ArrayElement && is_string($handler['value'])) {
+ // An empty string cast to an array is an array with one element.
+ if ($handler['value'] === '') {
+ $handler['value'] = [];
+ }
+ else {
+ $handler['value'] = (array) $handler['value'];
+ }
+ $handler['operator'] = $this->mapOperatorFromSingleToMultiple($handler['operator']);
+ }
+
+ // For all the other fields we try to determine the fields using config
+ // schema and remove everything not being defined in the new handler.
+ foreach (array_keys($handler) as $handler_key) {
+ if (!isset($typed_handler->getDataDefinition()['mapping'][$handler_key])) {
+ unset($handler[$handler_key]);
+ }
+ }
+ }
+
+ return $changed;
+ }
+
+ /**
+ * Maps a single operator to a multiple one, if possible.
+ *
+ * @param string $single_operator
+ * A single operator.
+ *
+ * @return string
+ * A multiple operator or the original one if no mapping was available.
+ */
+ protected function mapOperatorFromSingleToMultiple($single_operator) {
+ switch ($single_operator) {
+ case '=':
+ return 'or';
+
+ case '!=':
+ return 'not';
+
+ default:
+ return $single_operator;
+ }
+ }
+
+}
diff --git a/web/core/modules/views/templates/views-view-table.html.twig b/web/core/modules/views/templates/views-view-table.html.twig
index 0c0b445836..0f0bd5ebcb 100644
--- a/web/core/modules/views/templates/views-view-table.html.twig
+++ b/web/core/modules/views/templates/views-view-table.html.twig
@@ -26,6 +26,7 @@
* used.
* - responsive: A flag indicating whether table is responsive.
* - sticky: A flag indicating whether table header is sticky.
+ * - summary_element: A render array with table summary information (if any).
*
* @see template_preprocess_views_view_table()
*
@@ -47,15 +48,8 @@
{% else %}
{{ title }}
{% endif %}
- {% if (summary is not empty) or (description is not empty) %}
- <details>
- {% if summary is not empty %}
- <summary>{{ summary }}</summary>
- {% endif %}
- {% if description is not empty %}
- {{ description }}
- {% endif %}
- </details>
+ {% if (summary_element is not empty) %}
+ {{ summary_element }}
{% endif %}
</caption>
{% endif %}
@@ -75,14 +69,14 @@
{%- if column.wrapper_element -%}
<{{ column.wrapper_element }}>
{%- if column.url -%}
- <a href="{{ column.url }}" title="{{ column.title }}">{{ column.content }}{{ column.sort_indicator }}</a>
+ <a href="{{ column.url }}" title="{{ column.title }}" rel="nofollow">{{ column.content }}{{ column.sort_indicator }}</a>
{%- else -%}
{{ column.content }}{{ column.sort_indicator }}
{%- endif -%}
</{{ column.wrapper_element }}>
{%- else -%}
{%- if column.url -%}
- <a href="{{ column.url }}" title="{{ column.title }}">{{ column.content }}{{ column.sort_indicator }}</a>
+ <a href="{{ column.url }}" title="{{ column.title }}" rel="nofollow">{{ column.content }}{{ column.sort_indicator }}</a>
{%- else -%}
{{- column.content }}{{ column.sort_indicator }}
{%- endif -%}
diff --git a/web/core/modules/views/tests/fixtures/update/views.view.test_user_multi_value.yml b/web/core/modules/views/tests/fixtures/update/views.view.test_user_multi_value.yml
new file mode 100644
index 0000000000..2d68cbe4c4
--- /dev/null
+++ b/web/core/modules/views/tests/fixtures/update/views.view.test_user_multi_value.yml
@@ -0,0 +1,240 @@
+uuid: 001475a0-daec-4e8a-8ca7-97b0d24100a6
+langcode: en
+status: true
+dependencies:
+ module:
+ - user
+id: test_user_multi_value
+label: test_user_multi_value
+module: views
+description: ''
+tag: ''
+base_table: users_field_data
+base_field: uid
+core: 8.x
+display:
+ default:
+ display_plugin: default
+ id: default
+ display_title: Master
+ position: 0
+ display_options:
+ access:
+ type: perm
+ options:
+ perm: 'access user profiles'
+ cache:
+ type: tag
+ options: { }
+ query:
+ type: views_query
+ options:
+ disable_sql_rewrite: false
+ distinct: false
+ replica: false
+ query_comment: ''
+ query_tags: { }
+ exposed_form:
+ type: basic
+ options:
+ submit_button: Filter
+ reset_button: false
+ reset_button_label: Reset
+ exposed_sorts_label: 'Sort by'
+ expose_sort_order: true
+ sort_asc_label: Asc
+ sort_desc_label: Desc
+ pager:
+ type: mini
+ options:
+ items_per_page: 10
+ offset: 0
+ id: 0
+ total_pages: null
+ expose:
+ items_per_page: false
+ items_per_page_label: 'Items per page'
+ items_per_page_options: '5, 10, 25, 50'
+ items_per_page_options_all: false
+ items_per_page_options_all_label: '- All -'
+ offset: false
+ offset_label: Offset
+ tags:
+ previous: ‹‹
+ next: ››
+ style:
+ type: default
+ options:
+ grouping: { }
+ row_class: ''
+ default_row_class: true
+ uses_fields: false
+ row:
+ type: fields
+ options:
+ inline: { }
+ separator: ''
+ hide_empty: false
+ default_field_elements: true
+ fields:
+ roles:
+ id: roles
+ table: user__roles
+ field: roles
+ relationship: none
+ group_type: group
+ admin_label: ''
+ label: ''
+ exclude: false
+ alter:
+ alter_text: false
+ text: ''
+ make_link: false
+ path: ''
+ absolute: false
+ external: false
+ replace_spaces: false
+ path_case: none
+ trim_whitespace: false
+ alt: ''
+ rel: ''
+ link_class: ''
+ prefix: ''
+ suffix: ''
+ target: ''
+ nl2br: false
+ max_length: 0
+ word_boundary: true
+ ellipsis: true
+ more_link: false
+ more_link_text: ''
+ more_link_path: ''
+ strip_tags: false
+ trim: false
+ preserve_tags: ''
+ html: false
+ element_type: ''
+ element_class: ''
+ element_label_type: ''
+ element_label_class: ''
+ element_label_colon: false
+ element_wrapper_type: ''
+ element_wrapper_class: ''
+ element_default_classes: true
+ empty: ''
+ hide_empty: false
+ empty_zero: false
+ hide_alter_empty: true
+ click_sort_column: target_id
+ type: entity_reference_label
+ settings:
+ link: true
+ group_column: target_id
+ group_columns: { }
+ group_rows: true
+ delta_limit: 0
+ delta_offset: 0
+ delta_reversed: false
+ delta_first_last: false
+ multi_type: separator
+ separator: ', '
+ field_api_classes: false
+ entity_type: user
+ entity_field: roles
+ plugin_id: field
+ filters:
+ roles:
+ id: roles
+ table: user__roles
+ field: roles
+ relationship: none
+ group_type: group
+ admin_label: ''
+ operator: '='
+ value: ''
+ group: 1
+ exposed: false
+ expose:
+ operator_id: ''
+ label: ''
+ description: ''
+ use_operator: false
+ operator: ''
+ identifier: ''
+ required: false
+ remember: false
+ multiple: false
+ remember_roles:
+ authenticated: authenticated
+ is_grouped: false
+ group_info:
+ label: ''
+ description: ''
+ identifier: ''
+ optional: true
+ widget: select
+ multiple: false
+ remember: false
+ default_group: All
+ default_group_multiple: { }
+ group_items: { }
+ entity_type: user
+ entity_field: roles
+ plugin_id: string
+ sorts: { }
+ header: { }
+ footer: { }
+ empty: { }
+ relationships: { }
+ arguments:
+ roles:
+ id: roles
+ table: user__roles
+ field: roles
+ relationship: none
+ group_type: group
+ admin_label: ''
+ default_action: ignore
+ exception:
+ value: all
+ title_enable: false
+ title: All
+ title_enable: false
+ title: ''
+ default_argument_type: fixed
+ default_argument_options:
+ argument: ''
+ default_argument_skip_url: false
+ summary_options:
+ base_path: ''
+ count: true
+ items_per_page: 25
+ override: false
+ summary:
+ sort_order: asc
+ number_of_records: 0
+ format: default_summary
+ specify_validation: false
+ validate:
+ type: none
+ fail: 'not found'
+ validate_options: { }
+ glossary: false
+ limit: 0
+ case: none
+ path_case: none
+ transform_dash: false
+ break_phrase: false
+ entity_type: user
+ entity_field: roles
+ plugin_id: string
+ display_extenders: { }
+ cache_metadata:
+ max-age: -1
+ contexts:
+ - 'languages:language_content'
+ - 'languages:language_interface'
+ - url
+ - url.query_args
+ - user.permissions
+ tags: { }
diff --git a/web/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_transform_term.yml b/web/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_transform_term.yml
new file mode 100644
index 0000000000..7d7d8b1904
--- /dev/null
+++ b/web/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_transform_term.yml
@@ -0,0 +1,217 @@
+langcode: en
+status: true
+dependencies:
+ module:
+ - node
+ - taxonomy
+ - user
+id: test_argument_transform_term
+label: test_argument_transform_term
+module: views
+description: ''
+tag: ''
+base_table: node_field_data
+base_field: nid
+display:
+ default:
+ display_plugin: default
+ id: default
+ display_title: Master
+ position: 0
+ display_options:
+ access:
+ type: perm
+ options:
+ perm: 'access content'
+ cache:
+ type: none
+ options: { }
+ query:
+ type: views_query
+ options:
+ disable_sql_rewrite: false
+ distinct: false
+ replica: false
+ query_comment: ''
+ query_tags: { }
+ exposed_form:
+ type: basic
+ options:
+ submit_button: Apply
+ reset_button: false
+ reset_button_label: Reset
+ exposed_sorts_label: 'Sort by'
+ expose_sort_order: true
+ sort_asc_label: Asc
+ sort_desc_label: Desc
+ pager:
+ type: full
+ options:
+ items_per_page: 10
+ offset: 0
+ id: 0
+ total_pages: null
+ expose:
+ items_per_page: false
+ items_per_page_label: 'Items per page'
+ items_per_page_options: '5, 10, 25, 50'
+ items_per_page_options_all: false
+ items_per_page_options_all_label: '- All -'
+ offset: false
+ offset_label: Offset
+ tags:
+ previous: '‹ Previous'
+ next: 'Next ›'
+ first: '« First'
+ last: 'Last »'
+ quantity: 9
+ style:
+ type: default
+ options:
+ grouping: { }
+ row_class: ''
+ default_row_class: true
+ uses_fields: false
+ row:
+ type: fields
+ options:
+ inline: { }
+ separator: ''
+ hide_empty: false
+ default_field_elements: true
+ fields:
+ title:
+ id: title
+ table: node_field_data
+ field: title
+ entity_type: node
+ entity_field: title
+ label: ''
+ alter:
+ alter_text: false
+ make_link: false
+ absolute: false
+ trim: false
+ word_boundary: false
+ ellipsis: false
+ strip_tags: false
+ html: false
+ hide_empty: false
+ empty_zero: false
+ settings:
+ link_to_entity: true
+ plugin_id: field
+ relationship: none
+ group_type: group
+ admin_label: ''
+ exclude: false
+ element_type: ''
+ element_class: ''
+ element_label_type: ''
+ element_label_class: ''
+ element_label_colon: true
+ element_wrapper_type: ''
+ element_wrapper_class: ''
+ element_default_classes: true
+ empty: ''
+ hide_alter_empty: true
+ click_sort_column: value
+ type: string
+ group_column: value
+ group_columns: { }
+ group_rows: true
+ delta_limit: 0
+ delta_offset: 0
+ delta_reversed: false
+ delta_first_last: false
+ multi_type: separator
+ separator: ', '
+ field_api_classes: false
+ filters:
+ status:
+ value: '1'
+ table: node_field_data
+ field: status
+ plugin_id: boolean
+ entity_type: node
+ entity_field: status
+ id: status
+ expose:
+ operator: ''
+ operator_limit_selection: false
+ operator_list: { }
+ group: 1
+ sorts:
+ created:
+ id: created
+ table: node_field_data
+ field: created
+ order: DESC
+ entity_type: node
+ entity_field: created
+ plugin_id: date
+ relationship: none
+ group_type: group
+ admin_label: ''
+ exposed: false
+ expose:
+ label: ''
+ granularity: second
+ header: { }
+ footer: { }
+ empty: { }
+ relationships: { }
+ arguments:
+ tid:
+ id: tid
+ table: taxonomy_index
+ field: tid
+ relationship: none
+ group_type: group
+ admin_label: ''
+ default_action: ignore
+ exception:
+ value: all
+ title_enable: false
+ title: All
+ title_enable: true
+ title: '{{ raw_arguments.tid }}'
+ default_argument_type: fixed
+ default_argument_options:
+ argument: ''
+ default_argument_skip_url: false
+ summary_options:
+ base_path: ''
+ count: true
+ items_per_page: 25
+ override: false
+ summary:
+ sort_order: asc
+ number_of_records: 0
+ format: default_summary
+ specify_validation: true
+ validate:
+ type: taxonomy_term_name
+ fail: 'not found'
+ validate_options:
+ operation: view
+ transform: true
+ bundles: { }
+ access: false
+ break_phrase: false
+ add_table: false
+ require_value: false
+ reduce_duplicates: false
+ plugin_id: taxonomy_index_tid
+ display_extenders: { }
+ cache_metadata:
+ contexts:
+ - 'languages:language_content'
+ - 'languages:language_interface'
+ - url
+ - url.query_args
+ - 'user.node_grants:view'
+ - user.permissions
+ cacheable: false
+ max-age: -1
+ tags: { }
diff --git a/web/core/modules/views/tests/modules/views_test_data/src/Plugin/views/query/QueryTest.php b/web/core/modules/views/tests/modules/views_test_data/src/Plugin/views/query/QueryTest.php
index 71aa2defcc..2d475c97b1 100644
--- a/web/core/modules/views/tests/modules/views_test_data/src/Plugin/views/query/QueryTest.php
+++ b/web/core/modules/views/tests/modules/views_test_data/src/Plugin/views/query/QueryTest.php
@@ -135,6 +135,7 @@ public function match($element, $condition) {
switch ($condition['operator']) {
case '=':
return $value == $condition['value'];
+
case 'IN':
return in_array($value, $condition['value']);
}
diff --git a/web/core/modules/views/tests/src/Functional/BulkFormTest.php b/web/core/modules/views/tests/src/Functional/BulkFormTest.php
index 8f49155b88..8d72267d54 100644
--- a/web/core/modules/views/tests/src/Functional/BulkFormTest.php
+++ b/web/core/modules/views/tests/src/Functional/BulkFormTest.php
@@ -43,6 +43,7 @@ public function testBulkForm() {
// array.
$timestamp = REQUEST_TIME - $i;
$nodes[] = $this->drupalCreateNode([
+ 'title' => 'Node ' . $i,
'sticky' => FALSE,
'created' => $timestamp,
'changed' => $timestamp,
@@ -112,7 +113,7 @@ public function testBulkForm() {
$this->drupalGet('test_bulk_form');
$options = $this->xpath('//select[@id=:id]/option', [':id' => 'edit-action']);
- $this->assertEqual(count($options), 2);
+ $this->assertCount(2, $options);
$this->assertOption('edit-action', 'node_make_sticky_action');
$this->assertOption('edit-action', 'node_make_unsticky_action');
@@ -157,6 +158,57 @@ public function testBulkForm() {
$this->assertText(t('Deleted 5 content items.'));
// Check if we got redirected to the original page.
$this->assertUrl('test_bulk_form');
+
+ // Test that the bulk form works when a node gets deleted by another user
+ // before the loaded bulk form can be used.
+ $this->drupalGet('test_bulk_form');
+ // Now delete the node we want to delete with the bulk form.
+ $link = $this->getSession()->getPage()->findLink($nodes[6]->label());
+ $checkbox = $link->getParent()->getParent()->find('css', 'input');
+ $nodes[6]->delete();
+ $edit = [
+ $checkbox->getAttribute('name') => TRUE,
+ 'action' => 'node_delete_action',
+ ];
+ $this->drupalPostForm(NULL, $edit, t('Apply to selected items'));
+ // Make sure we just return to the bulk view with no warnings.
+ $this->assertUrl('test_bulk_form');
+ $errors = $this->xpath('//div[contains(@class, "messages--status")]');
+ $this->assertEmpty($errors, 'No action message shown.');
+
+ // Test that the bulk form works when multiple nodes are selected
+ // but one of the selected nodes are already deleted by another user before
+ // the loaded bulk form was submitted.
+ $this->drupalGet('test_bulk_form');
+ // Call the node delete action.
+ $nodes[7]->delete();
+ $edit = [
+ 'node_bulk_form[0]' => TRUE,
+ 'node_bulk_form[1]' => TRUE,
+ 'action' => 'node_delete_action',
+ ];
+ $this->drupalPostForm(NULL, $edit, t('Apply to selected items'));
+ // Make sure we don't show an action message while we are still on the
+ // confirmation page.
+ $errors = $this->xpath('//div[contains(@class, "messages--status")]');
+ $this->assertEmpty($errors, 'No action message shown.');
+ $this->drupalPostForm(NULL, [], t('Delete'));
+ $this->assertText(t('Deleted 1 content item.'));
+
+ // Test that the bulk form works when multiple nodes are selected
+ // but all of the selected nodes are already deleted
+ // by another user before the loaded bulk form was submitted.
+ $this->drupalGet('test_bulk_form');
+ // Call the node delete action.
+ foreach ($nodes as $key => $node) {
+ $node->delete();
+ }
+ $edit = [
+ 'node_bulk_form[0]' => TRUE,
+ 'action' => 'node_delete_action',
+ ];
+ $this->drupalPostForm(NULL, $edit, t('Apply to selected items'));
+ $this->assertText('No content selected.');
}
}
diff --git a/web/core/modules/views/tests/src/Functional/DefaultViewsTest.php b/web/core/modules/views/tests/src/Functional/DefaultViewsTest.php
index 071786a470..9a945cc060 100644
--- a/web/core/modules/views/tests/src/Functional/DefaultViewsTest.php
+++ b/web/core/modules/views/tests/src/Functional/DefaultViewsTest.php
@@ -30,7 +30,15 @@ class DefaultViewsTest extends ViewTestBase {
*
* @var array
*/
- public static $modules = ['views', 'node', 'search', 'comment', 'taxonomy', 'block', 'user'];
+ public static $modules = [
+ 'views',
+ 'node',
+ 'search',
+ 'comment',
+ 'taxonomy',
+ 'block',
+ 'user',
+ ];
/**
* {@inheritdoc}
@@ -232,7 +240,7 @@ public function testArchiveView() {
\Drupal::service('router.builder')->rebuild();
$this->drupalGet('archive');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
}
}
diff --git a/web/core/modules/views/tests/src/Functional/Entity/FieldEntityTranslationTest.php b/web/core/modules/views/tests/src/Functional/Entity/FieldEntityTranslationTest.php
index 6c82768153..a386250014 100644
--- a/web/core/modules/views/tests/src/Functional/Entity/FieldEntityTranslationTest.php
+++ b/web/core/modules/views/tests/src/Functional/Entity/FieldEntityTranslationTest.php
@@ -19,7 +19,12 @@ class FieldEntityTranslationTest extends ViewTestBase {
/**
* {@inheritdoc}
*/
- public static $modules = ['language', 'locale', 'content_translation', 'node'];
+ public static $modules = [
+ 'language',
+ 'locale',
+ 'content_translation',
+ 'node',
+ ];
/**
* {@inheritdoc}
diff --git a/web/core/modules/views/tests/src/Functional/Entity/FieldRenderedEntityTranslationTest.php b/web/core/modules/views/tests/src/Functional/Entity/FieldRenderedEntityTranslationTest.php
index 7d7b3d2454..a66fe15c8a 100644
--- a/web/core/modules/views/tests/src/Functional/Entity/FieldRenderedEntityTranslationTest.php
+++ b/web/core/modules/views/tests/src/Functional/Entity/FieldRenderedEntityTranslationTest.php
@@ -16,7 +16,12 @@ class FieldRenderedEntityTranslationTest extends ViewTestBase {
/**
* {@inheritdoc}
*/
- public static $modules = ['language', 'locale', 'content_translation', 'node'];
+ public static $modules = [
+ 'language',
+ 'locale',
+ 'content_translation',
+ 'node',
+ ];
/**
* {@inheritdoc}
diff --git a/web/core/modules/views/tests/src/Functional/Entity/ViewNonTranslatableEntityTest.php b/web/core/modules/views/tests/src/Functional/Entity/ViewNonTranslatableEntityTest.php
index e8d9094f85..50fd4cabfc 100644
--- a/web/core/modules/views/tests/src/Functional/Entity/ViewNonTranslatableEntityTest.php
+++ b/web/core/modules/views/tests/src/Functional/Entity/ViewNonTranslatableEntityTest.php
@@ -43,7 +43,7 @@ public function testViewNoTranslatableEntity() {
// Visit the view page and assert it is displayed properly.
$this->drupalGet('no-entity-translation-view');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertText('No Entity Translation View');
$this->assertText($no_language_entity->uuid());
}
diff --git a/web/core/modules/views/tests/src/Functional/GlossaryTest.php b/web/core/modules/views/tests/src/Functional/GlossaryTest.php
index 2adac436b2..f3a5dcdce6 100644
--- a/web/core/modules/views/tests/src/Functional/GlossaryTest.php
+++ b/web/core/modules/views/tests/src/Functional/GlossaryTest.php
@@ -110,7 +110,7 @@ public function testGlossaryView() {
// Check the actual page response.
$this->drupalGet($url);
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
foreach ($nodes_per_char as $char => $count) {
$href = Url::fromRoute('view.glossary.page_1', ['arg_0' => $char])->toString();
$label = mb_strtoupper($char);
diff --git a/web/core/modules/views/tests/src/Functional/Handler/AreaHTTPStatusCodeTest.php b/web/core/modules/views/tests/src/Functional/Handler/AreaHTTPStatusCodeTest.php
index d284f4719a..88d7ae8f66 100644
--- a/web/core/modules/views/tests/src/Functional/Handler/AreaHTTPStatusCodeTest.php
+++ b/web/core/modules/views/tests/src/Functional/Handler/AreaHTTPStatusCodeTest.php
@@ -37,7 +37,7 @@ class AreaHTTPStatusCodeTest extends ViewTestBase {
*/
public function testHTTPStatusCodeHandler() {
$this->drupalGet('test-http-status-code');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Change the HTTP status code to 418.
$view = Views::getView('test_http_status_code');
@@ -47,7 +47,7 @@ public function testHTTPStatusCodeHandler() {
// Test that the HTTP response is "I'm a teapot".
$this->drupalGet('test-http-status-code');
- $this->assertResponse(418);
+ $this->assertSession()->statusCodeEquals(418);
}
}
diff --git a/web/core/modules/views/tests/src/Functional/Handler/AreaTest.php b/web/core/modules/views/tests/src/Functional/Handler/AreaTest.php
index 9a25749056..cb6ce55183 100644
--- a/web/core/modules/views/tests/src/Functional/Handler/AreaTest.php
+++ b/web/core/modules/views/tests/src/Functional/Handler/AreaTest.php
@@ -109,10 +109,10 @@ public function testRenderArea() {
// Check whether the strings exist in the output and are sanitized.
$output = $view->preview();
$output = $this->container->get('renderer')->renderRoot($output);
- $this->assertTrue(strpos($output, Xss::filterAdmin($header_string)) !== FALSE, 'Views header exists in the output and is sanitized');
- $this->assertTrue(strpos($output, Xss::filterAdmin($footer_string)) !== FALSE, 'Views footer exists in the output and is sanitized');
- $this->assertTrue(strpos($output, Xss::filterAdmin($empty_string)) !== FALSE, 'Views empty exists in the output and is sanitized');
- $this->assertTrue(strpos($output, '<script') === FALSE, 'Script tags were escaped');
+ $this->assertStringContainsString(Xss::filterAdmin($header_string), $output, 'Views header exists in the output and is sanitized');
+ $this->assertStringContainsString(Xss::filterAdmin($footer_string), $output, 'Views footer exists in the output and is sanitized');
+ $this->assertStringContainsString(Xss::filterAdmin($empty_string), $output, 'Views empty exists in the output and is sanitized');
+ $this->assertStringNotContainsString('<script', $output, 'Script tags were escaped');
}
/**
@@ -124,12 +124,12 @@ public function testAreaAccess() {
$view->initDisplay();
$view->initHandlers();
$handlers = $view->display_handler->getHandlers('empty');
- $this->assertEqual(0, count($handlers));
+ $this->assertCount(0, $handlers);
$output = $view->preview();
$output = \Drupal::service('renderer')->renderRoot($output);
// The area output should not be present since access was denied.
- $this->assertFalse(strpos($output, 'a custom string') !== FALSE);
+ $this->assertStringNotContainsString('a custom string', $output);
$view->destroy();
// Test with access granted for the area handler.
@@ -150,8 +150,8 @@ public function testAreaAccess() {
$output = $view->preview();
$output = \Drupal::service('renderer')->renderRoot($output);
- $this->assertTrue(strpos($output, 'a custom string') !== FALSE);
- $this->assertEqual(1, count($handlers));
+ $this->assertStringContainsString('a custom string', $output);
+ $this->assertCount(1, $handlers);
}
/**
@@ -175,7 +175,9 @@ public function testRenderAreaToken() {
// Test the list of available tokens.
$available = $empty_handler->getAvailableGlobalTokens();
foreach (['site', 'view'] as $type) {
- $this->assertTrue(!empty($available[$type]) && is_array($available[$type]));
+ $this->assertNotEmpty($available[$type]);
+ $this->assertIsArray($available[$type]);
+
// Test that each item exists in the list.
foreach ($available[$type] as $token => $info) {
$this->assertText("[$type:$token]");
@@ -189,7 +191,7 @@ public function testRenderAreaToken() {
$output = $view->preview();
$output = $this->container->get('renderer')->renderRoot($output);
$expected = \Drupal::token()->replace('[site:name]');
- $this->assertTrue(strpos($output, $expected) !== FALSE);
+ $this->assertStringContainsString($expected, $output);
}
/**
diff --git a/web/core/modules/views/tests/src/Functional/Handler/FieldDropButtonTest.php b/web/core/modules/views/tests/src/Functional/Handler/FieldDropButtonTest.php
index 7eae8284a6..1762ed5a51 100644
--- a/web/core/modules/views/tests/src/Functional/Handler/FieldDropButtonTest.php
+++ b/web/core/modules/views/tests/src/Functional/Handler/FieldDropButtonTest.php
@@ -54,9 +54,9 @@ public function testDropbutton() {
$this->drupalGet('test-dropbutton');
foreach ($nodes as $node) {
$result = $this->xpath('//ul[contains(@class, dropbutton)]/li/a[contains(@href, :path) and text()=:title]', [':path' => '/node/' . $node->id(), ':title' => $node->label()]);
- $this->assertEqual(count($result), 1, 'Just one node title link was found.');
+ $this->assertCount(1, $result, 'Just one node title link was found.');
$result = $this->xpath('//ul[contains(@class, dropbutton)]/li/a[contains(@href, :path) and text()=:title]', [':path' => '/node/' . $node->id(), ':title' => 'Custom Text']);
- $this->assertEqual(count($result), 1, 'Just one custom link was found.');
+ $this->assertCount(1, $result, 'Just one custom link was found.');
}
// Check if the dropbutton.js library is available.
diff --git a/web/core/modules/views/tests/src/Functional/Handler/FieldEntityOperationsTest.php b/web/core/modules/views/tests/src/Functional/Handler/FieldEntityOperationsTest.php
index c6c5a0909d..99db5e1adb 100644
--- a/web/core/modules/views/tests/src/Functional/Handler/FieldEntityOperationsTest.php
+++ b/web/core/modules/views/tests/src/Functional/Handler/FieldEntityOperationsTest.php
@@ -82,7 +82,7 @@ public function testEntityOperations() {
// test would by default point to the frontpage.
$operation['url']->setOption('query', ['destination' => $expected_destination]);
$result = $this->xpath('//ul[contains(@class, dropbutton)]/li/a[@href=:path and text()=:title]', [':path' => $operation['url']->toString(), ':title' => (string) $operation['title']]);
- $this->assertEqual(count($result), 1, t('Found entity @operation link with destination parameter.', ['@operation' => $operation['title']]));
+ $this->assertCount(1, $result, t('Found entity @operation link with destination parameter.', ['@operation' => $operation['title']]));
// Entities which were created in Hungarian should link to the Hungarian
// edit form, others to the English one (which has no path prefix here).
$base_path = \Drupal::request()->getBasePath();
diff --git a/web/core/modules/views/tests/src/Functional/Handler/FieldWebTest.php b/web/core/modules/views/tests/src/Functional/Handler/FieldWebTest.php
index 25026c9a07..b61204e1f9 100644
--- a/web/core/modules/views/tests/src/Functional/Handler/FieldWebTest.php
+++ b/web/core/modules/views/tests/src/Functional/Handler/FieldWebTest.php
@@ -67,7 +67,7 @@ protected function viewsData() {
*/
public function testClickSorting() {
$this->drupalGet('test_click_sort');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Only the id and name should be click sortable, but not the name.
$this->assertLinkByHref(Url::fromRoute('<none>', [], ['query' => ['order' => 'id', 'sort' => 'asc']])->toString());
@@ -84,10 +84,14 @@ public function testClickSorting() {
// Clicking a click sort should change the order.
$this->clickLink(t('ID'));
- $this->assertLinkByHref(Url::fromRoute('<none>', [], ['query' => ['order' => 'id', 'sort' => 'desc']])->toString());
+ $href = Url::fromRoute('<none>', [], ['query' => ['order' => 'id', 'sort' => 'desc']])->toString();
+ $this->assertLinkByHref($href);
// Check that the output has the expected order (asc).
$ids = $this->clickSortLoadIdsFromOutput();
$this->assertEqual($ids, range(1, 5));
+ // Check that the rel attribute has the correct value.
+ $result = $this->xpath('//a[@href="' . $href . '"]');
+ $this->assertEquals('nofollow', $result[0]->getAttribute('rel'));
$this->clickLink(t('ID Sort descending'));
// Check that the output has the expected order (desc).
@@ -125,7 +129,7 @@ protected function clickSortLoadIdsFromOutput() {
* TRUE if the assertion succeeded, FALSE otherwise.
*/
protected function assertSubString($haystack, $needle, $message = '', $group = 'Other') {
- return $this->assertTrue(strpos($haystack, $needle) !== FALSE, $message, $group);
+ return $this->assertStringContainsString($needle, $haystack, $message);
}
/**
@@ -143,7 +147,7 @@ protected function assertSubString($haystack, $needle, $message = '', $group = '
* TRUE if the assertion succeeded, FALSE otherwise.
*/
protected function assertNotSubString($haystack, $needle, $message = '', $group = 'Other') {
- return $this->assertTrue(strpos($haystack, $needle) === FALSE, $message, $group);
+ return $this->assertStringNotContainsString($needle, $haystack, $message);
}
/**
diff --git a/web/core/modules/views/tests/src/Functional/Handler/FilterDateTest.php b/web/core/modules/views/tests/src/Functional/Handler/FilterDateTest.php
index 0ef10459b6..e1d3f439a9 100644
--- a/web/core/modules/views/tests/src/Functional/Handler/FilterDateTest.php
+++ b/web/core/modules/views/tests/src/Functional/Handler/FilterDateTest.php
@@ -243,18 +243,18 @@ protected function _testFilterDateUI() {
$this->drupalGet($path);
$this->drupalPostForm(NULL, [], 'Apply');
$results = $this->cssSelect('.view-content .field-content');
- $this->assertEqual(count($results), 4);
+ $this->assertCount(4, $results);
$this->drupalPostForm(NULL, ['created' => '1'], 'Apply');
$results = $this->cssSelect('.view-content .field-content');
- $this->assertEqual(count($results), 1);
+ $this->assertCount(1, $results);
$this->assertEqual($results[0]->getText(), $this->nodes[3]->id());
$this->drupalPostForm(NULL, ['created' => '2'], 'Apply');
$results = $this->cssSelect('.view-content .field-content');
- $this->assertEqual(count($results), 1);
+ $this->assertCount(1, $results);
$this->assertEqual($results[0]->getText(), $this->nodes[3]->id());
$this->drupalPostForm(NULL, ['created' => '3'], 'Apply');
$results = $this->cssSelect('.view-content .field-content');
- $this->assertEqual(count($results), 1);
+ $this->assertCount(1, $results);
$this->assertEqual($results[0]->getText(), $this->nodes[1]->id());
// Change the filter to a single filter to test the schema when the operator
@@ -271,13 +271,13 @@ protected function _testFilterDateUI() {
// Test that the filter works as expected.
$this->drupalGet($path);
$results = $this->cssSelect('.view-content .field-content');
- $this->assertEqual(count($results), 1);
+ $this->assertCount(1, $results);
$this->assertEqual($results[0]->getText(), $this->nodes[3]->id());
$this->drupalPostForm(NULL, [
'created' => $this->dateFormatter->format(250000, 'custom', 'Y-m-d H:i:s'),
], 'Apply');
$results = $this->cssSelect('.view-content .field-content');
- $this->assertEqual(count($results), 2);
+ $this->assertCount(2, $results);
$this->assertEqual($results[0]->getText(), $this->nodes[2]->id());
$this->assertEqual($results[1]->getText(), $this->nodes[3]->id());
}
diff --git a/web/core/modules/views/tests/src/Functional/Handler/HandlerAllTest.php b/web/core/modules/views/tests/src/Functional/Handler/HandlerAllTest.php
index 2f82ca599d..cd3da0c4b0 100644
--- a/web/core/modules/views/tests/src/Functional/Handler/HandlerAllTest.php
+++ b/web/core/modules/views/tests/src/Functional/Handler/HandlerAllTest.php
@@ -2,7 +2,6 @@
namespace Drupal\Tests\views\Functional\Handler;
-use Drupal\Component\Render\FormattableMarkup;
use Drupal\comment\Tests\CommentTestTrait;
use Drupal\Tests\views\Functional\ViewTestBase;
use Drupal\views\Plugin\views\filter\NumericFilter;
@@ -111,12 +110,7 @@ public function testHandlers() {
foreach ($object_types as $type) {
if (isset($view->{$type})) {
foreach ($view->{$type} as $handler) {
- $this->assertTrue($handler instanceof HandlerBase, new FormattableMarkup(
- '@type handler of class %class is an instance of HandlerBase',
- [
- '@type' => $type,
- '%class' => get_class($handler),
- ]));
+ $this->assertInstanceOf(HandlerBase::class, $handler);
}
}
}
diff --git a/web/core/modules/views/tests/src/Functional/Handler/HandlerTest.php b/web/core/modules/views/tests/src/Functional/Handler/HandlerTest.php
index 0dcfdd0317..f62c0f825f 100644
--- a/web/core/modules/views/tests/src/Functional/Handler/HandlerTest.php
+++ b/web/core/modules/views/tests/src/Functional/Handler/HandlerTest.php
@@ -382,7 +382,7 @@ public function testAccess() {
foreach ($views_data['access_callback'] as $type => $info) {
if (!in_array($type, ['title', 'help'])) {
- $this->assertTrue($view->field['access_callback'] instanceof HandlerBase, 'Make sure the user got access to the access_callback field ');
+ $this->assertInstanceOf(HandlerBase::class, $view->field['access_callback']);
$this->assertFalse(isset($view->field['access_callback_arguments']), 'Make sure the user got no access to the access_callback_arguments field ');
}
}
@@ -397,7 +397,7 @@ public function testAccess() {
foreach ($views_data['access_callback'] as $type => $info) {
if (!in_array($type, ['title', 'help'])) {
$this->assertFalse(isset($view->field['access_callback']), 'Make sure the user got no access to the access_callback field ');
- $this->assertTrue($view->field['access_callback_arguments'] instanceof HandlerBase, 'Make sure the user got access to the access_callback_arguments field ');
+ $this->assertInstanceOf(HandlerBase::class, $view->field['access_callback_arguments']);
}
}
}
diff --git a/web/core/modules/views/tests/src/Functional/Plugin/AccessTest.php b/web/core/modules/views/tests/src/Functional/Plugin/AccessTest.php
index 317d6da374..1fca2def69 100644
--- a/web/core/modules/views/tests/src/Functional/Plugin/AccessTest.php
+++ b/web/core/modules/views/tests/src/Functional/Plugin/AccessTest.php
@@ -92,7 +92,7 @@ public function testStaticAccessPlugin() {
$this->assertFalse($access_plugin->access($this->normalUser));
$this->drupalGet('test_access_static');
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
$display = &$view->storage->getDisplay('default');
$display['display_options']['access']['options']['access'] = TRUE;
@@ -105,7 +105,7 @@ public function testStaticAccessPlugin() {
$this->assertTrue($access_plugin->access($this->normalUser));
$this->drupalGet('test_access_static');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
}
}
diff --git a/web/core/modules/views/tests/src/Functional/Plugin/ArgumentDefaultTest.php b/web/core/modules/views/tests/src/Functional/Plugin/ArgumentDefaultTest.php
index 3fcc13a044..2ee68ea616 100644
--- a/web/core/modules/views/tests/src/Functional/Plugin/ArgumentDefaultTest.php
+++ b/web/core/modules/views/tests/src/Functional/Plugin/ArgumentDefaultTest.php
@@ -68,7 +68,7 @@ public function testArgumentDefaultPlugin() {
$id = $view->addHandler('default', 'argument', 'views_test_data', 'name', $options);
$view->initHandlers();
$plugin = $view->argument[$id]->getPlugin('argument_default');
- $this->assertTrue($plugin instanceof ArgumentDefaultTestPlugin, 'The correct argument default plugin is used.');
+ $this->assertInstanceOf(ArgumentDefaultTestPlugin::class, $plugin);
// Check that the value of the default argument is as expected.
$this->assertEqual($view->argument[$id]->getDefaultArgument(), 'John', 'The correct argument default value is returned.');
@@ -166,9 +166,9 @@ public function testArgumentDefaultNode() {
$this->drupalPlaceBlock("views_block:test_argument_default_node-block_1", ['id' => $id]);
$xpath = '//*[@id="block-' . $id . '"]';
$this->drupalGet('node/' . $node1->id());
- $this->assertContains($node1->getTitle(), $this->xpath($xpath)[0]->getText());
+ $this->assertStringContainsString($node1->getTitle(), $this->xpath($xpath)[0]->getText());
$this->drupalGet('node/' . $node2->id());
- $this->assertContains($node2->getTitle(), $this->xpath($xpath)[0]->getText());
+ $this->assertStringContainsString($node2->getTitle(), $this->xpath($xpath)[0]->getText());
}
/**
diff --git a/web/core/modules/views/tests/src/Functional/Plugin/CacheWebTest.php b/web/core/modules/views/tests/src/Functional/Plugin/CacheWebTest.php
index cf7b6a25ce..4d1447453e 100644
--- a/web/core/modules/views/tests/src/Functional/Plugin/CacheWebTest.php
+++ b/web/core/modules/views/tests/src/Functional/Plugin/CacheWebTest.php
@@ -69,7 +69,7 @@ public function testCacheOutputOnPage() {
$this->assertFalse($render_cache->get($cache_element));
$this->drupalGet('test-display');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertNotEmpty($render_cache->get($cache_element));
$cache_tags = [
'config:user.role.anonymous',
@@ -80,7 +80,7 @@ public function testCacheOutputOnPage() {
$this->assertCacheTags($cache_tags);
$this->drupalGet('test-display');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertNotEmpty($render_cache->get($cache_element));
$this->assertCacheTags($cache_tags);
}
diff --git a/web/core/modules/views/tests/src/Functional/Plugin/ContextualFiltersBlockContextTest.php b/web/core/modules/views/tests/src/Functional/Plugin/ContextualFiltersBlockContextTest.php
index 2dc22f7548..c41edf53c0 100644
--- a/web/core/modules/views/tests/src/Functional/Plugin/ContextualFiltersBlockContextTest.php
+++ b/web/core/modules/views/tests/src/Functional/Plugin/ContextualFiltersBlockContextTest.php
@@ -86,7 +86,7 @@ public function testBlockContext() {
// Check if context was correctly propagated to the block.
$definition = $this->container->get('plugin.manager.block')
->getDefinition('views_block:test_view_block_with_context-block_1');
- $this->assertTrue($definition['context_definitions']['nid'] instanceof ContextDefinitionInterface);
+ $this->assertInstanceOf(ContextDefinitionInterface::class, $definition['context_definitions']['nid']);
/** @var \Drupal\Core\Plugin\Context\ContextDefinitionInterface $context */
$context = $definition['context_definitions']['nid'];
$this->assertEqual($context->getDataType(), 'entity:node', 'Context definition data type is correct.');
@@ -133,21 +133,21 @@ public function testBlockContext() {
// based on the numeric plugin and the other based on numeric validation.
$definition = $this->container->get('plugin.manager.block')
->getDefinition('views_block:test_view_block_with_context-block_2');
- $this->assertTrue($definition['context_definitions']['created'] instanceof ContextDefinitionInterface);
+ $this->assertInstanceOf(ContextDefinitionInterface::class, $definition['context_definitions']['created']);
/** @var \Drupal\Core\Plugin\Context\ContextDefinitionInterface $context */
$context = $definition['context_definitions']['created'];
$this->assertEqual($context->getDataType(), 'integer', 'Context definition data type is correct.');
$this->assertEqual($context->getLabel(), 'Content: Authored on', 'Context definition label is correct.');
$this->assertFalse($context->isRequired(), 'Context is not required.');
- $this->assertTrue($definition['context_definitions']['vid'] instanceof ContextDefinitionInterface);
+ $this->assertInstanceOf(ContextDefinitionInterface::class, $definition['context_definitions']['vid']);
/** @var \Drupal\Core\Plugin\Context\ContextDefinitionInterface $context */
$context = $definition['context_definitions']['vid'];
$this->assertEqual($context->getDataType(), 'integer', 'Context definition data type is correct.');
$this->assertEqual($context->getLabel(), 'Content: Revision ID', 'Context definition label is correct.');
$this->assertFalse($context->isRequired(), 'Context is not required.');
- $this->assertTrue($definition['context_definitions']['title'] instanceof ContextDefinitionInterface);
+ $this->assertInstanceOf(ContextDefinitionInterface::class, $definition['context_definitions']['title']);
/** @var \Drupal\Core\Plugin\Context\ContextDefinitionInterface $context */
$context = $definition['context_definitions']['title'];
$this->assertEqual($context->getDataType(), 'string', 'Context definition data type is correct.');
diff --git a/web/core/modules/views/tests/src/Functional/Plugin/DisabledDisplayTest.php b/web/core/modules/views/tests/src/Functional/Plugin/DisabledDisplayTest.php
index 4fe00c7458..5f3f3705bb 100644
--- a/web/core/modules/views/tests/src/Functional/Plugin/DisabledDisplayTest.php
+++ b/web/core/modules/views/tests/src/Functional/Plugin/DisabledDisplayTest.php
@@ -67,7 +67,7 @@ public function testDisabledDisplays() {
// Disabled page view should 404.
$this->drupalGet('test-disabled-display-2');
- $this->assertResponse(404);
+ $this->assertSession()->statusCodeEquals(404);
// Enable each disabled display and save the view.
foreach ($display_ids as $display_id) {
@@ -96,11 +96,11 @@ public function testDisabledDisplays() {
// Check that the page_1 display still works.
$this->drupalGet('test-disabled-display');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Check that the page_2 display is now disabled again.
$this->drupalGet('test-disabled-display-2');
- $this->assertResponse(404);
+ $this->assertSession()->statusCodeEquals(404);
}
}
diff --git a/web/core/modules/views/tests/src/Functional/Plugin/DisplayAttachmentTest.php b/web/core/modules/views/tests/src/Functional/Plugin/DisplayAttachmentTest.php
index a09faf12b9..2f672942bd 100644
--- a/web/core/modules/views/tests/src/Functional/Plugin/DisplayAttachmentTest.php
+++ b/web/core/modules/views/tests/src/Functional/Plugin/DisplayAttachmentTest.php
@@ -48,13 +48,13 @@ public function testAttachment() {
$this->drupalGet('test-display-attachment');
$result = $this->xpath('//div[contains(@class, "view-content")]');
- $this->assertEqual(count($result), 2, 'Both actual view and the attachment is rendered.');
+ $this->assertCount(2, $result, 'Both actual view and the attachment is rendered.');
$result = $this->xpath('//div[contains(@class, "attachment-after")]');
- $this->assertEqual(count($result), 0, 'The attachment is not rendered after the actual view.');
+ $this->assertCount(0, $result, 'The attachment is not rendered after the actual view.');
$result = $this->xpath('//div[contains(@class, "attachment-before")]');
- $this->assertEqual(count($result), 1, 'The attachment is rendered before the actual view.');
+ $this->assertCount(1, $result, 'The attachment is rendered before the actual view.');
}
/**
@@ -68,20 +68,20 @@ public function testDisabledAttachments() {
$view = Views::getView('test_attached_disabled');
$view->setDisplay('page_1');
$attached_displays = $view->display_handler->getAttachedDisplays();
- $this->assertTrue(in_array('attachment_1', $attached_displays), 'The attachment_1 display is attached to the page display.');
- $this->assertTrue(in_array('attachment_2', $attached_displays), 'The attachment_2 display is attached to the page display.');
+ $this->assertContains('attachment_1', $attached_displays, 'The attachment_1 display is attached to the page display.');
+ $this->assertContains('attachment_2', $attached_displays, 'The attachment_2 display is attached to the page display.');
// Check that the attachments are output on the page display.
$this->drupalGet('test-attached-disabled');
$result = $this->xpath('//div[contains(@class, "view-content")]');
- $this->assertEqual(count($result), 3, 'The page view and the attachments are rendered.');
+ $this->assertCount(3, $result, 'The page view and the attachments are rendered.');
$result = $this->xpath('//div[contains(@class, "attachment-before")]');
- $this->assertEqual(count($result), 1, 'The attachment is rendered before the page view.');
+ $this->assertCount(1, $result, 'The attachment is rendered before the page view.');
$result = $this->xpath('//div[contains(@class, "attachment-after")]');
- $this->assertEqual(count($result), 1, 'The attachment is rendered after the page view.');
+ $this->assertCount(1, $result, 'The attachment is rendered after the page view.');
// Disable the attachment_1 display.
$view->displayHandlers->get('attachment_1')->setOption('enabled', FALSE);
@@ -90,10 +90,10 @@ public function testDisabledAttachments() {
// Test that the before attachment is not displayed.
$this->drupalGet('/test-attached-disabled');
$result = $this->xpath('//div[contains(@class, "view-content")]');
- $this->assertEqual(count($result), 2, 'The page view and only one attachment are rendered.');
+ $this->assertCount(2, $result, 'The page view and only one attachment are rendered.');
$result = $this->xpath('//div[contains(@class, "attachment-before")]');
- $this->assertEqual(count($result), 0, 'The attachment_1 is not rendered.');
+ $this->assertCount(0, $result, 'The attachment_1 is not rendered.');
// Disable the attachment_2 display.
$view->displayHandlers->get('attachment_2')->setOption('enabled', FALSE);
@@ -102,10 +102,10 @@ public function testDisabledAttachments() {
// Test that the after attachment is not displayed.
$this->drupalGet('/test-attached-disabled');
$result = $this->xpath('//div[contains(@class, "view-content")]');
- $this->assertEqual(count($result), 1, 'The page view is rendered without attachments.');
+ $this->assertCount(1, $result, 'The page view is rendered without attachments.');
$result = $this->xpath('//div[contains(@class, "attachment-after")]');
- $this->assertEqual(count($result), 0, 'The attachment_2 is not rendered.');
+ $this->assertCount(0, $result, 'The attachment_2 is not rendered.');
}
}
diff --git a/web/core/modules/views/tests/src/Functional/Plugin/DisplayEntityReferenceTest.php b/web/core/modules/views/tests/src/Functional/Plugin/DisplayEntityReferenceTest.php
index 8a9b32db12..9fcf2a7d76 100644
--- a/web/core/modules/views/tests/src/Functional/Plugin/DisplayEntityReferenceTest.php
+++ b/web/core/modules/views/tests/src/Functional/Plugin/DisplayEntityReferenceTest.php
@@ -162,7 +162,7 @@ public function testEntityReferenceDisplay() {
$this->executeView($view);
// Test that we have searched in both fields.
- $this->assertEqual(count($view->result), 2, 'Search returned two rows');
+ $this->assertCount(2, $view->result, 'Search returned two rows');
$view->destroy();
// Test the 'CONTAINS' match_operator.
@@ -176,7 +176,7 @@ public function testEntityReferenceDisplay() {
];
$view->display_handler->setOption('entity_reference_options', $options);
$this->executeView($view);
- $this->assertEqual(count($view->result), 13, 'Search returned thirteen rows');
+ $this->assertCount(13, $view->result, 'Search returned thirteen rows');
$view->destroy();
// Test the 'STARTS_WITH' match_operator.
@@ -190,7 +190,7 @@ public function testEntityReferenceDisplay() {
];
$view->display_handler->setOption('entity_reference_options', $options);
$this->executeView($view);
- $this->assertEqual(count($view->result), 12, 'Search returned twelve rows');
+ $this->assertCount(12, $view->result, 'Search returned twelve rows');
$view->destroy();
// Test the '=' match_operator.
@@ -204,7 +204,7 @@ public function testEntityReferenceDisplay() {
];
$view->display_handler->setOption('entity_reference_options', $options);
$this->executeView($view);
- $this->assertEqual(count($view->result), 2, 'Search returned two rows');
+ $this->assertCount(2, $view->result, 'Search returned two rows');
$view->destroy();
// Add a relationship and a field using that relationship.
@@ -234,7 +234,7 @@ public function testEntityReferenceDisplay() {
$this->executeView($view);
// Run validation when using a relationship to the same base table.
- $this->assertEqual(count($view->result), 2, 'Search returned two rows');
+ $this->assertCount(2, $view->result, 'Search returned two rows');
$view->destroy();
$this->drupalPostForm('admin/structure/views/nojs/add-handler/test_display_entity_reference/default/relationship', ['name[entity_test__field_test_entity_ref_entity_ref.field_test_entity_ref_entity_ref]' => TRUE], t('Add and configure relationships'));
@@ -257,7 +257,7 @@ public function testEntityReferenceDisplay() {
$this->executeView($view);
- $this->assertEqual(count($view->result), 2, 'Search returned two rows');
+ $this->assertCount(2, $view->result, 'Search returned two rows');
// Test that the render() return empty array for empty result.
$view = Views::getView('test_display_entity_reference');
diff --git a/web/core/modules/views/tests/src/Functional/Plugin/DisplayFeedTest.php b/web/core/modules/views/tests/src/Functional/Plugin/DisplayFeedTest.php
index aaaeb50b95..7a9ed469b9 100644
--- a/web/core/modules/views/tests/src/Functional/Plugin/DisplayFeedTest.php
+++ b/web/core/modules/views/tests/src/Functional/Plugin/DisplayFeedTest.php
@@ -95,7 +95,7 @@ public function testFeedOutput() {
$this->drupalPlaceBlock('views_block:test_display_feed-test');
$this->drupalGet('<front>');
$feed_icon = $this->cssSelect('div.view-id-test_display_feed a.feed-icon');
- $this->assertContains('test-feed-display.xml', $feed_icon[0]->getAttribute('href'), 'The feed icon was found.');
+ $this->assertStringContainsString('test-feed-display.xml', $feed_icon[0]->getAttribute('href'), 'The feed icon was found.');
// Test feed display attached to page display with arguments.
$this->drupalGet('test-feed-icon/' . $node->id());
@@ -131,7 +131,7 @@ public function testFeedFieldOutput() {
$this->createPathAlias('/node/' . $node->id(), '/the-article-alias');
$node_link = $node->toUrl()->setAbsolute()->toString();
- $this->assertContains('/the-article-alias', $node_link);
+ $this->assertStringContainsString('/the-article-alias', $node_link);
$this->drupalGet('test-feed-display-fields.xml');
$this->assertEquals($node_title, $this->getSession()->getDriver()->getText('//item/title'));
@@ -161,13 +161,13 @@ public function testDisabledFeed() {
$view = Views::getView('test_attached_disabled');
$view->setDisplay('page_1');
$attached_displays = $view->display_handler->getAttachedDisplays();
- $this->assertTrue(in_array('feed_1', $attached_displays), 'The feed display is attached to the page display.');
+ $this->assertContains('feed_1', $attached_displays, 'The feed display is attached to the page display.');
// Check that the rss header is output on the page display.
$this->drupalGet('/test-attached-disabled');
$feed_header = $this->xpath('//link[@rel="alternate"]');
$this->assertEqual($feed_header[0]->getAttribute('type'), 'application/rss+xml', 'The feed link has the type application/rss+xml.');
- $this->assertContains('test-attached-disabled.xml', $feed_header[0]->getAttribute('href'), 'Page display contains the correct feed URL.');
+ $this->assertStringContainsString('test-attached-disabled.xml', $feed_header[0]->getAttribute('href'), 'Page display contains the correct feed URL.');
// Disable the feed display.
$view->displayHandlers->get('feed_1')->setOption('enabled', FALSE);
@@ -180,7 +180,7 @@ public function testDisabledFeed() {
// Ensure the feed attachment returns 'Not found'.
$this->drupalGet('/test-attached-disabled.xml');
- $this->assertResponse(404);
+ $this->assertSession()->statusCodeEquals(404);
}
/**
@@ -197,10 +197,10 @@ public function testDisabledLinkedDisplay() {
\Drupal::service('router.builder')->rebuild();
$this->drupalGet('test-attached-disabled');
- $this->assertResponse(404);
+ $this->assertSession()->statusCodeEquals(404);
// Ensure the feed can still be reached.
$this->drupalGet('test-attached-disabled.xml');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
}
}
diff --git a/web/core/modules/views/tests/src/Functional/Plugin/DisplayFeedTranslationTest.php b/web/core/modules/views/tests/src/Functional/Plugin/DisplayFeedTranslationTest.php
index 24de96611c..ec60f04963 100644
--- a/web/core/modules/views/tests/src/Functional/Plugin/DisplayFeedTranslationTest.php
+++ b/web/core/modules/views/tests/src/Functional/Plugin/DisplayFeedTranslationTest.php
@@ -29,7 +29,12 @@ class DisplayFeedTranslationTest extends ViewTestBase {
*
* @var array
*/
- public static $modules = ['node', 'views', 'language', 'content_translation'];
+ public static $modules = [
+ 'node',
+ 'views',
+ 'language',
+ 'content_translation',
+ ];
/**
* {@inheritdoc}
@@ -156,7 +161,7 @@ protected function checkFeedResults($link_style, Node $node) {
}
$this->drupalGet('test-feed-display-fields.xml');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$items = $this->getSession()->getDriver()->find('//channel/item');
// There should only be 3 items in the feed.
diff --git a/web/core/modules/views/tests/src/Functional/Plugin/DisplayPageWebTest.php b/web/core/modules/views/tests/src/Functional/Plugin/DisplayPageWebTest.php
index afcaf31d1d..97c41c370c 100644
--- a/web/core/modules/views/tests/src/Functional/Plugin/DisplayPageWebTest.php
+++ b/web/core/modules/views/tests/src/Functional/Plugin/DisplayPageWebTest.php
@@ -49,41 +49,41 @@ protected function setUp($import_test_views = TRUE) {
*/
public function testArguments() {
$this->drupalGet('test_route_without_arguments');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$result = $this->xpath('//span[@class="field-content"]');
- $this->assertEqual(count($result), 5, 'All entries was returned');
+ $this->assertCount(5, $result, 'All entries was returned');
$this->drupalGet('test_route_without_arguments/1');
- $this->assertResponse(404);
+ $this->assertSession()->statusCodeEquals(404);
$this->drupalGet('test_route_with_argument/1');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertCacheContexts(['languages:language_interface', 'route', 'theme', 'url']);
$result = $this->xpath('//span[@class="field-content"]');
- $this->assertEqual(count($result), 1, 'Ensure that just the filtered entry was returned.');
+ $this->assertCount(1, $result, 'Ensure that just the filtered entry was returned.');
$this->assertEqual($result[0]->getText(), 1, 'The passed ID was returned.');
$this->drupalGet('test_route_with_suffix/1/suffix');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$result = $this->xpath('//span[@class="field-content"]');
- $this->assertEqual(count($result), 1, 'Ensure that just the filtered entry was returned.');
+ $this->assertCount(1, $result, 'Ensure that just the filtered entry was returned.');
$this->assertEqual($result[0]->getText(), 1, 'The passed ID was returned.');
$this->drupalGet('test_route_with_suffix_and_argument/1/suffix/2');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$result = $this->xpath('//span[@class="field-content"]');
- $this->assertEqual(count($result), 0, 'No result was returned.');
+ $this->assertCount(0, $result, 'No result was returned.');
$this->drupalGet('test_route_with_suffix_and_argument/1/suffix/1');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$result = $this->xpath('//span[@class="field-content"]');
- $this->assertEqual(count($result), 1, 'Ensure that just the filtered entry was returned.');
+ $this->assertCount(1, $result, 'Ensure that just the filtered entry was returned.');
$this->assertEqual($result[0]->getText(), 1, 'The passed ID was returned.');
$this->drupalGet('test_route_with_long_argument/1');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$result = $this->xpath('//span[@class="field-content"]');
- $this->assertEqual(count($result), 1, 'Ensure that just the filtered entry was returned.');
+ $this->assertCount(1, $result, 'Ensure that just the filtered entry was returned.');
$this->assertEqual($result[0]->getText(), 1, 'The passed ID was returned.');
}
@@ -93,25 +93,25 @@ public function testArguments() {
public function testPageDisplayMenu() {
// Check local tasks.
$this->drupalGet('test_page_display_menu');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$element = $this->xpath('//ul[contains(@class, :ul_class)]//a[contains(@class, :a_class)]/child::text()', [
':ul_class' => 'tabs primary',
':a_class' => 'is-active',
]);
$this->assertEqual($element[0]->getText(), t('Test default tab'));
- $this->assertTitle(t('Test default page | Drupal'));
+ $this->assertTitle('Test default page | Drupal');
$this->drupalGet('test_page_display_menu/default');
- $this->assertResponse(404);
+ $this->assertSession()->statusCodeEquals(404);
$this->drupalGet('test_page_display_menu/local');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$element = $this->xpath('//ul[contains(@class, :ul_class)]//a[contains(@class, :a_class)]/child::text()', [
':ul_class' => 'tabs primary',
':a_class' => 'is-active',
]);
$this->assertEqual($element[0]->getText(), t('Test local tab'));
- $this->assertTitle(t('Test local page | Drupal'));
+ $this->assertTitle('Test local page | Drupal');
// Check an ordinary menu link.
$admin_user = $this->drupalCreateUser(['administer menu']);
@@ -169,10 +169,10 @@ public function assertPagePath($path) {
$this->container->get('router.builder')->rebuild();
// Check if we successfully changed the path.
$this->drupalGet($path);
- $success = $this->assertResponse(200);
+ $success = $this->assertSession()->statusCodeEquals(200);
// Check if we don't get any error on the view edit page.
$this->drupalGet('admin/structure/views/view/test_page_display_path');
- return $success && $this->assertResponse(200);
+ return $success && $this->assertSession()->statusCodeEquals(200);
}
}
diff --git a/web/core/modules/views/tests/src/Functional/Plugin/DisplayTest.php b/web/core/modules/views/tests/src/Functional/Plugin/DisplayTest.php
index 17154476a9..515a9179e3 100644
--- a/web/core/modules/views/tests/src/Functional/Plugin/DisplayTest.php
+++ b/web/core/modules/views/tests/src/Functional/Plugin/DisplayTest.php
@@ -94,7 +94,7 @@ public function testDisplayPlugin() {
$view->setDisplay('display_test_1');
- $this->assertTrue($view->display_handler instanceof DisplayTestPlugin, 'The correct display handler instance is on the view object.');
+ $this->assertInstanceOf(DisplayTestPlugin::class, $view->display_handler);
// Check the test option.
$this->assertIdentical($view->display_handler->getOption('test_option'), '');
@@ -109,7 +109,7 @@ public function testDisplayPlugin() {
$output = $view->preview();
$output = $renderer->renderRoot($output);
- $this->assertTrue(strpos($output, '<h1></h1>') !== FALSE, 'An empty value for test_option found in output.');
+ $this->assertStringContainsString('<h1></h1>', $output, 'An empty value for test_option found in output.');
// Change this option and check the title of out output.
$view->display_handler->overrideOption('test_option', 'Test option title');
@@ -119,7 +119,7 @@ public function testDisplayPlugin() {
$output = $renderer->renderRoot($output);
// Test we have our custom <h1> tag in the output of the view.
- $this->assertTrue(strpos($output, '<h1>Test option title</h1>') !== FALSE, 'The test_option value found in display output title.');
+ $this->assertStringContainsString('<h1>Test option title</h1>', $output, 'The test_option value found in display output title.');
// Test that the display category/summary is in the UI.
$this->drupalGet('admin/structure/views/view/test_view/edit/display_test_1');
@@ -216,7 +216,7 @@ public function testReadMoreCustomURL() {
$this->executeView($view);
$output = $view->preview();
$output = $renderer->renderRoot($output);
- $this->assertTrue(strpos($output, '/node') !== FALSE, 'The read more link with href "/node" was found.');
+ $this->assertStringContainsString('/node', $output, 'The read more link with href "/node" was found.');
// Test more link with leading slash.
$view->display_handler->setOption('link_display', 'custom_url');
@@ -224,7 +224,7 @@ public function testReadMoreCustomURL() {
$this->executeView($view);
$output = $view->preview();
$output = $renderer->renderRoot($output);
- $this->assertTrue(strpos($output, '/node') !== FALSE, 'The read more link with href "/node" was found.');
+ $this->assertStringContainsString('/node', $output, 'The read more link with href "/node" was found.');
// Test more link with absolute url.
$view->display_handler->setOption('link_display', 'custom_url');
@@ -232,7 +232,7 @@ public function testReadMoreCustomURL() {
$this->executeView($view);
$output = $view->preview();
$output = $renderer->renderRoot($output);
- $this->assertTrue(strpos($output, 'http://drupal.org') !== FALSE, 'The read more link with href "http://drupal.org" was found.');
+ $this->assertStringContainsString('http://drupal.org', $output, 'The read more link with href "http://drupal.org" was found.');
// Test more link with query parameters in the url.
$view->display_handler->setOption('link_display', 'custom_url');
@@ -240,7 +240,7 @@ public function testReadMoreCustomURL() {
$this->executeView($view);
$output = $view->preview();
$output = $renderer->renderRoot($output);
- $this->assertTrue(strpos($output, '/node?page=1&foo=bar') !== FALSE, 'The read more link with href "/node?page=1&foo=bar" was found.');
+ $this->assertStringContainsString('/node?page=1&foo=bar', $output, 'The read more link with href "/node?page=1&foo=bar" was found.');
// Test more link with fragment in the url.
$view->display_handler->setOption('link_display', 'custom_url');
@@ -248,7 +248,7 @@ public function testReadMoreCustomURL() {
$this->executeView($view);
$output = $view->preview();
$output = $renderer->renderRoot($output);
- $this->assertTrue(strpos($output, '/node#target') !== FALSE, 'The read more link with href "/node#target" was found.');
+ $this->assertStringContainsString('/node#target', $output, 'The read more link with href "/node#target" was found.');
// Test more link with arguments.
$view = Views::getView('test_simple_argument');
@@ -261,7 +261,7 @@ public function testReadMoreCustomURL() {
$this->executeView($view);
$output = $view->preview();
$output = $renderer->renderRoot($output);
- $this->assertTrue(strpos($output, '/node?date=22&foo=bar') !== FALSE, 'The read more link with href "/node?date=22&foo=bar" was found.');
+ $this->assertStringContainsString('/node?date=22&foo=bar', $output, 'The read more link with href "/node?date=22&foo=bar" was found.');
// Test more link with 1 dimension array query parameters with arguments.
$view = Views::getView('test_simple_argument');
@@ -274,7 +274,7 @@ public function testReadMoreCustomURL() {
$this->executeView($view);
$output = $view->preview();
$output = $renderer->renderRoot($output);
- $this->assertTrue(strpos($output, '/node?f%5B0%5D=foo%3Abar&f%5B1%5D=foo%3A22') !== FALSE, 'The read more link with href "/node?f[0]=foo:bar&f[1]=foo:22" was found.');
+ $this->assertStringContainsString('/node?f%5B0%5D=foo%3Abar&f%5B1%5D=foo%3A22', $output, 'The read more link with href "/node?f[0]=foo:bar&f[1]=foo:22" was found.');
// Test more link with arguments in path.
$view->display_handler->setOption('link_url', 'node/{{ raw_arguments.age }}?date={{ raw_arguments.age }}&foo=bar');
@@ -282,7 +282,7 @@ public function testReadMoreCustomURL() {
$this->executeView($view);
$output = $view->preview();
$output = $renderer->renderRoot($output);
- $this->assertTrue(strpos($output, '/node/22?date=22&foo=bar') !== FALSE, 'The read more link with href "/node/22?date=22&foo=bar" was found.');
+ $this->assertStringContainsString('/node/22?date=22&foo=bar', $output, 'The read more link with href "/node/22?date=22&foo=bar" was found.');
// Test more link with arguments in fragment.
$view->display_handler->setOption('link_url', 'node?date={{ raw_arguments.age }}&foo=bar#{{ raw_arguments.age }}');
@@ -290,7 +290,7 @@ public function testReadMoreCustomURL() {
$this->executeView($view);
$output = $view->preview();
$output = $renderer->renderRoot($output);
- $this->assertTrue(strpos($output, '/node?date=22&foo=bar#22') !== FALSE, 'The read more link with href "/node?date=22&foo=bar#22" was found.');
+ $this->assertStringContainsString('/node?date=22&foo=bar#22', $output, 'The read more link with href "/node?date=22&foo=bar#22" was found.');
}
/**
@@ -298,7 +298,7 @@ public function testReadMoreCustomURL() {
*/
public function testInvalidDisplayPlugins() {
$this->drupalGet('test_display_invalid');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Change the page plugin id to an invalid one. Bypass the entity system
// so no menu rebuild was executed (so the path is still available).
@@ -307,7 +307,7 @@ public function testInvalidDisplayPlugins() {
$config->save();
$this->drupalGet('test_display_invalid');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertText('The "invalid" plugin does not exist.');
// Rebuild the router, and ensure that the path is not accessible anymore.
@@ -315,7 +315,7 @@ public function testInvalidDisplayPlugins() {
\Drupal::service('router.builder')->rebuildIfNeeded();
$this->drupalGet('test_display_invalid');
- $this->assertResponse(404);
+ $this->assertSession()->statusCodeEquals(404);
// Change the display plugin ID back to the correct ID.
$config = $this->config('views.view.test_display_invalid');
@@ -326,9 +326,8 @@ public function testInvalidDisplayPlugins() {
$block = $this->drupalPlaceBlock('views_block:test_display_invalid-block_1', ['label' => 'Invalid display']);
$this->drupalGet('<front>');
- $this->assertResponse(200);
- $result = $this->xpath('//div[@id = :id]', [':id' => 'block-' . $block->id()]);
- $this->assertEquals(1, count($result));
+ $this->assertSession()->statusCodeEquals(200);
+ $this->assertCount(1, $this->xpath('//div[@id = :id]', [':id' => 'block-' . $block->id()]));
// Change the block plugin ID to an invalid one.
$config = $this->config('views.view.test_display_invalid');
@@ -338,10 +337,9 @@ public function testInvalidDisplayPlugins() {
// Test the page is still displayed, the block not present, and has the
// plugin warning message.
$this->drupalGet('<front>');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertText('The "invalid" plugin does not exist.');
- $result = $this->xpath('//div[@id = :id]', [':id' => 'block-' . $block->id()]);
- $this->assertEquals(0, count($result));
+ $this->assertCount(0, $this->xpath('//div[@id = :id]', [':id' => 'block-' . $block->id()]));
}
/**
@@ -364,7 +362,7 @@ public function testMissingRelationship() {
// Validate display
$errors = $view->validate();
// Check that the error messages are shown.
- $this->assertTrue(count($errors['default']) == 2, 'Error messages found for required relationship');
+ $this->assertCount(2, $errors['default'], 'Error messages found for required relationship');
$this->assertEqual($errors['default'][0], t('The %handler_type %handler uses a relationship that has been removed.', ['%handler_type' => 'field', '%handler' => 'User: Last login']));
$this->assertEqual($errors['default'][1], t('The %handler_type %handler uses a relationship that has been removed.', ['%handler_type' => 'field', '%handler' => 'User: Created']));
}
diff --git a/web/core/modules/views/tests/src/Functional/Plugin/ExposedFormCheckboxesTest.php b/web/core/modules/views/tests/src/Functional/Plugin/ExposedFormCheckboxesTest.php
index f6bd8adae3..5112416cdd 100644
--- a/web/core/modules/views/tests/src/Functional/Plugin/ExposedFormCheckboxesTest.php
+++ b/web/core/modules/views/tests/src/Functional/Plugin/ExposedFormCheckboxesTest.php
@@ -98,17 +98,17 @@ public function testExposedFormRenderCheckboxes() {
$this->drupalGet('test_exposed_form_checkboxes');
$actual = $this->xpath('//form//input[@type="checkbox" and @name="type[article]"]');
- $this->assertEqual(count($actual), 1, 'Article option renders as a checkbox.');
+ $this->assertCount(1, $actual, 'Article option renders as a checkbox.');
$actual = $this->xpath('//form//input[@type="checkbox" and @name="type[page]"]');
- $this->assertEqual(count($actual), 1, 'Page option renders as a checkbox');
+ $this->assertCount(1, $actual, 'Page option renders as a checkbox');
// Ensure that all results are displayed.
$rows = $this->xpath("//div[contains(@class, 'views-row')]");
- $this->assertEqual(count($rows), 5, '5 rows are displayed by default on the first page when no options are checked.');
+ $this->assertCount(5, $rows, '5 rows are displayed by default on the first page when no options are checked.');
$this->clickLink('Page 2');
$rows = $this->xpath("//div[contains(@class, 'views-row')]");
- $this->assertEqual(count($rows), 1, '1 row is displayed by default on the second page when no options are checked.');
+ $this->assertCount(1, $rows, '1 row is displayed by default on the second page when no options are checked.');
$this->assertNoText('An illegal choice has been detected. Please contact the site administrator.');
}
@@ -156,7 +156,7 @@ public function testExposedIsAllOfFilter() {
// Ensure that all results are displayed.
$rows = $this->xpath("//div[contains(@class, 'views-row')]");
- $this->assertEqual(count($rows), 8, 'All rows are displayed by default on the first page when no options are checked.');
+ $this->assertCount(8, $rows, 'All rows are displayed by default on the first page when no options are checked.');
$this->assertNoText('An illegal choice has been detected. Please contact the site administrator.');
// Select one option and ensure we still have results.
@@ -165,7 +165,7 @@ public function testExposedIsAllOfFilter() {
// Ensure only nodes tagged with $tid are displayed.
$rows = $this->xpath("//div[contains(@class, 'views-row')]");
- $this->assertEqual(count($rows), 2, 'Correct rows are displayed when a tid is selected.');
+ $this->assertCount(2, $rows, 'Correct rows are displayed when a tid is selected.');
$this->assertNoText('An illegal choice has been detected. Please contact the site administrator.');
}
diff --git a/web/core/modules/views/tests/src/Functional/Plugin/ExposedFormTest.php b/web/core/modules/views/tests/src/Functional/Plugin/ExposedFormTest.php
index 5f15407747..c63eaabf86 100644
--- a/web/core/modules/views/tests/src/Functional/Plugin/ExposedFormTest.php
+++ b/web/core/modules/views/tests/src/Functional/Plugin/ExposedFormTest.php
@@ -57,7 +57,7 @@ protected function setUp($import_test_views = TRUE) {
public function testSubmitButton() {
// Test the submit button value defaults to 'Apply'.
$this->drupalGet('test_exposed_form_buttons');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->helperButtonHasLabel('edit-submit-test-exposed-form-buttons', t('Apply'));
// Rename the label of the submit button.
@@ -164,7 +164,7 @@ public function testResetButton() {
// Test the reset works.
$this->drupalGet('test_exposed_form_buttons', ['query' => ['op' => 'Reset']]);
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Test the type has been reset.
$this->assertFieldById('edit-type', 'All', 'Article type filter has been reset.');
@@ -173,7 +173,7 @@ public function testResetButton() {
// Test the reset works with type set.
$this->drupalGet('test_exposed_form_buttons', ['query' => ['type' => 'article', 'op' => 'Reset']]);
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertFieldById('edit-type', 'All', 'Article type filter has been reset.');
// Test the button is hidden after reset.
@@ -191,7 +191,7 @@ public function testResetButton() {
// Look whether the reset button label changed.
$this->drupalGet('test_exposed_form_buttons', ['query' => ['type' => 'article']]);
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->helperButtonHasLabel('edit-reset', $expected_label);
}
@@ -233,7 +233,7 @@ public function testExposedBlock() {
// Test there is an exposed form in a block.
$xpath = $this->buildXPathQuery('//div[@id=:id]/form/@id', [':id' => Html::getUniqueId('block-' . $block->id())]);
$result = $this->xpath($xpath);
- $this->assertEquals(1, count($result));
+ $this->assertCount(1, $result);
// Test there is not an exposed form in the view page content area.
$xpath = $this->buildXPathQuery('//div[@class="view-content"]/form/@id', [':id' => Html::getUniqueId('block-' . $block->id())]);
@@ -241,15 +241,15 @@ public function testExposedBlock() {
// Test there is only one views exposed form on the page.
$elements = $this->xpath('//form[@id=:id]', [':id' => $this->getExpectedExposedFormId($view)]);
- $this->assertEqual(count($elements), 1, 'One exposed form block found.');
+ $this->assertCount(1, $elements, 'One exposed form block found.');
// Test that the correct option is selected after form submission.
$this->assertCacheContext('url');
- $this->assertOptionSelected('edit-type', 'All');
+ $this->assertOptionSelected('Content: Type', 'All');
foreach (['All', 'article', 'page'] as $argument) {
$this->drupalGet('test_exposed_block', ['query' => ['type' => $argument]]);
$this->assertCacheContext('url');
- $this->assertOptionSelected('edit-type', $argument);
+ $this->assertOptionSelected('Content: Type', $argument);
}
}
@@ -263,18 +263,18 @@ public function testInputRequired() {
$view->save();
$this->drupalGet('test_exposed_form_buttons');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->helperButtonHasLabel('edit-submit-test-exposed-form-buttons', t('Apply'));
// Ensure that no results are displayed.
$rows = $this->xpath("//div[contains(@class, 'views-row')]");
- $this->assertEqual(count($rows), 0, 'No rows are displayed by default when no input is provided.');
+ $this->assertCount(0, $rows, 'No rows are displayed by default when no input is provided.');
$this->drupalGet('test_exposed_form_buttons', ['query' => ['type' => 'article']]);
// Ensure that results are displayed.
$rows = $this->xpath("//div[contains(@class, 'views-row')]");
- $this->assertEqual(count($rows), 5, 'All rows are displayed by default when input is provided.');
+ $this->assertCount(5, $rows, 'All rows are displayed by default when input is provided.');
}
/**
@@ -393,14 +393,14 @@ protected function getExpectedExposedFormId(ViewExecutable $view) {
*/
public function testFormErrorWithExposedForm() {
$this->drupalGet('views_test_data_error_form_page');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$form = $this->cssSelect('form.views-exposed-form');
$this->assertNotEmpty($form, 'The exposed form element was found.');
$this->assertRaw(t('Apply'), 'Ensure the exposed form is rendered before submitting the normal form.');
$this->assertRaw('<div class="views-row">', 'Views result shown.');
$this->drupalPostForm(NULL, [], t('Submit'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$form = $this->cssSelect('form.views-exposed-form');
$this->assertNotEmpty($form, 'The exposed form element was found.');
$this->assertRaw(t('Apply'), 'Ensure the exposed form is rendered after submitting the normal form.');
diff --git a/web/core/modules/views/tests/src/Functional/Plugin/FilterTest.php b/web/core/modules/views/tests/src/Functional/Plugin/FilterTest.php
index d968125dea..7ce4dff840 100644
--- a/web/core/modules/views/tests/src/Functional/Plugin/FilterTest.php
+++ b/web/core/modules/views/tests/src/Functional/Plugin/FilterTest.php
@@ -61,7 +61,7 @@ protected function viewsData() {
public function testFilterQuery() {
// Check that we can find the test filter plugin.
$plugin = $this->container->get('plugin.manager.views.filter')->createInstance('test_filter');
- $this->assertTrue($plugin instanceof FilterPlugin, 'Test filter plugin found.');
+ $this->assertInstanceOf(FilterPlugin::class, $plugin);
$view = Views::getView('test_filter');
$view->initDisplay();
@@ -97,7 +97,7 @@ public function testFilterQuery() {
// Check that we have a single element, as a result of applying the '= John'
// filter.
- $this->assertEqual(count($view->result), 1, new FormattableMarkup('Results were returned. @count results.', ['@count' => count($view->result)]));
+ $this->assertCount(1, $view->result, new FormattableMarkup('Results were returned. @count results.', ['@count' => count($view->result)]));
$view->destroy();
@@ -123,7 +123,7 @@ public function testFilterQuery() {
// Check if we have the other elements in the dataset, as a result of
// applying the '<> John' filter.
- $this->assertEqual(count($view->result), 4, new FormattableMarkup('Results were returned. @count results.', ['@count' => count($view->result)]));
+ $this->assertCount(4, $view->result, new FormattableMarkup('Results were returned. @count results.', ['@count' => count($view->result)]));
$view->destroy();
$view->initDisplay();
@@ -147,7 +147,7 @@ public function testFilterQuery() {
$this->executeView($view);
// Check if we have all 5 results.
- $this->assertEqual(count($view->result), 5, new FormattableMarkup('All @count results returned', ['@count' => count($view->displayHandlers)]));
+ $this->assertCount(5, $view->result, new FormattableMarkup('All @count results returned', ['@count' => count($view->displayHandlers)]));
}
/**
@@ -176,7 +176,7 @@ public function testInOperatorSelectAllOptions() {
public function testLimitExposedOperators() {
$this->drupalGet('test_filter_in_operator_ui');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertOption('edit-nid-op', '<');
$this->assertOption('edit-nid-op', '<=');
$this->assertOption('edit-nid-op', '=');
@@ -196,7 +196,7 @@ public function testLimitExposedOperators() {
$this->drupalPostForm('admin/structure/views/view/test_filter_in_operator_ui/edit/default', [], t('Save'));
$this->drupalGet('test_filter_in_operator_ui');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertNoOption('edit-nid-op', '<');
$this->assertNoOption('edit-nid-op', '<=');
$this->assertNoOption('edit-nid-op', '=');
diff --git a/web/core/modules/views/tests/src/Functional/Plugin/MenuLinkTest.php b/web/core/modules/views/tests/src/Functional/Plugin/MenuLinkTest.php
index 1bba00e1ba..9d58f4a497 100644
--- a/web/core/modules/views/tests/src/Functional/Plugin/MenuLinkTest.php
+++ b/web/core/modules/views/tests/src/Functional/Plugin/MenuLinkTest.php
@@ -24,7 +24,14 @@ class MenuLinkTest extends ViewTestBase {
*
* @var array
*/
- public static $modules = ['views', 'views_ui', 'user', 'node', 'menu_ui', 'block'];
+ public static $modules = [
+ 'views',
+ 'views_ui',
+ 'user',
+ 'node',
+ 'menu_ui',
+ 'block',
+ ];
/**
* {@inheritdoc}
diff --git a/web/core/modules/views/tests/src/Functional/Plugin/PagerTest.php b/web/core/modules/views/tests/src/Functional/Plugin/PagerTest.php
index c7c6867401..81a0fa5048 100644
--- a/web/core/modules/views/tests/src/Functional/Plugin/PagerTest.php
+++ b/web/core/modules/views/tests/src/Functional/Plugin/PagerTest.php
@@ -167,7 +167,7 @@ public function testNoLimit() {
}
$view = Views::getView('test_pager_none');
$this->executeView($view);
- $this->assertEqual(count($view->result), 11, 'Make sure that every item is returned in the result');
+ $this->assertCount(11, $view->result, 'Make sure that every item is returned in the result');
// Setup and test a offset.
$view = Views::getView('test_pager_none');
@@ -181,7 +181,7 @@ public function testNoLimit() {
$view->display_handler->setOption('pager', $pager);
$this->executeView($view);
- $this->assertEqual(count($view->result), 8, 'Make sure that every item beside the first three is returned in the result');
+ $this->assertCount(8, $view->result, 'Make sure that every item beside the first three is returned in the result');
// Check some public functions.
$this->assertFalse($view->pager->usePager());
@@ -215,7 +215,7 @@ public function testLimit() {
$view = Views::getView('test_pager_some');
$this->executeView($view);
- $this->assertEqual(count($view->result), 5, 'Make sure that only a certain count of items is returned');
+ $this->assertCount(5, $view->result, 'Make sure that only a certain count of items is returned');
// Setup and test a offset.
$view = Views::getView('test_pager_some');
@@ -229,7 +229,7 @@ public function testLimit() {
];
$view->display_handler->setOption('pager', $pager);
$this->executeView($view);
- $this->assertEqual(count($view->result), 3, 'Make sure that only a certain count of items is returned');
+ $this->assertCount(3, $view->result, 'Make sure that only a certain count of items is returned');
// Check some public functions.
$this->assertFalse($view->pager->usePager());
@@ -249,7 +249,7 @@ public function testNormalPager() {
$view = Views::getView('test_pager_full');
$this->executeView($view);
- $this->assertEqual(count($view->result), 5, 'Make sure that only a certain count of items is returned');
+ $this->assertCount(5, $view->result, 'Make sure that only a certain count of items is returned');
// Setup and test a offset.
$view = Views::getView('test_pager_full');
@@ -263,13 +263,13 @@ public function testNormalPager() {
];
$view->display_handler->setOption('pager', $pager);
$this->executeView($view);
- $this->assertEqual(count($view->result), 3, 'Make sure that only a certain count of items is returned');
+ $this->assertCount(3, $view->result, 'Make sure that only a certain count of items is returned');
// Test items per page = 0
$view = Views::getView('test_view_pager_full_zero_items_per_page');
$this->executeView($view);
- $this->assertEqual(count($view->result), 11, 'All items are return');
+ $this->assertCount(11, $view->result, 'All items are return');
// TODO test number of pages.
@@ -288,7 +288,7 @@ public function testNormalPager() {
$view->display_handler->setOption('pager', $pager);
$this->executeView($view);
$this->assertEqual($view->pager->getItemsPerPage(), 0);
- $this->assertEqual(count($view->result), 11);
+ $this->assertCount(11, $view->result);
// Test pager cache contexts.
$this->drupalGet('test_pager_full');
diff --git a/web/core/modules/views/tests/src/Functional/Plugin/StyleSummaryTest.php b/web/core/modules/views/tests/src/Functional/Plugin/StyleSummaryTest.php
index f39f6b43ac..918fc7afa1 100644
--- a/web/core/modules/views/tests/src/Functional/Plugin/StyleSummaryTest.php
+++ b/web/core/modules/views/tests/src/Functional/Plugin/StyleSummaryTest.php
@@ -63,21 +63,21 @@ public function testSummaryView() {
$this->assertRaw('stable/css/views/views.module.css');
$summary_list = $this->cssSelect('ul.views-summary li');
- $this->assertEqual(4, count($summary_list));
+ $this->assertCount(4, $summary_list);
foreach ($summary_list as $summary_list_item) {
$this->assertEqual('(5)', trim(explode(' ', $summary_list_item->getText())[1]));
}
$summary_links = $this->cssSelect('ul.views-summary a');
- $this->assertEqual(4, count($summary_links));
+ $this->assertCount(4, $summary_links);
foreach ($summary_links as $index => $summary_link) {
$this->assertEqual('type' . $index, trim($summary_link->getText()));
}
$this->clickLink('type1');
$entries = $this->cssSelect('div.view-content div.views-row');
- $this->assertEqual(2, count($entries));
+ $this->assertCount(2, $entries);
// Add a base path to the summary settings.
$edit = [
@@ -90,7 +90,7 @@ public function testSummaryView() {
$this->drupalGet('test-summary');
$this->clickLink('type1');
$entries = $this->cssSelect('div.view-content div.views-row');
- $this->assertEqual(2, count($entries));
+ $this->assertCount(2, $entries);
// Change the summary display to an unformatted list displaying 3 items.
$edit = [
@@ -105,21 +105,21 @@ public function testSummaryView() {
$this->drupalGet('test-summary');
$summary_list = $this->cssSelect('.views-summary-unformatted');
- $this->assertEqual(3, count($summary_list));
+ $this->assertCount(3, $summary_list);
foreach ($summary_list as $summary_list_item) {
$this->assertEqual('(5)', trim(explode(' ', $summary_list_item->getText())[1]));
}
$summary_links = $this->cssSelect('.views-summary-unformatted a');
- $this->assertEqual(3, count($summary_links));
+ $this->assertCount(3, $summary_links);
foreach ($summary_links as $index => $summary_link) {
$this->assertEqual('type' . $index, trim($summary_link->getText()));
}
$this->clickLink('type1');
$entries = $this->cssSelect('div.view-content div.views-row');
- $this->assertEqual(2, count($entries));
+ $this->assertCount(2, $entries);
// Add a base path to the summary settings.
$edit = [
@@ -132,7 +132,7 @@ public function testSummaryView() {
$this->drupalGet('test-summary');
$this->clickLink('type1');
$entries = $this->cssSelect('div.view-content div.views-row');
- $this->assertEqual(2, count($entries));
+ $this->assertCount(2, $entries);
// Set base_path to an unknown path and test that the links lead to the
// front page.
diff --git a/web/core/modules/views/tests/src/Functional/Plugin/StyleTableTest.php b/web/core/modules/views/tests/src/Functional/Plugin/StyleTableTest.php
index 7201c93350..bcd8cf8566 100644
--- a/web/core/modules/views/tests/src/Functional/Plugin/StyleTableTest.php
+++ b/web/core/modules/views/tests/src/Functional/Plugin/StyleTableTest.php
@@ -48,6 +48,10 @@ public function testAccessibilitySettings() {
$result = $this->xpath('//summary/child::text()');
$this->assertNotEmpty($result, 'The summary appears on the table.');
$this->assertEqual(trim($result[0]->getText()), 'summary-text');
+ // Check that the summary has the right accessibility settings.
+ $summary = $this->xpath('//summary')[0];
+ $this->assertTrue($summary->hasAttribute('role'));
+ $this->assertTrue($summary->hasAttribute('aria-expanded'));
$result = $this->xpath('//caption/details/child::text()[normalize-space()]');
$this->assertNotEmpty($result, 'The table description appears on the table.');
@@ -154,10 +158,10 @@ public function testEmptyColumn() {
// Test that only one of the job columns still shows.
$result = $this->xpath('//thead/tr/th/a[text()="Job"]');
- $this->assertEqual(count($result), 1, 'Ensure that empty column header is hidden.');
+ $this->assertCount(1, $result, 'Ensure that empty column header is hidden.');
$result = $this->xpath('//tbody/tr/td[contains(concat(" ", @class, " "), " views-field-job-1 ")]');
- $this->assertEqual(count($result), 0, 'Ensure the empty table cells are hidden.');
+ $this->assertCount(0, $result, 'Ensure the empty table cells are hidden.');
}
/**
diff --git a/web/core/modules/views/tests/src/Functional/Plugin/ViewsFormTest.php b/web/core/modules/views/tests/src/Functional/Plugin/ViewsFormTest.php
index d8556ca1bc..28218c7d20 100644
--- a/web/core/modules/views/tests/src/Functional/Plugin/ViewsFormTest.php
+++ b/web/core/modules/views/tests/src/Functional/Plugin/ViewsFormTest.php
@@ -30,7 +30,7 @@ public function testFormWrapper() {
$this->drupalGet('test_bulk_form');
// Ensure we have the form tag on the page.
$xpath = $this->cssSelect('.views-form form');
- $this->assertIdentical(count($xpath), 1, 'There is one views form on the page.');
+ $this->assertCount(1, $xpath, 'There is one views form on the page.');
// Ensure we don't have nested form elements.
$result = (bool) preg_match('#<form[^>]*?>(?!/form).*<form#s', $this->getSession()->getPage()->getContent());
$this->assertFalse($result, 'The views form element is not nested.');
diff --git a/web/core/modules/views/tests/src/Functional/SearchMultilingualTest.php b/web/core/modules/views/tests/src/Functional/SearchMultilingualTest.php
index 78a6c3f2c6..d7e209aebd 100644
--- a/web/core/modules/views/tests/src/Functional/SearchMultilingualTest.php
+++ b/web/core/modules/views/tests/src/Functional/SearchMultilingualTest.php
@@ -20,7 +20,12 @@ class SearchMultilingualTest extends ViewTestBase {
*
* @var array
*/
- public static $modules = ['node', 'search', 'language', 'content_translation'];
+ public static $modules = [
+ 'node',
+ 'search',
+ 'language',
+ 'content_translation',
+ ];
/**
* {@inheritdoc}
diff --git a/web/core/modules/views/tests/src/Functional/Update/EntityLinkOutputUrlUpdateTest.php b/web/core/modules/views/tests/src/Functional/Update/EntityLinkOutputUrlUpdateTest.php
index 11c9b758ce..894d3091c3 100644
--- a/web/core/modules/views/tests/src/Functional/Update/EntityLinkOutputUrlUpdateTest.php
+++ b/web/core/modules/views/tests/src/Functional/Update/EntityLinkOutputUrlUpdateTest.php
@@ -8,6 +8,8 @@
/**
* Tests that the additional settings are added to the entity link field.
*
+ * @coversDefaultClass \Drupal\views\ViewsConfigUpdater
+ *
* @see views_post_update_entity_link_url()
*
* @group legacy
@@ -26,6 +28,8 @@ protected function setDatabaseDumpFiles() {
/**
* Tests that the additional settings are added to the config.
+ *
+ * @covers ::needsEntityLinkUrlUpdate
*/
public function testViewsPostUpdateEntityLinkUrl() {
$this->runUpdates();
diff --git a/web/core/modules/views/tests/src/Functional/Update/EntityViewsMultiValueBaseFieldDataUpdateTest.php b/web/core/modules/views/tests/src/Functional/Update/EntityViewsMultiValueBaseFieldDataUpdateTest.php
index 44516e97a5..e3b232e70f 100644
--- a/web/core/modules/views/tests/src/Functional/Update/EntityViewsMultiValueBaseFieldDataUpdateTest.php
+++ b/web/core/modules/views/tests/src/Functional/Update/EntityViewsMultiValueBaseFieldDataUpdateTest.php
@@ -8,7 +8,9 @@
/**
* Tests the upgrade path for views multi-value base field data.
*
- * @see views_update_8500()
+ * @coversDefaultClass \Drupal\views\ViewsConfigUpdater
+ *
+ * @see views_post_update_field_names_for_multivalue_fields()
*
* @group legacy
*/
@@ -26,6 +28,8 @@ protected function setDatabaseDumpFiles() {
/**
* Tests multi-value base field views data is updated correctly.
+ *
+ * @covers ::needsMultivalueBaseFieldUpdate
*/
public function testUpdateMultiValueBaseFields() {
$this->runUpdates();
@@ -48,6 +52,14 @@ public function testUpdateMultiValueBaseFields() {
// The plugin ID should be updated as well.
$this->assertEqual($type === 'arguments' ? 'user__roles_rid' : 'user_roles', $handler_config['plugin_id']);
+
+ if ($type === 'filters') {
+ // The filter value should have been converted to an array.
+ $this->assertTrue(is_array($handler_config['value']));
+
+ // The filter operator should have been mapped from single to multiple.
+ $this->assertEquals('or', $handler_config['operator']);
+ }
}
}
diff --git a/web/core/modules/views/tests/src/Functional/Update/ImageStyleDependencyUpdateTest.php b/web/core/modules/views/tests/src/Functional/Update/ImageStyleDependencyUpdateTest.php
index d0bd731e92..f801ce3d2d 100644
--- a/web/core/modules/views/tests/src/Functional/Update/ImageStyleDependencyUpdateTest.php
+++ b/web/core/modules/views/tests/src/Functional/Update/ImageStyleDependencyUpdateTest.php
@@ -32,7 +32,7 @@ public function testUpdateImageStyleDependencies() {
// Checks that 'thumbnail' image style is not a dependency of view 'foo'.
$this->assertFalse(in_array('image.style.thumbnail', $config_dependencies));
- // We test the case the the field formatter image style doesn't exist.
+ // We test the case that the field formatter image style doesn't exist.
// Checks that 'nonexistent' image style is not a dependency of view 'foo'.
$this->assertFalse(in_array('image.style.nonexistent', $config_dependencies));
diff --git a/web/core/modules/views/tests/src/Functional/Update/LimitOperatorsDefaultsTest.php b/web/core/modules/views/tests/src/Functional/Update/LimitOperatorsDefaultsTest.php
index 64c74a4c3a..f2b19724ca 100644
--- a/web/core/modules/views/tests/src/Functional/Update/LimitOperatorsDefaultsTest.php
+++ b/web/core/modules/views/tests/src/Functional/Update/LimitOperatorsDefaultsTest.php
@@ -8,6 +8,8 @@
/**
* Tests the upgrade path for limit operators feature.
*
+ * @coversDefaultClass \Drupal\views\ViewsConfigUpdater
+ *
* @see views_post_update_limit_operator_defaults()
*
* @group Update
@@ -27,6 +29,8 @@ protected function setDatabaseDumpFiles() {
/**
* Tests that default settings for limit operators are present.
+ *
+ * @covers ::needsOperatorDefaultsUpdate
*/
public function testViewsPostUpdateLimitOperatorsDefaultValues() {
// Load and initialize our test view.
diff --git a/web/core/modules/views/tests/src/Functional/ViewAjaxTest.php b/web/core/modules/views/tests/src/Functional/ViewAjaxTest.php
index 32236d8f55..ad13ffb24b 100644
--- a/web/core/modules/views/tests/src/Functional/ViewAjaxTest.php
+++ b/web/core/modules/views/tests/src/Functional/ViewAjaxTest.php
@@ -37,7 +37,7 @@ public function testAjaxView() {
$drupal_settings = $this->getDrupalSettings();
$this->assertTrue(isset($drupal_settings['views']['ajax_path']), 'The Ajax callback path is set in drupalSettings.');
- $this->assertEqual(count($drupal_settings['views']['ajaxViews']), 1);
+ $this->assertCount(1, $drupal_settings['views']['ajaxViews']);
$view_entry = array_keys($drupal_settings['views']['ajaxViews'])[0];
$this->assertEqual($drupal_settings['views']['ajaxViews'][$view_entry]['view_name'], 'test_ajax_view', 'The view\'s ajaxViews array entry has the correct \'view_name\' key.');
$this->assertEqual($drupal_settings['views']['ajaxViews'][$view_entry]['view_display_id'], 'page_1', 'The view\'s ajaxViews array entry has the correct \'view_display_id\' key.');
diff --git a/web/core/modules/views/tests/src/Functional/ViewElementTest.php b/web/core/modules/views/tests/src/Functional/ViewElementTest.php
index 773e776be3..a8efb76fd7 100644
--- a/web/core/modules/views/tests/src/Functional/ViewElementTest.php
+++ b/web/core/modules/views/tests/src/Functional/ViewElementTest.php
@@ -48,7 +48,7 @@ public function testViewElement() {
$this->assertNotEmpty($xpath, 'The view content has been found on the form.');
// There should be 5 rows in the results.
$xpath = $this->xpath('//div[@class="view-content"]/div');
- $this->assertEqual(count($xpath), 5);
+ $this->assertCount(5, $xpath);
// Add an argument and save the view.
$view->displayHandlers->get('default')->overrideOption('arguments', [
@@ -73,7 +73,7 @@ public function testViewElement() {
// Test that the form has the expected result.
$this->drupalGet('views_test_data_element_form');
$xpath = $this->xpath('//div[@class="view-content"]/div');
- $this->assertEqual(count($xpath), 1);
+ $this->assertCount(1, $xpath);
}
/**
@@ -93,7 +93,7 @@ public function testViewElementEmbed() {
$this->assertNotEmpty($xpath, 'The view content has been found on the form.');
// There should be 5 rows in the results.
$xpath = $this->xpath('//div[@class="view-content"]/div');
- $this->assertEqual(count($xpath), 5);
+ $this->assertCount(5, $xpath);
// Add an argument and save the view.
$view->displayHandlers->get('default')->overrideOption('arguments', [
@@ -118,7 +118,7 @@ public function testViewElementEmbed() {
// Test that the form has the same expected result.
$this->drupalGet('views_test_data_element_embed_form');
$xpath = $this->xpath('//div[@class="view-content"]/div');
- $this->assertEqual(count($xpath), 1);
+ $this->assertCount(1, $xpath);
}
}
diff --git a/web/core/modules/views/tests/src/Functional/Wizard/BasicTest.php b/web/core/modules/views/tests/src/Functional/Wizard/BasicTest.php
index cd0b4d7ca7..252a0c734c 100644
--- a/web/core/modules/views/tests/src/Functional/Wizard/BasicTest.php
+++ b/web/core/modules/views/tests/src/Functional/Wizard/BasicTest.php
@@ -40,7 +40,7 @@ public function testViewsWizardAndListing() {
$view1['description'] = $this->randomMachineName(16);
$view1['page[create]'] = FALSE;
$this->drupalPostForm('admin/structure/views/add', $view1, t('Save and edit'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->drupalGet('admin/structure/views');
$this->assertText($view1['label']);
$this->assertText($view1['description']);
@@ -71,7 +71,7 @@ public function testViewsWizardAndListing() {
$view2['page[feed_properties][path]'] = $this->randomMachineName(16);
$this->drupalPostForm('admin/structure/views/add', $view2, t('Save and edit'));
$this->drupalGet($view2['page[path]']);
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Since the view has a page, we expect to be automatically redirected to
// it.
@@ -83,7 +83,7 @@ public function testViewsWizardAndListing() {
// Check if we have the feed.
$this->assertLinkByHref(Url::fromRoute('view.' . $view2['id'] . '.feed_1')->toString());
$elements = $this->cssSelect('link[href="' . Url::fromRoute('view.' . $view2['id'] . '.feed_1', [], ['absolute' => TRUE])->toString() . '"]');
- $this->assertEqual(count($elements), 1, 'Feed found.');
+ $this->assertCount(1, $elements, 'Feed found.');
$this->drupalGet($view2['page[feed_properties][path]']);
// Because the response is XML we can't use the page which depends on an
// HTML tag being present.
@@ -122,7 +122,7 @@ public function testViewsWizardAndListing() {
$view3['block[title]'] = $this->randomMachineName(16);
$this->drupalPostForm('admin/structure/views/add', $view3, t('Save and edit'));
$this->drupalGet($view3['page[path]']);
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Make sure the view only displays the node we expect.
$this->assertUrl($view3['page[path]']);
@@ -171,9 +171,9 @@ public function testViewsWizardAndListing() {
// Check that the REST export path works. JSON will work, as all core
// formats will be allowed. JSON and XML by default.
$this->drupalGet($view4['rest_export[path]'], ['query' => ['_format' => 'json']]);
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$data = Json::decode($this->getSession()->getPage()->getContent());
- $this->assertEqual(count($data), 1, 'Only the node of type page is exported.');
+ $this->assertCount(1, $data, 'Only the node of type page is exported.');
$node = reset($data);
$this->assertEqual($node['nid'][0]['value'], $node1->id(), 'The node of type page is exported.');
diff --git a/web/core/modules/views/tests/src/Functional/Wizard/ItemsPerPageTest.php b/web/core/modules/views/tests/src/Functional/Wizard/ItemsPerPageTest.php
index 4ab72da1df..12aa5949a2 100644
--- a/web/core/modules/views/tests/src/Functional/Wizard/ItemsPerPageTest.php
+++ b/web/core/modules/views/tests/src/Functional/Wizard/ItemsPerPageTest.php
@@ -56,7 +56,7 @@ public function testItemsPerPage() {
$view['block[items_per_page]'] = 3;
$this->drupalPostForm('admin/structure/views/add', $view, t('Save and edit'));
$this->drupalGet($view['page[path]']);
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Make sure the page display shows the nodes we expect, and that they
// appear in the expected order.
diff --git a/web/core/modules/views/tests/src/Functional/Wizard/MenuTest.php b/web/core/modules/views/tests/src/Functional/Wizard/MenuTest.php
index 98f7d619df..f35b851ea4 100644
--- a/web/core/modules/views/tests/src/Functional/Wizard/MenuTest.php
+++ b/web/core/modules/views/tests/src/Functional/Wizard/MenuTest.php
@@ -39,7 +39,7 @@ public function testMenus() {
// Make sure there is a link to the view from the front page (where we
// expect the main menu to display).
$this->drupalGet('');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertLink($view['page[link_properties][title]']);
$this->assertLinkByHref(Url::fromUri('base:' . $view['page[path]'])->toString());
diff --git a/web/core/modules/views/tests/src/Functional/Wizard/SortingTest.php b/web/core/modules/views/tests/src/Functional/Wizard/SortingTest.php
index af8b0a12c9..2534949c0c 100644
--- a/web/core/modules/views/tests/src/Functional/Wizard/SortingTest.php
+++ b/web/core/modules/views/tests/src/Functional/Wizard/SortingTest.php
@@ -42,7 +42,7 @@ public function testSorting() {
$view1['page[path]'] = $this->randomMachineName(16);
$this->drupalPostForm('admin/structure/views/add', $view1, t('Save and edit'));
$this->drupalGet($view1['page[path]']);
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Make sure the view shows the nodes in the expected order.
$this->assertUrl($view1['page[path]']);
@@ -67,7 +67,7 @@ public function testSorting() {
$view2['page[path]'] = $this->randomMachineName(16);
$this->drupalPostForm('admin/structure/views/add', $view2, t('Save and edit'));
$this->drupalGet($view2['page[path]']);
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Make sure the view shows the nodes in the expected order.
$this->assertUrl($view2['page[path]']);
diff --git a/web/core/modules/views/tests/src/Functional/Wizard/TaggedWithTest.php b/web/core/modules/views/tests/src/Functional/Wizard/TaggedWithTest.php
index 4eee68c760..b8220b1b41 100644
--- a/web/core/modules/views/tests/src/Functional/Wizard/TaggedWithTest.php
+++ b/web/core/modules/views/tests/src/Functional/Wizard/TaggedWithTest.php
@@ -158,7 +158,7 @@ public function testTaggedWith() {
// Visit the page and check that the nodes we expect are present and the
// ones we don't expect are absent.
$this->drupalGet($view1['page[path]']);
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertText($node_tag1_title);
$this->assertText($node_tag1_tag2_title);
$this->assertNoText($node_no_tags_title);
@@ -168,7 +168,7 @@ public function testTaggedWith() {
$view2 = [];
$view2['show[type]'] = $this->nodeTypeWithTags->id();
$this->drupalPostForm('admin/structure/views/add', $view2, t('Update "of type" choice'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$view2['label'] = $this->randomMachineName(16);
$view2['id'] = strtolower($this->randomMachineName(16));
$view2['description'] = $this->randomMachineName(16);
@@ -177,7 +177,7 @@ public function testTaggedWith() {
$view2['page[title]'] = $this->randomMachineName(16);
$view2['page[path]'] = $this->randomMachineName(16);
$this->drupalPostForm(NULL, $view2, t('Save and edit'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->drupalGet($view2['page[path]']);
$this->assertNoText($node_tag1_title);
$this->assertText($node_tag1_tag2_title);
diff --git a/web/core/modules/views/tests/src/FunctionalJavascript/BlockExposedFilterAJAXTest.php b/web/core/modules/views/tests/src/FunctionalJavascript/BlockExposedFilterAJAXTest.php
index e2000b3f97..d59b3f31be 100644
--- a/web/core/modules/views/tests/src/FunctionalJavascript/BlockExposedFilterAJAXTest.php
+++ b/web/core/modules/views/tests/src/FunctionalJavascript/BlockExposedFilterAJAXTest.php
@@ -58,9 +58,9 @@ public function testExposedFilteringAndReset() {
// Ensure that the Content we're testing for is present.
$html = $page->getHtml();
- $this->assertContains('Page A', $html);
- $this->assertContains('Page B', $html);
- $this->assertContains('Article A', $html);
+ $this->assertStringContainsString('Page A', $html);
+ $this->assertStringContainsString('Page B', $html);
+ $this->assertStringContainsString('Article A', $html);
// Filter by page type.
$this->submitForm(['type' => 'page'], t('Apply'));
@@ -68,18 +68,18 @@ public function testExposedFilteringAndReset() {
// Verify that only the page nodes are present.
$html = $page->getHtml();
- $this->assertContains('Page A', $html);
- $this->assertContains('Page B', $html);
- $this->assertNotContains('Article A', $html);
+ $this->assertStringContainsString('Page A', $html);
+ $this->assertStringContainsString('Page B', $html);
+ $this->assertStringNotContainsString('Article A', $html);
// Reset the form.
$this->submitForm([], t('Reset'));
// Assert we are still on the node page.
$html = $page->getHtml();
// Repeat the original tests.
- $this->assertContains('Page A', $html);
- $this->assertContains('Page B', $html);
- $this->assertContains('Article A', $html);
+ $this->assertStringContainsString('Page A', $html);
+ $this->assertStringContainsString('Page B', $html);
+ $this->assertStringContainsString('Article A', $html);
$this->assertSession()->addressEquals('node/' . $node->id());
$block->delete();
diff --git a/web/core/modules/views/tests/src/FunctionalJavascript/ClickSortingAJAXTest.php b/web/core/modules/views/tests/src/FunctionalJavascript/ClickSortingAJAXTest.php
index 19c48a7093..53c88c7c2e 100644
--- a/web/core/modules/views/tests/src/FunctionalJavascript/ClickSortingAJAXTest.php
+++ b/web/core/modules/views/tests/src/FunctionalJavascript/ClickSortingAJAXTest.php
@@ -67,16 +67,16 @@ public function testClickSorting() {
/** @var \Behat\Mink\Element\NodeElement[] $rows */
$rows = $page->findAll('css', 'tbody tr');
$this->assertCount(2, $rows);
- $this->assertContains('Page B', $rows[0]->getHtml());
- $this->assertContains('Page A', $rows[1]->getHtml());
+ $this->assertStringContainsString('Page B', $rows[0]->getHtml());
+ $this->assertStringContainsString('Page A', $rows[1]->getHtml());
// Now sort by title and check if the order changed.
$page->clickLink('Title');
$session_assert->assertWaitOnAjaxRequest();
$rows = $page->findAll('css', 'tbody tr');
$this->assertCount(2, $rows);
- $this->assertContains('Page A', $rows[0]->getHtml());
- $this->assertContains('Page B', $rows[1]->getHtml());
+ $this->assertStringContainsString('Page A', $rows[0]->getHtml());
+ $this->assertStringContainsString('Page B', $rows[1]->getHtml());
}
}
diff --git a/web/core/modules/views/tests/src/FunctionalJavascript/ExposedFilterAJAXTest.php b/web/core/modules/views/tests/src/FunctionalJavascript/ExposedFilterAJAXTest.php
index 0fa130156b..2e2515f38d 100644
--- a/web/core/modules/views/tests/src/FunctionalJavascript/ExposedFilterAJAXTest.php
+++ b/web/core/modules/views/tests/src/FunctionalJavascript/ExposedFilterAJAXTest.php
@@ -63,8 +63,8 @@ public function testExposedFiltering() {
// Ensure that the Content we're testing for is present.
$html = $session->getPage()->getHtml();
- $this->assertContains('Page One', $html);
- $this->assertContains('Page Two', $html);
+ $this->assertStringContainsString('Page One', $html);
+ $this->assertStringContainsString('Page Two', $html);
// Search for "Page One".
$this->submitForm(['title' => 'Page One'], t('Filter'));
@@ -72,8 +72,8 @@ public function testExposedFiltering() {
// Verify that only the "Page One" Node is present.
$html = $session->getPage()->getHtml();
- $this->assertContains('Page One', $html);
- $this->assertNotContains('Page Two', $html);
+ $this->assertStringContainsString('Page One', $html);
+ $this->assertStringNotContainsString('Page Two', $html);
// Search for "Page Two".
$this->submitForm(['title' => 'Page Two'], t('Filter'));
@@ -81,8 +81,8 @@ public function testExposedFiltering() {
// Verify that only the "Page Two" Node is present.
$html = $session->getPage()->getHtml();
- $this->assertContains('Page Two', $html);
- $this->assertNotContains('Page One', $html);
+ $this->assertStringContainsString('Page Two', $html);
+ $this->assertStringNotContainsString('Page One', $html);
// Submit bulk actions form to ensure that the previous AJAX submit does not
// break it.
@@ -117,8 +117,8 @@ public function testExposedFiltersInModal() {
$session = $this->getSession();
// Ensure that the Content we're testing for is present.
$html = $session->getPage()->getHtml();
- $this->assertContains('Page One', $html);
- $this->assertContains('Page Two', $html);
+ $this->assertStringContainsString('Page One', $html);
+ $this->assertStringContainsString('Page Two', $html);
// Search for "Page One".
$session->getPage()->fillField('title', 'Page One');
@@ -127,8 +127,8 @@ public function testExposedFiltersInModal() {
// Verify that only the "Page One" Node is present.
$html = $session->getPage()->getHtml();
- $this->assertContains('Page One', $html);
- $this->assertNotContains('Page Two', $html);
+ $this->assertStringContainsString('Page One', $html);
+ $this->assertStringNotContainsString('Page Two', $html);
// Close and re-open the modal.
$assert->buttonExists('Close', $dialog)->press();
@@ -137,8 +137,8 @@ public function testExposedFiltersInModal() {
// Ensure that the Content we're testing for is present.
$html = $session->getPage()->getHtml();
- $this->assertContains('Page One', $html);
- $this->assertContains('Page Two', $html);
+ $this->assertStringContainsString('Page One', $html);
+ $this->assertStringContainsString('Page Two', $html);
// Search for "Page One".
$session->getPage()->fillField('title', 'Page One');
@@ -147,8 +147,8 @@ public function testExposedFiltersInModal() {
// Verify that only the "Page One" Node is present.
$html = $session->getPage()->getHtml();
- $this->assertContains('Page One', $html);
- $this->assertNotContains('Page Two', $html);
+ $this->assertStringContainsString('Page One', $html);
+ $this->assertStringNotContainsString('Page Two', $html);
}
}
diff --git a/web/core/modules/views/tests/src/FunctionalJavascript/PaginationAJAXTest.php b/web/core/modules/views/tests/src/FunctionalJavascript/PaginationAJAXTest.php
index 84f6936968..93ffac2399 100644
--- a/web/core/modules/views/tests/src/FunctionalJavascript/PaginationAJAXTest.php
+++ b/web/core/modules/views/tests/src/FunctionalJavascript/PaginationAJAXTest.php
@@ -71,7 +71,7 @@ public function testBasicPagination() {
$settings = $this->getDrupalSettings();
- // Make sure the the view_path is set correctly.
+ // Make sure that the view_path is set correctly.
$expected_view_path = '/test-content-ajax';
$this->assertEquals($expected_view_path, current($settings['views']['ajaxViews'])['view_path']);
@@ -90,13 +90,13 @@ public function testBasicPagination() {
/** @var \Behat\Mink\Element\NodeElement[] $rows */
$rows = $page->findAll('css', 'tbody tr');
$this->assertCount(5, $rows);
- $this->assertContains('Node 1 content', $rows[0]->getHtml());
+ $this->assertStringContainsString('Node 1 content', $rows[0]->getHtml());
$this->clickLink('Go to page 2');
$session_assert->assertWaitOnAjaxRequest();
$rows = $page->findAll('css', 'tbody tr');
$this->assertCount(5, $rows);
- $this->assertContains('Node 6 content', $rows[0]->getHtml());
+ $this->assertStringContainsString('Node 6 content', $rows[0]->getHtml());
$link = $page->findLink('Go to page 3');
// Test that no unwanted parameters are added to the URL.
$this->assertEquals('?status=All&type=All&langcode=All&items_per_page=5&order=changed&sort=asc&title=&page=2', $link->getAttribute('href'));
@@ -106,28 +106,28 @@ public function testBasicPagination() {
$session_assert->assertWaitOnAjaxRequest();
$rows = $page->findAll('css', 'tbody tr');
$this->assertCount(1, $rows);
- $this->assertContains('Node 11 content', $rows[0]->getHtml());
+ $this->assertStringContainsString('Node 11 content', $rows[0]->getHtml());
// Navigate back to the first page.
$this->clickLink('Go to first page');
$session_assert->assertWaitOnAjaxRequest();
$rows = $page->findAll('css', 'tbody tr');
$this->assertCount(5, $rows);
- $this->assertContains('Node 1 content', $rows[0]->getHtml());
+ $this->assertStringContainsString('Node 1 content', $rows[0]->getHtml());
// Navigate using the 'next' link.
$this->clickLink('Go to next page');
$session_assert->assertWaitOnAjaxRequest();
$rows = $page->findAll('css', 'tbody tr');
$this->assertCount(5, $rows);
- $this->assertContains('Node 6 content', $rows[0]->getHtml());
+ $this->assertStringContainsString('Node 6 content', $rows[0]->getHtml());
// Navigate using the 'last' link.
$this->clickLink('Go to last page');
$session_assert->assertWaitOnAjaxRequest();
$rows = $page->findAll('css', 'tbody tr');
$this->assertCount(1, $rows);
- $this->assertContains('Node 11 content', $rows[0]->getHtml());
+ $this->assertStringContainsString('Node 11 content', $rows[0]->getHtml());
// Make sure the AJAX calls don't change the view_path.
$settings = $this->getDrupalSettings();
@@ -142,7 +142,7 @@ protected function assertNoDuplicateAssetsOnPage() {
$scripts = $this->getSession()->getPage()->findAll('xpath', '//script');
$script_src = [];
foreach ($scripts as $script) {
- $this->assertFalse(in_array($script->getAttribute('src'), $script_src));
+ $this->assertNotContains($script->getAttribute('src'), $script_src);
$script_src[] = $script->getAttribute('src');
}
}
diff --git a/web/core/modules/views/tests/src/FunctionalJavascript/Plugin/views/Handler/GroupedExposedFilterTest.php b/web/core/modules/views/tests/src/FunctionalJavascript/Plugin/views/Handler/GroupedExposedFilterTest.php
index bda1fbbd7c..bb1debe0a6 100644
--- a/web/core/modules/views/tests/src/FunctionalJavascript/Plugin/views/Handler/GroupedExposedFilterTest.php
+++ b/web/core/modules/views/tests/src/FunctionalJavascript/Plugin/views/Handler/GroupedExposedFilterTest.php
@@ -17,7 +17,13 @@ class GroupedExposedFilterTest extends WebDriverTestBase {
/**
* {@inheritdoc}
*/
- public static $modules = ['node', 'views', 'views_ui', 'user', 'views_test_config'];
+ public static $modules = [
+ 'node',
+ 'views',
+ 'views_ui',
+ 'user',
+ 'views_test_config',
+ ];
/**
* {@inheritdoc}
diff --git a/web/core/modules/views/tests/src/Kernel/BasicTest.php b/web/core/modules/views/tests/src/Kernel/BasicTest.php
index 4ef22b1408..cbfa3835bd 100644
--- a/web/core/modules/views/tests/src/Kernel/BasicTest.php
+++ b/web/core/modules/views/tests/src/Kernel/BasicTest.php
@@ -29,7 +29,7 @@ public function testSimpleResultSet() {
$this->executeView($view);
// Verify the result.
- $this->assertEqual(5, count($view->result), 'The number of returned rows match.');
+ $this->assertCount(5, $view->result, 'The number of returned rows match.');
$this->assertIdenticalResultset($view, $this->dataSet(), [
'views_test_data_name' => 'name',
'views_test_data_age' => 'age',
@@ -88,7 +88,7 @@ public function testSimpleFiltering() {
];
// Verify the result.
- $this->assertEqual(3, count($view->result), 'The number of returned rows match.');
+ $this->assertCount(3, $view->result, 'The number of returned rows match.');
$this->assertIdenticalResultSet($view, $dataset, [
'views_test_data_name' => 'name',
'views_test_data_age' => 'age',
@@ -114,7 +114,7 @@ public function testSimpleArgument() {
];
// Verify the result.
- $this->assertEqual(1, count($view->result), 'The number of returned rows match.');
+ $this->assertCount(1, $view->result, 'The number of returned rows match.');
$this->assertIdenticalResultSet($view, $dataset, [
'views_test_data_name' => 'name',
'views_test_data_age' => 'age',
@@ -127,7 +127,7 @@ public function testSimpleArgument() {
// Build the expected result.
$dataset = $this->dataSet();
- $this->assertEqual(5, count($view->result), 'The number of returned rows match.');
+ $this->assertCount(5, $view->result, 'The number of returned rows match.');
$this->assertIdenticalResultSet($view, $dataset, [
'views_test_data_name' => 'name',
'views_test_data_age' => 'age',
diff --git a/web/core/modules/views/tests/src/Kernel/Entity/RowEntityRenderersTest.php b/web/core/modules/views/tests/src/Kernel/Entity/RowEntityRenderersTest.php
index 83e0cb97f5..54e4f11ee2 100644
--- a/web/core/modules/views/tests/src/Kernel/Entity/RowEntityRenderersTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Entity/RowEntityRenderersTest.php
@@ -21,7 +21,15 @@ class RowEntityRenderersTest extends ViewsKernelTestBase {
*
* @var array
*/
- public static $modules = ['field', 'filter', 'text', 'node', 'user', 'language', 'views_test_language'];
+ public static $modules = [
+ 'field',
+ 'filter',
+ 'text',
+ 'node',
+ 'user',
+ 'language',
+ 'views_test_language',
+ ];
/**
* Views used by this test.
diff --git a/web/core/modules/views/tests/src/Kernel/Entity/ViewEntityDependenciesTest.php b/web/core/modules/views/tests/src/Kernel/Entity/ViewEntityDependenciesTest.php
index 34f58122ca..dc46dace8a 100644
--- a/web/core/modules/views/tests/src/Kernel/Entity/ViewEntityDependenciesTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Entity/ViewEntityDependenciesTest.php
@@ -29,7 +29,14 @@ class ViewEntityDependenciesTest extends ViewsKernelTestBase {
*
* @var array
*/
- public static $modules = ['node', 'comment', 'user', 'field', 'text', 'search'];
+ public static $modules = [
+ 'node',
+ 'comment',
+ 'user',
+ 'field',
+ 'text',
+ 'search',
+ ];
/**
* {@inheritdoc}
diff --git a/web/core/modules/views/tests/src/Kernel/EventSubscriber/ViewsEntitySchemaSubscriberIntegrationTest.php b/web/core/modules/views/tests/src/Kernel/EventSubscriber/ViewsEntitySchemaSubscriberIntegrationTest.php
index 4a27c0fec1..cc4d9d07aa 100644
--- a/web/core/modules/views/tests/src/Kernel/EventSubscriber/ViewsEntitySchemaSubscriberIntegrationTest.php
+++ b/web/core/modules/views/tests/src/Kernel/EventSubscriber/ViewsEntitySchemaSubscriberIntegrationTest.php
@@ -26,7 +26,12 @@ class ViewsEntitySchemaSubscriberIntegrationTest extends ViewsKernelTestBase {
/**
* {@inheritdoc}
*/
- public static $modules = ['entity_test', 'entity_test_update', 'user', 'text'];
+ public static $modules = [
+ 'entity_test',
+ 'entity_test_update',
+ 'user',
+ 'text',
+ ];
/**
* Views used by this test.
diff --git a/web/core/modules/views/tests/src/Kernel/Handler/AreaEntityTest.php b/web/core/modules/views/tests/src/Kernel/Handler/AreaEntityTest.php
index 428796fdfb..5242b4d633 100644
--- a/web/core/modules/views/tests/src/Kernel/Handler/AreaEntityTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Handler/AreaEntityTest.php
@@ -131,23 +131,23 @@ public function doTestRender($entities) {
$footer_xpath = '//div[@class = "' . $view_class . '"]/footer[1]';
$result = $this->xpath($header_xpath);
- $this->assertTrue(strpos(trim((string) $result[0]), $entities[0]->label()) !== FALSE, 'The rendered entity appears in the header of the view.');
- $this->assertTrue(strpos(trim((string) $result[0]), 'full') !== FALSE, 'The rendered entity appeared in the right view mode.');
+ $this->assertStringContainsString($entities[0]->label(), (string) $result[0], 'The rendered entity appears in the header of the view.');
+ $this->assertStringContainsString('full', (string) $result[0], 'The rendered entity appeared in the right view mode.');
$result = $this->xpath($footer_xpath);
- $this->assertTrue(strpos(trim((string) $result[0]), $entities[1]->label()) !== FALSE, 'The rendered entity appears in the footer of the view.');
- $this->assertTrue(strpos(trim((string) $result[0]), 'full') !== FALSE, 'The rendered entity appeared in the right view mode.');
+ $this->assertStringContainsString($entities[1]->label(), (string) $result[0], 'The rendered entity appears in the footer of the view.');
+ $this->assertStringContainsString('full', (string) $result[0], 'The rendered entity appeared in the right view mode.');
$preview = $view->preview('default', [$entities[1]->id()]);
$this->setRawContent($renderer->renderRoot($preview));
$result = $this->xpath($header_xpath);
- $this->assertTrue(strpos(trim((string) $result[0]), $entities[0]->label()) !== FALSE, 'The rendered entity appears in the header of the view.');
- $this->assertTrue(strpos(trim((string) $result[0]), 'full') !== FALSE, 'The rendered entity appeared in the right view mode.');
+ $this->assertStringContainsString($entities[0]->label(), (string) $result[0], 'The rendered entity appears in the header of the view.');
+ $this->assertStringContainsString('full', (string) $result[0], 'The rendered entity appeared in the right view mode.');
$result = $this->xpath($footer_xpath);
- $this->assertTrue(strpos(trim((string) $result[0]), $entities[1]->label()) !== FALSE, 'The rendered entity appears in the footer of the view.');
- $this->assertTrue(strpos(trim((string) $result[0]), 'full') !== FALSE, 'The rendered entity appeared in the right view mode.');
+ $this->assertStringContainsString($entities[1]->label(), (string) $result[0], 'The rendered entity appears in the footer of the view.');
+ $this->assertStringContainsString('full', (string) $result[0], 'The rendered entity appeared in the right view mode.');
// Mark entity_test test view_mode as customizable.
$entity_view_mode = \Drupal::entityTypeManager()->getStorage('entity_view_mode')->load('entity_test.test');
@@ -164,8 +164,8 @@ public function doTestRender($entities) {
$this->setRawContent($renderer->renderRoot($preview));
$view_class = 'js-view-dom-id-' . $view->dom_id;
$result = $this->xpath('//div[@class = "' . $view_class . '"]/header[1]');
- $this->assertTrue(strpos(trim((string) $result[0]), $entities[0]->label()) !== FALSE, 'The rendered entity appears in the header of the view.');
- $this->assertTrue(strpos(trim((string) $result[0]), 'test') !== FALSE, 'The rendered entity appeared in the right view mode.');
+ $this->assertStringContainsString($entities[0]->label(), (string) $result[0], 'The rendered entity appears in the header of the view.');
+ $this->assertStringContainsString('test', (string) $result[0], 'The rendered entity appeared in the right view mode.');
// Test entity access.
$view = Views::getView('test_entity_area');
@@ -173,7 +173,7 @@ public function doTestRender($entities) {
$this->setRawContent($renderer->renderRoot($preview));
$view_class = 'js-view-dom-id-' . $view->dom_id;
$result = $this->xpath('//div[@class = "' . $view_class . '"]/footer[1]');
- $this->assertTrue(strpos($result[0], $entities[2]->label()) === FALSE, 'The rendered entity does not appear in the footer of the view.');
+ $this->assertStringNotContainsString($entities[2]->label(), $result[0], 'The rendered entity does not appear in the footer of the view.');
// Test the available view mode options.
$form = [];
diff --git a/web/core/modules/views/tests/src/Kernel/Handler/AreaViewTest.php b/web/core/modules/views/tests/src/Kernel/Handler/AreaViewTest.php
index a3ab52960b..66a5e2b779 100644
--- a/web/core/modules/views/tests/src/Kernel/Handler/AreaViewTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Handler/AreaViewTest.php
@@ -41,15 +41,15 @@ public function testViewArea() {
$this->executeView($view);
$output = $view->render();
$output = $renderer->renderRoot($output);
- $this->assertTrue(strpos($output, 'js-view-dom-id-' . $view->dom_id) !== FALSE, 'The test view is correctly embedded.');
+ $this->assertStringContainsString('js-view-dom-id-' . $view->dom_id, $output, 'The test view is correctly embedded.');
$view->destroy();
$view->setArguments([27]);
$this->executeView($view);
$output = $view->render();
$output = $renderer->renderRoot($output);
- $this->assertTrue(strpos($output, 'John') === FALSE, 'The test view is correctly embedded with inherited arguments.');
- $this->assertTrue(strpos($output, 'George') !== FALSE, 'The test view is correctly embedded with inherited arguments.');
+ $this->assertStringNotContainsString('John', $output, 'The test view is correctly embedded with inherited arguments.');
+ $this->assertStringContainsString('George', $output, 'The test view is correctly embedded with inherited arguments.');
$view->destroy();
}
diff --git a/web/core/modules/views/tests/src/Kernel/Handler/ArgumentNullTest.php b/web/core/modules/views/tests/src/Kernel/Handler/ArgumentNullTest.php
index 933a00099f..1b5683c3c5 100644
--- a/web/core/modules/views/tests/src/Kernel/Handler/ArgumentNullTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Handler/ArgumentNullTest.php
@@ -68,7 +68,7 @@ public function testAreaText() {
$this->executeView($view, [26]);
// The argument should be ignored, so every result should return.
- $this->assertEqual(5, count($view->result));
+ $this->assertCount(5, $view->result);
}
}
diff --git a/web/core/modules/views/tests/src/Kernel/Handler/ComputedFieldTest.php b/web/core/modules/views/tests/src/Kernel/Handler/ComputedFieldTest.php
index ed00f68a06..cf8f35049c 100644
--- a/web/core/modules/views/tests/src/Kernel/Handler/ComputedFieldTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Handler/ComputedFieldTest.php
@@ -50,7 +50,7 @@ public function testComputedFieldHandler() {
$rendered_view = $view->preview();
$output = $this->container->get('renderer')->renderRoot($rendered_view);
- $this->assertContains('computed string', (string) $output);
+ $this->assertStringContainsString('computed string', (string) $output);
}
}
diff --git a/web/core/modules/views/tests/src/Kernel/Handler/FieldCounterTest.php b/web/core/modules/views/tests/src/Kernel/Handler/FieldCounterTest.php
index ed669667d4..7c9df8b370 100644
--- a/web/core/modules/views/tests/src/Kernel/Handler/FieldCounterTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Handler/FieldCounterTest.php
@@ -116,7 +116,7 @@ public function testPager() {
$this->assertEquals('1', $counter);
$view->destroy();
- // Go the the second page.
+ // Go to the second page.
$view->setCurrentPage(1);
$view->preview();
@@ -124,7 +124,7 @@ public function testPager() {
$this->assertEquals('2', $counter);
$view->destroy();
- // Go the the third page.
+ // Go to the third page.
$view->setCurrentPage(2);
$view->preview();
@@ -158,7 +158,7 @@ public function testPager() {
$this->assertEquals($counter_start, $counter);
$view->destroy();
- // Go the the second page.
+ // Go to the second page.
$view->setCurrentPage(1);
$view->preview();
@@ -166,7 +166,7 @@ public function testPager() {
$this->assertEquals($counter_start + 1, $counter);
$view->destroy();
- // Go the the third page.
+ // Go to the third page.
$view->setCurrentPage(2);
$view->preview();
diff --git a/web/core/modules/views/tests/src/Kernel/Handler/FieldCustomTest.php b/web/core/modules/views/tests/src/Kernel/Handler/FieldCustomTest.php
index 8f55e95d5f..7e502529ff 100644
--- a/web/core/modules/views/tests/src/Kernel/Handler/FieldCustomTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Handler/FieldCustomTest.php
@@ -86,7 +86,7 @@ public function testFieldCustomTokens() {
$output = $renderer->renderRoot($preview);
$expected_text = 'Amount of kittens: ' . $view->style_plugin->getField(0, 'age');
- $this->assertContains($expected_text, (string) $output, 'The views token has been successfully replaced.');
+ $this->assertStringContainsString($expected_text, (string) $output, 'The views token has been successfully replaced.');
}
/**
diff --git a/web/core/modules/views/tests/src/Kernel/Handler/FieldDropbuttonTest.php b/web/core/modules/views/tests/src/Kernel/Handler/FieldDropbuttonTest.php
index d764ea511c..31b7360376 100644
--- a/web/core/modules/views/tests/src/Kernel/Handler/FieldDropbuttonTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Handler/FieldDropbuttonTest.php
@@ -147,21 +147,21 @@ public function testDropbuttonMarkupShouldNotLeakBetweenRows() {
// The first row should contain edit links to node 3, as the user has
// access.
- $this->assertContains($this->node3->toUrl('edit-form')->toString(), (string) $dropbutton_output[0]);
- $this->assertContains($this->node3->toUrl('delete-form')->toString(), (string) $dropbutton_output[0]);
+ $this->assertStringContainsString($this->node3->toUrl('edit-form')->toString(), (string) $dropbutton_output[0]);
+ $this->assertStringContainsString($this->node3->toUrl('delete-form')->toString(), (string) $dropbutton_output[0]);
// Second row should be not contain links to edit/delete any content as user
// has no edit/delete permissions.
// It most certainly should not contain links to node 3, as node 2 is the
// entity that forms this row.
- $this->assertNotContains($this->node3->toUrl('edit-form')->toString(), (string) $dropbutton_output[1]);
- $this->assertNotContains($this->node3->toUrl('delete-form')->toString(), (string) $dropbutton_output[1]);
- $this->assertNotContains($this->node2->toUrl('edit-form')->toString(), (string) $dropbutton_output[1]);
- $this->assertNotContains($this->node2->toUrl('delete-form')->toString(), (string) $dropbutton_output[1]);
+ $this->assertStringNotContainsString($this->node3->toUrl('edit-form')->toString(), (string) $dropbutton_output[1]);
+ $this->assertStringNotContainsString($this->node3->toUrl('delete-form')->toString(), (string) $dropbutton_output[1]);
+ $this->assertStringNotContainsString($this->node2->toUrl('edit-form')->toString(), (string) $dropbutton_output[1]);
+ $this->assertStringNotContainsString($this->node2->toUrl('delete-form')->toString(), (string) $dropbutton_output[1]);
// Third row should contain links for node 1.
- $this->assertContains($this->node1->toUrl('edit-form')->toString(), (string) $dropbutton_output[2]);
- $this->assertContains($this->node1->toUrl('delete-form')->toString(), (string) $dropbutton_output[2]);
+ $this->assertStringContainsString($this->node1->toUrl('edit-form')->toString(), (string) $dropbutton_output[2]);
+ $this->assertStringContainsString($this->node1->toUrl('delete-form')->toString(), (string) $dropbutton_output[2]);
}
}
diff --git a/web/core/modules/views/tests/src/Kernel/Handler/FieldFieldTest.php b/web/core/modules/views/tests/src/Kernel/Handler/FieldFieldTest.php
index 03ad765c46..a6d21a91e8 100644
--- a/web/core/modules/views/tests/src/Kernel/Handler/FieldFieldTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Handler/FieldFieldTest.php
@@ -24,7 +24,13 @@ class FieldFieldTest extends ViewsKernelTestBase {
/**
* {@inheritdoc}
*/
- public static $modules = ['field', 'entity_test', 'user', 'views_test_formatter', 'views_entity_test'];
+ public static $modules = [
+ 'field',
+ 'entity_test',
+ 'user',
+ 'views_test_formatter',
+ 'views_entity_test',
+ ];
/**
* {@inheritdoc}
@@ -229,8 +235,8 @@ public function testSimpleExecute() {
$executable = Views::getView('test_field_field_test');
$executable->execute();
- $this->assertTrue($executable->field['id'] instanceof EntityField);
- $this->assertTrue($executable->field['field_test'] instanceof EntityField);
+ $this->assertInstanceOf(EntityField::class, $executable->field['id']);
+ $this->assertInstanceOf(EntityField::class, $executable->field['field_test']);
$this->assertIdenticalResultset($executable,
[
@@ -299,9 +305,9 @@ public function testFieldAlias() {
$executable = Views::getView('test_field_alias_test');
$executable->execute();
- $this->assertTrue($executable->field['id'] instanceof EntityField);
- $this->assertTrue($executable->field['name'] instanceof EntityField);
- $this->assertTrue($executable->field['name_alias'] instanceof EntityField);
+ $this->assertInstanceOf(EntityField::class, $executable->field['id']);
+ $this->assertInstanceOf(EntityField::class, $executable->field['name']);
+ $this->assertInstanceOf(EntityField::class, $executable->field['name_alias']);
$this->assertIdenticalResultset($executable,
[
@@ -348,10 +354,10 @@ public function testComplexExecute() {
$timezones[] = $user->getTimeZone();
}
- $this->assertTrue($executable->field['field_test_multiple'] instanceof EntityField);
- $this->assertTrue($executable->field['field_test_multiple_1'] instanceof EntityField);
- $this->assertTrue($executable->field['field_test_multiple_2'] instanceof EntityField);
- $this->assertTrue($executable->field['timezone'] instanceof EntityField);
+ $this->assertInstanceOf(EntityField::class, $executable->field['field_test_multiple']);
+ $this->assertInstanceOf(EntityField::class, $executable->field['field_test_multiple_1']);
+ $this->assertInstanceOf(EntityField::class, $executable->field['field_test_multiple_2']);
+ $this->assertInstanceOf(EntityField::class, $executable->field['timezone']);
$this->assertIdenticalResultset($executable,
[
@@ -421,8 +427,8 @@ public function testRevisionExecute() {
$executable = Views::getView('test_field_field_revision_test');
$executable->execute();
- $this->assertTrue($executable->field['name'] instanceof EntityField);
- $this->assertTrue($executable->field['field_test'] instanceof EntityField);
+ $this->assertInstanceOf(EntityField::class, $executable->field['name']);
+ $this->assertInstanceOf(EntityField::class, $executable->field['field_test']);
$this->assertIdenticalResultset($executable,
[
@@ -475,12 +481,12 @@ public function testRevisionComplexExecute() {
$timezones[] = $user->getTimeZone();
}
- $this->assertTrue($executable->field['id'] instanceof EntityField);
- $this->assertTrue($executable->field['revision_id'] instanceof EntityField);
- $this->assertTrue($executable->field['timezone'] instanceof EntityField);
- $this->assertTrue($executable->field['field_test_multiple'] instanceof EntityField);
- $this->assertTrue($executable->field['field_test_multiple_1'] instanceof EntityField);
- $this->assertTrue($executable->field['field_test_multiple_2'] instanceof EntityField);
+ $this->assertInstanceOf(EntityField::class, $executable->field['id']);
+ $this->assertInstanceOf(EntityField::class, $executable->field['revision_id']);
+ $this->assertInstanceOf(EntityField::class, $executable->field['timezone']);
+ $this->assertInstanceOf(EntityField::class, $executable->field['field_test_multiple']);
+ $this->assertInstanceOf(EntityField::class, $executable->field['field_test_multiple_1']);
+ $this->assertInstanceOf(EntityField::class, $executable->field['field_test_multiple_2']);
$this->assertIdenticalResultset($executable,
[
diff --git a/web/core/modules/views/tests/src/Kernel/Handler/FieldKernelTest.php b/web/core/modules/views/tests/src/Kernel/Handler/FieldKernelTest.php
index faee4e66a6..81623f4f6d 100644
--- a/web/core/modules/views/tests/src/Kernel/Handler/FieldKernelTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Handler/FieldKernelTest.php
@@ -114,7 +114,7 @@ public function testQuery() {
* TRUE if the assertion succeeded, FALSE otherwise.
*/
protected function assertSubString($haystack, $needle, $message = '', $group = 'Other') {
- return $this->assertTrue(strpos($haystack, $needle) !== FALSE, $message, $group);
+ return $this->assertStringContainsString($needle, $haystack, $message);
}
/**
@@ -139,7 +139,7 @@ protected function assertSubString($haystack, $needle, $message = '', $group = '
* TRUE if the assertion succeeded, FALSE otherwise.
*/
protected function assertNotSubString($haystack, $needle, $message = '', $group = 'Other') {
- return $this->assertTrue(strpos($haystack, $needle) === FALSE, $message, $group);
+ return $this->assertStringNotContainsString($needle, $haystack, $message);
}
/**
@@ -251,7 +251,7 @@ public function testArgumentTokens() {
return $name_field_0->advancedRender($row);
});
- $this->assertFalse(strpos((string) $output, '\Drupal\views_test_data\Controller\ViewsTestDataController::preRender executed') !== FALSE, 'Ensure that the pre_render function was not executed');
+ $this->assertStringNotContainsString('\Drupal\views_test_data\Controller\ViewsTestDataController::preRender executed', (string) $output, 'Ensure that the pre_render function was not executed');
$this->assertEqual('%1 !1', (string) $output, "Ensure that old style placeholders aren't replaced");
// This time use new style tokens but ensure that we still don't allow
@@ -264,7 +264,7 @@ public function testArgumentTokens() {
return $name_field_0->advancedRender($row);
});
- $this->assertFalse(strpos((string) $output, '\Drupal\views_test_data\Controller\ViewsTestDataController::preRender executed') !== FALSE, 'Ensure that the pre_render function was not executed');
+ $this->assertStringNotContainsString('\Drupal\views_test_data\Controller\ViewsTestDataController::preRender executed', (string) $output, 'Ensure that the pre_render function was not executed');
$this->assertEqual('{{ { "#pre_render": ["\Drupal\views_test_data\Controller\ViewsTestDataController::preRender"]} }} {{ { "#pre_render": ["\Drupal\views_test_data\Controller\ViewsTestDataController::preRender"]} }}', (string) $output, 'Ensure that new style placeholders are replaced');
}
diff --git a/web/core/modules/views/tests/src/Kernel/Handler/FilterBooleanOperatorStringTest.php b/web/core/modules/views/tests/src/Kernel/Handler/FilterBooleanOperatorStringTest.php
index 325da5106e..2eb4aff6ed 100644
--- a/web/core/modules/views/tests/src/Kernel/Handler/FilterBooleanOperatorStringTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Handler/FilterBooleanOperatorStringTest.php
@@ -106,7 +106,7 @@ public function testFilterBooleanOperatorString() {
['id' => 4],
];
- $this->assertEqual(2, count($view->result));
+ $this->assertCount(2, $view->result);
$this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
$view->destroy();
@@ -129,7 +129,7 @@ public function testFilterBooleanOperatorString() {
['id' => 5],
];
- $this->assertEqual(3, count($view->result));
+ $this->assertCount(3, $view->result);
$this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
}
@@ -152,7 +152,7 @@ public function testFilterGroupedExposed() {
['id' => 5],
];
- $this->assertEqual(3, count($view->result));
+ $this->assertCount(3, $view->result);
$this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
$view->destroy();
@@ -167,7 +167,7 @@ public function testFilterGroupedExposed() {
['id' => 4],
];
- $this->assertEqual(2, count($view->result));
+ $this->assertCount(2, $view->result);
$this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
}
diff --git a/web/core/modules/views/tests/src/Kernel/Handler/FilterBooleanOperatorTest.php b/web/core/modules/views/tests/src/Kernel/Handler/FilterBooleanOperatorTest.php
index 7cdd41f525..3dfe23b28d 100644
--- a/web/core/modules/views/tests/src/Kernel/Handler/FilterBooleanOperatorTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Handler/FilterBooleanOperatorTest.php
@@ -59,7 +59,7 @@ public function testFilterBooleanOperator() {
['id' => 4],
];
- $this->assertEqual(2, count($view->result));
+ $this->assertCount(2, $view->result);
$this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
$view->destroy();
@@ -82,7 +82,7 @@ public function testFilterBooleanOperator() {
['id' => 5],
];
- $this->assertEqual(3, count($view->result));
+ $this->assertCount(3, $view->result);
$this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
$view->destroy();
@@ -106,7 +106,7 @@ public function testFilterBooleanOperator() {
['id' => 5],
];
- $this->assertEqual(3, count($view->result));
+ $this->assertCount(3, $view->result);
$this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
}
@@ -129,7 +129,7 @@ public function testFilterGroupedExposed() {
['id' => 5],
];
- $this->assertEqual(3, count($view->result));
+ $this->assertCount(3, $view->result);
$this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
$view->destroy();
@@ -144,7 +144,7 @@ public function testFilterGroupedExposed() {
['id' => 4],
];
- $this->assertEqual(2, count($view->result));
+ $this->assertCount(2, $view->result);
$this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
$view->destroy();
@@ -162,7 +162,7 @@ public function testFilterGroupedExposed() {
['id' => 5],
];
- $this->assertEqual(3, count($view->result));
+ $this->assertCount(3, $view->result);
$this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
}
diff --git a/web/core/modules/views/tests/src/Kernel/Handler/FilterCombineTest.php b/web/core/modules/views/tests/src/Kernel/Handler/FilterCombineTest.php
index feffbafd9e..4c52cfe123 100644
--- a/web/core/modules/views/tests/src/Kernel/Handler/FilterCombineTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Handler/FilterCombineTest.php
@@ -188,6 +188,10 @@ public function testFilterCombineAllWords() {
],
];
$this->assertIdenticalResultset($view, $resultset, $this->columnMap);
+
+ // Confirm that the query with multiple filters used the "CONCAT_WS"
+ // operator.
+ $this->assertStringContainsString('CONCAT_WS(', $view->query->query());
}
/**
@@ -271,6 +275,10 @@ public function testNonFieldsRow() {
$errors = $view->validate();
// Check that the right error is shown.
$this->assertEquals(t('%display: %filter can only be used on displays that use fields. Set the style or row format for that display to one using fields to use the combine field filter.', ['%filter' => 'Global: Combine fields filter', '%display' => 'Master']), reset($errors['default']));
+
+ // Confirm that the query with single filter does not use the "CONCAT_WS"
+ // operator.
+ $this->assertStringNotContainsString('CONCAT_WS(', $view->query->query());
}
/**
diff --git a/web/core/modules/views/tests/src/Kernel/Handler/FilterInOperatorTest.php b/web/core/modules/views/tests/src/Kernel/Handler/FilterInOperatorTest.php
index 08ab9cf6b4..9516696d1a 100644
--- a/web/core/modules/views/tests/src/Kernel/Handler/FilterInOperatorTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Handler/FilterInOperatorTest.php
@@ -70,7 +70,7 @@ public function testFilterInOperatorSimple() {
],
];
- $this->assertEqual(2, count($view->result));
+ $this->assertCount(2, $view->result);
$this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
$view->destroy();
@@ -104,7 +104,7 @@ public function testFilterInOperatorSimple() {
],
];
- $this->assertEqual(3, count($view->result));
+ $this->assertCount(3, $view->result);
$this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
}
@@ -130,7 +130,7 @@ public function testFilterInOperatorGroupedExposedSimple() {
],
];
- $this->assertEqual(2, count($view->result));
+ $this->assertCount(2, $view->result);
$this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
}
@@ -160,7 +160,7 @@ public function testFilterNotInOperatorGroupedExposedSimple() {
],
];
- $this->assertEqual(3, count($view->result));
+ $this->assertCount(3, $view->result);
$this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
}
diff --git a/web/core/modules/views/tests/src/Kernel/Handler/SortDateTest.php b/web/core/modules/views/tests/src/Kernel/Handler/SortDateTest.php
index dd408f8786..09fc68ca77 100644
--- a/web/core/modules/views/tests/src/Kernel/Handler/SortDateTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Handler/SortDateTest.php
@@ -33,6 +33,7 @@ protected function expectedResultSet($granularity, $reverse = TRUE) {
['name' => 'George'],
];
break;
+
case 'minute':
$expected = [
['name' => 'John'],
@@ -42,6 +43,7 @@ protected function expectedResultSet($granularity, $reverse = TRUE) {
['name' => 'George'],
];
break;
+
case 'hour':
$expected = [
['name' => 'John'],
@@ -51,6 +53,7 @@ protected function expectedResultSet($granularity, $reverse = TRUE) {
['name' => 'George'],
];
break;
+
case 'day':
$expected = [
['name' => 'John'],
@@ -60,6 +63,7 @@ protected function expectedResultSet($granularity, $reverse = TRUE) {
['name' => 'George'],
];
break;
+
case 'month':
$expected = [
['name' => 'John'],
@@ -69,6 +73,7 @@ protected function expectedResultSet($granularity, $reverse = TRUE) {
['name' => 'Meredith'],
];
break;
+
case 'year':
$expected = [
['name' => 'John'],
@@ -91,6 +96,7 @@ protected function expectedResultSet($granularity, $reverse = TRUE) {
['name' => 'John'],
];
break;
+
case 'minute':
$expected = [
['name' => 'George'],
@@ -100,6 +106,7 @@ protected function expectedResultSet($granularity, $reverse = TRUE) {
['name' => 'John'],
];
break;
+
case 'hour':
$expected = [
['name' => 'George'],
@@ -109,6 +116,7 @@ protected function expectedResultSet($granularity, $reverse = TRUE) {
['name' => 'John'],
];
break;
+
case 'day':
$expected = [
['name' => 'George'],
@@ -118,6 +126,7 @@ protected function expectedResultSet($granularity, $reverse = TRUE) {
['name' => 'Meredith'],
];
break;
+
case 'month':
$expected = [
['name' => 'John'],
@@ -127,6 +136,7 @@ protected function expectedResultSet($granularity, $reverse = TRUE) {
['name' => 'Meredith'],
];
break;
+
case 'year':
$expected = [
['name' => 'John'],
diff --git a/web/core/modules/views/tests/src/Kernel/ModuleTest.php b/web/core/modules/views/tests/src/Kernel/ModuleTest.php
index db43e96cea..219d3ae3b8 100644
--- a/web/core/modules/views/tests/src/Kernel/ModuleTest.php
+++ b/web/core/modules/views/tests/src/Kernel/ModuleTest.php
@@ -76,7 +76,7 @@ public function testViewsGetHandler() {
'field' => 'job',
];
$handler = $this->container->get('plugin.manager.views.filter')->getHandler($item, 'standard');
- $this->assertTrue($handler instanceof Standard);
+ $this->assertInstanceOf(Standard::class, $handler);
// @todo Reinstate these tests when the debug() in views_get_handler() is
// restored.
@@ -89,7 +89,7 @@ public function testViewsGetHandler() {
'field' => 'field_invalid',
];
$this->container->get('plugin.manager.views.field')->getHandler($item);
- $this->assertTrue(strpos($this->lastErrorMessage, new FormattableMarkup("Missing handler: @table @field @type", ['@table' => 'views_test_data', '@field' => 'field_invalid', '@type' => 'field'])) !== FALSE, 'An invalid field name throws a debug message.');
+ $this->assertStringContainsString(new FormattableMarkup("Missing handler: @table @field @type", ['@table' => 'views_test_data', '@field' => 'field_invalid', '@type' => 'field']), $this->lastErrorMessage, 'An invalid field name throws a debug message.');
unset($this->lastErrorMessage);
$item = [
@@ -97,7 +97,7 @@ public function testViewsGetHandler() {
'field' => 'id',
];
$this->container->get('plugin.manager.views.filter')->getHandler($item);
- $this->assertEqual(strpos($this->lastErrorMessage, new FormattableMarkup("Missing handler: @table @field @type", ['@table' => 'table_invalid', '@field' => 'id', '@type' => 'filter'])) !== FALSE, 'An invalid table name throws a debug message.');
+ $this->assertStringContainsString(new FormattableMarkup("Missing handler: @table @field @type", ['@table' => 'table_invalid', '@field' => 'id', '@type' => 'filter']), $this->lastErrorMessage, 'An invalid table name throws a debug message.');
unset($this->lastErrorMessage);
$item = [
@@ -105,7 +105,7 @@ public function testViewsGetHandler() {
'field' => 'id',
];
$this->container->get('plugin.manager.views.filter')->getHandler($item);
- $this->assertEqual(strpos($this->lastErrorMessage, new FormattableMarkup("Missing handler: @table @field @type", ['@table' => 'table_invalid', '@field' => 'id', '@type' => 'filter'])) !== FALSE, 'An invalid table name throws a debug message.');
+ $this->assertStringContainsString(new FormattableMarkup("Missing handler: @table @field @type", ['@table' => 'table_invalid', '@field' => 'id', '@type' => 'filter']), $this->lastErrorMessage, 'An invalid table name throws a debug message.');
unset($this->lastErrorMessage);
restore_error_handler();
@@ -191,9 +191,9 @@ public function testLoadFunctions() {
$this->assertIdentical(array_keys($all_views_sorted), array_keys(Views::getViewsAsOptions(TRUE, 'all', NULL, FALSE, TRUE)), 'All view id keys returned in expected sort order');
// Test $exclude_view parameter.
- $this->assertFalse(array_key_exists('archive', Views::getViewsAsOptions(TRUE, 'all', 'archive')), 'View excluded from options based on name');
- $this->assertFalse(array_key_exists('archive:default', Views::getViewsAsOptions(FALSE, 'all', 'archive:default')), 'View display excluded from options based on name');
- $this->assertFalse(array_key_exists('archive', Views::getViewsAsOptions(TRUE, 'all', $archive->getExecutable())), 'View excluded from options based on object');
+ $this->assertArrayNotHasKey('archive', Views::getViewsAsOptions(TRUE, 'all', 'archive'));
+ $this->assertArrayNotHasKey('archive:default', Views::getViewsAsOptions(FALSE, 'all', 'archive:default'));
+ $this->assertArrayNotHasKey('archive', Views::getViewsAsOptions(TRUE, 'all', $archive->getExecutable()));
// Test the $opt_group parameter.
$expected_opt_groups = [];
@@ -262,7 +262,7 @@ public function testViewsPluginList() {
$this->assertEqual($plugin_details['type'], $plugin_type, 'The expected plugin type was found.');
$this->assertEqual($plugin_details['title'], $plugin_def['title'], 'The expected plugin title was found.');
$this->assertEqual($plugin_details['provider'], $plugin_def['provider'], 'The expected plugin provider was found.');
- $this->assertTrue(in_array('test_view', $plugin_details['views']), 'The test_view View was found in the list of views using this plugin.');
+ $this->assertContains('test_view', $plugin_details['views'], 'The test_view View was found in the list of views using this plugin.');
}
}
@@ -275,23 +275,23 @@ public function testViewsEmbedView() {
$result = views_embed_view('test_argument');
$renderer->renderPlain($result);
- $this->assertEqual(count($result['view_build']['#view']->result), 5);
+ $this->assertCount(5, $result['view_build']['#view']->result);
$result = views_embed_view('test_argument', 'default', 1);
$renderer->renderPlain($result);
- $this->assertEqual(count($result['view_build']['#view']->result), 1);
+ $this->assertCount(1, $result['view_build']['#view']->result);
$result = views_embed_view('test_argument', 'default', '1,2');
$renderer->renderPlain($result);
- $this->assertEqual(count($result['view_build']['#view']->result), 2);
+ $this->assertCount(2, $result['view_build']['#view']->result);
$result = views_embed_view('test_argument', 'default', '1,2', 'John');
$renderer->renderPlain($result);
- $this->assertEqual(count($result['view_build']['#view']->result), 1);
+ $this->assertCount(1, $result['view_build']['#view']->result);
$result = views_embed_view('test_argument', 'default', '1,2', 'John,George');
$renderer->renderPlain($result);
- $this->assertEqual(count($result['view_build']['#view']->result), 2);
+ $this->assertCount(2, $result['view_build']['#view']->result);
}
/**
@@ -300,39 +300,39 @@ public function testViewsEmbedView() {
public function testViewsPreview() {
$view = Views::getView('test_argument');
$result = $view->preview('default');
- $this->assertEqual(count($result['#view']->result), 5);
+ $this->assertCount(5, $result['#view']->result);
$view = Views::getView('test_argument');
$result = $view->preview('default', ['0' => 1]);
- $this->assertEqual(count($result['#view']->result), 1);
+ $this->assertCount(1, $result['#view']->result);
$view = Views::getView('test_argument');
$result = $view->preview('default', ['3' => 1]);
- $this->assertEqual(count($result['#view']->result), 1);
+ $this->assertCount(1, $result['#view']->result);
$view = Views::getView('test_argument');
$result = $view->preview('default', ['0' => '1,2']);
- $this->assertEqual(count($result['#view']->result), 2);
+ $this->assertCount(2, $result['#view']->result);
$view = Views::getView('test_argument');
$result = $view->preview('default', ['3' => '1,2']);
- $this->assertEqual(count($result['#view']->result), 2);
+ $this->assertCount(2, $result['#view']->result);
$view = Views::getView('test_argument');
$result = $view->preview('default', ['0' => '1,2', '1' => 'John']);
- $this->assertEqual(count($result['#view']->result), 1);
+ $this->assertCount(1, $result['#view']->result);
$view = Views::getView('test_argument');
$result = $view->preview('default', ['3' => '1,2', '4' => 'John']);
- $this->assertEqual(count($result['#view']->result), 1);
+ $this->assertCount(1, $result['#view']->result);
$view = Views::getView('test_argument');
$result = $view->preview('default', ['0' => '1,2', '1' => 'John,George']);
- $this->assertEqual(count($result['#view']->result), 2);
+ $this->assertCount(2, $result['#view']->result);
$view = Views::getView('test_argument');
$result = $view->preview('default', ['3' => '1,2', '4' => 'John,George']);
- $this->assertEqual(count($result['#view']->result), 2);
+ $this->assertCount(2, $result['#view']->result);
}
/**
diff --git a/web/core/modules/views/tests/src/Kernel/Plugin/ArgumentValidatorTest.php b/web/core/modules/views/tests/src/Kernel/Plugin/ArgumentValidatorTest.php
index 82876f1e3e..657b576649 100644
--- a/web/core/modules/views/tests/src/Kernel/Plugin/ArgumentValidatorTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Plugin/ArgumentValidatorTest.php
@@ -57,7 +57,7 @@ public function testArgumentValidatorPlugin() {
$this->assertTrue($argument->validateArgument($test_value), 'The right argument validates.');
$plugin = $argument->getPlugin('argument_validator');
- $this->assertTrue($plugin instanceof ArgumentValidatorTestPlugin, 'The correct argument validator plugin is used.');
+ $this->assertInstanceOf(ArgumentValidatorTestPlugin::class, $plugin);
$this->assertFalse($plugin->validateArgument($this->randomMachineName()), 'A random value does not validate.');
$this->assertTrue($plugin->validateArgument($test_value), 'The right argument validates.');
}
diff --git a/web/core/modules/views/tests/src/Kernel/Plugin/CacheTest.php b/web/core/modules/views/tests/src/Kernel/Plugin/CacheTest.php
index c8793bc882..85e01708ec 100644
--- a/web/core/modules/views/tests/src/Kernel/Plugin/CacheTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Plugin/CacheTest.php
@@ -81,7 +81,7 @@ public function testTimeResultCaching() {
// Test the default (non-paged) display.
$this->executeView($view);
// Verify the result.
- $this->assertEqual(5, count($view->result), 'The number of returned rows match.');
+ $this->assertCount(5, $view->result, 'The number of returned rows match.');
// Add another man to the beatles.
$record = [
@@ -97,7 +97,7 @@ public function testTimeResultCaching() {
$view->destroy();
$this->executeView($view);
// Verify the result.
- $this->assertEqual(5, count($view->result), 'The number of returned rows match.');
+ $this->assertCount(5, $view->result, 'The number of returned rows match.');
}
/**
@@ -108,7 +108,7 @@ public function testTimeResultCaching() {
public function testTimeResultCachingWithFilter() {
// Check that we can find the test filter plugin.
$plugin = $this->container->get('plugin.manager.views.filter')->createInstance('test_filter');
- $this->assertTrue($plugin instanceof FilterPlugin, 'Test filter plugin found.');
+ $this->assertInstanceOf(FilterPlugin::class, $plugin);
$view = Views::getView('test_filter');
$view->initDisplay();
@@ -141,7 +141,7 @@ public function testTimeResultCachingWithFilter() {
$dataset = [['name' => 'John']];
// Verify the result.
- $this->assertEqual(1, count($view->result), 'The number of returned rows match.');
+ $this->assertCount(1, $view->result, 'The number of returned rows match.');
$this->assertIdenticalResultSet($view, $dataset, [
'views_test_data_name' => 'name',
]);
@@ -172,7 +172,7 @@ public function testTimeResultCachingWithFilter() {
$dataset = [['name' => 'Ringo']];
// Verify the result.
- $this->assertEqual(1, count($view->result), 'The number of returned rows match.');
+ $this->assertCount(1, $view->result, 'The number of returned rows match.');
$this->assertIdenticalResultSet($view, $dataset, [
'views_test_data_name' => 'name',
]);
@@ -235,7 +235,7 @@ public function testNoneResultCaching() {
$this->executeView($view);
// Verify the result.
- $this->assertEqual(5, count($view->result), 'The number of returned rows match.');
+ $this->assertCount(5, $view->result, 'The number of returned rows match.');
// Add another man to the beatles.
$record = [
@@ -255,7 +255,7 @@ public function testNoneResultCaching() {
$this->executeView($view);
// Verify the result.
- $this->assertEqual(6, count($view->result), 'The number of returned rows match.');
+ $this->assertCount(6, $view->result, 'The number of returned rows match.');
}
/**
@@ -291,7 +291,7 @@ public function testHeaderStorage() {
return $renderer->render($output);
});
- $this->assertTrue(in_array('views_test_data/test', $output['#attached']['library']), 'Make sure libraries are added for cached views.');
+ $this->assertContains('views_test_data/test', $output['#attached']['library'], 'Make sure libraries are added for cached views.');
$this->assertEqual(['foo' => 'bar'], $output['#attached']['drupalSettings'], 'Make sure drupalSettings are added for cached views.');
// Note: views_test_data_views_pre_render() adds some cache tags.
$this->assertEqual(['config:views.view.test_cache_header_storage', 'views_test_data:1'], $output['#cache']['tags']);
diff --git a/web/core/modules/views/tests/src/Kernel/Plugin/DisplayExtenderTest.php b/web/core/modules/views/tests/src/Kernel/Plugin/DisplayExtenderTest.php
index ffd8d762a9..4d60524a5f 100644
--- a/web/core/modules/views/tests/src/Kernel/Plugin/DisplayExtenderTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Plugin/DisplayExtenderTest.php
@@ -27,15 +27,15 @@ class DisplayExtenderTest extends ViewsKernelTestBase {
*/
public function testDisplayExtenders() {
$this->config('views.settings')->set('display_extenders', ['display_extender_test'])->save();
- $this->assertEqual(count(Views::getEnabledDisplayExtenders()), 1, 'Make sure that there is only one enabled display extender.');
+ $this->assertCount(1, Views::getEnabledDisplayExtenders(), 'Make sure that there is only one enabled display extender.');
$view = Views::getView('test_view');
$view->initDisplay();
- $this->assertEqual(count($view->display_handler->getExtenders()), 1, 'Make sure that only one extender is initialized.');
+ $this->assertCount(1, $view->display_handler->getExtenders(), 'Make sure that only one extender is initialized.');
$display_extender = $view->display_handler->getExtenders()['display_extender_test'];
- $this->assertTrue($display_extender instanceof DisplayExtenderTestData, 'Make sure the right class got initialized.');
+ $this->assertInstanceOf(DisplayExtenderTestData::class, $display_extender);
$view->preExecute();
$this->assertTrue($display_extender->testState['preExecute'], 'Make sure the display extender was able to react on preExecute.');
@@ -53,7 +53,8 @@ public function testDisplayExtendersValidate() {
$errors = $view->validate();
foreach ($view->displayHandlers as $id => $display) {
- $this->assertTrue(isset($errors[$id]) && in_array('Display extender test error.', $errors[$id]), new FormattableMarkup('Error message found for @id display', ['@id' => $id]));
+ $this->assertArrayHasKey($id, $errors);
+ $this->assertContains('Display extender test error.', $errors[$id], new FormattableMarkup('Error message found for @id display', ['@id' => $id]));
}
}
diff --git a/web/core/modules/views/tests/src/Kernel/Plugin/DisplayKernelTest.php b/web/core/modules/views/tests/src/Kernel/Plugin/DisplayKernelTest.php
index fc4b4f7b68..0e9739e6d7 100644
--- a/web/core/modules/views/tests/src/Kernel/Plugin/DisplayKernelTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Plugin/DisplayKernelTest.php
@@ -94,13 +94,13 @@ public function testGetPlugin() {
$view->initDisplay();
$display_handler = $view->display_handler;
- $this->assertTrue($display_handler->getPlugin('access') instanceof AccessPluginBase, 'An access plugin instance was returned.');
- $this->assertTrue($display_handler->getPlugin('cache') instanceof CachePluginBase, 'A cache plugin instance was returned.');
- $this->assertTrue($display_handler->getPlugin('exposed_form') instanceof ExposedFormPluginInterface, 'An exposed_form plugin instance was returned.');
- $this->assertTrue($display_handler->getPlugin('pager') instanceof PagerPluginBase, 'A pager plugin instance was returned.');
- $this->assertTrue($display_handler->getPlugin('query') instanceof QueryPluginBase, 'A query plugin instance was returned.');
- $this->assertTrue($display_handler->getPlugin('row') instanceof RowPluginBase, 'A row plugin instance was returned.');
- $this->assertTrue($display_handler->getPlugin('style') instanceof StylePluginBase, 'A style plugin instance was returned.');
+ $this->assertInstanceOf(AccessPluginBase::class, $display_handler->getPlugin('access'));
+ $this->assertInstanceOf(CachePluginBase::class, $display_handler->getPlugin('cache'));
+ $this->assertInstanceOf(ExposedFormPluginInterface::class, $display_handler->getPlugin('exposed_form'));
+ $this->assertInstanceOf(PagerPluginBase::class, $display_handler->getPlugin('pager'));
+ $this->assertInstanceOf(QueryPluginBase::class, $display_handler->getPlugin('query'));
+ $this->assertInstanceOf(RowPluginBase::class, $display_handler->getPlugin('row'));
+ $this->assertInstanceOf(StylePluginBase::class, $display_handler->getPlugin('style'));
// Test that nothing is returned when an invalid type is requested.
$this->assertNull($display_handler->getPlugin('invalid'), 'NULL was returned for an invalid instance');
// Test that nothing was returned for an instance with no 'type' in options.
diff --git a/web/core/modules/views/tests/src/Kernel/Plugin/ExposedFormRenderTest.php b/web/core/modules/views/tests/src/Kernel/Plugin/ExposedFormRenderTest.php
index 8cde0897eb..bb2579cd2b 100644
--- a/web/core/modules/views/tests/src/Kernel/Plugin/ExposedFormRenderTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Plugin/ExposedFormRenderTest.php
@@ -49,8 +49,8 @@ public function testExposedFormRender() {
$expected_action = $view->display_handler->getUrlInfo()->toString();
$this->assertFieldByXPath('//form/@action', $expected_action, 'The expected value for the action attribute was found.');
// Make sure the description is shown.
- $result = $this->xpath('//form//div[contains(@id, :id) and normalize-space(text())=:description]', [':id' => 'edit-type--description', ':description' => t('Exposed description')]);
- $this->assertEqual(count($result), 1, 'Filter description was found.');
+ $result = $this->xpath('//form//div[contains(@id, :id) and normalize-space(text())=:description]', [':id' => 'edit-type--2--description', ':description' => t('Exposed description')]);
+ $this->assertCount(1, $result, 'Filter description was found.');
}
/**
diff --git a/web/core/modules/views/tests/src/Kernel/Plugin/FieldOrLanguageJoinTest.php b/web/core/modules/views/tests/src/Kernel/Plugin/FieldOrLanguageJoinTest.php
index 76be7154df..7d32c33565 100644
--- a/web/core/modules/views/tests/src/Kernel/Plugin/FieldOrLanguageJoinTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Plugin/FieldOrLanguageJoinTest.php
@@ -63,7 +63,7 @@ public function testBase() {
'adjusted' => TRUE,
];
$join = $this->manager->createInstance($this->pluginId, $configuration);
- $this->assertTrue($join instanceof FieldOrLanguageJoin);
+ $this->assertInstanceOf(FieldOrLanguageJoin::class, $join);
$this->assertNull($join->extra);
$this->assertTrue($join->adjusted);
@@ -97,9 +97,9 @@ public function testBase() {
],
];
$join_info = $this->buildJoin($view, $configuration, 'users3');
- $this->assertContains('views_test_data.uid = users3.uid', $join_info['condition']);
- $this->assertContains('users3.name = :views_join_condition_0', $join_info['condition']);
- $this->assertContains('users3.name <> :views_join_condition_1', $join_info['condition']);
+ $this->assertStringContainsString('views_test_data.uid = users3.uid', $join_info['condition']);
+ $this->assertStringContainsString('users3.name = :views_join_condition_0', $join_info['condition']);
+ $this->assertStringContainsString('users3.name <> :views_join_condition_1', $join_info['condition']);
$this->assertSame(array_values($join_info['arguments']), [$random_name_1, $random_name_2]);
// Test that 'IN' conditions are properly built.
@@ -118,9 +118,9 @@ public function testBase() {
],
];
$join_info = $this->buildJoin($view, $configuration, 'users4');
- $this->assertContains('views_test_data.uid = users4.uid', $join_info['condition']);
- $this->assertContains('users4.name = :views_join_condition_0', $join_info['condition']);
- $this->assertContains('users4.name IN ( :views_join_condition_1[] )', $join_info['condition']);
+ $this->assertStringContainsString('views_test_data.uid = users4.uid', $join_info['condition']);
+ $this->assertStringContainsString('users4.name = :views_join_condition_0', $join_info['condition']);
+ $this->assertStringContainsString('users4.name IN ( :views_join_condition_1[] )', $join_info['condition']);
$this->assertSame($join_info['arguments'][':views_join_condition_1[]'], [$random_name_2, $random_name_3, $random_name_4]);
}
@@ -148,7 +148,7 @@ public function testLanguageBundleConditions() {
],
];
$join_info = $this->buildJoin($view, $configuration, 'node__field_tags');
- $this->assertContains('AND (node__field_tags.langcode = views_test_data.langcode)', $join_info['condition']);
+ $this->assertStringContainsString('AND (node__field_tags.langcode = views_test_data.langcode)', $join_info['condition']);
array_unshift($configuration['extra'], [
'field' => 'deleted',
@@ -156,7 +156,7 @@ public function testLanguageBundleConditions() {
'numeric' => TRUE,
]);
$join_info = $this->buildJoin($view, $configuration, 'node__field_tags');
- $this->assertContains('AND (node__field_tags.langcode = views_test_data.langcode)', $join_info['condition']);
+ $this->assertStringContainsString('AND (node__field_tags.langcode = views_test_data.langcode)', $join_info['condition']);
// Replace the language condition with a bundle condition.
$configuration['extra'][1] = [
@@ -164,7 +164,7 @@ public function testLanguageBundleConditions() {
'value' => ['page'],
];
$join_info = $this->buildJoin($view, $configuration, 'node__field_tags');
- $this->assertContains('AND (node__field_tags.bundle = :views_join_condition_1)', $join_info['condition']);
+ $this->assertStringContainsString('AND (node__field_tags.bundle = :views_join_condition_1)', $join_info['condition']);
// Now re-add a language condition to make sure the bundle and language
// conditions are combined with an OR.
@@ -173,7 +173,7 @@ public function testLanguageBundleConditions() {
'field' => 'langcode',
];
$join_info = $this->buildJoin($view, $configuration, 'node__field_tags');
- $this->assertContains('AND (node__field_tags.bundle = :views_join_condition_1 OR node__field_tags.langcode = views_test_data.langcode)', $join_info['condition']);
+ $this->assertStringContainsString('AND (node__field_tags.bundle = :views_join_condition_1 OR node__field_tags.langcode = views_test_data.langcode)', $join_info['condition']);
}
/**
@@ -196,7 +196,7 @@ protected function buildJoin($view, $configuration, $table_alias) {
$query = \Drupal::database()->select('node');
$join = $this->manager->createInstance('field_or_language_join', $configuration);
- $this->assertInstanceOf(FieldOrLanguageJoin::class, $join, 'The correct join class got loaded.');
+ $this->assertInstanceOf(FieldOrLanguageJoin::class, $join);
$table = ['alias' => $table_alias];
$join->buildJoin($query, $table, $view->query);
diff --git a/web/core/modules/views/tests/src/Kernel/Plugin/JoinTest.php b/web/core/modules/views/tests/src/Kernel/Plugin/JoinTest.php
index e59027f4fb..c01ef8f81b 100644
--- a/web/core/modules/views/tests/src/Kernel/Plugin/JoinTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Plugin/JoinTest.php
@@ -54,7 +54,7 @@ public function testExamplePlugin() {
'field' => 'uid',
];
$join = $this->manager->createInstance('join_test', $configuration);
- $this->assertTrue($join instanceof JoinTestPlugin, 'The correct join class got loaded.');
+ $this->assertInstanceOf(JoinTestPlugin::class, $join);
$rand_int = rand(0, 1000);
$join->setJoinValue($rand_int);
@@ -65,7 +65,7 @@ public function testExamplePlugin() {
$tables = $query->getTables();
$join_info = $tables['users_field_data'];
- $this->assertTrue(strpos($join_info['condition'], "views_test_data.uid = $rand_int") !== FALSE, 'Make sure that the custom join plugin can extend the join base and alter the result.');
+ $this->assertStringContainsString("views_test_data.uid = $rand_int", $join_info['condition'], 'Make sure that the custom join plugin can extend the join base and alter the result.');
}
/**
@@ -88,7 +88,7 @@ public function testBasePlugin() {
'adjusted' => TRUE,
];
$join = $this->manager->createInstance('standard', $configuration);
- $this->assertTrue($join instanceof JoinPluginBase, 'The correct join class got loaded.');
+ $this->assertInstanceOf(JoinPluginBase::class, $join);
$this->assertNull($join->extra, 'The field extra was not overridden.');
$this->assertTrue($join->adjusted, 'The field adjusted was set correctly.');
@@ -144,9 +144,9 @@ public function testBasePlugin() {
$tables = $query->getTables();
$join_info = $tables['users3'];
- $this->assertTrue(strpos($join_info['condition'], "views_test_data.uid = users3.uid") !== FALSE, 'Make sure the join condition appears in the query.');
- $this->assertTrue(strpos($join_info['condition'], "users3.name = :views_join_condition_0") !== FALSE, 'Make sure the first extra join condition appears in the query and uses the first placeholder.');
- $this->assertTrue(strpos($join_info['condition'], "users3.name <> :views_join_condition_1") !== FALSE, 'Make sure the second extra join condition appears in the query and uses the second placeholder.');
+ $this->assertStringContainsString("views_test_data.uid = users3.uid", $join_info['condition'], 'Make sure the join condition appears in the query.');
+ $this->assertStringContainsString("users3.name = :views_join_condition_0", $join_info['condition'], 'Make sure the first extra join condition appears in the query and uses the first placeholder.');
+ $this->assertStringContainsString("users3.name <> :views_join_condition_1", $join_info['condition'], 'Make sure the second extra join condition appears in the query and uses the second placeholder.');
$this->assertEqual(array_values($join_info['arguments']), [$random_name_1, $random_name_2], 'Make sure the arguments are in the right order');
// Test that 'IN' conditions are properly built.
@@ -170,9 +170,9 @@ public function testBasePlugin() {
$tables = $query->getTables();
$join_info = $tables['users4'];
- $this->assertTrue(strpos($join_info['condition'], "views_test_data.uid = users4.uid") !== FALSE, 'Make sure the join condition appears in the query.');
- $this->assertTrue(strpos($join_info['condition'], "users4.name = :views_join_condition_2") !== FALSE, 'Make sure the first extra join condition appears in the query.');
- $this->assertTrue(strpos($join_info['condition'], "users4.name IN ( :views_join_condition_3[] )") !== FALSE, 'The IN condition for the join is properly formed.');
+ $this->assertStringContainsString("views_test_data.uid = users4.uid", $join_info['condition'], 'Make sure the join condition appears in the query.');
+ $this->assertStringContainsString("users4.name = :views_join_condition_2", $join_info['condition'], 'Make sure the first extra join condition appears in the query.');
+ $this->assertStringContainsString("users4.name IN ( :views_join_condition_3[] )", $join_info['condition'], 'The IN condition for the join is properly formed.');
$this->assertEqual($join_info['arguments'][':views_join_condition_3[]'], [$random_name_2, $random_name_3, $random_name_4], 'Make sure the IN arguments are still part of an array.');
// Test that all the conditions are properly built.
@@ -197,10 +197,24 @@ public function testBasePlugin() {
$tables = $query->getTables();
$join_info = $tables['users5'];
- $this->assertTrue(strpos($join_info['condition'], "views_test_data.uid = users5.uid") !== FALSE, 'Make sure the join condition appears in the query.');
- $this->assertTrue(strpos($join_info['condition'], "users5.langcode = :views_join_condition_4") !== FALSE, 'Make sure the first extra join condition appears in the query.');
- $this->assertTrue(strpos($join_info['condition'], "views_test_data.status = :views_join_condition_5") !== FALSE, 'Make sure the second extra join condition appears in the query.');
- $this->assertTrue(strpos($join_info['condition'], "users5.name = views_test_data.name") !== FALSE, 'Make sure the third extra join condition appears in the query.');
+ $this->assertStringContainsString("views_test_data.uid = users5.uid", $join_info['condition'], 'Make sure the join condition appears in the query.');
+ $this->assertStringContainsString("users5.langcode = :views_join_condition_4", $join_info['condition'], 'Make sure the first extra join condition appears in the query.');
+ $this->assertStringContainsString("views_test_data.status = :views_join_condition_5", $join_info['condition'], 'Make sure the second extra join condition appears in the query.');
+ $this->assertStringContainsString("users5.name = views_test_data.name", $join_info['condition'], 'Make sure the third extra join condition appears in the query.');
+ $this->assertEqual(array_values($join_info['arguments']), ['en', 0], 'Make sure the arguments are in the right order');
+
+ // Test that joins using 'left_formula' are properly built.
+ $configuration['left_formula'] = 'MAX(views_test_data.uid)';
+ $join = $this->manager->createInstance('standard', $configuration);
+ $table = ['alias' => 'users6'];
+ $join->buildJoin($query, $table, $view->query);
+
+ $tables = $query->getTables();
+ $join_info = $tables['users6'];
+ $this->assertStringContainsString("MAX(views_test_data.uid) = users6.uid", $join_info['condition'], 'Make sure the join condition appears in the query.');
+ $this->assertStringContainsString("users6.langcode = :views_join_condition_7", $join_info['condition'], 'Make sure the first extra join condition appears in the query.');
+ $this->assertStringContainsString("views_test_data.status = :views_join_condition_8", $join_info['condition'], 'Make sure the second extra join condition appears in the query.');
+ $this->assertStringContainsString("users6.name = views_test_data.name", $join_info['condition'], 'Make sure the third extra join condition appears in the query.');
$this->assertEqual(array_values($join_info['arguments']), ['en', 0], 'Make sure the arguments are in the right order');
}
diff --git a/web/core/modules/views/tests/src/Kernel/Plugin/QueryTest.php b/web/core/modules/views/tests/src/Kernel/Plugin/QueryTest.php
index d3f4f162eb..e2b19475a7 100644
--- a/web/core/modules/views/tests/src/Kernel/Plugin/QueryTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Plugin/QueryTest.php
@@ -44,7 +44,7 @@ public function _testInitQuery() {
$view->setDisplay();
$view->initQuery();
- $this->assertInstanceOf(QueryTestPlugin::class, $view->query, 'Make sure the right query plugin got instantiated.');
+ $this->assertInstanceOf(QueryTestPlugin::class, $view->query);
}
public function _testQueryExecute() {
diff --git a/web/core/modules/views/tests/src/Kernel/Plugin/RelationshipTest.php b/web/core/modules/views/tests/src/Kernel/Plugin/RelationshipTest.php
index 9f8975eba8..421b73643b 100644
--- a/web/core/modules/views/tests/src/Kernel/Plugin/RelationshipTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Plugin/RelationshipTest.php
@@ -173,9 +173,9 @@ public function testRelationshipRender() {
// Check that the output contains correct values.
$xpath = '//div[@class="views-row" and div[@class="views-field views-field-id"]=:id and div[@class="views-field views-field-author"]=:author]';
- $this->assertEqual(1, count($this->xpath($xpath, [':id' => 1, ':author' => $author1->getAccountName()])));
- $this->assertEqual(1, count($this->xpath($xpath, [':id' => 2, ':author' => $author2->getAccountName()])));
- $this->assertEqual(1, count($this->xpath($xpath, [':id' => 3, ':author' => ''])));
+ $this->assertCount(1, $this->xpath($xpath, [':id' => 1, ':author' => $author1->getAccountName()]));
+ $this->assertCount(1, $this->xpath($xpath, [':id' => 2, ':author' => $author2->getAccountName()]));
+ $this->assertCount(1, $this->xpath($xpath, [':id' => 3, ':author' => '']));
}
}
diff --git a/web/core/modules/views/tests/src/Kernel/Plugin/RowEntityTest.php b/web/core/modules/views/tests/src/Kernel/Plugin/RowEntityTest.php
index 208a6f0ee3..ec1ad3a2aa 100644
--- a/web/core/modules/views/tests/src/Kernel/Plugin/RowEntityTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Plugin/RowEntityTest.php
@@ -21,7 +21,15 @@ class RowEntityTest extends ViewsKernelTestBase {
*
* @var array
*/
- public static $modules = ['taxonomy', 'text', 'filter', 'field', 'system', 'node', 'user'];
+ public static $modules = [
+ 'taxonomy',
+ 'text',
+ 'filter',
+ 'field',
+ 'system',
+ 'node',
+ 'user',
+ ];
/**
* Views used by this test.
diff --git a/web/core/modules/views/tests/src/Kernel/Plugin/RssFieldsTest.php b/web/core/modules/views/tests/src/Kernel/Plugin/RssFieldsTest.php
index fed34c9bdc..b45ccee6c6 100644
--- a/web/core/modules/views/tests/src/Kernel/Plugin/RssFieldsTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Plugin/RssFieldsTest.php
@@ -71,7 +71,7 @@ public function testLink() {
$view = Views::getView('test_display_feed');
$output = $view->preview('feed_2');
$output = (string) $renderer->renderRoot($output);
- $this->assertContains('<link>' . $node_url . '</link>', $output);
+ $this->assertStringContainsString('<link>' . $node_url . '</link>', $output);
}
}
diff --git a/web/core/modules/views/tests/src/Kernel/Plugin/StyleFieldsTest.php b/web/core/modules/views/tests/src/Kernel/Plugin/StyleFieldsTest.php
new file mode 100644
index 0000000000..a6b6fcadda
--- /dev/null
+++ b/web/core/modules/views/tests/src/Kernel/Plugin/StyleFieldsTest.php
@@ -0,0 +1,68 @@
+<?php
+
+namespace Drupal\Tests\views\Kernel\Plugin;
+
+use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
+use Drupal\views\Views;
+
+/**
+ * Tests fields style functionality.
+ *
+ * @group views
+ *
+ * @see \Drupal\views\Plugin\views\row\Fields.
+ */
+class StyleFieldsTest extends ViewsKernelTestBase {
+
+ /**
+ * {@inheritdoc}
+ */
+ public static $testViews = ['test_view'];
+
+ /**
+ * Tests inline fields and separator.
+ */
+ public function testInlineFields() {
+ $renderer = $this->container->get('renderer');
+ $view = Views::getView('test_view');
+ $view->setDisplay();
+
+ // Test using an HTML separator.
+ $row = $view->display_handler->getOption('row');
+ $row['options'] = [
+ 'inline' => [
+ 'age' => 'age',
+ 'id' => 'id',
+ 'name' => 'name',
+ ],
+ 'separator' => '<br />',
+ ];
+ $view->display_handler->setOption('row', $row);
+ $view->initDisplay();
+ $view->initStyle();
+ $output = $view->preview();
+ $output = $renderer->renderRoot($output);
+ $this->assertStringContainsString('<div class="views-row"><span class="views-field views-field-age"><span class="field-content">25</span></span><br /><span class="views-field views-field-id"><span class="field-content">1</span></span><br /><span class="views-field views-field-name"><span class="field-content">John</span></span></div>', (string) $output);
+ $view->destroy();
+
+ // Check that unsafe separators are stripped.
+ $view->setDisplay();
+ $row = $view->display_handler->getOption('row');
+ $row['options'] = [
+ 'inline' => [
+ 'age' => 'age',
+ 'id' => 'id',
+ 'name' => 'name',
+ ],
+ 'separator' => '<script>alert("escape me!")</script>',
+ ];
+ $view->display_handler->setOption('row', $row);
+ $view->initDisplay();
+ $view->initStyle();
+ $output = $view->preview();
+ $output = $renderer->renderRoot($output);
+ $this->assertStringNotContainsString('<script>', (string) $output);
+ $this->assertStringContainsString('alert("escape me!")', (string) $output);
+ }
+
+}
diff --git a/web/core/modules/views/tests/src/Kernel/Plugin/StyleGridTest.php b/web/core/modules/views/tests/src/Kernel/Plugin/StyleGridTest.php
index f725d769e6..521ab74ed4 100644
--- a/web/core/modules/views/tests/src/Kernel/Plugin/StyleGridTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Plugin/StyleGridTest.php
@@ -71,12 +71,16 @@ protected function assertGrid(ViewExecutable $view, $alignment, $columns) {
switch ($columns) {
case 5: $width = '20';
break;
+
case 4: $width = '25';
break;
+
case 3: $width = '33.3333';
break;
+
case 2: $width = '50';
break;
+
case 1: $width = '100';
break;
}
diff --git a/web/core/modules/views/tests/src/Kernel/Plugin/StyleHtmlListTest.php b/web/core/modules/views/tests/src/Kernel/Plugin/StyleHtmlListTest.php
index 0e99439e7e..e6acb31bac 100644
--- a/web/core/modules/views/tests/src/Kernel/Plugin/StyleHtmlListTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Plugin/StyleHtmlListTest.php
@@ -30,11 +30,11 @@ public function testDefaultRowClasses() {
// Check that an empty class attribute is not added if the wrapper class is
// not set.
- $this->assertTrue(strpos($output, '<div>') !== FALSE, 'Empty class is not added to DIV when class is not set');
+ $this->assertStringContainsString('<div>', $output, 'Empty class is not added to DIV when class is not set');
// Check that an empty class attribute is not added if the list class is
// not set.
- $this->assertTrue(strpos($output, '<ul>') !== FALSE, 'Empty class is not added to UL when class is not set');
+ $this->assertStringContainsString('<ul>', $output, 'Empty class is not added to UL when class is not set');
// Set wrapper class and list class in style options.
$view->style_plugin->options['class'] = 'class';
@@ -44,10 +44,10 @@ public function testDefaultRowClasses() {
$output = \Drupal::service('renderer')->renderRoot($output);
// Check that class attribute is present if the wrapper class is set.
- $this->assertTrue(strpos($output, '<div class="wrapper-class">') !== FALSE, 'Class is added to DIV');
+ $this->assertStringContainsString('<div class="wrapper-class">', $output, 'Class is added to DIV');
// Check that class attribute is present if the list class is set.
- $this->assertTrue(strpos($output, '<ul class="class">') !== FALSE, 'Class is added to UL');
+ $this->assertStringContainsString('<ul class="class">', $output, 'Class is added to UL');
}
}
diff --git a/web/core/modules/views/tests/src/Kernel/Plugin/StyleMappingTest.php b/web/core/modules/views/tests/src/Kernel/Plugin/StyleMappingTest.php
index d83b2643ac..ea1c43ce84 100644
--- a/web/core/modules/views/tests/src/Kernel/Plugin/StyleMappingTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Plugin/StyleMappingTest.php
@@ -27,13 +27,13 @@ class StyleMappingTest extends StyleTestBase {
public function testMappedOutput() {
$view = Views::getView('test_style_mapping');
$output = $this->mappedOutputHelper($view);
- $this->assertTrue(strpos($output, 'job') === FALSE, 'The job field is added to the view but not in the mapping.');
+ $this->assertStringNotContainsString('job', $output, 'The job field is added to the view but not in the mapping.');
$view->destroy();
$view->setDisplay();
$view->displayHandlers->get('default')->options['style']['options']['mapping']['name_field'] = 'job';
$output = $this->mappedOutputHelper($view);
- $this->assertTrue(strpos($output, 'job') !== FALSE, 'The job field is added to the view and is in the mapping.');
+ $this->assertStringContainsString('job', $output, 'The job field is added to the view and is in the mapping.');
}
/**
@@ -56,7 +56,7 @@ protected function mappedOutputHelper($view) {
foreach ($rows as $row) {
$attributes = $row->attributes();
$class = (string) $attributes['class'][0];
- $this->assertTrue(strpos($class, 'views-row-mapping-test') !== FALSE, 'Make sure that each row has the correct CSS class.');
+ $this->assertStringContainsString('views-row-mapping-test', $class, 'Make sure that each row has the correct CSS class.');
foreach ($row->div as $field) {
// Split up the field-level class, the first part is the mapping name
diff --git a/web/core/modules/views/tests/src/Kernel/Plugin/StyleTableUnitTest.php b/web/core/modules/views/tests/src/Kernel/Plugin/StyleTableUnitTest.php
index 365b0c78e8..c30780c3fc 100644
--- a/web/core/modules/views/tests/src/Kernel/Plugin/StyleTableUnitTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Plugin/StyleTableUnitTest.php
@@ -119,7 +119,7 @@ public function testTable() {
$view->field['name']->options['exclude'] = TRUE;
$output = $view->preview();
$output = \Drupal::service('renderer')->renderRoot($output);
- $this->assertFalse(strpos($output, 'views-field-name') !== FALSE, "Excluded field's wrapper was not rendered.");
+ $this->assertStringNotContainsString('views-field-name', $output, "Excluded field's wrapper was not rendered.");
$view->destroy();
// Render a non empty result, and ensure that the empty area handler is not
@@ -128,7 +128,7 @@ public function testTable() {
$output = $view->preview();
$output = \Drupal::service('renderer')->renderRoot($output);
- $this->assertFalse(strpos($output, 'custom text') !== FALSE, 'Empty handler was not rendered on a non empty table.');
+ $this->assertStringNotContainsString('custom text', $output, 'Empty handler was not rendered on a non empty table.');
// Render an empty result, and ensure that the area handler is rendered.
$view->setDisplay('default');
@@ -137,7 +137,7 @@ public function testTable() {
$output = $view->preview();
$output = \Drupal::service('renderer')->renderRoot($output);
- $this->assertTrue(strpos($output, 'custom text') !== FALSE, 'Empty handler got rendered on an empty table.');
+ $this->assertStringContainsString('custom text', $output, 'Empty handler got rendered on an empty table.');
}
/**
diff --git a/web/core/modules/views/tests/src/Kernel/Plugin/StyleTest.php b/web/core/modules/views/tests/src/Kernel/Plugin/StyleTest.php
index ded782b2fb..cfc2e38db2 100644
--- a/web/core/modules/views/tests/src/Kernel/Plugin/StyleTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Plugin/StyleTest.php
@@ -49,7 +49,7 @@ public function testStyle() {
$output = $view->preview();
$output = $renderer->renderRoot($output);
- $this->assertContains($random_text, (string) $output);
+ $this->assertStringContainsString($random_text, (string) $output);
// Test without row plugin support.
$view = Views::getView('test_view');
@@ -69,7 +69,7 @@ public function testStyle() {
$view->style_plugin->setOutput($random_text);
$output = $view->preview();
$output = $renderer->renderRoot($output);
- $this->assertContains($random_text, (string) $output);
+ $this->assertStringContainsString($random_text, (string) $output);
}
/**
@@ -258,11 +258,11 @@ public function testCustomRowClasses() {
foreach ($rows as $row) {
$attributes = $row->attributes();
$class = (string) $attributes['class'][0];
- $this->assertContains($random_name, $class);
+ $this->assertStringContainsString($random_name, $class);
// Check token replacement.
$name = $view->field['name']->getValue($view->result[$count]);
- $this->assertContains("test-token-$name", $class);
+ $this->assertStringContainsString("test-token-$name", $class);
$count++;
}
diff --git a/web/core/modules/views/tests/src/Kernel/Plugin/StyleUnformattedTest.php b/web/core/modules/views/tests/src/Kernel/Plugin/StyleUnformattedTest.php
index af58b70006..9ca057feee 100644
--- a/web/core/modules/views/tests/src/Kernel/Plugin/StyleUnformattedTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Plugin/StyleUnformattedTest.php
@@ -34,7 +34,7 @@ public function testDefaultRowClasses() {
$count++;
$attributes = $row->attributes();
$class = (string) $attributes['class'][0];
- $this->assertTrue(strpos($class, 'views-row') !== FALSE, 'Make sure that the views row class is set right.');
+ $this->assertStringContainsString('views-row', $class, 'Make sure that the views row class is set right.');
}
$this->assertIdentical($count, $count_result);
}
diff --git a/web/core/modules/views/tests/src/Kernel/PluginInstanceTest.php b/web/core/modules/views/tests/src/Kernel/PluginInstanceTest.php
index 8000c960c9..d806a0f021 100644
--- a/web/core/modules/views/tests/src/Kernel/PluginInstanceTest.php
+++ b/web/core/modules/views/tests/src/Kernel/PluginInstanceTest.php
@@ -2,7 +2,6 @@
namespace Drupal\Tests\views\Kernel;
-use Drupal\Component\Render\FormattableMarkup;
use Drupal\views\Views;
use Drupal\views\Plugin\views\PluginBase;
@@ -67,12 +66,13 @@ protected function setUp($import_test_views = TRUE) {
*/
public function testPluginData() {
// Check that we have an array of data.
- $this->assertTrue(is_array($this->definitions), 'Plugin data is an array.');
+ $this->assertIsArray($this->definitions);
// Check all plugin types.
foreach ($this->pluginTypes as $type) {
- $this->assertTrue(array_key_exists($type, $this->definitions), new FormattableMarkup('Key for plugin type @type found.', ['@type' => $type]));
- $this->assertTrue(is_array($this->definitions[$type]) && !empty($this->definitions[$type]), new FormattableMarkup('Plugin type @type has an array of plugins.', ['@type' => $type]));
+ $this->assertArrayHasKey($type, $this->definitions);
+ $this->assertIsArray($this->definitions[$type]);
+ $this->assertNotEmpty($this->definitions[$type], "Plugin type '$type' should contain plugins.");
}
// Tests that the plugin list has not missed any types.
diff --git a/web/core/modules/views/tests/src/Kernel/QueryGroupByTest.php b/web/core/modules/views/tests/src/Kernel/QueryGroupByTest.php
index c4805a890b..f0e05bdda9 100644
--- a/web/core/modules/views/tests/src/Kernel/QueryGroupByTest.php
+++ b/web/core/modules/views/tests/src/Kernel/QueryGroupByTest.php
@@ -28,7 +28,13 @@ class QueryGroupByTest extends ViewsKernelTestBase {
*
* @var array
*/
- public static $modules = ['entity_test', 'system', 'field', 'user', 'language'];
+ public static $modules = [
+ 'entity_test',
+ 'system',
+ 'field',
+ 'user',
+ 'language',
+ ];
/**
* The storage for the test entity type.
@@ -61,7 +67,7 @@ public function testAggregateCount() {
$view = Views::getView('test_aggregate_count');
$this->executeView($view);
- $this->assertEqual(count($view->result), 2, 'Make sure the count of items is right.');
+ $this->assertCount(2, $view->result, 'Make sure the count of items is right.');
$types = [];
foreach ($view->result as $item) {
@@ -99,7 +105,7 @@ public function groupByTestHelper($aggregation_function, $values) {
$this->executeView($view);
- $this->assertEqual(count($view->result), 2, 'Make sure the count of items is right.');
+ $this->assertCount(2, $view->result, 'Make sure the count of items is right.');
// Group by name to identify the right count.
$results = [];
foreach ($view->result as $item) {
@@ -187,8 +193,8 @@ public function testGroupByCountOnlyFilters() {
$view = Views::getView('test_group_by_in_filters');
$this->executeView($view);
- $this->assertContains('GROUP BY', (string) $view->build_info['query'], 'Make sure that GROUP BY is in the query');
- $this->assertContains('HAVING', (string) $view->build_info['query'], 'Make sure that HAVING is in the query');
+ $this->assertStringContainsString('GROUP BY', (string) $view->build_info['query'], 'Make sure that GROUP BY is in the query');
+ $this->assertStringContainsString('HAVING', (string) $view->build_info['query'], 'Make sure that HAVING is in the query');
}
/**
@@ -204,7 +210,7 @@ public function testGroupByBaseField() {
$view->displayHandlers->get('default')->options['fields']['name']['group_type'] = 'min';
unset($view->displayHandlers->get('default')->options['fields']['id']['group_type']);
$this->executeView($view);
- $this->assertContains('GROUP BY entity_test.id', (string) $view->build_info['query'], 'GROUP BY field includes the base table name when grouping on the base field.');
+ $this->assertStringContainsString('GROUP BY entity_test.id', (string) $view->build_info['query'], 'GROUP BY field includes the base table name when grouping on the base field.');
}
/**
@@ -246,7 +252,7 @@ public function testGroupByFieldWithCardinality() {
$view = Views::getView('test_group_by_count_multicardinality');
$this->executeView($view);
- $this->assertEqual(2, count($view->result));
+ $this->assertCount(2, $view->result);
$this->assertEqual('3', $view->getStyle()->getField(0, 'id'));
$this->assertEqual('1', $view->getStyle()->getField(0, 'field_test'));
@@ -260,7 +266,7 @@ public function testGroupByFieldWithCardinality() {
$view = Views::getView('test_group_by_count_multicardinality');
$this->executeView($view);
- $this->assertEqual(5, count($view->result));
+ $this->assertCount(5, $view->result);
$this->assertEqual('3', $view->getStyle()->getField(0, 'id'));
$this->assertEqual('1', $view->getStyle()->getField(0, 'field_test'));
@@ -282,7 +288,7 @@ public function testGroupByFieldWithCardinality() {
$view = Views::getView('test_group_by_count_multicardinality');
$this->executeView($view);
- $this->assertEqual(6, count($view->result));
+ $this->assertCount(6, $view->result);
$this->assertEqual('3', $view->getStyle()->getField(5, 'id'));
$this->assertEqual('6', $view->getStyle()->getField(5, 'field_test'));
}
@@ -322,7 +328,7 @@ public function testGroupByWithFieldsNotExistingOnBundle() {
$view = Views::getView('test_group_by_field_not_within_bundle');
$this->executeView($view);
- $this->assertEqual(2, count($view->result));
+ $this->assertCount(2, $view->result);
// The first result is coming from entity_test_mul2, so no field could be
// rendered.
$this->assertEqual('', $view->getStyle()->getField(0, 'field_test'));
diff --git a/web/core/modules/views/tests/src/Kernel/RenderCacheIntegrationTest.php b/web/core/modules/views/tests/src/Kernel/RenderCacheIntegrationTest.php
index 3102bdd8d3..e0ddb3c132 100644
--- a/web/core/modules/views/tests/src/Kernel/RenderCacheIntegrationTest.php
+++ b/web/core/modules/views/tests/src/Kernel/RenderCacheIntegrationTest.php
@@ -145,7 +145,7 @@ protected function assertCacheTagsForFieldBasedView($do_assert_views_caches) {
// @todo Static render arrays don't support different pages yet, see
// https://www.drupal.org/node/2500701.
// $this->assertViewsCacheTagsFromStaticRenderArray($view, $tags_page_2, $do_assert_views_caches);
- $this->assertContains($random_name, (string) $build['#markup']);
+ $this->assertStringContainsString($random_name, (string) $build['#markup']);
$view->destroy();
$this->pass('Page 1');
@@ -155,7 +155,7 @@ protected function assertCacheTagsForFieldBasedView($do_assert_views_caches) {
$entities[1]->save();
$build = $this->assertViewsCacheTags($view, $tags_page_1, $do_assert_views_caches, $tags_page_1);
$this->assertViewsCacheTagsFromStaticRenderArray($view, $tags_page_1, $do_assert_views_caches);
- $this->assertContains($random_name, (string) $build['#markup']);
+ $this->assertStringContainsString($random_name, (string) $build['#markup']);
$view->destroy();
// Setup arguments to ensure that render caching also varies by them.
diff --git a/web/core/modules/views/tests/src/Kernel/ViewElementTest.php b/web/core/modules/views/tests/src/Kernel/ViewElementTest.php
index 921fac70b1..29b7437de6 100644
--- a/web/core/modules/views/tests/src/Kernel/ViewElementTest.php
+++ b/web/core/modules/views/tests/src/Kernel/ViewElementTest.php
@@ -37,7 +37,7 @@ public function testViewElement() {
// There should be 5 rows in the results.
$xpath = $this->xpath('//div[@class="views-row"]');
- $this->assertEqual(count($xpath), 5);
+ $this->assertCount(5, $xpath);
// Add an argument and save the view.
$view->displayHandlers->get('default')->overrideOption('arguments', [
@@ -65,7 +65,7 @@ public function testViewElement() {
$this->setRawContent($renderer->renderRoot($render));
// There should be 1 row in the results, 'John' arg 25.
$xpath = $this->xpath('//div[@class="views-row"]');
- $this->assertEqual(count($xpath), 1);
+ $this->assertCount(1, $xpath);
}
/**
@@ -90,7 +90,7 @@ public function testViewElementEmbed() {
// There should be 5 rows in the results.
$xpath = $this->xpath('//div[@class="views-row"]');
- $this->assertEqual(count($xpath), 5);
+ $this->assertCount(5, $xpath);
// Add an argument and save the view.
$view->displayHandlers->get('default')->overrideOption('arguments', [
@@ -118,7 +118,7 @@ public function testViewElementEmbed() {
$this->setRawContent($renderer->renderRoot($render));
// There should be 1 row in the results, 'John' arg 25.
$xpath = $this->xpath('//div[@class="views-row"]');
- $this->assertEqual(count($xpath), 1);
+ $this->assertCount(1, $xpath);
// Tests the render array with an exposed filter.
$view = Views::getView('test_view_embed');
@@ -126,7 +126,7 @@ public function testViewElementEmbed() {
$this->setRawContent($renderer->renderRoot($render));
// Ensure that the exposed form is rendered.
- $this->assertEqual(1, count($this->xpath('//form[@class="views-exposed-form"]')));
+ $this->assertCount(1, $this->xpath('//form[@class="views-exposed-form"]'));
}
}
diff --git a/web/core/modules/views/tests/src/Kernel/ViewExecutableTest.php b/web/core/modules/views/tests/src/Kernel/ViewExecutableTest.php
index 84d2504e25..c893c14d47 100644
--- a/web/core/modules/views/tests/src/Kernel/ViewExecutableTest.php
+++ b/web/core/modules/views/tests/src/Kernel/ViewExecutableTest.php
@@ -33,7 +33,15 @@ class ViewExecutableTest extends ViewsKernelTestBase {
use CommentTestTrait;
- public static $modules = ['system', 'node', 'comment', 'user', 'filter', 'field', 'text'];
+ public static $modules = [
+ 'system',
+ 'node',
+ 'comment',
+ 'user',
+ 'filter',
+ 'field',
+ 'text',
+ ];
/**
* Views used by this test.
@@ -100,9 +108,9 @@ protected function setUpFixtures() {
*/
public function testFactoryService() {
$factory = $this->container->get('views.executable');
- $this->assertTrue($factory instanceof ViewExecutableFactory, 'A ViewExecutableFactory instance was returned from the container.');
+ $this->assertInstanceOf(ViewExecutableFactory::class, $factory);
$view = View::load('test_executable_displays');
- $this->assertTrue($factory->get($view) instanceof ViewExecutable, 'A ViewExecutable instance was returned from the factory.');
+ $this->assertInstanceOf(ViewExecutable::class, $factory->get($view));
}
/**
@@ -112,8 +120,8 @@ public function testInitMethods() {
$view = Views::getView('test_destroy');
$view->initDisplay();
- $this->assertTrue($view->display_handler instanceof DefaultDisplay, 'Make sure a reference to the current display handler is set.');
- $this->assertTrue($view->displayHandlers->get('default') instanceof DefaultDisplay, 'Make sure a display handler is created for each display.');
+ $this->assertInstanceOf(DefaultDisplay::class, $view->display_handler);
+ $this->assertInstanceOf(DefaultDisplay::class, $view->displayHandlers->get('default'));
$view->destroy();
$view->initHandlers();
@@ -129,15 +137,15 @@ public function testInitMethods() {
}
// initHandlers() should create display handlers automatically as well.
- $this->assertTrue($view->display_handler instanceof DefaultDisplay, 'Make sure a reference to the current display handler is set.');
- $this->assertTrue($view->displayHandlers->get('default') instanceof DefaultDisplay, 'Make sure a display handler is created for each display.');
+ $this->assertInstanceOf(DefaultDisplay::class, $view->display_handler);
+ $this->assertInstanceOf(DefaultDisplay::class, $view->displayHandlers->get('default'));
$view_hash = spl_object_hash($view);
$display_hash = spl_object_hash($view->display_handler);
// Test the initStyle() method.
$view->initStyle();
- $this->assertTrue($view->style_plugin instanceof DefaultStyle, 'Make sure a reference to the style plugin is set.');
+ $this->assertInstanceOf(DefaultStyle::class, $view->style_plugin);
// Test the plugin has been invited and view have references to the view and
// display handler.
$this->assertEqual(spl_object_hash($view->style_plugin->view), $view_hash);
@@ -145,7 +153,7 @@ public function testInitMethods() {
// Test the initQuery method().
$view->initQuery();
- $this->assertTrue($view->query instanceof Sql, 'Make sure a reference to the query is set');
+ $this->assertInstanceOf(Sql::class, $view->query);
$this->assertEqual(spl_object_hash($view->query->view), $view_hash);
$this->assertEqual(spl_object_hash($view->query->displayHandler), $display_hash);
@@ -153,23 +161,23 @@ public function testInitMethods() {
// Test the plugin get methods.
$display_plugin = $view->getDisplay();
- $this->assertTrue($display_plugin instanceof DefaultDisplay, 'An instance of DefaultDisplay was returned.');
- $this->assertTrue($view->display_handler instanceof DefaultDisplay, 'The display_handler property has been set.');
+ $this->assertInstanceOf(DefaultDisplay::class, $display_plugin);
+ $this->assertInstanceOf(DefaultDisplay::class, $view->display_handler);
$this->assertIdentical($display_plugin, $view->getDisplay(), 'The same display plugin instance was returned.');
$style_plugin = $view->getStyle();
- $this->assertTrue($style_plugin instanceof DefaultStyle, 'An instance of DefaultStyle was returned.');
- $this->assertTrue($view->style_plugin instanceof DefaultStyle, 'The style_plugin property has been set.');
+ $this->assertInstanceOf(DefaultStyle::class, $style_plugin);
+ $this->assertInstanceOf(DefaultStyle::class, $view->style_plugin);
$this->assertIdentical($style_plugin, $view->getStyle(), 'The same style plugin instance was returned.');
$pager_plugin = $view->getPager();
- $this->assertTrue($pager_plugin instanceof PagerPluginBase, 'An instance of PagerPluginBase was returned.');
- $this->assertTrue($view->pager instanceof PagerPluginBase, 'The pager property has been set.');
+ $this->assertInstanceOf(PagerPluginBase::class, $pager_plugin);
+ $this->assertInstanceOf(PagerPluginBase::class, $view->pager);
$this->assertIdentical($pager_plugin, $view->getPager(), 'The same pager plugin instance was returned.');
$query_plugin = $view->getQuery();
- $this->assertTrue($query_plugin instanceof QueryPluginBase, 'An instance of QueryPluginBase was returned.');
- $this->assertTrue($view->query instanceof QueryPluginBase, 'The query property has been set.');
+ $this->assertInstanceOf(QueryPluginBase::class, $query_plugin);
+ $this->assertInstanceOf(QueryPluginBase::class, $view->query);
$this->assertIdentical($query_plugin, $view->getQuery(), 'The same query plugin instance was returned.');
}
@@ -218,11 +226,11 @@ public function testDisplays() {
// Tests Drupal\views\ViewExecutable::initDisplay().
$view->initDisplay();
- $this->assertTrue($view->displayHandlers instanceof DisplayPluginCollection, 'The displayHandlers property has the right class.');
+ $this->assertInstanceOf(DisplayPluginCollection::class, $view->displayHandlers);
// Tests the classes of the instances.
- $this->assertTrue($view->displayHandlers->get('default') instanceof DefaultDisplay);
- $this->assertTrue($view->displayHandlers->get('page_1') instanceof Page);
- $this->assertTrue($view->displayHandlers->get('page_2') instanceof Page);
+ $this->assertInstanceOf(DefaultDisplay::class, $view->displayHandlers->get('default'));
+ $this->assertInstanceOf(Page::class, $view->displayHandlers->get('page_1'));
+ $this->assertInstanceOf(Page::class, $view->displayHandlers->get('page_2'));
// After initializing the default display is the current used display.
$this->assertEqual($view->current_display, 'default');
@@ -253,14 +261,14 @@ public function testDisplays() {
// display.
$view->setDisplay('page_1');
$view->initStyle();
- $this->assertTrue($view->style_plugin instanceof DefaultStyle);
- $this->assertTrue($view->rowPlugin instanceof Fields);
+ $this->assertInstanceOf(DefaultStyle::class, $view->style_plugin);
+ $this->assertInstanceOf(Fields::class, $view->rowPlugin);
$view->setDisplay('page_2');
$view->initStyle();
- $this->assertTrue($view->style_plugin instanceof Grid);
+ $this->assertInstanceOf(Grid::class, $view->style_plugin);
// @todo Change this rowPlugin type too.
- $this->assertTrue($view->rowPlugin instanceof Fields);
+ $this->assertInstanceOf(Fields::class, $view->rowPlugin);
// Test the newDisplay() method.
$view = $this->container->get('entity_type.manager')->getStorage('view')->create(['id' => 'test_executable_displays']);
@@ -270,14 +278,14 @@ public function testDisplays() {
$executable->newDisplay('page');
$executable->newDisplay('display_test');
- $this->assertTrue($executable->displayHandlers->get('default') instanceof DefaultDisplay);
+ $this->assertInstanceOf(DefaultDisplay::class, $executable->displayHandlers->get('default'));
$this->assertFalse(isset($executable->displayHandlers->get('default')->default_display));
- $this->assertTrue($executable->displayHandlers->get('page_1') instanceof Page);
- $this->assertTrue($executable->displayHandlers->get('page_1')->default_display instanceof DefaultDisplay);
- $this->assertTrue($executable->displayHandlers->get('page_2') instanceof Page);
- $this->assertTrue($executable->displayHandlers->get('page_2')->default_display instanceof DefaultDisplay);
- $this->assertTrue($executable->displayHandlers->get('display_test_1') instanceof DisplayTest);
- $this->assertTrue($executable->displayHandlers->get('display_test_1')->default_display instanceof DefaultDisplay);
+ $this->assertInstanceOf(Page::class, $executable->displayHandlers->get('page_1'));
+ $this->assertInstanceOf(DefaultDisplay::class, $executable->displayHandlers->get('page_1')->default_display);
+ $this->assertInstanceOf(Page::class, $executable->displayHandlers->get('page_2'));
+ $this->assertInstanceOf(DefaultDisplay::class, $executable->displayHandlers->get('page_2')->default_display);
+ $this->assertInstanceOf(DisplayTest::class, $executable->displayHandlers->get('display_test_1'));
+ $this->assertInstanceOf(DefaultDisplay::class, $executable->displayHandlers->get('display_test_1')->default_display);
}
/**
@@ -316,7 +324,7 @@ public function testPropertyMethods() {
$this->assertIdentical($view->getBaseTables(), $expected);
// Test response methods.
- $this->assertTrue($view->getResponse() instanceof Response, 'New response object returned.');
+ $this->assertInstanceOf(Response::class, $view->getResponse());
$new_response = new Response();
$view->setResponse($new_response);
$this->assertIdentical(spl_object_hash($view->getResponse()), spl_object_hash($new_response), 'New response object correctly set.');
@@ -468,7 +476,7 @@ public function testValidateNestedLoops() {
});
// Assert that there were 9 total errors across 3 displays.
$this->assertIdentical(9, $total_error_count);
- $this->assertIdentical(3, count($errors));
+ $this->assertCount(3, $errors);
}
/**
@@ -484,12 +492,12 @@ public function testSerialization() {
// Test the view storage object is not present in the actual serialized
// string.
- $this->assertIdentical(strpos($serialized, '"Drupal\views\Entity\View"'), FALSE, 'The Drupal\views\Entity\View class was not found in the serialized string.');
+ $this->assertStringNotContainsString('"Drupal\views\Entity\View"', $serialized, 'The Drupal\views\Entity\View class was not found in the serialized string.');
/** @var \Drupal\views\ViewExecutable $unserialized */
$unserialized = unserialize($serialized);
- $this->assertTrue($unserialized instanceof ViewExecutable);
+ $this->assertInstanceOf(ViewExecutable::class, $unserialized);
$this->assertIdentical($view->storage->id(), $unserialized->storage->id(), 'The expected storage entity was loaded on the unserialized view.');
$this->assertIdentical($unserialized->current_display, 'page_1', 'The expected display was set on the unserialized view.');
$this->assertIdentical($unserialized->args, ['test'], 'The expected argument was set on the unserialized view.');
@@ -519,7 +527,7 @@ public function testSerialization() {
// Serialize the ViewExecutable as part of other data.
unserialize(serialize(['SOMETHING UNEXPECTED', $view_executable]));
- // Make sure the serialisation of the ViewExecutable didn't influence the
+ // Make sure the serialization of the ViewExecutable didn't influence the
// field definitions.
$nid_definition_after = $field_manager->getBaseFieldDefinitions('node')['nid']
->getItemDefinition()
diff --git a/web/core/modules/views/tests/src/Kernel/ViewStorageTest.php b/web/core/modules/views/tests/src/Kernel/ViewStorageTest.php
index e764806e3d..9a010be58d 100644
--- a/web/core/modules/views/tests/src/Kernel/ViewStorageTest.php
+++ b/web/core/modules/views/tests/src/Kernel/ViewStorageTest.php
@@ -63,7 +63,7 @@ public function testConfigurationEntityCRUD() {
$this->controller = $this->container->get('entity_type.manager')->getStorage('view');
// Confirm that an info array has been returned.
- $this->assertTrue($this->entityType instanceof EntityTypeInterface, 'The View info array is loaded.');
+ $this->assertInstanceOf(EntityTypeInterface::class, $this->entityType);
// CRUD tests.
$this->loadTests();
@@ -83,7 +83,7 @@ protected function loadTests() {
// Confirm that an actual view object is loaded and that it returns all of
// expected properties.
- $this->assertTrue($view instanceof View, 'Single View instance loaded.');
+ $this->assertInstanceOf(View::class, $view);
foreach ($this->configProperties as $property) {
$this->assertTrue($view->get($property) !== NULL, new FormattableMarkup('Property: @property loaded onto View.', ['@property' => $property]));
}
@@ -117,7 +117,7 @@ protected function createTests() {
// Create a new View instance with empty values.
$created = $this->controller->create([]);
- $this->assertTrue($created instanceof View, 'Created object is a View.');
+ $this->assertInstanceOf(View::class, $created);
// Check that the View contains all of the properties.
foreach ($this->configProperties as $property) {
$this->assertTrue(property_exists($created, $property), new FormattableMarkup('Property: @property created on View.', ['@property' => $property]));
@@ -129,7 +129,7 @@ protected function createTests() {
unset($values['uuid']);
$created = $this->controller->create($values);
- $this->assertTrue($created instanceof View, 'Created object is a View.');
+ $this->assertInstanceOf(View::class, $created);
// Check that the View contains all of the properties.
$properties = $this->configProperties;
// Remove display from list.
@@ -162,7 +162,7 @@ protected function displayTests() {
$executable = $view->getExecutable();
$executable->initDisplay();
- $this->assertTrue($executable->displayHandlers->get($new_id) instanceof Page, 'New page display "test" uses the right display plugin.');
+ $this->assertInstanceOf(Page::class, $executable->displayHandlers->get($new_id));
// To save this with a new ID, we should use createDuplicate().
$view = $view->createDuplicate();
@@ -170,7 +170,9 @@ protected function displayTests() {
$view->save();
$values = $this->config('views.view.test_view_storage_new_new2')->get();
- $this->assertTrue(isset($values['display']['test']) && is_array($values['display']['test']), 'New display was saved.');
+ // Verify that the display was saved by ensuring it contains an array of
+ // values in the view data.
+ $this->assertIsArray($values['display']['test']);
}
/**
@@ -316,7 +318,7 @@ public function testCreateDuplicate() {
$view = Views::getView('test_view_storage');
$copy = $view->storage->createDuplicate();
- $this->assertTrue($copy instanceof View, 'The copied object is a View.');
+ $this->assertInstanceOf(View::class, $copy);
// Check that the original view and the copy have different UUIDs.
$this->assertNotIdentical($view->storage->uuid(), $copy->uuid(), 'The copied view has a new UUID.');
diff --git a/web/core/modules/views/tests/src/Kernel/ViewsConfigDependenciesIntegrationTest.php b/web/core/modules/views/tests/src/Kernel/ViewsConfigDependenciesIntegrationTest.php
index 0b75a7fdc2..13ac8132de 100644
--- a/web/core/modules/views/tests/src/Kernel/ViewsConfigDependenciesIntegrationTest.php
+++ b/web/core/modules/views/tests/src/Kernel/ViewsConfigDependenciesIntegrationTest.php
@@ -18,7 +18,14 @@ class ViewsConfigDependenciesIntegrationTest extends ViewsKernelTestBase {
/**
* {@inheritdoc}
*/
- public static $modules = ['field', 'file', 'image', 'entity_test', 'user', 'text'];
+ public static $modules = [
+ 'field',
+ 'file',
+ 'image',
+ 'entity_test',
+ 'user',
+ 'text',
+ ];
/**
* {@inheritdoc}
@@ -76,7 +83,7 @@ public function testImage() {
$dependencies = $view->getDependencies() + ['config' => []];
// Checks that style 'foo' is a dependency of view 'entity_test_fields'.
- $this->assertTrue(in_array('image.style.foo', $dependencies['config']));
+ $this->assertContains('image.style.foo', $dependencies['config']);
// Delete the 'foo' image style.
$style->delete();
@@ -95,7 +102,7 @@ public function testImage() {
$dependencies = $view->getDependencies() + ['config' => []];
// Checks that the dependency on style 'foo' has been removed.
- $this->assertFalse(in_array('image.style.foo', $dependencies['config']));
+ $this->assertNotContains('image.style.foo', $dependencies['config']);
}
/**
@@ -127,7 +134,7 @@ public function testConfigRemovalRole() {
// Check that the View now has a dependency on the Role.
$dependencies = $view->getDependencies() + ['config' => []];
- $this->assertTrue(in_array('user.role.dummy', $dependencies['config']));
+ $this->assertContains('user.role.dummy', $dependencies['config']);
// Delete the role.
$role->delete();
diff --git a/web/core/modules/views/tests/src/Kernel/ViewsConfigUpdaterTest.php b/web/core/modules/views/tests/src/Kernel/ViewsConfigUpdaterTest.php
new file mode 100644
index 0000000000..d17e60ac33
--- /dev/null
+++ b/web/core/modules/views/tests/src/Kernel/ViewsConfigUpdaterTest.php
@@ -0,0 +1,102 @@
+<?php
+
+namespace Drupal\Tests\views\Kernel;
+
+use Drupal\Core\Config\FileStorage;
+use Drupal\views\ViewsConfigUpdater;
+
+/**
+ * @coversDefaultClass \Drupal\views\ViewsConfigUpdater
+ *
+ * @group Views
+ */
+class ViewsConfigUpdaterTest extends ViewsKernelTestBase {
+
+ /**
+ * The views config updater.
+ *
+ * @var \Drupal\views\ViewsConfigUpdater
+ */
+ protected $configUpdater;
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function setUp($import_test_views = TRUE) {
+ parent::setUp();
+
+ $this->configUpdater = $this->container
+ ->get('class_resolver')
+ ->getInstanceFromDefinition(ViewsConfigUpdater::class);
+ }
+
+ /**
+ * Loads a test view.
+ *
+ * @param string $view_id
+ * The view config ID.
+ *
+ * @return \Drupal\views\ViewEntityInterface
+ * A view entity object.
+ */
+ protected function loadTestView($view_id) {
+ // We just instantiate the test view from the raw configuration, as it may
+ // not be possible to save it, due to its faulty schema.
+ $config_dir = drupal_get_path('module', 'views') . '/tests/fixtures/update';
+ $file_storage = new FileStorage($config_dir);
+ $values = $file_storage->read($view_id);
+ /** @var \Drupal\views\ViewEntityInterface $test_view */
+ $test_view = $this->container
+ ->get('entity_type.manager')
+ ->getStorage('view')
+ ->create($values);
+ return $test_view;
+ }
+
+ /**
+ * @covers ::needsEntityLinkUrlUpdate
+ */
+ public function testNeedsEntityLinkUrlUpdate() {
+ $test_view = $this->loadTestView('views.view.node_link_update_test');
+ $needs_update = $this->configUpdater->needsEntityLinkUrlUpdate($test_view);
+ $this->assertTrue($needs_update);
+ }
+
+ /**
+ * @covers ::needsOperatorDefaultsUpdate
+ */
+ public function testNeedsOperatorUpdateDefaults() {
+ $test_view = $this->loadTestView('views.view.test_exposed_filters');
+ $needs_update = $this->configUpdater->needsOperatorDefaultsUpdate($test_view);
+ $this->assertTrue($needs_update);
+ }
+
+ /**
+ * @covers ::needsMultivalueBaseFieldUpdate
+ */
+ public function testNeedsFieldNamesForMultivalueBaseFieldsUpdate() {
+ $test_view = $this->loadTestView('views.view.test_user_multi_value');
+ $needs_update = $this->configUpdater->needsMultivalueBaseFieldUpdate($test_view);
+ $this->assertTrue($needs_update);
+ }
+
+ /**
+ * @covers ::updateAll
+ */
+ public function testUpdateAll() {
+ $view_ids = [
+ 'views.view.node_link_update_test',
+ 'views.view.test_exposed_filters',
+ 'views.view.test_user_multi_value',
+ ];
+
+ foreach ($view_ids as $view_id) {
+ $test_view = $this->loadTestView($view_id);
+ $this->configUpdater->updateAll($test_view);
+ }
+
+ // @todo Improve this in https://www.drupal.org/node/3121008.
+ $this->pass('Views processed');
+ }
+
+}
diff --git a/web/core/modules/views/tests/src/Kernel/ViewsKernelTestBase.php b/web/core/modules/views/tests/src/Kernel/ViewsKernelTestBase.php
index 3f2cf3bae6..39287c6368 100644
--- a/web/core/modules/views/tests/src/Kernel/ViewsKernelTestBase.php
+++ b/web/core/modules/views/tests/src/Kernel/ViewsKernelTestBase.php
@@ -28,7 +28,14 @@ abstract class ViewsKernelTestBase extends KernelTestBase {
/**
* {@inheritdoc}
*/
- public static $modules = ['path_alias', 'system', 'views', 'views_test_config', 'views_test_data', 'user'];
+ public static $modules = [
+ 'path_alias',
+ 'system',
+ 'views',
+ 'views_test_config',
+ 'views_test_data',
+ 'user',
+ ];
/**
* {@inheritdoc}
diff --git a/web/core/modules/views/tests/src/Kernel/ViewsPreprocessTest.php b/web/core/modules/views/tests/src/Kernel/ViewsPreprocessTest.php
index f66be0ad2e..1f6b4b954b 100644
--- a/web/core/modules/views/tests/src/Kernel/ViewsPreprocessTest.php
+++ b/web/core/modules/views/tests/src/Kernel/ViewsPreprocessTest.php
@@ -46,15 +46,15 @@ public function testCssClassCleaning() {
$view = Views::getview('test_preprocess');
$build = $view->buildRenderable();
$renderer->renderRoot($build);
- $this->assertContains('class="entity-test--default entity-test__default', (string) $build['#markup']);
+ $this->assertStringContainsString('class="entity-test--default entity-test__default', (string) $build['#markup']);
$view->destroy();
$view->setDisplay('display_2');
$build = $view->buildRenderable();
$renderer->renderRoot($build);
$markup = (string) $build['#markup'];
- $this->assertContains('css_class: entity-test--default and-another-class entity-test__default', $markup);
- $this->assertContains('attributes: class="entity-test--default and-another-class entity-test__default', $markup);
+ $this->assertStringContainsString('css_class: entity-test--default and-another-class entity-test__default', $markup);
+ $this->assertStringContainsString('attributes: class="entity-test--default and-another-class entity-test__default', $markup);
}
}
diff --git a/web/core/modules/views/tests/src/Kernel/ViewsTemplateTest.php b/web/core/modules/views/tests/src/Kernel/ViewsTemplateTest.php
index cca9edfd80..61b3eca0e2 100644
--- a/web/core/modules/views/tests/src/Kernel/ViewsTemplateTest.php
+++ b/web/core/modules/views/tests/src/Kernel/ViewsTemplateTest.php
@@ -14,7 +14,7 @@
class ViewsTemplateTest extends ViewsKernelTestBase {
/**
- * {@inheritdic}
+ * {@inheritdoc}
*/
public static $testViews = ['test_view_display_template'];
@@ -27,7 +27,7 @@ public function testTemplate() {
$renderer = $this->container->get('renderer');
// Check that the renderd output uses the correct template file.
- $this->assertContains('This module defines its own display template.', (string) $renderer->renderRoot($output));
+ $this->assertStringContainsString('This module defines its own display template.', (string) $renderer->renderRoot($output));
}
}
diff --git a/web/core/modules/views/tests/src/Kernel/Wizard/WizardPluginBaseKernelTest.php b/web/core/modules/views/tests/src/Kernel/Wizard/WizardPluginBaseKernelTest.php
index beb7b486d5..21c6b06bf9 100644
--- a/web/core/modules/views/tests/src/Kernel/Wizard/WizardPluginBaseKernelTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Wizard/WizardPluginBaseKernelTest.php
@@ -63,7 +63,7 @@ public function testCreateView() {
$this->wizard->validateView($form, $form_state);
$view = $this->wizard->createView($form, $form_state);
- $this->assertTrue($view instanceof ViewUI, 'The created view is a ViewUI object.');
+ $this->assertInstanceOf(ViewUI::class, $view);
$this->assertEqual($view->get('id'), $random_id);
$this->assertEqual($view->get('label'), $random_label);
$this->assertEqual($view->get('description'), $random_description);
diff --git a/web/core/modules/views/tests/src/Unit/Controller/ViewAjaxControllerTest.php b/web/core/modules/views/tests/src/Unit/Controller/ViewAjaxControllerTest.php
index 8f208f15b7..be92a4e757 100644
--- a/web/core/modules/views/tests/src/Unit/Controller/ViewAjaxControllerTest.php
+++ b/web/core/modules/views/tests/src/Unit/Controller/ViewAjaxControllerTest.php
@@ -194,7 +194,7 @@ public function testAjaxView() {
->with('/test-page?type=article');
$response = $this->viewAjaxController->ajaxView($request);
- $this->assertTrue($response instanceof ViewAjaxResponse);
+ $this->assertInstanceOf(ViewAjaxResponse::class, $response);
$this->assertSame($response->getView(), $executable);
@@ -234,7 +234,7 @@ public function testAjaxViewWithArguments() {
->with('page_1', ['arg1', 'arg2']);
$response = $this->viewAjaxController->ajaxView($request);
- $this->assertTrue($response instanceof ViewAjaxResponse);
+ $this->assertInstanceOf(ViewAjaxResponse::class, $response);
$this->assertViewResultCommand($response);
}
@@ -255,7 +255,7 @@ public function testAjaxViewWithEmptyArguments() {
->with('page_1', $this->identicalTo(['arg1', NULL]));
$response = $this->viewAjaxController->ajaxView($request);
- $this->assertTrue($response instanceof ViewAjaxResponse);
+ $this->assertInstanceOf(ViewAjaxResponse::class, $response);
$this->assertViewResultCommand($response);
}
@@ -275,7 +275,7 @@ public function testAjaxViewWithHtmlEntityArguments() {
->with('page_1', ['arg1 & arg2', 'arg3']);
$response = $this->viewAjaxController->ajaxView($request);
- $this->assertTrue($response instanceof ViewAjaxResponse);
+ $this->assertInstanceOf(ViewAjaxResponse::class, $response);
$this->assertViewResultCommand($response);
}
@@ -310,7 +310,7 @@ public function testAjaxViewWithPager() {
$executable->displayHandlers = $display_collection;
$response = $this->viewAjaxController->ajaxView($request);
- $this->assertTrue($response instanceof ViewAjaxResponse);
+ $this->assertInstanceOf(ViewAjaxResponse::class, $response);
$commands = $this->getCommands($response);
$this->assertEquals('viewsScrollTop', $commands[0]['command']);
diff --git a/web/core/modules/views/tests/src/Unit/Plugin/display/PathPluginBaseTest.php b/web/core/modules/views/tests/src/Unit/Plugin/display/PathPluginBaseTest.php
index 2d4546892d..5f0f89d430 100644
--- a/web/core/modules/views/tests/src/Unit/Plugin/display/PathPluginBaseTest.php
+++ b/web/core/modules/views/tests/src/Unit/Plugin/display/PathPluginBaseTest.php
@@ -104,7 +104,7 @@ public function testCollectRoutes() {
$this->assertEquals(['test_id.page_1' => 'view.test_id.page_1'], $result);
$route = $collection->get('view.test_id.page_1');
- $this->assertTrue($route instanceof Route);
+ $this->assertInstanceOf(Route::class, $route);
$this->assertEquals('test_id', $route->getDefault('view_id'));
$this->assertEquals('page_1', $route->getDefault('display_id'));
$this->assertSame(FALSE, $route->getOption('returns_response'));
@@ -159,7 +159,7 @@ public function testCollectRoutesWithArguments() {
$this->assertEquals(['test_id.page_1' => 'view.test_id.page_1'], $result);
$route = $collection->get('view.test_id.page_1');
- $this->assertTrue($route instanceof Route);
+ $this->assertInstanceOf(Route::class, $route);
$this->assertEquals('test_id', $route->getDefault('view_id'));
$this->assertEquals('page_1', $route->getDefault('display_id'));
$this->assertEquals(['arg_0' => 'arg_0'], $route->getOption('_view_argument_map'));
@@ -190,7 +190,7 @@ public function testCollectRoutesWithArgumentsNotSpecifiedInPath() {
$this->assertEquals(['test_id.page_1' => 'view.test_id.page_1'], $result);
$route = $collection->get('view.test_id.page_1');
- $this->assertTrue($route instanceof Route);
+ $this->assertInstanceOf(Route::class, $route);
$this->assertEquals('test_id', $route->getDefault('view_id'));
$this->assertEquals('page_1', $route->getDefault('display_id'));
$this->assertEquals(['arg_0' => 'arg_0'], $route->getOption('_view_argument_map'));
@@ -217,7 +217,7 @@ public function testCollectRoutesWithSpecialRouteName() {
$this->assertEquals(['test_id.page_1' => 'test_route'], $result);
$route = $collection->get('test_route');
- $this->assertTrue($route instanceof Route);
+ $this->assertInstanceOf(Route::class, $route);
$this->assertEquals('test_id', $route->getDefault('view_id'));
$this->assertEquals('page_1', $route->getDefault('display_id'));
$this->assertEquals('my views title', $route->getDefault('_title'));
@@ -247,14 +247,14 @@ public function testAlterRoute() {
// Ensure that the test_route is overridden.
$route = $collection->get('test_route');
- $this->assertTrue($route instanceof Route);
+ $this->assertInstanceOf(Route::class, $route);
$this->assertEquals('test_id', $route->getDefault('view_id'));
$this->assertEquals('page_1', $route->getDefault('display_id'));
$this->assertEquals('my views title', $route->getDefault('_title'));
// Ensure that the test_route_2 is not overridden.
$route = $collection->get('test_route_2');
- $this->assertTrue($route instanceof Route);
+ $this->assertInstanceOf(Route::class, $route);
$this->assertFalse($route->hasDefault('view_id'));
$this->assertFalse($route->hasDefault('display_id'));
$this->assertSame($collection->get('test_route_2'), $route_2);
@@ -286,13 +286,13 @@ public function testAlterPostRestRoute() {
// Ensure that the test_route is not overridden.
$this->assertCount(2, $collection);
$route = $collection->get('test_route');
- $this->assertTrue($route instanceof Route);
+ $this->assertInstanceOf(Route::class, $route);
$this->assertFalse($route->hasDefault('view_id'));
$this->assertFalse($route->hasDefault('display_id'));
$this->assertSame($collection->get('test_route'), $route);
$route = $collection->get('view.test_id.page_1');
- $this->assertTrue($route instanceof Route);
+ $this->assertInstanceOf(Route::class, $route);
$this->assertEquals('test_id', $route->getDefault('view_id'));
$this->assertEquals('page_1', $route->getDefault('display_id'));
$this->assertEquals('my views title', $route->getDefault('_title'));
@@ -325,13 +325,13 @@ public function testGetRestRoute() {
// Ensure that the test_route is not overridden.
$this->assertCount(2, $collection);
$route = $collection->get('test_route');
- $this->assertTrue($route instanceof Route);
+ $this->assertInstanceOf(Route::class, $route);
$this->assertFalse($route->hasDefault('view_id'));
$this->assertFalse($route->hasDefault('display_id'));
$this->assertSame($collection->get('test_route'), $route);
$route = $collection->get('view.test_id.page_1');
- $this->assertTrue($route instanceof Route);
+ $this->assertInstanceOf(Route::class, $route);
$this->assertEquals('test_id', $route->getDefault('view_id'));
$this->assertEquals('page_1', $route->getDefault('display_id'));
$this->assertEquals('my views title', $route->getDefault('_title'));
@@ -361,7 +361,7 @@ public function testAlterRouteWithAlterCallback() {
// Ensure that the test_route is overridden.
$route = $collection->get('test_route');
- $this->assertTrue($route instanceof Route);
+ $this->assertInstanceOf(Route::class, $route);
$this->assertEquals('test_id', $route->getDefault('view_id'));
$this->assertEquals('\Drupal\Tests\views\Unit\Plugin\display\TestController::testTitle', $route->getDefault('_title_callback'));
$this->assertEquals('page_1', $route->getDefault('display_id'));
@@ -369,7 +369,7 @@ public function testAlterRouteWithAlterCallback() {
// Ensure that the test_route_2 is not overridden.
$route = $collection->get('test_route_2');
- $this->assertTrue($route instanceof Route);
+ $this->assertInstanceOf(Route::class, $route);
$this->assertFalse($route->hasDefault('view_id'));
$this->assertFalse($route->hasDefault('display_id'));
$this->assertSame($collection->get('test_route_2'), $route_2);
@@ -402,7 +402,7 @@ public function testCollectRoutesWithNamedParameters() {
$this->assertEquals(['test_id.page_1' => 'view.test_id.page_1'], $result);
$route = $collection->get('view.test_id.page_1');
- $this->assertTrue($route instanceof Route);
+ $this->assertInstanceOf(Route::class, $route);
$this->assertEquals('/test_route/{node}/example', $route->getPath());
$this->assertEquals('test_id', $route->getDefault('view_id'));
$this->assertEquals('page_1', $route->getDefault('display_id'));
diff --git a/web/core/modules/views/tests/src/Unit/Plugin/views/field/EntityOperationsUnitTest.php b/web/core/modules/views/tests/src/Unit/Plugin/views/field/EntityOperationsUnitTest.php
index 5f07966475..0826a2c106 100644
--- a/web/core/modules/views/tests/src/Unit/Plugin/views/field/EntityOperationsUnitTest.php
+++ b/web/core/modules/views/tests/src/Unit/Plugin/views/field/EntityOperationsUnitTest.php
@@ -87,7 +87,7 @@ public function testUsesGroupBy() {
*/
public function testDefineOptions() {
$options = $this->plugin->defineOptions();
- $this->assertInternalType('array', $options);
+ $this->assertIsArray($options);
$this->assertArrayHasKey('destination', $options);
}
diff --git a/web/core/modules/views/tests/src/Unit/Routing/ViewPageControllerTest.php b/web/core/modules/views/tests/src/Unit/Routing/ViewPageControllerTest.php
index 0364558124..adbd125fe4 100644
--- a/web/core/modules/views/tests/src/Unit/Routing/ViewPageControllerTest.php
+++ b/web/core/modules/views/tests/src/Unit/Routing/ViewPageControllerTest.php
@@ -64,7 +64,7 @@ public function testPageController() {
$route_match = RouteMatch::createFromRequest($request);
$output = $this->pageController->handle($route_match->getParameter('view_id'), $route_match->getParameter('display_id'), $route_match);
- $this->assertInternalType('array', $output);
+ $this->assertIsArray($output);
$this->assertEquals($build, $output);
}
diff --git a/web/core/modules/views/views.api.php b/web/core/modules/views/views.api.php
index 9889c93e32..950a06cfeb 100644
--- a/web/core/modules/views/views.api.php
+++ b/web/core/modules/views/views.api.php
@@ -879,7 +879,7 @@ function hook_views_query_alter(ViewExecutable $view, QueryPluginBase $query) {
// Traverse through the 'where' part of the query.
foreach ($query->where as &$condition_group) {
foreach ($condition_group['conditions'] as &$condition) {
- // If this is the part of the query filtering on title, chang the
+ // If this is the part of the query filtering on title, change the
// condition to filter on node ID.
if ($condition['field'] == 'node.title') {
$condition = [
@@ -921,27 +921,6 @@ function hook_views_preview_info_alter(array &$rows, ViewExecutable $view) {
];
}
-/**
- * Alter the links displayed at the top of the view edit form.
- *
- * @param array $links
- * A renderable array of links which will be displayed at the top of the
- * view edit form. Each entry will be in a form suitable for
- * '#theme' => 'links'.
- * @param \Drupal\views\ViewExecutable $view
- * The view object being edited.
- * @param string $display_id
- * The ID of the display being edited, e.g. 'default' or 'page_1'.
- *
- * @see \Drupal\views_ui\ViewUI::renderDisplayTop()
- */
-function hook_views_ui_display_top_links_alter(array &$links, ViewExecutable $view, $display_id) {
- // Put the export link first in the list.
- if (isset($links['export'])) {
- $links = ['export' => $links['export']] + $links;
- }
-}
-
// @todo Describe how to alter a view ajax response with event listeners.
/**
diff --git a/web/core/modules/views/views.install b/web/core/modules/views/views.install
index 002ad01321..668112d325 100644
--- a/web/core/modules/views/views.install
+++ b/web/core/modules/views/views.install
@@ -5,9 +5,6 @@
* Contains install and update functions for Views.
*/
-use Drupal\Core\Config\Schema\ArrayElement;
-use Drupal\views\Views;
-
/**
* Implements hook_install().
*/
@@ -402,133 +399,6 @@ function views_update_8201() {
* Update field names for multi-value base fields.
*/
function views_update_8500() {
- // Find all multi-value base fields for content entities.
- $entity_type_manager = \Drupal::entityTypeManager();
- $entity_field_manager = \Drupal::service('entity_field.manager');
- $table_update_info = [];
-
- foreach ($entity_type_manager->getDefinitions() as $entity_type_id => $entity_type) {
- if ($entity_type->hasHandlerClass('views_data')) {
- $base_field_definitions = $entity_field_manager->getBaseFieldDefinitions($entity_type_id);
-
- $entity_storage = $entity_type_manager->getStorage($entity_type_id);
- $table_mapping = $entity_storage->getTableMapping($base_field_definitions);
-
- foreach ($base_field_definitions as $field_name => $base_field_definition) {
- $base_field_storage_definition = $base_field_definition->getFieldStorageDefinition();
-
- // Skip single value and custom storage base fields.
- if (!$base_field_storage_definition->isMultiple() || $base_field_storage_definition->hasCustomStorage()) {
- continue;
- }
-
- // Get the actual table, as well as the column for the main property
- // name so we can perform an update later on the views.
- $table_name = $table_mapping->getFieldTableName($field_name);
- $main_property_name = $base_field_storage_definition->getMainPropertyName();
-
- $table_update_info[$table_name][$field_name] = $table_mapping->getFieldColumnName($base_field_storage_definition, $main_property_name);
- }
- }
- }
-
- if (empty($table_update_info)) {
- return;
- }
-
- $config_factory = \Drupal::configFactory();
- /** @var \Drupal\Core\Config\TypedConfigManagerInterface $typed_config_manager */
- $typed_config_manager = \Drupal::service('config.typed');
- $views_data = Views::viewsData();
- $handler_types = ['field', 'argument', 'sort', 'relationship', 'filter'];
-
- $required_cleanup_handlers = [];
- foreach ($config_factory->listAll('views.view.') as $id) {
- $view = $config_factory->getEditable($id);
- $changed = FALSE;
-
- foreach ($view->get('display') as $display_id => &$display) {
- foreach ($handler_types as $handler_type_singular) {
- $handler_type_plural = $handler_type_singular . 's';
- $handler_data = $view->get("display.$display_id.display_options.$handler_type_plural");
-
- if (empty($handler_data)) {
- continue;
- }
-
- foreach ($handler_data as $key => $data) {
- // If this handler has a table we're interested in, update the field
- // name.
- $table = $data['table'];
- if (isset($table_update_info[$table])) {
- $path_to_handler = "display.$display_id.display_options.$handler_type_plural.$key";
- $path_field = "{$path_to_handler}.field";
- $path_plugin_id = "{$path_to_handler}.plugin_id";
- $original_field_name = $view->get($path_field);
-
- // Only if the wrong field name is set do we change the field. It
- // could already be using the correct field. Like
- // user__roles/roles_target_id.
- if (isset($table_update_info[$table][$original_field_name])) {
- $required_cleanup_handlers[$id][] = $path_to_handler;
-
- // Set both the new table field as well as new 'plugin_id' field.
- $view->set($path_field, $table_update_info[$table][$original_field_name]);
- $view->set($path_plugin_id, $views_data->get($table)[$table_update_info[$table][$original_field_name]][$handler_type_singular]['id']);
-
- $changed = TRUE;
- }
- }
- }
- }
- }
-
- if ($changed) {
- $view->save(TRUE);
- }
- }
-
- // Beside of updating the field and plugin ID we also need to truncate orphan
- // keys so the configuration applies to the config schema.
- // We cannot do that inline in the other code, due to caching issues with
- // typed configuration.
- foreach ($required_cleanup_handlers as $id => $paths_to_handlers) {
- $changed = FALSE;
- $typed_view = $typed_config_manager->get($id);
- $view = $config_factory->getEditable($id);
- foreach ($paths_to_handlers as $path_to_handler) {
- /** @var \Drupal\Core\Config\Schema\TypedConfigInterface $typed_view */
-
- /** @var \Drupal\Core\Config\Schema\ArrayElement $typed_config */
- $typed_config = $typed_view->get($path_to_handler);
- $config = $typed_config->getValue();
-
- // Filter values we want to convert from a string to an array.
- if (strpos($path_to_handler, 'filters') !== FALSE && $typed_config->get('value') instanceof ArrayElement && is_string($config['value'])) {
- // An empty string casted to an array is an array with one
- // element.
- if ($config['value'] === '') {
- $config['value'] = [];
- }
- else {
- $config['value'] = (array) $config['value'];
- }
- }
-
- // For all the other fields we try to determine the fields using
- // config schema and remove everything which is not needed.
- foreach (array_keys($config) as $config_key) {
- if (!isset($typed_config->getDataDefinition()['mapping'][$config_key])) {
- unset($config[$config_key]);
- $changed = TRUE;
- }
- }
- $typed_config->setValue($config);
- $view->set($path_to_handler, $typed_config->getValue());
- }
-
- if ($changed) {
- $view->save();
- }
- }
+ // This update has been replaced by
+ // views_post_update_field_names_for_multivalue_fields().
}
diff --git a/web/core/modules/views/views.module b/web/core/modules/views/views.module
index 13bec4d13e..398b670f68 100644
--- a/web/core/modules/views/views.module
+++ b/web/core/modules/views/views.module
@@ -17,6 +17,7 @@
use Drupal\views\Entity\View;
use Drupal\views\Form\ViewsFormMainForm;
use Drupal\views\Views;
+use Drupal\views\ViewsConfigUpdater;
/**
* Implements hook_help().
@@ -843,49 +844,9 @@ function views_view_delete(EntityInterface $entity) {
/**
* Implements hook_ENTITY_TYPE_presave().
- *
- * Provides a BC layer for modules providing old configurations.
*/
function views_view_presave(ViewEntityInterface $view) {
- $displays = $view->get('display');
- $changed = FALSE;
- foreach ($displays as $display_name => &$display) {
- if (isset($display['display_options']['fields'])) {
- foreach ($display['display_options']['fields'] as $field_name => &$field) {
- if (isset($field['plugin_id']) && $field['plugin_id'] === 'entity_link') {
- // Add any missing settings for entity_link.
- if (!isset($field['output_url_as_text'])) {
- $field['output_url_as_text'] = FALSE;
- $changed = TRUE;
- }
- if (!isset($field['absolute'])) {
- $field['absolute'] = FALSE;
- $changed = TRUE;
- }
- }
- elseif (isset($field['plugin_id']) && $field['plugin_id'] === 'node_path') {
- // Convert the use of node_path to entity_link.
- $field['plugin_id'] = 'entity_link';
- $field['field'] = 'view_node';
- $field['output_url_as_text'] = TRUE;
- $changed = TRUE;
- }
- }
- }
- if (isset($display['display_options']['filters'])) {
- foreach ($display['display_options']['filters'] as $filter_name => &$filter) {
- if (!isset($filter['expose']['operator_limit_selection'])) {
- $filter['expose']['operator_limit_selection'] = FALSE;
- $changed = TRUE;
- }
- if (!isset($filter['expose']['operator_list'])) {
- $filter['expose']['operator_list'] = [];
- $changed = TRUE;
- }
- }
- }
- }
- if ($changed) {
- $view->set('display', $displays);
- }
+ /** @var \Drupal\views\ViewsConfigUpdater $config_updater */
+ $config_updater = \Drupal::classResolver(ViewsConfigUpdater::class);
+ $config_updater->updateAll($view);
}
diff --git a/web/core/modules/views/views.post_update.php b/web/core/modules/views/views.post_update.php
index c949f81885..028f1eb53d 100644
--- a/web/core/modules/views/views.post_update.php
+++ b/web/core/modules/views/views.post_update.php
@@ -11,6 +11,7 @@
use Drupal\views\Plugin\views\filter\NumericFilter;
use Drupal\views\Plugin\views\filter\StringFilter;
use Drupal\views\Views;
+use Drupal\views\ViewsConfigUpdater;
/**
* Update the cacheability metadata for all views.
@@ -223,43 +224,12 @@ function views_post_update_revision_metadata_fields() {
* Add additional settings to the entity link field and convert node_path usage
* to entity_link.
*/
-function views_post_update_entity_link_url() {
- // Load all views.
- $views = \Drupal::entityTypeManager()->getStorage('view')->loadMultiple();
-
- /* @var \Drupal\views\Entity\View[] $views */
- foreach ($views as $view) {
- $displays = $view->get('display');
- $changed = FALSE;
- foreach ($displays as $display_name => &$display) {
- if (isset($display['display_options']['fields'])) {
- foreach ($display['display_options']['fields'] as $field_name => &$field) {
- if (isset($field['plugin_id']) && $field['plugin_id'] === 'entity_link') {
- // Add any missing settings for entity_link.
- if (!isset($field['output_url_as_text'])) {
- $field['output_url_as_text'] = FALSE;
- $changed = TRUE;
- }
- if (!isset($field['absolute'])) {
- $field['absolute'] = FALSE;
- $changed = TRUE;
- }
- }
- elseif (isset($field['plugin_id']) && $field['plugin_id'] === 'node_path') {
- // Convert the use of node_path to entity_link.
- $field['plugin_id'] = 'entity_link';
- $field['field'] = 'view_node';
- $field['output_url_as_text'] = TRUE;
- $changed = TRUE;
- }
- }
- }
- }
- if ($changed) {
- $view->set('display', $displays);
- $view->save();
- }
- }
+function views_post_update_entity_link_url(&$sandbox = NULL) {
+ /** @var \Drupal\views\ViewsConfigUpdater $view_config_updater */
+ $view_config_updater = \Drupal::classResolver(ViewsConfigUpdater::class);
+ \Drupal::classResolver(ConfigEntityUpdater::class)->update($sandbox, 'view', function ($view) use ($view_config_updater) {
+ return $view_config_updater->needsEntityLinkUrlUpdate($view);
+ });
}
/**
@@ -399,31 +369,10 @@ function views_post_update_make_placeholders_translatable() {
* Define default values for limit operators settings in all filters.
*/
function views_post_update_limit_operator_defaults(&$sandbox = NULL) {
- \Drupal::classResolver(ConfigEntityUpdater::class)->update($sandbox, 'view', function ($view) {
- /** @var \Drupal\views\ViewEntityInterface $view */
- $displays = $view->get('display');
-
- $update = FALSE;
- foreach ($displays as $display_name => &$display) {
- if (!isset($display['display_options']['filters'])) {
- continue;
- }
-
- foreach ($display['display_options']['filters'] as $filter_name => $filter) {
- if (!isset($filter['expose']['operator_limit_selection'])) {
- $filter['expose']['operator_limit_selection'] = FALSE;
- $update = TRUE;
- }
- if (!isset($filter['expose']['operator_list'])) {
- $filter['expose']['operator_list'] = [];
- $update = TRUE;
- }
- if ($update) {
- $view->set("display.$display_name.display_options.filters.$filter_name", $filter);
- }
- }
- }
- return $update;
+ /** @var \Drupal\views\ViewsConfigUpdater $view_config_updater */
+ $view_config_updater = \Drupal::classResolver(ViewsConfigUpdater::class);
+ \Drupal::classResolver(ConfigEntityUpdater::class)->update($sandbox, 'view', function ($view) use ($view_config_updater) {
+ return $view_config_updater->needsOperatorDefaultsUpdate($view);
});
}
@@ -436,3 +385,14 @@ function views_post_update_remove_core_key(&$sandbox = NULL) {
return TRUE;
});
}
+
+/**
+ * Update field names for multi-value base fields.
+ */
+function views_post_update_field_names_for_multivalue_fields(&$sandbox = NULL) {
+ /** @var \Drupal\views\ViewsConfigUpdater $view_config_updater */
+ $view_config_updater = \Drupal::classResolver(ViewsConfigUpdater::class);
+ \Drupal::classResolver(ConfigEntityUpdater::class)->update($sandbox, 'view', function ($view) use ($view_config_updater) {
+ return $view_config_updater->needsMultivalueBaseFieldUpdate($view);
+ });
+}
diff --git a/web/core/modules/views/views.theme.inc b/web/core/modules/views/views.theme.inc
index 509a146e03..ba95597608 100644
--- a/web/core/modules/views/views.theme.inc
+++ b/web/core/modules/views/views.theme.inc
@@ -139,7 +139,9 @@ function template_preprocess_views_view_fields(&$variables) {
}
if (!empty($variables['options']['separator']) && $previous_inline && $object->inline && $object->content) {
- $object->separator = Xss::filterAdmin($variables['options']['separator']);
+ $object->separator = [
+ '#markup' => $variables['options']['separator'],
+ ];
}
$object->class = Html::cleanCssIdentifier($id);
@@ -658,8 +660,23 @@ function template_preprocess_views_view_table(&$variables) {
$variables['caption_needed'] = FALSE;
}
+ // For backwards compatibility, initialize the 'summary' and 'description'
+ // variables, although core templates now all use 'summary_element' instead.
$variables['summary'] = $handler->options['summary'];
$variables['description'] = $handler->options['description'];
+ $variables['summary_element'] = [
+ '#type' => 'details',
+ '#title' => $handler->options['summary'],
+ // To ensure that the description is properly escaped during rendering, use
+ // an 'inline_template' to let Twig do its magic, instead of 'markup'.
+ 'description' => [
+ '#type' => 'inline_template',
+ '#template' => '{{ description }}',
+ '#context' => [
+ 'description' => $handler->options['description'],
+ ],
+ ],
+ ];
$variables['caption_needed'] |= !empty($variables['summary']) || !empty($variables['description']);
$variables['responsive'] = FALSE;
diff --git a/web/core/modules/views/views.tokens.inc b/web/core/modules/views/views.tokens.inc
index 9bf5470a66..915ad807f6 100644
--- a/web/core/modules/views/views.tokens.inc
+++ b/web/core/modules/views/views.tokens.inc
@@ -112,21 +112,27 @@ function views_tokens($type, $tokens, array $data, array $options, BubbleableMet
$replacements[$original] = '';
}
break;
+
case 'base-table':
$replacements[$original] = $view->storage->get('base_table');
break;
+
case 'base-field':
$replacements[$original] = $view->storage->get('base_field');
break;
+
case 'total-rows':
$replacements[$original] = (int) $view->total_rows;
break;
+
case 'items-per-page':
$replacements[$original] = (int) $view->getItemsPerPage();
break;
+
case 'current-page':
$replacements[$original] = (int) $view->getCurrentPage() + 1;
break;
+
case 'page-count':
// If there are no items per page, set this to 1 for the division.
$per_page = $view->getItemsPerPage() ?: 1;
diff --git a/web/core/modules/views/views.views.inc b/web/core/modules/views/views.views.inc
index 40af91805c..fb2663e031 100644
--- a/web/core/modules/views/views.views.inc
+++ b/web/core/modules/views/views.views.inc
@@ -604,6 +604,7 @@ function views_field_default_views_data(FieldStorageConfigInterface $field_stora
$filter = 'boolean';
}
break;
+
case 'blob':
// It does not make sense to sort by blob.
$allow_sort = FALSE;
diff --git a/web/core/modules/views_ui/src/ViewEditForm.php b/web/core/modules/views_ui/src/ViewEditForm.php
index 8ca5612dbb..2ca08f7e84 100644
--- a/web/core/modules/views_ui/src/ViewEditForm.php
+++ b/web/core/modules/views_ui/src/ViewEditForm.php
@@ -110,7 +110,7 @@ public function form(array $form, FormStateInterface $form_state) {
$form['#tree'] = TRUE;
- $form['#attached']['library'][] = 'core/jquery.ui.dialog';
+ $form['#attached']['library'][] = 'core/drupal.dialog.ajax';
$form['#attached']['library'][] = 'core/drupal.states';
$form['#attached']['library'][] = 'core/drupal.tabledrag';
$form['#attached']['library'][] = 'views_ui/views_ui.admin';
@@ -315,8 +315,6 @@ public function save(array $form, FormStateInterface $form_state) {
$query->remove('destination');
}
}
- // @todo Use Url::fromPath() once https://www.drupal.org/node/2351379 is
- // resolved.
$form_state->setRedirectUrl(Url::fromUri("base:$destination"));
}
@@ -980,6 +978,7 @@ public function getFormBucket(ViewUI $view, $type, $display) {
// TODO: Add another class to have another symbol for filter rearrange.
$class = 'icon compact rearrange';
break;
+
case 'field':
// Fetch the style plugin info so we know whether to list fields or not.
$style_plugin = $executable->style_plugin;
@@ -993,6 +992,7 @@ public function getFormBucket(ViewUI $view, $type, $display) {
return $build;
}
break;
+
case 'header':
case 'footer':
case 'empty':
diff --git a/web/core/modules/views_ui/src/ViewListBuilder.php b/web/core/modules/views_ui/src/ViewListBuilder.php
index 0a5ef2439b..1595cf945b 100644
--- a/web/core/modules/views_ui/src/ViewListBuilder.php
+++ b/web/core/modules/views_ui/src/ViewListBuilder.php
@@ -161,6 +161,8 @@ public function buildHeader() {
*/
public function getDefaultOperations(EntityInterface $entity) {
$operations = parent::getDefaultOperations($entity);
+ // Remove destination redirect for Edit operation.
+ $operations['edit']['url'] = $entity->toUrl('edit-form');
if ($entity->hasLinkTemplate('duplicate-form')) {
$operations['duplicate'] = [
diff --git a/web/core/modules/views_ui/src/ViewUI.php b/web/core/modules/views_ui/src/ViewUI.php
index 28c32f72e8..2e25c1471b 100644
--- a/web/core/modules/views_ui/src/ViewUI.php
+++ b/web/core/modules/views_ui/src/ViewUI.php
@@ -614,7 +614,7 @@ public function renderPreview($display_id, $args = []) {
// Prepare the query information and statistics to show either above or
// below the view preview.
- // Initialise the empty rows arrays so we can safely merge them later.
+ // Initialize the empty rows arrays so we can safely merge them later.
$rows['query'] = [];
$rows['statistics'] = [];
if ($show_info || $show_query || $show_stats) {
diff --git a/web/core/modules/views_ui/tests/src/Functional/CustomBooleanTest.php b/web/core/modules/views_ui/tests/src/Functional/CustomBooleanTest.php
index 77d2e0b35e..cd3c36e241 100644
--- a/web/core/modules/views_ui/tests/src/Functional/CustomBooleanTest.php
+++ b/web/core/modules/views_ui/tests/src/Functional/CustomBooleanTest.php
@@ -73,17 +73,17 @@ public function testCustomOption() {
'plain' => [
'true' => $custom_true,
'false' => $custom_false,
- 'test' => 'assertContains',
+ 'test' => 'assertStringContainsString',
],
'allowed tag' => [
'true' => '<p>' . $custom_true . '</p>',
'false' => '<p>' . $custom_false . '</p>',
- 'test' => 'assertContains',
+ 'test' => 'assertStringContainsString',
],
'disallowed tag' => [
'true' => '<script>' . $custom_true . '</script>',
'false' => '<script>' . $custom_false . '</script>',
- 'test' => 'assertNotContains',
+ 'test' => 'assertStringNotContainsString',
],
];
@@ -145,17 +145,17 @@ public function testCustomOptionTemplate() {
'plain' => [
'true' => $custom_true,
'false' => $custom_false,
- 'test' => 'assertContains',
+ 'test' => 'assertStringContainsString',
],
'allowed tag' => [
'true' => '<p>' . $custom_true . '</p>',
'false' => '<p>' . $custom_false . '</p>',
- 'test' => 'assertContains',
+ 'test' => 'assertStringContainsString',
],
'disallowed tag' => [
'true' => '<script>' . $custom_true . '</script>',
'false' => '<script>' . $custom_false . '</script>',
- 'test' => 'assertNotContains',
+ 'test' => 'assertStringNotContainsString',
],
];
@@ -178,7 +178,7 @@ public function testCustomOptionTemplate() {
$this->{$values['test']}($values['false'], (string) $output, new FormattableMarkup('Expected custom boolean FALSE value %value in output for %type', ['%value' => $values['false'], '%type' => $type]));
// Assert that we are using the correct template.
- $this->assertContains('llama', (string) $output);
+ $this->assertStringContainsString('llama', (string) $output);
}
}
diff --git a/web/core/modules/views_ui/tests/src/Functional/DefaultViewsTest.php b/web/core/modules/views_ui/tests/src/Functional/DefaultViewsTest.php
index 7a4ad1eaa4..6a5a75f036 100644
--- a/web/core/modules/views_ui/tests/src/Functional/DefaultViewsTest.php
+++ b/web/core/modules/views_ui/tests/src/Functional/DefaultViewsTest.php
@@ -64,7 +64,7 @@ public function testDefaultViews() {
$this->drupalPostForm('admin/structure/views/nojs/display/glossary/page_1/title', $edit, t('Apply'));
$this->drupalPostForm('admin/structure/views/view/glossary/edit/page_1', [], t('Save'));
$this->drupalGet('glossary');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertText($new_title);
// Save another view in the UI.
@@ -93,7 +93,7 @@ public function testDefaultViews() {
$edit = [
'id' => 'duplicate_of_glossary',
];
- $this->assertTitle(t('Duplicate of @label | @site-name', ['@label' => 'Glossary', '@site-name' => $this->config('system.site')->get('name')]));
+ $this->assertTitle('Duplicate of Glossary | Drupal');
$this->drupalPostForm(NULL, $edit, t('Duplicate'));
$this->assertUrl('admin/structure/views/view/duplicate_of_glossary', [], 'The normal duplicating name schema is applied.');
@@ -125,9 +125,9 @@ public function testDefaultViews() {
// Test the default views disclose no data by default.
$this->drupalLogout();
$this->drupalGet('glossary');
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
$this->drupalGet('archive');
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
// Test deleting a view.
$this->drupalLogin($this->fullAdminUser);
@@ -140,7 +140,7 @@ public function testDefaultViews() {
$this->assertNoLinkByHref($edit_href);
// Ensure the view is no longer available.
$this->drupalGet($edit_href);
- $this->assertResponse(404);
+ $this->assertSession()->statusCodeEquals(404);
$this->assertText('Page not found');
// Delete all duplicated Glossary views.
@@ -150,14 +150,14 @@ public function testDefaultViews() {
$this->drupalPostForm(NULL, [], t('Delete'));
$this->drupalGet('glossary');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->drupalGet('admin/structure/views');
$this->clickViewsOperationLink(t('Delete'), $random_name);
// Submit the confirmation form.
$this->drupalPostForm(NULL, [], t('Delete'));
$this->drupalGet('glossary');
- $this->assertResponse(404);
+ $this->assertSession()->statusCodeEquals(404);
$this->assertText('Page not found');
}
@@ -176,25 +176,25 @@ public function testSplitListing() {
$this->drupalGet('admin/structure/views');
$elements = $this->xpath($xpath, $arguments);
- $this->assertIdentical(count($elements), 0, 'A disabled view is not found in the enabled views table.');
+ $this->assertCount(0, $elements, 'A disabled view is not found in the enabled views table.');
$arguments[':status'] = 'views-list-section disabled';
$elements = $this->xpath($xpath, $arguments);
- $this->assertIdentical(count($elements), 1, 'A disabled view is found in the disabled views table.');
+ $this->assertCount(1, $elements, 'A disabled view is found in the disabled views table.');
// Enable the view.
$this->clickViewsOperationLink(t('Enable'), '/test_view_status/');
$elements = $this->xpath($xpath, $arguments);
- $this->assertIdentical(count($elements), 0, 'After enabling a view, it is not found in the disabled views table.');
+ $this->assertCount(0, $elements, 'After enabling a view, it is not found in the disabled views table.');
$arguments[':status'] = 'views-list-section enabled';
$elements = $this->xpath($xpath, $arguments);
- $this->assertIdentical(count($elements), 1, 'After enabling a view, it is found in the enabled views table.');
+ $this->assertCount(1, $elements, 'After enabling a view, it is found in the enabled views table.');
// Attempt to disable the view by path directly, with no token.
$this->drupalGet('admin/structure/views/view/test_view_status/disable');
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
}
/**
diff --git a/web/core/modules/views_ui/tests/src/Functional/DisplayCRUDTest.php b/web/core/modules/views_ui/tests/src/Functional/DisplayCRUDTest.php
index 83e43f9987..b24efd5e87 100644
--- a/web/core/modules/views_ui/tests/src/Functional/DisplayCRUDTest.php
+++ b/web/core/modules/views_ui/tests/src/Functional/DisplayCRUDTest.php
@@ -94,7 +94,7 @@ public function testRemoveDisplay() {
$this->drupalPostForm("admin/structure/views/nojs/display/{$view['id']}/page_1/display_id", ['display_id' => $machine_name], 'Apply');
$this->drupalPostForm(NULL, [], 'Delete Page');
$this->drupalPostForm(NULL, [], t('Save'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertNoLinkByHref($path_prefix . '/new_machine_name', 'Make sure there is no display tab for the deleted display.');
}
@@ -104,7 +104,7 @@ public function testRemoveDisplay() {
public function testDefaultDisplay() {
$this->drupalGet('admin/structure/views/view/test_display');
$elements = $this->xpath('//*[@id="views-page-1-display-title"]');
- $this->assertEqual(count($elements), 1, 'The page display is loaded as the default display.');
+ $this->assertCount(1, $elements, 'The page display is loaded as the default display.');
}
/**
diff --git a/web/core/modules/views_ui/tests/src/Functional/DisplayPathTest.php b/web/core/modules/views_ui/tests/src/Functional/DisplayPathTest.php
index cdf36704cf..e4ba28fad8 100644
--- a/web/core/modules/views_ui/tests/src/Functional/DisplayPathTest.php
+++ b/web/core/modules/views_ui/tests/src/Functional/DisplayPathTest.php
@@ -151,11 +151,11 @@ public function testMenuOptions() {
$this->drupalGet('admin/structure/views/view/test_view');
$this->drupalPostForm('admin/structure/views/nojs/display/test_view/page_1/menu', ['menu[type]' => 'default tab', 'menu[title]' => 'Test tab title'], t('Apply'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertUrl('admin/structure/views/nojs/display/test_view/page_1/tab_options');
$this->drupalPostForm(NULL, ['tab_options[type]' => 'tab', 'tab_options[title]' => $this->randomString()], t('Apply'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertUrl('admin/structure/views/view/test_view/edit/page_1');
$this->drupalGet('admin/structure/views/view/test_view');
@@ -165,7 +165,7 @@ public function testMenuOptions() {
// Ensure that you can select a parent in case the parent does not exist.
$this->drupalGet('admin/structure/views/nojs/display/test_page_display_menu/page_5/menu');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$menu_parent = $this->xpath('//select[@id="edit-menu-parent"]');
$menu_options = (array) $menu_parent[0]->findAll('css', 'option');
unset($menu_options['@attributes']);
@@ -256,7 +256,7 @@ public function testDefaultMenuTabRegression() {
$this->drupalPostForm(NULL, [], t('Save'));
// Assert that saving the view will not cause an exception.
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
}
}
diff --git a/web/core/modules/views_ui/tests/src/Functional/ExposedFormUITest.php b/web/core/modules/views_ui/tests/src/Functional/ExposedFormUITest.php
index c863d9362c..a55be6b997 100644
--- a/web/core/modules/views_ui/tests/src/Functional/ExposedFormUITest.php
+++ b/web/core/modules/views_ui/tests/src/Functional/ExposedFormUITest.php
@@ -21,7 +21,14 @@ class ExposedFormUITest extends UITestBase {
/**
* {@inheritdoc}
*/
- public static $modules = ['node', 'views_ui', 'block', 'taxonomy', 'field_ui', 'datetime'];
+ public static $modules = [
+ 'node',
+ 'views_ui',
+ 'block',
+ 'taxonomy',
+ 'field_ui',
+ 'datetime',
+ ];
/**
* {@inheritdoc}
@@ -292,7 +299,7 @@ public function testExposedGroupedFilter() {
$this->drupalPostForm(NULL, $edit, t('Apply'));
// Check that the view is saved without errors.
$this->drupalPostForm(NULL, [], t('Save'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Click the Expose filter button.
$this->drupalPostForm('admin/structure/views/nojs/add-handler/test_exposed_admin_ui/default/filter', ['name[node_field_data.status]' => 1], t('Add and configure filter criteria'));
@@ -313,7 +320,7 @@ public function testExposedGroupedFilter() {
$this->drupalPostForm(NULL, $edit, t('Apply'));
// Check that the view is saved without errors.
$this->drupalPostForm(NULL, [], t('Save'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->drupalGet('admin/structure/views/nojs/handler/test_exposed_admin_ui/default/filter/status');
// Assert the same settings defined before still are there.
diff --git a/web/core/modules/views_ui/tests/src/Functional/FilterBooleanWebTest.php b/web/core/modules/views_ui/tests/src/Functional/FilterBooleanWebTest.php
index f62c8c0ae8..3a2546d59a 100644
--- a/web/core/modules/views_ui/tests/src/Functional/FilterBooleanWebTest.php
+++ b/web/core/modules/views_ui/tests/src/Functional/FilterBooleanWebTest.php
@@ -58,7 +58,7 @@ public function testFilterBooleanUI() {
$this->assertEqual($result[1]->getAttribute('checked'), 'checked');
// Test that there is a remove link for each group.
- $this->assertEqual(count($this->cssSelect('a.views-remove-link')), 3);
+ $this->assertCount(3, $this->cssSelect('a.views-remove-link'));
// Test selecting a default and removing an item.
$edit = [];
diff --git a/web/core/modules/views_ui/tests/src/Functional/HandlerTest.php b/web/core/modules/views_ui/tests/src/Functional/HandlerTest.php
index 557a992027..692be46a94 100644
--- a/web/core/modules/views_ui/tests/src/Functional/HandlerTest.php
+++ b/web/core/modules/views_ui/tests/src/Functional/HandlerTest.php
@@ -211,7 +211,7 @@ public function testBrokenHandlers() {
$href = "admin/structure/views/nojs/handler/test_view_broken/default/$type/id_broken";
$result = $this->xpath('//a[contains(@href, :href)]', [':href' => $href]);
- $this->assertEqual(count($result), 1, new FormattableMarkup('Handler (%type) edit link found.', ['%type' => $type]));
+ $this->assertCount(1, $result, new FormattableMarkup('Handler (%type) edit link found.', ['%type' => $type]));
$text = 'Broken/missing handler';
@@ -219,7 +219,7 @@ public function testBrokenHandlers() {
$this->drupalGet($href);
$result = $this->xpath('//h1[@class="page-title"]');
- $this->assertContains($text, $result[0]->getText(), 'Ensure the broken handler text was found.');
+ $this->assertStringContainsString($text, $result[0]->getText(), 'Ensure the broken handler text was found.');
$original_configuration = [
'field' => 'id_broken',
@@ -283,7 +283,7 @@ public function testErrorMissingHelp() {
*/
public function assertNoDuplicateField($field_name, $entity_type) {
$elements = $this->xpath('//td[.=:entity_type]/preceding-sibling::td[@class="title" and .=:title]', [':title' => $field_name, ':entity_type' => $entity_type]);
- $this->assertEqual(1, count($elements), $field_name . ' appears just once in ' . $entity_type . '.');
+ $this->assertCount(1, $elements, $field_name . ' appears just once in ' . $entity_type . '.');
}
}
diff --git a/web/core/modules/views_ui/tests/src/Functional/NewViewConfigSchemaTest.php b/web/core/modules/views_ui/tests/src/Functional/NewViewConfigSchemaTest.php
index 58b0bdfdd9..2dc44dc5a7 100644
--- a/web/core/modules/views_ui/tests/src/Functional/NewViewConfigSchemaTest.php
+++ b/web/core/modules/views_ui/tests/src/Functional/NewViewConfigSchemaTest.php
@@ -14,7 +14,15 @@ class NewViewConfigSchemaTest extends UITestBase {
*
* @var array
*/
- public static $modules = ['views_ui', 'node', 'comment', 'file', 'taxonomy', 'dblog', 'aggregator'];
+ public static $modules = [
+ 'views_ui',
+ 'node',
+ 'comment',
+ 'file',
+ 'taxonomy',
+ 'dblog',
+ 'aggregator',
+ ];
/**
* {@inheritdoc}
diff --git a/web/core/modules/views_ui/tests/src/Functional/OverrideDisplaysTest.php b/web/core/modules/views_ui/tests/src/Functional/OverrideDisplaysTest.php
index 1bc982a1c5..d026a42445 100644
--- a/web/core/modules/views_ui/tests/src/Functional/OverrideDisplaysTest.php
+++ b/web/core/modules/views_ui/tests/src/Functional/OverrideDisplaysTest.php
@@ -51,7 +51,7 @@ public function testOverrideDisplays() {
// Make sure the title appears in the page.
$this->drupalGet($view_path);
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertText($original_title);
// Confirm that the view block is available in the block administration UI.
@@ -74,7 +74,7 @@ public function testOverrideDisplays() {
$this->drupalPostForm("admin/structure/views/nojs/display/{$view['id']}/page_1/title", $edit, t('Apply'));
$this->drupalPostForm("admin/structure/views/view/{$view['id']}/edit/page_1", [], t('Save'));
$this->drupalGet($view_path);
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertText($new_title);
$this->assertText($original_title);
}
@@ -106,11 +106,11 @@ public function testWizardMixedDefaultOverriddenDisplays() {
// Make sure that the feed, page and block all start off with the correct
// titles.
$this->drupalGet($view['page[path]']);
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertText($view['page[title]']);
$this->assertNoText($view['block[title]']);
$this->drupalGet($view['page[feed_properties][path]']);
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertText($view['page[title]']);
$this->assertNoText($view['block[title]']);
@@ -142,12 +142,12 @@ public function testWizardMixedDefaultOverriddenDisplays() {
$this->drupalPostForm("admin/structure/views/nojs/display/{$view['id']}/page_1/title", $edit, t('Apply'));
$this->drupalPostForm("admin/structure/views/view/{$view['id']}/edit/page_1", [], t('Save'));
$this->drupalGet($view['page[path]']);
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertText($new_default_title);
$this->assertNoText($view['page[title]']);
$this->assertNoText($view['block[title]']);
$this->drupalGet($view['page[feed_properties][path]']);
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertText($new_default_title);
$this->assertNoText($view['page[title]']);
$this->assertNoText($view['block[title]']);
@@ -163,10 +163,10 @@ public function testWizardMixedDefaultOverriddenDisplays() {
$this->drupalPostForm("admin/structure/views/nojs/display/{$view['id']}/block_1/title", $edit, t('Apply'));
$this->drupalPostForm("admin/structure/views/view/{$view['id']}/edit/block_1", [], t('Save'));
$this->drupalGet($view['page[path]']);
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertText($new_default_title);
$this->drupalGet($view['page[feed_properties][path]']);
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertText($new_default_title);
$this->assertNoText($new_block_title);
$this->drupalGet('');
diff --git a/web/core/modules/views_ui/tests/src/Functional/PreviewTest.php b/web/core/modules/views_ui/tests/src/Functional/PreviewTest.php
index f254097f1f..239c08886e 100644
--- a/web/core/modules/views_ui/tests/src/Functional/PreviewTest.php
+++ b/web/core/modules/views_ui/tests/src/Functional/PreviewTest.php
@@ -29,11 +29,11 @@ public function testPreviewContextual() {
$this->resetAll();
$this->drupalGet('admin/structure/views/view/test_preview/edit');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->drupalPostForm(NULL, $edit = [], t('Update preview'));
$elements = $this->xpath('//div[@id="views-live-preview"]//ul[contains(@class, :ul-class)]/li[contains(@class, :li-class)]', [':ul-class' => 'contextual-links', ':li-class' => 'filter-add']);
- $this->assertEqual(count($elements), 1, 'The contextual link to add a new field is shown.');
+ $this->assertCount(1, $elements, 'The contextual link to add a new field is shown.');
$this->drupalPostForm(NULL, $edit = ['view_args' => '100'], t('Update preview'));
@@ -49,24 +49,24 @@ public function testPreviewContextual() {
*/
public function testPreviewUI() {
$this->drupalGet('admin/structure/views/view/test_preview/edit');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->drupalPostForm(NULL, $edit = [], t('Update preview'));
$elements = $this->xpath('//div[@class = "view-content"]/div[contains(@class, views-row)]');
- $this->assertEqual(count($elements), 5);
+ $this->assertCount(5, $elements);
// Filter just the first result.
$this->drupalPostForm(NULL, $edit = ['view_args' => '1'], t('Update preview'));
$elements = $this->xpath('//div[@class = "view-content"]/div[contains(@class, views-row)]');
- $this->assertEqual(count($elements), 1);
+ $this->assertCount(1, $elements);
// Filter for no results.
$this->drupalPostForm(NULL, $edit = ['view_args' => '100'], t('Update preview'));
$elements = $this->xpath('//div[@class = "view-content"]/div[contains(@class, views-row)]');
- $this->assertEqual(count($elements), 0);
+ $this->assertCount(0, $elements);
// Test that area text and exposed filters are present and rendered.
$this->assertFieldByName('id', NULL, 'ID exposed filter field found.');
@@ -87,7 +87,7 @@ public function testPreviewUI() {
$this->clickLink(t('Feed'));
$this->drupalPostForm(NULL, [], t('Update preview'));
$result = $this->xpath('//div[@id="views-live-preview"]/pre');
- $this->assertContains('<title>' . $view['page[title]'] . '</title>', $result[0]->getText(), 'The Feed RSS preview was rendered.');
+ $this->assertStringContainsString('<title>' . $view['page[title]'] . '</title>', $result[0]->getText(), 'The Feed RSS preview was rendered.');
// Test the non-default UI display options.
// Statistics only, no query.
@@ -127,7 +127,7 @@ public function testPreviewUI() {
$this->drupalPostForm("admin/structure/views/nojs/display/test_preview/default/title", $edit = ['title' => 'Double & escaped'], t('Apply'));
$this->drupalPostForm(NULL, [], t('Update preview'));
$elements = $this->xpath('//div[@id="views-live-preview"]/div[contains(@class, views-query-info)]//td[text()=:text]', [':text' => 'Double & escaped']);
- $this->assertEqual(1, count($elements));
+ $this->assertCount(1, $elements);
}
/**
@@ -138,16 +138,16 @@ public function testPreviewAdditionalInfo() {
$this->resetAll();
$this->drupalGet('admin/structure/views/view/test_preview/edit');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->drupalPostForm(NULL, $edit = [], t('Update preview'));
// Check for implementation of hook_views_preview_info_alter().
// @see views_ui_test.module
$elements = $this->xpath('//div[@id="views-live-preview"]/div[contains(@class, views-query-info)]//td[text()=:text]', [':text' => 'Test row count']);
- $this->assertEqual(count($elements), 1, 'Views Query Preview Info area altered.');
+ $this->assertCount(1, $elements, 'Views Query Preview Info area altered.');
// Check that additional assets are attached.
- $this->assertTrue(strpos($this->getDrupalSettings()['ajaxPageState']['libraries'], 'views_ui_test/views_ui_test.test') !== FALSE, 'Attached library found.');
+ $this->assertStringContainsString('views_ui_test/views_ui_test.test', $this->getDrupalSettings()['ajaxPageState']['libraries'], 'Attached library found.');
$this->assertRaw('css/views_ui_test.test.css', 'Attached CSS asset found.');
}
@@ -156,7 +156,7 @@ public function testPreviewAdditionalInfo() {
*/
public function testPreviewError() {
$this->drupalGet('admin/structure/views/view/test_preview_error/edit');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->drupalPostForm(NULL, $edit = [], t('Update preview'));
diff --git a/web/core/modules/views_ui/tests/src/Functional/ReportTest.php b/web/core/modules/views_ui/tests/src/Functional/ReportTest.php
index 5322e01084..7a09118734 100644
--- a/web/core/modules/views_ui/tests/src/Functional/ReportTest.php
+++ b/web/core/modules/views_ui/tests/src/Functional/ReportTest.php
@@ -36,7 +36,7 @@ public function testReport() {
// Test the report page.
$this->drupalGet('admin/reports/views-plugins');
- $this->assertResponse(200, "Views report page exists");
+ $this->assertSession()->statusCodeEquals(200);
}
}
diff --git a/web/core/modules/views_ui/tests/src/Functional/RowUITest.php b/web/core/modules/views_ui/tests/src/Functional/RowUITest.php
index 637bbb576d..53c74ea4dd 100644
--- a/web/core/modules/views_ui/tests/src/Functional/RowUITest.php
+++ b/web/core/modules/views_ui/tests/src/Functional/RowUITest.php
@@ -62,7 +62,7 @@ public function testRowUI() {
$this->drupalPostForm($row_plugin_url, ['row[type]' => 'fields'], 'Apply');
$this->drupalGet($row_plugin_url);
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertFieldByName('row[type]', 'fields', 'Make sure that the fields got saved as used row plugin.');
// Ensure that entity row plugins appear.
diff --git a/web/core/modules/views_ui/tests/src/Functional/SettingsTest.php b/web/core/modules/views_ui/tests/src/Functional/SettingsTest.php
index d5ce503523..955a7c1814 100644
--- a/web/core/modules/views_ui/tests/src/Functional/SettingsTest.php
+++ b/web/core/modules/views_ui/tests/src/Functional/SettingsTest.php
@@ -108,7 +108,7 @@ public function testEditUI() {
$this->drupalPostForm(NULL, [], t('Update preview'));
$xpath = $this->xpath('//div[@class="views-query-info"]/pre');
- $this->assertEqual(count($xpath), 0, 'The views sql is hidden.');
+ $this->assertCount(0, $xpath, 'The views sql is hidden.');
$edit = [
'ui_show_sql_query_enabled' => TRUE,
@@ -120,9 +120,9 @@ public function testEditUI() {
$this->drupalPostForm(NULL, [], t('Update preview'));
$xpath = $this->xpath('//div[@class="views-query-info"]//pre');
- $this->assertEqual(count($xpath), 1, 'The views sql is shown.');
- $this->assertFalse(strpos($xpath[0]->getText(), 'db_condition_placeholder') !== FALSE, 'No placeholders are shown in the views sql.');
- $this->assertTrue(strpos($xpath[0]->getText(), "node_field_data.status = '1'") !== FALSE, 'The placeholders in the views sql is replace by the actual value.');
+ $this->assertCount(1, $xpath, 'The views sql is shown.');
+ $this->assertStringNotContainsString('db_condition_placeholder', $xpath[0]->getText(), 'No placeholders are shown in the views sql.');
+ $this->assertStringContainsString("node_field_data.status = '1'", $xpath[0]->getText(), 'The placeholders in the views sql is replace by the actual value.');
// Test the advanced settings form.
diff --git a/web/core/modules/views_ui/tests/src/Functional/UnsavedPreviewTest.php b/web/core/modules/views_ui/tests/src/Functional/UnsavedPreviewTest.php
index 96c3778446..77bd52b8c5 100644
--- a/web/core/modules/views_ui/tests/src/Functional/UnsavedPreviewTest.php
+++ b/web/core/modules/views_ui/tests/src/Functional/UnsavedPreviewTest.php
@@ -53,29 +53,29 @@ public function testUnsavedPageDisplayPreview() {
}
$this->drupalGet('admin/structure/views/view/content');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->drupalPostForm(NULL, [], t('Add Page'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->drupalGet('admin/structure/views/nojs/display/content/page_2/path');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->drupalPostForm(NULL, ['path' => 'foobarbaz'], t('Apply'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->drupalPostForm(NULL, [], t('Update preview'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertText(t('This display has no path'));
$this->drupalGet('admin/structure/views/view/content/edit/page_2');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->drupalPostForm(NULL, [], t('Save'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->drupalPostForm(NULL, [], t('Update preview'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertLinkByHref('foobarbaz');
}
diff --git a/web/core/modules/views_ui/tests/src/Functional/ViewEditTest.php b/web/core/modules/views_ui/tests/src/Functional/ViewEditTest.php
index 82eec0b60d..c5cef7402c 100644
--- a/web/core/modules/views_ui/tests/src/Functional/ViewEditTest.php
+++ b/web/core/modules/views_ui/tests/src/Functional/ViewEditTest.php
@@ -32,7 +32,7 @@ public function testDeleteLink() {
$this->assertLink(t('Delete view'), 0, 'Ensure that the view delete link appears');
$view = $this->container->get('entity_type.manager')->getStorage('view')->load('test_view');
- $this->assertTrue($view instanceof View);
+ $this->assertInstanceOf(View::class, $view);
$this->clickLink(t('Delete view'));
$this->assertUrl('admin/structure/views/view/test_view/delete');
$this->drupalPostForm(NULL, [], t('Delete'));
@@ -40,7 +40,7 @@ public function testDeleteLink() {
$this->assertUrl('admin/structure/views');
$view = $this->container->get('entity_type.manager')->getStorage('view')->load('test_view');
- $this->assertFalse($view instanceof View);
+ $this->assertNotInstanceOf(View::class, $view);
}
/**
@@ -67,7 +67,7 @@ public function testOtherOptions() {
$displays = $view->get('display');
$this->assertTrue(!empty($displays['test_1']), 'Display data found for new display ID key.');
$this->assertIdentical($displays['test_1']['id'], 'test_1', 'New display ID matches the display ID key.');
- $this->assertFalse(array_key_exists('attachment_1', $displays), 'Old display ID not found.');
+ $this->assertArrayNotHasKey('attachment_1', $displays);
// Set to the same machine name and save the View.
$edit = ['display_id' => 'test_1'];
@@ -77,7 +77,7 @@ public function testOtherOptions() {
// Test the form validation with invalid IDs.
$machine_name_edit_url = 'admin/structure/views/nojs/display/test_view/test_1/display_id';
- $error_text = t('Display name must be letters, numbers, or underscores only.');
+ $error_text = t('Display machine name must contain only lowercase letters, numbers, or underscores.');
// Test that potential invalid display ID requests are detected
try {
@@ -85,7 +85,7 @@ public function testOtherOptions() {
$this->fail('Expected error, when setDisplay() called with invalid display ID');
}
catch (\Exception $e) {
- $this->assertContains('setDisplay() called with invalid display ID "fake_display_name".', $e->getMessage());
+ $this->assertStringContainsString('setDisplay() called with invalid display ID "fake_display_name".', $e->getMessage());
}
$edit = ['display_id' => 'test 1'];
@@ -132,7 +132,7 @@ public function testEditFormLanguageOptions() {
];
foreach ($test_views as $view_name => $display) {
$this->drupalGet('admin/structure/views/view/' . $view_name);
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$langcode_url = 'admin/structure/views/nojs/display/' . $view_name . '/' . $display . '/rendering_language';
$this->assertNoLinkByHref($langcode_url);
$assert_session->linkNotExistsExact(t('@type language selected for page', ['@type' => t('Content')]));
@@ -148,7 +148,7 @@ public function testEditFormLanguageOptions() {
// Language options should now exist with entity language the default.
foreach ($test_views as $view_name => $display) {
$this->drupalGet('admin/structure/views/view/' . $view_name);
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$langcode_url = 'admin/structure/views/nojs/display/' . $view_name . '/' . $display . '/rendering_language';
if ($view_name == 'test_view') {
$this->assertNoLinkByHref($langcode_url);
@@ -162,7 +162,7 @@ public function testEditFormLanguageOptions() {
}
$this->drupalGet($langcode_url);
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
if ($view_name == 'test_view') {
$this->assertText(t('The view is not based on a translatable entity type or the site is not multilingual.'));
}
@@ -218,7 +218,7 @@ public function testEditFormLanguageOptions() {
// Check the order for the langcode filter.
$langcode_url = 'admin/structure/views/nojs/handler/' . $view_name . '/' . $display . '/filter/langcode';
$this->drupalGet($langcode_url);
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$expected_elements = [
'all',
diff --git a/web/core/modules/views_ui/tests/src/Functional/ViewsListTest.php b/web/core/modules/views_ui/tests/src/Functional/ViewsListTest.php
index 80ac1b8d00..d5ac50f793 100644
--- a/web/core/modules/views_ui/tests/src/Functional/ViewsListTest.php
+++ b/web/core/modules/views_ui/tests/src/Functional/ViewsListTest.php
@@ -49,9 +49,16 @@ protected function setUp($import_test_views = TRUE) {
public function testViewsListLimit() {
// Check if we can access the main views admin page.
$this->drupalGet('admin/structure/views');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertLink(t('Add view'));
+ // Check that there is a link to the content view without a destination
+ // parameter.
+ $this->drupalGet('admin/structure/views');
+ $links = $this->getSession()->getPage()->findAll('xpath', "//a[contains(@href, 'admin/structure/views/view/content')]");
+ $this->assertStringEndsWith('admin/structure/views/view/content', $links[0]->getAttribute('href'));
+ $this->assertLinkByHref('admin/structure/views/view/content/delete?destination');
+
// Count default views to be subtracted from the limit.
$views = count(Views::getEnabledViews());
diff --git a/web/core/modules/views_ui/tests/src/FunctionalJavascript/FilterOptionsTest.php b/web/core/modules/views_ui/tests/src/FunctionalJavascript/FilterOptionsTest.php
index 69c9021e17..4683ee6f79 100644
--- a/web/core/modules/views_ui/tests/src/FunctionalJavascript/FilterOptionsTest.php
+++ b/web/core/modules/views_ui/tests/src/FunctionalJavascript/FilterOptionsTest.php
@@ -14,7 +14,12 @@ class FilterOptionsTest extends WebDriverTestBase {
/**
* {@inheritdoc}
*/
- public static $modules = ['node', 'views', 'views_ui', 'views_ui_test_field'];
+ public static $modules = [
+ 'node',
+ 'views',
+ 'views_ui',
+ 'views_ui_test_field',
+ ];
/**
* {@inheritdoc}
diff --git a/web/core/modules/views_ui/tests/src/FunctionalJavascript/PreviewTest.php b/web/core/modules/views_ui/tests/src/FunctionalJavascript/PreviewTest.php
index d426bc1036..9ebd947834 100644
--- a/web/core/modules/views_ui/tests/src/FunctionalJavascript/PreviewTest.php
+++ b/web/core/modules/views_ui/tests/src/FunctionalJavascript/PreviewTest.php
@@ -303,7 +303,7 @@ protected function assertClass(NodeElement $element, $class, $message = NULL) {
if (!isset($message)) {
$message = "Class .$class found.";
}
- $this->assertTrue(strpos($element->getAttribute('class'), $class) !== FALSE, $message);
+ $this->assertStringContainsString($class, $element->getAttribute('class'), $message);
}
}
diff --git a/web/core/modules/views_ui/tests/src/Kernel/TagTest.php b/web/core/modules/views_ui/tests/src/Kernel/TagTest.php
index b54ce0617e..6376874b4a 100644
--- a/web/core/modules/views_ui/tests/src/Kernel/TagTest.php
+++ b/web/core/modules/views_ui/tests/src/Kernel/TagTest.php
@@ -2,7 +2,6 @@
namespace Drupal\Tests\views_ui\Kernel;
-use Drupal\Component\Render\FormattableMarkup;
use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
use Drupal\views_ui\Controller\ViewsUIController;
use Drupal\Component\Utility\Html;
@@ -43,30 +42,30 @@ public function testViewsUiAutocompleteTag() {
$request->query->set('q', 'autocomplete_tag_test');
$result = $controller->autocompleteTag($request);
$matches = (array) json_decode($result->getContent(), TRUE);
- $this->assertEqual(count($matches), 10, 'Make sure the maximum amount of tag results is 10.');
+ $this->assertCount(10, $matches, 'Make sure the maximum amount of tag results is 10.');
// Make sure the returned array has the proper format.
$suggestions = array_map(function ($tag) {
return ['value' => $tag, 'label' => Html::escape($tag)];
}, $tags);
foreach ($matches as $match) {
- $this->assertTrue(in_array($match, $suggestions), 'Make sure the returned array has the proper format.');
+ $this->assertContains($match, $suggestions, 'Make sure the returned array has the proper format.');
}
// Make sure that matching by a certain prefix works.
$request->query->set('q', 'autocomplete_tag_test_even');
$result = $controller->autocompleteTag($request);
$matches = (array) json_decode($result->getContent(), TRUE);
- $this->assertEqual(count($matches), 8, 'Make sure that only a subset is returned.');
+ $this->assertCount(8, $matches, 'Make sure that only a subset is returned.');
foreach ($matches as $tag) {
- $this->assertTrue(array_search($tag['value'], $tags) !== FALSE, new FormattableMarkup('Make sure the returned tag @tag actually exists.', ['@tag' => $tag['value']]));
+ $this->assertContains($tag['value'], $tags);
}
// Make sure an invalid result doesn't return anything.
$request->query->set('q', $this->randomMachineName());
$result = $controller->autocompleteTag($request);
$matches = (array) json_decode($result->getContent());
- $this->assertEqual(count($matches), 0, "Make sure an invalid tag doesn't return anything.");
+ $this->assertCount(0, $matches, "Make sure an invalid tag doesn't return anything.");
}
}
diff --git a/web/core/modules/views_ui/tests/src/Unit/ViewUIObjectTest.php b/web/core/modules/views_ui/tests/src/Unit/ViewUIObjectTest.php
index cf729027e8..f0e6442503 100644
--- a/web/core/modules/views_ui/tests/src/Unit/ViewUIObjectTest.php
+++ b/web/core/modules/views_ui/tests/src/Unit/ViewUIObjectTest.php
@@ -181,7 +181,7 @@ public function testSerialization() {
$serialized = serialize($view_ui);
// Make sure the ViewExecutable class is not found in the serialized string.
- $this->assertSame(strpos($serialized, '"Drupal\views\ViewExecutable"'), FALSE);
+ $this->assertStringNotContainsString('"Drupal\views\ViewExecutable"', $serialized);
$unserialized = unserialize($serialized);
$this->assertInstanceOf('Drupal\views_ui\ViewUI', $unserialized);
diff --git a/web/core/modules/views_ui/views_ui.api.php b/web/core/modules/views_ui/views_ui.api.php
index b220fb2cc2..d623fd4f4c 100644
--- a/web/core/modules/views_ui/views_ui.api.php
+++ b/web/core/modules/views_ui/views_ui.api.php
@@ -54,6 +54,27 @@ function hook_views_ui_display_tab_alter(&$build, \Drupal\views_ui\ViewUI $view,
$build['custom']['#markup'] = 'This text should always appear';
}
+/**
+ * Alter the links displayed at the top of the view edit form.
+ *
+ * @param array $links
+ * A renderable array of links which will be displayed at the top of the
+ * view edit form. Each entry will be in a form suitable for
+ * '#theme' => 'links'.
+ * @param \Drupal\views\ViewExecutable $view
+ * The view object being edited.
+ * @param string $display_id
+ * The ID of the display being edited, e.g. 'default' or 'page_1'.
+ *
+ * @see \Drupal\views_ui\ViewUI::renderDisplayTop()
+ */
+function hook_views_ui_display_top_links_alter(array &$links, ViewExecutable $view, $display_id) {
+ // Put the export link first in the list.
+ if (isset($links['export'])) {
+ $links = ['export' => $links['export']] + $links;
+ }
+}
+
/**
* @} End of "addtogroup hooks".
*/
diff --git a/web/core/modules/views_ui/views_ui.info.yml b/web/core/modules/views_ui/views_ui.info.yml
index b79eec4a18..e57b9b0527 100644
--- a/web/core/modules/views_ui/views_ui.info.yml
+++ b/web/core/modules/views_ui/views_ui.info.yml
@@ -1,6 +1,6 @@
name: 'Views UI'
type: module
-description: 'Administrative interface for Views.'
+description: 'Provides a user interface for creating and managing views.'
package: Core
version: VERSION
core: 8.x
diff --git a/web/core/modules/views_ui/views_ui.theme.inc b/web/core/modules/views_ui/views_ui.theme.inc
index 69eff489fc..153d3d3544 100644
--- a/web/core/modules/views_ui/views_ui.theme.inc
+++ b/web/core/modules/views_ui/views_ui.theme.inc
@@ -495,40 +495,49 @@ function template_preprocess_views_ui_view_preview_section(&$variables) {
$variables['title'] = t('Title');
$links = views_ui_view_preview_section_display_category_links($variables['view'], 'title', $variables['title']);
break;
+
case 'header':
$variables['title'] = t('Header');
$links = views_ui_view_preview_section_handler_links($variables['view'], $variables['section']);
break;
+
case 'empty':
$variables['title'] = t('No results behavior');
$links = views_ui_view_preview_section_handler_links($variables['view'], $variables['section']);
break;
+
case 'exposed':
// @todo Sorts can be exposed too, so we may need a better title.
$variables['title'] = t('Exposed Filters');
$links = views_ui_view_preview_section_display_category_links($variables['view'], 'exposed_form_options', $variables['title']);
break;
+
case 'rows':
// @todo The title needs to depend on what is being viewed.
$variables['title'] = t('Content');
$links = views_ui_view_preview_section_rows_links($variables['view']);
break;
+
case 'pager':
$variables['title'] = t('Pager');
$links = views_ui_view_preview_section_display_category_links($variables['view'], 'pager_options', $variables['title']);
break;
+
case 'more':
$variables['title'] = t('More');
$links = views_ui_view_preview_section_display_category_links($variables['view'], 'use_more', $variables['title']);
break;
+
case 'footer':
$variables['title'] = t('Footer');
$links = views_ui_view_preview_section_handler_links($variables['view'], $variables['section']);
break;
+
case 'attachment_before':
// @todo: Add links to the attachment configuration page.
$variables['title'] = t('Attachment before');
break;
+
case 'attachment_after':
// @todo: Add links to the attachment configuration page.
$variables['title'] = t('Attachment after');
diff --git a/web/core/modules/workflows/src/Form/WorkflowEditForm.php b/web/core/modules/workflows/src/Form/WorkflowEditForm.php
index 0f783f4c04..3a70b5e150 100644
--- a/web/core/modules/workflows/src/Form/WorkflowEditForm.php
+++ b/web/core/modules/workflows/src/Form/WorkflowEditForm.php
@@ -120,7 +120,7 @@ public function form(array $form, FormStateInterface $form_state) {
];
if ($this->entity->access('delete-state:' . $state->id())) {
$links['delete'] = [
- 'title' => t('Delete'),
+ 'title' => $this->t('Delete'),
'url' => Url::fromRoute('entity.workflow.delete_state_form', [
'workflow' => $workflow->id(),
'workflow_state' => $state->id(),
@@ -133,7 +133,7 @@ public function form(array $form, FormStateInterface $form_state) {
'#weight' => $state->weight(),
'weight' => [
'#type' => 'weight',
- '#title' => t('Weight for @title', ['@title' => $state->label()]),
+ '#title' => $this->t('Weight for @title', ['@title' => $state->label()]),
'#title_display' => 'invisible',
'#default_value' => $state->weight(),
'#attributes' => ['class' => ['state-weight']],
@@ -183,7 +183,7 @@ public function form(array $form, FormStateInterface $form_state) {
'url' => Url::fromRoute('entity.workflow.edit_transition_form', ['workflow' => $workflow->id(), 'workflow_transition' => $transition->id()]),
];
$links['delete'] = [
- 'title' => t('Delete'),
+ 'title' => $this->t('Delete'),
'url' => Url::fromRoute('entity.workflow.delete_transition_form', ['workflow' => $workflow->id(), 'workflow_transition' => $transition->id()]),
];
$form['transitions_container']['transitions'][$transition->id()] = [
@@ -192,7 +192,7 @@ public function form(array $form, FormStateInterface $form_state) {
'#weight' => $transition->weight(),
'weight' => [
'#type' => 'weight',
- '#title' => t('Weight for @title', ['@title' => $transition->label()]),
+ '#title' => $this->t('Weight for @title', ['@title' => $transition->label()]),
'#title_display' => 'invisible',
'#default_value' => $transition->weight(),
'#attributes' => ['class' => ['transition-weight']],
diff --git a/web/core/modules/workflows/src/Form/WorkflowStateEditForm.php b/web/core/modules/workflows/src/Form/WorkflowStateEditForm.php
index 0ecc3cde6b..d0a1960908 100644
--- a/web/core/modules/workflows/src/Form/WorkflowStateEditForm.php
+++ b/web/core/modules/workflows/src/Form/WorkflowStateEditForm.php
@@ -125,7 +125,7 @@ public function form(array $form, FormStateInterface $form_state) {
]),
];
$links['delete'] = [
- 'title' => t('Delete'),
+ 'title' => $this->t('Delete'),
'url' => Url::fromRoute('entity.workflow.delete_transition_form', [
'workflow' => $workflow->id(),
'workflow_transition' => $transition->id(),
diff --git a/web/core/modules/workflows/src/WorkflowDeleteAccessCheck.php b/web/core/modules/workflows/src/WorkflowDeleteAccessCheck.php
index a93e0eb376..7ec66e0772 100644
--- a/web/core/modules/workflows/src/WorkflowDeleteAccessCheck.php
+++ b/web/core/modules/workflows/src/WorkflowDeleteAccessCheck.php
@@ -11,10 +11,8 @@
* @internal
* Marked as internal for use by the workflows module only.
*
- * @deprecated
- * Using the _workflow_state_delete_access check is deprecated in Drupal 8.6.0
- * and will be removed before Drupal 9.0.0, you can use _workflow_access in
- * route definitions instead.
+ * This is deprecated in drupal:8.6.0 and is removed from drupal:9.0.0.
+ * Use _workflow_access in route definitions instead.
* @code
* # The old approach:
* requirements:
diff --git a/web/core/modules/workflows/tests/src/Kernel/WorkflowDependenciesTest.php b/web/core/modules/workflows/tests/src/Kernel/WorkflowDependenciesTest.php
index c1070dc53c..96238adeeb 100644
--- a/web/core/modules/workflows/tests/src/Kernel/WorkflowDependenciesTest.php
+++ b/web/core/modules/workflows/tests/src/Kernel/WorkflowDependenciesTest.php
@@ -17,7 +17,12 @@ class WorkflowDependenciesTest extends KernelTestBase {
/**
* {@inheritdoc}
*/
- public static $modules = ['system', 'workflows', 'workflow_type_test', 'workflow_third_party_settings_test'];
+ public static $modules = [
+ 'system',
+ 'workflows',
+ 'workflow_type_test',
+ 'workflow_third_party_settings_test',
+ ];
/**
* Tests \Drupal\workflows\Entity\Workflow::onDependencyRemoval().
diff --git a/web/core/modules/workspaces/src/EntityQuery/Query.php b/web/core/modules/workspaces/src/EntityQuery/Query.php
index 471c1d87a4..ebc92c6f9d 100644
--- a/web/core/modules/workspaces/src/EntityQuery/Query.php
+++ b/web/core/modules/workspaces/src/EntityQuery/Query.php
@@ -20,7 +20,7 @@ public function prepare() {
$this->traitPrepare();
// If the prepare() method from the trait decided that we need to alter this
- // query, we need to re-define the the key fields for fetchAllKeyed() as SQL
+ // query, we need to re-define the key fields for fetchAllKeyed() as SQL
// expressions.
if ($this->sqlQuery->getMetaData('active_workspace_id')) {
$id_field = $this->entityType->getKey('id');
diff --git a/web/core/modules/workspaces/src/ViewsQueryAlter.php b/web/core/modules/workspaces/src/ViewsQueryAlter.php
index a6e4e0d528..485f51a81e 100644
--- a/web/core/modules/workspaces/src/ViewsQueryAlter.php
+++ b/web/core/modules/workspaces/src/ViewsQueryAlter.php
@@ -187,8 +187,7 @@ protected function alterQueryForEntityType(Sql $query, EntityTypeInterface $enti
// Update the join to use our COALESCE.
$revision_field = $entity_type->getKey('revision');
- $table_info['join']->leftTable = NULL;
- $table_info['join']->leftField = "COALESCE($workspace_association_table.target_entity_revision_id, $relationship.$revision_field)";
+ $table_info['join']->leftFormula = "COALESCE($workspace_association_table.target_entity_revision_id, $relationship.$revision_field)";
// Update the join and the table info to our new table name, and to join
// on the revision key.
diff --git a/web/core/modules/workspaces/tests/src/Functional/EntityResource/WorkspaceResourceTestBase.php b/web/core/modules/workspaces/tests/src/Functional/EntityResource/WorkspaceResourceTestBase.php
index 3767a62961..31c670d703 100644
--- a/web/core/modules/workspaces/tests/src/Functional/EntityResource/WorkspaceResourceTestBase.php
+++ b/web/core/modules/workspaces/tests/src/Functional/EntityResource/WorkspaceResourceTestBase.php
@@ -49,12 +49,15 @@ protected function setUpAuthorization($method) {
case 'GET':
$this->grantPermissionsToTestedRole(['view any workspace']);
break;
+
case 'POST':
$this->grantPermissionsToTestedRole(['create workspace']);
break;
+
case 'PATCH':
$this->grantPermissionsToTestedRole(['edit any workspace']);
break;
+
case 'DELETE':
$this->grantPermissionsToTestedRole(['delete any workspace']);
break;
@@ -180,16 +183,16 @@ protected function getExpectedUnauthorizedAccessMessage($method) {
switch ($method) {
case 'GET':
return "The 'view any workspace' permission is required.";
- break;
+
case 'POST':
return "The 'create workspace' permission is required.";
- break;
+
case 'PATCH':
return "The 'edit any workspace' permission is required.";
- break;
+
case 'DELETE':
return "The 'delete any workspace' permission is required.";
- break;
+
}
return parent::getExpectedUnauthorizedAccessMessage($method);
}
diff --git a/web/core/modules/workspaces/tests/src/Functional/PathWorkspacesTest.php b/web/core/modules/workspaces/tests/src/Functional/PathWorkspacesTest.php
index 1787815b1f..88f63332f2 100644
--- a/web/core/modules/workspaces/tests/src/Functional/PathWorkspacesTest.php
+++ b/web/core/modules/workspaces/tests/src/Functional/PathWorkspacesTest.php
@@ -19,7 +19,13 @@ class PathWorkspacesTest extends BrowserTestBase {
/**
* {@inheritdoc}
*/
- protected static $modules = ['block', 'content_translation', 'node', 'path', 'workspaces'];
+ protected static $modules = [
+ 'block',
+ 'content_translation',
+ 'node',
+ 'path',
+ 'workspaces',
+ ];
/**
* {@inheritdoc}
diff --git a/web/core/modules/workspaces/tests/src/Functional/Update/WorkspacesUpdateTest.php b/web/core/modules/workspaces/tests/src/Functional/Update/WorkspacesUpdateTest.php
index abc1869ef7..bdf7326f9d 100644
--- a/web/core/modules/workspaces/tests/src/Functional/Update/WorkspacesUpdateTest.php
+++ b/web/core/modules/workspaces/tests/src/Functional/Update/WorkspacesUpdateTest.php
@@ -127,28 +127,6 @@ public function testWorkspaceParentField() {
$this->assertNull($form_display->getComponent('parent'));
}
- /**
- * Tests that there is no active workspace during database updates.
- */
- public function testActiveWorkspaceDuringUpdate() {
- /** @var \Drupal\workspaces\WorkspaceManagerInterface $workspace_manager */
- $workspace_manager = \Drupal::service('workspaces.manager');
-
- // Check that we have an active workspace before running the updates.
- $this->assertTrue($workspace_manager->hasActiveWorkspace());
- $this->assertEquals('test', $workspace_manager->getActiveWorkspace()->id());
-
- $this->runUpdates();
-
- // Check that we didn't have an active workspace while running the updates.
- // @see workspace_update_test_post_update_check_active_workspace()
- $this->assertFalse(\Drupal::state()->get('workspace_update_test.has_active_workspace'));
-
- // Check that we have an active workspace after running the updates.
- $this->assertTrue($workspace_manager->hasActiveWorkspace());
- $this->assertEquals('test', $workspace_manager->getActiveWorkspace()->id());
- }
-
/**
* {@inheritdoc}
*/
diff --git a/web/core/modules/workspaces/tests/src/Functional/UpdateSystem/ActiveWorkspaceUpdateTest.php b/web/core/modules/workspaces/tests/src/Functional/UpdateSystem/ActiveWorkspaceUpdateTest.php
new file mode 100644
index 0000000000..98cc5a3bfe
--- /dev/null
+++ b/web/core/modules/workspaces/tests/src/Functional/UpdateSystem/ActiveWorkspaceUpdateTest.php
@@ -0,0 +1,63 @@
+<?php
+
+namespace Drupal\Tests\workspaces\Functional\UpdateSystem;
+
+use Drupal\Tests\BrowserTestBase;
+use Drupal\Tests\UpdatePathTestTrait;
+
+/**
+ * Tests that there is no active workspace during database updates.
+ *
+ * @group workspaces
+ * @group Update
+ */
+class ActiveWorkspaceUpdateTest extends BrowserTestBase {
+ use UpdatePathTestTrait;
+
+ /**
+ * {@inheritdoc}
+ */
+ protected static $modules = ['workspaces', 'workspace_update_test'];
+
+ /**
+ * {@inheritdoc}
+ */
+ protected $defaultTheme = 'stark';
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function setUp() {
+ parent::setUp();
+ // Ensure the workspace_update_test_post_update_check_active_workspace()
+ // update runs.
+ $existing_updates = \Drupal::keyValue('post_update')->get('existing_updates', []);
+ $index = array_search('workspace_update_test_post_update_check_active_workspace', $existing_updates);
+ unset($existing_updates[$index]);
+ \Drupal::keyValue('post_update')->set('existing_updates', $existing_updates);
+ }
+
+ /**
+ * Tests that there is no active workspace during database updates.
+ */
+ public function testActiveWorkspaceDuringUpdate() {
+ /** @var \Drupal\workspaces\WorkspaceManagerInterface $workspace_manager */
+ $workspace_manager = \Drupal::service('workspaces.manager');
+
+ // Check that we have an active workspace before running the updates.
+ $this->assertTrue($workspace_manager->hasActiveWorkspace());
+ $this->assertEquals('test', $workspace_manager->getActiveWorkspace()->id());
+
+ $this->runUpdates();
+
+ // Check that we didn't have an active workspace while running the updates.
+ // @see workspace_update_test_post_update_check_active_workspace()
+ $this->assertFalse(\Drupal::state()->get('workspace_update_test.has_active_workspace'));
+
+ // Check that we have an active workspace after running the updates.
+ $workspace_manager = \Drupal::service('workspaces.manager');
+ $this->assertTrue($workspace_manager->hasActiveWorkspace());
+ $this->assertEquals('test', $workspace_manager->getActiveWorkspace()->id());
+ }
+
+}
diff --git a/web/core/modules/workspaces/tests/src/Functional/WorkspaceCacheContextTest.php b/web/core/modules/workspaces/tests/src/Functional/WorkspaceCacheContextTest.php
index aabffbb713..2d1ddcb877 100644
--- a/web/core/modules/workspaces/tests/src/Functional/WorkspaceCacheContextTest.php
+++ b/web/core/modules/workspaces/tests/src/Functional/WorkspaceCacheContextTest.php
@@ -54,15 +54,15 @@ public function testWorkspaceCacheContext() {
// Render it so the default cache contexts are applied.
$renderer->renderRoot($build);
- $this->assertTrue(in_array('workspace', $build['#cache']['contexts'], TRUE));
+ $this->assertContains('workspace', $build['#cache']['contexts']);
$cid_parts = array_merge($build['#cache']['keys'], $cache_contexts_manager->convertTokensToKeys($build['#cache']['contexts'])->getKeys());
- $this->assertTrue(in_array('[workspace]=live', $cid_parts, TRUE));
+ $this->assertContains('[workspace]=live', $cid_parts);
// Test that a cache entry is created.
$cid = implode(':', $cid_parts);
$bin = $build['#cache']['bin'];
- $this->assertInstanceOf(\stdClass::class, $this->container->get('cache.' . $bin)->get($cid), 'The entity render element has been cached.');
+ $this->assertInstanceOf(\stdClass::class, $this->container->get('cache.' . $bin)->get($cid));
// Switch to the 'stage' workspace and check that the correct workspace
// cache context is used.
@@ -80,15 +80,15 @@ public function testWorkspaceCacheContext() {
// Render it so the default cache contexts are applied.
$renderer->renderRoot($build);
- $this->assertTrue(in_array('workspace', $build['#cache']['contexts'], TRUE));
+ $this->assertContains('workspace', $build['#cache']['contexts']);
$cid_parts = array_merge($build['#cache']['keys'], $cache_contexts_manager->convertTokensToKeys($build['#cache']['contexts'])->getKeys());
- $this->assertTrue(in_array('[workspace]=stage', $cid_parts, TRUE));
+ $this->assertContains('[workspace]=stage', $cid_parts);
// Test that a cache entry is created.
$cid = implode(':', $cid_parts);
$bin = $build['#cache']['bin'];
- $this->assertInstanceOf(\stdClass::class, $this->container->get('cache.' . $bin)->get($cid), 'The entity render element has been cached.');
+ $this->assertInstanceOf(\stdClass::class, $this->container->get('cache.' . $bin)->get($cid));
}
}
diff --git a/web/core/modules/workspaces/tests/src/FunctionalJavascript/WorkspaceToolbarIntegrationTest.php b/web/core/modules/workspaces/tests/src/FunctionalJavascript/WorkspaceToolbarIntegrationTest.php
index 889f50261a..e8e2c89a88 100644
--- a/web/core/modules/workspaces/tests/src/FunctionalJavascript/WorkspaceToolbarIntegrationTest.php
+++ b/web/core/modules/workspaces/tests/src/FunctionalJavascript/WorkspaceToolbarIntegrationTest.php
@@ -59,7 +59,7 @@ public function testWorkspaceCanvasToggling() {
}
/**
- * Test workspace switch and landing page behaviour.
+ * Test workspace switch and landing page behavior.
*/
public function testWorkspaceSwitch() {
$page = $this->getSession()->getPage();
diff --git a/web/core/modules/workspaces/tests/src/Kernel/WorkspaceIntegrationTest.php b/web/core/modules/workspaces/tests/src/Kernel/WorkspaceIntegrationTest.php
index 6466a80358..9fadc29e85 100644
--- a/web/core/modules/workspaces/tests/src/Kernel/WorkspaceIntegrationTest.php
+++ b/web/core/modules/workspaces/tests/src/Kernel/WorkspaceIntegrationTest.php
@@ -101,8 +101,8 @@ protected function setUp() {
// Create two nodes, a published and an unpublished one, so we can test the
// behavior of the module with default/existing content.
$this->createdTimestamp = \Drupal::time()->getRequestTime();
- $this->nodes[] = $this->createNode(['title' => 'live - 1 - r1 - published', 'created' => $this->createdTimestamp++, 'status' => TRUE]);
- $this->nodes[] = $this->createNode(['title' => 'live - 2 - r2 - unpublished', 'created' => $this->createdTimestamp++, 'status' => FALSE]);
+ $this->nodes[] = $this->createNode(['title' => 'live - 1 - r1 - published', 'body' => 'node 1', 'created' => $this->createdTimestamp++, 'status' => TRUE]);
+ $this->nodes[] = $this->createNode(['title' => 'live - 2 - r2 - unpublished', 'body' => 'node 2', 'created' => $this->createdTimestamp++, 'status' => FALSE]);
$translation = $this->nodes[0]->addTranslation('de');
$translation->setTitle('live - 1 - r1 - published - de');
@@ -794,6 +794,23 @@ protected function assertWorkspaceStatus(array $expected, $entity_type_id) {
$this->assertNoRaw($expected_entity_values[$entity_keys['label']]);
}
}
+
+ // Add a filter on a field that is stored in a dedicated table in order to
+ // test field joins with extra conditions (e.g. 'deleted' and 'langcode').
+ $view->destroy();
+ $view->setDisplay('page_1');
+ $filters = $view->displayHandlers->get('page_1')->getOption('filters');
+ $view->displayHandlers->get('page_1')->overrideOption('filters', $filters + [
+ 'body_value' => [
+ 'id' => 'body_value',
+ 'table' => 'node__body',
+ 'field' => 'body_value',
+ 'operator' => 'not empty',
+ 'plugin_id' => 'string',
+ ],
+ ]);
+ $view->execute();
+ $this->assertIdenticalResultset($view, $expected_frontpage, ['nid' => 'nid']);
}
}
diff --git a/web/core/phpcs.xml.dist b/web/core/phpcs.xml.dist
index 81cd2c369e..645e4e0f2d 100644
--- a/web/core/phpcs.xml.dist
+++ b/web/core/phpcs.xml.dist
@@ -32,6 +32,7 @@
</rule>
<rule ref="Drupal.Classes.ClassCreateInstance"/>
<rule ref="Drupal.Classes.ClassDeclaration"/>
+ <rule ref="Drupal.Classes.ClassFileName"/>
<rule ref="Drupal.Classes.FullyQualifiedNamespace"/>
<rule ref="Drupal.Classes.InterfaceName"/>
<rule ref="Drupal.Classes.UnusedUseStatement"/>
@@ -141,12 +142,12 @@
<rule ref="Drupal.WhiteSpace.ObjectOperatorSpacing"/>
<rule ref="Drupal.WhiteSpace.OpenBracketSpacing"/>
<rule ref="Drupal.WhiteSpace.OpenTagNewline"/>
- <rule ref="Drupal.WhiteSpace.OperatorSpacing"/>
<rule ref="Drupal.WhiteSpace.ScopeClosingBrace"/>
<rule ref="Drupal.WhiteSpace.ScopeIndent"/>
<!-- Drupal Practice sniffs -->
<rule ref="DrupalPractice.Commenting.ExpectedException"/>
+ <rule ref="DrupalPractice.General.ExceptionT"/>
<!-- Generic sniffs -->
<rule ref="Generic.Arrays.DisallowLongArraySyntax"/>
@@ -329,6 +330,11 @@
</properties>
</rule>
<rule ref="Squiz.WhiteSpace.LanguageConstructSpacing" />
+ <rule ref="Squiz.WhiteSpace.OperatorSpacing">
+ <properties>
+ <property name="ignoreNewlines" value="true"/>
+ </properties>
+ </rule>
<rule ref="Squiz.WhiteSpace.SemicolonSpacing"/>
<rule ref="Squiz.WhiteSpace.SuperfluousWhitespace"/>
diff --git a/web/core/profiles/demo_umami/config/install/block.block.umami_page_title.yml b/web/core/profiles/demo_umami/config/install/block.block.umami_page_title.yml
index 174a592d75..4266f111ab 100644
--- a/web/core/profiles/demo_umami/config/install/block.block.umami_page_title.yml
+++ b/web/core/profiles/demo_umami/config/install/block.block.umami_page_title.yml
@@ -1,6 +1,8 @@
langcode: en
status: true
dependencies:
+ module:
+ - system
theme:
- umami
id: umami_page_title
@@ -14,4 +16,9 @@ settings:
label: 'Page title'
provider: core
label_display: '0'
-visibility: { }
+visibility:
+ request_path:
+ id: request_path
+ pages: '<front>'
+ negate: true
+ context_mapping: { }
diff --git a/web/core/profiles/demo_umami/config/install/media.type.remote_video.yml b/web/core/profiles/demo_umami/config/install/media.type.remote_video.yml
index 7b4e5df7b4..f2e7b330ea 100644
--- a/web/core/profiles/demo_umami/config/install/media.type.remote_video.yml
+++ b/web/core/profiles/demo_umami/config/install/media.type.remote_video.yml
@@ -6,7 +6,7 @@ label: 'Remote video'
description: 'A remotely hosted video from YouTube or Vimeo.'
source: 'oembed:video'
queue_thumbnail_downloads: false
-new_revision: false
+new_revision: true
source_configuration:
thumbnails_directory: 'public://oembed_thumbnails'
providers:
diff --git a/web/core/profiles/demo_umami/config/install/views.view.frontpage.yml b/web/core/profiles/demo_umami/config/install/views.view.frontpage.yml
index 5ce9aaf507..86397d039a 100644
--- a/web/core/profiles/demo_umami/config/install/views.view.frontpage.yml
+++ b/web/core/profiles/demo_umami/config/install/views.view.frontpage.yml
@@ -287,7 +287,7 @@ display:
empty: false
tokenize: false
content:
- value: '<h2 class="text-align-center">Explore recipes across every type of occasion, ingredient, and skill level.</h2>'
+ value: '<p class="text-align-center">Explore recipes across every type of occasion, ingredient, and skill level.</p>'
format: full_html
plugin_id: text
footer: { }
@@ -354,6 +354,21 @@ display:
css_class: grid--2
defaults:
css_class: false
+ header: false
+ header:
+ area:
+ id: area
+ table: views
+ field: area
+ relationship: none
+ group_type: group
+ admin_label: ''
+ empty: false
+ tokenize: false
+ content:
+ value: '<p class="text-align-center">Explore recipes across every type of occasion, ingredient, and skill level</p>'
+ format: full_html
+ plugin_id: text
rendering_language: '***LANGUAGE_language_interface***'
display_plugin: page
display_title: Page
diff --git a/web/core/profiles/demo_umami/modules/demo_umami_content/demo_umami_content.install b/web/core/profiles/demo_umami/modules/demo_umami_content/demo_umami_content.install
index 8b94cc82f5..95640955d9 100644
--- a/web/core/profiles/demo_umami/modules/demo_umami_content/demo_umami_content.install
+++ b/web/core/profiles/demo_umami/modules/demo_umami_content/demo_umami_content.install
@@ -10,8 +10,8 @@
/**
* Implements hook_install().
*/
-function demo_umami_content_install() {
- if (!\Drupal::service('config.installer')->isSyncing()) {
+function demo_umami_content_install($is_syncing) {
+ if (!$is_syncing) {
\Drupal::classResolver(InstallHelper::class)->importContent();
}
}
@@ -19,8 +19,8 @@ function demo_umami_content_install() {
/**
* Implements hook_uninstall().
*/
-function demo_umami_content_uninstall() {
- if (!\Drupal::service('config.installer')->isSyncing()) {
+function demo_umami_content_uninstall($is_syncing) {
+ if (!$is_syncing) {
\Drupal::classResolver(InstallHelper::class)->deleteImportedContent();
}
}
diff --git a/web/core/profiles/demo_umami/modules/demo_umami_content/src/InstallHelper.php b/web/core/profiles/demo_umami/modules/demo_umami_content/src/InstallHelper.php
index 6835cc3bd0..4538831bc4 100644
--- a/web/core/profiles/demo_umami/modules/demo_umami_content/src/InstallHelper.php
+++ b/web/core/profiles/demo_umami/modules/demo_umami_content/src/InstallHelper.php
@@ -687,28 +687,36 @@ protected function processContent($bundle_machine_name, array $content, $langcod
case 'recipe':
$structured_content = $this->processRecipe($content, $langcode);
break;
+
case 'article':
$structured_content = $this->processArticle($content, $langcode);
break;
+
case 'page':
$structured_content = $this->processPage($content, $langcode);
break;
+
case 'banner_block':
$structured_content = $this->processBannerBlock($content, $langcode);
break;
+
case 'disclaimer_block':
$structured_content = $this->processDisclaimerBlock($content);
break;
+
case 'footer_promo_block':
$structured_content = $this->processFooterPromoBlock($content, $langcode);
break;
+
case 'image':
$structured_content = $this->processImage($content);
break;
+
case 'recipe_category':
case 'tags':
$structured_content = $this->processTerm($content, $bundle_machine_name);
break;
+
default:
break;
}
diff --git a/web/core/profiles/demo_umami/modules/demo_umami_content/tests/src/Functional/UninstallDefaultContentTest.php b/web/core/profiles/demo_umami/modules/demo_umami_content/tests/src/Functional/UninstallDefaultContentTest.php
index 9f2f50f6d9..3b97c5c33c 100644
--- a/web/core/profiles/demo_umami/modules/demo_umami_content/tests/src/Functional/UninstallDefaultContentTest.php
+++ b/web/core/profiles/demo_umami/modules/demo_umami_content/tests/src/Functional/UninstallDefaultContentTest.php
@@ -90,7 +90,7 @@ protected function assertRecipesImported(EntityStorageInterface $node_storage) {
$nodes = $node_storage->loadByProperties(['title' => 'Gluten free pizza']);
$this->assertCount(1, $nodes);
$node = reset($nodes);
- $this->assertContains('Mix some of the milk and water in a jug', $node->field_recipe_instruction->value);
+ $this->assertStringContainsString('Mix some of the milk and water in a jug', $node->field_recipe_instruction->value);
}
/**
@@ -108,7 +108,7 @@ protected function assertArticlesImported(EntityStorageInterface $node_storage)
$nodes = $node_storage->loadByProperties(['title' => 'The umami guide to our favorite mushrooms']);
$this->assertCount(1, $nodes);
$node = reset($nodes);
- $this->assertContains('One of the best things about mushrooms is their versatility', $node->body->value);
+ $this->assertStringContainsString('One of the best things about mushrooms is their versatility', $node->body->value);
}
/**
diff --git a/web/core/profiles/demo_umami/themes/umami/css/base.css b/web/core/profiles/demo_umami/themes/umami/css/base.css
index 385fe877c4..8d86dc2f82 100644
--- a/web/core/profiles/demo_umami/themes/umami/css/base.css
+++ b/web/core/profiles/demo_umami/themes/umami/css/base.css
@@ -77,7 +77,7 @@ blockquote > * {
line-height: 1.5;
}
blockquote a {
- /* Tweak default link colour to improve contrast for accessibility */
+ /* Tweak default link color to improve contrast for accessibility */
color: #057d6d;
}
blockquote a:hover,
diff --git a/web/core/profiles/demo_umami/themes/umami/css/classy/README.txt b/web/core/profiles/demo_umami/themes/umami/css/classy/README.txt
new file mode 100644
index 0000000000..42514f5f0c
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/css/classy/README.txt
@@ -0,0 +1,12 @@
+WHAT IS THIS DIRECTORY FOR?
+--------------------------------
+This directory is for CSS files previously inherited from the Classy theme.
+
+WHY ARE CLASSY CSS FILES BEING COPIED HERE?
+-------------------------------------------
+Classy will be deprecated during the Drupal 9 lifecycle. To prepare for Classy's
+removal, CSS files that would otherwise be inherited from Classy are copied
+here.
+
+CSS files that differ from the Classy versions should not be placed in this
+directory or any subdirectory.
diff --git a/web/core/profiles/demo_umami/themes/umami/css/classy/components/action-links.css b/web/core/profiles/demo_umami/themes/umami/css/classy/components/action-links.css
new file mode 100644
index 0000000000..274d798e18
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/css/classy/components/action-links.css
@@ -0,0 +1,43 @@
+/**
+ * @file
+ * Styles for link buttons and action links.
+ */
+
+.action-links {
+ margin: 1em 0;
+ padding: 0;
+ list-style: none;
+}
+[dir="rtl"] .action-links {
+ /* This is required to win over specificity of [dir="rtl"] ul */
+ margin-right: 0;
+}
+.action-links li {
+ display: inline-block;
+ margin: 0 0.3em;
+}
+.action-links li:first-child {
+ margin-left: 0; /* LTR */
+}
+[dir="rtl"] .action-links li:first-child {
+ margin-right: 0;
+ margin-left: 0.3em;
+}
+.button-action {
+ display: inline-block;
+ padding: 0.2em 0.5em 0.3em;
+ text-decoration: none;
+ line-height: 160%;
+}
+.button-action:before {
+ margin-left: -0.1em; /* LTR */
+ padding-right: 0.2em; /* LTR */
+ content: "+";
+ font-weight: 900;
+}
+[dir="rtl"] .button-action:before {
+ margin-right: -0.1em;
+ margin-left: 0;
+ padding-right: 0;
+ padding-left: 0.2em;
+}
diff --git a/web/core/profiles/demo_umami/themes/umami/css/classy/components/book-navigation.css b/web/core/profiles/demo_umami/themes/umami/css/classy/components/book-navigation.css
new file mode 100644
index 0000000000..08728e27b5
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/css/classy/components/book-navigation.css
@@ -0,0 +1,40 @@
+/**
+ * @file
+ * Styling for the Book module.
+ */
+
+.book-navigation .menu {
+ padding-top: 1em;
+ padding-bottom: 0;
+}
+.book-navigation .book-pager {
+ overflow: auto;
+ margin: 0;
+ padding: 0.5em 0;
+}
+.book-pager__item {
+ display: inline-block;
+ list-style-type: none;
+ vertical-align: top;
+}
+.book-pager__item--previous {
+ width: 45%;
+ text-align: left; /* LTR */
+}
+[dir="rtl"] .book-pager__item--previous {
+ float: right;
+ text-align: right;
+}
+.book-pager__item--center {
+ width: 8%;
+ text-align: center;
+}
+.book-pager__item--next {
+ float: right; /* LTR */
+ width: 45%;
+ text-align: right; /* LTR */
+}
+[dir="rtl"] .book-pager__item--next {
+ float: left;
+ text-align: left;
+}
diff --git a/web/core/profiles/demo_umami/themes/umami/css/classy/components/breadcrumb.css b/web/core/profiles/demo_umami/themes/umami/css/classy/components/breadcrumb.css
new file mode 100644
index 0000000000..1e6a7fac71
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/css/classy/components/breadcrumb.css
@@ -0,0 +1,29 @@
+/**
+ * @file
+ * Styles for breadcrumbs.
+ */
+
+.breadcrumb {
+ padding-bottom: 0.5em;
+}
+.breadcrumb ol {
+ margin: 0;
+ padding: 0;
+}
+[dir="rtl"] .breadcrumb ol {
+ /* This is required to win over specificity of [dir="rtl"] ol */
+ margin-right: 0;
+}
+.breadcrumb li {
+ display: inline;
+ margin: 0;
+ padding: 0;
+ list-style-type: none;
+}
+/* IE8 does not support :not() and :last-child. */
+.breadcrumb li:before {
+ content: " \BB ";
+}
+.breadcrumb li:first-child:before {
+ content: none;
+}
diff --git a/web/core/profiles/demo_umami/themes/umami/css/classy/components/button.css b/web/core/profiles/demo_umami/themes/umami/css/classy/components/button.css
new file mode 100644
index 0000000000..5eb4f1ac13
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/css/classy/components/button.css
@@ -0,0 +1,15 @@
+/**
+ * @file
+ * Visual styles for buttons.
+ */
+
+.button,
+.image-button {
+ margin-right: 1em;
+ margin-left: 1em;
+}
+.button:first-child,
+.image-button:first-child {
+ margin-right: 0;
+ margin-left: 0;
+}
diff --git a/web/core/profiles/demo_umami/themes/umami/css/classy/components/collapse-processed.css b/web/core/profiles/demo_umami/themes/umami/css/classy/components/collapse-processed.css
new file mode 100644
index 0000000000..16129301c8
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/css/classy/components/collapse-processed.css
@@ -0,0 +1,32 @@
+/**
+ * @file
+ * Visual styles for collapsible fieldsets.
+ */
+
+.collapse-processed > summary {
+ padding-right: 0.5em;
+ padding-left: 0.5em;
+}
+.collapse-processed > summary:before {
+ float: left; /* LTR */
+ width: 1em;
+ height: 1em;
+ content: "";
+ background: url(../../../../../../../misc/menu-expanded.png) 0 100% no-repeat; /* LTR */
+}
+[dir="rtl"] .collapse-processed > summary:before {
+ float: right;
+ background-position: 100% 100%;
+}
+.collapse-processed:not([open]) > summary:before {
+ -ms-transform: rotate(-90deg);
+ -webkit-transform: rotate(-90deg);
+ transform: rotate(-90deg);
+ background-position: 25% 35%; /* LTR */
+}
+[dir="rtl"] .collapse-processed:not([open]) > summary:before {
+ -ms-transform: rotate(90deg);
+ -webkit-transform: rotate(90deg);
+ transform: rotate(90deg);
+ background-position: 75% 35%;
+}
diff --git a/web/core/profiles/demo_umami/themes/umami/css/classy/components/container-inline.css b/web/core/profiles/demo_umami/themes/umami/css/classy/components/container-inline.css
new file mode 100644
index 0000000000..64b78f683b
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/css/classy/components/container-inline.css
@@ -0,0 +1,22 @@
+/**
+ * @file
+ * Inline items.
+ */
+
+.container-inline label:after,
+.container-inline .label:after {
+ content: ":";
+}
+.form-type-radios .container-inline label:after,
+.form-type-checkboxes .container-inline label:after {
+ content: "";
+}
+.form-type-radios .container-inline .form-type-radio,
+.form-type-checkboxes .container-inline .form-type-checkbox {
+ margin: 0 1em;
+}
+.container-inline .form-actions,
+.container-inline.form-actions {
+ margin-top: 0;
+ margin-bottom: 0;
+}
diff --git a/web/core/profiles/demo_umami/themes/umami/css/classy/components/details.css b/web/core/profiles/demo_umami/themes/umami/css/classy/components/details.css
new file mode 100644
index 0000000000..a546363a29
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/css/classy/components/details.css
@@ -0,0 +1,23 @@
+/**
+ * @file
+ * Collapsible details.
+ *
+ * @see collapse.js
+ * @see http://nicolasgallagher.com/css-background-image-hacks/
+ */
+
+details {
+ margin-top: 1em;
+ margin-bottom: 1em;
+ border: 1px solid #ccc;
+}
+details > .details-wrapper {
+ padding: 0.5em 1.5em;
+}
+/* @todo Regression: The summary of uncollapsible details are no longer
+ vertically aligned with the .details-wrapper in browsers without native
+ details support. */
+summary {
+ padding: 0.2em 0.5em;
+ cursor: pointer;
+}
diff --git a/web/core/profiles/demo_umami/themes/umami/css/classy/components/dialog.css b/web/core/profiles/demo_umami/themes/umami/css/classy/components/dialog.css
new file mode 100644
index 0000000000..c57a667745
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/css/classy/components/dialog.css
@@ -0,0 +1,72 @@
+/**
+ * @file
+ * Presentational styles for Drupal dialogs.
+ */
+
+.ui-dialog {
+ position: absolute;
+ z-index: 1260;
+ overflow: visible;
+ padding: 0;
+ color: #000;
+ border: solid 1px #ccc;
+ background: #fff;
+}
+
+@media all and (max-width: 48em) { /* 768px */
+ .ui-dialog {
+ width: 92% !important;
+ }
+}
+.ui-dialog .ui-dialog-titlebar {
+ border-width: 0 0 1px 0;
+ border-style: solid;
+ border-color: #ccc;
+ border-radius: 0;
+ background: #f3f4ee;
+ font-weight: bold;
+}
+.ui-dialog .ui-dialog-titlebar-close {
+ border: 0;
+ background: none;
+}
+.ui-dialog .ui-dialog-buttonpane {
+ margin-top: 0;
+ padding: 0.3em 1em;
+ border-width: 1px 0 0 0;
+ border-color: #ccc;
+ background: #f3f4ee;
+}
+.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset {
+ margin: 0;
+ padding: 0;
+}
+.ui-dialog .ui-dialog-buttonpane .ui-button-text-only .ui-button-text {
+ padding: 0;
+}
+
+/* Form action buttons are moved in dialogs. Remove empty space. */
+.ui-dialog .ui-dialog-content .form-actions {
+ margin: 0;
+ padding: 0;
+}
+.ui-dialog .ajax-progress-throbber {
+ position: fixed;
+ z-index: 1000;
+ top: 48.5%;
+ /* Can't do center:50% middle: 50%, so approximate it for a typical window size. */
+ left: 49%;
+ width: 24px;
+ height: 24px;
+ padding: 4px;
+ opacity: 0.9;
+ border-radius: 7px;
+ background-color: #232323;
+ background-image: url(../../../../../../../misc/loading-small.gif);
+ background-repeat: no-repeat;
+ background-position: center center;
+}
+.ui-dialog .ajax-progress-throbber .throbber,
+.ui-dialog .ajax-progress-throbber .message {
+ display: none;
+}
diff --git a/web/core/profiles/demo_umami/themes/umami/css/classy/components/dropbutton.css b/web/core/profiles/demo_umami/themes/umami/css/classy/components/dropbutton.css
new file mode 100644
index 0000000000..5e971ba622
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/css/classy/components/dropbutton.css
@@ -0,0 +1,33 @@
+/**
+ * @file
+ * General styles for dropbuttons.
+ */
+
+.js .dropbutton-widget {
+ border: 1px solid #ccc;
+ background-color: white;
+}
+.js .dropbutton-widget:hover {
+ border-color: #b8b8b8;
+}
+.dropbutton .dropbutton-action > * {
+ padding: 0.1em 0.5em;
+ white-space: nowrap;
+}
+.dropbutton .secondary-action {
+ border-top: 1px solid #e8e8e8;
+}
+.dropbutton-multiple .dropbutton {
+ border-right: 1px solid #e8e8e8; /* LTR */
+}
+[dir="rtl"] .dropbutton-multiple .dropbutton {
+ border-right: 0 none;
+ border-left: 1px solid #e8e8e8;
+}
+.dropbutton-multiple .dropbutton .dropbutton-action > * {
+ margin-right: 0.25em; /* LTR */
+}
+[dir="rtl"] .dropbutton-multiple .dropbutton .dropbutton-action > * {
+ margin-right: 0;
+ margin-left: 0.25em;
+}
diff --git a/web/core/profiles/demo_umami/themes/umami/css/classy/components/exposed-filters.css b/web/core/profiles/demo_umami/themes/umami/css/classy/components/exposed-filters.css
new file mode 100644
index 0000000000..b686902ef1
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/css/classy/components/exposed-filters.css
@@ -0,0 +1,46 @@
+/**
+ * @file
+ * Visual styles for exposed filters.
+ */
+
+.exposed-filters .filters {
+ float: left; /* LTR */
+ margin-right: 1em; /* LTR */
+}
+[dir="rtl"] .exposed-filters .filters {
+ float: right;
+ margin-right: 0;
+ margin-left: 1em;
+}
+.exposed-filters .form-item {
+ margin: 0 0 0.1em 0;
+ padding: 0;
+}
+.exposed-filters .form-item label {
+ float: left; /* LTR */
+ width: 10em;
+ font-weight: normal;
+}
+[dir="rtl"] .exposed-filters .form-item label {
+ float: right;
+}
+.exposed-filters .form-select {
+ width: 14em;
+}
+/* Current filters */
+.exposed-filters .current-filters {
+ margin-bottom: 1em;
+}
+.exposed-filters .current-filters .placeholder {
+ font-weight: bold;
+ font-style: normal;
+}
+.exposed-filters .additional-filters {
+ float: left; /* LTR */
+ margin-right: 1em; /* LTR */
+}
+[dir="rtl"] .exposed-filters .additional-filters {
+ float: right;
+ margin-right: 0;
+ margin-left: 1em;
+}
diff --git a/web/core/profiles/demo_umami/themes/umami/css/classy/components/field.css b/web/core/profiles/demo_umami/themes/umami/css/classy/components/field.css
new file mode 100644
index 0000000000..ff7e9ab1fc
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/css/classy/components/field.css
@@ -0,0 +1,25 @@
+/**
+ * @file
+ * Visual styles for fields.
+ */
+
+.field__label {
+ font-weight: bold;
+}
+.field--label-inline .field__label,
+.field--label-inline .field__items {
+ float: left; /* LTR */
+}
+.field--label-inline .field__label,
+.field--label-inline > .field__item,
+.field--label-inline .field__items {
+ padding-right: 0.5em;
+}
+[dir="rtl"] .field--label-inline .field__label,
+[dir="rtl"] .field--label-inline .field__items {
+ padding-right: 0;
+ padding-left: 0.5em;
+}
+.field--label-inline .field__label::after {
+ content: ":";
+}
diff --git a/web/core/profiles/demo_umami/themes/umami/css/classy/components/file.css b/web/core/profiles/demo_umami/themes/umami/css/classy/components/file.css
new file mode 100644
index 0000000000..8637242a54
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/css/classy/components/file.css
@@ -0,0 +1,62 @@
+/**
+ * @file
+ * Default style for file module.
+ */
+
+/* File icons. */
+
+.file {
+ display: inline-block;
+ min-height: 16px;
+ padding-left: 20px; /* LTR */
+ background-repeat: no-repeat;
+ background-position: left center; /* LTR */
+}
+[dir="rtl"] .file {
+ padding-right: 20px;
+ padding-left: inherit;
+ background-position: right center;
+}
+.file--general,
+.file--application-octet-stream {
+ background-image: url(../../../images/classy/icons/application-octet-stream.png);
+}
+.file--package-x-generic {
+ background-image: url(../../../images/classy/icons/package-x-generic.png);
+}
+.file--x-office-spreadsheet {
+ background-image: url(../../../images/classy/icons/x-office-spreadsheet.png);
+}
+.file--x-office-document {
+ background-image: url(../../../images/classy/icons/x-office-document.png);
+}
+.file--x-office-presentation {
+ background-image: url(../../../images/classy/icons/x-office-presentation.png);
+}
+.file--text-x-script {
+ background-image: url(../../../images/classy/icons/text-x-script.png);
+}
+.file--text-html {
+ background-image: url(../../../images/classy/icons/text-html.png);
+}
+.file--text-plain {
+ background-image: url(../../../images/classy/icons/text-plain.png);
+}
+.file--application-pdf {
+ background-image: url(../../../images/classy/icons/application-pdf.png);
+}
+.file--application-x-executable {
+ background-image: url(../../../images/classy/icons/application-x-executable.png);
+}
+.file--audio {
+ background-image: url(../../../images/classy/icons/audio-x-generic.png);
+}
+.file--video {
+ background-image: url(../../../images/classy/icons/video-x-generic.png);
+}
+.file--text {
+ background-image: url(../../../images/classy/icons/text-x-generic.png);
+}
+.file--image {
+ background-image: url(../../../images/classy/icons/image-x-generic.png);
+}
diff --git a/web/core/profiles/demo_umami/themes/umami/css/classy/components/form.css b/web/core/profiles/demo_umami/themes/umami/css/classy/components/form.css
new file mode 100644
index 0000000000..61af1e1849
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/css/classy/components/form.css
@@ -0,0 +1,104 @@
+/**
+ * @file
+ * Visual styles for form components.
+ */
+
+form .field-multiple-table {
+ margin: 0;
+}
+form .field-multiple-table .field-multiple-drag {
+ width: 30px;
+ padding-right: 0; /* LTR */
+}
+[dir="rtl"] form .field-multiple-table .field-multiple-drag {
+ padding-left: 0;
+}
+form .field-multiple-table .field-multiple-drag .tabledrag-handle {
+ padding-right: 0.5em; /* LTR */
+}
+[dir="rtl"] form .field-multiple-table .field-multiple-drag .tabledrag-handle {
+ padding-right: 0;
+ padding-left: 0.5em;
+}
+form .field-add-more-submit {
+ margin: 0.5em 0 0;
+}
+
+/**
+ * Markup generated by Form API.
+ */
+.form-item,
+.form-actions {
+ margin-top: 1em;
+ margin-bottom: 1em;
+}
+tr.odd .form-item,
+tr.even .form-item {
+ margin-top: 0;
+ margin-bottom: 0;
+}
+.form-composite > .fieldset-wrapper > .description,
+.form-item .description {
+ font-size: 0.85em;
+}
+label.option {
+ display: inline;
+ font-weight: normal;
+}
+.form-composite > legend,
+.label {
+ display: inline;
+ margin: 0;
+ padding: 0;
+ font-size: inherit;
+ font-weight: bold;
+}
+.form-checkboxes .form-item,
+.form-radios .form-item {
+ margin-top: 0.4em;
+ margin-bottom: 0.4em;
+}
+.form-type-radio .description,
+.form-type-checkbox .description {
+ margin-left: 2.4em; /* LTR */
+}
+[dir="rtl"] .form-type-radio .description,
+[dir="rtl"] .form-type-checkbox .description {
+ margin-right: 2.4em;
+ margin-left: 0;
+}
+.marker {
+ color: #e00;
+}
+.form-required:after {
+ display: inline-block;
+ width: 6px;
+ height: 6px;
+ margin: 0 0.3em;
+ content: "";
+ vertical-align: super;
+ /* Use a background image to prevent screen readers from announcing the text. */
+ background-image: url(../../../../../../../misc/icons/ee0000/required.svg);
+ background-repeat: no-repeat;
+ background-size: 6px 6px;
+}
+abbr.tabledrag-changed,
+abbr.ajax-changed {
+ border-bottom: none;
+}
+.form-item input.error,
+.form-item textarea.error,
+.form-item select.error {
+ border: 2px solid red;
+}
+
+/* Inline error messages. */
+.form-item--error-message:before {
+ display: inline-block;
+ width: 14px;
+ height: 14px;
+ content: "";
+ vertical-align: sub;
+ background: url(../../../../../../../misc/icons/e32700/error.svg) no-repeat;
+ background-size: contain;
+}
diff --git a/web/core/profiles/demo_umami/themes/umami/css/classy/components/forum.css b/web/core/profiles/demo_umami/themes/umami/css/classy/components/forum.css
new file mode 100644
index 0000000000..c35e3f4411
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/css/classy/components/forum.css
@@ -0,0 +1,46 @@
+/**
+ * @file
+ * Styling for the Forum module.
+ */
+
+.forum__description {
+ margin: 0.5em;
+ font-size: 0.9em;
+}
+.forum__icon {
+ float: left; /* LTR */
+ width: 24px;
+ height: 24px;
+ margin: 0 9px 0 0; /* LTR */
+ background-image: url(../../../images/classy/icons/forum-icons.png);
+ background-repeat: no-repeat;
+}
+[dir="rtl"] .forum__icon {
+ float: right;
+ margin: 0 0 0 9px;
+}
+.forum__title {
+ overflow: hidden;
+}
+.forum .indented {
+ margin-left: 20px; /* LTR */
+}
+[dir="rtl"] .forum .indented {
+ margin-right: 20px;
+ margin-left: 0;
+}
+.forum__topic-status--new {
+ background-position: -24px 0;
+}
+.forum__topic-status--hot {
+ background-position: -48px 0;
+}
+.forum__topic-status--hot-new {
+ background-position: -72px 0;
+}
+.forum__topic-status--sticky {
+ background-position: -96px 0;
+}
+.forum__topic-status--closed {
+ background-position: -120px 0;
+}
diff --git a/web/core/profiles/demo_umami/themes/umami/css/classy/components/icons.css b/web/core/profiles/demo_umami/themes/umami/css/classy/components/icons.css
new file mode 100644
index 0000000000..47aabe3c36
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/css/classy/components/icons.css
@@ -0,0 +1,21 @@
+/**
+ * @file
+ * Visual styles for icons.
+ */
+
+.icon-help {
+ padding: 1px 0 1px 20px; /* LTR */
+ background: url(../../../../../../../misc/help.png) 0 50% no-repeat; /* LTR */
+}
+[dir="rtl"] .icon-help {
+ padding: 1px 20px 1px 0;
+ background-position: 100% 50%;
+}
+.feed-icon {
+ display: block;
+ overflow: hidden;
+ width: 16px;
+ height: 16px;
+ text-indent: -9999px;
+ background: url(../../../../../../../misc/feed.svg) no-repeat;
+}
diff --git a/web/core/profiles/demo_umami/themes/umami/css/classy/components/image-widget.css b/web/core/profiles/demo_umami/themes/umami/css/classy/components/image-widget.css
new file mode 100644
index 0000000000..56777c41ea
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/css/classy/components/image-widget.css
@@ -0,0 +1,33 @@
+/**
+ * @file
+ * Image upload widget.
+ *
+ * This CSS file is not used in this theme (Classy). It was intended to be used,
+ * but due to a bug, Drupal 8 shipped with it not being used. To not break
+ * backwards compatibility, we continue to not load it in Classy. Every
+ * subtheme of Classy is encouraged to use it, by attaching the
+ * classy/image-widget asset library in their image-widget.html.twig file.
+ *
+ * @see core/themes/seven/templates/content-edit/image-widget.html.twig.
+ *
+ * @todo In Drupal 9, let core/themes/classy/templates/content-edit/image-widget.html.twig
+ * attach the classy/image-widget asset library.
+ */
+
+.image-preview {
+ float: left; /* LTR */
+ padding: 0 10px 10px 0; /* LTR */
+}
+[dir="rtl"] .image-preview {
+ float: right;
+ padding: 0 0 10px 10px;
+}
+.image-widget-data {
+ float: left; /* LTR */
+}
+[dir="rtl"] .image-widget-data {
+ float: right;
+}
+.image-widget-data .text-field {
+ width: auto;
+}
diff --git a/web/core/profiles/demo_umami/themes/umami/css/classy/components/inline-form.css b/web/core/profiles/demo_umami/themes/umami/css/classy/components/inline-form.css
new file mode 100644
index 0000000000..b5201a78c9
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/css/classy/components/inline-form.css
@@ -0,0 +1,33 @@
+/**
+ * @file
+ * Visual styles for inline forms.
+ */
+
+.form--inline .form-item {
+ float: left; /* LTR */
+ margin-right: 0.5em; /* LTR */
+}
+[dir="rtl"] .form--inline .form-item {
+ float: right;
+ margin-right: 0;
+ margin-left: 0.5em;
+}
+/* This is required to win over specificity of [dir="rtl"] .form--inline .form-item */
+[dir="rtl"] .views-filterable-options-controls .form-item {
+ margin-right: 2%;
+}
+.form--inline .form-item-separator {
+ margin-top: 2.3em;
+ margin-right: 1em; /* LTR */
+ margin-left: 0.5em; /* LTR */
+}
+[dir="rtl"] .form--inline .form-item-separator {
+ margin-right: 0.5em;
+ margin-left: 1em;
+}
+.form--inline .form-actions {
+ clear: left; /* LTR */
+}
+[dir="rtl"] .form--inline .form-actions {
+ clear: right;
+}
diff --git a/web/core/profiles/demo_umami/themes/umami/css/classy/components/item-list.css b/web/core/profiles/demo_umami/themes/umami/css/classy/components/item-list.css
new file mode 100644
index 0000000000..a8ce5d28a5
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/css/classy/components/item-list.css
@@ -0,0 +1,32 @@
+/**
+ * @file
+ * Visual styles for item list.
+ */
+
+.item-list .title {
+ font-weight: bold;
+}
+.item-list ul {
+ margin: 0 0 0.75em 0;
+ padding: 0;
+}
+.item-list li {
+ margin: 0 0 0.25em 1.5em; /* LTR */
+ padding: 0;
+}
+[dir="rtl"] .item-list li {
+ margin: 0 1.5em 0.25em 0;
+}
+
+/**
+ * Comma separated lists.
+ */
+.item-list--comma-list {
+ display: inline;
+}
+.item-list--comma-list .item-list__comma-list,
+.item-list__comma-list li,
+[dir="rtl"] .item-list--comma-list .item-list__comma-list,
+[dir="rtl"] .item-list__comma-list li {
+ margin: 0;
+}
diff --git a/web/core/profiles/demo_umami/themes/umami/css/classy/components/link.css b/web/core/profiles/demo_umami/themes/umami/css/classy/components/link.css
new file mode 100644
index 0000000000..fa83f2bb2c
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/css/classy/components/link.css
@@ -0,0 +1,16 @@
+/**
+ * @file
+ * Style another element as a link.
+ */
+
+button.link {
+ margin: 0;
+ padding: 0;
+ cursor: pointer;
+ border: 0;
+ background: transparent;
+ font-size: 1em;
+}
+label button.link {
+ font-weight: bold;
+}
diff --git a/web/core/profiles/demo_umami/themes/umami/css/classy/components/links.css b/web/core/profiles/demo_umami/themes/umami/css/classy/components/links.css
new file mode 100644
index 0000000000..e483253933
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/css/classy/components/links.css
@@ -0,0 +1,23 @@
+/**
+ * @file
+ * Visual styles for links.
+ */
+
+ul.inline,
+ul.links.inline {
+ display: inline;
+ padding-left: 0; /* LTR */
+}
+[dir="rtl"] ul.inline,
+[dir="rtl"] ul.links.inline {
+ padding-right: 0;
+ padding-left: 15px;
+}
+ul.inline li {
+ display: inline;
+ padding: 0 0.5em;
+ list-style-type: none;
+}
+ul.links a.is-active {
+ color: #000;
+}
diff --git a/web/core/profiles/demo_umami/themes/umami/css/classy/components/media-embed-error.css b/web/core/profiles/demo_umami/themes/umami/css/classy/components/media-embed-error.css
new file mode 100644
index 0000000000..053c5c80f2
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/css/classy/components/media-embed-error.css
@@ -0,0 +1,20 @@
+/**
+ * @file
+ * Media Embed filter: default styling for media embed errors.
+ */
+
+/**
+ * The caption filter's styling overrides ours, so add a more specific selector
+ * to account for that.
+ */
+.media-embed-error,
+.caption > .media-embed-error {
+ max-width: 200px;
+ padding: 100px 20px 20px;
+ text-align: center;
+ background-color: #ebebeb;
+ background-image: url(../../../../../../../modules/media/images/icons/no-thumbnail.png);
+ background-repeat: no-repeat;
+ background-position: center top;
+ background-size: 100px 100px;
+}
diff --git a/web/core/profiles/demo_umami/themes/umami/css/classy/components/menu.css b/web/core/profiles/demo_umami/themes/umami/css/classy/components/menu.css
new file mode 100644
index 0000000000..7de40f63ad
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/css/classy/components/menu.css
@@ -0,0 +1,34 @@
+/**
+ * @file
+ * Visual styles for menu.
+ */
+
+ul.menu {
+ margin-left: 1em; /* LTR */
+ padding: 0;
+ list-style: none outside;
+ text-align: left; /* LTR */
+}
+[dir="rtl"] ul.menu {
+ margin-right: 1em;
+ margin-left: 0;
+ text-align: right;
+}
+.menu-item--expanded {
+ list-style-type: circle;
+ list-style-image: url(../../../../../../../misc/menu-expanded.png);
+}
+.menu-item--collapsed {
+ list-style-type: disc;
+ list-style-image: url(../../../../../../../misc/menu-collapsed.png); /* LTR */
+}
+[dir="rtl"] .menu-item--collapsed {
+ list-style-image: url(../../../../../../../misc/menu-collapsed-rtl.png);
+}
+.menu-item {
+ margin: 0;
+ padding-top: 0.2em;
+}
+ul.menu a.is-active {
+ color: #000;
+}
diff --git a/web/core/profiles/demo_umami/themes/umami/css/classy/components/more-link.css b/web/core/profiles/demo_umami/themes/umami/css/classy/components/more-link.css
new file mode 100644
index 0000000000..c604061317
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/css/classy/components/more-link.css
@@ -0,0 +1,12 @@
+/**
+ * @file
+ * Markup generated by #type 'more_link'.
+ */
+
+.more-link {
+ display: block;
+ text-align: right; /* LTR */
+}
+[dir="rtl"] .more-link {
+ text-align: left;
+}
diff --git a/web/core/profiles/demo_umami/themes/umami/css/classy/components/node.css b/web/core/profiles/demo_umami/themes/umami/css/classy/components/node.css
new file mode 100644
index 0000000000..6b7cd5257d
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/css/classy/components/node.css
@@ -0,0 +1,8 @@
+/**
+ * @file
+ * Visual styles for nodes.
+ */
+
+.node--unpublished {
+ background-color: #fff4f4;
+}
diff --git a/web/core/profiles/demo_umami/themes/umami/css/classy/components/pager.css b/web/core/profiles/demo_umami/themes/umami/css/classy/components/pager.css
new file mode 100644
index 0000000000..a9471fc037
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/css/classy/components/pager.css
@@ -0,0 +1,16 @@
+/**
+ * @file
+ * Visual styles for pager.
+ */
+
+.pager__items {
+ clear: both;
+ text-align: center;
+}
+.pager__item {
+ display: inline;
+ padding: 0.5em;
+}
+.pager__item.is-active {
+ font-weight: bold;
+}
diff --git a/web/core/profiles/demo_umami/themes/umami/css/classy/components/progress.css b/web/core/profiles/demo_umami/themes/umami/css/classy/components/progress.css
new file mode 100644
index 0000000000..47da889350
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/css/classy/components/progress.css
@@ -0,0 +1,69 @@
+/**
+ * @file
+ * Visual styles for progress bar.
+ *
+ * @see progress.js
+ */
+
+.progress__track {
+ border-color: #b3b3b3;
+ border-radius: 10em;
+ background-color: #f2f1eb;
+ background-image: -webkit-linear-gradient(#e7e7df, #f0f0f0);
+ background-image: linear-gradient(#e7e7df, #f0f0f0);
+ box-shadow: inset 0 1px 3px hsla(0, 0%, 0%, 0.16);
+}
+.progress__bar {
+ height: 16px;
+ margin-top: -1px;
+ margin-left: -1px; /* LTR */
+ padding: 0 1px;
+ -webkit-transition: width 0.5s ease-out;
+ transition: width 0.5s ease-out;
+ -webkit-animation: animate-stripes 3s linear infinite;
+ -moz-animation: animate-stripes 3s linear infinite;
+ border: 1px #07629a solid;
+ border-radius: 10em;
+ background: #057ec9;
+ background-image:
+ -webkit-linear-gradient(top, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.15)),
+ -webkit-linear-gradient(left top, #0094f0 0%, #0094f0 25%, #007ecc 25%, #007ecc 50%, #0094f0 50%, #0094f0 75%, #0094f0 100%);
+ background-image:
+ linear-gradient(to bottom, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.15)),
+ linear-gradient(to right bottom, #0094f0 0%, #0094f0 25%, #007ecc 25%, #007ecc 50%, #0094f0 50%, #0094f0 75%, #0094f0 100%);
+ background-size: 40px 40px;
+}
+[dir="rtl"] .progress__bar {
+ margin-right: -1px;
+ margin-left: 0;
+ -webkit-animation-direction: reverse;
+ -moz-animation-direction: reverse;
+ animation-direction: reverse;
+}
+
+@media screen and (prefers-reduced-motion: reduce) {
+ .progress__bar {
+ -webkit-transition: none;
+ transition: none;
+ -webkit-animation: none;
+ -moz-animation: none;
+ }
+}
+
+/**
+ * Progress bar animations.
+ */
+@-webkit-keyframes animate-stripes {
+ 0% { background-position: 0 0, 0 0; }
+ 100% { background-position: 0 0, -80px 0; }
+}
+
+@-ms-keyframes animate-stripes {
+ 0% { background-position: 0 0, 0 0; }
+ 100% { background-position: 0 0, -80px 0; }
+}
+
+@keyframes animate-stripes {
+ 0% { background-position: 0 0, 0 0; }
+ 100% { background-position: 0 0, -80px 0; }
+}
diff --git a/web/core/profiles/demo_umami/themes/umami/css/classy/components/search-results.css b/web/core/profiles/demo_umami/themes/umami/css/classy/components/search-results.css
new file mode 100644
index 0000000000..343ea8b5fb
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/css/classy/components/search-results.css
@@ -0,0 +1,8 @@
+/**
+ * @file
+ * Stylesheet for results generated by the Search module.
+ */
+
+.search-results {
+ list-style: none;
+}
diff --git a/web/core/profiles/demo_umami/themes/umami/css/classy/components/tabledrag.css b/web/core/profiles/demo_umami/themes/umami/css/classy/components/tabledrag.css
new file mode 100644
index 0000000000..a197b24979
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/css/classy/components/tabledrag.css
@@ -0,0 +1,14 @@
+/**
+ * @file
+ * Visual styles for table drag.
+ */
+
+tr.drag {
+ background-color: #fffff0;
+}
+tr.drag-previous {
+ background-color: #ffd;
+}
+body div.tabledrag-changed-warning {
+ margin-bottom: 0.5em;
+}
diff --git a/web/core/profiles/demo_umami/themes/umami/css/classy/components/tableselect.css b/web/core/profiles/demo_umami/themes/umami/css/classy/components/tableselect.css
new file mode 100644
index 0000000000..fcfb2a5aa4
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/css/classy/components/tableselect.css
@@ -0,0 +1,19 @@
+/**
+ * @file
+ * Table select behavior.
+ *
+ * @see tableselect.js
+ */
+
+tr.selected td {
+ background: #ffc;
+}
+td.checkbox,
+th.checkbox {
+ text-align: center;
+}
+[dir="rtl"] td.checkbox,
+[dir="rtl"] th.checkbox {
+ /* This is required to win over specificity of [dir="rtl"] td */
+ text-align: center;
+}
diff --git a/web/core/profiles/demo_umami/themes/umami/css/classy/components/tablesort.css b/web/core/profiles/demo_umami/themes/umami/css/classy/components/tablesort.css
new file mode 100644
index 0000000000..44e5349404
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/css/classy/components/tablesort.css
@@ -0,0 +1,11 @@
+/**
+ * @file
+ * Table sort indicator.
+ */
+
+th.is-active img {
+ display: inline;
+}
+td.is-active {
+ background-color: #ddd;
+}
diff --git a/web/core/profiles/demo_umami/themes/umami/css/classy/components/tabs.css b/web/core/profiles/demo_umami/themes/umami/css/classy/components/tabs.css
new file mode 100644
index 0000000000..16fb1223f0
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/css/classy/components/tabs.css
@@ -0,0 +1,33 @@
+/**
+ * @file
+ * Visual styles for tabs.
+ */
+
+div.tabs {
+ margin: 1em 0;
+}
+ul.tabs {
+ margin: 0 0 0.5em;
+ padding: 0;
+ list-style: none;
+}
+.tabs > li {
+ display: inline-block;
+ margin-right: 0.3em; /* LTR */
+}
+[dir="rtl"] .tabs > li {
+ margin-right: 0;
+ margin-left: 0.3em;
+}
+.tabs a {
+ display: block;
+ padding: 0.2em 1em;
+ text-decoration: none;
+}
+.tabs a.is-active {
+ background-color: #eee;
+}
+.tabs a:focus,
+.tabs a:hover {
+ background-color: #f5f5f5;
+}
diff --git a/web/core/profiles/demo_umami/themes/umami/css/classy/components/textarea.css b/web/core/profiles/demo_umami/themes/umami/css/classy/components/textarea.css
new file mode 100644
index 0000000000..2661bae9c4
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/css/classy/components/textarea.css
@@ -0,0 +1,11 @@
+/**
+ * @file
+ * Visual styles for a resizable textarea.
+ */
+
+.form-textarea-wrapper textarea {
+ display: block;
+ box-sizing: border-box;
+ width: 100%;
+ margin: 0;
+}
diff --git a/web/core/profiles/demo_umami/themes/umami/css/classy/components/ui-dialog.css b/web/core/profiles/demo_umami/themes/umami/css/classy/components/ui-dialog.css
new file mode 100644
index 0000000000..476c21ffdb
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/css/classy/components/ui-dialog.css
@@ -0,0 +1,15 @@
+/**
+ * @file
+ * Styles for Classy's modal windows.
+ */
+
+.ui-dialog--narrow {
+ max-width: 500px;
+}
+
+@media screen and (max-width: 600px) {
+ .ui-dialog--narrow {
+ min-width: 95%;
+ max-width: 95%;
+ }
+}
diff --git a/web/core/profiles/demo_umami/themes/umami/css/classy/components/user.css b/web/core/profiles/demo_umami/themes/umami/css/classy/components/user.css
new file mode 100644
index 0000000000..8baa8f83a3
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/css/classy/components/user.css
@@ -0,0 +1,66 @@
+/**
+ * @file
+ * Theme styling for user module.
+ */
+
+/* Visual styling for the Password strength indicator */
+.password-strength__meter {
+ margin-top: 0.5em;
+ background-color: #ebeae4;
+}
+.password-strength__indicator {
+ -webkit-transition: width 0.5s ease-out;
+ transition: width 0.5s ease-out;
+ background-color: #77b259;
+}
+.password-strength__indicator.is-weak {
+ background-color: #e62600;
+}
+.password-strength__indicator.is-fair {
+ background-color: #e09600;
+}
+.password-strength__indicator.is-good {
+ background-color: #0074bd;
+}
+.password-strength__indicator.is-strong {
+ background-color: #77b259;
+}
+
+.password-confirm,
+.password-field,
+.password-strength,
+.password-confirm-match {
+ width: 55%;
+}
+
+.password-suggestions {
+ max-width: 34.7em;
+ margin: 0.7em 0;
+ padding: 0.2em 0.5em;
+ border: 1px solid #b4b4b4;
+}
+.password-suggestions ul {
+ margin-bottom: 0;
+}
+
+.confirm-parent,
+.password-parent {
+ clear: left; /* LTR */
+ overflow: hidden;
+ max-width: 33em;
+ margin: 0;
+}
+[dir="rtl"] .confirm-parent,
+[dir="rtl"] .password-parent {
+ clear: right;
+}
+
+/* Styling for the status indicator of the passwords match test. */
+.password-confirm .ok {
+ color: #325e1c;
+ font-weight: bold;
+}
+.password-confirm .error {
+ color: #a51b00;
+ font-weight: bold;
+}
diff --git a/web/core/profiles/demo_umami/themes/umami/css/classy/layout/media-library.css b/web/core/profiles/demo_umami/themes/umami/css/classy/layout/media-library.css
new file mode 100644
index 0000000000..84dee10daa
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/css/classy/layout/media-library.css
@@ -0,0 +1,28 @@
+/**
+ * @file
+ * Contains minimal layout styling for the media library.
+ */
+
+.media-library-wrapper {
+ display: flex;
+}
+
+.media-library-menu {
+ flex-basis: 20%;
+ flex-shrink: 0;
+}
+
+.media-library-content {
+ flex-grow: 1;
+}
+
+.media-library-views-form {
+ display: flex;
+ flex-wrap: wrap;
+}
+
+.media-library-views-form .media-library-item {
+ justify-content: space-between;
+ max-width: 23%;
+ margin: 1%;
+}
diff --git a/web/core/profiles/demo_umami/themes/umami/css/components/views/frontpage.css b/web/core/profiles/demo_umami/themes/umami/css/components/views/frontpage.css
index 9e45137859..3768e9d25c 100644
--- a/web/core/profiles/demo_umami/themes/umami/css/components/views/frontpage.css
+++ b/web/core/profiles/demo_umami/themes/umami/css/components/views/frontpage.css
@@ -4,20 +4,19 @@
*/
.view-frontpage .view-header {
+ margin-top: 2rem;
margin-bottom: 2rem;
padding: 0 1.266rem;
+ font-family: "Scope One", Georgia, serif;
+ font-size: 1.5rem;
+ line-height: 1.2;
}
-
-@media screen and (min-width: 30em) {
+/* Large */
+@media screen and (min-width: 60em) { /* 960px */
.view-frontpage .view-header {
margin-bottom: 3rem;
- }
-}
-
-@media screen and (min-width: 60em) {
- .view-frontpage .view-header {
- margin-bottom: 4rem;
padding-right: 2.37rem;
padding-left: 2.37rem;
+ font-size: 1.77rem;
}
}
diff --git a/web/core/profiles/demo_umami/themes/umami/images/classy/README.txt b/web/core/profiles/demo_umami/themes/umami/images/classy/README.txt
new file mode 100644
index 0000000000..9df44f55ec
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/images/classy/README.txt
@@ -0,0 +1,12 @@
+WHAT IS THIS DIRECTORY FOR?
+--------------------------------
+This directory is for image files previously inherited from the Classy theme.
+
+WHY ARE CLASSY IMAGE FILES BEING COPIED HERE?
+-------------------------------------------
+Classy will be deprecated during the Drupal 9 lifecycle. To prepare for Classy's
+removal, image files that would otherwise be inherited from Classy are copied
+here.
+
+Image files that differ from the Classy versions should not be placed in this
+directory or any subdirectory.
diff --git a/web/core/profiles/demo_umami/themes/umami/images/classy/icons/application-octet-stream.png b/web/core/profiles/demo_umami/themes/umami/images/classy/icons/application-octet-stream.png
new file mode 100644
index 0000000000..d5453217dc
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/images/classy/icons/application-octet-stream.png
@@ -0,0 +1,3 @@
+�PNG
+
+���
IHDR�����������7����tEXtSoftware�Adobe ImageReadyq�e<���_IDAT(S�ͱ �@Dѩ�,�`�42���@����Z���#���d2!�4J�>dt�� `�
,=ޛ���{g8���C �PG(�<�h\���w�)E�o}�^�����IEND�B`�
\ No newline at end of file
diff --git a/web/core/profiles/demo_umami/themes/umami/images/classy/icons/application-pdf.png b/web/core/profiles/demo_umami/themes/umami/images/classy/icons/application-pdf.png
new file mode 100644
index 0000000000..36107d6e80
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/images/classy/icons/application-pdf.png
@@ -0,0 +1,5 @@
+�PNG
+
+���
IHDR��������� ��a��!IDATxڍӱ��0 ��{ Aqs�]��M9p�I��#��� nN.
+..š�"����ic~�渢�\��/%�|�)����, ���{�sO�c ��RI�<"_Z ۶K���=�O-�8�k����z�h���Ff3��� �q\*:�@
���7���#��A�M��� p2y8�N��z=p���[� Av8 A ����Ѩ�%�Z
A��h<F��(���Ձl�W������n��v�r��� ��'@��2�W�_�F�:��_.
+�[-U����gB��ܣ*���()5h �����IEND�B`�
\ No newline at end of file
diff --git a/web/core/profiles/demo_umami/themes/umami/images/classy/icons/application-x-executable.png b/web/core/profiles/demo_umami/themes/umami/images/classy/icons/application-x-executable.png
new file mode 100644
index 0000000000..d5453217dc
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/images/classy/icons/application-x-executable.png
@@ -0,0 +1,3 @@
+�PNG
+
+���
IHDR�����������7����tEXtSoftware�Adobe ImageReadyq�e<���_IDAT(S�ͱ �@Dѩ�,�`�42���@����Z���#���d2!�4J�>dt�� `�
,=ޛ���{g8���C �PG(�<�h\���w�)E�o}�^�����IEND�B`�
\ No newline at end of file
diff --git a/web/core/profiles/demo_umami/themes/umami/images/classy/icons/audio-x-generic.png b/web/core/profiles/demo_umami/themes/umami/images/classy/icons/audio-x-generic.png
new file mode 100644
index 0000000000..28d7f50862
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/images/classy/icons/audio-x-generic.png
@@ -0,0 +1,3 @@
+�PNG
+
+���
IHDR��������� ��a��IDAT8Oc���?����'W1H-L �?�����w ���dC�q��n��� ����8 � <��0��w��~���Z��{���=�������ל��?y_�������W6��ׯ` >_��,6 L��P��0Hq�����N7�?ps����og��?���F#h� �c��a���^$I������V�#���v8���sy�g�����)�������������o�(3���/��i�)�����ۉ����IEND�B`�
\ No newline at end of file
diff --git a/web/core/profiles/demo_umami/themes/umami/images/classy/icons/forum-icons.png b/web/core/profiles/demo_umami/themes/umami/images/classy/icons/forum-icons.png
new file mode 100644
index 0000000000..e291de6725
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/images/classy/icons/forum-icons.png
@@ -0,0 +1,10 @@
+�PNG
+
+���
IHDR����������"{�?��PLTE������������www�����������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������߯����������������������������������������������������������������������������������ۯ�������������������������������������������ד��������������������������������������tP[�����tRNS�
+
+ %***+,..001479=HKMX\ddhiimsvxxxxxxyy{}������������������������������������������������������������������������甐��IDATx^����E�JiS
+-�����/R܊hq�W�P|d�]b������&�����圼���o��*
�mۨt���w?8 ����e��O �ձ����]� ��e���y���E�Y�?�s� �8~@������t�8�A~��� ���?s�$�$����s�c�=z�9s�v+O��mKP�l&��w{���O�<�3I�}tj���̠"�p훼��gM>��0 ��y�F�?����{�;~��mnxcKۏ
+��f9�w�=�uy�y&(�aa ��g� e��f3���) `0h^v���Z��䙠�r�5H�$?.`�q�c�W^(g�!�>3��D�4�����;x��bIv��� ���<�x��Tܻ�Ш=K��M�k �,�q��F������!�#��90&�V��$��ӀP�=�y$hO��>|~Q�qDn�Qd&��cV�W��-�����¥�z�U�q��-�E!�(�Vl�|0b�v� =�8��x0�}�@ �x$>�G/L���"��W�Ϋ~�aE�� �(���4�E|s��<~rC�&�=7ݧl�s@!)<ɿ-�ԓ|=�Ŋ�8��sn��� a �u�r��Ql� Ls��� A�$��ʅ��7�h���t {4�0O���]��j\�� E9���մ� ��0�;�
��߭9y����a0OH���x��Y������4����қ�g��g�懕g��x�#(�9yƣH�sA��� 9��Ȍ�q
+�Þ�B��ѫ�/��U����k�������p(�)C��H.}
+�P-XUO[��O�,f��� @x5�LU�H@)��{�nz��/TU��"��Kf��'��Bc�<
+�q������~Z��˟ߠɷ9遟u]�<��%�>m�En�i�/�{TI?�<'*��K�ޣ �Y�{��ԏT�\�D�:�ˮ�� -�U� �}"�u��߄�{��ӿb�4(Hd2�f���I�Kua�*�[�Aɫu����\�k���}�d��/ݲį��� W ����=8�V��w�R����q�
>��{���I�F�E�2gz��L����IEND�B`�
\ No newline at end of file
diff --git a/web/core/profiles/demo_umami/themes/umami/images/classy/icons/image-x-generic.png b/web/core/profiles/demo_umami/themes/umami/images/classy/icons/image-x-generic.png
new file mode 100644
index 0000000000..c1b814f7cb
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/images/classy/icons/image-x-generic.png
@@ -0,0 +1,6 @@
+�PNG
+
+���
IHDR��������� ��a��HIDATxڕ�=K�P���'�.��Z*����q�N��!�JDGE�YA��IT��`S�4I�QLnm�{��Z�聇��&��K"� $I� �� �D��1۶�p �^2*�S>�o���HϹ���|�/�e:����!�W��b�
+��
+�`�ȏ�א$\P#A���c�� j֚ЄQR0�i�܌����ܒx�-p�I���F��r!#Юk)��-��T�W��iT�i0cvq��:��x�~�+7�we��r1��I/��W���$ ����(�u���e� '��v#���mW��fnV�����\fۢ�0��;G@�
+�A �| �@ F����IEND�B`�
\ No newline at end of file
diff --git a/web/core/profiles/demo_umami/themes/umami/images/classy/icons/package-x-generic.png b/web/core/profiles/demo_umami/themes/umami/images/classy/icons/package-x-generic.png
new file mode 100644
index 0000000000..21fc382cba
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/images/classy/icons/package-x-generic.png
@@ -0,0 +1,4 @@
+�PNG
+
+���
IHDR�����������7����tEXtSoftware�Adobe ImageReadyq�e<����IDAT(S��1�0�|�P�P�D�4��T�H�qPȲ>��c��h��<Y��(
+6**qO�0�'�_���u&�
Q�g�CW�p&[\���3�B{�;-N�BK*6T6���Ł�B��K�Q#Q �ј ����_s=oH�>-�".�;�C����0`"�a2�\�N�{ӆ�i��������IEND�B`�
\ No newline at end of file
diff --git a/web/core/profiles/demo_umami/themes/umami/images/classy/icons/text-html.png b/web/core/profiles/demo_umami/themes/umami/images/classy/icons/text-html.png
new file mode 100644
index 0000000000..9c7c7932c2
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/images/classy/icons/text-html.png
@@ -0,0 +1,7 @@
+�PNG
+
+���
IHDR��������� ��a����IDATxڍ��
+�@�}�ަS��=@��7:G��� �� �w�۲
+��o@��vǁ� f��)�1q �� �s?����Z;��*W��
+PY�I0F�?? 3� �sI t�^AQD��+(�2�.0�0���_� ��ۄ��9�/O� 3��dwD�Ϧi�; ^�7/�W��~�t�"�\ÙW xB]�BP��@)]���m��� ��
+�c�0��������IEND�B`�
\ No newline at end of file
diff --git a/web/core/profiles/demo_umami/themes/umami/images/classy/icons/text-plain.png b/web/core/profiles/demo_umami/themes/umami/images/classy/icons/text-plain.png
new file mode 100644
index 0000000000..06804849b8
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/images/classy/icons/text-plain.png
@@ -0,0 +1,4 @@
+�PNG
+
+���
IHDR�����������7����tEXtSoftware�Adobe ImageReadyq�e<���~IDAT(S��� �0 E3� 8��l���ɋ
+�� �km���<hh��)�@ E���f� #�^)h����"jq�I�Q�u���&0���A� � ��d�J�6t%� ����1r*A�?��?�T��f;�����������IEND�B`�
\ No newline at end of file
diff --git a/web/core/profiles/demo_umami/themes/umami/images/classy/icons/text-x-generic.png b/web/core/profiles/demo_umami/themes/umami/images/classy/icons/text-x-generic.png
new file mode 100644
index 0000000000..06804849b8
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/images/classy/icons/text-x-generic.png
@@ -0,0 +1,4 @@
+�PNG
+
+���
IHDR�����������7����tEXtSoftware�Adobe ImageReadyq�e<���~IDAT(S��� �0 E3� 8��l���ɋ
+�� �km���<hh��)�@ E���f� #�^)h����"jq�I�Q�u���&0���A� � ��d�J�6t%� ����1r*A�?��?�T��f;�����������IEND�B`�
\ No newline at end of file
diff --git a/web/core/profiles/demo_umami/themes/umami/images/classy/icons/text-x-script.png b/web/core/profiles/demo_umami/themes/umami/images/classy/icons/text-x-script.png
new file mode 100644
index 0000000000..f9ecca8138
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/images/classy/icons/text-x-script.png
@@ -0,0 +1,5 @@
+�PNG
+
+���
IHDR��������� ��a����IDATxڝ��
+�@E����U��}@ ?� ��E!D �� YRM�̗w���
�zpxsa�a ��q ��E�p�MP�5�e9��*S2�
+0Q
�E�ώ�U�$I .��V�R�B?қ1�eV���d<��ʣ<��Ȃ�(h�����&��_��d`#>˂�i���fƖ<륫K*{ �|�� �p "�_�F���ڶ��Eaw�_�� �>2���Z����IEND�B`�
\ No newline at end of file
diff --git a/web/core/profiles/demo_umami/themes/umami/images/classy/icons/video-x-generic.png b/web/core/profiles/demo_umami/themes/umami/images/classy/icons/video-x-generic.png
new file mode 100644
index 0000000000..a2b71f95d9
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/images/classy/icons/video-x-generic.png
@@ -0,0 +1,5 @@
+�PNG
+
+���
IHDR�����������7����tEXtSoftware�Adobe ImageReadyq�e<���xIDAT(ϕ�11 �V>�(v�IEO��
+`��Av�2]4�� �F��BA10[���c� �K��pK�<�}c�=7S�b��Q0����,< �B=S�����\�
+�� �y�g7aA �πǴ"�j����IEND�B`�
\ No newline at end of file
diff --git a/web/core/profiles/demo_umami/themes/umami/images/classy/icons/x-office-document.png b/web/core/profiles/demo_umami/themes/umami/images/classy/icons/x-office-document.png
new file mode 100644
index 0000000000..40db538fcb
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/images/classy/icons/x-office-document.png
@@ -0,0 +1,5 @@
+�PNG
+
+���
IHDR��������� ��a����IDATx�ՓA
+! E=k/��,��: ��܉�� TR�c3���l���� ⎵��ա�q�#�9cJI��\�
+(f{ z��;k�qF�IS��^�2dS�snB��� b�����5(�T�Z���:�����3�֎���@�|�� �~-�����IEND�B`�
\ No newline at end of file
diff --git a/web/core/profiles/demo_umami/themes/umami/images/classy/icons/x-office-presentation.png b/web/core/profiles/demo_umami/themes/umami/images/classy/icons/x-office-presentation.png
new file mode 100644
index 0000000000..fb119e5ba9
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/images/classy/icons/x-office-presentation.png
@@ -0,0 +1,5 @@
+�PNG
+
+���
IHDR��������� ��a���|IDATx���
+� �}�^�st��o1=�r�`1�������
"����� �=�V�E)EJVS@9���F^���F S�RRȰ���&����+�F~ �~�z��}�GB�3��F�[�E
+. 4 ��;�����IEND�B`�
\ No newline at end of file
diff --git a/web/core/profiles/demo_umami/themes/umami/images/classy/icons/x-office-spreadsheet.png b/web/core/profiles/demo_umami/themes/umami/images/classy/icons/x-office-spreadsheet.png
new file mode 100644
index 0000000000..9af7b61ea1
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/images/classy/icons/x-office-spreadsheet.png
@@ -0,0 +1,4 @@
+�PNG
+
+���
IHDR��������� ��a���~IDATx��� � E=u��:@��e ȳ�`M�B E"�C{臇��_4�pa��6��w�!�ؐR��UP�}j��"��<H�*��7ȰL8�z� B4�]�/5(�|������j�=�.E
+N� �8������IEND�B`�
\ No newline at end of file
diff --git a/web/core/profiles/demo_umami/themes/umami/js/classy/README.txt b/web/core/profiles/demo_umami/themes/umami/js/classy/README.txt
new file mode 100644
index 0000000000..efa01cfd10
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/js/classy/README.txt
@@ -0,0 +1,12 @@
+WHAT IS THIS DIRECTORY FOR?
+--------------------------------
+This directory is for JS files previously inherited from the Classy theme.
+
+WHY ARE CLASSY JS FILES BEING COPIED HERE?
+-------------------------------------------
+Classy will be deprecated during the Drupal 9 lifecycle. To prepare for Classy's
+removal, JS files that would otherwise be inherited from Classy are copied
+here.
+
+JS files that differ from the Classy versions should not be placed in this
+directory or any subdirectory.
diff --git a/web/core/profiles/demo_umami/themes/umami/js/classy/media_embed_ckeditor.theme.es6.js b/web/core/profiles/demo_umami/themes/umami/js/classy/media_embed_ckeditor.theme.es6.js
new file mode 100644
index 0000000000..10193f7ba2
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/js/classy/media_embed_ckeditor.theme.es6.js
@@ -0,0 +1,22 @@
+/**
+ * @file
+ * Classy theme overrides for the Media Embed CKEditor plugin.
+ */
+
+(Drupal => {
+ /**
+ * Themes the error displayed when the media embed preview fails.
+ *
+ * @param {string} error
+ * The error message to display
+ *
+ * @return {string}
+ * A string representing a DOM fragment.
+ *
+ * @see media-embed-error.html.twig
+ */
+ Drupal.theme.mediaEmbedPreviewError = () =>
+ `<div class="media-embed-error media-embed-error--preview-error">${Drupal.t(
+ 'An error occurred while trying to preview the media. Please save your work and reload this page.',
+ )}</div>`;
+})(Drupal);
diff --git a/web/core/profiles/demo_umami/themes/umami/js/classy/media_embed_ckeditor.theme.js b/web/core/profiles/demo_umami/themes/umami/js/classy/media_embed_ckeditor.theme.js
new file mode 100644
index 0000000000..6614288cb4
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/js/classy/media_embed_ckeditor.theme.js
@@ -0,0 +1,12 @@
+/**
+* DO NOT EDIT THIS FILE.
+* See the following change record for more information,
+* https://www.drupal.org/node/2815083
+* @preserve
+**/
+
+(function (Drupal) {
+ Drupal.theme.mediaEmbedPreviewError = function () {
+ return '<div class="media-embed-error media-embed-error--preview-error">' + Drupal.t('An error occurred while trying to preview the media. Please save your work and reload this page.') + '</div>';
+ };
+})(Drupal);
\ No newline at end of file
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/README.txt b/web/core/profiles/demo_umami/themes/umami/templates/classy/README.txt
new file mode 100644
index 0000000000..8708a82e74
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/README.txt
@@ -0,0 +1,12 @@
+WHAT IS THIS DIRECTORY FOR?
+--------------------------------
+This directory is for templates previously inherited from the Classy theme.
+
+WHY ARE CLASSY TEMPLATES BEING COPIED HERE?
+-------------------------------------------
+Classy will be deprecated during the Drupal 9 lifecycle. To prepare for Classy's
+removal, templates that would otherwise be inherited from Classy are copied
+here.
+
+Templates that differ from the Classy versions should not be placed in this
+directory or any subdirectory.
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/block/block--local-actions-block.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/block/block--local-actions-block.html.twig
new file mode 100644
index 0000000000..97df94b666
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/block/block--local-actions-block.html.twig
@@ -0,0 +1,12 @@
+{% extends "block.html.twig" %}
+{#
+/**
+ * @file
+ * Theme override for local actions (primary admin actions.)
+ */
+#}
+{% block content %}
+ {% if content %}
+ <nav class="action-links">{{ content }}</nav>
+ {% endif %}
+{% endblock %}
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/block/block--local-tasks-block.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/block/block--local-tasks-block.html.twig
new file mode 100644
index 0000000000..0f25f59d83
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/block/block--local-tasks-block.html.twig
@@ -0,0 +1,14 @@
+{% extends "block.html.twig" %}
+{#
+/**
+ * @file
+ * Theme override for tabs.
+ */
+#}
+{% block content %}
+ {% if content %}
+ <nav class="tabs" role="navigation" aria-label="{{ 'Tabs'|t }}">
+ {{ content }}
+ </nav>
+ {% endif %}
+{% endblock %}
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/block/block--system-menu-block.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/block/block--system-menu-block.html.twig
new file mode 100644
index 0000000000..407f8403fd
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/block/block--system-menu-block.html.twig
@@ -0,0 +1,56 @@
+{#
+/**
+ * @file
+ * Theme override for a menu block.
+ *
+ * Available variables:
+ * - plugin_id: The ID of the block implementation.
+ * - label: The configured label of the block if visible.
+ * - configuration: A list of the block's configuration values.
+ * - label: The configured label for the block.
+ * - label_display: The display settings for the label.
+ * - provider: The module or other provider that provided this block plugin.
+ * - Block plugin specific settings will also be stored here.
+ * - content: The content of this block.
+ * - attributes: HTML attributes for the containing element.
+ * - id: A valid HTML ID and guaranteed unique.
+ * - title_attributes: HTML attributes for the title element.
+ * - content_attributes: HTML attributes for the content element.
+ * - title_prefix: Additional output populated by modules, intended to be
+ * displayed in front of the main title tag that appears in the template.
+ * - title_suffix: Additional output populated by modules, intended to be
+ * displayed after the main title tag that appears in the template.
+ *
+ * Headings should be used on navigation menus that consistently appear on
+ * multiple pages. When this menu block's label is configured to not be
+ * displayed, it is automatically made invisible using the 'visually-hidden' CSS
+ * class, which still keeps it visible for screen-readers and assistive
+ * technology. Headings allow screen-reader and keyboard only users to navigate
+ * to or skip the links.
+ * See http://juicystudio.com/article/screen-readers-display-none.php and
+ * http://www.w3.org/TR/WCAG-TECHS/H42.html for more information.
+ */
+#}
+{%
+ set classes = [
+ 'block',
+ 'block-menu',
+ 'navigation',
+ 'menu--' ~ derivative_plugin_id|clean_class,
+ ]
+%}
+{% set heading_id = attributes.id ~ '-menu'|clean_id %}
+<nav role="navigation" aria-labelledby="{{ heading_id }}"{{ attributes.addClass(classes)|without('role', 'aria-labelledby') }}>
+ {# Label. If not displayed, we still provide it for screen readers. #}
+ {% if not configuration.label_display %}
+ {% set title_attributes = title_attributes.addClass('visually-hidden') %}
+ {% endif %}
+ {{ title_prefix }}
+ <h2{{ title_attributes.setAttribute('id', heading_id) }}>{{ configuration.label }}</h2>
+ {{ title_suffix }}
+
+ {# Menu. #}
+ {% block content %}
+ {{ content }}
+ {% endblock %}
+</nav>
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/block/block.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/block/block.html.twig
new file mode 100644
index 0000000000..fd3311be95
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/block/block.html.twig
@@ -0,0 +1,44 @@
+{#
+/**
+ * @file
+ * Theme override to display a block.
+ *
+ * Available variables:
+ * - plugin_id: The ID of the block implementation.
+ * - label: The configured label of the block if visible.
+ * - configuration: A list of the block's configuration values.
+ * - label: The configured label for the block.
+ * - label_display: The display settings for the label.
+ * - provider: The module or other provider that provided this block plugin.
+ * - Block plugin specific settings will also be stored here.
+ * - content: The content of this block.
+ * - attributes: array of HTML attributes populated by modules, intended to
+ * be added to the main container tag of this template.
+ * - id: A valid HTML ID and guaranteed unique.
+ * - title_attributes: Same as attributes, except applied to the main title
+ * tag that appears in the template.
+ * - title_prefix: Additional output populated by modules, intended to be
+ * displayed in front of the main title tag that appears in the template.
+ * - title_suffix: Additional output populated by modules, intended to be
+ * displayed after the main title tag that appears in the template.
+ *
+ * @see template_preprocess_block()
+ */
+#}
+{%
+ set classes = [
+ 'block',
+ 'block-' ~ configuration.provider|clean_class,
+ 'block-' ~ plugin_id|clean_class,
+ ]
+%}
+<div{{ attributes.addClass(classes) }}>
+ {{ title_prefix }}
+ {% if label %}
+ <h2{{ title_attributes }}>{{ label }}</h2>
+ {% endif %}
+ {{ title_suffix }}
+ {% block content %}
+ {{ content }}
+ {% endblock %}
+</div>
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/content-edit/file-managed-file.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/content-edit/file-managed-file.html.twig
new file mode 100644
index 0000000000..254c424295
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/content-edit/file-managed-file.html.twig
@@ -0,0 +1,22 @@
+{#
+/**
+ * @file
+ * Theme override to display a file form widget.
+ *
+ * Available variables:
+ * - element: Form element for the file upload.
+ * - attributes: HTML attributes for the containing element.
+ *
+ * @see template_preprocess_file_managed_file()
+ */
+#}
+{{ attach_library('umami/classy.file') }}
+{%
+ set classes = [
+ 'js-form-managed-file',
+ 'form-managed-file',
+ ]
+%}
+<div{{ attributes.addClass(classes) }}>
+ {{ element }}
+</div>
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/content-edit/filter-caption.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/content-edit/filter-caption.html.twig
new file mode 100644
index 0000000000..1e35795fc1
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/content-edit/filter-caption.html.twig
@@ -0,0 +1,18 @@
+{#
+/**
+ * @file
+ * Theme override for a filter caption.
+ *
+ * Returns HTML for a captioned image, audio, video or other tag.
+ *
+ * Available variables
+ * - string node: The complete HTML tag whose contents are being captioned.
+ * - string tag: The name of the HTML tag whose contents are being captioned.
+ * - string caption: The caption text.
+ * - string classes: The classes of the captioned HTML tag.
+ */
+#}
+<figure role="group" class="caption caption-{{ tag }}{%- if classes %} {{ classes }}{%- endif %}">
+{{ node }}
+<figcaption>{{ caption }}</figcaption>
+</figure>
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/content-edit/filter-guidelines.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/content-edit/filter-guidelines.html.twig
new file mode 100644
index 0000000000..afef2d2cfb
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/content-edit/filter-guidelines.html.twig
@@ -0,0 +1,29 @@
+{#
+/**
+ * @file
+ * Theme override for guidelines for a text format.
+ *
+ * Available variables:
+ * - format: Contains information about the current text format, including the
+ * following:
+ * - name: The name of the text format, potentially unsafe and needs to be
+ * escaped.
+ * - format: The machine name of the text format, e.g. 'basic_html'.
+ * - attributes: HTML attributes for the containing element.
+ * - tips: Descriptions and a CSS ID in the form of 'module-name/filter-id'
+ * (only used when 'long' is TRUE) for each filter in one or more text
+ * formats.
+ *
+ * @see template_preprocess_filter_tips()
+ */
+#}
+{%
+ set classes = [
+ 'filter-guidelines-item',
+ 'filter-guidelines-' ~ format.id,
+ ]
+%}
+<div{{ attributes.addClass(classes) }}>
+ <h4 class="label">{{ format.label }}</h4>
+ {{ tips }}
+</div>
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/content-edit/filter-tips.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/content-edit/filter-tips.html.twig
new file mode 100644
index 0000000000..25ed49d6ae
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/content-edit/filter-tips.html.twig
@@ -0,0 +1,61 @@
+{#
+/**
+ * @file
+ * Theme override for a set of filter tips.
+ *
+ * Available variables:
+ * - tips: Descriptions and a CSS ID in the form of 'module-name/filter-id'
+ * (only used when 'long' is TRUE) for each filter in one or more text
+ * formats.
+ * - long: A flag indicating whether the passed-in filter tips contain extended
+ * explanations, i.e. intended to be output on the path 'filter/tips'
+ * (TRUE), or are in a short format, i.e. suitable to be displayed below a
+ * form element. Defaults to FALSE.
+ * - multiple: A flag indicating there is more than one filter tip.
+ *
+ * @see template_preprocess_filter_tips()
+ */
+#}
+{% if multiple %}
+ <h2>{{ 'Text Formats'|t }}</h2>
+{% endif %}
+
+{% if tips|length %}
+ {% if multiple %}
+ <div class="compose-tips">
+ {% endif %}
+
+ {% for name, tip in tips %}
+ {% if multiple %}
+ {%
+ set tip_classes = [
+ 'filter-type',
+ 'filter-' ~ name|clean_class,
+ ]
+ %}
+ <div{{ tip.attributes.addClass(tip_classes) }}>
+ <h3>{{ tip.name }}</h3>
+ {% endif %}
+
+ {% if tip.list|length %}
+ <ul class="tips">
+ {% for item in tip.list %}
+ {%
+ set item_classes = [
+ long ? 'filter-' ~ item.id|replace({'/': '-'}),
+ ]
+ %}
+ <li{{ item.attributes.addClass(item_classes) }}>{{ item.tip }}</li>
+ {% endfor %}
+ </ul>
+ {% endif %}
+
+ {% if multiple %}
+ </div>
+ {% endif %}
+ {% endfor %}
+
+ {% if multiple %}
+ </div>
+ {% endif %}
+{% endif %}
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/content-edit/image-widget.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/content-edit/image-widget.html.twig
new file mode 100644
index 0000000000..dac3a227b3
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/content-edit/image-widget.html.twig
@@ -0,0 +1,23 @@
+{#
+/**
+ * @file
+ * Theme override for an image field widget.
+ *
+ * Available variables:
+ * - attributes: HTML attributes for the containing element.
+ * - data: Render elements of the image widget.
+ *
+ * @see template_preprocess_image_widget()
+ */
+#}
+<div{{ attributes }}>
+ {% if data.preview %}
+ <div class="image-preview">
+ {{ data.preview }}
+ </div>
+ {% endif %}
+ <div class="image-widget-data">
+ {# Render widget data without the image preview that was output already. #}
+ {{ data|without('preview') }}
+ </div>
+</div>
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/content-edit/node-add-list.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/content-edit/node-add-list.html.twig
new file mode 100644
index 0000000000..f38fe3a5c6
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/content-edit/node-add-list.html.twig
@@ -0,0 +1,30 @@
+{#
+/**
+ * @file
+ * Theme override to list node types available for adding content.
+ *
+ * This list is displayed on the Add content admin page.
+ *
+ * Available variables:
+ * - types: A list of content types, each with the following properties:
+ * - add_link: Link to create a piece of content of this type.
+ * - description: Description of this type of content.
+ *
+ * @see template_preprocess_node_add_list()
+ */
+#}
+{% if types is not empty %}
+ <dl class="node-type-list">
+ {% for type in types %}
+ <dt>{{ type.add_link }}</dt>
+ <dd>{{ type.description }}</dd>
+ {% endfor %}
+ </dl>
+{% else %}
+ <p>
+ {% set create_content = path('node.type_add') %}
+ {% trans %}
+ You have not created any content types yet. Go to the <a href="{{ create_content }}">content type creation page</a> to add a new content type.
+ {% endtrans %}
+ </p>
+{% endif %}
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/content-edit/node-edit-form.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/content-edit/node-edit-form.html.twig
new file mode 100644
index 0000000000..18097f3797
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/content-edit/node-edit-form.html.twig
@@ -0,0 +1,28 @@
+{#
+/**
+ * @file
+ * Theme override for a node edit form.
+ *
+ * Two column template for the node add/edit form.
+ *
+ * This template will be used when a node edit form specifies 'node_edit_form'
+ * as its #theme callback. Otherwise, by default, node add/edit forms will be
+ * themed by form.html.twig.
+ *
+ * Available variables:
+ * - form: The node add/edit form.
+ *
+ * @see seven_form_node_form_alter()
+ */
+#}
+<div class="layout-node-form clearfix">
+ <div class="layout-region layout-region-node-main">
+ {{ form|without('advanced', 'actions') }}
+ </div>
+ <div class="layout-region layout-region-node-secondary">
+ {{ form.advanced }}
+ </div>
+ <div class="layout-region layout-region-node-footer">
+ {{ form.actions }}
+ </div>
+</div>
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/content-edit/text-format-wrapper.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/content-edit/text-format-wrapper.html.twig
new file mode 100644
index 0000000000..08a88ca1ce
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/content-edit/text-format-wrapper.html.twig
@@ -0,0 +1,26 @@
+{#
+/**
+ * @file
+ * Theme override for a text format-enabled form element.
+ *
+ * Available variables:
+ * - children: Text format element children.
+ * - description: Text format element description.
+ * - attributes: HTML attributes for the containing element.
+ * - aria_description: Flag for whether or not an ARIA description has been
+ * added to the description container.
+ *
+ * @see template_preprocess_text_format_wrapper()
+ */
+#}
+<div class="js-text-format-wrapper text-format-wrapper js-form-item form-item">
+ {{ children }}
+ {% if description %}
+ {%
+ set classes = [
+ aria_description ? 'description',
+ ]
+ %}
+ <div{{ attributes.addClass(classes) }}>{{ description }}</div>
+ {% endif %}
+</div>
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/content/aggregator-item.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/content/aggregator-item.html.twig
new file mode 100644
index 0000000000..16f4428a03
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/content/aggregator-item.html.twig
@@ -0,0 +1,31 @@
+{#
+/**
+ * @file
+ * Theme override to present a feed item in an aggregator page.
+ *
+ * Available variables:
+ * - url: URL to the originating feed item.
+ * - title: (optional) Title of the feed item.
+ * - content: All field items. Use {{ content }} to print them all,
+ * or print a subset such as {{ content.field_example }}. Use
+ * {{ content|without('field_example') }} to temporarily suppress the printing
+ * of a given element.
+ * - attributes: HTML attributes for the wrapper.
+ * - title_prefix: Additional output populated by modules, intended to be
+ * displayed in front of the main title tag that appears in the template.
+ * - title_suffix: Additional output populated by modules, intended to be
+ * displayed after the main title tag that appears in the template.
+ *
+ * @see template_preprocess_aggregator_item()
+ */
+#}
+<article{{ attributes.addClass('aggregator-item') }}>
+ {{ title_prefix }}
+ {% if title %}
+ <h3 class="feed-item-title">
+ <a href="{{ url }}">{{ title }}</a>
+ </h3>
+ {% endif %}
+ {{ title_suffix }}
+ {{ content }}
+</article>
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/content/book-node-export-html.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/content/book-node-export-html.html.twig
new file mode 100644
index 0000000000..94a4c24dc7
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/content/book-node-export-html.html.twig
@@ -0,0 +1,20 @@
+{#
+/**
+ * @file
+ * Theme override for a single node in a printer-friendly outline.
+ *
+ * Available variables:
+ * - node: Fully loaded node.
+ * - depth: Depth of the current node inside the outline.
+ * - title: Node title.
+ * - content: Node content.
+ * - children: All the child nodes recursively rendered through this file.
+ *
+ * @see template_preprocess_book_node_export_html()
+ */
+#}
+<article id="node-{{ node.id }}" class="section-{{ depth }}">
+ <h1 class="book-heading">{{ title }}</h1>
+ {{ content }}
+ {{ children }}
+</article>
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/content/comment.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/content/comment.html.twig
new file mode 100644
index 0000000000..31c34d815f
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/content/comment.html.twig
@@ -0,0 +1,111 @@
+{#
+/**
+ * @file
+ * Theme override for comments.
+ *
+ * Available variables:
+ * - author: Comment author. Can be a link or plain text.
+ * - content: The content-related items for the comment display. Use
+ * {{ content }} to print them all, or print a subset such as
+ * {{ content.field_example }}. Use the following code to temporarily suppress
+ * the printing of a given child element:
+ * @code
+ * {{ content|without('field_example') }}
+ * @endcode
+ * - created: Formatted date and time for when the comment was created.
+ * Preprocess functions can reformat it by calling DateFormatter::format()
+ * with the desired parameters on the 'comment.created' variable.
+ * - changed: Formatted date and time for when the comment was last changed.
+ * Preprocess functions can reformat it by calling DateFormatter::format()
+ * with the desired parameters on the 'comment.changed' variable.
+ * - permalink: Comment permalink.
+ * - submitted: Submission information created from author and created
+ * during template_preprocess_comment().
+ * - user_picture: The comment author's profile picture.
+ * - status: Comment status. Possible values are:
+ * unpublished, published, or preview.
+ * - title: Comment title, linked to the comment.
+ * - attributes: HTML attributes for the containing element.
+ * The attributes.class may contain one or more of the following classes:
+ * - comment: The current template type; e.g., 'theming hook'.
+ * - by-anonymous: Comment by an unregistered user.
+ * - by-{entity-type}-author: Comment by the author of the parent entity,
+ * eg. by-node-author.
+ * - preview: When previewing a new or edited comment.
+ * The following applies only to viewers who are registered users:
+ * - unpublished: An unpublished comment visible only to administrators.
+ * - title_prefix: Additional output populated by modules, intended to be
+ * displayed in front of the main title tag that appears in the template.
+ * - title_suffix: Additional output populated by modules, intended to be
+ * displayed after the main title tag that appears in the template.
+ * - content_attributes: List of classes for the styling of the comment content.
+ * - title_attributes: Same as attributes, except applied to the main title
+ * tag that appears in the template.
+ * - threaded: A flag indicating whether the comments are threaded or not.
+ *
+ * These variables are provided to give context about the parent comment (if
+ * any):
+ * - parent_comment: Full parent comment entity (if any).
+ * - parent_author: Equivalent to author for the parent comment.
+ * - parent_created: Equivalent to created for the parent comment.
+ * - parent_changed: Equivalent to changed for the parent comment.
+ * - parent_title: Equivalent to title for the parent comment.
+ * - parent_permalink: Equivalent to permalink for the parent comment.
+ * - parent: A text string of parent comment submission information created from
+ * 'parent_author' and 'parent_created' during template_preprocess_comment().
+ * This information is presented to help screen readers follow lengthy
+ * discussion threads. You can hide this from sighted users using the class
+ * visually-hidden.
+ *
+ * These two variables are provided for context:
+ * - comment: Full comment object.
+ * - entity: Entity the comments are attached to.
+ *
+ * @see template_preprocess_comment()
+ */
+#}
+{% if threaded %}
+ {{ attach_library('umami/classy.indented') }}
+{% endif %}
+{%
+ set classes = [
+ 'comment',
+ 'js-comment',
+ status != 'published' ? status,
+ comment.owner.anonymous ? 'by-anonymous',
+ author_id and author_id == commented_entity.getOwnerId() ? 'by-' ~ commented_entity.getEntityTypeId() ~ '-author',
+ ]
+%}
+<article{{ attributes.addClass(classes) }}>
+ {#
+ Hide the "new" indicator by default, let a piece of JavaScript ask the
+ server which comments are new for the user. Rendering the final "new"
+ indicator here would break the render cache.
+ #}
+ <mark class="hidden" data-comment-timestamp="{{ new_indicator_timestamp }}"></mark>
+
+ <footer class="comment__meta">
+ {{ user_picture }}
+ <p class="comment__submitted">{{ submitted }}</p>
+
+ {#
+ Indicate the semantic relationship between parent and child comments for
+ accessibility. The list is difficult to navigate in a screen reader
+ without this information.
+ #}
+ {% if parent %}
+ <p class="parent visually-hidden">{{ parent }}</p>
+ {% endif %}
+
+ {{ permalink }}
+ </footer>
+
+ <div{{ content_attributes.addClass('content') }}>
+ {% if title %}
+ {{ title_prefix }}
+ <h3{{ title_attributes }}>{{ title }}</h3>
+ {{ title_suffix }}
+ {% endif %}
+ {{ content }}
+ </div>
+</article>
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/content/links--node.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/content/links--node.html.twig
new file mode 100644
index 0000000000..e6cda0d7bb
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/content/links--node.html.twig
@@ -0,0 +1,40 @@
+{#
+/**
+ * @file
+ * Theme override to display node links.
+ *
+ * Available variables:
+ * - attributes: Attributes for the UL containing the list of links.
+ * - links: Links to be output.
+ * Each link will have the following elements:
+ * - link: (optional) A render array that returns a link. See
+ * template_preprocess_links() for details how it is generated.
+ * - text: The link text.
+ * - attributes: HTML attributes for the list item element.
+ * - text_attributes: (optional) HTML attributes for the span element if no
+ * 'url' was supplied.
+ * - heading: (optional) A heading to precede the links.
+ * - text: The heading text.
+ * - level: The heading level (e.g. 'h2', 'h3').
+ * - attributes: (optional) A keyed list of attributes for the heading.
+ * If the heading is a string, it will be used as the text of the heading and
+ * the level will default to 'h2'.
+ *
+ * Headings should be used on navigation menus and any list of links that
+ * consistently appears on multiple pages. To make the heading invisible use
+ * the 'visually-hidden' CSS class. Do not use 'display:none', which
+ * removes it from screen readers and assistive technology. Headings allow
+ * screen reader and keyboard only users to navigate to or skip the links.
+ * See http://juicystudio.com/article/screen-readers-display-none.php and
+ * http://www.w3.org/TR/WCAG-TECHS/H42.html for more information.
+ *
+ * @see template_preprocess_links()
+ *
+ * @ingroup themeable
+ */
+#}
+{% if links %}
+ <div class="node__links">
+ {% include "links.html.twig" %}
+ </div>
+{% endif %}
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/content/mark.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/content/mark.html.twig
new file mode 100644
index 0000000000..9219915ce5
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/content/mark.html.twig
@@ -0,0 +1,20 @@
+{#
+/**
+ * @file
+ * Theme override for a marker for new or updated content.
+ *
+ * Available variables:
+ * - status: Number representing the marker status to display. Use the constants
+ * below for comparison:
+ * - MARK_NEW
+ * - MARK_UPDATED
+ * - MARK_READ
+ */
+#}
+{% if logged_in %}
+ {% if status is constant('MARK_NEW') %}
+ <span class="marker">{{ 'New'|t }}</span>
+ {% elseif status is constant('MARK_UPDATED') %}
+ <span class="marker">{{ 'Updated'|t }}</span>
+ {% endif %}
+{% endif %}
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/content/media-embed-error.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/content/media-embed-error.html.twig
new file mode 100644
index 0000000000..7386c4c432
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/content/media-embed-error.html.twig
@@ -0,0 +1,21 @@
+{#
+/**
+ * @file
+ * Theme override for a missing media error.
+ *
+ * Available variables
+ * - message: The message text.
+ * - attributes: HTML attributes for the containing element.
+ *
+ * When a response from the back end can't be returned, a related error message
+ * is displayed from JavaScript.
+ *
+ * @see Drupal.theme.mediaEmbedPreviewError
+ *
+ * @ingroup themeable
+ */
+#}
+{{ attach_library('umami/classy.media_embed_error') }}
+<div{{ attributes.addClass('media-embed-error', 'media-embed-error--missing-source') }}>
+ {{ message }}
+</div>
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/content/media.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/content/media.html.twig
new file mode 100644
index 0000000000..422030e9d0
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/content/media.html.twig
@@ -0,0 +1,28 @@
+{#
+/**
+ * @file
+ * Theme override to display a media item.
+ *
+ * Available variables:
+ * - name: Name of the media.
+ * - content: Media content.
+ *
+ * @see template_preprocess_media()
+ *
+ * @ingroup themeable
+ */
+#}
+{%
+ set classes = [
+ 'media',
+ 'media--type-' ~ media.bundle()|clean_class,
+ not media.isPublished() ? 'media--unpublished',
+ view_mode ? 'media--view-mode-' ~ view_mode|clean_class,
+ ]
+%}
+<article{{ attributes.addClass(classes) }}>
+ {{ title_suffix.contextual_links }}
+ {% if content %}
+ {{ content }}
+ {% endif %}
+</article>
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/content/page-title.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/content/page-title.html.twig
new file mode 100644
index 0000000000..e1de726607
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/content/page-title.html.twig
@@ -0,0 +1,19 @@
+{#
+/**
+ * @file
+ * Theme override for page titles.
+ *
+ * Available variables:
+ * - title_attributes: HTML attributes for the page title element.
+ * - title_prefix: Additional output populated by modules, intended to be
+ * displayed in front of the main title tag that appears in the template.
+ * - title: The page title, for use in the actual content.
+ * - title_suffix: Additional output populated by modules, intended to be
+ * displayed after the main title tag that appears in the template.
+ */
+#}
+{{ title_prefix }}
+{% if title %}
+ <h1{{ title_attributes.addClass('page-title') }}>{{ title }}</h1>
+{% endif %}
+{{ title_suffix }}
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/content/search-result.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/content/search-result.html.twig
new file mode 100644
index 0000000000..a1aa3c5c81
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/content/search-result.html.twig
@@ -0,0 +1,72 @@
+{#
+/**
+ * @file
+ * Theme override for displaying a single search result.
+ *
+ * This template renders a single search result. The list of results is
+ * rendered using '#theme' => 'item_list', with suggestions of:
+ * - item_list__search_results__(plugin_id)
+ * - item_list__search_results
+ *
+ * Available variables:
+ * - url: URL of the result.
+ * - title: Title of the result.
+ * - snippet: A small preview of the result. Does not apply to user searches.
+ * - info: String of all the meta information ready for print. Does not apply
+ * to user searches.
+ * - plugin_id: The machine-readable name of the plugin being executed,such
+ * as "node_search" or "user_search".
+ * - title_prefix: Additional output populated by modules, intended to be
+ * displayed in front of the main title tag that appears in the template.
+ * - title_suffix: Additional output populated by modules, intended to be
+ * displayed after the main title tag that appears in the template.
+ * - info_split: Contains same data as info, but split into separate parts.
+ * - info_split.type: Node type (or item type string supplied by module).
+ * - info_split.user: Author of the node linked to users profile. Depends
+ * on permission.
+ * - info_split.date: Last update of the node. Short formatted.
+ * - info_split.comment: Number of comments output as "% comments", %
+ * being the count. (Depends on comment.module).
+ * @todo The info variable needs to be made drillable and each of these sub
+ * items should instead be within info and renamed info.foo, info.bar, etc.
+ *
+ * Other variables:
+ * - title_attributes: HTML attributes for the title.
+ * - content_attributes: HTML attributes for the content.
+ *
+ * Since info_split is keyed, a direct print of the item is possible.
+ * This array does not apply to user searches so it is recommended to check
+ * for its existence before printing. The default keys of 'type', 'user' and
+ * 'date' always exist for node searches. Modules may provide other data.
+ * @code
+ * {% if (info_split.comment) %}
+ * <span class="info-comment">
+ * {{ info_split.comment }}
+ * </span>
+ * {% endif %}
+ * @endcode
+ *
+ * To check for all available data within info_split, use the code below.
+ * @code
+ * <pre>
+ * {{ dump(info_split) }}
+ * </pre>
+ * @endcode
+ *
+ * @see template_preprocess_search_result()
+ */
+#}
+{{ attach_library('umami/classy.search-results') }}
+{{ title_prefix }}
+<h3{{ title_attributes.addClass('search-result__title') }}>
+ <a href="{{ url }}">{{ title }}</a>
+</h3>
+{{ title_suffix }}
+<div class="search-result__snippet-info">
+ {% if snippet %}
+ <p{{ content_attributes.addClass('search-result__snippet') }}>{{ snippet }}</p>
+ {% endif %}
+ {% if info %}
+ <p class="search-result__info">{{ info }}</p>
+ {% endif %}
+</div>
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/content/taxonomy-term.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/content/taxonomy-term.html.twig
new file mode 100644
index 0000000000..6478b507d0
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/content/taxonomy-term.html.twig
@@ -0,0 +1,41 @@
+{#
+/**
+ * @file
+ * Theme override to display a taxonomy term.
+ *
+ * Available variables:
+ * - url: URL of the current term.
+ * - name: (optional) Name of the current term.
+ * - content: Items for the content of the term (fields and description).
+ * Use 'content' to print them all, or print a subset such as
+ * 'content.description'. Use the following code to exclude the
+ * printing of a given child element:
+ * @code
+ * {{ content|without('description') }}
+ * @endcode
+ * - attributes: HTML attributes for the wrapper.
+ * - page: Flag for the full page state.
+ * - term: The taxonomy term entity, including:
+ * - id: The ID of the taxonomy term.
+ * - bundle: Machine name of the current vocabulary.
+ * - view_mode: View mode, e.g. 'full', 'teaser', etc.
+ *
+ * @see template_preprocess_taxonomy_term()
+ */
+#}
+{%
+ set classes = [
+ 'taxonomy-term',
+ 'vocabulary-' ~ term.bundle|clean_class,
+ ]
+%}
+<div{{ attributes.setAttribute('id', 'taxonomy-term-' ~ term.id).addClass(classes) }}>
+ {{ title_prefix }}
+ {% if name and not page %}
+ <h2><a href="{{ url }}">{{ name }}</a></h2>
+ {% endif %}
+ {{ title_suffix }}
+ <div class="content">
+ {{ content }}
+ </div>
+</div>
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/dataset/aggregator-feed.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/dataset/aggregator-feed.html.twig
new file mode 100644
index 0000000000..9eacccb604
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/dataset/aggregator-feed.html.twig
@@ -0,0 +1,36 @@
+{#
+/**
+ * @file
+ * Theme override to present an aggregator feed.
+ *
+ * The contents are rendered above feed listings when browsing source feeds.
+ * For example, "example.com/aggregator/sources/1".
+ *
+ * Available variables:
+ * - title: (optional) Title of the feed item.
+ * - content: All field items. Use {{ content }} to print them all,
+ * or print a subset such as {{ content.field_example }}. Use
+ * {{ content|without('field_example') }} to temporarily suppress the printing
+ * of a given element.
+ * - attributes: HTML attributes for the wrapper.
+ * - title_attributes: Same as attributes, except applied to the main title
+ * tag that appears in the template.
+ * - title_prefix: Additional output populated by modules, intended to be
+ * displayed in front of the main title tag that appears in the template.
+ * - title_suffix: Additional output populated by modules, intended to be
+ * displayed after the main title tag that appears in the template.
+ *
+ * @see template_preprocess_aggregator_feed()
+ */
+#}
+<div{{ attributes.addClass('aggregator-feed') }}>
+
+ {{ title_prefix }}
+ {% if title and not full %}
+ <h2{{ title_attributes }}>{{ title }}</h2>
+ {% endif %}
+ {{ title_suffix }}
+
+ {{ content }}
+
+</div>
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/dataset/forum-icon.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/dataset/forum-icon.html.twig
new file mode 100644
index 0000000000..d6be503bb2
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/dataset/forum-icon.html.twig
@@ -0,0 +1,30 @@
+{#
+/**
+ * @file
+ * Theme override to display a status icon for a forum post.
+ *
+ * Available variables:
+ * - attributes: HTML attributes to be applied to the wrapper element.
+ * - class: HTML classes that determine which icon to display. May be one of
+ * 'hot', 'hot-new', 'new', 'default', 'closed', or 'sticky'.
+ * - title: Text alternative for the forum icon.
+ * - icon_title: Text alternative for the forum icon, same as above.
+ * - new_posts: '1' when this topic contains new posts, otherwise '0'.
+ * - first_new: '1' when this is the first topic with new posts, otherwise '0'.
+ * - icon_status: Indicates which status icon should be used.
+ *
+ * @see template_preprocess_forum_icon()
+ */
+#}
+{%
+ set classes = [
+ 'forum__icon',
+ 'forum__topic-status--' ~ icon_status,
+ ]
+%}
+<div{{ attributes.addClass(classes) }}>
+ {% if first_new -%}
+ <a id="new"></a>
+ {%- endif %}
+ <span class="visually-hidden">{{ icon_title }}</span>
+</div>
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/dataset/forum-list.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/dataset/forum-list.html.twig
new file mode 100644
index 0000000000..ce610bb49b
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/dataset/forum-list.html.twig
@@ -0,0 +1,79 @@
+{#
+/**
+ * @file
+ * Theme override to display a list of forums and containers.
+ *
+ * Available variables:
+ * - forums: A collection of forums and containers to display. It is keyed to
+ * the numeric IDs of all child forums and containers. Each forum in forums
+ * contains:
+ * - is_container: A flag indicating if the forum can contain other
+ * forums. Otherwise, the forum can only contain topics.
+ * - depth: How deep the forum is in the current hierarchy.
+ * - zebra: 'even' or 'odd', used for row class.
+ * - icon_class: 'default' or 'new', used for forum icon class.
+ * - icon_title: Text alternative for the forum icon.
+ * - name: The name of the forum.
+ * - link: The URL to link to this forum.
+ * - description: The description field for the forum, containing:
+ * - value: The descriptive text for the forum.
+ * - new_topics: A flag indicating if the forum contains unread posts.
+ * - new_url: A URL to the forum's unread posts.
+ * - new_text: Text for the above URL, which tells how many new posts.
+ * - old_topics: A count of posts that have already been read.
+ * - num_posts: The total number of posts in the forum.
+ * - last_reply: Text representing the last time a forum was posted or
+ * commented in.
+ * - forum_id: Forum ID for the current forum. Parent to all items within the
+ * forums array.
+ *
+ * @see template_preprocess_forum_list()
+ */
+#}
+<table id="forum-{{ forum_id }}">
+ <thead>
+ <tr>
+ <th>{{ 'Forum'|t }}</th>
+ <th>{{ 'Topics'|t }}</th>
+ <th>{{ 'Posts'|t }}</th>
+ <th>{{ 'Last post'|t }}</th>
+ </tr>
+ </thead>
+ <tbody>
+ {% for child_id, forum in forums %}
+ <tr id="forum-list-{{ child_id }}" class="{{ forum.zebra }}">
+ <td {% if forum.is_container == true -%}
+ colspan="4" class="container"
+ {%- else -%}
+ class="forum-list__forum"
+ {%- endif -%}>
+ {#
+ Enclose the contents of this cell with X divs, where X is the
+ depth this forum resides at. This will allow us to use CSS
+ left-margin for indenting.
+ #}
+ {% for i in 1..forum.depth if forum.depth > 0 %}<div class="indented">{% endfor %}
+ <div class="forum__icon forum-status-{{ forum.icon_class }}" title="{{ forum.icon_title }}">
+ <span class="visually-hidden">{{ forum.icon_title }}</span>
+ </div>
+ <div class="forum__name"><a href="{{ forum.link }}">{{ forum.label }}</a></div>
+ {% if forum.description.value %}
+ <div class="forum__description">{{ forum.description.value }}</div>
+ {% endif %}
+ {% for i in 1..forum.depth if forum.depth > 0 %}</div>{% endfor %}
+ </td>
+ {% if forum.is_container == false %}
+ <td class="forum__topics">
+ {{ forum.num_topics }}
+ {% if forum.new_topics == true %}
+ <br />
+ <a href="{{ forum.new_url }}">{{ forum.new_text }}</a>
+ {% endif %}
+ </td>
+ <td class="forum__posts">{{ forum.num_posts }}</td>
+ <td class="forum__last-reply">{{ forum.last_reply }}</td>
+ {% endif %}
+ </tr>
+ {% endfor %}
+ </tbody>
+</table>
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/dataset/forums.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/dataset/forums.html.twig
new file mode 100644
index 0000000000..9dc8e55f69
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/dataset/forums.html.twig
@@ -0,0 +1,24 @@
+{#
+/**
+ * @file
+ * Theme override to display a forum.
+ *
+ * May contain forum containers as well as forum topics.
+ *
+ * Available variables:
+ * - forums: The forums to display (as processed by forum-list.html.twig).
+ * - topics: The topics to display.
+ * - topics_pager: The topics pager.
+ * - forums_defined: A flag to indicate that the forums are configured.
+ *
+ * @see template_preprocess_forums()
+ */
+#}
+{{ attach_library('umami/classy.forum') }}
+{% if forums_defined %}
+ <div class="forum">
+ {{ forums }}
+ {{ topics }}
+ {{ topics_pager }}
+ </div>
+{% endif %}
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/dataset/item-list--search-results.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/dataset/item-list--search-results.html.twig
new file mode 100644
index 0000000000..e9928fd776
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/dataset/item-list--search-results.html.twig
@@ -0,0 +1,29 @@
+{% extends "item-list.html.twig" %}
+{#
+/**
+ * @file
+ * Theme override for an item list of search results.
+ *
+ * Available variables:
+ * - items: A list of items. Each item contains:
+ * - attributes: HTML attributes to be applied to each list item.
+ * - value: The content of the list element.
+ * - title: The title of the list.
+ * - list_type: The tag for list element ("ul" or "ol").
+ * - attributes: HTML attributes to be applied to the list.
+ * - empty: A message to display when there are no items. Allowed value is a
+ * string or render array.
+ * - context: An list of contextual data associated with the list. For search
+ * results, the following data is set:
+ * - plugin: The search plugin ID, for example "node_search".
+ *
+ * @see template_preprocess_item_list()
+ */
+#}
+{%
+ set classes = [
+ 'search-results',
+ context.plugin ~ '-results',
+ ]
+%}
+{% set attributes = attributes.addClass(classes) %}
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/dataset/item-list.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/dataset/item-list.html.twig
new file mode 100644
index 0000000000..20541b0b7e
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/dataset/item-list.html.twig
@@ -0,0 +1,41 @@
+{#
+/**
+ * @file
+ * Theme override for an item list.
+ *
+ * Available variables:
+ * - items: A list of items. Each item contains:
+ * - attributes: HTML attributes to be applied to each list item.
+ * - value: The content of the list element.
+ * - title: The title of the list.
+ * - list_type: The tag for list element ("ul" or "ol").
+ * - wrapper_attributes: HTML attributes to be applied to the list wrapper.
+ * - attributes: HTML attributes to be applied to the list.
+ * - empty: A message to display when there are no items. Allowed value is a
+ * string or render array.
+ * - context: A list of contextual data associated with the list. May contain:
+ * - list_style: The custom list style.
+ *
+ * @see template_preprocess_item_list()
+ */
+#}
+{% if context.list_style %}
+ {%- set wrapper_attributes = wrapper_attributes.addClass('item-list--' ~ context.list_style) %}
+ {%- set attributes = attributes.addClass('item-list__' ~ context.list_style) %}
+{% endif %}
+{% if items or empty -%}
+ <div{{ wrapper_attributes.addClass('item-list') }}>
+ {%- if title is not empty -%}
+ <h3>{{ title }}</h3>
+ {%- endif -%}
+ {%- if items -%}
+ <{{ list_type }}{{ attributes }}>
+ {%- for item in items -%}
+ <li{{ item.attributes }}>{{ item.value }}</li>
+ {%- endfor -%}
+ </{{ list_type }}>
+ {%- else -%}
+ {{- empty -}}
+ {%- endif -%}
+ </div>
+{%- endif %}
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/dataset/table.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/dataset/table.html.twig
new file mode 100644
index 0000000000..2afa9c1556
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/dataset/table.html.twig
@@ -0,0 +1,113 @@
+{#
+/**
+ * @file
+ * Theme override to display a table.
+ *
+ * Available variables:
+ * - attributes: HTML attributes to apply to the <table> tag.
+ * - caption: A localized string for the <caption> tag.
+ * - colgroups: Column groups. Each group contains the following properties:
+ * - attributes: HTML attributes to apply to the <col> tag.
+ * Note: Drupal currently supports only one table header row, see
+ * https://www.drupal.org/node/893530 and
+ * http://api.drupal.org/api/drupal/includes!theme.inc/function/theme_table/7#comment-5109.
+ * - header: Table header cells. Each cell contains the following properties:
+ * - tag: The HTML tag name to use; either 'th' or 'td'.
+ * - attributes: HTML attributes to apply to the tag.
+ * - content: A localized string for the title of the column.
+ * - field: Field name (required for column sorting).
+ * - sort: Default sort order for this column ("asc" or "desc").
+ * - sticky: A flag indicating whether to use a "sticky" table header.
+ * - rows: Table rows. Each row contains the following properties:
+ * - attributes: HTML attributes to apply to the <tr> tag.
+ * - data: Table cells.
+ * - no_striping: A flag indicating that the row should receive no
+ * 'even / odd' styling. Defaults to FALSE.
+ * - cells: Table cells of the row. Each cell contains the following keys:
+ * - tag: The HTML tag name to use; either 'th' or 'td'.
+ * - attributes: Any HTML attributes, such as "colspan", to apply to the
+ * table cell.
+ * - content: The string to display in the table cell.
+ * - active_table_sort: A boolean indicating whether the cell is the active
+ table sort.
+ * - footer: Table footer rows, in the same format as the rows variable.
+ * - empty: The message to display in an extra row if table does not have
+ * any rows.
+ * - no_striping: A boolean indicating that the row should receive no striping.
+ * - header_columns: The number of columns in the header.
+ *
+ * @see template_preprocess_table()
+ */
+#}
+<table{{ attributes }}>
+ {% if caption %}
+ <caption>{{ caption }}</caption>
+ {% endif %}
+
+ {% for colgroup in colgroups %}
+ {% if colgroup.cols %}
+ <colgroup{{ colgroup.attributes }}>
+ {% for col in colgroup.cols %}
+ <col{{ col.attributes }} />
+ {% endfor %}
+ </colgroup>
+ {% else %}
+ <colgroup{{ colgroup.attributes }} />
+ {% endif %}
+ {% endfor %}
+
+ {% if header %}
+ <thead>
+ <tr>
+ {% for cell in header %}
+ {%
+ set cell_classes = [
+ cell.active_table_sort ? 'is-active',
+ ]
+ %}
+ <{{ cell.tag }}{{ cell.attributes.addClass(cell_classes) }}>
+ {{- cell.content -}}
+ </{{ cell.tag }}>
+ {% endfor %}
+ </tr>
+ </thead>
+ {% endif %}
+
+ {% if rows %}
+ <tbody>
+ {% for row in rows %}
+ {%
+ set row_classes = [
+ not no_striping ? cycle(['odd', 'even'], loop.index0),
+ ]
+ %}
+ <tr{{ row.attributes.addClass(row_classes) }}>
+ {% for cell in row.cells %}
+ <{{ cell.tag }}{{ cell.attributes }}>
+ {{- cell.content -}}
+ </{{ cell.tag }}>
+ {% endfor %}
+ </tr>
+ {% endfor %}
+ </tbody>
+ {% elseif empty %}
+ <tbody>
+ <tr class="odd">
+ <td colspan="{{ header_columns }}" class="empty message">{{ empty }}</td>
+ </tr>
+ </tbody>
+ {% endif %}
+ {% if footer %}
+ <tfoot>
+ {% for row in footer %}
+ <tr{{ row.attributes }}>
+ {% for cell in row.cells %}
+ <{{ cell.tag }}{{ cell.attributes }}>
+ {{- cell.content -}}
+ </{{ cell.tag }}>
+ {% endfor %}
+ </tr>
+ {% endfor %}
+ </tfoot>
+ {% endif %}
+</table>
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/field/field--comment.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/field/field--comment.html.twig
new file mode 100644
index 0000000000..1ec3ee64b1
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/field/field--comment.html.twig
@@ -0,0 +1,57 @@
+{#
+/**
+ * @file
+ * Theme override for comment fields.
+ *
+ * Available variables:
+ * - attributes: HTML attributes for the containing element.
+ * - label_hidden: Whether to show the field label or not.
+ * - title_attributes: HTML attributes for the title.
+ * - label: The label for the field.
+ * - title_prefix: Additional output populated by modules, intended to be
+ * displayed in front of the main title tag that appears in the template.
+ * - title_suffix: Additional title output populated by modules, intended to
+ * be displayed after the main title tag that appears in the template.
+ * - comments: List of comments rendered through comment.html.twig.
+ * - comment_form: The 'Add new comment' form.
+ * - comment_display_mode: Is the comments are threaded.
+ * - comment_type: The comment type bundle ID for the comment field.
+ * - entity_type: The entity type to which the field belongs.
+ * - field_name: The name of the field.
+ * - field_type: The type of the field.
+ * - label_display: The display settings for the label.
+ *
+ * @see template_preprocess_field()
+ * @see comment_preprocess_field()
+ */
+#}
+{%
+ set classes = [
+ 'field',
+ 'field--name-' ~ field_name|clean_class,
+ 'field--type-' ~ field_type|clean_class,
+ 'field--label-' ~ label_display,
+ 'comment-wrapper',
+ ]
+%}
+{%
+ set title_classes = [
+ 'title',
+ label_display == 'visually_hidden' ? 'visually-hidden',
+ ]
+%}
+<section{{ attributes.addClass(classes) }}>
+ {% if comments and not label_hidden %}
+ {{ title_prefix }}
+ <h2{{ title_attributes.addClass(title_classes) }}>{{ label }}</h2>
+ {{ title_suffix }}
+ {% endif %}
+
+ {{ comments }}
+
+ {% if comment_form %}
+ <h2 class="title comment-form__title">{{ 'Add new comment'|t }}</h2>
+ {{ comment_form }}
+ {% endif %}
+
+</section>
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/field/field--node--created.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/field/field--node--created.html.twig
new file mode 100644
index 0000000000..72d5d6737d
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/field/field--node--created.html.twig
@@ -0,0 +1,34 @@
+{#
+/**
+ * @file
+ * Theme override for the node created field.
+ *
+ * This is an override of field.html.twig for the node created field. See that
+ * template for documentation about its details and overrides.
+ *
+ * Available variables:
+ * - attributes: HTML attributes for the containing span element.
+ * - items: List of all the field items. Each item contains:
+ * - attributes: List of HTML attributes for each item.
+ * - content: The field item content.
+ * - entity_type: The entity type to which the field belongs.
+ * - field_name: The name of the field.
+ * - field_type: The type of the field.
+ * - label_display: The display settings for the label.
+ *
+ * @see field.html.twig
+ */
+#}
+{%
+ set classes = [
+ 'field',
+ 'field--name-' ~ field_name|clean_class,
+ 'field--type-' ~ field_type|clean_class,
+ 'field--label-' ~ label_display,
+ ]
+%}
+<span{{ attributes.addClass(classes) }}>
+ {%- for item in items -%}
+ {{ item.content }}
+ {%- endfor -%}
+</span>
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/field/field--node--title.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/field/field--node--title.html.twig
new file mode 100644
index 0000000000..33b105f50b
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/field/field--node--title.html.twig
@@ -0,0 +1,34 @@
+{#
+/**
+ * @file
+ * Theme override for the node title field.
+ *
+ * This is an override of field.html.twig for the node title field. See that
+ * template for documentation about its details and overrides.
+ *
+ * Available variables:
+ * - attributes: HTML attributes for the containing span element.
+ * - items: List of all the field items. Each item contains:
+ * - attributes: List of HTML attributes for each item.
+ * - content: The field item content.
+ * - entity_type: The entity type to which the field belongs.
+ * - field_name: The name of the field.
+ * - field_type: The type of the field.
+ * - label_display: The display settings for the label.
+ *
+ * @see field.html.twig
+ */
+#}
+{%
+ set classes = [
+ 'field',
+ 'field--name-' ~ field_name|clean_class,
+ 'field--type-' ~ field_type|clean_class,
+ 'field--label-' ~ label_display,
+ ]
+%}
+<span{{ attributes.addClass(classes) }}>
+ {%- for item in items -%}
+ {{ item.content }}
+ {%- endfor -%}
+</span>
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/field/field--node--uid.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/field/field--node--uid.html.twig
new file mode 100644
index 0000000000..9afc591b71
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/field/field--node--uid.html.twig
@@ -0,0 +1,34 @@
+{#
+/**
+ * @file
+ * Theme override for the node user field.
+ *
+ * This is an override of field.html.twig for the node user field. See that
+ * template for documentation about its details and overrides.
+ *
+ * Available variables:
+ * - attributes: HTML attributes for the containing span element.
+ * - items: List of all the field items. Each item contains:
+ * - attributes: List of HTML attributes for each item.
+ * - content: The field item content.
+ * - entity_type: The entity type to which the field belongs.
+ * - field_name: The name of the field.
+ * - field_type: The type of the field.
+ * - label_display: The display settings for the label.
+ *
+ * @see field.html.twig
+ */
+#}
+{%
+ set classes = [
+ 'field',
+ 'field--name-' ~ field_name|clean_class,
+ 'field--type-' ~ field_type|clean_class,
+ 'field--label-' ~ label_display,
+ ]
+%}
+<span{{ attributes.addClass(classes) }}>
+ {%- for item in items -%}
+ {{ item.content }}
+ {%- endfor -%}
+</span>
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/field/field--text-long.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/field/field--text-long.html.twig
new file mode 100644
index 0000000000..07ce721d2d
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/field/field--text-long.html.twig
@@ -0,0 +1 @@
+{% extends "field--text.html.twig" %}
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/field/field--text-with-summary.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/field/field--text-with-summary.html.twig
new file mode 100644
index 0000000000..07ce721d2d
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/field/field--text-with-summary.html.twig
@@ -0,0 +1 @@
+{% extends "field--text.html.twig" %}
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/field/field--text.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/field/field--text.html.twig
new file mode 100644
index 0000000000..5d1690c3ec
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/field/field--text.html.twig
@@ -0,0 +1,28 @@
+{% extends "field.html.twig" %}
+{#
+/**
+ * @file
+ * Default theme implementation for a text field.
+ *
+ * A 'clearfix' class is added, because 'text' fields have a 'format' property
+ * that allows a Text Format to be associated with the entered text, which then
+ * applies filtering on output. A common use case is to align images to the left
+ * or right, and without this 'clearfix' class, such aligned images may be
+ * rendered outside of the 'text' field formatter's boundaries, and hence
+ * overlap with other fields. By setting the 'clearfix' class on all 'text'
+ * fields, we prevent that.
+ *
+ * @see https://www.drupal.org/node/2358529
+ *
+ * A 'text-formatted' class is added to assist with default styling of base
+ * elements such as paragraphs and lists that may not have classes assigned to
+ * them. This allows user entered content to have default styling without
+ * interfering with the styles of other UI components such as system generated
+ * lists or other dynamic content.
+ *
+ * @see https://www.drupal.org/node/2539860
+ *
+ * @ingroup themeable
+ */
+#}
+{% set attributes = attributes.addClass('clearfix', 'text-formatted') %}
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/field/field.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/field/field.html.twig
new file mode 100644
index 0000000000..1cfbd651ce
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/field/field.html.twig
@@ -0,0 +1,81 @@
+{#
+/**
+ * @file
+ * Theme override for a field.
+ *
+ * To override output, copy the "field.html.twig" from the templates directory
+ * to your theme's directory and customize it, just like customizing other
+ * Drupal templates such as page.html.twig or node.html.twig.
+ *
+ * Instead of overriding the theming for all fields, you can also just override
+ * theming for a subset of fields using
+ * @link themeable Theme hook suggestions. @endlink For example,
+ * here are some theme hook suggestions that can be used for a field_foo field
+ * on an article node type:
+ * - field--node--field-foo--article.html.twig
+ * - field--node--field-foo.html.twig
+ * - field--node--article.html.twig
+ * - field--field-foo.html.twig
+ * - field--text-with-summary.html.twig
+ * - field.html.twig
+ *
+ * Available variables:
+ * - attributes: HTML attributes for the containing element.
+ * - label_hidden: Whether to show the field label or not.
+ * - title_attributes: HTML attributes for the title.
+ * - label: The label for the field.
+ * - multiple: TRUE if a field can contain multiple items.
+ * - items: List of all the field items. Each item contains:
+ * - attributes: List of HTML attributes for each item.
+ * - content: The field item's content.
+ * - entity_type: The entity type to which the field belongs.
+ * - field_name: The name of the field.
+ * - field_type: The type of the field.
+ * - label_display: The display settings for the label.
+ *
+ *
+ * @see template_preprocess_field()
+ */
+#}
+{%
+ set classes = [
+ 'field',
+ 'field--name-' ~ field_name|clean_class,
+ 'field--type-' ~ field_type|clean_class,
+ 'field--label-' ~ label_display,
+ label_display == 'inline' ? 'clearfix',
+ ]
+%}
+{%
+ set title_classes = [
+ 'field__label',
+ label_display == 'visually_hidden' ? 'visually-hidden',
+ ]
+%}
+
+{% if label_hidden %}
+ {% if multiple %}
+ <div{{ attributes.addClass(classes, 'field__items') }}>
+ {% for item in items %}
+ <div{{ item.attributes.addClass('field__item') }}>{{ item.content }}</div>
+ {% endfor %}
+ </div>
+ {% else %}
+ {% for item in items %}
+ <div{{ attributes.addClass(classes, 'field__item') }}>{{ item.content }}</div>
+ {% endfor %}
+ {% endif %}
+{% else %}
+ <div{{ attributes.addClass(classes) }}>
+ <div{{ title_attributes.addClass(title_classes) }}>{{ label }}</div>
+ {% if multiple %}
+ <div class="field__items">
+ {% endif %}
+ {% for item in items %}
+ <div{{ item.attributes.addClass('field__item') }}>{{ item.content }}</div>
+ {% endfor %}
+ {% if multiple %}
+ </div>
+ {% endif %}
+ </div>
+{% endif %}
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/field/file-audio.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/field/file-audio.html.twig
new file mode 100644
index 0000000000..cd3f0acc54
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/field/file-audio.html.twig
@@ -0,0 +1,23 @@
+{#
+/**
+* @file
+* Default theme implementation to display the file entity as an audio tag.
+*
+* Available variables:
+* - attributes: An array of HTML attributes, intended to be added to the
+* audio tag.
+* - files: And array of files to be added as sources for the audio tag. Each
+* element is an array with the following elements:
+* - file: The full file object.
+* - source_attributes: An array of HTML attributes for to be added to the
+* source tag.
+*
+* @ingroup themeable
+*/
+#}
+{{ attach_library('umami/classy.file') }}
+<audio {{ attributes }}>
+ {% for file in files %}
+ <source {{ file.source_attributes }} />
+ {% endfor %}
+</audio>
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/field/file-link.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/field/file-link.html.twig
new file mode 100644
index 0000000000..a54df5cdb0
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/field/file-link.html.twig
@@ -0,0 +1,17 @@
+{#
+/**
+ * @file
+ * Theme override for a link to a file.
+ *
+ * Available variables:
+ * - attributes: The HTML attributes for the containing element.
+ * - link: A link to the file.
+ * - icon: The icon image representing the file type.
+ * - file_size: The size of the file.
+ *
+ * @see template_preprocess_file_link()
+ * @see stable_preprocess_image_widget()
+ */
+#}
+{{ attach_library('umami/classy.file') }}
+<span{{ attributes }}>{{ icon }} {{ link }}</span>
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/field/file-video.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/field/file-video.html.twig
new file mode 100644
index 0000000000..090639efb8
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/field/file-video.html.twig
@@ -0,0 +1,23 @@
+{#
+/**
+* @file
+* Default theme implementation to display the file entity as a video tag.
+*
+* Available variables:
+* - attributes: An array of HTML attributes, intended to be added to the
+* video tag.
+* - files: And array of files to be added as sources for the video tag. Each
+* element is an array with the following elements:
+* - file: The full file object.
+* - source_attributes: An array of HTML attributes for to be added to the
+* source tag.
+*
+* @ingroup themeable
+*/
+#}
+{{ attach_library('umami/classy.file') }}
+<video {{ attributes }}>
+ {% for file in files %}
+ <source {{ file.source_attributes }} />
+ {% endfor %}
+</video>
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/field/image.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/field/image.html.twig
new file mode 100644
index 0000000000..31f782bb60
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/field/image.html.twig
@@ -0,0 +1,18 @@
+{#
+/**
+ * @file
+ * Theme override of an image.
+ *
+ * Available variables:
+ * - attributes: HTML attributes for the img tag.
+ * - style_name: (optional) The name of the image style applied.
+ *
+ * @see template_preprocess_image()
+ */
+#}
+{%
+set classes = [
+ style_name ? 'image-style-' ~ style_name|clean_class,
+]
+%}
+<img{{ attributes.addClass(classes) }} />
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/field/link-formatter-link-separate.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/field/link-formatter-link-separate.html.twig
new file mode 100644
index 0000000000..cb94264c66
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/field/link-formatter-link-separate.html.twig
@@ -0,0 +1,22 @@
+{#
+/**
+ * @file
+ * Theme override of a link with separate title and URL elements.
+ *
+ * Available variables:
+ * - link: The link that has already been formatted by l().
+ * - title: (optional) A descriptive or alternate title for the link, which may
+ * be different than the actual link text.
+ *
+ * @see template_preprocess()
+ * @see template_preprocess_link_formatter_link_separate()
+ */
+#}
+{% spaceless %}
+ <div class="link-item">
+ {% if title %}
+ <div class="link-title">{{ title }}</div>
+ {% endif %}
+ <div class="link-url">{{ link }}</div>
+ </div>
+{% endspaceless %}
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/field/time.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/field/time.html.twig
new file mode 100644
index 0000000000..f2912b7f98
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/field/time.html.twig
@@ -0,0 +1,22 @@
+{#
+/**
+ * @file
+ * Theme override for a date / time element.
+ *
+ * Available variables
+ * - timestamp: (optional) A UNIX timestamp for the datetime attribute. If the
+ * datetime cannot be represented as a UNIX timestamp, use a valid datetime
+ * attribute value in attributes.datetime.
+ * - text: (optional) The content to display within the <time> element.
+ * Defaults to a human-readable representation of the timestamp value or the
+ * datetime attribute value using DateFormatter::format().
+ * - attributes: (optional) HTML attributes to apply to the <time> element.
+ * A datetime attribute in 'attributes' overrides the 'timestamp'. To
+ * create a valid datetime attribute value from a UNIX timestamp, use
+ * DateFormatter::format() with one of the predefined 'html_*' formats.
+ *
+ * @see template_preprocess_time()
+ * @see http://www.w3.org/TR/html5-author/the-time-element.html#attr-time-datetime
+ */
+#}
+<time{{ attributes.addClass('datetime') }}>{{ text }}</time>
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/form/datetime-form.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/form/datetime-form.html.twig
new file mode 100644
index 0000000000..f56182fdf2
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/form/datetime-form.html.twig
@@ -0,0 +1,15 @@
+{#
+/**
+ * @file
+ * Theme override of a datetime form element.
+ *
+ * Available variables:
+ * - attributes: HTML attributes for the datetime form element.
+ * - content: The datelist form element to be output.
+ *
+ * @see template_preprocess_datetime_form()
+ */
+#}
+<div{{ attributes.addClass('container-inline') }}>
+ {{ content }}
+</div>
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/form/datetime-wrapper.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/form/datetime-wrapper.html.twig
new file mode 100644
index 0000000000..5b52f2daa3
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/form/datetime-wrapper.html.twig
@@ -0,0 +1,36 @@
+{#
+/**
+ * @file
+ * Theme override of a datetime form wrapper.
+ *
+ * Available variables:
+ * - content: The form element to be output, usually a datelist, or datetime.
+ * - title: The title of the form element.
+ * - title_attributes: HTML attributes for the title wrapper.
+ * - description: Description text for the form element.
+ * - required: An indicator for whether the associated form element is required.
+ *
+ * @see template_preprocess_datetime_wrapper()
+ */
+#}
+{%
+ set title_classes = [
+ 'label',
+ required ? 'js-form-required',
+ required ? 'form-required',
+ ]
+%}
+{% if title %}
+ <h4{{ title_attributes.addClass(title_classes) }}>{{ title }}</h4>
+{% endif %}
+{{ content }}
+{% if errors %}
+ <div class="form-item--error-message">
+ <strong>{{ errors }}</strong>
+ </div>
+{% endif %}
+{% if description %}
+ <div{{ description_attributes.addClass('description') }}>
+ {{ description }}
+ </div>
+{% endif %}
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/form/details.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/form/details.html.twig
new file mode 100644
index 0000000000..c554096da9
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/form/details.html.twig
@@ -0,0 +1,44 @@
+{#
+/**
+ * @file
+ * Theme override for a details element.
+ *
+ * Available variables
+ * - attributes: A list of HTML attributes for the details element.
+ * - errors: (optional) Any errors for this details element, may not be set.
+ * - title: (optional) The title of the element, may not be set.
+ * - summary_attributes: A list of HTML attributes for the summary element.
+ * - description: (optional) The description of the element, may not be set.
+ * - children: (optional) The children of the element, may not be set.
+ * - value: (optional) The value of the element, may not be set.
+ *
+ * @see template_preprocess_details()
+ */
+#}
+<details{{ attributes }}>
+ {%- if title -%}
+ {%
+ set summary_classes = [
+ required ? 'js-form-required',
+ required ? 'form-required',
+ ]
+ %}
+ <summary{{ summary_attributes.addClass(summary_classes) }}>{{ title }}</summary>
+ {%- endif -%}
+ <div class="details-wrapper">
+ {% if errors %}
+ <div class="form-item--error-message">
+ <strong>{{ errors }}</strong>
+ </div>
+ {% endif %}
+ {%- if description -%}
+ <div class="details-description">{{ description }}</div>
+ {%- endif -%}
+ {%- if children -%}
+ {{ children }}
+ {%- endif -%}
+ {%- if value -%}
+ {{ value }}
+ {%- endif -%}
+ </div>
+</details>
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/form/fieldset.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/form/fieldset.html.twig
new file mode 100644
index 0000000000..0d089ed381
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/form/fieldset.html.twig
@@ -0,0 +1,60 @@
+{#
+/**
+ * @file
+ * Theme override for a fieldset element and its children.
+ *
+ * Available variables:
+ * - attributes: HTML attributes for the fieldset element.
+ * - errors: (optional) Any errors for this fieldset element, may not be set.
+ * - required: Boolean indicating whether the fieldeset element is required.
+ * - legend: The legend element containing the following properties:
+ * - title: Title of the fieldset, intended for use as the text of the legend.
+ * - attributes: HTML attributes to apply to the legend.
+ * - description: The description element containing the following properties:
+ * - content: The description content of the fieldset.
+ * - attributes: HTML attributes to apply to the description container.
+ * - children: The rendered child elements of the fieldset.
+ * - prefix: The content to add before the fieldset children.
+ * - suffix: The content to add after the fieldset children.
+ *
+ * @see template_preprocess_fieldset()
+ */
+#}
+{%
+ set classes = [
+ 'js-form-item',
+ 'form-item',
+ 'js-form-wrapper',
+ 'form-wrapper',
+ ]
+%}
+<fieldset{{ attributes.addClass(classes) }}>
+ {%
+ set legend_span_classes = [
+ 'fieldset-legend',
+ required ? 'js-form-required',
+ required ? 'form-required',
+ ]
+ %}
+ {# Always wrap fieldset legends in a <span> for CSS positioning. #}
+ <legend{{ legend.attributes }}>
+ <span{{ legend_span.attributes.addClass(legend_span_classes) }}>{{ legend.title }}</span>
+ </legend>
+ <div class="fieldset-wrapper">
+ {% if errors %}
+ <div class="form-item--error-message">
+ <strong>{{ errors }}</strong>
+ </div>
+ {% endif %}
+ {% if prefix %}
+ <span class="field-prefix">{{ prefix }}</span>
+ {% endif %}
+ {{ children }}
+ {% if suffix %}
+ <span class="field-suffix">{{ suffix }}</span>
+ {% endif %}
+ {% if description.content %}
+ <div{{ description.attributes.addClass('description') }}>{{ description.content }}</div>
+ {% endif %}
+ </div>
+</fieldset>
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/form/form-element-label.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/form/form-element-label.html.twig
new file mode 100644
index 0000000000..7c2f8f2223
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/form/form-element-label.html.twig
@@ -0,0 +1,25 @@
+{#
+/**
+ * @file
+ * Theme override for a form element label.
+ *
+ * Available variables:
+ * - title: The label's text.
+ * - title_display: Elements title_display setting.
+ * - required: An indicator for whether the associated form element is required.
+ * - attributes: A list of HTML attributes for the label.
+ *
+ * @see template_preprocess_form_element_label()
+ */
+#}
+{%
+ set classes = [
+ title_display == 'after' ? 'option',
+ title_display == 'invisible' ? 'visually-hidden',
+ required ? 'js-form-required',
+ required ? 'form-required',
+ ]
+%}
+{% if title is not empty or required -%}
+ <label{{ attributes.addClass(classes) }}>{{ title }}</label>
+{%- endif %}
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/form/form-element.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/form/form-element.html.twig
new file mode 100644
index 0000000000..3bde4f7115
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/form/form-element.html.twig
@@ -0,0 +1,95 @@
+{#
+/**
+ * @file
+ * Theme override for a form element.
+ *
+ * Available variables:
+ * - attributes: HTML attributes for the containing element.
+ * - errors: (optional) Any errors for this form element, may not be set.
+ * - prefix: (optional) The form element prefix, may not be set.
+ * - suffix: (optional) The form element suffix, may not be set.
+ * - required: The required marker, or empty if the associated form element is
+ * not required.
+ * - type: The type of the element.
+ * - name: The name of the element.
+ * - label: A rendered label element.
+ * - label_display: Label display setting. It can have these values:
+ * - before: The label is output before the element. This is the default.
+ * The label includes the #title and the required marker, if #required.
+ * - after: The label is output after the element. For example, this is used
+ * for radio and checkbox #type elements. If the #title is empty but the
+ * field is #required, the label will contain only the required marker.
+ * - invisible: Labels are critical for screen readers to enable them to
+ * properly navigate through forms but can be visually distracting. This
+ * property hides the label for everyone except screen readers.
+ * - attribute: Set the title attribute on the element to create a tooltip but
+ * output no label element. This is supported only for checkboxes and radios
+ * in \Drupal\Core\Render\Element\CompositeFormElementTrait::preRenderCompositeFormElement().
+ * It is used where a visual label is not needed, such as a table of
+ * checkboxes where the row and column provide the context. The tooltip will
+ * include the title and required marker.
+ * - description: (optional) A list of description properties containing:
+ * - content: A description of the form element, may not be set.
+ * - attributes: (optional) A list of HTML attributes to apply to the
+ * description content wrapper. Will only be set when description is set.
+ * - description_display: Description display setting. It can have these values:
+ * - before: The description is output before the element.
+ * - after: The description is output after the element. This is the default
+ * value.
+ * - invisible: The description is output after the element, hidden visually
+ * but available to screen readers.
+ * - disabled: True if the element is disabled.
+ * - title_display: Title display setting.
+ *
+ * @see template_preprocess_form_element()
+ */
+#}
+{%
+ set classes = [
+ 'js-form-item',
+ 'form-item',
+ 'js-form-type-' ~ type|clean_class,
+ 'form-type-' ~ type|clean_class,
+ 'js-form-item-' ~ name|clean_class,
+ 'form-item-' ~ name|clean_class,
+ title_display not in ['after', 'before'] ? 'form-no-label',
+ disabled == 'disabled' ? 'form-disabled',
+ errors ? 'form-item--error',
+ ]
+%}
+{%
+ set description_classes = [
+ 'description',
+ description_display == 'invisible' ? 'visually-hidden',
+ ]
+%}
+<div{{ attributes.addClass(classes) }}>
+ {% if label_display in ['before', 'invisible'] %}
+ {{ label }}
+ {% endif %}
+ {% if prefix is not empty %}
+ <span class="field-prefix">{{ prefix }}</span>
+ {% endif %}
+ {% if description_display == 'before' and description.content %}
+ <div{{ description.attributes }}>
+ {{ description.content }}
+ </div>
+ {% endif %}
+ {{ children }}
+ {% if suffix is not empty %}
+ <span class="field-suffix">{{ suffix }}</span>
+ {% endif %}
+ {% if label_display == 'after' %}
+ {{ label }}
+ {% endif %}
+ {% if errors %}
+ <div class="form-item--error-message">
+ <strong>{{ errors }}</strong>
+ </div>
+ {% endif %}
+ {% if description_display in ['after', 'invisible'] and description.content %}
+ <div{{ description.attributes.addClass(description_classes) }}>
+ {{ description.content }}
+ </div>
+ {% endif %}
+</div>
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/form/radios.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/form/radios.html.twig
new file mode 100644
index 0000000000..2e4bafd41c
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/form/radios.html.twig
@@ -0,0 +1,13 @@
+{#
+/**
+ * @file
+ * Theme override for a 'radios' #type form element.
+ *
+ * Available variables
+ * - attributes: A list of HTML attributes for the wrapper element.
+ * - children: The rendered radios.
+ *
+ * @see template_preprocess_radios()
+ */
+#}
+<div{{ attributes.addClass('form-radios') }}>{{ children }}</div>
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/form/textarea.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/form/textarea.html.twig
new file mode 100644
index 0000000000..99e1bde090
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/form/textarea.html.twig
@@ -0,0 +1,25 @@
+{#
+/**
+ * @file
+ * Theme override for a 'textarea' #type form element.
+ *
+ * Available variables
+ * - wrapper_attributes: A list of HTML attributes for the wrapper element.
+ * - attributes: A list of HTML attributes for the <textarea> element.
+ * - resizable: An indicator for whether the textarea is resizable.
+ * - required: An indicator for whether the textarea is required.
+ * - value: The textarea content.
+ *
+ * @see template_preprocess_textarea()
+ */
+#}
+{%
+ set classes = [
+ 'form-textarea',
+ resizable ? 'resize-' ~ resizable,
+ required ? 'required',
+ ]
+%}
+<div{{ wrapper_attributes.addClass('form-textarea-wrapper') }}>
+ <textarea{{ attributes.addClass(classes) }}>{{ value }}</textarea>
+</div>
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/layout/book-export-html.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/layout/book-export-html.html.twig
new file mode 100644
index 0000000000..ea33648d38
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/layout/book-export-html.html.twig
@@ -0,0 +1,45 @@
+{#
+/**
+ * @file
+ * Theme override for printed version of book outline.
+ *
+ * Available variables:
+ * - title: Top level node title.
+ * - head: Header tags.
+ * - language: Language object.
+ * - language_rtl: A flag indicating whether the current display language is a
+ * right to left language.
+ * - base_url: URL to the home page.
+ * - contents: Nodes within the current outline rendered through
+ * book-node-export-html.html.twig.
+ *
+ * @see template_preprocess_book_export_html()
+ */
+#}
+<!DOCTYPE html>
+<html{{ html_attributes }}>
+ <head>
+ <title>{{ title }}</title>
+ {{ page.head }}
+ <base href="{{ base_url }}" />
+ <link type="text/css" rel="stylesheet" href="misc/print.css" />
+ </head>
+ <body>
+ {#
+ The given node is embedded to its absolute depth in a top level section.
+ For example, a child node with depth 2 in the hierarchy is contained in
+ (otherwise empty) div elements corresponding to depth 0 and depth 1. This
+ is intended to support WYSIWYG output - e.g., level 3 sections always look
+ like level 3 sections, no matter their depth relative to the node selected
+ to be exported as printer-friendly HTML.
+ #}
+
+ {% for i in 1..depth-1 if depth > 1 %}
+ <div class="section-{{ i }}">
+ {% endfor %}
+ {{ contents }}
+ {% for i in 1..depth-1 if depth > 1 %}
+ </div>
+ {% endfor %}
+ </body>
+</html>
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/layout/html.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/layout/html.html.twig
new file mode 100644
index 0000000000..4fe57a01cf
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/layout/html.html.twig
@@ -0,0 +1,55 @@
+{#
+/**
+ * @file
+ * Theme override for the basic structure of a single Drupal page.
+ *
+ * Variables:
+ * - logged_in: A flag indicating if user is logged in.
+ * - root_path: The root path of the current page (e.g., node, admin, user).
+ * - node_type: The content type for the current node, if the page is a node.
+ * - head_title: List of text elements that make up the head_title variable.
+ * May contain one or more of the following:
+ * - title: The title of the page.
+ * - name: The name of the site.
+ * - slogan: The slogan of the site.
+ * - page_top: Initial rendered markup. This should be printed before 'page'.
+ * - page: The rendered page markup.
+ * - page_bottom: Closing rendered markup. This variable should be printed after
+ * 'page'.
+ * - db_offline: A flag indicating if the database is offline.
+ * - placeholder_token: The token for generating head, css, js and js-bottom
+ * placeholders.
+ *
+ * @see template_preprocess_html()
+ */
+#}
+{%
+ set body_classes = [
+ logged_in ? 'user-logged-in',
+ not root_path ? 'path-frontpage' : 'path-' ~ root_path|clean_class,
+ node_type ? 'page-node-type-' ~ node_type|clean_class,
+ db_offline ? 'db-offline',
+ ]
+%}
+<!DOCTYPE html>
+<html{{ html_attributes }}>
+ <head>
+ <head-placeholder token="{{ placeholder_token }}">
+ <title>{{ head_title|safe_join(' | ') }}</title>
+ <css-placeholder token="{{ placeholder_token }}">
+ <js-placeholder token="{{ placeholder_token }}">
+ </head>
+ <body{{ attributes.addClass(body_classes) }}>
+ {#
+ Keyboard navigation/accessibility link to main content section in
+ page.html.twig.
+ #}
+ <a href="#main-content" class="visually-hidden focusable skip-link">
+ {{ 'Skip to main content'|t }}
+ </a>
+ {{ page_top }}
+ {{ page }}
+ {{ page_bottom }}
+ <js-bottom-placeholder token="{{ placeholder_token }}">
+ </body>
+</html>
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/layout/maintenance-page.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/layout/maintenance-page.html.twig
new file mode 100644
index 0000000000..7463b0238c
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/layout/maintenance-page.html.twig
@@ -0,0 +1,65 @@
+{#
+/**
+ * @file
+ * Theme override to display a single Drupal page while offline.
+ *
+ * All available variables are mirrored in page.html.twig.
+ * Some may be blank but they are provided for consistency.
+ *
+ * @see template_preprocess_maintenance_page()
+ */
+#}
+<div class="layout-container">
+
+ <header role="banner">
+ {% if logo %}
+ <a href="{{ front_page }}" title="{{ 'Home'|t }}" rel="home">
+ <img src="{{ logo }}" alt="{{ 'Home'|t }}"/>
+ </a>
+ {% endif %}
+
+ {% if site_name or site_slogan %}
+ <div class="name-and-slogan">
+ {% if site_name %}
+ <h1 class="site-name">
+ <a href="{{ front_page }}" title="{{ 'Home'|t }}" rel="home">{{ site_name }}</a>
+ </h1>
+ {% endif %}
+
+ {% if site_slogan %}
+ <div class="site-slogan">{{ site_slogan }}</div>
+ {% endif %}
+ </div>{# /.name-and-slogan #}
+ {% endif %}
+
+ </header>
+
+ <main role="main">
+ {% if title %}
+ <h1>{{ title }}</h1>
+ {% endif %}
+
+ {{ page.highlighted }}
+
+ {{ page.content }}
+ </main>
+
+ {% if page.sidebar_first %}
+ <aside class="layout-sidebar-first" role="complementary">
+ {{ page.sidebar_first }}
+ </aside>{# /.layout-sidebar-first #}
+ {% endif %}
+
+ {% if page.sidebar_second %}
+ <aside class="layout-sidebar-second" role="complementary">
+ {{ page.sidebar_second }}
+ </aside>{# /.layout-sidebar-second #}
+ {% endif %}
+
+ {% if page.footer %}
+ <footer role="contentinfo">
+ {{ page.footer }}
+ </footer>
+ {% endif %}
+
+</div>{# /.layout-container #}
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/layout/region.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/layout/region.html.twig
new file mode 100644
index 0000000000..95e71cec37
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/layout/region.html.twig
@@ -0,0 +1,25 @@
+{#
+/**
+ * @file
+ * Theme override to display a region.
+ *
+ * Available variables:
+ * - content: The content for this region, typically blocks.
+ * - attributes: HTML attributes for the region <div>.
+ * - region: The name of the region variable as defined in the theme's
+ * .info.yml file.
+ *
+ * @see template_preprocess_region()
+ */
+#}
+{%
+ set classes = [
+ 'region',
+ 'region-' ~ region|clean_class,
+ ]
+%}
+{% if content %}
+ <div{{ attributes.addClass(classes) }}>
+ {{ content }}
+ </div>
+{% endif %}
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/media-library/container--media-library-content.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/media-library/container--media-library-content.html.twig
new file mode 100644
index 0000000000..7c930e2c7b
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/media-library/container--media-library-content.html.twig
@@ -0,0 +1,28 @@
+{#
+/**
+ * @file
+ * Theme implementation the content area of the modal media library dialog.
+ *
+ * The content area is everything that is not the menu of available media
+ * types. This includes the form to add new media items, if available, and
+ * the view of available media to select.
+ *
+ * Available variables:
+ * - attributes: HTML attributes for the containing element.
+ * - children: The rendered child elements of the container.
+ * - has_parent: A flag to indicate that the container has one or more parent
+ containers.
+ *
+ * @see template_preprocess_container()
+ *
+ * @ingroup themeable
+ */
+#}
+{%
+ set classes = [
+ has_parent ? 'js-form-wrapper',
+ has_parent ? 'form-wrapper',
+ 'media-library-content',
+ ]
+%}
+<div{{ attributes.addClass(classes) }}>{{ children }}</div>
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/media-library/container--media-library-widget-selection.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/media-library/container--media-library-widget-selection.html.twig
new file mode 100644
index 0000000000..7c0af44307
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/media-library/container--media-library-widget-selection.html.twig
@@ -0,0 +1,28 @@
+{#
+/**
+ * @file
+ * Theme implementation of a wrapper for selected media items.
+ *
+ * This is used to wrap around the set of media items that are currently
+ * selected in the media library widget (not the modal dialog), which may
+ * be used for entity reference fields that target media.
+ *
+ * Available variables:
+ * - attributes: HTML attributes for the containing element.
+ * - children: The rendered child elements of the container.
+ * - has_parent: A flag to indicate that the container has one or more parent
+ containers.
+ *
+ * @see template_preprocess_container()
+ *
+ * @ingroup themeable
+ */
+#}
+{%
+ set classes = [
+ has_parent ? 'js-form-wrapper',
+ has_parent ? 'form-wrapper',
+ 'media-library-selection',
+ ]
+%}
+<div{{ attributes.addClass(classes) }}>{{ children }}</div>
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/media-library/links--media-library-menu.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/media-library/links--media-library-menu.html.twig
new file mode 100644
index 0000000000..b2361574a8
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/media-library/links--media-library-menu.html.twig
@@ -0,0 +1,36 @@
+{% extends "links.html.twig" %}
+{#
+/**
+ * @file
+ * Theme implementation of the media type menu in the media library dialog.
+ *
+ * Available variables:
+ * - attributes: Attributes for the UL containing the list of links.
+ * - links: Links to be output.
+ * Each link will have the following elements:
+ * - link: (optional) A render array that returns a link. See
+ * template_preprocess_links() for details how it is generated.
+ * - text: The link text.
+ * - attributes: HTML attributes for the list item element.
+ * - text_attributes: (optional) HTML attributes for the span element if no
+ * 'url' was supplied.
+ * - heading: (optional) A heading to precede the links.
+ * - text: The heading text.
+ * - level: The heading level (e.g. 'h2', 'h3').
+ * - attributes: (optional) A keyed list of attributes for the heading.
+ * If the heading is a string, it will be used as the text of the heading and
+ * the level will default to 'h2'.
+ *
+ * Headings should be used on navigation menus and any list of links that
+ * consistently appears on multiple pages. To make the heading invisible use
+ * the 'visually-hidden' CSS class. Do not use 'display:none', which
+ * removes it from screen readers and assistive technology. Headings allow
+ * screen reader and keyboard only users to navigate to or skip the links.
+ * See http://juicystudio.com/article/screen-readers-display-none.php and
+ * http://www.w3.org/TR/WCAG-TECHS/H42.html for more information.
+ *
+ * @see classy_preprocess_links__media_library_menu()
+ * @see template_preprocess_links()
+ */
+#}
+{% set attributes = attributes.addClass('media-library-menu') %}
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/media-library/media--media-library.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/media-library/media--media-library.html.twig
new file mode 100644
index 0000000000..e88635424f
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/media-library/media--media-library.html.twig
@@ -0,0 +1,55 @@
+{#
+/**
+ * @file
+ * Theme override of a media item in the media library.
+ *
+ * This is used for media that the user can select from the grid of media
+ * items. It is not used for items that have already been selected in the
+ * corresponding field widget, or for items that have been previously selected
+ * before adding new media to the library.
+ *
+ * Available variables:
+ * - media: The entity with limited access to object properties and methods.
+ * Only method names starting with "get", "has", or "is" and a few common
+ * methods such as "id", "label", and "bundle" are available. For example:
+ * - entity.getEntityTypeId() will return the entity type ID.
+ * - entity.hasField('field_example') returns TRUE if the entity includes
+ * field_example. (This does not indicate the presence of a value in this
+ * field.)
+ * Calling other methods, such as entity.delete(), will result in an exception.
+ * See \Drupal\Core\Entity\EntityInterface for a full list of methods.
+ * - name: Name of the media.
+ * - content: Media content.
+ * - title_prefix: Additional output populated by modules, intended to be
+ * displayed in front of the main title tag that appears in the template.
+ * - title_suffix: Additional output populated by modules, intended to be
+ * displayed after the main title tag that appears in the template.
+ * - view_mode: View mode; for example, "teaser" or "full".
+ * - attributes: HTML attributes for the containing element.
+ * - title_attributes: Same as attributes, except applied to the main title
+ * tag that appears in the template.
+ * - url: Direct URL of the media.
+ * - preview_attributes: HTML attributes for the preview wrapper.
+ * - metadata_attributes: HTML attributes for the expandable metadata area.
+ * - status: Whether or not the Media is published.
+ *
+ * @see template_preprocess_media()
+ *
+ * @ingroup themeable
+ */
+#}
+<article{{ attributes }}>
+ {% if content %}
+ <div{{ preview_attributes.addClass('media-library-item__preview js-media-library-item-preview') }}>
+ {{ content|without('name') }}
+ </div>
+ {% if not status %}
+ <div class="media-library-item__status">{{ "unpublished" | t }}</div>
+ {% endif %}
+ <div{{ metadata_attributes.addClass('media-library-item__attributes') }}>
+ <div class="media-library-item__name">
+ {{ name }}
+ </div>
+ </div>
+ {% endif %}
+</article>
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/media-library/media-library-item--small.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/media-library/media-library-item--small.html.twig
new file mode 100644
index 0000000000..ba03858b7f
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/media-library/media-library-item--small.html.twig
@@ -0,0 +1,31 @@
+{#
+/**
+ * @file
+ * Default theme implementation of a media library item.
+ *
+ * This is used when displaying selected media items, either in the field
+ * widget or in the "Additional selected media" area when adding new
+ * media items in the media library modal dialog.
+ *
+ * Available variables:
+ * - attributes: HTML attributes for the containing element.
+ * - content: The content of the media library item, plus any additional
+ * fields or elements surrounding it.
+ *
+ * @see seven_preprocess_media_library_item__small()
+ * @see seven_preprocess_media_library_item__widget()
+ * @see template_preprocess_media_library_item()
+ *
+ * @ingroup themeable
+ */
+#}
+{%
+ set classes = [
+ 'media-library-item',
+ 'media-library-item--grid',
+ 'media-library-item--small',
+ ]
+%}
+<div{{ attributes.addClass(classes) }}>
+ {{ content }}
+</div>
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/media-library/media-library-item.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/media-library/media-library-item.html.twig
new file mode 100644
index 0000000000..297780e0f7
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/media-library/media-library-item.html.twig
@@ -0,0 +1,28 @@
+{#
+/**
+ * @file
+ * Default theme implementation of a media library item.
+ *
+ * This is used when displaying selected media items, either in the field
+ * widget or in the "Additional selected media" area when adding new
+ * media items in the media library modal dialog.
+ *
+ * Available variables:
+ * - attributes: HTML attributes for the containing element.
+ * - content: The content of the media library item, plus any additional
+ * fields or elements surrounding it.
+ *
+ * @see template_preprocess_media_library_item()
+ *
+ * @ingroup themeable
+ */
+#}
+{%
+ set classes = [
+ 'media-library-item',
+ 'media-library-item--grid',
+ ]
+%}
+<div{{ attributes.addClass(classes) }}>
+ {{ content }}
+</div>
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/media-library/media-library-wrapper.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/media-library/media-library-wrapper.html.twig
new file mode 100644
index 0000000000..850f63aa17
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/media-library/media-library-wrapper.html.twig
@@ -0,0 +1,21 @@
+{#
+/**
+ * @file
+ * Theme override of a container used to wrap the media library's modal dialog
+ * interface.
+ *
+ * Available variables:
+ * - attributes: HTML attributes for the containing element.
+ * - menu: The menu of availble media types to choose from.
+ * - content: The form to add new media items, followed by the grid or table of
+ * existing media items to choose from.
+ *
+ * @see template_preprocess_media_library_wrapper()
+ *
+ * @ingroup themeable
+ */
+#}
+<div{{ attributes.addClass('media-library-wrapper') }}>
+ {{ menu }}
+ {{ content }}
+</div>
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/media-library/views-view-unformatted--media-library.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/media-library/views-view-unformatted--media-library.html.twig
new file mode 100644
index 0000000000..a94d4e2b63
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/media-library/views-view-unformatted--media-library.html.twig
@@ -0,0 +1,35 @@
+{#
+/**
+ * @file
+ * Theme override of the media library view.
+ *
+ * This is used to display a grid of media items, in both the administrative
+ * interface and in the modal media library dialog's grid layout.
+ *
+ * Available variables:
+ * - title: The title of this group of rows. May be empty.
+ * - rows: A list of the view's row items.
+ * - attributes: The row's HTML attributes.
+ * - content: The row's content.
+ * - view: The view object.
+ * - default_row_class: A flag indicating whether default classes should be
+ * used on rows.
+ *
+ * @see template_preprocess_views_view_unformatted()
+ */
+#}
+{% if title %}
+ <h3>{{ title }}</h3>
+{% endif %}
+{% for row in rows %}
+ {%
+ set row_classes = [
+ default_row_class ? 'views-row',
+ 'media-library-item',
+ 'media-library-item--grid',
+ ]
+ %}
+ <div{{ row.attributes.addClass(row_classes) }}>
+ {{- row.content -}}
+ </div>
+{% endfor %}
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/misc/help-section.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/misc/help-section.html.twig
new file mode 100644
index 0000000000..6cfaa38da2
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/misc/help-section.html.twig
@@ -0,0 +1,48 @@
+{#
+/**
+ * @file
+ * Theme override for a section of the help page.
+ *
+ * This implementation divides the links into 4 columns.
+ *
+ * Available variables:
+ * - title: The section title.
+ * - description: The description text for the section.
+ * - links: Links to display in the section.
+ * - empty: Text to display if there are no links.
+ */
+#}
+<div class="clearfix">
+ <h2>{{ title }}</h2>
+ <p>{{ description }}</p>
+ {% if links %}
+ {# Calculate the column length, to divide links into 4 columns. #}
+ {% set size = links|length // 4 %}
+ {% if size * 4 < links|length %}
+ {% set size = size + 1 %}
+ {% endif %}
+
+ {# Output the links in 4 columns. #}
+ {% set count = 0 %}
+ {% for link in links %}
+ {% if count == 0 %}
+ {# Start a new column. #}
+ <div class="layout-column layout-column--quarter"><ul>
+ {% endif %}
+ <li>{{ link }}</li>
+ {% set count = count + 1 %}
+ {% if count >= size %}
+ {# End the current column. #}
+ {% set count = 0 %}
+ </ul></div>
+ {% endif %}
+ {% endfor %}
+
+ {# End the last column, if one is open. #}
+ {% if count > 0 %}
+ </ul></div>
+ {% endif %}
+ {% else %}
+ <p>{{ empty }}</p>
+ {% endif %}
+</div>
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/misc/progress-bar.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/misc/progress-bar.html.twig
new file mode 100644
index 0000000000..66d669b9d8
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/misc/progress-bar.html.twig
@@ -0,0 +1,22 @@
+{#
+/**
+ * @file
+ * Theme override for a progress bar.
+ *
+ * Note that the core Batch API uses this only for non-JavaScript batch jobs.
+ *
+ * Available variables:
+ * - label: The label of the working task.
+ * - percent: The percentage of the progress.
+ * - message: A string containing information to be displayed.
+ */
+#}
+{{ attach_library('umami/classy.progress') }}
+<div class="progress" data-drupal-progress>
+ {% if label %}
+ <div class="progress__label">{{ label }}</div>
+ {% endif %}
+ <div class="progress__track"><div class="progress__bar" style="width: {{ percent }}%"></div></div>
+ <div class="progress__percentage">{{ percent }}%</div>
+ <div class="progress__description">{{ message }}</div>
+</div>
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/misc/rdf-metadata.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/misc/rdf-metadata.html.twig
new file mode 100644
index 0000000000..acc62df16d
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/misc/rdf-metadata.html.twig
@@ -0,0 +1,20 @@
+{#
+/**
+ * @file
+ * Theme override for empty spans with RDF attributes.
+ *
+ * The XHTML+RDFa doctype allows either <span></span> or <span /> syntax to
+ * be used, but for maximum browser compatibility, W3C recommends the
+ * former when serving pages using the text/html media type, see
+ * http://www.w3.org/TR/xhtml1/#C_3.
+ *
+ * Available variables:
+ * - metadata: Each item within corresponds to its own set of attributes,
+ * and therefore, needs its own 'attributes' element.
+ *
+ * @see template_preprocess_rdf_metadata()
+ */
+#}
+{% for attributes in metadata %}
+ <span{{ attributes.addClass('rdf-meta', 'hidden') }}></span>
+{% endfor %}
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/navigation/book-all-books-block.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/navigation/book-all-books-block.html.twig
new file mode 100644
index 0000000000..b4cb64de3d
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/navigation/book-all-books-block.html.twig
@@ -0,0 +1,22 @@
+{#
+/**
+ * @file
+ * Theme override for rendering book outlines within a block.
+ *
+ * This template is used only when the block is configured to "show block on all
+ * pages", which presents multiple independent books on all pages.
+ *
+ * Available variables:
+ * - book_menus: Book outlines.
+ * - id: The parent book ID.
+ * - title: The parent book title.
+ * - menu: The top-level book links.
+ *
+ * @see template_preprocess_book_all_books_block()
+ */
+#}
+{% for book in book_menus %}
+ <nav id="book-block-menu-{{ book.id }}" class="book-block-menu" role="navigation" aria-label="{% trans %}Book outline for {{ book.title }}{% endtrans %}">
+ {{ book.menu }}
+ </nav>
+{% endfor %}
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/navigation/book-navigation.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/navigation/book-navigation.html.twig
new file mode 100644
index 0000000000..9b6e9fc03b
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/navigation/book-navigation.html.twig
@@ -0,0 +1,56 @@
+{#
+/**
+ * @file
+ * Theme override to navigate books.
+ *
+ * Presented under nodes that are a part of book outlines.
+ *
+ * Available variables:
+ * - tree: The immediate children of the current node rendered as an unordered
+ * list.
+ * - current_depth: Depth of the current node within the book outline. Provided
+ * for context.
+ * - prev_url: URL to the previous node.
+ * - prev_title: Title of the previous node.
+ * - parent_url: URL to the parent node.
+ * - parent_title: Title of the parent node. Not printed by default. Provided
+ * as an option.
+ * - next_url: URL to the next node.
+ * - next_title: Title of the next node.
+ * - has_links: Flags TRUE whenever the previous, parent or next data has a
+ * value.
+ * - book_id: The book ID of the current outline being viewed. Same as the node
+ * ID containing the entire outline. Provided for context.
+ * - book_url: The book/node URL of the current outline being viewed. Provided
+ * as an option. Not used by default.
+ * - book_title: The book/node title of the current outline being viewed.
+ *
+ * @see template_preprocess_book_navigation()
+ */
+#}
+{{ attach_library('umami/classy.book-navigation') }}
+{% if tree or has_links %}
+ <nav id="book-navigation-{{ book_id }}" class="book-navigation" role="navigation" aria-labelledby="book-label-{{ book_id }}">
+ {{ tree }}
+ {% if has_links %}
+ <h2 class="visually-hidden" id="book-label-{{ book_id }}">{{ 'Book traversal links for'|t }} {{ book_title }}</h2>
+ <ul class="book-pager">
+ {% if prev_url %}
+ <li class="book-pager__item book-pager__item--previous">
+ <a href="{{ prev_url }}" rel="prev" title="{{ 'Go to previous page'|t }}"><b>{{ '‹'|t }}</b> {{ prev_title }}</a>
+ </li>
+ {% endif %}
+ {% if parent_url %}
+ <li class="book-pager__item book-pager__item--center">
+ <a href="{{ parent_url }}" title="{{ 'Go to parent page'|t }}">{{ 'Up'|t }}</a>
+ </li>
+ {% endif %}
+ {% if next_url %}
+ <li class="book-pager__item book-pager__item--next">
+ <a href="{{ next_url }}" rel="next" title="{{ 'Go to next page'|t }}">{{ next_title }} <b>{{ '›'|t }}</b></a>
+ </li>
+ {% endif %}
+ </ul>
+ {% endif %}
+ </nav>
+{% endif %}
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/navigation/book-tree.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/navigation/book-tree.html.twig
new file mode 100644
index 0000000000..94fac5598b
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/navigation/book-tree.html.twig
@@ -0,0 +1,55 @@
+{#
+/**
+ * @file
+ * Theme override to display a book tree.
+ *
+ * Returns HTML for a wrapper for a book sub-tree.
+ *
+ * Available variables:
+ * - items: A nested list of book items. Each book item contains:
+ * - attributes: HTML attributes for the book item.
+ * - below: The book item child items.
+ * - title: The book link title.
+ * - url: The book link URL, instance of \Drupal\Core\Url.
+ * - is_expanded: TRUE if the link has visible children within the current
+ * book tree.
+ * - is_collapsed: TRUE if the link has children within the current book tree
+ * that are not currently visible.
+ * - in_active_trail: TRUE if the link is in the active trail.
+ */
+#}
+{% import _self as book_tree %}
+
+{#
+ We call a macro which calls itself to render the full tree.
+ @see https://twig.symfony.com/doc/1.x/tags/macro.html
+#}
+{{ book_tree.book_links(items, attributes, 0) }}
+
+{% macro book_links(items, attributes, menu_level) %}
+ {% import _self as book_tree %}
+ {% if items %}
+ {% if menu_level == 0 %}
+ <ul{{ attributes.addClass('menu') }}>
+ {% else %}
+ <ul class="menu">
+ {% endif %}
+ {% for item in items %}
+ {%
+ set classes = [
+ 'menu-item',
+ item.is_expanded ? 'menu-item--expanded',
+ item.is_collapsed ? 'menu-item--collapsed',
+ item.in_active_trail ? 'menu-item--active-trail',
+ ]
+ %}
+ <li{{ item.attributes.addClass(classes) }}>
+ {{ link(item.title, item.url) }}
+ {% if item.below %}
+ {{ book_tree.book_links(item.below, attributes, menu_level + 1) }}
+ {% endif %}
+ </li>
+ {% endfor %}
+ </ul>
+ {% endif %}
+{% endmacro %}
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/navigation/toolbar.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/navigation/toolbar.html.twig
new file mode 100644
index 0000000000..20f12d48b2
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/navigation/toolbar.html.twig
@@ -0,0 +1,46 @@
+{#
+/**
+ * @file
+ * Theme override for the administrative toolbar.
+ *
+ * Available variables:
+ * - attributes: HTML attributes for the wrapper.
+ * - toolbar_attributes: HTML attributes to apply to the toolbar.
+ * - toolbar_heading: The heading or label for the toolbar.
+ * - tabs: List of tabs for the toolbar.
+ * - attributes: HTML attributes for the tab container.
+ * - link: Link or button for the menu tab.
+ * - trays: Toolbar tray list, each associated with a tab. Each tray in trays
+ * contains:
+ * - attributes: HTML attributes to apply to the tray.
+ * - label: The tray's label.
+ * - links: The tray menu links.
+ * - remainder: Any non-tray, non-tab elements left to be rendered.
+ *
+ * @see template_preprocess_toolbar()
+ */
+#}
+<div{{ attributes.addClass('toolbar') }}>
+ <nav{{ toolbar_attributes.addClass('toolbar-bar', 'clearfix') }}>
+ <h2 class="visually-hidden">{{ toolbar_heading }}</h2>
+ {% for key, tab in tabs %}
+ {% set tray = trays[key] %}
+ <div{{ tab.attributes.addClass('toolbar-tab') }}>
+ {{ tab.link }}
+ {% spaceless %}
+ <div{{ tray.attributes }}>
+ {% if tray.label %}
+ <nav class="toolbar-lining clearfix" role="navigation" aria-label="{{ tray.label }}">
+ <h3 class="toolbar-tray-name visually-hidden">{{ tray.label }}</h3>
+ {% else %}
+ <nav class="toolbar-lining clearfix" role="navigation">
+ {% endif %}
+ {{ tray.links }}
+ </nav>
+ </div>
+ {% endspaceless %}
+ </div>
+ {% endfor %}
+ </nav>
+ {{ remainder }}
+</div>
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/user/forum-submitted.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/user/forum-submitted.html.twig
new file mode 100644
index 0000000000..57311e96b5
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/user/forum-submitted.html.twig
@@ -0,0 +1,21 @@
+{#
+/**
+ * @file
+ * Theme override for a forum post submission string.
+ *
+ * The submission string indicates when and by whom a topic was submitted.
+ *
+ * Available variables:
+ * - author: The author of the post.
+ * - time: How long ago the post was created.
+ * - topic: An object with the raw data of the post. Potentially unsafe. Be
+ * sure to clean this data before printing.
+ *
+ * @see template_preprocess_forum_submitted()
+ */
+#}
+{% if time %}
+ <span class="submitted">{% trans %}By {{ author }} {{ time }} ago{% endtrans %}</span>
+{% else %}
+ {{ 'n/a'|t }}
+{% endif %}
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/user/user.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/user/user.html.twig
new file mode 100644
index 0000000000..9a824effd3
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/user/user.html.twig
@@ -0,0 +1,23 @@
+{#
+/**
+ * @file
+ * Theme override to present all user data.
+ *
+ * This template is used when viewing a registered user's page,
+ * e.g., example.com/user/123. 123 being the user's ID.
+ *
+ * Available variables:
+ * - content: A list of content items. Use 'content' to print all content, or
+ * print a subset such as 'content.field_example'. Fields attached to a user
+ * such as 'user_picture' are available as 'content.user_picture'.
+ * - attributes: HTML attributes for the container element.
+ * - user: A Drupal User entity.
+ *
+ * @see template_preprocess_user()
+ */
+#}
+<article{{ attributes.addClass('profile') }}>
+ {% if content %}
+ {{- content -}}
+ {% endif %}
+</article>
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/user/username.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/user/username.html.twig
new file mode 100644
index 0000000000..df694dff69
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/user/username.html.twig
@@ -0,0 +1,29 @@
+{#
+/**
+ * @file
+ * Theme override for displaying a username.
+ *
+ * Available variables:
+ * - account: The full account information for the user.
+ * - uid: The user ID, or zero if not a user. As used in anonymous comments.
+ * - name: The user's name, sanitized, and optionally truncated.
+ * - name_raw: The user's name, un-truncated.
+ * - truncated: Whether the user's name was truncated.
+ * - extra: Additional text to append to the user's name, sanitized.
+ * - profile_access: Whether the current user has permission to access this
+ users profile page.
+ * - link_path: The path or URL of the user's profile page, home page,
+ * or other desired page to link to for more information about the user.
+ * - homepage: (optional) The home page of the account, only set for non users.
+ * - link_options: Options to set on the \Drupal\Core\Url object if linking the
+ * user's name to the user's page.
+ * - attributes: HTML attributes for the containing element.
+ *
+ * @see template_preprocess_username()
+ */
+#}
+{% if link_path -%}
+ <a{{ attributes.addClass('username') }}>{{ name }}{{ extra }}</a>
+{%- else -%}
+ <span{{ attributes }}>{{ name }}{{ extra }}</span>
+{%- endif -%}
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/views/views-exposed-form.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/views/views-exposed-form.html.twig
new file mode 100644
index 0000000000..3c679ae583
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/views/views-exposed-form.html.twig
@@ -0,0 +1,21 @@
+{#
+/**
+ * @file
+ * Theme override for a views exposed form.
+ *
+ * Available variables:
+ * - form: A render element representing the form.
+ *
+ * @see template_preprocess_views_exposed_form()
+ */
+#}
+{% if q is not empty %}
+ {#
+ This ensures that, if clean URLs are off, the 'q' is added first,
+ as a hidden form element, so that it shows up first in the POST URL.
+ #}
+{{ q }}
+{% endif %}
+<div class="form--inline clearfix">
+ {{ form }}
+</div>
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/views/views-mini-pager.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/views/views-mini-pager.html.twig
new file mode 100644
index 0000000000..4b46f2bb1f
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/views/views-mini-pager.html.twig
@@ -0,0 +1,42 @@
+{#
+/**
+ * @file
+ * Theme override for a views mini-pager.
+ *
+ * Available variables:
+ * - heading_id: Pagination heading ID.
+ * - items: List of pager items.
+ *
+ * @see template_preprocess_views_mini_pager()
+ */
+#}
+{% if items.previous or items.next %}
+ <nav class="pager" role="navigation" aria-labelledby="{{ heading_id }}">
+ <h4 id="{{ heading_id }}" class="pager__heading visually-hidden">{{ 'Pagination'|t }}</h4>
+ <ul class="pager__items js-pager__items">
+ {% if items.previous %}
+ <li class="pager__item pager__item--previous">
+ <a href="{{ items.previous.href }}" title="{{ 'Go to previous page'|t }}" rel="prev"{{ items.previous.attributes|without('href', 'title', 'rel') }}>
+ <span class="visually-hidden">{{ 'Previous page'|t }}</span>
+ <span aria-hidden="true">{{ items.previous.text|default('‹‹'|t) }}</span>
+ </a>
+ </li>
+ {% endif %}
+ {% if items.current %}
+ <li class="pager__item is-active">
+ {% trans %}
+ Page {{ items.current }}
+ {% endtrans %}
+ </li>
+ {% endif %}
+ {% if items.next %}
+ <li class="pager__item pager__item--next">
+ <a href="{{ items.next.href }}" title="{{ 'Go to next page'|t }}" rel="next"{{ items.next.attributes|without('href', 'title', 'rel') }}>
+ <span class="visually-hidden">{{ 'Next page'|t }}</span>
+ <span aria-hidden="true">{{ items.next.text|default('››'|t) }}</span>
+ </a>
+ </li>
+ {% endif %}
+ </ul>
+ </nav>
+{% endif %}
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/views/views-view-grouping.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/views/views-view-grouping.html.twig
new file mode 100644
index 0000000000..44905e56b7
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/views/views-view-grouping.html.twig
@@ -0,0 +1,20 @@
+{#
+/**
+ * @file
+ * Theme override to display a single views grouping.
+ *
+ * Available variables:
+ * - view: The view object.
+ * - grouping: The grouping instruction.
+ * - grouping_level: A number indicating the hierarchical level of the grouping.
+ * - title: The group heading.
+ * - content: The content to be grouped.
+ * - rows: The rows returned from the view.
+ *
+ * @see template_preprocess_views_view_grouping()
+ */
+#}
+<div class="view-grouping">
+ <div class="view-grouping-header">{{ title }}</div>
+ <div class="view-grouping-content">{{ content }}</div>
+</div>
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/views/views-view-row-rss.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/views/views-view-row-rss.html.twig
new file mode 100644
index 0000000000..aee08aee6e
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/views/views-view-row-rss.html.twig
@@ -0,0 +1,30 @@
+{#
+/**
+ * @file
+ * Theme override to display an item in a views RSS feed.
+ *
+ * Available variables:
+ * - title: RSS item title.
+ * - link: RSS item link.
+ * - description: RSS body text.
+ * - item_elements: RSS item elements to be rendered as XML (pubDate, creator,
+ * guid).
+ *
+ * @see template_preprocess_views_view_row_rss()
+ *
+ * @ingroup themeable
+ */
+#}
+<item>
+ <title>{{ title }}</title>
+ <link>{{ link }}</link>
+ <description>{{ description }}</description>
+ {% for item in item_elements -%}
+ <{{ item.key }}{{ item.attributes -}}
+ {% if item.value -%}
+ >{{ item.value }}</{{ item.key }}>
+ {% else -%}
+ {{ ' />' }}
+ {% endif %}
+ {%- endfor %}
+</item>
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/views/views-view-summary-unformatted.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/views/views-view-summary-unformatted.html.twig
new file mode 100644
index 0000000000..151734e948
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/views/views-view-summary-unformatted.html.twig
@@ -0,0 +1,31 @@
+{#
+/**
+ * @file
+ * Theme override for unformatted summary links.
+ *
+ * Available variables:
+ * - rows: The rows contained in this view.
+ * - url: The URL to this row's content.
+ * - count: The number of items this summary item represents.
+ * - separator: A separator between each row.
+ * - attributes: HTML attributes for a row.
+ * - active: A flag indicating whether the row is active.
+ * - options: Flags indicating how each row should be displayed. This contains:
+ * - count: A flag indicating whether the row's 'count' should be displayed.
+ * - inline: A flag indicating whether the item should be wrapped in an inline
+ * or block level HTML element.
+ *
+ * @see template_preprocess_views_view_summary_unformatted()
+ */
+#}
+{% for row in rows %}
+ {{ options.inline ? '<span' : '<div' }} class="views-summary views-summary-unformatted">
+ {% if row.separator -%}
+ {{ row.separator }}
+ {%- endif %}
+ <a href="{{ row.url }}"{{ row.attributes.addClass(row.active ? 'is-active')|without('href') }}>{{ row.link }}</a>
+ {% if options.count %}
+ ({{ row.count }})
+ {% endif %}
+ {{ options.inline ? '</span>' : '</div>' }}
+{% endfor %}
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/views/views-view-summary.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/views/views-view-summary.html.twig
new file mode 100644
index 0000000000..3190a45ada
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/views/views-view-summary.html.twig
@@ -0,0 +1,31 @@
+{#
+/**
+ * @file
+ * Theme override to display a list of summary lines.
+ *
+ * Available variables:
+ * - rows: The rows contained in this view.
+ * Each row contains:
+ * - url: The summary link URL.
+ * - link: The summary link text.
+ * - count: The number of items under this grouping.
+ * - attributes: HTML attributes to apply to each row.
+ * - active: A flag indicating whether the row is active.
+ * - options: Flags indicating how the summary should be displayed.
+ * This contains:
+ * - count: A flag indicating whether the count should be displayed.
+ *
+ * @see template_preprocess_views_view_summary()
+ */
+#}
+<div class="item-list">
+ <ul class="views-summary">
+ {% for row in rows %}
+ <li><a href="{{ row.url }}"{{ row.attributes.addClass(row.active ? 'is-active')|without('href') }}>{{ row.link }}</a>
+ {% if options.count %}
+ ({{ row.count }})
+ {% endif %}
+ </li>
+ {% endfor %}
+ </ul>
+</div>
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/views/views-view-table.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/views/views-view-table.html.twig
new file mode 100644
index 0000000000..edc14983da
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/views/views-view-table.html.twig
@@ -0,0 +1,120 @@
+{#
+/**
+ * @file
+ * Theme override for displaying a view as a table.
+ *
+ * Available variables:
+ * - attributes: Remaining HTML attributes for the element.
+ * - class: HTML classes that can be used to style contextually through CSS.
+ * - title : The title of this group of rows.
+ * - header: The table header columns.
+ * - attributes: Remaining HTML attributes for the element.
+ * - content: HTML classes to apply to each header cell, indexed by
+ * the header's key.
+ * - default_classes: A flag indicating whether default classes should be
+ * used.
+ * - caption_needed: Is the caption tag needed.
+ * - caption: The caption for this table.
+ * - accessibility_description: Extended description for the table details.
+ * - accessibility_summary: Summary for the table details.
+ * - rows: Table row items. Rows are keyed by row number.
+ * - attributes: HTML classes to apply to each row.
+ * - columns: Row column items. Columns are keyed by column number.
+ * - attributes: HTML classes to apply to each column.
+ * - content: The column content.
+ * - default_classes: A flag indicating whether default classes should be
+ * used.
+ * - responsive: A flag indicating whether table is responsive.
+ * - sticky: A flag indicating whether table header is sticky.
+ * - summary_element: A render array with table summary information (if any).
+ *
+ * @see template_preprocess_views_view_table()
+ */
+#}
+{%
+ set classes = [
+ 'views-table',
+ 'views-view-table',
+ 'cols-' ~ header|length,
+ responsive ? 'responsive-enabled',
+ sticky ? 'sticky-enabled',
+ ]
+%}
+<table{{ attributes.addClass(classes) }}>
+ {% if caption_needed %}
+ <caption>
+ {% if caption %}
+ {{ caption }}
+ {% else %}
+ {{ title }}
+ {% endif %}
+ {% if (summary_element is not empty) %}
+ {{ summary_element }}
+ {% endif %}
+ </caption>
+ {% endif %}
+ {% if header %}
+ <thead>
+ <tr>
+ {% for key, column in header %}
+ {% if column.default_classes %}
+ {%
+ set column_classes = [
+ 'views-field',
+ 'views-field-' ~ fields[key],
+ ]
+ %}
+ {% endif %}
+ <th{{ column.attributes.addClass(column_classes).setAttribute('scope', 'col') }}>
+ {%- if column.wrapper_element -%}
+ <{{ column.wrapper_element }}>
+ {%- if column.url -%}
+ <a href="{{ column.url }}" title="{{ column.title }}" rel="nofollow">{{ column.content }}{{ column.sort_indicator }}</a>
+ {%- else -%}
+ {{ column.content }}{{ column.sort_indicator }}
+ {%- endif -%}
+ </{{ column.wrapper_element }}>
+ {%- else -%}
+ {%- if column.url -%}
+ <a href="{{ column.url }}" title="{{ column.title }}" rel="nofollow">{{ column.content }}{{ column.sort_indicator }}</a>
+ {%- else -%}
+ {{- column.content }}{{ column.sort_indicator }}
+ {%- endif -%}
+ {%- endif -%}
+ </th>
+ {% endfor %}
+ </tr>
+ </thead>
+ {% endif %}
+ <tbody>
+ {% for row in rows %}
+ <tr{{ row.attributes }}>
+ {% for key, column in row.columns %}
+ {% if column.default_classes %}
+ {%
+ set column_classes = [
+ 'views-field'
+ ]
+ %}
+ {% for field in column.fields %}
+ {% set column_classes = column_classes|merge(['views-field-' ~ field]) %}
+ {% endfor %}
+ {% endif %}
+ <td{{ column.attributes.addClass(column_classes) }}>
+ {%- if column.wrapper_element -%}
+ <{{ column.wrapper_element }}>
+ {% for content in column.content %}
+ {{ content.separator }}{{ content.field_output }}
+ {% endfor %}
+ </{{ column.wrapper_element }}>
+ {%- else -%}
+ {% for content in column.content %}
+ {{- content.separator }}{{ content.field_output -}}
+ {% endfor %}
+ {%- endif %}
+ </td>
+ {% endfor %}
+ </tr>
+ {% endfor %}
+ </tbody>
+</table>
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/views/views-view.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/views/views-view.html.twig
new file mode 100644
index 0000000000..769a86849e
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/views/views-view.html.twig
@@ -0,0 +1,95 @@
+{#
+/**
+ * @file
+ * Theme override for a main view template.
+ *
+ * Available variables:
+ * - attributes: Remaining HTML attributes for the element.
+ * - css_name: A CSS-safe version of the view name.
+ * - css_class: The user-specified classes names, if any.
+ * - header: The optional header.
+ * - footer: The optional footer.
+ * - rows: The results of the view query, if any.
+ * - empty: The content to display if there are no rows.
+ * - pager: The optional pager next/prev links to display.
+ * - exposed: Exposed widget form/info to display.
+ * - feed_icons: Optional feed icons to display.
+ * - more: An optional link to the next page of results.
+ * - title: Title of the view, only used when displaying in the admin preview.
+ * - title_prefix: Additional output populated by modules, intended to be
+ * displayed in front of the view title.
+ * - title_suffix: Additional output populated by modules, intended to be
+ * displayed after the view title.
+ * - attachment_before: An optional attachment view to be displayed before the
+ * view content.
+ * - attachment_after: An optional attachment view to be displayed after the
+ * view content.
+ * - dom_id: Unique id for every view being printed to give unique class for
+ * Javascript.
+ *
+ * @see template_preprocess_views_view()
+ */
+#}
+{%
+ set classes = [
+ 'view',
+ 'view-' ~ id|clean_class,
+ 'view-id-' ~ id,
+ 'view-display-id-' ~ display_id,
+ dom_id ? 'js-view-dom-id-' ~ dom_id,
+ ]
+%}
+<div{{ attributes.addClass(classes) }}>
+ {{ title_prefix }}
+ {% if title %}
+ {{ title }}
+ {% endif %}
+ {{ title_suffix }}
+ {% if header %}
+ <div class="view-header">
+ {{ header }}
+ </div>
+ {% endif %}
+ {% if exposed %}
+ <div class="view-filters">
+ {{ exposed }}
+ </div>
+ {% endif %}
+ {% if attachment_before %}
+ <div class="attachment attachment-before">
+ {{ attachment_before }}
+ </div>
+ {% endif %}
+
+ {% if rows %}
+ <div class="view-content">
+ {{ rows }}
+ </div>
+ {% elseif empty %}
+ <div class="view-empty">
+ {{ empty }}
+ </div>
+ {% endif %}
+
+ {% if pager %}
+ {{ pager }}
+ {% endif %}
+ {% if attachment_after %}
+ <div class="attachment attachment-after">
+ {{ attachment_after }}
+ </div>
+ {% endif %}
+ {% if more %}
+ {{ more }}
+ {% endif %}
+ {% if footer %}
+ <div class="view-footer">
+ {{ footer }}
+ </div>
+ {% endif %}
+ {% if feed_icons %}
+ <div class="feed-icons">
+ {{ feed_icons }}
+ </div>
+ {% endif %}
+</div>
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/components/navigation/menu-local-tasks.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/components/navigation/menu-local-tasks.html.twig
new file mode 100644
index 0000000000..77ebc63cbe
--- /dev/null
+++ b/web/core/profiles/demo_umami/themes/umami/templates/components/navigation/menu-local-tasks.html.twig
@@ -0,0 +1,21 @@
+{#
+/**
+ * @file
+ * Theme override to display primary and secondary local tasks.
+ *
+ * Available variables:
+ * - primary: HTML list items representing primary tasks.
+ * - secondary: HTML list items representing primary tasks.
+ *
+ * Each item in these variables (primary and secondary) can be individually
+ * themed in menu-local-task.html.twig.
+ */
+#}
+{% if primary %}
+ <h2 class="visually-hidden">{{ 'Primary tabs'|t }}</h2>
+ <ul class="tabs primary">{{ primary }}</ul>
+{% endif %}
+{% if secondary %}
+ <h2 class="visually-hidden">{{ 'Secondary tabs'|t }}</h2>
+ <ul class="tabs secondary">{{ secondary }}</ul>
+{% endif %}
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/content/node--article--full.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/content/node--article--full.html.twig
index 7cd0fe0f53..55ae577b32 100644
--- a/web/core/profiles/demo_umami/themes/umami/templates/content/node--article--full.html.twig
+++ b/web/core/profiles/demo_umami/themes/umami/templates/content/node--article--full.html.twig
@@ -77,7 +77,7 @@
]
%}
{% set created_date = node.getCreatedTime|format_date('umami_dates') %}
-{{ attach_library('classy/node') }}
+{{ attach_library('umami/classy.node') }}
<article{{ attributes.addClass(classes) }}>
{{ title_prefix }}
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/content/node--card-common.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/content/node--card-common.html.twig
index 7def0d41d3..00ccfb68b5 100644
--- a/web/core/profiles/demo_umami/themes/umami/templates/content/node--card-common.html.twig
+++ b/web/core/profiles/demo_umami/themes/umami/templates/content/node--card-common.html.twig
@@ -77,7 +77,7 @@
view_mode ? 'node--view-mode-' ~ view_mode|clean_class,
]
%}
-{{ attach_library('classy/node') }}
+{{ attach_library('umami/classy.node') }}
{{ attach_library('umami/view-mode-card') }}
{% block libraries %}
{{ attach_library('umami/view-mode-card-common') }}
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/content/node--card.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/content/node--card.html.twig
index 8a12756154..9835c2e0fe 100644
--- a/web/core/profiles/demo_umami/themes/umami/templates/content/node--card.html.twig
+++ b/web/core/profiles/demo_umami/themes/umami/templates/content/node--card.html.twig
@@ -77,7 +77,7 @@
view_mode ? 'node--view-mode-' ~ view_mode|clean_class,
]
%}
-{{ attach_library('classy/node') }}
+{{ attach_library('umami/classy.node') }}
{{ attach_library('umami/view-mode-card') }}
<article{{ attributes.addClass(classes) }}>
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/content/node.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/content/node.html.twig
index 359f926dd1..64122a3024 100644
--- a/web/core/profiles/demo_umami/themes/umami/templates/content/node.html.twig
+++ b/web/core/profiles/demo_umami/themes/umami/templates/content/node.html.twig
@@ -77,7 +77,7 @@
]
%}
{% set created_date = node.getCreatedTime|format_date('umami_dates') %}
-{{ attach_library('classy/node') }}
+{{ attach_library('umami/classy.node') }}
<article{{ attributes.addClass(classes) }}>
diff --git a/web/core/profiles/demo_umami/themes/umami/umami.info.yml b/web/core/profiles/demo_umami/themes/umami/umami.info.yml
index 1b006153d0..36f3da0fde 100644
--- a/web/core/profiles/demo_umami/themes/umami/umami.info.yml
+++ b/web/core/profiles/demo_umami/themes/umami/umami.info.yml
@@ -11,7 +11,22 @@ libraries:
- umami/webfonts-scope-one
libraries-override:
+ classy/base: umami/classy.base
+ classy/book-navigation: umami/classy.book-navigation
+ classy/dialog: umami/classy.dialog
+ classy/dropbutton: umami/classy.dropbutton
+ classy/file: umami/classy.file
+ classy/forum: umami/classy.forum
+ classy/image-widget: umami/classy.image-widget
+ classy/indented: umami/classy.indented
+ classy/media_embed_ckeditor_theme: umami/classy.media_embed_ckeditor_theme
+ classy/media_embed_error: umami/classy.media_embed_error
+ classy/media_library: umami/classy.media_library
classy/messages: false
+ classy/node: umami/classy.node
+ classy/progress: umami/classy.progress
+ classy/search-results: umami/classy.search-results
+ classy/user: umami/classy.user
layout_builder/twocol_section:
css:
theme:
@@ -28,6 +43,22 @@ libraries-override:
libraries-extend:
tour/tour-styling:
- umami/demo-umami-tour
+ core/drupal.dialog:
+ - umami/classy.dialog
+ core/drupal.dropbutton:
+ - umami/classy.dropbutton
+ core/drupal.progress:
+ - umami/classy.progress
+ file/drupal.file:
+ - umami/classy.file
+ media/media_embed_ckeditor_theme:
+ - umami/classy.media_embed_ckeditor_theme
+ media_library/view:
+ - umami/classy.media_library
+ media_library/widget:
+ - umami/classy.media_library
+ user/drupal.user:
+ - umami/classy.user
regions:
pre_header: Pre-header
@@ -44,3 +75,6 @@ regions:
bottom: Bottom
page_top: 'Page top' # Needed by Drupal Core
page_bottom: 'Page bottom' # Needed by Drupal Core
+
+ckeditor_stylesheets:
+ - css/classy/components/media-embed-error.css
diff --git a/web/core/profiles/demo_umami/themes/umami/umami.libraries.yml b/web/core/profiles/demo_umami/themes/umami/umami.libraries.yml
index 0e2db3db81..ccb8e3b18d 100644
--- a/web/core/profiles/demo_umami/themes/umami/umami.libraries.yml
+++ b/web/core/profiles/demo_umami/themes/umami/umami.libraries.yml
@@ -130,3 +130,114 @@ oneplusfourgrid_section:
css:
theme:
layouts/oneplusfourgrid_section/oneplusfourgrid_section.css: {}
+
+classy.base:
+ version: VERSION
+ css:
+ component:
+ css/classy/components/action-links.css: { weight: -10 }
+ css/classy/components/breadcrumb.css: { weight: -10 }
+ css/classy/components/button.css: { weight: -10 }
+ css/classy/components/collapse-processed.css: { weight: -10 }
+ css/classy/components/container-inline.css: { weight: -10 }
+ css/classy/components/details.css: { weight: -10 }
+ css/classy/components/exposed-filters.css: { weight: -10 }
+ css/classy/components/field.css: { weight: -10 }
+ css/classy/components/form.css: { weight: -10 }
+ css/classy/components/icons.css: { weight: -10 }
+ css/classy/components/inline-form.css: { weight: -10 }
+ css/classy/components/item-list.css: { weight: -10 }
+ css/classy/components/link.css: { weight: -10 }
+ css/classy/components/links.css: { weight: -10 }
+ css/classy/components/menu.css: { weight: -10 }
+ css/classy/components/more-link.css: { weight: -10 }
+ css/classy/components/pager.css: { weight: -10 }
+ css/classy/components/tabledrag.css: { weight: -10 }
+ css/classy/components/tableselect.css: { weight: -10 }
+ css/classy/components/tablesort.css: { weight: -10 }
+ css/classy/components/tabs.css: { weight: -10 }
+ css/classy/components/textarea.css: { weight: -10 }
+ css/classy/components/ui-dialog.css: { weight: -10 }
+
+classy.book-navigation:
+ version: VERSION
+ css:
+ component:
+ css/classy/components/book-navigation.css: {}
+
+classy.dialog:
+ version: VERSION
+ css:
+ component:
+ css/classy/components/dialog.css: { weight: -10 }
+
+classy.dropbutton:
+ version: VERSION
+ css:
+ component:
+ css/classy/components/dropbutton.css: { weight: -10 }
+
+classy.file:
+ version: VERSION
+ css:
+ component:
+ css/classy/components/file.css: { weight: -10 }
+
+classy.forum:
+ version: VERSION
+ css:
+ component:
+ css/classy/components/forum.css: { weight: -10 }
+
+classy.image-widget:
+ version: VERSION
+ css:
+ component:
+ css/classy/components/image-widget.css: {}
+
+classy.indented:
+ version: VERSION
+ css:
+ component:
+ css/classy/components/indented.css: {}
+
+classy.media_embed_ckeditor_theme:
+ version: VERSION
+ js:
+ js/classy/media_embed_ckeditor.theme.js: {}
+
+classy.media_embed_error:
+ version: VERSION
+ css:
+ component:
+ css/classy/components/media-embed-error.css: {}
+
+classy.media_library:
+ version: VERSION
+ css:
+ layout:
+ css/classy/layout/media-library.css: {}
+
+classy.node:
+ version: VERSION
+ css:
+ component:
+ css/classy/components/node.css: { weight: -10 }
+
+classy.progress:
+ version: VERSION
+ css:
+ component:
+ css/classy/components/progress.css: { weight: -10 }
+
+classy.search-results:
+ version: VERSION
+ css:
+ component:
+ css/classy/components/search-results.css: {}
+
+classy.user:
+ version: VERSION
+ css:
+ component:
+ css/classy/components/user.css: { weight: -10 }
diff --git a/web/core/profiles/minimal/tests/src/Functional/MinimalTest.php b/web/core/profiles/minimal/tests/src/Functional/MinimalTest.php
index b0c587e937..48894a13b7 100644
--- a/web/core/profiles/minimal/tests/src/Functional/MinimalTest.php
+++ b/web/core/profiles/minimal/tests/src/Functional/MinimalTest.php
@@ -29,7 +29,7 @@ public function testMinimal() {
$this->drupalGet('');
// Check the login block is present.
$this->assertLink(t('Create new account'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Create a user to test tools and navigation blocks for logged in users
// with appropriate permissions.
diff --git a/web/core/profiles/standard/config/optional/media.type.remote_video.yml b/web/core/profiles/standard/config/optional/media.type.remote_video.yml
index 7b4e5df7b4..f2e7b330ea 100644
--- a/web/core/profiles/standard/config/optional/media.type.remote_video.yml
+++ b/web/core/profiles/standard/config/optional/media.type.remote_video.yml
@@ -6,7 +6,7 @@ label: 'Remote video'
description: 'A remotely hosted video from YouTube or Vimeo.'
source: 'oembed:video'
queue_thumbnail_downloads: false
-new_revision: false
+new_revision: true
source_configuration:
thumbnails_directory: 'public://oembed_thumbnails'
providers:
diff --git a/web/core/profiles/standard/tests/src/Functional/StandardTest.php b/web/core/profiles/standard/tests/src/Functional/StandardTest.php
index 1f7c111edf..2acd63c7bb 100644
--- a/web/core/profiles/standard/tests/src/Functional/StandardTest.php
+++ b/web/core/profiles/standard/tests/src/Functional/StandardTest.php
@@ -40,7 +40,7 @@ public function testStandard() {
$this->drupalGet('');
$this->assertLink(t('Contact'));
$this->clickLink(t('Contact'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Test anonymous user can access 'Main navigation' block.
$this->adminUser = $this->drupalCreateUser([
@@ -69,14 +69,14 @@ public function testStandard() {
':id' => 'block-bartik-help',
]);
- $this->assertEqual(count($elements), 1, 'Found complementary role on help block.');
+ $this->assertCount(1, $elements, 'Found complementary role on help block.');
$this->drupalGet('');
$elements = $this->xpath('//div[@role=:role and @id=:id]', [
':role' => 'complementary',
':id' => 'block-bartik-powered',
]);
- $this->assertEqual(count($elements), 1, 'Found complementary role on powered by block.');
+ $this->assertCount(1, $elements, 'Found complementary role on powered by block.');
// Verify anonymous user can see the block.
$this->drupalLogout();
@@ -153,7 +153,7 @@ public function testStandard() {
$this->adminUser->addRole($role->id());
$this->adminUser->save();
$this->drupalGet('node/add');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Ensure that there are no pending updates after installation.
$this->drupalLogin($this->rootUser);
diff --git a/web/core/tests/Drupal/BuildTests/Composer/Template/ComposerProjectTemplatesTest.php b/web/core/tests/Drupal/BuildTests/Composer/Template/ComposerProjectTemplatesTest.php
index d6d90504e1..fe667d27a4 100644
--- a/web/core/tests/Drupal/BuildTests/Composer/Template/ComposerProjectTemplatesTest.php
+++ b/web/core/tests/Drupal/BuildTests/Composer/Template/ComposerProjectTemplatesTest.php
@@ -104,12 +104,44 @@ public function testVerifyTemplateTestProviderIsAccurate() {
* @dataProvider provideTemplateCreateProject
*/
public function testTemplateCreateProject($project, $package_dir, $docroot_dir) {
- $this->copyCodebase();
+ $composer_version_line = exec('composer --version');
+ if (strpos($composer_version_line, 'Composer version 2') !== FALSE) {
+ // @todo Remove in https://www.drupal.org/project/drupal/issues/3128631
+ $this->markTestSkipped("Composer 2 not supported for this test yet.");
+ }
+
+ // Make a working COMPOSER_HOME directory for setting global composer config
+ $composer_home = $this->getWorkspaceDirectory() . '/composer-home';
+ mkdir($composer_home);
+
+ // Disable packagist globally (but only in our own custom COMPOSER_HOME).
+ // It is necessary to do this globally rather than in our SUT composer.json
+ // in order to ensure that Packagist is disabled during the
+ // `composer create-project` command.
+ $this->executeCommand("COMPOSER_HOME=$composer_home composer config --no-interaction --global repo.packagist false");
+ $this->assertCommandSuccessful();
// Get the Drupal core version branch. For instance, this should be
// 8.9.x-dev for the 8.9.x branch.
$core_version = Composer::drupalVersionBranch();
+ // Create a "Composer"-type repository containing one entry for every
+ // package in the vendor directory.
+ $vendor_packages_path = $this->getWorkspaceDirectory() . '/vendor_packages/packages.json';
+ $this->makeVendorPackage($vendor_packages_path);
+
+ // Make a copy of the code to alter.
+ $this->copyCodebase();
+
+ // Remove the packages.drupal.org entry (and any other custom repository)
+ // from the SUT's repositories section. There is no way to do this via
+ // `composer config --unset`, so we read and rewrite composer.json.
+ $composer_json_path = $this->getWorkspaceDirectory() . "/$package_dir/composer.json";
+ $composer_json = json_decode(file_get_contents($composer_json_path), TRUE);
+ unset($composer_json['repositories']);
+ $json = json_encode($composer_json, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
+ file_put_contents($composer_json_path, $json);
+
// Set up the template to use our path repos. Inclusion of metapackages is
// reported differently, so we load up a separate set for them.
$metapackage_path_repos = $this->getPathReposForType($this->getWorkspaceDirectory(), 'Metapackage');
@@ -117,17 +149,20 @@ public function testTemplateCreateProject($project, $package_dir, $docroot_dir)
// Always add drupal/core as a path repo.
$path_repos['drupal/core'] = $this->getWorkspaceDirectory() . '/core';
foreach ($path_repos as $name => $path) {
- $this->executeCommand('composer config repositories.' . $name . ' path ' . $path, $package_dir);
+ $this->executeCommand("composer config --no-interaction repositories.$name path $path", $package_dir);
$this->assertCommandSuccessful();
}
+ $this->executeCommand("composer config --no-interaction repositories.local composer file://" . $vendor_packages_path, $package_dir);
+ $this->assertCommandSuccessful();
+
$repository_path = $this->getWorkspaceDirectory() . '/test_repository/packages.json';
$this->makeTestPackage($repository_path, $core_version);
$autoloader = $this->getWorkspaceDirectory() . '/testproject' . $docroot_dir . '/autoload.php';
$this->assertFileNotExists($autoloader);
- $this->executeCommand("COMPOSER_CORE_VERSION=$core_version composer create-project $project testproject $core_version -s dev -vv --repository $repository_path");
+ $this->executeCommand("COMPOSER_HOME=$composer_home COMPOSER_ROOT_VERSION=$core_version composer create-project --no-ansi $project testproject $core_version -s dev -vv --repository $repository_path");
$this->assertCommandSuccessful();
// Ensure we used the project from our codebase.
@@ -135,7 +170,8 @@ public function testTemplateCreateProject($project, $package_dir, $docroot_dir)
// Ensure that we used drupal/core from our codebase. This probably means
// that drupal/core-recommended was added successfully by the project.
$this->assertErrorOutputContains("Installing drupal/core ($core_version): Symlinking from");
- // Verify that there is an autoloader.
+ // Verify that there is an autoloader. This is written by the scaffold
+ // plugin, so its existence assures us that scaffolding happened.
$this->assertFileExists($autoloader);
// In order to verify that Composer used the path repos for our project, we
@@ -208,4 +244,45 @@ protected function makeTestPackage($repository_path, $version) {
file_put_contents($repository_path, $json);
}
+ /**
+ * Creates a test package that points to all the projects in vendor.
+ *
+ * @param string $repository_path
+ * The path where to create the test package.
+ */
+ protected function makeVendorPackage($repository_path) {
+ $root = $this->getDrupalRoot();
+ $process = $this->executeCommand("composer --working-dir=$root info --format=json");
+ $this->assertCommandSuccessful();
+ $installed = json_decode($process->getOutput(), TRUE);
+
+ // Build out package definitions for everything installed in
+ // the vendor directory.
+ $packages = [];
+ foreach ($installed['installed'] as $project) {
+ $name = $project['name'];
+ $version = $project['version'];
+ $path = "vendor/$name";
+ $full_path = "$root/$path";
+ // We are building a set of path repositories to projects in the vendor
+ // directory, so we will skip any project that does not exist in vendor.
+ if (is_dir($full_path)) {
+ $packages['packages'][$name] = [
+ $version => [
+ "name" => $name,
+ "dist" => [
+ "type" => "path",
+ "url" => $path,
+ ],
+ "version" => $version,
+ ],
+ ];
+ }
+ }
+
+ $json = json_encode($packages, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
+ mkdir(dirname($repository_path));
+ file_put_contents($repository_path, $json);
+ }
+
}
diff --git a/web/core/tests/Drupal/BuildTests/Framework/BuildTestBase.php b/web/core/tests/Drupal/BuildTests/Framework/BuildTestBase.php
index 47a086064f..c13eafeeb3 100644
--- a/web/core/tests/Drupal/BuildTests/Framework/BuildTestBase.php
+++ b/web/core/tests/Drupal/BuildTests/Framework/BuildTestBase.php
@@ -7,6 +7,7 @@
use Behat\Mink\Mink;
use Behat\Mink\Session;
use Drupal\Component\FileSystem\FileSystem as DrupalFilesystem;
+use Drupal\Tests\PhpunitCompatibilityTrait;
use PHPUnit\Framework\TestCase;
use Symfony\Component\BrowserKit\Client as SymfonyClient;
use Symfony\Component\Filesystem\Filesystem as SymfonyFilesystem;
@@ -52,6 +53,7 @@
abstract class BuildTestBase extends TestCase {
use ExternalCommandRequirementsTrait;
+ use PhpunitCompatibilityTrait;
/**
* The working directory where this test will manipulate files.
@@ -266,7 +268,7 @@ public function getWorkspaceDirectory() {
* Text we expect to find in the error output of the command.
*/
public function assertErrorOutputContains($expected) {
- $this->assertContains($expected, $this->commandProcess->getErrorOutput());
+ $this->assertStringContainsString($expected, $this->commandProcess->getErrorOutput());
}
/**
@@ -276,7 +278,7 @@ public function assertErrorOutputContains($expected) {
* Text we expect to find in the output of the command.
*/
public function assertCommandOutputContains($expected) {
- $this->assertContains($expected, $this->commandProcess->getOutput());
+ $this->assertStringContainsString($expected, $this->commandProcess->getOutput());
}
/**
diff --git a/web/core/tests/Drupal/FunctionalJavascriptTests/Ajax/AjaxFormCacheTest.php b/web/core/tests/Drupal/FunctionalJavascriptTests/Ajax/AjaxFormCacheTest.php
index 00f01d7514..f4b4e8ff4f 100644
--- a/web/core/tests/Drupal/FunctionalJavascriptTests/Ajax/AjaxFormCacheTest.php
+++ b/web/core/tests/Drupal/FunctionalJavascriptTests/Ajax/AjaxFormCacheTest.php
@@ -33,7 +33,7 @@ public function testFormCacheUsage() {
$this->drupalLogin($this->rootUser);
// Ensure that the cache is empty.
- $this->assertEqual(0, count($key_value_expirable->getAll()));
+ $this->assertCount(0, $key_value_expirable->getAll());
// Visit an AJAX form that is not cached, 3 times.
$uncached_form_url = Url::fromRoute('ajax_forms_test.commands_form');
@@ -42,7 +42,7 @@ public function testFormCacheUsage() {
$this->drupalGet($uncached_form_url);
// The number of cache entries should not have changed.
- $this->assertEqual(0, count($key_value_expirable->getAll()));
+ $this->assertCount(0, $key_value_expirable->getAll());
}
/**
diff --git a/web/core/tests/Drupal/FunctionalJavascriptTests/Ajax/AjaxFormPageCacheTest.php b/web/core/tests/Drupal/FunctionalJavascriptTests/Ajax/AjaxFormPageCacheTest.php
index 1ac000ce74..88d90f669b 100644
--- a/web/core/tests/Drupal/FunctionalJavascriptTests/Ajax/AjaxFormPageCacheTest.php
+++ b/web/core/tests/Drupal/FunctionalJavascriptTests/Ajax/AjaxFormPageCacheTest.php
@@ -37,7 +37,7 @@ protected function setUp() {
*/
protected function getFormBuildId() {
$build_id_fields = $this->xpath('//input[@name="form_build_id"]');
- $this->assertEquals(count($build_id_fields), 1, 'One form build id field on the page');
+ $this->assertCount(1, $build_id_fields, 'One form build id field on the page');
return $build_id_fields[0]->getValue();
}
diff --git a/web/core/tests/Drupal/FunctionalJavascriptTests/Ajax/AjaxTest.php b/web/core/tests/Drupal/FunctionalJavascriptTests/Ajax/AjaxTest.php
index 87e2f88cd5..c8b784d48c 100644
--- a/web/core/tests/Drupal/FunctionalJavascriptTests/Ajax/AjaxTest.php
+++ b/web/core/tests/Drupal/FunctionalJavascriptTests/Ajax/AjaxTest.php
@@ -63,7 +63,7 @@ public function testDrupalSettingsCachingRegression() {
$libraries = $session->evaluateScript('drupalSettings.ajaxPageState.libraries');
// Test that the fake library is set.
- $this->assertContains($fake_library, $libraries);
+ $this->assertStringContainsString($fake_library, $libraries);
// Click on the AJAX link.
$this->clickLink('Link 8 (ajax)');
@@ -71,20 +71,20 @@ public function testDrupalSettingsCachingRegression() {
// Test that the fake library is still set after the AJAX call.
$libraries = $session->evaluateScript('drupalSettings.ajaxPageState.libraries');
- $this->assertContains($fake_library, $libraries);
+ $this->assertStringContainsString($fake_library, $libraries);
// Reload the page, this should reset the loaded libraries and remove the
// fake library.
$this->drupalGet('ajax-test/dialog');
$libraries = $session->evaluateScript('drupalSettings.ajaxPageState.libraries');
- $this->assertNotContains($fake_library, $libraries);
+ $this->assertStringNotContainsString($fake_library, $libraries);
// Click on the AJAX link again, and the libraries should still not contain
// the fake library.
$this->clickLink('Link 8 (ajax)');
$assert->assertWaitOnAjaxRequest();
$libraries = $session->evaluateScript('drupalSettings.ajaxPageState.libraries');
- $this->assertNotContains($fake_library, $libraries);
+ $this->assertStringNotContainsString($fake_library, $libraries);
}
/**
diff --git a/web/core/tests/Drupal/FunctionalJavascriptTests/Ajax/CommandsTest.php b/web/core/tests/Drupal/FunctionalJavascriptTests/Ajax/CommandsTest.php
index 8dee3fed69..143c2161be 100644
--- a/web/core/tests/Drupal/FunctionalJavascriptTests/Ajax/CommandsTest.php
+++ b/web/core/tests/Drupal/FunctionalJavascriptTests/Ajax/CommandsTest.php
@@ -151,7 +151,7 @@ protected function assertWaitPageContains($text) {
$page->waitFor(10, function () use ($page, $text) {
return stripos($page->getContent(), $text) !== FALSE;
});
- $this->assertContains($text, $page->getContent());
+ $this->assertStringContainsString($text, $page->getContent());
}
}
diff --git a/web/core/tests/Drupal/FunctionalJavascriptTests/Ajax/DialogTest.php b/web/core/tests/Drupal/FunctionalJavascriptTests/Ajax/DialogTest.php
index e6f7c666e1..3ea9d7aea0 100644
--- a/web/core/tests/Drupal/FunctionalJavascriptTests/Ajax/DialogTest.php
+++ b/web/core/tests/Drupal/FunctionalJavascriptTests/Ajax/DialogTest.php
@@ -72,7 +72,7 @@ public function testDialog() {
$dialog = $this->assertSession()->waitForElementVisible('css', 'div.ui-dialog');
$this->assertNotNull($dialog, 'Link was used to open a dialog ( non-modal, with options )');
$style = $dialog->getAttribute('style');
- $this->assertContains('width: 400px;', $style, new FormattableMarkup('Modal respected the dialog-options width parameter. Style = style', ['%style' => $style]));
+ $this->assertStringContainsString('width: 400px;', $style, new FormattableMarkup('Modal respected the dialog-options width parameter. Style = style', ['%style' => $style]));
// Reset: Return to the dialog links page.
$this->drupalGet('ajax-test/dialog');
diff --git a/web/core/tests/Drupal/FunctionalJavascriptTests/Ajax/ElementValidationTest.php b/web/core/tests/Drupal/FunctionalJavascriptTests/Ajax/ElementValidationTest.php
index ad85e98b2a..f1867d3c0c 100644
--- a/web/core/tests/Drupal/FunctionalJavascriptTests/Ajax/ElementValidationTest.php
+++ b/web/core/tests/Drupal/FunctionalJavascriptTests/Ajax/ElementValidationTest.php
@@ -44,7 +44,7 @@ public function testAjaxElementValidation() {
$this->assertNotNull($placeholder_text, 'A callback successfully echoed back a string.');
$this->drupalGet('ajax_validation_test');
- // Partialy complete the form with a number.
+ // Partially complete the form with a number.
$page->fillField('drivernumber', '12345');
$page->findField('spare_required_field')->focus();
diff --git a/web/core/tests/Drupal/FunctionalJavascriptTests/Ajax/FormValuesTest.php b/web/core/tests/Drupal/FunctionalJavascriptTests/Ajax/FormValuesTest.php
index 0911bbe1d7..7439b927d8 100644
--- a/web/core/tests/Drupal/FunctionalJavascriptTests/Ajax/FormValuesTest.php
+++ b/web/core/tests/Drupal/FunctionalJavascriptTests/Ajax/FormValuesTest.php
@@ -61,7 +61,7 @@ public function testSimpleAjaxFormValue() {
// Verify that AJAX elements with invalid callbacks return error code 500.
// Ensure the test error log is empty before these tests.
- $this->assertFalse(file_exists(DRUPAL_ROOT . '/' . $this->siteDirectory . '/error.log'), 'PHP error.log is empty.');
+ $this->assertFileNotExists(DRUPAL_ROOT . '/' . $this->siteDirectory . '/error.log');
// We don't need to check for the X-Drupal-Ajax-Token header with these
// invalid requests.
$this->assertAjaxHeader = FALSE;
@@ -75,8 +75,8 @@ public function testSimpleAjaxFormValue() {
// The select element is enabled as the response is receieved.
$this->assertSession()->waitForElement('css', "select[name=\"$element_name\"]:enabled");
- $this->assertTrue(file_exists(DRUPAL_ROOT . '/' . $this->siteDirectory . '/error.log'), 'PHP error.log is not empty.');
- $this->assertContains('"The specified #ajax callback is empty or not callable."', file_get_contents(DRUPAL_ROOT . '/' . $this->siteDirectory . '/error.log'));
+ $this->assertFileExists(DRUPAL_ROOT . '/' . $this->siteDirectory . '/error.log');
+ $this->assertStringContainsString('"The specified #ajax callback is empty or not callable."', file_get_contents(DRUPAL_ROOT . '/' . $this->siteDirectory . '/error.log'));
// The exceptions are expected. Do not interpret them as a test failure.
// Not using File API; a potential error must trigger a PHP warning.
unlink(\Drupal::root() . '/' . $this->siteDirectory . '/error.log');
diff --git a/web/core/tests/Drupal/FunctionalJavascriptTests/Ajax/MultiFormTest.php b/web/core/tests/Drupal/FunctionalJavascriptTests/Ajax/MultiFormTest.php
index 0a1547f8f5..b417de5baf 100644
--- a/web/core/tests/Drupal/FunctionalJavascriptTests/Ajax/MultiFormTest.php
+++ b/web/core/tests/Drupal/FunctionalJavascriptTests/Ajax/MultiFormTest.php
@@ -82,7 +82,7 @@ public function testMultiForm() {
$session = $this->getSession();
$page = $session->getPage();
$fields = $page->findAll('xpath', $form_xpath . $field_xpath);
- $this->assertEqual(count($fields), 2);
+ $this->assertCount(2, $fields);
foreach ($fields as $field) {
$this->assertCount(1, $field->findAll('xpath', '.' . $field_items_xpath_suffix), 'Found the correct number of field items on the initial page.');
$this->assertFieldsByValue($field->find('xpath', '.' . $button_xpath_suffix), NULL, 'Found the "add more" button on the initial page.');
@@ -106,7 +106,7 @@ public function testMultiForm() {
// After AJAX request and response page will update.
$page_updated = $session->getPage();
$field = $page_updated->findAll('xpath', '.' . $field_xpath);
- $this->assertEqual(count($field[0]->find('xpath', '.' . $field_items_xpath_suffix)), $i + 2, 'Found the correct number of field items after an AJAX submission.');
+ $this->assertCount($i + 2, $field[0]->find('xpath', '.' . $field_items_xpath_suffix), 'Found the correct number of field items after an AJAX submission.');
$this->assertFieldsByValue($field[0]->find('xpath', '.' . $button_xpath_suffix), NULL, 'Found the "add more" button after an AJAX submission.');
$this->assertNoDuplicateIds();
}
diff --git a/web/core/tests/Drupal/FunctionalJavascriptTests/Core/JsMessageTest.php b/web/core/tests/Drupal/FunctionalJavascriptTests/Core/JsMessageTest.php
index b99f32da14..b13ef49fe7 100644
--- a/web/core/tests/Drupal/FunctionalJavascriptTests/Core/JsMessageTest.php
+++ b/web/core/tests/Drupal/FunctionalJavascriptTests/Core/JsMessageTest.php
@@ -50,8 +50,8 @@ public function testAddRemoveMessages() {
$selector = "$messagesSelector .messages.messages--$type";
$msg_element = $web_assert->waitForElementVisible('css', $selector);
$this->assertNotEmpty($msg_element, "Message element visible: $selector");
- $web_assert->elementContains('css', $selector, "This is a message of the type, $type. You be the the judge of its importance.");
- $current_messages[$selector] = "This is a message of the type, $type. You be the the judge of its importance.";
+ $web_assert->elementContains('css', $selector, "This is a message of the type, $type. You be the judge of its importance.");
+ $current_messages[$selector] = "This is a message of the type, $type. You be the judge of its importance.";
$this->assertCurrentMessages($current_messages, $messagesSelector);
}
// Remove messages 1 by 1 and confirm the messages are expected.
@@ -69,7 +69,7 @@ public function testAddRemoveMessages() {
$types = JSMessageTestController::getTypes();
$nb_messages = count($types) * 2;
for ($i = 0; $i < $nb_messages; $i++) {
- $current_messages[] = "This is message number $i of the type, {$types[$i % count($types)]}. You be the the judge of its importance.";
+ $current_messages[] = "This is message number $i of the type, {$types[$i % count($types)]}. You be the judge of its importance.";
}
// Test adding multiple messages at once.
// @see processMessages()
diff --git a/web/core/tests/Drupal/FunctionalJavascriptTests/Core/MachineNameTest.php b/web/core/tests/Drupal/FunctionalJavascriptTests/Core/MachineNameTest.php
index aaa9440e75..3e25c97a7b 100644
--- a/web/core/tests/Drupal/FunctionalJavascriptTests/Core/MachineNameTest.php
+++ b/web/core/tests/Drupal/FunctionalJavascriptTests/Core/MachineNameTest.php
@@ -73,11 +73,16 @@ public function testMachineName() {
$machine_name_2_wrapper = $machine_name_2_field->getParent();
$machine_name_1_value = $page->find('css', '#edit-machine-name-1-label-machine-name-suffix .machine-name-value');
$machine_name_2_value = $page->find('css', '#edit-machine-name-2-label-machine-name-suffix .machine-name-value');
+ $machine_name_3_value = $page->find('css', '#edit-machine-name-3-label-machine-name-suffix .machine-name-value');
$button_1 = $page->find('css', '#edit-machine-name-1-label-machine-name-suffix button.link');
- // Assert both fields are initialized correctly.
+ // Assert all fields are initialized correctly.
$this->assertNotEmpty($machine_name_1_value, 'Machine name field 1 must be initialized');
$this->assertNotEmpty($machine_name_2_value, 'Machine name field 2 must be initialized');
+ $this->assertNotEmpty($machine_name_3_value, 'Machine name field 3 must be initialized');
+
+ // Assert that a machine name based on a default value is initialized.
+ $this->assertJsCondition('jQuery("#edit-machine-name-3-label-machine-name-suffix .machine-name-value").html() == "yet_another_machine_name"');
// Field must be present for the rest of the test to work.
if (empty($machine_name_1_value)) {
diff --git a/web/core/tests/Drupal/FunctionalJavascriptTests/EntityReference/EntityReferenceAutocompleteWidgetTest.php b/web/core/tests/Drupal/FunctionalJavascriptTests/EntityReference/EntityReferenceAutocompleteWidgetTest.php
index 0b86802c98..a8ab676bed 100644
--- a/web/core/tests/Drupal/FunctionalJavascriptTests/EntityReference/EntityReferenceAutocompleteWidgetTest.php
+++ b/web/core/tests/Drupal/FunctionalJavascriptTests/EntityReference/EntityReferenceAutocompleteWidgetTest.php
@@ -66,9 +66,9 @@ public function testEntityReferenceAutocompleteWidget() {
]);
// To satisfy config schema, the size setting must be an integer, not just
// a numeric value. See https://www.drupal.org/node/2885441.
- $this->assertInternalType('integer', $form_display->getComponent($field_name)['settings']['size']);
+ $this->assertIsInt($form_display->getComponent($field_name)['settings']['size']);
$form_display->save();
- $this->assertInternalType('integer', $form_display->getComponent($field_name)['settings']['size']);
+ $this->assertIsInt($form_display->getComponent($field_name)['settings']['size']);
// Visit the node add page.
$this->drupalGet('node/add/page');
diff --git a/web/core/tests/Drupal/FunctionalJavascriptTests/TableDrag/TableDragTest.php b/web/core/tests/Drupal/FunctionalJavascriptTests/TableDrag/TableDragTest.php
index d9fa930342..1cdfff4488 100644
--- a/web/core/tests/Drupal/FunctionalJavascriptTests/TableDrag/TableDragTest.php
+++ b/web/core/tests/Drupal/FunctionalJavascriptTests/TableDrag/TableDragTest.php
@@ -3,6 +3,7 @@
namespace Drupal\FunctionalJavascriptTests\TableDrag;
use Behat\Mink\Element\NodeElement;
+use Behat\Mink\Exception\ExpectationException;
use Drupal\FunctionalJavascriptTests\WebDriverTestBase;
/**
@@ -43,6 +44,88 @@ protected function setUp() {
$this->state = $this->container->get('state');
}
+ /**
+ * Tests row weight switch.
+ */
+ public function testRowWeightSwitch() {
+ $this->state->set('tabledrag_test_table', array_flip(range(1, 3)));
+
+ $this->drupalGet('tabledrag_test');
+
+ $session = $this->getSession();
+ $page = $session->getPage();
+
+ $weight_select1 = $page->findField("table[1][weight]");
+ $weight_select2 = $page->findField("table[2][weight]");
+ $weight_select3 = $page->findField("table[3][weight]");
+
+ // Check that rows weight selects are hidden.
+ $this->assertFalse($weight_select1->isVisible());
+ $this->assertFalse($weight_select2->isVisible());
+ $this->assertFalse($weight_select3->isVisible());
+
+ // Toggle row weight selects as visible.
+ $this->findWeightsToggle('Show row weights')->click();
+
+ // Check that rows weight selects are visible.
+ $this->assertTrue($weight_select1->isVisible());
+ $this->assertTrue($weight_select2->isVisible());
+ $this->assertTrue($weight_select3->isVisible());
+
+ // Toggle row weight selects back to hidden.
+ $this->findWeightsToggle('Hide row weights')->click();
+
+ // Check that rows weight selects are hidden again.
+ $this->assertFalse($weight_select1->isVisible());
+ $this->assertFalse($weight_select2->isVisible());
+ $this->assertFalse($weight_select3->isVisible());
+ }
+
+ /**
+ * Tests draggable table drag'n'drop.
+ */
+ public function testDragAndDrop() {
+ $this->state->set('tabledrag_test_table', array_flip(range(1, 3)));
+ $this->drupalGet('tabledrag_test');
+
+ $session = $this->getSession();
+ $page = $session->getPage();
+
+ $weight_select1 = $page->findField("table[1][weight]");
+ $weight_select2 = $page->findField("table[2][weight]");
+ $weight_select3 = $page->findField("table[3][weight]");
+
+ // Check that initially the rows are in the correct order.
+ $this->assertOrder(['Row with id 1', 'Row with id 2', 'Row with id 3']);
+
+ // Check that the 'unsaved changes' text is not present in the message area.
+ $this->assertSession()->pageTextNotContains('You have unsaved changes.');
+
+ $row1 = $this->findRowById(1)->find('css', 'a.tabledrag-handle');
+ $row2 = $this->findRowById(2)->find('css', 'a.tabledrag-handle');
+ $row3 = $this->findRowById(3)->find('css', 'a.tabledrag-handle');
+
+ // Drag row1 over row2.
+ $row1->dragTo($row2);
+
+ // Check that the 'unsaved changes' text was added in the message area.
+ $this->assertSession()->waitForText('You have unsaved changes.');
+
+ // Check that row1 and row2 were swapped.
+ $this->assertOrder(['Row with id 2', 'Row with id 1', 'Row with id 3']);
+
+ // Check that weights were changed.
+ $this->assertGreaterThan($weight_select2->getValue(), $weight_select1->getValue());
+ $this->assertGreaterThan($weight_select2->getValue(), $weight_select3->getValue());
+ $this->assertGreaterThan($weight_select1->getValue(), $weight_select3->getValue());
+
+ // Now move the last row (row3) in the second position. row1 should go last.
+ $row3->dragTo($row1);
+
+ // Check that the order is: row2, row3 and row1.
+ $this->assertOrder(['Row with id 2', 'Row with id 3', 'Row with id 1']);
+ }
+
/**
* Tests accessibility through keyboard of the tabledrag functionality.
*/
@@ -199,6 +282,31 @@ public function testTableDragChangedWarning() {
$this->assertSession()->pageTextContainsOnce('You have unsaved changes.');
}
+ /**
+ * Asserts that several pieces of markup are in a given order in the page.
+ *
+ * @param string[] $items
+ * An ordered list of strings.
+ *
+ * @throws \Behat\Mink\Exception\ExpectationException
+ * When any of the given string is not found.
+ *
+ * @todo Remove this and use the WebAssert method when #2817657 is done.
+ */
+ protected function assertOrder(array $items) {
+ $session = $this->getSession();
+ $text = $session->getPage()->getHtml();
+ $strings = [];
+ foreach ($items as $item) {
+ if (($pos = strpos($text, $item)) === FALSE) {
+ throw new ExpectationException("Cannot find '$item' in the page", $session->getDriver());
+ }
+ $strings[$pos] = $item;
+ }
+ ksort($strings);
+ $this->assertSame($items, array_values($strings), "Strings found on the page but incorrectly ordered.");
+ }
+
/**
* Asserts the whole structure of the draggable test table.
*
@@ -262,6 +370,21 @@ protected function findRowById($id) {
return $row;
}
+ /**
+ * Finds the show/hide weight toggle element.
+ *
+ * @param string $expected_text
+ * The expected text on the element.
+ *
+ * @return \Behat\Mink\Element\NodeElement
+ * The toggle element.
+ */
+ protected function findWeightsToggle($expected_text) {
+ $toggle = $this->getSession()->getPage()->findButton($expected_text);
+ $this->assertNotEmpty($toggle);
+ return $toggle;
+ }
+
/**
* Moves a row through the keyboard.
*
diff --git a/web/core/tests/Drupal/FunctionalJavascriptTests/Tests/JSWebAssertTest.php b/web/core/tests/Drupal/FunctionalJavascriptTests/Tests/JSWebAssertTest.php
index 14deebe63b..1853e24fbe 100644
--- a/web/core/tests/Drupal/FunctionalJavascriptTests/Tests/JSWebAssertTest.php
+++ b/web/core/tests/Drupal/FunctionalJavascriptTests/Tests/JSWebAssertTest.php
@@ -65,28 +65,28 @@ public function testJsWebAssert() {
$test_button->click();
$result = $assert_session->waitForButton('Added button');
$this->assertNotEmpty($result);
- $this->assertTrue($result instanceof NodeElement);
+ $this->assertInstanceOf(NodeElement::class, $result);
$result = $page->findLink('Added link');
$this->assertEmpty($result);
$test_link->click();
$result = $assert_session->waitForLink('Added link');
$this->assertNotEmpty($result);
- $this->assertTrue($result instanceof NodeElement);
+ $this->assertInstanceOf(NodeElement::class, $result);
$result = $page->findField('added_field');
$this->assertEmpty($result);
$test_field->click();
$result = $assert_session->waitForField('added_field');
$this->assertNotEmpty($result);
- $this->assertTrue($result instanceof NodeElement);
+ $this->assertInstanceOf(NodeElement::class, $result);
$result = $page->findById('js_webassert_test_field_id');
$this->assertEmpty($result);
$test_id->click();
$result = $assert_session->waitForId('js_webassert_test_field_id');
$this->assertNotEmpty($result);
- $this->assertTrue($result instanceof NodeElement);
+ $this->assertInstanceOf(NodeElement::class, $result);
// Test waitOnAjaxRequest. Verify the element is available after the wait
// and the behaviors have run on completing by checking the value.
@@ -96,7 +96,7 @@ public function testJsWebAssert() {
$assert_session->assertWaitOnAjaxRequest();
$result = $page->findField('test_assert_wait_on_ajax_input');
$this->assertNotEmpty($result);
- $this->assertTrue($result instanceof NodeElement);
+ $this->assertInstanceOf(NodeElement::class, $result);
$this->assertEquals('js_webassert_test', $result->getValue());
$result = $page->findButton('Added WaitForElementVisible');
@@ -104,7 +104,7 @@ public function testJsWebAssert() {
$test_wait_on_element_visible->click();
$result = $assert_session->waitForElementVisible('named', ['button', 'Added WaitForElementVisible']);
$this->assertNotEmpty($result);
- $this->assertTrue($result instanceof NodeElement);
+ $this->assertInstanceOf(NodeElement::class, $result);
$this->assertEquals(TRUE, $result->isVisible());
}
diff --git a/web/core/tests/Drupal/FunctionalJavascriptTests/Theme/ClaroTableDragTest.php b/web/core/tests/Drupal/FunctionalJavascriptTests/Theme/ClaroTableDragTest.php
new file mode 100644
index 0000000000..c1e4fbe641
--- /dev/null
+++ b/web/core/tests/Drupal/FunctionalJavascriptTests/Theme/ClaroTableDragTest.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Drupal\FunctionalJavascriptTests\Theme;
+
+use Drupal\FunctionalJavascriptTests\TableDrag\TableDragTest;
+
+/**
+ * Runs TableDragTest in Claro.
+ *
+ * @group claro
+ *
+ * @see \Drupal\FunctionalJavascriptTests\TableDrag\TableDragTest
+ */
+class ClaroTableDragTest extends TableDragTest {
+
+ /**
+ * {@inheritdoc}
+ */
+ protected $defaultTheme = 'claro';
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function findWeightsToggle($expected_text) {
+ $toggle = $this->getSession()->getPage()->findLink($expected_text);
+ $this->assertNotEmpty($toggle);
+ return $toggle;
+ }
+
+}
diff --git a/web/core/tests/Drupal/FunctionalJavascriptTests/WebDriverTestBase.php b/web/core/tests/Drupal/FunctionalJavascriptTests/WebDriverTestBase.php
index 22bdbc430a..6f1bc12db4 100644
--- a/web/core/tests/Drupal/FunctionalJavascriptTests/WebDriverTestBase.php
+++ b/web/core/tests/Drupal/FunctionalJavascriptTests/WebDriverTestBase.php
@@ -194,7 +194,7 @@ protected function assertJsCondition($condition, $timeout = 10000, $message = ''
* driver then this should be a JPG filename.
* @param bool $set_background_color
* (optional) By default this method will set the background color to white.
- * Set to FALSE to override this behaviour.
+ * Set to FALSE to override this behavior.
*
* @throws \Behat\Mink\Exception\UnsupportedDriverActionException
* When operation not supported by the driver.
diff --git a/web/core/tests/Drupal/FunctionalJavascriptTests/WebDriverWebAssert.php b/web/core/tests/Drupal/FunctionalJavascriptTests/WebDriverWebAssert.php
index e621c1a072..22dbce9518 100644
--- a/web/core/tests/Drupal/FunctionalJavascriptTests/WebDriverWebAssert.php
+++ b/web/core/tests/Drupal/FunctionalJavascriptTests/WebDriverWebAssert.php
@@ -14,7 +14,7 @@ class WebDriverWebAssert extends JSWebAssert {
* The status code.
*/
public function statusCodeEquals($code) {
- @trigger_error('Support for statusCodeEquals is to be dropped from Javascript tests. See https://www.drupal.org/node/2857562.');
+ @trigger_error('Support for statusCodeEquals is to be dropped from Javascript tests. See https://www.drupal.org/node/2857562.', E_USER_DEPRECATED);
parent::statusCodeEquals($code);
}
@@ -25,7 +25,7 @@ public function statusCodeEquals($code) {
* The status code.
*/
public function statusCodeNotEquals($code) {
- @trigger_error('Support for statusCodeNotEquals is to be dropped from Javascript tests. See https://www.drupal.org/node/2857562.');
+ @trigger_error('Support for statusCodeNotEquals is to be dropped from Javascript tests. See https://www.drupal.org/node/2857562.', E_USER_DEPRECATED);
parent::statusCodeNotEquals($code);
}
@@ -38,7 +38,7 @@ public function statusCodeNotEquals($code) {
* The value to check the header against.
*/
public function responseHeaderEquals($name, $value) {
- @trigger_error('Support for responseHeaderEquals is to be dropped from Javascript tests. See https://www.drupal.org/node/2857562.');
+ @trigger_error('Support for responseHeaderEquals is to be dropped from Javascript tests. See https://www.drupal.org/node/2857562.', E_USER_DEPRECATED);
parent::responseHeaderEquals($name, $value);
}
@@ -51,7 +51,7 @@ public function responseHeaderEquals($name, $value) {
* The value to check the header against.
*/
public function responseHeaderNotEquals($name, $value) {
- @trigger_error('Support for responseHeaderNotEquals is to be dropped from Javascript tests. See https://www.drupal.org/node/2857562.');
+ @trigger_error('Support for responseHeaderNotEquals is to be dropped from Javascript tests. See https://www.drupal.org/node/2857562.', E_USER_DEPRECATED);
parent::responseHeaderNotEquals($name, $value);
}
@@ -64,7 +64,7 @@ public function responseHeaderNotEquals($name, $value) {
* The value to check the header against.
*/
public function responseHeaderContains($name, $value) {
- @trigger_error('Support for responseHeaderContains is to be dropped from Javascript tests. See https://www.drupal.org/node/2857562.');
+ @trigger_error('Support for responseHeaderContains is to be dropped from Javascript tests. See https://www.drupal.org/node/2857562.', E_USER_DEPRECATED);
parent::responseHeaderContains($name, $value);
}
@@ -77,7 +77,7 @@ public function responseHeaderContains($name, $value) {
* The value to check the header against.
*/
public function responseHeaderNotContains($name, $value) {
- @trigger_error('Support for responseHeaderNotContains is to be dropped from Javascript tests. See https://www.drupal.org/node/2857562.');
+ @trigger_error('Support for responseHeaderNotContains is to be dropped from Javascript tests. See https://www.drupal.org/node/2857562.', E_USER_DEPRECATED);
parent::responseHeaderNotContains($name, $value);
}
@@ -90,7 +90,7 @@ public function responseHeaderNotContains($name, $value) {
* The value to check the header against.
*/
public function responseHeaderMatches($name, $regex) {
- @trigger_error('Support for responseHeaderMatches is to be dropped from Javascript tests. See https://www.drupal.org/node/2857562.');
+ @trigger_error('Support for responseHeaderMatches is to be dropped from Javascript tests. See https://www.drupal.org/node/2857562.', E_USER_DEPRECATED);
parent::responseHeaderMatches($name, $regex);
}
@@ -103,7 +103,7 @@ public function responseHeaderMatches($name, $regex) {
* The value to check the header against.
*/
public function responseHeaderNotMatches($name, $regex) {
- @trigger_error('Support for responseHeaderNotMatches is to be dropped from Javascript tests. See https://www.drupal.org/node/2857562.');
+ @trigger_error('Support for responseHeaderNotMatches is to be dropped from Javascript tests. See https://www.drupal.org/node/2857562.', E_USER_DEPRECATED);
parent::responseHeaderNotMatches($name, $regex);
}
diff --git a/web/core/tests/Drupal/FunctionalTests/AssertLegacyTrait.php b/web/core/tests/Drupal/FunctionalTests/AssertLegacyTrait.php
index aed232f785..8115a13172 100644
--- a/web/core/tests/Drupal/FunctionalTests/AssertLegacyTrait.php
+++ b/web/core/tests/Drupal/FunctionalTests/AssertLegacyTrait.php
@@ -697,10 +697,10 @@ protected function assertPattern($pattern) {
* Deprecated in drupal:8.4.0 and is removed from drupal:10.0.0. Use
* $this->assertSession()->responseNotMatches() instead.
*
- * @see https://www.drupal.org/node/2864262
+ * @see https://www.drupal.org/node/3129738
*/
protected function assertNoPattern($pattern) {
- @trigger_error('AssertLegacyTrait::assertNoPattern() is deprecated in drupal:8.4.0 and is removed from drupal:10.0.0. Use $this->assertSession()->responseNotMatches() instead. See https://www.drupal.org/node/2864262', E_USER_DEPRECATED);
+ @trigger_error('AssertLegacyTrait::assertNoPattern() is deprecated in drupal:8.4.0 and is removed from drupal:10.0.0. Use $this->assertSession()->responseNotMatches() instead. See https://www.drupal.org/node/3129738', E_USER_DEPRECATED);
$this->assertSession()->responseNotMatches($pattern);
}
@@ -726,10 +726,10 @@ protected function assertCacheTag($expected_cache_tag) {
* Deprecated in drupal:8.4.0 and is removed from drupal:10.0.0. Use
* $this->assertSession()->responseHeaderNotContains() instead.
*
- * @see https://www.drupal.org/node/2864029
+ * @see https://www.drupal.org/node/3129738
*/
protected function assertNoCacheTag($cache_tag) {
- @trigger_error('AssertLegacyTrait::assertNoCacheTag() is deprecated in drupal:8.4.0 and is removed from drupal:10.0.0. Use $this->assertSession()->responseHeaderNotContains() instead. See https://www.drupal.org/node/2864029', E_USER_DEPRECATED);
+ @trigger_error('AssertLegacyTrait::assertNoCacheTag() is deprecated in drupal:8.4.0 and is removed from drupal:10.0.0. Use $this->assertSession()->responseHeaderNotContains() instead. See https://www.drupal.org/node/3129738', E_USER_DEPRECATED);
$this->assertSession()->responseHeaderNotContains('X-Drupal-Cache-Tags', $cache_tag);
}
@@ -811,10 +811,10 @@ protected function constructFieldXpath($attribute, $value) {
* Deprecated in drupal:8.2.0 and is removed from drupal:10.0.0. Use
* $this->getSession()->getPage()->getContent() instead.
*
- * @see http://drupal.org/node/2735045
+ * @see https://www.drupal.org/node/3129738
*/
protected function getRawContent() {
- @trigger_error('AssertLegacyTrait::getRawContent() is deprecated in drupal:8.2.0 and is removed from drupal:10.0.0. Use $this->getSession()->getPage()->getContent() instead. See http://drupal.org/node/2735045', E_USER_DEPRECATED);
+ @trigger_error('AssertLegacyTrait::getRawContent() is deprecated in drupal:8.2.0 and is removed from drupal:10.0.0. Use $this->getSession()->getPage()->getContent() instead. See https://www.drupal.org/node/3129738', E_USER_DEPRECATED);
return $this->getSession()->getPage()->getContent();
}
@@ -830,10 +830,10 @@ protected function getRawContent() {
* Deprecated in drupal:8.5.0 and is removed from drupal:10.0.0. Use
* $element->findAll('xpath', 'option') instead.
*
- * @see http://drupal.org/node/2735045
+ * @see https://www.drupal.org/node/3129738
*/
protected function getAllOptions(NodeElement $element) {
- @trigger_error('AssertLegacyTrait::getAllOptions() is deprecated in drupal:8.5.0 and is removed from drupal:10.0.0. Use $element->findAll(\'xpath\', \'option\') instead. See http://drupal.org/node/2735045', E_USER_DEPRECATED);
+ @trigger_error('AssertLegacyTrait::getAllOptions() is deprecated in drupal:8.5.0 and is removed from drupal:10.0.0. Use $element->findAll(\'xpath\', \'option\') instead. See https://www.drupal.org/node/3129738', E_USER_DEPRECATED);
return $element->findAll('xpath', '//option');
}
diff --git a/web/core/tests/Drupal/FunctionalTests/Bootstrap/UncaughtExceptionTest.php b/web/core/tests/Drupal/FunctionalTests/Bootstrap/UncaughtExceptionTest.php
index 61a6f2db04..8921cfa5c3 100644
--- a/web/core/tests/Drupal/FunctionalTests/Bootstrap/UncaughtExceptionTest.php
+++ b/web/core/tests/Drupal/FunctionalTests/Bootstrap/UncaughtExceptionTest.php
@@ -115,7 +115,7 @@ public function testUncaughtFatalError() {
'%function' => 'Drupal\error_test\Controller\ErrorTestController->Drupal\error_test\Controller\{closure}()',
];
$this->drupalGet('error-test/generate-fatals');
- $this->assertResponse(500, 'Received expected HTTP status code.');
+ $this->assertResponse(500);
$message = new FormattableMarkup('%type: @message in %function (line ', $fatal_error);
$this->assertRaw((string) $message);
$this->assertRaw('<pre class="backtrace">');
@@ -237,6 +237,7 @@ public function testLostDatabaseConnection() {
case 'mysql':
$this->expectedExceptionMessage = $incorrect_username;
break;
+
default:
// We can not carry out this test.
$this->pass('Unable to run \Drupal\system\Tests\System\UncaughtExceptionTest::testLostDatabaseConnection for this database type.');
@@ -279,13 +280,13 @@ public function testLoggerException() {
// Find fatal error logged to the error.log
$errors = file(\Drupal::root() . '/' . $this->siteDirectory . '/error.log');
- $this->assertIdentical(count($errors), 8, 'The error + the error that the logging service is broken has been written to the error log.');
- $this->assertTrue(strpos($errors[0], 'Failed to log error') !== FALSE, 'The error handling logs when an error could not be logged to the logger.');
+ $this->assertCount(8, $errors, 'The error + the error that the logging service is broken has been written to the error log.');
+ $this->assertStringContainsString('Failed to log error', $errors[0], 'The error handling logs when an error could not be logged to the logger.');
$expected_path = \Drupal::root() . '/core/modules/system/tests/modules/error_service_test/src/MonkeysInTheControlRoom.php';
$expected_line = 59;
$expected_entry = "Failed to log error: Exception: Deforestation in Drupal\\error_service_test\\MonkeysInTheControlRoom->handle() (line ${expected_line} of ${expected_path})";
- $this->assert(strpos($errors[0], $expected_entry) !== FALSE, 'Original error logged to the PHP error log when an exception is thrown by a logger');
+ $this->assertStringContainsString($expected_entry, $errors[0], 'Original error logged to the PHP error log when an exception is thrown by a logger');
// The exception is expected. Do not interpret it as a test failure. Not
// using File API; a potential error must trigger a PHP warning.
@@ -303,9 +304,7 @@ public function testLoggerException() {
*/
protected function assertErrorLogged($error_message) {
$error_log_filename = DRUPAL_ROOT . '/' . $this->siteDirectory . '/error.log';
- if (!file_exists($error_log_filename)) {
- $this->fail('No error logged yet.');
- }
+ $this->assertFileExists($error_log_filename);
$content = file_get_contents($error_log_filename);
$rows = explode(PHP_EOL, $content);
@@ -334,7 +333,7 @@ protected function assertErrorLogged($error_message) {
protected function assertNoErrorsLogged() {
// Since PHP only creates the error.log file when an actual error is
// triggered, it is sufficient to check whether the file exists.
- $this->assertFalse(file_exists(DRUPAL_ROOT . '/' . $this->siteDirectory . '/error.log'), 'PHP error.log is empty.');
+ $this->assertFileNotExists(DRUPAL_ROOT . '/' . $this->siteDirectory . '/error.log');
}
/**
@@ -373,14 +372,14 @@ protected function assertResponse($code) {
* {@inheritdoc}
*/
protected function assertText($text) {
- $this->assertContains($text, $this->response);
+ $this->assertStringContainsString($text, $this->response);
}
/**
* {@inheritdoc}
*/
protected function assertNoText($text) {
- $this->assertNotContains($text, $this->response);
+ $this->assertStringNotContainsString($text, $this->response);
}
/**
diff --git a/web/core/tests/Drupal/FunctionalTests/BrowserTestBaseTest.php b/web/core/tests/Drupal/FunctionalTests/BrowserTestBaseTest.php
index 8bc8a5cb16..74226b83e8 100644
--- a/web/core/tests/Drupal/FunctionalTests/BrowserTestBaseTest.php
+++ b/web/core/tests/Drupal/FunctionalTests/BrowserTestBaseTest.php
@@ -24,7 +24,12 @@ class BrowserTestBaseTest extends BrowserTestBase {
*
* @var array
*/
- public static $modules = ['test_page_test', 'form_test', 'system_test', 'node'];
+ public static $modules = [
+ 'test_page_test',
+ 'form_test',
+ 'system_test',
+ 'node',
+ ];
/**
* {@inheritdoc}
@@ -47,8 +52,8 @@ public function testGoTo() {
// Check that returned plain text is correct.
$text = $this->getTextContent();
- $this->assertContains('Test page text.', $text);
- $this->assertNotContains('</html>', $text);
+ $this->assertStringContainsString('Test page text.', $text);
+ $this->assertStringNotContainsString('</html>', $text);
// Response includes cache tags that we can assert.
$this->assertSession()->responseHeaderEquals('X-Drupal-Cache-Tags', 'http_response rendered');
@@ -164,13 +169,13 @@ public function testForm() {
public function testClickLink() {
$this->drupalGet('test-page');
$this->clickLink('Visually identical test links');
- $this->assertContains('user/login', $this->getSession()->getCurrentUrl());
+ $this->assertStringContainsString('user/login', $this->getSession()->getCurrentUrl());
$this->drupalGet('test-page');
$this->clickLink('Visually identical test links', 0);
- $this->assertContains('user/login', $this->getSession()->getCurrentUrl());
+ $this->assertStringContainsString('user/login', $this->getSession()->getCurrentUrl());
$this->drupalGet('test-page');
$this->clickLink('Visually identical test links', 1);
- $this->assertContains('user/register', $this->getSession()->getCurrentUrl());
+ $this->assertStringContainsString('user/register', $this->getSession()->getCurrentUrl());
}
public function testError() {
@@ -248,7 +253,7 @@ public function testTextAsserts() {
* Tests legacy getRawContent().
*
* @group legacy
- * @expectedDeprecation AssertLegacyTrait::getRawContent() is deprecated in drupal:8.2.0 and is removed from drupal:10.0.0. Use $this->getSession()->getPage()->getContent() instead. See http://drupal.org/node/2735045
+ * @expectedDeprecation AssertLegacyTrait::getRawContent() is deprecated in drupal:8.2.0 and is removed from drupal:10.0.0. Use $this->getSession()->getPage()->getContent() instead. See https://www.drupal.org/node/3129738
*/
public function testGetRawContent() {
$this->drupalGet('test-encoded');
@@ -651,7 +656,7 @@ public function testCronRun() {
*/
public function testInstall() {
$htaccess_filename = $this->tempFilesDirectory . '/.htaccess';
- $this->assertTrue(file_exists($htaccess_filename), "$htaccess_filename exists");
+ $this->assertFileExists($htaccess_filename);
}
/**
diff --git a/web/core/tests/Drupal/FunctionalTests/Core/Test/AssertLegacyTraitDeprecatedTest.php b/web/core/tests/Drupal/FunctionalTests/Core/Test/AssertLegacyTraitDeprecatedTest.php
index b07bc14ef8..331bdd5752 100644
--- a/web/core/tests/Drupal/FunctionalTests/Core/Test/AssertLegacyTraitDeprecatedTest.php
+++ b/web/core/tests/Drupal/FunctionalTests/Core/Test/AssertLegacyTraitDeprecatedTest.php
@@ -22,7 +22,7 @@ class AssertLegacyTraitDeprecatedTest extends BrowserTestBase {
/**
* Tests getAllOptions().
*
- * @expectedDeprecation AssertLegacyTrait::getAllOptions() is deprecated in drupal:8.5.0 and is removed from drupal:10.0.0. Use $element->findAll('xpath', 'option') instead. See http://drupal.org/node/2735045
+ * @expectedDeprecation AssertLegacyTrait::getAllOptions() is deprecated in drupal:8.5.0 and is removed from drupal:10.0.0. Use $element->findAll('xpath', 'option') instead. See https://www.drupal.org/node/3129738
*/
public function testGetAllOptions() {
$this->drupalGet('/form-test/select');
diff --git a/web/core/tests/Drupal/FunctionalTests/Datetime/TimestampTest.php b/web/core/tests/Drupal/FunctionalTests/Datetime/TimestampTest.php
index bf1ca56d5d..f196be2071 100644
--- a/web/core/tests/Drupal/FunctionalTests/Datetime/TimestampTest.php
+++ b/web/core/tests/Drupal/FunctionalTests/Datetime/TimestampTest.php
@@ -116,7 +116,7 @@ public function testWidget() {
// Make sure the "datetime_timestamp" widget is on the page.
$fields = $this->xpath('//div[contains(@class, "field--widget-datetime-timestamp") and @id="edit-field-timestamp-wrapper"]');
- $this->assertEquals(1, count($fields));
+ $this->assertCount(1, $fields);
// Look for the widget elements and make sure they are empty.
$this->assertSession()->fieldExists('field_timestamp[0][value][date]');
diff --git a/web/core/tests/Drupal/FunctionalTests/Entity/EntityBundleListCacheTest.php b/web/core/tests/Drupal/FunctionalTests/Entity/EntityBundleListCacheTest.php
new file mode 100644
index 0000000000..207c0b74b7
--- /dev/null
+++ b/web/core/tests/Drupal/FunctionalTests/Entity/EntityBundleListCacheTest.php
@@ -0,0 +1,80 @@
+<?php
+
+namespace Drupal\FunctionalTests\Entity;
+
+use Drupal\Core\Url;
+use Drupal\entity_test\Entity\EntityTestBundle;
+use Drupal\entity_test\Entity\EntityTestWithBundle;
+use Drupal\Tests\BrowserTestBase;
+use Drupal\Tests\system\Functional\Cache\AssertPageCacheContextsAndTagsTrait;
+
+/**
+ * Tests that bundle tags are invalidated when entities change.
+ *
+ * @group Entity
+ */
+class EntityBundleListCacheTest extends BrowserTestBase {
+
+ use AssertPageCacheContextsAndTagsTrait;
+
+ /**
+ * Modules to enable.
+ *
+ * @var array
+ */
+ public static $modules = ['cache_test', 'entity_test'];
+
+ /**
+ * {@inheritdoc}
+ */
+ protected $defaultTheme = 'classy';
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function setUp() {
+ parent::setUp();
+ EntityTestBundle::create([
+ 'id' => 'bundle_a',
+ 'label' => 'Bundle A',
+ ])->save();
+ EntityTestBundle::create([
+ 'id' => 'bundle_b',
+ 'label' => 'Bundle B',
+ ])->save();
+ }
+
+ /**
+ * Tests that tags are invalidated when an entity with that bundle changes.
+ */
+ public function testBundleListingCache() {
+ // Access to lists of test entities with each bundle.
+ $bundle_a_url = Url::fromRoute('cache_test_list.bundle_tags', ['entity_type_id' => 'entity_test_with_bundle', 'bundle' => 'bundle_a']);
+ $bundle_b_url = Url::fromRoute('cache_test_list.bundle_tags', ['entity_type_id' => 'entity_test_with_bundle', 'bundle' => 'bundle_b']);
+ $this->drupalGet($bundle_a_url);
+ $this->assertSession()->responseHeaderEquals('X-Drupal-Cache', 'MISS');
+ $this->assertCacheTags(['rendered', 'entity_test_with_bundle_list:bundle_a']);
+
+ $this->drupalGet($bundle_a_url);
+ $this->assertSession()->responseHeaderEquals('X-Drupal-Cache', 'HIT');
+ $this->assertCacheTags(['rendered', 'entity_test_with_bundle_list:bundle_a']);
+ $this->drupalGet($bundle_b_url);
+ $this->assertSession()->responseHeaderEquals('X-Drupal-Cache', 'MISS');
+ $this->assertCacheTags(['rendered', 'entity_test_with_bundle_list:bundle_b']);
+ $this->drupalGet($bundle_b_url);
+ $this->assertSession()->responseHeaderEquals('X-Drupal-Cache', 'HIT');
+ $entity1 = EntityTestWithBundle::create(['type' => 'bundle_a', 'name' => 'entity1']);
+ $entity1->save();
+ // Check that tags are invalidated after creating an entity of the current
+ // bundle.
+ $this->drupalGet($bundle_a_url);
+ $this->assertSession()->responseHeaderEquals('X-Drupal-Cache', 'MISS');
+ $this->drupalGet($bundle_a_url);
+ $this->assertSession()->responseHeaderEquals('X-Drupal-Cache', 'HIT');
+ // Check that tags are not invalidated after creating an entity of a
+ // different bundle than the current in the request.
+ $this->drupalGet($bundle_b_url);
+ $this->assertSession()->responseHeaderEquals('X-Drupal-Cache', 'HIT');
+ }
+
+}
diff --git a/web/core/tests/Drupal/FunctionalTests/Image/ToolkitSetupFormTest.php b/web/core/tests/Drupal/FunctionalTests/Image/ToolkitSetupFormTest.php
index 9c9720e177..80f19b6ebb 100644
--- a/web/core/tests/Drupal/FunctionalTests/Image/ToolkitSetupFormTest.php
+++ b/web/core/tests/Drupal/FunctionalTests/Image/ToolkitSetupFormTest.php
@@ -73,7 +73,7 @@ public function testToolkitSetupForm() {
// Test access without the permission 'administer site configuration'.
$this->drupalLogin($this->drupalCreateUser(['access administration pages']));
$this->drupalGet('admin/config/media/image-toolkit');
- $this->assertResponse(403);
+ $this->assertSession()->statusCodeEquals(403);
}
}
diff --git a/web/core/tests/Drupal/FunctionalTests/Image/ToolkitTest.php b/web/core/tests/Drupal/FunctionalTests/Image/ToolkitTest.php
index e91dab4b29..3c02f38da9 100644
--- a/web/core/tests/Drupal/FunctionalTests/Image/ToolkitTest.php
+++ b/web/core/tests/Drupal/FunctionalTests/Image/ToolkitTest.php
@@ -32,7 +32,7 @@ public function testGetAvailableToolkits() {
*/
public function testLoad() {
$image = $this->getImage();
- $this->assertTrue(is_object($image), 'Returned an object.');
+ $this->assertIsObject($image);
$this->assertEqual($image->getToolkitId(), 'test', 'Image had toolkit set.');
$this->assertToolkitOperationsCalled(['parseFile']);
}
diff --git a/web/core/tests/Drupal/FunctionalTests/Installer/ConfigAfterInstallerTestBase.php b/web/core/tests/Drupal/FunctionalTests/Installer/ConfigAfterInstallerTestBase.php
index 32b2906030..741ef8276f 100644
--- a/web/core/tests/Drupal/FunctionalTests/Installer/ConfigAfterInstallerTestBase.php
+++ b/web/core/tests/Drupal/FunctionalTests/Installer/ConfigAfterInstallerTestBase.php
@@ -32,13 +32,7 @@ protected function assertInstalledConfig(array $skipped_config) {
foreach ($profile_config_storage->listAll() as $config_name) {
$result = $config_manager->diff($profile_config_storage, $active_config_storage, $config_name);
- try {
- $this->assertConfigDiff($result, $config_name, $skipped_config);
- $this->pass("$config_name has no differences");
- }
- catch (\Exception $e) {
- $this->fail($e->getMessage());
- }
+ $this->assertConfigDiff($result, $config_name, $skipped_config);
}
}
diff --git a/web/core/tests/Drupal/FunctionalTests/Installer/DistributionProfileExistingSettingsTest.php b/web/core/tests/Drupal/FunctionalTests/Installer/DistributionProfileExistingSettingsTest.php
index d5194bdec1..df5fd53b22 100644
--- a/web/core/tests/Drupal/FunctionalTests/Installer/DistributionProfileExistingSettingsTest.php
+++ b/web/core/tests/Drupal/FunctionalTests/Installer/DistributionProfileExistingSettingsTest.php
@@ -116,7 +116,7 @@ protected function setUpSettings() {
*/
public function testInstalled() {
$this->assertUrl('user/1');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Confirm that we are logged-in after installation.
$this->assertText($this->rootUser->getAccountName());
diff --git a/web/core/tests/Drupal/FunctionalTests/Installer/DistributionProfileTest.php b/web/core/tests/Drupal/FunctionalTests/Installer/DistributionProfileTest.php
index bb7801e7d9..b83c711b4a 100644
--- a/web/core/tests/Drupal/FunctionalTests/Installer/DistributionProfileTest.php
+++ b/web/core/tests/Drupal/FunctionalTests/Installer/DistributionProfileTest.php
@@ -72,7 +72,7 @@ protected function setUpProfile() {
*/
public function testInstalled() {
$this->assertUrl('myrootuser');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Confirm that we are logged-in after installation.
$this->assertText($this->rootUser->getAccountName());
diff --git a/web/core/tests/Drupal/FunctionalTests/Installer/DistributionProfileTranslationQueryTest.php b/web/core/tests/Drupal/FunctionalTests/Installer/DistributionProfileTranslationQueryTest.php
index 0fc21f42b9..7345b744c0 100644
--- a/web/core/tests/Drupal/FunctionalTests/Installer/DistributionProfileTranslationQueryTest.php
+++ b/web/core/tests/Drupal/FunctionalTests/Installer/DistributionProfileTranslationQueryTest.php
@@ -112,7 +112,7 @@ protected function setUpSettings() {
*/
public function testInstalled() {
$this->assertUrl('user/1');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Confirm that we are logged-in after installation.
$this->assertText($this->rootUser->getDisplayName());
diff --git a/web/core/tests/Drupal/FunctionalTests/Installer/DistributionProfileTranslationTest.php b/web/core/tests/Drupal/FunctionalTests/Installer/DistributionProfileTranslationTest.php
index ec6d811463..c6eadd6ea6 100644
--- a/web/core/tests/Drupal/FunctionalTests/Installer/DistributionProfileTranslationTest.php
+++ b/web/core/tests/Drupal/FunctionalTests/Installer/DistributionProfileTranslationTest.php
@@ -103,7 +103,7 @@ protected function setUpSettings() {
*/
public function testInstalled() {
$this->assertUrl('user/1');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Confirm that we are logged-in after installation.
$this->assertText($this->rootUser->getDisplayName());
diff --git a/web/core/tests/Drupal/FunctionalTests/Installer/InstallProfileDependenciesTest.php b/web/core/tests/Drupal/FunctionalTests/Installer/InstallProfileDependenciesTest.php
index 1e397e069e..b112840e3d 100644
--- a/web/core/tests/Drupal/FunctionalTests/Installer/InstallProfileDependenciesTest.php
+++ b/web/core/tests/Drupal/FunctionalTests/Installer/InstallProfileDependenciesTest.php
@@ -44,7 +44,7 @@ public function testUninstallingModules() {
$this->fail('Uninstalled dblog module.');
}
catch (ModuleUninstallValidatorException $e) {
- $this->assertContains('The Testing install profile dependencies module is required', $e->getMessage());
+ $this->assertStringContainsString('The Testing install profile dependencies module is required', $e->getMessage());
}
}
diff --git a/web/core/tests/Drupal/FunctionalTests/Installer/InstallerConfigDirectorySetNoDirectoryErrorTest.php b/web/core/tests/Drupal/FunctionalTests/Installer/InstallerConfigDirectorySetNoDirectoryErrorTest.php
index 38a08bf3b8..9c83b18ac1 100644
--- a/web/core/tests/Drupal/FunctionalTests/Installer/InstallerConfigDirectorySetNoDirectoryErrorTest.php
+++ b/web/core/tests/Drupal/FunctionalTests/Installer/InstallerConfigDirectorySetNoDirectoryErrorTest.php
@@ -60,7 +60,7 @@ protected function setUpSite() {
*/
public function testError() {
$this->assertText("An automated attempt to create the directory {$this->configDirectory}/sync failed, possibly due to a permissions problem.");
- $this->assertFalse(file_exists($this->configDirectory . '/sync') && is_dir($this->configDirectory . '/sync'), "The directory {$this->configDirectory}/sync does not exist.");
+ $this->assertDirectoryNotExists($this->configDirectory . '/sync');
}
}
diff --git a/web/core/tests/Drupal/FunctionalTests/Installer/InstallerConfigDirectorySetNoDirectoryTest.php b/web/core/tests/Drupal/FunctionalTests/Installer/InstallerConfigDirectorySetNoDirectoryTest.php
index 5863d931f4..6fbc9c9e3e 100644
--- a/web/core/tests/Drupal/FunctionalTests/Installer/InstallerConfigDirectorySetNoDirectoryTest.php
+++ b/web/core/tests/Drupal/FunctionalTests/Installer/InstallerConfigDirectorySetNoDirectoryTest.php
@@ -40,8 +40,8 @@ protected function prepareEnvironment() {
*/
public function testInstaller() {
$this->assertUrl('user/1');
- $this->assertResponse(200);
- $this->assertTrue(file_exists($this->syncDirectory) && is_dir($this->syncDirectory), "The directory {$this->syncDirectory} exists.");
+ $this->assertSession()->statusCodeEquals(200);
+ $this->assertDirectoryExists($this->syncDirectory);
}
}
diff --git a/web/core/tests/Drupal/FunctionalTests/Installer/InstallerCustomConfigDirectoryCreateTest.php b/web/core/tests/Drupal/FunctionalTests/Installer/InstallerCustomConfigDirectoryCreateTest.php
index ee8b68e18d..f6f586df8c 100644
--- a/web/core/tests/Drupal/FunctionalTests/Installer/InstallerCustomConfigDirectoryCreateTest.php
+++ b/web/core/tests/Drupal/FunctionalTests/Installer/InstallerCustomConfigDirectoryCreateTest.php
@@ -38,12 +38,11 @@ protected function prepareEnvironment() {
public function testInstaller() {
$this->assertUrl('user/1');
$this->assertResponse(200);
- $this->assertTrue(file_exists($this->publicFilesDirectory . '/config_custom') && is_dir($this->publicFilesDirectory . '/config_custom'), "The directory {$this->publicFilesDirectory}/custom_config exists.");
+ $this->assertDirectoryExists($this->publicFilesDirectory . '/config_custom');
// Ensure the sync directory also exists.
$sync_directory = Settings::get('config_sync_directory');
- $this->assertTrue(file_exists($sync_directory) && is_dir($sync_directory), "The directory {$sync_directory} exists.");
-
+ $this->assertDirectoryExists($sync_directory);
}
}
diff --git a/web/core/tests/Drupal/FunctionalTests/Installer/InstallerEmptySettingsTest.php b/web/core/tests/Drupal/FunctionalTests/Installer/InstallerEmptySettingsTest.php
index 2f3e5acc66..447adc5c6c 100644
--- a/web/core/tests/Drupal/FunctionalTests/Installer/InstallerEmptySettingsTest.php
+++ b/web/core/tests/Drupal/FunctionalTests/Installer/InstallerEmptySettingsTest.php
@@ -29,7 +29,7 @@ protected function prepareEnvironment() {
*/
public function testInstaller() {
$this->assertUrl('user/1');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
}
}
diff --git a/web/core/tests/Drupal/FunctionalTests/Installer/InstallerExistingBrokenDatabaseSettingsTest.php b/web/core/tests/Drupal/FunctionalTests/Installer/InstallerExistingBrokenDatabaseSettingsTest.php
new file mode 100644
index 0000000000..32fe43edeb
--- /dev/null
+++ b/web/core/tests/Drupal/FunctionalTests/Installer/InstallerExistingBrokenDatabaseSettingsTest.php
@@ -0,0 +1,72 @@
+<?php
+
+namespace Drupal\FunctionalTests\Installer;
+
+use Drupal\Core\Database\Database;
+
+/**
+ * Tests the installer with broken database connection info in settings.php.
+ *
+ * @group Installer
+ */
+class InstallerExistingBrokenDatabaseSettingsTest extends InstallerTestBase {
+
+ /**
+ * {@inheritdoc}
+ */
+ protected $defaultTheme = 'stark';
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function prepareEnvironment() {
+ parent::prepareEnvironment();
+ // Pre-configure database credentials in settings.php.
+ $connection_info = Database::getConnectionInfo();
+
+ if ($connection_info['default']['driver'] !== 'mysql') {
+ $this->markTestSkipped('This test relies on overriding the mysql driver');
+ }
+
+ // Use a database driver that reports a fake database version that does
+ // not meet requirements.
+ unset($connection_info['default']['pdo']);
+ unset($connection_info['default']['init_commands']);
+ $connection_info['default']['driver'] = 'DrivertestMysqlDeprecatedVersion';
+ $namespace = 'Drupal\\driver_test\\Driver\\Database\\DrivertestMysqlDeprecatedVersion';
+ $connection_info['default']['namespace'] = $namespace;
+ $connection_info['default']['autoload'] = Database::findDriverAutoloadDirectory($namespace, \Drupal::root());
+
+ $this->settings['databases']['default'] = (object) [
+ 'value' => $connection_info,
+ 'required' => TRUE,
+ ];
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function setUpSettings() {
+ // This form will never be reached.
+ return;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function setUpSite() {
+ // This form will never be reached.
+ return;
+ }
+
+ /**
+ * Tests the expected requirements problem.
+ */
+ public function testRequirementsProblem() {
+ $this->assertSession()->titleEquals('Requirements problem | Drupal');
+ $this->assertSession()->pageTextContains('Database settings');
+ $this->assertSession()->pageTextContains('Resolve all issues below to continue the installation. For help configuring your database server,');
+ $this->assertSession()->pageTextContains('The database server version 5.5.2 is less than the minimum required version');
+ }
+
+}
diff --git a/web/core/tests/Drupal/FunctionalTests/Installer/InstallerExistingConfigDirectoryTest.php b/web/core/tests/Drupal/FunctionalTests/Installer/InstallerExistingConfigDirectoryTest.php
index eae925a62a..6b6fae5d6e 100644
--- a/web/core/tests/Drupal/FunctionalTests/Installer/InstallerExistingConfigDirectoryTest.php
+++ b/web/core/tests/Drupal/FunctionalTests/Installer/InstallerExistingConfigDirectoryTest.php
@@ -39,7 +39,7 @@ protected function prepareEnvironment() {
*/
public function testInstaller() {
$this->assertUrl('user/1');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertEqual($this->expectedFilePerms, fileperms($this->siteDirectory . '/config_read_only'));
$this->assertEqual([], glob($this->siteDirectory . '/config_read_only/*'), 'The sync directory is empty after install because it is read-only.');
}
diff --git a/web/core/tests/Drupal/FunctionalTests/Installer/InstallerExistingDatabaseSettingsTest.php b/web/core/tests/Drupal/FunctionalTests/Installer/InstallerExistingDatabaseSettingsTest.php
index 021abd42f7..40b7f9fc6b 100644
--- a/web/core/tests/Drupal/FunctionalTests/Installer/InstallerExistingDatabaseSettingsTest.php
+++ b/web/core/tests/Drupal/FunctionalTests/Installer/InstallerExistingDatabaseSettingsTest.php
@@ -60,7 +60,7 @@ protected function setUpSettings() {
*/
public function testInstaller() {
$this->assertUrl('user/1');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
}
}
diff --git a/web/core/tests/Drupal/FunctionalTests/Installer/InstallerExistingSettingsNoProfileTest.php b/web/core/tests/Drupal/FunctionalTests/Installer/InstallerExistingSettingsNoProfileTest.php
index 42f3542212..f9cdf8b832 100644
--- a/web/core/tests/Drupal/FunctionalTests/Installer/InstallerExistingSettingsNoProfileTest.php
+++ b/web/core/tests/Drupal/FunctionalTests/Installer/InstallerExistingSettingsNoProfileTest.php
@@ -65,7 +65,7 @@ protected function setUpSettings() {
*/
public function testInstaller() {
$this->assertUrl('user/1');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertEqual('testing', \Drupal::installProfile());
}
diff --git a/web/core/tests/Drupal/FunctionalTests/Installer/InstallerExistingSettingsTest.php b/web/core/tests/Drupal/FunctionalTests/Installer/InstallerExistingSettingsTest.php
index 141f047a3c..1615f8c6e2 100644
--- a/web/core/tests/Drupal/FunctionalTests/Installer/InstallerExistingSettingsTest.php
+++ b/web/core/tests/Drupal/FunctionalTests/Installer/InstallerExistingSettingsTest.php
@@ -78,7 +78,7 @@ protected function setUpSettings() {
*/
public function testInstaller() {
$this->assertUrl('user/1');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
$this->assertEqual('testing', \Drupal::installProfile());
}
diff --git a/web/core/tests/Drupal/FunctionalTests/Installer/InstallerLanguageDirectionTest.php b/web/core/tests/Drupal/FunctionalTests/Installer/InstallerLanguageDirectionTest.php
index 48d50af4d1..de7d040cec 100644
--- a/web/core/tests/Drupal/FunctionalTests/Installer/InstallerLanguageDirectionTest.php
+++ b/web/core/tests/Drupal/FunctionalTests/Installer/InstallerLanguageDirectionTest.php
@@ -46,7 +46,7 @@ protected function setUpLanguage() {
*/
public function testInstalled() {
$this->assertUrl('user/1');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
}
}
diff --git a/web/core/tests/Drupal/FunctionalTests/Installer/InstallerLanguagePageTest.php b/web/core/tests/Drupal/FunctionalTests/Installer/InstallerLanguagePageTest.php
index 692dd314b1..f08eb5327a 100644
--- a/web/core/tests/Drupal/FunctionalTests/Installer/InstallerLanguagePageTest.php
+++ b/web/core/tests/Drupal/FunctionalTests/Installer/InstallerLanguagePageTest.php
@@ -43,7 +43,7 @@ protected function setUpLanguage() {
*/
public function testInstalled() {
$this->assertUrl('user/1');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
}
}
diff --git a/web/core/tests/Drupal/FunctionalTests/Installer/InstallerNonDefaultDatabaseDriverTest.php b/web/core/tests/Drupal/FunctionalTests/Installer/InstallerNonDefaultDatabaseDriverTest.php
new file mode 100644
index 0000000000..87b64c69c8
--- /dev/null
+++ b/web/core/tests/Drupal/FunctionalTests/Installer/InstallerNonDefaultDatabaseDriverTest.php
@@ -0,0 +1,65 @@
+<?php
+
+namespace Drupal\FunctionalTests\Installer;
+
+use Drupal\Core\Database\Database;
+
+/**
+ * Tests the interactive installer.
+ *
+ * @group Installer
+ */
+class InstallerNonDefaultDatabaseDriverTest extends InstallerTestBase {
+
+ /**
+ * {@inheritdoc}
+ */
+ protected $defaultTheme = 'stark';
+
+ /**
+ * The name of the test database driver in use.
+ * @var string
+ */
+ protected $testDriverName;
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function setUpSettings() {
+ $driver = Database::getConnection()->driver();
+ if (!in_array($driver, ['mysql', 'pgsql'])) {
+ $this->markTestSkipped("This test does not support the {$driver} database driver.");
+ }
+ $this->testDriverName = 'Drivertest' . ucfirst($driver);
+
+ // Assert that we are using the database drivers from the driver_test module.
+ $elements = $this->xpath('//label[@for="edit-driver-drivertestmysql"]');
+ $this->assertEqual(current($elements)->getText(), 'MySQL by the driver_test module');
+ $elements = $this->xpath('//label[@for="edit-driver-drivertestpgsql"]');
+ $this->assertEqual(current($elements)->getText(), 'PostgreSQL by the driver_test module');
+
+ $settings = $this->parameters['forms']['install_settings_form'];
+
+ $settings['driver'] = $this->testDriverName;
+ $settings[$this->testDriverName] = $settings[$driver];
+ unset($settings[$driver]);
+ $edit = $this->translatePostValues($settings);
+ $this->drupalPostForm(NULL, $edit, $this->translations['Save and continue']);
+ }
+
+ /**
+ * Confirms that the installation succeeded.
+ */
+ public function testInstalled() {
+ $this->assertUrl('user/1');
+ $this->assertSession()->statusCodeEquals(200);
+
+ // Assert that in the settings.php the database connection array has the
+ // correct values set.
+ $contents = file_get_contents($this->root . '/' . $this->siteDirectory . '/settings.php');
+ $this->assertStringContainsString("'namespace' => 'Drupal\\\\driver_test\\\\Driver\\\\Database\\\\{$this->testDriverName}',", $contents);
+ $this->assertStringContainsString("'driver' => '{$this->testDriverName}',", $contents);
+ $this->assertStringContainsString("'autoload' => 'core/modules/system/tests/modules/driver_test/src/Driver/Database/{$this->testDriverName}/',", $contents);
+ }
+
+}
diff --git a/web/core/tests/Drupal/FunctionalTests/Installer/InstallerSkipPermissionHardeningTest.php b/web/core/tests/Drupal/FunctionalTests/Installer/InstallerSkipPermissionHardeningTest.php
index f282de8678..3ba244c465 100644
--- a/web/core/tests/Drupal/FunctionalTests/Installer/InstallerSkipPermissionHardeningTest.php
+++ b/web/core/tests/Drupal/FunctionalTests/Installer/InstallerSkipPermissionHardeningTest.php
@@ -27,8 +27,8 @@ protected function prepareEnvironment() {
*/
protected function setUpSite() {
$site_directory = $this->container->get('app.root') . '/' . $this->siteDirectory;
- $this->assertTrue(is_writable($site_directory));
- $this->assertTrue(is_writable($site_directory . '/settings.php'));
+ $this->assertDirectoryIsWritable($site_directory);
+ $this->assertFileIsWritable($site_directory . '/settings.php');
$this->assertSession()->responseContains('All necessary changes to <em class="placeholder">' . $this->siteDirectory . '</em> and <em class="placeholder">' . $this->siteDirectory . '/settings.php</em> have been made, so you should remove write permissions to them now in order to avoid security risks. If you are unsure how to do so, consult the <a href="https://www.drupal.org/server-permissions">online handbook</a>.');
diff --git a/web/core/tests/Drupal/FunctionalTests/Installer/InstallerTest.php b/web/core/tests/Drupal/FunctionalTests/Installer/InstallerTest.php
index 1fd5449482..86658df07a 100644
--- a/web/core/tests/Drupal/FunctionalTests/Installer/InstallerTest.php
+++ b/web/core/tests/Drupal/FunctionalTests/Installer/InstallerTest.php
@@ -19,7 +19,7 @@ class InstallerTest extends InstallerTestBase {
*/
public function testInstaller() {
$this->assertUrl('user/1');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Confirm that we are logged-in after installation.
$this->assertText($this->rootUser->getAccountName());
@@ -63,7 +63,7 @@ protected function setUpProfile() {
// Assert that the expected title is present.
$this->assertEqual('Select an installation profile', $this->cssSelect('main h2')[0]->getText());
$result = $this->xpath('//span[contains(@class, :class) and contains(text(), :text)]', [':class' => 'visually-hidden', ':text' => 'Select an installation profile']);
- $this->assertEqual(count($result), 1, "Title/Label not displayed when '#title_display' => 'invisible' attribute is set");
+ $this->assertCount(1, $result, "Title/Label not displayed when '#title_display' => 'invisible' attribute is set");
parent::setUpProfile();
}
@@ -75,6 +75,13 @@ protected function setUpSettings() {
// Assert that the expected title is present.
$this->assertEqual('Database configuration', $this->cssSelect('main h2')[0]->getText());
+ // Assert that we use the by core supported database drivers by default and
+ // not the ones from the driver_test module.
+ $elements = $this->xpath('//label[@for="edit-driver-mysql"]');
+ $this->assertEqual(current($elements)->getText(), 'MySQL, MariaDB, Percona Server, or equivalent');
+ $elements = $this->xpath('//label[@for="edit-driver-pgsql"]');
+ $this->assertEqual(current($elements)->getText(), 'PostgreSQL');
+
parent::setUpSettings();
}
@@ -88,8 +95,8 @@ protected function setUpSite() {
// Test that SiteConfigureForm::buildForm() has made the site directory and
// the settings file non-writable.
$site_directory = $this->container->get('app.root') . '/' . $this->siteDirectory;
- $this->assertFalse(is_writable($site_directory));
- $this->assertFalse(is_writable($site_directory . '/settings.php'));
+ $this->assertDirectoryNotIsWritable($site_directory);
+ $this->assertFileNotIsWritable($site_directory . '/settings.php');
parent::setUpSite();
}
diff --git a/web/core/tests/Drupal/FunctionalTests/Installer/InstallerTranslationQueryTest.php b/web/core/tests/Drupal/FunctionalTests/Installer/InstallerTranslationQueryTest.php
index 5c1c14a989..b94647ee13 100644
--- a/web/core/tests/Drupal/FunctionalTests/Installer/InstallerTranslationQueryTest.php
+++ b/web/core/tests/Drupal/FunctionalTests/Installer/InstallerTranslationQueryTest.php
@@ -59,7 +59,7 @@ protected function setUpLanguage() {
*/
public function testInstaller() {
$this->assertUrl('user/1');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Verify German was configured but not English.
$this->drupalGet('admin/config/regional/language');
diff --git a/web/core/tests/Drupal/FunctionalTests/Installer/InstallerTranslationTest.php b/web/core/tests/Drupal/FunctionalTests/Installer/InstallerTranslationTest.php
index c38d4719fc..1eec26e7fb 100644
--- a/web/core/tests/Drupal/FunctionalTests/Installer/InstallerTranslationTest.php
+++ b/web/core/tests/Drupal/FunctionalTests/Installer/InstallerTranslationTest.php
@@ -70,7 +70,7 @@ protected function setUpSettings() {
*/
public function testInstaller() {
$this->assertUrl('user/1');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Verify German was configured but not English.
$this->drupalGet('admin/config/regional/language');
@@ -89,7 +89,7 @@ public function testInstaller() {
// Ensure that we can enable basic_auth on a non-english site.
$this->drupalPostForm('admin/modules', ['modules[basic_auth][enable]' => TRUE], t('Install'));
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Assert that the theme CSS was added to the page.
$edit = ['preprocess_css' => FALSE];
diff --git a/web/core/tests/Drupal/FunctionalTests/Installer/MultipleDistributionsProfileTest.php b/web/core/tests/Drupal/FunctionalTests/Installer/MultipleDistributionsProfileTest.php
index a0f2069cba..33bf61f17f 100644
--- a/web/core/tests/Drupal/FunctionalTests/Installer/MultipleDistributionsProfileTest.php
+++ b/web/core/tests/Drupal/FunctionalTests/Installer/MultipleDistributionsProfileTest.php
@@ -76,7 +76,7 @@ protected function setUpProfile() {
*/
public function testInstalled() {
$this->assertUrl('user/1');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Confirm that we are logged-in after installation.
$this->assertText($this->rootUser->getAccountName());
diff --git a/web/core/tests/Drupal/FunctionalTests/Installer/SingleVisibleProfileTest.php b/web/core/tests/Drupal/FunctionalTests/Installer/SingleVisibleProfileTest.php
index 02e60a817e..131d45b772 100644
--- a/web/core/tests/Drupal/FunctionalTests/Installer/SingleVisibleProfileTest.php
+++ b/web/core/tests/Drupal/FunctionalTests/Installer/SingleVisibleProfileTest.php
@@ -57,7 +57,7 @@ protected function setUpProfile() {
*/
public function testInstalled() {
$this->assertUrl('user/1');
- $this->assertResponse(200);
+ $this->assertSession()->statusCodeEquals(200);
// Confirm that we are logged-in after installation.
$this->assertText($this->rootUser->getAccountName());
// Confirm that the minimal profile was installed.
diff --git a/web/core/tests/Drupal/FunctionalTests/MailCaptureTest.php b/web/core/tests/Drupal/FunctionalTests/MailCaptureTest.php
index 74e2f07ef8..8acae8629d 100644
--- a/web/core/tests/Drupal/FunctionalTests/MailCaptureTest.php
+++ b/web/core/tests/Drupal/FunctionalTests/MailCaptureTest.php
@@ -39,14 +39,14 @@ public function testMailSend() {
// Before we send the email, drupalGetMails should return an empty array.
$captured_emails = $this->drupalGetMails();
- $this->assertEqual(count($captured_emails), 0, 'The captured emails queue is empty.', 'Email');
+ $this->assertCount(0, $captured_emails, 'The captured emails queue is empty.');
// Send the email.
\Drupal::service('plugin.manager.mail')->getInstance(['module' => 'simpletest', 'key' => 'drupal_mail_test'])->mail($message);
// Ensure that there is one email in the captured emails array.
$captured_emails = $this->drupalGetMails();
- $this->assertEqual(count($captured_emails), 1, 'One email was captured.', 'Email');
+ $this->assertCount(1, $captured_emails, 'One email was captured.');
// Assert that the email was sent by iterating over the message properties
// and ensuring that they are captured intact.
@@ -68,22 +68,22 @@ public function testMailSend() {
// There should now be 6 emails captured.
$captured_emails = $this->drupalGetMails();
- $this->assertEqual(count($captured_emails), 6, 'All emails were captured.', 'Email');
+ $this->assertCount(6, $captured_emails, 'All emails were captured.');
// Test different ways of getting filtered emails via drupalGetMails().
$captured_emails = $this->drupalGetMails(['id' => 'drupal_mail_test']);
- $this->assertEqual(count($captured_emails), 1, 'Only one email is returned when filtering by id.', 'Email');
+ $this->assertCount(1, $captured_emails, 'Only one email is returned when filtering by id.');
$captured_emails = $this->drupalGetMails(['id' => 'drupal_mail_test', 'subject' => $subject]);
- $this->assertEqual(count($captured_emails), 1, 'Only one email is returned when filtering by id and subject.', 'Email');
+ $this->assertCount(1, $captured_emails, 'Only one email is returned when filtering by id and subject.');
$captured_emails = $this->drupalGetMails(['id' => 'drupal_mail_test', 'subject' => $subject, 'from' => 'this_was_not_used@example.com']);
- $this->assertEqual(count($captured_emails), 0, 'No emails are returned when querying with an unused from address.', 'Email');
+ $this->assertCount(0, $captured_emails, 'No emails are returned when querying with an unused from address.');
// Send the last email again, so we can confirm that the
// drupalGetMails-filter correctly returns all emails with a given
// property/value.
\Drupal::service('plugin.manager.mail')->getInstance(['module' => 'drupal_mail_test', 'key' => $index])->mail($message);
$captured_emails = $this->drupalGetMails(['id' => 'drupal_mail_test_4']);
- $this->assertEqual(count($captured_emails), 2, 'All emails with the same id are returned when filtering by id.', 'Email');
+ $this->assertCount(2, $captured_emails, 'All emails with the same id are returned when filtering by id.');
}
}
diff --git a/web/core/tests/Drupal/FunctionalTests/Routing/RouteCachingLanguageTest.php b/web/core/tests/Drupal/FunctionalTests/Routing/RouteCachingLanguageTest.php
index 27eab11dc7..992e3ee9ca 100644
--- a/web/core/tests/Drupal/FunctionalTests/Routing/RouteCachingLanguageTest.php
+++ b/web/core/tests/Drupal/FunctionalTests/Routing/RouteCachingLanguageTest.php
@@ -20,7 +20,13 @@ class RouteCachingLanguageTest extends BrowserTestBase {
*
* @var array
*/
- public static $modules = ['path', 'node', 'content_translation', 'link', 'block'];
+ public static $modules = [
+ 'path',
+ 'node',
+ 'content_translation',
+ 'link',
+ 'block',
+ ];
/**
* {@inheritdoc}
diff --git a/web/core/tests/Drupal/FunctionalTests/Theme/BartikTest.php b/web/core/tests/Drupal/FunctionalTests/Theme/BartikTest.php
index 20b2a5da81..86cf7de9e2 100644
--- a/web/core/tests/Drupal/FunctionalTests/Theme/BartikTest.php
+++ b/web/core/tests/Drupal/FunctionalTests/Theme/BartikTest.php
@@ -17,7 +17,7 @@ class BartikTest extends BrowserTestBase {
protected $defaultTheme = 'bartik';
/**
- * Tests that the Bartik theme always adds its message CSS and Classy's.
+ * Tests that the Bartik theme always adds its message CSS files.
*
* @see bartik.libraries.yml
* @see classy.info.yml
@@ -26,7 +26,7 @@ public function testRegressionMissingMessagesCss() {
$this->drupalGet('');
$this->assertSession()->statusCodeEquals(200);
$this->assertSession()->responseContains('bartik/css/components/messages.css');
- $this->assertSession()->responseContains('classy/css/components/messages.css');
+ $this->assertSession()->responseContains('bartik/css/classy/components/messages.css');
}
}
diff --git a/web/core/tests/Drupal/FunctionalTests/Update/UpdatePathTestBase.php b/web/core/tests/Drupal/FunctionalTests/Update/UpdatePathTestBase.php
index 89835ece0c..d0a4644ce0 100644
--- a/web/core/tests/Drupal/FunctionalTests/Update/UpdatePathTestBase.php
+++ b/web/core/tests/Drupal/FunctionalTests/Update/UpdatePathTestBase.php
@@ -312,8 +312,10 @@ protected function runDbTasks() {
\Drupal::setContainer($container);
require_once __DIR__ . '/../../../../includes/install.inc';
- $connection = Database::getConnection();
- $errors = db_installer_object($connection->driver())->runTasks();
+ $connection_info = Database::getConnectionInfo();
+ $driver = $connection_info['default']['driver'];
+ $namespace = $connection_info['default']['namespace'] ?? NULL;
+ $errors = db_installer_object($driver, $namespace)->runTasks();
if (!empty($errors)) {
$this->fail('Failed to run installer database tasks: ' . implode(', ', $errors));
}
diff --git a/web/core/tests/Drupal/KernelTests/AssertConfigTrait.php b/web/core/tests/Drupal/KernelTests/AssertConfigTrait.php
index 7acab53b06..f4e04260ce 100644
--- a/web/core/tests/Drupal/KernelTests/AssertConfigTrait.php
+++ b/web/core/tests/Drupal/KernelTests/AssertConfigTrait.php
@@ -30,6 +30,7 @@ protected function assertConfigDiff(Diff $result, $config_name, array $skipped_c
case 'Drupal\Component\Diff\Engine\DiffOpCopy':
// Nothing to do, a copy is what we expect.
break;
+
case 'Drupal\Component\Diff\Engine\DiffOpDelete':
case 'Drupal\Component\Diff\Engine\DiffOpChange':
// It is not part of the skipped config, so we can directly throw the
@@ -68,6 +69,7 @@ protected function assertConfigDiff(Diff $result, $config_name, array $skipped_c
throw new \Exception($config_name . ': ' . var_export($op, TRUE));
}
break;
+
case 'Drupal\Component\Diff\Engine\DiffOpAdd':
// The _core property does not exist in the default config.
if ($op->closing[0] === '_core:') {
@@ -81,6 +83,7 @@ protected function assertConfigDiff(Diff $result, $config_name, array $skipped_c
throw new \Exception($config_name . ': ' . var_export($op, TRUE));
}
break;
+
default:
throw new \Exception($config_name . ': ' . var_export($op, TRUE));
}
diff --git a/web/core/tests/Drupal/KernelTests/AssertContentTrait.php b/web/core/tests/Drupal/KernelTests/AssertContentTrait.php
index c2bd32571c..a1805471e2 100644
--- a/web/core/tests/Drupal/KernelTests/AssertContentTrait.php
+++ b/web/core/tests/Drupal/KernelTests/AssertContentTrait.php
@@ -7,6 +7,7 @@
use Drupal\Component\Render\FormattableMarkup;
use Drupal\Component\Utility\Xss;
use Drupal\Core\Render\RenderContext;
+use PHPUnit\Framework\TestCase;
use Symfony\Component\CssSelector\CssSelectorConverter;
/**
@@ -434,7 +435,12 @@ protected function assertRaw($raw, $message = '', $group = 'Other') {
if (!$message) {
$message = 'Raw "' . Html::escape($raw) . '" found';
}
- return $this->assert(strpos($this->getRawContent(), (string) $raw) !== FALSE, $message, $group);
+ if ($this instanceof TestCase) {
+ $this->assertStringContainsString((string) $raw, $this->getRawContent(), $message);
+ }
+ else {
+ return $this->assert(strpos($this->getRawContent(), (string) $raw) !== FALSE, $message, $group);
+ }
}
/**
@@ -462,7 +468,12 @@ protected function assertNoRaw($raw, $message = '', $group = 'Other') {
if (!$message) {
$message = 'Raw "' . Html::escape($raw) . '" not found';
}
- return $this->assert(strpos($this->getRawContent(), (string) $raw) === FALSE, $message, $group);
+ if ($this instanceof TestCase) {
+ $this->assertStringNotContainsString((string) $raw, $this->getRawContent(), $message);
+ }
+ else {
+ return $this->assert(strpos($this->getRawContent(), (string) $raw) === FALSE, $message, $group);
+ }
}
/**
@@ -490,7 +501,12 @@ protected function assertEscaped($raw, $message = '', $group = 'Other') {
if (!$message) {
$message = 'Escaped "' . Html::escape($raw) . '" found';
}
- return $this->assert(strpos($this->getRawContent(), Html::escape($raw)) !== FALSE, $message, $group);
+ if ($this instanceof TestCase) {
+ $this->assertStringContainsString(Html::escape($raw), $this->getRawContent(), $message);
+ }
+ else {
+ return $this->assert(strpos($this->getRawContent(), Html::escape($raw)) !== FALSE, $message, $group);
+ }
}
/**
@@ -519,7 +535,12 @@ protected function assertNoEscaped($raw, $message = '', $group = 'Other') {
if (!$message) {
$message = 'Escaped "' . Html::escape($raw) . '" not found';
}
- return $this->assert(strpos($this->getRawContent(), Html::escape($raw)) === FALSE, $message, $group);
+ if ($this instanceof TestCase) {
+ $this->assertStringNotContainsString(Html::escape($raw), $this->getRawContent(), $message);
+ }
+ else {
+ return $this->assert(strpos($this->getRawContent(), Html::escape($raw)) === FALSE, $message, $group);
+ }
}
/**
@@ -606,7 +627,22 @@ protected function assertTextHelper($text, $message = '', $group = 'Other', $not
if (!$message) {
$message = !$not_exists ? new FormattableMarkup('"@text" found', ['@text' => $text]) : new FormattableMarkup('"@text" not found', ['@text' => $text]);
}
- return $this->assert($not_exists == (strpos($this->getTextContent(), (string) $text) === FALSE), $message, $group);
+ if ($not_exists) {
+ if ($this instanceof TestCase) {
+ $this->assertStringNotContainsString((string) $text, $this->getTextContent(), $message);
+ }
+ else {
+ return $this->assert(strpos($this->getTextContent(), (string) $text) === FALSE, $message, $group);
+ }
+ }
+ else {
+ if ($this instanceof TestCase) {
+ $this->assertStringContainsString((string) $text, $this->getTextContent(), $message);
+ }
+ else {
+ return $this->assert(strpos($this->getTextContent(), (string) $text) !== FALSE, $message, $group);
+ }
+ }
}
/**
diff --git a/web/core/tests/Drupal/KernelTests/Config/TypedConfigTest.php b/web/core/tests/Drupal/KernelTests/Config/TypedConfigTest.php
index bc9c441d51..06752d64e3 100644
--- a/web/core/tests/Drupal/KernelTests/Config/TypedConfigTest.php
+++ b/web/core/tests/Drupal/KernelTests/Config/TypedConfigTest.php
@@ -66,7 +66,7 @@ public function testTypedDataAPI() {
$this->assertInstanceOf(StringInterface::class, $sequence->get('hum1'));
$this->assertEquals('hum1', $sequence->get('hum1')->getValue());
$this->assertEquals('hum2', $sequence->get('hum2')->getValue());
- $this->assertEquals(2, count($sequence->getIterator()));
+ $this->assertCount(2, $sequence->getIterator());
// Verify the item metadata is available.
$this->assertInstanceOf(SequenceDataDefinition::class, $sequence->getDataDefinition());
diff --git a/web/core/tests/Drupal/KernelTests/Core/Asset/AttachedAssetsTest.php b/web/core/tests/Drupal/KernelTests/Core/Asset/AttachedAssetsTest.php
index 8ae5d36c6e..5b9c663f29 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Asset/AttachedAssetsTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Asset/AttachedAssetsTest.php
@@ -81,16 +81,16 @@ public function testAddFiles() {
$css = $this->assetResolver->getCssAssets($assets, FALSE);
$js = $this->assetResolver->getJsAssets($assets, FALSE)[1];
- $this->assertTrue(array_key_exists('core/modules/system/tests/modules/common_test/bar.css', $css), 'CSS files are correctly added.');
- $this->assertTrue(array_key_exists('core/modules/system/tests/modules/common_test/foo.js', $js), 'JavaScript files are correctly added.');
+ $this->assertArrayHasKey('core/modules/system/tests/modules/common_test/bar.css', $css);
+ $this->assertArrayHasKey('core/modules/system/tests/modules/common_test/foo.js', $js);
$css_render_array = \Drupal::service('asset.css.collection_renderer')->render($css);
$js_render_array = \Drupal::service('asset.js.collection_renderer')->render($js);
$rendered_css = $this->renderer->renderPlain($css_render_array);
$rendered_js = $this->renderer->renderPlain($js_render_array);
$query_string = $this->container->get('state')->get('system.css_js_query_string') ?: '0';
- $this->assertNotIdentical(strpos($rendered_css, '<link rel="stylesheet" media="all" href="' . file_url_transform_relative(file_create_url('core/modules/system/tests/modules/common_test/bar.css')) . '?' . $query_string . '" />'), FALSE, 'Rendering an external CSS file.');
- $this->assertNotIdentical(strpos($rendered_js, '<script src="' . file_url_transform_relative(file_create_url('core/modules/system/tests/modules/common_test/foo.js')) . '?' . $query_string . '"></script>'), FALSE, 'Rendering an external JavaScript file.');
+ $this->assertStringContainsString('<link rel="stylesheet" media="all" href="' . file_url_transform_relative(file_create_url('core/modules/system/tests/modules/common_test/bar.css')) . '?' . $query_string . '" />', $rendered_css, 'Rendering an external CSS file.');
+ $this->assertStringContainsString('<script src="' . file_url_transform_relative(file_create_url('core/modules/system/tests/modules/common_test/foo.js')) . '?' . $query_string . '"></script>', $rendered_js, 'Rendering an external JavaScript file.');
}
/**
@@ -103,8 +103,8 @@ public function testAddJsSettings() {
$this->assertEqual([], $assets->getSettings(), 'JavaScript settings on $assets are empty.');
$javascript = $this->assetResolver->getJsAssets($assets, FALSE)[1];
- $this->assertTrue(array_key_exists('currentPath', $javascript['drupalSettings']['data']['path']), 'The current path JavaScript setting is set correctly.');
- $this->assertTrue(array_key_exists('currentPath', $assets->getSettings()['path']), 'JavaScript settings on $assets are resolved after retrieving JavaScript assets, and are equal to the returned JavaScript settings.');
+ $this->assertArrayHasKey('currentPath', $javascript['drupalSettings']['data']['path']);
+ $this->assertArrayHasKey('currentPath', $assets->getSettings()['path']);
$assets->setSettings(['drupal' => 'rocks', 'dries' => 280342800]);
$javascript = $this->assetResolver->getJsAssets($assets, FALSE)[1];
@@ -121,15 +121,15 @@ public function testAddExternalFiles() {
$css = $this->assetResolver->getCssAssets($assets, FALSE);
$js = $this->assetResolver->getJsAssets($assets, FALSE)[1];
- $this->assertTrue(array_key_exists('http://example.com/stylesheet.css', $css), 'External CSS files are correctly added.');
- $this->assertTrue(array_key_exists('http://example.com/script.js', $js), 'External JavaScript files are correctly added.');
+ $this->assertArrayHasKey('http://example.com/stylesheet.css', $css);
+ $this->assertArrayHasKey('http://example.com/script.js', $js);
$css_render_array = \Drupal::service('asset.css.collection_renderer')->render($css);
$js_render_array = \Drupal::service('asset.js.collection_renderer')->render($js);
$rendered_css = $this->renderer->renderPlain($css_render_array);
$rendered_js = $this->renderer->renderPlain($js_render_array);
- $this->assertNotIdentical(strpos($rendered_css, '<link rel="stylesheet" media="all" href="http://example.com/stylesheet.css" />'), FALSE, 'Rendering an external CSS file.');
- $this->assertNotIdentical(strpos($rendered_js, '<script src="http://example.com/script.js"></script>'), FALSE, 'Rendering an external JavaScript file.');
+ $this->assertStringContainsString('<link rel="stylesheet" media="all" href="http://example.com/stylesheet.css" />', $rendered_css, 'Rendering an external CSS file.');
+ $this->assertStringContainsString('<script src="http://example.com/script.js"></script>', $rendered_js, 'Rendering an external JavaScript file.');
}
/**
@@ -144,8 +144,8 @@ public function testAttributes() {
$rendered_js = $this->renderer->renderPlain($js_render_array);
$expected_1 = '<script src="http://example.com/deferred-external.js" foo="bar" defer></script>';
$expected_2 = '<script src="' . file_url_transform_relative(file_create_url('core/modules/system/tests/modules/common_test/deferred-internal.js')) . '?v=1" defer bar="foo"></script>';
- $this->assertNotIdentical(strpos($rendered_js, $expected_1), FALSE, 'Rendered external JavaScript with correct defer and random attributes.');
- $this->assertNotIdentical(strpos($rendered_js, $expected_2), FALSE, 'Rendered internal JavaScript with correct defer and random attributes.');
+ $this->assertStringContainsString($expected_1, $rendered_js, 'Rendered external JavaScript with correct defer and random attributes.');
+ $this->assertStringContainsString($expected_2, $rendered_js, 'Rendered internal JavaScript with correct defer and random attributes.');
}
/**
@@ -160,8 +160,8 @@ public function testAggregatedAttributes() {
$rendered_js = $this->renderer->renderPlain($js_render_array);
$expected_1 = '<script src="http://example.com/deferred-external.js" foo="bar" defer></script>';
$expected_2 = '<script src="' . file_url_transform_relative(file_create_url('core/modules/system/tests/modules/common_test/deferred-internal.js')) . '?v=1" defer bar="foo"></script>';
- $this->assertNotIdentical(strpos($rendered_js, $expected_1), FALSE, 'Rendered external JavaScript with correct defer and random attributes.');
- $this->assertNotIdentical(strpos($rendered_js, $expected_2), FALSE, 'Rendered internal JavaScript with correct defer and random attributes.');
+ $this->assertStringContainsString($expected_1, $rendered_js, 'Rendered external JavaScript with correct defer and random attributes.');
+ $this->assertStringContainsString($expected_2, $rendered_js, 'Rendered internal JavaScript with correct defer and random attributes.');
}
/**
@@ -172,14 +172,14 @@ public function testAggregation() {
$build['#attached']['library'][] = 'core/drupal.vertical-tabs';
$assets = AttachedAssets::createFromRenderArray($build);
- $this->assertEqual(1, count($this->assetResolver->getCssAssets($assets, TRUE)), 'There is a sole aggregated CSS asset.');
+ $this->assertCount(1, $this->assetResolver->getCssAssets($assets, TRUE), 'There is a sole aggregated CSS asset.');
list($header_js, $footer_js) = $this->assetResolver->getJsAssets($assets, TRUE);
$this->assertEqual([], \Drupal::service('asset.js.collection_renderer')->render($header_js), 'There are 0 JavaScript assets in the header.');
$rendered_footer_js = \Drupal::service('asset.js.collection_renderer')->render($footer_js);
- $this->assertEqual(2, count($rendered_footer_js), 'There are 2 JavaScript assets in the footer.');
+ $this->assertCount(2, $rendered_footer_js, 'There are 2 JavaScript assets in the footer.');
$this->assertEqual('drupal-settings-json', $rendered_footer_js[0]['#attributes']['data-drupal-selector'], 'The first of the two JavaScript assets in the footer has drupal settings.');
- $this->assertEqual(0, strpos($rendered_footer_js[1]['#attributes']['src'], base_path()), 'The second of the two JavaScript assets in the footer has the sole aggregated JavaScript asset.');
+ $this->assertStringStartsWith(base_path(), $rendered_footer_js[1]['#attributes']['src'], 'The second of the two JavaScript assets in the footer has the sole aggregated JavaScript asset.');
}
/**
@@ -233,9 +233,9 @@ public function testHeaderHTML() {
$js_render_array = \Drupal::service('asset.js.collection_renderer')->render($js);
$rendered_js = $this->renderer->renderPlain($js_render_array);
$query_string = $this->container->get('state')->get('system.css_js_query_string') ?: '0';
- $this->assertNotIdentical(strpos($rendered_js, '<script src="' . file_url_transform_relative(file_create_url('core/modules/system/tests/modules/common_test/header.js')) . '?' . $query_string . '"></script>'), FALSE, 'The JS asset in common_test/js-header appears in the header.');
- $this->assertNotIdentical(strpos($rendered_js, '<script src="' . file_url_transform_relative(file_create_url('core/misc/drupal.js'))), FALSE, 'The JS asset of the direct dependency (core/drupal) of common_test/js-header appears in the header.');
- $this->assertNotIdentical(strpos($rendered_js, '<script src="' . file_url_transform_relative(file_create_url('core/misc/drupalSettingsLoader.js'))), FALSE, 'The JS asset of the indirect dependency (core/drupalSettings) of common_test/js-header appears in the header.');
+ $this->assertStringContainsString('<script src="' . file_url_transform_relative(file_create_url('core/modules/system/tests/modules/common_test/header.js')) . '?' . $query_string . '"></script>', $rendered_js, 'The JS asset in common_test/js-header appears in the header.');
+ $this->assertStringContainsString('<script src="' . file_url_transform_relative(file_create_url('core/misc/drupal.js')), $rendered_js, 'The JS asset of the direct dependency (core/drupal) of common_test/js-header appears in the header.');
+ $this->assertStringContainsString('<script src="' . file_url_transform_relative(file_create_url('core/misc/drupalSettingsLoader.js')), $rendered_js, 'The JS asset of the indirect dependency (core/drupalSettings) of common_test/js-header appears in the header.');
}
/**
@@ -266,8 +266,8 @@ public function testBrowserConditionalComments() {
$expected_1 = "<!--[if lte IE 8]>\n" . '<script src="' . file_url_transform_relative(file_create_url('core/modules/system/tests/modules/common_test/old-ie.js')) . '?' . $default_query_string . '"></script>' . "\n<![endif]-->";
$expected_2 = "<!--[if !IE]><!-->\n" . '<script src="' . file_url_transform_relative(file_create_url('core/modules/system/tests/modules/common_test/no-ie.js')) . '?' . $default_query_string . '"></script>' . "\n<!--<![endif]-->";
- $this->assertNotIdentical(strpos($rendered_js, $expected_1), FALSE, 'Rendered JavaScript within downlevel-hidden conditional comments.');
- $this->assertNotIdentical(strpos($rendered_js, $expected_2), FALSE, 'Rendered JavaScript within downlevel-revealed conditional comments.');
+ $this->assertStringContainsString($expected_1, $rendered_js, 'Rendered JavaScript within downlevel-hidden conditional comments.');
+ $this->assertStringContainsString($expected_2, $rendered_js, 'Rendered JavaScript within downlevel-revealed conditional comments.');
}
/**
@@ -281,7 +281,7 @@ public function testVersionQueryString() {
$js_render_array = \Drupal::service('asset.js.collection_renderer')->render($js);
$rendered_js = $this->renderer->renderPlain($js_render_array);
- $this->assertTrue(strpos($rendered_js, 'core/assets/vendor/backbone/backbone-min.js?v=1.2.3') > 0, 'JavaScript version identifiers correctly appended to URLs');
+ $this->assertStringContainsString('core/assets/vendor/backbone/backbone-min.js?v=1.4.0', $rendered_js, 'JavaScript version identifiers correctly appended to URLs');
}
/**
@@ -418,7 +418,7 @@ public function testLibraryAlter() {
$js = $this->assetResolver->getJsAssets($assets, FALSE)[1];
$js_render_array = \Drupal::service('asset.js.collection_renderer')->render($js);
$rendered_js = $this->renderer->renderPlain($js_render_array);
- $this->assertContains('core/assets/vendor/jquery-form/jquery.form.min.js', (string) $rendered_js, 'Altered library dependencies are added to the page.');
+ $this->assertStringContainsString('core/assets/vendor/jquery-form/jquery.form.min.js', (string) $rendered_js, 'Altered library dependencies are added to the page.');
}
/**
@@ -432,15 +432,13 @@ public function testDynamicLibrary() {
\Drupal::state()->set('common_test.library_info_build_test', TRUE);
$library_discovery->clearCachedDefinitions();
$dynamic_library = $library_discovery->getLibraryByName('common_test', 'dynamic_library');
- $this->assertTrue(is_array($dynamic_library));
- if ($this->assertTrue(isset($dynamic_library['version']))) {
- $this->assertSame('1.0', $dynamic_library['version']);
- }
+ $this->assertIsArray($dynamic_library);
+ $this->assertArrayHasKey('version', $dynamic_library);
+ $this->assertSame('1.0', $dynamic_library['version']);
// Make sure the dynamic library definition could be altered.
// @see common_test_library_info_alter()
- if ($this->assertTrue(isset($dynamic_library['dependencies']))) {
- $this->assertSame(['core/jquery'], $dynamic_library['dependencies']);
- }
+ $this->assertArrayHasKey('dependencies', $dynamic_library);
+ $this->assertSame(['core/jquery'], $dynamic_library['dependencies']);
}
/**
@@ -464,16 +462,16 @@ public function testAddJsFileWithQueryString() {
$css = $this->assetResolver->getCssAssets($assets, FALSE);
$js = $this->assetResolver->getJsAssets($assets, FALSE)[1];
- $this->assertTrue(array_key_exists('core/modules/system/tests/modules/common_test/querystring.css?arg1=value1&arg2=value2', $css), 'CSS file with query string is correctly added.');
- $this->assertTrue(array_key_exists('core/modules/system/tests/modules/common_test/querystring.js?arg1=value1&arg2=value2', $js), 'JavaScript file with query string is correctly added.');
+ $this->assertArrayHasKey('core/modules/system/tests/modules/common_test/querystring.css?arg1=value1&arg2=value2', $css);
+ $this->assertArrayHasKey('core/modules/system/tests/modules/common_test/querystring.js?arg1=value1&arg2=value2', $js);
$css_render_array = \Drupal::service('asset.css.collection_renderer')->render($css);
$rendered_css = $this->renderer->renderPlain($css_render_array);
$js_render_array = \Drupal::service('asset.js.collection_renderer')->render($js);
$rendered_js = $this->renderer->renderPlain($js_render_array);
$query_string = $this->container->get('state')->get('system.css_js_query_string') ?: '0';
- $this->assertNotIdentical(strpos($rendered_css, '<link rel="stylesheet" media="all" href="' . str_replace('&', '&', file_url_transform_relative(file_create_url('core/modules/system/tests/modules/common_test/querystring.css?arg1=value1&arg2=value2'))) . '&' . $query_string . '" />'), FALSE, 'CSS file with query string gets version query string correctly appended..');
- $this->assertNotIdentical(strpos($rendered_js, '<script src="' . str_replace('&', '&', file_url_transform_relative(file_create_url('core/modules/system/tests/modules/common_test/querystring.js?arg1=value1&arg2=value2'))) . '&' . $query_string . '"></script>'), FALSE, 'JavaScript file with query string gets version query string correctly appended.');
+ $this->assertStringContainsString('<link rel="stylesheet" media="all" href="' . str_replace('&', '&', file_url_transform_relative(file_create_url('core/modules/system/tests/modules/common_test/querystring.css?arg1=value1&arg2=value2'))) . '&' . $query_string . '" />', $rendered_css, 'CSS file with query string gets version query string correctly appended..');
+ $this->assertStringContainsString('<script src="' . str_replace('&', '&', file_url_transform_relative(file_create_url('core/modules/system/tests/modules/common_test/querystring.js?arg1=value1&arg2=value2'))) . '&' . $query_string . '"></script>', $rendered_js, 'JavaScript file with query string gets version query string correctly appended.');
}
}
diff --git a/web/core/tests/Drupal/KernelTests/Core/Asset/ResolvedLibraryDefinitionsFilesMatchTest.php b/web/core/tests/Drupal/KernelTests/Core/Asset/ResolvedLibraryDefinitionsFilesMatchTest.php
index ad2c6eaede..3948b4417b 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Asset/ResolvedLibraryDefinitionsFilesMatchTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Asset/ResolvedLibraryDefinitionsFilesMatchTest.php
@@ -173,7 +173,7 @@ protected function verifyLibraryFilesExist($library_definitions) {
$path = $this->root . '/' . $file;
// Only check and assert each file path once.
if (!isset($this->pathsChecked[$path])) {
- $this->assertTrue(is_file($path), "$file file referenced from the $extension/$library_name library exists.");
+ $this->assertFileExists($path, "$file file referenced from the $extension/$library_name library does not exist.");
$this->pathsChecked[$path] = TRUE;
}
}
diff --git a/web/core/tests/Drupal/KernelTests/Core/Cache/GenericCacheBackendUnitTestBase.php b/web/core/tests/Drupal/KernelTests/Core/Cache/GenericCacheBackendUnitTestBase.php
index 1cbc64b607..c8a7f97242 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Cache/GenericCacheBackendUnitTestBase.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Cache/GenericCacheBackendUnitTestBase.php
@@ -134,7 +134,7 @@ public function testSetGet() {
$with_backslash = ['foo' => '\Drupal\foo\Bar'];
$backend->set('test1', $with_backslash);
$cached = $backend->get('test1');
- $this->assert(is_object($cached), "Backend returned an object for cache id test1.");
+ $this->assertIsObject($cached);
$this->assertSame($with_backslash, $cached->data);
$this->assertTrue($cached->valid, 'Item is marked as valid.');
// We need to round because microtime may be rounded up in the backend.
@@ -144,7 +144,7 @@ public function testSetGet() {
$this->assertSame(FALSE, $backend->get('test2'), "Backend does not contain data for cache id test2.");
$backend->set('test2', ['value' => 3], REQUEST_TIME + 3);
$cached = $backend->get('test2');
- $this->assert(is_object($cached), "Backend returned an object for cache id test2.");
+ $this->assertIsObject($cached);
$this->assertSame(['value' => 3], $cached->data);
$this->assertTrue($cached->valid, 'Item is marked as valid.');
$this->assertTrue($cached->created >= REQUEST_TIME && $cached->created <= round(microtime(TRUE), 3), 'Created time is correct.');
@@ -153,7 +153,7 @@ public function testSetGet() {
$backend->set('test3', 'foobar', REQUEST_TIME - 3);
$this->assertFalse($backend->get('test3'), 'Invalid item not returned.');
$cached = $backend->get('test3', TRUE);
- $this->assert(is_object($cached), 'Backend returned an object for cache id test3.');
+ $this->assertIsObject($cached);
$this->assertFalse($cached->valid, 'Item is marked as valid.');
$this->assertTrue($cached->created >= REQUEST_TIME && $cached->created <= round(microtime(TRUE), 3), 'Created time is correct.');
$this->assertEqual($cached->expire, REQUEST_TIME - 3, 'Expire time is correct.');
@@ -162,7 +162,7 @@ public function testSetGet() {
$with_eof = ['foo' => "\nEOF\ndata"];
$backend->set('test4', $with_eof);
$cached = $backend->get('test4');
- $this->assert(is_object($cached), "Backend returned an object for cache id test4.");
+ $this->assertIsObject($cached);
$this->assertSame($with_eof, $cached->data);
$this->assertTrue($cached->valid, 'Item is marked as valid.');
$this->assertTrue($cached->created >= REQUEST_TIME && $cached->created <= round(microtime(TRUE), 3), 'Created time is correct.');
@@ -172,7 +172,7 @@ public function testSetGet() {
$with_eof_and_semicolon = ['foo' => "\nEOF;\ndata"];
$backend->set('test5', $with_eof_and_semicolon);
$cached = $backend->get('test5');
- $this->assert(is_object($cached), "Backend returned an object for cache id test5.");
+ $this->assertIsObject($cached);
$this->assertSame($with_eof_and_semicolon, $cached->data);
$this->assertTrue($cached->valid, 'Item is marked as valid.');
$this->assertTrue($cached->created >= REQUEST_TIME && $cached->created <= round(microtime(TRUE), 3), 'Created time is correct.');
@@ -181,7 +181,7 @@ public function testSetGet() {
$with_variable = ['foo' => '$bar'];
$backend->set('test6', $with_variable);
$cached = $backend->get('test6');
- $this->assert(is_object($cached), "Backend returned an object for cache id test6.");
+ $this->assertIsObject($cached);
$this->assertSame($with_variable, $cached->data);
// Make sure that a cached object is not affected by changing the original.
@@ -194,7 +194,7 @@ public function testSetGet() {
// Add a property to the original. It should not appear in the cached data.
$data->this_should_not_be_in_the_cache = TRUE;
$cached = $backend->get('test7');
- $this->assert(is_object($cached), "Backend returned an object for cache id test7.");
+ $this->assertIsObject($cached);
$this->assertEqual($expected_data, $cached->data);
$this->assertFalse(isset($cached->data->this_should_not_be_in_the_cache));
// Add a property to the cache data. It should not appear when we fetch
@@ -216,10 +216,10 @@ public function testSetGet() {
// Calling ::set() with invalid cache tags. This should fail an assertion.
try {
$backend->set('assertion_test', 'value', Cache::PERMANENT, ['node' => [3, 5, 7]]);
- $this->fail('::set() was called with invalid cache tags, runtime assertion did not fail.');
+ $this->fail('::set() was called with invalid cache tags, but runtime assertion did not fail.');
}
catch (\AssertionError $e) {
- $this->pass('::set() was called with invalid cache tags, runtime assertion failed.');
+ // Do nothing; continue testing in extending classes.
}
}
@@ -231,16 +231,16 @@ public function testDelete() {
$this->assertSame(FALSE, $backend->get('test1'), "Backend does not contain data for cache id test1.");
$backend->set('test1', 7);
- $this->assert(is_object($backend->get('test1')), "Backend returned an object for cache id test1.");
+ $this->assertIsObject($backend->get('test1'));
$this->assertSame(FALSE, $backend->get('test2'), "Backend does not contain data for cache id test2.");
$backend->set('test2', 3);
- $this->assert(is_object($backend->get('test2')), "Backend returned an object for cache id %cid.");
+ $this->assertIsObject($backend->get('test2'));
$backend->delete('test1');
$this->assertSame(FALSE, $backend->get('test1'), "Backend does not contain data for cache id test1 after deletion.");
- $this->assert(is_object($backend->get('test2')), "Backend still has an object for cache id test2.");
+ $this->assertIsObject($backend->get('test2'));
$backend->delete('test2');
$this->assertSame(FALSE, $backend->get('test2'), "Backend does not contain data for cache id test2 after deletion.");
@@ -274,7 +274,7 @@ public function testValueTypeIsKept() {
// Retrieve and test cache objects.
foreach ($variables as $cid => $value) {
$object = $backend->get($cid);
- $this->assert(is_object($object), sprintf("Backend returned an object for cache id %s.", $cid));
+ $this->assertIsObject($object, sprintf("Backend returned an object for cache id %s.", $cid));
$this->assertSame($value, $object->data, sprintf("Data of cached id %s kept is identical in type and value", $cid));
}
}
@@ -328,13 +328,13 @@ public function testGetMultiple() {
$this->assertIdentical($ret['test6']->data, 13, "Existing cache id test6 has the correct value.");
$this->assertIdentical($ret['test7']->data, 17, "Existing cache id test7 has the correct value.");
// Test $cids array - ensure it contains cache id's that do not exist.
- $this->assert(in_array('test19', $cids), "Nonexistent cache id test19 is in cids array.");
- $this->assert(in_array('test21', $cids), "Nonexistent cache id test21 is in cids array.");
+ $this->assertContains('test19', $cids, "Nonexistent cache id test19 is in cids array.");
+ $this->assertContains('test21', $cids, "Nonexistent cache id test21 is in cids array.");
// Test $cids array - ensure it does not contain cache id's that exist.
- $this->assertFalse(in_array('test2', $cids), "Existing cache id test2 is not in cids array.");
- $this->assertFalse(in_array('test3', $cids), "Existing cache id test3 is not in cids array.");
- $this->assertFalse(in_array('test6', $cids), "Existing cache id test6 is not in cids array.");
- $this->assertFalse(in_array('test7', $cids), "Existing cache id test7 is not in cids array.");
+ $this->assertNotContains('test2', $cids, "Existing cache id test2 is not in cids array.");
+ $this->assertNotContains('test3', $cids, "Existing cache id test3 is not in cids array.");
+ $this->assertNotContains('test6', $cids, "Existing cache id test6 is not in cids array.");
+ $this->assertNotContains('test7', $cids, "Existing cache id test7 is not in cids array.");
// Test a second time after deleting and setting new keys which ensures that
// if the backend uses statics it does not cause unexpected results.
@@ -357,13 +357,13 @@ public function testGetMultiple() {
$this->assertIdentical($ret['test7']->data, 17, "Existing cache id test7 has the correct value.");
$this->assertIdentical($ret['test19']->data, 57, "Added cache id test19 has the correct value.");
// Test $cids array - ensure it contains cache id's that do not exist.
- $this->assert(in_array('test3', $cids), "Deleted cache id test3 is in cids array.");
- $this->assert(in_array('test6', $cids), "Deleted cache id test6 is in cids array.");
- $this->assert(in_array('test21', $cids), "Nonexistent cache id test21 is in cids array.");
+ $this->assertContains('test3', $cids, "Deleted cache id test3 is in cids array.");
+ $this->assertContains('test6', $cids, "Deleted cache id test6 is in cids array.");
+ $this->assertContains('test21', $cids, "Nonexistent cache id test21 is in cids array.");
// Test $cids array - ensure it does not contain cache id's that exist.
- $this->assertFalse(in_array('test2', $cids), "Existing cache id test2 is not in cids array.");
- $this->assertFalse(in_array('test7', $cids), "Existing cache id test7 is not in cids array.");
- $this->assertFalse(in_array('test19', $cids), "Added cache id test19 is not in cids array.");
+ $this->assertNotContains('test2', $cids, "Existing cache id test2 is not in cids array.");
+ $this->assertNotContains('test7', $cids, "Existing cache id test7 is not in cids array.");
+ $this->assertNotContains('test19', $cids, "Added cache id test19 is not in cids array.");
// Test with a long $cid and non-numeric array key.
$cids = ['key:key' => $long_cid];
@@ -418,10 +418,10 @@ public function testSetMultiple() {
'exception_test_3' => ['data' => 3, 'tags' => ['node' => [3, 5, 7]]],
];
$backend->setMultiple($items);
- $this->fail('::setMultiple() was called with invalid cache tags, runtime assertion did not fail.');
+ $this->fail('::setMultiple() was called with invalid cache tags, but runtime assertion did not fail.');
}
catch (\AssertionError $e) {
- $this->pass('::setMultiple() was called with invalid cache tags, runtime assertion failed.');
+ // Do nothing; continue testing in extending classes.
}
}
@@ -507,18 +507,18 @@ public function testInvalidate() {
$cids = $reference;
$ret = $backend->getMultiple($cids);
- $this->assertEqual(count($ret), 4, 'Four items returned.');
+ $this->assertCount(4, $ret, 'Four items returned.');
$backend->invalidate('test1');
$backend->invalidateMultiple(['test2', 'test3']);
$cids = $reference;
$ret = $backend->getMultiple($cids);
- $this->assertEqual(count($ret), 1, 'Only one item element returned.');
+ $this->assertCount(1, $ret, 'Only one item element returned.');
$cids = $reference;
$ret = $backend->getMultiple($cids, TRUE);
- $this->assertEqual(count($ret), 4, 'Four items returned.');
+ $this->assertCount(4, $ret, 'Four items returned.');
// Calling invalidateMultiple() with an empty array should not cause an
// error.
diff --git a/web/core/tests/Drupal/KernelTests/Core/Command/DbDumpTest.php b/web/core/tests/Drupal/KernelTests/Core/Command/DbDumpTest.php
index 09aafb3564..327a868c22 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Command/DbDumpTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Command/DbDumpTest.php
@@ -25,7 +25,17 @@ class DbDumpTest extends KernelTestBase {
/**
* {@inheritdoc}
*/
- public static $modules = ['system', 'config', 'dblog', 'menu_link_content', 'link', 'block_content', 'file', 'path_alias', 'user'];
+ public static $modules = [
+ 'system',
+ 'config',
+ 'dblog',
+ 'menu_link_content',
+ 'link',
+ 'block_content',
+ 'file',
+ 'path_alias',
+ 'user',
+ ];
/**
* Test data to write into config.
diff --git a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigCRUDTest.php b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigCRUDTest.php
index 52269c0dfe..561fffef6e 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigCRUDTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigCRUDTest.php
@@ -184,7 +184,7 @@ public function testCRUD() {
// previously accessed with get()
$new_config = $config_factory->get('non_existing_key');
$this->assertTrue($new_config->isNew());
- $this->assertEqual(0, count($config_factory->loadMultiple(['non_existing_key'])), 'loadMultiple() does not return new objects');
+ $this->assertCount(0, $config_factory->loadMultiple(['non_existing_key']), 'loadMultiple() does not return new objects');
}
/**
diff --git a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigDependencyTest.php b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigDependencyTest.php
index 63e3b8fd01..3e7dbbf2d1 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigDependencyTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigDependencyTest.php
@@ -87,10 +87,10 @@ public function testDependencyManagement() {
// Test getting $entity2's dependencies as entities.
$dependents = $config_manager->findConfigEntityDependentsAsEntities('config', [$entity2->getConfigDependencyName()]);
$dependent_ids = $this->getDependentIds($dependents);
- $this->assertFalse(in_array('config_test:entity1', $dependent_ids), 'config_test.dynamic.entity1 does not have a dependency on config_test.dynamic.entity1.');
- $this->assertFalse(in_array('config_test:entity2', $dependent_ids), 'config_test.dynamic.entity2 does not have a dependency on itself.');
- $this->assertTrue(in_array('config_test:entity3', $dependent_ids), 'config_test.dynamic.entity3 has a dependency on config_test.dynamic.entity2.');
- $this->assertTrue(in_array('config_test:entity4', $dependent_ids), 'config_test.dynamic.entity4 has a dependency on config_test.dynamic.entity2.');
+ $this->assertNotContains('config_test:entity1', $dependent_ids, 'config_test.dynamic.entity1 does not have a dependency on config_test.dynamic.entity1.');
+ $this->assertNotContains('config_test:entity2', $dependent_ids, 'config_test.dynamic.entity2 does not have a dependency on itself.');
+ $this->assertContains('config_test:entity3', $dependent_ids, 'config_test.dynamic.entity3 has a dependency on config_test.dynamic.entity2.');
+ $this->assertContains('config_test:entity4', $dependent_ids, 'config_test.dynamic.entity4 has a dependency on config_test.dynamic.entity2.');
// Test getting node module's dependencies as configuration dependency
// objects.
@@ -132,30 +132,30 @@ public function testDependencyManagement() {
$dependents = $config_manager->findConfigEntityDependentsAsEntities('config', [$entity1->getConfigDependencyName()]);
$dependent_ids = $this->getDependentIds($dependents);
- $this->assertFalse(in_array('config_test:entity1', $dependent_ids), 'config_test.dynamic.entity1 does not have a dependency on itself.');
- $this->assertTrue(in_array('config_test:entity2', $dependent_ids), 'config_test.dynamic.entity2 has a dependency on config_test.dynamic.entity1.');
- $this->assertTrue(in_array('config_test:entity3', $dependent_ids), 'config_test.dynamic.entity3 has a dependency on config_test.dynamic.entity1.');
- $this->assertTrue(in_array('config_test:entity4', $dependent_ids), 'config_test.dynamic.entity4 has a dependency on config_test.dynamic.entity1.');
- $this->assertTrue(in_array('config_query_test:entity1', $dependent_ids), 'config_query_test.dynamic.entity1 has a dependency on config_test.dynamic.entity1.');
- $this->assertFalse(in_array('config_query_test:entity2', $dependent_ids), 'config_query_test.dynamic.entity2 does not have a dependency on config_test.dynamic.entity1.');
+ $this->assertNotContains('config_test:entity1', $dependent_ids, 'config_test.dynamic.entity1 does not have a dependency on itself.');
+ $this->assertContains('config_test:entity2', $dependent_ids, 'config_test.dynamic.entity2 has a dependency on config_test.dynamic.entity1.');
+ $this->assertContains('config_test:entity3', $dependent_ids, 'config_test.dynamic.entity3 has a dependency on config_test.dynamic.entity1.');
+ $this->assertContains('config_test:entity4', $dependent_ids, 'config_test.dynamic.entity4 has a dependency on config_test.dynamic.entity1.');
+ $this->assertContains('config_query_test:entity1', $dependent_ids, 'config_query_test.dynamic.entity1 has a dependency on config_test.dynamic.entity1.');
+ $this->assertNotContains('config_query_test:entity2', $dependent_ids, 'config_query_test.dynamic.entity2 does not have a dependency on config_test.dynamic.entity1.');
$dependents = $config_manager->findConfigEntityDependentsAsEntities('module', ['node', 'views']);
$dependent_ids = $this->getDependentIds($dependents);
- $this->assertFalse(in_array('config_test:entity1', $dependent_ids), 'config_test.dynamic.entity1 does not have a dependency on Views or Node.');
- $this->assertFalse(in_array('config_test:entity2', $dependent_ids), 'config_test.dynamic.entity2 does not have a dependency on Views or Node.');
- $this->assertTrue(in_array('config_test:entity3', $dependent_ids), 'config_test.dynamic.entity3 has a dependency on Views or Node.');
- $this->assertTrue(in_array('config_test:entity4', $dependent_ids), 'config_test.dynamic.entity4 has a dependency on Views or Node.');
- $this->assertFalse(in_array('config_query_test:entity1', $dependent_ids), 'config_test.query.entity1 does not have a dependency on Views or Node.');
- $this->assertTrue(in_array('config_query_test:entity2', $dependent_ids), 'config_test.query.entity2 has a dependency on Views or Node.');
+ $this->assertNotContains('config_test:entity1', $dependent_ids, 'config_test.dynamic.entity1 does not have a dependency on Views or Node.');
+ $this->assertNotContains('config_test:entity2', $dependent_ids, 'config_test.dynamic.entity2 does not have a dependency on Views or Node.');
+ $this->assertContains('config_test:entity3', $dependent_ids, 'config_test.dynamic.entity3 has a dependency on Views or Node.');
+ $this->assertContains('config_test:entity4', $dependent_ids, 'config_test.dynamic.entity4 has a dependency on Views or Node.');
+ $this->assertNotContains('config_query_test:entity1', $dependent_ids, 'config_test.query.entity1 does not have a dependency on Views or Node.');
+ $this->assertContains('config_query_test:entity2', $dependent_ids, 'config_test.query.entity2 has a dependency on Views or Node.');
$dependents = $config_manager->findConfigEntityDependentsAsEntities('module', ['config_test']);
$dependent_ids = $this->getDependentIds($dependents);
- $this->assertTrue(in_array('config_test:entity1', $dependent_ids), 'config_test.dynamic.entity1 has a dependency on config_test module.');
- $this->assertTrue(in_array('config_test:entity2', $dependent_ids), 'config_test.dynamic.entity2 has a dependency on config_test module.');
- $this->assertTrue(in_array('config_test:entity3', $dependent_ids), 'config_test.dynamic.entity3 has a dependency on config_test module.');
- $this->assertTrue(in_array('config_test:entity4', $dependent_ids), 'config_test.dynamic.entity4 has a dependency on config_test module.');
- $this->assertTrue(in_array('config_query_test:entity1', $dependent_ids), 'config_test.query.entity1 has a dependency on config_test module.');
- $this->assertTrue(in_array('config_query_test:entity2', $dependent_ids), 'config_test.query.entity2 has a dependency on config_test module.');
+ $this->assertContains('config_test:entity1', $dependent_ids, 'config_test.dynamic.entity1 has a dependency on config_test module.');
+ $this->assertContains('config_test:entity2', $dependent_ids, 'config_test.dynamic.entity2 has a dependency on config_test module.');
+ $this->assertContains('config_test:entity3', $dependent_ids, 'config_test.dynamic.entity3 has a dependency on config_test module.');
+ $this->assertContains('config_test:entity4', $dependent_ids, 'config_test.dynamic.entity4 has a dependency on config_test module.');
+ $this->assertContains('config_query_test:entity1', $dependent_ids, 'config_test.query.entity1 has a dependency on config_test module.');
+ $this->assertContains('config_query_test:entity2', $dependent_ids, 'config_test.query.entity2 has a dependency on config_test module.');
// Test the ability to find missing content dependencies.
$missing_dependencies = $config_manager->findMissingContentDependencies();
diff --git a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigDiffTest.php b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigDiffTest.php
index f29b88acd1..aa537a37a2 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigDiffTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigDiffTest.php
@@ -87,7 +87,7 @@ public function testDiff() {
// Prove the fields match.
$edits = $diff->getEdits();
$this->assertEqual($edits[0]->type, 'copy', 'The first item in the diff is a copy.');
- $this->assertEqual(count($edits), 1, 'There is one item in the diff');
+ $this->assertCount(1, $edits, 'There is one item in the diff');
// Rename the entity.
$new_test_entity_id = $this->randomMachineName();
@@ -102,7 +102,7 @@ public function testDiff() {
['id: ' . $test_entity_id]);
$this->assertYamlEdit($edits, 'label', 'copy');
$this->assertEqual($edits[2]->type, 'copy', 'The third item in the diff is a copy.');
- $this->assertEqual(count($edits), 3, 'There are three items in the diff.');
+ $this->assertCount(3, $edits, 'There are three items in the diff.');
}
/**
@@ -128,7 +128,7 @@ public function testCollectionDiff() {
$diff = \Drupal::service('config.manager')->diff($active, $sync, $config_name);
$edits = $diff->getEdits();
$this->assertEqual($edits[0]->type, 'copy', 'The first item in the diff is a copy.');
- $this->assertEqual(count($edits), 1, 'There is one item in the diff');
+ $this->assertCount(1, $edits, 'There is one item in the diff');
// Test that the differences are detected when diffing the collection.
$diff = \Drupal::service('config.manager')->diff($active, $sync, $config_name, NULL, 'test');
@@ -146,11 +146,11 @@ public function testCollectionDiff() {
* @param string $type
* The type of edit that is being asserted.
* @param mixed $orig
- * (optional) The original value of of the edit. If not supplied, assertion
- * is skipped.
+ * (optional) The original value of the edit. If not supplied, assertion is
+ * skipped.
* @param mixed $closing
- * (optional) The closing value of of the edit. If not supplied, assertion
- * is skipped.
+ * (optional) The closing value of the edit. If not supplied, assertion is
+ * skipped.
*/
protected function assertYamlEdit(array $edits, $field, $type, $orig = NULL, $closing = NULL) {
$match = FALSE;
diff --git a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigEntityUnitTest.php b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigEntityUnitTest.php
index 0f8609cc24..4456ad1e64 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigEntityUnitTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigEntityUnitTest.php
@@ -83,10 +83,10 @@ public function testStorageMethods() {
$this->assertSame($entity->uuid(), $entity_loaded_by_uuid->uuid());
$entities = $this->storage->loadByProperties();
- $this->assertEqual(count($entities), 3, 'Three entities are loaded when no properties are specified.');
+ $this->assertCount(3, $entities, 'Three entities are loaded when no properties are specified.');
$entities = $this->storage->loadByProperties(['style' => $style]);
- $this->assertEqual(count($entities), 2, 'Two entities are loaded when the style property is specified.');
+ $this->assertCount(2, $entities, 'Two entities are loaded when the style property is specified.');
// Assert that both returned entities have a matching style property.
foreach ($entities as $entity) {
diff --git a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigFileContentTest.php b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigFileContentTest.php
index 818be6ecca..57f6ad6832 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigFileContentTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigFileContentTest.php
@@ -159,17 +159,17 @@ public function testReadWriteConfig() {
// Get file listing for all files starting with 'foo'. Should return
// two elements.
$files = $storage->listAll('foo');
- $this->assertEqual(count($files), 2, 'Two files listed with the prefix \'foo\'.');
+ $this->assertCount(2, $files, 'Two files listed with the prefix \'foo\'.');
// Get file listing for all files starting with 'biff'. Should return
// one element.
$files = $storage->listAll('biff');
- $this->assertEqual(count($files), 1, 'One file listed with the prefix \'biff\'.');
+ $this->assertCount(1, $files, 'One file listed with the prefix \'biff\'.');
// Get file listing for all files starting with 'foo.bar'. Should return
// one element.
$files = $storage->listAll('foo.bar');
- $this->assertEqual(count($files), 1, 'One file listed with the prefix \'foo.bar\'.');
+ $this->assertCount(1, $files, 'One file listed with the prefix \'foo.bar\'.');
// Get file listing for all files starting with 'bar'. Should return
// an empty array.
diff --git a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigImportRecreateTest.php b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigImportRecreateTest.php
index 3ff2dea598..480abd844d 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigImportRecreateTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigImportRecreateTest.php
@@ -88,9 +88,9 @@ public function testRecreateEntity() {
// will be recreated.
$creates = $this->configImporter->getUnprocessedConfiguration('create');
$deletes = $this->configImporter->getUnprocessedConfiguration('delete');
- $this->assertEqual(5, count($creates), 'There are 5 configuration items to create.');
- $this->assertEqual(5, count($deletes), 'There are 5 configuration items to delete.');
- $this->assertEqual(0, count($this->configImporter->getUnprocessedConfiguration('update')), 'There are no configuration items to update.');
+ $this->assertCount(5, $creates, 'There are 5 configuration items to create.');
+ $this->assertCount(5, $deletes, 'There are 5 configuration items to delete.');
+ $this->assertCount(0, $this->configImporter->getUnprocessedConfiguration('update'), 'There are no configuration items to update.');
$this->assertSame($creates, array_reverse($deletes), 'Deletes and creates contain the same configuration names in opposite orders due to dependencies.');
$this->configImporter->import();
diff --git a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigImportRenameValidationTest.php b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigImportRenameValidationTest.php
index 4ec352e57d..4540ca939d 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigImportRenameValidationTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigImportRenameValidationTest.php
@@ -29,7 +29,14 @@ class ConfigImportRenameValidationTest extends KernelTestBase {
*
* @var array
*/
- public static $modules = ['system', 'user', 'node', 'field', 'text', 'config_test'];
+ public static $modules = [
+ 'system',
+ 'user',
+ 'node',
+ 'field',
+ 'text',
+ 'config_test',
+ ];
/**
* {@inheritdoc}
diff --git a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigImporterMissingContentTest.php b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigImporterMissingContentTest.php
index c67e0425da..a5b4dcfb27 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigImporterMissingContentTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigImporterMissingContentTest.php
@@ -26,7 +26,13 @@ class ConfigImporterMissingContentTest extends KernelTestBase {
*
* @var array
*/
- public static $modules = ['system', 'user', 'entity_test', 'config_test', 'config_import_test'];
+ public static $modules = [
+ 'system',
+ 'user',
+ 'entity_test',
+ 'config_test',
+ 'config_import_test',
+ ];
protected function setUp() {
parent::setUp();
diff --git a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigImporterTest.php b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigImporterTest.php
index a976edb1cb..d9a513caaa 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigImporterTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigImporterTest.php
@@ -157,7 +157,7 @@ public function testDeleted() {
$this->assertFalse($this->configImporter->hasUnprocessedConfigurationChanges());
$logs = $this->configImporter->getErrors();
- $this->assertEqual(count($logs), 0);
+ $this->assertCount(0, $logs);
}
/**
@@ -211,7 +211,7 @@ public function testNew() {
// Verify that there is nothing more to import.
$this->assertFalse($this->configImporter->hasUnprocessedConfigurationChanges());
$logs = $this->configImporter->getErrors();
- $this->assertEqual(count($logs), 0);
+ $this->assertCount(0, $logs);
}
/**
@@ -256,7 +256,7 @@ public function testSecondaryWritePrimaryFirst() {
$this->assertEqual($secondary->label(), $values_secondary['label']);
$logs = $this->configImporter->getErrors();
- $this->assertEqual(count($logs), 1);
+ $this->assertCount(1, $logs);
$this->assertEqual($logs[0], new FormattableMarkup('Deleted and replaced configuration entity "@name"', ['@name' => $name_secondary]));
}
@@ -302,7 +302,7 @@ public function testSecondaryWriteSecondaryFirst() {
$this->assertEqual($secondary->label(), $values_secondary['label']);
$logs = $this->configImporter->getErrors();
- $this->assertEqual(count($logs), 1);
+ $this->assertCount(1, $logs);
$this->assertEqual($logs[0], Html::escape("Unexpected error during import with operation create for $name_primary: 'config_test' entity with ID 'secondary' already exists."));
}
@@ -384,7 +384,7 @@ public function testSecondaryUpdateDeletedDeleterFirst() {
$this->assertEqual($other->label(), $values_other['label']);
$logs = $this->configImporter->getErrors();
- $this->assertEqual(count($logs), 1);
+ $this->assertCount(1, $logs);
$this->assertEqual($logs[0], new FormattableMarkup('Update target "@name" is missing.', ['@name' => $name_deletee]));
}
@@ -435,7 +435,7 @@ public function testSecondaryUpdateDeletedDeleteeFirst() {
$this->assertNull($entity_storage->load('deleter'));
$this->assertNull($entity_storage->load('deletee'));
$logs = $this->configImporter->getErrors();
- $this->assertEqual(count($logs), 0);
+ $this->assertCount(0, $logs);
}
/**
@@ -477,7 +477,7 @@ public function testSecondaryDeletedDeleteeSecond() {
// delete occurred in \Drupal\config_test\Entity\ConfigTest::postDelete()
// this does not matter.
$logs = $this->configImporter->getErrors();
- $this->assertEqual(count($logs), 0);
+ $this->assertCount(0, $logs);
}
/**
@@ -534,7 +534,7 @@ public function testUpdated() {
// Verify that there is nothing more to import.
$this->assertFalse($this->configImporter->hasUnprocessedConfigurationChanges());
$logs = $this->configImporter->getErrors();
- $this->assertEqual(count($logs), 0);
+ $this->assertCount(0, $logs);
}
/**
@@ -619,7 +619,7 @@ public function testUnmetDependency() {
'Configuration <em class="placeholder">unknown.config</em> depends on the <em class="placeholder">unknown</em> extension that will not be installed after import.',
];
foreach ($expected as $expected_message) {
- $this->assertTrue(in_array($expected_message, $error_log), $expected_message);
+ $this->assertContains($expected_message, $error_log, $expected_message);
}
}
@@ -667,7 +667,7 @@ public function testUnmetDependency() {
'Configuration <em class="placeholder">config_test.dynamic.dotted.theme</em> depends on themes (<em class="placeholder">unknown, Seven</em>) that will not be installed after import.',
];
foreach ($expected as $expected_message) {
- $this->assertTrue(in_array($expected_message, $error_log), $expected_message);
+ $this->assertContains($expected_message, $error_log, $expected_message);
}
}
}
diff --git a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigLanguageOverrideTest.php b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigLanguageOverrideTest.php
index 5bf6f0ec47..adce52268e 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigLanguageOverrideTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigLanguageOverrideTest.php
@@ -17,7 +17,13 @@ class ConfigLanguageOverrideTest extends KernelTestBase {
*
* @var array
*/
- public static $modules = ['user', 'language', 'config_test', 'system', 'field'];
+ public static $modules = [
+ 'user',
+ 'language',
+ 'config_test',
+ 'system',
+ 'field',
+ ];
/**
* {@inheritdoc}
diff --git a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigOverridesPriorityTest.php b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigOverridesPriorityTest.php
index 6c568b8417..cd60c95dce 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigOverridesPriorityTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigOverridesPriorityTest.php
@@ -18,7 +18,12 @@ class ConfigOverridesPriorityTest extends KernelTestBase {
*
* @var array
*/
- public static $modules = ['system', 'config', 'config_override_test', 'language'];
+ public static $modules = [
+ 'system',
+ 'config',
+ 'config_override_test',
+ 'language',
+ ];
public function testOverridePriorities() {
$GLOBALS['config_test_run_module_overrides'] = FALSE;
diff --git a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigSchemaTest.php b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigSchemaTest.php
index e16225d0ec..7f89bfa248 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigSchemaTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigSchemaTest.php
@@ -25,7 +25,14 @@ class ConfigSchemaTest extends KernelTestBase {
*
* @var array
*/
- public static $modules = ['system', 'language', 'field', 'image', 'config_test', 'config_schema_test'];
+ public static $modules = [
+ 'system',
+ 'language',
+ 'field',
+ 'image',
+ 'config_test',
+ 'config_schema_test',
+ ];
/**
* {@inheritdoc}
@@ -310,31 +317,33 @@ public function testSchemaData() {
// Try a simple property.
$meta = \Drupal::service('config.typed')->get('system.site');
$property = $meta->get('page')->get('front');
- $this->assertTrue($property instanceof StringInterface, 'Got the right wrapper fo the page.front property.');
+ $this->assertInstanceOf(StringInterface::class, $property);
$this->assertEqual($property->getValue(), '/user/login', 'Got the right value for page.front data.');
$definition = $property->getDataDefinition();
$this->assertTrue(empty($definition['translatable']), 'Got the right translatability setting for page.front data.');
// Check nested array of properties.
$list = $meta->get('page')->getElements();
- $this->assertEqual(count($list), 3, 'Got a list with the right number of properties for site page data');
+ $this->assertCount(3, $list, 'Got a list with the right number of properties for site page data');
$this->assertTrue(isset($list['front']) && isset($list['403']) && isset($list['404']), 'Got a list with the right properties for site page data.');
$this->assertEqual($list['front']->getValue(), '/user/login', 'Got the right value for page.front data from the list.');
// And test some TypedConfigInterface methods.
$properties = $list;
- $this->assertTrue(count($properties) == 3 && $properties['front'] == $list['front'], 'Got the right properties for site page.');
+ $this->assertCount(3, $properties, 'Got the right number of properties for site page.');
+ $this->assertSame($list['front'], $properties['front']);
$values = $meta->get('page')->toArray();
- $this->assertTrue(count($values) == 3 && $values['front'] == '/user/login', 'Got the right property values for site page.');
+ $this->assertCount(3, $values, 'Got the right number of property values for site page.');
+ $this->assertSame($values['front'], '/user/login');
// Now let's try something more complex, with nested objects.
$wrapper = \Drupal::service('config.typed')->get('image.style.large');
$effects = $wrapper->get('effects');
- $this->assertTrue(count($effects->toArray()) == 1, 'Got an array with effects for image.style.large data');
+ $this->assertCount(1, $effects->toArray(), 'Got an array with effects for image.style.large data');
$uuid = key($effects->getValue());
$effect = $effects->get($uuid)->getElements();
$this->assertTrue(!$effect['data']->isEmpty() && $effect['id']->getValue() == 'image_scale', 'Got data for the image scale effect from metadata.');
- $this->assertTrue($effect['data']->get('width') instanceof IntegerInterface, 'Got the right type for the scale effect width.');
+ $this->assertInstanceOf(IntegerInterface::class, $effect['data']->get('width'));
$this->assertEqual($effect['data']->get('width')->getValue(), 480, 'Got the right value for the scale effect width.');
}
diff --git a/web/core/tests/Drupal/KernelTests/Core/Config/Storage/ConfigStorageTestBase.php b/web/core/tests/Drupal/KernelTests/Core/Config/Storage/ConfigStorageTestBase.php
index 03bd1a1477..cff3d01dfb 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Config/Storage/ConfigStorageTestBase.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Config/Storage/ConfigStorageTestBase.php
@@ -60,13 +60,13 @@ public function testCRUD() {
// Listing all names returns all.
$names = $this->storage->listAll();
- $this->assertTrue(in_array('system.performance', $names));
- $this->assertTrue(in_array($name, $names));
+ $this->assertContains('system.performance', $names);
+ $this->assertContains($name, $names);
// Listing all names with prefix returns names with that prefix only.
$names = $this->storage->listAll('config_test.');
- $this->assertFalse(in_array('system.performance', $names));
- $this->assertTrue(in_array($name, $names));
+ $this->assertNotContains('system.performance', $names);
+ $this->assertContains($name, $names);
// Rename the configuration storage object.
$new_name = 'config_test.storage_rename';
@@ -138,8 +138,7 @@ public function testInvalidStorage() {
$this->fail('Exception not thrown upon deleting from a non-existing storage bin.');
}
catch (\Exception $e) {
- $class = get_class($e);
- $this->pass($class . ' thrown upon deleting from a non-existing storage bin.');
+ // An exception occurred as expected; just continue.
}
// Listing on a non-existing storage bin returns an empty array.
diff --git a/web/core/tests/Drupal/KernelTests/Core/Config/Storage/FileStorageTest.php b/web/core/tests/Drupal/KernelTests/Core/Config/Storage/FileStorageTest.php
index 805af8aedd..33c864458a 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Config/Storage/FileStorageTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Config/Storage/FileStorageTest.php
@@ -83,7 +83,7 @@ public function testReadUnsupportedDataTypeConfigException() {
}
catch (UnsupportedDataTypeConfigException $e) {
$this->pass('Exception thrown when trying to read a field containing invalid data type.');
- $this->assertTrue((strpos($e->getMessage(), $this->storage->getFilePath('core.extension')) !== FALSE), 'Erroneous file path is displayed.');
+ $this->assertStringContainsString($this->storage->getFilePath('core.extension'), $e->getMessage(), 'Erroneous file path is displayed.');
}
}
diff --git a/web/core/tests/Drupal/KernelTests/Core/Database/AlterTest.php b/web/core/tests/Drupal/KernelTests/Core/Database/AlterTest.php
index 6ee99afb82..84c87b876b 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Database/AlterTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Database/AlterTest.php
@@ -21,7 +21,7 @@ public function testSimpleAlter() {
$result = $query->execute()->fetchAll();
- $this->assertEqual(count($result), 2, 'Returned the correct number of rows.');
+ $this->assertCount(2, $result, 'Returned the correct number of rows.');
}
/**
@@ -38,7 +38,7 @@ public function testAlterWithJoin() {
$records = $result->fetchAll();
- $this->assertEqual(count($records), 2, 'Returned the correct number of rows.');
+ $this->assertCount(2, $records, 'Returned the correct number of rows.');
$this->assertEqual($records[0]->name, 'George', 'Correct data retrieved.');
$this->assertEqual($records[0]->$tid_field, 4, 'Correct data retrieved.');
@@ -66,7 +66,7 @@ public function testAlterChangeConditional() {
$records = $result->fetchAll();
- $this->assertEqual(count($records), 1, 'Returned the correct number of rows.');
+ $this->assertCount(1, $records, 'Returned the correct number of rows.');
$this->assertEqual($records[0]->$name_field, 'John', 'Correct data retrieved.');
$this->assertEqual($records[0]->$tid_field, 2, 'Correct data retrieved.');
$this->assertEqual($records[0]->$pid_field, 1, 'Correct data retrieved.');
diff --git a/web/core/tests/Drupal/KernelTests/Core/Database/ConnectionTest.php b/web/core/tests/Drupal/KernelTests/Core/Database/ConnectionTest.php
index c9ab16a551..ce77eb4fc5 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Database/ConnectionTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Database/ConnectionTest.php
@@ -5,6 +5,7 @@
use Drupal\Component\Render\FormattableMarkup;
use Drupal\Core\Database\Database;
use Drupal\Core\Database\DatabaseExceptionWrapper;
+use Drupal\Core\Database\Query\Condition;
/**
* Tests of the core database system.
@@ -175,4 +176,17 @@ public function testPostgresqlReservedWords() {
}
}
+ /**
+ * Test that the method ::condition() returns a Condition object.
+ */
+ public function testCondition() {
+ $connection = Database::getConnection('default', 'default');
+ $namespace = (new \ReflectionObject($connection))->getNamespaceName() . "\\Condition";
+ if (!class_exists($namespace)) {
+ $namespace = Condition::class;
+ }
+ $condition = $connection->condition('AND');
+ $this->assertSame($namespace, get_class($condition));
+ }
+
}
diff --git a/web/core/tests/Drupal/KernelTests/Core/Database/DeleteTruncateTest.php b/web/core/tests/Drupal/KernelTests/Core/Database/DeleteTruncateTest.php
index b4aa0a9b14..c276704214 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Database/DeleteTruncateTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Database/DeleteTruncateTest.php
@@ -22,7 +22,7 @@ class DeleteTruncateTest extends DatabaseTestBase {
*/
public function testSubselectDelete() {
$num_records_before = $this->connection->query('SELECT COUNT(*) FROM {test_task}')->fetchField();
- $pid_to_delete = $this->connection->query("SELECT * FROM {test_task} WHERE task = 'sleep'")->fetchField();
+ $pid_to_delete = $this->connection->query("SELECT * FROM {test_task} WHERE task = 'sleep' ORDER BY tid")->fetchField();
$subquery = $this->connection->select('test', 't')
->fields('t', ['id'])
diff --git a/web/core/tests/Drupal/KernelTests/Core/Database/FetchTest.php b/web/core/tests/Drupal/KernelTests/Core/Database/FetchTest.php
index a8b25c54bd..c3f46b1f91 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Database/FetchTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Database/FetchTest.php
@@ -21,14 +21,14 @@ class FetchTest extends DatabaseTestBase {
public function testQueryFetchDefault() {
$records = [];
$result = $this->connection->query('SELECT name FROM {test} WHERE age = :age', [':age' => 25]);
- $this->assertTrue($result instanceof StatementInterface, 'Result set is a Drupal statement object.');
+ $this->assertInstanceOf(StatementInterface::class, $result);
foreach ($result as $record) {
$records[] = $record;
- $this->assertTrue(is_object($record), 'Record is an object.');
- $this->assertIdentical($record->name, 'John', '25 year old is John.');
+ $this->assertIsObject($record);
+ $this->assertSame('John', $record->name);
}
- $this->assertIdentical(count($records), 1, 'There is only one record.');
+ $this->assertCount(1, $records, 'There is only one record.');
}
/**
@@ -39,11 +39,11 @@ public function testQueryFetchObject() {
$result = $this->connection->query('SELECT name FROM {test} WHERE age = :age', [':age' => 25], ['fetch' => \PDO::FETCH_OBJ]);
foreach ($result as $record) {
$records[] = $record;
- $this->assertTrue(is_object($record), 'Record is an object.');
- $this->assertIdentical($record->name, 'John', '25 year old is John.');
+ $this->assertIsObject($record);
+ $this->assertSame('John', $record->name);
}
- $this->assertIdentical(count($records), 1, 'There is only one record.');
+ $this->assertCount(1, $records, 'There is only one record.');
}
/**
@@ -54,12 +54,12 @@ public function testQueryFetchArray() {
$result = $this->connection->query('SELECT name FROM {test} WHERE age = :age', [':age' => 25], ['fetch' => \PDO::FETCH_ASSOC]);
foreach ($result as $record) {
$records[] = $record;
- if ($this->assertTrue(is_array($record), 'Record is an array.')) {
- $this->assertIdentical($record['name'], 'John', 'Record can be accessed associatively.');
- }
+ $this->assertIsArray($record);
+ $this->assertArrayHasKey('name', $record);
+ $this->assertSame('John', $record['name']);
}
- $this->assertIdentical(count($records), 1, 'There is only one record.');
+ $this->assertCount(1, $records, 'There is only one record.');
}
/**
@@ -72,12 +72,28 @@ public function testQueryFetchClass() {
$result = $this->connection->query('SELECT name FROM {test} WHERE age = :age', [':age' => 25], ['fetch' => FakeRecord::class]);
foreach ($result as $record) {
$records[] = $record;
- if ($this->assertTrue($record instanceof FakeRecord, 'Record is an object of class FakeRecord.')) {
- $this->assertIdentical($record->name, 'John', '25 year old is John.');
- }
+ $this->assertInstanceOf(FakeRecord::class, $record);
+ $this->assertSame('John', $record->name);
}
- $this->assertIdentical(count($records), 1, 'There is only one record.');
+ $this->assertCount(1, $records, 'There is only one record.');
+ }
+
+ /**
+ * Confirms that we can fetch a record into a class using fetchObject.
+ *
+ * @see \Drupal\system\Tests\Database\FakeRecord
+ * @see \Drupal\Core\Database\StatementPrefech::fetchObject
+ */
+ public function testQueryFetchObjectClass() {
+ $records = 0;
+ $query = $this->connection->query('SELECT name FROM {test} WHERE age = :age', [':age' => 25]);
+ while ($result = $query->fetchObject(FakeRecord::class)) {
+ $records += 1;
+ $this->assertInstanceOf(FakeRecord::class, $result);
+ $this->assertSame('John', $result->name, '25 year old is John.');
+ }
+ $this->assertSame(1, $records, 'There is only one record.');
}
/**
@@ -91,10 +107,9 @@ public function testQueryFetchClasstype() {
$result = $this->connection->query('SELECT classname, name, job FROM {test_classtype} WHERE age = :age', [':age' => 26], ['fetch' => \PDO::FETCH_CLASS | \PDO::FETCH_CLASSTYPE]);
foreach ($result as $record) {
$records[] = $record;
- if ($this->assertTrue($record instanceof FakeRecord, 'Record is an object of class FakeRecord.')) {
- $this->assertSame('Kay', $record->name, 'Kay is found.');
- $this->assertSame('Web Developer', $record->job, 'A 26 year old Web Developer.');
- }
+ $this->assertInstanceOf(FakeRecord::class, $record);
+ $this->assertSame('Kay', $record->name);
+ $this->assertSame('Web Developer', $record->job);
$this->assertFalse(isset($record->classname), 'Classname field not found, as intended.');
}
@@ -109,12 +124,12 @@ public function testQueryFetchNum() {
$result = $this->connection->query('SELECT name FROM {test} WHERE age = :age', [':age' => 25], ['fetch' => \PDO::FETCH_NUM]);
foreach ($result as $record) {
$records[] = $record;
- if ($this->assertTrue(is_array($record), 'Record is an array.')) {
- $this->assertIdentical($record[0], 'John', 'Record can be accessed numerically.');
- }
+ $this->assertIsArray($record);
+ $this->assertArrayHasKey(0, $record);
+ $this->assertSame('John', $record[0]);
}
- $this->assertIdentical(count($records), 1, 'There is only one record');
+ $this->assertCount(1, $records, 'There is only one record');
}
/**
@@ -125,13 +140,14 @@ public function testQueryFetchBoth() {
$result = $this->connection->query('SELECT name FROM {test} WHERE age = :age', [':age' => 25], ['fetch' => \PDO::FETCH_BOTH]);
foreach ($result as $record) {
$records[] = $record;
- if ($this->assertTrue(is_array($record), 'Record is an array.')) {
- $this->assertIdentical($record[0], 'John', 'Record can be accessed numerically.');
- $this->assertIdentical($record['name'], 'John', 'Record can be accessed associatively.');
- }
+ $this->assertIsArray($record);
+ $this->assertArrayHasKey(0, $record);
+ $this->assertSame('John', $record[0]);
+ $this->assertArrayHasKey('name', $record);
+ $this->assertSame('John', $record['name']);
}
- $this->assertIdentical(count($records), 1, 'There is only one record.');
+ $this->assertCount(1, $records, 'There is only one record.');
}
/**
@@ -153,7 +169,7 @@ public function testQueryFetchAllColumn() {
public function testQueryFetchCol() {
$result = $this->connection->query('SELECT name FROM {test} WHERE age > :age', [':age' => 25]);
$column = $result->fetchCol();
- $this->assertIdentical(count($column), 3, 'fetchCol() returns the right number of records.');
+ $this->assertCount(3, $column, 'fetchCol() returns the right number of records.');
$result = $this->connection->query('SELECT name FROM {test} WHERE age > :age', [':age' => 25]);
$i = 0;
diff --git a/web/core/tests/Drupal/KernelTests/Core/Database/LoggingTest.php b/web/core/tests/Drupal/KernelTests/Core/Database/LoggingTest.php
index b0177dda00..48dfc4fc6f 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Database/LoggingTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Database/LoggingTest.php
@@ -36,7 +36,7 @@ public function testEnableLogging() {
$queries = Database::getLog('testing', 'default');
- $this->assertEqual(count($queries), 4, 'Correct number of queries recorded.');
+ $this->assertCount(4, $queries, 'Correct number of queries recorded.');
foreach ($queries as $query) {
$this->assertEqual($query['caller']['function'], __FUNCTION__, 'Correct function in query log.');
@@ -58,8 +58,8 @@ public function testEnableMultiLogging() {
$queries1 = Database::getLog('testing1');
$queries2 = Database::getLog('testing2');
- $this->assertEqual(count($queries1), 2, 'Correct number of queries recorded for log 1.');
- $this->assertEqual(count($queries2), 1, 'Correct number of queries recorded for log 2.');
+ $this->assertCount(2, $queries1, 'Correct number of queries recorded for log 1.');
+ $this->assertCount(1, $queries2, 'Correct number of queries recorded for log 2.');
}
/**
@@ -79,7 +79,7 @@ public function testEnableTargetLogging() {
$queries1 = Database::getLog('testing1');
- $this->assertEqual(count($queries1), 2, 'Recorded queries from all targets.');
+ $this->assertCount(2, $queries1, 'Recorded queries from all targets.');
$this->assertEqual($queries1[0]['target'], 'default', 'First query used default target.');
$this->assertEqual($queries1[1]['target'], 'replica', 'Second query used replica target.');
}
@@ -105,7 +105,7 @@ public function testEnableTargetLoggingNoTarget() {
$queries1 = Database::getLog('testing1');
- $this->assertEqual(count($queries1), 2, 'Recorded queries from all targets.');
+ $this->assertCount(2, $queries1, 'Recorded queries from all targets.');
$this->assertEqual($queries1[0]['target'], 'default', 'First query used default target.');
$this->assertEqual($queries1[1]['target'], 'default', 'Second query used default target as fallback.');
}
@@ -133,8 +133,8 @@ public function testEnableMultiConnectionLogging() {
$queries1 = Database::getLog('testing1');
$queries2 = Database::getLog('testing1', 'test2');
- $this->assertEqual(count($queries1), 1, 'Correct number of queries recorded for first connection.');
- $this->assertEqual(count($queries2), 1, 'Correct number of queries recorded for second connection.');
+ $this->assertCount(1, $queries1, 'Correct number of queries recorded for first connection.');
+ $this->assertCount(1, $queries2, 'Correct number of queries recorded for second connection.');
}
/**
diff --git a/web/core/tests/Drupal/KernelTests/Core/Database/QueryTest.php b/web/core/tests/Drupal/KernelTests/Core/Database/QueryTest.php
index 572c9c7ef9..d59082ba8c 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Database/QueryTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Database/QueryTest.php
@@ -14,10 +14,10 @@ class QueryTest extends DatabaseTestBase {
*/
public function testArraySubstitution() {
$names = $this->connection->query('SELECT name FROM {test} WHERE age IN ( :ages[] ) ORDER BY age', [':ages[]' => [25, 26, 27]])->fetchAll();
- $this->assertEqual(count($names), 3, 'Correct number of names returned');
+ $this->assertCount(3, $names, 'Correct number of names returned');
$names = $this->connection->query('SELECT name FROM {test} WHERE age IN ( :ages[] ) ORDER BY age', [':ages[]' => [25]])->fetchAll();
- $this->assertEqual(count($names), 1, 'Correct number of names returned');
+ $this->assertCount(1, $names, 'Correct number of names returned');
}
/**
diff --git a/web/core/tests/Drupal/KernelTests/Core/Database/RangeQueryTest.php b/web/core/tests/Drupal/KernelTests/Core/Database/RangeQueryTest.php
index 24f0f7f95d..cc78ad12fb 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Database/RangeQueryTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Database/RangeQueryTest.php
@@ -15,7 +15,7 @@ class RangeQueryTest extends DatabaseTestBase {
public function testRangeQuery() {
// Test if return correct number of rows.
$range_rows = $this->connection->queryRange("SELECT name FROM {test} ORDER BY name", 1, 3)->fetchAll();
- $this->assertEqual(count($range_rows), 3, 'Range query work and return correct number of rows.');
+ $this->assertCount(3, $range_rows, 'Range query work and return correct number of rows.');
// Test if return target data.
$raw_rows = $this->connection->query('SELECT name FROM {test} ORDER BY name')->fetchAll();
diff --git a/web/core/tests/Drupal/KernelTests/Core/Database/SelectSubqueryTest.php b/web/core/tests/Drupal/KernelTests/Core/Database/SelectSubqueryTest.php
index 0916d8601c..dbbc40f180 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Database/SelectSubqueryTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Database/SelectSubqueryTest.php
@@ -110,7 +110,7 @@ public function testConditionSubquerySelect2() {
// FROM test t
// WHERE t.age < (SELECT AVG(t2.age) FROM test t2)
$people = $select->execute()->fetchCol();
- $this->assertEquals(['John', 'Paul'], $people, 'Returned Paul and John.', 0.0, 10, TRUE);
+ $this->assertEqualsCanonicalizing(['John', 'Paul'], $people, 'Returned Paul and John.');
}
/**
@@ -136,7 +136,7 @@ public function testConditionSubquerySelect3() {
// FROM test t
// WHERE (SELECT AVG(tt.priority) FROM test_task tt WHERE tt.pid = t.id) > (SELECT AVG(tt2.priority) FROM test_task tt2)
$people = $select->execute()->fetchCol();
- $this->assertEquals(['John'], $people, 'Returned John.', 0.0, 10, TRUE);
+ $this->assertEqualsCanonicalizing(['John'], $people, 'Returned John.');
}
/**
@@ -174,7 +174,7 @@ public function testConditionSubquerySelect4() {
// BETWEEN (SELECT MIN(tt2.priority) AS expression FROM {test_task} tt2 WHERE (tt2.pid <> t.id))
// AND (SELECT AVG(tt3.priority) AS expression FROM {test_task} tt3 WHERE (tt3.pid <> t.id));
$people = $select->execute()->fetchCol();
- $this->assertEquals(['George', 'Paul'], $people, 'Returned George and Paul.', 0.0, 10, TRUE);
+ $this->assertEqualsCanonicalizing(['George', 'Paul'], $people, 'Returned George and Paul.');
}
/**
diff --git a/web/core/tests/Drupal/KernelTests/Core/Database/SelectTest.php b/web/core/tests/Drupal/KernelTests/Core/Database/SelectTest.php
index 3f55cacbe1..f551e43f41 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Database/SelectTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Database/SelectTest.php
@@ -38,8 +38,8 @@ public function testSimpleComment() {
$query = (string) $query;
$expected = "/* Testing query comments */";
- $this->assertEqual(count($records), 4, 'Returned the correct number of rows.');
- $this->assertNotIdentical(FALSE, strpos($query, $expected), 'The flattened query contains the comment string.');
+ $this->assertCount(4, $records, 'Returned the correct number of rows.');
+ $this->assertStringContainsString($expected, $query, 'The flattened query contains the comment string.');
}
/**
@@ -58,8 +58,8 @@ public function testVulnerableComment() {
// Check the returned number of rows.
$this->assertCount(4, $records);
- // Check that the flattened query contains the sanitised comment string.
- $this->assertContains($expected, $query);
+ // Check that the flattened query contains the sanitized comment string.
+ $this->assertStringContainsString($expected, $query);
$connection = Database::getConnection();
foreach ($this->makeCommentsProvider() as $test_set) {
@@ -218,7 +218,7 @@ public function testNullCondition() {
->condition('age', NULL)
->execute()->fetchCol();
- $this->assertEqual(count($names), 0, 'No records found when comparing to NULL.');
+ $this->assertCount(0, $names, 'No records found when comparing to NULL.');
}
/**
@@ -232,7 +232,7 @@ public function testIsNullCondition() {
->isNull('age')
->execute()->fetchCol();
- $this->assertEqual(count($names), 1, 'Correct number of records found with NULL age.');
+ $this->assertCount(1, $names, 'Correct number of records found with NULL age.');
$this->assertEqual($names[0], 'Fozzie', 'Correct record returned for NULL age.');
}
@@ -248,7 +248,7 @@ public function testIsNotNullCondition() {
->orderBy('name')
->execute()->fetchCol();
- $this->assertEqual(count($names), 2, 'Correct number of records found withNOT NULL age.');
+ $this->assertCount(2, $names, 'Correct number of records found withNOT NULL age.');
$this->assertEqual($names[0], 'Gonzo', 'Correct record returned for NOT NULL age.');
$this->assertEqual($names[1], 'Kermit', 'Correct record returned for NOT NULL age.');
}
@@ -317,7 +317,7 @@ public function testUnion() {
$names = $query_1->execute()->fetchCol();
// Ensure we only get 2 records.
- $this->assertEqual(count($names), 2, 'UNION correctly discarded duplicates.');
+ $this->assertCount(2, $names, 'UNION correctly discarded duplicates.');
sort($names);
$this->assertEquals(['George', 'Ringo'], $names);
}
@@ -339,7 +339,7 @@ public function testUnionAll() {
$names = $query_1->execute()->fetchCol();
// Ensure we get all 3 records.
- $this->assertEqual(count($names), 3, 'UNION ALL correctly preserved duplicates.');
+ $this->assertCount(3, $names, 'UNION ALL correctly preserved duplicates.');
$this->assertEqual($names[0], 'George', 'First query returned correct first name.');
$this->assertEqual($names[1], 'Ringo', 'Second query returned correct second name.');
@@ -388,7 +388,7 @@ public function testUnionOrder() {
$names = $query_1->execute()->fetchCol();
// Ensure we get all 3 records.
- $this->assertEqual(count($names), 3, 'UNION returned rows from both queries.');
+ $this->assertCount(3, $names, 'UNION returned rows from both queries.');
// Ensure that the names are in the correct reverse alphabetical order,
// regardless of which query they came from.
@@ -418,7 +418,7 @@ public function testUnionOrderLimit() {
$names = $query_1->execute()->fetchCol();
// Ensure we get all only 2 of the 3 records.
- $this->assertEqual(count($names), 2, 'UNION with a limit returned rows from both queries.');
+ $this->assertCount(2, $names, 'UNION with a limit returned rows from both queries.');
// Ensure that the names are in the correct reverse alphabetical order,
// regardless of which query they came from.
@@ -559,7 +559,7 @@ public function testInvalidSelectCount() {
// Normally it would throw an exception but we are suppressing
// it with the throw_exception option.
$options['throw_exception'] = FALSE;
- $this->connection->select('some_table_that_doesnt_exist', 't', $options)
+ $this->connection->select('some_table_that_does_not_exist', 't', $options)
->fields('t')
->countQuery()
->execute();
@@ -573,7 +573,7 @@ public function testInvalidSelectCount() {
try {
// This query will fail because the table does not exist.
- $this->connection->select('some_table_that_doesnt_exist', 't')
+ $this->connection->select('some_table_that_does_not_exist', 't')
->fields('t')
->countQuery()
->execute();
diff --git a/web/core/tests/Drupal/KernelTests/Core/Datetime/TimestampSchemaTest.php b/web/core/tests/Drupal/KernelTests/Core/Datetime/TimestampSchemaTest.php
index 977f8af20b..aa08749db8 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Datetime/TimestampSchemaTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Datetime/TimestampSchemaTest.php
@@ -14,7 +14,12 @@ class TimestampSchemaTest extends KernelTestBase {
/**
* {@inheritdoc}
*/
- protected static $modules = ['entity_test', 'field', 'field_timestamp_test', 'user'];
+ protected static $modules = [
+ 'entity_test',
+ 'field',
+ 'field_timestamp_test',
+ 'user',
+ ];
/**
* {@inheritdoc}
diff --git a/web/core/tests/Drupal/KernelTests/Core/DrupalKernel/DrupalKernelTest.php b/web/core/tests/Drupal/KernelTests/Core/DrupalKernel/DrupalKernelTest.php
index aede46b355..20447edf1d 100644
--- a/web/core/tests/Drupal/KernelTests/Core/DrupalKernel/DrupalKernelTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/DrupalKernel/DrupalKernelTest.php
@@ -137,7 +137,7 @@ public function testCompileDIC() {
// Check that the container itself is not among the persist IDs because it
// does not make sense to persist the container itself.
$persist_ids = $container->getParameter('persist_ids');
- $this->assertSame(FALSE, array_search('service_container', $persist_ids));
+ $this->assertNotContains('service_container', $persist_ids);
}
/**
diff --git a/web/core/tests/Drupal/KernelTests/Core/Element/PathElementFormTest.php b/web/core/tests/Drupal/KernelTests/Core/Element/PathElementFormTest.php
index b5b9ffd5ec..32890b95a3 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Element/PathElementFormTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Element/PathElementFormTest.php
@@ -153,7 +153,7 @@ public function testPathElement() {
$form_builder->submitForm($this, $form_state);
// Valid form state.
- $this->assertEqual(count($form_state->getErrors()), 0);
+ $this->assertCount(0, $form_state->getErrors());
$this->assertEqual($form_state->getValue('required_validate_route'), [
'route_name' => 'entity.user.canonical',
'route_parameters' => [
@@ -162,7 +162,7 @@ public function testPathElement() {
]);
/** @var \Drupal\Core\Url $url */
$url = $form_state->getValue('required_validate_url');
- $this->assertTrue($url instanceof Url);
+ $this->assertInstanceOf(Url::class, $url);
$this->assertEqual($url->getRouteName(), 'entity.user.canonical');
$this->assertEqual($url->getRouteParameters(), [
'user' => $this->testUser->id(),
@@ -178,7 +178,7 @@ public function testPathElement() {
$form_builder->submitForm($this, $form_state);
$errors = $form_state->getErrors();
// Should be missing 'required_validate' field.
- $this->assertEqual(count($errors), 1);
+ $this->assertCount(1, $errors);
$this->assertEqual($errors, ['required_validate' => t('@name field is required.', ['@name' => 'required_validate'])]);
// Test invalid parameters.
@@ -194,7 +194,7 @@ public function testPathElement() {
// Valid form state.
$errors = $form_state->getErrors();
- $this->assertEqual(count($errors), 3);
+ $this->assertCount(3, $errors);
$this->assertEqual($errors, [
'required_validate' => t('This path does not exist or you do not have permission to link to %path.', ['%path' => 'user/74']),
'required_validate_route' => t('This path does not exist or you do not have permission to link to %path.', ['%path' => 'user/74']),
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/ContentEntityChangedTest.php b/web/core/tests/Drupal/KernelTests/Core/Entity/ContentEntityChangedTest.php
index 6956af2e81..7329479fc3 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Entity/ContentEntityChangedTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/ContentEntityChangedTest.php
@@ -18,7 +18,15 @@ class ContentEntityChangedTest extends EntityKernelTestBase {
*
* @var array
*/
- public static $modules = ['language', 'user', 'system', 'field', 'text', 'filter', 'entity_test'];
+ public static $modules = [
+ 'language',
+ 'user',
+ 'system',
+ 'field',
+ 'text',
+ 'filter',
+ 'entity_test',
+ ];
/**
* The EntityTestMulChanged entity type storage.
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/CreateSampleEntityTest.php b/web/core/tests/Drupal/KernelTests/Core/Entity/CreateSampleEntityTest.php
index f4eeec9c05..6332869c3e 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Entity/CreateSampleEntityTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/CreateSampleEntityTest.php
@@ -25,7 +25,18 @@ class CreateSampleEntityTest extends KernelTestBase {
/**
* {@inheritdoc}
*/
- public static $modules = ['path_alias', 'system', 'field', 'filter', 'text', 'file', 'user', 'node', 'comment', 'taxonomy'];
+ public static $modules = [
+ 'path_alias',
+ 'system',
+ 'field',
+ 'filter',
+ 'text',
+ 'file',
+ 'user',
+ 'node',
+ 'comment',
+ 'taxonomy',
+ ];
/**
* {@inheritdoc}
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/Element/EntityAutocompleteElementFormTest.php b/web/core/tests/Drupal/KernelTests/Core/Entity/Element/EntityAutocompleteElementFormTest.php
index dc121eaf56..afde849c5a 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Entity/Element/EntityAutocompleteElementFormTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/Element/EntityAutocompleteElementFormTest.php
@@ -211,7 +211,7 @@ public function testValidEntityAutocompleteElement() {
$form_builder->submitForm($this, $form_state);
// Valid form state.
- $this->assertEqual(count($form_state->getErrors()), 0);
+ $this->assertCount(0, $form_state->getErrors());
// Test the 'single' element.
$this->assertEqual($form_state->getValue('single'), $this->referencedEntities[0]->id());
@@ -280,7 +280,7 @@ public function testInvalidEntityAutocompleteElement() {
'single' => 'single - non-existent label',
]);
$form_builder->submitForm($this, $form_state);
- $this->assertEqual(count($form_state->getErrors()), 1);
+ $this->assertCount(1, $form_state->getErrors());
$this->assertEqual($form_state->getErrors()['single'], t('There are no entities matching "%value".', ['%value' => 'single - non-existent label']));
// Test 'single' with a entity ID that doesn't exist.
@@ -289,7 +289,7 @@ public function testInvalidEntityAutocompleteElement() {
'single' => 'single - non-existent label (42)',
]);
$form_builder->submitForm($this, $form_state);
- $this->assertEqual(count($form_state->getErrors()), 1);
+ $this->assertCount(1, $form_state->getErrors());
$this->assertEqual($form_state->getErrors()['single'], t('The referenced entity (%type: %id) does not exist.', ['%type' => 'entity_test', '%id' => 42]));
// Do the same tests as above but on an element with '#validate_reference'
@@ -303,7 +303,7 @@ public function testInvalidEntityAutocompleteElement() {
// The element without 'autocreate' support still has to emit a warning when
// the input doesn't end with an entity ID enclosed in parentheses.
- $this->assertEqual(count($form_state->getErrors()), 1);
+ $this->assertCount(1, $form_state->getErrors());
$this->assertEqual($form_state->getErrors()['single_no_validate'], t('There are no entities matching "%value".', ['%value' => 'single - non-existent label']));
$form_state = (new FormState())
@@ -315,7 +315,7 @@ public function testInvalidEntityAutocompleteElement() {
// The input is complete (i.e. contains an entity ID at the end), no errors
// are triggered.
- $this->assertEqual(count($form_state->getErrors()), 0);
+ $this->assertCount(0, $form_state->getErrors());
}
/**
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityAccessControlHandlerTest.php b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityAccessControlHandlerTest.php
index d83706aaaf..b80bb2f75b 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityAccessControlHandlerTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityAccessControlHandlerTest.php
@@ -176,7 +176,7 @@ public function testEntityAccessDefaultController() {
// Check that the default access control handler is used for entities that don't
// have a specific access control handler defined.
$handler = $this->container->get('entity_type.manager')->getAccessControlHandler('entity_test_default_access');
- $this->assertTrue($handler instanceof EntityAccessControlHandler, 'The default entity handler is used for the entity_test_default_access entity type.');
+ $this->assertInstanceOf(EntityAccessControlHandler::class, $handler);
$entity = EntityTestDefaultAccess::create();
$this->assertEntityAccess([
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityCrudHookTest.php b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityCrudHookTest.php
index a3566fdd6c..fd75f33957 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityCrudHookTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityCrudHookTest.php
@@ -41,7 +41,15 @@ class EntityCrudHookTest extends EntityKernelTestBase {
*
* @var array
*/
- public static $modules = ['block', 'block_test', 'entity_crud_hook_test', 'file', 'taxonomy', 'node', 'comment'];
+ public static $modules = [
+ 'block',
+ 'block_test',
+ 'entity_crud_hook_test',
+ 'file',
+ 'taxonomy',
+ 'node',
+ 'comment',
+ ];
protected $ids = [];
@@ -69,9 +77,8 @@ protected function assertHookMessageOrder($messages) {
foreach ($messages as $message) {
// Verify that each message is found and record its position.
$position = array_search($message, $GLOBALS['entity_crud_hook_test']);
- if ($this->assertTrue($position !== FALSE, $message)) {
- $positions[] = $position;
- }
+ $this->assertNotFalse($position, $message);
+ $positions[] = $position;
}
// Sort the positions and ensure they remain in the same order.
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityDisplayBaseTest.php b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityDisplayBaseTest.php
index 7237d2413e..7b643d8b43 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityDisplayBaseTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityDisplayBaseTest.php
@@ -18,7 +18,14 @@ class EntityDisplayBaseTest extends KernelTestBase {
/**
* {@inheritdoc}
*/
- public static $modules = ['entity_test', 'entity_test_third_party', 'field', 'system', 'comment', 'user'];
+ public static $modules = [
+ 'entity_test',
+ 'entity_test_third_party',
+ 'field',
+ 'system',
+ 'comment',
+ 'user',
+ ];
/**
* {@inheritdoc}
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityFieldTest.php b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityFieldTest.php
index d2c95cfe8c..345f87b8ce 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityFieldTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityFieldTest.php
@@ -117,8 +117,8 @@ protected function doTestReadWrite($entity_type) {
$langcode = 'en';
// Access the name field.
- $this->assertTrue($entity->name instanceof FieldItemListInterface, new FormattableMarkup('%entity_type: Field implements interface', ['%entity_type' => $entity_type]));
- $this->assertTrue($entity->name[0] instanceof FieldItemInterface, new FormattableMarkup('%entity_type: Field item implements interface', ['%entity_type' => $entity_type]));
+ $this->assertInstanceOf(FieldItemListInterface::class, $entity->name);
+ $this->assertInstanceOf(FieldItemInterface::class, $entity->name[0]);
$this->assertEqual($this->entityName, $entity->name->value, new FormattableMarkup('%entity_type: Name value can be read.', ['%entity_type' => $entity_type]));
$this->assertEqual($this->entityName, $entity->name[0]->value, new FormattableMarkup('%entity_type: Name value can be read through list access.', ['%entity_type' => $entity_type]));
@@ -135,8 +135,8 @@ protected function doTestReadWrite($entity_type) {
$this->assertEqual($new_name, $entity->name->value, new FormattableMarkup('%entity_type: Name can be updated and read through list access.', ['%entity_type' => $entity_type]));
// Access the user field.
- $this->assertTrue($entity->user_id instanceof FieldItemListInterface, new FormattableMarkup('%entity_type: Field implements interface', ['%entity_type' => $entity_type]));
- $this->assertTrue($entity->user_id[0] instanceof FieldItemInterface, new FormattableMarkup('%entity_type: Field item implements interface', ['%entity_type' => $entity_type]));
+ $this->assertInstanceOf(FieldItemListInterface::class, $entity->user_id);
+ $this->assertInstanceOf(FieldItemInterface::class, $entity->user_id[0]);
$this->assertEqual($this->entityUser->id(), $entity->user_id->target_id, new FormattableMarkup('%entity_type: User id can be read.', ['%entity_type' => $entity_type]));
$this->assertEqual($this->entityUser->getAccountName(), $entity->user_id->entity->name->value, new FormattableMarkup('%entity_type: User name can be read.', ['%entity_type' => $entity_type]));
@@ -228,7 +228,7 @@ protected function doTestReadWrite($entity_type) {
}
$this->assertTrue(isset($entity->name), new FormattableMarkup('%entity_type: Name field is set.', ['%entity_type' => $entity_type]));
$this->assertTrue($entity->name->isEmpty(), new FormattableMarkup('%entity_type: Name field is set.', ['%entity_type' => $entity_type]));
- $this->assertIdentical(count($entity->name), 0, new FormattableMarkup('%entity_type: Name field contains no items.', ['%entity_type' => $entity_type]));
+ $this->assertCount(0, $entity->name, new FormattableMarkup('%entity_type: Name field contains no items.', ['%entity_type' => $entity_type]));
$this->assertIdentical($entity->name->getValue(), [], new FormattableMarkup('%entity_type: Name field value is an empty array.', ['%entity_type' => $entity_type]));
$this->assertFalse(isset($entity->name[0]), new FormattableMarkup('%entity_type: Name field item is not set.', ['%entity_type' => $entity_type]));
$this->assertFalse(isset($entity->name[0]->value), new FormattableMarkup('%entity_type: First name item value is not set.', ['%entity_type' => $entity_type]));
@@ -303,13 +303,13 @@ protected function doTestReadWrite($entity_type) {
unset($entity->name[3]);
// Test removing and empty-ing list items.
- $this->assertEqual(count($entity->name), 3, new FormattableMarkup('%entity_type: List has 3 items.', ['%entity_type' => $entity_type]));
+ $this->assertCount(3, $entity->name, new FormattableMarkup('%entity_type: List has 3 items.', ['%entity_type' => $entity_type]));
unset($entity->name[1]);
- $this->assertEqual(count($entity->name), 2, new FormattableMarkup('%entity_type: Second list item has been removed.', ['%entity_type' => $entity_type]));
+ $this->assertCount(2, $entity->name, new FormattableMarkup('%entity_type: Second list item has been removed.', ['%entity_type' => $entity_type]));
$this->assertEqual($entity->name[1]->value, 'Third name', new FormattableMarkup('%entity_type: The subsequent items have been shifted up.', ['%entity_type' => $entity_type]));
$this->assertEqual($entity->name[1]->getName(), 1, new FormattableMarkup('%entity_type: The items names have been updated to their new delta.', ['%entity_type' => $entity_type]));
$entity->name[1] = NULL;
- $this->assertEqual(count($entity->name), 2, new FormattableMarkup('%entity_type: Assigning NULL does not reduce array count.', ['%entity_type' => $entity_type]));
+ $this->assertCount(2, $entity->name, new FormattableMarkup('%entity_type: Assigning NULL does not reduce array count.', ['%entity_type' => $entity_type]));
$this->assertTrue($entity->name[1]->isEmpty(), new FormattableMarkup('%entity_type: Assigning NULL empties the item.', ['%entity_type' => $entity_type]));
// Test using isEmpty().
@@ -318,15 +318,15 @@ protected function doTestReadWrite($entity_type) {
$entity->name->value = NULL;
$this->assertTrue($entity->name[0]->isEmpty(), new FormattableMarkup('%entity_type: Name item is empty.', ['%entity_type' => $entity_type]));
$this->assertTrue($entity->name->isEmpty(), new FormattableMarkup('%entity_type: Name field is empty.', ['%entity_type' => $entity_type]));
- $this->assertEqual(count($entity->name), 1, new FormattableMarkup('%entity_type: Empty item is considered when counting.', ['%entity_type' => $entity_type]));
+ $this->assertCount(1, $entity->name, new FormattableMarkup('%entity_type: Empty item is considered when counting.', ['%entity_type' => $entity_type]));
$this->assertEqual(count(iterator_to_array($entity->name->getIterator())), count($entity->name), new FormattableMarkup('%entity_type: Count matches iterator count.', ['%entity_type' => $entity_type]));
$this->assertTrue($entity->name->getValue() === [0 => ['value' => NULL]], new FormattableMarkup('%entity_type: Name field value contains a NULL value.', ['%entity_type' => $entity_type]));
// Test using filterEmptyItems().
$entity->name = [NULL, 'foo'];
- $this->assertEqual(count($entity->name), 2, new FormattableMarkup('%entity_type: List has 2 items.', ['%entity_type' => $entity_type]));
+ $this->assertCount(2, $entity->name, new FormattableMarkup('%entity_type: List has 2 items.', ['%entity_type' => $entity_type]));
$entity->name->filterEmptyItems();
- $this->assertEqual(count($entity->name), 1, new FormattableMarkup('%entity_type: The empty item was removed.', ['%entity_type' => $entity_type]));
+ $this->assertCount(1, $entity->name, new FormattableMarkup('%entity_type: The empty item was removed.', ['%entity_type' => $entity_type]));
$this->assertEqual($entity->name[0]->value, 'foo', new FormattableMarkup('%entity_type: The items were renumbered.', ['%entity_type' => $entity_type]));
$this->assertEqual($entity->name[0]->getName(), 0, new FormattableMarkup('%entity_type: The deltas were updated in the items.', ['%entity_type' => $entity_type]));
@@ -390,7 +390,7 @@ protected function doTestSave($entity_type) {
// Access the name field.
$this->assertEqual(1, $entity->id->value, new FormattableMarkup('%entity_type: ID value can be read.', ['%entity_type' => $entity_type]));
- $this->assertTrue(is_string($entity->uuid->value), new FormattableMarkup('%entity_type: UUID value can be read.', ['%entity_type' => $entity_type]));
+ $this->assertIsString($entity->uuid->value);
$this->assertEqual('en', $entity->{$langcode_key}->value, new FormattableMarkup('%entity_type: Language code can be read.', ['%entity_type' => $entity_type]));
$this->assertEqual(\Drupal::languageManager()->getLanguage('en'), $entity->{$langcode_key}->language, new FormattableMarkup('%entity_type: Language object can be read.', ['%entity_type' => $entity_type]));
$this->assertEqual($this->entityUser->id(), $entity->user_id->target_id, new FormattableMarkup('%entity_type: User id can be read.', ['%entity_type' => $entity_type]));
@@ -423,12 +423,12 @@ protected function doTestIntrospection($entity_type) {
$this->assertEqual($definitions['field_test_text']->getType(), 'text', $entity_type . ': Test-text-field field found.');
// Test deriving further metadata.
- $this->assertTrue($definitions['name'] instanceof FieldDefinitionInterface);
+ $this->assertInstanceOf(FieldDefinitionInterface::class, $definitions['name']);
$field_item_definition = $definitions['name']->getItemDefinition();
- $this->assertTrue($field_item_definition instanceof ComplexDataDefinitionInterface);
+ $this->assertInstanceOf(ComplexDataDefinitionInterface::class, $field_item_definition);
$this->assertEqual($field_item_definition->getDataType(), 'field_item:string');
$value_definition = $field_item_definition->getPropertyDefinition('value');
- $this->assertTrue($value_definition instanceof DataDefinitionInterface);
+ $this->assertInstanceOf(DataDefinitionInterface::class, $value_definition);
$this->assertEqual($value_definition->getDataType(), 'string');
// Test deriving metadata from references.
@@ -443,12 +443,12 @@ protected function doTestIntrospection($entity_type) {
->getPropertyDefinition('entity')
->getTargetDefinition();
- $this->assertTrue($reference_definition instanceof EntityDataDefinitionInterface, 'Definition of the referenced user retrieved.');
+ $this->assertInstanceOf(EntityDataDefinitionInterface::class, $reference_definition);
$this->assertEqual($reference_definition->getEntityTypeId(), 'user', 'Referenced entity is of type "user".');
// Test propagating down.
$name_definition = $reference_definition->getPropertyDefinition('name');
- $this->assertTrue($name_definition instanceof FieldDefinitionInterface);
+ $this->assertInstanceOf(FieldDefinitionInterface::class, $name_definition);
$this->assertEqual($name_definition->getPropertyDefinition('value')->getDataType(), 'string');
// Test introspecting an entity object.
@@ -522,13 +522,13 @@ protected function doTestIterator($entity_type) {
$entity = $this->createTestEntity($entity_type);
foreach ($entity as $name => $field) {
- $this->assertTrue($field instanceof FieldItemListInterface, $entity_type . ": Field $name implements interface.");
+ $this->assertInstanceOf(FieldItemListInterface::class, $field);
foreach ($field as $delta => $item) {
- $this->assertTrue($field[0] instanceof FieldItemInterface, $entity_type . ": Item $delta of field $name implements interface.");
+ $this->assertInstanceOf(FieldItemInterface::class, $field[0]);
foreach ($item as $value_name => $value_property) {
- $this->assertTrue($value_property instanceof TypedDataInterface, $entity_type . ": Value $value_name of item $delta of field $name implements interface.");
+ $this->assertInstanceOf(TypedDataInterface::class, $value_property);
$value = $value_property->getValue();
$this->assertTrue(!isset($value) || is_scalar($value) || $value instanceof EntityInterface, $entity_type . ": Value $value_name of item $delta of field $name is a primitive or an entity.");
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityKernelTestBase.php b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityKernelTestBase.php
index 27edf6bce8..2f63dc996f 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityKernelTestBase.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityKernelTestBase.php
@@ -27,7 +27,14 @@ abstract class EntityKernelTestBase extends KernelTestBase {
*
* @var array
*/
- public static $modules = ['user', 'system', 'field', 'text', 'filter', 'entity_test'];
+ public static $modules = [
+ 'user',
+ 'system',
+ 'field',
+ 'text',
+ 'filter',
+ 'entity_test',
+ ];
/**
* The list of deprecated services.
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityLegacyTest.php b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityLegacyTest.php
index 87c01b45d3..fea6bcb8f6 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityLegacyTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityLegacyTest.php
@@ -133,7 +133,7 @@ public function testEntityView() {
EntityTest::create(),
EntityTest::create(),
];
- $this->assertEquals(4, count(entity_view_multiple($entities, 'default')));
+ $this->assertCount(4, entity_view_multiple($entities, 'default'));
}
/**
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryRelationshipTest.php b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryRelationshipTest.php
index c560b953c5..e305568c37 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryRelationshipTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryRelationshipTest.php
@@ -132,7 +132,7 @@ public function testQuery() {
$this->queryResults = $storage->getQuery()
->notExists("user_id.entity.name")
->execute();
- $this->assertEqual(count($this->queryResults), 0);
+ $this->assertCount(0, $this->queryResults);
// This returns the 0th entity as that's only one pointing to the 0th
// term (test without specifying the field column).
$this->queryResults = $storage->getQuery()
@@ -171,7 +171,7 @@ public function testQuery() {
$this->queryResults = $storage->getQuery()
->notExists("user_id.entity:user.name")
->execute();
- $this->assertEqual(count($this->queryResults), 0);
+ $this->assertCount(0, $this->queryResults);
// This returns the 0th entity as that's only one pointing to the 0th
// term (test without specifying the field column).
$this->queryResults = $storage->getQuery()
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryTest.php b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryTest.php
index 21ac9915c4..6d2b3e4c1c 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryTest.php
@@ -2,6 +2,7 @@
namespace Drupal\KernelTests\Core\Entity;
+use Drupal\Core\Database\Database;
use Drupal\entity_test\Entity\EntityTest;
use Drupal\entity_test\Entity\EntityTestMulRev;
use Drupal\field\Entity\FieldConfig;
@@ -274,6 +275,14 @@ public function testEntityQuery() {
$entity->name->value .= 'x';
$entity->save();
}
+ // Test querying all revisions with a condition on the revision ID field.
+ $this->queryResults = $this->storage
+ ->getQuery()
+ ->condition('revision_id', $first_entity->getRevisionId())
+ ->allRevisions()
+ ->execute();
+ $this->assertCount(1, $this->queryResults);
+ $this->assertEquals($first_entity->getRevisionId(), key($this->queryResults));
// We changed the entity names, so the current revision should not match.
$this->queryResults = $this->storage
->getQuery()
@@ -564,7 +573,7 @@ public function testNestedConditionGroups() {
*/
public function testConditionCount() {
// Query for all entities of the first bundle that
- // have red as a colour AND are triangle shaped.
+ // have red as a color AND are triangle shaped.
$query = $this->storage->getQuery();
// Add an AND condition group with 2 conditions in it.
@@ -802,127 +811,127 @@ public function testCaseSensitivity() {
->getQuery()
->condition('field_ci', $fixtures[0]['lowercase'] . $fixtures[1]['lowercase'])
->execute();
- $this->assertIdentical(count($result), 1, 'Case insensitive, lowercase');
+ $this->assertCount(1, $result, 'Case insensitive, lowercase');
$result = $this->storage
->getQuery()
->condition('field_ci', $fixtures[0]['uppercase'] . $fixtures[1]['uppercase'])
->execute();
- $this->assertIdentical(count($result), 1, 'Case insensitive, uppercase');
+ $this->assertCount(1, $result, 'Case insensitive, uppercase');
$result = $this->storage
->getQuery()
->condition('field_ci', $fixtures[0]['uppercase'] . $fixtures[1]['lowercase'])
->execute();
- $this->assertIdentical(count($result), 1, 'Case insensitive, mixed.');
+ $this->assertCount(1, $result, 'Case insensitive, mixed.');
// Check the case sensitive field, = operator.
$result = $this->storage
->getQuery()
->condition('field_cs', $fixtures[0]['lowercase'] . $fixtures[1]['lowercase'])
->execute();
- $this->assertIdentical(count($result), 0, 'Case sensitive, lowercase.');
+ $this->assertCount(0, $result, 'Case sensitive, lowercase.');
$result = $this->storage
->getQuery()
->condition('field_cs', $fixtures[0]['uppercase'] . $fixtures[1]['uppercase'])
->execute();
- $this->assertIdentical(count($result), 0, 'Case sensitive, uppercase.');
+ $this->assertCount(0, $result, 'Case sensitive, uppercase.');
$result = $this->storage
->getQuery()
->condition('field_cs', $fixtures[0]['uppercase'] . $fixtures[1]['lowercase'])
->execute();
- $this->assertIdentical(count($result), 1, 'Case sensitive, exact match.');
+ $this->assertCount(1, $result, 'Case sensitive, exact match.');
// Check the case insensitive field, IN operator.
$result = $this->storage
->getQuery()
->condition('field_ci', [$fixtures[0]['lowercase'] . $fixtures[1]['lowercase']], 'IN')
->execute();
- $this->assertIdentical(count($result), 1, 'Case insensitive, lowercase');
+ $this->assertCount(1, $result, 'Case insensitive, lowercase');
$result = $this->storage
->getQuery()
->condition('field_ci', [$fixtures[0]['uppercase'] . $fixtures[1]['uppercase']], 'IN')->execute();
- $this->assertIdentical(count($result), 1, 'Case insensitive, uppercase');
+ $this->assertCount(1, $result, 'Case insensitive, uppercase');
$result = $this->storage
->getQuery()
->condition('field_ci', [$fixtures[0]['uppercase'] . $fixtures[1]['lowercase']], 'IN')
->execute();
- $this->assertIdentical(count($result), 1, 'Case insensitive, mixed');
+ $this->assertCount(1, $result, 'Case insensitive, mixed');
// Check the case sensitive field, IN operator.
$result = $this->storage
->getQuery()
->condition('field_cs', [$fixtures[0]['lowercase'] . $fixtures[1]['lowercase']], 'IN')
->execute();
- $this->assertIdentical(count($result), 0, 'Case sensitive, lowercase');
+ $this->assertCount(0, $result, 'Case sensitive, lowercase');
$result = $this->storage
->getQuery()
->condition('field_cs', [$fixtures[0]['uppercase'] . $fixtures[1]['uppercase']], 'IN')
->execute();
- $this->assertIdentical(count($result), 0, 'Case sensitive, uppercase');
+ $this->assertCount(0, $result, 'Case sensitive, uppercase');
$result = $this->storage
->getQuery()
->condition('field_cs', [$fixtures[0]['uppercase'] . $fixtures[1]['lowercase']], 'IN')
->execute();
- $this->assertIdentical(count($result), 1, 'Case sensitive, mixed');
+ $this->assertCount(1, $result, 'Case sensitive, mixed');
// Check the case insensitive field, STARTS_WITH operator.
$result = $this->storage
->getQuery()
->condition('field_ci', $fixtures[0]['lowercase'], 'STARTS_WITH')
->execute();
- $this->assertIdentical(count($result), 1, 'Case sensitive, lowercase.');
+ $this->assertCount(1, $result, 'Case sensitive, lowercase.');
$result = $this->storage
->getQuery()
->condition('field_ci', $fixtures[0]['uppercase'], 'STARTS_WITH')
->execute();
- $this->assertIdentical(count($result), 1, 'Case sensitive, exact match.');
+ $this->assertCount(1, $result, 'Case sensitive, exact match.');
// Check the case sensitive field, STARTS_WITH operator.
$result = $this->storage
->getQuery()
->condition('field_cs', $fixtures[0]['lowercase'], 'STARTS_WITH')
->execute();
- $this->assertIdentical(count($result), 0, 'Case sensitive, lowercase.');
+ $this->assertCount(0, $result, 'Case sensitive, lowercase.');
$result = $this->storage
->getQuery()
->condition('field_cs', $fixtures[0]['uppercase'], 'STARTS_WITH')
->execute();
- $this->assertIdentical(count($result), 1, 'Case sensitive, exact match.');
+ $this->assertCount(1, $result, 'Case sensitive, exact match.');
// Check the case insensitive field, ENDS_WITH operator.
$result = $this->storage
->getQuery()
->condition('field_ci', $fixtures[1]['lowercase'], 'ENDS_WITH')
->execute();
- $this->assertIdentical(count($result), 1, 'Case sensitive, lowercase.');
+ $this->assertCount(1, $result, 'Case sensitive, lowercase.');
$result = $this->storage
->getQuery()
->condition('field_ci', $fixtures[1]['uppercase'], 'ENDS_WITH')
->execute();
- $this->assertIdentical(count($result), 1, 'Case sensitive, exact match.');
+ $this->assertCount(1, $result, 'Case sensitive, exact match.');
// Check the case sensitive field, ENDS_WITH operator.
$result = $this->storage
->getQuery()
->condition('field_cs', $fixtures[1]['lowercase'], 'ENDS_WITH')
->execute();
- $this->assertIdentical(count($result), 1, 'Case sensitive, lowercase.');
+ $this->assertCount(1, $result, 'Case sensitive, lowercase.');
$result = $this->storage
->getQuery()
->condition('field_cs', $fixtures[1]['uppercase'], 'ENDS_WITH')
->execute();
- $this->assertIdentical(count($result), 0, 'Case sensitive, exact match.');
+ $this->assertCount(0, $result, 'Case sensitive, exact match.');
// Check the case insensitive field, CONTAINS operator, use the inner 8
// characters of the uppercase and lowercase strings.
@@ -930,26 +939,26 @@ public function testCaseSensitivity() {
->getQuery()
->condition('field_ci', mb_substr($fixtures[0]['uppercase'] . $fixtures[1]['lowercase'], 4, 8), 'CONTAINS')
->execute();
- $this->assertIdentical(count($result), 1, 'Case sensitive, lowercase.');
+ $this->assertCount(1, $result, 'Case sensitive, lowercase.');
$result = $this->storage
->getQuery()
->condition('field_ci', mb_strtolower(mb_substr($fixtures[0]['uppercase'] . $fixtures[1]['lowercase'], 4, 8)), 'CONTAINS')
->execute();
- $this->assertIdentical(count($result), 1, 'Case sensitive, exact match.');
+ $this->assertCount(1, $result, 'Case sensitive, exact match.');
// Check the case sensitive field, CONTAINS operator.
$result = $this->storage
->getQuery()
->condition('field_cs', mb_substr($fixtures[0]['uppercase'] . $fixtures[1]['lowercase'], 4, 8), 'CONTAINS')
->execute();
- $this->assertIdentical(count($result), 1, 'Case sensitive, lowercase.');
+ $this->assertCount(1, $result, 'Case sensitive, lowercase.');
$result = $this->storage
->getQuery()
->condition('field_cs', mb_strtolower(mb_substr($fixtures[0]['uppercase'] . $fixtures[1]['lowercase'], 4, 8)), 'CONTAINS')
->execute();
- $this->assertIdentical(count($result), 0, 'Case sensitive, exact match.');
+ $this->assertCount(0, $result, 'Case sensitive, exact match.');
}
@@ -988,7 +997,7 @@ public function testBaseFieldMultipleColumns() {
->condition('description.format', 'format1')
->execute();
- $this->assertEqual(count($ids), 1);
+ $this->assertCount(1, $ids);
$this->assertEqual($term1->id(), reset($ids));
}
@@ -1001,7 +1010,7 @@ public function testPendingRevisions() {
->getQuery()
->condition('id', [14], 'IN')
->execute();
- $this->assertEqual(count($result), 1);
+ $this->assertCount(1, $result);
// Set a revision on entity 14 that isn't the current default.
$entity = EntityTestMulRev::load(14);
@@ -1020,7 +1029,7 @@ public function testPendingRevisions() {
->getQuery()
->condition('id', [14], 'IN')
->execute();
- $this->assertEqual(count($result), 1);
+ $this->assertCount(1, $result);
// Verify that field conditions on the default and pending revision are
// work as expected.
@@ -1201,4 +1210,50 @@ public function testConditionOnRevisionMetadataKeys() {
$this->assertEquals($entity->id(), reset($result));
}
+ /**
+ * Tests __toString().
+ */
+ public function testToString() {
+ $query = $this->storage->getQuery();
+ $group_blue = $query->andConditionGroup()->condition("{$this->figures}.color", ['blue'], 'IN');
+ $group_red = $query->andConditionGroup()->condition("{$this->figures}.color", ['red'], 'IN');
+ $null_group = $query->andConditionGroup()->notExists("{$this->figures}.color");
+ $this->queryResults = $query
+ ->condition($group_blue)
+ ->condition($group_red)
+ ->condition($null_group)
+ ->sort('id');
+
+ $figures = $this->figures;
+
+ // Matching the SQL statement against an hardcoded statement leads to
+ // failures with database drivers that override the
+ // Drupal\Core\Database\Query\Select class. We build a dynamic query via
+ // the db API to check that its SQL matches the one generated by the
+ // EntityQuery. This way we ensure that the database driver is free to
+ // create its own comparable SQL statement.
+ $connection = Database::getConnection();
+ $expected = $connection->select("entity_test_mulrev", "base_table");
+ $expected->addField("base_table", "revision_id", "revision_id");
+ $expected->addField("base_table", "id", "id");
+ $expected->join("entity_test_mulrev__$figures", "entity_test_mulrev__$figures", "entity_test_mulrev__$figures.entity_id = base_table.id");
+ $expected->join("entity_test_mulrev__$figures", "entity_test_mulrev__{$figures}_2", "entity_test_mulrev__{$figures}_2.entity_id = base_table.id");
+ $expected->addJoin("LEFT", "entity_test_mulrev__$figures", "entity_test_mulrev__{$figures}_3", "entity_test_mulrev__{$figures}_3.entity_id = base_table.id");
+ $expected->condition("entity_test_mulrev__$figures.{$figures}_color", ["blue"], "IN");
+ $expected->condition("entity_test_mulrev__{$figures}_2.{$figures}_color", ["red"], "IN");
+ $expected->isNull("entity_test_mulrev__{$figures}_3.{$figures}_color");
+ $expected->orderBy("base_table.id");
+
+ // Apply table prefixes to the expected SQL.
+ $expected_string = \Drupal::database()->prefixTables((string) $expected);
+ // Resolve placeholders in the expected SQL to their values.
+ $quoted = [];
+ foreach ($expected->getArguments() as $key => $value) {
+ $quoted[$key] = $connection->quote($value);
+ }
+ $expected_string = strtr($expected_string, $quoted);
+
+ $this->assertSame($expected_string, (string) $query);
+ }
+
}
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityRepositoryTest.php b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityRepositoryTest.php
index a65530365e..b26cb4d30b 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityRepositoryTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityRepositoryTest.php
@@ -302,7 +302,8 @@ protected function doTestLanguageFallback($method_name) {
* The expected entity type ID.
*/
protected function assertEntityType($entity, $expected_entity_type_id) {
- $this->assertTrue($entity instanceof EntityTest && $entity->getEntityTypeId() === $expected_entity_type_id);
+ $this->assertInstanceOf(EntityTest::class, $entity);
+ $this->assertEquals($expected_entity_type_id, $entity->getEntityTypeId());
}
/**
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/EntitySchemaTest.php b/web/core/tests/Drupal/KernelTests/Core/Entity/EntitySchemaTest.php
index f8be106cbc..06ba440839 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Entity/EntitySchemaTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/EntitySchemaTest.php
@@ -328,7 +328,7 @@ public function testCleanUpStorageDefinition() {
if ($definition->getProvider() == 'entity_test') {
$this->installEntitySchema($entity_type_id);
$entity_type_ids[] = $entity_type_id;
- };
+ }
}
// Get a list of all the entities in the schema.
@@ -371,4 +371,63 @@ public function testCleanUpStorageDefinition() {
$this->assertEqual($entity_type_id_count, 0, 'After uninstalling entity_test module the schema should not contains fields from entities provided by the module.');
}
+ /**
+ * Tests the installed storage schema for identifier fields.
+ */
+ public function testIdentifierSchema() {
+ $this->installEntitySchema('entity_test_rev');
+
+ $key_value_store = \Drupal::keyValue('entity.storage_schema.sql');
+ $id_schema = $key_value_store->get('entity_test_rev.field_schema_data.id', []);
+ $revision_id_schema = $key_value_store->get('entity_test_rev.field_schema_data.revision_id', []);
+
+ $expected_id_schema = [
+ 'entity_test_rev' => [
+ 'fields' => [
+ 'id' => [
+ 'type' => 'serial',
+ 'unsigned' => TRUE,
+ 'size' => 'normal',
+ 'not null' => TRUE,
+ ],
+ ],
+ ],
+ 'entity_test_rev_revision' => [
+ 'fields' => [
+ 'id' => [
+ 'type' => 'int',
+ 'unsigned' => TRUE,
+ 'size' => 'normal',
+ 'not null' => TRUE,
+ ],
+ ],
+ ],
+ ];
+ $this->assertEquals($expected_id_schema, $id_schema);
+
+ $expected_revision_id_schema = [
+ 'entity_test_rev' => [
+ 'fields' => [
+ 'revision_id' => [
+ 'type' => 'int',
+ 'unsigned' => TRUE,
+ 'size' => 'normal',
+ 'not null' => FALSE,
+ ],
+ ],
+ ],
+ 'entity_test_rev_revision' => [
+ 'fields' => [
+ 'revision_id' => [
+ 'type' => 'serial',
+ 'unsigned' => TRUE,
+ 'size' => 'normal',
+ 'not null' => TRUE,
+ ],
+ ],
+ ],
+ ];
+ $this->assertEquals($expected_revision_id_schema, $revision_id_schema);
+ }
+
}
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityTranslationTest.php b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityTranslationTest.php
index 24c256ee1c..a7426b84d0 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityTranslationTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityTranslationTest.php
@@ -255,24 +255,24 @@ protected function doTestMultilingualProperties($entity_type) {
->save();
$entities = $storage->loadMultiple();
- $this->assertEqual(count($entities), 3, new FormattableMarkup('%entity_type: Three entities were created.', ['%entity_type' => $entity_type]));
+ $this->assertCount(3, $entities, new FormattableMarkup('%entity_type: Three entities were created.', ['%entity_type' => $entity_type]));
$entities = $storage->loadMultiple([$translated_id]);
- $this->assertEqual(count($entities), 1, new FormattableMarkup('%entity_type: One entity correctly loaded by id.', ['%entity_type' => $entity_type]));
+ $this->assertCount(1, $entities, new FormattableMarkup('%entity_type: One entity correctly loaded by id.', ['%entity_type' => $entity_type]));
$entities = $storage->loadByProperties(['name' => $name]);
- $this->assertEqual(count($entities), 2, new FormattableMarkup('%entity_type: Two entities correctly loaded by name.', ['%entity_type' => $entity_type]));
+ $this->assertCount(2, $entities, new FormattableMarkup('%entity_type: Two entities correctly loaded by name.', ['%entity_type' => $entity_type]));
// @todo The default language condition should go away in favor of an
// explicit parameter.
$entities = $storage->loadByProperties(['name' => $properties[$langcode]['name'][0], $default_langcode_key => 0]);
- $this->assertEqual(count($entities), 1, new FormattableMarkup('%entity_type: One entity correctly loaded by name translation.', ['%entity_type' => $entity_type]));
+ $this->assertCount(1, $entities, new FormattableMarkup('%entity_type: One entity correctly loaded by name translation.', ['%entity_type' => $entity_type]));
$entities = $storage->loadByProperties([$langcode_key => $default_langcode, 'name' => $name]);
- $this->assertEqual(count($entities), 1, new FormattableMarkup('%entity_type: One entity correctly loaded by name and language.', ['%entity_type' => $entity_type]));
+ $this->assertCount(1, $entities, new FormattableMarkup('%entity_type: One entity correctly loaded by name and language.', ['%entity_type' => $entity_type]));
$entities = $storage->loadByProperties([$langcode_key => $langcode, 'name' => $properties[$langcode]['name'][0]]);
- $this->assertEqual(count($entities), 0, new FormattableMarkup('%entity_type: No entity loaded by name translation specifying the translation language.', ['%entity_type' => $entity_type]));
+ $this->assertCount(0, $entities, new FormattableMarkup('%entity_type: No entity loaded by name translation specifying the translation language.', ['%entity_type' => $entity_type]));
$entities = $storage->loadByProperties([$langcode_key => $langcode, 'name' => $properties[$langcode]['name'][0], $default_langcode_key => 0]);
- $this->assertEqual(count($entities), 1, new FormattableMarkup('%entity_type: One entity loaded by name translation and language specifying to look for translations.', ['%entity_type' => $entity_type]));
+ $this->assertCount(1, $entities, new FormattableMarkup('%entity_type: One entity loaded by name translation and language specifying to look for translations.', ['%entity_type' => $entity_type]));
$entities = $storage->loadByProperties(['user_id' => $properties[$langcode]['user_id'][0], $default_langcode_key => NULL]);
- $this->assertEqual(count($entities), 2, new FormattableMarkup('%entity_type: Two entities loaded by uid without caring about property translatability.', ['%entity_type' => $entity_type]));
+ $this->assertCount(2, $entities, new FormattableMarkup('%entity_type: Two entities loaded by uid without caring about property translatability.', ['%entity_type' => $entity_type]));
// Test property conditions and orders with multiple languages in the same
// query.
@@ -284,7 +284,7 @@ protected function doTestMultilingualProperties($entity_type) {
->condition($group)
->condition('name', $properties[$langcode]['name'][0], '=', $langcode)
->execute();
- $this->assertEqual(count($result), 1, new FormattableMarkup('%entity_type: One entity loaded by name and uid using different language meta conditions.', ['%entity_type' => $entity_type]));
+ $this->assertCount(1, $result, new FormattableMarkup('%entity_type: One entity loaded by name and uid using different language meta conditions.', ['%entity_type' => $entity_type]));
// Test mixed property and field conditions.
$storage->resetCache($result);
@@ -304,7 +304,7 @@ protected function doTestMultilingualProperties($entity_type) {
->condition($default_langcode_group)
->condition($langcode_group)
->execute();
- $this->assertEqual(count($result), 1, new FormattableMarkup('%entity_type: One entity loaded by name, uid and field value using different language meta conditions.', ['%entity_type' => $entity_type]));
+ $this->assertCount(1, $result, new FormattableMarkup('%entity_type: One entity loaded by name, uid and field value using different language meta conditions.', ['%entity_type' => $entity_type]));
}
/**
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityTypedDataDefinitionTest.php b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityTypedDataDefinitionTest.php
index dcfe664a6d..17bd0976b6 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityTypedDataDefinitionTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityTypedDataDefinitionTest.php
@@ -49,11 +49,11 @@ protected function setUp() {
public function testFields() {
$field_definition = BaseFieldDefinition::create('integer');
// Fields are lists of complex data.
- $this->assertTrue($field_definition instanceof ListDataDefinitionInterface);
- $this->assertFalse($field_definition instanceof ComplexDataDefinitionInterface);
+ $this->assertInstanceOf(ListDataDefinitionInterface::class, $field_definition);
+ $this->assertNotInstanceOf(ComplexDataDefinitionInterface::class, $field_definition);
$field_item_definition = $field_definition->getItemDefinition();
- $this->assertFalse($field_item_definition instanceof ListDataDefinitionInterface);
- $this->assertTrue($field_item_definition instanceof ComplexDataDefinitionInterface);
+ $this->assertNotInstanceOf(ListDataDefinitionInterface::class, $field_item_definition);
+ $this->assertInstanceOf(ComplexDataDefinitionInterface::class, $field_item_definition);
// Derive metadata about field item properties.
$this->assertEqual(array_keys($field_item_definition->getPropertyDefinitions()), ['value']);
@@ -62,7 +62,7 @@ public function testFields() {
$this->assertNull($field_item_definition->getPropertyDefinition('invalid'));
// Test accessing field item property metadata via the field definition.
- $this->assertTrue($field_definition instanceof FieldDefinitionInterface);
+ $this->assertInstanceOf(FieldDefinitionInterface::class, $field_definition);
$this->assertEqual(array_keys($field_definition->getPropertyDefinitions()), ['value']);
$this->assertEqual($field_definition->getPropertyDefinition('value')->getDataType(), 'integer');
$this->assertEqual($field_definition->getMainPropertyName(), 'value');
@@ -70,15 +70,15 @@ public function testFields() {
// Test using the definition factory for field item lists and field items.
$field_item = $this->typedDataManager->createDataDefinition('field_item:integer');
- $this->assertFalse($field_item instanceof ListDataDefinitionInterface);
- $this->assertTrue($field_item instanceof ComplexDataDefinitionInterface);
+ $this->assertNotInstanceOf(ListDataDefinitionInterface::class, $field_item);
+ $this->assertInstanceOf(ComplexDataDefinitionInterface::class, $field_item);
// Comparison should ignore the internal static cache, so compare the
// serialized objects instead.
$this->assertEqual(serialize($field_item_definition), serialize($field_item));
$field_definition2 = $this->typedDataManager->createListDataDefinition('field_item:integer');
- $this->assertTrue($field_definition2 instanceof ListDataDefinitionInterface);
- $this->assertFalse($field_definition2 instanceof ComplexDataDefinitionInterface);
+ $this->assertInstanceOf(ListDataDefinitionInterface::class, $field_definition2);
+ $this->assertNotInstanceOf(ComplexDataDefinitionInterface::class, $field_definition2);
$this->assertEqual(serialize($field_definition), serialize($field_definition2));
}
@@ -94,8 +94,8 @@ public function testEntities() {
$entity_definition = EntityDataDefinition::create('node');
$bundle_definition = EntityDataDefinition::create('node', 'article');
// Entities are complex data.
- $this->assertFalse($entity_definition instanceof ListDataDefinitionInterface);
- $this->assertTrue($entity_definition instanceof ComplexDataDefinitionInterface);
+ $this->assertNotInstanceOf(ListDataDefinitionInterface::class, $entity_definition);
+ $this->assertInstanceOf(ComplexDataDefinitionInterface::class, $entity_definition);
// Entity definitions should inherit their labels from the entity type.
$this->assertEquals('Content', $entity_definition->getLabel());
@@ -110,8 +110,8 @@ public function testEntities() {
$this->assertNull($entity_definition->getPropertyDefinition('invalid'));
$entity_definition2 = $this->typedDataManager->createDataDefinition('entity:node');
- $this->assertFalse($entity_definition2 instanceof ListDataDefinitionInterface);
- $this->assertTrue($entity_definition2 instanceof ComplexDataDefinitionInterface);
+ $this->assertNotInstanceOf(ListDataDefinitionInterface::class, $entity_definition2);
+ $this->assertInstanceOf(ComplexDataDefinitionInterface::class, $entity_definition2);
$this->assertEqual(serialize($entity_definition), serialize($entity_definition2));
// Test that the definition factory creates the right definitions for all
@@ -129,15 +129,15 @@ public function testEntities() {
*/
public function testEntityReferences() {
$reference_definition = DataReferenceDefinition::create('entity');
- $this->assertTrue($reference_definition instanceof DataReferenceDefinitionInterface);
+ $this->assertInstanceOf(DataReferenceDefinitionInterface::class, $reference_definition);
// Test retrieving metadata about the referenced data.
$this->assertEqual($reference_definition->getTargetDefinition()->getDataType(), 'entity');
- $this->assertTrue($reference_definition->getTargetDefinition() instanceof EntityDataDefinitionInterface);
+ $this->assertInstanceOf(EntityDataDefinitionInterface::class, $reference_definition->getTargetDefinition());
// Test that the definition factory creates the right definition object.
$reference_definition2 = $this->typedDataManager->createDataDefinition('entity_reference');
- $this->assertTrue($reference_definition2 instanceof DataReferenceDefinitionInterface);
+ $this->assertInstanceOf(DataReferenceDefinitionInterface::class, $reference_definition2);
$this->assertEqual(serialize($reference_definition2), serialize($reference_definition));
}
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityUUIDTest.php b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityUUIDTest.php
index 9c49dbdfcf..8cad697535 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityUUIDTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityUUIDTest.php
@@ -86,17 +86,20 @@ protected function assertCRUD($entity_type) {
$this->assertNotNull($entity->uuid());
$this->assertNotEqual($entity_duplicate->uuid(), $entity->uuid());
break;
+
case 'id':
$this->assertNull($entity_duplicate->id());
$this->assertNotNull($entity->id());
$this->assertNotEqual($entity_duplicate->id(), $entity->id());
break;
+
case 'revision_id':
$this->assertNull($entity_duplicate->getRevisionId());
$this->assertNotNull($entity->getRevisionId());
$this->assertNotEqual($entity_duplicate->getRevisionId(), $entity->getRevisionId());
$this->assertNotEqual($entity_duplicate->{$property}->getValue(), $entity->{$property}->getValue());
break;
+
default:
$this->assertEqual($entity_duplicate->{$property}->getValue(), $entity->{$property}->getValue());
}
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityValidationTest.php b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityValidationTest.php
index f795ee3951..d3335cae49 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityValidationTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityValidationTest.php
@@ -111,7 +111,7 @@ public function testValidation() {
foreach ($cached_discoveries as $cached_discovery) {
$cached_discovery_classes[] = get_class($cached_discovery);
}
- $this->assertTrue(in_array('Drupal\Core\Validation\ConstraintManager', $cached_discovery_classes));
+ $this->assertContains('Drupal\Core\Validation\ConstraintManager', $cached_discovery_classes);
// All entity variations have to have the same results.
foreach (entity_test_entity_types() as $entity_type) {
@@ -205,7 +205,7 @@ public function testCompositeConstraintValidation() {
// Make sure we can determine this is composite constraint.
$constraint = $violations[0]->getConstraint();
- $this->assertTrue($constraint instanceof CompositeConstraintBase, 'Constraint is composite constraint.');
+ $this->assertInstanceOf(CompositeConstraintBase::class, $constraint);
$this->assertEqual('type', $violations[0]->getPropertyPath());
/** @var \Drupal\Core\Entity\Plugin\Validation\Constraint\CompositeConstraintBase $constraint */
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityViewBuilderTest.php b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityViewBuilderTest.php
index 5a82ee6612..e8b462cf61 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityViewBuilderTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityViewBuilderTest.php
@@ -291,7 +291,7 @@ public function testViewField() {
$reference_field = $main_entity->get('reference_field');
$reference_field_array_english = $view_builder->viewField($reference_field, 'full');
$rendered_reference_field_english = $renderer->renderRoot($reference_field_array_english);
- $this->assertContains('Text in English', (string) $rendered_reference_field_english);
+ $this->assertStringContainsString('Text in English', (string) $rendered_reference_field_english);
// Change the default language to Spanish and render the reference
// field again. It should display the contents of the Spanish translation.
@@ -300,7 +300,7 @@ public function testViewField() {
\Drupal::languageManager()->getCurrentLanguage();
$reference_field_array_spanish = $view_builder->viewField($reference_field, 'full');
$rendered_reference_field_spanish = $renderer->renderRoot($reference_field_array_spanish);
- $this->assertContains('Text in Spanish', (string) $rendered_reference_field_spanish);
+ $this->assertStringContainsString('Text in Spanish', (string) $rendered_reference_field_spanish);
}
/**
@@ -336,7 +336,7 @@ public function testNoTemplate() {
$entity = $this->createTestEntity('entity_test');
$build = $entity_type_manager->getViewBuilder('entity_test')->view($entity);
$this->assertEquals($entity, $build['#entity_test']);
- $this->assertFalse(array_key_exists('#theme', $build));
+ $this->assertArrayNotHasKey('#theme', $build);
}
}
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/FieldSqlStorageTest.php b/web/core/tests/Drupal/KernelTests/Core/Entity/FieldSqlStorageTest.php
index 28766fd829..36b0ce4634 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Entity/FieldSqlStorageTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/FieldSqlStorageTest.php
@@ -266,7 +266,7 @@ public function testFieldWrite() {
$entity->{$this->fieldName} = NULL;
$entity->save();
$rows = $connection->select($this->table, 't')->fields('t')->execute()->fetchAllAssoc('delta', \PDO::FETCH_ASSOC);
- $this->assertEqual(count($rows), 0);
+ $this->assertCount(0, $rows);
}
/**
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/FieldWidgetConstraintValidatorTest.php b/web/core/tests/Drupal/KernelTests/Core/Entity/FieldWidgetConstraintValidatorTest.php
index 2f5f85218c..e1076654bf 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Entity/FieldWidgetConstraintValidatorTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/FieldWidgetConstraintValidatorTest.php
@@ -15,7 +15,13 @@
*/
class FieldWidgetConstraintValidatorTest extends KernelTestBase {
- public static $modules = ['entity_test', 'field', 'field_test', 'user', 'system'];
+ public static $modules = [
+ 'entity_test',
+ 'field',
+ 'field_test',
+ 'user',
+ 'system',
+ ];
/**
* {@inheritdoc}
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/FieldableEntityDefinitionUpdateTest.php b/web/core/tests/Drupal/KernelTests/Core/Entity/FieldableEntityDefinitionUpdateTest.php
index 6503b41d23..bcfcab4fb0 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Entity/FieldableEntityDefinitionUpdateTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/FieldableEntityDefinitionUpdateTest.php
@@ -80,7 +80,11 @@ class FieldableEntityDefinitionUpdateTest extends EntityKernelTestBase {
*
* @var array
*/
- public static $modules = ['content_translation', 'entity_test_update', 'language'];
+ public static $modules = [
+ 'content_translation',
+ 'entity_test_update',
+ 'language',
+ ];
/**
* {@inheritdoc}
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/RevisionableContentEntityBaseTest.php b/web/core/tests/Drupal/KernelTests/Core/Entity/RevisionableContentEntityBaseTest.php
index 0a84a27e0e..995b23245a 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Entity/RevisionableContentEntityBaseTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/RevisionableContentEntityBaseTest.php
@@ -85,7 +85,7 @@ public function testRevisionableContentEntity() {
}
$this->assertItemsTableCount(6, $definition);
- $this->assertEqual(6, count($revision_ids));
+ $this->assertCount(6, $revision_ids);
// Delete the first 3 revisions.
foreach (range(0, 2) as $key) {
diff --git a/web/core/tests/Drupal/KernelTests/Core/Extension/ModuleImplementsAlterTest.php b/web/core/tests/Drupal/KernelTests/Core/Extension/ModuleImplementsAlterTest.php
index 7d29a26124..2b0579fd59 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Extension/ModuleImplementsAlterTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Extension/ModuleImplementsAlterTest.php
@@ -42,13 +42,12 @@ public function testModuleImplementsAlter() {
$this->assertTrue(function_exists('module_test_modules_installed'),
'The file module_test.module was successfully included.');
- $this->assertTrue(array_key_exists('module_test', \Drupal::moduleHandler()->getModuleList()),
- 'module_test is in the module list.');
+ $this->assertArrayHasKey('module_test', \Drupal::moduleHandler()->getModuleList());
- $this->assertTrue(in_array('module_test', \Drupal::moduleHandler()->getImplementations('modules_installed')),
+ $this->assertContains('module_test', \Drupal::moduleHandler()->getImplementations('modules_installed'),
'module_test implements hook_modules_installed().');
- $this->assertTrue(in_array('module_test', \Drupal::moduleHandler()->getImplementations('module_implements_alter')),
+ $this->assertContains('module_test', \Drupal::moduleHandler()->getImplementations('module_implements_alter'),
'module_test implements hook_module_implements_alter().');
// Assert that module_test.implementations.inc is not included yet.
@@ -58,7 +57,7 @@ public function testModuleImplementsAlter() {
// Trigger hook discovery for hook_altered_test_hook().
// Assert that module_test_module_implements_alter(*, 'altered_test_hook')
// has added an implementation.
- $this->assertTrue(in_array('module_test', \Drupal::moduleHandler()->getImplementations('altered_test_hook')),
+ $this->assertContains('module_test', \Drupal::moduleHandler()->getImplementations('altered_test_hook'),
'module_test implements hook_altered_test_hook().');
// Assert that module_test.implementations.inc was included as part of the process.
diff --git a/web/core/tests/Drupal/KernelTests/Core/Extension/ThemeExtensionListTest.php b/web/core/tests/Drupal/KernelTests/Core/Extension/ThemeExtensionListTest.php
index 0982983922..2111ced05c 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Extension/ThemeExtensionListTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Extension/ThemeExtensionListTest.php
@@ -35,4 +35,12 @@ public function testGetlist() {
$this->assertArrayHasKey('test_theme', $extensions);
}
+ /**
+ * Tests that themes have an empty default version set.
+ */
+ public function testThemeWithoutVersion() {
+ $theme = \Drupal::service('extension.list.theme')->get('test_theme_settings_features');
+ $this->assertNull($theme->info['version']);
+ }
+
}
diff --git a/web/core/tests/Drupal/KernelTests/Core/Field/FieldAccessTest.php b/web/core/tests/Drupal/KernelTests/Core/Field/FieldAccessTest.php
index 3b88a97473..fb061949fc 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Field/FieldAccessTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Field/FieldAccessTest.php
@@ -19,7 +19,14 @@ class FieldAccessTest extends KernelTestBase {
*
* @var array
*/
- public static $modules = ['entity_test', 'field', 'system', 'text', 'filter', 'user'];
+ public static $modules = [
+ 'entity_test',
+ 'field',
+ 'system',
+ 'text',
+ 'filter',
+ 'user',
+ ];
/**
* Holds the currently active global user ID that initiated the test run.
diff --git a/web/core/tests/Drupal/KernelTests/Core/File/DirectoryTest.php b/web/core/tests/Drupal/KernelTests/Core/File/DirectoryTest.php
index 376ce1cef0..a0b5af5fca 100644
--- a/web/core/tests/Drupal/KernelTests/Core/File/DirectoryTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/File/DirectoryTest.php
@@ -42,7 +42,7 @@ public function testFileCheckLocalDirectoryHandling() {
$child = $this->randomMachineName();
// Files directory already exists.
- $this->assertTrue(is_dir($directory), t('Files directory already exists.'), 'File');
+ $this->assertDirectoryExists($directory);
// Make files directory writable only.
$old_mode = fileperms($directory);
@@ -54,8 +54,8 @@ public function testFileCheckLocalDirectoryHandling() {
$this->assertTrue($file_system->mkdir($child_path, 0775, TRUE), t('No error reported when creating new local directories.'), 'File');
// Ensure new directories also exist.
- $this->assertTrue(is_dir($parent_path), t('New parent directory actually exists.'), 'File');
- $this->assertTrue(is_dir($child_path), t('New child directory actually exists.'), 'File');
+ $this->assertDirectoryExists($parent_path);
+ $this->assertDirectoryExists($child_path);
// Check that new directory permissions were set properly.
$this->assertDirectoryPermissions($parent_path, 0775);
@@ -77,7 +77,7 @@ public function testFileCheckDirectoryHandling() {
// A directory to operate on.
$default_scheme = 'public';
$directory = $default_scheme . '://' . $this->randomMachineName() . '/' . $this->randomMachineName();
- $this->assertFalse(is_dir($directory), 'Directory does not exist prior to testing.');
+ $this->assertDirectoryNotExists($directory);
// Non-existent directory.
/** @var \Drupal\Core\File\FileSystemInterface $file_system */
@@ -88,7 +88,7 @@ public function testFileCheckDirectoryHandling() {
$this->assertTrue($file_system->prepareDirectory($directory, FileSystemInterface::CREATE_DIRECTORY), 'No error reported when creating a new directory.', 'File');
// Make sure directory actually exists.
- $this->assertTrue(is_dir($directory), 'Directory actually exists.', 'File');
+ $this->assertDirectoryExists($directory);
$file_system = \Drupal::service('file_system');
if (substr(PHP_OS, 0, 3) != 'WIN') {
// PHP on Windows doesn't support any kind of useful read-only mode for
@@ -110,15 +110,15 @@ public function testFileCheckDirectoryHandling() {
// Remove .htaccess file to then test that it gets re-created.
@$file_system->unlink($default_scheme . '://.htaccess');
- $this->assertFalse(is_file($default_scheme . '://.htaccess'), 'Successfully removed the .htaccess file in the files directory.', 'File');
+ $this->assertFileNotExists($default_scheme . '://.htaccess');
$this->container->get('file.htaccess_writer')->ensure();
- $this->assertTrue(is_file($default_scheme . '://.htaccess'), 'Successfully re-created the .htaccess file in the files directory.', 'File');
+ $this->assertFileExists($default_scheme . '://.htaccess');
// Remove .htaccess file again to test that it is re-created by a cron run.
@$file_system->unlink($default_scheme . '://.htaccess');
- $this->assertFalse(is_file($default_scheme . '://.htaccess'), 'Successfully removed the .htaccess file in the files directory.', 'File');
+ $this->assertFileNotExists($default_scheme . '://.htaccess');
system_cron();
- $this->assertTrue(is_file($default_scheme . '://.htaccess'), 'Successfully re-created the .htaccess file in the files directory.', 'File');
+ $this->assertFileExists($default_scheme . '://.htaccess');
// Verify contents of .htaccess file.
$file = file_get_contents($default_scheme . '://.htaccess');
diff --git a/web/core/tests/Drupal/KernelTests/Core/File/FileCopyTest.php b/web/core/tests/Drupal/KernelTests/Core/File/FileCopyTest.php
index 532ecb6389..c3f5cf66a2 100644
--- a/web/core/tests/Drupal/KernelTests/Core/File/FileCopyTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/File/FileCopyTest.php
@@ -27,8 +27,8 @@ public function testNormal() {
$new_filepath = \Drupal::service('file_system')->copy($uri, $desired_filepath, FileSystemInterface::EXISTS_ERROR);
$this->assertNotFalse($new_filepath, 'Copy was successful.');
$this->assertEqual($new_filepath, $desired_filepath, 'Returned expected filepath.');
- $this->assertTrue(file_exists($uri), 'Original file remains.');
- $this->assertTrue(file_exists($new_filepath), 'New file exists.');
+ $this->assertFileExists($uri);
+ $this->assertFileExists($new_filepath);
$this->assertFilePermissions($new_filepath, Settings::get('file_chmod_file', FileSystem::CHMOD_FILE));
// Copying with rename.
@@ -37,8 +37,8 @@ public function testNormal() {
$newer_filepath = \Drupal::service('file_system')->copy($uri, $desired_filepath, FileSystemInterface::EXISTS_RENAME);
$this->assertNotFalse($newer_filepath, 'Copy was successful.');
$this->assertNotEqual($newer_filepath, $desired_filepath, 'Returned expected filepath.');
- $this->assertTrue(file_exists($uri), 'Original file remains.');
- $this->assertTrue(file_exists($newer_filepath), 'New file exists.');
+ $this->assertFileExists($uri);
+ $this->assertFileExists($newer_filepath);
$this->assertFilePermissions($newer_filepath, Settings::get('file_chmod_file', FileSystem::CHMOD_FILE));
// TODO: test copying to a directory (rather than full directory/file path)
@@ -51,7 +51,7 @@ public function testNormal() {
public function testNonExistent() {
// Copy non-existent file
$desired_filepath = $this->randomMachineName();
- $this->assertFalse(file_exists($desired_filepath), "Randomly named file doesn't exist.");
+ $this->assertFileNotExists($desired_filepath);
$this->expectException(FileNotExistsException::class);
$new_filepath = \Drupal::service('file_system')->copy($desired_filepath, $this->randomMachineName());
$this->assertFalse($new_filepath, 'Copying a missing file fails.');
@@ -70,27 +70,27 @@ public function testOverwriteSelf() {
$new_filepath = $file_system->copy($uri, $uri, FileSystemInterface::EXISTS_RENAME);
$this->assertNotFalse($new_filepath, 'Copying onto itself with renaming works.');
$this->assertNotEqual($new_filepath, $uri, 'Copied file has a new name.');
- $this->assertTrue(file_exists($uri), 'Original file exists after copying onto itself.');
- $this->assertTrue(file_exists($new_filepath), 'Copied file exists after copying onto itself.');
+ $this->assertFileExists($uri);
+ $this->assertFileExists($new_filepath);
$this->assertFilePermissions($new_filepath, Settings::get('file_chmod_file', FileSystem::CHMOD_FILE));
// Copy the file onto itself without renaming fails.
$this->expectException(FileExistsException::class);
$new_filepath = $file_system->copy($uri, $uri, FileSystemInterface::EXISTS_ERROR);
$this->assertFalse($new_filepath, 'Copying onto itself without renaming fails.');
- $this->assertTrue(file_exists($uri), 'File exists after copying onto itself.');
+ $this->assertFileExists($uri);
// Copy the file into same directory without renaming fails.
$new_filepath = $file_system->copy($uri, $file_system->dirname($uri), FileSystemInterface::EXISTS_ERROR);
$this->assertFalse($new_filepath, 'Copying onto itself fails.');
- $this->assertTrue(file_exists($uri), 'File exists after copying onto itself.');
+ $this->assertFileExists($uri);
// Copy the file into same directory with renaming works.
$new_filepath = $file_system->copy($uri, $file_system->dirname($uri), FileSystemInterface::EXISTS_RENAME);
$this->assertNotFalse($new_filepath, 'Copying into same directory works.');
$this->assertNotEqual($new_filepath, $uri, 'Copied file has a new name.');
- $this->assertTrue(file_exists($uri), 'Original file exists after copying onto itself.');
- $this->assertTrue(file_exists($new_filepath), 'Copied file exists after copying onto itself.');
+ $this->assertFileExists($uri);
+ $this->assertFileExists($new_filepath);
$this->assertFilePermissions($new_filepath, Settings::get('file_chmod_file', FileSystem::CHMOD_FILE));
}
diff --git a/web/core/tests/Drupal/KernelTests/Core/File/FileDeleteRecursiveTest.php b/web/core/tests/Drupal/KernelTests/Core/File/FileDeleteRecursiveTest.php
index c714c539d4..99d9c76f9e 100644
--- a/web/core/tests/Drupal/KernelTests/Core/File/FileDeleteRecursiveTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/File/FileDeleteRecursiveTest.php
@@ -19,7 +19,7 @@ public function testSingleFile() {
// Delete the file.
$this->assertTrue(\Drupal::service('file_system')->deleteRecursive($filepath), 'Function reported success.');
- $this->assertFalse(file_exists($filepath), 'Test file has been deleted.');
+ $this->assertFileNotExists($filepath);
}
/**
@@ -31,7 +31,7 @@ public function testEmptyDirectory() {
// Delete the directory.
$this->assertTrue(\Drupal::service('file_system')->deleteRecursive($directory), 'Function reported success.');
- $this->assertFalse(file_exists($directory), 'Directory has been deleted.');
+ $this->assertDirectoryNotExists($directory);
}
/**
@@ -47,9 +47,9 @@ public function testDirectory() {
// Delete the directory.
$this->assertTrue(\Drupal::service('file_system')->deleteRecursive($directory), 'Function reported success.');
- $this->assertFalse(file_exists($filepathA), 'Test file A has been deleted.');
- $this->assertFalse(file_exists($filepathB), 'Test file B has been deleted.');
- $this->assertFalse(file_exists($directory), 'Directory has been deleted.');
+ $this->assertFileNotExists($filepathA);
+ $this->assertFileNotExists($filepathB);
+ $this->assertDirectoryNotExists($directory);
}
/**
@@ -66,10 +66,10 @@ public function testSubDirectory() {
// Delete the directory.
$this->assertTrue(\Drupal::service('file_system')->deleteRecursive($directory), 'Function reported success.');
- $this->assertFalse(file_exists($filepathA), 'Test file A has been deleted.');
- $this->assertFalse(file_exists($filepathB), 'Test file B has been deleted.');
- $this->assertFalse(file_exists($subdirectory), 'Subdirectory has been deleted.');
- $this->assertFalse(file_exists($directory), 'Directory has been deleted.');
+ $this->assertFileNotExists($filepathA);
+ $this->assertFileNotExists($filepathB);
+ $this->assertDirectoryNotExists($subdirectory);
+ $this->assertDirectoryNotExists($directory);
}
}
diff --git a/web/core/tests/Drupal/KernelTests/Core/File/FileDeleteTest.php b/web/core/tests/Drupal/KernelTests/Core/File/FileDeleteTest.php
index 1fa2d75f2a..e60d952c7c 100644
--- a/web/core/tests/Drupal/KernelTests/Core/File/FileDeleteTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/File/FileDeleteTest.php
@@ -20,7 +20,7 @@ public function testNormal() {
// Delete a regular file
$this->assertTrue(\Drupal::service('file_system')->delete($uri), 'Deleted worked.');
- $this->assertFalse(file_exists($uri), 'Test file has actually been deleted.');
+ $this->assertFileNotExists($uri);
}
/**
@@ -46,7 +46,7 @@ public function testDirectory() {
catch (NotRegularFileException $e) {
// Ignore.
}
- $this->assertTrue(file_exists($directory), 'Directory has not been deleted.');
+ $this->assertDirectoryExists($directory);
}
}
diff --git a/web/core/tests/Drupal/KernelTests/Core/File/FileMoveTest.php b/web/core/tests/Drupal/KernelTests/Core/File/FileMoveTest.php
index fcee3b09fd..155ef1f8bf 100644
--- a/web/core/tests/Drupal/KernelTests/Core/File/FileMoveTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/File/FileMoveTest.php
@@ -29,19 +29,19 @@ public function testNormal() {
$new_filepath = $file_system->move($uri, $desired_filepath, FileSystemInterface::EXISTS_ERROR);
$this->assertNotFalse($new_filepath, 'Move was successful.');
$this->assertEqual($new_filepath, $desired_filepath, 'Returned expected filepath.');
- $this->assertTrue(file_exists($new_filepath), 'File exists at the new location.');
- $this->assertFalse(file_exists($uri), 'No file remains at the old location.');
+ $this->assertFileExists($new_filepath);
+ $this->assertFileNotExists($uri);
$this->assertFilePermissions($new_filepath, Settings::get('file_chmod_file', FileSystem::CHMOD_FILE));
// Moving with rename.
$desired_filepath = 'public://' . $this->randomMachineName();
- $this->assertTrue(file_exists($new_filepath), 'File exists before moving.');
+ $this->assertFileExists($new_filepath);
$this->assertNotFalse(file_put_contents($desired_filepath, ' '), 'Created a file so a rename will have to happen.');
$newer_filepath = $file_system->move($new_filepath, $desired_filepath, FileSystemInterface::EXISTS_RENAME);
$this->assertNotFalse($newer_filepath, 'Move was successful.');
$this->assertNotEqual($newer_filepath, $desired_filepath, 'Returned expected filepath.');
- $this->assertTrue(file_exists($newer_filepath), 'File exists at the new location.');
- $this->assertFalse(file_exists($new_filepath), 'No file remains at the old location.');
+ $this->assertFileExists($newer_filepath);
+ $this->assertFileNotExists($new_filepath);
$this->assertFilePermissions($newer_filepath, Settings::get('file_chmod_file', FileSystem::CHMOD_FILE));
// TODO: test moving to a directory (rather than full directory/file path)
@@ -70,13 +70,13 @@ public function testOverwriteSelf() {
$this->expectException(FileException::class);
$new_filepath = $file_system->move($uri, $uri, FileSystemInterface::EXISTS_REPLACE);
$this->assertFalse($new_filepath, 'Moving onto itself without renaming fails.');
- $this->assertTrue(file_exists($uri), 'File exists after moving onto itself.');
+ $this->assertFileExists($uri);
// Move the file onto itself with renaming will result in a new filename.
$new_filepath = $file_system->move($uri, $uri, FileSystemInterface::EXISTS_RENAME);
$this->assertNotFalse($new_filepath, 'Moving onto itself with renaming works.');
- $this->assertFalse(file_exists($uri), 'Original file has been removed.');
- $this->assertTrue(file_exists($new_filepath), 'File exists after moving onto itself.');
+ $this->assertFileNotExists($uri);
+ $this->assertFileExists($new_filepath);
}
}
diff --git a/web/core/tests/Drupal/KernelTests/Core/File/FileTestBase.php b/web/core/tests/Drupal/KernelTests/Core/File/FileTestBase.php
index c22a5bce01..27a78a1e98 100644
--- a/web/core/tests/Drupal/KernelTests/Core/File/FileTestBase.php
+++ b/web/core/tests/Drupal/KernelTests/Core/File/FileTestBase.php
@@ -161,7 +161,8 @@ public function createDirectory($path = NULL) {
if (!isset($path)) {
$path = 'public://' . $this->randomMachineName();
}
- $this->assertTrue(\Drupal::service('file_system')->mkdir($path) && is_dir($path), 'Directory was created successfully.');
+ $this->assertTrue(\Drupal::service('file_system')->mkdir($path));
+ $this->assertDirectoryExists($path);
return $path;
}
@@ -196,7 +197,7 @@ public function createUri($filepath = NULL, $contents = NULL, $scheme = NULL) {
}
file_put_contents($filepath, $contents);
- $this->assertTrue(is_file($filepath), t('The test file exists on the disk.'), 'Create test file');
+ $this->assertFileExists($filepath);
return $filepath;
}
diff --git a/web/core/tests/Drupal/KernelTests/Core/File/HtaccessTest.php b/web/core/tests/Drupal/KernelTests/Core/File/HtaccessTest.php
index 56ef36e897..94f987a985 100644
--- a/web/core/tests/Drupal/KernelTests/Core/File/HtaccessTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/File/HtaccessTest.php
@@ -54,11 +54,11 @@ public function testHtaccessSave() {
mkdir($this->public, 0777, TRUE);
$this->assertTrue($this->htaccessWriter->write($this->public, FALSE));
$content = file_get_contents($this->public . '/.htaccess');
- $this->assertTrue(strpos($content, "SetHandler Drupal_Security_Do_Not_Remove_See_SA_2006_006") !== FALSE);
- $this->assertFalse(strpos($content, "Require all denied") !== FALSE);
- $this->assertFalse(strpos($content, "Deny from all") !== FALSE);
- $this->assertTrue(strpos($content, "Options -Indexes -ExecCGI -Includes -MultiViews") !== FALSE);
- $this->assertTrue(strpos($content, "SetHandler Drupal_Security_Do_Not_Remove_See_SA_2013_003") !== FALSE);
+ $this->assertStringContainsString("SetHandler Drupal_Security_Do_Not_Remove_See_SA_2006_006", $content);
+ $this->assertStringNotContainsString("Require all denied", $content);
+ $this->assertStringNotContainsString("Deny from all", $content);
+ $this->assertStringContainsString("Options -Indexes -ExecCGI -Includes -MultiViews", $content);
+ $this->assertStringContainsString("SetHandler Drupal_Security_Do_Not_Remove_See_SA_2013_003", $content);
$this->assertFilePermissions($this->public . '/.htaccess', 0444);
$this->assertTrue($this->htaccessWriter->write($this->public, FALSE));
@@ -67,11 +67,11 @@ public function testHtaccessSave() {
mkdir($private, 0777, TRUE);
$this->assertTrue($this->htaccessWriter->write($private));
$content = file_get_contents($private . '/.htaccess');
- $this->assertTrue(strpos($content, "SetHandler Drupal_Security_Do_Not_Remove_See_SA_2006_006") !== FALSE);
- $this->assertTrue(strpos($content, "Require all denied") !== FALSE);
- $this->assertTrue(strpos($content, "Deny from all") !== FALSE);
- $this->assertTrue(strpos($content, "Options -Indexes -ExecCGI -Includes -MultiViews") !== FALSE);
- $this->assertTrue(strpos($content, "SetHandler Drupal_Security_Do_Not_Remove_See_SA_2013_003") !== FALSE);
+ $this->assertStringContainsString("SetHandler Drupal_Security_Do_Not_Remove_See_SA_2006_006", $content);
+ $this->assertStringContainsString("Require all denied", $content);
+ $this->assertStringContainsString("Deny from all", $content);
+ $this->assertStringContainsString("Options -Indexes -ExecCGI -Includes -MultiViews", $content);
+ $this->assertStringContainsString("SetHandler Drupal_Security_Do_Not_Remove_See_SA_2013_003", $content);
$this->assertFilePermissions($private . '/.htaccess', 0444);
$this->assertTrue($this->htaccessWriter->write($private));
@@ -80,11 +80,11 @@ public function testHtaccessSave() {
mkdir($stream, 0777, TRUE);
$this->assertTrue($this->htaccessWriter->write($stream));
$content = file_get_contents($stream . '/.htaccess');
- $this->assertTrue(strpos($content, "SetHandler Drupal_Security_Do_Not_Remove_See_SA_2006_006") !== FALSE);
- $this->assertTrue(strpos($content, "Require all denied") !== FALSE);
- $this->assertTrue(strpos($content, "Deny from all") !== FALSE);
- $this->assertTrue(strpos($content, "Options -Indexes -ExecCGI -Includes -MultiViews") !== FALSE);
- $this->assertTrue(strpos($content, "SetHandler Drupal_Security_Do_Not_Remove_See_SA_2013_003") !== FALSE);
+ $this->assertStringContainsString("SetHandler Drupal_Security_Do_Not_Remove_See_SA_2006_006", $content);
+ $this->assertStringContainsString("Require all denied", $content);
+ $this->assertStringContainsString("Deny from all", $content);
+ $this->assertStringContainsString("Options -Indexes -ExecCGI -Includes -MultiViews", $content);
+ $this->assertStringContainsString("SetHandler Drupal_Security_Do_Not_Remove_See_SA_2013_003", $content);
$this->assertFilePermissions($stream . '/.htaccess', 0444);
$this->assertTrue($this->htaccessWriter->write($stream));
diff --git a/web/core/tests/Drupal/KernelTests/Core/File/NameMungingTest.php b/web/core/tests/Drupal/KernelTests/Core/File/NameMungingTest.php
index 789e3fca00..892fa3c600 100644
--- a/web/core/tests/Drupal/KernelTests/Core/File/NameMungingTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/File/NameMungingTest.php
@@ -42,7 +42,7 @@ public function testMunging() {
$munged_name = file_munge_filename($this->name, '', TRUE);
$messages = \Drupal::messenger()->all();
\Drupal::messenger()->deleteAll();
- $this->assertTrue(in_array(strtr('For security reasons, your upload has been renamed to <em class="placeholder">%filename</em>.', ['%filename' => $munged_name]), $messages['status']), 'Alert properly set when a file is renamed.');
+ $this->assertContains(strtr('For security reasons, your upload has been renamed to <em class="placeholder">%filename</em>.', ['%filename' => $munged_name]), $messages['status'], 'Alert properly set when a file is renamed.');
$this->assertNotEqual($munged_name, $this->name, new FormattableMarkup('The new filename (%munged) has been modified from the original (%original)', ['%munged' => $munged_name, '%original' => $this->name]));
}
diff --git a/web/core/tests/Drupal/KernelTests/Core/File/PharWrapperTest.php b/web/core/tests/Drupal/KernelTests/Core/File/PharWrapperTest.php
index e0dbddc467..fd53d27e94 100644
--- a/web/core/tests/Drupal/KernelTests/Core/File/PharWrapperTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/File/PharWrapperTest.php
@@ -18,8 +18,8 @@ public function testPharFile() {
$base = $this->getDrupalRoot() . '/core/tests/fixtures/files';
// Ensure that file operations via the phar:// stream wrapper work for phar
// files with the .phar extension.
- $this->assertFalse(file_exists("phar://$base/phar-1.phar/no-such-file.php"));
- $this->assertTrue(file_exists("phar://$base/phar-1.phar/index.php"));
+ $this->assertFileNotExists("phar://$base/phar-1.phar/no-such-file.php");
+ $this->assertFileExists("phar://$base/phar-1.phar/index.php");
$file_contents = file_get_contents("phar://$base/phar-1.phar/index.php");
$expected_hash = 'c7e7904ea573c5ebea3ef00bb08c1f86af1a45961fbfbeb1892ff4a98fd73ad5';
$this->assertSame($expected_hash, hash('sha256', $file_contents));
diff --git a/web/core/tests/Drupal/KernelTests/Core/File/ReadOnlyStreamWrapperTest.php b/web/core/tests/Drupal/KernelTests/Core/File/ReadOnlyStreamWrapperTest.php
index a57c0c7dac..8b56ff6bcb 100644
--- a/web/core/tests/Drupal/KernelTests/Core/File/ReadOnlyStreamWrapperTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/File/ReadOnlyStreamWrapperTest.php
@@ -81,7 +81,7 @@ public function testReadOnlyBehavior() {
$this->assertFalse(@rename($uri, $this->scheme . '://newname.txt'), 'Unable to rename files using the read-only stream wrapper.');
// Test the unlink() function
$this->assertTrue(@$file_system->unlink($uri), 'Able to unlink file using read-only stream wrapper.');
- $this->assertTrue(file_exists($filepath), 'Unlink File was not actually deleted.');
+ $this->assertFileExists($filepath);
// Test the mkdir() function by attempting to create a directory.
$dirname = $this->randomMachineName();
diff --git a/web/core/tests/Drupal/KernelTests/Core/File/ScanDirectoryTest.php b/web/core/tests/Drupal/KernelTests/Core/File/ScanDirectoryTest.php
index 79f5044769..af95406128 100644
--- a/web/core/tests/Drupal/KernelTests/Core/File/ScanDirectoryTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/File/ScanDirectoryTest.php
@@ -52,7 +52,7 @@ public function testReturn() {
// passed to the callback.
$all_files = $this->fileSystem->scanDirectory($this->path, '/^javascript-/');
ksort($all_files);
- $this->assertEqual(2, count($all_files), 'Found two, expected javascript files.');
+ $this->assertCount(2, $all_files, 'Found two, expected javascript files.');
// Check the first file.
$file = reset($all_files);
@@ -78,18 +78,18 @@ public function testOptionCallback() {
// When nothing is matched nothing should be passed to the callback.
$all_files = $this->fileSystem->scanDirectory($this->path, '/^NONEXISTINGFILENAME/', ['callback' => 'file_test_file_scan_callback']);
- $this->assertEqual(0, count($all_files), 'No files were found.');
+ $this->assertCount(0, $all_files, 'No files were found.');
$results = file_test_file_scan_callback();
file_test_file_scan_callback_reset();
- $this->assertEqual(0, count($results), 'No files were passed to the callback.');
+ $this->assertCount(0, $results, 'No files were passed to the callback.');
// Grab a listing of all the JavaScript files and check that they're
// passed to the callback.
$all_files = $this->fileSystem->scanDirectory($this->path, '/^javascript-/', ['callback' => 'file_test_file_scan_callback']);
- $this->assertEqual(2, count($all_files), 'Found two, expected javascript files.');
+ $this->assertCount(2, $all_files, 'Found two, expected javascript files.');
$results = file_test_file_scan_callback();
file_test_file_scan_callback_reset();
- $this->assertEqual(2, count($results), 'Files were passed to the callback.');
+ $this->assertCount(2, $results, 'Files were passed to the callback.');
}
/**
@@ -100,11 +100,11 @@ public function testOptionCallback() {
public function testOptionNoMask() {
// Grab a listing of all the JavaScript files.
$all_files = $this->fileSystem->scanDirectory($this->path, '/^javascript-/');
- $this->assertEqual(2, count($all_files), 'Found two, expected javascript files.');
+ $this->assertCount(2, $all_files, 'Found two, expected javascript files.');
// Now use the nomask parameter to filter out the .script file.
$filtered_files = $this->fileSystem->scanDirectory($this->path, '/^javascript-/', ['nomask' => '/.script$/']);
- $this->assertEqual(1, count($filtered_files), 'Filtered correctly.');
+ $this->assertCount(1, $filtered_files, 'Filtered correctly.');
}
/**
@@ -148,7 +148,7 @@ public function testOptionRecurse() {
$this->assertTrue(empty($files), "Without recursion couldn't find javascript files.");
$files = $this->fileSystem->scanDirectory($this->path . '/..', '/^javascript-/', ['recurse' => TRUE]);
- $this->assertEqual(2, count($files), 'With recursion we found the expected javascript files.');
+ $this->assertCount(2, $files, 'With recursion we found the expected javascript files.');
}
/**
@@ -159,7 +159,7 @@ public function testOptionRecurse() {
*/
public function testOptionMinDepth() {
$files = $this->fileSystem->scanDirectory($this->path, '/^javascript-/', ['min_depth' => 0]);
- $this->assertEqual(2, count($files), 'No minimum-depth gets files in current directory.');
+ $this->assertCount(2, $files, 'No minimum-depth gets files in current directory.');
$files = $this->fileSystem->scanDirectory($this->path, '/^javascript-/', ['min_depth' => 1]);
$this->assertTrue(empty($files), 'Minimum-depth of 1 successfully excludes files from current directory.');
diff --git a/web/core/tests/Drupal/KernelTests/Core/File/StreamWrapperTest.php b/web/core/tests/Drupal/KernelTests/Core/File/StreamWrapperTest.php
index ee438e5816..51aa657c40 100644
--- a/web/core/tests/Drupal/KernelTests/Core/File/StreamWrapperTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/File/StreamWrapperTest.php
@@ -102,9 +102,9 @@ public function testUriFunctions() {
// TemporaryStream::getExternalUrl() uses Url::fromRoute(), which needs
// route information to work.
$this->container->get('router.builder')->rebuild();
- $this->assertContains('system/temporary?file=test.txt', file_create_url('temporary://test.txt'), 'Temporary external URL correctly built.');
- $this->assertContains(Settings::get('file_public_path') . '/test.txt', file_create_url('public://test.txt'), 'Public external URL correctly built.');
- $this->assertContains('system/files/test.txt', file_create_url('private://test.txt'), 'Private external URL correctly built.');
+ $this->assertStringContainsString('system/temporary?file=test.txt', file_create_url('temporary://test.txt'), 'Temporary external URL correctly built.');
+ $this->assertStringContainsString(Settings::get('file_public_path') . '/test.txt', file_create_url('public://test.txt'), 'Public external URL correctly built.');
+ $this->assertStringContainsString('system/files/test.txt', file_create_url('private://test.txt'), 'Private external URL correctly built.');
}
/**
diff --git a/web/core/tests/Drupal/KernelTests/Core/Form/ExternalFormUrlTest.php b/web/core/tests/Drupal/KernelTests/Core/Form/ExternalFormUrlTest.php
index f3fbc4f76c..b1c34a24f8 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Form/ExternalFormUrlTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Form/ExternalFormUrlTest.php
@@ -65,7 +65,7 @@ protected function setUp() {
}
/**
- * Tests form behaviour.
+ * Tests form behavior.
*/
public function testActionUrlBehavior() {
// Create a new request which has a request uri with multiple leading
diff --git a/web/core/tests/Drupal/KernelTests/Core/Form/FormDefaultHandlersTest.php b/web/core/tests/Drupal/KernelTests/Core/Form/FormDefaultHandlersTest.php
index 6d79f17cfb..9edfd7520b 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Form/FormDefaultHandlersTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Form/FormDefaultHandlersTest.php
@@ -92,11 +92,11 @@ public function testDefaultAndCustomHandlers() {
$handlers = $form_state->get('test_handlers');
- $this->assertIdentical(count($handlers['validate']), 2);
+ $this->assertCount(2, $handlers['validate']);
$this->assertIdentical($handlers['validate'][0], 'customValidateForm');
$this->assertIdentical($handlers['validate'][1], 'validateForm');
- $this->assertIdentical(count($handlers['submit']), 2);
+ $this->assertCount(2, $handlers['submit']);
$this->assertIdentical($handlers['submit'][0], 'customSubmitForm');
$this->assertIdentical($handlers['submit'][1], 'submitForm');
}
diff --git a/web/core/tests/Drupal/KernelTests/Core/Image/ToolkitGdTest.php b/web/core/tests/Drupal/KernelTests/Core/Image/ToolkitGdTest.php
index 901332a84d..444c90d4d8 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Image/ToolkitGdTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Image/ToolkitGdTest.php
@@ -302,6 +302,8 @@ public function testManipulations() {
// been destroyed.
$new_res = $toolkit->getResource();
if ($new_res !== $old_res) {
+ // @todo In https://www.drupal.org/node/3133236 convert this to
+ // $this->assertIsNotResource($old_res).
$this->assertFalse(is_resource($old_res), new FormattableMarkup("'%operation' destroyed the original resource.", ['%operation' => $values['function']]));
}
@@ -351,14 +353,17 @@ public function testManipulations() {
$x = 0;
$y = 0;
break;
+
case 1:
$x = $image->getWidth() - 1;
$y = 0;
break;
+
case 2:
$x = $image->getWidth() - 1;
$y = $image->getHeight() - 1;
break;
+
case 3:
$x = 0;
$y = $image->getHeight() - 1;
@@ -428,21 +433,25 @@ public function testResourceDestruction() {
// Test that an Image object going out of scope releases its GD resource.
$image = $this->imageFactory->get('core/tests/fixtures/files/image-test.png');
$res = $image->getToolkit()->getResource();
- $this->assertTrue(is_resource($res), 'Successfully loaded image resource.');
+ $this->assertIsResource($res);
$image = NULL;
+ // @todo In https://www.drupal.org/node/3133236 convert this to
+ // $this->assertIsNotResource($res).
$this->assertFalse(is_resource($res), 'Image resource was destroyed after losing scope.');
// Test that 'create_new' operation does not leave orphaned GD resources.
$image = $this->imageFactory->get('core/tests/fixtures/files/image-test.png');
$old_res = $image->getToolkit()->getResource();
// Check if resource has been created successfully.
- $this->assertTrue(is_resource($old_res));
+ $this->assertIsResource($old_res);
$image->createNew(20, 20);
$new_res = $image->getToolkit()->getResource();
// Check if the original resource has been destroyed.
+ // @todo In https://www.drupal.org/node/3133236 convert this to
+ // $this->assertIsNotResource($old_res).
$this->assertFalse(is_resource($old_res));
// Check if a new resource has been created successfully.
- $this->assertTrue(is_resource($new_res));
+ $this->assertIsResource($new_res);
}
/**
diff --git a/web/core/tests/Drupal/KernelTests/Core/Installer/InstallerLanguageTest.php b/web/core/tests/Drupal/KernelTests/Core/Installer/InstallerLanguageTest.php
index 0e74c35b4d..0381e2e9ff 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Installer/InstallerLanguageTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Installer/InstallerLanguageTest.php
@@ -33,7 +33,7 @@ public function testInstallerTranslationFiles() {
$files_found = $file_translation->findTranslationFiles($langcode);
$this->assertTrue(count($files_found) == count($files_expected), new FormattableMarkup('@count installer languages found.', ['@count' => count($files_expected)]));
foreach ($files_found as $file) {
- $this->assertTrue(in_array($file->filename, $files_expected), new FormattableMarkup('@file found.', ['@file' => $file->filename]));
+ $this->assertContains($file->filename, $files_expected, new FormattableMarkup('@file found.', ['@file' => $file->filename]));
}
}
}
diff --git a/web/core/tests/Drupal/KernelTests/Core/KeyValueStore/DatabaseStorageExpirableTest.php b/web/core/tests/Drupal/KernelTests/Core/KeyValueStore/DatabaseStorageExpirableTest.php
index 30f21d335f..e87abcb846 100644
--- a/web/core/tests/Drupal/KernelTests/Core/KeyValueStore/DatabaseStorageExpirableTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/KeyValueStore/DatabaseStorageExpirableTest.php
@@ -132,7 +132,7 @@ public function testExpiration() {
$this->assertNull($stores[0]->get('yesterday'));
$this->assertTrue($stores[0]->has('troubles'));
$this->assertIdentical($stores[0]->get('troubles'), 'here to stay');
- $this->assertIdentical(count($stores[0]->getMultiple(['yesterday', 'troubles'])), 1);
+ $this->assertCount(1, $stores[0]->getMultiple(['yesterday', 'troubles']));
// Store items set to expire in the past in various ways.
$stores[0]->setWithExpire($this->randomMachineName(), $this->objects[0], -7 * $day);
@@ -149,7 +149,7 @@ public function testExpiration() {
// Ensure only non-expired items are retrieved.
$all = $stores[0]->getAll();
- $this->assertIdentical(count($all), 2);
+ $this->assertCount(2, $all);
foreach (['troubles', 'still'] as $key) {
$this->assertTrue(!empty($all[$key]));
}
diff --git a/web/core/tests/Drupal/KernelTests/Core/KeyValueStore/GarbageCollectionTest.php b/web/core/tests/Drupal/KernelTests/Core/KeyValueStore/GarbageCollectionTest.php
index 3c8615205e..e119303631 100644
--- a/web/core/tests/Drupal/KernelTests/Core/KeyValueStore/GarbageCollectionTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/KeyValueStore/GarbageCollectionTest.php
@@ -40,7 +40,7 @@ public function testGarbageCollection() {
for ($i = 0; $i <= 3; $i++) {
$store->setWithExpire('key_' . $i, $this->randomObject(), rand(500, 100000));
}
- $this->assertIdentical(count($store->getAll()), 4, 'Four items were written to the storage.');
+ $this->assertCount(4, $store->getAll(), 'Four items were written to the storage.');
// Manually expire the data.
for ($i = 0; $i <= 3; $i++) {
@@ -65,7 +65,7 @@ public function testGarbageCollection() {
[
':collection' => $collection,
])->fetchAll();
- $this->assertIdentical(count($result), 1, 'Only one item remains after garbage collection');
+ $this->assertCount(1, $result, 'Only one item remains after garbage collection');
}
diff --git a/web/core/tests/Drupal/KernelTests/Core/Menu/MenuLinkDefaultIntegrationTest.php b/web/core/tests/Drupal/KernelTests/Core/Menu/MenuLinkDefaultIntegrationTest.php
index d0da9130a6..a0d47c7eae 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Menu/MenuLinkDefaultIntegrationTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Menu/MenuLinkDefaultIntegrationTest.php
@@ -34,7 +34,7 @@ public function testMoveToRoot() {
$this->assertEqual($menu_link['menu_name'], 'test');
$tree = \Drupal::menuTree()->load('test', new MenuTreeParameters());
- $this->assertEqual(count($tree), 1);
+ $this->assertCount(1, $tree);
$this->assertEqual($tree['menu_test.parent']->link->getPluginId(), 'menu_test.parent');
$this->assertEqual($tree['menu_test.parent']->subtree['menu_test.child']->link->getPluginId(), 'menu_test.child');
@@ -46,7 +46,7 @@ public function testMoveToRoot() {
$this->assertEqual($menu_link['menu_name'], 'test');
$tree = \Drupal::menuTree()->load('test', new MenuTreeParameters());
- $this->assertEqual(count($tree), 2);
+ $this->assertCount(2, $tree);
$this->assertEqual($tree['menu_test.parent']->link->getPluginId(), 'menu_test.parent');
$this->assertEqual($tree['menu_test.child']->link->getPluginId(), 'menu_test.child');
diff --git a/web/core/tests/Drupal/KernelTests/Core/Menu/MenuLinkTreeTest.php b/web/core/tests/Drupal/KernelTests/Core/Menu/MenuLinkTreeTest.php
index 42d8110e19..a7ab177693 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Menu/MenuLinkTreeTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Menu/MenuLinkTreeTest.php
@@ -69,17 +69,17 @@ public function testDeleteLinksInMenu() {
\Drupal::entityTypeManager()->getStorage('menu_link_content')->create(['link' => ['uri' => 'internal:/menu_name_test'], 'menu_name' => 'menu2', 'bundle' => 'menu_link_content', 'title' => 'Link test'])->save();
$output = $this->linkTree->load('menu1', new MenuTreeParameters());
- $this->assertEqual(count($output), 2);
+ $this->assertCount(2, $output);
$output = $this->linkTree->load('menu2', new MenuTreeParameters());
- $this->assertEqual(count($output), 1);
+ $this->assertCount(1, $output);
$this->menuLinkManager->deleteLinksInMenu('menu1');
$output = $this->linkTree->load('menu1', new MenuTreeParameters());
- $this->assertEqual(count($output), 0);
+ $this->assertCount(0, $output);
$output = $this->linkTree->load('menu2', new MenuTreeParameters());
- $this->assertEqual(count($output), 1);
+ $this->assertCount(1, $output);
}
/**
@@ -125,7 +125,7 @@ public function testCreateLinksInMenu() {
$parameters->setRoot('test.example2');
$tree = $this->linkTree->load($instance->getMenuName(), $parameters);
$top_link = reset($tree);
- $this->assertEqual(count($top_link->subtree), 1);
+ $this->assertCount(1, $top_link->subtree);
$child = reset($top_link->subtree);
$this->assertEqual($child->link->getPluginId(), $links[3]->getPluginId());
$height = $this->linkTree->getSubtreeHeight('test.example2');
diff --git a/web/core/tests/Drupal/KernelTests/Core/Menu/MenuTreeStorageTest.php b/web/core/tests/Drupal/KernelTests/Core/Menu/MenuTreeStorageTest.php
index a3d701f5c0..d5b884bb23 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Menu/MenuTreeStorageTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Menu/MenuTreeStorageTest.php
@@ -234,32 +234,32 @@ public function testLoadTree() {
$data = $this->treeStorage->loadTreeData('tools', new MenuTreeParameters());
$tree = $data['tree'];
- $this->assertEqual(count($tree['test1']['subtree']), 1);
- $this->assertEqual(count($tree['test1']['subtree']['test2']['subtree']), 1);
- $this->assertEqual(count($tree['test1']['subtree']['test2']['subtree']['test3']['subtree']), 0);
- $this->assertEqual(count($tree['test4']['subtree']), 1);
- $this->assertEqual(count($tree['test4']['subtree']['test5']['subtree']), 0);
+ $this->assertCount(1, $tree['test1']['subtree']);
+ $this->assertCount(1, $tree['test1']['subtree']['test2']['subtree']);
+ $this->assertCount(0, $tree['test1']['subtree']['test2']['subtree']['test3']['subtree']);
+ $this->assertCount(1, $tree['test4']['subtree']);
+ $this->assertCount(0, $tree['test4']['subtree']['test5']['subtree']);
$parameters = new MenuTreeParameters();
$parameters->setActiveTrail(['test4', 'test5']);
$data = $this->treeStorage->loadTreeData('tools', $parameters);
$tree = $data['tree'];
- $this->assertEqual(count($tree['test1']['subtree']), 1);
+ $this->assertCount(1, $tree['test1']['subtree']);
$this->assertFalse($tree['test1']['in_active_trail']);
- $this->assertEqual(count($tree['test1']['subtree']['test2']['subtree']), 1);
+ $this->assertCount(1, $tree['test1']['subtree']['test2']['subtree']);
$this->assertFalse($tree['test1']['subtree']['test2']['in_active_trail']);
- $this->assertEqual(count($tree['test1']['subtree']['test2']['subtree']['test3']['subtree']), 0);
+ $this->assertCount(0, $tree['test1']['subtree']['test2']['subtree']['test3']['subtree']);
$this->assertFalse($tree['test1']['subtree']['test2']['subtree']['test3']['in_active_trail']);
- $this->assertEqual(count($tree['test4']['subtree']), 1);
+ $this->assertCount(1, $tree['test4']['subtree']);
$this->assertTrue($tree['test4']['in_active_trail']);
- $this->assertEqual(count($tree['test4']['subtree']['test5']['subtree']), 0);
+ $this->assertCount(0, $tree['test4']['subtree']['test5']['subtree']);
$this->assertTrue($tree['test4']['subtree']['test5']['in_active_trail']);
// Add some conditions to ensure that conditions work as expected.
$parameters = new MenuTreeParameters();
$parameters->addCondition('parent', 'test1');
$data = $this->treeStorage->loadTreeData('tools', $parameters);
- $this->assertEqual(count($data['tree']), 1);
+ $this->assertCount(1, $data['tree']);
$this->assertEqual($data['tree']['test2']['definition']['id'], 'test2');
$this->assertEqual($data['tree']['test2']['subtree'], []);
@@ -277,9 +277,9 @@ public function testLoadTree() {
$parameters = new MenuTreeParameters();
$parameters->onlyEnabledLinks();
$data = $this->treeStorage->loadTreeData('tools', $parameters);
- $this->assertEqual(count($data['tree']), 1);
+ $this->assertCount(1, $data['tree']);
$this->assertEqual($data['tree']['test1']['definition']['id'], 'test1');
- $this->assertEqual(count($data['tree']['test1']['subtree']), 1);
+ $this->assertCount(1, $data['tree']['test1']['subtree']);
$this->assertEqual($data['tree']['test1']['subtree']['test2']['definition']['id'], 'test2');
$this->assertEqual($data['tree']['test1']['subtree']['test2']['subtree'], []);
@@ -415,7 +415,7 @@ protected function assertMenuLink($id, array $expected_properties, array $parent
$query->condition($field, $value);
}
$all = $query->execute()->fetchAll(\PDO::FETCH_ASSOC);
- $this->assertEqual(count($all), 1, "Found link $id matching all the expected properties");
+ $this->assertCount(1, $all, "Found link $id matching all the expected properties");
$raw = reset($all);
// Put the current link onto the front.
diff --git a/web/core/tests/Drupal/KernelTests/Core/Plugin/Context/ContextAwarePluginBaseTest.php b/web/core/tests/Drupal/KernelTests/Core/Plugin/Context/ContextAwarePluginBaseTest.php
index 1271d22ec7..55b24b5ae9 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Plugin/Context/ContextAwarePluginBaseTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Plugin/Context/ContextAwarePluginBaseTest.php
@@ -51,7 +51,7 @@ public function setUp() {
* @covers ::getContextDefinitions
*/
public function testGetContextDefinitions() {
- $this->assertInternalType('array', $this->plugin->getContextDefinitions());
+ $this->assertIsArray($this->plugin->getContextDefinitions());
}
/**
diff --git a/web/core/tests/Drupal/KernelTests/Core/Plugin/ContextPluginTest.php b/web/core/tests/Drupal/KernelTests/Core/Plugin/ContextPluginTest.php
index 5245824787..006aaa5a5e 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Plugin/ContextPluginTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Plugin/ContextPluginTest.php
@@ -17,7 +17,14 @@
*/
class ContextPluginTest extends KernelTestBase {
- public static $modules = ['system', 'user', 'node', 'field', 'filter', 'text'];
+ public static $modules = [
+ 'system',
+ 'user',
+ 'node',
+ 'field',
+ 'filter',
+ 'text',
+ ];
/**
* Tests basic context definition and value getters and setters.
diff --git a/web/core/tests/Drupal/KernelTests/Core/Render/Element/TableTest.php b/web/core/tests/Drupal/KernelTests/Core/Render/Element/TableTest.php
index f32b490d5b..0703801a34 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Render/Element/TableTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Render/Element/TableTest.php
@@ -33,7 +33,7 @@ public function testThemeTableStickyHeaders() {
$this->render($table);
// Make sure tableheader.js was attached.
$tableheader = $this->xpath("//script[contains(@src, 'tableheader.js')]");
- $this->assertEqual(count($tableheader), 1);
+ $this->assertCount(1, $tableheader);
$this->assertRaw('sticky-enabled');
}
@@ -58,7 +58,7 @@ public function testThemeTableNoStickyHeaders() {
$this->render($table);
// Make sure tableheader.js was not attached.
$tableheader = $this->xpath("//script[contains(@src, 'tableheader.js')]");
- $this->assertEqual(count($tableheader), 0);
+ $this->assertCount(0, $tableheader);
$this->assertNoRaw('sticky-enabled');
}
@@ -305,7 +305,7 @@ public function testThemeTableTitle() {
$form = \Drupal::formBuilder()->getForm('\Drupal\form_test\Form\FormTestTableForm');
$this->render($form);
$this->assertEscaped('Update <em>kitten</em>');
- $this->assertRaw('Update my favourite fruit is <strong>bananas</strong>');
+ $this->assertRaw('Update my favorite fruit is <strong>bananas</strong>');
}
}
diff --git a/web/core/tests/Drupal/KernelTests/Core/Render/RenderTest.php b/web/core/tests/Drupal/KernelTests/Core/Render/RenderTest.php
index 0ac19d5f8b..fb1e6511c0 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Render/RenderTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Render/RenderTest.php
@@ -48,7 +48,7 @@ public function testDrupalRenderThemePreprocessAttached() {
*/
public function testRenderChildren() {
// Ensure that #prefix and #suffix is only being printed once since that is
- // the behaviour the caller code expects.
+ // the behavior the caller code expects.
$build = [
'#type' => 'container',
'#theme' => 'theme_test_render_element_children',
diff --git a/web/core/tests/Drupal/KernelTests/Core/Routing/ContentNegotiationRoutingTest.php b/web/core/tests/Drupal/KernelTests/Core/Routing/ContentNegotiationRoutingTest.php
index d05170deb9..45a29662f9 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Routing/ContentNegotiationRoutingTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Routing/ContentNegotiationRoutingTest.php
@@ -108,7 +108,7 @@ public function testContentRouting() {
// see the error.
$this->assertTrue(TRUE, $message);
$this->assertEqual($response->getStatusCode(), Response::HTTP_OK);
- $this->assertTrue(strpos($response->headers->get('Content-type'), $content_type) !== FALSE);
+ $this->assertStringContainsString($content_type, $response->headers->get('Content-type'));
}
}
diff --git a/web/core/tests/Drupal/KernelTests/Core/Routing/ExceptionHandlingTest.php b/web/core/tests/Drupal/KernelTests/Core/Routing/ExceptionHandlingTest.php
index 2dae1147b8..0b955fd1c2 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Routing/ExceptionHandlingTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Routing/ExceptionHandlingTest.php
@@ -113,15 +113,15 @@ public function testHtml404() {
public function testExceptionResponseGeneratedForOriginalRequest() {
// Test with 404 path pointing to a route that uses '_controller'.
$response = $this->doTest404Route('/router_test/test25');
- $this->assertTrue(strpos($response->getContent(), '/not-found') !== FALSE);
+ $this->assertStringContainsString('/not-found', $response->getContent());
// Test with 404 path pointing to a route that uses '_form'.
$response = $this->doTest404Route('/router_test/test26');
- $this->assertTrue(strpos($response->getContent(), '<form class="system-logging-settings"') !== FALSE);
+ $this->assertStringContainsString('<form class="system-logging-settings"', $response->getContent());
// Test with 404 path pointing to a route that uses '_entity_form'.
$response = $this->doTest404Route('/router_test/test27');
- $this->assertTrue(strpos($response->getContent(), '<form class="date-format-add-form date-format-form"') !== FALSE);
+ $this->assertStringContainsString('<form class="date-format-add-form date-format-form"', $response->getContent());
}
/**
@@ -161,8 +161,8 @@ public function testBacktraceEscaping() {
// Test both that the backtrace is properly escaped, and that the unescaped
// string is not output at all.
- $this->assertTrue(strpos($response->getContent(), Html::escape('<script>alert(\'xss\')</script>')) !== FALSE);
- $this->assertTrue(strpos($response->getContent(), '<script>alert(\'xss\')</script>') === FALSE);
+ $this->assertStringContainsString(Html::escape('<script>alert(\'xss\')</script>'), $response->getContent());
+ $this->assertStringNotContainsString('<script>alert(\'xss\')</script>', $response->getContent());
}
/**
diff --git a/web/core/tests/Drupal/KernelTests/Core/Routing/MatcherDumperTest.php b/web/core/tests/Drupal/KernelTests/Core/Routing/MatcherDumperTest.php
index e5b1e1184d..cfad6baa75 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Routing/MatcherDumperTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Routing/MatcherDumperTest.php
@@ -48,7 +48,7 @@ public function testCreate() {
$dumper = new MatcherDumper($connection, $this->state);
$class_name = 'Drupal\Core\Routing\MatcherDumper';
- $this->assertTrue($dumper instanceof $class_name, 'Dumper created successfully');
+ $this->assertInstanceOf($class_name, $dumper);
}
/**
@@ -134,7 +134,7 @@ public function testDump() {
$this->assertEqual($record->path, '/test/{my}/path', 'Dumped route has correct pattern.');
$this->assertEqual($record->pattern_outline, '/test/%/path', 'Dumped route has correct pattern outline.');
$this->assertEqual($record->fit, 5 /* 101 in binary */, 'Dumped route has correct fit.');
- $this->assertTrue($loaded_route instanceof Route, 'Route object retrieved successfully.');
+ $this->assertInstanceOf(Route::class, $loaded_route);
}
/**
diff --git a/web/core/tests/Drupal/KernelTests/Core/Routing/RouteProviderTest.php b/web/core/tests/Drupal/KernelTests/Core/Routing/RouteProviderTest.php
index 6daa3964c8..d855d8ce31 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Routing/RouteProviderTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Routing/RouteProviderTest.php
@@ -38,7 +38,12 @@ class RouteProviderTest extends KernelTestBase {
/**
* Modules to enable.
*/
- public static $modules = ['url_alter_test', 'system', 'language', 'path_alias'];
+ public static $modules = [
+ 'url_alter_test',
+ 'system',
+ 'language',
+ 'path_alias',
+ ];
/**
* A collection of shared fixture data for tests.
@@ -126,14 +131,14 @@ public function testCandidateOutlines() {
$candidates = array_flip($candidates);
- $this->assertTrue(count($candidates) == 7, 'Correct number of candidates found');
- $this->assertTrue(array_key_exists('/node/5/edit', $candidates), 'First candidate found.');
- $this->assertTrue(array_key_exists('/node/5/%', $candidates), 'Second candidate found.');
- $this->assertTrue(array_key_exists('/node/%/edit', $candidates), 'Third candidate found.');
- $this->assertTrue(array_key_exists('/node/%/%', $candidates), 'Fourth candidate found.');
- $this->assertTrue(array_key_exists('/node/5', $candidates), 'Fifth candidate found.');
- $this->assertTrue(array_key_exists('/node/%', $candidates), 'Sixth candidate found.');
- $this->assertTrue(array_key_exists('/node', $candidates), 'Seventh candidate found.');
+ $this->assertCount(7, $candidates, 'Correct number of candidates found');
+ $this->assertArrayHasKey('/node/5/edit', $candidates);
+ $this->assertArrayHasKey('/node/5/%', $candidates);
+ $this->assertArrayHasKey('/node/%/edit', $candidates);
+ $this->assertArrayHasKey('/node/%/%', $candidates);
+ $this->assertArrayHasKey('/node/5', $candidates);
+ $this->assertArrayHasKey('/node/%', $candidates);
+ $this->assertArrayHasKey('/node', $candidates);
}
/**
@@ -142,7 +147,7 @@ public function testCandidateOutlines() {
public function testEmptyPathCandidatesOutlines() {
$provider = new TestRouteProvider(Database::getConnection(), $this->state, $this->currentPath, $this->cache, $this->pathProcessor, $this->cacheTagsInvalidator, 'test_routes');
$candidates = $provider->getCandidateOutlines([]);
- $this->assertEqual(count($candidates), 0, 'Empty parts should return no candidates.');
+ $this->assertCount(0, $candidates, 'Empty parts should return no candidates.');
}
/**
@@ -193,7 +198,7 @@ public function testOutlinePathMatch() {
$this->assertEqual($route->compile()->getPatternOutline(), '/path/%/one', 'Found path has correct pattern');
}
- $this->assertEqual(count($routes), 2, 'The correct number of routes was found.');
+ $this->assertCount(2, $routes, 'The correct number of routes was found.');
$this->assertNotNull($routes->get('route_a'), 'The first matching route was found.');
$this->assertNotNull($routes->get('route_b'), 'The second matching route was not found.');
}
@@ -238,11 +243,11 @@ public function testMixedCasePaths($path, $expected_route_name, $method = 'GET')
$routes = $provider->getRouteCollectionForRequest($request);
if ($expected_route_name) {
- $this->assertEquals(1, count($routes), 'The correct number of routes was found.');
+ $this->assertCount(1, $routes, 'The correct number of routes was found.');
$this->assertNotNull($routes->get($expected_route_name), 'The first matching route was found.');
}
else {
- $this->assertEquals(0, count($routes), 'No routes matched.');
+ $this->assertCount(0, $routes, 'No routes matched.');
}
}
@@ -310,7 +315,7 @@ public function testOutlinePathMatchTrailingSlash() {
$this->assertEqual($route->compile()->getPatternOutline(), '/path/%/one', 'Found path has correct pattern');
}
- $this->assertEqual(count($routes), 2, 'The correct number of routes was found.');
+ $this->assertCount(2, $routes, 'The correct number of routes was found.');
$this->assertNotNull($routes->get('route_a'), 'The first matching route was found.');
$this->assertNotNull($routes->get('route_b'), 'The second matching route was not found.');
}
@@ -345,7 +350,7 @@ public function testOutlinePathMatchDefaults() {
$this->assertEqual($route->compile()->getPatternOutline(), '/some/path', 'Found path has correct pattern');
}
- $this->assertEqual(count($routes), 1, 'The correct number of routes was found.');
+ $this->assertCount(1, $routes, 'The correct number of routes was found.');
$this->assertNotNull($routes->get('poink'), 'The first matching route was found.');
}
catch (ResourceNotFoundException $e) {
@@ -384,7 +389,7 @@ public function testOutlinePathMatchDefaultsCollision() {
$this->assertEqual($route->compile()->getPatternOutline(), '/some/path', 'Found path has correct pattern');
}
- $this->assertEqual(count($routes), 1, 'The correct number of routes was found.');
+ $this->assertCount(1, $routes, 'The correct number of routes was found.');
$this->assertNotNull($routes->get('poink'), 'The first matching route was found.');
}
catch (ResourceNotFoundException $e) {
@@ -420,7 +425,7 @@ public function testOutlinePathMatchDefaultsCollision2() {
$routes = $provider->getRouteCollectionForRequest($request);
$routes_array = $routes->all();
- $this->assertEqual(count($routes), 2, 'The correct number of routes was found.');
+ $this->assertCount(2, $routes, 'The correct number of routes was found.');
$this->assertEqual(['narf', 'poink'], array_keys($routes_array), 'Ensure the fitness was taken into account.');
$this->assertNotNull($routes->get('narf'), 'The first matching route was found.');
$this->assertNotNull($routes->get('poink'), 'The second matching route was found.');
@@ -459,7 +464,7 @@ public function testOutlinePathMatchDefaultsCollision3() {
$routes = $provider->getRouteCollectionForRequest($request);
$routes_array = $routes->all();
- $this->assertEqual(count($routes), 2, 'The correct number of routes was found.');
+ $this->assertCount(2, $routes, 'The correct number of routes was found.');
$this->assertEqual(['poink', 'poink2'], array_keys($routes_array), 'Ensure the fitness and name were taken into account in the sort.');
$this->assertNotNull($routes->get('poink'), 'The first matching route was found.');
$this->assertNotNull($routes->get('poink2'), 'The second matching route was found.');
@@ -498,7 +503,7 @@ public function testOutlinePathMatchZero() {
$this->assertEqual($route->compile()->getPatternOutline(), '/some/path/%', 'Found path has correct pattern');
}
- $this->assertEqual(count($routes), 1, 'The correct number of routes was found.');
+ $this->assertCount(1, $routes, 'The correct number of routes was found.');
}
catch (ResourceNotFoundException $e) {
$this->fail('No matchout route found with 0 as argument value');
@@ -552,7 +557,7 @@ public function testRouteCaching() {
$cache = $this->cache->get('route:[language]=en:/path/add/one:');
$this->assertEqual('/path/add/one', $cache->data['path']);
$this->assertEqual([], $cache->data['query']);
- $this->assertEqual(3, count($cache->data['routes']));
+ $this->assertCount(3, $cache->data['routes']);
// A path with query parameters.
$path = '/path/add/one?foo=bar';
@@ -562,7 +567,7 @@ public function testRouteCaching() {
$cache = $this->cache->get('route:[language]=en:/path/add/one:foo=bar');
$this->assertEqual('/path/add/one', $cache->data['path']);
$this->assertEqual(['foo' => 'bar'], $cache->data['query']);
- $this->assertEqual(3, count($cache->data['routes']));
+ $this->assertCount(3, $cache->data['routes']);
// A path with placeholders.
$path = '/path/1/one';
@@ -572,7 +577,7 @@ public function testRouteCaching() {
$cache = $this->cache->get('route:[language]=en:/path/1/one:');
$this->assertEqual('/path/1/one', $cache->data['path']);
$this->assertEqual([], $cache->data['query']);
- $this->assertEqual(2, count($cache->data['routes']));
+ $this->assertCount(2, $cache->data['routes']);
// A path with a path alias.
$this->createPathAlias('/path/add/one', '/path/add-one');
@@ -587,7 +592,7 @@ public function testRouteCaching() {
$cache = $this->cache->get('route:[language]=en:/path/add-one:');
$this->assertEqual('/path/add/one', $cache->data['path']);
$this->assertEqual([], $cache->data['query']);
- $this->assertEqual(3, count($cache->data['routes']));
+ $this->assertCount(3, $cache->data['routes']);
// Test with a different current language by switching out the default
// language.
@@ -602,7 +607,7 @@ public function testRouteCaching() {
$cache = $this->cache->get('route:[language]=gsw-berne:/path/add-one:');
$this->assertEquals('/path/add/one', $cache->data['path']);
$this->assertEquals([], $cache->data['query']);
- $this->assertEquals(3, count($cache->data['routes']));
+ $this->assertCount(3, $cache->data['routes']);
}
/**
@@ -635,7 +640,7 @@ public function testRouteByName() {
$this->assertTrue($exception_thrown, 'Random route was not found.');
$routes = $provider->getRoutesByNames(['route_c', 'route_d', $this->randomMachineName()]);
- $this->assertEqual(count($routes), 2, 'Only two valid routes found.');
+ $this->assertCount(2, $routes, 'Only two valid routes found.');
$this->assertEqual($routes['route_c']->getPath(), '/path/two');
$this->assertEqual($routes['route_d']->getPath(), '/path/three');
}
@@ -654,13 +659,13 @@ public function testGetRoutesByPatternWithLongPatterns() {
$result = $provider->getRoutesByPattern($shortest);
$this->assertEqual($result->count(), 0);
$candidates = $provider->getCandidateOutlines(explode('/', trim($shortest, '/')));
- $this->assertEqual(count($candidates), 7);
+ $this->assertCount(7, $candidates);
// A longer patten is not found and returns no candidates
$path_to_test = '/test/1/test2/2/test3/3/4/5/6/test4';
$result = $provider->getRoutesByPattern($path_to_test);
$this->assertEqual($result->count(), 0);
$candidates = $provider->getCandidateOutlines(explode('/', trim($path_to_test, '/')));
- $this->assertEqual(count($candidates), 0);
+ $this->assertCount(0, $candidates);
// Add a matching route and dump it.
$dumper = new MatcherDumper($connection, $this->state, 'test_routes');
@@ -676,7 +681,7 @@ public function testGetRoutesByPatternWithLongPatterns() {
$this->assertEqual(serialize($result->get('long_pattern')), serialize($collection->get('long_pattern')), 'The right route was found.');
// We now have a single candidate outline.
$candidates = $provider->getCandidateOutlines(explode('/', trim($path_to_test, '/')));
- $this->assertEqual(count($candidates), 1);
+ $this->assertCount(1, $candidates);
// Longer and shorter patterns are not found. Both are longer than 3, so
// we should not have any candidates either. The fact that we do not
// get any candidates for a longer path is a security feature.
@@ -684,18 +689,18 @@ public function testGetRoutesByPatternWithLongPatterns() {
$result = $provider->getRoutesByPattern($longer);
$this->assertEqual($result->count(), 0);
$candidates = $provider->getCandidateOutlines(explode('/', trim($longer, '/')));
- $this->assertEqual(count($candidates), 1);
+ $this->assertCount(1, $candidates);
$shorter = '/test/1/test2/2/test3';
$result = $provider->getRoutesByPattern($shorter);
$this->assertEqual($result->count(), 0);
$candidates = $provider->getCandidateOutlines(explode('/', trim($shorter, '/')));
- $this->assertEqual(count($candidates), 0);
+ $this->assertCount(0, $candidates);
// This pattern has only 3 parts, so we will get candidates, but no routes.
// This result is unchanged by running the dumper.
$result = $provider->getRoutesByPattern($shortest);
$this->assertEqual($result->count(), 0);
$candidates = $provider->getCandidateOutlines(explode('/', trim($shortest, '/')));
- $this->assertEqual(count($candidates), 7);
+ $this->assertCount(7, $candidates);
}
/**
diff --git a/web/core/tests/Drupal/KernelTests/Core/TempStore/TempStoreDatabaseTest.php b/web/core/tests/Drupal/KernelTests/Core/TempStore/TempStoreDatabaseTest.php
index c9e3cfe647..b4c8a4000e 100644
--- a/web/core/tests/Drupal/KernelTests/Core/TempStore/TempStoreDatabaseTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/TempStore/TempStoreDatabaseTest.php
@@ -107,7 +107,7 @@ public function testSharedTempStore() {
$this->assertIdenticalObject($this->objects[2], $stores[1]->get($key));
// This user should be allowed to get, update, delete.
- $this->assertTrue($stores[0]->getIfOwner($key) instanceof \stdClass);
+ $this->assertInstanceOf(\stdClass::class, $stores[0]->getIfOwner($key));
$this->assertTrue($stores[0]->setIfOwner($key, $this->objects[1]));
$this->assertTrue($stores[0]->deleteIfOwner($key));
diff --git a/web/core/tests/Drupal/KernelTests/Core/Test/AssertMailTraitTest.php b/web/core/tests/Drupal/KernelTests/Core/Test/AssertMailTraitTest.php
index 9b71fb357e..7ce78183f1 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Test/AssertMailTraitTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Test/AssertMailTraitTest.php
@@ -43,7 +43,7 @@ public function testAssertMailTrait() {
// Ensure that there is one email in the captured emails array.
$captured_emails = $this->getMails();
- $this->assertEquals(count($captured_emails), 1, 'One email was captured.');
+ $this->assertCount(1, $captured_emails, 'One email was captured.');
// Assert that the email was sent by iterating over the message properties
// and ensuring that they are captured intact.
diff --git a/web/core/tests/Drupal/KernelTests/Core/Test/Comparator/MarkupInterfaceComparatorTest.php b/web/core/tests/Drupal/KernelTests/Core/Test/Comparator/MarkupInterfaceComparatorTest.php
new file mode 100644
index 0000000000..dc676dd1fc
--- /dev/null
+++ b/web/core/tests/Drupal/KernelTests/Core/Test/Comparator/MarkupInterfaceComparatorTest.php
@@ -0,0 +1,160 @@
+<?php
+
+namespace Drupal\KernelTests\Core\Test\Comparator;
+
+use Drupal\Component\Render\FormattableMarkup;
+use Drupal\Core\StringTranslation\TranslatableMarkup;
+use Drupal\KernelTests\KernelTestBase;
+use Drupal\TestTools\Comparator\MarkupInterfaceComparator;
+use PHPUnit\Framework\Error\Notice;
+use SebastianBergmann\Comparator\Factory;
+use SebastianBergmann\Comparator\ComparisonFailure;
+
+/**
+ * Tests \Drupal\TestTools\Comparator\MarkupInterfaceComparator.
+ *
+ * We need to test the class with a kernel test since casting MarkupInterface
+ * objects to strings can require an initialized container.
+ *
+ * @group Test
+ *
+ * @coversDefaultClass \Drupal\TestTools\Comparator\MarkupInterfaceComparator
+ */
+class MarkupInterfaceComparatorTest extends KernelTestBase {
+
+ /**
+ * @var \Drupal\TestTools\Comparator\MarkupInterfaceComparator
+ */
+ protected $comparator;
+
+ /**
+ * @var \SebastianBergmann\Comparator\Factory
+ */
+ protected $factory;
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function setUp() {
+ parent::setUp();
+ $this->factory = new Factory();
+ $this->comparator = new MarkupInterfaceComparator();
+ $this->comparator->setFactory($this->factory);
+ }
+
+ /**
+ * Provides test data for the comparator.
+ *
+ * @return array
+ * Each array entry has:
+ * - test expected value,
+ * - test actual value,
+ * - a bool indicating the expected return value of ::accepts,
+ * - a value indicating the expected result of ::assertEquals, TRUE if
+ * comparison should match, FALSE if error, or a class name of an object
+ * thrown.
+ */
+ public function dataSetProvider() {
+ return [
+ 'FormattableMarkup vs FormattableMarkup, equal' => [
+ new FormattableMarkup('goldfinger', []),
+ new FormattableMarkup('goldfinger', []),
+ TRUE,
+ TRUE,
+ ],
+ 'FormattableMarkup vs FormattableMarkup, not equal' => [
+ new FormattableMarkup('goldfinger', []),
+ new FormattableMarkup('moonraker', []),
+ TRUE,
+ ComparisonFailure::class,
+ ],
+ 'FormattableMarkup vs string, equal' => [
+ new FormattableMarkup('goldfinger', []),
+ 'goldfinger',
+ TRUE,
+ TRUE,
+ ],
+ 'string vs FormattableMarkup, equal' => [
+ 'goldfinger',
+ new FormattableMarkup('goldfinger', []),
+ TRUE,
+ TRUE,
+ ],
+ 'TranslatableMarkup vs FormattableMarkup, equal' => [
+ new TranslatableMarkup('goldfinger'),
+ new FormattableMarkup('goldfinger', []),
+ TRUE,
+ TRUE,
+ ],
+ 'TranslatableMarkup vs string, not equal' => [
+ new TranslatableMarkup('goldfinger'),
+ 'moonraker',
+ TRUE,
+ ComparisonFailure::class,
+ ],
+ 'TranslatableMarkup vs int, equal' => [
+ new TranslatableMarkup('1234'),
+ 1234,
+ TRUE,
+ TRUE,
+ ],
+ 'int vs TranslatableMarkup, equal' => [
+ 1234,
+ new TranslatableMarkup('1234'),
+ TRUE,
+ TRUE,
+ ],
+ 'FormattableMarkup vs array' => [
+ new FormattableMarkup('goldfinger', []),
+ ['goldfinger'],
+ FALSE,
+ Notice::class,
+ ],
+ 'stdClass vs TranslatableMarkup' => [
+ (object) ['goldfinger'],
+ new TranslatableMarkup('goldfinger'),
+ FALSE,
+ FALSE,
+ ],
+ 'string vs string, equal' => [
+ 'goldfinger',
+ 'goldfinger',
+ FALSE,
+ TRUE,
+ ],
+ ];
+ }
+
+ /**
+ * @covers ::accepts
+ * @dataProvider dataSetProvider
+ */
+ public function testAccepts($expected, $actual, $accepts_result, $equals_result) {
+ if ($accepts_result) {
+ $this->assertTrue($this->comparator->accepts($expected, $actual));
+ }
+ else {
+ $this->assertFalse($this->comparator->accepts($expected, $actual));
+ }
+ }
+
+ /**
+ * @covers ::assertEquals
+ * @dataProvider dataSetProvider
+ */
+ public function testAssertEquals($expected, $actual, $accepts_result, $equals_result) {
+ try {
+ $this->assertNull($this->comparator->assertEquals($expected, $actual));
+ $this->assertTrue($equals_result);
+ }
+ catch (\Throwable $e) {
+ if ($equals_result === FALSE) {
+ $this->assertNotNull($e->getMessage());
+ }
+ else {
+ $this->assertInstanceOf($equals_result, $e);
+ }
+ }
+ }
+
+}
diff --git a/web/core/tests/Drupal/KernelTests/Core/Theme/ConfirmClassyCopiesTest.php b/web/core/tests/Drupal/KernelTests/Core/Theme/ConfirmClassyCopiesTest.php
new file mode 100644
index 0000000000..48cdd0ad9b
--- /dev/null
+++ b/web/core/tests/Drupal/KernelTests/Core/Theme/ConfirmClassyCopiesTest.php
@@ -0,0 +1,869 @@
+<?php
+
+namespace Drupal\KernelTests\Core\Theme;
+
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Confirms that theme assets copied from Classy have not been changed.
+ *
+ * If a copied Classy asset is changed, it should no longer be in a /classy
+ * subdirectory. The files there should be exact copies from Classy. Once it has
+ * changed, it is custom to the theme and should be moved to a different
+ * location.
+ *
+ * @group Theme
+ */
+class ConfirmClassyCopiesTest extends KernelTestBase {
+
+ /**
+ * Tests Classy's assets have not been altered.
+ */
+ public function testClassyHashes() {
+ $theme_path = $this->container->get('extension.list.theme')->getPath('classy');
+ foreach (['images', 'css', 'js', 'templates'] as $type => $sub_folder) {
+ $asset_path = "$theme_path/$sub_folder";
+ $directory = new \RecursiveDirectoryIterator($asset_path, \FilesystemIterator::CURRENT_AS_FILEINFO | \FilesystemIterator::SKIP_DOTS);
+ $iterator = new \RecursiveIteratorIterator($directory);
+ $this->assertGreaterThan(0, iterator_count($iterator));
+ foreach ($iterator as $fileinfo) {
+ $filename = $fileinfo->getFilename();
+ $this->assertSame(
+ $this->getClassyHash($sub_folder, $filename),
+ md5_file($fileinfo->getPathname()),
+ "$filename has expected hash"
+ );
+ }
+ }
+ }
+
+ /**
+ * Confirms that files copied from Classy have not been altered.
+ *
+ * The /classy subdirectory in a theme's css, js and images directories is for
+ * unaltered copies of files from Classy. If a file in that subdirectory has
+ * changed, then it is custom to that theme and should be moved to a different
+ * directory. Additional information can be found in the README.txt of each of
+ * those /classy subdirectories.
+ *
+ * @param string $theme
+ * The theme being tested.
+ * @param string $path_replace
+ * A string to replace paths found in CSS so relative URLs don't cause the
+ * hash to differ.
+ * @param string[] $filenames
+ * Provides list of every asset copied from Classy.
+ *
+ * @dataProvider providerTestClassyCopies
+ */
+ public function testClassyCopies($theme, $path_replace, array $filenames) {
+ $theme_path = $this->container->get('extension.list.theme')->getPath($theme);
+
+ foreach (['images', 'css', 'js', 'templates'] as $sub_folder) {
+ $asset_path = "$theme_path/$sub_folder/classy";
+ // If a theme has completely customized all files of a type there is
+ // potentially no Classy subdirectory for that type. Tests can be skipped
+ // for that type.
+ if (!file_exists($asset_path)) {
+ $this->assertEmpty($filenames[$sub_folder]);
+ continue;
+ }
+
+ // Create iterators to collect all files in a asset directory.
+ $directory = new \RecursiveDirectoryIterator($asset_path, \FilesystemIterator::CURRENT_AS_FILEINFO | \FilesystemIterator::SKIP_DOTS);
+ $iterator = new \RecursiveIteratorIterator($directory);
+ $filecount = 0;
+ foreach ($iterator as $fileinfo) {
+ $filename = $fileinfo->getFilename();
+ if ($filename === 'README.txt') {
+ continue;
+ }
+
+ $filecount++;
+
+ // Replace paths in the contents so the hash will match Classy's hashes.
+ $contents = file_get_contents($fileinfo->getPathname());
+ $contents = str_replace('(' . $path_replace, '(../../../../', $contents);
+ $contents = str_replace('(../../../images/classy/icons', '(../../images/icons', $contents);
+ preg_match_all("/attach_library\('.+\/classy\.(.+)'/", $contents, $classy_attach_library_matches);
+ if (!empty($classy_attach_library_matches[0])) {
+ $library_module = $classy_attach_library_matches[1][0];
+ $contents = str_replace("'$theme/classy.$library_module'", "'classy/$library_module'", $contents);
+ }
+
+ $this->assertContains($filename, $filenames[$sub_folder], "$sub_folder file: $filename not present.");
+ $this->assertSame(
+ $this->getClassyHash($sub_folder, $filename),
+ md5($contents),
+ "$filename is in the theme's /classy subdirectory, but the file contents no longer match the original file from Classy. This should be moved to a new directory and libraries should be updated. The file can be removed from the data provider."
+ );
+ }
+ $this->assertCount($filecount, $filenames[$sub_folder], "Different count for $sub_folder files in the /classy subdirectory. If a file was added to /classy, it shouldn't have been. If it was intentionally removed, it should also be removed from this test's data provider.");
+ }
+ }
+
+ /**
+ * Provides lists of filenames for a theme's asset files copied from Classy.
+ *
+ * @return array
+ * Theme name, how to replace a path to core assets and asset file names.
+ */
+ public function providerTestClassyCopies() {
+ return [
+ 'umami' => [
+ 'theme-name' => 'umami',
+ 'path-replace' => '../../../../../../../',
+ 'filenames' => [
+ 'css' => [
+ 'action-links.css',
+ 'book-navigation.css',
+ 'breadcrumb.css',
+ 'button.css',
+ 'collapse-processed.css',
+ 'container-inline.css',
+ 'details.css',
+ 'dialog.css',
+ 'dropbutton.css',
+ 'exposed-filters.css',
+ 'field.css',
+ 'file.css',
+ 'form.css',
+ 'forum.css',
+ 'icons.css',
+ 'image-widget.css',
+ 'inline-form.css',
+ 'item-list.css',
+ 'link.css',
+ 'links.css',
+ 'media-embed-error.css',
+ 'media-library.css',
+ 'menu.css',
+ 'more-link.css',
+ 'node.css',
+ 'pager.css',
+ 'progress.css',
+ 'search-results.css',
+ 'tabledrag.css',
+ 'tableselect.css',
+ 'tablesort.css',
+ 'tabs.css',
+ 'textarea.css',
+ 'ui-dialog.css',
+ 'user.css',
+ ],
+ 'js' => [
+ 'media_embed_ckeditor.theme.es6.js',
+ 'media_embed_ckeditor.theme.js',
+ ],
+ 'images' => [
+ 'application-octet-stream.png',
+ 'application-pdf.png',
+ 'application-x-executable.png',
+ 'audio-x-generic.png',
+ 'forum-icons.png',
+ 'image-x-generic.png',
+ 'package-x-generic.png',
+ 'text-html.png',
+ 'text-plain.png',
+ 'text-x-generic.png',
+ 'text-x-script.png',
+ 'video-x-generic.png',
+ 'x-office-document.png',
+ 'x-office-presentation.png',
+ 'x-office-spreadsheet.png',
+ ],
+ 'templates' => [
+ 'node-edit-form.html.twig',
+ 'image-widget.html.twig',
+ 'node-add-list.html.twig',
+ 'filter-guidelines.html.twig',
+ 'filter-tips.html.twig',
+ 'file-managed-file.html.twig',
+ 'text-format-wrapper.html.twig',
+ 'filter-caption.html.twig',
+ 'rdf-metadata.html.twig',
+ 'help-section.html.twig',
+ 'progress-bar.html.twig',
+ 'form-element-label.html.twig',
+ 'datetime-wrapper.html.twig',
+ 'fieldset.html.twig',
+ 'datetime-form.html.twig',
+ 'textarea.html.twig',
+ 'details.html.twig',
+ 'form-element.html.twig',
+ 'radios.html.twig',
+ 'item-list.html.twig',
+ 'aggregator-feed.html.twig',
+ 'item-list--search-results.html.twig',
+ 'table.html.twig',
+ 'forum-list.html.twig',
+ 'forum-icon.html.twig',
+ 'forums.html.twig',
+ 'maintenance-page.html.twig',
+ 'book-export-html.html.twig',
+ 'html.html.twig',
+ 'region.html.twig',
+ 'book-all-books-block.html.twig',
+ 'book-tree.html.twig',
+ 'book-navigation.html.twig',
+ 'toolbar.html.twig',
+ 'comment.html.twig',
+ 'taxonomy-term.html.twig',
+ 'media-embed-error.html.twig',
+ 'book-node-export-html.html.twig',
+ 'links--node.html.twig',
+ 'page-title.html.twig',
+ 'search-result.html.twig',
+ 'aggregator-item.html.twig',
+ 'media.html.twig',
+ 'mark.html.twig',
+ 'forum-submitted.html.twig',
+ 'username.html.twig',
+ 'user.html.twig',
+ 'time.html.twig',
+ 'image.html.twig',
+ 'field--text.html.twig',
+ 'field--text-long.html.twig',
+ 'file-audio.html.twig',
+ 'field--comment.html.twig',
+ 'link-formatter-link-separate.html.twig',
+ 'field.html.twig',
+ 'file-link.html.twig',
+ 'field--text-with-summary.html.twig',
+ 'field--node--uid.html.twig',
+ 'field--node--title.html.twig',
+ 'field--node--created.html.twig',
+ 'file-video.html.twig',
+ 'links--media-library-menu.html.twig',
+ 'media--media-library.html.twig',
+ 'views-view-unformatted--media-library.html.twig',
+ 'container--media-library-content.html.twig',
+ 'media-library-item--small.html.twig',
+ 'container--media-library-widget-selection.html.twig',
+ 'media-library-wrapper.html.twig',
+ 'media-library-item.html.twig',
+ 'views-mini-pager.html.twig',
+ 'views-exposed-form.html.twig',
+ 'views-view-grouping.html.twig',
+ 'views-view-summary.html.twig',
+ 'views-view-table.html.twig',
+ 'views-view-row-rss.html.twig',
+ 'views-view-summary-unformatted.html.twig',
+ 'views-view.html.twig',
+ 'block.html.twig',
+ 'block--local-actions-block.html.twig',
+ 'block--system-menu-block.html.twig',
+ 'block--local-tasks-block.html.twig',
+ ],
+ ],
+ ],
+ 'claro' => [
+ 'theme-name' => 'claro',
+ 'path-replace' => '../../../../../',
+ 'filenames' => [
+ 'css' => [
+ 'book-navigation.css',
+ 'container-inline.css',
+ 'exposed-filters.css',
+ 'field.css',
+ 'file.css',
+ 'forum.css',
+ 'icons.css',
+ 'indented.css',
+ 'inline-form.css',
+ 'item-list.css',
+ 'link.css',
+ 'links.css',
+ 'media-embed-error.css',
+ 'menu.css',
+ 'more-link.css',
+ 'node.css',
+ 'search-results.css',
+ 'tablesort.css',
+ 'textarea.css',
+ 'ui-dialog.css',
+ ],
+ 'js' => [
+ 'media_embed_ckeditor.theme.es6.js',
+ 'media_embed_ckeditor.theme.js',
+ ],
+ 'images' => [
+ 'application-octet-stream.png',
+ 'application-pdf.png',
+ 'application-x-executable.png',
+ 'audio-x-generic.png',
+ 'forum-icons.png',
+ 'image-x-generic.png',
+ 'package-x-generic.png',
+ 'text-html.png',
+ 'text-plain.png',
+ 'text-x-generic.png',
+ 'text-x-script.png',
+ 'video-x-generic.png',
+ 'x-office-document.png',
+ 'x-office-presentation.png',
+ 'x-office-spreadsheet.png',
+ ],
+ 'templates' => [
+ 'filter-caption.html.twig',
+ 'rdf-metadata.html.twig',
+ 'help-section.html.twig',
+ 'progress-bar.html.twig',
+ 'textarea.html.twig',
+ 'radios.html.twig',
+ 'item-list.html.twig',
+ 'aggregator-feed.html.twig',
+ 'item-list--search-results.html.twig',
+ 'table.html.twig',
+ 'forum-list.html.twig',
+ 'forum-icon.html.twig',
+ 'forums.html.twig',
+ 'book-export-html.html.twig',
+ 'html.html.twig',
+ 'region.html.twig',
+ 'menu.html.twig',
+ 'book-all-books-block.html.twig',
+ 'book-tree.html.twig',
+ 'book-navigation.html.twig',
+ 'toolbar.html.twig',
+ 'comment.html.twig',
+ 'node.html.twig',
+ 'taxonomy-term.html.twig',
+ 'media-embed-error.html.twig',
+ 'book-node-export-html.html.twig',
+ 'links--node.html.twig',
+ 'page-title.html.twig',
+ 'search-result.html.twig',
+ 'aggregator-item.html.twig',
+ 'media.html.twig',
+ 'mark.html.twig',
+ 'forum-submitted.html.twig',
+ 'username.html.twig',
+ 'user.html.twig',
+ 'time.html.twig',
+ 'image.html.twig',
+ 'field--text.html.twig',
+ 'field--text-long.html.twig',
+ 'file-audio.html.twig',
+ 'field--comment.html.twig',
+ 'link-formatter-link-separate.html.twig',
+ 'field.html.twig',
+ 'field--text-with-summary.html.twig',
+ 'field--node--uid.html.twig',
+ 'field--node--title.html.twig',
+ 'field--node--created.html.twig',
+ 'file-video.html.twig',
+ 'links--media-library-menu.html.twig',
+ 'media--media-library.html.twig',
+ 'container--media-library-content.html.twig',
+ 'media-library-item--small.html.twig',
+ 'container--media-library-widget-selection.html.twig',
+ 'media-library-wrapper.html.twig',
+ 'media-library-item.html.twig',
+ 'views-view-grouping.html.twig',
+ 'views-view-summary.html.twig',
+ 'views-view-table.html.twig',
+ 'views-view-row-rss.html.twig',
+ 'views-view-summary-unformatted.html.twig',
+ 'views-view.html.twig',
+ 'block--system-branding-block.html.twig',
+ 'block--search-form-block.html.twig',
+ 'block.html.twig',
+ 'block--system-menu-block.html.twig',
+ ],
+ ],
+ ],
+ 'seven' => [
+ 'theme-name' => 'seven',
+ 'path-replace' => '../../../../../',
+ 'filenames' => [
+ 'css' => [
+ 'action-links.css',
+ 'book-navigation.css',
+ 'breadcrumb.css',
+ 'button.css',
+ 'collapse-processed.css',
+ 'container-inline.css',
+ 'dropbutton.css',
+ 'exposed-filters.css',
+ 'field.css',
+ 'file.css',
+ 'form.css',
+ 'forum.css',
+ 'icons.css',
+ 'image-widget.css',
+ 'indented.css',
+ 'inline-form.css',
+ 'item-list.css',
+ 'link.css',
+ 'links.css',
+ 'media-embed-error.css',
+ 'media-library.css',
+ 'menu.css',
+ 'messages.css',
+ 'more-link.css',
+ 'node.css',
+ 'pager.css',
+ 'progress.css',
+ 'search-results.css',
+ 'tabledrag.css',
+ 'tableselect.css',
+ 'tablesort.css',
+ 'tabs.css',
+ 'textarea.css',
+ 'ui-dialog.css',
+ 'user.css',
+ ],
+ 'js' => [
+ 'media_embed_ckeditor.theme.es6.js',
+ 'media_embed_ckeditor.theme.js',
+ ],
+ 'images' => [
+ 'application-octet-stream.png',
+ 'application-pdf.png',
+ 'application-x-executable.png',
+ 'audio-x-generic.png',
+ 'forum-icons.png',
+ 'image-x-generic.png',
+ 'package-x-generic.png',
+ 'text-html.png',
+ 'text-plain.png',
+ 'text-x-generic.png',
+ 'text-x-script.png',
+ 'video-x-generic.png',
+ 'x-office-document.png',
+ 'x-office-presentation.png',
+ 'x-office-spreadsheet.png',
+ ],
+ 'templates' => [
+ 'filter-guidelines.html.twig',
+ 'filter-tips.html.twig',
+ 'file-managed-file.html.twig',
+ 'text-format-wrapper.html.twig',
+ 'filter-caption.html.twig',
+ 'rdf-metadata.html.twig',
+ 'help-section.html.twig',
+ 'progress-bar.html.twig',
+ 'status-messages.html.twig',
+ 'form-element-label.html.twig',
+ 'datetime-wrapper.html.twig',
+ 'fieldset.html.twig',
+ 'datetime-form.html.twig',
+ 'textarea.html.twig',
+ 'form-element.html.twig',
+ 'radios.html.twig',
+ 'item-list.html.twig',
+ 'aggregator-feed.html.twig',
+ 'item-list--search-results.html.twig',
+ 'table.html.twig',
+ 'forum-list.html.twig',
+ 'forum-icon.html.twig',
+ 'forums.html.twig',
+ 'book-export-html.html.twig',
+ 'html.html.twig',
+ 'region.html.twig',
+ 'menu.html.twig',
+ 'book-all-books-block.html.twig',
+ 'book-tree.html.twig',
+ 'menu-local-task.html.twig',
+ 'book-navigation.html.twig',
+ 'breadcrumb.html.twig',
+ 'toolbar.html.twig',
+ 'comment.html.twig',
+ 'node.html.twig',
+ 'taxonomy-term.html.twig',
+ 'media-embed-error.html.twig',
+ 'book-node-export-html.html.twig',
+ 'links--node.html.twig',
+ 'page-title.html.twig',
+ 'search-result.html.twig',
+ 'aggregator-item.html.twig',
+ 'media.html.twig',
+ 'mark.html.twig',
+ 'forum-submitted.html.twig',
+ 'username.html.twig',
+ 'user.html.twig',
+ 'time.html.twig',
+ 'image.html.twig',
+ 'field--text.html.twig',
+ 'field--text-long.html.twig',
+ 'file-audio.html.twig',
+ 'field--comment.html.twig',
+ 'link-formatter-link-separate.html.twig',
+ 'field.html.twig',
+ 'file-link.html.twig',
+ 'field--text-with-summary.html.twig',
+ 'field--node--uid.html.twig',
+ 'field--node--title.html.twig',
+ 'field--node--created.html.twig',
+ 'file-video.html.twig',
+ 'links--media-library-menu.html.twig',
+ 'media--media-library.html.twig',
+ 'container--media-library-content.html.twig',
+ 'media-library-item--small.html.twig',
+ 'container--media-library-widget-selection.html.twig',
+ 'media-library-wrapper.html.twig',
+ 'media-library-item.html.twig',
+ 'views-mini-pager.html.twig',
+ 'views-exposed-form.html.twig',
+ 'views-view-grouping.html.twig',
+ 'views-view-summary.html.twig',
+ 'views-view-table.html.twig',
+ 'views-view-row-rss.html.twig',
+ 'views-view-summary-unformatted.html.twig',
+ 'views-view.html.twig',
+ 'block--system-branding-block.html.twig',
+ 'block--search-form-block.html.twig',
+ 'block.html.twig',
+ 'block--system-menu-block.html.twig',
+ 'block--local-tasks-block.html.twig',
+ ],
+ ],
+ ],
+ // Will be populated when Classy libraries are copied to Bartik.
+ 'bartik' => [
+ 'theme-name' => 'bartik',
+ 'path-replace' => '../../../../../',
+ 'filenames' => [
+ 'css' => [
+ 'media-library.css',
+ 'action-links.css',
+ 'file.css',
+ 'dropbutton.css',
+ 'book-navigation.css',
+ 'tableselect.css',
+ 'ui-dialog.css',
+ 'user.css',
+ 'item-list.css',
+ 'image-widget.css',
+ 'field.css',
+ 'tablesort.css',
+ 'tabs.css',
+ 'forum.css',
+ 'progress.css',
+ 'collapse-processed.css',
+ 'details.css',
+ 'inline-form.css',
+ 'link.css',
+ 'textarea.css',
+ 'links.css',
+ 'form.css',
+ 'exposed-filters.css',
+ 'tabledrag.css',
+ 'indented.css',
+ 'messages.css',
+ 'pager.css',
+ 'search-results.css',
+ 'button.css',
+ 'node.css',
+ 'dialog.css',
+ 'menu.css',
+ 'icons.css',
+ 'breadcrumb.css',
+ 'media-embed-error.css',
+ 'container-inline.css',
+ 'more-link.css',
+ ],
+ 'js' => [
+ 'media_embed_ckeditor.theme.es6.js',
+ 'media_embed_ckeditor.theme.js',
+ ],
+ 'images' => [
+ 'application-octet-stream.png',
+ 'application-pdf.png',
+ 'application-x-executable.png',
+ 'audio-x-generic.png',
+ 'forum-icons.png',
+ 'image-x-generic.png',
+ 'package-x-generic.png',
+ 'text-html.png',
+ 'text-plain.png',
+ 'text-x-generic.png',
+ 'text-x-script.png',
+ 'video-x-generic.png',
+ 'x-office-document.png',
+ 'x-office-presentation.png',
+ 'x-office-spreadsheet.png',
+ ],
+ 'templates' => [
+ 'node-edit-form.html.twig',
+ 'image-widget.html.twig',
+ 'node-add-list.html.twig',
+ 'filter-guidelines.html.twig',
+ 'filter-tips.html.twig',
+ 'file-managed-file.html.twig',
+ 'text-format-wrapper.html.twig',
+ 'filter-caption.html.twig',
+ 'rdf-metadata.html.twig',
+ 'help-section.html.twig',
+ 'progress-bar.html.twig',
+ 'form-element-label.html.twig',
+ 'datetime-wrapper.html.twig',
+ 'fieldset.html.twig',
+ 'datetime-form.html.twig',
+ 'textarea.html.twig',
+ 'details.html.twig',
+ 'form-element.html.twig',
+ 'radios.html.twig',
+ 'item-list.html.twig',
+ 'aggregator-feed.html.twig',
+ 'item-list--search-results.html.twig',
+ 'table.html.twig',
+ 'forum-list.html.twig',
+ 'forum-icon.html.twig',
+ 'forums.html.twig',
+ 'book-export-html.html.twig',
+ 'html.html.twig',
+ 'region.html.twig',
+ 'menu.html.twig',
+ 'book-all-books-block.html.twig',
+ 'book-tree.html.twig',
+ 'menu-local-task.html.twig',
+ 'book-navigation.html.twig',
+ 'breadcrumb.html.twig',
+ 'toolbar.html.twig',
+ 'menu-local-tasks.html.twig',
+ 'taxonomy-term.html.twig',
+ 'media-embed-error.html.twig',
+ 'book-node-export-html.html.twig',
+ 'links--node.html.twig',
+ 'search-result.html.twig',
+ 'aggregator-item.html.twig',
+ 'media.html.twig',
+ 'mark.html.twig',
+ 'forum-submitted.html.twig',
+ 'username.html.twig',
+ 'user.html.twig',
+ 'time.html.twig',
+ 'image.html.twig',
+ 'field--text.html.twig',
+ 'field--text-long.html.twig',
+ 'file-audio.html.twig',
+ 'field--comment.html.twig',
+ 'link-formatter-link-separate.html.twig',
+ 'field.html.twig',
+ 'file-link.html.twig',
+ 'field--text-with-summary.html.twig',
+ 'field--node--uid.html.twig',
+ 'field--node--title.html.twig',
+ 'field--node--created.html.twig',
+ 'file-video.html.twig',
+ 'links--media-library-menu.html.twig',
+ 'media--media-library.html.twig',
+ 'views-view-unformatted--media-library.html.twig',
+ 'container--media-library-content.html.twig',
+ 'media-library-item--small.html.twig',
+ 'container--media-library-widget-selection.html.twig',
+ 'media-library-wrapper.html.twig',
+ 'media-library-item.html.twig',
+ 'views-mini-pager.html.twig',
+ 'views-exposed-form.html.twig',
+ 'views-view-grouping.html.twig',
+ 'views-view-summary.html.twig',
+ 'views-view-table.html.twig',
+ 'views-view-row-rss.html.twig',
+ 'views-view-summary-unformatted.html.twig',
+ 'views-view.html.twig',
+ 'block--local-actions-block.html.twig',
+ 'block--local-tasks-block.html.twig',
+ ],
+ ],
+ ],
+ ];
+ }
+
+ /**
+ * Gets the hash of a Classy asset.
+ *
+ * @param string $type
+ * The asset type.
+ * @param string $file
+ * The asset filename.
+ *
+ * @return string
+ * A hash for the file.
+ */
+ protected function getClassyHash($type, $file) {
+ static $hashes = [
+ 'css' => [
+ 'action-links.css' => '6abb88c2b3b6884c1a64fa5ca4853d45',
+ 'book-navigation.css' => 'e8219368d360bd4a10763610ada85a1c',
+ 'breadcrumb.css' => '14268f8071dffd40ce7a39862b8fbc56',
+ 'button.css' => '3abebf58e144fd4150d80facdbe5d10f',
+ 'collapse-processed.css' => 'e928df55485662a4499c9ba12def22e6',
+ 'container-inline.css' => 'ae9caee6071b319ac97bf0bb3e14b542',
+ 'details.css' => 'fdd0606ea856072f5e6a19ab1a2e850e',
+ 'dialog.css' => 'f30e4423380f5f01d02ef0a93e010c53',
+ 'dropbutton.css' => 'f8e4b0b81ff60206b27f622e85a6a0ee',
+ 'exposed-filters.css' => '396a5f76dafec5f78f4e736f69a0874f',
+ 'field.css' => '8f4718bc926eea7e007ecfd6f410ee8d',
+ 'file.css' => '7f36f62ca67c57a82f9d9e882918a01b',
+ 'form.css' => 'a8733b00eebffbc3293779cb779c808e',
+ 'forum.css' => '8aad2d86dfd29818e991757581cd7ab8',
+ 'icons.css' => '56f623bd343b9bc7e7ac3e3e95d7f3ce',
+ 'image-widget.css' => '2da54829199f64a2c390930c3b0913a3',
+ 'indented.css' => '48e214a106d9fede1e05aa10b4796361',
+ 'inline-form.css' => 'cc5cbfd34511d9021a53ec693c110740',
+ 'item-list.css' => '1d519afe6007f4b01e00f22b0ba8bf33',
+ 'link.css' => '22f42d430fe458080a7739c70a2d2ea5',
+ 'links.css' => '21fe64349f5702cd5b89104a1d3b9cd3',
+ 'media-embed-error.css' => 'ab7f4c91f7b312122d30d7e09bb1bcc4',
+ 'media-library.css' => 'bb405519d30970c721405452dfb7b38e',
+ 'menu.css' => 'c4608b4ac9aafce1f6e0d21c6e6e6ee8',
+ 'messages.css' => '2930ea9bebf4d1658e9bdc3b1f83bd43',
+ 'more-link.css' => 'b2ebfb826e035334340193b42246b180',
+ 'node.css' => '81ea0a3fef211dbc32549ac7f39ec646',
+ 'pager.css' => 'd10589366720f9c15b66df434baab4da',
+ 'progress.css' => '5147a9b07ede9f456c6a3f3efeb520e1',
+ 'search-results.css' => 'ce3ca8fcd54e72f142ba29da5a3a5c9a',
+ 'tabledrag.css' => '98d24ff864c7699dfa6da9190c5e70df',
+ 'tableselect.css' => '8e966ac85a0cc60f470717410640c8fe',
+ 'tablesort.css' => 'f6ed3b44832bebffa09fc3b4b6ce27ab',
+ 'tabs.css' => 'e58827db5c767c41b67488244c14056c',
+ 'textarea.css' => '2bc390c137c5205bbcd7645d6c1c86de',
+ 'ui-dialog.css' => '4a3d036007ba8c8c80f4a21a369c72cc',
+ 'user.css' => '0ec6acc22567a7c9c228f04b5a97c711',
+ ],
+ 'js' => [
+ 'media_embed_ckeditor.theme.es6.js' => 'decf95c314bf22c642fb630179502e43',
+ 'media_embed_ckeditor.theme.js' => '1b17d61e258c4fdaa129acecf773f04e',
+ ],
+ 'images' => [
+ 'application-octet-stream.png' => 'fef73511632890590b5ae0a13c99e4bf',
+ 'application-pdf.png' => 'bb41f8b679b9d93323b30c87fde14de9',
+ 'application-x-executable.png' => 'fef73511632890590b5ae0a13c99e4bf',
+ 'audio-x-generic.png' => 'f7d0e6fbcde58594bd1102db95e3ea7b',
+ 'forum-icons.png' => 'dfa091b192819cc14523ccd653e7b5ff',
+ 'image-x-generic.png' => '9aca2e02c3cdbb391ca721d40fa4c0c6',
+ 'package-x-generic.png' => 'bb8581301a2030b48ff3c67374eed88a',
+ 'text-html.png' => '9d2d3003a786ab392d42744b2d064eec',
+ 'text-plain.png' => '1b769df473f54d6f78f7aba79ec25e12',
+ 'text-x-generic.png' => '1b769df473f54d6f78f7aba79ec25e12',
+ 'text-x-script.png' => 'f9dc156d35298536011ea48226b21682',
+ 'video-x-generic.png' => 'a5dc89b884a8a1b666c15bb41fd88ee9',
+ 'x-office-document.png' => '48e0c92b5dec1a027f43a5c6fe190f39',
+ 'x-office-presentation.png' => '8ba9f51c97a2b47de2c8c117aafd7dcd',
+ 'x-office-spreadsheet.png' => 'fc5d4b32f259ea6d0f960b17a0886f63',
+ ],
+ 'templates' => [
+ 'node-edit-form.html.twig' => '62333c862703b199fe339677ce6783ac',
+ 'file-widget-multiple.html.twig' => '93425e782dabe54b88b1516dc681f9ce',
+ 'image-widget.html.twig' => '03d1151c7e99999174a0113d21375372',
+ 'file-upload-help.html.twig' => 'd8fcf1f79c4eff6c89539c17d03c4731',
+ 'node-add-list.html.twig' => '43cef03ea415399b8e51e2e363479702',
+ 'filter-guidelines.html.twig' => '250f9abf18cfc45f174d994dc505585b',
+ 'filter-tips.html.twig' => 'fefcab317b602cbfe7f608bc481be889',
+ 'file-managed-file.html.twig' => 'ee735232c3d782f09178bc56df8f89b1',
+ 'text-format-wrapper.html.twig' => '9b9f43cee239648f0c6966c68fc4d72e',
+ 'filter-caption.html.twig' => '7cc9ce9634332604bd3a565af2ef0cd5',
+ 'rdf-metadata.html.twig' => 'ebf2c20050b6a89b04168ce66d0a55dc',
+ 'help-section.html.twig' => '4f98fbb266cf9069a4604049c848a4c2',
+ 'progress-bar.html.twig' => 'ad07ee846d10bb46eb71d4c81d5bce75',
+ 'status-messages.html.twig' => '5c8403daec6d92b35407a893c04a6a36',
+ 'container.html.twig' => 'd88ec99c466a11fa9b83e3594675cc9a',
+ 'input.html.twig' => 'b844ef5f74df3058bd6ff9ec024d907b',
+ 'form-element-label.html.twig' => '21026361fa9ba15ccdc823d6bb00a6d9',
+ 'datetime-wrapper.html.twig' => '765aa519f7e4ae36ee4726ae2633de6d',
+ 'fieldset.html.twig' => 'c22ed7e50177391f1fc4b1fbacc8a211',
+ 'form.html.twig' => '0767ff441543553d51443b970c4b736b',
+ 'datetime-form.html.twig' => '649c36a2900c556b8a1385c1fa755281',
+ 'checkboxes.html.twig' => 'a5faa5fdd7de4aa42045753db65ffb0b',
+ 'textarea.html.twig' => '4a583e6afa9c04ed6a7b2a36ba172f16',
+ 'field-multiple-value-form.html.twig' => '152e4e8b944d093742f5a1c3ce65b28b',
+ 'dropbutton-wrapper.html.twig' => 'd349b4afba06abbffd0156de86e0f85a',
+ 'details.html.twig' => 'ac7d9de69428a0a04933775d1cfd78c6',
+ 'select.html.twig' => '55dd565c1705008ba490ef26e2f8da89',
+ 'form-element.html.twig' => '0dbef99d7eb04f81f38af1dd5c0954a0',
+ 'confirm-form.html.twig' => '12f6086c3742ef59e1b25b0cadc1f890',
+ 'radios.html.twig' => 'd938c3dd61fc99b79cf4f07ad673ee83',
+ 'item-list.html.twig' => '869d9d6a7c79844b69e88a622eb1e4b1',
+ 'aggregator-feed.html.twig' => 'b9c4dc3b384bca32041edf63c598e197',
+ 'item-list--search-results.html.twig' => 'fe10f094b0caff314d63842bd332cfb3',
+ 'table.html.twig' => '8a3c6dc67452ec6372d56cfb496c711d',
+ 'forum-list.html.twig' => '62bf16f84cc75748df38a6721f9c6315',
+ 'forum-icon.html.twig' => 'ad4bb2036adf04888e0bf82dfd93890e',
+ 'forums.html.twig' => '0a46228fa1f90089dfc67e7fe4c6690b',
+ 'page.html.twig' => '14210892625e61cb8570cda6a3a932ce',
+ 'maintenance-page.html.twig' => '627dd51c95d2930844c584a385eff3c5',
+ 'book-export-html.html.twig' => '6837d66ac7ff4125175f13c8ab0039ff',
+ 'html.html.twig' => '7bc0366efb52d727aa6fb48d4d3d75fb',
+ 'region.html.twig' => 'b1c621b93e5ab7334151fe31d4c163a8',
+ 'menu.html.twig' => 'a85f0d836f62a4a2834934b15b5cc4f3',
+ 'book-all-books-block.html.twig' => '7210413d32aafa0c5413f1c29b9a87cc',
+ 'book-tree.html.twig' => '027a2d9aa9d8e13afeb87b2f830f4339',
+ 'links.html.twig' => '158ded06d80f3071b051a3263d9bdeac',
+ 'vertical-tabs.html.twig' => 'cccdb9b454f5befdfedfc629a6a51e4d',
+ 'pager.html.twig' => '3ad3ad68fa70d7f6b69676d1e28b0338',
+ 'menu-local-task.html.twig' => 'eb20b3b773365137893f25e31a9768e3',
+ 'book-navigation.html.twig' => '6ecc18ab554936f9e3b4cadd92a94d66',
+ 'breadcrumb.html.twig' => '3de826e26e00fbe1a661b1f64d4c45d0',
+ 'menu-local-action.html.twig' => 'ff1dfb632b6235a304146aaeaa49c3ca',
+ 'toolbar.html.twig' => '6fd28ccf2041c0f8ed8bb7924f307b41',
+ 'menu-local-tasks.html.twig' => 'ab94198d8dba71464c647aca349dcfd3',
+ 'comment.html.twig' => '68718b6de9a0d21f5180a9fbcc40987f',
+ 'node.html.twig' => '48526d497ead869ec3a78d83787c0311',
+ 'taxonomy-term.html.twig' => '63e39620cd877c85297914fef61930de',
+ 'media-embed-error.html.twig' => '83621141a91e525cd4df15c1d93b58b2',
+ 'book-node-export-html.html.twig' => 'e3f896d5f4f69c28256807fb57382eb5',
+ 'links--node.html.twig' => '746362f23d45654540368b963e6b9feb',
+ 'page-title.html.twig' => '73e9f3f4933b1a1b789db6e4a6556355',
+ 'search-result.html.twig' => '5676e5f62d82fcb1a2588da2197d1455',
+ 'aggregator-item.html.twig' => '5d1d474391f1f1cce4731b5b33e04df4',
+ 'media.html.twig' => 'ba8a5c1035a7d9f958d6bb16ea862a74',
+ 'mark.html.twig' => '8a162708ce2ca9c3fc272daf4a92897e',
+ 'forum-submitted.html.twig' => '9566e863a16db23a76ec3e289e16fa47',
+ 'username.html.twig' => '92ebba7253772a4389c76c27f7d2b0f0',
+ 'user.html.twig' => 'b265def674626cf35ac46f1bbad3e28f',
+ 'time.html.twig' => '74a5bbb48d3bce23ccab80993e1d04c1',
+ 'image.html.twig' => 'b8dd5d5b7e1bf594f85411f28eb29440',
+ 'field--text.html.twig' => '4cb76e10e41ccf0b7cf350be600853c5',
+ 'field--text-long.html.twig' => '898425e3da212ed81ff01c7b624033fd',
+ 'file-audio.html.twig' => '2dec3e01acc93858bdad64ccac1d0fc1',
+ 'field--comment.html.twig' => 'c116dc85a39418301a676b9138a8d697',
+ 'link-formatter-link-separate.html.twig' => 'a4d8639d22d93d447418f6fbf2dfb912',
+ 'field.html.twig' => '4da82841bf83d728ed2f3757de7402fb',
+ 'file-link.html.twig' => '0f10f3e79ecb9b6e82ef30c66e4ebcc6',
+ 'field--text-with-summary.html.twig' => '898425e3da212ed81ff01c7b624033fd',
+ 'field--node--uid.html.twig' => 'eec25d4a07d3447ba012a1f6bf8c2cea',
+ 'field--node--title.html.twig' => 'bd618d16c576614d2f2c6d3e60315559',
+ 'image-style.html.twig' => '6d2588a4453ed014601f66cd45baf00f',
+ 'field--node--created.html.twig' => '7a33b0533f7bd12cc81af52f4151cb7c',
+ 'image-formatter.html.twig' => '9bc966dd2fe1a913cd7a89fbd243d947',
+ 'file-video.html.twig' => '9f58b817bf059a86300d2757c76f0d97',
+ 'links--media-library-menu.html.twig' => '31f4f0f507af5dde490e9a992fa89db6',
+ 'media--media-library.html.twig' => '72a2af7f2f0ac3013f0a20f887e4d48a',
+ 'views-view-unformatted--media-library.html.twig' => '4071005d8fac358614742983d77940a2',
+ 'container--media-library-content.html.twig' => 'dede085892e5039aefb3c2cc2dc2074b',
+ 'media-library-item--small.html.twig' => 'e45cfe56961b3419feb8008a5abb7357',
+ 'container--media-library-widget-selection.html.twig' => '70759ddf4d23f5cdd7ef62f3d3e0eda0',
+ 'media-library-wrapper.html.twig' => '3ca8cd32767c043cd376f8de42b70611',
+ 'media-library-item.html.twig' => '278c18d4f6ec1651a408a1fce3ec70a5',
+ 'views-mini-pager.html.twig' => '92f8935c78df8c61ba1bb03c34e305a8',
+ 'views-view-row-opml.html.twig' => 'defbd7edeff60ebb16a06414ef13db06',
+ 'views-exposed-form.html.twig' => 'd88119f917c62e0caa75ca0becc8c327',
+ 'views-view-grouping.html.twig' => 'e766e383b51511b86fc0815c94167c18',
+ 'views-view-summary.html.twig' => '38639cb9e815e387782b126cb613bb40',
+ 'views-view-table.html.twig' => '206e53d257651ea8b0eead68888878c0',
+ 'views-view-list.html.twig' => '7480144ffa90384ad2c3162f03ad042f',
+ 'views-view-unformatted.html.twig' => 'b2faf1bd77678dba68e1e6bb05c3a219',
+ 'views-view-row-rss.html.twig' => '0721785e0471ca23bbed6358dde0df68',
+ 'views-view-mapping-test.html.twig' => '818431786e1d19df33cecccad98d5a22',
+ 'views-view-opml.html.twig' => '4ab17668908dcd4af75d35f891f97fff',
+ 'views-view-summary-unformatted.html.twig' => '76f6e5882aa7fe6bc0440b66e85a0a6c',
+ 'views-view.html.twig' => 'd20ba03bc36703828bb7651baa15f28f',
+ 'views-view-grid.html.twig' => '8f4ea66bf949530d31a79a44f3d87650',
+ 'views-view-rss.html.twig' => 'f4e49d0d8df01019245c51ff2a4259c2',
+ 'block--system-branding-block.html.twig' => '73f89a493071e67c6ed3d17fff8e3a95',
+ 'block--search-form-block.html.twig' => '7fef4c274e4487ba887fdeaa41acb5ca',
+ 'block.html.twig' => '9b68163e596c63921119ff8f20c6f157',
+ 'block--local-actions-block.html.twig' => '6afe8adb14d3f37ec374400fecd5b809',
+ 'block--system-menu-block.html.twig' => '242f41ff8a0f71bbccece61bf8e29e2f',
+ 'block--local-tasks-block.html.twig' => 'd462897ef5c9b6935ce801de122bce30',
+ ],
+ ];
+ $this->assertArrayHasKey($type, $hashes);
+ $this->assertArrayHasKey($file, $hashes[$type]);
+ return $hashes[$type][$file];
+ }
+
+}
diff --git a/web/core/tests/Drupal/KernelTests/Core/Theme/RegistryLegacyTest.php b/web/core/tests/Drupal/KernelTests/Core/Theme/RegistryLegacyTest.php
new file mode 100644
index 0000000000..6616495c76
--- /dev/null
+++ b/web/core/tests/Drupal/KernelTests/Core/Theme/RegistryLegacyTest.php
@@ -0,0 +1,70 @@
+<?php
+
+namespace Drupal\KernelTests\Core\Theme;
+
+use Drupal\Core\Theme\Registry;
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests legacy behavior of the ThemeRegistry class.
+ *
+ * @group Theme
+ * @group legacy
+ *
+ * @todo Remove in https://www.drupal.org/project/drupal/issues/3097889
+ */
+class RegistryLegacyTest extends KernelTestBase {
+
+ /**
+ * Modules to enable.
+ *
+ * @var array
+ */
+ public static $modules = ['theme_test', 'system'];
+
+ protected $profile = 'testing';
+
+ /**
+ * Tests the theme registry with theme functions and multiple subthemes.
+ *
+ * @expectedDeprecation Theme functions are deprecated in drupal:8.0.0 and are removed from drupal:10.0.0. Use Twig templates instead of theme_theme_test(). See https://www.drupal.org/node/1831138
+ */
+ public function testMultipleSubThemes() {
+ $theme_handler = \Drupal::service('theme_handler');
+ \Drupal::service('module_installer')->install(['theme_legacy_test']);
+ \Drupal::service('theme_installer')->install(['test_basetheme']);
+
+ $registry_base_theme = new Registry($this->root, \Drupal::cache(), \Drupal::lock(), \Drupal::moduleHandler(), $theme_handler, \Drupal::service('theme.initialization'), 'test_basetheme');
+ $registry_base_theme->setThemeManager(\Drupal::theme());
+
+ $preprocess_functions = $registry_base_theme->get()['theme_test_function_suggestions']['preprocess functions'];
+ $this->assertSame([
+ 'template_preprocess_theme_test_function_suggestions',
+ 'test_basetheme_preprocess_theme_test_function_suggestions',
+ ], $preprocess_functions, "Theme functions don't have template_preprocess but do have template_preprocess_HOOK");
+ }
+
+ /**
+ * Tests the theme registry with theme functions with suggestions.
+ *
+ * @expectedDeprecation Theme functions are deprecated in drupal:8.0.0 and are removed from drupal:10.0.0. Use Twig templates instead of test_legacy_theme_theme_test_preprocess_suggestions__kitten__meerkat(). See https://www.drupal.org/node/1831138
+ */
+ public function testSuggestionPreprocessFunctions() {
+ $theme_handler = \Drupal::service('theme_handler');
+ \Drupal::service('theme_installer')->install(['test_legacy_theme']);
+
+ $registry_deprecated_theme = new Registry($this->root, \Drupal::cache(), \Drupal::lock(), \Drupal::moduleHandler(), $theme_handler, \Drupal::service('theme.initialization'), 'test_legacy_theme');
+ $registry_deprecated_theme->setThemeManager(\Drupal::theme());
+
+ $expected_preprocess_functions = [
+ 'template_preprocess',
+ 'theme_test_preprocess_theme_test_preprocess_suggestions',
+ 'test_theme_preprocess_theme_test_preprocess_suggestions',
+ 'test_theme_preprocess_theme_test_preprocess_suggestions__kitten',
+ ];
+
+ $preprocess_functions = $registry_deprecated_theme->get()['theme_test_preprocess_suggestions__kitten__meerkat']['preprocess functions'];
+ $this->assertSame($expected_preprocess_functions, $preprocess_functions, 'Suggestion implemented as a function correctly inherits preprocess functions.');
+ }
+
+}
diff --git a/web/core/tests/Drupal/KernelTests/Core/Theme/RegistryTest.php b/web/core/tests/Drupal/KernelTests/Core/Theme/RegistryTest.php
index 41f028336b..bfc693f32d 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Theme/RegistryTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Theme/RegistryTest.php
@@ -97,12 +97,6 @@ public function testMultipleSubThemes() {
'template_preprocess',
'test_basetheme_preprocess_theme_test_template_test',
], $preprocess_functions);
-
- $preprocess_functions = $registry_base_theme->get()['theme_test_function_suggestions']['preprocess functions'];
- $this->assertSame([
- 'template_preprocess_theme_test_function_suggestions',
- 'test_basetheme_preprocess_theme_test_function_suggestions',
- ], $preprocess_functions, "Theme functions don't have template_preprocess but do have template_preprocess_HOOK");
}
/**
@@ -136,9 +130,6 @@ public function testSuggestionPreprocessFunctions() {
'test_theme_preprocess_theme_test_preprocess_suggestions__kitten',
];
- $preprocess_functions = $registry_theme->get()['theme_test_preprocess_suggestions__kitten__meerkat']['preprocess functions'];
- $this->assertSame($expected_preprocess_functions, $preprocess_functions, 'Suggestion implemented as a function correctly inherits preprocess functions.');
-
$preprocess_functions = $registry_theme->get()['theme_test_preprocess_suggestions__kitten__bearcat']['preprocess functions'];
$this->assertSame($expected_preprocess_functions, $preprocess_functions, 'Suggestion implemented as a template correctly inherits preprocess functions.');
diff --git a/web/core/tests/Drupal/KernelTests/Core/Theme/ThemeInstallerTest.php b/web/core/tests/Drupal/KernelTests/Core/Theme/ThemeInstallerTest.php
index c8dd0337a8..13c7aa2826 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Theme/ThemeInstallerTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Theme/ThemeInstallerTest.php
@@ -4,6 +4,8 @@
use Drupal\Core\DependencyInjection\ContainerBuilder;
use Drupal\Core\Extension\ExtensionNameLengthException;
+use Drupal\Core\Extension\MissingDependencyException;
+use Drupal\Core\Extension\ModuleUninstallValidatorException;
use Drupal\Core\Extension\Exception\UnknownExtensionException;
use Drupal\KernelTests\KernelTestBase;
@@ -137,6 +139,79 @@ public function testInstallNameTooLong() {
}
}
+ /**
+ * Tests installing a theme with unmet module dependencies.
+ *
+ * @dataProvider providerTestInstallThemeWithUnmetModuleDependencies
+ */
+ public function testInstallThemeWithUnmetModuleDependencies($theme_name, $installed_modules, $message) {
+ $this->container->get('module_installer')->install($installed_modules);
+ $themes = $this->themeHandler()->listInfo();
+ $this->assertEmpty($themes);
+ $this->expectException(MissingDependencyException::class);
+ $this->expectExceptionMessage($message);
+ $this->themeInstaller()->install([$theme_name]);
+ }
+
+ /**
+ * Data provider for testInstallThemeWithUnmetModuleDependencies().
+ */
+ public function providerTestInstallThemeWithUnmetModuleDependencies() {
+ return [
+ 'theme with uninstalled module dependencies' => [
+ 'test_theme_depending_on_modules',
+ [],
+ "Unable to install theme: 'test_theme_depending_on_modules' due to unmet module dependencies: 'test_module_required_by_theme, test_another_module_required_by_theme'.",
+ ],
+ 'theme with a base theme with uninstalled module dependencies' => [
+ 'test_theme_with_a_base_theme_depending_on_modules',
+ [],
+ "Unable to install theme: 'test_theme_with_a_base_theme_depending_on_modules' due to unmet module dependencies: 'test_module_required_by_theme, test_another_module_required_by_theme'.",
+ ],
+ 'theme and base theme have uninstalled module dependencies' => [
+ 'test_theme_mixed_module_dependencies',
+ [],
+ "Unable to install theme: 'test_theme_mixed_module_dependencies' due to unmet module dependencies: 'help, test_module_required_by_theme, test_another_module_required_by_theme'.",
+ ],
+ 'theme with already installed module dependencies, base theme module dependencies are not installed' => [
+ 'test_theme_mixed_module_dependencies',
+ ['help'],
+ "Unable to install theme: 'test_theme_mixed_module_dependencies' due to unmet module dependencies: 'test_module_required_by_theme, test_another_module_required_by_theme'.",
+ ],
+ 'theme with module dependencies not installed, base theme module dependencies are already installed, ' => [
+ 'test_theme_mixed_module_dependencies',
+ ['test_module_required_by_theme', 'test_another_module_required_by_theme'],
+ "Unable to install theme: 'test_theme_mixed_module_dependencies' due to unmet module dependencies: 'help'.",
+ ],
+ 'theme depending on a module that does not exist' => [
+ 'test_theme_depending_on_nonexisting_module',
+ [],
+ "Unable to install theme: 'test_theme_depending_on_nonexisting_module' due to unmet module dependencies: 'test_module_non_existing",
+ ],
+ 'theme depending on an installed but incompatible module' => [
+ 'test_theme_depending_on_constrained_modules',
+ ['test_module_compatible_constraint', 'test_module_incompatible_constraint'],
+ "Unable to install theme: Test Module Theme Depends on with Incompatible Constraint (>=8.x-2.x) (incompatible with version 8.x-1.8)",
+ ],
+ ];
+ }
+
+ /**
+ * Tests installing a theme with module dependencies that are met.
+ */
+ public function testInstallThemeWithMetModuleDependencies() {
+ $name = 'test_theme_depending_on_modules';
+ $themes = $this->themeHandler()->listInfo();
+ $this->assertArrayNotHasKey($name, $themes);
+ $this->container->get('module_installer')->install(['test_module_required_by_theme', 'test_another_module_required_by_theme']);
+ $this->themeInstaller()->install([$name]);
+ $themes = $this->themeHandler()->listInfo();
+ $this->assertArrayHasKey($name, $themes);
+ $this->expectException(ModuleUninstallValidatorException::class);
+ $this->expectExceptionMessage('The following reasons prevent the modules from being uninstalled: Required by the theme: Test Theme Depending on Modules');
+ $this->container->get('module_installer')->uninstall(['test_module_required_by_theme']);
+ }
+
/**
* Tests uninstalling the default theme.
*/
diff --git a/web/core/tests/Drupal/KernelTests/Core/Theme/ThemeNotUsingClassyLibraryTest.php b/web/core/tests/Drupal/KernelTests/Core/Theme/ThemeNotUsingClassyLibraryTest.php
new file mode 100644
index 0000000000..290c2ab9c0
--- /dev/null
+++ b/web/core/tests/Drupal/KernelTests/Core/Theme/ThemeNotUsingClassyLibraryTest.php
@@ -0,0 +1,447 @@
+<?php
+
+namespace Drupal\KernelTests\Core\Theme;
+
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests that themes do not depend on Classy libraries.
+ *
+ * These tests exist to facilitate the process of decoupling theme from Classy.
+ * The decoupling process includes replacing the use of all Classy libraries
+ * with theme-specific ones. These tests ensure these replacements are properly
+ * implemented.
+ *
+ * @group Theme
+ */
+class ThemeNotUsingClassyLibraryTest extends KernelTestBase {
+
+ /**
+ * The theme initialization.
+ *
+ * @var \Drupal\Core\Theme\ThemeInitializationInterface
+ */
+ protected $themeInitialization;
+
+ /**
+ * The library discovery service.
+ *
+ * @var \Drupal\Core\Asset\LibraryDiscoveryInterface
+ */
+ protected $libraryDiscovery;
+
+ /**
+ * The theme handler.
+ *
+ * @var \Drupal\Core\Extension\ThemeHandlerInterface
+ */
+ protected $themeHandler;
+
+ /**
+ * Classy's libraries.
+ *
+ * These are the libraries defined in classy.libraries.yml.
+ *
+ * @var string[][]
+ *
+ * @see \Drupal\Core\Asset\LibraryDiscoveryInterface::getLibrariesByExtension()
+ */
+ protected $classyLibraries;
+
+ /**
+ * Libraries that Classy extends.
+ *
+ * These are the libraries listed in `libraries-extend` in classy.info.yml.
+ *
+ * @var string[][]
+ */
+ protected $classyLibrariesExtend;
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function setUp() {
+ parent::setUp();
+
+ $this->themeInitialization = $this->container->get('theme.initialization');
+ $this->libraryDiscovery = $this->container->get('library.discovery');
+ $this->themeHandler = $this->container->get('theme_handler');
+ $this->container->get('theme_installer')->install([
+ 'umami',
+ 'bartik',
+ 'seven',
+ 'claro',
+ ]);
+ $this->classyLibraries = $this->libraryDiscovery->getLibrariesByExtension('classy');
+ $this->assertNotEmpty($this->classyLibraries);
+ $this->classyLibrariesExtend = $this->themeHandler->getTheme('classy')->info['libraries-extend'];
+ $this->assertNotEmpty($this->classyLibrariesExtend);
+ }
+
+ /**
+ * Ensures that a theme is decoupled from Classy libraries.
+ *
+ * This confirms that none of the libraries defined in classy.libraries.yml
+ * are loaded by the current theme. For this to happen, the current theme
+ * must override the Classy library so no assets from Classy are loaded.
+ *
+ * @param string $theme
+ * The theme being tested.
+ * @param string[] $libraries_to_skip
+ * Libraries excluded from the test.
+ *
+ * @dataProvider providerTestThemeNotUsingClassyLibraries
+ */
+ public function testThemeNotUsingClassyLibraries($theme, array $libraries_to_skip) {
+ // In some cases an overridden Classy library does not use any copied assets
+ // from Classy. This array collects those so this test knows to skip
+ // assertions specific to those copied assets.
+ $skip_asset_matching_assertions = [];
+ $theme_path = $this->themeHandler->getTheme($theme)->getPath();
+
+ // A list of all libraries that the current theme is overriding. In a
+ // theme's info.yml file, these are the libraries listed in
+ // `libraries-override:`, and are libraries altered by the current theme.
+ // This will be used for confirming that all of Classy's libraries are
+ // overridden.
+ $theme_library_overrides = $this->themeInitialization->getActiveThemeByName($theme)->getLibrariesOverride()[$theme_path] ?? [];
+
+ // A list of all libraries created by the current theme.
+ $theme_libraries = $this->libraryDiscovery->getLibrariesByExtension($theme);
+ $this->assertNotEmpty($theme_libraries);
+
+ // Loop through all libraries overridden by the theme. For those that are
+ // Classy libraries, confirm that the overrides prevent the loading of any
+ // Classy asset.
+ foreach ($theme_library_overrides as $library_name => $library_definition) {
+ $in_skip_list = in_array(str_replace('classy/', '', $library_name), $libraries_to_skip);
+
+ // If the library name does not begin with `classy/`, it's not a Classy
+ // library.
+ $not_classy_library = substr($library_name, 0, 7) !== 'classy/';
+
+ // If $library_definition is false or a string, the override is preventing
+ // the Classy library from loading altogether.
+ $library_fully_replaced = $library_definition === FALSE || gettype($library_definition) === 'string';
+
+ // If the library is fully replaced, it may need to be added to the
+ // $skip_asset_matching_assertions array.
+ if ($library_fully_replaced) {
+ // Libraries with names that begin with `$theme/classy.` are copies of
+ // Classy libraries.
+ $not_copied_from_classy = gettype($library_definition) === 'string' && substr($library_definition, 0, (8 + strlen($theme))) !== "$theme/classy.";
+
+ // If the overridden library is not copied from Classy or is FALSE (i.e.
+ // not loaded at all), it is customized and should skip the tests that
+ // check for a 1:1 asset match between the Classy library and its
+ // override in the current theme.
+ if ($library_definition === FALSE || $not_copied_from_classy) {
+ $skip_asset_matching_assertions[] = $library_name;
+ }
+ }
+
+ // If any of these three conditions are true, there's no need for the
+ // remaining asset-specific assertions in this loop.
+ if ($in_skip_list || $not_classy_library || $library_fully_replaced) {
+ continue;
+ }
+
+ // If the library override has a 'css' key, some Classy CSS files may
+ // still be loading. Confirm this is not the case.
+ if (isset($library_definition['css'])) {
+ $this->confirmNoClassyAssets($library_name, $library_definition, 'css');
+
+ // If the override has no JS and all Classy CSS is accounted for, add it
+ // to the list of libraries already fully overridden. It won't be
+ // necessary to copy the library from Classy.
+ if (!isset($library_definition['js'])) {
+ $skip_asset_matching_assertions[] = $library_name;
+ }
+ }
+ if (isset($library_definition['js'])) {
+ $this->confirmNoClassyAssets($library_name, $library_definition, 'js');
+
+ // CSS has already been checked. So, if all JS in the library is
+ // accounted for, add it to the list of libraries already fully
+ // overridden. It won't be necessary to copy the library from Classy.
+ $skip_asset_matching_assertions[] = $library_name;
+ }
+ }
+
+ // Confirm that every Classy library is copied or fully overridden by the
+ // current theme.
+ foreach ($this->classyLibraries as $classy_library_name => $classy_library) {
+ // If a Classy library is in the $skip_asset_matching_assertions
+ // array, it does not use any assets copied from Classy and can skip the
+ // tests in this loop.
+ $fully_overridden = in_array("classy/$classy_library_name", $skip_asset_matching_assertions);
+ $skip = in_array($classy_library_name, $libraries_to_skip);
+ if ($skip || $fully_overridden) {
+ continue;
+ }
+ // Confirm the Classy Library is overridden so assets aren't loaded twice.
+ $this->assertArrayHasKey("classy/$classy_library_name", $theme_library_overrides, "The classy/$classy_library_name library is not overridden in $theme");
+
+ // Confirm there is a theme-specific version of the Classy library.
+ $this->assertArrayHasKey("classy.$classy_library_name", $theme_libraries, "There is not a $theme equivalent for classy/$classy_library_name");
+ $theme_copy_of_classy_library = $theme_libraries["classy.$classy_library_name"];
+
+ // If the Classy library includes CSS, confirm the theme's copy has the
+ // same CSS with the same properties.
+ if (!empty($classy_library['css'])) {
+ $this->confirmMatchingAssets($classy_library_name, $classy_library, $theme_copy_of_classy_library, $theme_path, 'css');
+ }
+
+ // If the Classy library includes JavaScript, confirm the theme's copy has
+ // the same JavaScript with the same properties.
+ if (!empty($classy_library['js'])) {
+ $this->confirmMatchingAssets($classy_library_name, $classy_library, $theme_copy_of_classy_library, $theme_path, 'js');
+ }
+ }
+ }
+
+ /**
+ * Checks for theme-specific equivalents of all Classy library-extends.
+ *
+ * Classy extends several core libraries with its own assets, these are
+ * defined in the `libraries-extend:` list in classy.info.yml. Classy adds
+ * additional assets to these libraries (e.g. when the `file/drupal.file`
+ * library loads, the assets of `classy/file` are loaded as well). For a theme
+ * to be properly decoupled from Classy's libraries, these core library
+ * extensions must become the responsibility of that theme.
+ *
+ * @param string $theme
+ * The theme being tested.
+ * @param string[] $extends_to_skip
+ * Classy library-extends excluded from the test.
+ *
+ * @dataProvider providerTestThemeAccountsForClassyExtensions
+ */
+ public function testThemeAccountsForClassyExtensions($theme, array $extends_to_skip) {
+ $theme_path = $this->themeHandler->getTheme($theme)->getPath();
+
+ // Get a list of libraries overridden by the current theme. In a theme's
+ // info.yml file, these are the libraries listed in `libraries-override:`.
+ // They are libraries altered by the current theme.
+ $theme_library_overrides = $this->themeInitialization->getActiveThemeByName($theme)->getLibrariesOverride()[$theme_path] ?? [];
+
+ // Get a list of libraries extended by the current theme. In a theme's
+ // info.yml file, these are the libraries listed in `libraries-extend:`.
+ // The current theme adds additional files to these libraries.
+ $theme_extends = $this->themeHandler->getTheme($theme)->info['libraries-extend'] ?? [];
+
+ // Some Classy libraries extend core libraries (i.e. they are not standalone
+ // libraries. Rather, they extend the functionality of existing core
+ // libraries). These extensions that were implemented in Classy need to be
+ // accounted for in the current theme by either 1) The current theme
+ // extending the core library with local copy of the Classy library 2)
+ // Overriding the core library altogether.
+ // The following iterates through each library extended by Classy to confirm
+ // that the current theme accounts for these these extensions.
+ foreach ($this->classyLibrariesExtend as $library_extended => $info) {
+ if (in_array($library_extended, $extends_to_skip)) {
+ continue;
+ }
+
+ $extends_core_library = isset($theme_extends[$library_extended]);
+ $overrides_core_library = isset($theme_library_overrides[$library_extended]);
+
+ // Every core library extended by Classy must be extended or overridden by
+ // the current theme.
+ $this->assertTrue(($extends_core_library || $overrides_core_library), "$library_extended is extended by Classy and should be extended or overridden by $theme");
+
+ // If the core library is overridden, confirm that the override does not
+ // include any Classy assets.
+ if ($overrides_core_library) {
+ $overridden_with = $theme_library_overrides[$library_extended];
+
+ // A library override variable can be one of three types:
+ // - bool (set to false): this means the override simply prevents the
+ // library from loading.
+ // - array: this means some files in the overridden library are changed,
+ // but not necessarily all of them.
+ // - string (which is what is being looked for here): this means the
+ // library is replaced with a completely different library.
+ $override_replaces_library = (gettype($overridden_with) === 'string');
+ if ($override_replaces_library) {
+ // Make sure the replacement library does not come from Classy.
+ $this->assertFalse(substr($overridden_with, 0, 7) === 'classy/', "$library_extended is replaced with $overridden_with. The replacement should not be a Classy library.");
+ }
+
+ // If the override doesn't prevent the core library from loading
+ // entirely, and it doesn't replace it with another library, each asset
+ // must be checked to confirm it isn't coming from Classy.
+ if ($overridden_with !== FALSE && !$override_replaces_library) {
+ foreach (['component', 'layout'] as $category) {
+ if (isset($overridden_with['css'][$category])) {
+ foreach ($overridden_with['css'][$category] as $css_file) {
+ $this->assertFalse(strpos($css_file, 'core/themes/classy/css'), "Override is loading a Classy asset: $css_file");
+ }
+ }
+ }
+ if (isset($overridden_with['js'])) {
+ foreach ($overridden_with['js'] as $js_file) {
+ $this->assertFalse(strpos($js_file, 'core/themes/classy/js'), "Override is loading a Classy asset: $js_file");
+ }
+ }
+ }
+ }
+
+ // If the library is extended, make sure it's not being extended with a
+ // Classy library.
+ if ($extends_core_library) {
+ foreach ($theme_extends[$library_extended] as $library) {
+ $this->assertFalse(substr($library, 0, 7) === 'classy/', "$theme is extending the core library: $library_extended with $library. Core libraries should not be extended with a Classy library.");
+ }
+ }
+ }
+ }
+
+ /**
+ * Confirms a library is not loading any Classy assets.
+ *
+ * @param string $library_name
+ * The library name.
+ * @param string[][] $library_definition
+ * The data for a library, as defined in a theme's `.libraries.yml` file.
+ * @param string $type
+ * The type of asset, either 'js' or 'css'.
+ */
+ protected function confirmNoClassyAssets($library_name, array $library_definition, $type) {
+ // Get the Classy version of the library being overridden.
+ $classy_library = $this->classyLibraries[str_replace('classy/', '', $library_name)];
+
+ // Get a list of all CSS or JS files loaded by the Classy library.
+ $files_used_in_classy_library = array_map(function ($item) {
+ return str_replace('core/themes/classy/', '', $item['data']);
+ }, $classy_library[$type]);
+
+ $files_used_by_library_override = [];
+ if ($type === 'js') {
+ foreach ($library_definition[$type] as $js_file => $options) {
+ $files_used_by_library_override[] = $js_file;
+ }
+ }
+ elseif ($type === 'css') {
+ foreach (['component', 'layout'] as $category) {
+ if (isset($library_definition[$type][$category])) {
+ foreach ($library_definition[$type][$category] as $css_file => $options) {
+ $files_used_by_library_override[] = $css_file;
+ }
+ }
+ }
+ }
+
+ $classy_files_still_loading = array_diff($files_used_in_classy_library, $files_used_by_library_override);
+ $this->assertEmpty($classy_files_still_loading, "$library_name is overridden, but the theme is still loading these files from Classy. " . print_r($classy_files_still_loading, 1));
+ }
+
+ /**
+ * Confirms that the assets of a copied Classy library match the original's.
+ *
+ * @param string $classy_library_name
+ * The name of the Classy library.
+ * @param array[] $classy_library_data
+ * The Classy library's data.
+ * @param array[] $theme_copy_of_classy_library
+ * The theme's copy of the Classy library.
+ * @param string $theme_path
+ * The path to the current theme.
+ * @param string $type
+ * The asset type, either 'js' or 'css'.
+ */
+ protected function confirmMatchingAssets($classy_library_name, array $classy_library_data, array $theme_copy_of_classy_library, $theme_path, $type) {
+ $this->assertArrayHasKey($type, $theme_copy_of_classy_library);
+ $theme_assets = [];
+ $classy_assets = [];
+
+ // Create arrays of Classy and copied assets with a structure that
+ // facilitates easy comparison.
+ foreach ($theme_copy_of_classy_library[$type] as $item) {
+ $key = str_replace("$theme_path/$type/classy/", '', $item['data']);
+ $theme_assets[$key] = $item;
+
+ // Remove the data key as it's the only one that shouldn't match.
+ unset($theme_assets[$key]['data']);
+ }
+ foreach ($classy_library_data[$type] as $item) {
+ $key = str_replace("core/themes/classy/$type/", '', $item['data']);
+ $classy_assets[$key] = $item;
+
+ // Remove the data key as it's the only one that shouldn't match.
+ unset($classy_assets[$key]['data']);
+ }
+
+ $this->assertNotEmpty($theme_assets);
+ $this->assertNotEmpty($classy_assets);
+ $this->assertEmpty(array_diff_key($theme_assets, $classy_assets), "Missing the inclusion of one or more files from classy/$classy_library_name.");
+
+ // Confirm the properties of each copied file are identical.
+ foreach ($classy_assets as $file => $properties) {
+ foreach ($properties as $property => $value) {
+ $this->assertEqual($theme_assets[$file][$property], $value, "The copied file: $file from classy/$classy_library_name has a non-matching property: $property");
+ }
+ }
+ }
+
+ /**
+ * Data provider.
+ *
+ * The to-skip arrays should become increasingly smaller as issues that
+ * remove Classy library dependencies are completed.
+ *
+ * @return array[]
+ * Themes and the libraries to be ignored.
+ */
+ public function providerTestThemeNotUsingClassyLibraries() {
+ return [
+ 'claro' => [
+ 'theme-name' => 'claro',
+ 'to-skip' => [],
+ ],
+ 'umami' => [
+ 'theme-name' => 'umami',
+ 'to-skip' => [],
+ ],
+ 'bartik' => [
+ 'theme-name' => 'bartik',
+ 'to-skip' => [],
+ ],
+ 'seven' => [
+ 'theme-name' => 'seven',
+ 'to-skip' => [],
+ ],
+ ];
+ }
+
+ /**
+ * Data provider.
+ *
+ * The to-skip arrays should become increasingly smaller as issues that
+ * remove Classy library dependencies are completed.
+ *
+ * @return array[]
+ * Themes and the extensions to be ignored.
+ */
+ public function providerTestThemeAccountsForClassyExtensions() {
+ return [
+ [
+ 'theme-name' => 'claro',
+ 'to-skip' => [],
+ ],
+ [
+ 'theme-name' => 'umami',
+ 'to-skip' => [],
+ ],
+ [
+ 'theme-name' => 'bartik',
+ 'to-skip' => [],
+ ],
+ [
+ 'theme-name' => 'seven',
+ 'to-skip' => [],
+ ],
+ ];
+ }
+
+}
diff --git a/web/core/tests/Drupal/KernelTests/Core/Theme/ThemeRenderAndAutoescapeTest.php b/web/core/tests/Drupal/KernelTests/Core/Theme/ThemeRenderAndAutoescapeTest.php
index 058669b590..13ed8bb8fa 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Theme/ThemeRenderAndAutoescapeTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Theme/ThemeRenderAndAutoescapeTest.php
@@ -53,7 +53,7 @@ public function testThemeRenderAndAutoescape($arg, $expected) {
$renderer = \Drupal::service('renderer');
$output = $renderer->executeInRenderContext($context, $theme_render_and_autoescape);
$this->assertEquals($expected, $output);
- $this->assertInternalType('string', $output);
+ $this->assertIsString($output);
}
/**
diff --git a/web/core/tests/Drupal/KernelTests/Core/Theme/ThemeSettingsTest.php b/web/core/tests/Drupal/KernelTests/Core/Theme/ThemeSettingsTest.php
index 844bc789b3..295e237d7b 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Theme/ThemeSettingsTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Theme/ThemeSettingsTest.php
@@ -44,7 +44,7 @@ protected function setUp() {
public function testDefaultConfig() {
$name = 'test_basetheme';
$path = $this->availableThemes[$name]->getPath();
- $this->assertTrue(file_exists("$path/" . InstallStorage::CONFIG_INSTALL_DIRECTORY . "/$name.settings.yml"));
+ $this->assertFileExists("$path/" . InstallStorage::CONFIG_INSTALL_DIRECTORY . "/$name.settings.yml");
$this->container->get('theme_installer')->install([$name]);
$this->assertIdentical(theme_get_setting('base', $name), 'only');
}
@@ -55,7 +55,7 @@ public function testDefaultConfig() {
public function testNoDefaultConfig() {
$name = 'stark';
$path = $this->availableThemes[$name]->getPath();
- $this->assertFalse(file_exists("$path/" . InstallStorage::CONFIG_INSTALL_DIRECTORY . "/$name.settings.yml"));
+ $this->assertFileNotExists("$path/" . InstallStorage::CONFIG_INSTALL_DIRECTORY . "/$name.settings.yml");
$this->container->get('theme_installer')->install([$name]);
$this->assertNotNull(theme_get_setting('features.favicon', $name));
}
@@ -71,7 +71,7 @@ public function testLogoConfig() {
$theme_handler = $this->container->get('theme_handler');
$theme = $theme_handler->getTheme('stark');
- // Tests default behaviour.
+ // Tests default behavior.
$expected = '/' . $theme->getPath() . '/logo.svg';
$this->assertEquals($expected, theme_get_setting('logo.url', 'stark'));
diff --git a/web/core/tests/Drupal/KernelTests/Core/Theme/ThemesNotUsingClassyTemplatesTest.php b/web/core/tests/Drupal/KernelTests/Core/Theme/ThemesNotUsingClassyTemplatesTest.php
new file mode 100644
index 0000000000..860163fd16
--- /dev/null
+++ b/web/core/tests/Drupal/KernelTests/Core/Theme/ThemesNotUsingClassyTemplatesTest.php
@@ -0,0 +1,193 @@
+<?php
+
+namespace Drupal\KernelTests\Core\Theme;
+
+use Drupal\Core\Theme\Registry;
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests that themes do not depend on Classy templates.
+ *
+ * These tests exist to facilitate the process of decoupling themes from
+ * Classy. The decoupling process includes eliminating the use of Classy
+ * templates by providing theme-specific versions of templates that would
+ * otherwise be inherited from Classy.
+ *
+ * This test can be removed once the Classy decoupling is complete, and it will
+ * fail if it is still present when Classy is removed from Drupal core.
+ *
+ * @group Theme
+ */
+class ThemesNotUsingClassyTemplatesTest extends KernelTestBase {
+
+ /**
+ * {@inheritdoc}
+ */
+ public static $modules = ['system', 'user'];
+
+ /**
+ * The theme handler.
+ *
+ * @var \Drupal\Core\Extension\ThemeHandlerInterface
+ */
+ protected $themeHandler;
+
+ /**
+ * Templates that are identical in Stable, which means they can be skipped.
+ *
+ * In several cases, the templates in Classy are identical to those in
+ * Stable. This means that a theme would behave identically even if those
+ * templates were removed from Classy. They are effectively decoupled from
+ * Classy already as they rely on no functionality unique to Classy.
+ *
+ * @var string[]
+ *
+ * @see \Drupal\Tests\Core\Theme\ClassyTemplatesIdenticalToStableTest for a
+ * test that confirms that these templates are identical.
+ */
+ protected $templatesSkippableBecauseIdenticalToStable = [
+ 'file-upload-help',
+ 'file-widget-multiple',
+ 'image-formatter',
+ 'image-style',
+ 'checkboxes',
+ 'confirm-form',
+ 'container',
+ 'dropbutton-wrapper',
+ 'field-multiple-value-form',
+ 'form',
+ 'input',
+ 'select',
+ 'links',
+ 'menu-local-action',
+ 'pager',
+ 'vertical-tabs',
+ 'views-view-grid',
+ 'views-view-list',
+ 'views-view-mapping-test',
+ 'views-view-opml',
+ 'views-view-row-opml',
+ 'views-view-rss',
+ 'views-view-unformatted',
+ ];
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function setUp() {
+ parent::setUp();
+ $this->themeHandler = $this->container->get('theme_handler');
+ $this->container->get('theme_installer')->install([
+ 'umami',
+ 'bartik',
+ 'seven',
+ 'claro',
+ ]);
+ // Enable all modules so every template is present in the theme registry.
+ // This makes it possible to check the source of every template and
+ // determine if they come from Classy.
+ $this->installAllModules();
+ }
+
+ /**
+ * Installs all core modules.
+ */
+ protected function installAllModules() {
+ // Enable all core modules.
+ $all_modules = $this->container->get('extension.list.module')->getList();
+ $all_modules = array_filter($all_modules, function ($module) {
+ // Filter contrib, hidden, experimental, already enabled modules, and
+ // modules in the Testing package.
+ if ($module->origin !== 'core' || !empty($module->info['hidden']) || $module->status === TRUE || $module->info['package'] === 'Testing' || $module->info['package'] === 'Core (Experimental)') {
+ return FALSE;
+ }
+ return TRUE;
+ });
+ $all_modules = array_keys($all_modules);
+ $module_installer = $this->container->get('module_installer');
+ $module_installer->install($all_modules);
+ }
+
+ /**
+ * Ensures that themes are not inheriting templates from Classy.
+ *
+ * @param string $theme
+ * The theme to test.
+ * @param string[] $templates_to_skip
+ * Templates that will not be tested.
+ *
+ * @dataProvider providerTestThemesTemplatesNotClassy
+ */
+ public function testThemesTemplatesNotClassy($theme, array $templates_to_skip) {
+ // Get every template available to the theme being tested.
+ $theme_registry = new Registry($this->root, \Drupal::cache(), \Drupal::lock(), \Drupal::moduleHandler(), $this->themeHandler, \Drupal::service('theme.initialization'), $theme);
+ $theme_registry->setThemeManager(\Drupal::theme());
+ $theme_registry_full = $theme_registry->get();
+
+ // Add views-form-views-form to the skipped templates array. It is
+ // registered via views_theme() in views.module, but does not represent an
+ // actual template.
+ $templates_to_skip[] = 'views-form-views-form';
+
+ // Loop through every template available to the current theme, confirm it
+ // does not come from Classy, does not attach Classy libraries, and does not
+ // extend or include Classy templates.
+ foreach ($theme_registry_full as $info) {
+ if (isset($info['template'])) {
+ $template_name = $info['template'];
+
+ if (in_array($template_name, $templates_to_skip) || in_array($template_name, $this->templatesSkippableBecauseIdenticalToStable)) {
+ continue;
+ }
+
+ $template_contents = file_get_contents("{$this->root}/{$info['path']}/$template_name.html.twig");
+
+ // Confirm template does not come from Classy.
+ $this->assertFalse($info['theme path'] === 'core/themes/classy', "$theme is inheriting $template_name from Classy.");
+
+ // Confirm template does not include or extend Classy templates.
+ preg_match_all('/(extends|include)\s+(\'|")@classy/', $template_contents, $classy_extend_include_matches);
+ $this->assertEmpty($classy_extend_include_matches[0], "The template: '$template_name' in the theme: '$theme' includes or extends a Classy template.");
+
+ // Confirm template does not attach a Classy library.
+ preg_match_all('/attach_library\((\'|")classy\/.+(\'|")\)/', $template_contents, $classy_extend_library_matches);
+ $this->assertEmpty($classy_extend_library_matches[0], "The template: '$template_name' in the theme: '$theme' attaches a Classy library.");
+ }
+ }
+ }
+
+ /**
+ * Data provider for testThemesTemplatesNotClassy().
+ *
+ * @return array
+ * Array of test cases using these keys:
+ * -'theme-name': The machine name of the theme being tested.
+ * -'to-skip': Templates that will skipped by the test.
+ */
+ public function providerTestThemesTemplatesNotClassy() {
+ // Each item provides the theme name and an array of templates to skip. The
+ // templates in the to-skip array are ones that have not yet been decoupled
+ // from Classy. When a template is properly decoupled from Classy, it can be
+ // removed from to-skip. If this test passes with an empty to-skip array,
+ // this is confirmation that the templates are fully decoupled form Classy.
+ return [
+ 'umami' => [
+ 'theme-name' => 'umami',
+ 'to-skip' => [],
+ ],
+ 'seven' => [
+ 'theme-name' => 'seven',
+ 'to-skip' => [],
+ ],
+ 'claro' => [
+ 'theme-name' => 'claro',
+ 'to-skip' => [],
+ ],
+ 'bartik' => [
+ 'theme-name' => 'bartik',
+ 'to-skip' => [],
+ ],
+ ];
+ }
+
+}
diff --git a/web/core/tests/Drupal/KernelTests/Core/Theme/TwigEnvironmentTest.php b/web/core/tests/Drupal/KernelTests/Core/Theme/TwigEnvironmentTest.php
index bbc1253a3f..31b83b2470 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Theme/TwigEnvironmentTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Theme/TwigEnvironmentTest.php
@@ -107,7 +107,7 @@ public function testTemplateNotFoundException() {
$this->fail('Did not throw an exception as expected.');
}
catch (\Twig_Error_Loader $e) {
- $this->assertTrue(strpos($e->getMessage(), 'Template "this-template-does-not-exist.html.twig" is not defined') === 0);
+ $this->assertStringStartsWith('Template "this-template-does-not-exist.html.twig" is not defined', $e->getMessage());
}
}
diff --git a/web/core/tests/Drupal/KernelTests/Core/Theme/TwigMarkupInterfaceTest.php b/web/core/tests/Drupal/KernelTests/Core/Theme/TwigMarkupInterfaceTest.php
index 826ac047cb..684a245a8a 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Theme/TwigMarkupInterfaceTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Theme/TwigMarkupInterfaceTest.php
@@ -63,7 +63,7 @@ public function providerTestMarkupInterfaceEmpty() {
}
/**
- * Tests behaviour if a string is translated to become an empty string.
+ * Tests behavior if a string is translated to become an empty string.
*/
public function testEmptyTranslation() {
$settings = Settings::getAll();
diff --git a/web/core/tests/Drupal/KernelTests/Core/Theme/TwigWhiteListTest.php b/web/core/tests/Drupal/KernelTests/Core/Theme/TwigWhiteListTest.php
index 0a3b3ed66e..a72591c89a 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Theme/TwigWhiteListTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Theme/TwigWhiteListTest.php
@@ -35,7 +35,15 @@ class TwigWhiteListTest extends KernelTestBase {
/**
* {@inheritdoc}
*/
- public static $modules = ['node', 'taxonomy', 'user', 'system', 'text', 'field', 'entity_reference'];
+ public static $modules = [
+ 'node',
+ 'taxonomy',
+ 'user',
+ 'system',
+ 'text',
+ 'field',
+ 'entity_reference',
+ ];
/**
* {@inheritdoc}
diff --git a/web/core/tests/Drupal/KernelTests/Core/TypedData/TypedDataDefinitionTest.php b/web/core/tests/Drupal/KernelTests/Core/TypedData/TypedDataDefinitionTest.php
index ad266c2852..6d7f0c536e 100644
--- a/web/core/tests/Drupal/KernelTests/Core/TypedData/TypedDataDefinitionTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/TypedData/TypedDataDefinitionTest.php
@@ -36,20 +36,20 @@ protected function setUp() {
*/
public function testLists() {
$list_definition = ListDataDefinition::create('string');
- $this->assertTrue($list_definition instanceof ListDataDefinitionInterface);
+ $this->assertInstanceOf(ListDataDefinitionInterface::class, $list_definition);
$item_definition = $list_definition->getItemDefinition();
- $this->assertTrue($item_definition instanceof DataDefinitionInterface);
+ $this->assertInstanceOf(DataDefinitionInterface::class, $item_definition);
$this->assertEqual($item_definition->getDataType(), 'string');
// Test using the definition factory.
$list_definition2 = $this->typedDataManager->createListDataDefinition('string');
- $this->assertTrue($list_definition2 instanceof ListDataDefinitionInterface);
+ $this->assertInstanceOf(ListDataDefinitionInterface::class, $list_definition2);
$this->assertEqual($list_definition, $list_definition2);
// Test creating the definition of data with type 'list', which is the same
// as creating a definition of a list of items of type 'any'.
$list_definition = $this->typedDataManager->createDataDefinition('list');
- $this->assertTrue($list_definition instanceof ListDataDefinitionInterface);
+ $this->assertInstanceOf(ListDataDefinitionInterface::class, $list_definition);
$this->assertEqual($list_definition->getDataType(), 'list');
$this->assertEqual($list_definition->getItemDefinition()->getDataType(), 'any');
}
@@ -63,7 +63,7 @@ public function testMaps() {
->setPropertyDefinition('two', DataDefinition::create('string'))
->setPropertyDefinition('three', DataDefinition::create('string'));
- $this->assertTrue($map_definition instanceof ComplexDataDefinitionInterface);
+ $this->assertInstanceOf(ComplexDataDefinitionInterface::class, $map_definition);
// Test retrieving metadata about contained properties.
$this->assertEqual(array_keys($map_definition->getPropertyDefinitions()), ['one', 'two', 'three']);
@@ -73,7 +73,7 @@ public function testMaps() {
// Test using the definition factory.
$map_definition2 = $this->typedDataManager->createDataDefinition('map');
- $this->assertTrue($map_definition2 instanceof ComplexDataDefinitionInterface);
+ $this->assertInstanceOf(ComplexDataDefinitionInterface::class, $map_definition2);
$map_definition2->setPropertyDefinition('one', DataDefinition::create('string'))
->setPropertyDefinition('two', DataDefinition::create('string'))
->setPropertyDefinition('three', DataDefinition::create('string'));
@@ -85,14 +85,14 @@ public function testMaps() {
*/
public function testDataReferences() {
$language_reference_definition = DataReferenceDefinition::create('language');
- $this->assertTrue($language_reference_definition instanceof DataReferenceDefinitionInterface);
+ $this->assertInstanceOf(DataReferenceDefinitionInterface::class, $language_reference_definition);
// Test retrieving metadata about the referenced data.
$this->assertEqual($language_reference_definition->getTargetDefinition()->getDataType(), 'language');
// Test using the definition factory.
$language_reference_definition2 = $this->typedDataManager->createDataDefinition('language_reference');
- $this->assertTrue($language_reference_definition2 instanceof DataReferenceDefinitionInterface);
+ $this->assertInstanceOf(DataReferenceDefinitionInterface::class, $language_reference_definition2);
$this->assertEqual(serialize($language_reference_definition), serialize($language_reference_definition2));
}
diff --git a/web/core/tests/Drupal/KernelTests/Core/TypedData/TypedDataTest.php b/web/core/tests/Drupal/KernelTests/Core/TypedData/TypedDataTest.php
index 760b2d081d..bfffc00fda 100644
--- a/web/core/tests/Drupal/KernelTests/Core/TypedData/TypedDataTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/TypedData/TypedDataTest.php
@@ -57,7 +57,7 @@ protected function createTypedData($definition, $value = NULL, $name = NULL) {
$definition = DataDefinition::create($definition['type']);
}
$data = $this->typedDataManager->create($definition, $value, $name);
- $this->assertTrue($data instanceof TypedDataInterface, 'Typed data object is an instance of the typed data interface.');
+ $this->assertInstanceOf(TypedDataInterface::class, $data);
return $data;
}
@@ -67,13 +67,13 @@ protected function createTypedData($definition, $value = NULL, $name = NULL) {
public function testGetAndSet() {
// Boolean type.
$typed_data = $this->createTypedData(['type' => 'boolean'], TRUE);
- $this->assertTrue($typed_data instanceof BooleanInterface, 'Typed data object is an instance of BooleanInterface.');
+ $this->assertInstanceOf(BooleanInterface::class, $typed_data);
$this->assertTrue($typed_data->getValue() === TRUE, 'Boolean value was fetched.');
$this->assertEqual($typed_data->validate()->count(), 0);
$typed_data->setValue(FALSE);
$this->assertTrue($typed_data->getValue() === FALSE, 'Boolean value was changed.');
$this->assertEqual($typed_data->validate()->count(), 0);
- $this->assertTrue(is_string($typed_data->getString()), 'Boolean value was converted to string');
+ $this->assertIsString($typed_data->getString());
$typed_data->setValue(NULL);
$this->assertNull($typed_data->getValue(), 'Boolean wrapper is null-able.');
$this->assertEqual($typed_data->validate()->count(), 0);
@@ -83,7 +83,7 @@ public function testGetAndSet() {
// String type.
$value = $this->randomString();
$typed_data = $this->createTypedData(['type' => 'string'], $value);
- $this->assertTrue($typed_data instanceof StringInterface, 'Typed data object is an instance of StringInterface.');
+ $this->assertInstanceOf(StringInterface::class, $typed_data);
$this->assertTrue($typed_data->getValue() === $value, 'String value was fetched.');
$this->assertEqual($typed_data->validate()->count(), 0);
$new_value = $this->randomString();
@@ -91,7 +91,7 @@ public function testGetAndSet() {
$this->assertTrue($typed_data->getValue() === $new_value, 'String value was changed.');
$this->assertEqual($typed_data->validate()->count(), 0);
// Funky test.
- $this->assertTrue(is_string($typed_data->getString()), 'String value was converted to string');
+ $this->assertIsString($typed_data->getString());
$typed_data->setValue(NULL);
$this->assertNull($typed_data->getValue(), 'String wrapper is null-able.');
$this->assertEqual($typed_data->validate()->count(), 0);
@@ -101,13 +101,13 @@ public function testGetAndSet() {
// Integer type.
$value = rand();
$typed_data = $this->createTypedData(['type' => 'integer'], $value);
- $this->assertTrue($typed_data instanceof IntegerInterface, 'Typed data object is an instance of IntegerInterface.');
+ $this->assertInstanceOf(IntegerInterface::class, $typed_data);
$this->assertTrue($typed_data->getValue() === $value, 'Integer value was fetched.');
$this->assertEqual($typed_data->validate()->count(), 0);
$new_value = rand();
$typed_data->setValue($new_value);
$this->assertTrue($typed_data->getValue() === $new_value, 'Integer value was changed.');
- $this->assertTrue(is_string($typed_data->getString()), 'Integer value was converted to string');
+ $this->assertIsString($typed_data->getString());
$this->assertEqual($typed_data->validate()->count(), 0);
$typed_data->setValue(NULL);
$this->assertNull($typed_data->getValue(), 'Integer wrapper is null-able.');
@@ -118,13 +118,13 @@ public function testGetAndSet() {
// Float type.
$value = 123.45;
$typed_data = $this->createTypedData(['type' => 'float'], $value);
- $this->assertTrue($typed_data instanceof FloatInterface, 'Typed data object is an instance of FloatInterface.');
+ $this->assertInstanceOf(FloatInterface::class, $typed_data);
$this->assertTrue($typed_data->getValue() === $value, 'Float value was fetched.');
$this->assertEqual($typed_data->validate()->count(), 0);
$new_value = 678.90;
$typed_data->setValue($new_value);
$this->assertTrue($typed_data->getValue() === $new_value, 'Float value was changed.');
- $this->assertTrue(is_string($typed_data->getString()), 'Float value was converted to string');
+ $this->assertIsString($typed_data->getString());
$this->assertEqual($typed_data->validate()->count(), 0);
$typed_data->setValue(NULL);
$this->assertNull($typed_data->getValue(), 'Float wrapper is null-able.');
@@ -135,7 +135,7 @@ public function testGetAndSet() {
// Date Time type; values with timezone offset.
$value = '2014-01-01T20:00:00+00:00';
$typed_data = $this->createTypedData(['type' => 'datetime_iso8601'], $value);
- $this->assertTrue($typed_data instanceof DateTimeInterface, 'Typed data object is an instance of DateTimeInterface.');
+ $this->assertInstanceOf(DateTimeInterface::class, $typed_data);
$this->assertTrue($typed_data->getValue() == $value, 'Date value was fetched.');
$this->assertEqual($typed_data->getValue(), $typed_data->getDateTime()->format('c'), 'Value representation of a date is ISO 8601');
$this->assertSame('+00:00', $typed_data->getDateTime()->getTimezone()->getName());
@@ -154,7 +154,7 @@ public function testGetAndSet() {
$this->assertEqual($typed_data->validate()->count(), 1, 'Validation detected invalid value.');
// Check implementation of DateTimeInterface.
$typed_data = $this->createTypedData(['type' => 'datetime_iso8601'], '2014-01-01T20:00:00+00:00');
- $this->assertTrue($typed_data->getDateTime() instanceof DrupalDateTime);
+ $this->assertInstanceOf(DrupalDateTime::class, $typed_data->getDateTime());
$this->assertSame('+00:00', $typed_data->getDateTime()->getTimezone()->getName());
$typed_data->setDateTime(new DrupalDateTime('2014-01-02T20:00:00+00:00'));
$this->assertSame('+00:00', $typed_data->getDateTime()->getTimezone()->getName());
@@ -165,7 +165,7 @@ public function testGetAndSet() {
// Date Time type; values without timezone offset.
$value = '2014-01-01T20:00';
$typed_data = $this->createTypedData(['type' => 'datetime_iso8601'], $value);
- $this->assertTrue($typed_data instanceof DateTimeInterface, 'Typed data object is an instance of DateTimeInterface.');
+ $this->assertInstanceOf(DateTimeInterface::class, $typed_data);
$this->assertTrue($typed_data->getValue() == $value, 'Date value was fetched.');
// @todo Uncomment this assertion in https://www.drupal.org/project/drupal/issues/2716891.
// $this->assertEqual($typed_data->getValue(), $typed_data->getDateTime()->format('c'), 'Value representation of a date is ISO 8601');
@@ -186,7 +186,7 @@ public function testGetAndSet() {
$this->assertEqual($typed_data->validate()->count(), 1, 'Validation detected invalid value.');
// Check implementation of DateTimeInterface.
$typed_data = $this->createTypedData(['type' => 'datetime_iso8601'], '2014-01-01T20:00:00');
- $this->assertTrue($typed_data->getDateTime() instanceof DrupalDateTime);
+ $this->assertInstanceOf(DrupalDateTime::class, $typed_data->getDateTime());
$this->assertSame('UTC', $typed_data->getDateTime()->getTimezone()->getName());
// When setting datetime without a timezone offset, the default timezone is
// used (Australia/Sydney). DateTimeIso8601::setDateTime() converts this
@@ -201,7 +201,7 @@ public function testGetAndSet() {
// Timestamp type.
$value = REQUEST_TIME;
$typed_data = $this->createTypedData(['type' => 'timestamp'], $value);
- $this->assertTrue($typed_data instanceof DateTimeInterface, 'Typed data object is an instance of DateTimeInterface.');
+ $this->assertInstanceOf(DateTimeInterface::class, $typed_data);
$this->assertTrue($typed_data->getValue() == $value, 'Timestamp value was fetched.');
$this->assertEqual($typed_data->validate()->count(), 0);
$new_value = REQUEST_TIME + 1;
@@ -215,7 +215,7 @@ public function testGetAndSet() {
$this->assertEqual($typed_data->validate()->count(), 1, 'Validation detected invalid value.');
// Check implementation of DateTimeInterface.
$typed_data = $this->createTypedData(['type' => 'timestamp'], REQUEST_TIME);
- $this->assertTrue($typed_data->getDateTime() instanceof DrupalDateTime);
+ $this->assertInstanceOf(DrupalDateTime::class, $typed_data->getDateTime());
$typed_data->setDateTime(DrupalDateTime::createFromTimestamp(REQUEST_TIME + 1));
$this->assertEqual($typed_data->getValue(), REQUEST_TIME + 1);
$typed_data->setValue(NULL);
@@ -224,12 +224,12 @@ public function testGetAndSet() {
// DurationIso8601 type.
$value = 'PT20S';
$typed_data = $this->createTypedData(['type' => 'duration_iso8601'], $value);
- $this->assertTrue($typed_data instanceof DurationInterface, 'Typed data object is an instance of DurationInterface.');
+ $this->assertInstanceOf(DurationInterface::class, $typed_data);
$this->assertIdentical($typed_data->getValue(), $value, 'DurationIso8601 value was fetched.');
$this->assertEqual($typed_data->validate()->count(), 0);
$typed_data->setValue('P40D');
$this->assertEqual($typed_data->getDuration()->d, 40, 'DurationIso8601 value was changed and set by duration string.');
- $this->assertTrue(is_string($typed_data->getString()), 'DurationIso8601 value was converted to string');
+ $this->assertIsString($typed_data->getString());
$this->assertEqual($typed_data->validate()->count(), 0);
$typed_data->setValue(NULL);
$this->assertNull($typed_data->getValue(), 'DurationIso8601 wrapper is null-able.');
@@ -238,7 +238,7 @@ public function testGetAndSet() {
$this->assertEqual($typed_data->validate()->count(), 1, 'Validation detected invalid value.');
// Check implementation of DurationInterface.
$typed_data = $this->createTypedData(['type' => 'duration_iso8601'], 'PT20S');
- $this->assertTrue($typed_data->getDuration() instanceof \DateInterval);
+ $this->assertInstanceOf(\DateInterval::class, $typed_data->getDuration());
$typed_data->setDuration(new \DateInterval('P40D'));
// @todo: Should we make this "nicer"?
$this->assertEqual($typed_data->getValue(), 'P0Y0M40DT0H0M0S');
@@ -248,12 +248,12 @@ public function testGetAndSet() {
// Time span type.
$value = 20;
$typed_data = $this->createTypedData(['type' => 'timespan'], $value);
- $this->assertTrue($typed_data instanceof DurationInterface, 'Typed data object is an instance of DurationInterface.');
+ $this->assertInstanceOf(DurationInterface::class, $typed_data);
$this->assertIdentical($typed_data->getValue(), $value, 'Time span value was fetched.');
$this->assertEqual($typed_data->validate()->count(), 0);
$typed_data->setValue(60 * 60 * 4);
$this->assertEqual($typed_data->getDuration()->s, 14400, 'Time span was changed');
- $this->assertTrue(is_string($typed_data->getString()), 'Time span value was converted to string');
+ $this->assertIsString($typed_data->getString());
$this->assertEqual($typed_data->validate()->count(), 0);
$typed_data->setValue(NULL);
$this->assertNull($typed_data->getValue(), 'Time span wrapper is null-able.');
@@ -262,7 +262,7 @@ public function testGetAndSet() {
$this->assertEqual($typed_data->validate()->count(), 1, 'Validation detected invalid value.');
// Check implementation of DurationInterface.
$typed_data = $this->createTypedData(['type' => 'timespan'], 20);
- $this->assertTrue($typed_data->getDuration() instanceof \DateInterval);
+ $this->assertInstanceOf(\DateInterval::class, $typed_data->getDuration());
$typed_data->setDuration(new \DateInterval('PT4H'));
$this->assertEqual($typed_data->getValue(), 60 * 60 * 4);
$typed_data->setValue(NULL);
@@ -271,12 +271,12 @@ public function testGetAndSet() {
// URI type.
$uri = 'http://example.com/foo/';
$typed_data = $this->createTypedData(['type' => 'uri'], $uri);
- $this->assertTrue($typed_data instanceof UriInterface, 'Typed data object is an instance of UriInterface.');
+ $this->assertInstanceOf(UriInterface::class, $typed_data);
$this->assertTrue($typed_data->getValue() === $uri, 'URI value was fetched.');
$this->assertEqual($typed_data->validate()->count(), 0);
$typed_data->setValue($uri . 'bar.txt');
$this->assertTrue($typed_data->getValue() === $uri . 'bar.txt', 'URI value was changed.');
- $this->assertTrue(is_string($typed_data->getString()), 'URI value was converted to string');
+ $this->assertIsString($typed_data->getString());
$this->assertEqual($typed_data->validate()->count(), 0);
$typed_data->setValue(NULL);
$this->assertNull($typed_data->getValue(), 'URI wrapper is null-able.');
@@ -299,12 +299,12 @@ public function testGetAndSet() {
// Email type.
$value = $this->randomString();
$typed_data = $this->createTypedData(['type' => 'email'], $value);
- $this->assertTrue($typed_data instanceof StringInterface, 'Typed data object is an instance of StringInterface.');
+ $this->assertInstanceOf(StringInterface::class, $typed_data);
$this->assertIdentical($typed_data->getValue(), $value, 'Email value was fetched.');
$new_value = 'test@example.com';
$typed_data->setValue($new_value);
$this->assertIdentical($typed_data->getValue(), $new_value, 'Email value was changed.');
- $this->assertTrue(is_string($typed_data->getString()), 'Email value was converted to string');
+ $this->assertIsString($typed_data->getString());
$this->assertEqual($typed_data->validate()->count(), 0);
$typed_data->setValue(NULL);
$this->assertNull($typed_data->getValue(), 'Email wrapper is null-able.');
@@ -314,18 +314,18 @@ public function testGetAndSet() {
// Binary type.
$typed_data = $this->createTypedData(['type' => 'binary'], $files[0]->getFileUri());
- $this->assertTrue($typed_data instanceof BinaryInterface, 'Typed data object is an instance of BinaryInterface.');
- $this->assertTrue(is_resource($typed_data->getValue()), 'Binary value was fetched.');
+ $this->assertInstanceOf(BinaryInterface::class, $typed_data);
+ $this->assertIsResource($typed_data->getValue());
$this->assertEqual($typed_data->validate()->count(), 0);
// Try setting by URI.
$typed_data->setValue($files[1]->getFileUri());
$this->assertEqual(fgets($typed_data->getValue()), fgets(fopen($files[1]->getFileUri(), 'r')), 'Binary value was changed.');
- $this->assertTrue(is_string($typed_data->getString()), 'Binary value was converted to string');
+ $this->assertIsString($typed_data->getString());
$this->assertEqual($typed_data->validate()->count(), 0);
// Try setting by resource.
$typed_data->setValue(fopen($files[2]->getFileUri(), 'r'));
$this->assertEqual(fgets($typed_data->getValue()), fgets(fopen($files[2]->getFileUri(), 'r')), 'Binary value was changed.');
- $this->assertTrue(is_string($typed_data->getString()), 'Binary value was converted to string');
+ $this->assertIsString($typed_data->getString());
$this->assertEqual($typed_data->validate()->count(), 0);
$typed_data->setValue(NULL);
$this->assertNull($typed_data->getValue(), 'Binary wrapper is null-able.');
@@ -340,7 +340,7 @@ public function testGetAndSet() {
$new_value = 'test@example.com';
$typed_data->setValue($new_value);
$this->assertIdentical($typed_data->getValue(), $new_value, 'Any value was changed.');
- $this->assertTrue(is_string($typed_data->getString()), 'Any value was converted to string');
+ $this->assertIsString($typed_data->getString());
$this->assertEqual($typed_data->validate()->count(), 0);
$typed_data->setValue(NULL);
$this->assertNull($typed_data->getValue(), 'Any wrapper is null-able.');
@@ -364,7 +364,7 @@ public function testTypedDataLists() {
// Test iterating.
$count = 0;
foreach ($typed_data as $item) {
- $this->assertTrue($item instanceof TypedDataInterface);
+ $this->assertInstanceOf(TypedDataInterface::class, $item);
$count++;
}
$this->assertEqual($count, 3);
@@ -399,24 +399,24 @@ public function testTypedDataLists() {
// Test dealing with NULL items.
$typed_data[] = NULL;
$this->assertTrue($typed_data->isEmpty());
- $this->assertEqual(count($typed_data), 1);
+ $this->assertCount(1, $typed_data);
$typed_data[] = '';
$this->assertFalse($typed_data->isEmpty());
- $this->assertEqual(count($typed_data), 2);
+ $this->assertCount(2, $typed_data);
$typed_data[] = 'three';
$this->assertFalse($typed_data->isEmpty());
- $this->assertEqual(count($typed_data), 3);
+ $this->assertCount(3, $typed_data);
$this->assertEqual($typed_data->getValue(), [NULL, '', 'three']);
// Test unsetting.
unset($typed_data[1]);
- $this->assertEqual(count($typed_data), 2);
+ $this->assertCount(2, $typed_data);
// Check that items were shifted.
$this->assertEqual($typed_data[1]->getValue(), 'three');
// Getting a not set list item returns NULL, and does not create a new item.
$this->assertNull($typed_data[2]);
- $this->assertEqual(count($typed_data), 2);
+ $this->assertCount(2, $typed_data);
// Test setting the list with less values.
$typed_data->setValue(['one']);
@@ -489,7 +489,7 @@ public function testTypedDataMaps() {
// Test iterating.
$count = 0;
foreach ($typed_data as $item) {
- $this->assertTrue($item instanceof TypedDataInterface);
+ $this->assertInstanceOf(TypedDataInterface::class, $item);
$count++;
}
$this->assertEqual($count, 3);
@@ -541,7 +541,7 @@ public function testTypedDataMaps() {
$this->assertNull($typed_data->getValue());
$typed_data->setValue([]);
$value = $typed_data->getValue();
- $this->assertTrue(isset($value) && is_array($value));
+ $this->assertIsArray($value);
// Test accessing invalid properties.
$typed_data->setValue($value);
diff --git a/web/core/tests/Drupal/KernelTests/Core/Update/CompatibilityFixTest.php b/web/core/tests/Drupal/KernelTests/Core/Update/CompatibilityFixTest.php
index 6fcae686bf..931992b8b5 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Update/CompatibilityFixTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Update/CompatibilityFixTest.php
@@ -23,7 +23,7 @@ protected function setUp() {
}
/**
- * @expectedDeprecation update_fix_compatibility() is deprecated in Drupal 8.8.4 and will be removed before Drupal 9.0.0. There is no replacement. See https://www.drupal.org/node/3026100
+ * @expectedDeprecation update_fix_compatibility() is deprecated in Drupal 8.8.5 and will be removed before Drupal 9.0.0. There is no replacement. See https://www.drupal.org/node/3026100
*/
public function testFixCompatibility() {
$extension_config = \Drupal::configFactory()->getEditable('core.extension');
diff --git a/web/core/tests/Drupal/KernelTests/Core/Url/LinkGenerationTest.php b/web/core/tests/Drupal/KernelTests/Core/Url/LinkGenerationTest.php
index 610dc303df..3eeb7bc9ae 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Url/LinkGenerationTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Url/LinkGenerationTest.php
@@ -27,7 +27,7 @@ public function testHookLinkAlter() {
return \Drupal::service('link_generator')->generate(['#markup' => '<em>link with markup</em>'], $url);
});
$this->setRawContent($link);
- $this->assertTrue($link instanceof MarkupInterface, 'The output of link generation is marked safe as it is a link.');
+ $this->assertInstanceOf(MarkupInterface::class, $link);
// Ensure the content of the link is not escaped.
$this->assertRaw('<em>link with markup</em>');
@@ -37,7 +37,7 @@ public function testHookLinkAlter() {
return \Drupal::service('link_generator')->generate(['#markup' => '<em>link with markup</em>'], $url);
});
$this->setRawContent($link);
- $this->assertTrue($link instanceof MarkupInterface, 'The output of link generation is marked safe as it is a link.');
+ $this->assertInstanceOf(MarkupInterface::class, $link);
// Ensure the content of the link is escaped.
$this->assertEscaped('<em>link with markup</em> <strong>Test!</strong>');
@@ -47,7 +47,7 @@ public function testHookLinkAlter() {
return \Drupal::service('link_generator')->generate(['#markup' => '<em>link with markup</em>'], $url);
});
$this->setRawContent($link);
- $this->assertTrue($link instanceof MarkupInterface, 'The output of link generation is marked safe as it is a link.');
+ $this->assertInstanceOf(MarkupInterface::class, $link);
// Ensure the content of the link is escaped.
$this->assertRaw('<em>link with markup</em> <strong>Test!</strong>');
@@ -56,7 +56,7 @@ public function testHookLinkAlter() {
return \Drupal::service('link_generator')->generate('<em>link with markup</em>', $url);
});
$this->setRawContent($link);
- $this->assertTrue($link instanceof MarkupInterface, 'The output of link generation is marked safe as it is a link.');
+ $this->assertInstanceOf(MarkupInterface::class, $link);
// Ensure the content of the link is escaped.
$this->assertEscaped('<em>link with markup</em>');
$this->assertRaw('<strong>Test!</strong>');
diff --git a/web/core/tests/Drupal/KernelTests/KernelTestBase.php b/web/core/tests/Drupal/KernelTests/KernelTestBase.php
index dc6204686b..d3ae0992d4 100644
--- a/web/core/tests/Drupal/KernelTests/KernelTestBase.php
+++ b/web/core/tests/Drupal/KernelTests/KernelTestBase.php
@@ -6,7 +6,6 @@
use Drupal\Component\FileCache\FileCache;
use Drupal\Component\FileCache\FileCacheFactory;
use Drupal\Component\Utility\Html;
-use Drupal\Component\Render\FormattableMarkup;
use Drupal\Core\Config\Development\ConfigSchemaChecker;
use Drupal\Core\Database\Database;
use Drupal\Core\DependencyInjection\ContainerBuilder;
@@ -22,6 +21,7 @@
use Drupal\Tests\PhpunitCompatibilityTrait;
use Drupal\Tests\RandomGeneratorTrait;
use Drupal\Tests\TestRequirementsTrait;
+use Drupal\TestTools\Comparator\MarkupInterfaceComparator;
use PHPUnit\Framework\Exception;
use PHPUnit\Framework\TestCase;
use Symfony\Component\DependencyInjection\Reference;
@@ -237,6 +237,9 @@ public static function setUpBeforeClass() {
protected function setUp() {
parent::setUp();
+ // Allow tests to compare MarkupInterface objects via assertEquals().
+ $this->registerComparator(new MarkupInterfaceComparator());
+
$this->root = static::getDrupalRoot();
$this->initFileCache();
$this->bootEnvironment();
@@ -362,8 +365,10 @@ private function bootKernel() {
// Ensure database tasks have been run.
require_once __DIR__ . '/../../../includes/install.inc';
- $connection = Database::getConnection();
- $errors = db_installer_object($connection->driver())->runTasks();
+ $connection_info = Database::getConnectionInfo();
+ $driver = $connection_info['default']['driver'];
+ $namespace = $connection_info['default']['namespace'] ?? NULL;
+ $errors = db_installer_object($driver, $namespace)->runTasks();
if (!empty($errors)) {
$this->fail('Failed to run installer database tasks: ' . implode(', ', $errors));
}
@@ -742,21 +747,8 @@ protected function installEntitySchema($entity_type_id) {
if ($storage instanceof SqlEntityStorageInterface) {
$tables = $storage->getTableMapping()->getTableNames();
$db_schema = $this->container->get('database')->schema();
- $all_tables_exist = TRUE;
foreach ($tables as $table) {
- if (!$db_schema->tableExists($table)) {
- $this->fail(new FormattableMarkup('Installed entity type table for the %entity_type entity type: %table', [
- '%entity_type' => $entity_type_id,
- '%table' => $table,
- ]));
- $all_tables_exist = FALSE;
- }
- }
- if ($all_tables_exist) {
- $this->pass(new FormattableMarkup('Installed entity type tables for the %entity_type entity type: %tables', [
- '%entity_type' => $entity_type_id,
- '%tables' => '{' . implode('}, {', $tables) . '}',
- ]));
+ $this->assertTrue($db_schema->tableExists($table), "The entity type table '$table' for the entity type '$entity_type_id' should exist.");
}
}
}
diff --git a/web/core/tests/Drupal/Nightwatch/Commands/drupalInstall.js b/web/core/tests/Drupal/Nightwatch/Commands/drupalInstall.js
index 45c2a38463..b61db62c09 100644
--- a/web/core/tests/Drupal/Nightwatch/Commands/drupalInstall.js
+++ b/web/core/tests/Drupal/Nightwatch/Commands/drupalInstall.js
@@ -5,27 +5,36 @@ import { commandAsWebserver } from '../globals';
/**
* Installs a Drupal test site.
*
- * @param {oject} [settings={}]
+ * @param {object} [settings={}]
* Settings object
* @param {string} [settings.setupFile='']
* Setup file used by TestSiteApplicationTest
+ * @param {string} [settings.installProfile='']
+ * The install profile to use.
+ * @param {string} [settings.langcode='']
+ * The language to install the site in.
* @param {function} callback
* A callback which will be called, when the installation is finished.
* @return {object}
* The 'browser' object.
*/
-exports.command = function drupalInstall({ setupFile = '' } = {}, callback) {
+exports.command = function drupalInstall(
+ { setupFile = '', installProfile = 'nightwatch_testing', langcode = '' } = {},
+ callback,
+) {
const self = this;
try {
setupFile = setupFile ? `--setup-file "${setupFile}"` : '';
+ installProfile = `--install-profile "${installProfile}"`;
+ const langcodeOption = langcode ? `--langcode "${langcode}"` : '';
const dbOption =
process.env.DRUPAL_TEST_DB_URL.length > 0
? `--db-url ${process.env.DRUPAL_TEST_DB_URL}`
: '';
const install = execSync(
commandAsWebserver(
- `php ./scripts/test-site.php install ${setupFile} --install-profile nightwatch_testing --base-url ${process.env.DRUPAL_TEST_BASE_URL} ${dbOption} --json`,
+ `php ./scripts/test-site.php install ${setupFile} ${installProfile} ${langcodeOption} --base-url ${process.env.DRUPAL_TEST_BASE_URL} ${dbOption} --json`,
),
);
const installData = JSON.parse(install.toString());
diff --git a/web/core/tests/Drupal/Nightwatch/Tests/installProfileTest.js b/web/core/tests/Drupal/Nightwatch/Tests/installProfileTest.js
new file mode 100644
index 0000000000..d7b1d24c1a
--- /dev/null
+++ b/web/core/tests/Drupal/Nightwatch/Tests/installProfileTest.js
@@ -0,0 +1,19 @@
+module.exports = {
+ '@tags': ['core'],
+ before(browser) {
+ browser.drupalInstall({
+ setupFile: 'core/tests/Drupal/TestSite/TestSiteInstallTestScript.php',
+ installProfile: 'demo_umami',
+ });
+ },
+ after(browser) {
+ browser.drupalUninstall();
+ },
+ 'Test umami profile': browser => {
+ browser
+ .drupalRelativeURL('/test-page')
+ .waitForElementVisible('body', 1000)
+ .assert.elementPresent('#block-umami-branding')
+ .drupalLogAndEnd({ onlyOnError: false });
+ },
+};
diff --git a/web/core/tests/Drupal/Nightwatch/Tests/jsCookieTest.js b/web/core/tests/Drupal/Nightwatch/Tests/jsCookieTest.js
new file mode 100644
index 0000000000..ab2bd7e7a8
--- /dev/null
+++ b/web/core/tests/Drupal/Nightwatch/Tests/jsCookieTest.js
@@ -0,0 +1,254 @@
+const deprecatedMessageSuffix = `is deprecated in Drupal 9.0.0 and will be removed in Drupal 10.0.0. Use the core/js-cookie library instead. See https://www.drupal.org/node/3104677`;
+// Nightwatch suggests non-ES6 functions when using the execute method.
+// eslint-disable-next-line func-names, prefer-arrow-callback
+const getJqueryCookie = function(cookieName) {
+ return undefined !== cookieName ? jQuery.cookie(cookieName) : jQuery.cookie();
+};
+// eslint-disable-next-line func-names, prefer-arrow-callback
+const setJqueryCookieWithOptions = function(
+ cookieName,
+ cookieValue,
+ options = {},
+) {
+ return jQuery.cookie(cookieName, cookieValue, options);
+};
+module.exports = {
+ '@tags': ['core'],
+ before(browser) {
+ browser.drupalInstall().drupalLoginAsAdmin(() => {
+ browser
+ .drupalRelativeURL('/admin/modules')
+ .setValue('input[type="search"]', 'JS Cookie Test')
+ .waitForElementVisible(
+ 'input[name="modules[js_cookie_test][enable]"]',
+ 1000,
+ )
+ .click('input[name="modules[js_cookie_test][enable]"]')
+ .click('input[type="submit"]'); // Submit module form.
+ });
+ },
+ after(browser) {
+ browser.drupalUninstall();
+ },
+ 'Test jquery.cookie Shim Simple Value and jquery.removeCookie': browser => {
+ browser
+ .drupalRelativeURL('/js_cookie_with_shim_test')
+ .waitForElementVisible('.js_cookie_test_add_button', 1000)
+ .click('.js_cookie_test_add_button')
+ // prettier-ignore
+ .execute(getJqueryCookie, ['js_cookie_test'], result => {
+ browser.assert.equal(
+ result.value,
+ 'red panda',
+ '$.cookie returns cookie value',
+ );
+ })
+ .waitForElementVisible('.js_cookie_test_remove_button', 1000)
+ .click('.js_cookie_test_remove_button')
+ .execute(getJqueryCookie, ['js_cookie_test_remove'], result => {
+ browser.assert.equal(result.value, null, 'cookie removed');
+ })
+ .drupalLogAndEnd({ onlyOnError: false });
+ },
+ 'Test jquery.cookie Shim Empty Value': browser => {
+ browser
+ .setCookie({
+ name: 'js_cookie_test_empty',
+ value: '',
+ })
+ // prettier-ignore
+ .execute(getJqueryCookie, ['js_cookie_test_empty'], result => {
+ browser.assert.equal(
+ result.value,
+ '',
+ '$.cookie returns empty cookie value',
+ );
+ })
+ .getCookie('js_cookie_test_empty', result => {
+ browser.assert.equal(result.value, '', 'Cookie value is empty.');
+ })
+ .drupalLogAndEnd({ onlyOnError: false });
+ },
+ 'Test jquery.cookie Shim Undefined': browser => {
+ browser
+ .deleteCookie('js_cookie_test_undefined', () => {
+ browser.execute(
+ getJqueryCookie,
+ ['js_cookie_test_undefined'],
+ result => {
+ browser.assert.equal(
+ result.value,
+ undefined,
+ '$.cookie returns undefined cookie value',
+ );
+ },
+ );
+ })
+ .drupalLogAndEnd({ onlyOnError: false });
+ },
+ 'Test jquery.cookie Shim Decode': browser => {
+ browser
+ .setCookie({
+ name: encodeURIComponent(' js_cookie_test_encoded'),
+ value: encodeURIComponent(' red panda'),
+ })
+ .execute(getJqueryCookie, [' js_cookie_test_encoded'], result => {
+ browser.assert.equal(
+ result.value,
+ ' red panda',
+ '$.cookie returns decoded cookie value',
+ );
+ })
+ .setCookie({
+ name: 'js_cookie_test_encoded_plus_to_space',
+ value: 'red+panda',
+ })
+ .execute(
+ getJqueryCookie,
+ ['js_cookie_test_encoded_plus_to_space'],
+ result => {
+ browser.assert.equal(
+ result.value,
+ 'red panda',
+ '$.cookie returns decoded plus to space in cookie value',
+ );
+ },
+ )
+ .drupalLogAndEnd({ onlyOnError: false });
+ },
+ 'Test jquery.cookie Shim With raw': browser => {
+ browser
+ .drupalRelativeURL('/js_cookie_with_shim_test')
+ .waitForElementVisible('.js_cookie_test_add_raw_button', 1000)
+ .click('.js_cookie_test_add_raw_button')
+ .execute(getJqueryCookie, ['js_cookie_test_raw'], result => {
+ browser.assert.equal(
+ result.value,
+ 'red%20panda',
+ '$.cookie returns raw cookie value',
+ );
+ })
+ .drupalLogAndEnd({ onlyOnError: false });
+ },
+ 'Test jquery.cookie Shim With JSON': browser => {
+ browser
+ .drupalRelativeURL('/js_cookie_with_shim_test')
+ .waitForElementVisible('.js_cookie_test_add_json_button', 1000)
+ .click('.js_cookie_test_add_json_button')
+ .execute(getJqueryCookie, ['js_cookie_test_json'], result => {
+ browser.assert.deepEqual(
+ result.value,
+ { panda: 'red' },
+ 'Stringified JSON is returned as JSON.',
+ );
+ })
+ .getCookie('js_cookie_test_json', result => {
+ browser.assert.equal(
+ result.value,
+ '%7B%22panda%22%3A%22red%22%7D',
+ 'Cookie value is encoded backwards-compatible with jquery.cookie.',
+ );
+ })
+ .execute(getJqueryCookie, ['js_cookie_test_json_simple'], result => {
+ browser.assert.equal(
+ result.value,
+ 'red panda',
+ '$.cookie returns simple cookie value with JSON enabled',
+ );
+ })
+ .waitForElementVisible('.js_cookie_test_add_json_string_button', 1000)
+ .click('.js_cookie_test_add_json_string_button')
+ .execute(getJqueryCookie, ['js_cookie_test_json_string'], result => {
+ browser.assert.deepEqual(
+ result.value,
+ '[object Object]',
+ 'JSON used without json option is return as a string.',
+ );
+ })
+ .getCookie('js_cookie_test_json_string', result => {
+ browser.assert.equal(
+ result.value,
+ '%5Bobject%20Object%5D',
+ 'Cookie value is encoded backwards-compatible with jquery.cookie.',
+ );
+ })
+ .drupalLogAndEnd({ onlyOnError: false });
+ },
+ 'Test jquery.cookie Shim invalid URL encoding': browser => {
+ browser
+ .setCookie({
+ name: 'js_cookie_test_bad',
+ value: 'red panda%',
+ })
+ .execute(getJqueryCookie, ['js_cookie_test_bad'], result => {
+ browser.assert.equal(
+ result.value,
+ undefined,
+ '$.cookie won`t throw exception, returns undefined',
+ );
+ })
+ .drupalLogAndEnd({ onlyOnError: false });
+ },
+ 'Test jquery.cookie Shim Read all when there are cookies or return empty object': browser => {
+ browser
+ .getCookie('SIMPLETEST_USER_AGENT', simpletestCookie => {
+ const simpletestCookieValue = simpletestCookie.value;
+ browser
+ .drupalRelativeURL('/js_cookie_with_shim_test')
+ .deleteCookies(() => {
+ browser
+ .execute(getJqueryCookie, [], result => {
+ browser.assert.deepEqual(
+ result.value,
+ {},
+ '$.cookie() returns empty object',
+ );
+ })
+ .setCookie({
+ name: 'js_cookie_test_first',
+ value: 'red panda',
+ })
+ .setCookie({
+ name: 'js_cookie_test_second',
+ value: 'second red panda',
+ })
+ .setCookie({
+ name: 'js_cookie_test_third',
+ value: 'third red panda id bad%',
+ })
+ .execute(getJqueryCookie, [], result => {
+ browser.assert.deepEqual(
+ result.value,
+ {
+ js_cookie_test_first: 'red panda',
+ js_cookie_test_second: 'second red panda',
+ },
+ '$.cookie() returns object containing all cookies',
+ );
+ })
+ .setCookie({
+ name: 'SIMPLETEST_USER_AGENT',
+ value: simpletestCookieValue,
+ });
+ });
+ })
+ .drupalLogAndEnd({ onlyOnError: false });
+ },
+ 'Test jquery.cookie Shim expires option as Date instance': browser => {
+ const sevenDaysFromNow = new Date();
+ sevenDaysFromNow.setDate(sevenDaysFromNow.getDate() + 7);
+ browser
+ .execute(
+ setJqueryCookieWithOptions,
+ ['c', 'v', { expires: sevenDaysFromNow }],
+ result => {
+ browser.assert.equal(
+ result.value,
+ `c=v; expires=${sevenDaysFromNow.toUTCString()}`,
+ 'should write the cookie string with expires',
+ );
+ },
+ )
+ .drupalLogAndEnd({ onlyOnError: false });
+ },
+};
diff --git a/web/core/tests/Drupal/Nightwatch/Tests/langcodeTest.js b/web/core/tests/Drupal/Nightwatch/Tests/langcodeTest.js
new file mode 100644
index 0000000000..7248f2a8a3
--- /dev/null
+++ b/web/core/tests/Drupal/Nightwatch/Tests/langcodeTest.js
@@ -0,0 +1,18 @@
+module.exports = {
+ '@tags': ['core'],
+ before(browser) {
+ browser.drupalInstall({
+ setupFile: 'core/tests/Drupal/TestSite/TestSiteInstallTestScript.php',
+ langcode: 'fr',
+ });
+ },
+ after(browser) {
+ browser.drupalUninstall();
+ },
+ 'Test page with langcode': browser => {
+ browser
+ .drupalRelativeURL('/test-page')
+ .assert.attributeEquals('html', 'lang', 'fr')
+ .drupalLogAndEnd({ onlyOnError: false });
+ },
+};
diff --git a/web/core/tests/Drupal/TestSite/Commands/TestSiteInstallCommand.php b/web/core/tests/Drupal/TestSite/Commands/TestSiteInstallCommand.php
index a0e08cc1d0..1a7a7a6363 100644
--- a/web/core/tests/Drupal/TestSite/Commands/TestSiteInstallCommand.php
+++ b/web/core/tests/Drupal/TestSite/Commands/TestSiteInstallCommand.php
@@ -200,9 +200,6 @@ protected function installDrupal() {
$this->initSettings();
$container = $this->initKernel(\Drupal::request());
$this->initConfig($container);
- $this->installDefaultThemeFromClassProperty($container);
- $this->installModulesFromClassProperty($container);
- $this->rebuildAll();
}
/**
diff --git a/web/core/tests/Drupal/TestTools/Comparator/MarkupInterfaceComparator.php b/web/core/tests/Drupal/TestTools/Comparator/MarkupInterfaceComparator.php
new file mode 100644
index 0000000000..71ea80b82d
--- /dev/null
+++ b/web/core/tests/Drupal/TestTools/Comparator/MarkupInterfaceComparator.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Drupal\TestTools\Comparator;
+
+use Drupal\Component\Render\MarkupInterface;
+use SebastianBergmann\Comparator\Comparator;
+
+/**
+ * Compares MarkupInterface objects for equality.
+ */
+class MarkupInterfaceComparator extends Comparator {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function accepts($expected, $actual) {
+ // If at least one argument is a MarkupInterface object, we take over and
+ // convert to strings before comparing.
+ return ($expected instanceof MarkupInterface && $actual instanceof MarkupInterface) ||
+ ($expected instanceof MarkupInterface && is_scalar($actual)) ||
+ (is_scalar($expected) && $actual instanceof MarkupInterface);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function assertEquals($expected, $actual, $delta = 0.0, $canonicalize = FALSE, $ignoreCase = FALSE) {
+ $expected_safe = (string) $expected;
+ $actual_safe = (string) $actual;
+ $comparator = $this->factory->getComparatorFor($expected_safe, $actual_safe);
+ $comparator->assertEquals($expected_safe, $actual_safe, $delta, $canonicalize, $ignoreCase);
+ }
+
+}
diff --git a/web/core/tests/Drupal/TestTools/PhpUnitCompatibility/PhpUnit6/TestCompatibilityTrait.php b/web/core/tests/Drupal/TestTools/PhpUnitCompatibility/PhpUnit6/TestCompatibilityTrait.php
index 92b1b9ebd7..6c7c75572a 100644
--- a/web/core/tests/Drupal/TestTools/PhpUnitCompatibility/PhpUnit6/TestCompatibilityTrait.php
+++ b/web/core/tests/Drupal/TestTools/PhpUnitCompatibility/PhpUnit6/TestCompatibilityTrait.php
@@ -40,17 +40,185 @@ public static function assertFalse($actual, $message = '') {
}
/**
- * {@inheritdoc}
- */
- public static function assertEquals($expected, $actual, $message = '', $delta = 0, $maxDepth = 10, $canonicalize = FALSE, $ignoreCase = FALSE) {
- // Cast objects implementing MarkupInterface to string instead of
- // relying on PHP casting them to string depending on what they are being
- // comparing with.
- if (method_exists(self::class, 'castSafeStrings')) {
- $expected = self::castSafeStrings($expected);
- $actual = self::castSafeStrings($actual);
- }
- parent::assertEquals($expected, $actual, $message, $delta, $maxDepth, $canonicalize, $ignoreCase);
+ * Forward compatibility for assertStringContainsString.
+ */
+ public static function assertStringContainsString($needle, $haystack, $message = '') {
+ static::assertContains((string) $needle, (string) $haystack, $message);
+ }
+
+ /**
+ * Forward compatibility for assertStringContainsStringIgnoringCase.
+ */
+ public static function assertStringContainsStringIgnoringCase($needle, $haystack, $message = '') {
+ static::assertContains((string) $needle, (string) $haystack, $message, TRUE);
+ }
+
+ /**
+ * Forward compatibility for assertStringNotContainsString.
+ */
+ public static function assertStringNotContainsString($needle, $haystack, $message = '') {
+ static::assertNotContains((string) $needle, (string) $haystack, $message);
+ }
+
+ /**
+ * Forward compatibility for assertStringNotContainsStringIgnoringCase.
+ */
+ public static function assertStringNotContainsStringIgnoringCase($needle, $haystack, $message = '') {
+ static::assertNotContains((string) $needle, (string) $haystack, $message, TRUE);
+ }
+
+ /**
+ * Forward compatibility for assertEqualsCanonicalizing.
+ */
+ public static function assertEqualsCanonicalizing($expected, $actual, $message = '') {
+ static::assertEquals($expected, $actual, $message, 0.0, 10, TRUE);
+ }
+
+ /**
+ * Forward compatibility for assertNotEqualsCanonicalizing.
+ */
+ public static function assertNotEqualsCanonicalizing($expected, $actual, $message = '') {
+ static::assertNotEquals($expected, $actual, $message, 0.0, 10, TRUE);
+ }
+
+ /**
+ * Provides forward-compatibility for assertIsArray().
+ */
+ public static function assertIsArray($actual, $message = '') {
+ static::assertInternalType('array', $actual, $message);
+ }
+
+ /**
+ * Provides forward-compatibility for assertIsBool().
+ */
+ public static function assertIsBool($actual, $message = '') {
+ static::assertInternalType('bool', $actual, $message);
+ }
+
+ /**
+ * Provides forward-compatibility for assertIsFloat().
+ */
+ public static function assertIsFloat($actual, $message = '') {
+ static::assertInternalType('float', $actual, $message);
+ }
+
+ /**
+ * Provides forward-compatibility for assertIsInt().
+ */
+ public static function assertIsInt($actual, $message = '') {
+ static::assertInternalType('int', $actual, $message);
+ }
+
+ /**
+ * Provides forward-compatibility for assertIsNumeric().
+ */
+ public static function assertIsNumeric($actual, $message = '') {
+ static::assertInternalType('numeric', $actual, $message);
+ }
+
+ /**
+ * Provides forward-compatibility for assertIsObject().
+ */
+ public static function assertIsObject($actual, $message = '') {
+ static::assertInternalType('object', $actual, $message);
+ }
+
+ /**
+ * Provides forward-compatibility for assertIsResource().
+ */
+ public static function assertIsResource($actual, $message = '') {
+ static::assertInternalType('resource', $actual, $message);
+ }
+
+ /**
+ * Provides forward-compatibility for assertIsString().
+ */
+ public static function assertIsString($actual, $message = '') {
+ static::assertInternalType('string', $actual, $message);
+ }
+
+ /**
+ * Provides forward-compatibility for assertIsScalar().
+ */
+ public static function assertIsScalar($actual, $message = '') {
+ static::assertInternalType('scalar', $actual, $message);
+ }
+
+ /**
+ * Provides forward-compatibility for assertIsCallable().
+ */
+ public static function assertIsCallable($actual, $message = '') {
+ static::assertInternalType('callable', $actual, $message);
+ }
+
+ /**
+ * Provides forward-compatibility for assertIsNotArray().
+ */
+ public static function assertIsNotArray($actual, $message = '') {
+ static::assertNotInternalType('array', $actual, $message);
+ }
+
+ /**
+ * Provides forward-compatibility for assertIsNotBool().
+ */
+ public static function assertIsNotBool($actual, $message = '') {
+ static::assertNotInternalType('bool', $actual, $message);
+ }
+
+ /**
+ * Provides forward-compatibility for assertIsNotFloat().
+ */
+ public static function assertIsNotFloat($actual, $message = '') {
+ static::assertNotInternalType('float', $actual, $message);
+ }
+
+ /**
+ * Provides forward-compatibility for assertIsNotInt().
+ */
+ public static function assertIsNotInt($actual, $message = '') {
+ static::assertNotInternalType('int', $actual, $message);
+ }
+
+ /**
+ * Provides forward-compatibility for assertIsNotNumeric().
+ */
+ public static function assertIsNotNumeric($actual, $message = '') {
+ static::assertNotInternalType('numeric', $actual, $message);
+ }
+
+ /**
+ * Provides forward-compatibility for assertIsNotObject().
+ */
+ public static function assertIsNotObject($actual, $message = '') {
+ static::assertNotInternalType('object', $actual, $message);
+ }
+
+ /**
+ * Provides forward-compatibility for assertIsNotResource().
+ */
+ public static function assertIsNotResource($actual, $message = '') {
+ static::assertNotInternalType('resource', $actual, $message);
+ }
+
+ /**
+ * Provides forward-compatibility for assertIsNotString().
+ */
+ public static function assertIsNotString($actual, $message = '') {
+ static::assertNotInternalType('string', $actual, $message);
+ }
+
+ /**
+ * Provides forward-compatibility for assertIsNotScalar().
+ */
+ public static function assertIsNotScalar($actual, $message = '') {
+ static::assertNotInternalType('scalar', $actual, $message);
+ }
+
+ /**
+ * Provides forward-compatibility for assertIsNotCallable().
+ */
+ public static function assertIsNotCallable($actual, $message = '') {
+ static::assertNotInternalType('callable', $actual, $message);
}
}
diff --git a/web/core/tests/Drupal/TestTools/PhpUnitCompatibility/PhpUnit7/TestCompatibilityTrait.php b/web/core/tests/Drupal/TestTools/PhpUnitCompatibility/PhpUnit7/TestCompatibilityTrait.php
index 3d10e151a9..9c677e1693 100644
--- a/web/core/tests/Drupal/TestTools/PhpUnitCompatibility/PhpUnit7/TestCompatibilityTrait.php
+++ b/web/core/tests/Drupal/TestTools/PhpUnitCompatibility/PhpUnit7/TestCompatibilityTrait.php
@@ -40,17 +40,185 @@ public static function assertFalse($actual, string $message = ''): void {
}
/**
- * {@inheritdoc}
- */
- public static function assertEquals($expected, $actual, string $message = '', float $delta = 0, int $maxDepth = 10, bool $canonicalize = FALSE, bool $ignoreCase = FALSE): void {
- // Cast objects implementing MarkupInterface to string instead of
- // relying on PHP casting them to string depending on what they are being
- // comparing with.
- if (method_exists(self::class, 'castSafeStrings')) {
- $expected = self::castSafeStrings($expected);
- $actual = self::castSafeStrings($actual);
- }
- parent::assertEquals($expected, $actual, $message, $delta, $maxDepth, $canonicalize, $ignoreCase);
+ * Forward compatibility for assertStringContainsString.
+ */
+ public static function assertStringContainsString(string $needle, string $haystack, string $message = ''): void {
+ static::assertContains($needle, $haystack, $message);
+ }
+
+ /**
+ * Forward compatibility for assertStringContainsStringIgnoringCase.
+ */
+ public static function assertStringContainsStringIgnoringCase(string $needle, string $haystack, string $message = ''): void {
+ static::assertContains($needle, $haystack, $message, TRUE);
+ }
+
+ /**
+ * Forward compatibility for assertStringNotContainsString.
+ */
+ public static function assertStringNotContainsString(string $needle, string $haystack, string $message = ''): void {
+ static::assertNotContains($needle, $haystack, $message);
+ }
+
+ /**
+ * Forward compatibility for assertStringNotContainsStringIgnoringCase.
+ */
+ public static function assertStringNotContainsStringIgnoringCase(string $needle, string $haystack, string $message = ''): void {
+ static::assertNotContains($needle, $haystack, $message, TRUE);
+ }
+
+ /**
+ * Forward compatibility for assertEqualsCanonicalizing.
+ */
+ public static function assertEqualsCanonicalizing($expected, $actual, string $message = ''): void {
+ static::assertEquals($expected, $actual, $message, 0.0, 10, TRUE);
+ }
+
+ /**
+ * Forward compatibility for assertNotEqualsCanonicalizing.
+ */
+ public static function assertNotEqualsCanonicalizing($expected, $actual, string $message = ''): void {
+ static::assertNotEquals($expected, $actual, $message, 0.0, 10, TRUE);
+ }
+
+ /**
+ * Provides forward-compatibility for assertIsArray().
+ */
+ public static function assertIsArray($actual, string $message = ''): void {
+ static::assertInternalType('array', $actual, $message);
+ }
+
+ /**
+ * Provides forward-compatibility for assertIsBool().
+ */
+ public static function assertIsBool($actual, string $message = ''): void {
+ static::assertInternalType('bool', $actual, $message);
+ }
+
+ /**
+ * Provides forward-compatibility for assertIsFloat().
+ */
+ public static function assertIsFloat($actual, string $message = ''): void {
+ static::assertInternalType('float', $actual, $message);
+ }
+
+ /**
+ * Provides forward-compatibility for assertIsInt().
+ */
+ public static function assertIsInt($actual, string $message = ''): void {
+ static::assertInternalType('int', $actual, $message);
+ }
+
+ /**
+ * Provides forward-compatibility for assertIsNumeric().
+ */
+ public static function assertIsNumeric($actual, string $message = ''): void {
+ static::assertInternalType('numeric', $actual, $message);
+ }
+
+ /**
+ * Provides forward-compatibility for assertIsObject().
+ */
+ public static function assertIsObject($actual, string $message = ''): void {
+ static::assertInternalType('object', $actual, $message);
+ }
+
+ /**
+ * Provides forward-compatibility for assertIsResource().
+ */
+ public static function assertIsResource($actual, string $message = ''): void {
+ static::assertInternalType('resource', $actual, $message);
+ }
+
+ /**
+ * Provides forward-compatibility for assertIsString().
+ */
+ public static function assertIsString($actual, string $message = ''): void {
+ static::assertInternalType('string', $actual, $message);
+ }
+
+ /**
+ * Provides forward-compatibility for assertIsScalar().
+ */
+ public static function assertIsScalar($actual, string $message = ''): void {
+ static::assertInternalType('scalar', $actual, $message);
+ }
+
+ /**
+ * Provides forward-compatibility for assertIsCallable().
+ */
+ public static function assertIsCallable($actual, string $message = ''): void {
+ static::assertInternalType('callable', $actual, $message);
+ }
+
+ /**
+ * Provides forward-compatibility for assertIsNotArray().
+ */
+ public static function assertIsNotArray($actual, string $message = ''): void {
+ static::assertNotInternalType('array', $actual, $message);
+ }
+
+ /**
+ * Provides forward-compatibility for assertIsNotBool().
+ */
+ public static function assertIsNotBool($actual, string $message = ''): void {
+ static::assertNotInternalType('bool', $actual, $message);
+ }
+
+ /**
+ * Provides forward-compatibility for assertIsNotFloat().
+ */
+ public static function assertIsNotFloat($actual, string $message = ''): void {
+ static::assertNotInternalType('float', $actual, $message);
+ }
+
+ /**
+ * Provides forward-compatibility for assertIsNotInt().
+ */
+ public static function assertIsNotInt($actual, string $message = ''): void {
+ static::assertNotInternalType('int', $actual, $message);
+ }
+
+ /**
+ * Provides forward-compatibility for assertIsNotNumeric().
+ */
+ public static function assertIsNotNumeric($actual, string $message = ''): void {
+ static::assertNotInternalType('numeric', $actual, $message);
+ }
+
+ /**
+ * Provides forward-compatibility for assertIsNotObject().
+ */
+ public static function assertIsNotObject($actual, string $message = ''): void {
+ static::assertNotInternalType('object', $actual, $message);
+ }
+
+ /**
+ * Provides forward-compatibility for assertIsNotResource().
+ */
+ public static function assertIsNotResource($actual, string $message = ''): void {
+ static::assertNotInternalType('resource', $actual, $message);
+ }
+
+ /**
+ * Provides forward-compatibility for assertIsNotString().
+ */
+ public static function assertIsNotString($actual, string $message = ''): void {
+ static::assertNotInternalType('string', $actual, $message);
+ }
+
+ /**
+ * Provides forward-compatibility for assertIsNotScalar().
+ */
+ public static function assertIsNotScalar($actual, string $message = ''): void {
+ static::assertNotInternalType('scalar', $actual, $message);
+ }
+
+ /**
+ * Provides forward-compatibility for assertIsNotCallable().
+ */
+ public static function assertIsNotCallable($actual, string $message = ''): void {
+ static::assertNotInternalType('callable', $actual, $message);
}
}
diff --git a/web/core/tests/Drupal/Tests/BrowserTestBase.php b/web/core/tests/Drupal/Tests/BrowserTestBase.php
index d768bfcc3f..fa318edcc5 100644
--- a/web/core/tests/Drupal/Tests/BrowserTestBase.php
+++ b/web/core/tests/Drupal/Tests/BrowserTestBase.php
@@ -17,6 +17,7 @@
use Drupal\Tests\node\Traits\ContentTypeCreationTrait;
use Drupal\Tests\node\Traits\NodeCreationTrait;
use Drupal\Tests\user\Traits\UserCreationTrait;
+use Drupal\TestTools\Comparator\MarkupInterfaceComparator;
use GuzzleHttp\Cookie\CookieJar;
use PHPUnit\Framework\TestCase;
use Psr\Http\Message\RequestInterface;
@@ -395,6 +396,9 @@ protected function registerSessions() {}
protected function setUp() {
parent::setUp();
+ // Allow tests to compare MarkupInterface objects via assertEquals().
+ $this->registerComparator(new MarkupInterfaceComparator());
+
$this->setupBaseUrl();
// Install Drupal test site.
diff --git a/web/core/tests/Drupal/Tests/Component/Annotation/Doctrine/DocParserTest.php b/web/core/tests/Drupal/Tests/Component/Annotation/Doctrine/DocParserTest.php
index 1e2eec14f9..8c7fc2d253 100644
--- a/web/core/tests/Drupal/Tests/Component/Annotation/Doctrine/DocParserTest.php
+++ b/web/core/tests/Drupal/Tests/Component/Annotation/Doctrine/DocParserTest.php
@@ -9,6 +9,7 @@
use Drupal\Tests\Component\Annotation\Doctrine\Fixtures\AnnotationWithConstants;
use Drupal\Tests\Component\Annotation\Doctrine\Fixtures\ClassWithConstants;
use Drupal\Tests\Component\Annotation\Doctrine\Fixtures\IntefaceWithConstants;
+use Drupal\Tests\PhpunitCompatibilityTrait;
use PHPUnit\Framework\TestCase;
/**
@@ -27,6 +28,7 @@
*/
class DocParserTest extends TestCase
{
+ use PhpunitCompatibilityTrait;
public function testNestedArraysWithNestedAnnotation()
{
$parser = $this->createTestParser();
@@ -35,16 +37,16 @@ public function testNestedArraysWithNestedAnnotation()
$result = $parser->parse('@Name(foo={1,2, {"key"=@Name}})');
$annot = $result[0];
- $this->assertTrue($annot instanceof Name);
+ $this->assertInstanceOf(Name::class, $annot);
$this->assertNull($annot->value);
- $this->assertEquals(3, count($annot->foo));
+ $this->assertCount(3, $annot->foo);
$this->assertEquals(1, $annot->foo[0]);
$this->assertEquals(2, $annot->foo[1]);
- $this->assertTrue(is_array($annot->foo[2]));
+ $this->assertIsArray($annot->foo[2]);
$nestedArray = $annot->foo[2];
$this->assertTrue(isset($nestedArray['key']));
- $this->assertTrue($nestedArray['key'] instanceof Name);
+ $this->assertInstanceOf(Name::class, $nestedArray['key']);
}
public function testBasicAnnotations()
@@ -54,7 +56,7 @@ public function testBasicAnnotations()
// Marker annotation
$result = $parser->parse("@Name");
$annot = $result[0];
- $this->assertTrue($annot instanceof Name);
+ $this->assertInstanceOf(Name::class, $annot);
$this->assertNull($annot->value);
$this->assertNull($annot->foo);
@@ -62,13 +64,13 @@ public function testBasicAnnotations()
$result = $parser->parse('@Name(foo={"key1" = "value1"})');
$annot = $result[0];
$this->assertNull($annot->value);
- $this->assertTrue(is_array($annot->foo));
+ $this->assertIsArray($annot->foo);
$this->assertTrue(isset($annot->foo['key1']));
// Numerical arrays
$result = $parser->parse('@Name({2="foo", 4="bar"})');
$annot = $result[0];
- $this->assertTrue(is_array($annot->value));
+ $this->assertIsArray($annot->value);
$this->assertEquals('foo', $annot->value[2]);
$this->assertEquals('bar', $annot->value[4]);
$this->assertFalse(isset($annot->value[0]));
@@ -79,19 +81,19 @@ public function testBasicAnnotations()
$result = $parser->parse('@Name(@Name, @Name)');
$annot = $result[0];
- $this->assertTrue($annot instanceof Name);
- $this->assertTrue(is_array($annot->value));
- $this->assertTrue($annot->value[0] instanceof Name);
- $this->assertTrue($annot->value[1] instanceof Name);
+ $this->assertInstanceOf(Name::class, $annot);
+ $this->assertIsArray($annot->value);
+ $this->assertInstanceOf(Name::class, $annot->value[0]);
+ $this->assertInstanceOf(Name::class, $annot->value[1]);
// Multiple types as values
$result = $parser->parse('@Name(foo="Bar", @Name, {"key1"="value1", "key2"="value2"})');
$annot = $result[0];
- $this->assertTrue($annot instanceof Name);
- $this->assertTrue(is_array($annot->value));
- $this->assertTrue($annot->value[0] instanceof Name);
- $this->assertTrue(is_array($annot->value[1]));
+ $this->assertInstanceOf(Name::class, $annot);
+ $this->assertIsArray($annot->value);
+ $this->assertInstanceOf(Name::class, $annot->value[0]);
+ $this->assertIsArray($annot->value[1]);
$this->assertEquals('value1', $annot->value[1]['key1']);
$this->assertEquals('value2', $annot->value[1]['key2']);
@@ -106,9 +108,9 @@ public function testBasicAnnotations()
DOCBLOCK;
$result = $parser->parse($docblock);
- $this->assertEquals(1, count($result));
+ $this->assertCount(1, $result);
$annot = $result[0];
- $this->assertTrue($annot instanceof Name);
+ $this->assertInstanceOf(Name::class, $annot);
$this->assertEquals("bar", $annot->foo);
$this->assertNull($annot->value);
}
@@ -121,16 +123,16 @@ public function testDefaultValueAnnotations()
$result = $parser->parse('@Name({"key1"="value1"})');
$annot = $result[0];
- $this->assertTrue($annot instanceof Name);
- $this->assertTrue(is_array($annot->value));
+ $this->assertInstanceOf(Name::class, $annot);
+ $this->assertIsArray($annot->value);
$this->assertEquals('value1', $annot->value['key1']);
// Array as first value and additional values
$result = $parser->parse('@Name({"key1"="value1"}, foo="bar")');
$annot = $result[0];
- $this->assertTrue($annot instanceof Name);
- $this->assertTrue(is_array($annot->value));
+ $this->assertInstanceOf(Name::class, $annot);
+ $this->assertIsArray($annot->value);
$this->assertEquals('value1', $annot->value['key1']);
$this->assertEquals('bar', $annot->foo);
}
@@ -153,9 +155,9 @@ public function testNamespacedAnnotations()
DOCBLOCK;
$result = $parser->parse($docblock);
- $this->assertEquals(1, count($result));
+ $this->assertCount(1, $result);
$annot = $result[0];
- $this->assertTrue($annot instanceof Name);
+ $this->assertInstanceOf(Name::class, $annot);
$this->assertEquals("bar", $annot->foo);
}
@@ -181,14 +183,14 @@ public function testTypicalMethodDocBlock()
DOCBLOCK;
$result = $parser->parse($docblock);
- $this->assertEquals(2, count($result));
+ $this->assertCount(2, $result);
$this->assertTrue(isset($result[0]));
$this->assertTrue(isset($result[1]));
$annot = $result[0];
- $this->assertTrue($annot instanceof Name);
+ $this->assertInstanceOf(Name::class, $annot);
$this->assertEquals("bar", $annot->foo);
$marker = $result[1];
- $this->assertTrue($marker instanceof Marker);
+ $this->assertInstanceOf(Marker::class, $marker);
}
@@ -204,11 +206,11 @@ public function testAnnotationWithoutConstructor()
DOCBLOCK;
$result = $parser->parse($docblock);
- $this->assertEquals(count($result), 1);
+ $this->assertCount(1, $result);
$annot = $result[0];
$this->assertNotNull($annot);
- $this->assertTrue($annot instanceof SomeAnnotationClassNameWithoutConstructor);
+ $this->assertInstanceOf(SomeAnnotationClassNameWithoutConstructor::class, $annot);
$this->assertNull($annot->name);
$this->assertNotNull($annot->data);
@@ -225,11 +227,11 @@ public function testAnnotationWithoutConstructor()
$result = $parser->parse($docblock);
- $this->assertEquals(count($result), 1);
+ $this->assertCount(1, $result);
$annot = $result[0];
$this->assertNotNull($annot);
- $this->assertTrue($annot instanceof SomeAnnotationClassNameWithoutConstructor);
+ $this->assertInstanceOf(SomeAnnotationClassNameWithoutConstructor::class, $annot);
$this->assertEquals($annot->name, "Some Name");
$this->assertEquals($annot->data, "Some data");
@@ -244,7 +246,7 @@ public function testAnnotationWithoutConstructor()
DOCBLOCK;
$result = $parser->parse($docblock);
- $this->assertEquals(count($result), 1);
+ $this->assertCount(1, $result);
$annot = $result[0];
$this->assertEquals($annot->data, "Some data");
@@ -258,7 +260,7 @@ public function testAnnotationWithoutConstructor()
DOCBLOCK;
$result = $parser->parse($docblock);
- $this->assertEquals(count($result), 1);
+ $this->assertCount(1, $result);
$annot = $result[0];
$this->assertEquals($annot->name, "Some name");
@@ -271,7 +273,7 @@ public function testAnnotationWithoutConstructor()
DOCBLOCK;
$result = $parser->parse($docblock);
- $this->assertEquals(count($result), 1);
+ $this->assertCount(1, $result);
$annot = $result[0];
$this->assertEquals($annot->data, "Some data");
@@ -286,7 +288,7 @@ public function testAnnotationWithoutConstructor()
DOCBLOCK;
$result = $parser->parse($docblock);
- $this->assertEquals(count($result), 1);
+ $this->assertCount(1, $result);
$annot = $result[0];
$this->assertEquals($annot->name, "Some name");
@@ -300,7 +302,7 @@ public function testAnnotationWithoutConstructor()
DOCBLOCK;
$result = $parser->parse($docblock);
- $this->assertEquals(count($result), 1);
+ $this->assertCount(1, $result);
$annot = $result[0];
$this->assertEquals($annot->name, "Some name");
@@ -313,8 +315,8 @@ public function testAnnotationWithoutConstructor()
DOCBLOCK;
$result = $parser->parse($docblock);
- $this->assertEquals(count($result), 1);
- $this->assertTrue($result[0] instanceof SomeAnnotationClassNameWithoutConstructorAndProperties);
+ $this->assertCount(1, $result);
+ $this->assertInstanceOf(SomeAnnotationClassNameWithoutConstructorAndProperties::class, $result[0]);
}
public function testAnnotationTarget()
@@ -997,7 +999,7 @@ public function testAnnotationWithoutClassIsIgnoredWithoutWarning()
$parser->setIgnoreNotImportedAnnotations(true);
$result = $parser->parse("@param");
- $this->assertEquals(0, count($result));
+ $this->assertCount(0, $result);
}
/**
@@ -1010,7 +1012,7 @@ public function testNotAnAnnotationClassIsIgnoredWithoutWarning()
$parser->setIgnoredAnnotationNames(array('PHPUnit_Framework_TestCase' => true));
$result = $parser->parse('@PHPUnit_Framework_TestCase');
- $this->assertEquals(0, count($result));
+ $this->assertCount(0, $result);
}
public function testAnnotationDontAcceptSingleQuotes()
@@ -1025,12 +1027,12 @@ public function testAnnotationDontAcceptSingleQuotes()
/**
* @group DCOM-41
*/
- public function testAnnotationDoesntThrowExceptionWhenAtSignIsNotFollowedByIdentifier()
+ public function testAnnotationDoesNotThrowExceptionWhenAtSignIsNotFollowedByIdentifier()
{
$parser = new DocParser();
$result = $parser->parse("'@'");
- $this->assertEquals(0, count($result));
+ $this->assertCount(0, $result);
}
/**
@@ -1060,7 +1062,7 @@ public function testAutoloadAnnotation()
));
$annotations = $parser->parse('@Autoload');
- $this->assertEquals(1, count($annotations));
+ $this->assertCount(1, $annotations);
$this->assertInstanceOf('Drupal\Tests\Component\Annotation\Doctrine\Fixtures\Annotation\Autoload', $annotations[0]);
}
@@ -1108,7 +1110,8 @@ class A {
try {
$parser = $this->createTestParser();
$result = $parser->parse($docblock);
- $this->assertTrue(is_array($result) && empty($result));
+ $this->assertIsArray($result);
+ $this->assertEmpty($result);
} catch (\Exception $e) {
$this->fail($e->getMessage());
}
@@ -1130,7 +1133,8 @@ class A {
try {
$parser = $this->createTestParser();
$result = $parser->parse($docblock);
- $this->assertTrue(is_array($result) && empty($result));
+ $this->assertIsArray($result);
+ $this->assertEmpty($result);
} catch (\Exception $e) {
$this->fail($e->getMessage());
}
@@ -1198,18 +1202,18 @@ public function testReservedKeywordsInAnnotations()
$parser = $this->createTestParser();
$result = $parser->parse('@Drupal\Tests\Component\Annotation\Doctrine\True');
- $this->assertTrue($result[0] instanceof True);
+ $this->assertInstanceOf(True::class, $result[0]);
$result = $parser->parse('@Drupal\Tests\Component\Annotation\Doctrine\False');
- $this->assertTrue($result[0] instanceof False);
+ $this->assertInstanceOf(False::class, $result[0]);
$result = $parser->parse('@Drupal\Tests\Component\Annotation\Doctrine\Null');
- $this->assertTrue($result[0] instanceof Null);
+ $this->assertInstanceOf(Null::class, $result[0]);
$result = $parser->parse('@True');
- $this->assertTrue($result[0] instanceof True);
+ $this->assertInstanceOf(True::class, $result[0]);
$result = $parser->parse('@False');
- $this->assertTrue($result[0] instanceof False);
+ $this->assertInstanceOf(False::class, $result[0]);
$result = $parser->parse('@Null');
- $this->assertTrue($result[0] instanceof Null);
+ $this->assertInstanceOf(Null::class, $result[0]);
}
public function testSetValuesExeption()
@@ -1243,7 +1247,7 @@ public function testTrailingCommaIsAllowed()
"Foo",
"Bar",
})');
- $this->assertEquals(1, count($annots));
+ $this->assertCount(1, $annots);
$this->assertEquals(array('Foo', 'Bar'), $annots[0]->value);
}
@@ -1252,7 +1256,7 @@ public function testDefaultAnnotationValueIsNotOverwritten()
$parser = $this->createTestParser();
$annots = $parser->parse('@Drupal\Tests\Component\Annotation\Doctrine\Fixtures\Annotation\AnnotWithDefaultValue');
- $this->assertEquals(1, count($annots));
+ $this->assertCount(1, $annots);
$this->assertEquals('bar', $annots[0]->foo);
}
@@ -1261,7 +1265,7 @@ public function testArrayWithColon()
$parser = $this->createTestParser();
$annots = $parser->parse('@Name({"foo": "bar"})');
- $this->assertEquals(1, count($annots));
+ $this->assertCount(1, $annots);
$this->assertEquals(array('foo' => 'bar'), $annots[0]->value);
}
@@ -1282,7 +1286,7 @@ public function testEmptyArray()
$parser = $this->createTestParser();
$annots = $parser->parse('@Name({"foo": {}})');
- $this->assertEquals(1, count($annots));
+ $this->assertCount(1, $annots);
$this->assertEquals(array('foo' => array()), $annots[0]->value);
}
@@ -1291,7 +1295,7 @@ public function testKeyHasNumber()
$parser = $this->createTestParser();
$annots = $parser->parse('@SettingsAnnotation(foo="test", bar2="test")');
- $this->assertEquals(1, count($annots));
+ $this->assertCount(1, $annots);
$this->assertEquals(array('foo' => 'test', 'bar2' => 'test'), $annots[0]->settings);
}
@@ -1304,7 +1308,7 @@ public function testSupportsEscapedQuotedValues()
$this->assertCount(1, $result);
- $this->assertTrue($result[0] instanceof Name);
+ $this->assertInstanceOf(Name::class, $result[0]);
$this->assertEquals('"bar"', $result[0]->foo);
}
}
diff --git a/web/core/tests/Drupal/Tests/Component/Annotation/Doctrine/Ticket/DCOM58Test.php b/web/core/tests/Drupal/Tests/Component/Annotation/Doctrine/Ticket/DCOM58Test.php
index 96c9b608eb..3179b30c96 100644
--- a/web/core/tests/Drupal/Tests/Component/Annotation/Doctrine/Ticket/DCOM58Test.php
+++ b/web/core/tests/Drupal/Tests/Component/Annotation/Doctrine/Ticket/DCOM58Test.php
@@ -37,7 +37,7 @@ public function testIssueGlobalNamespace()
$annots = $parser->parse($docblock);
- $this->assertEquals(1, count($annots));
+ $this->assertCount(1, $annots);
$this->assertInstanceOf("Drupal\Tests\Component\Annotation\Doctrine\Ticket\Doctrine\ORM\Mapping\Entity", $annots[0]);
}
@@ -49,7 +49,7 @@ public function testIssueNamespaces()
$annots = $parser->parse($docblock);
- $this->assertEquals(1, count($annots));
+ $this->assertCount(1, $annots);
$this->assertInstanceOf("Drupal\Tests\Component\Annotation\Doctrine\Ticket\Doctrine\ORM\Entity", $annots[0]);
}
@@ -62,7 +62,7 @@ public function testIssueMultipleNamespaces()
$annots = $parser->parse($docblock);
- $this->assertEquals(1, count($annots));
+ $this->assertCount(1, $annots);
$this->assertInstanceOf("Drupal\Tests\Component\Annotation\Doctrine\Ticket\Doctrine\ORM\Mapping\Entity", $annots[0]);
}
@@ -72,9 +72,9 @@ public function testIssueWithNamespacesOrImports()
$parser = new DocParser();
$annots = $parser->parse($docblock);
- $this->assertEquals(1, count($annots));
+ $this->assertCount(1, $annots);
$this->assertInstanceOf("Entity", $annots[0]);
- $this->assertEquals(1, count($annots));
+ $this->assertCount(1, $annots);
}
@@ -84,7 +84,7 @@ public function testIssueSimpleAnnotationReader()
$reader->addNamespace('Drupal\Tests\Component\Annotation\Doctrine\Ticket\Doctrine\ORM\Mapping');
$annots = $reader->getClassAnnotations(new \ReflectionClass(__NAMESPACE__."\MappedClass"));
- $this->assertEquals(1, count($annots));
+ $this->assertCount(1, $annots);
$this->assertInstanceOf("Drupal\Tests\Component\Annotation\Doctrine\Ticket\Doctrine\ORM\Mapping\Entity", $annots[0]);
}
diff --git a/web/core/tests/Drupal/Tests/Component/Bridge/ZfExtensionManagerSfContainerTest.php b/web/core/tests/Drupal/Tests/Component/Bridge/ZfExtensionManagerSfContainerTest.php
index dcad80f8da..88cac103dd 100644
--- a/web/core/tests/Drupal/Tests/Component/Bridge/ZfExtensionManagerSfContainerTest.php
+++ b/web/core/tests/Drupal/Tests/Component/Bridge/ZfExtensionManagerSfContainerTest.php
@@ -6,8 +6,8 @@
use PHPUnit\Framework\TestCase;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
-use Zend\Feed\Reader\Extension\Atom\Entry;
-use Zend\Feed\Reader\StandaloneExtensionManager;
+use Laminas\Feed\Reader\Extension\Atom\Entry;
+use Laminas\Feed\Reader\StandaloneExtensionManager;
/**
* @coversDefaultClass \Drupal\Component\Bridge\ZfExtensionManagerSfContainer
@@ -59,7 +59,7 @@ public function testHas() {
*/
public function testSetStandaloneException() {
$this->expectException(\RuntimeException::class);
- $this->expectExceptionMessage('Drupal\Tests\Component\Bridge\ZfExtensionManagerSfContainerTest must implement Zend\Feed\Reader\ExtensionManagerInterface or Zend\Feed\Writer\ExtensionManagerInterface');
+ $this->expectExceptionMessage('Drupal\Tests\Component\Bridge\ZfExtensionManagerSfContainerTest must implement Laminas\Feed\Reader\ExtensionManagerInterface or Laminas\Feed\Writer\ExtensionManagerInterface');
$bridge = new ZfExtensionManagerSfContainer();
$bridge->setStandalone(static::class);
}
diff --git a/web/core/tests/Drupal/Tests/Component/DependencyInjection/ContainerTest.php b/web/core/tests/Drupal/Tests/Component/DependencyInjection/ContainerTest.php
index f2fc10dd7b..40d4988e60 100644
--- a/web/core/tests/Drupal/Tests/Component/DependencyInjection/ContainerTest.php
+++ b/web/core/tests/Drupal/Tests/Component/DependencyInjection/ContainerTest.php
@@ -154,7 +154,7 @@ public function testGet() {
// Retrieve services of the container.
$other_service_class = $this->containerDefinition['services']['other.service']['class'];
$other_service = $this->container->get('other.service');
- $this->assertInstanceOf($other_service_class, $other_service, 'other.service has the right class.');
+ $this->assertInstanceOf($other_service_class, $other_service);
$some_parameter = $this->containerDefinition['parameters']['some_config'];
$some_other_parameter = $this->containerDefinition['parameters']['some_other_config'];
@@ -194,7 +194,7 @@ public function testGetForClassFromParameter() {
$other_service_class = $this->containerDefinition['parameters']['some_parameter_class'];
$other_service = $container->get('other.service_class_from_parameter');
- $this->assertInstanceOf($other_service_class, $other_service, 'other.service_class_from_parameter has the right class.');
+ $this->assertInstanceOf($other_service_class, $other_service);
}
/**
@@ -273,7 +273,7 @@ public function testGetForSerializedServiceDefinition() {
// Retrieve services of the container.
$other_service_class = $this->containerDefinition['services']['other.service']['class'];
$other_service = $container->get('other.service');
- $this->assertInstanceOf($other_service_class, $other_service, 'other.service has the right class.');
+ $this->assertInstanceOf($other_service_class, $other_service);
$service = $container->get('service.provider');
$this->assertEquals($other_service, $service->getSomeOtherService(), '@other.service was injected via constructor.');
diff --git a/web/core/tests/Drupal/Tests/Component/Graph/GraphTest.php b/web/core/tests/Drupal/Tests/Component/Graph/GraphTest.php
index 940217c64f..eb7d7e3cbd 100644
--- a/web/core/tests/Drupal/Tests/Component/Graph/GraphTest.php
+++ b/web/core/tests/Drupal/Tests/Component/Graph/GraphTest.php
@@ -149,7 +149,7 @@ protected function assertComponents($graph, $expected_components) {
$result_components[] = $graph[$vertex]['component'];
unset($unassigned_vertices[$vertex]);
}
- $this->assertEquals(1, count(array_unique($result_components)), sprintf('Expected one unique component for vertices %s, got %s', $this->displayArray($component), $this->displayArray($result_components)));
+ $this->assertCount(1, array_unique($result_components), sprintf('Expected one unique component for vertices %s, got %s', $this->displayArray($component), $this->displayArray($result_components)));
}
$this->assertEquals([], $unassigned_vertices, sprintf('Vertices not assigned to a component: %s', $this->displayArray($unassigned_vertices, TRUE)));
}
diff --git a/web/core/tests/Drupal/Tests/Component/PhpStorage/FileStorageReadOnlyTest.php b/web/core/tests/Drupal/Tests/Component/PhpStorage/FileStorageReadOnlyTest.php
index 991006b5a2..a54f5abd0a 100644
--- a/web/core/tests/Drupal/Tests/Component/PhpStorage/FileStorageReadOnlyTest.php
+++ b/web/core/tests/Drupal/Tests/Component/PhpStorage/FileStorageReadOnlyTest.php
@@ -108,7 +108,7 @@ public function testDeleteAll() {
$this->assertFalse($php_read->deleteAll());
// Make sure directory exists prior to removal.
- $this->assertTrue(file_exists($this->directory . '/test'), 'File storage directory does not exist.');
+ $this->assertDirectoryExists($this->directory . '/test');
}
}
diff --git a/web/core/tests/Drupal/Tests/Component/PhpStorage/FileStorageTest.php b/web/core/tests/Drupal/Tests/Component/PhpStorage/FileStorageTest.php
index 891a1dcceb..c7c83b0723 100644
--- a/web/core/tests/Drupal/Tests/Component/PhpStorage/FileStorageTest.php
+++ b/web/core/tests/Drupal/Tests/Component/PhpStorage/FileStorageTest.php
@@ -78,11 +78,11 @@ public function testDeleteAll() {
$this->assertTrue($GLOBALS[$random], 'File saved correctly with correct value');
// Make sure directory exists prior to removal.
- $this->assertTrue(file_exists($this->directory . '/test'), 'File storage directory does not exist.');
+ $this->assertDirectoryExists($this->directory . '/test');
$this->assertTrue($php->deleteAll(), 'Delete all reported success');
$this->assertFalse($php->load($name));
- $this->assertFalse(file_exists($this->directory . '/test'), 'File storage directory does not exist after call to deleteAll()');
+ $this->assertDirectoryNotExists($this->directory . '/test');
// Should still return TRUE if directory has already been deleted.
$this->assertTrue($php->deleteAll(), 'Delete all succeeds with nothing to delete');
diff --git a/web/core/tests/Drupal/Tests/Component/PhpStorage/MTimeProtectedFileStorageBase.php b/web/core/tests/Drupal/Tests/Component/PhpStorage/MTimeProtectedFileStorageBase.php
index ad78951713..cd68de55a3 100644
--- a/web/core/tests/Drupal/Tests/Component/PhpStorage/MTimeProtectedFileStorageBase.php
+++ b/web/core/tests/Drupal/Tests/Component/PhpStorage/MTimeProtectedFileStorageBase.php
@@ -91,7 +91,7 @@ public function testSecurity() {
// Ensure the file exists and that it and the containing directory have
// minimal permissions. fileperms() can return high bits unrelated to
// permissions, so mask with 0777.
- $this->assertTrue(file_exists($expected_filename));
+ $this->assertFileExists($expected_filename);
$this->assertSame(0444, fileperms($expected_filename) & 0777);
$this->assertSame(0777, fileperms($expected_directory) & 0777);
diff --git a/web/core/tests/Drupal/Tests/Component/Render/FormattableMarkupTest.php b/web/core/tests/Drupal/Tests/Component/Render/FormattableMarkupTest.php
index 27445b151b..67a8a39dfe 100644
--- a/web/core/tests/Drupal/Tests/Component/Render/FormattableMarkupTest.php
+++ b/web/core/tests/Drupal/Tests/Component/Render/FormattableMarkupTest.php
@@ -93,7 +93,7 @@ public function providerTestUnexpectedPlaceholder() {
return [
['Non alpha starting character: ~placeholder', ['~placeholder' => 'replaced'], E_USER_ERROR, 'Invalid placeholder (~placeholder) in string: Non alpha starting character: ~placeholder'],
['Alpha starting character: placeholder', ['placeholder' => 'replaced'], E_USER_DEPRECATED, 'Invalid placeholder (placeholder) in string: Alpha starting character: placeholder'],
- // Ensure that where the placeholder is located in the the string is
+ // Ensure that where the placeholder is located in the string is
// irrelevant.
['placeholder', ['placeholder' => 'replaced'], E_USER_DEPRECATED, 'Invalid placeholder (placeholder) in string: placeholder'],
];
diff --git a/web/core/tests/Drupal/Tests/Component/Serialization/YamlTest.php b/web/core/tests/Drupal/Tests/Component/Serialization/YamlTest.php
index f68013bfdc..51233d6e3d 100644
--- a/web/core/tests/Drupal/Tests/Component/Serialization/YamlTest.php
+++ b/web/core/tests/Drupal/Tests/Component/Serialization/YamlTest.php
@@ -126,7 +126,7 @@ public function providerYamlFilesInCore() {
if ($dir->getExtension() == 'yml' && strpos($pathname, '/../../../../../node_modules') === FALSE) {
if (strpos($dir->getRealPath(), 'invalid_file') !== FALSE) {
// There are some intentionally invalid files provided for testing
- // library API behaviours, ignore them.
+ // library API behaviors, ignore them.
continue;
}
$files[] = [$dir->getRealPath()];
diff --git a/web/core/tests/Drupal/Tests/Component/Utility/NumberTest.php b/web/core/tests/Drupal/Tests/Component/Utility/NumberTest.php
index 1fc05d3ad7..0c5a5fa507 100644
--- a/web/core/tests/Drupal/Tests/Component/Utility/NumberTest.php
+++ b/web/core/tests/Drupal/Tests/Component/Utility/NumberTest.php
@@ -93,9 +93,9 @@ public static function providerTestValidStep() {
}
/**
- * Data provider for \Drupal\Test\Component\Utility\NumberTest::testValidStepOffset().
+ * Data provider for \Drupal\Tests\Component\Utility\NumberTest::testValidStepOffset().
*
- * @see \Drupal\Test\Component\Utility\NumberTest::testValidStepOffset()
+ * @see \Drupal\Tests\Component\Utility\NumberTest::testValidStepOffset()
*/
public static function providerTestValidStepOffset() {
return [
diff --git a/web/core/tests/Drupal/Tests/Component/Utility/SafeMarkupTest.php b/web/core/tests/Drupal/Tests/Component/Utility/SafeMarkupTest.php
index 7de1a39eea..5d565522d0 100644
--- a/web/core/tests/Drupal/Tests/Component/Utility/SafeMarkupTest.php
+++ b/web/core/tests/Drupal/Tests/Component/Utility/SafeMarkupTest.php
@@ -61,7 +61,7 @@ public function testIsSafe() {
*/
public function testCheckPlain($text, $expected, $message) {
$result = SafeMarkup::checkPlain($text);
- $this->assertTrue($result instanceof HtmlEscapedText);
+ $this->assertInstanceOf(HtmlEscapedText::class, $result);
$this->assertEquals($expected, $result, $message);
}
@@ -129,7 +129,12 @@ public function testFormat($string, array $args, $expected, $message, $expected_
$result = SafeMarkup::format($string, $args);
$this->assertEquals($expected, (string) $result, $message);
- $this->assertEquals($expected_is_safe, $result instanceof MarkupInterface, 'SafeMarkup::format correctly sets the result as safe or not safe.');
+ if ($expected_is_safe) {
+ $this->assertInstanceOf(MarkupInterface::class, $result);
+ }
+ else {
+ $this->assertNotInstanceOf(MarkupInterface::class, $result);
+ }
}
/**
diff --git a/web/core/tests/Drupal/Tests/Component/Utility/SortArrayTest.php b/web/core/tests/Drupal/Tests/Component/Utility/SortArrayTest.php
index ab2447065a..8a16b8796a 100644
--- a/web/core/tests/Drupal/Tests/Component/Utility/SortArrayTest.php
+++ b/web/core/tests/Drupal/Tests/Component/Utility/SortArrayTest.php
@@ -3,6 +3,7 @@
namespace Drupal\Tests\Component\Utility;
use Drupal\Component\Utility\SortArray;
+use Drupal\Tests\PhpunitCompatibilityTrait;
use PHPUnit\Framework\TestCase;
/**
@@ -14,6 +15,8 @@
*/
class SortArrayTest extends TestCase {
+ use PhpunitCompatibilityTrait;
+
/**
* Tests SortArray::sortByWeightElement() input against expected output.
*
@@ -316,7 +319,8 @@ public function providerSortByTitleProperty() {
* Actual comparison function return value.
*/
protected function assertBothNegativePositiveOrZero($expected, $result) {
- $this->assertTrue(is_numeric($expected) && is_numeric($result), 'Parameters are numeric.');
+ $this->assertIsNumeric($expected);
+ $this->assertIsNumeric($result);
$this->assertTrue(($expected < 0 && $result < 0) || ($expected > 0 && $result > 0) || ($expected === 0 && $result === 0), 'Numbers are either both negative, both positive or both zero.');
}
diff --git a/web/core/tests/Drupal/Tests/Component/Utility/UrlHelperTest.php b/web/core/tests/Drupal/Tests/Component/Utility/UrlHelperTest.php
index 7b9bd1c40e..613ecfffbe 100644
--- a/web/core/tests/Drupal/Tests/Component/Utility/UrlHelperTest.php
+++ b/web/core/tests/Drupal/Tests/Component/Utility/UrlHelperTest.php
@@ -599,7 +599,7 @@ public function providerTestExternalIsLocal() {
['http://example.com/foo', 'http://example.com/bar', FALSE],
['http://example.com', 'http://example.com/bar', FALSE],
['http://example.com/bar', 'http://example.com/bar/', FALSE],
- // Ensure \ is normalised to / since some browsers do that.
+ // Ensure \ is normalized to / since some browsers do that.
['http://www.example.ca\@example.com', 'http://example.com', FALSE],
// Some browsers ignore or strip leading control characters.
["\x00//www.example.ca", 'http://example.com', FALSE],
diff --git a/web/core/tests/Drupal/Tests/Component/Utility/XssTest.php b/web/core/tests/Drupal/Tests/Component/Utility/XssTest.php
index 695b4278ed..742a26d69e 100644
--- a/web/core/tests/Drupal/Tests/Component/Utility/XssTest.php
+++ b/web/core/tests/Drupal/Tests/Component/Utility/XssTest.php
@@ -247,7 +247,7 @@ public function providerTestFilterXssNotNormalized() {
[
'<blockquote><script>alert(0)</script></blockquote>',
'script',
- 'HTML tag stripping evasion -- script in a blockqoute.',
+ 'HTML tag stripping evasion -- script in a blockquote.',
['blockquote'],
],
[
diff --git a/web/core/tests/Drupal/Tests/Composer/ComposerTest.php b/web/core/tests/Drupal/Tests/Composer/ComposerTest.php
index 7728187888..2e1d1bdfab 100644
--- a/web/core/tests/Drupal/Tests/Composer/ComposerTest.php
+++ b/web/core/tests/Drupal/Tests/Composer/ComposerTest.php
@@ -25,23 +25,4 @@ public function testEnsureComposerVersion() {
}
}
- /**
- * Verify that Composer::ensureBehatDriverVersions() detects a good version.
- *
- * @covers::ensureBehatDriverVersions
- */
- public function testEnsureBehatDriverVersions() {
- // First call 'ensureBehatDriverVersions' test directly using Drupal's
- // composer.lock. It should not fail.
- chdir($this->root);
- $this->assertNull(Composer::ensureBehatDriverVersions());
-
- // Next, call 'ensureBehatDriverVersions' again, this time using a fixture
- // with a known-bad version number.
- $this->expectException(\RuntimeException::class);
- $this->expectExceptionMessageRegExp('#^Drupal requires behat/mink-selenium2-driver:1.3.x-dev#');
- chdir(__DIR__ . '/fixtures/ensureBehatDriverVersionsFixture');
- $this->assertNull(Composer::ensureBehatDriverVersions());
- }
-
}
diff --git a/web/core/tests/Drupal/Tests/Composer/Generator/BuilderTest.php b/web/core/tests/Drupal/Tests/Composer/Generator/BuilderTest.php
index f402b9d2c9..962486e16a 100644
--- a/web/core/tests/Drupal/Tests/Composer/Generator/BuilderTest.php
+++ b/web/core/tests/Drupal/Tests/Composer/Generator/BuilderTest.php
@@ -49,7 +49,7 @@ public function builderTestData() {
'license' => 'GPL-2.0-or-later',
'require' =>
[
- 'behat/mink' => '1.8.0 | 1.7.1.1 | 1.7.x-dev',
+ 'behat/mink' => '^1.8',
],
'conflict' =>
[
@@ -68,7 +68,7 @@ public function builderTestData() {
'require' =>
[
'drupal/core' => Composer::drupalVersionBranch(),
- 'behat/mink' => '1.8.0 | 1.7.1.1 | 1.7.x-dev',
+ 'behat/mink' => 'v1.8.0',
'symfony/css-selector' => 'v4.3.5',
],
'conflict' =>
diff --git a/web/core/tests/Drupal/Tests/Composer/Generator/Fixtures.php b/web/core/tests/Drupal/Tests/Composer/Generator/Fixtures.php
index eccac2c12b..5de506456f 100644
--- a/web/core/tests/Drupal/Tests/Composer/Generator/Fixtures.php
+++ b/web/core/tests/Drupal/Tests/Composer/Generator/Fixtures.php
@@ -33,12 +33,13 @@ protected function composerJson() {
'license' => 'GPL-2.0-or-later',
'require' =>
[
+ 'composer/installers' => '^1.9',
'php' => '>=7.0.8',
'symfony/yaml' => '~3.4.5',
],
'require-dev' =>
[
- 'behat/mink' => '1.7.x-dev',
+ 'behat/mink' => '^1.8',
],
];
}
@@ -59,6 +60,15 @@ protected function composerLock() {
'content-hash' => 'da9910627bab73a256b39ceda83d7167',
'packages' =>
[
+ [
+ 'name' => "composer/installers",
+ 'version' => 'v1.9.0',
+ 'source' => [
+ 'type' => 'git',
+ 'url' => 'https://github.com/composer/installers.git',
+ 'reference' => 'b93bcf0fa1fccb0b7d176b0967d969691cd74cca',
+ ],
+ ],
[
'name' => 'symfony/polyfill-ctype',
'version' => 'v1.12.0',
@@ -84,12 +94,12 @@ protected function composerLock() {
[
[
'name' => 'behat/mink',
- 'version' => 'dev-master',
+ 'version' => 'v1.8.0',
'source' =>
[
'type' => 'git',
'url' => 'https://github.com/minkphp/Mink.git',
- 'reference' => 'a534fe7dac9525e8e10ca68e737c3d7e5058ec83',
+ 'reference' => 'e1772aabb6b654464264a6cc72158c8b3409d8bc',
],
],
[
diff --git a/web/core/tests/Drupal/Tests/Composer/Generator/OverlapWithTopLevelDependenciesTest.php b/web/core/tests/Drupal/Tests/Composer/Generator/OverlapWithTopLevelDependenciesTest.php
new file mode 100644
index 0000000000..fbbf6ac926
--- /dev/null
+++ b/web/core/tests/Drupal/Tests/Composer/Generator/OverlapWithTopLevelDependenciesTest.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace Drupal\Tests\Composer\Generator;
+
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Tests DrupalCoreRecommendedBuilder.
+ *
+ * @group Metapackage
+ */
+class OverlapWithTopLevelDependenciesTest extends TestCase {
+
+ /**
+ * Provides data for testOverlapWithTemplateProject().
+ */
+ public function templateProjectPathProvider() {
+ return [
+ [
+ 'composer/Template/RecommendedProject',
+ ],
+ [
+ 'composer/Template/LegacyProject',
+ ],
+ ];
+ }
+
+ /**
+ * Tests top level and core-recommended dependencies do not overlap.
+ *
+ * @dataProvider templateProjectPathProvider
+ *
+ * @param string $template_project_path
+ * The path of the project template to test.
+ */
+ public function testOverlapWithTemplateProject($template_project_path) {
+ $root = dirname(__DIR__, 6);
+ // Read template project composer.json.
+ $top_level_composer_json = json_decode(file_get_contents("$root/$template_project_path/composer.json"), TRUE);
+
+ // Read drupal/core-recommended composer.json.
+ $core_recommended_composer_json = json_decode(file_get_contents("$root/composer/Metapackage/CoreRecommended/composer.json"), TRUE);
+
+ // Fail if any required project in the require section of the template
+ // project also exists in core/recommended.
+ foreach ($top_level_composer_json['require'] as $project => $version_constraint) {
+ $this->assertArrayNotHasKey($project, $core_recommended_composer_json['require'], "Pinned project $project is also a top-level dependency of $template_project_path. This can expose a Composer bug. See https://www.drupal.org/project/drupal/issues/3134648 and https://github.com/composer/composer/issues/8882");
+ }
+ }
+
+}
diff --git a/web/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/AssertUtilsTrait.php b/web/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/AssertUtilsTrait.php
index 2f39d832ec..55e7bac127 100644
--- a/web/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/AssertUtilsTrait.php
+++ b/web/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/AssertUtilsTrait.php
@@ -20,7 +20,7 @@ trait AssertUtilsTrait {
protected function assertScaffoldedFile($path, $is_link, $contents_contains) {
$this->assertFileExists($path);
$contents = file_get_contents($path);
- $this->assertContains($contents_contains, basename($path) . ': ' . $contents);
+ $this->assertStringContainsString($contents_contains, basename($path) . ': ' . $contents);
$this->assertSame($is_link, is_link($path));
}
@@ -38,7 +38,7 @@ protected function assertScaffoldedFileDoesNotContain($path, $contents_not_conta
return;
}
$contents = file_get_contents($path);
- $this->assertNotContains($contents_not_contains, $contents, basename($path) . ' contains unexpected contents:');
+ $this->assertStringNotContainsString($contents_not_contains, $contents, basename($path) . ' contains unexpected contents:');
}
}
diff --git a/web/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Functional/ComposerHookTest.php b/web/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Functional/ComposerHookTest.php
index c8e18e1b03..0c9063d981 100644
--- a/web/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Functional/ComposerHookTest.php
+++ b/web/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Functional/ComposerHookTest.php
@@ -6,6 +6,7 @@
use Drupal\Tests\Composer\Plugin\Scaffold\AssertUtilsTrait;
use Drupal\Tests\Composer\Plugin\Scaffold\ExecTrait;
use Drupal\Tests\Composer\Plugin\Scaffold\Fixtures;
+use Drupal\Tests\PhpunitCompatibilityTrait;
use PHPUnit\Framework\TestCase;
/**
@@ -25,16 +26,7 @@
class ComposerHookTest extends TestCase {
use ExecTrait;
use AssertUtilsTrait;
-
- /**
- * The root of this project.
- *
- * Used to substitute this project's base directory into composer.json files
- * so Composer can find it.
- *
- * @var string
- */
- protected $projectRoot;
+ use PhpunitCompatibilityTrait;
/**
* Directory to perform the tests in.
@@ -64,7 +56,9 @@ protected function setUp() {
$this->fileSystem = new Filesystem();
$this->fixtures = new Fixtures();
$this->fixtures->createIsolatedComposerCacheDir();
- $this->projectRoot = $this->fixtures->projectRoot();
+ $this->fixturesDir = $this->fixtures->tmpDir($this->getName());
+ $replacements = ['SYMLINK' => 'false', 'PROJECT_ROOT' => $this->fixtures->projectRoot()];
+ $this->fixtures->cloneFixtureProjects($this->fixturesDir, $replacements);
}
/**
@@ -79,9 +73,6 @@ protected function tearDown() {
* Test to see if scaffold operation runs at the correct times.
*/
public function testComposerHooks() {
- $this->fixturesDir = $this->fixtures->tmpDir($this->getName());
- $replacements = ['SYMLINK' => 'false', 'PROJECT_ROOT' => $this->projectRoot];
- $this->fixtures->cloneFixtureProjects($this->fixturesDir, $replacements);
$topLevelProjectDir = 'composer-hooks-fixture';
$sut = $this->fixturesDir . '/' . $topLevelProjectDir;
// First test: run composer install. This is the same as composer update
@@ -96,7 +87,7 @@ public function testComposerHooks() {
$this->assertScaffoldedFile($sut . '/sites/default/default.settings.php', FALSE, 'scaffolded from the scaffold-override-fixture');
// Make sure that the appropriate notice informing us that scaffolding
// is allowed was printed.
- $this->assertContains('Package fixtures/scaffold-override-fixture has scaffold operations, and is already allowed in the root-level composer.json file.', $stdout);
+ $this->assertStringContainsString('Package fixtures/scaffold-override-fixture has scaffold operations, and is already allowed in the root-level composer.json file.', $stdout);
// Delete one scaffold file, just for test purposes, then run
// 'composer update' and see if the scaffold file is replaced.
@unlink($sut . '/sites/default/default.settings.php');
@@ -123,7 +114,7 @@ public function testComposerHooks() {
$filesystem->remove($sut);
$stdout = $this->mustExec("composer create-project --repository=packages.json fixtures/drupal-drupal {$sut}", $this->fixturesDir, ['COMPOSER_MIRROR_PATH_REPOS' => 1]);
$this->assertDirectoryExists($sut);
- $this->assertContains('Scaffolding files for fixtures/drupal-drupal', $stdout);
+ $this->assertStringContainsString('Scaffolding files for fixtures/drupal-drupal', $stdout);
$this->assertScaffoldedFile($sut . '/index.php', FALSE, 'Test version of index.php from drupal/core');
$topLevelProjectDir = 'composer-hooks-nothing-allowed-fixture';
$sut = $this->fixturesDir . '/' . $topLevelProjectDir;
@@ -133,7 +124,32 @@ public function testComposerHooks() {
// get a warning, and it does not scaffold.
$stdout = $this->mustExec("composer require --no-ansi --no-interaction fixtures/scaffold-override-fixture:dev-master", $sut);
$this->assertFileNotExists($sut . '/sites/default/default.settings.php');
- $this->assertContains("Not scaffolding files for fixtures/scaffold-override-fixture, because it is not listed in the element 'extra.drupal-scaffold.allowed-packages' in the root-level composer.json file.", $stdout);
+ $this->assertStringContainsString("Not scaffolding files for fixtures/scaffold-override-fixture, because it is not listed in the element 'extra.drupal-scaffold.allowed-packages' in the root-level composer.json file.", $stdout);
+ }
+
+ /**
+ * Test to see if scaffold messages are omitted when running scaffold twice.
+ */
+ public function testScaffoldMessagesDoNotPrintTwice() {
+ $topLevelProjectDir = 'drupal-drupal';
+ $sut = $this->fixturesDir . '/' . $topLevelProjectDir;
+ // First test: run composer install. This is the same as composer update
+ // since there is no lock file. Ensure that scaffold operation ran.
+ $stdout = $this->mustExec("composer install --no-ansi", $sut);
+
+ $this->assertStringContainsString('- Copy [web-root]/index.php from assets/index.php', $stdout);
+ $this->assertStringContainsString('- Copy [web-root]/update.php from assets/update.php', $stdout);
+
+ // Run scaffold operation again. It should not print anything.
+ $stdout = $this->mustExec("composer scaffold --no-ansi", $sut);
+
+ $this->assertEquals('', $stdout);
+
+ // Delete a file and run it again. It should re-scaffold the removed file.
+ unlink("$sut/index.php");
+ $stdout = $this->mustExec("composer scaffold --no-ansi", $sut);
+ $this->assertStringContainsString('- Copy [web-root]/index.php from assets/index.php', $stdout);
+ $this->assertStringNotContainsString('- Copy [web-root]/update.php from assets/update.php', $stdout);
}
}
diff --git a/web/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Functional/ManageGitIgnoreTest.php b/web/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Functional/ManageGitIgnoreTest.php
index ea965164b1..48ef80fc91 100644
--- a/web/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Functional/ManageGitIgnoreTest.php
+++ b/web/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Functional/ManageGitIgnoreTest.php
@@ -6,6 +6,7 @@
use Drupal\Tests\Composer\Plugin\Scaffold\Fixtures;
use Drupal\Tests\Composer\Plugin\Scaffold\AssertUtilsTrait;
use Drupal\Tests\Composer\Plugin\Scaffold\ExecTrait;
+use Drupal\Tests\PhpunitCompatibilityTrait;
use PHPUnit\Framework\TestCase;
/**
@@ -20,6 +21,7 @@
class ManageGitIgnoreTest extends TestCase {
use ExecTrait;
use AssertUtilsTrait;
+ use PhpunitCompatibilityTrait;
/**
* The root of this project.
diff --git a/web/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Functional/ScaffoldTest.php b/web/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Functional/ScaffoldTest.php
index 948dd8aa12..b1bde4af93 100644
--- a/web/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Functional/ScaffoldTest.php
+++ b/web/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Functional/ScaffoldTest.php
@@ -6,6 +6,7 @@
use Drupal\Tests\Composer\Plugin\Scaffold\AssertUtilsTrait;
use Drupal\Tests\Composer\Plugin\Scaffold\Fixtures;
use Drupal\Tests\Composer\Plugin\Scaffold\ScaffoldTestResult;
+use Drupal\Tests\PhpunitCompatibilityTrait;
use PHPUnit\Framework\TestCase;
/**
@@ -18,6 +19,7 @@
*/
class ScaffoldTest extends TestCase {
use AssertUtilsTrait;
+ use PhpunitCompatibilityTrait;
/**
* The root of this project.
@@ -182,7 +184,7 @@ public function testEmptyProject() {
$fixture_name = 'empty-fixture';
$result = $this->scaffoldSut($fixture_name, FALSE, FALSE);
- $this->assertContains('Nothing scaffolded because no packages are allowed in the top-level composer.json file', $result->scaffoldOutput());
+ $this->assertStringContainsString('Nothing scaffolded because no packages are allowed in the top-level composer.json file', $result->scaffoldOutput());
}
/**
@@ -192,7 +194,7 @@ public function testProjectThatScaffoldsEmptyProject() {
$fixture_name = 'project-allowing-empty-fixture';
$is_link = FALSE;
$result = $this->scaffoldSut($fixture_name, FALSE, FALSE);
- $this->assertContains('The allowed package fixtures/empty-fixture does not provide a file mapping for Composer Scaffold', $result->scaffoldOutput());
+ $this->assertStringContainsString('The allowed package fixtures/empty-fixture does not provide a file mapping for Composer Scaffold', $result->scaffoldOutput());
$this->assertCommonDrupalAssetsWereScaffolded($result->docroot(), FALSE);
$this->assertAutoloadFileCorrect($result->docroot());
}
@@ -343,7 +345,7 @@ protected function scaffoldAppendTestValuesToPermute($is_link) {
*/
public function testDrupalDrupalFileWasAppended($fixture_name, $is_link, $scaffold_file_path, $scaffold_file_contents, $scaffoldOutputContains) {
$result = $this->scaffoldSut($fixture_name, $is_link, FALSE);
- $this->assertContains($scaffoldOutputContains, $result->scaffoldOutput());
+ $this->assertStringContainsString($scaffoldOutputContains, $result->scaffoldOutput());
$this->assertScaffoldedFile($result->docroot() . '/' . $scaffold_file_path, FALSE, $scaffold_file_contents);
$this->assertCommonDrupalAssetsWereScaffolded($result->docroot(), $is_link);
@@ -422,7 +424,7 @@ protected function assertAutoloadFileCorrect($docroot, $relocated_docroot = FALS
$expected = "return require __DIR__ . '/../vendor/autoload.php';";
}
- $this->assertContains($expected, $contents);
+ $this->assertStringContainsString($expected, $contents);
}
}
diff --git a/web/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Functional/ScaffoldUpgradeTest.php b/web/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Functional/ScaffoldUpgradeTest.php
new file mode 100644
index 0000000000..b5af25fc6b
--- /dev/null
+++ b/web/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Functional/ScaffoldUpgradeTest.php
@@ -0,0 +1,122 @@
+<?php
+
+namespace Drupal\Tests\Composer\Plugin\Scaffold\Functional;
+
+use Composer\Util\Filesystem;
+use Drupal\Tests\Composer\Plugin\Scaffold\AssertUtilsTrait;
+use Drupal\Tests\Composer\Plugin\Scaffold\ExecTrait;
+use Drupal\Tests\Composer\Plugin\Scaffold\Fixtures;
+use Drupal\Tests\PhpunitCompatibilityTrait;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Tests Upgrading the Composer Scaffold plugin.
+ *
+ * Upgrading a Composer plugin can be a dangerous operation. If the plugin
+ * instantiates any classes during the activate method, and the plugin code
+ * is subsequentially modified by a `composer update` operation, then any
+ * post-update hook (& etc.) may run with inconsistent code, leading to
+ * runtime errors. This test ensures that it is possible to upgrade from the
+ * last available stable 8.8.x tag to the current Scaffold plugin code (e.g. in
+ * the current patch-under-test).
+ *
+ * @group Scaffold
+ */
+class ScaffoldUpgradeTest extends TestCase {
+
+ use AssertUtilsTrait;
+ use ExecTrait;
+ use PhpunitCompatibilityTrait;
+
+ /**
+ * The Fixtures object.
+ *
+ * @var \Drupal\Tests\Composer\Plugin\Scaffold\Fixtures
+ */
+ protected $fixtures;
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function setUp() {
+ $this->fixtures = new Fixtures();
+ $this->fixtures->createIsolatedComposerCacheDir();
+ }
+
+ /**
+ * Test upgrading the Composer Scaffold plugin.
+ */
+ public function testScaffoldUpgrade() {
+ $composerVersionLine = exec('composer --version');
+ if (strpos($composerVersionLine, 'Composer version 2') !== FALSE) {
+ $this->markTestSkipped('We cannot run the scaffold upgrade test with Composer 2 until we have a stable version of drupal/core-composer-scaffold to start from that we can install with Composer 2.x.');
+ }
+ $this->fixturesDir = $this->fixtures->tmpDir($this->getName());
+ $replacements = ['SYMLINK' => 'false', 'PROJECT_ROOT' => $this->fixtures->projectRoot()];
+ $this->fixtures->cloneFixtureProjects($this->fixturesDir, $replacements);
+ $topLevelProjectDir = 'drupal-drupal';
+ $sut = $this->fixturesDir . '/' . $topLevelProjectDir;
+
+ // First step: set up the Scaffold plug in. Ensure that scaffold operation
+ // ran. This is more of a control than a test.
+ $this->mustExec("composer install --no-ansi", $sut);
+ $this->assertScaffoldedFile($sut . '/sites/default/default.settings.php', FALSE, 'A settings.php fixture file scaffolded from the scaffold-override-fixture');
+
+ // Next, bring back packagist.org and install core-composer-scaffold:8.8.0.
+ // Packagist is disabled in the fixture; we bring it back by removing the
+ // line that disables it.
+ $this->mustExec("composer config --unset repositories.packagist.org", $sut);
+ $stdout = $this->mustExec("composer require --no-ansi drupal/core-composer-scaffold:8.8.0 --no-plugins 2>&1", $sut);
+ $this->assertStringContainsString(" - Installing drupal/core-composer-scaffold (8.8.0):", $stdout);
+
+ // We can't force the path repo to re-install over the stable version
+ // without removing it, and removing it masks the bugs we are testing for.
+ // We will therefore make a git repo so that we can tag an explicit version
+ // to require.
+ $testVersion = '99.99.99';
+ $scaffoldPluginTmpRepo = $this->createTmpRepo($this->fixtures->projectRoot(), $this->fixturesDir, $testVersion);
+
+ // Disable packagist.org and upgrade back to the Scaffold plugin under test.
+ // This puts the `"packagist.org": false` config line back in composer.json
+ // so that Packagist will no longer be used.
+ $this->mustExec("composer config repositories.packagist.org false", $sut);
+ $this->mustExec("composer config repositories.composer-scaffold vcs 'file:///$scaffoldPluginTmpRepo'", $sut);
+
+ // Using 'mustExec' was giving a strange binary string here.
+ $output = $this->mustExec("composer require --no-ansi drupal/core-composer-scaffold:$testVersion 2>&1", $sut);
+ $this->assertStringContainsString("Installing drupal/core-composer-scaffold ($testVersion)", $output);
+
+ // Remove a scaffold file and run the scaffold command again to prove that
+ // scaffolding is still working.
+ unlink("$sut/index.php");
+ $stdout = $this->mustExec("composer scaffold", $sut);
+ $this->assertStringContainsString("Scaffolding files for", $stdout);
+ $this->assertFileExists("$sut/index.php");
+ }
+
+ /**
+ * Copy the provided source directory and create a temporary git repository.
+ *
+ * @param string $source
+ * Path to directory to copy.
+ * @param string $destParent
+ * Path to location to create git repository.
+ * @param string $version
+ * Version to tag the repository with.
+ * @return string
+ * Path to temporary git repository.
+ */
+ protected function createTmpRepo($source, $destParent, $version) {
+ $target = $destParent . '/' . basename($source);
+ $filesystem = new Filesystem();
+ $filesystem->copy($source, $target);
+ $this->mustExec("git init", $target);
+ $this->mustExec('git config user.email "scaffoldtest@example.com"', $target);
+ $this->mustExec('git config user.name "Scaffold Test"', $target);
+ $this->mustExec("git add .", $target);
+ $this->mustExec("git commit -m 'Initial commit'", $target);
+ $this->mustExec("git tag $version", $target);
+ return $target;
+ }
+
+}
diff --git a/web/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Integration/AppendOpTest.php b/web/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Integration/AppendOpTest.php
index d5fadedec1..5cdc648146 100644
--- a/web/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Integration/AppendOpTest.php
+++ b/web/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Integration/AppendOpTest.php
@@ -5,6 +5,7 @@
use Drupal\Composer\Plugin\Scaffold\Operations\AppendOp;
use Drupal\Composer\Plugin\Scaffold\ScaffoldOptions;
use Drupal\Tests\Composer\Plugin\Scaffold\Fixtures;
+use Drupal\Tests\PhpunitCompatibilityTrait;
use PHPUnit\Framework\TestCase;
/**
@@ -13,6 +14,7 @@
* @group Scaffold
*/
class AppendOpTest extends TestCase {
+ use PhpunitCompatibilityTrait;
/**
* @covers ::process
@@ -29,14 +31,9 @@ public function testProcess() {
$prepend = $fixtures->sourcePath('drupal-drupal-test-append', 'prepend-to-robots.txt');
$append = $fixtures->sourcePath('drupal-drupal-test-append', 'append-to-robots.txt');
- $sut = new AppendOp($prepend, $append);
+ $sut = new AppendOp($prepend, $append, TRUE);
+ $sut->scaffoldAtNewLocation($destination);
- // Test the system under test.
- $sut->process($destination, $fixtures->io(), $options);
- // Assert that the target file was created.
- $this->assertFileExists($destination->fullPath());
- // Assert the target contained the contents from the correct scaffold files.
- $contents = trim(file_get_contents($destination->fullPath()));
$expected = <<<EOT
# robots.txt fixture scaffolded from "file-mappings" in drupal-drupal-test-append composer.json fixture.
# This content is prepended to the top of the existing robots.txt fixture.
@@ -48,11 +45,21 @@ public function testProcess() {
# This content is appended to the bottom of the existing robots.txt fixture.
# robots.txt fixture scaffolded from "file-mappings" in drupal-drupal-test-append composer.json fixture.
EOT;
+
+ $pre_calculated_contents = $sut->contents();
+ $this->assertEquals(trim($expected), trim($pre_calculated_contents));
+
+ // Test the system under test.
+ $sut->process($destination, $fixtures->io(), $options);
+ // Assert that the target file was created.
+ $this->assertFileExists($destination->fullPath());
+ // Assert the target contained the contents from the correct scaffold files.
+ $contents = trim(file_get_contents($destination->fullPath()));
$this->assertEquals(trim($expected), $contents);
// Confirm that expected output was written to our io fixture.
$output = $fixtures->getOutput();
- $this->assertContains('Prepend to [web-root]/robots.txt from assets/prepend-to-robots.txt', $output);
- $this->assertContains('Append to [web-root]/robots.txt from assets/append-to-robots.txt', $output);
+ $this->assertStringContainsString('Prepend to [web-root]/robots.txt from assets/prepend-to-robots.txt', $output);
+ $this->assertStringContainsString('Append to [web-root]/robots.txt from assets/append-to-robots.txt', $output);
}
}
diff --git a/web/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Integration/ReplaceOpTest.php b/web/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Integration/ReplaceOpTest.php
index ee6bb73a8d..aac77a61ee 100644
--- a/web/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Integration/ReplaceOpTest.php
+++ b/web/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Integration/ReplaceOpTest.php
@@ -5,6 +5,7 @@
use Drupal\Composer\Plugin\Scaffold\Operations\ReplaceOp;
use Drupal\Composer\Plugin\Scaffold\ScaffoldOptions;
use Drupal\Tests\Composer\Plugin\Scaffold\Fixtures;
+use Drupal\Tests\PhpunitCompatibilityTrait;
use PHPUnit\Framework\TestCase;
/**
@@ -13,6 +14,7 @@
* @group Scaffold
*/
class ReplaceOpTest extends TestCase {
+ use PhpunitCompatibilityTrait;
/**
* @covers ::process
@@ -34,7 +36,7 @@ public function testProcess() {
$this->assertEquals('# Test version of robots.txt from drupal/core.', $contents);
// Confirm that expected output was written to our io fixture.
$output = $fixtures->getOutput();
- $this->assertContains('Copy [web-root]/robots.txt from assets/robots.txt', $output);
+ $this->assertStringContainsString('Copy [web-root]/robots.txt from assets/robots.txt', $output);
}
}
diff --git a/web/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Integration/ScaffoldFileCollectionTest.php b/web/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Integration/ScaffoldFileCollectionTest.php
index b970798862..69b8acfeb5 100644
--- a/web/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Integration/ScaffoldFileCollectionTest.php
+++ b/web/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Integration/ScaffoldFileCollectionTest.php
@@ -4,7 +4,7 @@
use PHPUnit\Framework\TestCase;
use Drupal\Tests\Composer\Plugin\Scaffold\Fixtures;
-use Drupal\Composer\Plugin\Scaffold\Operations\ConjunctionOp;
+use Drupal\Composer\Plugin\Scaffold\Operations\AppendOp;
use Drupal\Composer\Plugin\Scaffold\Operations\SkipOp;
use Drupal\Composer\Plugin\Scaffold\Operations\ScaffoldFileCollection;
@@ -41,8 +41,8 @@ public function testCreate() {
// Confirm that the keys of the output are the same as the keys of the
// input.
$this->assertEquals(array_keys($scaffold_file_fixtures), array_keys($resolved_file_mappings));
- // '[web-root]/robots.txt' is now a SkipOp, as it is now part of a
- // conjunction operation.
+ // '[web-root]/robots.txt' is now a SkipOp, as it is now part of an
+ // append operation.
$this->assertEquals([
'[web-root]/index.php',
'[web-root]/.htaccess',
@@ -62,8 +62,8 @@ public function testCreate() {
// Test that .htaccess is skipped.
$this->assertInstanceOf(SkipOp::class, $resolved_file_mappings['fixtures/drupal-assets-fixture']['[web-root]/.htaccess']->op());
- // Test that the expected conjunction operation exists.
- $this->assertInstanceOf(ConjunctionOp::class, $resolved_file_mappings['fixtures/drupal-drupal']['[web-root]/robots.txt']->op());
+ // Test that the expected append operation exists.
+ $this->assertInstanceOf(AppendOp::class, $resolved_file_mappings['fixtures/drupal-drupal']['[web-root]/robots.txt']->op());
}
}
diff --git a/web/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Integration/SkipOpTest.php b/web/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Integration/SkipOpTest.php
index 75c07a1f6e..cc5b02e541 100644
--- a/web/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Integration/SkipOpTest.php
+++ b/web/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Integration/SkipOpTest.php
@@ -5,6 +5,7 @@
use Drupal\Composer\Plugin\Scaffold\Operations\SkipOp;
use Drupal\Composer\Plugin\Scaffold\ScaffoldOptions;
use Drupal\Tests\Composer\Plugin\Scaffold\Fixtures;
+use Drupal\Tests\PhpunitCompatibilityTrait;
use PHPUnit\Framework\TestCase;
/**
@@ -13,6 +14,7 @@
* @group Scaffold
*/
class SkipOpTest extends TestCase {
+ use PhpunitCompatibilityTrait;
/**
* @covers ::process
@@ -30,7 +32,7 @@ public function testProcess() {
$this->assertFileNotExists($destination->fullPath());
// Confirm that expected output was written to our io fixture.
$output = $fixtures->getOutput();
- $this->assertContains('Skip [web-root]/robots.txt: disabled', $output);
+ $this->assertStringContainsString('Skip [web-root]/robots.txt: disabled', $output);
}
}
diff --git a/web/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-drupal/composer.json.tmpl b/web/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-drupal/composer.json.tmpl
index 96959916a8..00a91d7959 100644
--- a/web/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-drupal/composer.json.tmpl
+++ b/web/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/fixtures/drupal-drupal/composer.json.tmpl
@@ -46,7 +46,6 @@
"fixtures/scaffold-override-fixture"
],
"gitignore": false,
- "overwrite": true,
"symlink": __SYMLINK__,
"file-mapping": {
"[web-root]/.htaccess": false,
diff --git a/web/core/tests/Drupal/Tests/ComposerIntegrationTest.php b/web/core/tests/Drupal/Tests/ComposerIntegrationTest.php
index a7eaa6fff4..89294f3a44 100644
--- a/web/core/tests/Drupal/Tests/ComposerIntegrationTest.php
+++ b/web/core/tests/Drupal/Tests/ComposerIntegrationTest.php
@@ -43,7 +43,7 @@ public function testComposerTilde($path) {
if (strpos($dependency, 'symfony/') === 0) {
continue;
}
- $this->assertFalse(strpos($version, '~'), "Dependency $dependency in $path contains a tilde, use a caret.");
+ $this->assertStringNotContainsString('~', $version, "Dependency $dependency in $path contains a tilde, use a caret.");
}
}
}
diff --git a/web/core/tests/Drupal/Tests/Core/Access/AccessManagerTest.php b/web/core/tests/Drupal/Tests/Core/Access/AccessManagerTest.php
index 01be76e5bf..d958ca0cf4 100644
--- a/web/core/tests/Drupal/Tests/Core/Access/AccessManagerTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Access/AccessManagerTest.php
@@ -108,9 +108,9 @@ protected function setUp() {
$this->routeProvider = $this->createMock('Drupal\Core\Routing\RouteProviderInterface');
$map = [];
foreach ($this->routeCollection->all() as $name => $route) {
- $map[] = [$name, [], $route];
+ $map[] = [$name, $route];
}
- $map[] = ['test_route_4', ['value' => 'example'], $this->routeCollection->get('test_route_4')];
+ $map[] = ['test_route_4', $this->routeCollection->get('test_route_4')];
$this->routeProvider->expects($this->any())
->method('getRouteByName')
->will($this->returnValueMap($map));
@@ -371,7 +371,7 @@ public function testCheckNamedRouteWithUpcastedValues() {
$this->routeProvider = $this->createMock('Drupal\Core\Routing\RouteProviderInterface');
$this->routeProvider->expects($this->any())
->method('getRouteByName')
- ->with('test_route_1', ['value' => 'example'])
+ ->with('test_route_1')
->will($this->returnValue($route));
$map = [];
@@ -420,7 +420,7 @@ public function testCheckNamedRouteWithDefaultValue() {
$this->routeProvider = $this->createMock('Drupal\Core\Routing\RouteProviderInterface');
$this->routeProvider->expects($this->any())
->method('getRouteByName')
- ->with('test_route_1', [])
+ ->with('test_route_1')
->will($this->returnValue($route));
$map = [];
diff --git a/web/core/tests/Drupal/Tests/Core/Access/AccessResultTest.php b/web/core/tests/Drupal/Tests/Core/Access/AccessResultTest.php
index d311cdd436..3af1fc6bba 100644
--- a/web/core/tests/Drupal/Tests/Core/Access/AccessResultTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Access/AccessResultTest.php
@@ -538,7 +538,7 @@ public function testInheritCacheability() {
// andIf(); 1st has defaults, 2nd has custom tags, contexts and max-age.
$access = AccessResult::allowed();
$other = AccessResult::allowed()->setCacheMaxAge(1500)->cachePerPermissions()->addCacheTags(['node:20011988']);
- $this->assertTrue($access->inheritCacheability($other) instanceof AccessResult);
+ $this->assertInstanceOf(AccessResult::class, $access->inheritCacheability($other));
$this->assertSame(['user.permissions'], $access->getCacheContexts());
$this->assertSame(['node:20011988'], $access->getCacheTags());
$this->assertSame(1500, $access->getCacheMaxAge());
@@ -546,7 +546,7 @@ public function testInheritCacheability() {
// andIf(); 1st has custom tags, max-age, 2nd has custom contexts and max-age.
$access = AccessResult::allowed()->cachePerUser()->setCacheMaxAge(43200);
$other = AccessResult::forbidden()->addCacheTags(['node:14031991'])->setCacheMaxAge(86400);
- $this->assertTrue($access->inheritCacheability($other) instanceof AccessResult);
+ $this->assertInstanceOf(AccessResult::class, $access->inheritCacheability($other));
$this->assertSame(['user'], $access->getCacheContexts());
$this->assertSame(['node:14031991'], $access->getCacheTags());
$this->assertSame(43200, $access->getCacheMaxAge());
@@ -865,13 +865,13 @@ public function testAndOrCacheabilityPropagation(AccessResultInterface $first, $
throw new \LogicException('Invalid operator specified');
}
if ($implements_cacheable_dependency_interface) {
- $this->assertTrue($result instanceof CacheableDependencyInterface, 'Result is an instance of CacheableDependencyInterface.');
+ $this->assertInstanceOf(CacheableDependencyInterface::class, $result);
if ($result instanceof CacheableDependencyInterface) {
$this->assertSame($is_cacheable, $result->getCacheMaxAge() !== 0, 'getCacheMaxAge() matches expectations.');
}
}
else {
- $this->assertFalse($result instanceof CacheableDependencyInterface, 'Result is not an instance of CacheableDependencyInterface.');
+ $this->assertNotInstanceOf(CacheableDependencyInterface::class, $result);
}
}
diff --git a/web/core/tests/Drupal/Tests/Core/Access/CsrfTokenGeneratorTest.php b/web/core/tests/Drupal/Tests/Core/Access/CsrfTokenGeneratorTest.php
index b950a39e98..826b4f397c 100644
--- a/web/core/tests/Drupal/Tests/Core/Access/CsrfTokenGeneratorTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Access/CsrfTokenGeneratorTest.php
@@ -83,7 +83,7 @@ protected function setupDefaultExpectations() {
public function testGet() {
$this->setupDefaultExpectations();
- $this->assertInternalType('string', $this->generator->get());
+ $this->assertIsString($this->generator->get());
$this->assertNotSame($this->generator->get(), $this->generator->get($this->randomMachineName()));
$this->assertNotSame($this->generator->get($this->randomMachineName()), $this->generator->get($this->randomMachineName()));
}
@@ -107,7 +107,7 @@ public function testGenerateSeedOnGet() {
->method('setCsrfTokenSeed')
->with($this->isType('string'));
- $this->assertInternalType('string', $this->generator->get());
+ $this->assertIsString($this->generator->get());
}
/**
diff --git a/web/core/tests/Drupal/Tests/Core/Assert/AssertLegacyTraitTest.php b/web/core/tests/Drupal/Tests/Core/Assert/AssertLegacyTraitTest.php
index 9d9b75e2b4..392f6a3a5c 100644
--- a/web/core/tests/Drupal/Tests/Core/Assert/AssertLegacyTraitTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Assert/AssertLegacyTraitTest.php
@@ -156,7 +156,7 @@ public function testAssertOptionSelectedFail() {
/**
* @covers ::assertNoPattern
- * @expectedDeprecation AssertLegacyTrait::assertNoPattern() is deprecated in drupal:8.4.0 and is removed from drupal:10.0.0. Use $this->assertSession()->responseNotMatches() instead. See https://www.drupal.org/node/2864262
+ * @expectedDeprecation AssertLegacyTrait::assertNoPattern() is deprecated in drupal:8.4.0 and is removed from drupal:10.0.0. Use $this->assertSession()->responseNotMatches() instead. See https://www.drupal.org/node/3129738
*/
public function testAssertNoPattern() {
$this->webAssert
@@ -168,7 +168,7 @@ public function testAssertNoPattern() {
/**
* @covers ::assertNoCacheTag
- * @expectedDeprecation AssertLegacyTrait::assertNoCacheTag() is deprecated in drupal:8.4.0 and is removed from drupal:10.0.0. Use $this->assertSession()->responseHeaderNotContains() instead. See https://www.drupal.org/node/2864029
+ * @expectedDeprecation AssertLegacyTrait::assertNoCacheTag() is deprecated in drupal:8.4.0 and is removed from drupal:10.0.0. Use $this->assertSession()->responseHeaderNotContains() instead. See https://www.drupal.org/node/3129738
*/
public function testAssertNoCacheTag() {
$this->webAssert
diff --git a/web/core/tests/Drupal/Tests/Core/Asset/CssCollectionGrouperUnitTest.php b/web/core/tests/Drupal/Tests/Core/Asset/CssCollectionGrouperUnitTest.php
index 3b56cbd5fc..25628271f8 100644
--- a/web/core/tests/Drupal/Tests/Core/Asset/CssCollectionGrouperUnitTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Asset/CssCollectionGrouperUnitTest.php
@@ -104,7 +104,7 @@ public function testGrouper() {
$groups = $this->grouper->group($css_assets);
- $this->assertSame(5, count($groups), "5 groups created.");
+ $this->assertCount(5, $groups, "5 groups created.");
// Check group 1.
$group = $groups[0];
@@ -112,7 +112,7 @@ public function testGrouper() {
$this->assertSame('file', $group['type']);
$this->assertSame('all', $group['media']);
$this->assertSame(TRUE, $group['preprocess']);
- $this->assertSame(3, count($group['items']));
+ $this->assertCount(3, $group['items']);
$this->assertContains($css_assets['system.base.css'], $group['items']);
$this->assertContains($css_assets['js.module.css'], $group['items']);
@@ -122,7 +122,7 @@ public function testGrouper() {
$this->assertSame('file', $group['type']);
$this->assertSame('all', $group['media']);
$this->assertSame(TRUE, $group['preprocess']);
- $this->assertSame(1, count($group['items']));
+ $this->assertCount(1, $group['items']);
$this->assertContains($css_assets['field.css'], $group['items']);
// Check group 3.
@@ -131,7 +131,7 @@ public function testGrouper() {
$this->assertSame('external', $group['type']);
$this->assertSame('all', $group['media']);
$this->assertSame(TRUE, $group['preprocess']);
- $this->assertSame(1, count($group['items']));
+ $this->assertCount(1, $group['items']);
$this->assertContains($css_assets['external.css'], $group['items']);
// Check group 4.
@@ -140,7 +140,7 @@ public function testGrouper() {
$this->assertSame('file', $group['type']);
$this->assertSame('all', $group['media']);
$this->assertSame(TRUE, $group['preprocess']);
- $this->assertSame(1, count($group['items']));
+ $this->assertCount(1, $group['items']);
$this->assertContains($css_assets['elements.css'], $group['items']);
// Check group 5.
@@ -149,7 +149,7 @@ public function testGrouper() {
$this->assertSame('file', $group['type']);
$this->assertSame('print', $group['media']);
$this->assertSame(TRUE, $group['preprocess']);
- $this->assertSame(1, count($group['items']));
+ $this->assertCount(1, $group['items']);
$this->assertContains($css_assets['print.css'], $group['items']);
}
diff --git a/web/core/tests/Drupal/Tests/Core/Asset/LibrariesDirectoryFileFinderTest.php b/web/core/tests/Drupal/Tests/Core/Asset/LibrariesDirectoryFileFinderTest.php
new file mode 100644
index 0000000000..a347200ad8
--- /dev/null
+++ b/web/core/tests/Drupal/Tests/Core/Asset/LibrariesDirectoryFileFinderTest.php
@@ -0,0 +1,88 @@
+<?php
+
+namespace Drupal\Tests\Core\Asset;
+
+use Drupal\Core\Asset\LibrariesDirectoryFileFinder;
+use Drupal\Core\Extension\ProfileExtensionList;
+use Drupal\Tests\UnitTestCase;
+use org\bovigo\vfs\vfsStream;
+
+/**
+ * @coversDefaultClass \Drupal\Core\Asset\LibrariesDirectoryFileFinder
+ * @group Asset
+ */
+class LibrariesDirectoryFileFinderTest extends UnitTestCase {
+
+ /**
+ * @covers ::find
+ */
+ public function testFind() {
+ // Place a library file in all the possible locations.
+ $structure = [
+ 'sites' => [
+ 'example.com' => [
+ 'libraries' => [
+ 'third_party_library' => [
+ 'css' => [
+ 'example.css' => '/*Some css*/',
+ ],
+ ],
+ ],
+ ],
+ ],
+ 'libraries' => [
+ 'third_party_library' => [
+ 'css' => [
+ 'example.css' => '/*Some css*/',
+ ],
+ ],
+ ],
+ 'profiles' => [
+ 'library_testing' => [
+ 'libraries' => [
+ 'third_party_library' => [
+ 'css' => [
+ 'example.css' => '/*Some css*/',
+ ],
+ ],
+ ],
+ ],
+ ],
+ ];
+ vfsStream::setup('root', NULL, $structure);
+
+ $extension_list = $this->prophesize(ProfileExtensionList::class);
+ $extension_list->getPath('library_testing')->willReturn('profiles/library_testing');
+
+ $finder = new LibrariesDirectoryFileFinder('vfs://root', 'sites/example.com', $extension_list->reveal(), 'library_testing');
+
+ // The site specific location is the first location used.
+ $path = $finder->find('third_party_library/css/example.css');
+ $this->assertEquals('sites/example.com/libraries/third_party_library/css/example.css', $path);
+
+ // After removing the site specific location the root libraries folder
+ // should be used.
+ unlink('vfs://root/sites/example.com/libraries/third_party_library/css/example.css');
+ $path = $finder->find('third_party_library/css/example.css');
+ $this->assertEquals('libraries/third_party_library/css/example.css', $path);
+
+ // The profile's libraries is now the only remaining location.
+ unlink('vfs://root/libraries/third_party_library/css/example.css');
+ $path = $finder->find('third_party_library/css/example.css');
+ $this->assertEquals('profiles/library_testing/libraries/third_party_library/css/example.css', $path);
+
+ // If the libraries file cannot be found FALSE is returned.
+ unlink('vfs://root/profiles/library_testing/libraries/third_party_library/css/example.css');
+ $this->assertFalse($finder->find('third_party_library/css/example.css'));
+
+ // Test finding by the directory only. As all the directories still we'll
+ // find the first location.
+ $path = $finder->find('third_party_library');
+ $this->assertEquals('sites/example.com/libraries/third_party_library', $path);
+ }
+
+}
+
+if (!defined('DRUPAL_MINIMUM_PHP')) {
+ define('DRUPAL_MINIMUM_PHP', '7.0.8');
+}
diff --git a/web/core/tests/Drupal/Tests/Core/Asset/LibraryDiscoveryParserTest.php b/web/core/tests/Drupal/Tests/Core/Asset/LibraryDiscoveryParserTest.php
index 222537e268..7fc84a4278 100644
--- a/web/core/tests/Drupal/Tests/Core/Asset/LibraryDiscoveryParserTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Asset/LibraryDiscoveryParserTest.php
@@ -10,6 +10,7 @@
use Drupal\Core\Asset\Exception\IncompleteLibraryDefinitionException;
use Drupal\Core\Asset\Exception\InvalidLibraryFileException;
use Drupal\Core\Asset\Exception\LibraryDefinitionMissingLicenseException;
+use Drupal\Core\Asset\LibrariesDirectoryFileFinder;
use Drupal\Core\Asset\LibraryDiscoveryParser;
use Drupal\Core\StreamWrapper\StreamWrapperManagerInterface;
use Drupal\Tests\UnitTestCase;
@@ -62,6 +63,13 @@ class LibraryDiscoveryParserTest extends UnitTestCase {
*/
protected $streamWrapperManager;
+ /**
+ * The mocked libraries directory file finder.
+ *
+ * @var \Drupal\Core\Asset\LibrariesDirectoryFileFinder||\PHPUnit\Framework\MockObject\MockObject
+ */
+ protected $librariesDirectoryFileFinder;
+
/**
* {@inheritdoc}
*/
@@ -80,7 +88,8 @@ protected function setUp() {
->method('getActiveTheme')
->willReturn($mock_active_theme);
$this->streamWrapperManager = $this->createMock(StreamWrapperManagerInterface::class);
- $this->libraryDiscoveryParser = new TestLibraryDiscoveryParser($this->root, $this->moduleHandler, $this->themeManager, $this->streamWrapperManager);
+ $this->librariesDirectoryFileFinder = $this->createMock(LibrariesDirectoryFileFinder::class);
+ $this->libraryDiscoveryParser = new TestLibraryDiscoveryParser($this->root, $this->moduleHandler, $this->themeManager, $this->streamWrapperManager, $this->librariesDirectoryFileFinder);
}
/**
@@ -227,7 +236,7 @@ public function testVersion() {
$libraries = $this->libraryDiscoveryParser->buildByExtension('versions');
- $this->assertFalse(array_key_exists('version', $libraries['versionless']));
+ $this->assertArrayNotHasKey('version', $libraries['versionless']);
$this->assertEquals(-1, $libraries['versionless']['css'][0]['version']);
$this->assertEquals(-1, $libraries['versionless']['js'][0]['version']);
@@ -577,6 +586,64 @@ public function providerTestCssAssert() {
];
}
+ /**
+ * @covers ::buildByExtension
+ */
+ public function testNonCoreLibrariesFound() {
+ $this->moduleHandler->expects($this->atLeastOnce())
+ ->method('moduleExists')
+ ->with('example_contrib_module')
+ ->will($this->returnValue(TRUE));
+
+ $path = __DIR__ . '/library_test_files';
+ $path = substr($path, strlen($this->root) + 1);
+ $this->libraryDiscoveryParser->setPaths('module', 'example_contrib_module', $path);
+
+ $this->librariesDirectoryFileFinder->expects($this->once())
+ ->method('find')
+ ->with('third_party_library/css/example.css')
+ ->will($this->returnValue('sites/example.com/libraries/third_party_library/css/example.css'));
+
+ $libraries = $this->libraryDiscoveryParser->buildByExtension('example_contrib_module');
+ $library = $libraries['third_party_library'];
+
+ $this->assertCount(0, $library['js']);
+ $this->assertCount(1, $library['css']);
+ $this->assertCount(0, $library['dependencies']);
+ // The location is determined by the libraries directory file finder.
+ $this->assertEquals('sites/example.com/libraries/third_party_library/css/example.css', $library['css'][0]['data']);
+ }
+
+ /**
+ * @covers ::buildByExtension
+ */
+ public function testNonCoreLibrariesNotFound() {
+ $this->moduleHandler->expects($this->atLeastOnce())
+ ->method('moduleExists')
+ ->with('example_contrib_module')
+ ->will($this->returnValue(TRUE));
+
+ $path = __DIR__ . '/library_test_files';
+ $path = substr($path, strlen($this->root) + 1);
+ $this->libraryDiscoveryParser->setPaths('module', 'example_contrib_module', $path);
+ $this->libraryDiscoveryParser->setPaths('profile', 'library_testing', 'profiles/library_testing');
+
+ $this->librariesDirectoryFileFinder->expects($this->once())
+ ->method('find')
+ ->with('third_party_library/css/example.css')
+ ->will($this->returnValue(FALSE));
+
+ $libraries = $this->libraryDiscoveryParser->buildByExtension('example_contrib_module');
+ $library = $libraries['third_party_library'];
+
+ $this->assertCount(0, $library['js']);
+ $this->assertCount(1, $library['css']);
+ $this->assertCount(0, $library['dependencies']);
+ // The location will be the same as provided in the library definition even
+ // though it does not exist.
+ $this->assertEquals('libraries/third_party_library/css/example.css', $library['css'][0]['data']);
+ }
+
}
/**
diff --git a/web/core/tests/Drupal/Tests/Core/Asset/library_test_files/example_contrib_module.libraries.yml b/web/core/tests/Drupal/Tests/Core/Asset/library_test_files/example_contrib_module.libraries.yml
new file mode 100644
index 0000000000..c37437d602
--- /dev/null
+++ b/web/core/tests/Drupal/Tests/Core/Asset/library_test_files/example_contrib_module.libraries.yml
@@ -0,0 +1,5 @@
+third_party_library:
+ version: VERSION
+ css:
+ theme:
+ /libraries/third_party_library/css/example.css: {}
diff --git a/web/core/tests/Drupal/Tests/Core/Batch/BatchBuilderTest.php b/web/core/tests/Drupal/Tests/Core/Batch/BatchBuilderTest.php
index c812485b52..4e273b2910 100644
--- a/web/core/tests/Drupal/Tests/Core/Batch/BatchBuilderTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Batch/BatchBuilderTest.php
@@ -23,9 +23,9 @@ class BatchBuilderTest extends UnitTestCase {
public function testDefaultValues() {
$batch = (new BatchBuilder())->toArray();
- $this->assertInternalType('array', $batch);
+ $this->assertIsArray($batch);
$this->assertArrayHasKey('operations', $batch);
- $this->assertInternalType('array', $batch['operations']);
+ $this->assertIsArray($batch['operations']);
$this->assertEmpty($batch['operations'], 'Operations array is empty.');
$this->assertEquals(new TranslatableMarkup('Processing'), $batch['title']);
$this->assertEquals(new TranslatableMarkup('Initializing.'), $batch['init_message']);
@@ -34,10 +34,10 @@ public function testDefaultValues() {
$this->assertNull($batch['finished']);
$this->assertNull($batch['file']);
$this->assertArrayHasKey('library', $batch);
- $this->assertInternalType('array', $batch['library']);
+ $this->assertIsArray($batch['library']);
$this->assertEmpty($batch['library']);
$this->assertArrayHasKey('url_options', $batch);
- $this->assertInternalType('array', $batch['url_options']);
+ $this->assertIsArray($batch['url_options']);
$this->assertEmpty($batch['url_options']);
$this->assertArrayHasKey('progressive', $batch);
$this->assertTrue($batch['progressive']);
diff --git a/web/core/tests/Drupal/Tests/Core/Cache/BackendChainImplementationUnitTest.php b/web/core/tests/Drupal/Tests/Core/Cache/BackendChainImplementationUnitTest.php
index 9509cc1de4..64fff8c3ee 100644
--- a/web/core/tests/Drupal/Tests/Core/Cache/BackendChainImplementationUnitTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Cache/BackendChainImplementationUnitTest.php
@@ -107,12 +107,12 @@ public function testGetMultiple() {
$this->assertSame($ret['t123']->data, 1231, 'Got key 123 and value is from the first backend');
$this->assertSame($ret['t23']->data, 232, 'Got key 23 and value is from the second backend');
$this->assertSame($ret['t3']->data, 33, 'Got key 3 and value is from the third backend');
- $this->assertFalse(array_key_exists('t4', $ret), "Didn't get the nonexistent key");
+ $this->assertArrayNotHasKey('t4', $ret);
- $this->assertFalse(in_array('t123', $cids), "Existing key 123 has been removed from &\$cids");
- $this->assertFalse(in_array('t23', $cids), "Existing key 23 has been removed from &\$cids");
- $this->assertFalse(in_array('t3', $cids), "Existing key 3 has been removed from &\$cids");
- $this->assertTrue(in_array('t4', $cids), "Non existing key 4 is still in &\$cids");
+ $this->assertNotContains('t123', $cids, "Existing key 123 has been removed from &\$cids");
+ $this->assertNotContains('t23', $cids, "Existing key 23 has been removed from &\$cids");
+ $this->assertNotContains('t3', $cids, "Existing key 3 has been removed from &\$cids");
+ $this->assertContains('t4', $cids, "Non existing key 4 is still in &\$cids");
}
/**
diff --git a/web/core/tests/Drupal/Tests/Core/Cache/ChainedFastBackendTest.php b/web/core/tests/Drupal/Tests/Core/Cache/ChainedFastBackendTest.php
index 51f02eb253..8f203b0f16 100644
--- a/web/core/tests/Drupal/Tests/Core/Cache/ChainedFastBackendTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Cache/ChainedFastBackendTest.php
@@ -36,7 +36,7 @@ class ChainedFastBackendTest extends UnitTestCase {
/**
* Tests a get() on the fast backend, with no hit on the consistent backend.
*/
- public function testGetDoesntHitConsistentBackend() {
+ public function testGetDoesNotHitConsistentBackend() {
$consistent_cache = $this->createMock('Drupal\Core\Cache\CacheBackendInterface');
$timestamp_cid = ChainedFastBackend::LAST_WRITE_TIMESTAMP_PREFIX . 'cache_foo';
// Use the request time because that is what we will be comparing against.
diff --git a/web/core/tests/Drupal/Tests/Core/Cache/Context/ProtocolVersionCacheContextTest.php b/web/core/tests/Drupal/Tests/Core/Cache/Context/ProtocolVersionCacheContextTest.php
new file mode 100644
index 0000000000..530565cfa3
--- /dev/null
+++ b/web/core/tests/Drupal/Tests/Core/Cache/Context/ProtocolVersionCacheContextTest.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace Drupal\Tests\Core\Cache\Context;
+
+use Drupal\Core\Cache\Context\ProtocolVersionCacheContext;
+use Drupal\Tests\UnitTestCase;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
+
+/**
+ * @coversDefaultClass \Drupal\Core\Cache\Context\ProtocolVersionCacheContext
+ * @group Cache
+ */
+class ProtocolVersionCacheContextTest extends UnitTestCase {
+
+ /**
+ * @covers ::getContext
+ *
+ * @dataProvider providerTestGetContext
+ */
+ public function testGetContext($protocol, $context) {
+ $request_stack = new RequestStack();
+ $request = Request::create('/');
+ $request->server->set('SERVER_PROTOCOL', $protocol);
+ $request_stack->push($request);
+ $cache_context = new ProtocolVersionCacheContext($request_stack);
+ $this->assertSame($cache_context->getContext(), $context);
+ }
+
+ /**
+ * Provides a list of query arguments and expected cache contexts.
+ */
+ public function providerTestGetContext() {
+ return [
+ ['HTTP/1.0', 'HTTP/1.0'],
+ ['HTTP/1.1', 'HTTP/1.1'],
+ ['HTTP/2.0', 'HTTP/2.0'],
+ ['HTTP/3.0', 'HTTP/3.0'],
+ ];
+ }
+
+}
diff --git a/web/core/tests/Drupal/Tests/Core/Cache/Context/SessionCacheContextTest.php b/web/core/tests/Drupal/Tests/Core/Cache/Context/SessionCacheContextTest.php
index 17f0ab3fbb..410173af13 100644
--- a/web/core/tests/Drupal/Tests/Core/Cache/Context/SessionCacheContextTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Cache/Context/SessionCacheContextTest.php
@@ -59,7 +59,7 @@ public function testSameContextForSameSession() {
$context1 = $cache_context->getContext();
$context2 = $cache_context->getContext();
$this->assertSame($context1, $context2);
- $this->assertSame(FALSE, strpos($context1, $session_id), 'Session ID not contained in cache context');
+ $this->assertStringNotContainsString($session_id, $context1, 'Session ID not contained in cache context');
}
/**
@@ -83,8 +83,8 @@ public function testDifferentContextForDifferentSession() {
$context2 = $cache_context->getContext();
$this->assertNotEquals($context1, $context2);
- $this->assertSame(FALSE, strpos($context1, $session1_id), 'Session ID not contained in cache context');
- $this->assertSame(FALSE, strpos($context2, $session2_id), 'Session ID not contained in cache context');
+ $this->assertStringNotContainsString($session1_id, $context1, 'Session ID not contained in cache context');
+ $this->assertStringNotContainsString($session2_id, $context2, 'Session ID not contained in cache context');
}
/**
diff --git a/web/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityBaseUnitTest.php b/web/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityBaseUnitTest.php
index 970a82900d..ae3434ba1f 100644
--- a/web/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityBaseUnitTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityBaseUnitTest.php
@@ -175,8 +175,8 @@ public function testCalculateDependencies() {
// dependencies.
$this->entity->set('dependencies', ['module' => ['node'], 'enforced' => ['module' => 'views']]);
$dependencies = $this->entity->calculateDependencies()->getDependencies();
- $this->assertContains('views', $dependencies['module']);
- $this->assertNotContains('node', $dependencies['module']);
+ $this->assertStringContainsString('views', $dependencies['module']);
+ $this->assertStringNotContainsString('node', $dependencies['module']);
}
/**
@@ -564,7 +564,7 @@ public function testToArray() {
->method('getPropertiesToExport')
->willReturn(['id' => 'configId', 'dependencies' => 'dependencies']);
$properties = $this->entity->toArray();
- $this->assertInternalType('array', $properties);
+ $this->assertIsArray($properties);
$this->assertEquals(['configId' => $this->entity->id(), 'dependencies' => []], $properties);
}
@@ -590,7 +590,7 @@ public function testToArrayIdKey() {
->with('id')
->willReturn('id');
$properties = $entity->toArray();
- $this->assertInternalType('array', $properties);
+ $this->assertIsArray($properties);
$this->assertEquals(['configId' => $entity->id(), 'dependencies' => []], $properties);
}
@@ -636,7 +636,7 @@ public function testToArraySchemaException() {
->method('getPropertiesToExport')
->willReturn(NULL);
$this->expectException(SchemaIncompleteException::class);
- $this->expectExceptionMessage('Incomplete or missing schema for test_provider.');
+ $this->expectExceptionMessageRegExp("/Entity type 'Mock_ConfigEntityTypeInterface_[^']*' is missing 'config_export' definition in its annotation/");
$this->entity->toArray();
}
diff --git a/web/core/tests/Drupal/Tests/Core/Config/StorageCopyTraitTest.php b/web/core/tests/Drupal/Tests/Core/Config/StorageCopyTraitTest.php
index eb00129a20..0d14052729 100644
--- a/web/core/tests/Drupal/Tests/Core/Config/StorageCopyTraitTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Config/StorageCopyTraitTest.php
@@ -5,7 +5,11 @@
use Drupal\Core\Config\MemoryStorage;
use Drupal\Core\Config\StorageCopyTrait;
use Drupal\Core\Config\StorageInterface;
+use Drupal\Core\DependencyInjection\ContainerBuilder;
+use Drupal\Core\Logger\LoggerChannelFactoryInterface;
+use Drupal\Core\Logger\LoggerChannelInterface;
use Drupal\Tests\UnitTestCase;
+use Prophecy\Argument;
/**
* @coversDefaultClass \Drupal\Core\Config\StorageCopyTrait
@@ -111,4 +115,71 @@ protected function generateRandomData(StorageInterface $storage, $collections =
}
}
+ /**
+ * Tests replaceStorageContents() with config with an invalid configuration.
+ *
+ * @covers ::replaceStorageContents
+ */
+ public function testWithInvalidConfiguration() {
+ $source = new TestStorage();
+ $this->generateRandomData($source);
+
+ // Get a name from the source config storage and set the config value to
+ // false. It mimics a config storage read return value when that config
+ // storage has an invalid configuration.
+ $names = $source->listAll();
+ $test_name = reset($names);
+ $source->setValue($test_name, FALSE);
+
+ $logger_factory = $this->prophesize(LoggerChannelFactoryInterface::class);
+ $container = new ContainerBuilder();
+ $container->set('logger.factory', $logger_factory->reveal());
+ \Drupal::setContainer($container);
+
+ // Reading a config storage with an invalid configuration logs a notice.
+ $channel = $this->prophesize(LoggerChannelInterface::class);
+ $logger_factory->get('config')->willReturn($channel->reveal());
+ $channel->notice('Missing required data for configuration: %config', Argument::withEntry('%config', $test_name))->shouldBeCalled();
+
+ // Copy the config from the source storage to the target storage.
+ $target = new TestStorage();
+ self::replaceStorageContents($source, $target);
+
+ // Test that all configuration is copied correctly and that the value of the
+ // config with the invalid configuration has not been copied to the target
+ // storage.
+ foreach ($names as $name) {
+ if ($name === $test_name) {
+ $this->assertFalse($source->read($name));
+ $this->assertFalse($target->exists($name));
+ }
+ else {
+ $this->assertArrayEquals($source->read($name), $target->read($name));
+ }
+ }
+
+ // Test that the invalid configuration's name is in the source config
+ // storage, but not the target config storage. This ensures that it was not
+ // copied.
+ $this->assertContains($test_name, $source->listAll());
+ $this->assertNotContains($test_name, $target->listAll());
+ }
+
+}
+
+/**
+ * Provides a test implementation of \Drupal\Core\Config\StorageInterface.
+ */
+class TestStorage extends MemoryStorage {
+
+ /**
+ * Provides a setter to bypass the array typehint on ::write().
+ *
+ * This method allows us to create invalid configurations. The method
+ * ::write() only allows values of the type array.
+ */
+ public function setValue($name, $value) {
+ $this->config[$this->collection][$name] = $value;
+ }
+
}
diff --git a/web/core/tests/Drupal/Tests/Core/Controller/ControllerResolverTest.php b/web/core/tests/Drupal/Tests/Core/Controller/ControllerResolverTest.php
index d7dd9588be..cc57241bed 100644
--- a/web/core/tests/Drupal/Tests/Core/Controller/ControllerResolverTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Controller/ControllerResolverTest.php
@@ -220,10 +220,10 @@ public function testGetControllerFromDefinitionNotCallable() {
*/
protected function assertCallableController($controller, $class, $output) {
if ($class) {
- $this->assertTrue(is_object($controller[0]));
+ $this->assertIsObject($controller[0]);
$this->assertInstanceOf($class, $controller[0]);
}
- $this->assertTrue(is_callable($controller));
+ $this->assertIsCallable($controller);
$this->assertSame($output, call_user_func($controller));
}
diff --git a/web/core/tests/Drupal/Tests/Core/Database/ConditionTest.php b/web/core/tests/Drupal/Tests/Core/Database/ConditionTest.php
index c38261b866..0068ca3346 100644
--- a/web/core/tests/Drupal/Tests/Core/Database/ConditionTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Database/ConditionTest.php
@@ -5,6 +5,7 @@
use Drupal\Core\Database\Connection;
use Drupal\Core\Database\Query\Condition;
use Drupal\Core\Database\Query\PlaceholderInterface;
+use Drupal\Tests\Core\Database\Stub\StubPDO;
use Drupal\Tests\UnitTestCase;
use Prophecy\Argument;
use PHPUnit\Framework\Error\Error;
@@ -176,4 +177,30 @@ public function providerTestCompileWithSqlInjectionForOperator() {
return $data;
}
+ /**
+ * Test that the core Condition can be overridden.
+ */
+ public function testContribCondition() {
+ $mockCondition = $this->getMockBuilder(Condition::class)
+ ->setMockClassName('MockCondition')
+ ->setConstructorArgs([NULL])
+ ->disableOriginalConstructor()
+ ->getMock();
+ $contrib_namespace = 'Drupal\Driver\Database\mock';
+ $mocked_namespace = $contrib_namespace . '\\Condition';
+ class_alias('MockCondition', $mocked_namespace);
+
+ $options['namespace'] = $contrib_namespace;
+ $options['prefix']['default'] = '';
+
+ $mockPdo = $this->createMock(StubPDO::class);
+
+ $connection = $this->getMockBuilder(Connection::class)
+ ->setConstructorArgs([$mockPdo, $options])
+ ->getMockForAbstractClass();
+
+ $condition = $connection->condition('AND');
+ $this->assertSame('MockCondition', get_class($condition));
+ }
+
}
diff --git a/web/core/tests/Drupal/Tests/Core/Database/ConnectionTest.php b/web/core/tests/Drupal/Tests/Core/Database/ConnectionTest.php
index 8325079986..2c2e565ab7 100644
--- a/web/core/tests/Drupal/Tests/Core/Database/ConnectionTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Database/ConnectionTest.php
@@ -3,6 +3,7 @@
namespace Drupal\Tests\Core\Database;
use Drupal\Tests\Core\Database\Stub\StubConnection;
+use Drupal\Tests\Core\Database\Stub\StubPDO;
use Drupal\Tests\UnitTestCase;
/**
@@ -297,4 +298,58 @@ public function testFilterComments($expected, $comment) {
);
}
+ /**
+ * Test rtrim() of query strings.
+ *
+ * @dataProvider provideQueriesToTrim
+ */
+ public function testQueryTrim($expected, $query, $options) {
+ $mock_pdo = $this->getMockBuilder(StubPdo::class)
+ ->setMethods(['execute', 'prepare', 'setAttribute'])
+ ->getMock();
+
+ // Ensure that PDO::prepare() is called only once, and with the
+ // correctly trimmed query string.
+ $mock_pdo->expects($this->once())
+ ->method('prepare')
+ ->with($expected)
+ ->willReturnSelf();
+ $connection = new StubConnection($mock_pdo, []);
+ $connection->query($query, [], $options);
+ }
+
+ /**
+ * Dataprovider for testQueryTrim().
+ *
+ * @return array
+ * Array of arrays with the following elements:
+ * - Expected trimmed query.
+ * - Padded query.
+ * - Query options.
+ */
+ public function provideQueriesToTrim() {
+ return [
+ 'remove_semicolon' => [
+ 'SELECT * FROM test',
+ 'SELECT * FROM test;',
+ [],
+ ],
+ 'keep_trailing_semicolon' => [
+ 'SELECT * FROM test;',
+ 'SELECT * FROM test;',
+ ['allow_delimiter_in_query' => TRUE],
+ ],
+ 'remove_semicolon_with_whitespace' => [
+ 'SELECT * FROM test',
+ 'SELECT * FROM test; ',
+ [],
+ ],
+ 'keep_trailing_semicolon_with_whitespace' => [
+ 'SELECT * FROM test;',
+ 'SELECT * FROM test; ',
+ ['allow_delimiter_in_query' => TRUE],
+ ],
+ ];
+ }
+
}
diff --git a/web/core/tests/Drupal/Tests/Core/Database/DatabaseTest.php b/web/core/tests/Drupal/Tests/Core/Database/DatabaseTest.php
new file mode 100644
index 0000000000..9f01555a32
--- /dev/null
+++ b/web/core/tests/Drupal/Tests/Core/Database/DatabaseTest.php
@@ -0,0 +1,123 @@
+<?php
+
+namespace Drupal\Tests\Core\Database;
+
+use Composer\Autoload\ClassLoader;
+use Drupal\Core\Database\Database;
+use Drupal\Core\Site\Settings;
+use Drupal\Tests\UnitTestCase;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * @coversDefaultClass \Drupal\Core\Database\Database
+ *
+ * @runTestsInSeparateProcesses
+ * @preserveGlobalState disabled
+ *
+ * @group Database
+ */
+class DatabaseTest extends UnitTestCase {
+
+ /**
+ * A classloader to enable testing of contrib drivers.
+ *
+ * @var \Composer\Autoload\ClassLoader
+ */
+ protected $additionalClassloader;
+
+ /**
+ * Path to DRUPAL_ROOT.
+ *
+ * @var string
+ */
+ protected $root;
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function setUp() {
+ $this->additionalClassloader = new ClassLoader();
+ $this->additionalClassloader->register();
+ // Mock the container so we don't need to mock drupal_valid_test_ua().
+ // @see \Drupal\Core\Extension\ExtensionDiscovery::scan()
+ $this->root = dirname(dirname(dirname(dirname(dirname(dirname(__DIR__))))));
+ $container = $this->createMock(ContainerInterface::class);
+ $container->expects($this->any())
+ ->method('has')
+ ->with('kernel')
+ ->willReturn(TRUE);
+ $container->expects($this->any())
+ ->method('get')
+ ->with('site.path')
+ ->willReturn('');
+ \Drupal::setContainer($container);
+ }
+
+ /**
+ * @covers ::findDriverAutoloadDirectory
+ * @dataProvider providerFindDriverAutoloadDirectory
+ */
+ public function testFindDriverAutoloadDirectory($expected, $namespace) {
+ new Settings(['extension_discovery_scan_tests' => TRUE]);
+ // The only module that provides a driver in core is a test module.
+ $this->assertSame($expected, Database::findDriverAutoloadDirectory($namespace, $this->root));
+ }
+
+ /**
+ * Data provider for ::testFindDriverAutoloadDirectory().
+ *
+ * @return array
+ */
+ public function providerFindDriverAutoloadDirectory() {
+ return [
+ 'core mysql' => [FALSE, 'Drupal\Core\Database\Driver\mysql'],
+ 'D8 custom fake' => [FALSE, 'Drupal\Driver\Database\corefake'],
+ 'module mysql' => ['core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestMysql/', 'Drupal\driver_test\Driver\Database\DrivertestMysql'],
+ ];
+ }
+
+ /**
+ * @covers ::findDriverAutoloadDirectory
+ * @dataProvider providerFindDriverAutoloadDirectoryException
+ */
+ public function testFindDriverAutoloadDirectoryException($expected_message, $namespace, $include_tests) {
+ new Settings(['extension_discovery_scan_tests' => $include_tests]);
+ if ($include_tests === FALSE) {
+ // \Drupal\Core\Extension\ExtensionDiscovery::scan() needs
+ // drupal_valid_test_ua().
+ include $this->root . '/core/includes/bootstrap.inc';
+ }
+ $this->expectException(\RuntimeException::class);
+ $this->expectExceptionMessage($expected_message);
+ Database::findDriverAutoloadDirectory($namespace, $this->root);
+ }
+
+ /**
+ * Data provider for ::testFindDriverAutoloadDirectoryException().
+ *
+ * @return array
+ */
+ public function providerFindDriverAutoloadDirectoryException() {
+ return [
+ 'test module but tests not included' => ["Cannot find the module 'driver_test' for the database driver namespace 'Drupal\driver_test\Driver\Database\DrivertestMysql'", 'Drupal\driver_test\Driver\Database\DrivertestMysql', FALSE],
+ 'non-existent driver in test module' => ["Cannot find the database driver namespace 'Drupal\driver_test\Driver\Database\sqlite' in module 'driver_test'", 'Drupal\driver_test\Driver\Database\sqlite', TRUE],
+ 'non-existent module' => ["Cannot find the module 'does_not_exist' for the database driver namespace 'Drupal\does_not_exist\Driver\Database\mysql'", 'Drupal\does_not_exist\Driver\Database\mysql', TRUE],
+ ];
+ }
+
+ /**
+ * Adds a database driver that uses the D8's Drupal\Driver\Database namespace.
+ */
+ protected function addD8CustomDrivers() {
+ $this->additionalClassloader->addPsr4("Drupal\\Driver\\Database\\corefake\\", __DIR__ . "/../../../../../tests/fixtures/database_drivers/custom/corefake");
+ }
+
+ /**
+ * Adds database drivers that are provided by modules.
+ */
+ protected function addModuleDrivers() {
+ $this->additionalClassloader->addPsr4("Drupal\\driver_test\\Driver\\Database\\DrivertestMysql\\", __DIR__ . "/../../../../../modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestMysql");
+ $this->additionalClassloader->addPsr4("Drupal\\corefake\\Driver\\Database\\corefake\\", __DIR__ . "/../../../../../tests/fixtures/database_drivers/module/corefake/src/Driver/Database/corefake");
+ }
+
+}
diff --git a/web/core/tests/Drupal/Tests/Core/Database/Driver/sqlite/ConnectionTest.php b/web/core/tests/Drupal/Tests/Core/Database/Driver/sqlite/ConnectionTest.php
new file mode 100644
index 0000000000..3d872ceb77
--- /dev/null
+++ b/web/core/tests/Drupal/Tests/Core/Database/Driver/sqlite/ConnectionTest.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace Drupal\Tests\Core\Database\Driver\sqlite;
+
+use Drupal\Core\Database\Driver\sqlite\Connection;
+use Drupal\Tests\Core\Database\Stub\StubPDO;
+use Drupal\Tests\UnitTestCase;
+
+/**
+ * @coversDefaultClass \Drupal\Core\Database\Driver\sqlite\Connection
+ * @group Database
+ */
+class ConnectionTest extends UnitTestCase {
+
+ /**
+ * @covers ::createConnectionOptionsFromUrl
+ * @dataProvider providerCreateConnectionOptionsFromUrl
+ *
+ * @param string $url
+ * SQLite URL.
+ * @param string $expected
+ * Expected connection option.
+ */
+ public function testCreateConnectionOptionsFromUrl(string $url, string $expected) {
+ $root = dirname(__DIR__, 8);
+ $sqlite_connection = new Connection($this->createMock(StubPDO::class), []);
+ $database = $sqlite_connection->createConnectionOptionsFromUrl($url, $root);
+ $this->assertEquals('sqlite', $database['driver']);
+ $this->assertEquals($expected, $database['database']);
+ }
+
+ /**
+ * Data provider for testCreateConnectionOptionsFromUrl.
+ *
+ * @return string[][]
+ * Associative array of arrays with the following elements:
+ * - SQLite database URL
+ * - Expected database connection option
+ */
+ public function providerCreateConnectionOptionsFromUrl(): array {
+ $root = dirname(__DIR__, 8);
+ return [
+ 'sqlite relative path' => ['sqlite://localhost/tmp/test', $root . '/tmp/test'],
+ 'sqlite absolute path' => ['sqlite://localhost//tmp/test', '/tmp/test'],
+ 'in memory sqlite path' => ['sqlite://localhost/:memory:', ':memory:'],
+ ];
+ }
+
+}
diff --git a/web/core/tests/Drupal/Tests/Core/Database/EmptyStatementTest.php b/web/core/tests/Drupal/Tests/Core/Database/EmptyStatementTest.php
index 7cea8076e1..718bda7d0b 100644
--- a/web/core/tests/Drupal/Tests/Core/Database/EmptyStatementTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Database/EmptyStatementTest.php
@@ -19,7 +19,7 @@ class EmptyStatementTest extends UnitTestCase {
public function testEmpty() {
$result = new StatementEmpty();
- $this->assertTrue($result instanceof StatementInterface, 'Class implements expected interface');
+ $this->assertInstanceOf(StatementInterface::class, $result);
$this->assertNull($result->fetchObject(), 'Null result returned.');
}
diff --git a/web/core/tests/Drupal/Tests/Core/Database/InstallerObjectTest.php b/web/core/tests/Drupal/Tests/Core/Database/InstallerObjectTest.php
new file mode 100644
index 0000000000..08ee33c706
--- /dev/null
+++ b/web/core/tests/Drupal/Tests/Core/Database/InstallerObjectTest.php
@@ -0,0 +1,74 @@
+<?php
+
+namespace Drupal\Tests\Core\Database;
+
+use Composer\Autoload\ClassLoader;
+use Drupal\Core\Database\Driver\mysql\Install\Tasks as MysqlInstallTasks;
+use Drupal\Driver\Database\fake\Install\Tasks as FakeInstallTasks;
+use Drupal\Driver\Database\corefake\Install\Tasks as CustomCoreFakeInstallTasks;
+use Drupal\driver_test\Driver\Database\DrivertestMysql\Install\Tasks as DriverTestMysqlInstallTasks;
+use Drupal\Tests\UnitTestCase;
+
+/**
+ * Tests the db_installer_object() function that is used during installation.
+ *
+ * These tests run in isolation to prevent the autoloader additions from
+ * affecting other tests.
+ *
+ * @covers ::db_installer_object
+ *
+ * @runTestsInSeparateProcesses
+ * @preserveGlobalState disabled
+ *
+ * @group Database
+ */
+class InstallerObjectTest extends UnitTestCase {
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function setUp() {
+ parent::setUp();
+ require_once __DIR__ . '/../../../../../includes/install.inc';
+ $additional_class_loader = new ClassLoader();
+ $additional_class_loader->addPsr4("Drupal\\Driver\\Database\\fake\\", __DIR__ . "/../../../../../tests/fixtures/database_drivers/custom/fake");
+ $additional_class_loader->addPsr4("Drupal\\Core\\Database\\Driver\\corefake\\", __DIR__ . "/../../../../../tests/fixtures/database_drivers/core/corefake");
+ $additional_class_loader->addPsr4("Drupal\\Driver\\Database\\corefake\\", __DIR__ . "/../../../../../tests/fixtures/database_drivers/custom/corefake");
+ $additional_class_loader->addPsr4("Drupal\\driver_test\\Driver\\Database\\DrivertestMysql\\", __DIR__ . "/../../../../../../modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestMysql");
+ $additional_class_loader->register(TRUE);
+ }
+
+ /**
+ * @dataProvider providerDbInstallerObject
+ */
+ public function testDbInstallerObject($driver, $namespace, $expected_class_name) {
+ $object = db_installer_object($driver, $namespace);
+ $this->assertEquals(get_class($object), $expected_class_name);
+ }
+
+ /**
+ * Dataprovider for testDbUrltoConnectionConversion().
+ *
+ * @return array
+ * Array of arrays with the following elements:
+ * - driver: The driver name.
+ * - namespace: The namespace providing the driver.
+ * - class: The fully qualified class name of the expected install task.
+ */
+ public function providerDbInstallerObject() {
+ return [
+ // A driver only in the core namespace.
+ ['mysql', NULL, MysqlInstallTasks::class],
+
+ // A driver only in the custom namespace.
+ ['fake', "Drupal\\Driver\\Database\\fake", FakeInstallTasks::class],
+
+ // A driver in both namespaces. The custom one takes precedence.
+ ['corefake', "Drupal\\Driver\\Database\\corefake", CustomCoreFakeInstallTasks::class],
+
+ // A driver from a module that has a different name as the driver.
+ ['DrivertestMysql', "Drupal\\driver_test\\Driver\\Database\\DrivertestMysql", DriverTestMysqlInstallTasks::class],
+ ];
+ }
+
+}
diff --git a/web/core/tests/Drupal/Tests/Core/Database/UrlConversionTest.php b/web/core/tests/Drupal/Tests/Core/Database/UrlConversionTest.php
index b48e5c0514..883ca0f811 100644
--- a/web/core/tests/Drupal/Tests/Core/Database/UrlConversionTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Database/UrlConversionTest.php
@@ -2,8 +2,8 @@
namespace Drupal\Tests\Core\Database;
-use Composer\Autoload\ClassLoader;
use Drupal\Core\Database\Database;
+use Drupal\Core\Site\Settings;
use Drupal\Tests\UnitTestCase;
/**
@@ -26,9 +26,21 @@ class UrlConversionTest extends UnitTestCase {
*/
protected function setUp() {
parent::setUp();
- $additional_class_loader = new ClassLoader();
- $additional_class_loader->addPsr4("Drupal\\Driver\\Database\\fake\\", __DIR__ . "/fixtures/driver/fake");
- $additional_class_loader->register(TRUE);
+ $this->root = dirname(dirname(dirname(dirname(dirname(dirname(dirname(__FILE__)))))));
+ // Mock the container so we don't need to mock drupal_valid_test_ua().
+ // @see \Drupal\Core\Extension\ExtensionDiscovery::scan()
+ $container = $this->createMock('Symfony\Component\DependencyInjection\ContainerInterface');
+ $container->expects($this->any())
+ ->method('has')
+ ->with('kernel')
+ ->willReturn(TRUE);
+ $container->expects($this->any())
+ ->method('get')
+ ->with('site.path')
+ ->willReturn('');
+ \Drupal::setContainer($container);
+
+ new Settings(['extension_discovery_scan_tests' => TRUE]);
}
/**
@@ -37,7 +49,7 @@ protected function setUp() {
* @dataProvider providerConvertDbUrlToConnectionInfo
*/
public function testDbUrltoConnectionConversion($root, $url, $database_array) {
- $result = Database::convertDbUrlToConnectionInfo($url, $root);
+ $result = Database::convertDbUrlToConnectionInfo($url, $root ?: $this->root);
$this->assertEquals($database_array, $result);
}
@@ -114,17 +126,79 @@ public function providerConvertDbUrlToConnectionInfo() {
'namespace' => 'Drupal\Core\Database\Driver\sqlite',
],
],
- 'Fake custom database driver, without prefix' => [
+ 'MySQL contrib test driver without prefix' => [
+ '',
+ 'DrivertestMysql://test_user:test_pass@test_host:3306/test_database?module=driver_test',
+ [
+ 'driver' => 'DrivertestMysql',
+ 'username' => 'test_user',
+ 'password' => 'test_pass',
+ 'host' => 'test_host',
+ 'database' => 'test_database',
+ 'port' => 3306,
+ 'namespace' => 'Drupal\driver_test\Driver\Database\DrivertestMysql',
+ 'autoload' => 'core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestMysql/',
+ ],
+ ],
+ 'MySQL contrib test driver with prefix' => [
+ '',
+ 'DrivertestMysql://test_user:test_pass@test_host:3306/test_database?module=driver_test#bar',
+ [
+ 'driver' => 'DrivertestMysql',
+ 'username' => 'test_user',
+ 'password' => 'test_pass',
+ 'host' => 'test_host',
+ 'database' => 'test_database',
+ 'prefix' => [
+ 'default' => 'bar',
+ ],
+ 'port' => 3306,
+ 'namespace' => 'Drupal\driver_test\Driver\Database\DrivertestMysql',
+ 'autoload' => 'core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestMysql/',
+ ],
+ ],
+ 'PostgreSQL contrib test driver without prefix' => [
'',
- 'fake://fake_user:fake_pass@fake_host:3456/fake_database',
+ 'DrivertestPgsql://test_user:test_pass@test_host:5432/test_database?module=driver_test',
[
- 'driver' => 'fake',
- 'username' => 'fake_user',
- 'password' => 'fake_pass',
- 'host' => 'fake_host',
- 'database' => 'fake_database',
- 'port' => 3456,
- 'namespace' => 'Drupal\Driver\Database\fake',
+ 'driver' => 'DrivertestPgsql',
+ 'username' => 'test_user',
+ 'password' => 'test_pass',
+ 'host' => 'test_host',
+ 'database' => 'test_database',
+ 'port' => 5432,
+ 'namespace' => 'Drupal\driver_test\Driver\Database\DrivertestPgsql',
+ 'autoload' => 'core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestPgsql/',
+ ],
+ ],
+ 'PostgreSQL contrib test driver with prefix' => [
+ '',
+ 'DrivertestPgsql://test_user:test_pass@test_host:5432/test_database?module=driver_test#bar',
+ [
+ 'driver' => 'DrivertestPgsql',
+ 'username' => 'test_user',
+ 'password' => 'test_pass',
+ 'host' => 'test_host',
+ 'database' => 'test_database',
+ 'prefix' => [
+ 'default' => 'bar',
+ ],
+ 'port' => 5432,
+ 'namespace' => 'Drupal\driver_test\Driver\Database\DrivertestPgsql',
+ 'autoload' => 'core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestPgsql/',
+ ],
+ ],
+ 'MySql with a custom query parameter' => [
+ '',
+ 'mysql://test_user:test_pass@test_host:3306/test_database?extra=value',
+ [
+ 'driver' => 'mysql',
+ 'username' => 'test_user',
+ 'password' => 'test_pass',
+ 'host' => 'test_host',
+ 'database' => 'test_database',
+ 'port' => 3306,
+ 'namespace' => 'Drupal\Core\Database\Driver\mysql',
],
],
];
@@ -218,11 +292,67 @@ public function providerGetConnectionInfoAsUrl() {
];
$expected_url4 = 'sqlite://localhost/test_database#pre';
+ $info5 = [
+ 'database' => 'test_database',
+ 'username' => 'test_user',
+ 'password' => 'test_pass',
+ 'prefix' => '',
+ 'host' => 'test_host',
+ 'port' => '3306',
+ 'driver' => 'DrivertestMysql',
+ 'namespace' => 'Drupal\\driver_test\\Driver\\Database\\DrivertestMysql',
+ 'autoload' => 'core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestMysql/',
+ ];
+ $expected_url5 = 'DrivertestMysql://test_user:test_pass@test_host:3306/test_database?module=driver_test';
+
+ $info6 = [
+ 'database' => 'test_database',
+ 'username' => 'test_user',
+ 'password' => 'test_pass',
+ 'prefix' => 'pre',
+ 'host' => 'test_host',
+ 'port' => '3306',
+ 'driver' => 'DrivertestMysql',
+ 'namespace' => 'Drupal\\driver_test\\Driver\\Database\\DrivertestMysql',
+ 'autoload' => 'core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestMysql/',
+ ];
+ $expected_url6 = 'DrivertestMysql://test_user:test_pass@test_host:3306/test_database?module=driver_test#pre';
+
+ $info7 = [
+ 'database' => 'test_database',
+ 'username' => 'test_user',
+ 'password' => 'test_pass',
+ 'prefix' => '',
+ 'host' => 'test_host',
+ 'port' => '5432',
+ 'driver' => 'DrivertestPgsql',
+ 'namespace' => 'Drupal\\driver_test\\Driver\\Database\\DrivertestPgsql',
+ 'autoload' => 'core/modules/system/tests/modules/driver_test/src/Driver/Database/drivertestpqsql/',
+ ];
+ $expected_url7 = 'DrivertestPgsql://test_user:test_pass@test_host:5432/test_database?module=driver_test';
+
+ $info8 = [
+ 'database' => 'test_database',
+ 'username' => 'test_user',
+ 'password' => 'test_pass',
+ 'prefix' => 'pre',
+ 'host' => 'test_host',
+ 'port' => '5432',
+ 'driver' => 'DrivertestPgsql',
+ 'namespace' => 'Drupal\\driver_test\\Driver\\Database\\DrivertestPgsql',
+ 'autoload' => 'core/modules/system/tests/modules/driver_test/src/Driver/Database/drivertestpqsql/',
+ ];
+ $expected_url8 = 'DrivertestPgsql://test_user:test_pass@test_host:5432/test_database?module=driver_test#pre';
+
return [
[$info1, $expected_url1],
[$info2, $expected_url2],
[$info3, $expected_url3],
[$info4, $expected_url4],
+ [$info5, $expected_url5],
+ [$info6, $expected_url6],
+ [$info7, $expected_url7],
+ [$info8, $expected_url8],
];
}
@@ -267,4 +397,24 @@ public function providerInvalidArgumentGetConnectionInfoAsUrl() {
];
}
+ /**
+ * @covers ::convertDbUrlToConnectionInfo
+ */
+ public function testDriverModuleDoesNotExist() {
+ $url = 'mysql://test_user:test_pass@test_host:3306/test_database?module=does_not_exist';
+ $this->expectException(\RuntimeException::class);
+ $this->expectExceptionMessage("Cannot find the module 'does_not_exist' for the database driver namespace 'Drupal\does_not_exist\Driver\Database\mysql'");
+ Database::convertDbUrlToConnectionInfo($url, $this->root);
+ }
+
+ /**
+ * @covers ::convertDbUrlToConnectionInfo
+ */
+ public function testModuleDriverDoesNotExist() {
+ $url = 'mysql://test_user:test_pass@test_host:3306/test_database?module=driver_test';
+ $this->expectException(\RuntimeException::class);
+ $this->expectExceptionMessage("Cannot find the database driver namespace 'Drupal\driver_test\Driver\Database\mysql' in module 'driver_test'");
+ Database::convertDbUrlToConnectionInfo($url, $this->root);
+ }
+
}
diff --git a/web/core/tests/Drupal/Tests/Core/DependencyInjection/ContainerBuilderTest.php b/web/core/tests/Drupal/Tests/Core/DependencyInjection/ContainerBuilderTest.php
index 6b075ed6b4..193741f8e0 100644
--- a/web/core/tests/Drupal/Tests/Core/DependencyInjection/ContainerBuilderTest.php
+++ b/web/core/tests/Drupal/Tests/Core/DependencyInjection/ContainerBuilderTest.php
@@ -21,7 +21,7 @@ public function testGet() {
$container->register('bar', 'Drupal\Tests\Core\DependencyInjection\Fixture\BarClass');
$result = $container->get('bar');
- $this->assertTrue($result instanceof BarClass);
+ $this->assertInstanceOf(BarClass::class, $result);
}
/**
@@ -131,7 +131,7 @@ public function testSerialize() {
* @preserveGlobalState disabled
*/
public function testConstructor() {
- class_alias(testInterface::class, 'Symfony\Component\Config\Resource\ResourceInterface');
+ class_alias(TestInterface::class, 'Symfony\Component\Config\Resource\ResourceInterface');
$container = new ContainerBuilder();
$this->assertFalse($container->isTrackingResources());
}
@@ -143,5 +143,5 @@ class_alias(testInterface::class, 'Symfony\Component\Config\Resource\ResourceInt
*
* @see \Drupal\Tests\Core\DependencyInjection\ContainerBuilderTest::testConstructor()
*/
-interface testInterface {
+interface TestInterface {
}
diff --git a/web/core/tests/Drupal/Tests/Core/DrupalKernel/DrupalKernelTest.php b/web/core/tests/Drupal/Tests/Core/DrupalKernel/DrupalKernelTest.php
index 1151382b1d..d66086a51a 100644
--- a/web/core/tests/Drupal/Tests/Core/DrupalKernel/DrupalKernelTest.php
+++ b/web/core/tests/Drupal/Tests/Core/DrupalKernel/DrupalKernelTest.php
@@ -199,7 +199,7 @@ public function testFindSitePath() {
/**
* A fake autoloader for testing
*/
- class fakeAutoloader {
+ class FakeAutoloader {
/**
* Registers this instance as an autoloader.
diff --git a/web/core/tests/Drupal/Tests/Core/Enhancer/EntityRevisionRouteEnhancerTest.php b/web/core/tests/Drupal/Tests/Core/Enhancer/EntityRevisionRouteEnhancerTest.php
index 4d1883a447..69bae3918b 100644
--- a/web/core/tests/Drupal/Tests/Core/Enhancer/EntityRevisionRouteEnhancerTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Enhancer/EntityRevisionRouteEnhancerTest.php
@@ -16,7 +16,7 @@
class EntityRevisionRouteEnhancerTest extends UnitTestCase {
/**
- * @var \Drupal\entity\RouteEnhancer\EntityRevisionRouteEnhancer
+ * @var \Drupal\Core\Routing\RouteEnhancer\EntityRevisionRouteEnhancer
*/
protected $routeEnhancer;
diff --git a/web/core/tests/Drupal/Tests/Core/Entity/ContentEntityBaseUnitTest.php b/web/core/tests/Drupal/Tests/Core/Entity/ContentEntityBaseUnitTest.php
index 63d83117dc..d8be614f01 100644
--- a/web/core/tests/Drupal/Tests/Core/Entity/ContentEntityBaseUnitTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Entity/ContentEntityBaseUnitTest.php
@@ -375,8 +375,8 @@ public function testValidate() {
$this->typedDataManager->expects($this->exactly(2))
->method('getValidator')
->will($this->returnValue($validator));
- $this->assertSame(0, count($this->entity->validate()));
- $this->assertSame(1, count($this->entity->validate()));
+ $this->assertCount(0, $this->entity->validate());
+ $this->assertCount(1, $this->entity->validate());
}
/**
diff --git a/web/core/tests/Drupal/Tests/Core/Entity/Enhancer/EntityRouteEnhancerTest.php b/web/core/tests/Drupal/Tests/Core/Entity/Enhancer/EntityRouteEnhancerTest.php
index 5ea28c9d86..8eed80ac0d 100644
--- a/web/core/tests/Drupal/Tests/Core/Entity/Enhancer/EntityRouteEnhancerTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Entity/Enhancer/EntityRouteEnhancerTest.php
@@ -29,7 +29,7 @@ public function testEnhancer() {
$defaults['_entity_form'] = 'entity_test.default';
$defaults['_route_object'] = (new Route('/test', $defaults));
$new_defaults = $route_enhancer->enhance($defaults, $request);
- $this->assertTrue(is_callable($new_defaults['_controller']));
+ $this->assertIsCallable($new_defaults['_controller']);
$this->assertEquals($defaults['_controller'], $new_defaults['_controller'], '_controller did not get overridden.');
// Set _entity_form and ensure that the form is set.
diff --git a/web/core/tests/Drupal/Tests/Core/Entity/EntityBundleAccessCheckTest.php b/web/core/tests/Drupal/Tests/Core/Entity/EntityBundleAccessCheckTest.php
new file mode 100644
index 0000000000..e020bde97a
--- /dev/null
+++ b/web/core/tests/Drupal/Tests/Core/Entity/EntityBundleAccessCheckTest.php
@@ -0,0 +1,97 @@
+<?php
+
+namespace Drupal\Tests\Core\Entity;
+
+use Drupal\Core\Cache\Context\CacheContextsManager;
+use Drupal\Core\DependencyInjection\Container;
+use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Core\Session\AccountInterface;
+use Drupal\node\NodeInterface;
+use Symfony\Component\HttpFoundation\ParameterBag;
+use Symfony\Component\Routing\Route;
+use Drupal\Core\Access\AccessResult;
+use Drupal\Core\Entity\EntityBundleAccessCheck;
+use Drupal\Tests\UnitTestCase;
+
+/**
+ * Unit test of entity access checking system.
+ *
+ * @coversDefaultClass \Drupal\Core\Entity\EntityBundleAccessCheck
+ *
+ * @group Access
+ * @group Entity
+ */
+class EntityBundleAccessCheckTest extends UnitTestCase {
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function setUp() {
+ $cache_contexts_manager = $this->prophesize(CacheContextsManager::class)->reveal();
+ $container = new Container();
+ $container->set('cache_contexts_manager', $cache_contexts_manager);
+ \Drupal::setContainer($container);
+ }
+
+ /**
+ * Data provider.
+ */
+ public function getBundleAndAccessResult() {
+ return [
+ [
+ 'article',
+ 'node:article',
+ AccessResult::allowed(),
+ ],
+ [
+ 'page',
+ 'node:article',
+ AccessResult::neutral('The entity bundle does not match the route _entity_bundles requirement.'),
+ ],
+ [
+ 'page',
+ 'node:article|page',
+ AccessResult::allowed(),
+ ],
+ [
+ 'article',
+ 'node:article|page',
+ AccessResult::allowed(),
+ ],
+ [
+ 'book_page',
+ 'node:article|page',
+ AccessResult::neutral('The entity bundle does not match the route _entity_bundles requirement.'),
+ ],
+ ];
+ }
+
+ /**
+ * @covers ::access
+ *
+ * @dataProvider getBundleAndAccessResult
+ */
+ public function testRouteAccess($bundle, $access_requirement, $access_result) {
+ $route = new Route('/foo/{node}', [], ['_entity_bundles' => $access_requirement], ['parameters' => ['node' => ['type' => 'entity:node']]]);
+ /** @var \Drupal\Core\Session\AccountInterface $account */
+ $account = $this->prophesize(AccountInterface::class)->reveal();
+
+ /** @var \Drupal\node\NodeInterface|\Prophecy\Prophecy\ObjectProphecy $node */
+ $node = $this->prophesize(NodeInterface::class);
+ $node->bundle()->willReturn($bundle);
+ $node->getCacheContexts()->willReturn([]);
+ $node->getCacheTags()->willReturn([]);
+ $node->getCacheMaxAge()->willReturn(-1);
+ $node = $node->reveal();
+
+ /** @var \Drupal\Core\Routing\RouteMatchInterface|\Prophecy\Prophecy\ObjectProphecy $route_match */
+ $route_match = $this->prophesize(RouteMatchInterface::class);
+ $route_match->getRawParameters()->willReturn(new ParameterBag(['node' => 1]));
+ $route_match->getParameters()->willReturn(new ParameterBag(['node' => $node]));
+ $route_match = $route_match->reveal();
+
+ $access_check = new EntityBundleAccessCheck();
+ $this->assertEquals($access_result, $access_check->access($route, $route_match, $account));
+ }
+
+}
diff --git a/web/core/tests/Drupal/Tests/Core/Entity/EntityListBuilderTest.php b/web/core/tests/Drupal/Tests/Core/Entity/EntityListBuilderTest.php
index 10d9e97d80..6f23e80921 100644
--- a/web/core/tests/Drupal/Tests/Core/Entity/EntityListBuilderTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Entity/EntityListBuilderTest.php
@@ -139,15 +139,15 @@ public function testGetOperations() {
$list->setRedirectDestination($this->redirectDestination);
$operations = $list->getOperations($this->role);
- $this->assertInternalType('array', $operations);
+ $this->assertIsArray($operations);
$this->assertArrayHasKey('edit', $operations);
- $this->assertInternalType('array', $operations['edit']);
+ $this->assertIsArray($operations['edit']);
$this->assertArrayHasKey('title', $operations['edit']);
$this->assertArrayHasKey('delete', $operations);
- $this->assertInternalType('array', $operations['delete']);
+ $this->assertIsArray($operations['delete']);
$this->assertArrayHasKey('title', $operations['delete']);
$this->assertArrayHasKey($operation_name, $operations);
- $this->assertInternalType('array', $operations[$operation_name]);
+ $this->assertIsArray($operations[$operation_name]);
$this->assertArrayHasKey('title', $operations[$operation_name]);
}
diff --git a/web/core/tests/Drupal/Tests/Core/Entity/EntityTypeTest.php b/web/core/tests/Drupal/Tests/Core/Entity/EntityTypeTest.php
index b9eef7b9cd..28bff19c11 100644
--- a/web/core/tests/Drupal/Tests/Core/Entity/EntityTypeTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Entity/EntityTypeTest.php
@@ -2,6 +2,8 @@
namespace Drupal\Tests\Core\Entity;
+use Drupal\Core\Config\Entity\ConfigEntityInterface;
+use Drupal\Core\Entity\Entity\EntityFormMode;
use Drupal\Core\Entity\EntityType;
use Drupal\Core\Entity\EntityTypeInterface;
use Drupal\Core\StringTranslation\TranslatableMarkup;
@@ -167,6 +169,8 @@ public function testGetHandler() {
]);
$this->assertSame($controller, $entity_type->getHandlerClass('storage'));
$this->assertSame($controller, $entity_type->getHandlerClass('form', 'default'));
+ $this->assertNull($entity_type->getHandlerClass('foo'));
+ $this->assertNull($entity_type->getHandlerClass('foo', 'bar'));
}
/**
@@ -393,6 +397,12 @@ public function testGetCountLabel() {
$this->assertEquals('one entity test', $entity_type->getCountLabel(1));
$this->assertEquals('2 entity test', $entity_type->getCountLabel(2));
$this->assertEquals('200 entity test', $entity_type->getCountLabel(200));
+ $this->assertArrayNotHasKey('context', $entity_type->getCountLabel(1)->getOptions());
+
+ // Test a custom context.
+ $entity_type = $this->setUpEntityType(['label_count' => ['singular' => 'one entity test', 'plural' => '@count entity test', 'context' => 'custom context']]);
+ $entity_type->setStringTranslation($this->getStringTranslationStub());
+ $this->assertSame('custom context', $entity_type->getCountLabel(1)->getOption('context'));
}
/**
@@ -404,6 +414,7 @@ public function testGetCountLabelDefault() {
$this->assertEquals('1 entity test plural', $entity_type->getCountLabel(1));
$this->assertEquals('2 entity test plural entities', $entity_type->getCountLabel(2));
$this->assertEquals('200 entity test plural entities', $entity_type->getCountLabel(200));
+ $this->assertSame('Entity type label', $entity_type->getCountLabel(1)->getOption('context'));
}
/**
@@ -478,6 +489,26 @@ protected function assertNoPublicProperties(EntityTypeInterface $entity_type) {
$this->assertEmpty($reflection->getProperties(\ReflectionProperty::IS_PUBLIC));
}
+ /**
+ * @covers ::entityClassImplements
+ */
+ public function testEntityClassImplements() {
+ $entity_type = $this->setUpEntityType(['class' => EntityFormMode::class]);
+ $this->assertSame(TRUE, $entity_type->entityClassImplements(ConfigEntityInterface::class));
+ $this->assertSame(FALSE, $entity_type->entityClassImplements(\DateTimeInterface::class));
+ }
+
+ /**
+ * @covers ::isSubclassOf
+ * @group legacy
+ * @expectedDeprecation Drupal\Core\Entity\EntityType::isSubclassOf() is deprecated in drupal:8.3.0 and is removed from drupal:10.0.0. Use Drupal\Core\Entity\EntityTypeInterface::entityClassImplements() instead. See https://www.drupal.org/node/2842808
+ */
+ public function testIsSubClassOf() {
+ $entity_type = $this->setUpEntityType(['class' => EntityFormMode::class]);
+ $this->assertSame(TRUE, $entity_type->isSubclassOf(ConfigEntityInterface::class));
+ $this->assertSame(FALSE, $entity_type->isSubclassOf(\DateTimeInterface::class));
+ }
+
/**
* Tests that the EntityType object can be serialized.
*/
diff --git a/web/core/tests/Drupal/Tests/Core/Entity/EntityUnitTest.php b/web/core/tests/Drupal/Tests/Core/Entity/EntityUnitTest.php
index 0253a56dfb..0fb5405866 100644
--- a/web/core/tests/Drupal/Tests/Core/Entity/EntityUnitTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Entity/EntityUnitTest.php
@@ -443,6 +443,43 @@ public function testPostSave() {
$this->entity->postSave($storage, TRUE);
}
+ /**
+ * @covers ::postSave
+ */
+ public function testPostSaveBundle() {
+ $this->cacheTagsInvalidator->expects($this->at(0))
+ ->method('invalidateTags')
+ ->with([
+ // List cache tag.
+ $this->entityTypeId . '_list',
+ $this->entityTypeId . '_list:' . $this->entity->bundle(),
+ ]);
+ $this->cacheTagsInvalidator->expects($this->at(1))
+ ->method('invalidateTags')
+ ->with([
+ // Own cache tag.
+ $this->entityTypeId . ':' . $this->values['id'],
+ // List cache tag.
+ $this->entityTypeId . '_list',
+ $this->entityTypeId . '_list:' . $this->entity->bundle(),
+ ]);
+
+ $this->entityType->expects($this->atLeastOnce())
+ ->method('hasKey')
+ ->with('bundle')
+ ->willReturn(TRUE);
+
+ // This method is internal, so check for errors on calling it only.
+ $storage = $this->createMock('\Drupal\Core\Entity\EntityStorageInterface');
+
+ // A creation should trigger the invalidation of the global list cache tag
+ // and the one for the bundle.
+ $this->entity->postSave($storage, FALSE);
+ // An update should trigger the invalidation of the "list", bundle list and
+ // the "own" cache tags.
+ $this->entity->postSave($storage, TRUE);
+ }
+
/**
* @covers ::preCreate
*/
@@ -493,6 +530,30 @@ public function testPostDelete() {
$this->entity->postDelete($storage, $entities);
}
+ /**
+ * @covers ::postDelete
+ */
+ public function testPostDeleteBundle() {
+ $this->cacheTagsInvalidator->expects($this->once())
+ ->method('invalidateTags')
+ ->with([
+ $this->entityTypeId . ':' . $this->values['id'],
+ $this->entityTypeId . '_list',
+ $this->entityTypeId . '_list:' . $this->entity->bundle(),
+ ]);
+ $this->entityType->expects($this->atLeastOnce())
+ ->method('hasKey')
+ ->with('bundle')
+ ->willReturn(TRUE);
+ $storage = $this->createMock('\Drupal\Core\Entity\EntityStorageInterface');
+ $storage->expects($this->once())
+ ->method('getEntityType')
+ ->willReturn($this->entityType);
+
+ $entities = [$this->values['id'] => $this->entity];
+ $this->entity->postDelete($storage, $entities);
+ }
+
/**
* @covers ::postLoad
*/
diff --git a/web/core/tests/Drupal/Tests/Core/Entity/Sql/DefaultTableMappingTest.php b/web/core/tests/Drupal/Tests/Core/Entity/Sql/DefaultTableMappingTest.php
index 7af9ec3cb9..fe7a6e601a 100644
--- a/web/core/tests/Drupal/Tests/Core/Entity/Sql/DefaultTableMappingTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Entity/Sql/DefaultTableMappingTest.php
@@ -580,7 +580,7 @@ public function providerTestGetDedicatedTableName() {
*/
public function testTemporaryTableMapping() {
$table_mapping = new TemporaryTableMapping($this->entityType, [], '');
- $this->assertTrue($table_mapping instanceof DefaultTableMapping);
+ $this->assertInstanceOf(DefaultTableMapping::class, $table_mapping);
}
/**
diff --git a/web/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageSchemaTest.php b/web/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageSchemaTest.php
index ce2293a3e0..c5d43950de 100644
--- a/web/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageSchemaTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageSchemaTest.php
@@ -426,7 +426,7 @@ public function testGetSchemaRevisionable() {
->method('getRevisionMetadataKeys')
->will($this->returnValue([]));
- $this->storage->expects($this->exactly(1))
+ $this->storage->expects($this->exactly(9))
->method('getRevisionTable')
->will($this->returnValue('entity_test_revision'));
@@ -647,7 +647,7 @@ public function testGetSchemaRevisionableTranslatable() {
->method('isTranslatable')
->will($this->returnValue(TRUE));
- $this->storage->expects($this->exactly(2))
+ $this->storage->expects($this->exactly(30))
->method('getRevisionTable')
->will($this->returnValue('entity_test_revision'));
diff --git a/web/core/tests/Drupal/Tests/Core/Entity/TypedData/EntityAdapterUnitTest.php b/web/core/tests/Drupal/Tests/Core/Entity/TypedData/EntityAdapterUnitTest.php
index deed1e0bc9..ea72706442 100644
--- a/web/core/tests/Drupal/Tests/Core/Entity/TypedData/EntityAdapterUnitTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Entity/TypedData/EntityAdapterUnitTest.php
@@ -220,7 +220,7 @@ protected function setUp() {
* @covers ::getConstraints
*/
public function testGetConstraints() {
- $this->assertInternalType('array', $this->entityAdapter->getConstraints());
+ $this->assertIsArray($this->entityAdapter->getConstraints());
}
/**
@@ -349,7 +349,7 @@ public function testToArray() {
// Mock field objects return NULL values, so test keys only.
$this->assertArrayHasKey('id', $array);
$this->assertArrayHasKey('revision_id', $array);
- $this->assertEquals(count($array), 2);
+ $this->assertCount(2, $array);
}
/**
@@ -426,7 +426,7 @@ public function testGetIterator() {
$fields = iterator_to_array($iterator);
$this->assertArrayHasKey('id', $fields);
$this->assertArrayHasKey('revision_id', $fields);
- $this->assertEquals(count($fields), 2);
+ $this->assertCount(2, $fields);
$this->entityAdapter->setValue(NULL);
$this->assertEquals(new \ArrayIterator([]), $this->entityAdapter->getIterator());
diff --git a/web/core/tests/Drupal/Tests/Core/EventSubscriber/FinalExceptionSubscriberTest.php b/web/core/tests/Drupal/Tests/Core/EventSubscriber/FinalExceptionSubscriberTest.php
index 9902fdd2b9..7c467e6010 100644
--- a/web/core/tests/Drupal/Tests/Core/EventSubscriber/FinalExceptionSubscriberTest.php
+++ b/web/core/tests/Drupal/Tests/Core/EventSubscriber/FinalExceptionSubscriberTest.php
@@ -38,7 +38,7 @@ public function testOnExceptionWithUnknownFormat() {
$this->stringStartsWith('The website encountered an unexpected error. Please try again later.</br></br><em class="placeholder">Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException</em>: test message in ', $response->getContent());
$this->assertEquals(405, $response->getStatusCode());
$this->assertEquals('POST, PUT', $response->headers->get('Allow'));
- // Also check that that text/plain content type was added.
+ // Also check that the text/plain content type was added.
$this->assertEquals('text/plain', $response->headers->get('Content-Type'));
}
diff --git a/web/core/tests/Drupal/Tests/Core/Extension/ModuleRequiredByThemesUninstallValidatorTest.php b/web/core/tests/Drupal/Tests/Core/Extension/ModuleRequiredByThemesUninstallValidatorTest.php
new file mode 100644
index 0000000000..53ee666010
--- /dev/null
+++ b/web/core/tests/Drupal/Tests/Core/Extension/ModuleRequiredByThemesUninstallValidatorTest.php
@@ -0,0 +1,161 @@
+<?php
+
+namespace Drupal\Tests\Core\Extension;
+
+use Drupal\Core\Extension\ModuleExtensionList;
+use Drupal\Core\Extension\ModuleRequiredByThemesUninstallValidator;
+use Drupal\Core\Extension\ThemeExtensionList;
+use Drupal\Tests\AssertHelperTrait;
+use Drupal\Tests\UnitTestCase;
+
+/**
+ * @coversDefaultClass \Drupal\Core\Extension\ModuleRequiredByThemesUninstallValidator
+ * @group Extension
+ */
+class ModuleRequiredByThemesUninstallValidatorTest extends UnitTestCase {
+
+ use AssertHelperTrait;
+
+ /**
+ * Instance of ModuleRequiredByThemesUninstallValidator.
+ *
+ * @var \Drupal\Core\Extension\ModuleRequiredByThemesUninstallValidator
+ */
+ protected $moduleRequiredByThemeUninstallValidator;
+
+ /**
+ * Mock of ModuleExtensionList.
+ *
+ * @var \Drupal\Core\Extension\ModuleExtensionList
+ */
+ protected $moduleExtensionList;
+
+ /**
+ * Mock of ThemeExtensionList.
+ *
+ * @var \Drupal\Core\Extension\ThemeExtensionList
+ */
+ protected $themeExtensionList;
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function setUp() {
+ parent::setUp();
+ $this->moduleExtensionList = $this->prophesize(ModuleExtensionList::class);
+ $this->themeExtensionList = $this->prophesize(ThemeExtensionList::class);
+ $this->moduleRequiredByThemeUninstallValidator = new ModuleRequiredByThemesUninstallValidator($this->getStringTranslationStub(), $this->moduleExtensionList->reveal(), $this->themeExtensionList->reveal());
+ }
+
+ /**
+ * @covers ::validate
+ */
+ public function testValidateNoThemeDependency() {
+ $this->themeExtensionList->getAllInstalledInfo()->willReturn([
+ 'stable' => [
+ 'name' => 'Stable',
+ 'dependencies' => [],
+ ],
+ 'claro' => [
+ 'name' => 'Claro',
+ 'dependencies' => [],
+ ],
+ ]);
+
+ $module = $this->randomMachineName();
+ $expected = [];
+ $reasons = $this->moduleRequiredByThemeUninstallValidator->validate($module);
+ $this->assertSame($expected, $reasons);
+ }
+
+ /**
+ * @covers ::validate
+ */
+ public function testValidateOneThemeDependency() {
+ $module = 'single_module';
+ $module_name = 'Single Module';
+ $theme = 'one_theme';
+ $theme_name = 'One Theme';
+ $this->themeExtensionList->getAllInstalledInfo()->willReturn([
+ 'stable' => [
+ 'name' => 'Stable',
+ 'dependencies' => [],
+ ],
+ 'claro' => [
+ 'name' => 'Claro',
+ 'dependencies' => [],
+ ],
+ $theme => [
+ 'name' => $theme_name,
+ 'dependencies' => [
+ $module,
+ ],
+ ],
+ ]);
+
+ $this->moduleExtensionList->get($module)->willReturn((object) [
+ 'info' => [
+ 'name' => $module_name,
+ ],
+ ]);
+
+ $expected = [
+ "Required by the theme: $theme_name",
+ ];
+
+ $reasons = $this->moduleRequiredByThemeUninstallValidator->validate($module);
+ $this->assertSame($expected, $this->castSafeStrings($reasons));
+ }
+
+ /**
+ * @covers ::validate
+ */
+ public function testValidateTwoThemeDependencies() {
+ $module = 'popular_module';
+ $module_name = 'Popular Module';
+ $theme1 = 'first_theme';
+ $theme2 = 'second_theme';
+ $theme_name_1 = 'First Theme';
+ $theme_name_2 = 'Second Theme';
+ $this->themeExtensionList->getAllInstalledInfo()->willReturn([
+ 'stable' => [
+ 'name' => 'Stable',
+ 'dependencies' => [],
+ ],
+ 'claro' => [
+ 'name' => 'Claro',
+ 'dependencies' => [],
+ ],
+ $theme1 => [
+ 'name' => $theme_name_1,
+ 'dependencies' => [
+ $module,
+ ],
+ ],
+ $theme2 => [
+ 'name' => $theme_name_2,
+ 'dependencies' => [
+ $module,
+ ],
+ ],
+ ]);
+
+ $this->moduleExtensionList->get($module)->willReturn((object) [
+ 'info' => [
+ 'name' => $module_name,
+ ],
+ ]);
+
+ $expected = [
+ "Required by the themes: $theme_name_1, $theme_name_2",
+ ];
+
+ $reasons = $this->moduleRequiredByThemeUninstallValidator->validate($module);
+ $this->assertSame($expected, $this->castSafeStrings($reasons));
+ }
+
+}
+
+if (!defined('DRUPAL_MINIMUM_PHP')) {
+ define('DRUPAL_MINIMUM_PHP', '7.0.8');
+}
diff --git a/web/core/tests/Drupal/Tests/Core/Field/FieldItemListTest.php b/web/core/tests/Drupal/Tests/Core/Field/FieldItemListTest.php
index a5cc7e352d..fbd5222303 100644
--- a/web/core/tests/Drupal/Tests/Core/Field/FieldItemListTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Field/FieldItemListTest.php
@@ -135,6 +135,25 @@ public function providerTestEquals() {
// not exist ('3').
$datasets[] = [TRUE, $field_item_h, $field_item_i];
+ /** @var \Drupal\Core\Field\FieldItemBase $field_item_j */
+ $field_item_j = $this->getMockForAbstractClass('Drupal\Core\Field\FieldItemBase', [], '', FALSE);
+ $field_item_j->setValue(['0' => 1]);
+ /** @var \Drupal\Core\Field\FieldItemBase $field_item_k */
+ $field_item_k = $this->getMockForAbstractClass('Drupal\Core\Field\FieldItemBase', [], '', FALSE);
+ $field_item_k->setValue(['0' => 1, '1' => NULL]);
+ /** @var \Drupal\Core\Field\FieldItemBase $field_item_l */
+ $field_item_l = $this->getMockForAbstractClass('Drupal\Core\Field\FieldItemBase', [], '', FALSE);
+ $field_item_l->setValue(['0' => 1, '1' => FALSE]);
+ /** @var \Drupal\Core\Field\FieldItemBase $field_item_m */
+ $field_item_m = $this->getMockForAbstractClass('Drupal\Core\Field\FieldItemBase', [], '', FALSE);
+ $field_item_m->setValue(['0' => 1, '1' => '']);
+
+ // Tests filter properties with a NULL value. Empty strings or other false-y
+ // values are not filtered.
+ $datasets[] = [TRUE, $field_item_j, $field_item_k];
+ $datasets[] = [FALSE, $field_item_j, $field_item_l];
+ $datasets[] = [FALSE, $field_item_j, $field_item_m];
+
return $datasets;
}
diff --git a/web/core/tests/Drupal/Tests/Core/Form/FormBuilderTest.php b/web/core/tests/Drupal/Tests/Core/Form/FormBuilderTest.php
index a21ec29b98..f9bc6aee60 100644
--- a/web/core/tests/Drupal/Tests/Core/Form/FormBuilderTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Form/FormBuilderTest.php
@@ -485,6 +485,36 @@ public function testUniqueHtmlId() {
$this->assertSame('test-form-id--2', $form['#id']);
}
+ /**
+ * Tests that HTML IDs are unique between 2 forms with the same element names.
+ */
+ public function testUniqueElementHtmlId() {
+ $form_id_1 = 'test_form_id';
+ $form_id_2 = 'test_form_id_2';
+ $expected_form = $form_id_1();
+
+ // Mock 2 form objects that will be built once each.
+ $form_arg_1 = $this->createMock('Drupal\Core\Form\FormInterface');
+ $form_arg_1->expects($this->exactly(1))
+ ->method('getFormId')
+ ->will($this->returnValue($form_id_1));
+ $form_arg_1->expects($this->exactly(1))
+ ->method('buildForm')
+ ->will($this->returnValue($expected_form));
+ $form_arg_2 = $this->createMock('Drupal\Core\Form\FormInterface');
+ $form_arg_2->expects($this->exactly(1))
+ ->method('getFormId')
+ ->will($this->returnValue($form_id_2));
+ $form_arg_2->expects($this->exactly(1))
+ ->method('buildForm')
+ ->will($this->returnValue($expected_form));
+ $form_state = new FormState();
+ $form_1 = $this->simulateFormSubmission($form_id_1, $form_arg_1, $form_state);
+ $form_state = new FormState();
+ $form_2 = $this->simulateFormSubmission($form_id_2, $form_arg_2, $form_state);
+ $this->assertNotSame($form_1['actions']["#id"], $form_2['actions']["#id"]);
+ }
+
/**
* Tests that a cached form is deleted after submit.
*/
diff --git a/web/core/tests/Drupal/Tests/Core/Image/ImageTest.php b/web/core/tests/Drupal/Tests/Core/Image/ImageTest.php
index de5507ca37..c1ac3c3d0e 100644
--- a/web/core/tests/Drupal/Tests/Core/Image/ImageTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Image/ImageTest.php
@@ -188,7 +188,7 @@ public function testGetMimeType() {
public function testIsValid() {
$this->getTestImage(FALSE);
$this->assertTrue($this->image->isValid());
- $this->assertTrue(is_readable($this->image->getSource()));
+ $this->assertFileIsReadable($this->image->getSource());
}
/**
diff --git a/web/core/tests/Drupal/Tests/Core/Layout/LayoutPluginManagerTest.php b/web/core/tests/Drupal/Tests/Core/Layout/LayoutPluginManagerTest.php
index 3de9078e91..8d236c3197 100644
--- a/web/core/tests/Drupal/Tests/Core/Layout/LayoutPluginManagerTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Layout/LayoutPluginManagerTest.php
@@ -117,9 +117,9 @@ public function testGetDefinition() {
$this->assertSame('2 column layout', (string) $layout_definition->getLabel());
$this->assertSame('Columns: 2', (string) $layout_definition->getCategory());
$this->assertSame('A theme provided layout', (string) $layout_definition->getDescription());
- $this->assertTrue($layout_definition->getLabel() instanceof TranslatableMarkup);
- $this->assertTrue($layout_definition->getCategory() instanceof TranslatableMarkup);
- $this->assertTrue($layout_definition->getDescription() instanceof TranslatableMarkup);
+ $this->assertInstanceOf(TranslatableMarkup::class, $layout_definition->getLabel());
+ $this->assertInstanceOf(TranslatableMarkup::class, $layout_definition->getCategory());
+ $this->assertInstanceOf(TranslatableMarkup::class, $layout_definition->getDescription());
$this->assertSame('twocol', $layout_definition->getTemplate());
$this->assertSame('themes/theme_a/templates', $layout_definition->getPath());
$this->assertSame('theme_a/twocol', $layout_definition->getLibrary());
@@ -138,17 +138,17 @@ public function testGetDefinition() {
];
$regions = $layout_definition->getRegions();
$this->assertEquals($expected_regions, $regions);
- $this->assertTrue($regions['left']['label'] instanceof TranslatableMarkup);
- $this->assertTrue($regions['right']['label'] instanceof TranslatableMarkup);
+ $this->assertInstanceOf(TranslatableMarkup::class, $regions['left']['label']);
+ $this->assertInstanceOf(TranslatableMarkup::class, $regions['right']['label']);
$layout_definition = $this->layoutPluginManager->getDefinition('module_a_provided_layout');
$this->assertSame('module_a_provided_layout', $layout_definition->id());
$this->assertSame('1 column layout', (string) $layout_definition->getLabel());
$this->assertSame('Columns: 1', (string) $layout_definition->getCategory());
$this->assertSame('A module provided layout', (string) $layout_definition->getDescription());
- $this->assertTrue($layout_definition->getLabel() instanceof TranslatableMarkup);
- $this->assertTrue($layout_definition->getCategory() instanceof TranslatableMarkup);
- $this->assertTrue($layout_definition->getDescription() instanceof TranslatableMarkup);
+ $this->assertInstanceOf(TranslatableMarkup::class, $layout_definition->getLabel());
+ $this->assertInstanceOf(TranslatableMarkup::class, $layout_definition->getCategory());
+ $this->assertInstanceOf(TranslatableMarkup::class, $layout_definition->getDescription());
$this->assertSame(NULL, $layout_definition->getTemplate());
$this->assertSame('modules/module_a/layouts', $layout_definition->getPath());
$this->assertSame('module_a/onecol', $layout_definition->getLibrary());
@@ -167,8 +167,8 @@ public function testGetDefinition() {
];
$regions = $layout_definition->getRegions();
$this->assertEquals($expected_regions, $regions);
- $this->assertTrue($regions['top']['label'] instanceof TranslatableMarkup);
- $this->assertTrue($regions['bottom']['label'] instanceof TranslatableMarkup);
+ $this->assertInstanceOf(TranslatableMarkup::class, $regions['top']['label']);
+ $this->assertInstanceOf(TranslatableMarkup::class, $regions['bottom']['label']);
$core_path = '/core/lib/Drupal/Core';
$layout_definition = $this->layoutPluginManager->getDefinition('plugin_provided_layout');
@@ -176,9 +176,9 @@ public function testGetDefinition() {
$this->assertEquals('Layout plugin', $layout_definition->getLabel());
$this->assertEquals('Columns: 1', $layout_definition->getCategory());
$this->assertEquals('Test layout', $layout_definition->getDescription());
- $this->assertTrue($layout_definition->getLabel() instanceof TranslatableMarkup);
- $this->assertTrue($layout_definition->getCategory() instanceof TranslatableMarkup);
- $this->assertTrue($layout_definition->getDescription() instanceof TranslatableMarkup);
+ $this->assertInstanceOf(TranslatableMarkup::class, $layout_definition->getLabel());
+ $this->assertInstanceOf(TranslatableMarkup::class, $layout_definition->getCategory());
+ $this->assertInstanceOf(TranslatableMarkup::class, $layout_definition->getDescription());
$this->assertSame('plugin-provided-layout', $layout_definition->getTemplate());
$this->assertSame($core_path, $layout_definition->getPath());
$this->assertSame(NULL, $layout_definition->getLibrary());
@@ -194,7 +194,7 @@ public function testGetDefinition() {
];
$regions = $layout_definition->getRegions();
$this->assertEquals($expected_regions, $regions);
- $this->assertTrue($regions['main']['label'] instanceof TranslatableMarkup);
+ $this->assertInstanceOf(TranslatableMarkup::class, $regions['main']['label']);
}
/**
diff --git a/web/core/tests/Drupal/Tests/Core/Lock/LockBackendAbstractTest.php b/web/core/tests/Drupal/Tests/Core/Lock/LockBackendAbstractTest.php
index 5b6400ab71..f8914856c2 100644
--- a/web/core/tests/Drupal/Tests/Core/Lock/LockBackendAbstractTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Lock/LockBackendAbstractTest.php
@@ -53,7 +53,7 @@ public function testWaitTrue() {
*/
public function testGetLockId() {
$lock_id = $this->lock->getLockId();
- $this->assertInternalType('string', $lock_id);
+ $this->assertIsString($lock_id);
// Example lock ID would be '7213141505232b6ee2cb967.27683891'.
$this->assertRegExp('/[\da-f]+\.\d+/', $lock_id);
// Test the same lock ID is returned a second time.
diff --git a/web/core/tests/Drupal/Tests/Core/Menu/DefaultMenuLinkTreeManipulatorsTest.php b/web/core/tests/Drupal/Tests/Core/Menu/DefaultMenuLinkTreeManipulatorsTest.php
index 108236e774..dd576751a2 100644
--- a/web/core/tests/Drupal/Tests/Core/Menu/DefaultMenuLinkTreeManipulatorsTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Menu/DefaultMenuLinkTreeManipulatorsTest.php
@@ -200,7 +200,7 @@ public function testCheckAccess() {
$this->assertInstanceOf('\Drupal\Core\Menu\InaccessibleMenuLink', $element->link);
// Menu link 4: child of menu link 3, which was AccessResult::neutral(),
// hence menu link 3's subtree is removed, of which this menu link is one.
- $this->assertFalse(array_key_exists(4, $tree[2]->subtree[3]->subtree));
+ $this->assertArrayNotHasKey(4, $tree[2]->subtree[3]->subtree);
// Menu link 5: no route name, treated as external, hence access granted.
$element = $tree[5];
$this->assertEquals(AccessResult::allowed()->cachePerPermissions(), $element->access);
diff --git a/web/core/tests/Drupal/Tests/Core/Plugin/DefaultPluginManagerTest.php b/web/core/tests/Drupal/Tests/Core/Plugin/DefaultPluginManagerTest.php
index 7f5ca70145..54481ab822 100644
--- a/web/core/tests/Drupal/Tests/Core/Plugin/DefaultPluginManagerTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Plugin/DefaultPluginManagerTest.php
@@ -334,7 +334,7 @@ public function testGetDefinitionsWithoutRequiredInterface() {
$this->expectedDefinitions['banana']['provider'] = 'plugin_test';
$plugin_manager = new TestPluginManager($this->namespaces, $this->expectedDefinitions, $module_handler, NULL);
- $this->assertInternalType('array', $plugin_manager->getDefinitions());
+ $this->assertIsArray($plugin_manager->getDefinitions());
}
/**
@@ -344,9 +344,9 @@ public function testGetCacheContexts() {
$module_handler = $this->prophesize(ModuleHandlerInterface::class);
$plugin_manager = new TestPluginManager($this->namespaces, $this->expectedDefinitions, $module_handler->reveal(), NULL);
$cache_contexts = $plugin_manager->getCacheContexts();
- $this->assertInternalType('array', $cache_contexts);
+ $this->assertIsArray($cache_contexts);
array_map(function ($cache_context) {
- $this->assertInternalType('string', $cache_context);
+ $this->assertIsString($cache_context);
}, $cache_contexts);
}
@@ -357,9 +357,9 @@ public function testGetCacheTags() {
$module_handler = $this->prophesize(ModuleHandlerInterface::class);
$plugin_manager = new TestPluginManager($this->namespaces, $this->expectedDefinitions, $module_handler->reveal(), NULL);
$cache_tags = $plugin_manager->getCacheTags();
- $this->assertInternalType('array', $cache_tags);
+ $this->assertIsArray($cache_tags);
array_map(function ($cache_tag) {
- $this->assertInternalType('string', $cache_tag);
+ $this->assertIsString($cache_tag);
}, $cache_tags);
}
@@ -370,7 +370,7 @@ public function testGetCacheMaxAge() {
$module_handler = $this->prophesize(ModuleHandlerInterface::class);
$plugin_manager = new TestPluginManager($this->namespaces, $this->expectedDefinitions, $module_handler->reveal(), NULL);
$cache_max_age = $plugin_manager->getCacheMaxAge();
- $this->assertInternalType('int', $cache_max_age);
+ $this->assertIsInt($cache_max_age);
}
/**
diff --git a/web/core/tests/Drupal/Tests/Core/Plugin/Discovery/ContainerDerivativeDiscoveryDecoratorTest.php b/web/core/tests/Drupal/Tests/Core/Plugin/Discovery/ContainerDerivativeDiscoveryDecoratorTest.php
index dc888f2eaf..938fbbc01b 100644
--- a/web/core/tests/Drupal/Tests/Core/Plugin/Discovery/ContainerDerivativeDiscoveryDecoratorTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Plugin/Discovery/ContainerDerivativeDiscoveryDecoratorTest.php
@@ -45,7 +45,7 @@ public function testGetDefinitions() {
$definitions = $discovery->getDefinitions();
// Ensure that both the instances from container and non-container test derivatives got added.
- $this->assertEquals(4, count($definitions));
+ $this->assertCount(4, $definitions);
}
}
diff --git a/web/core/tests/Drupal/Tests/Core/Plugin/Discovery/DerivativeDiscoveryDecoratorTest.php b/web/core/tests/Drupal/Tests/Core/Plugin/Discovery/DerivativeDiscoveryDecoratorTest.php
index 569c8e6f46..0517f34a43 100644
--- a/web/core/tests/Drupal/Tests/Core/Plugin/Discovery/DerivativeDiscoveryDecoratorTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Plugin/Discovery/DerivativeDiscoveryDecoratorTest.php
@@ -50,7 +50,7 @@ public function testGetDerivativeFetcher() {
$definitions = $discovery->getDefinitions();
// Ensure that both test derivatives got added.
- $this->assertEquals(2, count($definitions));
+ $this->assertCount(2, $definitions);
$this->assertEquals('non_container_aware_discovery', $definitions['non_container_aware_discovery:test_discovery_0']['id']);
$this->assertEquals('\Drupal\Tests\Core\Plugin\Discovery\TestDerivativeDiscovery', $definitions['non_container_aware_discovery:test_discovery_0']['deriver']);
@@ -76,7 +76,7 @@ public function testGetDerivativeFetcherWithAnnotationObjects() {
$definitions = $discovery->getDefinitions();
// Ensure that both test derivatives got added.
- $this->assertEquals(2, count($definitions));
+ $this->assertCount(2, $definitions);
$this->assertInstanceOf('\stdClass', $definitions['non_container_aware_discovery:test_discovery_0']);
$this->assertEquals('non_container_aware_discovery', $definitions['non_container_aware_discovery:test_discovery_0']->id);
$this->assertEquals('\Drupal\Tests\Core\Plugin\Discovery\TestDerivativeDiscoveryWithObject', $definitions['non_container_aware_discovery:test_discovery_0']->deriver);
diff --git a/web/core/tests/Drupal/Tests/Core/Plugin/Discovery/YamlDirectoryDiscoveryTest.php b/web/core/tests/Drupal/Tests/Core/Plugin/Discovery/YamlDirectoryDiscoveryTest.php
index 01f837c0ff..3aec916451 100644
--- a/web/core/tests/Drupal/Tests/Core/Plugin/Discovery/YamlDirectoryDiscoveryTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Plugin/Discovery/YamlDirectoryDiscoveryTest.php
@@ -51,7 +51,7 @@ public function testGetDefinitions() {
$definitions = $discovery->getDefinitions();
- $this->assertInternalType('array', $definitions);
+ $this->assertIsArray($definitions);
$this->assertCount(4, $definitions);
foreach ($definitions as $id => $definition) {
diff --git a/web/core/tests/Drupal/Tests/Core/Plugin/Discovery/YamlDiscoveryDecoratorTest.php b/web/core/tests/Drupal/Tests/Core/Plugin/Discovery/YamlDiscoveryDecoratorTest.php
index 0880169af3..41a2699752 100644
--- a/web/core/tests/Drupal/Tests/Core/Plugin/Discovery/YamlDiscoveryDecoratorTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Plugin/Discovery/YamlDiscoveryDecoratorTest.php
@@ -70,7 +70,7 @@ protected function setUp() {
public function testGetDefinitions() {
$definitions = $this->discoveryDecorator->getDefinitions();
- $this->assertInternalType('array', $definitions);
+ $this->assertIsArray($definitions);
$this->assertCount(6, $definitions);
foreach ($this->expectedKeys as $expected_key) {
diff --git a/web/core/tests/Drupal/Tests/Core/Plugin/Discovery/YamlDiscoveryTest.php b/web/core/tests/Drupal/Tests/Core/Plugin/Discovery/YamlDiscoveryTest.php
index 04e686ae8b..c5289440c3 100644
--- a/web/core/tests/Drupal/Tests/Core/Plugin/Discovery/YamlDiscoveryTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Plugin/Discovery/YamlDiscoveryTest.php
@@ -51,7 +51,7 @@ protected function setUp() {
public function testGetDefinitions() {
$definitions = $this->discovery->getDefinitions();
- $this->assertInternalType('array', $definitions);
+ $this->assertIsArray($definitions);
$this->assertCount(4, $definitions);
foreach ($this->expectedKeys as $expected_key) {
diff --git a/web/core/tests/Drupal/Tests/Core/PrivateKeyTest.php b/web/core/tests/Drupal/Tests/Core/PrivateKeyTest.php
index 3331d44076..ef95a1624c 100644
--- a/web/core/tests/Drupal/Tests/Core/PrivateKeyTest.php
+++ b/web/core/tests/Drupal/Tests/Core/PrivateKeyTest.php
@@ -62,7 +62,7 @@ public function testGet() {
* Tests PrivateKey::get() with no private key from state.
*/
public function testGetNoState() {
- $this->assertInternalType('string', $this->privateKey->get());
+ $this->assertIsString($this->privateKey->get());
}
/**
diff --git a/web/core/tests/Drupal/Tests/Core/Render/Element/HtmlTagTest.php b/web/core/tests/Drupal/Tests/Core/Render/Element/HtmlTagTest.php
index 51ac995c19..96777a6e70 100644
--- a/web/core/tests/Drupal/Tests/Core/Render/Element/HtmlTagTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Render/Element/HtmlTagTest.php
@@ -75,7 +75,7 @@ public function providerPreRenderHtmlTag() {
$element['#noscript'] = TRUE;
$tags['noscript'] = [$element, '<noscript><div class="test" id="id">value</div>' . "\n" . '</noscript>'];
- // Ensure that #tag is sanitised.
+ // Ensure that #tag is sanitized.
$element = [
'#tag' => 'p><script>alert()</script><p',
'#value' => 'value',
diff --git a/web/core/tests/Drupal/Tests/Core/Render/RendererRecursionTest.php b/web/core/tests/Drupal/Tests/Core/Render/RendererRecursionTest.php
index 0517e659c4..d316d6dd18 100644
--- a/web/core/tests/Drupal/Tests/Core/Render/RendererRecursionTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Render/RendererRecursionTest.php
@@ -70,7 +70,7 @@ public function testRenderRecursionWithNestedRender() {
$this->setUpRequest();
$callable = function ($markup) use ($renderer, $complex_child_template) {
- $this->assertTrue(strpos($markup, '<drupal-render-placeholder') === 0, 'Rendered complex child output as expected, without the placeholder replaced, i.e. with just the placeholder.');
+ $this->assertStringStartsWith('<drupal-render-placeholder', (string) $markup, 'Rendered complex child output as expected, without the placeholder replaced, i.e. with just the placeholder.');
return $markup;
};
@@ -86,8 +86,8 @@ public function testRenderRecursionWithNestedRender() {
$output = $renderer->renderRoot($page);
$this->assertEquals('<p>This is a rendered placeholder!</p><p>Rendered!</p>', $output, 'Rendered output as expected, with the placeholder replaced.');
- $this->assertTrue(in_array('test:complex_child', $page['#cache']['tags']), 'Cache tag bubbling performed.');
- $this->assertTrue(in_array('dynamic_animal', array_keys($page['#attached']['drupalSettings'])), 'Asset bubbling performed.');
+ $this->assertContains('test:complex_child', $page['#cache']['tags'], 'Cache tag bubbling performed.');
+ $this->assertContains('dynamic_animal', array_keys($page['#attached']['drupalSettings']), 'Asset bubbling performed.');
}
/**
@@ -121,7 +121,7 @@ public function testRenderRecursionWithNestedRenderPlain() {
];
$output = $renderer->renderRoot($page);
$this->assertEquals('<p>This is a rendered placeholder!</p>' . $parent_markup, $output, 'Rendered output as expected, with the placeholder replaced.');
- $this->assertFalse(in_array('test:complex_child', $page['#cache']['tags']), 'Cache tag bubbling not performed.');
+ $this->assertNotContains('test:complex_child', $page['#cache']['tags'], 'Cache tag bubbling not performed.');
$this->assertTrue(empty($page['#attached']), 'Asset bubbling not performed.');
}
diff --git a/web/core/tests/Drupal/Tests/Core/Render/RendererTest.php b/web/core/tests/Drupal/Tests/Core/Render/RendererTest.php
index 271b94143d..1d381ca926 100644
--- a/web/core/tests/Drupal/Tests/Core/Render/RendererTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Render/RendererTest.php
@@ -48,13 +48,13 @@ public function testRenderBasic($build, $expected, callable $setup_code = NULL)
}
if (isset($build['#markup'])) {
- $this->assertNotInstanceOf(MarkupInterface::class, $build['#markup'], 'The #markup value is not marked safe before rendering.');
+ $this->assertNotInstanceOf(MarkupInterface::class, $build['#markup']);
}
$render_output = $this->renderer->renderRoot($build);
$this->assertSame($expected, (string) $render_output);
if ($render_output !== '') {
- $this->assertInstanceOf(MarkupInterface::class, $render_output, 'Output of render is marked safe.');
- $this->assertInstanceOf(MarkupInterface::class, $build['#markup'], 'The #markup value is marked safe after rendering.');
+ $this->assertInstanceOf(MarkupInterface::class, $render_output);
+ $this->assertInstanceOf(MarkupInterface::class, $build['#markup']);
}
}
@@ -933,7 +933,7 @@ public function testRenderCacheProperties(array $expected_results) {
// #custom_property_array can not be a safe_cache_property.
$safe_cache_properties = array_diff(Element::properties(array_filter($expected_results)), ['#custom_property_array']);
foreach ($safe_cache_properties as $cache_property) {
- $this->assertInstanceOf(MarkupInterface::class, $data[$cache_property], "$cache_property is marked as a safe string");
+ $this->assertInstanceOf(MarkupInterface::class, $data[$cache_property]);
}
}
diff --git a/web/core/tests/Drupal/Tests/Core/Render/RendererTestBase.php b/web/core/tests/Drupal/Tests/Core/Render/RendererTestBase.php
index 0a2a74a6e6..4a243dca74 100644
--- a/web/core/tests/Drupal/Tests/Core/Render/RendererTestBase.php
+++ b/web/core/tests/Drupal/Tests/Core/Render/RendererTestBase.php
@@ -127,9 +127,11 @@ protected function setUp() {
case 'details':
$info = ['#theme_wrappers' => ['details']];
break;
+
case 'link':
$info = ['#theme' => 'link'];
break;
+
default:
$info = [];
}
@@ -155,12 +157,15 @@ protected function setUp() {
case 'user.roles':
$keys[] = 'r.' . $current_user_role;
break;
+
case 'languages:language_interface':
$keys[] = 'en';
break;
+
case 'theme':
$keys[] = 'stark';
break;
+
default:
$keys[] = $context_id;
}
diff --git a/web/core/tests/Drupal/Tests/Core/Routing/AcceptHeaderMatcherTest.php b/web/core/tests/Drupal/Tests/Core/Routing/AcceptHeaderMatcherTest.php
index 595501727d..ca69cdd402 100644
--- a/web/core/tests/Drupal/Tests/Core/Routing/AcceptHeaderMatcherTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Routing/AcceptHeaderMatcherTest.php
@@ -75,7 +75,7 @@ public function testAcceptFiltering($accept_header, $format, $included_route, $e
$request->headers->set('Accept', $accept_header);
$request->setRequestFormat($format);
$routes = $this->matcher->filter($collection, $request);
- $this->assertEquals(count($routes), 4, 'The correct number of routes was found.');
+ $this->assertCount(4, $routes, 'The correct number of routes was found.');
$this->assertNotNull($routes->get($included_route), "Route $included_route was found when matching $accept_header.");
$this->assertNull($routes->get($excluded_route), "Route $excluded_route was not found when matching $accept_header.");
foreach ($routes as $name => $route) {
diff --git a/web/core/tests/Drupal/Tests/Core/Routing/ContentTypeHeaderMatcherTest.php b/web/core/tests/Drupal/Tests/Core/Routing/ContentTypeHeaderMatcherTest.php
index 1ae593bfda..400e07e1a1 100644
--- a/web/core/tests/Drupal/Tests/Core/Routing/ContentTypeHeaderMatcherTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Routing/ContentTypeHeaderMatcherTest.php
@@ -52,7 +52,7 @@ public function testSafeRequestFilter($method) {
$request = Request::create('path/two', $method);
$routes = $this->matcher->filter($collection, $request);
- $this->assertEquals(count($routes), 7, 'The correct number of routes was found.');
+ $this->assertCount(7, $routes, 'The correct number of routes was found.');
}
public function providerTestSafeRequestFilter() {
@@ -75,7 +75,7 @@ public function testJsonRequest() {
$request = Request::create('path/two', 'POST');
$request->headers->set('Content-type', 'application/json');
$routes = $this->matcher->filter($collection, $request);
- $this->assertEquals(count($routes), 6, 'The correct number of routes was found.');
+ $this->assertCount(6, $routes, 'The correct number of routes was found.');
$this->assertNotNull($routes->get('route_f'), 'The json route was found.');
$this->assertNull($routes->get('route_g'), 'The xml route was not found.');
foreach ($routes as $name => $route) {
@@ -96,7 +96,7 @@ public function testPostForm() {
$request = Request::create('path/two', 'POST');
$request->headers->set('Content-type', 'application/www-form-urlencoded');
$routes = $this->matcher->filter($collection, $request);
- $this->assertEquals(count($routes), 5, 'The correct number of routes was found.');
+ $this->assertCount(5, $routes, 'The correct number of routes was found.');
$this->assertNull($routes->get('route_f'), 'The json route was found.');
$this->assertNull($routes->get('route_g'), 'The xml route was not found.');
}
diff --git a/web/core/tests/Drupal/Tests/Core/Routing/TrustedRedirectResponseTest.php b/web/core/tests/Drupal/Tests/Core/Routing/TrustedRedirectResponseTest.php
index cb491441a0..17a5d52700 100644
--- a/web/core/tests/Drupal/Tests/Core/Routing/TrustedRedirectResponseTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Routing/TrustedRedirectResponseTest.php
@@ -61,7 +61,7 @@ public function testCreateFromRedirectResponse($redirect_response) {
$trusted_redirect_response = TrustedRedirectResponse::createFromRedirectResponse($redirect_response);
// The trusted redirect response is always a CacheableResponseInterface instance.
- $this->assertTrue($trusted_redirect_response instanceof CacheableResponseInterface);
+ $this->assertInstanceOf(CacheableResponseInterface::class, $trusted_redirect_response);
// But it is only actually cacheable (non-zero max-age) if the redirect
// response passed to TrustedRedirectResponse::createFromRedirectResponse()
diff --git a/web/core/tests/Drupal/Tests/Core/Routing/UrlGeneratorTest.php b/web/core/tests/Drupal/Tests/Core/Routing/UrlGeneratorTest.php
index 35ebc81c81..598e6fec51 100644
--- a/web/core/tests/Drupal/Tests/Core/Routing/UrlGeneratorTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Routing/UrlGeneratorTest.php
@@ -189,10 +189,13 @@ public function aliasManagerCallback() {
switch ($args[0]) {
case '/test/one':
return '/hello/world';
+
case '/test/two/5':
return '/goodbye/cruel/world';
+
case '/<front>':
return '/';
+
default:
return $args[0];
}
diff --git a/web/core/tests/Drupal/Tests/Core/Security/RequestSanitizerTest.php b/web/core/tests/Drupal/Tests/Core/Security/RequestSanitizerTest.php
index e828de086e..55e2da7b5c 100644
--- a/web/core/tests/Drupal/Tests/Core/Security/RequestSanitizerTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Security/RequestSanitizerTest.php
@@ -61,7 +61,7 @@ public function testRequestSanitization(Request $request, array $expected = [],
$request = RequestSanitizer::sanitize($request, $whitelist, is_null($expected_errors) ? FALSE : TRUE);
- // Normalise the expected data.
+ // Normalize the expected data.
$expected += ['cookies' => [], 'query' => [], 'request' => []];
$expected_query_string = http_build_query($expected['query']);
diff --git a/web/core/tests/Drupal/Tests/Core/Template/AttributeTest.php b/web/core/tests/Drupal/Tests/Core/Template/AttributeTest.php
index 46545a0ecc..dc8b9b813b 100644
--- a/web/core/tests/Drupal/Tests/Core/Template/AttributeTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Template/AttributeTest.php
@@ -348,7 +348,7 @@ public function testPrint() {
$this->assertID('example-id', $html);
$this->assertNoID('example-id2', $html);
- $this->assertTrue(strpos($html, 'enabled') !== FALSE);
+ $this->assertStringContainsString('enabled', $html);
}
/**
diff --git a/web/core/tests/Drupal/Tests/Core/Test/AssertContentTraitTest.php b/web/core/tests/Drupal/Tests/Core/Test/AssertContentTraitTest.php
index 70f62245b9..3bc362b328 100644
--- a/web/core/tests/Drupal/Tests/Core/Test/AssertContentTraitTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Test/AssertContentTraitTest.php
@@ -28,9 +28,9 @@ public function testGetTextContent() {
</body>
EOT;
$test->_setRawContent($raw_content);
- $this->assertNotContains('foo', $test->_getTextContent());
- $this->assertNotContains('<body>', $test->_getTextContent());
- $this->assertContains('bar', $test->_getTextContent());
+ $this->assertStringNotContainsString('foo', $test->_getTextContent());
+ $this->assertStringNotContainsString('<body>', $test->_getTextContent());
+ $this->assertStringContainsString('bar', $test->_getTextContent());
}
}
diff --git a/web/core/tests/Drupal/Tests/Core/Test/JUnitConverterTest.php b/web/core/tests/Drupal/Tests/Core/Test/JUnitConverterTest.php
index 500f4a3b57..ccb00ff82c 100644
--- a/web/core/tests/Drupal/Tests/Core/Test/JUnitConverterTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Test/JUnitConverterTest.php
@@ -29,7 +29,7 @@ public function testXmlToRowsWithErrors() {
$phpunit_error_xml = __DIR__ . '/fixtures/phpunit_error.xml';
$res = JUnitConverter::xmlToRows(1, $phpunit_error_xml);
- $this->assertEquals(count($res), 4, 'All testcases got extracted');
+ $this->assertCount(4, $res, 'All testcases got extracted');
$this->assertNotEquals($res[0]['status'], 'pass');
$this->assertEquals($res[0]['status'], 'fail');
diff --git a/web/core/tests/Drupal/Tests/Core/Test/PhpUnitCliTest.php b/web/core/tests/Drupal/Tests/Core/Test/PhpUnitCliTest.php
new file mode 100644
index 0000000000..135302f6c6
--- /dev/null
+++ b/web/core/tests/Drupal/Tests/Core/Test/PhpUnitCliTest.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace Drupal\Tests\Core\Test;
+
+use Drupal\Tests\UnitTestCase;
+use Symfony\Component\Process\Process;
+
+/**
+ * @group TestSuites
+ * @group Test
+ */
+class PhpUnitCliTest extends UnitTestCase {
+
+ /**
+ * Ensure that the test suites are able to discover tests without incident.
+ */
+ public function testPhpUnitListTests() {
+ // Generate the list of tests for all the tests the suites can discover.
+ // The goal here is to successfully generate the list, without any
+ // duplicate namespace errors or so forth. This keeps us from committing
+ // tests which don't break under run-tests.sh, but do break under the
+ // phpunit test runner tool.
+ $process = new Process('vendor/bin/phpunit --configuration core --verbose --list-tests');
+ $process->setWorkingDirectory($this->root)
+ ->setTimeout(300)
+ ->setIdleTimeout(300);
+ $process->run();
+ $this->assertEquals(0, $process->getExitCode(),
+ 'COMMAND: ' . $process->getCommandLine() . "\n" .
+ 'OUTPUT: ' . $process->getOutput() . "\n" .
+ 'ERROR: ' . $process->getErrorOutput() . "\n"
+ );
+ }
+
+}
diff --git a/web/core/tests/Drupal/Tests/Core/Theme/ClassyTemplatesIdenticalToStableTest.php b/web/core/tests/Drupal/Tests/Core/Theme/ClassyTemplatesIdenticalToStableTest.php
new file mode 100644
index 0000000000..ee018ae7f6
--- /dev/null
+++ b/web/core/tests/Drupal/Tests/Core/Theme/ClassyTemplatesIdenticalToStableTest.php
@@ -0,0 +1,62 @@
+<?php
+
+namespace Drupal\Tests\Core\Theme;
+
+use Drupal\Tests\UnitTestCase;
+
+/**
+ * Confirms that certain Classy templates have identical equivalents in Stable.
+ *
+ * @group Theme
+ */
+class ClassyTemplatesIdenticalToStableTest extends UnitTestCase {
+
+ /**
+ * Confirms that certain Classy templates have equivalents in Stable.
+ *
+ * @dataProvider providerTestStableTemplatesIdenticalToClassy
+ *
+ * @param string $template
+ * The template file to test.
+ */
+ public function testStableTemplatesIdenticalToClassy($template) {
+ $stable_template = $this->root . '/core/themes/stable/templates' . $template;
+ $classy_template = $this->root . '/core/themes/classy/templates' . $template;
+ $this->assertFileExists($stable_template);
+ $this->assertFileExists($classy_template);
+ $this->assertSame(md5_file($stable_template), md5_file($classy_template), 'The templates should have the same checksums.');
+ }
+
+ /**
+ * A list of the Classy templates that have identical copies in Stable.
+ */
+ public function providerTestStableTemplatesIdenticalToClassy() {
+ return [
+ ['/content-edit/file-upload-help.html.twig'],
+ ['/content-edit/file-widget-multiple.html.twig'],
+ ['/field/image-formatter.html.twig'],
+ ['/field/image-style.html.twig'],
+ ['/form/checkboxes.html.twig'],
+ ['/form/confirm-form.html.twig'],
+ ['/form/container.html.twig'],
+ ['/form/dropbutton-wrapper.html.twig'],
+ ['/form/field-multiple-value-form.html.twig'],
+ ['/form/form.html.twig'],
+ ['/form/form-element-label.html.twig'],
+ ['/form/input.html.twig'],
+ ['/form/select.html.twig'],
+ ['/navigation/links.html.twig'],
+ ['/navigation/menu-local-action.html.twig'],
+ ['/navigation/pager.html.twig'],
+ ['/navigation/vertical-tabs.html.twig'],
+ ['/views/views-view-grid.html.twig'],
+ ['/views/views-view-list.html.twig'],
+ ['/views/views-view-mapping-test.html.twig'],
+ ['/views/views-view-opml.html.twig'],
+ ['/views/views-view-row-opml.html.twig'],
+ ['/views/views-view-rss.html.twig'],
+ ['/views/views-view-unformatted.html.twig'],
+ ];
+ }
+
+}
diff --git a/web/core/tests/Drupal/Tests/Core/Theme/RegistryLegacyTest.php b/web/core/tests/Drupal/Tests/Core/Theme/RegistryLegacyTest.php
new file mode 100644
index 0000000000..4598913c7b
--- /dev/null
+++ b/web/core/tests/Drupal/Tests/Core/Theme/RegistryLegacyTest.php
@@ -0,0 +1,149 @@
+<?php
+
+namespace Drupal\Tests\Core\Theme;
+
+use Drupal\Core\Theme\ActiveTheme;
+use Drupal\Core\Theme\Registry;
+use Drupal\Tests\UnitTestCase;
+
+/**
+ * @coversDefaultClass \Drupal\Core\Theme\Registry
+ * @group Theme
+ * @group legacy
+ *
+ * @todo Remove in https://www.drupal.org/project/drupal/issues/3097889
+ */
+class RegistryLegacyTest extends UnitTestCase {
+
+ /**
+ * The mocked theme registry.
+ *
+ * @var \Drupal\Core\Theme\Registry|PHPUnit\Framework\MockObject\MockObject
+ */
+ protected $registry;
+
+ /**
+ * The mocked cache backend.
+ *
+ * @var \Drupal\Core\Cache\CacheBackendInterface|\PHPUnit\Framework\MockObject\MockObject
+ */
+ protected $cache;
+
+ /**
+ * The mocked lock backend.
+ *
+ * @var \Drupal\Core\Lock\LockBackendInterface|\PHPUnit\Framework\MockObject\MockObject
+ */
+ protected $lock;
+
+ /**
+ * The mocked module handler.
+ *
+ * @var \Drupal\Core\Extension\ModuleHandlerInterface|\PHPUnit\Framework\MockObject\MockObject
+ */
+ protected $moduleHandler;
+
+ /**
+ * The mocked theme handler.
+ *
+ * @var \Drupal\Core\Extension\ThemeHandlerInterface|\PHPUnit\Framework\MockObject\MockObject
+ */
+ protected $themeHandler;
+
+ /**
+ * The mocked theme initialization.
+ *
+ * @var \Drupal\Core\Theme\ThemeInitializationInterface|\PHPUnit\Framework\MockObject\MockObject
+ */
+ protected $themeInitialization;
+
+ /**
+ * The theme manager.
+ *
+ * @var \Drupal\Core\Theme\ThemeManagerInterface|\PHPUnit\Framework\MockObject\MockObject
+ */
+ protected $themeManager;
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function setUp() {
+ parent::setUp();
+
+ $this->cache = $this->createMock('Drupal\Core\Cache\CacheBackendInterface');
+ $this->lock = $this->createMock('Drupal\Core\Lock\LockBackendInterface');
+ $this->moduleHandler = $this->createMock('Drupal\Core\Extension\ModuleHandlerInterface');
+ $this->themeHandler = $this->createMock('Drupal\Core\Extension\ThemeHandlerInterface');
+ $this->themeInitialization = $this->createMock('Drupal\Core\Theme\ThemeInitializationInterface');
+ $this->themeManager = $this->createMock('Drupal\Core\Theme\ThemeManagerInterface');
+
+ $this->setupTheme();
+ }
+
+ /**
+ * Tests getting legacy theme function registry data defined by a module.
+ *
+ * @expectedDeprecation Theme functions are deprecated in drupal:8.0.0 and are removed from drupal:10.0.0. Use Twig templates instead of theme_theme_test(). See https://www.drupal.org/node/1831138
+ */
+ public function testGetLegacyThemeFunctionRegistryForModule() {
+ $test_theme = new ActiveTheme([
+ 'name' => 'test_legacy_theme',
+ 'path' => 'core/modules/system/tests/themes/test_legacy_theme/test_legacy_theme.info.yml',
+ 'engine' => 'twig',
+ 'owner' => 'twig',
+ 'stylesheets_remove' => [],
+ 'libraries_override' => [],
+ 'libraries_extend' => [],
+ 'libraries' => [],
+ 'extension' => '.twig',
+ 'base_theme_extensions' => [],
+ ]);
+
+ $this->themeManager->expects($this->once())
+ ->method('getActiveTheme')
+ ->willReturn($test_theme);
+
+ // Include the module and theme files so that hook_theme can be called.
+ include_once $this->root . '/core/modules/system/tests/modules/theme_legacy_test/theme_legacy_test.module';
+ $this->moduleHandler->expects($this->once())
+ ->method('getImplementations')
+ ->with('theme')
+ ->will($this->returnValue(['theme_legacy_test']));
+ $this->moduleHandler->expects($this->atLeastOnce())
+ ->method('getModuleList')
+ ->willReturn([]);
+
+ $registry = $this->registry->get();
+
+ // Ensure that the registry entries from the module are found.
+ $this->assertArrayHasKey('theme_test', $registry);
+ $this->assertArrayHasKey('theme_test_function_suggestions', $registry);
+ $this->assertArrayHasKey('theme_test_foo', $registry);
+ $this->assertArrayHasKey('theme_test_render_element_children', $registry);
+ $this->assertArrayHasKey('theme_test_function_template_override', $registry);
+
+ $this->assertArrayNotHasKey('test_theme_not_existing_function', $registry);
+
+ $info = $registry['theme_test_function_suggestions'];
+ $this->assertEquals('module', $info['type']);
+ $this->assertEquals('core/modules/system/tests/modules/theme_legacy_test', $info['theme path']);
+ $this->assertEquals('theme_theme_test_function_suggestions', $info['function']);
+ $this->assertEquals([], $info['variables']);
+ }
+
+ protected function setupTheme() {
+ $this->registry = $this->getMockBuilder(Registry::class)
+ ->setMethods(['getPath'])
+ ->setConstructorArgs([$this->root, $this->cache, $this->lock, $this->moduleHandler, $this->themeHandler, $this->themeInitialization])
+ ->getMock();
+ $this->registry->expects($this->any())
+ ->method('getPath')
+ ->willReturnCallback(function ($module) {
+ if ($module == 'theme_legacy_test') {
+ return 'core/modules/system/tests/modules/theme_legacy_test';
+ }
+ });
+ $this->registry->setThemeManager($this->themeManager);
+ }
+
+}
diff --git a/web/core/tests/Drupal/Tests/Core/Theme/RegistryTest.php b/web/core/tests/Drupal/Tests/Core/Theme/RegistryTest.php
index f16b26f931..438c634919 100644
--- a/web/core/tests/Drupal/Tests/Core/Theme/RegistryTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Theme/RegistryTest.php
@@ -1,10 +1,5 @@
<?php
-/**
- * @file
- * Contains \Drupal\Tests\Core\Theme\RegistryTest.
- */
-
namespace Drupal\Tests\Core\Theme;
use Drupal\Core\Theme\ActiveTheme;
@@ -18,9 +13,9 @@
class RegistryTest extends UnitTestCase {
/**
- * The tested theme registry.
+ * The mocked theme registry.
*
- * @var \Drupal\Tests\Core\Theme\TestRegistry
+ * @var \Drupal\Core\Theme\Registry|PHPUnit\Framework\MockObject\MockObject
*/
protected $registry;
@@ -151,27 +146,17 @@ public function testGetRegistryForModule() {
$this->assertArrayHasKey('theme_test_suggestion_provided', $registry);
$this->assertArrayHasKey('theme_test_specific_suggestions', $registry);
$this->assertArrayHasKey('theme_test_suggestions', $registry);
- $this->assertArrayHasKey('theme_test_function_suggestions', $registry);
$this->assertArrayHasKey('theme_test_foo', $registry);
$this->assertArrayHasKey('theme_test_render_element', $registry);
- $this->assertArrayHasKey('theme_test_render_element_children', $registry);
- $this->assertArrayHasKey('theme_test_function_template_override', $registry);
- $this->assertArrayNotHasKey('test_theme_not_existing_function', $registry);
- $this->assertFalse(in_array('test_stable_preprocess_theme_test_render_element', $registry['theme_test_render_element']['preprocess functions']));
-
- $info = $registry['theme_test_function_suggestions'];
- $this->assertEquals('module', $info['type']);
- $this->assertEquals('core/modules/system/tests/modules/theme_test', $info['theme path']);
- $this->assertEquals('theme_theme_test_function_suggestions', $info['function']);
- $this->assertEquals([], $info['variables']);
+ $this->assertNotContains('test_stable_preprocess_theme_test_render_element', $registry['theme_test_render_element']['preprocess functions']);
// The second call will initialize with the second theme. Ensure that this
// returns a different object and the discovery for the second theme's
// preprocess function worked.
$other_registry = $this->registry->get();
$this->assertNotSame($registry, $other_registry);
- $this->assertTrue(in_array('test_stable_preprocess_theme_test_render_element', $other_registry['theme_test_render_element']['preprocess functions']));
+ $this->assertContains('test_stable_preprocess_theme_test_render_element', $other_registry['theme_test_render_element']['preprocess functions']);
}
/**
@@ -200,7 +185,7 @@ public function testPostProcessExtension($defined_functions, $hooks, $expected)
->method('getModuleList')
->willReturn([]);
- $class = new \ReflectionClass(TestRegistry::class);
+ $class = new \ReflectionClass(Registry::class);
$reflection_method = $class->getMethod('postProcessExtension');
$reflection_method->setAccessible(TRUE);
$reflection_method->invokeArgs($this->registry, [&$hooks, $theme->reveal()]);
@@ -486,22 +471,22 @@ public function providerTestPostProcessExtension() {
}
protected function setupTheme() {
- $this->registry = new TestRegistry($this->root, $this->cache, $this->lock, $this->moduleHandler, $this->themeHandler, $this->themeInitialization);
+ $this->registry = $this->getMockBuilder(Registry::class)
+ ->setMethods(['getPath'])
+ ->setConstructorArgs([$this->root, $this->cache, $this->lock, $this->moduleHandler, $this->themeHandler, $this->themeInitialization])
+ ->getMock();
+ $this->registry->expects($this->any())
+ ->method('getPath')
+ ->willReturnCallback(function ($module) {
+ if ($module == 'theme_test') {
+ return 'core/modules/system/tests/modules/theme_test';
+ }
+ });
$this->registry->setThemeManager($this->themeManager);
}
}
-class TestRegistry extends Registry {
-
- protected function getPath($module) {
- if ($module == 'theme_test') {
- return 'core/modules/system/tests/modules/theme_test';
- }
- }
-
-}
-
namespace Drupal\Core\Theme;
use Drupal\Tests\Core\Theme\RegistryTest;
diff --git a/web/core/tests/Drupal/Tests/Core/UnroutedUrlTest.php b/web/core/tests/Drupal/Tests/Core/UnroutedUrlTest.php
index 1e81b0bfff..6a0c961863 100644
--- a/web/core/tests/Drupal/Tests/Core/UnroutedUrlTest.php
+++ b/web/core/tests/Drupal/Tests/Core/UnroutedUrlTest.php
@@ -236,7 +236,7 @@ public function testGetUri($uri) {
*/
public function testGetOptions($uri) {
$url = Url::fromUri($uri);
- $this->assertInternalType('array', $url->getOptions());
+ $this->assertIsArray($url->getOptions());
}
}
diff --git a/web/core/tests/Drupal/Tests/Core/UrlTest.php b/web/core/tests/Drupal/Tests/Core/UrlTest.php
index 5843bae302..450f03407c 100644
--- a/web/core/tests/Drupal/Tests/Core/UrlTest.php
+++ b/web/core/tests/Drupal/Tests/Core/UrlTest.php
@@ -191,7 +191,7 @@ public function testFromUserInput($path) {
$this->assertInstanceOf('Drupal\Core\Url', $url);
$this->assertFalse($url->isRouted());
- $this->assertEquals(0, strpos($uri, 'base:'));
+ $this->assertStringStartsWith('base:', $uri);
$parts = UrlHelper::parse($path);
$options = $url->getOptions();
diff --git a/web/core/tests/Drupal/Tests/Core/Utility/LinkGeneratorTest.php b/web/core/tests/Drupal/Tests/Core/Utility/LinkGeneratorTest.php
index a91e9824a6..79a07d24cb 100644
--- a/web/core/tests/Drupal/Tests/Core/Utility/LinkGeneratorTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Utility/LinkGeneratorTest.php
@@ -3,6 +3,7 @@
namespace Drupal\Tests\Core\Utility;
use Drupal\Component\Render\MarkupInterface;
+use Drupal\Core\GeneratedButton;
use Drupal\Core\GeneratedNoLink;
use Drupal\Core\GeneratedUrl;
use Drupal\Core\Language\Language;
@@ -169,7 +170,7 @@ public function testGenerateNoLink() {
$url->setOption('set_active_class', TRUE);
$result = $this->linkGenerator->generate('Test', $url);
- $this->assertTrue($result instanceof GeneratedNoLink);
+ $this->assertInstanceOf(GeneratedNoLink::class, $result);
$this->assertSame('<span>Test</span>', (string) $result);
}
@@ -199,6 +200,26 @@ public function testGenerateNone() {
$this->assertSame('<a href="">Test</a>', (string) $result);
}
+ /**
+ * Tests the generate() method with the <button> route.
+ *
+ * @covers ::generate
+ */
+ public function testGenerateButton() {
+ $this->urlGenerator->expects($this->never())
+ ->method('generateFromRoute');
+ $this->moduleHandler->expects($this->once())
+ ->method('alter')
+ ->with('link', $this->isType('array'));
+
+ $url = Url::fromRoute('<button>');
+ $url->setUrlGenerator($this->urlGenerator);
+
+ $result = $this->linkGenerator->generate('Test', $url);
+ $this->assertInstanceOf(GeneratedButton::class, $result);
+ $this->assertSame('<button type="button">Test</button>', (string) $result);
+ }
+
/**
* Tests the generate() method with an external URL.
*
@@ -416,7 +437,7 @@ public function testGenerateWithHtml() {
'tag' => 'em',
],
], $result);
- $this->assertTrue(strpos($result, '<em>HTML output</em>') !== FALSE);
+ $this->assertStringContainsString('<em>HTML output</em>', $result);
}
/**
@@ -431,8 +452,10 @@ public function testGenerateActive() {
switch ($name) {
case 'test_route_1':
return (new GeneratedUrl())->setGeneratedUrl('/test-route-1');
+
case 'test_route_3':
return (new GeneratedUrl())->setGeneratedUrl('/test-route-3');
+
case 'test_route_4':
if ($parameters['object'] == '1') {
return (new GeneratedUrl())->setGeneratedUrl('/test-route-4/1');
diff --git a/web/core/tests/Drupal/Tests/Core/Utility/TokenTest.php b/web/core/tests/Drupal/Tests/Core/Utility/TokenTest.php
index ed2262e0c6..00e674ee56 100644
--- a/web/core/tests/Drupal/Tests/Core/Utility/TokenTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Utility/TokenTest.php
@@ -271,7 +271,7 @@ public function testReplaceEscaping($string, array $tokens, $expected) {
});
$result = $this->token->replace($string, ['tokens' => $tokens]);
- $this->assertInternalType('string', $result);
+ $this->assertIsString($result);
$this->assertEquals($expected, $result);
}
diff --git a/web/core/tests/Drupal/Tests/ExpectDeprecationTest.php b/web/core/tests/Drupal/Tests/ExpectDeprecationTest.php
index 55a7839169..fe781e0e5f 100644
--- a/web/core/tests/Drupal/Tests/ExpectDeprecationTest.php
+++ b/web/core/tests/Drupal/Tests/ExpectDeprecationTest.php
@@ -41,7 +41,7 @@ public function testExpectDeprecationInIsolation() {
* @see https://github.com/symfony/symfony/pull/25757
*/
public function testDeprecatedExpectDeprecation() {
- $this->addExpectedDeprecationMessage('ExpectDeprecationTrait::expectDeprecation is deprecated in drupal:8.8.4 and is removed from drupal:9.0.0. Use ::addExpectedDeprecationMessage() instead. See https://www.drupal.org/node/3106024');
+ $this->addExpectedDeprecationMessage('ExpectDeprecationTrait::expectDeprecation is deprecated in drupal:8.8.5 and is removed from drupal:9.0.0. Use ::addExpectedDeprecationMessage() instead. See https://www.drupal.org/node/3106024');
$this->expectDeprecation('Test deprecated expectDeprecation');
@trigger_error('Test deprecated expectDeprecation', E_USER_DEPRECATED);
}
diff --git a/web/core/tests/Drupal/Tests/Listeners/DeprecationListenerTrait.php b/web/core/tests/Drupal/Tests/Listeners/DeprecationListenerTrait.php
index c3d4a6ed45..2d95a8dc6a 100644
--- a/web/core/tests/Drupal/Tests/Listeners/DeprecationListenerTrait.php
+++ b/web/core/tests/Drupal/Tests/Listeners/DeprecationListenerTrait.php
@@ -122,7 +122,6 @@ public static function getSkippedDeprecations() {
'MigrateCckFieldPluginManager is deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.x. Use \Drupal\migrate_drupal\Annotation\MigrateFieldPluginManager instead.',
'MigrateCckFieldPluginManagerInterface is deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.x. Use \Drupal\migrate_drupal\Annotation\MigrateFieldPluginManagerInterface instead.',
'The "plugin.manager.migrate.cckfield" service is deprecated. You should use the \'plugin.manager.migrate.field\' service instead. See https://www.drupal.org/node/2751897',
- 'Passing in arguments the legacy way is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Provide the right parameter names in the method, similar to controllers. See https://www.drupal.org/node/2894819',
'The Symfony\Component\ClassLoader\ApcClassLoader class is deprecated since Symfony 3.3 and will be removed in 4.0. Use `composer install --apcu-autoloader` instead.',
// The following deprecation is not triggered by DrupalCI testing since it
// is a Windows only deprecation. Remove when core no longer uses
diff --git a/web/core/tests/Drupal/Tests/PhpunitCompatibilityTraitTest.php b/web/core/tests/Drupal/Tests/PhpunitCompatibilityTraitTest.php
index 03a25656eb..e2a4228b7d 100644
--- a/web/core/tests/Drupal/Tests/PhpunitCompatibilityTraitTest.php
+++ b/web/core/tests/Drupal/Tests/PhpunitCompatibilityTraitTest.php
@@ -2,6 +2,8 @@
namespace Drupal\Tests;
+use Drupal\Component\Render\FormattableMarkup;
+
/**
* Tests the PHPUnit forward compatibility trait.
*
@@ -35,6 +37,85 @@ public function testSetExpectedException() {
throw new \Exception($expectedMessage, $expectedCode);
}
+ /**
+ * Tests that assert*StringContainsString* methods are available.
+ *
+ * @covers ::assertStringContainsString
+ * @covers ::assertStringContainsStringIgnoringCase
+ * @covers ::assertStringNotContainsString
+ * @covers ::assertStringNotContainsStringIgnoringCase
+ */
+ public function testAssertStringContainsString() {
+ $this->assertStringContainsString("bingo", "foobarbingobongo");
+ $this->assertStringContainsStringIgnoringCase("bingo", "foobarBiNgObongo");
+ $this->assertStringNotContainsString("buzzer", "BUZZERbingobongo");
+ $this->assertStringNotContainsStringIgnoringCase("buzzer", "foobarBiNgObongo");
+
+ // Test with stringable objects.
+ $this->assertStringContainsString(new FormattableMarkup("bingo", []), new FormattableMarkup("foobarbingobongo", []));
+ $this->assertStringContainsStringIgnoringCase(new FormattableMarkup("bingo", []), new FormattableMarkup("foobarBiNgObongo", []));
+ $this->assertStringNotContainsString(new FormattableMarkup("buzzer", []), new FormattableMarkup("BUZZERbingobongo", []));
+ $this->assertStringNotContainsStringIgnoringCase(new FormattableMarkup("buzzer", []), new FormattableMarkup("foobarBiNgObongo", []));
+ }
+
+ /**
+ * Tests that assert(Not)EqualsCanonicalizing methods are available.
+ *
+ * @covers ::assertEqualsCanonicalizing
+ * @covers ::assertNotEqualsCanonicalizing
+ */
+ public function testAssertEqualsCanonicalizing() {
+ $this->assertEqualsCanonicalizing([3, 2, 1], [2, 3, 1]);
+ $this->assertNotEqualsCanonicalizing([3, 2, 1], [2, 3, 0, 1]);
+ }
+
+ /**
+ * Tests that assertIs(Not)* methods are available.
+ *
+ * @covers ::assertIsArray
+ * @covers ::assertIsBool
+ * @covers ::assertIsFloat
+ * @covers ::assertIsInt
+ * @covers ::assertIsNumeric
+ * @covers ::assertIsObject
+ * @covers ::assertIsResource
+ * @covers ::assertIsString
+ * @covers ::assertIsScalar
+ * @covers ::assertIsCallable
+ * @covers ::assertIsNotArray
+ * @covers ::assertIsNotBool
+ * @covers ::assertIsNotFloat
+ * @covers ::assertIsNotInt
+ * @covers ::assertIsNotNumeric
+ * @covers ::assertIsNotObject
+ * @covers ::assertIsNotResource
+ * @covers ::assertIsNotString
+ * @covers ::assertIsNotScalar
+ * @covers ::assertIsNotCallable
+ */
+ public function testAssertIs() {
+ $this->assertIsArray([]);
+ $this->assertIsBool(TRUE);
+ $this->assertIsFloat(1.0);
+ $this->assertIsInt(1);
+ $this->assertIsNumeric(1);
+ $this->assertIsObject(new class() {});
+ $this->assertIsResource(fopen(__FILE__, 'rb'));
+ $this->assertIsString('');
+ $this->assertIsScalar(1);
+ $this->assertIsCallable(function () {});
+ $this->assertIsNotArray(1);
+ $this->assertIsNotBool([]);
+ $this->assertIsNotFloat(1);
+ $this->assertIsNotInt(1.0);
+ $this->assertIsNotNumeric('');
+ $this->assertIsNotObject('');
+ $this->assertIsNotResource('');
+ $this->assertIsNotString(1);
+ $this->assertIsNotScalar([]);
+ $this->assertIsNotCallable(1);
+ }
+
}
interface MockTestClassInterface {
diff --git a/web/core/tests/Drupal/Tests/Scripts/TestSiteApplicationTest.php b/web/core/tests/Drupal/Tests/Scripts/TestSiteApplicationTest.php
index 2762b8c68d..4e6e731552 100644
--- a/web/core/tests/Drupal/Tests/Scripts/TestSiteApplicationTest.php
+++ b/web/core/tests/Drupal/Tests/Scripts/TestSiteApplicationTest.php
@@ -58,7 +58,7 @@ public function testInstallWithNonExistingFile() {
$process = new Process($command_line, $this->root);
$process->run();
- $this->assertContains('The file this-class-does-not-exist does not exist.', $process->getErrorOutput());
+ $this->assertStringContainsString('The file this-class-does-not-exist does not exist.', $process->getErrorOutput());
$this->assertSame(1, $process->getExitCode());
$this->assertCount($table_count, $connection->schema()->findTables('%'), 'No additional tables created in the database');
}
@@ -76,7 +76,7 @@ public function testInstallWithFileWithNoClass() {
$process = new Process($command_line, $this->root);
$process->run();
- $this->assertContains('The file core/tests/fixtures/empty_file.php.module does not contain a class', $process->getErrorOutput());
+ $this->assertStringContainsString('The file core/tests/fixtures/empty_file.php.module does not contain a class', $process->getErrorOutput());
$this->assertSame(1, $process->getExitCode());
$this->assertCount($table_count, $connection->schema()->findTables('%'), 'No additional tables created in the database');
}
@@ -96,8 +96,8 @@ public function testInstallWithNonSetupClass() {
$process = new Process($command_line, $this->root, ['COLUMNS' => PHP_INT_MAX]);
$process->run();
- $this->assertContains('The class Drupal\Tests\Scripts\TestSiteApplicationTest contained in', $process->getErrorOutput());
- $this->assertContains('needs to implement \Drupal\TestSite\TestSetupInterface', $process->getErrorOutput());
+ $this->assertStringContainsString('The class Drupal\Tests\Scripts\TestSiteApplicationTest contained in', $process->getErrorOutput());
+ $this->assertStringContainsString('needs to implement \Drupal\TestSite\TestSetupInterface', $process->getErrorOutput());
$this->assertSame(1, $process->getExitCode());
$this->assertCount($table_count, $connection->schema()->findTables('%'), 'No additional tables created in the database');
}
@@ -129,7 +129,7 @@ public function testInstallScript() {
$response = $http_client->send($request);
// Ensure the test_page_test module got installed.
- $this->assertContains('Test page | Drupal', (string) $response->getBody());
+ $this->assertStringContainsString('Test page | Drupal', (string) $response->getBody());
// Ensure that there are files and database tables for the tear down command
// to clean up.
@@ -149,7 +149,7 @@ public function testInstallScript() {
// Set the timeout to a value that allows debugging.
$process->setTimeout(500);
$process->run();
- $this->assertContains('Successfully installed a test site', $process->getOutput());
+ $this->assertStringContainsString('Successfully installed a test site', $process->getOutput());
$this->assertSame(0, $process->getExitCode());
$regex = '/Database prefix\s+([^\s]*)/';
$this->assertRegExp($regex, $process->getOutput());
@@ -168,7 +168,7 @@ public function testInstallScript() {
$process->setTimeout(500);
$process->run();
$this->assertSame(0, $process->getExitCode());
- $this->assertContains("Successfully uninstalled $db_prefix test site", $process->getOutput());
+ $this->assertStringContainsString("Successfully uninstalled $db_prefix test site", $process->getOutput());
// Ensure that all the tables and files for this DB prefix are gone.
$this->assertCount(0, Database::getConnection('default', $key)->schema()->findTables('%'));
@@ -190,7 +190,7 @@ public function testInstallScript() {
$process->setTimeout(500);
$process->run();
$this->assertSame(0, $process->getExitCode());
- $this->assertContains("Successfully uninstalled $other_db_prefix test site", $process->getOutput());
+ $this->assertStringContainsString("Successfully uninstalled $other_db_prefix test site", $process->getOutput());
// Ensure that all the tables and files for this DB prefix are gone.
$this->assertCount(0, Database::getConnection('default', $other_key)->schema()->findTables('%'));
@@ -225,8 +225,8 @@ public function testInstallInDifferentLanguage() {
$response = $http_client->send($request);
// Ensure the test_page_test module got installed.
- $this->assertContains('Test page | Drupal', (string) $response->getBody());
- $this->assertContains('lang="fr"', (string) $response->getBody());
+ $this->assertStringContainsString('Test page | Drupal', (string) $response->getBody());
+ $this->assertStringContainsString('lang="fr"', (string) $response->getBody());
// Now test the tear down process as well.
$command_line = $this->php . ' core/scripts/test-site.php tear-down ' . $db_prefix . ' --db-url "' . getenv('SIMPLETEST_DB') . '"';
@@ -248,7 +248,7 @@ public function testTearDownDbPrefixValidation() {
$process->setTimeout(500);
$process->run();
$this->assertSame(1, $process->getExitCode());
- $this->assertContains('Invalid database prefix: not-a-valid-prefix', $process->getErrorOutput());
+ $this->assertStringContainsString('Invalid database prefix: not-a-valid-prefix', $process->getErrorOutput());
}
/**
@@ -279,7 +279,7 @@ public function testUserLogin() {
$process = new Process($command_line, $this->root);
$process->run();
$this->assertSame(0, $process->getExitCode());
- $this->assertContains('/user/reset/1/', $process->getOutput());
+ $this->assertStringContainsString('/user/reset/1/', $process->getOutput());
$http_client = new Client();
$request = (new Request('GET', getenv('SIMPLETEST_BASE_URL') . trim($process->getOutput())))
@@ -295,7 +295,7 @@ public function testUserLogin() {
$process = new Process($command_line, $this->root);
$process->run();
$this->assertSame(1, $process->getExitCode());
- $this->assertContains('The "uid" argument needs to be an integer, but it is "invalid-uid".', $process->getErrorOutput());
+ $this->assertStringContainsString('The "uid" argument needs to be an integer, but it is "invalid-uid".', $process->getErrorOutput());
// Now tear down the test site.
$command_line = $this->php . ' core/scripts/test-site.php tear-down ' . $db_prefix . ' --db-url "' . getenv('SIMPLETEST_DB') . '"';
@@ -304,7 +304,7 @@ public function testUserLogin() {
$process->setTimeout(500);
$process->run();
$this->assertSame(0, $process->getExitCode());
- $this->assertContains("Successfully uninstalled $db_prefix test site", $process->getOutput());
+ $this->assertStringContainsString("Successfully uninstalled $db_prefix test site", $process->getOutput());
}
/**
diff --git a/web/core/tests/Drupal/Tests/TestFileCreationTrait.php b/web/core/tests/Drupal/Tests/TestFileCreationTrait.php
index 27ee641b50..5192ed8a87 100644
--- a/web/core/tests/Drupal/Tests/TestFileCreationTrait.php
+++ b/web/core/tests/Drupal/Tests/TestFileCreationTrait.php
@@ -153,9 +153,11 @@ public static function generateFile($filename, $width, $lines, $type = 'binary-t
case 'text':
$text .= chr(rand(32, 126));
break;
+
case 'binary':
$text .= chr(rand(0, 31));
break;
+
case 'binary-text':
default:
$text .= rand(0, 1);
diff --git a/web/core/tests/Drupal/Tests/Traits/ExpectDeprecationTrait.php b/web/core/tests/Drupal/Tests/Traits/ExpectDeprecationTrait.php
index eaeb5a299b..bef43f98d3 100644
--- a/web/core/tests/Drupal/Tests/Traits/ExpectDeprecationTrait.php
+++ b/web/core/tests/Drupal/Tests/Traits/ExpectDeprecationTrait.php
@@ -35,14 +35,14 @@ protected function addExpectedDeprecationMessage($message) {
* @param string $message
* The expected deprecation message.
*
- * @deprecated in drupal:8.8.4 and is removed from drupal:9.0.0. Use
+ * @deprecated in drupal:8.8.5 and is removed from drupal:9.0.0. Use
* ::addExpectedDeprecationMessage() instead.
*
* @see https://www.drupal.org/node/3106024
*/
protected function expectDeprecation($message) {
if (strpos($message, 'ExpectDeprecationTrait::expectDeprecation') === FALSE) {
- @trigger_error('ExpectDeprecationTrait::expectDeprecation is deprecated in drupal:8.8.4 and is removed from drupal:9.0.0. Use ::addExpectedDeprecationMessage() instead. See https://www.drupal.org/node/3106024', E_USER_DEPRECATED);
+ @trigger_error('ExpectDeprecationTrait::expectDeprecation is deprecated in drupal:8.8.5 and is removed from drupal:9.0.0. Use ::addExpectedDeprecationMessage() instead. See https://www.drupal.org/node/3106024', E_USER_DEPRECATED);
}
$this->addExpectedDeprecationMessage($message);
}
diff --git a/web/core/tests/Drupal/Tests/UiHelperTrait.php b/web/core/tests/Drupal/Tests/UiHelperTrait.php
index 7eeb093ace..5602972c15 100644
--- a/web/core/tests/Drupal/Tests/UiHelperTrait.php
+++ b/web/core/tests/Drupal/Tests/UiHelperTrait.php
@@ -267,7 +267,8 @@ protected function drupalLogout() {
// idea being if you were properly logged out you should be seeing a login
// screen.
$assert_session = $this->assertSession();
- $this->drupalGet(Url::fromRoute('user.logout', [], ['query' => ['destination' => 'user']]));
+ $destination = Url::fromRoute('user.page')->toString();
+ $this->drupalGet(Url::fromRoute('user.logout', [], ['query' => ['destination' => $destination]]));
$assert_session->fieldExists('name');
$assert_session->fieldExists('pass');
@@ -527,7 +528,7 @@ protected function checkForMetaRefresh() {
if (!empty($refresh) && (!isset($this->maximumMetaRefreshCount) || $this->metaRefreshCount < $this->maximumMetaRefreshCount)) {
// Parse the content attribute of the meta tag for the format:
// "[delay]: URL=[page_to_redirect_to]".
- if (preg_match('/\d+;\s*URL=(?<url>.*)/i', $refresh[0]->getAttribute('content'), $match)) {
+ if (preg_match('/\d+;\s*URL=\'?(?<url>[^\']*)/i', $refresh[0]->getAttribute('content'), $match)) {
$this->metaRefreshCount++;
return $this->drupalGet($this->getAbsoluteUrl(Html::decodeEntities($match['url'])));
}
diff --git a/web/core/tests/Drupal/Tests/UpdatePathTestTrait.php b/web/core/tests/Drupal/Tests/UpdatePathTestTrait.php
index 61facab0bd..a1ed2e8af5 100644
--- a/web/core/tests/Drupal/Tests/UpdatePathTestTrait.php
+++ b/web/core/tests/Drupal/Tests/UpdatePathTestTrait.php
@@ -58,12 +58,15 @@ protected function runUpdates($update_url = NULL) {
$this->fail('The update failed with the following message: "' . reset($failure)->getText() . '"');
}
- // Ensure that there are no pending updates.
+ // Ensure that there are no pending updates. Clear the schema version
+ // static cache first in case it was accessed before running updates.
+ drupal_get_installed_schema_version(NULL, TRUE);
foreach (['update', 'post_update'] as $update_type) {
switch ($update_type) {
case 'update':
$all_updates = update_get_update_list();
break;
+
case 'post_update':
$all_updates = \Drupal::service('update.post_update_registry')->getPendingUpdateInformation();
break;
diff --git a/web/core/tests/README.md b/web/core/tests/README.md
index f341c413a6..bba9136ae3 100644
--- a/web/core/tests/README.md
+++ b/web/core/tests/README.md
@@ -44,7 +44,7 @@ to install the following additional software:
https://sites.google.com/a/chromium.org/chromedriver/
* PHP 7.1 or higher
-## Running unit, functional, and kernel tests
+## Running tests
The PHPUnit executable is vendor/bin/phpunit -- you will need to locate your
vendor directory (which may be outside the Drupal root).
@@ -57,10 +57,30 @@ a particular group:
./vendor/bin/phpunit -c /path/to/your/phpunit.xml --group Groupname
```
+Drupal core currently has a number of different types of tests that can be run
+using PHPUnit:
+- unit
+- kernel
+- functional
+- functional-javascript
+- build
+
+These are organized into PHPUnit test suites. You can run one test suite or many
+in combination by using `--testsuite` on the command line:
+```
+./vendor/bin/phpunit -c /path/to/your/phpunit.xml --testsuite unit
+./vendor/bin/phpunit -c /path/to/your/phpunit.xml --testsuite functional,functional-javascript
+```
+These can be combined with groups and filters:
+```
+./vendor/bin/phpunit -c /path/to/your/phpunit.xml --testsuite build --group Composer
+./vendor/bin/phpunit -c /path/to/your/phpunit.xml --testsuite build --exclude-group Build
+./vendor/bin/phpunit -c /path/to/your/phpunit.xml --testsuite unit --filter ClassTest::testMethod
+```
More information on running tests can be found at
https://www.drupal.org/docs/8/phpunit/running-phpunit-tests
-## Running Functional JavaScript tests
+## Setup for running Functional JavaScript tests
You can run JavaScript tests that are based on the
\Drupal\FunctionalJavascriptTests\WebDriverTestBase base class in the same way
diff --git a/web/core/tests/fixtures/database_drivers/core/corefake/Connection.php b/web/core/tests/fixtures/database_drivers/core/corefake/Connection.php
new file mode 100644
index 0000000000..b3228a2137
--- /dev/null
+++ b/web/core/tests/fixtures/database_drivers/core/corefake/Connection.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Drupal\Core\Database\Driver\corefake;
+
+use Drupal\Driver\Database\fake\Connection as BaseConnection;
+
+class Connection extends BaseConnection {
+
+ /**
+ * {@inheritdoc}
+ */
+ public $driver = 'corefake';
+
+}
diff --git a/web/core/tests/fixtures/database_drivers/core/corefake/Install/Tasks.php b/web/core/tests/fixtures/database_drivers/core/corefake/Install/Tasks.php
new file mode 100644
index 0000000000..4cb9083ffa
--- /dev/null
+++ b/web/core/tests/fixtures/database_drivers/core/corefake/Install/Tasks.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Drupal\Core\Database\Driver\corefake\Install;
+
+use Drupal\Core\Database\Install\Tasks as InstallTasks;
+
+class Tasks extends InstallTasks {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function name() {
+ return 'corefake';
+ }
+
+}
diff --git a/web/core/tests/fixtures/database_drivers/custom/corefake/Connection.php b/web/core/tests/fixtures/database_drivers/custom/corefake/Connection.php
new file mode 100644
index 0000000000..4c5188085e
--- /dev/null
+++ b/web/core/tests/fixtures/database_drivers/custom/corefake/Connection.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Drupal\Driver\Database\corefake;
+
+use Drupal\Core\Database\Driver\corefake\Connection as CoreFakeConnection;
+
+class Connection extends CoreFakeConnection {}
diff --git a/web/core/tests/fixtures/database_drivers/custom/corefake/Install/Tasks.php b/web/core/tests/fixtures/database_drivers/custom/corefake/Install/Tasks.php
new file mode 100644
index 0000000000..d131a3f1c7
--- /dev/null
+++ b/web/core/tests/fixtures/database_drivers/custom/corefake/Install/Tasks.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Drupal\Driver\Database\corefake\Install;
+
+use Drupal\Core\Database\Driver\corefake\Install\Tasks as BaseInstallTasks;
+
+class Tasks extends BaseInstallTasks {
+
+}
diff --git a/web/core/tests/Drupal/Tests/Core/Database/fixtures/driver/fake/Connection.php b/web/core/tests/fixtures/database_drivers/custom/fake/Connection.php
similarity index 100%
rename from web/core/tests/Drupal/Tests/Core/Database/fixtures/driver/fake/Connection.php
rename to web/core/tests/fixtures/database_drivers/custom/fake/Connection.php
diff --git a/web/core/tests/fixtures/database_drivers/custom/fake/Install/Tasks.php b/web/core/tests/fixtures/database_drivers/custom/fake/Install/Tasks.php
new file mode 100644
index 0000000000..2cd65190a5
--- /dev/null
+++ b/web/core/tests/fixtures/database_drivers/custom/fake/Install/Tasks.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Drupal\Driver\Database\fake\Install;
+
+use Drupal\Core\Database\Install\Tasks as InstallTasks;
+
+class Tasks extends InstallTasks {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function name() {
+ return 'fake';
+ }
+
+}
diff --git a/web/core/tests/fixtures/database_drivers/module/corefake/src/Driver/Database/corefake/Connection.php b/web/core/tests/fixtures/database_drivers/module/corefake/src/Driver/Database/corefake/Connection.php
new file mode 100644
index 0000000000..f009c84a58
--- /dev/null
+++ b/web/core/tests/fixtures/database_drivers/module/corefake/src/Driver/Database/corefake/Connection.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Drupal\corefake\Driver\Database\corefake;
+
+use Drupal\Driver\Database\fake\Connection as BaseConnection;
+
+class Connection extends BaseConnection {
+
+ /**
+ * {@inheritdoc}
+ */
+ public $driver = 'corefake';
+
+}
diff --git a/web/core/tests/fixtures/database_drivers/module/corefake/src/Driver/Database/corefake/Install/Tasks.php b/web/core/tests/fixtures/database_drivers/module/corefake/src/Driver/Database/corefake/Install/Tasks.php
new file mode 100644
index 0000000000..8eba6659d9
--- /dev/null
+++ b/web/core/tests/fixtures/database_drivers/module/corefake/src/Driver/Database/corefake/Install/Tasks.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Drupal\corefake\Driver\Database\corefake\Install;
+
+use Drupal\Core\Database\Install\Tasks as InstallTasks;
+
+class Tasks extends InstallTasks {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function name() {
+ return 'corefake';
+ }
+
+}
diff --git a/web/core/themes/bartik/bartik.info.yml b/web/core/themes/bartik/bartik.info.yml
index 130d583c91..7c95c74bba 100644
--- a/web/core/themes/bartik/bartik.info.yml
+++ b/web/core/themes/bartik/bartik.info.yml
@@ -20,11 +20,49 @@ version: VERSION
core: 8.x
libraries:
- bartik/global-styling
+
+libraries-override:
+ classy/base: bartik/classy.base
+ classy/book-navigation: bartik/classy.book-navigation
+ classy/dialog: bartik/classy.dialog
+ classy/dropbutton: bartik/classy.dropbutton
+ classy/file: bartik/classy.file
+ classy/forum: bartik/classy.forum
+ classy/image-widget: bartik/classy.image-widget
+ classy/indented: bartik/classy.indented
+ classy/media_embed_ckeditor_theme: bartik/classy.media_embed_ckeditor_theme
+ classy/media_embed_error: bartik/classy.media_embed_error
+ classy/media_library: bartik/classy.media_library
+ classy/messages: bartik/classy.messages
+ classy/node: bartik/classy.node
+ classy/progress: bartik/classy.progress
+ classy/search-results: bartik/classy.search-results
+ classy/user: bartik/classy.user
+
+libraries-extend:
+ core/drupal.dialog:
+ - bartik/classy.dialog
+ core/drupal.dropbutton:
+ - bartik/classy.dropbutton
+ core/drupal.progress:
+ - bartik/classy.progress
+ file/drupal.file:
+ - bartik/classy.file
+ media/media_embed_ckeditor_theme:
+ - bartik/classy.media_embed_ckeditor_theme
+ media_library/view:
+ - bartik/classy.media_library
+ media_library/widget:
+ - bartik/classy.media_library
+ user/drupal.user:
+ - bartik/classy.user
+
ckeditor_stylesheets:
- css/base/elements.css
- css/components/captions.css
- css/components/table.css
- css/components/text-formatted.css
+ - css/classy/components/media-embed-error.css
regions:
header: Header
primary_menu: 'Primary menu'
diff --git a/web/core/themes/bartik/bartik.libraries.yml b/web/core/themes/bartik/bartik.libraries.yml
index 3bbecd932f..b4fa4bffe0 100644
--- a/web/core/themes/bartik/bartik.libraries.yml
+++ b/web/core/themes/bartik/bartik.libraries.yml
@@ -85,3 +85,120 @@ maintenance_page:
dependencies:
- system/maintenance
- bartik/global-styling
+
+classy.base:
+ version: VERSION
+ css:
+ component:
+ css/classy/components/action-links.css: { weight: -10 }
+ css/classy/components/breadcrumb.css: { weight: -10 }
+ css/classy/components/button.css: { weight: -10 }
+ css/classy/components/collapse-processed.css: { weight: -10 }
+ css/classy/components/container-inline.css: { weight: -10 }
+ css/classy/components/details.css: { weight: -10 }
+ css/classy/components/exposed-filters.css: { weight: -10 }
+ css/classy/components/field.css: { weight: -10 }
+ css/classy/components/form.css: { weight: -10 }
+ css/classy/components/icons.css: { weight: -10 }
+ css/classy/components/inline-form.css: { weight: -10 }
+ css/classy/components/item-list.css: { weight: -10 }
+ css/classy/components/link.css: { weight: -10 }
+ css/classy/components/links.css: { weight: -10 }
+ css/classy/components/menu.css: { weight: -10 }
+ css/classy/components/more-link.css: { weight: -10 }
+ css/classy/components/pager.css: { weight: -10 }
+ css/classy/components/tabledrag.css: { weight: -10 }
+ css/classy/components/tableselect.css: { weight: -10 }
+ css/classy/components/tablesort.css: { weight: -10 }
+ css/classy/components/tabs.css: { weight: -10 }
+ css/classy/components/textarea.css: { weight: -10 }
+ css/classy/components/ui-dialog.css: { weight: -10 }
+
+classy.book-navigation:
+ version: VERSION
+ css:
+ component:
+ css/classy/components/book-navigation.css: {}
+
+classy.dialog:
+ version: VERSION
+ css:
+ component:
+ css/classy/components/dialog.css: { weight: -10 }
+
+classy.dropbutton:
+ version: VERSION
+ css:
+ component:
+ css/classy/components/dropbutton.css: { weight: -10 }
+
+classy.file:
+ version: VERSION
+ css:
+ component:
+ css/classy/components/file.css: { weight: -10 }
+
+classy.forum:
+ version: VERSION
+ css:
+ component:
+ css/classy/components/forum.css: { weight: -10 }
+
+classy.image-widget:
+ version: VERSION
+ css:
+ component:
+ css/classy/components/image-widget.css: {}
+
+classy.indented:
+ version: VERSION
+ css:
+ component:
+ css/classy/components/indented.css: {}
+
+classy.media_embed_ckeditor_theme:
+ version: VERSION
+ js:
+ js/classy/media_embed_ckeditor.theme.js: {}
+
+classy.media_embed_error:
+ version: VERSION
+ css:
+ component:
+ css/classy/components/media-embed-error.css: {}
+
+classy.media_library:
+ version: VERSION
+ css:
+ layout:
+ css/classy/layout/media-library.css: {}
+
+classy.messages:
+ version: VERSION
+ css:
+ component:
+ css/classy/components/messages.css: { weight: -10 }
+
+classy.node:
+ version: VERSION
+ css:
+ component:
+ css/classy/components/node.css: { weight: -10 }
+
+classy.progress:
+ version: VERSION
+ css:
+ component:
+ css/classy/components/progress.css: { weight: -10 }
+
+classy.search-results:
+ version: VERSION
+ css:
+ component:
+ css/classy/components/search-results.css: {}
+
+classy.user:
+ version: VERSION
+ css:
+ component:
+ css/classy/components/user.css: { weight: -10 }
diff --git a/web/core/themes/bartik/css/classy/README.txt b/web/core/themes/bartik/css/classy/README.txt
new file mode 100644
index 0000000000..42514f5f0c
--- /dev/null
+++ b/web/core/themes/bartik/css/classy/README.txt
@@ -0,0 +1,12 @@
+WHAT IS THIS DIRECTORY FOR?
+--------------------------------
+This directory is for CSS files previously inherited from the Classy theme.
+
+WHY ARE CLASSY CSS FILES BEING COPIED HERE?
+-------------------------------------------
+Classy will be deprecated during the Drupal 9 lifecycle. To prepare for Classy's
+removal, CSS files that would otherwise be inherited from Classy are copied
+here.
+
+CSS files that differ from the Classy versions should not be placed in this
+directory or any subdirectory.
diff --git a/web/core/themes/bartik/css/classy/components/action-links.css b/web/core/themes/bartik/css/classy/components/action-links.css
new file mode 100644
index 0000000000..274d798e18
--- /dev/null
+++ b/web/core/themes/bartik/css/classy/components/action-links.css
@@ -0,0 +1,43 @@
+/**
+ * @file
+ * Styles for link buttons and action links.
+ */
+
+.action-links {
+ margin: 1em 0;
+ padding: 0;
+ list-style: none;
+}
+[dir="rtl"] .action-links {
+ /* This is required to win over specificity of [dir="rtl"] ul */
+ margin-right: 0;
+}
+.action-links li {
+ display: inline-block;
+ margin: 0 0.3em;
+}
+.action-links li:first-child {
+ margin-left: 0; /* LTR */
+}
+[dir="rtl"] .action-links li:first-child {
+ margin-right: 0;
+ margin-left: 0.3em;
+}
+.button-action {
+ display: inline-block;
+ padding: 0.2em 0.5em 0.3em;
+ text-decoration: none;
+ line-height: 160%;
+}
+.button-action:before {
+ margin-left: -0.1em; /* LTR */
+ padding-right: 0.2em; /* LTR */
+ content: "+";
+ font-weight: 900;
+}
+[dir="rtl"] .button-action:before {
+ margin-right: -0.1em;
+ margin-left: 0;
+ padding-right: 0;
+ padding-left: 0.2em;
+}
diff --git a/web/core/themes/bartik/css/classy/components/book-navigation.css b/web/core/themes/bartik/css/classy/components/book-navigation.css
new file mode 100644
index 0000000000..08728e27b5
--- /dev/null
+++ b/web/core/themes/bartik/css/classy/components/book-navigation.css
@@ -0,0 +1,40 @@
+/**
+ * @file
+ * Styling for the Book module.
+ */
+
+.book-navigation .menu {
+ padding-top: 1em;
+ padding-bottom: 0;
+}
+.book-navigation .book-pager {
+ overflow: auto;
+ margin: 0;
+ padding: 0.5em 0;
+}
+.book-pager__item {
+ display: inline-block;
+ list-style-type: none;
+ vertical-align: top;
+}
+.book-pager__item--previous {
+ width: 45%;
+ text-align: left; /* LTR */
+}
+[dir="rtl"] .book-pager__item--previous {
+ float: right;
+ text-align: right;
+}
+.book-pager__item--center {
+ width: 8%;
+ text-align: center;
+}
+.book-pager__item--next {
+ float: right; /* LTR */
+ width: 45%;
+ text-align: right; /* LTR */
+}
+[dir="rtl"] .book-pager__item--next {
+ float: left;
+ text-align: left;
+}
diff --git a/web/core/themes/bartik/css/classy/components/breadcrumb.css b/web/core/themes/bartik/css/classy/components/breadcrumb.css
new file mode 100644
index 0000000000..1e6a7fac71
--- /dev/null
+++ b/web/core/themes/bartik/css/classy/components/breadcrumb.css
@@ -0,0 +1,29 @@
+/**
+ * @file
+ * Styles for breadcrumbs.
+ */
+
+.breadcrumb {
+ padding-bottom: 0.5em;
+}
+.breadcrumb ol {
+ margin: 0;
+ padding: 0;
+}
+[dir="rtl"] .breadcrumb ol {
+ /* This is required to win over specificity of [dir="rtl"] ol */
+ margin-right: 0;
+}
+.breadcrumb li {
+ display: inline;
+ margin: 0;
+ padding: 0;
+ list-style-type: none;
+}
+/* IE8 does not support :not() and :last-child. */
+.breadcrumb li:before {
+ content: " \BB ";
+}
+.breadcrumb li:first-child:before {
+ content: none;
+}
diff --git a/web/core/themes/bartik/css/classy/components/button.css b/web/core/themes/bartik/css/classy/components/button.css
new file mode 100644
index 0000000000..5eb4f1ac13
--- /dev/null
+++ b/web/core/themes/bartik/css/classy/components/button.css
@@ -0,0 +1,15 @@
+/**
+ * @file
+ * Visual styles for buttons.
+ */
+
+.button,
+.image-button {
+ margin-right: 1em;
+ margin-left: 1em;
+}
+.button:first-child,
+.image-button:first-child {
+ margin-right: 0;
+ margin-left: 0;
+}
diff --git a/web/core/themes/bartik/css/classy/components/collapse-processed.css b/web/core/themes/bartik/css/classy/components/collapse-processed.css
new file mode 100644
index 0000000000..c8c786882c
--- /dev/null
+++ b/web/core/themes/bartik/css/classy/components/collapse-processed.css
@@ -0,0 +1,32 @@
+/**
+ * @file
+ * Visual styles for collapsible fieldsets.
+ */
+
+.collapse-processed > summary {
+ padding-right: 0.5em;
+ padding-left: 0.5em;
+}
+.collapse-processed > summary:before {
+ float: left; /* LTR */
+ width: 1em;
+ height: 1em;
+ content: "";
+ background: url(../../../../../misc/menu-expanded.png) 0 100% no-repeat; /* LTR */
+}
+[dir="rtl"] .collapse-processed > summary:before {
+ float: right;
+ background-position: 100% 100%;
+}
+.collapse-processed:not([open]) > summary:before {
+ -ms-transform: rotate(-90deg);
+ -webkit-transform: rotate(-90deg);
+ transform: rotate(-90deg);
+ background-position: 25% 35%; /* LTR */
+}
+[dir="rtl"] .collapse-processed:not([open]) > summary:before {
+ -ms-transform: rotate(90deg);
+ -webkit-transform: rotate(90deg);
+ transform: rotate(90deg);
+ background-position: 75% 35%;
+}
diff --git a/web/core/themes/bartik/css/classy/components/container-inline.css b/web/core/themes/bartik/css/classy/components/container-inline.css
new file mode 100644
index 0000000000..64b78f683b
--- /dev/null
+++ b/web/core/themes/bartik/css/classy/components/container-inline.css
@@ -0,0 +1,22 @@
+/**
+ * @file
+ * Inline items.
+ */
+
+.container-inline label:after,
+.container-inline .label:after {
+ content: ":";
+}
+.form-type-radios .container-inline label:after,
+.form-type-checkboxes .container-inline label:after {
+ content: "";
+}
+.form-type-radios .container-inline .form-type-radio,
+.form-type-checkboxes .container-inline .form-type-checkbox {
+ margin: 0 1em;
+}
+.container-inline .form-actions,
+.container-inline.form-actions {
+ margin-top: 0;
+ margin-bottom: 0;
+}
diff --git a/web/core/themes/bartik/css/classy/components/details.css b/web/core/themes/bartik/css/classy/components/details.css
new file mode 100644
index 0000000000..a546363a29
--- /dev/null
+++ b/web/core/themes/bartik/css/classy/components/details.css
@@ -0,0 +1,23 @@
+/**
+ * @file
+ * Collapsible details.
+ *
+ * @see collapse.js
+ * @see http://nicolasgallagher.com/css-background-image-hacks/
+ */
+
+details {
+ margin-top: 1em;
+ margin-bottom: 1em;
+ border: 1px solid #ccc;
+}
+details > .details-wrapper {
+ padding: 0.5em 1.5em;
+}
+/* @todo Regression: The summary of uncollapsible details are no longer
+ vertically aligned with the .details-wrapper in browsers without native
+ details support. */
+summary {
+ padding: 0.2em 0.5em;
+ cursor: pointer;
+}
diff --git a/web/core/themes/bartik/css/classy/components/dialog.css b/web/core/themes/bartik/css/classy/components/dialog.css
new file mode 100644
index 0000000000..c1b7b997be
--- /dev/null
+++ b/web/core/themes/bartik/css/classy/components/dialog.css
@@ -0,0 +1,72 @@
+/**
+ * @file
+ * Presentational styles for Drupal dialogs.
+ */
+
+.ui-dialog {
+ position: absolute;
+ z-index: 1260;
+ overflow: visible;
+ padding: 0;
+ color: #000;
+ border: solid 1px #ccc;
+ background: #fff;
+}
+
+@media all and (max-width: 48em) { /* 768px */
+ .ui-dialog {
+ width: 92% !important;
+ }
+}
+.ui-dialog .ui-dialog-titlebar {
+ border-width: 0 0 1px 0;
+ border-style: solid;
+ border-color: #ccc;
+ border-radius: 0;
+ background: #f3f4ee;
+ font-weight: bold;
+}
+.ui-dialog .ui-dialog-titlebar-close {
+ border: 0;
+ background: none;
+}
+.ui-dialog .ui-dialog-buttonpane {
+ margin-top: 0;
+ padding: 0.3em 1em;
+ border-width: 1px 0 0 0;
+ border-color: #ccc;
+ background: #f3f4ee;
+}
+.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset {
+ margin: 0;
+ padding: 0;
+}
+.ui-dialog .ui-dialog-buttonpane .ui-button-text-only .ui-button-text {
+ padding: 0;
+}
+
+/* Form action buttons are moved in dialogs. Remove empty space. */
+.ui-dialog .ui-dialog-content .form-actions {
+ margin: 0;
+ padding: 0;
+}
+.ui-dialog .ajax-progress-throbber {
+ position: fixed;
+ z-index: 1000;
+ top: 48.5%;
+ /* Can't do center:50% middle: 50%, so approximate it for a typical window size. */
+ left: 49%;
+ width: 24px;
+ height: 24px;
+ padding: 4px;
+ opacity: 0.9;
+ border-radius: 7px;
+ background-color: #232323;
+ background-image: url(../../../../../misc/loading-small.gif);
+ background-repeat: no-repeat;
+ background-position: center center;
+}
+.ui-dialog .ajax-progress-throbber .throbber,
+.ui-dialog .ajax-progress-throbber .message {
+ display: none;
+}
diff --git a/web/core/themes/bartik/css/classy/components/dropbutton.css b/web/core/themes/bartik/css/classy/components/dropbutton.css
new file mode 100644
index 0000000000..5e971ba622
--- /dev/null
+++ b/web/core/themes/bartik/css/classy/components/dropbutton.css
@@ -0,0 +1,33 @@
+/**
+ * @file
+ * General styles for dropbuttons.
+ */
+
+.js .dropbutton-widget {
+ border: 1px solid #ccc;
+ background-color: white;
+}
+.js .dropbutton-widget:hover {
+ border-color: #b8b8b8;
+}
+.dropbutton .dropbutton-action > * {
+ padding: 0.1em 0.5em;
+ white-space: nowrap;
+}
+.dropbutton .secondary-action {
+ border-top: 1px solid #e8e8e8;
+}
+.dropbutton-multiple .dropbutton {
+ border-right: 1px solid #e8e8e8; /* LTR */
+}
+[dir="rtl"] .dropbutton-multiple .dropbutton {
+ border-right: 0 none;
+ border-left: 1px solid #e8e8e8;
+}
+.dropbutton-multiple .dropbutton .dropbutton-action > * {
+ margin-right: 0.25em; /* LTR */
+}
+[dir="rtl"] .dropbutton-multiple .dropbutton .dropbutton-action > * {
+ margin-right: 0;
+ margin-left: 0.25em;
+}
diff --git a/web/core/themes/bartik/css/classy/components/exposed-filters.css b/web/core/themes/bartik/css/classy/components/exposed-filters.css
new file mode 100644
index 0000000000..b686902ef1
--- /dev/null
+++ b/web/core/themes/bartik/css/classy/components/exposed-filters.css
@@ -0,0 +1,46 @@
+/**
+ * @file
+ * Visual styles for exposed filters.
+ */
+
+.exposed-filters .filters {
+ float: left; /* LTR */
+ margin-right: 1em; /* LTR */
+}
+[dir="rtl"] .exposed-filters .filters {
+ float: right;
+ margin-right: 0;
+ margin-left: 1em;
+}
+.exposed-filters .form-item {
+ margin: 0 0 0.1em 0;
+ padding: 0;
+}
+.exposed-filters .form-item label {
+ float: left; /* LTR */
+ width: 10em;
+ font-weight: normal;
+}
+[dir="rtl"] .exposed-filters .form-item label {
+ float: right;
+}
+.exposed-filters .form-select {
+ width: 14em;
+}
+/* Current filters */
+.exposed-filters .current-filters {
+ margin-bottom: 1em;
+}
+.exposed-filters .current-filters .placeholder {
+ font-weight: bold;
+ font-style: normal;
+}
+.exposed-filters .additional-filters {
+ float: left; /* LTR */
+ margin-right: 1em; /* LTR */
+}
+[dir="rtl"] .exposed-filters .additional-filters {
+ float: right;
+ margin-right: 0;
+ margin-left: 1em;
+}
diff --git a/web/core/themes/bartik/css/classy/components/field.css b/web/core/themes/bartik/css/classy/components/field.css
new file mode 100644
index 0000000000..ff7e9ab1fc
--- /dev/null
+++ b/web/core/themes/bartik/css/classy/components/field.css
@@ -0,0 +1,25 @@
+/**
+ * @file
+ * Visual styles for fields.
+ */
+
+.field__label {
+ font-weight: bold;
+}
+.field--label-inline .field__label,
+.field--label-inline .field__items {
+ float: left; /* LTR */
+}
+.field--label-inline .field__label,
+.field--label-inline > .field__item,
+.field--label-inline .field__items {
+ padding-right: 0.5em;
+}
+[dir="rtl"] .field--label-inline .field__label,
+[dir="rtl"] .field--label-inline .field__items {
+ padding-right: 0;
+ padding-left: 0.5em;
+}
+.field--label-inline .field__label::after {
+ content: ":";
+}
diff --git a/web/core/themes/bartik/css/classy/components/file.css b/web/core/themes/bartik/css/classy/components/file.css
new file mode 100644
index 0000000000..8637242a54
--- /dev/null
+++ b/web/core/themes/bartik/css/classy/components/file.css
@@ -0,0 +1,62 @@
+/**
+ * @file
+ * Default style for file module.
+ */
+
+/* File icons. */
+
+.file {
+ display: inline-block;
+ min-height: 16px;
+ padding-left: 20px; /* LTR */
+ background-repeat: no-repeat;
+ background-position: left center; /* LTR */
+}
+[dir="rtl"] .file {
+ padding-right: 20px;
+ padding-left: inherit;
+ background-position: right center;
+}
+.file--general,
+.file--application-octet-stream {
+ background-image: url(../../../images/classy/icons/application-octet-stream.png);
+}
+.file--package-x-generic {
+ background-image: url(../../../images/classy/icons/package-x-generic.png);
+}
+.file--x-office-spreadsheet {
+ background-image: url(../../../images/classy/icons/x-office-spreadsheet.png);
+}
+.file--x-office-document {
+ background-image: url(../../../images/classy/icons/x-office-document.png);
+}
+.file--x-office-presentation {
+ background-image: url(../../../images/classy/icons/x-office-presentation.png);
+}
+.file--text-x-script {
+ background-image: url(../../../images/classy/icons/text-x-script.png);
+}
+.file--text-html {
+ background-image: url(../../../images/classy/icons/text-html.png);
+}
+.file--text-plain {
+ background-image: url(../../../images/classy/icons/text-plain.png);
+}
+.file--application-pdf {
+ background-image: url(../../../images/classy/icons/application-pdf.png);
+}
+.file--application-x-executable {
+ background-image: url(../../../images/classy/icons/application-x-executable.png);
+}
+.file--audio {
+ background-image: url(../../../images/classy/icons/audio-x-generic.png);
+}
+.file--video {
+ background-image: url(../../../images/classy/icons/video-x-generic.png);
+}
+.file--text {
+ background-image: url(../../../images/classy/icons/text-x-generic.png);
+}
+.file--image {
+ background-image: url(../../../images/classy/icons/image-x-generic.png);
+}
diff --git a/web/core/themes/bartik/css/classy/components/form.css b/web/core/themes/bartik/css/classy/components/form.css
new file mode 100644
index 0000000000..7f8aa4b35f
--- /dev/null
+++ b/web/core/themes/bartik/css/classy/components/form.css
@@ -0,0 +1,104 @@
+/**
+ * @file
+ * Visual styles for form components.
+ */
+
+form .field-multiple-table {
+ margin: 0;
+}
+form .field-multiple-table .field-multiple-drag {
+ width: 30px;
+ padding-right: 0; /* LTR */
+}
+[dir="rtl"] form .field-multiple-table .field-multiple-drag {
+ padding-left: 0;
+}
+form .field-multiple-table .field-multiple-drag .tabledrag-handle {
+ padding-right: 0.5em; /* LTR */
+}
+[dir="rtl"] form .field-multiple-table .field-multiple-drag .tabledrag-handle {
+ padding-right: 0;
+ padding-left: 0.5em;
+}
+form .field-add-more-submit {
+ margin: 0.5em 0 0;
+}
+
+/**
+ * Markup generated by Form API.
+ */
+.form-item,
+.form-actions {
+ margin-top: 1em;
+ margin-bottom: 1em;
+}
+tr.odd .form-item,
+tr.even .form-item {
+ margin-top: 0;
+ margin-bottom: 0;
+}
+.form-composite > .fieldset-wrapper > .description,
+.form-item .description {
+ font-size: 0.85em;
+}
+label.option {
+ display: inline;
+ font-weight: normal;
+}
+.form-composite > legend,
+.label {
+ display: inline;
+ margin: 0;
+ padding: 0;
+ font-size: inherit;
+ font-weight: bold;
+}
+.form-checkboxes .form-item,
+.form-radios .form-item {
+ margin-top: 0.4em;
+ margin-bottom: 0.4em;
+}
+.form-type-radio .description,
+.form-type-checkbox .description {
+ margin-left: 2.4em; /* LTR */
+}
+[dir="rtl"] .form-type-radio .description,
+[dir="rtl"] .form-type-checkbox .description {
+ margin-right: 2.4em;
+ margin-left: 0;
+}
+.marker {
+ color: #e00;
+}
+.form-required:after {
+ display: inline-block;
+ width: 6px;
+ height: 6px;
+ margin: 0 0.3em;
+ content: "";
+ vertical-align: super;
+ /* Use a background image to prevent screen readers from announcing the text. */
+ background-image: url(../../../../../misc/icons/ee0000/required.svg);
+ background-repeat: no-repeat;
+ background-size: 6px 6px;
+}
+abbr.tabledrag-changed,
+abbr.ajax-changed {
+ border-bottom: none;
+}
+.form-item input.error,
+.form-item textarea.error,
+.form-item select.error {
+ border: 2px solid red;
+}
+
+/* Inline error messages. */
+.form-item--error-message:before {
+ display: inline-block;
+ width: 14px;
+ height: 14px;
+ content: "";
+ vertical-align: sub;
+ background: url(../../../../../misc/icons/e32700/error.svg) no-repeat;
+ background-size: contain;
+}
diff --git a/web/core/themes/bartik/css/classy/components/forum.css b/web/core/themes/bartik/css/classy/components/forum.css
new file mode 100644
index 0000000000..c35e3f4411
--- /dev/null
+++ b/web/core/themes/bartik/css/classy/components/forum.css
@@ -0,0 +1,46 @@
+/**
+ * @file
+ * Styling for the Forum module.
+ */
+
+.forum__description {
+ margin: 0.5em;
+ font-size: 0.9em;
+}
+.forum__icon {
+ float: left; /* LTR */
+ width: 24px;
+ height: 24px;
+ margin: 0 9px 0 0; /* LTR */
+ background-image: url(../../../images/classy/icons/forum-icons.png);
+ background-repeat: no-repeat;
+}
+[dir="rtl"] .forum__icon {
+ float: right;
+ margin: 0 0 0 9px;
+}
+.forum__title {
+ overflow: hidden;
+}
+.forum .indented {
+ margin-left: 20px; /* LTR */
+}
+[dir="rtl"] .forum .indented {
+ margin-right: 20px;
+ margin-left: 0;
+}
+.forum__topic-status--new {
+ background-position: -24px 0;
+}
+.forum__topic-status--hot {
+ background-position: -48px 0;
+}
+.forum__topic-status--hot-new {
+ background-position: -72px 0;
+}
+.forum__topic-status--sticky {
+ background-position: -96px 0;
+}
+.forum__topic-status--closed {
+ background-position: -120px 0;
+}
diff --git a/web/core/themes/bartik/css/classy/components/icons.css b/web/core/themes/bartik/css/classy/components/icons.css
new file mode 100644
index 0000000000..ab0245f4c5
--- /dev/null
+++ b/web/core/themes/bartik/css/classy/components/icons.css
@@ -0,0 +1,21 @@
+/**
+ * @file
+ * Visual styles for icons.
+ */
+
+.icon-help {
+ padding: 1px 0 1px 20px; /* LTR */
+ background: url(../../../../../misc/help.png) 0 50% no-repeat; /* LTR */
+}
+[dir="rtl"] .icon-help {
+ padding: 1px 20px 1px 0;
+ background-position: 100% 50%;
+}
+.feed-icon {
+ display: block;
+ overflow: hidden;
+ width: 16px;
+ height: 16px;
+ text-indent: -9999px;
+ background: url(../../../../../misc/feed.svg) no-repeat;
+}
diff --git a/web/core/themes/bartik/css/classy/components/image-widget.css b/web/core/themes/bartik/css/classy/components/image-widget.css
new file mode 100644
index 0000000000..56777c41ea
--- /dev/null
+++ b/web/core/themes/bartik/css/classy/components/image-widget.css
@@ -0,0 +1,33 @@
+/**
+ * @file
+ * Image upload widget.
+ *
+ * This CSS file is not used in this theme (Classy). It was intended to be used,
+ * but due to a bug, Drupal 8 shipped with it not being used. To not break
+ * backwards compatibility, we continue to not load it in Classy. Every
+ * subtheme of Classy is encouraged to use it, by attaching the
+ * classy/image-widget asset library in their image-widget.html.twig file.
+ *
+ * @see core/themes/seven/templates/content-edit/image-widget.html.twig.
+ *
+ * @todo In Drupal 9, let core/themes/classy/templates/content-edit/image-widget.html.twig
+ * attach the classy/image-widget asset library.
+ */
+
+.image-preview {
+ float: left; /* LTR */
+ padding: 0 10px 10px 0; /* LTR */
+}
+[dir="rtl"] .image-preview {
+ float: right;
+ padding: 0 0 10px 10px;
+}
+.image-widget-data {
+ float: left; /* LTR */
+}
+[dir="rtl"] .image-widget-data {
+ float: right;
+}
+.image-widget-data .text-field {
+ width: auto;
+}
diff --git a/web/core/themes/bartik/css/classy/components/indented.css b/web/core/themes/bartik/css/classy/components/indented.css
new file mode 100644
index 0000000000..6925a06363
--- /dev/null
+++ b/web/core/themes/bartik/css/classy/components/indented.css
@@ -0,0 +1,16 @@
+
+/**
+ * @file
+ * Basic styling for comment module.
+ */
+
+/**
+ * Indent threaded comments.
+ */
+.indented {
+ margin-left: 25px; /* LTR */
+}
+[dir="rtl"] .indented {
+ margin-right: 25px;
+ margin-left: 0;
+}
diff --git a/web/core/themes/bartik/css/classy/components/inline-form.css b/web/core/themes/bartik/css/classy/components/inline-form.css
new file mode 100644
index 0000000000..b5201a78c9
--- /dev/null
+++ b/web/core/themes/bartik/css/classy/components/inline-form.css
@@ -0,0 +1,33 @@
+/**
+ * @file
+ * Visual styles for inline forms.
+ */
+
+.form--inline .form-item {
+ float: left; /* LTR */
+ margin-right: 0.5em; /* LTR */
+}
+[dir="rtl"] .form--inline .form-item {
+ float: right;
+ margin-right: 0;
+ margin-left: 0.5em;
+}
+/* This is required to win over specificity of [dir="rtl"] .form--inline .form-item */
+[dir="rtl"] .views-filterable-options-controls .form-item {
+ margin-right: 2%;
+}
+.form--inline .form-item-separator {
+ margin-top: 2.3em;
+ margin-right: 1em; /* LTR */
+ margin-left: 0.5em; /* LTR */
+}
+[dir="rtl"] .form--inline .form-item-separator {
+ margin-right: 0.5em;
+ margin-left: 1em;
+}
+.form--inline .form-actions {
+ clear: left; /* LTR */
+}
+[dir="rtl"] .form--inline .form-actions {
+ clear: right;
+}
diff --git a/web/core/themes/bartik/css/classy/components/item-list.css b/web/core/themes/bartik/css/classy/components/item-list.css
new file mode 100644
index 0000000000..a8ce5d28a5
--- /dev/null
+++ b/web/core/themes/bartik/css/classy/components/item-list.css
@@ -0,0 +1,32 @@
+/**
+ * @file
+ * Visual styles for item list.
+ */
+
+.item-list .title {
+ font-weight: bold;
+}
+.item-list ul {
+ margin: 0 0 0.75em 0;
+ padding: 0;
+}
+.item-list li {
+ margin: 0 0 0.25em 1.5em; /* LTR */
+ padding: 0;
+}
+[dir="rtl"] .item-list li {
+ margin: 0 1.5em 0.25em 0;
+}
+
+/**
+ * Comma separated lists.
+ */
+.item-list--comma-list {
+ display: inline;
+}
+.item-list--comma-list .item-list__comma-list,
+.item-list__comma-list li,
+[dir="rtl"] .item-list--comma-list .item-list__comma-list,
+[dir="rtl"] .item-list__comma-list li {
+ margin: 0;
+}
diff --git a/web/core/themes/bartik/css/classy/components/link.css b/web/core/themes/bartik/css/classy/components/link.css
new file mode 100644
index 0000000000..fa83f2bb2c
--- /dev/null
+++ b/web/core/themes/bartik/css/classy/components/link.css
@@ -0,0 +1,16 @@
+/**
+ * @file
+ * Style another element as a link.
+ */
+
+button.link {
+ margin: 0;
+ padding: 0;
+ cursor: pointer;
+ border: 0;
+ background: transparent;
+ font-size: 1em;
+}
+label button.link {
+ font-weight: bold;
+}
diff --git a/web/core/themes/bartik/css/classy/components/links.css b/web/core/themes/bartik/css/classy/components/links.css
new file mode 100644
index 0000000000..e483253933
--- /dev/null
+++ b/web/core/themes/bartik/css/classy/components/links.css
@@ -0,0 +1,23 @@
+/**
+ * @file
+ * Visual styles for links.
+ */
+
+ul.inline,
+ul.links.inline {
+ display: inline;
+ padding-left: 0; /* LTR */
+}
+[dir="rtl"] ul.inline,
+[dir="rtl"] ul.links.inline {
+ padding-right: 0;
+ padding-left: 15px;
+}
+ul.inline li {
+ display: inline;
+ padding: 0 0.5em;
+ list-style-type: none;
+}
+ul.links a.is-active {
+ color: #000;
+}
diff --git a/web/core/themes/bartik/css/classy/components/media-embed-error.css b/web/core/themes/bartik/css/classy/components/media-embed-error.css
new file mode 100644
index 0000000000..edb3ab24e6
--- /dev/null
+++ b/web/core/themes/bartik/css/classy/components/media-embed-error.css
@@ -0,0 +1,20 @@
+/**
+ * @file
+ * Media Embed filter: default styling for media embed errors.
+ */
+
+/**
+ * The caption filter's styling overrides ours, so add a more specific selector
+ * to account for that.
+ */
+.media-embed-error,
+.caption > .media-embed-error {
+ max-width: 200px;
+ padding: 100px 20px 20px;
+ text-align: center;
+ background-color: #ebebeb;
+ background-image: url(../../../../../modules/media/images/icons/no-thumbnail.png);
+ background-repeat: no-repeat;
+ background-position: center top;
+ background-size: 100px 100px;
+}
diff --git a/web/core/themes/bartik/css/classy/components/menu.css b/web/core/themes/bartik/css/classy/components/menu.css
new file mode 100644
index 0000000000..80d3e14d86
--- /dev/null
+++ b/web/core/themes/bartik/css/classy/components/menu.css
@@ -0,0 +1,34 @@
+/**
+ * @file
+ * Visual styles for menu.
+ */
+
+ul.menu {
+ margin-left: 1em; /* LTR */
+ padding: 0;
+ list-style: none outside;
+ text-align: left; /* LTR */
+}
+[dir="rtl"] ul.menu {
+ margin-right: 1em;
+ margin-left: 0;
+ text-align: right;
+}
+.menu-item--expanded {
+ list-style-type: circle;
+ list-style-image: url(../../../../../misc/menu-expanded.png);
+}
+.menu-item--collapsed {
+ list-style-type: disc;
+ list-style-image: url(../../../../../misc/menu-collapsed.png); /* LTR */
+}
+[dir="rtl"] .menu-item--collapsed {
+ list-style-image: url(../../../../../misc/menu-collapsed-rtl.png);
+}
+.menu-item {
+ margin: 0;
+ padding-top: 0.2em;
+}
+ul.menu a.is-active {
+ color: #000;
+}
diff --git a/web/core/themes/bartik/css/classy/components/messages.css b/web/core/themes/bartik/css/classy/components/messages.css
new file mode 100644
index 0000000000..47459468d2
--- /dev/null
+++ b/web/core/themes/bartik/css/classy/components/messages.css
@@ -0,0 +1,72 @@
+/**
+ * @file
+ * Styles for system messages.
+ */
+
+.messages {
+ padding: 15px 20px 15px 35px; /* LTR */
+ word-wrap: break-word;
+ border: 1px solid;
+ border-width: 1px 1px 1px 0; /* LTR */
+ border-radius: 2px;
+ background: no-repeat 10px 17px; /* LTR */
+ overflow-wrap: break-word;
+}
+[dir="rtl"] .messages {
+ padding-right: 35px;
+ padding-left: 20px;
+ text-align: right;
+ border-width: 1px 0 1px 1px;
+ background-position: right 10px top 17px;
+}
+.messages + .messages {
+ margin-top: 1.538em;
+}
+.messages__list {
+ margin: 0;
+ padding: 0;
+ list-style: none;
+}
+.messages__item + .messages__item {
+ margin-top: 0.769em;
+}
+/* See .color-success in Seven's colors.css */
+.messages--status {
+ color: #325e1c;
+ border-color: #c9e1bd #c9e1bd #c9e1bd transparent; /* LTR */
+ background-color: #f3faef;
+ background-image: url(../../../../../misc/icons/73b355/check.svg);
+ box-shadow: -8px 0 0 #77b259; /* LTR */
+}
+[dir="rtl"] .messages--status {
+ margin-left: 0;
+ border-color: #c9e1bd transparent #c9e1bd #c9e1bd;
+ box-shadow: 8px 0 0 #77b259;
+}
+/* See .color-warning in Seven's colors.css */
+.messages--warning {
+ color: #734c00;
+ border-color: #f4daa6 #f4daa6 #f4daa6 transparent; /* LTR */
+ background-color: #fdf8ed;
+ background-image: url(../../../../../misc/icons/e29700/warning.svg);
+ box-shadow: -8px 0 0 #e09600; /* LTR */
+}
+[dir="rtl"] .messages--warning {
+ border-color: #f4daa6 transparent #f4daa6 #f4daa6;
+ box-shadow: 8px 0 0 #e09600;
+}
+/* See .color-error in Seven's colors.css */
+.messages--error {
+ color: #a51b00;
+ border-color: #f9c9bf #f9c9bf #f9c9bf transparent; /* LTR */
+ background-color: #fcf4f2;
+ background-image: url(../../../../../misc/icons/e32700/error.svg);
+ box-shadow: -8px 0 0 #e62600; /* LTR */
+}
+[dir="rtl"] .messages--error {
+ border-color: #f9c9bf transparent #f9c9bf #f9c9bf;
+ box-shadow: 8px 0 0 #e62600;
+}
+.messages--error p.error {
+ color: #a51b00;
+}
diff --git a/web/core/themes/bartik/css/classy/components/more-link.css b/web/core/themes/bartik/css/classy/components/more-link.css
new file mode 100644
index 0000000000..c604061317
--- /dev/null
+++ b/web/core/themes/bartik/css/classy/components/more-link.css
@@ -0,0 +1,12 @@
+/**
+ * @file
+ * Markup generated by #type 'more_link'.
+ */
+
+.more-link {
+ display: block;
+ text-align: right; /* LTR */
+}
+[dir="rtl"] .more-link {
+ text-align: left;
+}
diff --git a/web/core/themes/bartik/css/classy/components/node.css b/web/core/themes/bartik/css/classy/components/node.css
new file mode 100644
index 0000000000..6b7cd5257d
--- /dev/null
+++ b/web/core/themes/bartik/css/classy/components/node.css
@@ -0,0 +1,8 @@
+/**
+ * @file
+ * Visual styles for nodes.
+ */
+
+.node--unpublished {
+ background-color: #fff4f4;
+}
diff --git a/web/core/themes/bartik/css/classy/components/pager.css b/web/core/themes/bartik/css/classy/components/pager.css
new file mode 100644
index 0000000000..a9471fc037
--- /dev/null
+++ b/web/core/themes/bartik/css/classy/components/pager.css
@@ -0,0 +1,16 @@
+/**
+ * @file
+ * Visual styles for pager.
+ */
+
+.pager__items {
+ clear: both;
+ text-align: center;
+}
+.pager__item {
+ display: inline;
+ padding: 0.5em;
+}
+.pager__item.is-active {
+ font-weight: bold;
+}
diff --git a/web/core/themes/bartik/css/classy/components/progress.css b/web/core/themes/bartik/css/classy/components/progress.css
new file mode 100644
index 0000000000..47da889350
--- /dev/null
+++ b/web/core/themes/bartik/css/classy/components/progress.css
@@ -0,0 +1,69 @@
+/**
+ * @file
+ * Visual styles for progress bar.
+ *
+ * @see progress.js
+ */
+
+.progress__track {
+ border-color: #b3b3b3;
+ border-radius: 10em;
+ background-color: #f2f1eb;
+ background-image: -webkit-linear-gradient(#e7e7df, #f0f0f0);
+ background-image: linear-gradient(#e7e7df, #f0f0f0);
+ box-shadow: inset 0 1px 3px hsla(0, 0%, 0%, 0.16);
+}
+.progress__bar {
+ height: 16px;
+ margin-top: -1px;
+ margin-left: -1px; /* LTR */
+ padding: 0 1px;
+ -webkit-transition: width 0.5s ease-out;
+ transition: width 0.5s ease-out;
+ -webkit-animation: animate-stripes 3s linear infinite;
+ -moz-animation: animate-stripes 3s linear infinite;
+ border: 1px #07629a solid;
+ border-radius: 10em;
+ background: #057ec9;
+ background-image:
+ -webkit-linear-gradient(top, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.15)),
+ -webkit-linear-gradient(left top, #0094f0 0%, #0094f0 25%, #007ecc 25%, #007ecc 50%, #0094f0 50%, #0094f0 75%, #0094f0 100%);
+ background-image:
+ linear-gradient(to bottom, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.15)),
+ linear-gradient(to right bottom, #0094f0 0%, #0094f0 25%, #007ecc 25%, #007ecc 50%, #0094f0 50%, #0094f0 75%, #0094f0 100%);
+ background-size: 40px 40px;
+}
+[dir="rtl"] .progress__bar {
+ margin-right: -1px;
+ margin-left: 0;
+ -webkit-animation-direction: reverse;
+ -moz-animation-direction: reverse;
+ animation-direction: reverse;
+}
+
+@media screen and (prefers-reduced-motion: reduce) {
+ .progress__bar {
+ -webkit-transition: none;
+ transition: none;
+ -webkit-animation: none;
+ -moz-animation: none;
+ }
+}
+
+/**
+ * Progress bar animations.
+ */
+@-webkit-keyframes animate-stripes {
+ 0% { background-position: 0 0, 0 0; }
+ 100% { background-position: 0 0, -80px 0; }
+}
+
+@-ms-keyframes animate-stripes {
+ 0% { background-position: 0 0, 0 0; }
+ 100% { background-position: 0 0, -80px 0; }
+}
+
+@keyframes animate-stripes {
+ 0% { background-position: 0 0, 0 0; }
+ 100% { background-position: 0 0, -80px 0; }
+}
diff --git a/web/core/themes/bartik/css/classy/components/search-results.css b/web/core/themes/bartik/css/classy/components/search-results.css
new file mode 100644
index 0000000000..343ea8b5fb
--- /dev/null
+++ b/web/core/themes/bartik/css/classy/components/search-results.css
@@ -0,0 +1,8 @@
+/**
+ * @file
+ * Stylesheet for results generated by the Search module.
+ */
+
+.search-results {
+ list-style: none;
+}
diff --git a/web/core/themes/bartik/css/classy/components/tabledrag.css b/web/core/themes/bartik/css/classy/components/tabledrag.css
new file mode 100644
index 0000000000..a197b24979
--- /dev/null
+++ b/web/core/themes/bartik/css/classy/components/tabledrag.css
@@ -0,0 +1,14 @@
+/**
+ * @file
+ * Visual styles for table drag.
+ */
+
+tr.drag {
+ background-color: #fffff0;
+}
+tr.drag-previous {
+ background-color: #ffd;
+}
+body div.tabledrag-changed-warning {
+ margin-bottom: 0.5em;
+}
diff --git a/web/core/themes/bartik/css/classy/components/tableselect.css b/web/core/themes/bartik/css/classy/components/tableselect.css
new file mode 100644
index 0000000000..fcfb2a5aa4
--- /dev/null
+++ b/web/core/themes/bartik/css/classy/components/tableselect.css
@@ -0,0 +1,19 @@
+/**
+ * @file
+ * Table select behavior.
+ *
+ * @see tableselect.js
+ */
+
+tr.selected td {
+ background: #ffc;
+}
+td.checkbox,
+th.checkbox {
+ text-align: center;
+}
+[dir="rtl"] td.checkbox,
+[dir="rtl"] th.checkbox {
+ /* This is required to win over specificity of [dir="rtl"] td */
+ text-align: center;
+}
diff --git a/web/core/themes/bartik/css/classy/components/tablesort.css b/web/core/themes/bartik/css/classy/components/tablesort.css
new file mode 100644
index 0000000000..44e5349404
--- /dev/null
+++ b/web/core/themes/bartik/css/classy/components/tablesort.css
@@ -0,0 +1,11 @@
+/**
+ * @file
+ * Table sort indicator.
+ */
+
+th.is-active img {
+ display: inline;
+}
+td.is-active {
+ background-color: #ddd;
+}
diff --git a/web/core/themes/bartik/css/classy/components/tabs.css b/web/core/themes/bartik/css/classy/components/tabs.css
new file mode 100644
index 0000000000..16fb1223f0
--- /dev/null
+++ b/web/core/themes/bartik/css/classy/components/tabs.css
@@ -0,0 +1,33 @@
+/**
+ * @file
+ * Visual styles for tabs.
+ */
+
+div.tabs {
+ margin: 1em 0;
+}
+ul.tabs {
+ margin: 0 0 0.5em;
+ padding: 0;
+ list-style: none;
+}
+.tabs > li {
+ display: inline-block;
+ margin-right: 0.3em; /* LTR */
+}
+[dir="rtl"] .tabs > li {
+ margin-right: 0;
+ margin-left: 0.3em;
+}
+.tabs a {
+ display: block;
+ padding: 0.2em 1em;
+ text-decoration: none;
+}
+.tabs a.is-active {
+ background-color: #eee;
+}
+.tabs a:focus,
+.tabs a:hover {
+ background-color: #f5f5f5;
+}
diff --git a/web/core/themes/bartik/css/classy/components/textarea.css b/web/core/themes/bartik/css/classy/components/textarea.css
new file mode 100644
index 0000000000..2661bae9c4
--- /dev/null
+++ b/web/core/themes/bartik/css/classy/components/textarea.css
@@ -0,0 +1,11 @@
+/**
+ * @file
+ * Visual styles for a resizable textarea.
+ */
+
+.form-textarea-wrapper textarea {
+ display: block;
+ box-sizing: border-box;
+ width: 100%;
+ margin: 0;
+}
diff --git a/web/core/themes/bartik/css/classy/components/ui-dialog.css b/web/core/themes/bartik/css/classy/components/ui-dialog.css
new file mode 100644
index 0000000000..476c21ffdb
--- /dev/null
+++ b/web/core/themes/bartik/css/classy/components/ui-dialog.css
@@ -0,0 +1,15 @@
+/**
+ * @file
+ * Styles for Classy's modal windows.
+ */
+
+.ui-dialog--narrow {
+ max-width: 500px;
+}
+
+@media screen and (max-width: 600px) {
+ .ui-dialog--narrow {
+ min-width: 95%;
+ max-width: 95%;
+ }
+}
diff --git a/web/core/themes/bartik/css/classy/components/user.css b/web/core/themes/bartik/css/classy/components/user.css
new file mode 100644
index 0000000000..8baa8f83a3
--- /dev/null
+++ b/web/core/themes/bartik/css/classy/components/user.css
@@ -0,0 +1,66 @@
+/**
+ * @file
+ * Theme styling for user module.
+ */
+
+/* Visual styling for the Password strength indicator */
+.password-strength__meter {
+ margin-top: 0.5em;
+ background-color: #ebeae4;
+}
+.password-strength__indicator {
+ -webkit-transition: width 0.5s ease-out;
+ transition: width 0.5s ease-out;
+ background-color: #77b259;
+}
+.password-strength__indicator.is-weak {
+ background-color: #e62600;
+}
+.password-strength__indicator.is-fair {
+ background-color: #e09600;
+}
+.password-strength__indicator.is-good {
+ background-color: #0074bd;
+}
+.password-strength__indicator.is-strong {
+ background-color: #77b259;
+}
+
+.password-confirm,
+.password-field,
+.password-strength,
+.password-confirm-match {
+ width: 55%;
+}
+
+.password-suggestions {
+ max-width: 34.7em;
+ margin: 0.7em 0;
+ padding: 0.2em 0.5em;
+ border: 1px solid #b4b4b4;
+}
+.password-suggestions ul {
+ margin-bottom: 0;
+}
+
+.confirm-parent,
+.password-parent {
+ clear: left; /* LTR */
+ overflow: hidden;
+ max-width: 33em;
+ margin: 0;
+}
+[dir="rtl"] .confirm-parent,
+[dir="rtl"] .password-parent {
+ clear: right;
+}
+
+/* Styling for the status indicator of the passwords match test. */
+.password-confirm .ok {
+ color: #325e1c;
+ font-weight: bold;
+}
+.password-confirm .error {
+ color: #a51b00;
+ font-weight: bold;
+}
diff --git a/web/core/themes/bartik/css/classy/layout/media-library.css b/web/core/themes/bartik/css/classy/layout/media-library.css
new file mode 100644
index 0000000000..84dee10daa
--- /dev/null
+++ b/web/core/themes/bartik/css/classy/layout/media-library.css
@@ -0,0 +1,28 @@
+/**
+ * @file
+ * Contains minimal layout styling for the media library.
+ */
+
+.media-library-wrapper {
+ display: flex;
+}
+
+.media-library-menu {
+ flex-basis: 20%;
+ flex-shrink: 0;
+}
+
+.media-library-content {
+ flex-grow: 1;
+}
+
+.media-library-views-form {
+ display: flex;
+ flex-wrap: wrap;
+}
+
+.media-library-views-form .media-library-item {
+ justify-content: space-between;
+ max-width: 23%;
+ margin: 1%;
+}
diff --git a/web/core/themes/bartik/css/components/form.css b/web/core/themes/bartik/css/components/form.css
index f3400f411f..fc05258d27 100644
--- a/web/core/themes/bartik/css/components/form.css
+++ b/web/core/themes/bartik/css/components/form.css
@@ -17,17 +17,6 @@ fieldset {
min-width: 0;
margin: 1em 0;
}
-/**
- * We've temporarily added this Firefox specific rule here to fix fieldset
- * widths.
- * @todo remove once this Mozilla bug is fixed.
- * See https://bugzilla.mozilla.org/show_bug.cgi?id=504622
- */
-@media (min--moz-device-pixel-ratio: 0) {
- fieldset {
- display: table-cell;
- }
-}
details,
fieldset,
.filter-wrapper {
diff --git a/web/core/themes/bartik/images/classy/README.txt b/web/core/themes/bartik/images/classy/README.txt
new file mode 100644
index 0000000000..9df44f55ec
--- /dev/null
+++ b/web/core/themes/bartik/images/classy/README.txt
@@ -0,0 +1,12 @@
+WHAT IS THIS DIRECTORY FOR?
+--------------------------------
+This directory is for image files previously inherited from the Classy theme.
+
+WHY ARE CLASSY IMAGE FILES BEING COPIED HERE?
+-------------------------------------------
+Classy will be deprecated during the Drupal 9 lifecycle. To prepare for Classy's
+removal, image files that would otherwise be inherited from Classy are copied
+here.
+
+Image files that differ from the Classy versions should not be placed in this
+directory or any subdirectory.
diff --git a/web/core/themes/bartik/images/classy/icons/application-octet-stream.png b/web/core/themes/bartik/images/classy/icons/application-octet-stream.png
new file mode 100644
index 0000000000..d5453217dc
--- /dev/null
+++ b/web/core/themes/bartik/images/classy/icons/application-octet-stream.png
@@ -0,0 +1,3 @@
+�PNG
+
+���
IHDR�����������7����tEXtSoftware�Adobe ImageReadyq�e<���_IDAT(S�ͱ �@Dѩ�,�`�42���@����Z���#���d2!�4J�>dt�� `�
,=ޛ���{g8���C �PG(�<�h\���w�)E�o}�^�����IEND�B`�
\ No newline at end of file
diff --git a/web/core/themes/bartik/images/classy/icons/application-pdf.png b/web/core/themes/bartik/images/classy/icons/application-pdf.png
new file mode 100644
index 0000000000..36107d6e80
--- /dev/null
+++ b/web/core/themes/bartik/images/classy/icons/application-pdf.png
@@ -0,0 +1,5 @@
+�PNG
+
+���
IHDR��������� ��a��!IDATxڍӱ��0 ��{ Aqs�]��M9p�I��#��� nN.
+..š�"����ic~�渢�\��/%�|�)����, ���{�sO�c ��RI�<"_Z ۶K���=�O-�8�k����z�h���Ff3��� �q\*:�@
���7���#��A�M��� p2y8�N��z=p���[� Av8 A ����Ѩ�%�Z
A��h<F��(���Ձl�W������n��v�r��� ��'@��2�W�_�F�:��_.
+�[-U����gB��ܣ*���()5h �����IEND�B`�
\ No newline at end of file
diff --git a/web/core/themes/bartik/images/classy/icons/application-x-executable.png b/web/core/themes/bartik/images/classy/icons/application-x-executable.png
new file mode 100644
index 0000000000..d5453217dc
--- /dev/null
+++ b/web/core/themes/bartik/images/classy/icons/application-x-executable.png
@@ -0,0 +1,3 @@
+�PNG
+
+���
IHDR�����������7����tEXtSoftware�Adobe ImageReadyq�e<���_IDAT(S�ͱ �@Dѩ�,�`�42���@����Z���#���d2!�4J�>dt�� `�
,=ޛ���{g8���C �PG(�<�h\���w�)E�o}�^�����IEND�B`�
\ No newline at end of file
diff --git a/web/core/themes/bartik/images/classy/icons/audio-x-generic.png b/web/core/themes/bartik/images/classy/icons/audio-x-generic.png
new file mode 100644
index 0000000000..28d7f50862
--- /dev/null
+++ b/web/core/themes/bartik/images/classy/icons/audio-x-generic.png
@@ -0,0 +1,3 @@
+�PNG
+
+���
IHDR��������� ��a��IDAT8Oc���?����'W1H-L �?�����w ���dC�q��n��� ����8 � <��0��w��~���Z��{���=�������ל��?y_�������W6��ׯ` >_��,6 L��P��0Hq�����N7�?ps����og��?���F#h� �c��a���^$I������V�#���v8���sy�g�����)�������������o�(3���/��i�)�����ۉ����IEND�B`�
\ No newline at end of file
diff --git a/web/core/themes/bartik/images/classy/icons/forum-icons.png b/web/core/themes/bartik/images/classy/icons/forum-icons.png
new file mode 100644
index 0000000000..e291de6725
--- /dev/null
+++ b/web/core/themes/bartik/images/classy/icons/forum-icons.png
@@ -0,0 +1,10 @@
+�PNG
+
+���
IHDR����������"{�?��PLTE������������www�����������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������߯����������������������������������������������������������������������������������ۯ�������������������������������������������ד��������������������������������������tP[�����tRNS�
+
+ %***+,..001479=HKMX\ddhiimsvxxxxxxyy{}������������������������������������������������������������������������甐��IDATx^����E�JiS
+-�����/R܊hq�W�P|d�]b������&�����圼���o��*
�mۨt���w?8 ����e��O �ձ����]� ��e���y���E�Y�?�s� �8~@������t�8�A~��� ���?s�$�$����s�c�=z�9s�v+O��mKP�l&��w{���O�<�3I�}tj���̠"�p훼��gM>��0 ��y�F�?����{�;~��mnxcKۏ
+��f9�w�=�uy�y&(�aa ��g� e��f3���) `0h^v���Z��䙠�r�5H�$?.`�q�c�W^(g�!�>3��D�4�����;x��bIv��� ���<�x��Tܻ�Ш=K��M�k �,�q��F������!�#��90&�V��$��ӀP�=�y$hO��>|~Q�qDn�Qd&��cV�W��-�����¥�z�U�q��-�E!�(�Vl�|0b�v� =�8��x0�}�@ �x$>�G/L���"��W�Ϋ~�aE�� �(���4�E|s��<~rC�&�=7ݧl�s@!)<ɿ-�ԓ|=�Ŋ�8��sn��� a �u�r��Ql� Ls��� A�$��ʅ��7�h���t {4�0O���]��j\�� E9���մ� ��0�;�
��߭9y����a0OH���x��Y������4����қ�g��g�懕g��x�#(�9yƣH�sA��� 9��Ȍ�q
+�Þ�B��ѫ�/��U����k�������p(�)C��H.}
+�P-XUO[��O�,f��� @x5�LU�H@)��{�nz��/TU��"��Kf��'��Bc�<
+�q������~Z��˟ߠɷ9遟u]�<��%�>m�En�i�/�{TI?�<'*��K�ޣ �Y�{��ԏT�\�D�:�ˮ�� -�U� �}"�u��߄�{��ӿb�4(Hd2�f���I�Kua�*�[�Aɫu����\�k���}�d��/ݲį��� W ����=8�V��w�R����q�
>��{���I�F�E�2gz��L����IEND�B`�
\ No newline at end of file
diff --git a/web/core/themes/bartik/images/classy/icons/image-x-generic.png b/web/core/themes/bartik/images/classy/icons/image-x-generic.png
new file mode 100644
index 0000000000..c1b814f7cb
--- /dev/null
+++ b/web/core/themes/bartik/images/classy/icons/image-x-generic.png
@@ -0,0 +1,6 @@
+�PNG
+
+���
IHDR��������� ��a��HIDATxڕ�=K�P���'�.��Z*����q�N��!�JDGE�YA��IT��`S�4I�QLnm�{��Z�聇��&��K"� $I� �� �D��1۶�p �^2*�S>�o���HϹ���|�/�e:����!�W��b�
+��
+�`�ȏ�א$\P#A���c�� j֚ЄQR0�i�܌����ܒx�-p�I���F��r!#Юk)��-��T�W��iT�i0cvq��:��x�~�+7�we��r1��I/��W���$ ����(�u���e� '��v#���mW��fnV�����\fۢ�0��;G@�
+�A �| �@ F����IEND�B`�
\ No newline at end of file
diff --git a/web/core/themes/bartik/images/classy/icons/package-x-generic.png b/web/core/themes/bartik/images/classy/icons/package-x-generic.png
new file mode 100644
index 0000000000..21fc382cba
--- /dev/null
+++ b/web/core/themes/bartik/images/classy/icons/package-x-generic.png
@@ -0,0 +1,4 @@
+�PNG
+
+���
IHDR�����������7����tEXtSoftware�Adobe ImageReadyq�e<����IDAT(S��1�0�|�P�P�D�4��T�H�qPȲ>��c��h��<Y��(
+6**qO�0�'�_���u&�
Q�g�CW�p&[\���3�B{�;-N�BK*6T6���Ł�B��K�Q#Q �ј ����_s=oH�>-�".�;�C����0`"�a2�\�N�{ӆ�i��������IEND�B`�
\ No newline at end of file
diff --git a/web/core/themes/bartik/images/classy/icons/text-html.png b/web/core/themes/bartik/images/classy/icons/text-html.png
new file mode 100644
index 0000000000..9c7c7932c2
--- /dev/null
+++ b/web/core/themes/bartik/images/classy/icons/text-html.png
@@ -0,0 +1,7 @@
+�PNG
+
+���
IHDR��������� ��a����IDATxڍ��
+�@�}�ަS��=@��7:G��� �� �w�۲
+��o@��vǁ� f��)�1q �� �s?����Z;��*W��
+PY�I0F�?? 3� �sI t�^AQD��+(�2�.0�0���_� ��ۄ��9�/O� 3��dwD�Ϧi�; ^�7/�W��~�t�"�\ÙW xB]�BP��@)]���m��� ��
+�c�0��������IEND�B`�
\ No newline at end of file
diff --git a/web/core/themes/bartik/images/classy/icons/text-plain.png b/web/core/themes/bartik/images/classy/icons/text-plain.png
new file mode 100644
index 0000000000..06804849b8
--- /dev/null
+++ b/web/core/themes/bartik/images/classy/icons/text-plain.png
@@ -0,0 +1,4 @@
+�PNG
+
+���
IHDR�����������7����tEXtSoftware�Adobe ImageReadyq�e<���~IDAT(S��� �0 E3� 8��l���ɋ
+�� �km���<hh��)�@ E���f� #�^)h����"jq�I�Q�u���&0���A� � ��d�J�6t%� ����1r*A�?��?�T��f;�����������IEND�B`�
\ No newline at end of file
diff --git a/web/core/themes/bartik/images/classy/icons/text-x-generic.png b/web/core/themes/bartik/images/classy/icons/text-x-generic.png
new file mode 100644
index 0000000000..06804849b8
--- /dev/null
+++ b/web/core/themes/bartik/images/classy/icons/text-x-generic.png
@@ -0,0 +1,4 @@
+�PNG
+
+���
IHDR�����������7����tEXtSoftware�Adobe ImageReadyq�e<���~IDAT(S��� �0 E3� 8��l���ɋ
+�� �km���<hh��)�@ E���f� #�^)h����"jq�I�Q�u���&0���A� � ��d�J�6t%� ����1r*A�?��?�T��f;�����������IEND�B`�
\ No newline at end of file
diff --git a/web/core/themes/bartik/images/classy/icons/text-x-script.png b/web/core/themes/bartik/images/classy/icons/text-x-script.png
new file mode 100644
index 0000000000..f9ecca8138
--- /dev/null
+++ b/web/core/themes/bartik/images/classy/icons/text-x-script.png
@@ -0,0 +1,5 @@
+�PNG
+
+���
IHDR��������� ��a����IDATxڝ��
+�@E����U��}@ ?� ��E!D �� YRM�̗w���
�zpxsa�a ��q ��E�p�MP�5�e9��*S2�
+0Q
�E�ώ�U�$I .��V�R�B?қ1�eV���d<��ʣ<��Ȃ�(h�����&��_��d`#>˂�i���fƖ<륫K*{ �|�� �p "�_�F���ڶ��Eaw�_�� �>2���Z����IEND�B`�
\ No newline at end of file
diff --git a/web/core/themes/bartik/images/classy/icons/video-x-generic.png b/web/core/themes/bartik/images/classy/icons/video-x-generic.png
new file mode 100644
index 0000000000..a2b71f95d9
--- /dev/null
+++ b/web/core/themes/bartik/images/classy/icons/video-x-generic.png
@@ -0,0 +1,5 @@
+�PNG
+
+���
IHDR�����������7����tEXtSoftware�Adobe ImageReadyq�e<���xIDAT(ϕ�11 �V>�(v�IEO��
+`��Av�2]4�� �F��BA10[���c� �K��pK�<�}c�=7S�b��Q0����,< �B=S�����\�
+�� �y�g7aA �πǴ"�j����IEND�B`�
\ No newline at end of file
diff --git a/web/core/themes/bartik/images/classy/icons/x-office-document.png b/web/core/themes/bartik/images/classy/icons/x-office-document.png
new file mode 100644
index 0000000000..40db538fcb
--- /dev/null
+++ b/web/core/themes/bartik/images/classy/icons/x-office-document.png
@@ -0,0 +1,5 @@
+�PNG
+
+���
IHDR��������� ��a����IDATx�ՓA
+! E=k/��,��: ��܉�� TR�c3���l���� ⎵��ա�q�#�9cJI��\�
+(f{ z��;k�qF�IS��^�2dS�snB��� b�����5(�T�Z���:�����3�֎���@�|�� �~-�����IEND�B`�
\ No newline at end of file
diff --git a/web/core/themes/bartik/images/classy/icons/x-office-presentation.png b/web/core/themes/bartik/images/classy/icons/x-office-presentation.png
new file mode 100644
index 0000000000..fb119e5ba9
--- /dev/null
+++ b/web/core/themes/bartik/images/classy/icons/x-office-presentation.png
@@ -0,0 +1,5 @@
+�PNG
+
+���
IHDR��������� ��a���|IDATx���
+� �}�^�st��o1=�r�`1�������
"����� �=�V�E)EJVS@9���F^���F S�RRȰ���&����+�F~ �~�z��}�GB�3��F�[�E
+. 4 ��;�����IEND�B`�
\ No newline at end of file
diff --git a/web/core/themes/bartik/images/classy/icons/x-office-spreadsheet.png b/web/core/themes/bartik/images/classy/icons/x-office-spreadsheet.png
new file mode 100644
index 0000000000..9af7b61ea1
--- /dev/null
+++ b/web/core/themes/bartik/images/classy/icons/x-office-spreadsheet.png
@@ -0,0 +1,4 @@
+�PNG
+
+���
IHDR��������� ��a���~IDATx��� � E=u��:@��e ȳ�`M�B E"�C{臇��_4�pa��6��w�!�ؐR��UP�}j��"��<H�*��7ȰL8�z� B4�]�/5(�|������j�=�.E
+N� �8������IEND�B`�
\ No newline at end of file
diff --git a/web/core/themes/bartik/js/classy/README.txt b/web/core/themes/bartik/js/classy/README.txt
new file mode 100644
index 0000000000..efa01cfd10
--- /dev/null
+++ b/web/core/themes/bartik/js/classy/README.txt
@@ -0,0 +1,12 @@
+WHAT IS THIS DIRECTORY FOR?
+--------------------------------
+This directory is for JS files previously inherited from the Classy theme.
+
+WHY ARE CLASSY JS FILES BEING COPIED HERE?
+-------------------------------------------
+Classy will be deprecated during the Drupal 9 lifecycle. To prepare for Classy's
+removal, JS files that would otherwise be inherited from Classy are copied
+here.
+
+JS files that differ from the Classy versions should not be placed in this
+directory or any subdirectory.
diff --git a/web/core/themes/bartik/js/classy/media_embed_ckeditor.theme.es6.js b/web/core/themes/bartik/js/classy/media_embed_ckeditor.theme.es6.js
new file mode 100644
index 0000000000..10193f7ba2
--- /dev/null
+++ b/web/core/themes/bartik/js/classy/media_embed_ckeditor.theme.es6.js
@@ -0,0 +1,22 @@
+/**
+ * @file
+ * Classy theme overrides for the Media Embed CKEditor plugin.
+ */
+
+(Drupal => {
+ /**
+ * Themes the error displayed when the media embed preview fails.
+ *
+ * @param {string} error
+ * The error message to display
+ *
+ * @return {string}
+ * A string representing a DOM fragment.
+ *
+ * @see media-embed-error.html.twig
+ */
+ Drupal.theme.mediaEmbedPreviewError = () =>
+ `<div class="media-embed-error media-embed-error--preview-error">${Drupal.t(
+ 'An error occurred while trying to preview the media. Please save your work and reload this page.',
+ )}</div>`;
+})(Drupal);
diff --git a/web/core/themes/bartik/js/classy/media_embed_ckeditor.theme.js b/web/core/themes/bartik/js/classy/media_embed_ckeditor.theme.js
new file mode 100644
index 0000000000..6614288cb4
--- /dev/null
+++ b/web/core/themes/bartik/js/classy/media_embed_ckeditor.theme.js
@@ -0,0 +1,12 @@
+/**
+* DO NOT EDIT THIS FILE.
+* See the following change record for more information,
+* https://www.drupal.org/node/2815083
+* @preserve
+**/
+
+(function (Drupal) {
+ Drupal.theme.mediaEmbedPreviewError = function () {
+ return '<div class="media-embed-error media-embed-error--preview-error">' + Drupal.t('An error occurred while trying to preview the media. Please save your work and reload this page.') + '</div>';
+ };
+})(Drupal);
\ No newline at end of file
diff --git a/web/core/themes/bartik/templates/block--search-form-block.html.twig b/web/core/themes/bartik/templates/block--search-form-block.html.twig
index b2af1edf2b..1f9adf0d32 100644
--- a/web/core/themes/bartik/templates/block--search-form-block.html.twig
+++ b/web/core/themes/bartik/templates/block--search-form-block.html.twig
@@ -1,23 +1,48 @@
-{% extends "@classy/block/block--search-form-block.html.twig" %}
{#
/**
* @file
- * Bartik's theme implementation for a search form block. Extends Classy's
- * search form block template.
+ * Bartik's theme implementation for a search form block.
*
* Available variables:
+ * - plugin_id: The ID of the block implementation.
+ * - label: The configured label of the block if visible.
+ * - configuration: A list of the block's configuration values, including:
+ * - label: The configured label for the block.
+ * - label_display: The display settings for the label.
+ * - provider: The module or other provider that provided this block plugin.
+ * - Block plugin specific settings will also be stored here.
* - content: The content of this block.
* - content_attributes: A list of HTML attributes applied to the main content
+ * - attributes: A list HTML attributes populated by modules, intended to
+ * be added to the main container tag of this template. Includes:
+ * - id: A valid HTML ID and guaranteed unique.
+ * - title_attributes: Same as attributes, except applied to the main title
* tag that appears in the template.
+ * - title_prefix: Additional output populated by modules, intended to be
+ * displayed in front of the main title tag that appears in the template.
+ * - title_suffix: Additional output populated by modules, intended to be
+ * displayed after the main title tag that appears in the template.
*
* @see template_preprocess_block()
* @see search_preprocess_block()
- *
- * @ingroup themeable
*/
#}
-{% block content %}
- <div{{ content_attributes.addClass('content', 'container-inline') }}>
- {{ parent() }}
- </div>
-{% endblock %}
+{%
+ set classes = [
+ 'block',
+ 'block-search',
+ 'container-inline',
+ ]
+%}
+<div{{ attributes.addClass(classes) }}>
+ {{ title_prefix }}
+ {% if label %}
+ <h2{{ title_attributes }}>{{ label }}</h2>
+ {% endif %}
+ {{ title_suffix }}
+ {% block content %}
+ <div{{ content_attributes.addClass('content', 'container-inline') }}>
+ {{ content }}
+ </div>
+ {% endblock %}
+</div>
diff --git a/web/core/themes/bartik/templates/block--system-menu-block.html.twig b/web/core/themes/bartik/templates/block--system-menu-block.html.twig
index d22cfbf931..aea280820e 100644
--- a/web/core/themes/bartik/templates/block--system-menu-block.html.twig
+++ b/web/core/themes/bartik/templates/block--system-menu-block.html.twig
@@ -1,21 +1,66 @@
-{% extends "@classy/block/block--system-menu-block.html.twig" %}
{#
/**
* @file
* Bartik's theme implementation for a menu block.
*
- * @ingroup themeable
+ * Available variables:
+ * - plugin_id: The ID of the block implementation.
+ * - label: The configured label of the block if visible.
+ * - configuration: A list of the block's configuration values.
+ * - label: The configured label for the block.
+ * - label_display: The display settings for the label.
+ * - provider: The module or other provider that provided this block plugin.
+ * - Block plugin specific settings will also be stored here.
+ * - content: The content of this block.
+ * - attributes: HTML attributes for the containing element.
+ * - id: A valid HTML ID and guaranteed unique.
+ * - title_attributes: HTML attributes for the title element.
+ * - content_attributes: HTML attributes for the content element.
+ * - title_prefix: Additional output populated by modules, intended to be
+ * displayed in front of the main title tag that appears in the template.
+ * - title_suffix: Additional output populated by modules, intended to be
+ * displayed after the main title tag that appears in the template.
+ *
+ * Headings should be used on navigation menus that consistently appear on
+ * multiple pages. When this menu block's label is configured to not be
+ * displayed, it is automatically made invisible using the 'visually-hidden' CSS
+ * class, which still keeps it visible for screen-readers and assistive
+ * technology. Headings allow screen-reader and keyboard only users to navigate
+ * to or skip the links.
+ * See http://juicystudio.com/article/screen-readers-display-none.php and
+ * http://www.w3.org/TR/WCAG-TECHS/H42.html for more information.
*/
#}
+{%
+ set classes = [
+ 'block',
+ 'block-menu',
+ 'navigation',
+ 'menu--' ~ derivative_plugin_id|clean_class,
+ ]
+%}
+{% set heading_id = attributes.id ~ '-menu'|clean_id %}
{% set show_anchor = "show-" ~ attributes.id|clean_id %}
{% set hide_anchor = "hide-" ~ attributes.id|clean_id %}
-{% block content %}
- <div{{ content_attributes.addClass('content') }}>
- {# When rendering a menu without label, render a menu toggle. #}
- <div class="menu-toggle-target menu-toggle-target-show" id="{{ show_anchor }}"></div>
- <div class="menu-toggle-target" id="{{ hide_anchor }}"></div>
- <a class="menu-toggle" href="#{{ show_anchor }}">{% trans %} Show — {{ configuration.label }}{% endtrans %}</a>
- <a class="menu-toggle menu-toggle--hide" href="#{{ hide_anchor }}">{% trans %} Hide — {{ configuration.label }}{% endtrans %}</a>
- {{ content }}
- </div>
-{% endblock %}
+
+<nav role="navigation" aria-labelledby="{{ heading_id }}"{{ attributes.addClass(classes)|without('role', 'aria-labelledby') }}>
+ {# Label. If not displayed, we still provide it for screen readers. #}
+ {% if not configuration.label_display %}
+ {% set title_attributes = title_attributes.addClass('visually-hidden') %}
+ {% endif %}
+ {{ title_prefix }}
+ <h2{{ title_attributes.setAttribute('id', heading_id) }}>{{ configuration.label }}</h2>
+ {{ title_suffix }}
+
+ {# Menu. #}
+ {% block content %}
+ <div{{ content_attributes.addClass('content') }}>
+ {# When rendering a menu without label, render a menu toggle. #}
+ <div class="menu-toggle-target menu-toggle-target-show" id="{{ show_anchor }}"></div>
+ <div class="menu-toggle-target" id="{{ hide_anchor }}"></div>
+ <a class="menu-toggle" href="#{{ show_anchor }}">{% trans %} Show — {{ configuration.label }}{% endtrans %}</a>
+ <a class="menu-toggle menu-toggle--hide" href="#{{ hide_anchor }}">{% trans %} Hide — {{ configuration.label }}{% endtrans %}</a>
+ {{ content }}
+ </div>
+ {% endblock %}
+</nav>
diff --git a/web/core/themes/bartik/templates/classy/README.txt b/web/core/themes/bartik/templates/classy/README.txt
new file mode 100644
index 0000000000..8708a82e74
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/README.txt
@@ -0,0 +1,12 @@
+WHAT IS THIS DIRECTORY FOR?
+--------------------------------
+This directory is for templates previously inherited from the Classy theme.
+
+WHY ARE CLASSY TEMPLATES BEING COPIED HERE?
+-------------------------------------------
+Classy will be deprecated during the Drupal 9 lifecycle. To prepare for Classy's
+removal, templates that would otherwise be inherited from Classy are copied
+here.
+
+Templates that differ from the Classy versions should not be placed in this
+directory or any subdirectory.
diff --git a/web/core/themes/bartik/templates/classy/block/block--local-actions-block.html.twig b/web/core/themes/bartik/templates/classy/block/block--local-actions-block.html.twig
new file mode 100644
index 0000000000..97df94b666
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/block/block--local-actions-block.html.twig
@@ -0,0 +1,12 @@
+{% extends "block.html.twig" %}
+{#
+/**
+ * @file
+ * Theme override for local actions (primary admin actions.)
+ */
+#}
+{% block content %}
+ {% if content %}
+ <nav class="action-links">{{ content }}</nav>
+ {% endif %}
+{% endblock %}
diff --git a/web/core/themes/bartik/templates/classy/block/block--local-tasks-block.html.twig b/web/core/themes/bartik/templates/classy/block/block--local-tasks-block.html.twig
new file mode 100644
index 0000000000..0f25f59d83
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/block/block--local-tasks-block.html.twig
@@ -0,0 +1,14 @@
+{% extends "block.html.twig" %}
+{#
+/**
+ * @file
+ * Theme override for tabs.
+ */
+#}
+{% block content %}
+ {% if content %}
+ <nav class="tabs" role="navigation" aria-label="{{ 'Tabs'|t }}">
+ {{ content }}
+ </nav>
+ {% endif %}
+{% endblock %}
diff --git a/web/core/themes/bartik/templates/classy/content-edit/file-managed-file.html.twig b/web/core/themes/bartik/templates/classy/content-edit/file-managed-file.html.twig
new file mode 100644
index 0000000000..281d0d0dc2
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/content-edit/file-managed-file.html.twig
@@ -0,0 +1,22 @@
+{#
+/**
+ * @file
+ * Theme override to display a file form widget.
+ *
+ * Available variables:
+ * - element: Form element for the file upload.
+ * - attributes: HTML attributes for the containing element.
+ *
+ * @see template_preprocess_file_managed_file()
+ */
+#}
+{{ attach_library('bartik/classy.file') }}
+{%
+ set classes = [
+ 'js-form-managed-file',
+ 'form-managed-file',
+ ]
+%}
+<div{{ attributes.addClass(classes) }}>
+ {{ element }}
+</div>
diff --git a/web/core/themes/bartik/templates/classy/content-edit/filter-caption.html.twig b/web/core/themes/bartik/templates/classy/content-edit/filter-caption.html.twig
new file mode 100644
index 0000000000..1e35795fc1
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/content-edit/filter-caption.html.twig
@@ -0,0 +1,18 @@
+{#
+/**
+ * @file
+ * Theme override for a filter caption.
+ *
+ * Returns HTML for a captioned image, audio, video or other tag.
+ *
+ * Available variables
+ * - string node: The complete HTML tag whose contents are being captioned.
+ * - string tag: The name of the HTML tag whose contents are being captioned.
+ * - string caption: The caption text.
+ * - string classes: The classes of the captioned HTML tag.
+ */
+#}
+<figure role="group" class="caption caption-{{ tag }}{%- if classes %} {{ classes }}{%- endif %}">
+{{ node }}
+<figcaption>{{ caption }}</figcaption>
+</figure>
diff --git a/web/core/themes/bartik/templates/classy/content-edit/filter-guidelines.html.twig b/web/core/themes/bartik/templates/classy/content-edit/filter-guidelines.html.twig
new file mode 100644
index 0000000000..afef2d2cfb
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/content-edit/filter-guidelines.html.twig
@@ -0,0 +1,29 @@
+{#
+/**
+ * @file
+ * Theme override for guidelines for a text format.
+ *
+ * Available variables:
+ * - format: Contains information about the current text format, including the
+ * following:
+ * - name: The name of the text format, potentially unsafe and needs to be
+ * escaped.
+ * - format: The machine name of the text format, e.g. 'basic_html'.
+ * - attributes: HTML attributes for the containing element.
+ * - tips: Descriptions and a CSS ID in the form of 'module-name/filter-id'
+ * (only used when 'long' is TRUE) for each filter in one or more text
+ * formats.
+ *
+ * @see template_preprocess_filter_tips()
+ */
+#}
+{%
+ set classes = [
+ 'filter-guidelines-item',
+ 'filter-guidelines-' ~ format.id,
+ ]
+%}
+<div{{ attributes.addClass(classes) }}>
+ <h4 class="label">{{ format.label }}</h4>
+ {{ tips }}
+</div>
diff --git a/web/core/themes/bartik/templates/classy/content-edit/filter-tips.html.twig b/web/core/themes/bartik/templates/classy/content-edit/filter-tips.html.twig
new file mode 100644
index 0000000000..25ed49d6ae
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/content-edit/filter-tips.html.twig
@@ -0,0 +1,61 @@
+{#
+/**
+ * @file
+ * Theme override for a set of filter tips.
+ *
+ * Available variables:
+ * - tips: Descriptions and a CSS ID in the form of 'module-name/filter-id'
+ * (only used when 'long' is TRUE) for each filter in one or more text
+ * formats.
+ * - long: A flag indicating whether the passed-in filter tips contain extended
+ * explanations, i.e. intended to be output on the path 'filter/tips'
+ * (TRUE), or are in a short format, i.e. suitable to be displayed below a
+ * form element. Defaults to FALSE.
+ * - multiple: A flag indicating there is more than one filter tip.
+ *
+ * @see template_preprocess_filter_tips()
+ */
+#}
+{% if multiple %}
+ <h2>{{ 'Text Formats'|t }}</h2>
+{% endif %}
+
+{% if tips|length %}
+ {% if multiple %}
+ <div class="compose-tips">
+ {% endif %}
+
+ {% for name, tip in tips %}
+ {% if multiple %}
+ {%
+ set tip_classes = [
+ 'filter-type',
+ 'filter-' ~ name|clean_class,
+ ]
+ %}
+ <div{{ tip.attributes.addClass(tip_classes) }}>
+ <h3>{{ tip.name }}</h3>
+ {% endif %}
+
+ {% if tip.list|length %}
+ <ul class="tips">
+ {% for item in tip.list %}
+ {%
+ set item_classes = [
+ long ? 'filter-' ~ item.id|replace({'/': '-'}),
+ ]
+ %}
+ <li{{ item.attributes.addClass(item_classes) }}>{{ item.tip }}</li>
+ {% endfor %}
+ </ul>
+ {% endif %}
+
+ {% if multiple %}
+ </div>
+ {% endif %}
+ {% endfor %}
+
+ {% if multiple %}
+ </div>
+ {% endif %}
+{% endif %}
diff --git a/web/core/themes/bartik/templates/classy/content-edit/image-widget.html.twig b/web/core/themes/bartik/templates/classy/content-edit/image-widget.html.twig
new file mode 100644
index 0000000000..dac3a227b3
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/content-edit/image-widget.html.twig
@@ -0,0 +1,23 @@
+{#
+/**
+ * @file
+ * Theme override for an image field widget.
+ *
+ * Available variables:
+ * - attributes: HTML attributes for the containing element.
+ * - data: Render elements of the image widget.
+ *
+ * @see template_preprocess_image_widget()
+ */
+#}
+<div{{ attributes }}>
+ {% if data.preview %}
+ <div class="image-preview">
+ {{ data.preview }}
+ </div>
+ {% endif %}
+ <div class="image-widget-data">
+ {# Render widget data without the image preview that was output already. #}
+ {{ data|without('preview') }}
+ </div>
+</div>
diff --git a/web/core/themes/bartik/templates/classy/content-edit/node-add-list.html.twig b/web/core/themes/bartik/templates/classy/content-edit/node-add-list.html.twig
new file mode 100644
index 0000000000..f38fe3a5c6
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/content-edit/node-add-list.html.twig
@@ -0,0 +1,30 @@
+{#
+/**
+ * @file
+ * Theme override to list node types available for adding content.
+ *
+ * This list is displayed on the Add content admin page.
+ *
+ * Available variables:
+ * - types: A list of content types, each with the following properties:
+ * - add_link: Link to create a piece of content of this type.
+ * - description: Description of this type of content.
+ *
+ * @see template_preprocess_node_add_list()
+ */
+#}
+{% if types is not empty %}
+ <dl class="node-type-list">
+ {% for type in types %}
+ <dt>{{ type.add_link }}</dt>
+ <dd>{{ type.description }}</dd>
+ {% endfor %}
+ </dl>
+{% else %}
+ <p>
+ {% set create_content = path('node.type_add') %}
+ {% trans %}
+ You have not created any content types yet. Go to the <a href="{{ create_content }}">content type creation page</a> to add a new content type.
+ {% endtrans %}
+ </p>
+{% endif %}
diff --git a/web/core/themes/bartik/templates/classy/content-edit/node-edit-form.html.twig b/web/core/themes/bartik/templates/classy/content-edit/node-edit-form.html.twig
new file mode 100644
index 0000000000..18097f3797
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/content-edit/node-edit-form.html.twig
@@ -0,0 +1,28 @@
+{#
+/**
+ * @file
+ * Theme override for a node edit form.
+ *
+ * Two column template for the node add/edit form.
+ *
+ * This template will be used when a node edit form specifies 'node_edit_form'
+ * as its #theme callback. Otherwise, by default, node add/edit forms will be
+ * themed by form.html.twig.
+ *
+ * Available variables:
+ * - form: The node add/edit form.
+ *
+ * @see seven_form_node_form_alter()
+ */
+#}
+<div class="layout-node-form clearfix">
+ <div class="layout-region layout-region-node-main">
+ {{ form|without('advanced', 'actions') }}
+ </div>
+ <div class="layout-region layout-region-node-secondary">
+ {{ form.advanced }}
+ </div>
+ <div class="layout-region layout-region-node-footer">
+ {{ form.actions }}
+ </div>
+</div>
diff --git a/web/core/themes/bartik/templates/classy/content-edit/text-format-wrapper.html.twig b/web/core/themes/bartik/templates/classy/content-edit/text-format-wrapper.html.twig
new file mode 100644
index 0000000000..08a88ca1ce
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/content-edit/text-format-wrapper.html.twig
@@ -0,0 +1,26 @@
+{#
+/**
+ * @file
+ * Theme override for a text format-enabled form element.
+ *
+ * Available variables:
+ * - children: Text format element children.
+ * - description: Text format element description.
+ * - attributes: HTML attributes for the containing element.
+ * - aria_description: Flag for whether or not an ARIA description has been
+ * added to the description container.
+ *
+ * @see template_preprocess_text_format_wrapper()
+ */
+#}
+<div class="js-text-format-wrapper text-format-wrapper js-form-item form-item">
+ {{ children }}
+ {% if description %}
+ {%
+ set classes = [
+ aria_description ? 'description',
+ ]
+ %}
+ <div{{ attributes.addClass(classes) }}>{{ description }}</div>
+ {% endif %}
+</div>
diff --git a/web/core/themes/bartik/templates/classy/content/aggregator-item.html.twig b/web/core/themes/bartik/templates/classy/content/aggregator-item.html.twig
new file mode 100644
index 0000000000..16f4428a03
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/content/aggregator-item.html.twig
@@ -0,0 +1,31 @@
+{#
+/**
+ * @file
+ * Theme override to present a feed item in an aggregator page.
+ *
+ * Available variables:
+ * - url: URL to the originating feed item.
+ * - title: (optional) Title of the feed item.
+ * - content: All field items. Use {{ content }} to print them all,
+ * or print a subset such as {{ content.field_example }}. Use
+ * {{ content|without('field_example') }} to temporarily suppress the printing
+ * of a given element.
+ * - attributes: HTML attributes for the wrapper.
+ * - title_prefix: Additional output populated by modules, intended to be
+ * displayed in front of the main title tag that appears in the template.
+ * - title_suffix: Additional output populated by modules, intended to be
+ * displayed after the main title tag that appears in the template.
+ *
+ * @see template_preprocess_aggregator_item()
+ */
+#}
+<article{{ attributes.addClass('aggregator-item') }}>
+ {{ title_prefix }}
+ {% if title %}
+ <h3 class="feed-item-title">
+ <a href="{{ url }}">{{ title }}</a>
+ </h3>
+ {% endif %}
+ {{ title_suffix }}
+ {{ content }}
+</article>
diff --git a/web/core/themes/bartik/templates/classy/content/book-node-export-html.html.twig b/web/core/themes/bartik/templates/classy/content/book-node-export-html.html.twig
new file mode 100644
index 0000000000..94a4c24dc7
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/content/book-node-export-html.html.twig
@@ -0,0 +1,20 @@
+{#
+/**
+ * @file
+ * Theme override for a single node in a printer-friendly outline.
+ *
+ * Available variables:
+ * - node: Fully loaded node.
+ * - depth: Depth of the current node inside the outline.
+ * - title: Node title.
+ * - content: Node content.
+ * - children: All the child nodes recursively rendered through this file.
+ *
+ * @see template_preprocess_book_node_export_html()
+ */
+#}
+<article id="node-{{ node.id }}" class="section-{{ depth }}">
+ <h1 class="book-heading">{{ title }}</h1>
+ {{ content }}
+ {{ children }}
+</article>
diff --git a/web/core/themes/bartik/templates/classy/content/links--node.html.twig b/web/core/themes/bartik/templates/classy/content/links--node.html.twig
new file mode 100644
index 0000000000..e6cda0d7bb
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/content/links--node.html.twig
@@ -0,0 +1,40 @@
+{#
+/**
+ * @file
+ * Theme override to display node links.
+ *
+ * Available variables:
+ * - attributes: Attributes for the UL containing the list of links.
+ * - links: Links to be output.
+ * Each link will have the following elements:
+ * - link: (optional) A render array that returns a link. See
+ * template_preprocess_links() for details how it is generated.
+ * - text: The link text.
+ * - attributes: HTML attributes for the list item element.
+ * - text_attributes: (optional) HTML attributes for the span element if no
+ * 'url' was supplied.
+ * - heading: (optional) A heading to precede the links.
+ * - text: The heading text.
+ * - level: The heading level (e.g. 'h2', 'h3').
+ * - attributes: (optional) A keyed list of attributes for the heading.
+ * If the heading is a string, it will be used as the text of the heading and
+ * the level will default to 'h2'.
+ *
+ * Headings should be used on navigation menus and any list of links that
+ * consistently appears on multiple pages. To make the heading invisible use
+ * the 'visually-hidden' CSS class. Do not use 'display:none', which
+ * removes it from screen readers and assistive technology. Headings allow
+ * screen reader and keyboard only users to navigate to or skip the links.
+ * See http://juicystudio.com/article/screen-readers-display-none.php and
+ * http://www.w3.org/TR/WCAG-TECHS/H42.html for more information.
+ *
+ * @see template_preprocess_links()
+ *
+ * @ingroup themeable
+ */
+#}
+{% if links %}
+ <div class="node__links">
+ {% include "links.html.twig" %}
+ </div>
+{% endif %}
diff --git a/web/core/themes/bartik/templates/classy/content/mark.html.twig b/web/core/themes/bartik/templates/classy/content/mark.html.twig
new file mode 100644
index 0000000000..9219915ce5
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/content/mark.html.twig
@@ -0,0 +1,20 @@
+{#
+/**
+ * @file
+ * Theme override for a marker for new or updated content.
+ *
+ * Available variables:
+ * - status: Number representing the marker status to display. Use the constants
+ * below for comparison:
+ * - MARK_NEW
+ * - MARK_UPDATED
+ * - MARK_READ
+ */
+#}
+{% if logged_in %}
+ {% if status is constant('MARK_NEW') %}
+ <span class="marker">{{ 'New'|t }}</span>
+ {% elseif status is constant('MARK_UPDATED') %}
+ <span class="marker">{{ 'Updated'|t }}</span>
+ {% endif %}
+{% endif %}
diff --git a/web/core/themes/bartik/templates/classy/content/media-embed-error.html.twig b/web/core/themes/bartik/templates/classy/content/media-embed-error.html.twig
new file mode 100644
index 0000000000..142367bafa
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/content/media-embed-error.html.twig
@@ -0,0 +1,21 @@
+{#
+/**
+ * @file
+ * Theme override for a missing media error.
+ *
+ * Available variables
+ * - message: The message text.
+ * - attributes: HTML attributes for the containing element.
+ *
+ * When a response from the back end can't be returned, a related error message
+ * is displayed from JavaScript.
+ *
+ * @see Drupal.theme.mediaEmbedPreviewError
+ *
+ * @ingroup themeable
+ */
+#}
+{{ attach_library('bartik/classy.media_embed_error') }}
+<div{{ attributes.addClass('media-embed-error', 'media-embed-error--missing-source') }}>
+ {{ message }}
+</div>
diff --git a/web/core/themes/bartik/templates/classy/content/media.html.twig b/web/core/themes/bartik/templates/classy/content/media.html.twig
new file mode 100644
index 0000000000..422030e9d0
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/content/media.html.twig
@@ -0,0 +1,28 @@
+{#
+/**
+ * @file
+ * Theme override to display a media item.
+ *
+ * Available variables:
+ * - name: Name of the media.
+ * - content: Media content.
+ *
+ * @see template_preprocess_media()
+ *
+ * @ingroup themeable
+ */
+#}
+{%
+ set classes = [
+ 'media',
+ 'media--type-' ~ media.bundle()|clean_class,
+ not media.isPublished() ? 'media--unpublished',
+ view_mode ? 'media--view-mode-' ~ view_mode|clean_class,
+ ]
+%}
+<article{{ attributes.addClass(classes) }}>
+ {{ title_suffix.contextual_links }}
+ {% if content %}
+ {{ content }}
+ {% endif %}
+</article>
diff --git a/web/core/themes/bartik/templates/classy/content/search-result.html.twig b/web/core/themes/bartik/templates/classy/content/search-result.html.twig
new file mode 100644
index 0000000000..9f3b04d8ee
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/content/search-result.html.twig
@@ -0,0 +1,72 @@
+{#
+/**
+ * @file
+ * Theme override for displaying a single search result.
+ *
+ * This template renders a single search result. The list of results is
+ * rendered using '#theme' => 'item_list', with suggestions of:
+ * - item_list__search_results__(plugin_id)
+ * - item_list__search_results
+ *
+ * Available variables:
+ * - url: URL of the result.
+ * - title: Title of the result.
+ * - snippet: A small preview of the result. Does not apply to user searches.
+ * - info: String of all the meta information ready for print. Does not apply
+ * to user searches.
+ * - plugin_id: The machine-readable name of the plugin being executed,such
+ * as "node_search" or "user_search".
+ * - title_prefix: Additional output populated by modules, intended to be
+ * displayed in front of the main title tag that appears in the template.
+ * - title_suffix: Additional output populated by modules, intended to be
+ * displayed after the main title tag that appears in the template.
+ * - info_split: Contains same data as info, but split into separate parts.
+ * - info_split.type: Node type (or item type string supplied by module).
+ * - info_split.user: Author of the node linked to users profile. Depends
+ * on permission.
+ * - info_split.date: Last update of the node. Short formatted.
+ * - info_split.comment: Number of comments output as "% comments", %
+ * being the count. (Depends on comment.module).
+ * @todo The info variable needs to be made drillable and each of these sub
+ * items should instead be within info and renamed info.foo, info.bar, etc.
+ *
+ * Other variables:
+ * - title_attributes: HTML attributes for the title.
+ * - content_attributes: HTML attributes for the content.
+ *
+ * Since info_split is keyed, a direct print of the item is possible.
+ * This array does not apply to user searches so it is recommended to check
+ * for its existence before printing. The default keys of 'type', 'user' and
+ * 'date' always exist for node searches. Modules may provide other data.
+ * @code
+ * {% if (info_split.comment) %}
+ * <span class="info-comment">
+ * {{ info_split.comment }}
+ * </span>
+ * {% endif %}
+ * @endcode
+ *
+ * To check for all available data within info_split, use the code below.
+ * @code
+ * <pre>
+ * {{ dump(info_split) }}
+ * </pre>
+ * @endcode
+ *
+ * @see template_preprocess_search_result()
+ */
+#}
+{{ attach_library('bartik/classy.search-results') }}
+{{ title_prefix }}
+<h3{{ title_attributes.addClass('search-result__title') }}>
+ <a href="{{ url }}">{{ title }}</a>
+</h3>
+{{ title_suffix }}
+<div class="search-result__snippet-info">
+ {% if snippet %}
+ <p{{ content_attributes.addClass('search-result__snippet') }}>{{ snippet }}</p>
+ {% endif %}
+ {% if info %}
+ <p class="search-result__info">{{ info }}</p>
+ {% endif %}
+</div>
diff --git a/web/core/themes/bartik/templates/classy/content/taxonomy-term.html.twig b/web/core/themes/bartik/templates/classy/content/taxonomy-term.html.twig
new file mode 100644
index 0000000000..6478b507d0
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/content/taxonomy-term.html.twig
@@ -0,0 +1,41 @@
+{#
+/**
+ * @file
+ * Theme override to display a taxonomy term.
+ *
+ * Available variables:
+ * - url: URL of the current term.
+ * - name: (optional) Name of the current term.
+ * - content: Items for the content of the term (fields and description).
+ * Use 'content' to print them all, or print a subset such as
+ * 'content.description'. Use the following code to exclude the
+ * printing of a given child element:
+ * @code
+ * {{ content|without('description') }}
+ * @endcode
+ * - attributes: HTML attributes for the wrapper.
+ * - page: Flag for the full page state.
+ * - term: The taxonomy term entity, including:
+ * - id: The ID of the taxonomy term.
+ * - bundle: Machine name of the current vocabulary.
+ * - view_mode: View mode, e.g. 'full', 'teaser', etc.
+ *
+ * @see template_preprocess_taxonomy_term()
+ */
+#}
+{%
+ set classes = [
+ 'taxonomy-term',
+ 'vocabulary-' ~ term.bundle|clean_class,
+ ]
+%}
+<div{{ attributes.setAttribute('id', 'taxonomy-term-' ~ term.id).addClass(classes) }}>
+ {{ title_prefix }}
+ {% if name and not page %}
+ <h2><a href="{{ url }}">{{ name }}</a></h2>
+ {% endif %}
+ {{ title_suffix }}
+ <div class="content">
+ {{ content }}
+ </div>
+</div>
diff --git a/web/core/themes/bartik/templates/classy/dataset/aggregator-feed.html.twig b/web/core/themes/bartik/templates/classy/dataset/aggregator-feed.html.twig
new file mode 100644
index 0000000000..9eacccb604
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/dataset/aggregator-feed.html.twig
@@ -0,0 +1,36 @@
+{#
+/**
+ * @file
+ * Theme override to present an aggregator feed.
+ *
+ * The contents are rendered above feed listings when browsing source feeds.
+ * For example, "example.com/aggregator/sources/1".
+ *
+ * Available variables:
+ * - title: (optional) Title of the feed item.
+ * - content: All field items. Use {{ content }} to print them all,
+ * or print a subset such as {{ content.field_example }}. Use
+ * {{ content|without('field_example') }} to temporarily suppress the printing
+ * of a given element.
+ * - attributes: HTML attributes for the wrapper.
+ * - title_attributes: Same as attributes, except applied to the main title
+ * tag that appears in the template.
+ * - title_prefix: Additional output populated by modules, intended to be
+ * displayed in front of the main title tag that appears in the template.
+ * - title_suffix: Additional output populated by modules, intended to be
+ * displayed after the main title tag that appears in the template.
+ *
+ * @see template_preprocess_aggregator_feed()
+ */
+#}
+<div{{ attributes.addClass('aggregator-feed') }}>
+
+ {{ title_prefix }}
+ {% if title and not full %}
+ <h2{{ title_attributes }}>{{ title }}</h2>
+ {% endif %}
+ {{ title_suffix }}
+
+ {{ content }}
+
+</div>
diff --git a/web/core/themes/bartik/templates/classy/dataset/forum-icon.html.twig b/web/core/themes/bartik/templates/classy/dataset/forum-icon.html.twig
new file mode 100644
index 0000000000..d6be503bb2
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/dataset/forum-icon.html.twig
@@ -0,0 +1,30 @@
+{#
+/**
+ * @file
+ * Theme override to display a status icon for a forum post.
+ *
+ * Available variables:
+ * - attributes: HTML attributes to be applied to the wrapper element.
+ * - class: HTML classes that determine which icon to display. May be one of
+ * 'hot', 'hot-new', 'new', 'default', 'closed', or 'sticky'.
+ * - title: Text alternative for the forum icon.
+ * - icon_title: Text alternative for the forum icon, same as above.
+ * - new_posts: '1' when this topic contains new posts, otherwise '0'.
+ * - first_new: '1' when this is the first topic with new posts, otherwise '0'.
+ * - icon_status: Indicates which status icon should be used.
+ *
+ * @see template_preprocess_forum_icon()
+ */
+#}
+{%
+ set classes = [
+ 'forum__icon',
+ 'forum__topic-status--' ~ icon_status,
+ ]
+%}
+<div{{ attributes.addClass(classes) }}>
+ {% if first_new -%}
+ <a id="new"></a>
+ {%- endif %}
+ <span class="visually-hidden">{{ icon_title }}</span>
+</div>
diff --git a/web/core/themes/bartik/templates/classy/dataset/forum-list.html.twig b/web/core/themes/bartik/templates/classy/dataset/forum-list.html.twig
new file mode 100644
index 0000000000..ce610bb49b
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/dataset/forum-list.html.twig
@@ -0,0 +1,79 @@
+{#
+/**
+ * @file
+ * Theme override to display a list of forums and containers.
+ *
+ * Available variables:
+ * - forums: A collection of forums and containers to display. It is keyed to
+ * the numeric IDs of all child forums and containers. Each forum in forums
+ * contains:
+ * - is_container: A flag indicating if the forum can contain other
+ * forums. Otherwise, the forum can only contain topics.
+ * - depth: How deep the forum is in the current hierarchy.
+ * - zebra: 'even' or 'odd', used for row class.
+ * - icon_class: 'default' or 'new', used for forum icon class.
+ * - icon_title: Text alternative for the forum icon.
+ * - name: The name of the forum.
+ * - link: The URL to link to this forum.
+ * - description: The description field for the forum, containing:
+ * - value: The descriptive text for the forum.
+ * - new_topics: A flag indicating if the forum contains unread posts.
+ * - new_url: A URL to the forum's unread posts.
+ * - new_text: Text for the above URL, which tells how many new posts.
+ * - old_topics: A count of posts that have already been read.
+ * - num_posts: The total number of posts in the forum.
+ * - last_reply: Text representing the last time a forum was posted or
+ * commented in.
+ * - forum_id: Forum ID for the current forum. Parent to all items within the
+ * forums array.
+ *
+ * @see template_preprocess_forum_list()
+ */
+#}
+<table id="forum-{{ forum_id }}">
+ <thead>
+ <tr>
+ <th>{{ 'Forum'|t }}</th>
+ <th>{{ 'Topics'|t }}</th>
+ <th>{{ 'Posts'|t }}</th>
+ <th>{{ 'Last post'|t }}</th>
+ </tr>
+ </thead>
+ <tbody>
+ {% for child_id, forum in forums %}
+ <tr id="forum-list-{{ child_id }}" class="{{ forum.zebra }}">
+ <td {% if forum.is_container == true -%}
+ colspan="4" class="container"
+ {%- else -%}
+ class="forum-list__forum"
+ {%- endif -%}>
+ {#
+ Enclose the contents of this cell with X divs, where X is the
+ depth this forum resides at. This will allow us to use CSS
+ left-margin for indenting.
+ #}
+ {% for i in 1..forum.depth if forum.depth > 0 %}<div class="indented">{% endfor %}
+ <div class="forum__icon forum-status-{{ forum.icon_class }}" title="{{ forum.icon_title }}">
+ <span class="visually-hidden">{{ forum.icon_title }}</span>
+ </div>
+ <div class="forum__name"><a href="{{ forum.link }}">{{ forum.label }}</a></div>
+ {% if forum.description.value %}
+ <div class="forum__description">{{ forum.description.value }}</div>
+ {% endif %}
+ {% for i in 1..forum.depth if forum.depth > 0 %}</div>{% endfor %}
+ </td>
+ {% if forum.is_container == false %}
+ <td class="forum__topics">
+ {{ forum.num_topics }}
+ {% if forum.new_topics == true %}
+ <br />
+ <a href="{{ forum.new_url }}">{{ forum.new_text }}</a>
+ {% endif %}
+ </td>
+ <td class="forum__posts">{{ forum.num_posts }}</td>
+ <td class="forum__last-reply">{{ forum.last_reply }}</td>
+ {% endif %}
+ </tr>
+ {% endfor %}
+ </tbody>
+</table>
diff --git a/web/core/themes/bartik/templates/classy/dataset/forums.html.twig b/web/core/themes/bartik/templates/classy/dataset/forums.html.twig
new file mode 100644
index 0000000000..6cf7c833eb
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/dataset/forums.html.twig
@@ -0,0 +1,24 @@
+{#
+/**
+ * @file
+ * Theme override to display a forum.
+ *
+ * May contain forum containers as well as forum topics.
+ *
+ * Available variables:
+ * - forums: The forums to display (as processed by forum-list.html.twig).
+ * - topics: The topics to display.
+ * - topics_pager: The topics pager.
+ * - forums_defined: A flag to indicate that the forums are configured.
+ *
+ * @see template_preprocess_forums()
+ */
+#}
+{{ attach_library('bartik/classy.forum') }}
+{% if forums_defined %}
+ <div class="forum">
+ {{ forums }}
+ {{ topics }}
+ {{ topics_pager }}
+ </div>
+{% endif %}
diff --git a/web/core/themes/bartik/templates/classy/dataset/item-list--search-results.html.twig b/web/core/themes/bartik/templates/classy/dataset/item-list--search-results.html.twig
new file mode 100644
index 0000000000..e9928fd776
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/dataset/item-list--search-results.html.twig
@@ -0,0 +1,29 @@
+{% extends "item-list.html.twig" %}
+{#
+/**
+ * @file
+ * Theme override for an item list of search results.
+ *
+ * Available variables:
+ * - items: A list of items. Each item contains:
+ * - attributes: HTML attributes to be applied to each list item.
+ * - value: The content of the list element.
+ * - title: The title of the list.
+ * - list_type: The tag for list element ("ul" or "ol").
+ * - attributes: HTML attributes to be applied to the list.
+ * - empty: A message to display when there are no items. Allowed value is a
+ * string or render array.
+ * - context: An list of contextual data associated with the list. For search
+ * results, the following data is set:
+ * - plugin: The search plugin ID, for example "node_search".
+ *
+ * @see template_preprocess_item_list()
+ */
+#}
+{%
+ set classes = [
+ 'search-results',
+ context.plugin ~ '-results',
+ ]
+%}
+{% set attributes = attributes.addClass(classes) %}
diff --git a/web/core/themes/bartik/templates/classy/dataset/item-list.html.twig b/web/core/themes/bartik/templates/classy/dataset/item-list.html.twig
new file mode 100644
index 0000000000..20541b0b7e
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/dataset/item-list.html.twig
@@ -0,0 +1,41 @@
+{#
+/**
+ * @file
+ * Theme override for an item list.
+ *
+ * Available variables:
+ * - items: A list of items. Each item contains:
+ * - attributes: HTML attributes to be applied to each list item.
+ * - value: The content of the list element.
+ * - title: The title of the list.
+ * - list_type: The tag for list element ("ul" or "ol").
+ * - wrapper_attributes: HTML attributes to be applied to the list wrapper.
+ * - attributes: HTML attributes to be applied to the list.
+ * - empty: A message to display when there are no items. Allowed value is a
+ * string or render array.
+ * - context: A list of contextual data associated with the list. May contain:
+ * - list_style: The custom list style.
+ *
+ * @see template_preprocess_item_list()
+ */
+#}
+{% if context.list_style %}
+ {%- set wrapper_attributes = wrapper_attributes.addClass('item-list--' ~ context.list_style) %}
+ {%- set attributes = attributes.addClass('item-list__' ~ context.list_style) %}
+{% endif %}
+{% if items or empty -%}
+ <div{{ wrapper_attributes.addClass('item-list') }}>
+ {%- if title is not empty -%}
+ <h3>{{ title }}</h3>
+ {%- endif -%}
+ {%- if items -%}
+ <{{ list_type }}{{ attributes }}>
+ {%- for item in items -%}
+ <li{{ item.attributes }}>{{ item.value }}</li>
+ {%- endfor -%}
+ </{{ list_type }}>
+ {%- else -%}
+ {{- empty -}}
+ {%- endif -%}
+ </div>
+{%- endif %}
diff --git a/web/core/themes/bartik/templates/classy/dataset/table.html.twig b/web/core/themes/bartik/templates/classy/dataset/table.html.twig
new file mode 100644
index 0000000000..2afa9c1556
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/dataset/table.html.twig
@@ -0,0 +1,113 @@
+{#
+/**
+ * @file
+ * Theme override to display a table.
+ *
+ * Available variables:
+ * - attributes: HTML attributes to apply to the <table> tag.
+ * - caption: A localized string for the <caption> tag.
+ * - colgroups: Column groups. Each group contains the following properties:
+ * - attributes: HTML attributes to apply to the <col> tag.
+ * Note: Drupal currently supports only one table header row, see
+ * https://www.drupal.org/node/893530 and
+ * http://api.drupal.org/api/drupal/includes!theme.inc/function/theme_table/7#comment-5109.
+ * - header: Table header cells. Each cell contains the following properties:
+ * - tag: The HTML tag name to use; either 'th' or 'td'.
+ * - attributes: HTML attributes to apply to the tag.
+ * - content: A localized string for the title of the column.
+ * - field: Field name (required for column sorting).
+ * - sort: Default sort order for this column ("asc" or "desc").
+ * - sticky: A flag indicating whether to use a "sticky" table header.
+ * - rows: Table rows. Each row contains the following properties:
+ * - attributes: HTML attributes to apply to the <tr> tag.
+ * - data: Table cells.
+ * - no_striping: A flag indicating that the row should receive no
+ * 'even / odd' styling. Defaults to FALSE.
+ * - cells: Table cells of the row. Each cell contains the following keys:
+ * - tag: The HTML tag name to use; either 'th' or 'td'.
+ * - attributes: Any HTML attributes, such as "colspan", to apply to the
+ * table cell.
+ * - content: The string to display in the table cell.
+ * - active_table_sort: A boolean indicating whether the cell is the active
+ table sort.
+ * - footer: Table footer rows, in the same format as the rows variable.
+ * - empty: The message to display in an extra row if table does not have
+ * any rows.
+ * - no_striping: A boolean indicating that the row should receive no striping.
+ * - header_columns: The number of columns in the header.
+ *
+ * @see template_preprocess_table()
+ */
+#}
+<table{{ attributes }}>
+ {% if caption %}
+ <caption>{{ caption }}</caption>
+ {% endif %}
+
+ {% for colgroup in colgroups %}
+ {% if colgroup.cols %}
+ <colgroup{{ colgroup.attributes }}>
+ {% for col in colgroup.cols %}
+ <col{{ col.attributes }} />
+ {% endfor %}
+ </colgroup>
+ {% else %}
+ <colgroup{{ colgroup.attributes }} />
+ {% endif %}
+ {% endfor %}
+
+ {% if header %}
+ <thead>
+ <tr>
+ {% for cell in header %}
+ {%
+ set cell_classes = [
+ cell.active_table_sort ? 'is-active',
+ ]
+ %}
+ <{{ cell.tag }}{{ cell.attributes.addClass(cell_classes) }}>
+ {{- cell.content -}}
+ </{{ cell.tag }}>
+ {% endfor %}
+ </tr>
+ </thead>
+ {% endif %}
+
+ {% if rows %}
+ <tbody>
+ {% for row in rows %}
+ {%
+ set row_classes = [
+ not no_striping ? cycle(['odd', 'even'], loop.index0),
+ ]
+ %}
+ <tr{{ row.attributes.addClass(row_classes) }}>
+ {% for cell in row.cells %}
+ <{{ cell.tag }}{{ cell.attributes }}>
+ {{- cell.content -}}
+ </{{ cell.tag }}>
+ {% endfor %}
+ </tr>
+ {% endfor %}
+ </tbody>
+ {% elseif empty %}
+ <tbody>
+ <tr class="odd">
+ <td colspan="{{ header_columns }}" class="empty message">{{ empty }}</td>
+ </tr>
+ </tbody>
+ {% endif %}
+ {% if footer %}
+ <tfoot>
+ {% for row in footer %}
+ <tr{{ row.attributes }}>
+ {% for cell in row.cells %}
+ <{{ cell.tag }}{{ cell.attributes }}>
+ {{- cell.content -}}
+ </{{ cell.tag }}>
+ {% endfor %}
+ </tr>
+ {% endfor %}
+ </tfoot>
+ {% endif %}
+</table>
diff --git a/web/core/themes/bartik/templates/classy/field/field--comment.html.twig b/web/core/themes/bartik/templates/classy/field/field--comment.html.twig
new file mode 100644
index 0000000000..1ec3ee64b1
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/field/field--comment.html.twig
@@ -0,0 +1,57 @@
+{#
+/**
+ * @file
+ * Theme override for comment fields.
+ *
+ * Available variables:
+ * - attributes: HTML attributes for the containing element.
+ * - label_hidden: Whether to show the field label or not.
+ * - title_attributes: HTML attributes for the title.
+ * - label: The label for the field.
+ * - title_prefix: Additional output populated by modules, intended to be
+ * displayed in front of the main title tag that appears in the template.
+ * - title_suffix: Additional title output populated by modules, intended to
+ * be displayed after the main title tag that appears in the template.
+ * - comments: List of comments rendered through comment.html.twig.
+ * - comment_form: The 'Add new comment' form.
+ * - comment_display_mode: Is the comments are threaded.
+ * - comment_type: The comment type bundle ID for the comment field.
+ * - entity_type: The entity type to which the field belongs.
+ * - field_name: The name of the field.
+ * - field_type: The type of the field.
+ * - label_display: The display settings for the label.
+ *
+ * @see template_preprocess_field()
+ * @see comment_preprocess_field()
+ */
+#}
+{%
+ set classes = [
+ 'field',
+ 'field--name-' ~ field_name|clean_class,
+ 'field--type-' ~ field_type|clean_class,
+ 'field--label-' ~ label_display,
+ 'comment-wrapper',
+ ]
+%}
+{%
+ set title_classes = [
+ 'title',
+ label_display == 'visually_hidden' ? 'visually-hidden',
+ ]
+%}
+<section{{ attributes.addClass(classes) }}>
+ {% if comments and not label_hidden %}
+ {{ title_prefix }}
+ <h2{{ title_attributes.addClass(title_classes) }}>{{ label }}</h2>
+ {{ title_suffix }}
+ {% endif %}
+
+ {{ comments }}
+
+ {% if comment_form %}
+ <h2 class="title comment-form__title">{{ 'Add new comment'|t }}</h2>
+ {{ comment_form }}
+ {% endif %}
+
+</section>
diff --git a/web/core/themes/bartik/templates/classy/field/field--node--created.html.twig b/web/core/themes/bartik/templates/classy/field/field--node--created.html.twig
new file mode 100644
index 0000000000..72d5d6737d
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/field/field--node--created.html.twig
@@ -0,0 +1,34 @@
+{#
+/**
+ * @file
+ * Theme override for the node created field.
+ *
+ * This is an override of field.html.twig for the node created field. See that
+ * template for documentation about its details and overrides.
+ *
+ * Available variables:
+ * - attributes: HTML attributes for the containing span element.
+ * - items: List of all the field items. Each item contains:
+ * - attributes: List of HTML attributes for each item.
+ * - content: The field item content.
+ * - entity_type: The entity type to which the field belongs.
+ * - field_name: The name of the field.
+ * - field_type: The type of the field.
+ * - label_display: The display settings for the label.
+ *
+ * @see field.html.twig
+ */
+#}
+{%
+ set classes = [
+ 'field',
+ 'field--name-' ~ field_name|clean_class,
+ 'field--type-' ~ field_type|clean_class,
+ 'field--label-' ~ label_display,
+ ]
+%}
+<span{{ attributes.addClass(classes) }}>
+ {%- for item in items -%}
+ {{ item.content }}
+ {%- endfor -%}
+</span>
diff --git a/web/core/themes/bartik/templates/classy/field/field--node--title.html.twig b/web/core/themes/bartik/templates/classy/field/field--node--title.html.twig
new file mode 100644
index 0000000000..33b105f50b
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/field/field--node--title.html.twig
@@ -0,0 +1,34 @@
+{#
+/**
+ * @file
+ * Theme override for the node title field.
+ *
+ * This is an override of field.html.twig for the node title field. See that
+ * template for documentation about its details and overrides.
+ *
+ * Available variables:
+ * - attributes: HTML attributes for the containing span element.
+ * - items: List of all the field items. Each item contains:
+ * - attributes: List of HTML attributes for each item.
+ * - content: The field item content.
+ * - entity_type: The entity type to which the field belongs.
+ * - field_name: The name of the field.
+ * - field_type: The type of the field.
+ * - label_display: The display settings for the label.
+ *
+ * @see field.html.twig
+ */
+#}
+{%
+ set classes = [
+ 'field',
+ 'field--name-' ~ field_name|clean_class,
+ 'field--type-' ~ field_type|clean_class,
+ 'field--label-' ~ label_display,
+ ]
+%}
+<span{{ attributes.addClass(classes) }}>
+ {%- for item in items -%}
+ {{ item.content }}
+ {%- endfor -%}
+</span>
diff --git a/web/core/themes/bartik/templates/classy/field/field--node--uid.html.twig b/web/core/themes/bartik/templates/classy/field/field--node--uid.html.twig
new file mode 100644
index 0000000000..9afc591b71
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/field/field--node--uid.html.twig
@@ -0,0 +1,34 @@
+{#
+/**
+ * @file
+ * Theme override for the node user field.
+ *
+ * This is an override of field.html.twig for the node user field. See that
+ * template for documentation about its details and overrides.
+ *
+ * Available variables:
+ * - attributes: HTML attributes for the containing span element.
+ * - items: List of all the field items. Each item contains:
+ * - attributes: List of HTML attributes for each item.
+ * - content: The field item content.
+ * - entity_type: The entity type to which the field belongs.
+ * - field_name: The name of the field.
+ * - field_type: The type of the field.
+ * - label_display: The display settings for the label.
+ *
+ * @see field.html.twig
+ */
+#}
+{%
+ set classes = [
+ 'field',
+ 'field--name-' ~ field_name|clean_class,
+ 'field--type-' ~ field_type|clean_class,
+ 'field--label-' ~ label_display,
+ ]
+%}
+<span{{ attributes.addClass(classes) }}>
+ {%- for item in items -%}
+ {{ item.content }}
+ {%- endfor -%}
+</span>
diff --git a/web/core/themes/bartik/templates/classy/field/field--text-long.html.twig b/web/core/themes/bartik/templates/classy/field/field--text-long.html.twig
new file mode 100644
index 0000000000..07ce721d2d
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/field/field--text-long.html.twig
@@ -0,0 +1 @@
+{% extends "field--text.html.twig" %}
diff --git a/web/core/themes/bartik/templates/classy/field/field--text-with-summary.html.twig b/web/core/themes/bartik/templates/classy/field/field--text-with-summary.html.twig
new file mode 100644
index 0000000000..07ce721d2d
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/field/field--text-with-summary.html.twig
@@ -0,0 +1 @@
+{% extends "field--text.html.twig" %}
diff --git a/web/core/themes/bartik/templates/classy/field/field--text.html.twig b/web/core/themes/bartik/templates/classy/field/field--text.html.twig
new file mode 100644
index 0000000000..5d1690c3ec
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/field/field--text.html.twig
@@ -0,0 +1,28 @@
+{% extends "field.html.twig" %}
+{#
+/**
+ * @file
+ * Default theme implementation for a text field.
+ *
+ * A 'clearfix' class is added, because 'text' fields have a 'format' property
+ * that allows a Text Format to be associated with the entered text, which then
+ * applies filtering on output. A common use case is to align images to the left
+ * or right, and without this 'clearfix' class, such aligned images may be
+ * rendered outside of the 'text' field formatter's boundaries, and hence
+ * overlap with other fields. By setting the 'clearfix' class on all 'text'
+ * fields, we prevent that.
+ *
+ * @see https://www.drupal.org/node/2358529
+ *
+ * A 'text-formatted' class is added to assist with default styling of base
+ * elements such as paragraphs and lists that may not have classes assigned to
+ * them. This allows user entered content to have default styling without
+ * interfering with the styles of other UI components such as system generated
+ * lists or other dynamic content.
+ *
+ * @see https://www.drupal.org/node/2539860
+ *
+ * @ingroup themeable
+ */
+#}
+{% set attributes = attributes.addClass('clearfix', 'text-formatted') %}
diff --git a/web/core/themes/bartik/templates/classy/field/field.html.twig b/web/core/themes/bartik/templates/classy/field/field.html.twig
new file mode 100644
index 0000000000..1cfbd651ce
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/field/field.html.twig
@@ -0,0 +1,81 @@
+{#
+/**
+ * @file
+ * Theme override for a field.
+ *
+ * To override output, copy the "field.html.twig" from the templates directory
+ * to your theme's directory and customize it, just like customizing other
+ * Drupal templates such as page.html.twig or node.html.twig.
+ *
+ * Instead of overriding the theming for all fields, you can also just override
+ * theming for a subset of fields using
+ * @link themeable Theme hook suggestions. @endlink For example,
+ * here are some theme hook suggestions that can be used for a field_foo field
+ * on an article node type:
+ * - field--node--field-foo--article.html.twig
+ * - field--node--field-foo.html.twig
+ * - field--node--article.html.twig
+ * - field--field-foo.html.twig
+ * - field--text-with-summary.html.twig
+ * - field.html.twig
+ *
+ * Available variables:
+ * - attributes: HTML attributes for the containing element.
+ * - label_hidden: Whether to show the field label or not.
+ * - title_attributes: HTML attributes for the title.
+ * - label: The label for the field.
+ * - multiple: TRUE if a field can contain multiple items.
+ * - items: List of all the field items. Each item contains:
+ * - attributes: List of HTML attributes for each item.
+ * - content: The field item's content.
+ * - entity_type: The entity type to which the field belongs.
+ * - field_name: The name of the field.
+ * - field_type: The type of the field.
+ * - label_display: The display settings for the label.
+ *
+ *
+ * @see template_preprocess_field()
+ */
+#}
+{%
+ set classes = [
+ 'field',
+ 'field--name-' ~ field_name|clean_class,
+ 'field--type-' ~ field_type|clean_class,
+ 'field--label-' ~ label_display,
+ label_display == 'inline' ? 'clearfix',
+ ]
+%}
+{%
+ set title_classes = [
+ 'field__label',
+ label_display == 'visually_hidden' ? 'visually-hidden',
+ ]
+%}
+
+{% if label_hidden %}
+ {% if multiple %}
+ <div{{ attributes.addClass(classes, 'field__items') }}>
+ {% for item in items %}
+ <div{{ item.attributes.addClass('field__item') }}>{{ item.content }}</div>
+ {% endfor %}
+ </div>
+ {% else %}
+ {% for item in items %}
+ <div{{ attributes.addClass(classes, 'field__item') }}>{{ item.content }}</div>
+ {% endfor %}
+ {% endif %}
+{% else %}
+ <div{{ attributes.addClass(classes) }}>
+ <div{{ title_attributes.addClass(title_classes) }}>{{ label }}</div>
+ {% if multiple %}
+ <div class="field__items">
+ {% endif %}
+ {% for item in items %}
+ <div{{ item.attributes.addClass('field__item') }}>{{ item.content }}</div>
+ {% endfor %}
+ {% if multiple %}
+ </div>
+ {% endif %}
+ </div>
+{% endif %}
diff --git a/web/core/themes/bartik/templates/classy/field/file-audio.html.twig b/web/core/themes/bartik/templates/classy/field/file-audio.html.twig
new file mode 100644
index 0000000000..f25317b90b
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/field/file-audio.html.twig
@@ -0,0 +1,23 @@
+{#
+/**
+* @file
+* Default theme implementation to display the file entity as an audio tag.
+*
+* Available variables:
+* - attributes: An array of HTML attributes, intended to be added to the
+* audio tag.
+* - files: And array of files to be added as sources for the audio tag. Each
+* element is an array with the following elements:
+* - file: The full file object.
+* - source_attributes: An array of HTML attributes for to be added to the
+* source tag.
+*
+* @ingroup themeable
+*/
+#}
+{{ attach_library('bartik/classy.file') }}
+<audio {{ attributes }}>
+ {% for file in files %}
+ <source {{ file.source_attributes }} />
+ {% endfor %}
+</audio>
diff --git a/web/core/themes/bartik/templates/classy/field/file-link.html.twig b/web/core/themes/bartik/templates/classy/field/file-link.html.twig
new file mode 100644
index 0000000000..06f6f054fb
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/field/file-link.html.twig
@@ -0,0 +1,17 @@
+{#
+/**
+ * @file
+ * Theme override for a link to a file.
+ *
+ * Available variables:
+ * - attributes: The HTML attributes for the containing element.
+ * - link: A link to the file.
+ * - icon: The icon image representing the file type.
+ * - file_size: The size of the file.
+ *
+ * @see template_preprocess_file_link()
+ * @see stable_preprocess_image_widget()
+ */
+#}
+{{ attach_library('bartik/classy.file') }}
+<span{{ attributes }}>{{ icon }} {{ link }}</span>
diff --git a/web/core/themes/bartik/templates/classy/field/file-video.html.twig b/web/core/themes/bartik/templates/classy/field/file-video.html.twig
new file mode 100644
index 0000000000..14498696d6
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/field/file-video.html.twig
@@ -0,0 +1,23 @@
+{#
+/**
+* @file
+* Default theme implementation to display the file entity as a video tag.
+*
+* Available variables:
+* - attributes: An array of HTML attributes, intended to be added to the
+* video tag.
+* - files: And array of files to be added as sources for the video tag. Each
+* element is an array with the following elements:
+* - file: The full file object.
+* - source_attributes: An array of HTML attributes for to be added to the
+* source tag.
+*
+* @ingroup themeable
+*/
+#}
+{{ attach_library('bartik/classy.file') }}
+<video {{ attributes }}>
+ {% for file in files %}
+ <source {{ file.source_attributes }} />
+ {% endfor %}
+</video>
diff --git a/web/core/themes/bartik/templates/classy/field/image.html.twig b/web/core/themes/bartik/templates/classy/field/image.html.twig
new file mode 100644
index 0000000000..31f782bb60
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/field/image.html.twig
@@ -0,0 +1,18 @@
+{#
+/**
+ * @file
+ * Theme override of an image.
+ *
+ * Available variables:
+ * - attributes: HTML attributes for the img tag.
+ * - style_name: (optional) The name of the image style applied.
+ *
+ * @see template_preprocess_image()
+ */
+#}
+{%
+set classes = [
+ style_name ? 'image-style-' ~ style_name|clean_class,
+]
+%}
+<img{{ attributes.addClass(classes) }} />
diff --git a/web/core/themes/bartik/templates/classy/field/link-formatter-link-separate.html.twig b/web/core/themes/bartik/templates/classy/field/link-formatter-link-separate.html.twig
new file mode 100644
index 0000000000..cb94264c66
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/field/link-formatter-link-separate.html.twig
@@ -0,0 +1,22 @@
+{#
+/**
+ * @file
+ * Theme override of a link with separate title and URL elements.
+ *
+ * Available variables:
+ * - link: The link that has already been formatted by l().
+ * - title: (optional) A descriptive or alternate title for the link, which may
+ * be different than the actual link text.
+ *
+ * @see template_preprocess()
+ * @see template_preprocess_link_formatter_link_separate()
+ */
+#}
+{% spaceless %}
+ <div class="link-item">
+ {% if title %}
+ <div class="link-title">{{ title }}</div>
+ {% endif %}
+ <div class="link-url">{{ link }}</div>
+ </div>
+{% endspaceless %}
diff --git a/web/core/themes/bartik/templates/classy/field/time.html.twig b/web/core/themes/bartik/templates/classy/field/time.html.twig
new file mode 100644
index 0000000000..f2912b7f98
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/field/time.html.twig
@@ -0,0 +1,22 @@
+{#
+/**
+ * @file
+ * Theme override for a date / time element.
+ *
+ * Available variables
+ * - timestamp: (optional) A UNIX timestamp for the datetime attribute. If the
+ * datetime cannot be represented as a UNIX timestamp, use a valid datetime
+ * attribute value in attributes.datetime.
+ * - text: (optional) The content to display within the <time> element.
+ * Defaults to a human-readable representation of the timestamp value or the
+ * datetime attribute value using DateFormatter::format().
+ * - attributes: (optional) HTML attributes to apply to the <time> element.
+ * A datetime attribute in 'attributes' overrides the 'timestamp'. To
+ * create a valid datetime attribute value from a UNIX timestamp, use
+ * DateFormatter::format() with one of the predefined 'html_*' formats.
+ *
+ * @see template_preprocess_time()
+ * @see http://www.w3.org/TR/html5-author/the-time-element.html#attr-time-datetime
+ */
+#}
+<time{{ attributes.addClass('datetime') }}>{{ text }}</time>
diff --git a/web/core/themes/bartik/templates/classy/form/datetime-form.html.twig b/web/core/themes/bartik/templates/classy/form/datetime-form.html.twig
new file mode 100644
index 0000000000..f56182fdf2
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/form/datetime-form.html.twig
@@ -0,0 +1,15 @@
+{#
+/**
+ * @file
+ * Theme override of a datetime form element.
+ *
+ * Available variables:
+ * - attributes: HTML attributes for the datetime form element.
+ * - content: The datelist form element to be output.
+ *
+ * @see template_preprocess_datetime_form()
+ */
+#}
+<div{{ attributes.addClass('container-inline') }}>
+ {{ content }}
+</div>
diff --git a/web/core/themes/bartik/templates/classy/form/datetime-wrapper.html.twig b/web/core/themes/bartik/templates/classy/form/datetime-wrapper.html.twig
new file mode 100644
index 0000000000..5b52f2daa3
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/form/datetime-wrapper.html.twig
@@ -0,0 +1,36 @@
+{#
+/**
+ * @file
+ * Theme override of a datetime form wrapper.
+ *
+ * Available variables:
+ * - content: The form element to be output, usually a datelist, or datetime.
+ * - title: The title of the form element.
+ * - title_attributes: HTML attributes for the title wrapper.
+ * - description: Description text for the form element.
+ * - required: An indicator for whether the associated form element is required.
+ *
+ * @see template_preprocess_datetime_wrapper()
+ */
+#}
+{%
+ set title_classes = [
+ 'label',
+ required ? 'js-form-required',
+ required ? 'form-required',
+ ]
+%}
+{% if title %}
+ <h4{{ title_attributes.addClass(title_classes) }}>{{ title }}</h4>
+{% endif %}
+{{ content }}
+{% if errors %}
+ <div class="form-item--error-message">
+ <strong>{{ errors }}</strong>
+ </div>
+{% endif %}
+{% if description %}
+ <div{{ description_attributes.addClass('description') }}>
+ {{ description }}
+ </div>
+{% endif %}
diff --git a/web/core/themes/bartik/templates/classy/form/details.html.twig b/web/core/themes/bartik/templates/classy/form/details.html.twig
new file mode 100644
index 0000000000..c554096da9
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/form/details.html.twig
@@ -0,0 +1,44 @@
+{#
+/**
+ * @file
+ * Theme override for a details element.
+ *
+ * Available variables
+ * - attributes: A list of HTML attributes for the details element.
+ * - errors: (optional) Any errors for this details element, may not be set.
+ * - title: (optional) The title of the element, may not be set.
+ * - summary_attributes: A list of HTML attributes for the summary element.
+ * - description: (optional) The description of the element, may not be set.
+ * - children: (optional) The children of the element, may not be set.
+ * - value: (optional) The value of the element, may not be set.
+ *
+ * @see template_preprocess_details()
+ */
+#}
+<details{{ attributes }}>
+ {%- if title -%}
+ {%
+ set summary_classes = [
+ required ? 'js-form-required',
+ required ? 'form-required',
+ ]
+ %}
+ <summary{{ summary_attributes.addClass(summary_classes) }}>{{ title }}</summary>
+ {%- endif -%}
+ <div class="details-wrapper">
+ {% if errors %}
+ <div class="form-item--error-message">
+ <strong>{{ errors }}</strong>
+ </div>
+ {% endif %}
+ {%- if description -%}
+ <div class="details-description">{{ description }}</div>
+ {%- endif -%}
+ {%- if children -%}
+ {{ children }}
+ {%- endif -%}
+ {%- if value -%}
+ {{ value }}
+ {%- endif -%}
+ </div>
+</details>
diff --git a/web/core/themes/bartik/templates/classy/form/fieldset.html.twig b/web/core/themes/bartik/templates/classy/form/fieldset.html.twig
new file mode 100644
index 0000000000..0d089ed381
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/form/fieldset.html.twig
@@ -0,0 +1,60 @@
+{#
+/**
+ * @file
+ * Theme override for a fieldset element and its children.
+ *
+ * Available variables:
+ * - attributes: HTML attributes for the fieldset element.
+ * - errors: (optional) Any errors for this fieldset element, may not be set.
+ * - required: Boolean indicating whether the fieldeset element is required.
+ * - legend: The legend element containing the following properties:
+ * - title: Title of the fieldset, intended for use as the text of the legend.
+ * - attributes: HTML attributes to apply to the legend.
+ * - description: The description element containing the following properties:
+ * - content: The description content of the fieldset.
+ * - attributes: HTML attributes to apply to the description container.
+ * - children: The rendered child elements of the fieldset.
+ * - prefix: The content to add before the fieldset children.
+ * - suffix: The content to add after the fieldset children.
+ *
+ * @see template_preprocess_fieldset()
+ */
+#}
+{%
+ set classes = [
+ 'js-form-item',
+ 'form-item',
+ 'js-form-wrapper',
+ 'form-wrapper',
+ ]
+%}
+<fieldset{{ attributes.addClass(classes) }}>
+ {%
+ set legend_span_classes = [
+ 'fieldset-legend',
+ required ? 'js-form-required',
+ required ? 'form-required',
+ ]
+ %}
+ {# Always wrap fieldset legends in a <span> for CSS positioning. #}
+ <legend{{ legend.attributes }}>
+ <span{{ legend_span.attributes.addClass(legend_span_classes) }}>{{ legend.title }}</span>
+ </legend>
+ <div class="fieldset-wrapper">
+ {% if errors %}
+ <div class="form-item--error-message">
+ <strong>{{ errors }}</strong>
+ </div>
+ {% endif %}
+ {% if prefix %}
+ <span class="field-prefix">{{ prefix }}</span>
+ {% endif %}
+ {{ children }}
+ {% if suffix %}
+ <span class="field-suffix">{{ suffix }}</span>
+ {% endif %}
+ {% if description.content %}
+ <div{{ description.attributes.addClass('description') }}>{{ description.content }}</div>
+ {% endif %}
+ </div>
+</fieldset>
diff --git a/web/core/themes/bartik/templates/classy/form/form-element-label.html.twig b/web/core/themes/bartik/templates/classy/form/form-element-label.html.twig
new file mode 100644
index 0000000000..7c2f8f2223
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/form/form-element-label.html.twig
@@ -0,0 +1,25 @@
+{#
+/**
+ * @file
+ * Theme override for a form element label.
+ *
+ * Available variables:
+ * - title: The label's text.
+ * - title_display: Elements title_display setting.
+ * - required: An indicator for whether the associated form element is required.
+ * - attributes: A list of HTML attributes for the label.
+ *
+ * @see template_preprocess_form_element_label()
+ */
+#}
+{%
+ set classes = [
+ title_display == 'after' ? 'option',
+ title_display == 'invisible' ? 'visually-hidden',
+ required ? 'js-form-required',
+ required ? 'form-required',
+ ]
+%}
+{% if title is not empty or required -%}
+ <label{{ attributes.addClass(classes) }}>{{ title }}</label>
+{%- endif %}
diff --git a/web/core/themes/bartik/templates/classy/form/form-element.html.twig b/web/core/themes/bartik/templates/classy/form/form-element.html.twig
new file mode 100644
index 0000000000..3bde4f7115
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/form/form-element.html.twig
@@ -0,0 +1,95 @@
+{#
+/**
+ * @file
+ * Theme override for a form element.
+ *
+ * Available variables:
+ * - attributes: HTML attributes for the containing element.
+ * - errors: (optional) Any errors for this form element, may not be set.
+ * - prefix: (optional) The form element prefix, may not be set.
+ * - suffix: (optional) The form element suffix, may not be set.
+ * - required: The required marker, or empty if the associated form element is
+ * not required.
+ * - type: The type of the element.
+ * - name: The name of the element.
+ * - label: A rendered label element.
+ * - label_display: Label display setting. It can have these values:
+ * - before: The label is output before the element. This is the default.
+ * The label includes the #title and the required marker, if #required.
+ * - after: The label is output after the element. For example, this is used
+ * for radio and checkbox #type elements. If the #title is empty but the
+ * field is #required, the label will contain only the required marker.
+ * - invisible: Labels are critical for screen readers to enable them to
+ * properly navigate through forms but can be visually distracting. This
+ * property hides the label for everyone except screen readers.
+ * - attribute: Set the title attribute on the element to create a tooltip but
+ * output no label element. This is supported only for checkboxes and radios
+ * in \Drupal\Core\Render\Element\CompositeFormElementTrait::preRenderCompositeFormElement().
+ * It is used where a visual label is not needed, such as a table of
+ * checkboxes where the row and column provide the context. The tooltip will
+ * include the title and required marker.
+ * - description: (optional) A list of description properties containing:
+ * - content: A description of the form element, may not be set.
+ * - attributes: (optional) A list of HTML attributes to apply to the
+ * description content wrapper. Will only be set when description is set.
+ * - description_display: Description display setting. It can have these values:
+ * - before: The description is output before the element.
+ * - after: The description is output after the element. This is the default
+ * value.
+ * - invisible: The description is output after the element, hidden visually
+ * but available to screen readers.
+ * - disabled: True if the element is disabled.
+ * - title_display: Title display setting.
+ *
+ * @see template_preprocess_form_element()
+ */
+#}
+{%
+ set classes = [
+ 'js-form-item',
+ 'form-item',
+ 'js-form-type-' ~ type|clean_class,
+ 'form-type-' ~ type|clean_class,
+ 'js-form-item-' ~ name|clean_class,
+ 'form-item-' ~ name|clean_class,
+ title_display not in ['after', 'before'] ? 'form-no-label',
+ disabled == 'disabled' ? 'form-disabled',
+ errors ? 'form-item--error',
+ ]
+%}
+{%
+ set description_classes = [
+ 'description',
+ description_display == 'invisible' ? 'visually-hidden',
+ ]
+%}
+<div{{ attributes.addClass(classes) }}>
+ {% if label_display in ['before', 'invisible'] %}
+ {{ label }}
+ {% endif %}
+ {% if prefix is not empty %}
+ <span class="field-prefix">{{ prefix }}</span>
+ {% endif %}
+ {% if description_display == 'before' and description.content %}
+ <div{{ description.attributes }}>
+ {{ description.content }}
+ </div>
+ {% endif %}
+ {{ children }}
+ {% if suffix is not empty %}
+ <span class="field-suffix">{{ suffix }}</span>
+ {% endif %}
+ {% if label_display == 'after' %}
+ {{ label }}
+ {% endif %}
+ {% if errors %}
+ <div class="form-item--error-message">
+ <strong>{{ errors }}</strong>
+ </div>
+ {% endif %}
+ {% if description_display in ['after', 'invisible'] and description.content %}
+ <div{{ description.attributes.addClass(description_classes) }}>
+ {{ description.content }}
+ </div>
+ {% endif %}
+</div>
diff --git a/web/core/themes/bartik/templates/classy/form/radios.html.twig b/web/core/themes/bartik/templates/classy/form/radios.html.twig
new file mode 100644
index 0000000000..2e4bafd41c
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/form/radios.html.twig
@@ -0,0 +1,13 @@
+{#
+/**
+ * @file
+ * Theme override for a 'radios' #type form element.
+ *
+ * Available variables
+ * - attributes: A list of HTML attributes for the wrapper element.
+ * - children: The rendered radios.
+ *
+ * @see template_preprocess_radios()
+ */
+#}
+<div{{ attributes.addClass('form-radios') }}>{{ children }}</div>
diff --git a/web/core/themes/bartik/templates/classy/form/textarea.html.twig b/web/core/themes/bartik/templates/classy/form/textarea.html.twig
new file mode 100644
index 0000000000..99e1bde090
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/form/textarea.html.twig
@@ -0,0 +1,25 @@
+{#
+/**
+ * @file
+ * Theme override for a 'textarea' #type form element.
+ *
+ * Available variables
+ * - wrapper_attributes: A list of HTML attributes for the wrapper element.
+ * - attributes: A list of HTML attributes for the <textarea> element.
+ * - resizable: An indicator for whether the textarea is resizable.
+ * - required: An indicator for whether the textarea is required.
+ * - value: The textarea content.
+ *
+ * @see template_preprocess_textarea()
+ */
+#}
+{%
+ set classes = [
+ 'form-textarea',
+ resizable ? 'resize-' ~ resizable,
+ required ? 'required',
+ ]
+%}
+<div{{ wrapper_attributes.addClass('form-textarea-wrapper') }}>
+ <textarea{{ attributes.addClass(classes) }}>{{ value }}</textarea>
+</div>
diff --git a/web/core/themes/bartik/templates/classy/layout/book-export-html.html.twig b/web/core/themes/bartik/templates/classy/layout/book-export-html.html.twig
new file mode 100644
index 0000000000..ea33648d38
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/layout/book-export-html.html.twig
@@ -0,0 +1,45 @@
+{#
+/**
+ * @file
+ * Theme override for printed version of book outline.
+ *
+ * Available variables:
+ * - title: Top level node title.
+ * - head: Header tags.
+ * - language: Language object.
+ * - language_rtl: A flag indicating whether the current display language is a
+ * right to left language.
+ * - base_url: URL to the home page.
+ * - contents: Nodes within the current outline rendered through
+ * book-node-export-html.html.twig.
+ *
+ * @see template_preprocess_book_export_html()
+ */
+#}
+<!DOCTYPE html>
+<html{{ html_attributes }}>
+ <head>
+ <title>{{ title }}</title>
+ {{ page.head }}
+ <base href="{{ base_url }}" />
+ <link type="text/css" rel="stylesheet" href="misc/print.css" />
+ </head>
+ <body>
+ {#
+ The given node is embedded to its absolute depth in a top level section.
+ For example, a child node with depth 2 in the hierarchy is contained in
+ (otherwise empty) div elements corresponding to depth 0 and depth 1. This
+ is intended to support WYSIWYG output - e.g., level 3 sections always look
+ like level 3 sections, no matter their depth relative to the node selected
+ to be exported as printer-friendly HTML.
+ #}
+
+ {% for i in 1..depth-1 if depth > 1 %}
+ <div class="section-{{ i }}">
+ {% endfor %}
+ {{ contents }}
+ {% for i in 1..depth-1 if depth > 1 %}
+ </div>
+ {% endfor %}
+ </body>
+</html>
diff --git a/web/core/themes/bartik/templates/classy/layout/html.html.twig b/web/core/themes/bartik/templates/classy/layout/html.html.twig
new file mode 100644
index 0000000000..4fe57a01cf
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/layout/html.html.twig
@@ -0,0 +1,55 @@
+{#
+/**
+ * @file
+ * Theme override for the basic structure of a single Drupal page.
+ *
+ * Variables:
+ * - logged_in: A flag indicating if user is logged in.
+ * - root_path: The root path of the current page (e.g., node, admin, user).
+ * - node_type: The content type for the current node, if the page is a node.
+ * - head_title: List of text elements that make up the head_title variable.
+ * May contain one or more of the following:
+ * - title: The title of the page.
+ * - name: The name of the site.
+ * - slogan: The slogan of the site.
+ * - page_top: Initial rendered markup. This should be printed before 'page'.
+ * - page: The rendered page markup.
+ * - page_bottom: Closing rendered markup. This variable should be printed after
+ * 'page'.
+ * - db_offline: A flag indicating if the database is offline.
+ * - placeholder_token: The token for generating head, css, js and js-bottom
+ * placeholders.
+ *
+ * @see template_preprocess_html()
+ */
+#}
+{%
+ set body_classes = [
+ logged_in ? 'user-logged-in',
+ not root_path ? 'path-frontpage' : 'path-' ~ root_path|clean_class,
+ node_type ? 'page-node-type-' ~ node_type|clean_class,
+ db_offline ? 'db-offline',
+ ]
+%}
+<!DOCTYPE html>
+<html{{ html_attributes }}>
+ <head>
+ <head-placeholder token="{{ placeholder_token }}">
+ <title>{{ head_title|safe_join(' | ') }}</title>
+ <css-placeholder token="{{ placeholder_token }}">
+ <js-placeholder token="{{ placeholder_token }}">
+ </head>
+ <body{{ attributes.addClass(body_classes) }}>
+ {#
+ Keyboard navigation/accessibility link to main content section in
+ page.html.twig.
+ #}
+ <a href="#main-content" class="visually-hidden focusable skip-link">
+ {{ 'Skip to main content'|t }}
+ </a>
+ {{ page_top }}
+ {{ page }}
+ {{ page_bottom }}
+ <js-bottom-placeholder token="{{ placeholder_token }}">
+ </body>
+</html>
diff --git a/web/core/themes/bartik/templates/classy/layout/region.html.twig b/web/core/themes/bartik/templates/classy/layout/region.html.twig
new file mode 100644
index 0000000000..95e71cec37
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/layout/region.html.twig
@@ -0,0 +1,25 @@
+{#
+/**
+ * @file
+ * Theme override to display a region.
+ *
+ * Available variables:
+ * - content: The content for this region, typically blocks.
+ * - attributes: HTML attributes for the region <div>.
+ * - region: The name of the region variable as defined in the theme's
+ * .info.yml file.
+ *
+ * @see template_preprocess_region()
+ */
+#}
+{%
+ set classes = [
+ 'region',
+ 'region-' ~ region|clean_class,
+ ]
+%}
+{% if content %}
+ <div{{ attributes.addClass(classes) }}>
+ {{ content }}
+ </div>
+{% endif %}
diff --git a/web/core/themes/bartik/templates/classy/media-library/container--media-library-content.html.twig b/web/core/themes/bartik/templates/classy/media-library/container--media-library-content.html.twig
new file mode 100644
index 0000000000..7c930e2c7b
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/media-library/container--media-library-content.html.twig
@@ -0,0 +1,28 @@
+{#
+/**
+ * @file
+ * Theme implementation the content area of the modal media library dialog.
+ *
+ * The content area is everything that is not the menu of available media
+ * types. This includes the form to add new media items, if available, and
+ * the view of available media to select.
+ *
+ * Available variables:
+ * - attributes: HTML attributes for the containing element.
+ * - children: The rendered child elements of the container.
+ * - has_parent: A flag to indicate that the container has one or more parent
+ containers.
+ *
+ * @see template_preprocess_container()
+ *
+ * @ingroup themeable
+ */
+#}
+{%
+ set classes = [
+ has_parent ? 'js-form-wrapper',
+ has_parent ? 'form-wrapper',
+ 'media-library-content',
+ ]
+%}
+<div{{ attributes.addClass(classes) }}>{{ children }}</div>
diff --git a/web/core/themes/bartik/templates/classy/media-library/container--media-library-widget-selection.html.twig b/web/core/themes/bartik/templates/classy/media-library/container--media-library-widget-selection.html.twig
new file mode 100644
index 0000000000..7c0af44307
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/media-library/container--media-library-widget-selection.html.twig
@@ -0,0 +1,28 @@
+{#
+/**
+ * @file
+ * Theme implementation of a wrapper for selected media items.
+ *
+ * This is used to wrap around the set of media items that are currently
+ * selected in the media library widget (not the modal dialog), which may
+ * be used for entity reference fields that target media.
+ *
+ * Available variables:
+ * - attributes: HTML attributes for the containing element.
+ * - children: The rendered child elements of the container.
+ * - has_parent: A flag to indicate that the container has one or more parent
+ containers.
+ *
+ * @see template_preprocess_container()
+ *
+ * @ingroup themeable
+ */
+#}
+{%
+ set classes = [
+ has_parent ? 'js-form-wrapper',
+ has_parent ? 'form-wrapper',
+ 'media-library-selection',
+ ]
+%}
+<div{{ attributes.addClass(classes) }}>{{ children }}</div>
diff --git a/web/core/themes/bartik/templates/classy/media-library/links--media-library-menu.html.twig b/web/core/themes/bartik/templates/classy/media-library/links--media-library-menu.html.twig
new file mode 100644
index 0000000000..b2361574a8
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/media-library/links--media-library-menu.html.twig
@@ -0,0 +1,36 @@
+{% extends "links.html.twig" %}
+{#
+/**
+ * @file
+ * Theme implementation of the media type menu in the media library dialog.
+ *
+ * Available variables:
+ * - attributes: Attributes for the UL containing the list of links.
+ * - links: Links to be output.
+ * Each link will have the following elements:
+ * - link: (optional) A render array that returns a link. See
+ * template_preprocess_links() for details how it is generated.
+ * - text: The link text.
+ * - attributes: HTML attributes for the list item element.
+ * - text_attributes: (optional) HTML attributes for the span element if no
+ * 'url' was supplied.
+ * - heading: (optional) A heading to precede the links.
+ * - text: The heading text.
+ * - level: The heading level (e.g. 'h2', 'h3').
+ * - attributes: (optional) A keyed list of attributes for the heading.
+ * If the heading is a string, it will be used as the text of the heading and
+ * the level will default to 'h2'.
+ *
+ * Headings should be used on navigation menus and any list of links that
+ * consistently appears on multiple pages. To make the heading invisible use
+ * the 'visually-hidden' CSS class. Do not use 'display:none', which
+ * removes it from screen readers and assistive technology. Headings allow
+ * screen reader and keyboard only users to navigate to or skip the links.
+ * See http://juicystudio.com/article/screen-readers-display-none.php and
+ * http://www.w3.org/TR/WCAG-TECHS/H42.html for more information.
+ *
+ * @see classy_preprocess_links__media_library_menu()
+ * @see template_preprocess_links()
+ */
+#}
+{% set attributes = attributes.addClass('media-library-menu') %}
diff --git a/web/core/themes/bartik/templates/classy/media-library/media--media-library.html.twig b/web/core/themes/bartik/templates/classy/media-library/media--media-library.html.twig
new file mode 100644
index 0000000000..e88635424f
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/media-library/media--media-library.html.twig
@@ -0,0 +1,55 @@
+{#
+/**
+ * @file
+ * Theme override of a media item in the media library.
+ *
+ * This is used for media that the user can select from the grid of media
+ * items. It is not used for items that have already been selected in the
+ * corresponding field widget, or for items that have been previously selected
+ * before adding new media to the library.
+ *
+ * Available variables:
+ * - media: The entity with limited access to object properties and methods.
+ * Only method names starting with "get", "has", or "is" and a few common
+ * methods such as "id", "label", and "bundle" are available. For example:
+ * - entity.getEntityTypeId() will return the entity type ID.
+ * - entity.hasField('field_example') returns TRUE if the entity includes
+ * field_example. (This does not indicate the presence of a value in this
+ * field.)
+ * Calling other methods, such as entity.delete(), will result in an exception.
+ * See \Drupal\Core\Entity\EntityInterface for a full list of methods.
+ * - name: Name of the media.
+ * - content: Media content.
+ * - title_prefix: Additional output populated by modules, intended to be
+ * displayed in front of the main title tag that appears in the template.
+ * - title_suffix: Additional output populated by modules, intended to be
+ * displayed after the main title tag that appears in the template.
+ * - view_mode: View mode; for example, "teaser" or "full".
+ * - attributes: HTML attributes for the containing element.
+ * - title_attributes: Same as attributes, except applied to the main title
+ * tag that appears in the template.
+ * - url: Direct URL of the media.
+ * - preview_attributes: HTML attributes for the preview wrapper.
+ * - metadata_attributes: HTML attributes for the expandable metadata area.
+ * - status: Whether or not the Media is published.
+ *
+ * @see template_preprocess_media()
+ *
+ * @ingroup themeable
+ */
+#}
+<article{{ attributes }}>
+ {% if content %}
+ <div{{ preview_attributes.addClass('media-library-item__preview js-media-library-item-preview') }}>
+ {{ content|without('name') }}
+ </div>
+ {% if not status %}
+ <div class="media-library-item__status">{{ "unpublished" | t }}</div>
+ {% endif %}
+ <div{{ metadata_attributes.addClass('media-library-item__attributes') }}>
+ <div class="media-library-item__name">
+ {{ name }}
+ </div>
+ </div>
+ {% endif %}
+</article>
diff --git a/web/core/themes/bartik/templates/classy/media-library/media-library-item--small.html.twig b/web/core/themes/bartik/templates/classy/media-library/media-library-item--small.html.twig
new file mode 100644
index 0000000000..ba03858b7f
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/media-library/media-library-item--small.html.twig
@@ -0,0 +1,31 @@
+{#
+/**
+ * @file
+ * Default theme implementation of a media library item.
+ *
+ * This is used when displaying selected media items, either in the field
+ * widget or in the "Additional selected media" area when adding new
+ * media items in the media library modal dialog.
+ *
+ * Available variables:
+ * - attributes: HTML attributes for the containing element.
+ * - content: The content of the media library item, plus any additional
+ * fields or elements surrounding it.
+ *
+ * @see seven_preprocess_media_library_item__small()
+ * @see seven_preprocess_media_library_item__widget()
+ * @see template_preprocess_media_library_item()
+ *
+ * @ingroup themeable
+ */
+#}
+{%
+ set classes = [
+ 'media-library-item',
+ 'media-library-item--grid',
+ 'media-library-item--small',
+ ]
+%}
+<div{{ attributes.addClass(classes) }}>
+ {{ content }}
+</div>
diff --git a/web/core/themes/bartik/templates/classy/media-library/media-library-item.html.twig b/web/core/themes/bartik/templates/classy/media-library/media-library-item.html.twig
new file mode 100644
index 0000000000..297780e0f7
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/media-library/media-library-item.html.twig
@@ -0,0 +1,28 @@
+{#
+/**
+ * @file
+ * Default theme implementation of a media library item.
+ *
+ * This is used when displaying selected media items, either in the field
+ * widget or in the "Additional selected media" area when adding new
+ * media items in the media library modal dialog.
+ *
+ * Available variables:
+ * - attributes: HTML attributes for the containing element.
+ * - content: The content of the media library item, plus any additional
+ * fields or elements surrounding it.
+ *
+ * @see template_preprocess_media_library_item()
+ *
+ * @ingroup themeable
+ */
+#}
+{%
+ set classes = [
+ 'media-library-item',
+ 'media-library-item--grid',
+ ]
+%}
+<div{{ attributes.addClass(classes) }}>
+ {{ content }}
+</div>
diff --git a/web/core/themes/bartik/templates/classy/media-library/media-library-wrapper.html.twig b/web/core/themes/bartik/templates/classy/media-library/media-library-wrapper.html.twig
new file mode 100644
index 0000000000..850f63aa17
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/media-library/media-library-wrapper.html.twig
@@ -0,0 +1,21 @@
+{#
+/**
+ * @file
+ * Theme override of a container used to wrap the media library's modal dialog
+ * interface.
+ *
+ * Available variables:
+ * - attributes: HTML attributes for the containing element.
+ * - menu: The menu of availble media types to choose from.
+ * - content: The form to add new media items, followed by the grid or table of
+ * existing media items to choose from.
+ *
+ * @see template_preprocess_media_library_wrapper()
+ *
+ * @ingroup themeable
+ */
+#}
+<div{{ attributes.addClass('media-library-wrapper') }}>
+ {{ menu }}
+ {{ content }}
+</div>
diff --git a/web/core/themes/bartik/templates/classy/media-library/views-view-unformatted--media-library.html.twig b/web/core/themes/bartik/templates/classy/media-library/views-view-unformatted--media-library.html.twig
new file mode 100644
index 0000000000..a94d4e2b63
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/media-library/views-view-unformatted--media-library.html.twig
@@ -0,0 +1,35 @@
+{#
+/**
+ * @file
+ * Theme override of the media library view.
+ *
+ * This is used to display a grid of media items, in both the administrative
+ * interface and in the modal media library dialog's grid layout.
+ *
+ * Available variables:
+ * - title: The title of this group of rows. May be empty.
+ * - rows: A list of the view's row items.
+ * - attributes: The row's HTML attributes.
+ * - content: The row's content.
+ * - view: The view object.
+ * - default_row_class: A flag indicating whether default classes should be
+ * used on rows.
+ *
+ * @see template_preprocess_views_view_unformatted()
+ */
+#}
+{% if title %}
+ <h3>{{ title }}</h3>
+{% endif %}
+{% for row in rows %}
+ {%
+ set row_classes = [
+ default_row_class ? 'views-row',
+ 'media-library-item',
+ 'media-library-item--grid',
+ ]
+ %}
+ <div{{ row.attributes.addClass(row_classes) }}>
+ {{- row.content -}}
+ </div>
+{% endfor %}
diff --git a/web/core/themes/bartik/templates/classy/misc/help-section.html.twig b/web/core/themes/bartik/templates/classy/misc/help-section.html.twig
new file mode 100644
index 0000000000..6cfaa38da2
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/misc/help-section.html.twig
@@ -0,0 +1,48 @@
+{#
+/**
+ * @file
+ * Theme override for a section of the help page.
+ *
+ * This implementation divides the links into 4 columns.
+ *
+ * Available variables:
+ * - title: The section title.
+ * - description: The description text for the section.
+ * - links: Links to display in the section.
+ * - empty: Text to display if there are no links.
+ */
+#}
+<div class="clearfix">
+ <h2>{{ title }}</h2>
+ <p>{{ description }}</p>
+ {% if links %}
+ {# Calculate the column length, to divide links into 4 columns. #}
+ {% set size = links|length // 4 %}
+ {% if size * 4 < links|length %}
+ {% set size = size + 1 %}
+ {% endif %}
+
+ {# Output the links in 4 columns. #}
+ {% set count = 0 %}
+ {% for link in links %}
+ {% if count == 0 %}
+ {# Start a new column. #}
+ <div class="layout-column layout-column--quarter"><ul>
+ {% endif %}
+ <li>{{ link }}</li>
+ {% set count = count + 1 %}
+ {% if count >= size %}
+ {# End the current column. #}
+ {% set count = 0 %}
+ </ul></div>
+ {% endif %}
+ {% endfor %}
+
+ {# End the last column, if one is open. #}
+ {% if count > 0 %}
+ </ul></div>
+ {% endif %}
+ {% else %}
+ <p>{{ empty }}</p>
+ {% endif %}
+</div>
diff --git a/web/core/themes/bartik/templates/classy/misc/progress-bar.html.twig b/web/core/themes/bartik/templates/classy/misc/progress-bar.html.twig
new file mode 100644
index 0000000000..b632a79539
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/misc/progress-bar.html.twig
@@ -0,0 +1,22 @@
+{#
+/**
+ * @file
+ * Theme override for a progress bar.
+ *
+ * Note that the core Batch API uses this only for non-JavaScript batch jobs.
+ *
+ * Available variables:
+ * - label: The label of the working task.
+ * - percent: The percentage of the progress.
+ * - message: A string containing information to be displayed.
+ */
+#}
+{{ attach_library('bartik/classy.progress') }}
+<div class="progress" data-drupal-progress>
+ {% if label %}
+ <div class="progress__label">{{ label }}</div>
+ {% endif %}
+ <div class="progress__track"><div class="progress__bar" style="width: {{ percent }}%"></div></div>
+ <div class="progress__percentage">{{ percent }}%</div>
+ <div class="progress__description">{{ message }}</div>
+</div>
diff --git a/web/core/themes/bartik/templates/classy/misc/rdf-metadata.html.twig b/web/core/themes/bartik/templates/classy/misc/rdf-metadata.html.twig
new file mode 100644
index 0000000000..acc62df16d
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/misc/rdf-metadata.html.twig
@@ -0,0 +1,20 @@
+{#
+/**
+ * @file
+ * Theme override for empty spans with RDF attributes.
+ *
+ * The XHTML+RDFa doctype allows either <span></span> or <span /> syntax to
+ * be used, but for maximum browser compatibility, W3C recommends the
+ * former when serving pages using the text/html media type, see
+ * http://www.w3.org/TR/xhtml1/#C_3.
+ *
+ * Available variables:
+ * - metadata: Each item within corresponds to its own set of attributes,
+ * and therefore, needs its own 'attributes' element.
+ *
+ * @see template_preprocess_rdf_metadata()
+ */
+#}
+{% for attributes in metadata %}
+ <span{{ attributes.addClass('rdf-meta', 'hidden') }}></span>
+{% endfor %}
diff --git a/web/core/themes/bartik/templates/classy/navigation/book-all-books-block.html.twig b/web/core/themes/bartik/templates/classy/navigation/book-all-books-block.html.twig
new file mode 100644
index 0000000000..b4cb64de3d
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/navigation/book-all-books-block.html.twig
@@ -0,0 +1,22 @@
+{#
+/**
+ * @file
+ * Theme override for rendering book outlines within a block.
+ *
+ * This template is used only when the block is configured to "show block on all
+ * pages", which presents multiple independent books on all pages.
+ *
+ * Available variables:
+ * - book_menus: Book outlines.
+ * - id: The parent book ID.
+ * - title: The parent book title.
+ * - menu: The top-level book links.
+ *
+ * @see template_preprocess_book_all_books_block()
+ */
+#}
+{% for book in book_menus %}
+ <nav id="book-block-menu-{{ book.id }}" class="book-block-menu" role="navigation" aria-label="{% trans %}Book outline for {{ book.title }}{% endtrans %}">
+ {{ book.menu }}
+ </nav>
+{% endfor %}
diff --git a/web/core/themes/bartik/templates/classy/navigation/book-navigation.html.twig b/web/core/themes/bartik/templates/classy/navigation/book-navigation.html.twig
new file mode 100644
index 0000000000..854e819498
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/navigation/book-navigation.html.twig
@@ -0,0 +1,56 @@
+{#
+/**
+ * @file
+ * Theme override to navigate books.
+ *
+ * Presented under nodes that are a part of book outlines.
+ *
+ * Available variables:
+ * - tree: The immediate children of the current node rendered as an unordered
+ * list.
+ * - current_depth: Depth of the current node within the book outline. Provided
+ * for context.
+ * - prev_url: URL to the previous node.
+ * - prev_title: Title of the previous node.
+ * - parent_url: URL to the parent node.
+ * - parent_title: Title of the parent node. Not printed by default. Provided
+ * as an option.
+ * - next_url: URL to the next node.
+ * - next_title: Title of the next node.
+ * - has_links: Flags TRUE whenever the previous, parent or next data has a
+ * value.
+ * - book_id: The book ID of the current outline being viewed. Same as the node
+ * ID containing the entire outline. Provided for context.
+ * - book_url: The book/node URL of the current outline being viewed. Provided
+ * as an option. Not used by default.
+ * - book_title: The book/node title of the current outline being viewed.
+ *
+ * @see template_preprocess_book_navigation()
+ */
+#}
+{{ attach_library('bartik/classy.book-navigation') }}
+{% if tree or has_links %}
+ <nav id="book-navigation-{{ book_id }}" class="book-navigation" role="navigation" aria-labelledby="book-label-{{ book_id }}">
+ {{ tree }}
+ {% if has_links %}
+ <h2 class="visually-hidden" id="book-label-{{ book_id }}">{{ 'Book traversal links for'|t }} {{ book_title }}</h2>
+ <ul class="book-pager">
+ {% if prev_url %}
+ <li class="book-pager__item book-pager__item--previous">
+ <a href="{{ prev_url }}" rel="prev" title="{{ 'Go to previous page'|t }}"><b>{{ '‹'|t }}</b> {{ prev_title }}</a>
+ </li>
+ {% endif %}
+ {% if parent_url %}
+ <li class="book-pager__item book-pager__item--center">
+ <a href="{{ parent_url }}" title="{{ 'Go to parent page'|t }}">{{ 'Up'|t }}</a>
+ </li>
+ {% endif %}
+ {% if next_url %}
+ <li class="book-pager__item book-pager__item--next">
+ <a href="{{ next_url }}" rel="next" title="{{ 'Go to next page'|t }}">{{ next_title }} <b>{{ '›'|t }}</b></a>
+ </li>
+ {% endif %}
+ </ul>
+ {% endif %}
+ </nav>
+{% endif %}
diff --git a/web/core/themes/bartik/templates/classy/navigation/book-tree.html.twig b/web/core/themes/bartik/templates/classy/navigation/book-tree.html.twig
new file mode 100644
index 0000000000..94fac5598b
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/navigation/book-tree.html.twig
@@ -0,0 +1,55 @@
+{#
+/**
+ * @file
+ * Theme override to display a book tree.
+ *
+ * Returns HTML for a wrapper for a book sub-tree.
+ *
+ * Available variables:
+ * - items: A nested list of book items. Each book item contains:
+ * - attributes: HTML attributes for the book item.
+ * - below: The book item child items.
+ * - title: The book link title.
+ * - url: The book link URL, instance of \Drupal\Core\Url.
+ * - is_expanded: TRUE if the link has visible children within the current
+ * book tree.
+ * - is_collapsed: TRUE if the link has children within the current book tree
+ * that are not currently visible.
+ * - in_active_trail: TRUE if the link is in the active trail.
+ */
+#}
+{% import _self as book_tree %}
+
+{#
+ We call a macro which calls itself to render the full tree.
+ @see https://twig.symfony.com/doc/1.x/tags/macro.html
+#}
+{{ book_tree.book_links(items, attributes, 0) }}
+
+{% macro book_links(items, attributes, menu_level) %}
+ {% import _self as book_tree %}
+ {% if items %}
+ {% if menu_level == 0 %}
+ <ul{{ attributes.addClass('menu') }}>
+ {% else %}
+ <ul class="menu">
+ {% endif %}
+ {% for item in items %}
+ {%
+ set classes = [
+ 'menu-item',
+ item.is_expanded ? 'menu-item--expanded',
+ item.is_collapsed ? 'menu-item--collapsed',
+ item.in_active_trail ? 'menu-item--active-trail',
+ ]
+ %}
+ <li{{ item.attributes.addClass(classes) }}>
+ {{ link(item.title, item.url) }}
+ {% if item.below %}
+ {{ book_tree.book_links(item.below, attributes, menu_level + 1) }}
+ {% endif %}
+ </li>
+ {% endfor %}
+ </ul>
+ {% endif %}
+{% endmacro %}
diff --git a/web/core/themes/bartik/templates/classy/navigation/breadcrumb.html.twig b/web/core/themes/bartik/templates/classy/navigation/breadcrumb.html.twig
new file mode 100644
index 0000000000..7dc08c5207
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/navigation/breadcrumb.html.twig
@@ -0,0 +1,25 @@
+{#
+/**
+ * @file
+ * Theme override for a breadcrumb trail.
+ *
+ * Available variables:
+ * - breadcrumb: Breadcrumb trail items.
+ */
+#}
+{% if breadcrumb %}
+ <nav class="breadcrumb" role="navigation" aria-labelledby="system-breadcrumb">
+ <h2 id="system-breadcrumb" class="visually-hidden">{{ 'Breadcrumb'|t }}</h2>
+ <ol>
+ {% for item in breadcrumb %}
+ <li>
+ {% if item.url %}
+ <a href="{{ item.url }}">{{ item.text }}</a>
+ {% else %}
+ {{ item.text }}
+ {% endif %}
+ </li>
+ {% endfor %}
+ </ol>
+ </nav>
+{% endif %}
diff --git a/web/core/themes/bartik/templates/classy/navigation/menu-local-task.html.twig b/web/core/themes/bartik/templates/classy/navigation/menu-local-task.html.twig
new file mode 100644
index 0000000000..b8559815b9
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/navigation/menu-local-task.html.twig
@@ -0,0 +1,17 @@
+{#
+/**
+ * @file
+ * Theme override for a local task link.
+ *
+ * Available variables:
+ * - attributes: HTML attributes for the wrapper element.
+ * - is_active: Whether the task item is an active tab.
+ * - link: A rendered link element.
+ *
+ * Note: This template renders the content for each task item in
+ * menu-local-tasks.html.twig.
+ *
+ * @see template_preprocess_menu_local_task()
+ */
+#}
+<li{{ attributes.addClass(is_active ? 'is-active') }}>{{ link }}</li>
diff --git a/web/core/themes/bartik/templates/classy/navigation/menu-local-tasks.html.twig b/web/core/themes/bartik/templates/classy/navigation/menu-local-tasks.html.twig
new file mode 100644
index 0000000000..77ebc63cbe
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/navigation/menu-local-tasks.html.twig
@@ -0,0 +1,21 @@
+{#
+/**
+ * @file
+ * Theme override to display primary and secondary local tasks.
+ *
+ * Available variables:
+ * - primary: HTML list items representing primary tasks.
+ * - secondary: HTML list items representing primary tasks.
+ *
+ * Each item in these variables (primary and secondary) can be individually
+ * themed in menu-local-task.html.twig.
+ */
+#}
+{% if primary %}
+ <h2 class="visually-hidden">{{ 'Primary tabs'|t }}</h2>
+ <ul class="tabs primary">{{ primary }}</ul>
+{% endif %}
+{% if secondary %}
+ <h2 class="visually-hidden">{{ 'Secondary tabs'|t }}</h2>
+ <ul class="tabs secondary">{{ secondary }}</ul>
+{% endif %}
diff --git a/web/core/themes/bartik/templates/classy/navigation/menu.html.twig b/web/core/themes/bartik/templates/classy/navigation/menu.html.twig
new file mode 100644
index 0000000000..b437f8760e
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/navigation/menu.html.twig
@@ -0,0 +1,55 @@
+{#
+/**
+ * @file
+ * Theme override to display a menu.
+ *
+ * Available variables:
+ * - menu_name: The machine name of the menu.
+ * - items: A nested list of menu items. Each menu item contains:
+ * - attributes: HTML attributes for the menu item.
+ * - below: The menu item child items.
+ * - title: The menu link title.
+ * - url: The menu link url, instance of \Drupal\Core\Url
+ * - localized_options: Menu link localized options.
+ * - is_expanded: TRUE if the link has visible children within the current
+ * menu tree.
+ * - is_collapsed: TRUE if the link has children within the current menu tree
+ * that are not currently visible.
+ * - in_active_trail: TRUE if the link is in the active trail.
+ */
+#}
+{% import _self as menus %}
+
+{#
+ We call a macro which calls itself to render the full tree.
+ @see https://twig.symfony.com/doc/1.x/tags/macro.html
+#}
+{{ menus.menu_links(items, attributes, 0) }}
+
+{% macro menu_links(items, attributes, menu_level) %}
+ {% import _self as menus %}
+ {% if items %}
+ {% if menu_level == 0 %}
+ <ul{{ attributes.addClass('menu') }}>
+ {% else %}
+ <ul class="menu">
+ {% endif %}
+ {% for item in items %}
+ {%
+ set classes = [
+ 'menu-item',
+ item.is_expanded ? 'menu-item--expanded',
+ item.is_collapsed ? 'menu-item--collapsed',
+ item.in_active_trail ? 'menu-item--active-trail',
+ ]
+ %}
+ <li{{ item.attributes.addClass(classes) }}>
+ {{ link(item.title, item.url) }}
+ {% if item.below %}
+ {{ menus.menu_links(item.below, attributes, menu_level + 1) }}
+ {% endif %}
+ </li>
+ {% endfor %}
+ </ul>
+ {% endif %}
+{% endmacro %}
diff --git a/web/core/themes/bartik/templates/classy/navigation/toolbar.html.twig b/web/core/themes/bartik/templates/classy/navigation/toolbar.html.twig
new file mode 100644
index 0000000000..20f12d48b2
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/navigation/toolbar.html.twig
@@ -0,0 +1,46 @@
+{#
+/**
+ * @file
+ * Theme override for the administrative toolbar.
+ *
+ * Available variables:
+ * - attributes: HTML attributes for the wrapper.
+ * - toolbar_attributes: HTML attributes to apply to the toolbar.
+ * - toolbar_heading: The heading or label for the toolbar.
+ * - tabs: List of tabs for the toolbar.
+ * - attributes: HTML attributes for the tab container.
+ * - link: Link or button for the menu tab.
+ * - trays: Toolbar tray list, each associated with a tab. Each tray in trays
+ * contains:
+ * - attributes: HTML attributes to apply to the tray.
+ * - label: The tray's label.
+ * - links: The tray menu links.
+ * - remainder: Any non-tray, non-tab elements left to be rendered.
+ *
+ * @see template_preprocess_toolbar()
+ */
+#}
+<div{{ attributes.addClass('toolbar') }}>
+ <nav{{ toolbar_attributes.addClass('toolbar-bar', 'clearfix') }}>
+ <h2 class="visually-hidden">{{ toolbar_heading }}</h2>
+ {% for key, tab in tabs %}
+ {% set tray = trays[key] %}
+ <div{{ tab.attributes.addClass('toolbar-tab') }}>
+ {{ tab.link }}
+ {% spaceless %}
+ <div{{ tray.attributes }}>
+ {% if tray.label %}
+ <nav class="toolbar-lining clearfix" role="navigation" aria-label="{{ tray.label }}">
+ <h3 class="toolbar-tray-name visually-hidden">{{ tray.label }}</h3>
+ {% else %}
+ <nav class="toolbar-lining clearfix" role="navigation">
+ {% endif %}
+ {{ tray.links }}
+ </nav>
+ </div>
+ {% endspaceless %}
+ </div>
+ {% endfor %}
+ </nav>
+ {{ remainder }}
+</div>
diff --git a/web/core/themes/bartik/templates/classy/user/forum-submitted.html.twig b/web/core/themes/bartik/templates/classy/user/forum-submitted.html.twig
new file mode 100644
index 0000000000..57311e96b5
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/user/forum-submitted.html.twig
@@ -0,0 +1,21 @@
+{#
+/**
+ * @file
+ * Theme override for a forum post submission string.
+ *
+ * The submission string indicates when and by whom a topic was submitted.
+ *
+ * Available variables:
+ * - author: The author of the post.
+ * - time: How long ago the post was created.
+ * - topic: An object with the raw data of the post. Potentially unsafe. Be
+ * sure to clean this data before printing.
+ *
+ * @see template_preprocess_forum_submitted()
+ */
+#}
+{% if time %}
+ <span class="submitted">{% trans %}By {{ author }} {{ time }} ago{% endtrans %}</span>
+{% else %}
+ {{ 'n/a'|t }}
+{% endif %}
diff --git a/web/core/themes/bartik/templates/classy/user/user.html.twig b/web/core/themes/bartik/templates/classy/user/user.html.twig
new file mode 100644
index 0000000000..9a824effd3
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/user/user.html.twig
@@ -0,0 +1,23 @@
+{#
+/**
+ * @file
+ * Theme override to present all user data.
+ *
+ * This template is used when viewing a registered user's page,
+ * e.g., example.com/user/123. 123 being the user's ID.
+ *
+ * Available variables:
+ * - content: A list of content items. Use 'content' to print all content, or
+ * print a subset such as 'content.field_example'. Fields attached to a user
+ * such as 'user_picture' are available as 'content.user_picture'.
+ * - attributes: HTML attributes for the container element.
+ * - user: A Drupal User entity.
+ *
+ * @see template_preprocess_user()
+ */
+#}
+<article{{ attributes.addClass('profile') }}>
+ {% if content %}
+ {{- content -}}
+ {% endif %}
+</article>
diff --git a/web/core/themes/bartik/templates/classy/user/username.html.twig b/web/core/themes/bartik/templates/classy/user/username.html.twig
new file mode 100644
index 0000000000..df694dff69
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/user/username.html.twig
@@ -0,0 +1,29 @@
+{#
+/**
+ * @file
+ * Theme override for displaying a username.
+ *
+ * Available variables:
+ * - account: The full account information for the user.
+ * - uid: The user ID, or zero if not a user. As used in anonymous comments.
+ * - name: The user's name, sanitized, and optionally truncated.
+ * - name_raw: The user's name, un-truncated.
+ * - truncated: Whether the user's name was truncated.
+ * - extra: Additional text to append to the user's name, sanitized.
+ * - profile_access: Whether the current user has permission to access this
+ users profile page.
+ * - link_path: The path or URL of the user's profile page, home page,
+ * or other desired page to link to for more information about the user.
+ * - homepage: (optional) The home page of the account, only set for non users.
+ * - link_options: Options to set on the \Drupal\Core\Url object if linking the
+ * user's name to the user's page.
+ * - attributes: HTML attributes for the containing element.
+ *
+ * @see template_preprocess_username()
+ */
+#}
+{% if link_path -%}
+ <a{{ attributes.addClass('username') }}>{{ name }}{{ extra }}</a>
+{%- else -%}
+ <span{{ attributes }}>{{ name }}{{ extra }}</span>
+{%- endif -%}
diff --git a/web/core/themes/bartik/templates/classy/views/views-exposed-form.html.twig b/web/core/themes/bartik/templates/classy/views/views-exposed-form.html.twig
new file mode 100644
index 0000000000..3c679ae583
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/views/views-exposed-form.html.twig
@@ -0,0 +1,21 @@
+{#
+/**
+ * @file
+ * Theme override for a views exposed form.
+ *
+ * Available variables:
+ * - form: A render element representing the form.
+ *
+ * @see template_preprocess_views_exposed_form()
+ */
+#}
+{% if q is not empty %}
+ {#
+ This ensures that, if clean URLs are off, the 'q' is added first,
+ as a hidden form element, so that it shows up first in the POST URL.
+ #}
+{{ q }}
+{% endif %}
+<div class="form--inline clearfix">
+ {{ form }}
+</div>
diff --git a/web/core/themes/bartik/templates/classy/views/views-mini-pager.html.twig b/web/core/themes/bartik/templates/classy/views/views-mini-pager.html.twig
new file mode 100644
index 0000000000..4b46f2bb1f
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/views/views-mini-pager.html.twig
@@ -0,0 +1,42 @@
+{#
+/**
+ * @file
+ * Theme override for a views mini-pager.
+ *
+ * Available variables:
+ * - heading_id: Pagination heading ID.
+ * - items: List of pager items.
+ *
+ * @see template_preprocess_views_mini_pager()
+ */
+#}
+{% if items.previous or items.next %}
+ <nav class="pager" role="navigation" aria-labelledby="{{ heading_id }}">
+ <h4 id="{{ heading_id }}" class="pager__heading visually-hidden">{{ 'Pagination'|t }}</h4>
+ <ul class="pager__items js-pager__items">
+ {% if items.previous %}
+ <li class="pager__item pager__item--previous">
+ <a href="{{ items.previous.href }}" title="{{ 'Go to previous page'|t }}" rel="prev"{{ items.previous.attributes|without('href', 'title', 'rel') }}>
+ <span class="visually-hidden">{{ 'Previous page'|t }}</span>
+ <span aria-hidden="true">{{ items.previous.text|default('‹‹'|t) }}</span>
+ </a>
+ </li>
+ {% endif %}
+ {% if items.current %}
+ <li class="pager__item is-active">
+ {% trans %}
+ Page {{ items.current }}
+ {% endtrans %}
+ </li>
+ {% endif %}
+ {% if items.next %}
+ <li class="pager__item pager__item--next">
+ <a href="{{ items.next.href }}" title="{{ 'Go to next page'|t }}" rel="next"{{ items.next.attributes|without('href', 'title', 'rel') }}>
+ <span class="visually-hidden">{{ 'Next page'|t }}</span>
+ <span aria-hidden="true">{{ items.next.text|default('››'|t) }}</span>
+ </a>
+ </li>
+ {% endif %}
+ </ul>
+ </nav>
+{% endif %}
diff --git a/web/core/themes/bartik/templates/classy/views/views-view-grouping.html.twig b/web/core/themes/bartik/templates/classy/views/views-view-grouping.html.twig
new file mode 100644
index 0000000000..44905e56b7
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/views/views-view-grouping.html.twig
@@ -0,0 +1,20 @@
+{#
+/**
+ * @file
+ * Theme override to display a single views grouping.
+ *
+ * Available variables:
+ * - view: The view object.
+ * - grouping: The grouping instruction.
+ * - grouping_level: A number indicating the hierarchical level of the grouping.
+ * - title: The group heading.
+ * - content: The content to be grouped.
+ * - rows: The rows returned from the view.
+ *
+ * @see template_preprocess_views_view_grouping()
+ */
+#}
+<div class="view-grouping">
+ <div class="view-grouping-header">{{ title }}</div>
+ <div class="view-grouping-content">{{ content }}</div>
+</div>
diff --git a/web/core/themes/bartik/templates/classy/views/views-view-row-rss.html.twig b/web/core/themes/bartik/templates/classy/views/views-view-row-rss.html.twig
new file mode 100644
index 0000000000..aee08aee6e
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/views/views-view-row-rss.html.twig
@@ -0,0 +1,30 @@
+{#
+/**
+ * @file
+ * Theme override to display an item in a views RSS feed.
+ *
+ * Available variables:
+ * - title: RSS item title.
+ * - link: RSS item link.
+ * - description: RSS body text.
+ * - item_elements: RSS item elements to be rendered as XML (pubDate, creator,
+ * guid).
+ *
+ * @see template_preprocess_views_view_row_rss()
+ *
+ * @ingroup themeable
+ */
+#}
+<item>
+ <title>{{ title }}</title>
+ <link>{{ link }}</link>
+ <description>{{ description }}</description>
+ {% for item in item_elements -%}
+ <{{ item.key }}{{ item.attributes -}}
+ {% if item.value -%}
+ >{{ item.value }}</{{ item.key }}>
+ {% else -%}
+ {{ ' />' }}
+ {% endif %}
+ {%- endfor %}
+</item>
diff --git a/web/core/themes/bartik/templates/classy/views/views-view-summary-unformatted.html.twig b/web/core/themes/bartik/templates/classy/views/views-view-summary-unformatted.html.twig
new file mode 100644
index 0000000000..151734e948
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/views/views-view-summary-unformatted.html.twig
@@ -0,0 +1,31 @@
+{#
+/**
+ * @file
+ * Theme override for unformatted summary links.
+ *
+ * Available variables:
+ * - rows: The rows contained in this view.
+ * - url: The URL to this row's content.
+ * - count: The number of items this summary item represents.
+ * - separator: A separator between each row.
+ * - attributes: HTML attributes for a row.
+ * - active: A flag indicating whether the row is active.
+ * - options: Flags indicating how each row should be displayed. This contains:
+ * - count: A flag indicating whether the row's 'count' should be displayed.
+ * - inline: A flag indicating whether the item should be wrapped in an inline
+ * or block level HTML element.
+ *
+ * @see template_preprocess_views_view_summary_unformatted()
+ */
+#}
+{% for row in rows %}
+ {{ options.inline ? '<span' : '<div' }} class="views-summary views-summary-unformatted">
+ {% if row.separator -%}
+ {{ row.separator }}
+ {%- endif %}
+ <a href="{{ row.url }}"{{ row.attributes.addClass(row.active ? 'is-active')|without('href') }}>{{ row.link }}</a>
+ {% if options.count %}
+ ({{ row.count }})
+ {% endif %}
+ {{ options.inline ? '</span>' : '</div>' }}
+{% endfor %}
diff --git a/web/core/themes/bartik/templates/classy/views/views-view-summary.html.twig b/web/core/themes/bartik/templates/classy/views/views-view-summary.html.twig
new file mode 100644
index 0000000000..3190a45ada
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/views/views-view-summary.html.twig
@@ -0,0 +1,31 @@
+{#
+/**
+ * @file
+ * Theme override to display a list of summary lines.
+ *
+ * Available variables:
+ * - rows: The rows contained in this view.
+ * Each row contains:
+ * - url: The summary link URL.
+ * - link: The summary link text.
+ * - count: The number of items under this grouping.
+ * - attributes: HTML attributes to apply to each row.
+ * - active: A flag indicating whether the row is active.
+ * - options: Flags indicating how the summary should be displayed.
+ * This contains:
+ * - count: A flag indicating whether the count should be displayed.
+ *
+ * @see template_preprocess_views_view_summary()
+ */
+#}
+<div class="item-list">
+ <ul class="views-summary">
+ {% for row in rows %}
+ <li><a href="{{ row.url }}"{{ row.attributes.addClass(row.active ? 'is-active')|without('href') }}>{{ row.link }}</a>
+ {% if options.count %}
+ ({{ row.count }})
+ {% endif %}
+ </li>
+ {% endfor %}
+ </ul>
+</div>
diff --git a/web/core/themes/bartik/templates/classy/views/views-view-table.html.twig b/web/core/themes/bartik/templates/classy/views/views-view-table.html.twig
new file mode 100644
index 0000000000..edc14983da
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/views/views-view-table.html.twig
@@ -0,0 +1,120 @@
+{#
+/**
+ * @file
+ * Theme override for displaying a view as a table.
+ *
+ * Available variables:
+ * - attributes: Remaining HTML attributes for the element.
+ * - class: HTML classes that can be used to style contextually through CSS.
+ * - title : The title of this group of rows.
+ * - header: The table header columns.
+ * - attributes: Remaining HTML attributes for the element.
+ * - content: HTML classes to apply to each header cell, indexed by
+ * the header's key.
+ * - default_classes: A flag indicating whether default classes should be
+ * used.
+ * - caption_needed: Is the caption tag needed.
+ * - caption: The caption for this table.
+ * - accessibility_description: Extended description for the table details.
+ * - accessibility_summary: Summary for the table details.
+ * - rows: Table row items. Rows are keyed by row number.
+ * - attributes: HTML classes to apply to each row.
+ * - columns: Row column items. Columns are keyed by column number.
+ * - attributes: HTML classes to apply to each column.
+ * - content: The column content.
+ * - default_classes: A flag indicating whether default classes should be
+ * used.
+ * - responsive: A flag indicating whether table is responsive.
+ * - sticky: A flag indicating whether table header is sticky.
+ * - summary_element: A render array with table summary information (if any).
+ *
+ * @see template_preprocess_views_view_table()
+ */
+#}
+{%
+ set classes = [
+ 'views-table',
+ 'views-view-table',
+ 'cols-' ~ header|length,
+ responsive ? 'responsive-enabled',
+ sticky ? 'sticky-enabled',
+ ]
+%}
+<table{{ attributes.addClass(classes) }}>
+ {% if caption_needed %}
+ <caption>
+ {% if caption %}
+ {{ caption }}
+ {% else %}
+ {{ title }}
+ {% endif %}
+ {% if (summary_element is not empty) %}
+ {{ summary_element }}
+ {% endif %}
+ </caption>
+ {% endif %}
+ {% if header %}
+ <thead>
+ <tr>
+ {% for key, column in header %}
+ {% if column.default_classes %}
+ {%
+ set column_classes = [
+ 'views-field',
+ 'views-field-' ~ fields[key],
+ ]
+ %}
+ {% endif %}
+ <th{{ column.attributes.addClass(column_classes).setAttribute('scope', 'col') }}>
+ {%- if column.wrapper_element -%}
+ <{{ column.wrapper_element }}>
+ {%- if column.url -%}
+ <a href="{{ column.url }}" title="{{ column.title }}" rel="nofollow">{{ column.content }}{{ column.sort_indicator }}</a>
+ {%- else -%}
+ {{ column.content }}{{ column.sort_indicator }}
+ {%- endif -%}
+ </{{ column.wrapper_element }}>
+ {%- else -%}
+ {%- if column.url -%}
+ <a href="{{ column.url }}" title="{{ column.title }}" rel="nofollow">{{ column.content }}{{ column.sort_indicator }}</a>
+ {%- else -%}
+ {{- column.content }}{{ column.sort_indicator }}
+ {%- endif -%}
+ {%- endif -%}
+ </th>
+ {% endfor %}
+ </tr>
+ </thead>
+ {% endif %}
+ <tbody>
+ {% for row in rows %}
+ <tr{{ row.attributes }}>
+ {% for key, column in row.columns %}
+ {% if column.default_classes %}
+ {%
+ set column_classes = [
+ 'views-field'
+ ]
+ %}
+ {% for field in column.fields %}
+ {% set column_classes = column_classes|merge(['views-field-' ~ field]) %}
+ {% endfor %}
+ {% endif %}
+ <td{{ column.attributes.addClass(column_classes) }}>
+ {%- if column.wrapper_element -%}
+ <{{ column.wrapper_element }}>
+ {% for content in column.content %}
+ {{ content.separator }}{{ content.field_output }}
+ {% endfor %}
+ </{{ column.wrapper_element }}>
+ {%- else -%}
+ {% for content in column.content %}
+ {{- content.separator }}{{ content.field_output -}}
+ {% endfor %}
+ {%- endif %}
+ </td>
+ {% endfor %}
+ </tr>
+ {% endfor %}
+ </tbody>
+</table>
diff --git a/web/core/themes/bartik/templates/classy/views/views-view.html.twig b/web/core/themes/bartik/templates/classy/views/views-view.html.twig
new file mode 100644
index 0000000000..769a86849e
--- /dev/null
+++ b/web/core/themes/bartik/templates/classy/views/views-view.html.twig
@@ -0,0 +1,95 @@
+{#
+/**
+ * @file
+ * Theme override for a main view template.
+ *
+ * Available variables:
+ * - attributes: Remaining HTML attributes for the element.
+ * - css_name: A CSS-safe version of the view name.
+ * - css_class: The user-specified classes names, if any.
+ * - header: The optional header.
+ * - footer: The optional footer.
+ * - rows: The results of the view query, if any.
+ * - empty: The content to display if there are no rows.
+ * - pager: The optional pager next/prev links to display.
+ * - exposed: Exposed widget form/info to display.
+ * - feed_icons: Optional feed icons to display.
+ * - more: An optional link to the next page of results.
+ * - title: Title of the view, only used when displaying in the admin preview.
+ * - title_prefix: Additional output populated by modules, intended to be
+ * displayed in front of the view title.
+ * - title_suffix: Additional output populated by modules, intended to be
+ * displayed after the view title.
+ * - attachment_before: An optional attachment view to be displayed before the
+ * view content.
+ * - attachment_after: An optional attachment view to be displayed after the
+ * view content.
+ * - dom_id: Unique id for every view being printed to give unique class for
+ * Javascript.
+ *
+ * @see template_preprocess_views_view()
+ */
+#}
+{%
+ set classes = [
+ 'view',
+ 'view-' ~ id|clean_class,
+ 'view-id-' ~ id,
+ 'view-display-id-' ~ display_id,
+ dom_id ? 'js-view-dom-id-' ~ dom_id,
+ ]
+%}
+<div{{ attributes.addClass(classes) }}>
+ {{ title_prefix }}
+ {% if title %}
+ {{ title }}
+ {% endif %}
+ {{ title_suffix }}
+ {% if header %}
+ <div class="view-header">
+ {{ header }}
+ </div>
+ {% endif %}
+ {% if exposed %}
+ <div class="view-filters">
+ {{ exposed }}
+ </div>
+ {% endif %}
+ {% if attachment_before %}
+ <div class="attachment attachment-before">
+ {{ attachment_before }}
+ </div>
+ {% endif %}
+
+ {% if rows %}
+ <div class="view-content">
+ {{ rows }}
+ </div>
+ {% elseif empty %}
+ <div class="view-empty">
+ {{ empty }}
+ </div>
+ {% endif %}
+
+ {% if pager %}
+ {{ pager }}
+ {% endif %}
+ {% if attachment_after %}
+ <div class="attachment attachment-after">
+ {{ attachment_after }}
+ </div>
+ {% endif %}
+ {% if more %}
+ {{ more }}
+ {% endif %}
+ {% if footer %}
+ <div class="view-footer">
+ {{ footer }}
+ </div>
+ {% endif %}
+ {% if feed_icons %}
+ <div class="feed-icons">
+ {{ feed_icons }}
+ </div>
+ {% endif %}
+</div>
diff --git a/web/core/themes/bartik/templates/node.html.twig b/web/core/themes/bartik/templates/node.html.twig
index c7495223fe..22bba0c865 100644
--- a/web/core/themes/bartik/templates/node.html.twig
+++ b/web/core/themes/bartik/templates/node.html.twig
@@ -77,7 +77,7 @@
'clearfix',
]
%}
-{{ attach_library('classy/node') }}
+{{ attach_library('bartik/classy.node') }}
<article{{ attributes.addClass(classes) }}>
<header>
{{ title_prefix }}
diff --git a/web/core/themes/bartik/templates/page-title.html.twig b/web/core/themes/bartik/templates/page-title.html.twig
index e061cd2e01..4d12311f87 100644
--- a/web/core/themes/bartik/templates/page-title.html.twig
+++ b/web/core/themes/bartik/templates/page-title.html.twig
@@ -1,4 +1,3 @@
-{% extends "@classy/content/page-title.html.twig" %}
{#
/**
* @file
@@ -13,4 +12,15 @@
* displayed after the main title tag that appears in the template.
*/
#}
-{% set title_attributes = title_attributes.addClass('title') %}
+{%
+ set classes = [
+ 'title',
+ 'page-title',
+ ]
+%}
+
+{{ title_prefix }}
+{% if title %}
+ <h1{{ title_attributes.addClass(classes) }}>{{ title }}</h1>
+{% endif %}
+{{ title_suffix }}
diff --git a/web/core/themes/bartik/templates/status-messages.html.twig b/web/core/themes/bartik/templates/status-messages.html.twig
index e822ff5fbb..700593206e 100644
--- a/web/core/themes/bartik/templates/status-messages.html.twig
+++ b/web/core/themes/bartik/templates/status-messages.html.twig
@@ -1,4 +1,3 @@
-{% extends "@classy/misc/status-messages.html.twig" %}
{#
/**
* @file
@@ -16,13 +15,46 @@
* Available variables:
* - message_list: List of messages to be displayed, grouped by type.
* - status_headings: List of all status types.
+ * - attributes: HTML attributes for the element, including:
+ * - class: HTML classes.
*/
#}
-{% block messages %}
- {% if message_list is not empty %}
- {{ attach_library('bartik/messages') }}
- <div class="messages__wrapper layout-container">
- {{ parent() }}
- </div>
- {% endif %}
-{% endblock messages %}
+<div data-drupal-messages>
+ {% block messages %}
+ {% if message_list is not empty %}
+ {{ attach_library('bartik/messages') }}
+ <div class="messages__wrapper layout-container">
+ {% for type, messages in message_list %}
+ {%
+ set classes = [
+ 'messages',
+ 'messages--' ~ type,
+ ]
+ %}
+ <div role="contentinfo" aria-label="{{ status_headings[type] }}"{{ attributes.addClass(classes)|without('role', 'aria-label') }}>
+ {% if type == 'error' %}
+ <div role="alert">
+ {% endif %}
+ {% if status_headings[type] %}
+ <h2 class="visually-hidden">{{ status_headings[type] }}</h2>
+ {% endif %}
+ {% if messages|length > 1 %}
+ <ul class="messages__list">
+ {% for message in messages %}
+ <li class="messages__item">{{ message }}</li>
+ {% endfor %}
+ </ul>
+ {% else %}
+ {{ messages|first }}
+ {% endif %}
+ {% if type == 'error' %}
+ </div>
+ {% endif %}
+ </div>
+ {# Remove type specific classes. #}
+ {% set attributes = attributes.removeClass(classes) %}
+ {% endfor %}
+ </div>
+ {% endif %}
+ {% endblock messages %}
+</div>
diff --git a/web/core/themes/claro/claro.info.yml b/web/core/themes/claro/claro.info.yml
index 7bdbcc0867..e2b090eafa 100644
--- a/web/core/themes/claro/claro.info.yml
+++ b/web/core/themes/claro/claro.info.yml
@@ -71,30 +71,57 @@ libraries-override:
css/components/action-links.css: false
css/components/breadcrumb.css: false
css/components/button.css: false
+ css/components/collapse-processed.css: false
+ css/components/container-inline.css: css/classy/components/container-inline.css
css/components/details.css: false
css/components/dropbutton.css: false
+ css/components/exposed-filters.css: css/classy/components/exposed-filters.css
+ css/components/field.css: css/classy/components/field.css
css/components/form.css: false
- css/components/tabs.css: false
+ css/components/icons.css: css/classy/components/icons.css
+ css/components/inline-form.css: css/classy/components/inline-form.css
+ css/components/item-list.css: css/classy/components/item-list.css
+ css/components/link.css: css/classy/components/link.css
+ css/components/links.css: css/classy/components/links.css
+ css/components/menu.css: css/classy/components/menu.css
+ css/components/more-link.css: css/classy/components/more-link.css
css/components/pager.css: false
- css/components/tableselect.css: css/components/tableselect.css
css/components/tabledrag.css: false
- css/components/collapse-processed.css: false
+ css/components/tableselect.css: css/components/tableselect.css
+ css/components/tablesort.css: css/classy/components/tablesort.css
+ css/components/tabs.css: false
+ css/components/textarea.css: css/classy/components/textarea.css
+ css/components/ui-dialog.css: css/classy/components/ui-dialog.css
+
+ classy/book-navigation: claro/classy.book-navigation
classy/dropbutton:
css:
component:
css/components/dropbutton.css: false
+ classy/file: claro/classy.file
+
+ classy/forum: claro/classy.forum
+
+ classy/image-widget: claro/image-widget
+
+ classy/indented: claro/classy.indented
+
+ classy/media_embed_ckeditor_theme: claro/classy.media_embed_ckeditor_theme
+
+ classy/media_embed_error: claro/classy.media_embed_error
+
classy/messages:
css:
component:
css/components/messages.css: false
- classy/progress:
- css:
- component:
- css/components/progress.css: css/components/progress.css
- # @todo Refactor when https://www.drupal.org/node/2642122 is fixed.
+ classy/node: claro/classy.node
+
+ classy/progress: claro/progress
+
+ classy/search-results: claro/classy.search-results
classy/user: false
@@ -129,18 +156,20 @@ libraries-override:
libraries-extend:
ckeditor/drupal.ckeditor:
- claro/ckeditor-editor
- classy/image-widget:
- - claro/image-widget
core/ckeditor:
- claro/ckeditor-dialog
core/drupal.collapse:
- claro/details-focus
+ core/drupal.dialog:
+ - claro/claro.drupal.dialog
core/drupal.dropbutton:
- claro/dropbutton
core/drupal.checkbox:
- claro/checkbox
core/drupal.message:
- claro/messages
+ core/drupal.progress:
+ - claro/progress
core/drupal.vertical-tabs:
- claro/vertical-tabs
core/jquery.ui:
@@ -159,6 +188,8 @@ libraries-extend:
- claro/ajax
views/views.module:
- claro/views
+ media/media_embed_ckeditor_theme:
+ - claro/classy.media_embed_ckeditor_theme
media_library/view:
- claro/media_library.theme
media_library/widget:
@@ -170,6 +201,7 @@ ckeditor_stylesheets:
- css/base/elements.css
- css/base/typography.css
- css/theme/ckeditor-frame.css
+ - css/classy/components/media-embed-error.css
regions:
header: 'Header'
diff --git a/web/core/themes/claro/claro.libraries.yml b/web/core/themes/claro/claro.libraries.yml
index 92bb34315a..9f9860b4ad 100644
--- a/web/core/themes/claro/claro.libraries.yml
+++ b/web/core/themes/claro/claro.libraries.yml
@@ -57,7 +57,7 @@ global-styling:
# such as inputs, action links, buttons, dropbuttons. For usability and
# accessibility reasons, we keep target sizes big enough on touch screen
# devices (by not making these elements smaller than their default size).
- # Modernizr is used for recognising whether user is using a touch device or
+ # Modernizr is used for recognizing whether user is using a touch device or
# not. This allows conditionally rendering small variation of the control
# elements on non-touch devices. In some cases, such as when rendering
# links, it is hard recognize when Modernizr should be attached, therefore
@@ -261,3 +261,56 @@ media_library.theme:
css:
theme:
css/theme/media-library.css: {}
+
+progress:
+ version: VERSION
+ css:
+ component:
+ css/components/progress.css: {}
+
+classy.book-navigation:
+ version: VERSION
+ css:
+ component:
+ css/classy/components/book-navigation.css: {}
+
+classy.file:
+ version: VERSION
+ css:
+ component:
+ css/classy/components/file.css: { weight: -10 }
+
+classy.forum:
+ version: VERSION
+ css:
+ component:
+ css/classy/components/forum.css: { weight: -10 }
+
+classy.indented:
+ version: VERSION
+ css:
+ component:
+ css/classy/components/indented.css: {}
+
+classy.media_embed_error:
+ version: VERSION
+ css:
+ component:
+ css/classy/components/media-embed-error.css: {}
+
+classy.media_embed_ckeditor_theme:
+ version: VERSION
+ js:
+ js/classy/media_embed_ckeditor.theme.js: {}
+
+classy.node:
+ version: VERSION
+ css:
+ component:
+ css/classy/components/node.css: { weight: -10 }
+
+classy.search-results:
+ version: VERSION
+ css:
+ component:
+ css/classy/components/search-results.css: {}
diff --git a/web/core/themes/claro/claro.theme b/web/core/themes/claro/claro.theme
index 35a2dbac10..6e60bd7072 100644
--- a/web/core/themes/claro/claro.theme
+++ b/web/core/themes/claro/claro.theme
@@ -257,6 +257,11 @@ function claro_element_info_alter(&$type) {
if (isset($type['managed_file'])) {
$type['managed_file']['#pre_render'][] = [ClaroPreRender::class, 'managedFile'];
}
+
+ // Add a pre-render to status_messages to alter the placeholder markup.
+ if (isset($type['status_messages'])) {
+ $type['status_messages']['#pre_render'][] = [ClaroPreRender::class, 'messagePlaceholder'];
+ }
}
/**
@@ -873,20 +878,6 @@ function claro_preprocess_form_element__password(&$variables) {
}
}
-/**
- * Implements template_preprocess_HOOK() for checkboxes.
- */
-function claro_preprocess_checkboxes(&$variables) {
- $variables['attributes']['class'][] = 'form-boolean-group';
-}
-
-/**
- * Implements template_preprocess_HOOK() for radios.
- */
-function claro_preprocess_radios(&$variables) {
- $variables['attributes']['class'][] = 'form-boolean-group';
-}
-
/**
* Implements template_preprocess_HOOK() for filter_tips.
*/
diff --git a/web/core/themes/claro/css/base/elements.css b/web/core/themes/claro/css/base/elements.css
index 2424fc0c08..9d17479b87 100644
--- a/web/core/themes/claro/css/base/elements.css
+++ b/web/core/themes/claro/css/base/elements.css
@@ -310,6 +310,18 @@ img {
.page-wrapper *:focus,
.ui-dialog *:focus {
- outline: 2px dotted transparent;
- box-shadow: 0 0 0 2px #fff, 0 0 0 5px #26a769;
+ outline: 2px
+dotted
+transparent;
+ box-shadow: 0
+0
+0
+2px
+#fff
+,
+0
+0
+0
+5px
+#26a769;
}
diff --git a/web/core/themes/claro/css/base/elements.pcss.css b/web/core/themes/claro/css/base/elements.pcss.css
index 8df7ed0f37..0e1591ed9e 100644
--- a/web/core/themes/claro/css/base/elements.pcss.css
+++ b/web/core/themes/claro/css/base/elements.pcss.css
@@ -208,6 +208,6 @@ img {
*/
.page-wrapper *:focus,
.ui-dialog *:focus {
- outline: 2px dotted transparent;
- box-shadow: 0 0 0 2px var(--color-white), 0 0 0 5px var(--color-focus);
+ outline: var(--focus-outline);
+ box-shadow: var(--focus-box-shadow);
}
diff --git a/web/core/themes/claro/css/base/variables.pcss.css b/web/core/themes/claro/css/base/variables.pcss.css
index dc855b4cc6..fbbfa04c7e 100644
--- a/web/core/themes/claro/css/base/variables.pcss.css
+++ b/web/core/themes/claro/css/base/variables.pcss.css
@@ -73,7 +73,10 @@
--transition: all var(--speed-transition) ease-out;
--base-border-radius: 2px;
--focus-border-size: 3px;
+ --focus-border-offset-size: 2px;
--outline-size: 2px;
+ --focus-outline: var(--outline-size) dotted transparent;
+ --focus-box-shadow: 0 0 0 var(--focus-border-offset-size) var(--color-white), 0 0 0 calc(var(--focus-border-size) + var(--focus-border-offset-size)) var(--color-focus);
/*
* Inputs.
*/
diff --git a/web/core/themes/claro/css/classy/README.txt b/web/core/themes/claro/css/classy/README.txt
new file mode 100644
index 0000000000..42514f5f0c
--- /dev/null
+++ b/web/core/themes/claro/css/classy/README.txt
@@ -0,0 +1,12 @@
+WHAT IS THIS DIRECTORY FOR?
+--------------------------------
+This directory is for CSS files previously inherited from the Classy theme.
+
+WHY ARE CLASSY CSS FILES BEING COPIED HERE?
+-------------------------------------------
+Classy will be deprecated during the Drupal 9 lifecycle. To prepare for Classy's
+removal, CSS files that would otherwise be inherited from Classy are copied
+here.
+
+CSS files that differ from the Classy versions should not be placed in this
+directory or any subdirectory.
diff --git a/web/core/themes/claro/css/classy/components/book-navigation.css b/web/core/themes/claro/css/classy/components/book-navigation.css
new file mode 100644
index 0000000000..08728e27b5
--- /dev/null
+++ b/web/core/themes/claro/css/classy/components/book-navigation.css
@@ -0,0 +1,40 @@
+/**
+ * @file
+ * Styling for the Book module.
+ */
+
+.book-navigation .menu {
+ padding-top: 1em;
+ padding-bottom: 0;
+}
+.book-navigation .book-pager {
+ overflow: auto;
+ margin: 0;
+ padding: 0.5em 0;
+}
+.book-pager__item {
+ display: inline-block;
+ list-style-type: none;
+ vertical-align: top;
+}
+.book-pager__item--previous {
+ width: 45%;
+ text-align: left; /* LTR */
+}
+[dir="rtl"] .book-pager__item--previous {
+ float: right;
+ text-align: right;
+}
+.book-pager__item--center {
+ width: 8%;
+ text-align: center;
+}
+.book-pager__item--next {
+ float: right; /* LTR */
+ width: 45%;
+ text-align: right; /* LTR */
+}
+[dir="rtl"] .book-pager__item--next {
+ float: left;
+ text-align: left;
+}
diff --git a/web/core/themes/claro/css/classy/components/container-inline.css b/web/core/themes/claro/css/classy/components/container-inline.css
new file mode 100644
index 0000000000..64b78f683b
--- /dev/null
+++ b/web/core/themes/claro/css/classy/components/container-inline.css
@@ -0,0 +1,22 @@
+/**
+ * @file
+ * Inline items.
+ */
+
+.container-inline label:after,
+.container-inline .label:after {
+ content: ":";
+}
+.form-type-radios .container-inline label:after,
+.form-type-checkboxes .container-inline label:after {
+ content: "";
+}
+.form-type-radios .container-inline .form-type-radio,
+.form-type-checkboxes .container-inline .form-type-checkbox {
+ margin: 0 1em;
+}
+.container-inline .form-actions,
+.container-inline.form-actions {
+ margin-top: 0;
+ margin-bottom: 0;
+}
diff --git a/web/core/themes/claro/css/classy/components/exposed-filters.css b/web/core/themes/claro/css/classy/components/exposed-filters.css
new file mode 100644
index 0000000000..b686902ef1
--- /dev/null
+++ b/web/core/themes/claro/css/classy/components/exposed-filters.css
@@ -0,0 +1,46 @@
+/**
+ * @file
+ * Visual styles for exposed filters.
+ */
+
+.exposed-filters .filters {
+ float: left; /* LTR */
+ margin-right: 1em; /* LTR */
+}
+[dir="rtl"] .exposed-filters .filters {
+ float: right;
+ margin-right: 0;
+ margin-left: 1em;
+}
+.exposed-filters .form-item {
+ margin: 0 0 0.1em 0;
+ padding: 0;
+}
+.exposed-filters .form-item label {
+ float: left; /* LTR */
+ width: 10em;
+ font-weight: normal;
+}
+[dir="rtl"] .exposed-filters .form-item label {
+ float: right;
+}
+.exposed-filters .form-select {
+ width: 14em;
+}
+/* Current filters */
+.exposed-filters .current-filters {
+ margin-bottom: 1em;
+}
+.exposed-filters .current-filters .placeholder {
+ font-weight: bold;
+ font-style: normal;
+}
+.exposed-filters .additional-filters {
+ float: left; /* LTR */
+ margin-right: 1em; /* LTR */
+}
+[dir="rtl"] .exposed-filters .additional-filters {
+ float: right;
+ margin-right: 0;
+ margin-left: 1em;
+}
diff --git a/web/core/themes/claro/css/classy/components/field.css b/web/core/themes/claro/css/classy/components/field.css
new file mode 100644
index 0000000000..ff7e9ab1fc
--- /dev/null
+++ b/web/core/themes/claro/css/classy/components/field.css
@@ -0,0 +1,25 @@
+/**
+ * @file
+ * Visual styles for fields.
+ */
+
+.field__label {
+ font-weight: bold;
+}
+.field--label-inline .field__label,
+.field--label-inline .field__items {
+ float: left; /* LTR */
+}
+.field--label-inline .field__label,
+.field--label-inline > .field__item,
+.field--label-inline .field__items {
+ padding-right: 0.5em;
+}
+[dir="rtl"] .field--label-inline .field__label,
+[dir="rtl"] .field--label-inline .field__items {
+ padding-right: 0;
+ padding-left: 0.5em;
+}
+.field--label-inline .field__label::after {
+ content: ":";
+}
diff --git a/web/core/themes/claro/css/classy/components/file.css b/web/core/themes/claro/css/classy/components/file.css
new file mode 100644
index 0000000000..8637242a54
--- /dev/null
+++ b/web/core/themes/claro/css/classy/components/file.css
@@ -0,0 +1,62 @@
+/**
+ * @file
+ * Default style for file module.
+ */
+
+/* File icons. */
+
+.file {
+ display: inline-block;
+ min-height: 16px;
+ padding-left: 20px; /* LTR */
+ background-repeat: no-repeat;
+ background-position: left center; /* LTR */
+}
+[dir="rtl"] .file {
+ padding-right: 20px;
+ padding-left: inherit;
+ background-position: right center;
+}
+.file--general,
+.file--application-octet-stream {
+ background-image: url(../../../images/classy/icons/application-octet-stream.png);
+}
+.file--package-x-generic {
+ background-image: url(../../../images/classy/icons/package-x-generic.png);
+}
+.file--x-office-spreadsheet {
+ background-image: url(../../../images/classy/icons/x-office-spreadsheet.png);
+}
+.file--x-office-document {
+ background-image: url(../../../images/classy/icons/x-office-document.png);
+}
+.file--x-office-presentation {
+ background-image: url(../../../images/classy/icons/x-office-presentation.png);
+}
+.file--text-x-script {
+ background-image: url(../../../images/classy/icons/text-x-script.png);
+}
+.file--text-html {
+ background-image: url(../../../images/classy/icons/text-html.png);
+}
+.file--text-plain {
+ background-image: url(../../../images/classy/icons/text-plain.png);
+}
+.file--application-pdf {
+ background-image: url(../../../images/classy/icons/application-pdf.png);
+}
+.file--application-x-executable {
+ background-image: url(../../../images/classy/icons/application-x-executable.png);
+}
+.file--audio {
+ background-image: url(../../../images/classy/icons/audio-x-generic.png);
+}
+.file--video {
+ background-image: url(../../../images/classy/icons/video-x-generic.png);
+}
+.file--text {
+ background-image: url(../../../images/classy/icons/text-x-generic.png);
+}
+.file--image {
+ background-image: url(../../../images/classy/icons/image-x-generic.png);
+}
diff --git a/web/core/themes/claro/css/classy/components/forum.css b/web/core/themes/claro/css/classy/components/forum.css
new file mode 100644
index 0000000000..c35e3f4411
--- /dev/null
+++ b/web/core/themes/claro/css/classy/components/forum.css
@@ -0,0 +1,46 @@
+/**
+ * @file
+ * Styling for the Forum module.
+ */
+
+.forum__description {
+ margin: 0.5em;
+ font-size: 0.9em;
+}
+.forum__icon {
+ float: left; /* LTR */
+ width: 24px;
+ height: 24px;
+ margin: 0 9px 0 0; /* LTR */
+ background-image: url(../../../images/classy/icons/forum-icons.png);
+ background-repeat: no-repeat;
+}
+[dir="rtl"] .forum__icon {
+ float: right;
+ margin: 0 0 0 9px;
+}
+.forum__title {
+ overflow: hidden;
+}
+.forum .indented {
+ margin-left: 20px; /* LTR */
+}
+[dir="rtl"] .forum .indented {
+ margin-right: 20px;
+ margin-left: 0;
+}
+.forum__topic-status--new {
+ background-position: -24px 0;
+}
+.forum__topic-status--hot {
+ background-position: -48px 0;
+}
+.forum__topic-status--hot-new {
+ background-position: -72px 0;
+}
+.forum__topic-status--sticky {
+ background-position: -96px 0;
+}
+.forum__topic-status--closed {
+ background-position: -120px 0;
+}
diff --git a/web/core/themes/claro/css/classy/components/icons.css b/web/core/themes/claro/css/classy/components/icons.css
new file mode 100644
index 0000000000..ab0245f4c5
--- /dev/null
+++ b/web/core/themes/claro/css/classy/components/icons.css
@@ -0,0 +1,21 @@
+/**
+ * @file
+ * Visual styles for icons.
+ */
+
+.icon-help {
+ padding: 1px 0 1px 20px; /* LTR */
+ background: url(../../../../../misc/help.png) 0 50% no-repeat; /* LTR */
+}
+[dir="rtl"] .icon-help {
+ padding: 1px 20px 1px 0;
+ background-position: 100% 50%;
+}
+.feed-icon {
+ display: block;
+ overflow: hidden;
+ width: 16px;
+ height: 16px;
+ text-indent: -9999px;
+ background: url(../../../../../misc/feed.svg) no-repeat;
+}
diff --git a/web/core/themes/claro/css/classy/components/indented.css b/web/core/themes/claro/css/classy/components/indented.css
new file mode 100644
index 0000000000..6925a06363
--- /dev/null
+++ b/web/core/themes/claro/css/classy/components/indented.css
@@ -0,0 +1,16 @@
+
+/**
+ * @file
+ * Basic styling for comment module.
+ */
+
+/**
+ * Indent threaded comments.
+ */
+.indented {
+ margin-left: 25px; /* LTR */
+}
+[dir="rtl"] .indented {
+ margin-right: 25px;
+ margin-left: 0;
+}
diff --git a/web/core/themes/claro/css/classy/components/inline-form.css b/web/core/themes/claro/css/classy/components/inline-form.css
new file mode 100644
index 0000000000..b5201a78c9
--- /dev/null
+++ b/web/core/themes/claro/css/classy/components/inline-form.css
@@ -0,0 +1,33 @@
+/**
+ * @file
+ * Visual styles for inline forms.
+ */
+
+.form--inline .form-item {
+ float: left; /* LTR */
+ margin-right: 0.5em; /* LTR */
+}
+[dir="rtl"] .form--inline .form-item {
+ float: right;
+ margin-right: 0;
+ margin-left: 0.5em;
+}
+/* This is required to win over specificity of [dir="rtl"] .form--inline .form-item */
+[dir="rtl"] .views-filterable-options-controls .form-item {
+ margin-right: 2%;
+}
+.form--inline .form-item-separator {
+ margin-top: 2.3em;
+ margin-right: 1em; /* LTR */
+ margin-left: 0.5em; /* LTR */
+}
+[dir="rtl"] .form--inline .form-item-separator {
+ margin-right: 0.5em;
+ margin-left: 1em;
+}
+.form--inline .form-actions {
+ clear: left; /* LTR */
+}
+[dir="rtl"] .form--inline .form-actions {
+ clear: right;
+}
diff --git a/web/core/themes/claro/css/classy/components/item-list.css b/web/core/themes/claro/css/classy/components/item-list.css
new file mode 100644
index 0000000000..a8ce5d28a5
--- /dev/null
+++ b/web/core/themes/claro/css/classy/components/item-list.css
@@ -0,0 +1,32 @@
+/**
+ * @file
+ * Visual styles for item list.
+ */
+
+.item-list .title {
+ font-weight: bold;
+}
+.item-list ul {
+ margin: 0 0 0.75em 0;
+ padding: 0;
+}
+.item-list li {
+ margin: 0 0 0.25em 1.5em; /* LTR */
+ padding: 0;
+}
+[dir="rtl"] .item-list li {
+ margin: 0 1.5em 0.25em 0;
+}
+
+/**
+ * Comma separated lists.
+ */
+.item-list--comma-list {
+ display: inline;
+}
+.item-list--comma-list .item-list__comma-list,
+.item-list__comma-list li,
+[dir="rtl"] .item-list--comma-list .item-list__comma-list,
+[dir="rtl"] .item-list__comma-list li {
+ margin: 0;
+}
diff --git a/web/core/themes/claro/css/classy/components/link.css b/web/core/themes/claro/css/classy/components/link.css
new file mode 100644
index 0000000000..fa83f2bb2c
--- /dev/null
+++ b/web/core/themes/claro/css/classy/components/link.css
@@ -0,0 +1,16 @@
+/**
+ * @file
+ * Style another element as a link.
+ */
+
+button.link {
+ margin: 0;
+ padding: 0;
+ cursor: pointer;
+ border: 0;
+ background: transparent;
+ font-size: 1em;
+}
+label button.link {
+ font-weight: bold;
+}
diff --git a/web/core/themes/claro/css/classy/components/links.css b/web/core/themes/claro/css/classy/components/links.css
new file mode 100644
index 0000000000..e483253933
--- /dev/null
+++ b/web/core/themes/claro/css/classy/components/links.css
@@ -0,0 +1,23 @@
+/**
+ * @file
+ * Visual styles for links.
+ */
+
+ul.inline,
+ul.links.inline {
+ display: inline;
+ padding-left: 0; /* LTR */
+}
+[dir="rtl"] ul.inline,
+[dir="rtl"] ul.links.inline {
+ padding-right: 0;
+ padding-left: 15px;
+}
+ul.inline li {
+ display: inline;
+ padding: 0 0.5em;
+ list-style-type: none;
+}
+ul.links a.is-active {
+ color: #000;
+}
diff --git a/web/core/themes/claro/css/classy/components/media-embed-error.css b/web/core/themes/claro/css/classy/components/media-embed-error.css
new file mode 100644
index 0000000000..edb3ab24e6
--- /dev/null
+++ b/web/core/themes/claro/css/classy/components/media-embed-error.css
@@ -0,0 +1,20 @@
+/**
+ * @file
+ * Media Embed filter: default styling for media embed errors.
+ */
+
+/**
+ * The caption filter's styling overrides ours, so add a more specific selector
+ * to account for that.
+ */
+.media-embed-error,
+.caption > .media-embed-error {
+ max-width: 200px;
+ padding: 100px 20px 20px;
+ text-align: center;
+ background-color: #ebebeb;
+ background-image: url(../../../../../modules/media/images/icons/no-thumbnail.png);
+ background-repeat: no-repeat;
+ background-position: center top;
+ background-size: 100px 100px;
+}
diff --git a/web/core/themes/claro/css/classy/components/menu.css b/web/core/themes/claro/css/classy/components/menu.css
new file mode 100644
index 0000000000..80d3e14d86
--- /dev/null
+++ b/web/core/themes/claro/css/classy/components/menu.css
@@ -0,0 +1,34 @@
+/**
+ * @file
+ * Visual styles for menu.
+ */
+
+ul.menu {
+ margin-left: 1em; /* LTR */
+ padding: 0;
+ list-style: none outside;
+ text-align: left; /* LTR */
+}
+[dir="rtl"] ul.menu {
+ margin-right: 1em;
+ margin-left: 0;
+ text-align: right;
+}
+.menu-item--expanded {
+ list-style-type: circle;
+ list-style-image: url(../../../../../misc/menu-expanded.png);
+}
+.menu-item--collapsed {
+ list-style-type: disc;
+ list-style-image: url(../../../../../misc/menu-collapsed.png); /* LTR */
+}
+[dir="rtl"] .menu-item--collapsed {
+ list-style-image: url(../../../../../misc/menu-collapsed-rtl.png);
+}
+.menu-item {
+ margin: 0;
+ padding-top: 0.2em;
+}
+ul.menu a.is-active {
+ color: #000;
+}
diff --git a/web/core/themes/claro/css/classy/components/more-link.css b/web/core/themes/claro/css/classy/components/more-link.css
new file mode 100644
index 0000000000..c604061317
--- /dev/null
+++ b/web/core/themes/claro/css/classy/components/more-link.css
@@ -0,0 +1,12 @@
+/**
+ * @file
+ * Markup generated by #type 'more_link'.
+ */
+
+.more-link {
+ display: block;
+ text-align: right; /* LTR */
+}
+[dir="rtl"] .more-link {
+ text-align: left;
+}
diff --git a/web/core/themes/claro/css/classy/components/node.css b/web/core/themes/claro/css/classy/components/node.css
new file mode 100644
index 0000000000..6b7cd5257d
--- /dev/null
+++ b/web/core/themes/claro/css/classy/components/node.css
@@ -0,0 +1,8 @@
+/**
+ * @file
+ * Visual styles for nodes.
+ */
+
+.node--unpublished {
+ background-color: #fff4f4;
+}
diff --git a/web/core/themes/claro/css/classy/components/search-results.css b/web/core/themes/claro/css/classy/components/search-results.css
new file mode 100644
index 0000000000..343ea8b5fb
--- /dev/null
+++ b/web/core/themes/claro/css/classy/components/search-results.css
@@ -0,0 +1,8 @@
+/**
+ * @file
+ * Stylesheet for results generated by the Search module.
+ */
+
+.search-results {
+ list-style: none;
+}
diff --git a/web/core/themes/claro/css/classy/components/tablesort.css b/web/core/themes/claro/css/classy/components/tablesort.css
new file mode 100644
index 0000000000..44e5349404
--- /dev/null
+++ b/web/core/themes/claro/css/classy/components/tablesort.css
@@ -0,0 +1,11 @@
+/**
+ * @file
+ * Table sort indicator.
+ */
+
+th.is-active img {
+ display: inline;
+}
+td.is-active {
+ background-color: #ddd;
+}
diff --git a/web/core/themes/claro/css/classy/components/textarea.css b/web/core/themes/claro/css/classy/components/textarea.css
new file mode 100644
index 0000000000..2661bae9c4
--- /dev/null
+++ b/web/core/themes/claro/css/classy/components/textarea.css
@@ -0,0 +1,11 @@
+/**
+ * @file
+ * Visual styles for a resizable textarea.
+ */
+
+.form-textarea-wrapper textarea {
+ display: block;
+ box-sizing: border-box;
+ width: 100%;
+ margin: 0;
+}
diff --git a/web/core/themes/claro/css/classy/components/ui-dialog.css b/web/core/themes/claro/css/classy/components/ui-dialog.css
new file mode 100644
index 0000000000..476c21ffdb
--- /dev/null
+++ b/web/core/themes/claro/css/classy/components/ui-dialog.css
@@ -0,0 +1,15 @@
+/**
+ * @file
+ * Styles for Classy's modal windows.
+ */
+
+.ui-dialog--narrow {
+ max-width: 500px;
+}
+
+@media screen and (max-width: 600px) {
+ .ui-dialog--narrow {
+ min-width: 95%;
+ max-width: 95%;
+ }
+}
diff --git a/web/core/themes/claro/css/components/content-header.css b/web/core/themes/claro/css/components/content-header.css
index 3668c7ea15..47ae19d73f 100644
--- a/web/core/themes/claro/css/components/content-header.css
+++ b/web/core/themes/claro/css/components/content-header.css
@@ -55,7 +55,7 @@
.content-header {
overflow: hidden;
- margin-bottom: 2rem;
+ margin-bottom: 0.75rem;
padding: 1.5rem 0 0;
background-color: #f3f4f9;
}
diff --git a/web/core/themes/claro/css/components/content-header.pcss.css b/web/core/themes/claro/css/components/content-header.pcss.css
index c82370be79..f774132e99 100644
--- a/web/core/themes/claro/css/components/content-header.pcss.css
+++ b/web/core/themes/claro/css/components/content-header.pcss.css
@@ -6,7 +6,7 @@
.content-header {
overflow: hidden;
- margin-bottom: 2rem;
- padding: 1.5rem 0 0;
+ margin-bottom: var(--space-s);
+ padding: var(--space-l) 0 0;
background-color: var(--color-whitesmoke);
}
diff --git a/web/core/themes/claro/css/components/dropbutton.css b/web/core/themes/claro/css/components/dropbutton.css
index 9021be7bc0..6c1c90aa79 100644
--- a/web/core/themes/claro/css/components/dropbutton.css
+++ b/web/core/themes/claro/css/components/dropbutton.css
@@ -413,8 +413,7 @@
}
/**
- * Set the the inherited button border color to transparent for high contrast
- * mode.
+ * Set the inherited button border color to transparent for high contrast mode.
*/
@media screen and (-ms-high-contrast: active) {
diff --git a/web/core/themes/claro/css/components/dropbutton.pcss.css b/web/core/themes/claro/css/components/dropbutton.pcss.css
index 8f3795f623..9136182e96 100644
--- a/web/core/themes/claro/css/components/dropbutton.pcss.css
+++ b/web/core/themes/claro/css/components/dropbutton.pcss.css
@@ -353,8 +353,7 @@
}
/**
- * Set the the inherited button border color to transparent for high contrast
- * mode.
+ * Set the inherited button border color to transparent for high contrast mode.
*/
@media screen and (-ms-high-contrast: active) {
.dropbutton__item:first-of-type ~ .dropbutton__item > a,
diff --git a/web/core/themes/claro/css/components/form--password-confirm.css b/web/core/themes/claro/css/components/form--password-confirm.css
index a356a3a290..304b1b702e 100644
--- a/web/core/themes/claro/css/components/form--password-confirm.css
+++ b/web/core/themes/claro/css/components/form--password-confirm.css
@@ -78,7 +78,6 @@
}
.js .password-confirm__confirm {
- overflow: hidden;
max-height: 10rem;
transition: max-height 0.2s ease-in-out, margin 0.2s ease-in-out;
}
diff --git a/web/core/themes/claro/css/components/form--password-confirm.pcss.css b/web/core/themes/claro/css/components/form--password-confirm.pcss.css
index 860d474675..cf2cac451b 100644
--- a/web/core/themes/claro/css/components/form--password-confirm.pcss.css
+++ b/web/core/themes/claro/css/components/form--password-confirm.pcss.css
@@ -36,7 +36,6 @@
}
.js .password-confirm__confirm {
- overflow: hidden;
max-height: 10rem;
transition: max-height var(--speed-transition) ease-in-out, margin var(--speed-transition) ease-in-out;
}
diff --git a/web/core/themes/claro/css/components/form--text.css b/web/core/themes/claro/css/components/form--text.css
index f8df07ddae..f7c7923296 100644
--- a/web/core/themes/claro/css/components/form--text.css
+++ b/web/core/themes/claro/css/components/form--text.css
@@ -183,7 +183,6 @@ _:-ms-fullscreen,
}
.form-element[disabled] {
- -webkit-opacity: 1;
color: #82828c;
border-color: #bababf;
background-color: #f2f2f3;
diff --git a/web/core/themes/claro/css/components/form--text.pcss.css b/web/core/themes/claro/css/components/form--text.pcss.css
index 577326a1a2..d6d09b6f88 100644
--- a/web/core/themes/claro/css/components/form--text.pcss.css
+++ b/web/core/themes/claro/css/components/form--text.pcss.css
@@ -114,7 +114,6 @@ _:-ms-fullscreen,
}
.form-element[disabled] {
- -webkit-opacity: 1;
color: var(--input--disabled-fg-color);
border-color: var(--input--disabled-border-color);
background-color: var(--input--disabled-bg-color);
diff --git a/web/core/themes/claro/css/components/form.css b/web/core/themes/claro/css/components/form.css
index c2ab325e92..ca6f8f302f 100644
--- a/web/core/themes/claro/css/components/form.css
+++ b/web/core/themes/claro/css/components/form.css
@@ -58,10 +58,6 @@
color: #8e929c;
}
-::-ms-input-placeholder {
- color: #8e929c;
-}
-
::placeholder {
color: #8e929c;
}
diff --git a/web/core/themes/claro/css/components/tabs.css b/web/core/themes/claro/css/components/tabs.css
index cb7464f0e0..969feff859 100644
--- a/web/core/themes/claro/css/components/tabs.css
+++ b/web/core/themes/claro/css/components/tabs.css
@@ -56,11 +56,7 @@
:root {
/**
* Tabs.
- */ /* 48px */
-}
-
-.tabs-wrapper {
- display: flex;
+ */ /* 48px */ /* 40px */
}
.tabs-wrapper > nav {
@@ -253,6 +249,9 @@ rgba(216, 217, 224, 0.8);
}
@media screen and (min-width: 48em) {
+ .tabs-wrapper {
+ display: flex;
+ }
.is-horizontal .tabs {
flex-direction: row;
width: auto;
@@ -263,16 +262,28 @@ rgba(216, 217, 224, 0.8);
.is-horizontal .tabs--secondary {
overflow: hidden;
- margin-right: -6px;
- margin-bottom: 1rem;
- margin-left: -6px;
+ margin: -6px -6px 0;
padding: 6px 6px 0;
border-radius: 0;
}
+ .is-horizontal .tabs--secondary .tabs__tab {
+ font-size: 0.889rem;
+ }
+
+ .is-horizontal .tabs--secondary .tabs__link {
+ min-height: 2.5rem;
+ padding-top: 0.5rem;
+ padding-bottom: 0.5rem;
+ }
+
+ .is-horizontal .tabs--secondary .tabs__link:focus {
+ min-height: 2.5rem;
+ }
+
.is-horizontal .tabs--secondary::after {
position: absolute;
- bottom: 1rem;
+ bottom: 0;
left: 0;
display: block;
width: 100%;
diff --git a/web/core/themes/claro/css/components/tabs.pcss.css b/web/core/themes/claro/css/components/tabs.pcss.css
index 4e7cefb66b..804ee41b34 100644
--- a/web/core/themes/claro/css/components/tabs.pcss.css
+++ b/web/core/themes/claro/css/components/tabs.pcss.css
@@ -13,15 +13,13 @@
--tabs--focus-height: 3px;
--tabs--active-height: 3px;
--tabs-link-height: 3rem; /* 48px */
+ --tabs-secondary-link-height: 2.5rem; /* 40px */
--tabs-base-border: 1px solid var(--color-lightgray);
--tabs-base-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
--tabs-trigger-border: 1px solid rgba(216, 217, 224, 0.8);
--tabs--hover-bg-color: #e6ecf8;
}
-.tabs-wrapper {
- display: flex;
-}
.tabs-wrapper > nav {
width: 100%;
}
@@ -175,6 +173,9 @@
}
@media screen and (min-width: 48em) {
+ .tabs-wrapper {
+ display: flex;
+ }
.is-horizontal .tabs {
flex-direction: row;
width: auto;
@@ -185,16 +186,28 @@
.is-horizontal .tabs--secondary {
overflow: hidden;
- margin-right: calc(calc(var(--tabs--focus-height) + 3px) * -1);
- margin-bottom: var(--space-m);
- margin-left: calc(calc(var(--tabs--focus-height) + 3px) * -1);
+ margin: calc(calc(var(--tabs--focus-height) + 3px) * -1) calc(calc(var(--tabs--focus-height) + 3px) * -1) 0;
padding: calc(var(--tabs--focus-height) + 3px) calc(var(--tabs--focus-height) + 3px) 0;
border-radius: 0;
}
+ .is-horizontal .tabs--secondary .tabs__tab {
+ font-size: var(--font-size-s);
+ }
+
+ .is-horizontal .tabs--secondary .tabs__link {
+ min-height: var(--tabs-secondary-link-height);
+ padding-top: var(--space-xs);
+ padding-bottom: var(--space-xs);
+ }
+
+ .is-horizontal .tabs--secondary .tabs__link:focus {
+ min-height: var(--tabs-secondary-link-height);
+ }
+
.is-horizontal .tabs--secondary::after {
position: absolute;
- bottom: var(--space-m);
+ bottom: 0;
left: 0;
display: block;
width: 100%;
diff --git a/web/core/themes/claro/css/layout/image-widget.css b/web/core/themes/claro/css/layout/image-widget.css
index 8964c2cf40..b1ea2e776f 100644
--- a/web/core/themes/claro/css/layout/image-widget.css
+++ b/web/core/themes/claro/css/layout/image-widget.css
@@ -7,7 +7,7 @@
/**
* @file
- * Extends classy/image-widget.
+ * Image widget styles.
*/
.image-widget-data {
diff --git a/web/core/themes/claro/css/layout/image-widget.pcss.css b/web/core/themes/claro/css/layout/image-widget.pcss.css
index ce659ce082..93d96f8a02 100644
--- a/web/core/themes/claro/css/layout/image-widget.pcss.css
+++ b/web/core/themes/claro/css/layout/image-widget.pcss.css
@@ -1,6 +1,6 @@
/**
* @file
- * Extends classy/image-widget.
+ * Image widget styles.
*/
.image-widget-data {
diff --git a/web/core/themes/claro/css/layout/layout.css b/web/core/themes/claro/css/layout/layout.css
index 601de6b6f9..aabb3b1113 100644
--- a/web/core/themes/claro/css/layout/layout.css
+++ b/web/core/themes/claro/css/layout/layout.css
@@ -4,15 +4,26 @@
* https://www.drupal.org/node/2815083
* @preserve
*/
+
/**
- * Add spacing to bottom of pages
+ * Add spacing to top and bottom of pages.
*/
+
.page-content {
+ margin-top: 1.5rem;
margin-bottom: 80px;
}
+
+@media screen and (min-width: 38em) {
+ .page-content {
+ margin-top: 2rem;
+ }
+}
+
/**
* Add color to layout icons.
*/
+
.layout-icon__region {
fill: #f5f5f2;
stroke: #666;
diff --git a/web/core/themes/claro/css/layout/layout.pcss.css b/web/core/themes/claro/css/layout/layout.pcss.css
index 39649e43c1..17e012274e 100644
--- a/web/core/themes/claro/css/layout/layout.pcss.css
+++ b/web/core/themes/claro/css/layout/layout.pcss.css
@@ -1,10 +1,18 @@
/**
- * Add spacing to bottom of pages
+ * Add spacing to top and bottom of pages.
*/
+
.page-content {
+ margin-top: 1.5rem;
margin-bottom: 80px;
}
+@media screen and (min-width: 38em) {
+ .page-content {
+ margin-top: 2rem;
+ }
+}
+
/**
* Add color to layout icons.
*/
diff --git a/web/core/themes/claro/css/theme/ckeditor-editor.css b/web/core/themes/claro/css/theme/ckeditor-editor.css
index b41568aae2..8fad4a5f7d 100644
--- a/web/core/themes/claro/css/theme/ckeditor-editor.css
+++ b/web/core/themes/claro/css/theme/ckeditor-editor.css
@@ -4,12 +4,10 @@
* https://www.drupal.org/node/2815083
* @preserve
*/
-
/**
* @file
* CKEditor appearance overrides.
*/
-
:root {
/*
* Color Palette.
@@ -53,15 +51,17 @@
* Breadcrumb.
*/
}
-
+:root { /* 1px */
+ /* Inner border size must be based on chrome border size. */ /* 1px */
+ /* Inner border radius must be based on chrome border radius and size. */
+}
.cke.cke_chrome {
- border-radius: 0.125em; /* (2 / 16) */
+ border-width: 1px;
+ border-radius: 2px;
}
-
.cke .cke_inner {
- border-radius: 0.0625em; /* (1 / 16) */
+ border-radius: 1px;
}
-
.cke_path_empty:only-child::after {
position: absolute;
top: 0;
@@ -71,97 +71,80 @@
content: "";
background: #fff;
}
-
.cke .cke_top {
- border: 0.0833em solid transparent; /* Moono lisa skin uses font-size 12px */
+ border: 1px solid transparent;
border-bottom: 0;
- border-radius: 0.0833em 0.0833em 0 0;
+ border-radius: 1px 1px 0 0;
}
-
.cke .cke_contents {
- border: 0.0625em solid transparent;
+ border: 1px solid transparent;
border-top: 0;
border-bottom: 0;
}
-
.cke .cke_bottom {
- border: 0.0833em solid transparent; /* Moono lisa skin uses font-size 12px */
+ border: 1px solid transparent;
border-top: 0;
- border-radius: 0 0 0.0833em 0.0833em;
+ border-radius: 0 0 1px 1px;
}
-
/* Default */
-
.cke.cke_chrome {
border-color: #8e929c;
}
-
-/* Error. */
-
-.error + .cke.cke_chrome,
-.error + .cke .cke_contents,
-.error + .cke .cke_top,
-.error + .cke .cke_bottom {
- border-color: #d72222;
-}
-
/* Hover. */
-
.cke.cke_chrome:hover,
.cke:hover .cke_contents,
.cke:hover .cke_top,
-.cke:hover .cke_bottom,
-.error + .cke.cke_chrome:hover,
-.error + .cke:hover .cke_contents,
-.error + .cke:hover .cke_top,
-.error + .cke:hover .cke_bottom {
+.cke:hover .cke_bottom {
border-color: #222330;
}
-
/* Focus. */
-
-.cke.cke_chrome.cke_focus,
-.cke.cke_focus .cke_contents,
-.cke.cke_focus .cke_top,
-.cke.cke_focus .cke_bottom,
-.error + .cke.cke_chrome.cke_focus,
-.error + .cke.cke_focus .cke_contents,
-.error + .cke.cke_focus .cke_top,
-.error + .cke.cke_focus .cke_bottom {
- border-color: #003cc5;
-}
-
+.cke.cke_chrome.cke_focus {
+ outline: 2px
+dotted
+transparent;
+ box-shadow: 0
+0
+0
+2px
+#fff
+,
+0
+0
+0
+5px
+#26a769;
+}
+/* Error. */
+.error + .cke.cke_chrome,
+.error + .cke .cke_contents,
+.error + .cke .cke_top,
+.error + .cke .cke_bottom {
+ border-color: #d72222;
+}
/* Disabled. */
-
[disabled] + .cke.cke_chrome {
border-color: #bababf;
}
-
[disabled] + .cke .cke_contents,
[disabled] + .cke .cke_top,
[disabled] + .cke .cke_bottom {
border-color: transparent;
}
-
[disabled] + .cke .cke_contents {
border-color: #f2f2f3;
background: hsl(240, 4%, 90%); /* Calculated from disabled input bg and iframe opacity. */
}
-
[disabled] + .cke iframe,
[disabled] + .cke .cke_source {
opacity: 0.505;
}
-
[disabled] + .cke .cke_bottom {
background: #f2f2f3;
}
-
[disabled] + .cke .cke_bottom > * {
/* Don't show element path dor disabled editor. */
opacity: 0;
}
-
[disabled] + .cke .cke_path_empty::after {
content: none;
}
diff --git a/web/core/themes/claro/css/theme/ckeditor-editor.pcss.css b/web/core/themes/claro/css/theme/ckeditor-editor.pcss.css
index addac3c91a..0ed93d4c70 100644
--- a/web/core/themes/claro/css/theme/ckeditor-editor.pcss.css
+++ b/web/core/themes/claro/css/theme/ckeditor-editor.pcss.css
@@ -2,15 +2,24 @@
* @file
* CKEditor appearance overrides.
*/
-
@import "../base/variables.pcss.css";
+:root {
+ --ckeditor-chrome-border-size: var(--input-border-size); /* 1px */
+ --ckeditor-chrome-border-radius: var(--base-border-radius);
+ /* Inner border size must be based on chrome border size. */
+ --ckeditor-inner-border-size: calc(var(--input--error-border-size) - var(--ckeditor-chrome-border-size)); /* 1px */
+ /* Inner border radius must be based on chrome border radius and size. */
+ --ckeditor-inner-border-radius: calc(var(--ckeditor-chrome-border-radius) - var(--ckeditor-chrome-border-size));
+}
+
.cke.cke_chrome {
- border-radius: 0.125em; /* (2 / 16) */
+ border-width: var(--ckeditor-chrome-border-size);
+ border-radius: var(--ckeditor-chrome-border-radius);
}
.cke .cke_inner {
- border-radius: 0.0625em; /* (1 / 16) */
+ border-radius: var(--ckeditor-inner-border-radius);
}
.cke_path_empty:only-child::after {
@@ -24,21 +33,21 @@
}
.cke .cke_top {
- border: 0.0833em solid transparent; /* Moono lisa skin uses font-size 12px */
+ border: var(--ckeditor-inner-border-size) solid transparent;
border-bottom: 0;
- border-radius: 0.0833em 0.0833em 0 0;
+ border-radius: var(--ckeditor-inner-border-size) var(--ckeditor-inner-border-size) 0 0;
}
.cke .cke_contents {
- border: 0.0625em solid transparent;
+ border: var(--ckeditor-inner-border-size) solid transparent;
border-top: 0;
border-bottom: 0;
}
.cke .cke_bottom {
- border: 0.0833em solid transparent; /* Moono lisa skin uses font-size 12px */
+ border: var(--ckeditor-inner-border-size) solid transparent;
border-top: 0;
- border-radius: 0 0 0.0833em 0.0833em;
+ border-radius: 0 0 var(--ckeditor-inner-border-size) var(--ckeditor-inner-border-size);
}
/* Default */
@@ -46,36 +55,26 @@
border-color: var(--input-border-color);
}
-/* Error. */
-.error + .cke.cke_chrome,
-.error + .cke .cke_contents,
-.error + .cke .cke_top,
-.error + .cke .cke_bottom {
- border-color: var(--input--error-border-color);
-}
-
/* Hover. */
.cke.cke_chrome:hover,
.cke:hover .cke_contents,
.cke:hover .cke_top,
-.cke:hover .cke_bottom,
-.error + .cke.cke_chrome:hover,
-.error + .cke:hover .cke_contents,
-.error + .cke:hover .cke_top,
-.error + .cke:hover .cke_bottom {
+.cke:hover .cke_bottom {
border-color: var(--input--hover-border-color);
}
/* Focus. */
-.cke.cke_chrome.cke_focus,
-.cke.cke_focus .cke_contents,
-.cke.cke_focus .cke_top,
-.cke.cke_focus .cke_bottom,
-.error + .cke.cke_chrome.cke_focus,
-.error + .cke.cke_focus .cke_contents,
-.error + .cke.cke_focus .cke_top,
-.error + .cke.cke_focus .cke_bottom {
- border-color: var(--input--focus-border-color);
+.cke.cke_chrome.cke_focus {
+ outline: var(--focus-outline);
+ box-shadow: var(--focus-box-shadow);
+}
+
+/* Error. */
+.error + .cke.cke_chrome,
+.error + .cke .cke_contents,
+.error + .cke .cke_top,
+.error + .cke .cke_bottom {
+ border-color: var(--input--error-border-color);
}
/* Disabled. */
diff --git a/web/core/themes/claro/images/classy/README.txt b/web/core/themes/claro/images/classy/README.txt
new file mode 100644
index 0000000000..9df44f55ec
--- /dev/null
+++ b/web/core/themes/claro/images/classy/README.txt
@@ -0,0 +1,12 @@
+WHAT IS THIS DIRECTORY FOR?
+--------------------------------
+This directory is for image files previously inherited from the Classy theme.
+
+WHY ARE CLASSY IMAGE FILES BEING COPIED HERE?
+-------------------------------------------
+Classy will be deprecated during the Drupal 9 lifecycle. To prepare for Classy's
+removal, image files that would otherwise be inherited from Classy are copied
+here.
+
+Image files that differ from the Classy versions should not be placed in this
+directory or any subdirectory.
diff --git a/web/core/themes/claro/images/classy/icons/application-octet-stream.png b/web/core/themes/claro/images/classy/icons/application-octet-stream.png
new file mode 100644
index 0000000000..d5453217dc
--- /dev/null
+++ b/web/core/themes/claro/images/classy/icons/application-octet-stream.png
@@ -0,0 +1,3 @@
+�PNG
+
+���
IHDR�����������7����tEXtSoftware�Adobe ImageReadyq�e<���_IDAT(S�ͱ �@Dѩ�,�`�42���@����Z���#���d2!�4J�>dt�� `�
,=ޛ���{g8���C �PG(�<�h\���w�)E�o}�^�����IEND�B`�
\ No newline at end of file
diff --git a/web/core/themes/claro/images/classy/icons/application-pdf.png b/web/core/themes/claro/images/classy/icons/application-pdf.png
new file mode 100644
index 0000000000..36107d6e80
--- /dev/null
+++ b/web/core/themes/claro/images/classy/icons/application-pdf.png
@@ -0,0 +1,5 @@
+�PNG
+
+���
IHDR��������� ��a��!IDATxڍӱ��0 ��{ Aqs�]��M9p�I��#��� nN.
+..š�"����ic~�渢�\��/%�|�)����, ���{�sO�c ��RI�<"_Z ۶K���=�O-�8�k����z�h���Ff3��� �q\*:�@
���7���#��A�M��� p2y8�N��z=p���[� Av8 A ����Ѩ�%�Z
A��h<F��(���Ձl�W������n��v�r��� ��'@��2�W�_�F�:��_.
+�[-U����gB��ܣ*���()5h �����IEND�B`�
\ No newline at end of file
diff --git a/web/core/themes/claro/images/classy/icons/application-x-executable.png b/web/core/themes/claro/images/classy/icons/application-x-executable.png
new file mode 100644
index 0000000000..d5453217dc
--- /dev/null
+++ b/web/core/themes/claro/images/classy/icons/application-x-executable.png
@@ -0,0 +1,3 @@
+�PNG
+
+���
IHDR�����������7����tEXtSoftware�Adobe ImageReadyq�e<���_IDAT(S�ͱ �@Dѩ�,�`�42���@����Z���#���d2!�4J�>dt�� `�
,=ޛ���{g8���C �PG(�<�h\���w�)E�o}�^�����IEND�B`�
\ No newline at end of file
diff --git a/web/core/themes/claro/images/classy/icons/audio-x-generic.png b/web/core/themes/claro/images/classy/icons/audio-x-generic.png
new file mode 100644
index 0000000000..28d7f50862
--- /dev/null
+++ b/web/core/themes/claro/images/classy/icons/audio-x-generic.png
@@ -0,0 +1,3 @@
+�PNG
+
+���
IHDR��������� ��a��IDAT8Oc���?����'W1H-L �?�����w ���dC�q��n��� ����8 � <��0��w��~���Z��{���=�������ל��?y_�������W6��ׯ` >_��,6 L��P��0Hq�����N7�?ps����og��?���F#h� �c��a���^$I������V�#���v8���sy�g�����)�������������o�(3���/��i�)�����ۉ����IEND�B`�
\ No newline at end of file
diff --git a/web/core/themes/claro/images/classy/icons/forum-icons.png b/web/core/themes/claro/images/classy/icons/forum-icons.png
new file mode 100644
index 0000000000..e291de6725
--- /dev/null
+++ b/web/core/themes/claro/images/classy/icons/forum-icons.png
@@ -0,0 +1,10 @@
+�PNG
+
+���
IHDR����������"{�?��PLTE������������www�����������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������߯����������������������������������������������������������������������������������ۯ�������������������������������������������ד��������������������������������������tP[�����tRNS�
+
+ %***+,..001479=HKMX\ddhiimsvxxxxxxyy{}������������������������������������������������������������������������甐��IDATx^����E�JiS
+-�����/R܊hq�W�P|d�]b������&�����圼���o��*
�mۨt���w?8 ����e��O �ձ����]� ��e���y���E�Y�?�s� �8~@������t�8�A~��� ���?s�$�$����s�c�=z�9s�v+O��mKP�l&��w{���O�<�3I�}tj���̠"�p훼��gM>��0 ��y�F�?����{�;~��mnxcKۏ
+��f9�w�=�uy�y&(�aa ��g� e��f3���) `0h^v���Z��䙠�r�5H�$?.`�q�c�W^(g�!�>3��D�4�����;x��bIv��� ���<�x��Tܻ�Ш=K��M�k �,�q��F������!�#��90&�V��$��ӀP�=�y$hO��>|~Q�qDn�Qd&��cV�W��-�����¥�z�U�q��-�E!�(�Vl�|0b�v� =�8��x0�}�@ �x$>�G/L���"��W�Ϋ~�aE�� �(���4�E|s��<~rC�&�=7ݧl�s@!)<ɿ-�ԓ|=�Ŋ�8��sn��� a �u�r��Ql� Ls��� A�$��ʅ��7�h���t {4�0O���]��j\�� E9���մ� ��0�;�
��߭9y����a0OH���x��Y������4����қ�g��g�懕g��x�#(�9yƣH�sA��� 9��Ȍ�q
+�Þ�B��ѫ�/��U����k�������p(�)C��H.}
+�P-XUO[��O�,f��� @x5�LU�H@)��{�nz��/TU��"��Kf��'��Bc�<
+�q������~Z��˟ߠɷ9遟u]�<��%�>m�En�i�/�{TI?�<'*��K�ޣ �Y�{��ԏT�\�D�:�ˮ�� -�U� �}"�u��߄�{��ӿb�4(Hd2�f���I�Kua�*�[�Aɫu����\�k���}�d��/ݲį��� W ����=8�V��w�R����q�
>��{���I�F�E�2gz��L����IEND�B`�
\ No newline at end of file
diff --git a/web/core/themes/claro/images/classy/icons/image-x-generic.png b/web/core/themes/claro/images/classy/icons/image-x-generic.png
new file mode 100644
index 0000000000..c1b814f7cb
--- /dev/null
+++ b/web/core/themes/claro/images/classy/icons/image-x-generic.png
@@ -0,0 +1,6 @@
+�PNG
+
+���
IHDR��������� ��a��HIDATxڕ�=K�P���'�.��Z*����q�N��!�JDGE�YA��IT��`S�4I�QLnm�{��Z�聇��&��K"� $I� �� �D��1۶�p �^2*�S>�o���HϹ���|�/�e:����!�W��b�
+��
+�`�ȏ�א$\P#A���c�� j֚ЄQR0�i�܌����ܒx�-p�I���F��r!#Юk)��-��T�W��iT�i0cvq��:��x�~�+7�we��r1��I/��W���$ ����(�u���e� '��v#���mW��fnV�����\fۢ�0��;G@�
+�A �| �@ F����IEND�B`�
\ No newline at end of file
diff --git a/web/core/themes/claro/images/classy/icons/package-x-generic.png b/web/core/themes/claro/images/classy/icons/package-x-generic.png
new file mode 100644
index 0000000000..21fc382cba
--- /dev/null
+++ b/web/core/themes/claro/images/classy/icons/package-x-generic.png
@@ -0,0 +1,4 @@
+�PNG
+
+���
IHDR�����������7����tEXtSoftware�Adobe ImageReadyq�e<����IDAT(S��1�0�|�P�P�D�4��T�H�qPȲ>��c��h��<Y��(
+6**qO�0�'�_���u&�
Q�g�CW�p&[\���3�B{�;-N�BK*6T6���Ł�B��K�Q#Q �ј ����_s=oH�>-�".�;�C����0`"�a2�\�N�{ӆ�i��������IEND�B`�
\ No newline at end of file
diff --git a/web/core/themes/claro/images/classy/icons/text-html.png b/web/core/themes/claro/images/classy/icons/text-html.png
new file mode 100644
index 0000000000..9c7c7932c2
--- /dev/null
+++ b/web/core/themes/claro/images/classy/icons/text-html.png
@@ -0,0 +1,7 @@
+�PNG
+
+���
IHDR��������� ��a����IDATxڍ��
+�@�}�ަS��=@��7:G��� �� �w�۲
+��o@��vǁ� f��)�1q �� �s?����Z;��*W��
+PY�I0F�?? 3� �sI t�^AQD��+(�2�.0�0���_� ��ۄ��9�/O� 3��dwD�Ϧi�; ^�7/�W��~�t�"�\ÙW xB]�BP��@)]���m��� ��
+�c�0��������IEND�B`�
\ No newline at end of file
diff --git a/web/core/themes/claro/images/classy/icons/text-plain.png b/web/core/themes/claro/images/classy/icons/text-plain.png
new file mode 100644
index 0000000000..06804849b8
--- /dev/null
+++ b/web/core/themes/claro/images/classy/icons/text-plain.png
@@ -0,0 +1,4 @@
+�PNG
+
+���
IHDR�����������7����tEXtSoftware�Adobe ImageReadyq�e<���~IDAT(S��� �0 E3� 8��l���ɋ
+�� �km���<hh��)�@ E���f� #�^)h����"jq�I�Q�u���&0���A� � ��d�J�6t%� ����1r*A�?��?�T��f;�����������IEND�B`�
\ No newline at end of file
diff --git a/web/core/themes/claro/images/classy/icons/text-x-generic.png b/web/core/themes/claro/images/classy/icons/text-x-generic.png
new file mode 100644
index 0000000000..06804849b8
--- /dev/null
+++ b/web/core/themes/claro/images/classy/icons/text-x-generic.png
@@ -0,0 +1,4 @@
+�PNG
+
+���
IHDR�����������7����tEXtSoftware�Adobe ImageReadyq�e<���~IDAT(S��� �0 E3� 8��l���ɋ
+�� �km���<hh��)�@ E���f� #�^)h����"jq�I�Q�u���&0���A� � ��d�J�6t%� ����1r*A�?��?�T��f;�����������IEND�B`�
\ No newline at end of file
diff --git a/web/core/themes/claro/images/classy/icons/text-x-script.png b/web/core/themes/claro/images/classy/icons/text-x-script.png
new file mode 100644
index 0000000000..f9ecca8138
--- /dev/null
+++ b/web/core/themes/claro/images/classy/icons/text-x-script.png
@@ -0,0 +1,5 @@
+�PNG
+
+���
IHDR��������� ��a����IDATxڝ��
+�@E����U��}@ ?� ��E!D �� YRM�̗w���
�zpxsa�a ��q ��E�p�MP�5�e9��*S2�
+0Q
�E�ώ�U�$I .��V�R�B?қ1�eV���d<��ʣ<��Ȃ�(h�����&��_��d`#>˂�i���fƖ<륫K*{ �|�� �p "�_�F���ڶ��Eaw�_�� �>2���Z����IEND�B`�
\ No newline at end of file
diff --git a/web/core/themes/claro/images/classy/icons/video-x-generic.png b/web/core/themes/claro/images/classy/icons/video-x-generic.png
new file mode 100644
index 0000000000..a2b71f95d9
--- /dev/null
+++ b/web/core/themes/claro/images/classy/icons/video-x-generic.png
@@ -0,0 +1,5 @@
+�PNG
+
+���
IHDR�����������7����tEXtSoftware�Adobe ImageReadyq�e<���xIDAT(ϕ�11 �V>�(v�IEO��
+`��Av�2]4�� �F��BA10[���c� �K��pK�<�}c�=7S�b��Q0����,< �B=S�����\�
+�� �y�g7aA �πǴ"�j����IEND�B`�
\ No newline at end of file
diff --git a/web/core/themes/claro/images/classy/icons/x-office-document.png b/web/core/themes/claro/images/classy/icons/x-office-document.png
new file mode 100644
index 0000000000..40db538fcb
--- /dev/null
+++ b/web/core/themes/claro/images/classy/icons/x-office-document.png
@@ -0,0 +1,5 @@
+�PNG
+
+���
IHDR��������� ��a����IDATx�ՓA
+! E=k/��,��: ��܉�� TR�c3���l���� ⎵��ա�q�#�9cJI��\�
+(f{ z��;k�qF�IS��^�2dS�snB��� b�����5(�T�Z���:�����3�֎���@�|�� �~-�����IEND�B`�
\ No newline at end of file
diff --git a/web/core/themes/claro/images/classy/icons/x-office-presentation.png b/web/core/themes/claro/images/classy/icons/x-office-presentation.png
new file mode 100644
index 0000000000..fb119e5ba9
--- /dev/null
+++ b/web/core/themes/claro/images/classy/icons/x-office-presentation.png
@@ -0,0 +1,5 @@
+�PNG
+
+���
IHDR��������� ��a���|IDATx���
+� �}�^�st��o1=�r�`1�������
"����� �=�V�E)EJVS@9���F^���F S�RRȰ���&����+�F~ �~�z��}�GB�3��F�[�E
+. 4 ��;�����IEND�B`�
\ No newline at end of file
diff --git a/web/core/themes/claro/images/classy/icons/x-office-spreadsheet.png b/web/core/themes/claro/images/classy/icons/x-office-spreadsheet.png
new file mode 100644
index 0000000000..9af7b61ea1
--- /dev/null
+++ b/web/core/themes/claro/images/classy/icons/x-office-spreadsheet.png
@@ -0,0 +1,4 @@
+�PNG
+
+���
IHDR��������� ��a���~IDATx��� � E=u��:@��e ȳ�`M�B E"�C{臇��_4�pa��6��w�!�ؐR��UP�}j��"��<H�*��7ȰL8�z� B4�]�/5(�|������j�=�.E
+N� �8������IEND�B`�
\ No newline at end of file
diff --git a/web/core/themes/claro/js/classy/README.txt b/web/core/themes/claro/js/classy/README.txt
new file mode 100644
index 0000000000..efa01cfd10
--- /dev/null
+++ b/web/core/themes/claro/js/classy/README.txt
@@ -0,0 +1,12 @@
+WHAT IS THIS DIRECTORY FOR?
+--------------------------------
+This directory is for JS files previously inherited from the Classy theme.
+
+WHY ARE CLASSY JS FILES BEING COPIED HERE?
+-------------------------------------------
+Classy will be deprecated during the Drupal 9 lifecycle. To prepare for Classy's
+removal, JS files that would otherwise be inherited from Classy are copied
+here.
+
+JS files that differ from the Classy versions should not be placed in this
+directory or any subdirectory.
diff --git a/web/core/themes/claro/js/classy/media_embed_ckeditor.theme.es6.js b/web/core/themes/claro/js/classy/media_embed_ckeditor.theme.es6.js
new file mode 100644
index 0000000000..10193f7ba2
--- /dev/null
+++ b/web/core/themes/claro/js/classy/media_embed_ckeditor.theme.es6.js
@@ -0,0 +1,22 @@
+/**
+ * @file
+ * Classy theme overrides for the Media Embed CKEditor plugin.
+ */
+
+(Drupal => {
+ /**
+ * Themes the error displayed when the media embed preview fails.
+ *
+ * @param {string} error
+ * The error message to display
+ *
+ * @return {string}
+ * A string representing a DOM fragment.
+ *
+ * @see media-embed-error.html.twig
+ */
+ Drupal.theme.mediaEmbedPreviewError = () =>
+ `<div class="media-embed-error media-embed-error--preview-error">${Drupal.t(
+ 'An error occurred while trying to preview the media. Please save your work and reload this page.',
+ )}</div>`;
+})(Drupal);
diff --git a/web/core/themes/claro/js/classy/media_embed_ckeditor.theme.js b/web/core/themes/claro/js/classy/media_embed_ckeditor.theme.js
new file mode 100644
index 0000000000..6614288cb4
--- /dev/null
+++ b/web/core/themes/claro/js/classy/media_embed_ckeditor.theme.js
@@ -0,0 +1,12 @@
+/**
+* DO NOT EDIT THIS FILE.
+* See the following change record for more information,
+* https://www.drupal.org/node/2815083
+* @preserve
+**/
+
+(function (Drupal) {
+ Drupal.theme.mediaEmbedPreviewError = function () {
+ return '<div class="media-embed-error media-embed-error--preview-error">' + Drupal.t('An error occurred while trying to preview the media. Please save your work and reload this page.') + '</div>';
+ };
+})(Drupal);
\ No newline at end of file
diff --git a/web/core/themes/claro/js/messages.es6.js b/web/core/themes/claro/js/messages.es6.js
index 50ffa866ef..6cf8238db9 100644
--- a/web/core/themes/claro/js/messages.es6.js
+++ b/web/core/themes/claro/js/messages.es6.js
@@ -4,30 +4,6 @@
*/
(Drupal => {
- /**
- * Override Drupal.Message.defaultWrapper() because it prevents adding classes
- * to the wrapper.
- *
- * @return {HTMLElement}
- * The default destination for JavaScript messages.
- *
- * @todo Revisit this after https://www.drupal.org/node/3086723 has been
- * resolved.
- */
- Drupal.Message.defaultWrapper = () => {
- let wrapper = document.querySelector('[data-drupal-messages]');
- if (!wrapper) {
- wrapper = document.querySelector('[data-drupal-messages-fallback]');
- wrapper.removeAttribute('data-drupal-messages-fallback');
- wrapper.setAttribute('data-drupal-messages', '');
- wrapper.classList.remove('hidden');
- wrapper.classList.add('messages-list');
- }
- return wrapper.innerHTML === ''
- ? Drupal.Message.messageInternalWrapper(wrapper)
- : wrapper.firstElementChild;
- };
-
/**
* Overrides message theme function.
*
diff --git a/web/core/themes/claro/js/messages.js b/web/core/themes/claro/js/messages.js
index a90c3e62da..70fca31a57 100644
--- a/web/core/themes/claro/js/messages.js
+++ b/web/core/themes/claro/js/messages.js
@@ -6,18 +6,6 @@
**/
(function (Drupal) {
- Drupal.Message.defaultWrapper = function () {
- var wrapper = document.querySelector('[data-drupal-messages]');
- if (!wrapper) {
- wrapper = document.querySelector('[data-drupal-messages-fallback]');
- wrapper.removeAttribute('data-drupal-messages-fallback');
- wrapper.setAttribute('data-drupal-messages', '');
- wrapper.classList.remove('hidden');
- wrapper.classList.add('messages-list');
- }
- return wrapper.innerHTML === '' ? Drupal.Message.messageInternalWrapper(wrapper) : wrapper.firstElementChild;
- };
-
Drupal.theme.message = function (_ref, _ref2) {
var text = _ref.text;
var type = _ref2.type,
diff --git a/web/core/themes/claro/js/nav-tabs.es6.js b/web/core/themes/claro/js/nav-tabs.es6.js
index 9971585319..44edaa1f7b 100644
--- a/web/core/themes/claro/js/nav-tabs.es6.js
+++ b/web/core/themes/claro/js/nav-tabs.es6.js
@@ -73,7 +73,7 @@
.trigger('resize.tabs');
}
/**
- * Initialise the tabs JS.
+ * Initialize the tabs JS.
*/
Drupal.behaviors.navTabs = {
attach(context) {
diff --git a/web/core/themes/claro/js/tabledrag.es6.js b/web/core/themes/claro/js/tabledrag.es6.js
index 1e1b591e2b..805d4798f4 100644
--- a/web/core/themes/claro/js/tabledrag.es6.js
+++ b/web/core/themes/claro/js/tabledrag.es6.js
@@ -146,9 +146,9 @@
/**
* Used to determine up or down direction from last mouse move.
*
- * @type {number}
+ * @type {?number}
*/
- this.oldY = 0;
+ this.oldY = null;
/**
* Whether anything in the entire table has changed.
@@ -237,10 +237,10 @@
// manually append 2 indentations in the first draggable row, measure
// the offset, then remove.
const indent = Drupal.theme('tableDragIndentation');
- const testRow = $('<tr/>')
+ const testRow = $('<tr></tr>')
.addClass('draggable')
.appendTo(table);
- const testCell = $('<td/>')
+ const testCell = $('<td></td>')
.appendTo(testRow)
.prepend(indent)
.prepend(indent);
@@ -817,7 +817,7 @@
* @param {Drupal.tableDrag} self
* The drag handle.
* @param {HTMLElement} item
- * The item that that is being dragged.
+ * The item that is being dragged.
*/
dragStart(event, self, item) {
// Create a new dragObject recording the pointer information.
@@ -856,6 +856,10 @@
if (self.oldRowElement) {
$(self.oldRowElement).removeClass('drag-previous');
}
+
+ // Set the initial y coordinate so the direction can be calculated in
+ // dragRow().
+ self.oldY = self.pointerCoords(event).y;
},
/**
@@ -1820,7 +1824,7 @@
* A string representing a DOM fragment.
*/
tableDragCellItemsWrapper() {
- return '<div class="tabledrag-cell-content"/>';
+ return '<div class="tabledrag-cell-content"></div>';
},
/**
@@ -1830,7 +1834,7 @@
* A string representing a DOM fragment.
*/
tableDragCellContentWrapper() {
- return '<div class="tabledrag-cell-content__item"/>';
+ return '<div class="tabledrag-cell-content__item"></div>';
},
/**
diff --git a/web/core/themes/claro/js/tabledrag.js b/web/core/themes/claro/js/tabledrag.js
index ef37e236c0..7a501691d6 100644
--- a/web/core/themes/claro/js/tabledrag.js
+++ b/web/core/themes/claro/js/tabledrag.js
@@ -41,7 +41,7 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
this.oldRowElement = null;
- this.oldY = 0;
+ this.oldY = null;
this.changed = false;
@@ -74,8 +74,8 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
this.indentCount = 1;
var indent = Drupal.theme('tableDragIndentation');
- var testRow = $('<tr/>').addClass('draggable').appendTo(table);
- var testCell = $('<td/>').appendTo(testRow).prepend(indent).prepend(indent);
+ var testRow = $('<tr></tr>').addClass('draggable').appendTo(table);
+ var testCell = $('<td></td>').appendTo(testRow).prepend(indent).prepend(indent);
var $indentation = testCell.find('.js-indentation');
this.indentAmount = $indentation.get(1).offsetLeft - $indentation.get(0).offsetLeft;
@@ -433,6 +433,8 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
if (self.oldRowElement) {
$(self.oldRowElement).removeClass('drag-previous');
}
+
+ self.oldY = self.pointerCoords(event).y;
},
dragRow: function dragRow(event, self) {
if (self.dragObject) {
@@ -975,10 +977,10 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
return '<a href="#" class="tabledrag-handle"></a>';
},
tableDragCellItemsWrapper: function tableDragCellItemsWrapper() {
- return '<div class="tabledrag-cell-content"/>';
+ return '<div class="tabledrag-cell-content"></div>';
},
tableDragCellContentWrapper: function tableDragCellContentWrapper() {
- return '<div class="tabledrag-cell-content__item"/>';
+ return '<div class="tabledrag-cell-content__item"></div>';
},
tableDragToggle: function tableDragToggle(action, text) {
var classes = ['action-link', 'action-link--extrasmall', 'tabledrag-toggle-weight'];
diff --git a/web/core/themes/claro/js/user.es6.js b/web/core/themes/claro/js/user.es6.js
index 80229ac52b..2349216d35 100644
--- a/web/core/themes/claro/js/user.es6.js
+++ b/web/core/themes/claro/js/user.es6.js
@@ -292,7 +292,7 @@
};
/**
- * Password strenght feedback for password confirm's main input.
+ * Password strength feedback for password confirm's main input.
*
* @param {string} message
* The prefix text for the strength feedback word.
diff --git a/web/core/themes/claro/src/ClaroPreRender.php b/web/core/themes/claro/src/ClaroPreRender.php
index fc0ecad964..76b3aeb035 100644
--- a/web/core/themes/claro/src/ClaroPreRender.php
+++ b/web/core/themes/claro/src/ClaroPreRender.php
@@ -176,6 +176,22 @@ public static function textFormat($element) {
return $element;
}
+ /**
+ * Prerender callback for status_messages placeholder.
+ *
+ * @param array $element
+ * A renderable array.
+ *
+ * @return array
+ * The updated renderable array containing the placeholder.
+ */
+ public static function messagePlaceholder(array $element) {
+ if (isset($element['fallback']['#markup'])) {
+ $element['fallback']['#markup'] = '<div data-drupal-messages-fallback class="hidden messages-list"></div>';
+ }
+ return $element;
+ }
+
/**
* {@inheritdoc}
*/
@@ -186,6 +202,7 @@ public static function trustedCallbacks() {
'dropButton',
'container',
'textFormat',
+ 'messagePlaceholder',
];
}
diff --git a/web/core/themes/claro/templates/classy/README.txt b/web/core/themes/claro/templates/classy/README.txt
new file mode 100644
index 0000000000..8708a82e74
--- /dev/null
+++ b/web/core/themes/claro/templates/classy/README.txt
@@ -0,0 +1,12 @@
+WHAT IS THIS DIRECTORY FOR?
+--------------------------------
+This directory is for templates previously inherited from the Classy theme.
+
+WHY ARE CLASSY TEMPLATES BEING COPIED HERE?
+-------------------------------------------
+Classy will be deprecated during the Drupal 9 lifecycle. To prepare for Classy's
+removal, templates that would otherwise be inherited from Classy are copied
+here.
+
+Templates that differ from the Classy versions should not be placed in this
+directory or any subdirectory.
diff --git a/web/core/themes/claro/templates/classy/block/block--search-form-block.html.twig b/web/core/themes/claro/templates/classy/block/block--search-form-block.html.twig
new file mode 100644
index 0000000000..667202fb6b
--- /dev/null
+++ b/web/core/themes/claro/templates/classy/block/block--search-form-block.html.twig
@@ -0,0 +1,45 @@
+{#
+/**
+ * @file
+ * Theme override for the search form block.
+ *
+ * Available variables:
+ * - plugin_id: The ID of the block implementation.
+ * - label: The configured label of the block if visible.
+ * - configuration: A list of the block's configuration values, including:
+ * - label: The configured label for the block.
+ * - label_display: The display settings for the label.
+ * - provider: The module or other provider that provided this block plugin.
+ * - Block plugin specific settings will also be stored here.
+ * - content: The content of this block.
+ * - attributes: A list HTML attributes populated by modules, intended to
+ * be added to the main container tag of this template. Includes:
+ * - id: A valid HTML ID and guaranteed unique.
+ * - title_attributes: Same as attributes, except applied to the main title
+ * tag that appears in the template.
+ * - title_prefix: Additional output populated by modules, intended to be
+ * displayed in front of the main title tag that appears in the template.
+ * - title_suffix: Additional output populated by modules, intended to be
+ * displayed after the main title tag that appears in the template.
+ *
+ * @see template_preprocess_block()
+ * @see search_preprocess_block()
+ */
+#}
+{%
+ set classes = [
+ 'block',
+ 'block-search',
+ 'container-inline',
+ ]
+%}
+<div{{ attributes.addClass(classes) }}>
+ {{ title_prefix }}
+ {% if label %}
+ <h2{{ title_attributes }}>{{ label }}</h2>
+ {% endif %}
+ {{ title_suffix }}
+ {% block content %}
+ {{ content }}
+ {% endblock %}
+</div>
diff --git a/web/core/themes/claro/templates/classy/block/block--system-branding-block.html.twig b/web/core/themes/claro/templates/classy/block/block--system-branding-block.html.twig
new file mode 100644
index 0000000000..57e9570e52
--- /dev/null
+++ b/web/core/themes/claro/templates/classy/block/block--system-branding-block.html.twig
@@ -0,0 +1,30 @@
+{% extends "block.html.twig" %}
+{#
+/**
+ * @file
+ * Theme override for a branding block.
+ *
+ * Each branding element variable (logo, name, slogan) is only available if
+ * enabled in the block configuration.
+ *
+ * Available variables:
+ * - site_logo: Logo for site as defined in Appearance or theme settings.
+ * - site_name: Name for site as defined in Site information settings.
+ * - site_slogan: Slogan for site as defined in Site information settings.
+ */
+#}
+{% block content %}
+ {% if site_logo %}
+ <a href="{{ path('<front>') }}" rel="home" class="site-logo">
+ <img src="{{ site_logo }}" alt="{{ 'Home'|t }}" />
+ </a>
+ {% endif %}
+ {% if site_name %}
+ <div class="site-name">
+ <a href="{{ path('<front>') }}" title="{{ 'Home'|t }}" rel="home">{{ site_name }}</a>
+ </div>
+ {% endif %}
+ {% if site_slogan %}
+ <div class="site-slogan">{{ site_slogan }}</div>
+ {% endif %}
+{% endblock %}
diff --git a/web/core/themes/claro/templates/classy/block/block--system-menu-block.html.twig b/web/core/themes/claro/templates/classy/block/block--system-menu-block.html.twig
new file mode 100644
index 0000000000..407f8403fd
--- /dev/null
+++ b/web/core/themes/claro/templates/classy/block/block--system-menu-block.html.twig
@@ -0,0 +1,56 @@
+{#
+/**
+ * @file
+ * Theme override for a menu block.
+ *
+ * Available variables:
+ * - plugin_id: The ID of the block implementation.
+ * - label: The configured label of the block if visible.
+ * - configuration: A list of the block's configuration values.
+ * - label: The configured label for the block.
+ * - label_display: The display settings for the label.
+ * - provider: The module or other provider that provided this block plugin.
+ * - Block plugin specific settings will also be stored here.
+ * - content: The content of this block.
+ * - attributes: HTML attributes for the containing element.
+ * - id: A valid HTML ID and guaranteed unique.
+ * - title_attributes: HTML attributes for the title element.
+ * - content_attributes: HTML attributes for the content element.
+ * - title_prefix: Additional output populated by modules, intended to be
+ * displayed in front of the main title tag that appears in the template.
+ * - title_suffix: Additional output populated by modules, intended to be
+ * displayed after the main title tag that appears in the template.
+ *
+ * Headings should be used on navigation menus that consistently appear on
+ * multiple pages. When this menu block's label is configured to not be
+ * displayed, it is automatically made invisible using the 'visually-hidden' CSS
+ * class, which still keeps it visible for screen-readers and assistive
+ * technology. Headings allow screen-reader and keyboard only users to navigate
+ * to or skip the links.
+ * See http://juicystudio.com/article/screen-readers-display-none.php and
+ * http://www.w3.org/TR/WCAG-TECHS/H42.html for more information.
+ */
+#}
+{%
+ set classes = [
+ 'block',
+ 'block-menu',
+ 'navigation',
+ 'menu--' ~ derivative_plugin_id|clean_class,
+ ]
+%}
+{% set heading_id = attributes.id ~ '-menu'|clean_id %}
+<nav role="navigation" aria-labelledby="{{ heading_id }}"{{ attributes.addClass(classes)|without('role', 'aria-labelledby') }}>
+ {# Label. If not displayed, we still provide it for screen readers. #}
+ {% if not configuration.label_display %}
+ {% set title_attributes = title_attributes.addClass('visually-hidden') %}
+ {% endif %}
+ {{ title_prefix }}
+ <h2{{ title_attributes.setAttribute('id', heading_id) }}>{{ configuration.label }}</h2>
+ {{ title_suffix }}
+
+ {# Menu. #}
+ {% block content %}
+ {{ content }}
+ {% endblock %}
+</nav>
diff --git a/web/core/themes/claro/templates/classy/block/block.html.twig b/web/core/themes/claro/templates/classy/block/block.html.twig
new file mode 100644
index 0000000000..fd3311be95
--- /dev/null
+++ b/web/core/themes/claro/templates/classy/block/block.html.twig
@@ -0,0 +1,44 @@
+{#
+/**
+ * @file
+ * Theme override to display a block.
+ *
+ * Available variables:
+ * - plugin_id: The ID of the block implementation.
+ * - label: The configured label of the block if visible.
+ * - configuration: A list of the block's configuration values.
+ * - label: The configured label for the block.
+ * - label_display: The display settings for the label.
+ * - provider: The module or other provider that provided this block plugin.
+ * - Block plugin specific settings will also be stored here.
+ * - content: The content of this block.
+ * - attributes: array of HTML attributes populated by modules, intended to
+ * be added to the main container tag of this template.
+ * - id: A valid HTML ID and guaranteed unique.
+ * - title_attributes: Same as attributes, except applied to the main title
+ * tag that appears in the template.
+ * - title_prefix: Additional output populated by modules, intended to be
+ * displayed in front of the main title tag that appears in the template.
+ * - title_suffix: Additional output populated by modules, intended to be
+ * displayed after the main title tag that appears in the template.
+ *
+ * @see template_preprocess_block()
+ */
+#}
+{%
+ set classes = [
+ 'block',
+ 'block-' ~ configuration.provider|clean_class,
+ 'block-' ~ plugin_id|clean_class,
+ ]
+%}
+<div{{ attributes.addClass(classes) }}>
+ {{ title_prefix }}
+ {% if label %}
+ <h2{{ title_attributes }}>{{ label }}</h2>
+ {% endif %}
+ {{ title_suffix }}
+ {% block content %}
+ {{ content }}
+ {% endblock %}
+</div>
diff --git a/web/core/themes/claro/templates/classy/content-edit/filter-caption.html.twig b/web/core/themes/claro/templates/classy/content-edit/filter-caption.html.twig
new file mode 100644
index 0000000000..1e35795fc1
--- /dev/null
+++ b/web/core/themes/claro/templates/classy/content-edit/filter-caption.html.twig
@@ -0,0 +1,18 @@
+{#
+/**
+ * @file
+ * Theme override for a filter caption.
+ *
+ * Returns HTML for a captioned image, audio, video or other tag.
+ *
+ * Available variables
+ * - string node: The complete HTML tag whose contents are being captioned.
+ * - string tag: The name of the HTML tag whose contents are being captioned.
+ * - string caption: The caption text.
+ * - string classes: The classes of the captioned HTML tag.
+ */
+#}
+<figure role="group" class="caption caption-{{ tag }}{%- if classes %} {{ classes }}{%- endif %}">
+{{ node }}
+<figcaption>{{ caption }}</figcaption>
+</figure>
diff --git a/web/core/themes/claro/templates/classy/content/aggregator-item.html.twig b/web/core/themes/claro/templates/classy/content/aggregator-item.html.twig
new file mode 100644
index 0000000000..16f4428a03
--- /dev/null
+++ b/web/core/themes/claro/templates/classy/content/aggregator-item.html.twig
@@ -0,0 +1,31 @@
+{#
+/**
+ * @file
+ * Theme override to present a feed item in an aggregator page.
+ *
+ * Available variables:
+ * - url: URL to the originating feed item.
+ * - title: (optional) Title of the feed item.
+ * - content: All field items. Use {{ content }} to print them all,
+ * or print a subset such as {{ content.field_example }}. Use
+ * {{ content|without('field_example') }} to temporarily suppress the printing
+ * of a given element.
+ * - attributes: HTML attributes for the wrapper.
+ * - title_prefix: Additional output populated by modules, intended to be
+ * displayed in front of the main title tag that appears in the template.
+ * - title_suffix: Additional output populated by modules, intended to be
+ * displayed after the main title tag that appears in the template.
+ *
+ * @see template_preprocess_aggregator_item()
+ */
+#}
+<article{{ attributes.addClass('aggregator-item') }}>
+ {{ title_prefix }}
+ {% if title %}
+ <h3 class="feed-item-title">
+ <a href="{{ url }}">{{ title }}</a>
+ </h3>
+ {% endif %}
+ {{ title_suffix }}
+ {{ content }}
+</article>
diff --git a/web/core/themes/claro/templates/classy/content/book-node-export-html.html.twig b/web/core/themes/claro/templates/classy/content/book-node-export-html.html.twig
new file mode 100644
index 0000000000..94a4c24dc7
--- /dev/null
+++ b/web/core/themes/claro/templates/classy/content/book-node-export-html.html.twig
@@ -0,0 +1,20 @@
+{#
+/**
+ * @file
+ * Theme override for a single node in a printer-friendly outline.
+ *
+ * Available variables:
+ * - node: Fully loaded node.
+ * - depth: Depth of the current node inside the outline.
+ * - title: Node title.
+ * - content: Node content.
+ * - children: All the child nodes recursively rendered through this file.
+ *
+ * @see template_preprocess_book_node_export_html()
+ */
+#}
+<article id="node-{{ node.id }}" class="section-{{ depth }}">
+ <h1 class="book-heading">{{ title }}</h1>
+ {{ content }}
+ {{ children }}
+</article>
diff --git a/web/core/themes/claro/templates/classy/content/comment.html.twig b/web/core/themes/claro/templates/classy/content/comment.html.twig
new file mode 100644
index 0000000000..f226a21cdc
--- /dev/null
+++ b/web/core/themes/claro/templates/classy/content/comment.html.twig
@@ -0,0 +1,111 @@
+{#
+/**
+ * @file
+ * Theme override for comments.
+ *
+ * Available variables:
+ * - author: Comment author. Can be a link or plain text.
+ * - content: The content-related items for the comment display. Use
+ * {{ content }} to print them all, or print a subset such as
+ * {{ content.field_example }}. Use the following code to temporarily suppress
+ * the printing of a given child element:
+ * @code
+ * {{ content|without('field_example') }}
+ * @endcode
+ * - created: Formatted date and time for when the comment was created.
+ * Preprocess functions can reformat it by calling DateFormatter::format()
+ * with the desired parameters on the 'comment.created' variable.
+ * - changed: Formatted date and time for when the comment was last changed.
+ * Preprocess functions can reformat it by calling DateFormatter::format()
+ * with the desired parameters on the 'comment.changed' variable.
+ * - permalink: Comment permalink.
+ * - submitted: Submission information created from author and created
+ * during template_preprocess_comment().
+ * - user_picture: The comment author's profile picture.
+ * - status: Comment status. Possible values are:
+ * unpublished, published, or preview.
+ * - title: Comment title, linked to the comment.
+ * - attributes: HTML attributes for the containing element.
+ * The attributes.class may contain one or more of the following classes:
+ * - comment: The current template type; e.g., 'theming hook'.
+ * - by-anonymous: Comment by an unregistered user.
+ * - by-{entity-type}-author: Comment by the author of the parent entity,
+ * eg. by-node-author.
+ * - preview: When previewing a new or edited comment.
+ * The following applies only to viewers who are registered users:
+ * - unpublished: An unpublished comment visible only to administrators.
+ * - title_prefix: Additional output populated by modules, intended to be
+ * displayed in front of the main title tag that appears in the template.
+ * - title_suffix: Additional output populated by modules, intended to be
+ * displayed after the main title tag that appears in the template.
+ * - content_attributes: List of classes for the styling of the comment content.
+ * - title_attributes: Same as attributes, except applied to the main title
+ * tag that appears in the template.
+ * - threaded: A flag indicating whether the comments are threaded or not.
+ *
+ * These variables are provided to give context about the parent comment (if
+ * any):
+ * - parent_comment: Full parent comment entity (if any).
+ * - parent_author: Equivalent to author for the parent comment.
+ * - parent_created: Equivalent to created for the parent comment.
+ * - parent_changed: Equivalent to changed for the parent comment.
+ * - parent_title: Equivalent to title for the parent comment.
+ * - parent_permalink: Equivalent to permalink for the parent comment.
+ * - parent: A text string of parent comment submission information created from
+ * 'parent_author' and 'parent_created' during template_preprocess_comment().
+ * This information is presented to help screen readers follow lengthy
+ * discussion threads. You can hide this from sighted users using the class
+ * visually-hidden.
+ *
+ * These two variables are provided for context:
+ * - comment: Full comment object.
+ * - entity: Entity the comments are attached to.
+ *
+ * @see template_preprocess_comment()
+ */
+#}
+{% if threaded %}
+ {{ attach_library('claro/classy.indented') }}
+{% endif %}
+{%
+ set classes = [
+ 'comment',
+ 'js-comment',
+ status != 'published' ? status,
+ comment.owner.anonymous ? 'by-anonymous',
+ author_id and author_id == commented_entity.getOwnerId() ? 'by-' ~ commented_entity.getEntityTypeId() ~ '-author',
+ ]
+%}
+<article{{ attributes.addClass(classes) }}>
+ {#
+ Hide the "new" indicator by default, let a piece of JavaScript ask the
+ server which comments are new for the user. Rendering the final "new"
+ indicator here would break the render cache.
+ #}
+ <mark class="hidden" data-comment-timestamp="{{ new_indicator_timestamp }}"></mark>
+
+ <footer class="comment__meta">
+ {{ user_picture }}
+ <p class="comment__submitted">{{ submitted }}</p>
+
+ {#
+ Indicate the semantic relationship between parent and child comments for
+ accessibility. The list is difficult to navigate in a screen reader
+ without this information.
+ #}
+ {% if parent %}
+ <p class="parent visually-hidden">{{ parent }}</p>
+ {% endif %}
+
+ {{ permalink }}
+ </footer>
+
+ <div{{ content_attributes.addClass('content') }}>
+ {% if title %}
+ {{ title_prefix }}
+ <h3{{ title_attributes }}>{{ title }}</h3>
+ {{ title_suffix }}
+ {% endif %}
+ {{ content }}
+ </div>
+</article>
diff --git a/web/core/themes/claro/templates/classy/content/links--node.html.twig b/web/core/themes/claro/templates/classy/content/links--node.html.twig
new file mode 100644
index 0000000000..e6cda0d7bb
--- /dev/null
+++ b/web/core/themes/claro/templates/classy/content/links--node.html.twig
@@ -0,0 +1,40 @@
+{#
+/**
+ * @file
+ * Theme override to display node links.
+ *
+ * Available variables:
+ * - attributes: Attributes for the UL containing the list of links.
+ * - links: Links to be output.
+ * Each link will have the following elements:
+ * - link: (optional) A render array that returns a link. See
+ * template_preprocess_links() for details how it is generated.
+ * - text: The link text.
+ * - attributes: HTML attributes for the list item element.
+ * - text_attributes: (optional) HTML attributes for the span element if no
+ * 'url' was supplied.
+ * - heading: (optional) A heading to precede the links.
+ * - text: The heading text.
+ * - level: The heading level (e.g. 'h2', 'h3').
+ * - attributes: (optional) A keyed list of attributes for the heading.
+ * If the heading is a string, it will be used as the text of the heading and
+ * the level will default to 'h2'.
+ *
+ * Headings should be used on navigation menus and any list of links that
+ * consistently appears on multiple pages. To make the heading invisible use
+ * the 'visually-hidden' CSS class. Do not use 'display:none', which
+ * removes it from screen readers and assistive technology. Headings allow
+ * screen reader and keyboard only users to navigate to or skip the links.
+ * See http://juicystudio.com/article/screen-readers-display-none.php and
+ * http://www.w3.org/TR/WCAG-TECHS/H42.html for more information.
+ *
+ * @see template_preprocess_links()
+ *
+ * @ingroup themeable
+ */
+#}
+{% if links %}
+ <div class="node__links">
+ {% include "links.html.twig" %}
+ </div>
+{% endif %}
diff --git a/web/core/themes/claro/templates/classy/content/mark.html.twig b/web/core/themes/claro/templates/classy/content/mark.html.twig
new file mode 100644
index 0000000000..9219915ce5
--- /dev/null
+++ b/web/core/themes/claro/templates/classy/content/mark.html.twig
@@ -0,0 +1,20 @@
+{#
+/**
+ * @file
+ * Theme override for a marker for new or updated content.
+ *
+ * Available variables:
+ * - status: Number representing the marker status to display. Use the constants
+ * below for comparison:
+ * - MARK_NEW
+ * - MARK_UPDATED
+ * - MARK_READ
+ */
+#}
+{% if logged_in %}
+ {% if status is constant('MARK_NEW') %}
+ <span class="marker">{{ 'New'|t }}</span>
+ {% elseif status is constant('MARK_UPDATED') %}
+ <span class="marker">{{ 'Updated'|t }}</span>
+ {% endif %}
+{% endif %}
diff --git a/web/core/themes/claro/templates/classy/content/media-embed-error.html.twig b/web/core/themes/claro/templates/classy/content/media-embed-error.html.twig
new file mode 100644
index 0000000000..048d2ac70a
--- /dev/null
+++ b/web/core/themes/claro/templates/classy/content/media-embed-error.html.twig
@@ -0,0 +1,21 @@
+{#
+/**
+ * @file
+ * Theme override for a missing media error.
+ *
+ * Available variables
+ * - message: The message text.
+ * - attributes: HTML attributes for the containing element.
+ *
+ * When a response from the back end can't be returned, a related error message
+ * is displayed from JavaScript.
+ *
+ * @see Drupal.theme.mediaEmbedPreviewError
+ *
+ * @ingroup themeable
+ */
+#}
+{{ attach_library('claro/classy.media_embed_error') }}
+<div{{ attributes.addClass('media-embed-error', 'media-embed-error--missing-source') }}>
+ {{ message }}
+</div>
diff --git a/web/core/themes/claro/templates/classy/content/media.html.twig b/web/core/themes/claro/templates/classy/content/media.html.twig
new file mode 100644
index 0000000000..422030e9d0
--- /dev/null
+++ b/web/core/themes/claro/templates/classy/content/media.html.twig
@@ -0,0 +1,28 @@
+{#
+/**
+ * @file
+ * Theme override to display a media item.
+ *
+ * Available variables:
+ * - name: Name of the media.
+ * - content: Media content.
+ *
+ * @see template_preprocess_media()
+ *
+ * @ingroup themeable
+ */
+#}
+{%
+ set classes = [
+ 'media',
+ 'media--type-' ~ media.bundle()|clean_class,
+ not media.isPublished() ? 'media--unpublished',
+ view_mode ? 'media--view-mode-' ~ view_mode|clean_class,
+ ]
+%}
+<article{{ attributes.addClass(classes) }}>
+ {{ title_suffix.contextual_links }}
+ {% if content %}
+ {{ content }}
+ {% endif %}
+</article>
diff --git a/web/core/themes/claro/templates/classy/content/node.html.twig b/web/core/themes/claro/templates/classy/content/node.html.twig
new file mode 100644
index 0000000000..9dcf7421ed
--- /dev/null
+++ b/web/core/themes/claro/templates/classy/content/node.html.twig
@@ -0,0 +1,108 @@
+{#
+/**
+ * @file
+ * Theme override to display a node.
+ *
+ * Available variables:
+ * - node: The node entity with limited access to object properties and methods.
+ * Only method names starting with "get", "has", or "is" and a few common
+ * methods such as "id", "label", and "bundle" are available. For example:
+ * - node.getCreatedTime() will return the node creation timestamp.
+ * - node.hasField('field_example') returns TRUE if the node bundle includes
+ * field_example. (This does not indicate the presence of a value in this
+ * field.)
+ * - node.isPublished() will return whether the node is published or not.
+ * Calling other methods, such as node.delete(), will result in an exception.
+ * See \Drupal\node\Entity\Node for a full list of public properties and
+ * methods for the node object.
+ * - label: (optional) The title of the node.
+ * - content: All node items. Use {{ content }} to print them all,
+ * or print a subset such as {{ content.field_example }}. Use
+ * {{ content|without('field_example') }} to temporarily suppress the printing
+ * of a given child element.
+ * - author_picture: The node author user entity, rendered using the "compact"
+ * view mode.
+ * - metadata: Metadata for this node.
+ * - date: (optional) Themed creation date field.
+ * - author_name: (optional) Themed author name field.
+ * - url: Direct URL of the current node.
+ * - display_submitted: Whether submission information should be displayed.
+ * - attributes: HTML attributes for the containing element.
+ * The attributes.class element may contain one or more of the following
+ * classes:
+ * - node: The current template type (also known as a "theming hook").
+ * - node--type-[type]: The current node type. For example, if the node is an
+ * "Article" it would result in "node--type-article". Note that the machine
+ * name will often be in a short form of the human readable label.
+ * - node--view-mode-[view_mode]: The View Mode of the node; for example, a
+ * teaser would result in: "node--view-mode-teaser", and
+ * full: "node--view-mode-full".
+ * The following are controlled through the node publishing options.
+ * - node--promoted: Appears on nodes promoted to the front page.
+ * - node--sticky: Appears on nodes ordered above other non-sticky nodes in
+ * teaser listings.
+ * - node--unpublished: Appears on unpublished nodes visible only to site
+ * admins.
+ * - title_attributes: Same as attributes, except applied to the main title
+ * tag that appears in the template.
+ * - content_attributes: Same as attributes, except applied to the main
+ * content tag that appears in the template.
+ * - author_attributes: Same as attributes, except applied to the author of
+ * the node tag that appears in the template.
+ * - title_prefix: Additional output populated by modules, intended to be
+ * displayed in front of the main title tag that appears in the template.
+ * - title_suffix: Additional output populated by modules, intended to be
+ * displayed after the main title tag that appears in the template.
+ * - view_mode: View mode; for example, "teaser" or "full".
+ * - teaser: Flag for the teaser state. Will be true if view_mode is 'teaser'.
+ * - page: Flag for the full page state. Will be true if view_mode is 'full'.
+ * - readmore: Flag for more state. Will be true if the teaser content of the
+ * node cannot hold the main body content.
+ * - logged_in: Flag for authenticated user status. Will be true when the
+ * current user is a logged-in member.
+ * - is_admin: Flag for admin user status. Will be true when the current user
+ * is an administrator.
+ *
+ * @see template_preprocess_node()
+ *
+ * @todo Remove the id attribute (or make it a class), because if that gets
+ * rendered twice on a page this is invalid CSS for example: two lists
+ * in different view modes.
+ */
+#}
+{%
+ set classes = [
+ 'node',
+ 'node--type-' ~ node.bundle|clean_class,
+ node.isPromoted() ? 'node--promoted',
+ node.isSticky() ? 'node--sticky',
+ not node.isPublished() ? 'node--unpublished',
+ view_mode ? 'node--view-mode-' ~ view_mode|clean_class,
+ ]
+%}
+{{ attach_library('claro/classy.node') }}
+<article{{ attributes.addClass(classes) }}>
+
+ {{ title_prefix }}
+ {% if label and not page %}
+ <h2{{ title_attributes }}>
+ <a href="{{ url }}" rel="bookmark">{{ label }}</a>
+ </h2>
+ {% endif %}
+ {{ title_suffix }}
+
+ {% if display_submitted %}
+ <footer class="node__meta">
+ {{ author_picture }}
+ <div{{ author_attributes.addClass('node__submitted') }}>
+ {% trans %}Submitted by {{ author_name }} on {{ date }}{% endtrans %}
+ {{ metadata }}
+ </div>
+ </footer>
+ {% endif %}
+
+ <div{{ content_attributes.addClass('node__content') }}>
+ {{ content }}
+ </div>
+
+</article>
diff --git a/web/core/themes/claro/templates/classy/content/page-title.html.twig b/web/core/themes/claro/templates/classy/content/page-title.html.twig
new file mode 100644
index 0000000000..e1de726607
--- /dev/null
+++ b/web/core/themes/claro/templates/classy/content/page-title.html.twig
@@ -0,0 +1,19 @@
+{#
+/**
+ * @file
+ * Theme override for page titles.
+ *
+ * Available variables:
+ * - title_attributes: HTML attributes for the page title element.
+ * - title_prefix: Additional output populated by modules, intended to be
+ * displayed in front of the main title tag that appears in the template.
+ * - title: The page title, for use in the actual content.
+ * - title_suffix: Additional output populated by modules, intended to be
+ * displayed after the main title tag that appears in the template.
+ */
+#}
+{{ title_prefix }}
+{% if title %}
+ <h1{{ title_attributes.addClass('page-title') }}>{{ title }}</h1>
+{% endif %}
+{{ title_suffix }}
diff --git a/web/core/themes/claro/templates/classy/content/search-result.html.twig b/web/core/themes/claro/templates/classy/content/search-result.html.twig
new file mode 100644
index 0000000000..d478f572f8
--- /dev/null
+++ b/web/core/themes/claro/templates/classy/content/search-result.html.twig
@@ -0,0 +1,72 @@
+{#
+/**
+ * @file
+ * Theme override for displaying a single search result.
+ *
+ * This template renders a single search result. The list of results is
+ * rendered using '#theme' => 'item_list', with suggestions of:
+ * - item_list__search_results__(plugin_id)
+ * - item_list__search_results
+ *
+ * Available variables:
+ * - url: URL of the result.
+ * - title: Title of the result.
+ * - snippet: A small preview of the result. Does not apply to user searches.
+ * - info: String of all the meta information ready for print. Does not apply
+ * to user searches.
+ * - plugin_id: The machine-readable name of the plugin being executed,such
+ * as "node_search" or "user_search".
+ * - title_prefix: Additional output populated by modules, intended to be
+ * displayed in front of the main title tag that appears in the template.
+ * - title_suffix: Additional output populated by modules, intended to be
+ * displayed after the main title tag that appears in the template.
+ * - info_split: Contains same data as info, but split into separate parts.
+ * - info_split.type: Node type (or item type string supplied by module).
+ * - info_split.user: Author of the node linked to users profile. Depends
+ * on permission.
+ * - info_split.date: Last update of the node. Short formatted.
+ * - info_split.comment: Number of comments output as "% comments", %
+ * being the count. (Depends on comment.module).
+ * @todo The info variable needs to be made drillable and each of these sub
+ * items should instead be within info and renamed info.foo, info.bar, etc.
+ *
+ * Other variables:
+ * - title_attributes: HTML attributes for the title.
+ * - content_attributes: HTML attributes for the content.
+ *
+ * Since info_split is keyed, a direct print of the item is possible.
+ * This array does not apply to user searches so it is recommended to check
+ * for its existence before printing. The default keys of 'type', 'user' and
+ * 'date' always exist for node searches. Modules may provide other data.
+ * @code
+ * {% if (info_split.comment) %}
+ * <span class="info-comment">
+ * {{ info_split.comment }}
+ * </span>
+ * {% endif %}
+ * @endcode
+ *
+ * To check for all available data within info_split, use the code below.
+ * @code
+ * <pre>
+ * {{ dump(info_split) }}
+ * </pre>
+ * @endcode
+ *
+ * @see template_preprocess_search_result()
+ */
+#}
+{{ attach_library('claro/classy.search-results') }}
+{{ title_prefix }}
+<h3{{ title_attributes.addClass('search-result__title') }}>
+ <a href="{{ url }}">{{ title }}</a>
+</h3>
+{{ title_suffix }}
+<div class="search-result__snippet-info">
+ {% if snippet %}
+ <p{{ content_attributes.addClass('search-result__snippet') }}>{{ snippet }}</p>
+ {% endif %}
+ {% if info %}
+ <p class="search-result__info">{{ info }}</p>
+ {% endif %}
+</div>
diff --git a/web/core/themes/claro/templates/classy/content/taxonomy-term.html.twig b/web/core/themes/claro/templates/classy/content/taxonomy-term.html.twig
new file mode 100644
index 0000000000..6478b507d0
--- /dev/null
+++ b/web/core/themes/claro/templates/classy/content/taxonomy-term.html.twig
@@ -0,0 +1,41 @@
+{#
+/**
+ * @file
+ * Theme override to display a taxonomy term.
+ *
+ * Available variables:
+ * - url: URL of the current term.
+ * - name: (optional) Name of the current term.
+ * - content: Items for the content of the term (fields and description).
+ * Use 'content' to print them all, or print a subset such as
+ * 'content.description'. Use the following code to exclude the
+ * printing of a given child element:
+ * @code
+ * {{ content|without('description') }}
+ * @endcode
+ * - attributes: HTML attributes for the wrapper.
+ * - page: Flag for the full page state.
+ * - term: The taxonomy term entity, including:
+ * - id: The ID of the taxonomy term.
+ * - bundle: Machine name of the current vocabulary.
+ * - view_mode: View mode, e.g. 'full', 'teaser', etc.
+ *
+ * @see template_preprocess_taxonomy_term()
+ */
+#}
+{%
+ set classes = [
+ 'taxonomy-term',
+ 'vocabulary-' ~ term.bundle|clean_class,
+ ]
+%}
+<div{{ attributes.setAttribute('id', 'taxonomy-term-' ~ term.id).addClass(classes) }}>
+ {{ title_prefix }}
+ {% if name and not page %}
+ <h2><a href="{{ url }}">{{ name }}</a></h2>
+ {% endif %}
+ {{ title_suffix }}
+ <div class="content">
+ {{ content }}
+ </div>
+</div>
diff --git a/web/core/themes/claro/templates/classy/dataset/aggregator-feed.html.twig b/web/core/themes/claro/templates/classy/dataset/aggregator-feed.html.twig
new file mode 100644
index 0000000000..9eacccb604
--- /dev/null
+++ b/web/core/themes/claro/templates/classy/dataset/aggregator-feed.html.twig
@@ -0,0 +1,36 @@
+{#
+/**
+ * @file
+ * Theme override to present an aggregator feed.
+ *
+ * The contents are rendered above feed listings when browsing source feeds.
+ * For example, "example.com/aggregator/sources/1".
+ *
+ * Available variables:
+ * - title: (optional) Title of the feed item.
+ * - content: All field items. Use {{ content }} to print them all,
+ * or print a subset such as {{ content.field_example }}. Use
+ * {{ content|without('field_example') }} to temporarily suppress the printing
+ * of a given element.
+ * - attributes: HTML attributes for the wrapper.
+ * - title_attributes: Same as attributes, except applied to the main title
+ * tag that appears in the template.
+ * - title_prefix: Additional output populated by modules, intended to be
+ * displayed in front of the main title tag that appears in the template.
+ * - title_suffix: Additional output populated by modules, intended to be
+ * displayed after the main title tag that appears in the template.
+ *
+ * @see template_preprocess_aggregator_feed()
+ */
+#}
+<div{{ attributes.addClass('aggregator-feed') }}>
+
+ {{ title_prefix }}
+ {% if title and not full %}
+ <h2{{ title_attributes }}>{{ title }}</h2>
+ {% endif %}
+ {{ title_suffix }}
+
+ {{ content }}
+
+</div>
diff --git a/web/core/themes/claro/templates/classy/dataset/forum-icon.html.twig b/web/core/themes/claro/templates/classy/dataset/forum-icon.html.twig
new file mode 100644
index 0000000000..d6be503bb2
--- /dev/null
+++ b/web/core/themes/claro/templates/classy/dataset/forum-icon.html.twig
@@ -0,0 +1,30 @@
+{#
+/**
+ * @file
+ * Theme override to display a status icon for a forum post.
+ *
+ * Available variables:
+ * - attributes: HTML attributes to be applied to the wrapper element.
+ * - class: HTML classes that determine which icon to display. May be one of
+ * 'hot', 'hot-new', 'new', 'default', 'closed', or 'sticky'.
+ * - title: Text alternative for the forum icon.
+ * - icon_title: Text alternative for the forum icon, same as above.
+ * - new_posts: '1' when this topic contains new posts, otherwise '0'.
+ * - first_new: '1' when this is the first topic with new posts, otherwise '0'.
+ * - icon_status: Indicates which status icon should be used.
+ *
+ * @see template_preprocess_forum_icon()
+ */
+#}
+{%
+ set classes = [
+ 'forum__icon',
+ 'forum__topic-status--' ~ icon_status,
+ ]
+%}
+<div{{ attributes.addClass(classes) }}>
+ {% if first_new -%}
+ <a id="new"></a>
+ {%- endif %}
+ <span class="visually-hidden">{{ icon_title }}</span>
+</div>
diff --git a/web/core/themes/claro/templates/classy/dataset/forum-list.html.twig b/web/core/themes/claro/templates/classy/dataset/forum-list.html.twig
new file mode 100644
index 0000000000..ce610bb49b
--- /dev/null
+++ b/web/core/themes/claro/templates/classy/dataset/forum-list.html.twig
@@ -0,0 +1,79 @@
+{#
+/**
+ * @file
+ * Theme override to display a list of forums and containers.
+ *
+ * Available variables:
+ * - forums: A collection of forums and containers to display. It is keyed to
+ * the numeric IDs of all child forums and containers. Each forum in forums
+ * contains:
+ * - is_container: A flag indicating if the forum can contain other
+ * forums. Otherwise, the forum can only contain topics.
+ * - depth: How deep the forum is in the current hierarchy.
+ * - zebra: 'even' or 'odd', used for row class.
+ * - icon_class: 'default' or 'new', used for forum icon class.
+ * - icon_title: Text alternative for the forum icon.
+ * - name: The name of the forum.
+ * - link: The URL to link to this forum.
+ * - description: The description field for the forum, containing:
+ * - value: The descriptive text for the forum.
+ * - new_topics: A flag indicating if the forum contains unread posts.
+ * - new_url: A URL to the forum's unread posts.
+ * - new_text: Text for the above URL, which tells how many new posts.
+ * - old_topics: A count of posts that have already been read.
+ * - num_posts: The total number of posts in the forum.
+ * - last_reply: Text representing the last time a forum was posted or
+ * commented in.
+ * - forum_id: Forum ID for the current forum. Parent to all items within the
+ * forums array.
+ *
+ * @see template_preprocess_forum_list()
+ */
+#}
+<table id="forum-{{ forum_id }}">
+ <thead>
+ <tr>
+ <th>{{ 'Forum'|t }}</th>
+ <th>{{ 'Topics'|t }}</th>
+ <th>{{ 'Posts'|t }}</th>
+ <th>{{ 'Last post'|t }}</th>
+ </tr>
+ </thead>
+ <tbody>
+ {% for child_id, forum in forums %}
+ <tr id="forum-list-{{ child_id }}" class="{{ forum.zebra }}">
+ <td {% if forum.is_container == true -%}
+ colspan="4" class="container"
+ {%- else -%}
+ class="forum-list__forum"
+ {%- endif -%}>
+ {#
+ Enclose the contents of this cell with X divs, where X is the
+ depth this forum resides at. This will allow us to use CSS
+ left-margin for indenting.
+ #}
+ {% for i in 1..forum.depth if forum.depth > 0 %}<div class="indented">{% endfor %}
+ <div class="forum__icon forum-status-{{ forum.icon_class }}" title="{{ forum.icon_title }}">
+ <span class="visually-hidden">{{ forum.icon_title }}</span>
+ </div>
+ <div class="forum__name"><a href="{{ forum.link }}">{{ forum.label }}</a></div>
+ {% if forum.description.value %}
+ <div class="forum__description">{{ forum.description.value }}</div>
+ {% endif %}
+ {% for i in 1..forum.depth if forum.depth > 0 %}</div>{% endfor %}
+ </td>
+ {% if forum.is_container == false %}
+ <td class="forum__topics">
+ {{ forum.num_topics }}
+ {% if forum.new_topics == true %}
+ <br />
+ <a href="{{ forum.new_url }}">{{ forum.new_text }}</a>
+ {% endif %}
+ </td>
+ <td class="forum__posts">{{ forum.num_posts }}</td>
+ <td class="forum__last-reply">{{ forum.last_reply }}</td>
+ {% endif %}
+ </tr>
+ {% endfor %}
+ </tbody>
+</table>
diff --git a/web/core/themes/claro/templates/classy/dataset/forums.html.twig b/web/core/themes/claro/templates/classy/dataset/forums.html.twig
new file mode 100644
index 0000000000..438c98cbba
--- /dev/null
+++ b/web/core/themes/claro/templates/classy/dataset/forums.html.twig
@@ -0,0 +1,24 @@
+{#
+/**
+ * @file
+ * Theme override to display a forum.
+ *
+ * May contain forum containers as well as forum topics.
+ *
+ * Available variables:
+ * - forums: The forums to display (as processed by forum-list.html.twig).
+ * - topics: The topics to display.
+ * - topics_pager: The topics pager.
+ * - forums_defined: A flag to indicate that the forums are configured.
+ *
+ * @see template_preprocess_forums()
+ */
+#}
+{{ attach_library('claro/classy.forum') }}
+{% if forums_defined %}
+ <div class="forum">
+ {{ forums }}
+ {{ topics }}
+ {{ topics_pager }}
+ </div>
+{% endif %}
diff --git a/web/core/themes/claro/templates/classy/dataset/item-list--search-results.html.twig b/web/core/themes/claro/templates/classy/dataset/item-list--search-results.html.twig
new file mode 100644
index 0000000000..e9928fd776
--- /dev/null
+++ b/web/core/themes/claro/templates/classy/dataset/item-list--search-results.html.twig
@@ -0,0 +1,29 @@
+{% extends "item-list.html.twig" %}
+{#
+/**
+ * @file
+ * Theme override for an item list of search results.
+ *
+ * Available variables:
+ * - items: A list of items. Each item contains:
+ * - attributes: HTML attributes to be applied to each list item.
+ * - value: The content of the list element.
+ * - title: The title of the list.
+ * - list_type: The tag for list element ("ul" or "ol").
+ * - attributes: HTML attributes to be applied to the list.
+ * - empty: A message to display when there are no items. Allowed value is a
+ * string or render array.
+ * - context: An list of contextual data associated with the list. For search
+ * results, the following data is set:
+ * - plugin: The search plugin ID, for example "node_search".
+ *
+ * @see template_preprocess_item_list()
+ */
+#}
+{%
+ set classes = [
+ 'search-results',
+ context.plugin ~ '-results',
+ ]
+%}
+{% set attributes = attributes.addClass(classes) %}
diff --git a/web/core/themes/claro/templates/classy/dataset/item-list.html.twig b/web/core/themes/claro/templates/classy/dataset/item-list.html.twig
new file mode 100644
index 0000000000..20541b0b7e
--- /dev/null
+++ b/web/core/themes/claro/templates/classy/dataset/item-list.html.twig
@@ -0,0 +1,41 @@
+{#
+/**
+ * @file
+ * Theme override for an item list.
+ *
+ * Available variables:
+ * - items: A list of items. Each item contains:
+ * - attributes: HTML attributes to be applied to each list item.
+ * - value: The content of the list element.
+ * - title: The title of the list.
+ * - list_type: The tag for list element ("ul" or "ol").
+ * - wrapper_attributes: HTML attributes to be applied to the list wrapper.
+ * - attributes: HTML attributes to be applied to the list.
+ * - empty: A message to display when there are no items. Allowed value is a
+ * string or render array.
+ * - context: A list of contextual data associated with the list. May contain:
+ * - list_style: The custom list style.
+ *
+ * @see template_preprocess_item_list()
+ */
+#}
+{% if context.list_style %}
+ {%- set wrapper_attributes = wrapper_attributes.addClass('item-list--' ~ context.list_style) %}
+ {%- set attributes = attributes.addClass('item-list__' ~ context.list_style) %}
+{% endif %}
+{% if items or empty -%}
+ <div{{ wrapper_attributes.addClass('item-list') }}>
+ {%- if title is not empty -%}
+ <h3>{{ title }}</h3>
+ {%- endif -%}
+ {%- if items -%}
+ <{{ list_type }}{{ attributes }}>
+ {%- for item in items -%}
+ <li{{ item.attributes }}>{{ item.value }}</li>
+ {%- endfor -%}
+ </{{ list_type }}>
+ {%- else -%}
+ {{- empty -}}
+ {%- endif -%}
+ </div>
+{%- endif %}
diff --git a/web/core/themes/claro/templates/classy/dataset/table.html.twig b/web/core/themes/claro/templates/classy/dataset/table.html.twig
new file mode 100644
index 0000000000..2afa9c1556
--- /dev/null
+++ b/web/core/themes/claro/templates/classy/dataset/table.html.twig
@@ -0,0 +1,113 @@
+{#
+/**
+ * @file
+ * Theme override to display a table.
+ *
+ * Available variables:
+ * - attributes: HTML attributes to apply to the <table> tag.
+ * - caption: A localized string for the <caption> tag.
+ * - colgroups: Column groups. Each group contains the following properties:
+ * - attributes: HTML attributes to apply to the <col> tag.
+ * Note: Drupal currently supports only one table header row, see
+ * https://www.drupal.org/node/893530 and
+ * http://api.drupal.org/api/drupal/includes!theme.inc/function/theme_table/7#comment-5109.
+ * - header: Table header cells. Each cell contains the following properties:
+ * - tag: The HTML tag name to use; either 'th' or 'td'.
+ * - attributes: HTML attributes to apply to the tag.
+ * - content: A localized string for the title of the column.
+ * - field: Field name (required for column sorting).
+ * - sort: Default sort order for this column ("asc" or "desc").
+ * - sticky: A flag indicating whether to use a "sticky" table header.
+ * - rows: Table rows. Each row contains the following properties:
+ * - attributes: HTML attributes to apply to the <tr> tag.
+ * - data: Table cells.
+ * - no_striping: A flag indicating that the row should receive no
+ * 'even / odd' styling. Defaults to FALSE.
+ * - cells: Table cells of the row. Each cell contains the following keys:
+ * - tag: The HTML tag name to use; either 'th' or 'td'.
+ * - attributes: Any HTML attributes, such as "colspan", to apply to the
+ * table cell.
+ * - content: The string to display in the table cell.
+ * - active_table_sort: A boolean indicating whether the cell is the active
+ table sort.
+ * - footer: Table footer rows, in the same format as the rows variable.
+ * - empty: The message to display in an extra row if table does not have
+ * any rows.
+ * - no_striping: A boolean indicating that the row should receive no striping.
+ * - header_columns: The number of columns in the header.
+ *
+ * @see template_preprocess_table()
+ */
+#}
+<table{{ attributes }}>
+ {% if caption %}
+ <caption>{{ caption }}</caption>
+ {% endif %}
+
+ {% for colgroup in colgroups %}
+ {% if colgroup.cols %}
+ <colgroup{{ colgroup.attributes }}>
+ {% for col in colgroup.cols %}
+ <col{{ col.attributes }} />
+ {% endfor %}
+ </colgroup>
+ {% else %}
+ <colgroup{{ colgroup.attributes }} />
+ {% endif %}
+ {% endfor %}
+
+ {% if header %}
+ <thead>
+ <tr>
+ {% for cell in header %}
+ {%
+ set cell_classes = [
+ cell.active_table_sort ? 'is-active',
+ ]
+ %}
+ <{{ cell.tag }}{{ cell.attributes.addClass(cell_classes) }}>
+ {{- cell.content -}}
+ </{{ cell.tag }}>
+ {% endfor %}
+ </tr>
+ </thead>
+ {% endif %}
+
+ {% if rows %}
+ <tbody>
+ {% for row in rows %}
+ {%
+ set row_classes = [
+ not no_striping ? cycle(['odd', 'even'], loop.index0),
+ ]
+ %}
+ <tr{{ row.attributes.addClass(row_classes) }}>
+ {% for cell in row.cells %}
+ <{{ cell.tag }}{{ cell.attributes }}>
+ {{- cell.content -}}
+ </{{ cell.tag }}>
+ {% endfor %}
+ </tr>
+ {% endfor %}
+ </tbody>
+ {% elseif empty %}
+ <tbody>
+ <tr class="odd">
+ <td colspan="{{ header_columns }}" class="empty message">{{ empty }}</td>
+ </tr>
+ </tbody>
+ {% endif %}
+ {% if footer %}
+ <tfoot>
+ {% for row in footer %}
+ <tr{{ row.attributes }}>
+ {% for cell in row.cells %}
+ <{{ cell.tag }}{{ cell.attributes }}>
+ {{- cell.content -}}
+ </{{ cell.tag }}>
+ {% endfor %}
+ </tr>
+ {% endfor %}
+ </tfoot>
+ {% endif %}
+</table>
diff --git a/web/core/themes/claro/templates/classy/field/field--comment.html.twig b/web/core/themes/claro/templates/classy/field/field--comment.html.twig
new file mode 100644
index 0000000000..1ec3ee64b1
--- /dev/null
+++ b/web/core/themes/claro/templates/classy/field/field--comment.html.twig
@@ -0,0 +1,57 @@
+{#
+/**
+ * @file
+ * Theme override for comment fields.
+ *
+ * Available variables:
+ * - attributes: HTML attributes for the containing element.
+ * - label_hidden: Whether to show the field label or not.
+ * - title_attributes: HTML attributes for the title.
+ * - label: The label for the field.
+ * - title_prefix: Additional output populated by modules, intended to be
+ * displayed in front of the main title tag that appears in the template.
+ * - title_suffix: Additional title output populated by modules, intended to
+ * be displayed after the main title tag that appears in the template.
+ * - comments: List of comments rendered through comment.html.twig.
+ * - comment_form: The 'Add new comment' form.
+ * - comment_display_mode: Is the comments are threaded.
+ * - comment_type: The comment type bundle ID for the comment field.
+ * - entity_type: The entity type to which the field belongs.
+ * - field_name: The name of the field.
+ * - field_type: The type of the field.
+ * - label_display: The display settings for the label.
+ *
+ * @see template_preprocess_field()
+ * @see comment_preprocess_field()
+ */
+#}
+{%
+ set classes = [
+ 'field',
+ 'field--name-' ~ field_name|clean_class,
+ 'field--type-' ~ field_type|clean_class,
+ 'field--label-' ~ label_display,
+ 'comment-wrapper',
+ ]
+%}
+{%
+ set title_classes = [
+ 'title',
+ label_display == 'visually_hidden' ? 'visually-hidden',
+ ]
+%}
+<section{{ attributes.addClass(classes) }}>
+ {% if comments and not label_hidden %}
+ {{ title_prefix }}
+ <h2{{ title_attributes.addClass(title_classes) }}>{{ label }}</h2>
+ {{ title_suffix }}
+ {% endif %}
+
+ {{ comments }}
+
+ {% if comment_form %}
+ <h2 class="title comment-form__title">{{ 'Add new comment'|t }}</h2>
+ {{ comment_form }}
+ {% endif %}
+
+</section>
diff --git a/web/core/themes/claro/templates/classy/field/field--node--created.html.twig b/web/core/themes/claro/templates/classy/field/field--node--created.html.twig
new file mode 100644
index 0000000000..72d5d6737d
--- /dev/null
+++ b/web/core/themes/claro/templates/classy/field/field--node--created.html.twig
@@ -0,0 +1,34 @@
+{#
+/**
+ * @file
+ * Theme override for the node created field.
+ *
+ * This is an override of field.html.twig for the node created field. See that
+ * template for documentation about its details and overrides.
+ *
+ * Available variables:
+ * - attributes: HTML attributes for the containing span element.
+ * - items: List of all the field items. Each item contains:
+ * - attributes: List of HTML attributes for each item.
+ * - content: The field item content.
+ * - entity_type: The entity type to which the field belongs.
+ * - field_name: The name of the field.
+ * - field_type: The type of the field.
+ * - label_display: The display settings for the label.
+ *
+ * @see field.html.twig
+ */
+#}
+{%
+ set classes = [
+ 'field',
+ 'field--name-' ~ field_name|clean_class,
+ 'field--type-' ~ field_type|clean_class,
+ 'field--label-' ~ label_display,
+ ]
+%}
+<span{{ attributes.addClass(classes) }}>
+ {%- for item in items -%}
+ {{ item.content }}
+ {%- endfor -%}
+</span>
diff --git a/web/core/themes/claro/templates/classy/field/field--node--title.html.twig b/web/core/themes/claro/templates/classy/field/field--node--title.html.twig
new file mode 100644
index 0000000000..33b105f50b
--- /dev/null
+++ b/web/core/themes/claro/templates/classy/field/field--node--title.html.twig
@@ -0,0 +1,34 @@
+{#
+/**
+ * @file
+ * Theme override for the node title field.
+ *
+ * This is an override of field.html.twig for the node title field. See that
+ * template for documentation about its details and overrides.
+ *
+ * Available variables:
+ * - attributes: HTML attributes for the containing span element.
+ * - items: List of all the field items. Each item contains:
+ * - attributes: List of HTML attributes for each item.
+ * - content: The field item content.
+ * - entity_type: The entity type to which the field belongs.
+ * - field_name: The name of the field.
+ * - field_type: The type of the field.
+ * - label_display: The display settings for the label.
+ *
+ * @see field.html.twig
+ */
+#}
+{%
+ set classes = [
+ 'field',
+ 'field--name-' ~ field_name|clean_class,
+ 'field--type-' ~ field_type|clean_class,
+ 'field--label-' ~ label_display,
+ ]
+%}
+<span{{ attributes.addClass(classes) }}>
+ {%- for item in items -%}
+ {{ item.content }}
+ {%- endfor -%}
+</span>
diff --git a/web/core/themes/claro/templates/classy/field/field--node--uid.html.twig b/web/core/themes/claro/templates/classy/field/field--node--uid.html.twig
new file mode 100644
index 0000000000..9afc591b71
--- /dev/null
+++ b/web/core/themes/claro/templates/classy/field/field--node--uid.html.twig
@@ -0,0 +1,34 @@
+{#
+/**
+ * @file
+ * Theme override for the node user field.
+ *
+ * This is an override of field.html.twig for the node user field. See that
+ * template for documentation about its details and overrides.
+ *
+ * Available variables:
+ * - attributes: HTML attributes for the containing span element.
+ * - items: List of all the field items. Each item contains:
+ * - attributes: List of HTML attributes for each item.
+ * - content: The field item content.
+ * - entity_type: The entity type to which the field belongs.
+ * - field_name: The name of the field.
+ * - field_type: The type of the field.
+ * - label_display: The display settings for the label.
+ *
+ * @see field.html.twig
+ */
+#}
+{%
+ set classes = [
+ 'field',
+ 'field--name-' ~ field_name|clean_class,
+ 'field--type-' ~ field_type|clean_class,
+ 'field--label-' ~ label_display,
+ ]
+%}
+<span{{ attributes.addClass(classes) }}>
+ {%- for item in items -%}
+ {{ item.content }}
+ {%- endfor -%}
+</span>
diff --git a/web/core/themes/claro/templates/classy/field/field--text-long.html.twig b/web/core/themes/claro/templates/classy/field/field--text-long.html.twig
new file mode 100644
index 0000000000..07ce721d2d
--- /dev/null
+++ b/web/core/themes/claro/templates/classy/field/field--text-long.html.twig
@@ -0,0 +1 @@
+{% extends "field--text.html.twig" %}
diff --git a/web/core/themes/claro/templates/classy/field/field--text-with-summary.html.twig b/web/core/themes/claro/templates/classy/field/field--text-with-summary.html.twig
new file mode 100644
index 0000000000..07ce721d2d
--- /dev/null
+++ b/web/core/themes/claro/templates/classy/field/field--text-with-summary.html.twig
@@ -0,0 +1 @@
+{% extends "field--text.html.twig" %}
diff --git a/web/core/themes/claro/templates/classy/field/field--text.html.twig b/web/core/themes/claro/templates/classy/field/field--text.html.twig
new file mode 100644
index 0000000000..5d1690c3ec
--- /dev/null
+++ b/web/core/themes/claro/templates/classy/field/field--text.html.twig
@@ -0,0 +1,28 @@
+{% extends "field.html.twig" %}
+{#
+/**
+ * @file
+ * Default theme implementation for a text field.
+ *
+ * A 'clearfix' class is added, because 'text' fields have a 'format' property
+ * that allows a Text Format to be associated with the entered text, which then
+ * applies filtering on output. A common use case is to align images to the left
+ * or right, and without this 'clearfix' class, such aligned images may be
+ * rendered outside of the 'text' field formatter's boundaries, and hence
+ * overlap with other fields. By setting the 'clearfix' class on all 'text'
+ * fields, we prevent that.
+ *
+ * @see https://www.drupal.org/node/2358529
+ *
+ * A 'text-formatted' class is added to assist with default styling of base
+ * elements such as paragraphs and lists that may not have classes assigned to
+ * them. This allows user entered content to have default styling without
+ * interfering with the styles of other UI components such as system generated
+ * lists or other dynamic content.
+ *
+ * @see https://www.drupal.org/node/2539860
+ *
+ * @ingroup themeable
+ */
+#}
+{% set attributes = attributes.addClass('clearfix', 'text-formatted') %}
diff --git a/web/core/themes/claro/templates/classy/field/field.html.twig b/web/core/themes/claro/templates/classy/field/field.html.twig
new file mode 100644
index 0000000000..1cfbd651ce
--- /dev/null
+++ b/web/core/themes/claro/templates/classy/field/field.html.twig
@@ -0,0 +1,81 @@
+{#
+/**
+ * @file
+ * Theme override for a field.
+ *
+ * To override output, copy the "field.html.twig" from the templates directory
+ * to your theme's directory and customize it, just like customizing other
+ * Drupal templates such as page.html.twig or node.html.twig.
+ *
+ * Instead of overriding the theming for all fields, you can also just override
+ * theming for a subset of fields using
+ * @link themeable Theme hook suggestions. @endlink For example,
+ * here are some theme hook suggestions that can be used for a field_foo field
+ * on an article node type:
+ * - field--node--field-foo--article.html.twig
+ * - field--node--field-foo.html.twig
+ * - field--node--article.html.twig
+ * - field--field-foo.html.twig
+ * - field--text-with-summary.html.twig
+ * - field.html.twig
+ *
+ * Available variables:
+ * - attributes: HTML attributes for the containing element.
+ * - label_hidden: Whether to show the field label or not.
+ * - title_attributes: HTML attributes for the title.
+ * - label: The label for the field.
+ * - multiple: TRUE if a field can contain multiple items.
+ * - items: List of all the field items. Each item contains:
+ * - attributes: List of HTML attributes for each item.
+ * - content: The field item's content.
+ * - entity_type: The entity type to which the field belongs.
+ * - field_name: The name of the field.
+ * - field_type: The type of the field.
+ * - label_display: The display settings for the label.
+ *
+ *
+ * @see template_preprocess_field()
+ */
+#}
+{%
+ set classes = [
+ 'field',
+ 'field--name-' ~ field_name|clean_class,
+ 'field--type-' ~ field_type|clean_class,
+ 'field--label-' ~ label_display,
+ label_display == 'inline' ? 'clearfix',
+ ]
+%}
+{%
+ set title_classes = [
+ 'field__label',
+ label_display == 'visually_hidden' ? 'visually-hidden',
+ ]
+%}
+
+{% if label_hidden %}
+ {% if multiple %}
+ <div{{ attributes.addClass(classes, 'field__items') }}>
+ {% for item in items %}
+ <div{{ item.attributes.addClass('field__item') }}>{{ item.content }}</div>
+ {% endfor %}
+ </div>
+ {% else %}
+ {% for item in items %}
+ <div{{ attributes.addClass(classes, 'field__item') }}>{{ item.content }}</div>
+ {% endfor %}
+ {% endif %}
+{% else %}
+ <div{{ attributes.addClass(classes) }}>
+ <div{{ title_attributes.addClass(title_classes) }}>{{ label }}</div>
+ {% if multiple %}
+ <div class="field__items">
+ {% endif %}
+ {% for item in items %}
+ <div{{ item.attributes.addClass('field__item') }}>{{ item.content }}</div>
+ {% endfor %}
+ {% if multiple %}
+ </div>
+ {% endif %}
+ </div>
+{% endif %}
diff --git a/web/core/themes/claro/templates/classy/field/file-audio.html.twig b/web/core/themes/claro/templates/classy/field/file-audio.html.twig
new file mode 100644
index 0000000000..f06e0f7daa
--- /dev/null
+++ b/web/core/themes/claro/templates/classy/field/file-audio.html.twig
@@ -0,0 +1,23 @@
+{#
+/**
+* @file
+* Default theme implementation to display the file entity as an audio tag.
+*
+* Available variables:
+* - attributes: An array of HTML attributes, intended to be added to the
+* audio tag.
+* - files: And array of files to be added as sources for the audio tag. Each
+* element is an array with the following elements:
+* - file: The full file object.
+* - source_attributes: An array of HTML attributes for to be added to the
+* source tag.
+*
+* @ingroup themeable
+*/
+#}
+{{ attach_library('claro/classy.file') }}
+<audio {{ attributes }}>
+ {% for file in files %}
+ <source {{ file.source_attributes }} />
+ {% endfor %}
+</audio>
diff --git a/web/core/themes/claro/templates/classy/field/file-video.html.twig b/web/core/themes/claro/templates/classy/field/file-video.html.twig
new file mode 100644
index 0000000000..d1761ee970
--- /dev/null
+++ b/web/core/themes/claro/templates/classy/field/file-video.html.twig
@@ -0,0 +1,23 @@
+{#
+/**
+* @file
+* Default theme implementation to display the file entity as a video tag.
+*
+* Available variables:
+* - attributes: An array of HTML attributes, intended to be added to the
+* video tag.
+* - files: And array of files to be added as sources for the video tag. Each
+* element is an array with the following elements:
+* - file: The full file object.
+* - source_attributes: An array of HTML attributes for to be added to the
+* source tag.
+*
+* @ingroup themeable
+*/
+#}
+{{ attach_library('claro/classy.file') }}
+<video {{ attributes }}>
+ {% for file in files %}
+ <source {{ file.source_attributes }} />
+ {% endfor %}
+</video>
diff --git a/web/core/themes/claro/templates/classy/field/image.html.twig b/web/core/themes/claro/templates/classy/field/image.html.twig
new file mode 100644
index 0000000000..31f782bb60
--- /dev/null
+++ b/web/core/themes/claro/templates/classy/field/image.html.twig
@@ -0,0 +1,18 @@
+{#
+/**
+ * @file
+ * Theme override of an image.
+ *
+ * Available variables:
+ * - attributes: HTML attributes for the img tag.
+ * - style_name: (optional) The name of the image style applied.
+ *
+ * @see template_preprocess_image()
+ */
+#}
+{%
+set classes = [
+ style_name ? 'image-style-' ~ style_name|clean_class,
+]
+%}
+<img{{ attributes.addClass(classes) }} />
diff --git a/web/core/themes/claro/templates/classy/field/link-formatter-link-separate.html.twig b/web/core/themes/claro/templates/classy/field/link-formatter-link-separate.html.twig
new file mode 100644
index 0000000000..cb94264c66
--- /dev/null
+++ b/web/core/themes/claro/templates/classy/field/link-formatter-link-separate.html.twig
@@ -0,0 +1,22 @@
+{#
+/**
+ * @file
+ * Theme override of a link with separate title and URL elements.
+ *
+ * Available variables:
+ * - link: The link that has already been formatted by l().
+ * - title: (optional) A descriptive or alternate title for the link, which may
+ * be different than the actual link text.
+ *
+ * @see template_preprocess()
+ * @see template_preprocess_link_formatter_link_separate()
+ */
+#}
+{% spaceless %}
+ <div class="link-item">
+ {% if title %}
+ <div class="link-title">{{ title }}</div>
+ {% endif %}
+ <div class="link-url">{{ link }}</div>
+ </div>
+{% endspaceless %}
diff --git a/web/core/themes/claro/templates/classy/field/time.html.twig b/web/core/themes/claro/templates/classy/field/time.html.twig
new file mode 100644
index 0000000000..f2912b7f98
--- /dev/null
+++ b/web/core/themes/claro/templates/classy/field/time.html.twig
@@ -0,0 +1,22 @@
+{#
+/**
+ * @file
+ * Theme override for a date / time element.
+ *
+ * Available variables
+ * - timestamp: (optional) A UNIX timestamp for the datetime attribute. If the
+ * datetime cannot be represented as a UNIX timestamp, use a valid datetime
+ * attribute value in attributes.datetime.
+ * - text: (optional) The content to display within the <time> element.
+ * Defaults to a human-readable representation of the timestamp value or the
+ * datetime attribute value using DateFormatter::format().
+ * - attributes: (optional) HTML attributes to apply to the <time> element.
+ * A datetime attribute in 'attributes' overrides the 'timestamp'. To
+ * create a valid datetime attribute value from a UNIX timestamp, use
+ * DateFormatter::format() with one of the predefined 'html_*' formats.
+ *
+ * @see template_preprocess_time()
+ * @see http://www.w3.org/TR/html5-author/the-time-element.html#attr-time-datetime
+ */
+#}
+<time{{ attributes.addClass('datetime') }}>{{ text }}</time>
diff --git a/web/core/themes/claro/templates/classy/form/radios.html.twig b/web/core/themes/claro/templates/classy/form/radios.html.twig
new file mode 100644
index 0000000000..2e4bafd41c
--- /dev/null
+++ b/web/core/themes/claro/templates/classy/form/radios.html.twig
@@ -0,0 +1,13 @@
+{#
+/**
+ * @file
+ * Theme override for a 'radios' #type form element.
+ *
+ * Available variables
+ * - attributes: A list of HTML attributes for the wrapper element.
+ * - children: The rendered radios.
+ *
+ * @see template_preprocess_radios()
+ */
+#}
+<div{{ attributes.addClass('form-radios') }}>{{ children }}</div>
diff --git a/web/core/themes/claro/templates/classy/form/textarea.html.twig b/web/core/themes/claro/templates/classy/form/textarea.html.twig
new file mode 100644
index 0000000000..99e1bde090
--- /dev/null
+++ b/web/core/themes/claro/templates/classy/form/textarea.html.twig
@@ -0,0 +1,25 @@
+{#
+/**
+ * @file
+ * Theme override for a 'textarea' #type form element.
+ *
+ * Available variables
+ * - wrapper_attributes: A list of HTML attributes for the wrapper element.
+ * - attributes: A list of HTML attributes for the <textarea> element.
+ * - resizable: An indicator for whether the textarea is resizable.
+ * - required: An indicator for whether the textarea is required.
+ * - value: The textarea content.
+ *
+ * @see template_preprocess_textarea()
+ */
+#}
+{%
+ set classes = [
+ 'form-textarea',
+ resizable ? 'resize-' ~ resizable,
+ required ? 'required',
+ ]
+%}
+<div{{ wrapper_attributes.addClass('form-textarea-wrapper') }}>
+ <textarea{{ attributes.addClass(classes) }}>{{ value }}</textarea>
+</div>
diff --git a/web/core/themes/claro/templates/classy/layout/book-export-html.html.twig b/web/core/themes/claro/templates/classy/layout/book-export-html.html.twig
new file mode 100644
index 0000000000..ea33648d38
--- /dev/null
+++ b/web/core/themes/claro/templates/classy/layout/book-export-html.html.twig
@@ -0,0 +1,45 @@
+{#
+/**
+ * @file
+ * Theme override for printed version of book outline.
+ *
+ * Available variables:
+ * - title: Top level node title.
+ * - head: Header tags.
+ * - language: Language object.
+ * - language_rtl: A flag indicating whether the current display language is a
+ * right to left language.
+ * - base_url: URL to the home page.
+ * - contents: Nodes within the current outline rendered through
+ * book-node-export-html.html.twig.
+ *
+ * @see template_preprocess_book_export_html()
+ */
+#}
+<!DOCTYPE html>
+<html{{ html_attributes }}>
+ <head>
+ <title>{{ title }}</title>
+ {{ page.head }}
+ <base href="{{ base_url }}" />
+ <link type="text/css" rel="stylesheet" href="misc/print.css" />
+ </head>
+ <body>
+ {#
+ The given node is embedded to its absolute depth in a top level section.
+ For example, a child node with depth 2 in the hierarchy is contained in
+ (otherwise empty) div elements corresponding to depth 0 and depth 1. This
+ is intended to support WYSIWYG output - e.g., level 3 sections always look
+ like level 3 sections, no matter their depth relative to the node selected
+ to be exported as printer-friendly HTML.
+ #}
+
+ {% for i in 1..depth-1 if depth > 1 %}
+ <div class="section-{{ i }}">
+ {% endfor %}
+ {{ contents }}
+ {% for i in 1..depth-1 if depth > 1 %}
+ </div>
+ {% endfor %}
+ </body>
+</html>
diff --git a/web/core/themes/claro/templates/classy/layout/html.html.twig b/web/core/themes/claro/templates/classy/layout/html.html.twig
new file mode 100644
index 0000000000..4fe57a01cf
--- /dev/null
+++ b/web/core/themes/claro/templates/classy/layout/html.html.twig
@@ -0,0 +1,55 @@
+{#
+/**
+ * @file
+ * Theme override for the basic structure of a single Drupal page.
+ *
+ * Variables:
+ * - logged_in: A flag indicating if user is logged in.
+ * - root_path: The root path of the current page (e.g., node, admin, user).
+ * - node_type: The content type for the current node, if the page is a node.
+ * - head_title: List of text elements that make up the head_title variable.
+ * May contain one or more of the following:
+ * - title: The title of the page.
+ * - name: The name of the site.
+ * - slogan: The slogan of the site.
+ * - page_top: Initial rendered markup. This should be printed before 'page'.
+ * - page: The rendered page markup.
+ * - page_bottom: Closing rendered markup. This variable should be printed after
+ * 'page'.
+ * - db_offline: A flag indicating if the database is offline.
+ * - placeholder_token: The token for generating head, css, js and js-bottom
+ * placeholders.
+ *
+ * @see template_preprocess_html()
+ */
+#}
+{%
+ set body_classes = [
+ logged_in ? 'user-logged-in',
+ not root_path ? 'path-frontpage' : 'path-' ~ root_path|clean_class,
+ node_type ? 'page-node-type-' ~ node_type|clean_class,
+ db_offline ? 'db-offline',
+ ]
+%}
+<!DOCTYPE html>
+<html{{ html_attributes }}>
+ <head>
+ <head-placeholder token="{{ placeholder_token }}">
+ <title>{{ head_title|safe_join(' | ') }}</title>
+ <css-placeholder token="{{ placeholder_token }}">
+ <js-placeholder token="{{ placeholder_token }}">
+ </head>
+ <body{{ attributes.addClass(body_classes) }}>
+ {#
+ Keyboard navigation/accessibility link to main content section in
+ page.html.twig.
+ #}
+ <a href="#main-content" class="visually-hidden focusable skip-link">
+ {{ 'Skip to main content'|t }}
+ </a>
+ {{ page_top }}
+ {{ page }}
+ {{ page_bottom }}
+ <js-bottom-placeholder token="{{ placeholder_token }}">
+ </body>
+</html>
diff --git a/web/core/themes/claro/templates/classy/layout/region.html.twig b/web/core/themes/claro/templates/classy/layout/region.html.twig
new file mode 100644
index 0000000000..95e71cec37
--- /dev/null
+++ b/web/core/themes/claro/templates/classy/layout/region.html.twig
@@ -0,0 +1,25 @@
+{#
+/**
+ * @file
+ * Theme override to display a region.
+ *
+ * Available variables:
+ * - content: The content for this region, typically blocks.
+ * - attributes: HTML attributes for the region <div>.
+ * - region: The name of the region variable as defined in the theme's
+ * .info.yml file.
+ *
+ * @see template_preprocess_region()
+ */
+#}
+{%
+ set classes = [
+ 'region',
+ 'region-' ~ region|clean_class,
+ ]
+%}
+{% if content %}
+ <div{{ attributes.addClass(classes) }}>
+ {{ content }}
+ </div>
+{% endif %}
diff --git a/web/core/themes/claro/templates/classy/media-library/container--media-library-content.html.twig b/web/core/themes/claro/templates/classy/media-library/container--media-library-content.html.twig
new file mode 100644
index 0000000000..7c930e2c7b
--- /dev/null
+++ b/web/core/themes/claro/templates/classy/media-library/container--media-library-content.html.twig
@@ -0,0 +1,28 @@
+{#
+/**
+ * @file
+ * Theme implementation the content area of the modal media library dialog.
+ *
+ * The content area is everything that is not the menu of available media
+ * types. This includes the form to add new media items, if available, and
+ * the view of available media to select.
+ *
+ * Available variables:
+ * - attributes: HTML attributes for the containing element.
+ * - children: The rendered child elements of the container.
+ * - has_parent: A flag to indicate that the container has one or more parent
+ containers.
+ *
+ * @see template_preprocess_container()
+ *
+ * @ingroup themeable
+ */
+#}
+{%
+ set classes = [
+ has_parent ? 'js-form-wrapper',
+ has_parent ? 'form-wrapper',
+ 'media-library-content',
+ ]
+%}
+<div{{ attributes.addClass(classes) }}>{{ children }}</div>
diff --git a/web/core/themes/claro/templates/classy/media-library/container--media-library-widget-selection.html.twig b/web/core/themes/claro/templates/classy/media-library/container--media-library-widget-selection.html.twig
new file mode 100644
index 0000000000..7c0af44307
--- /dev/null
+++ b/web/core/themes/claro/templates/classy/media-library/container--media-library-widget-selection.html.twig
@@ -0,0 +1,28 @@
+{#
+/**
+ * @file
+ * Theme implementation of a wrapper for selected media items.
+ *
+ * This is used to wrap around the set of media items that are currently
+ * selected in the media library widget (not the modal dialog), which may
+ * be used for entity reference fields that target media.
+ *
+ * Available variables:
+ * - attributes: HTML attributes for the containing element.
+ * - children: The rendered child elements of the container.
+ * - has_parent: A flag to indicate that the container has one or more parent
+ containers.
+ *
+ * @see template_preprocess_container()
+ *
+ * @ingroup themeable
+ */
+#}
+{%
+ set classes = [
+ has_parent ? 'js-form-wrapper',
+ has_parent ? 'form-wrapper',
+ 'media-library-selection',
+ ]
+%}
+<div{{ attributes.addClass(classes) }}>{{ children }}</div>
diff --git a/web/core/themes/claro/templates/classy/media-library/links--media-library-menu.html.twig b/web/core/themes/claro/templates/classy/media-library/links--media-library-menu.html.twig
new file mode 100644
index 0000000000..b2361574a8
--- /dev/null
+++ b/web/core/themes/claro/templates/classy/media-library/links--media-library-menu.html.twig
@@ -0,0 +1,36 @@
+{% extends "links.html.twig" %}
+{#
+/**
+ * @file
+ * Theme implementation of the media type menu in the media library dialog.
+ *
+ * Available variables:
+ * - attributes: Attributes for the UL containing the list of links.
+ * - links: Links to be output.
+ * Each link will have the following elements:
+ * - link: (optional) A render array that returns a link. See
+ * template_preprocess_links() for details how it is generated.
+ * - text: The link text.
+ * - attributes: HTML attributes for the list item element.
+ * - text_attributes: (optional) HTML attributes for the span element if no
+ * 'url' was supplied.
+ * - heading: (optional) A heading to precede the links.
+ * - text: The heading text.
+ * - level: The heading level (e.g. 'h2', 'h3').
+ * - attributes: (optional) A keyed list of attributes for the heading.
+ * If the heading is a string, it will be used as the text of the heading and
+ * the level will default to 'h2'.
+ *
+ * Headings should be used on navigation menus and any list of links that
+ * consistently appears on multiple pages. To make the heading invisible use
+ * the 'visually-hidden' CSS class. Do not use 'display:none', which
+ * removes it from screen readers and assistive technology. Headings allow
+ * screen reader and keyboard only users to navigate to or skip the links.
+ * See http://juicystudio.com/article/screen-readers-display-none.php and
+ * http://www.w3.org/TR/WCAG-TECHS/H42.html for more information.
+ *
+ * @see classy_preprocess_links__media_library_menu()
+ * @see template_preprocess_links()
+ */
+#}
+{% set attributes = attributes.addClass('media-library-menu') %}
diff --git a/web/core/themes/claro/templates/classy/media-library/media--media-library.html.twig b/web/core/themes/claro/templates/classy/media-library/media--media-library.html.twig
new file mode 100644
index 0000000000..e88635424f
--- /dev/null
+++ b/web/core/themes/claro/templates/classy/media-library/media--media-library.html.twig
@@ -0,0 +1,55 @@
+{#
+/**
+ * @file
+ * Theme override of a media item in the media library.
+ *
+ * This is used for media that the user can select from the grid of media
+ * items. It is not used for items that have already been selected in the
+ * corresponding field widget, or for items that have been previously selected
+ * before adding new media to the library.
+ *
+ * Available variables:
+ * - media: The entity with limited access to object properties and methods.
+ * Only method names starting with "get", "has", or "is" and a few common
+ * methods such as "id", "label", and "bundle" are available. For example:
+ * - entity.getEntityTypeId() will return the entity type ID.
+ * - entity.hasField('field_example') returns TRUE if the entity includes
+ * field_example. (This does not indicate the presence of a value in this
+ * field.)
+ * Calling other methods, such as entity.delete(), will result in an exception.
+ * See \Drupal\Core\Entity\EntityInterface for a full list of methods.
+ * - name: Name of the media.
+ * - content: Media content.
+ * - title_prefix: Additional output populated by modules, intended to be
+ * displayed in front of the main title tag that appears in the template.
+ * - title_suffix: Additional output populated by modules, intended to be
+ * displayed after the main title tag that appears in the template.
+ * - view_mode: View mode; for example, "teaser" or "full".
+ * - attributes: HTML attributes for the containing element.
+ * - title_attributes: Same as attributes, except applied to the main title
+ * tag that appears in the template.
+ * - url: Direct URL of the media.
+ * - preview_attributes: HTML attributes for the preview wrapper.
+ * - metadata_attributes: HTML attributes for the expandable metadata area.
+ * - status: Whether or not the Media is published.
+ *
+ * @see template_preprocess_media()
+ *
+ * @ingroup themeable
+ */
+#}
+<article{{ attributes }}>
+ {% if content %}
+ <div{{ preview_attributes.addClass('media-library-item__preview js-media-library-item-preview') }}>
+ {{ content|without('name') }}
+ </div>
+ {% if not status %}
+ <div class="media-library-item__status">{{ "unpublished" | t }}</div>
+ {% endif %}
+ <div{{ metadata_attributes.addClass('media-library-item__attributes') }}>
+ <div class="media-library-item__name">
+ {{ name }}
+ </div>
+ </div>
+ {% endif %}
+</article>
diff --git a/web/core/themes/claro/templates/classy/media-library/media-library-item--small.html.twig b/web/core/themes/claro/templates/classy/media-library/media-library-item--small.html.twig
new file mode 100644
index 0000000000..ba03858b7f
--- /dev/null
+++ b/web/core/themes/claro/templates/classy/media-library/media-library-item--small.html.twig
@@ -0,0 +1,31 @@
+{#
+/**
+ * @file
+ * Default theme implementation of a media library item.
+ *
+ * This is used when displaying selected media items, either in the field
+ * widget or in the "Additional selected media" area when adding new
+ * media items in the media library modal dialog.
+ *
+ * Available variables:
+ * - attributes: HTML attributes for the containing element.
+ * - content: The content of the media library item, plus any additional
+ * fields or elements surrounding it.
+ *
+ * @see seven_preprocess_media_library_item__small()
+ * @see seven_preprocess_media_library_item__widget()
+ * @see template_preprocess_media_library_item()
+ *
+ * @ingroup themeable
+ */
+#}
+{%
+ set classes = [
+ 'media-library-item',
+ 'media-library-item--grid',
+ 'media-library-item--small',
+ ]
+%}
+<div{{ attributes.addClass(classes) }}>
+ {{ content }}
+</div>
diff --git a/web/core/themes/claro/templates/classy/media-library/media-library-item.html.twig b/web/core/themes/claro/templates/classy/media-library/media-library-item.html.twig
new file mode 100644
index 0000000000..297780e0f7
--- /dev/null
+++ b/web/core/themes/claro/templates/classy/media-library/media-library-item.html.twig
@@ -0,0 +1,28 @@
+{#
+/**
+ * @file
+ * Default theme implementation of a media library item.
+ *
+ * This is used when displaying selected media items, either in the field
+ * widget or in the "Additional selected media" area when adding new
+ * media items in the media library modal dialog.
+ *
+ * Available variables:
+ * - attributes: HTML attributes for the containing element.
+ * - content: The content of the media library item, plus any additional
+ * fields or elements surrounding it.
+ *
+ * @see template_preprocess_media_library_item()
+ *
+ * @ingroup themeable
+ */
+#}
+{%
+ set classes = [
+ 'media-library-item',
+ 'media-library-item--grid',
+ ]
+%}
+<div{{ attributes.addClass(classes) }}>
+ {{ content }}
+</div>
diff --git a/web/core/themes/claro/templates/classy/media-library/media-library-wrapper.html.twig b/web/core/themes/claro/templates/classy/media-library/media-library-wrapper.html.twig
new file mode 100644
index 0000000000..850f63aa17
--- /dev/null
+++ b/web/core/themes/claro/templates/classy/media-library/media-library-wrapper.html.twig
@@ -0,0 +1,21 @@
+{#
+/**
+ * @file
+ * Theme override of a container used to wrap the media library's modal dialog
+ * interface.
+ *
+ * Available variables:
+ * - attributes: HTML attributes for the containing element.
+ * - menu: The menu of availble media types to choose from.
+ * - content: The form to add new media items, followed by the grid or table of
+ * existing media items to choose from.
+ *
+ * @see template_preprocess_media_library_wrapper()
+ *
+ * @ingroup themeable
+ */
+#}
+<div{{ attributes.addClass('media-library-wrapper') }}>
+ {{ menu }}
+ {{ content }}
+</div>
diff --git a/web/core/themes/claro/templates/classy/misc/help-section.html.twig b/web/core/themes/claro/templates/classy/misc/help-section.html.twig
new file mode 100644
index 0000000000..6cfaa38da2
--- /dev/null
+++ b/web/core/themes/claro/templates/classy/misc/help-section.html.twig
@@ -0,0 +1,48 @@
+{#
+/**
+ * @file
+ * Theme override for a section of the help page.
+ *
+ * This implementation divides the links into 4 columns.
+ *
+ * Available variables:
+ * - title: The section title.
+ * - description: The description text for the section.
+ * - links: Links to display in the section.
+ * - empty: Text to display if there are no links.
+ */
+#}
+<div class="clearfix">
+ <h2>{{ title }}</h2>
+ <p>{{ description }}</p>
+ {% if links %}
+ {# Calculate the column length, to divide links into 4 columns. #}
+ {% set size = links|length // 4 %}
+ {% if size * 4 < links|length %}
+ {% set size = size + 1 %}
+ {% endif %}
+
+ {# Output the links in 4 columns. #}
+ {% set count = 0 %}
+ {% for link in links %}
+ {% if count == 0 %}
+ {# Start a new column. #}
+ <div class="layout-column layout-column--quarter"><ul>
+ {% endif %}
+ <li>{{ link }}</li>
+ {% set count = count + 1 %}
+ {% if count >= size %}
+ {# End the current column. #}
+ {% set count = 0 %}
+ </ul></div>
+ {% endif %}
+ {% endfor %}
+
+ {# End the last column, if one is open. #}
+ {% if count > 0 %}
+ </ul></div>
+ {% endif %}
+ {% else %}
+ <p>{{ empty }}</p>
+ {% endif %}
+</div>
diff --git a/web/core/themes/claro/templates/classy/misc/progress-bar.html.twig b/web/core/themes/claro/templates/classy/misc/progress-bar.html.twig
new file mode 100644
index 0000000000..f204145ac1
--- /dev/null
+++ b/web/core/themes/claro/templates/classy/misc/progress-bar.html.twig
@@ -0,0 +1,22 @@
+{#
+/**
+ * @file
+ * Theme override for a progress bar.
+ *
+ * Note that the core Batch API uses this only for non-JavaScript batch jobs.
+ *
+ * Available variables:
+ * - label: The label of the working task.
+ * - percent: The percentage of the progress.
+ * - message: A string containing information to be displayed.
+ */
+#}
+{{ attach_library('claro/classy.progress') }}
+<div class="progress" data-drupal-progress>
+ {% if label %}
+ <div class="progress__label">{{ label }}</div>
+ {% endif %}
+ <div class="progress__track"><div class="progress__bar" style="width: {{ percent }}%"></div></div>
+ <div class="progress__percentage">{{ percent }}%</div>
+ <div class="progress__description">{{ message }}</div>
+</div>
diff --git a/web/core/themes/claro/templates/classy/misc/rdf-metadata.html.twig b/web/core/themes/claro/templates/classy/misc/rdf-metadata.html.twig
new file mode 100644
index 0000000000..acc62df16d
--- /dev/null
+++ b/web/core/themes/claro/templates/classy/misc/rdf-metadata.html.twig
@@ -0,0 +1,20 @@
+{#
+/**
+ * @file
+ * Theme override for empty spans with RDF attributes.
+ *
+ * The XHTML+RDFa doctype allows either <span></span> or <span /> syntax to
+ * be used, but for maximum browser compatibility, W3C recommends the
+ * former when serving pages using the text/html media type, see
+ * http://www.w3.org/TR/xhtml1/#C_3.
+ *
+ * Available variables:
+ * - metadata: Each item within corresponds to its own set of attributes,
+ * and therefore, needs its own 'attributes' element.
+ *
+ * @see template_preprocess_rdf_metadata()
+ */
+#}
+{% for attributes in metadata %}
+ <span{{ attributes.addClass('rdf-meta', 'hidden') }}></span>
+{% endfor %}
diff --git a/web/core/themes/claro/templates/classy/navigation/book-all-books-block.html.twig b/web/core/themes/claro/templates/classy/navigation/book-all-books-block.html.twig
new file mode 100644
index 0000000000..b4cb64de3d
--- /dev/null
+++ b/web/core/themes/claro/templates/classy/navigation/book-all-books-block.html.twig
@@ -0,0 +1,22 @@
+{#
+/**
+ * @file
+ * Theme override for rendering book outlines within a block.
+ *
+ * This template is used only when the block is configured to "show block on all
+ * pages", which presents multiple independent books on all pages.
+ *
+ * Available variables:
+ * - book_menus: Book outlines.
+ * - id: The parent book ID.
+ * - title: The parent book title.
+ * - menu: The top-level book links.
+ *
+ * @see template_preprocess_book_all_books_block()
+ */
+#}
+{% for book in book_menus %}
+ <nav id="book-block-menu-{{ book.id }}" class="book-block-menu" role="navigation" aria-label="{% trans %}Book outline for {{ book.title }}{% endtrans %}">
+ {{ book.menu }}
+ </nav>
+{% endfor %}
diff --git a/web/core/themes/claro/templates/classy/navigation/book-navigation.html.twig b/web/core/themes/claro/templates/classy/navigation/book-navigation.html.twig
new file mode 100644
index 0000000000..eaf733da06
--- /dev/null
+++ b/web/core/themes/claro/templates/classy/navigation/book-navigation.html.twig
@@ -0,0 +1,56 @@
+{#
+/**
+ * @file
+ * Theme override to navigate books.
+ *
+ * Presented under nodes that are a part of book outlines.
+ *
+ * Available variables:
+ * - tree: The immediate children of the current node rendered as an unordered
+ * list.
+ * - current_depth: Depth of the current node within the book outline. Provided
+ * for context.
+ * - prev_url: URL to the previous node.
+ * - prev_title: Title of the previous node.
+ * - parent_url: URL to the parent node.
+ * - parent_title: Title of the parent node. Not printed by default. Provided
+ * as an option.
+ * - next_url: URL to the next node.
+ * - next_title: Title of the next node.
+ * - has_links: Flags TRUE whenever the previous, parent or next data has a
+ * value.
+ * - book_id: The book ID of the current outline being viewed. Same as the node
+ * ID containing the entire outline. Provided for context.
+ * - book_url: The book/node URL of the current outline being viewed. Provided
+ * as an option. Not used by default.
+ * - book_title: The book/node title of the current outline being viewed.
+ *
+ * @see template_preprocess_book_navigation()
+ */
+#}
+{{ attach_library('claro/classy.book-navigation') }}
+{% if tree or has_links %}
+ <nav id="book-navigation-{{ book_id }}" class="book-navigation" role="navigation" aria-labelledby="book-label-{{ book_id }}">
+ {{ tree }}
+ {% if has_links %}
+ <h2 class="visually-hidden" id="book-label-{{ book_id }}">{{ 'Book traversal links for'|t }} {{ book_title }}</h2>
+ <ul class="book-pager">
+ {% if prev_url %}
+ <li class="book-pager__item book-pager__item--previous">
+ <a href="{{ prev_url }}" rel="prev" title="{{ 'Go to previous page'|t }}"><b>{{ '‹'|t }}</b> {{ prev_title }}</a>
+ </li>
+ {% endif %}
+ {% if parent_url %}
+ <li class="book-pager__item book-pager__item--center">
+ <a href="{{ parent_url }}" title="{{ 'Go to parent page'|t }}">{{ 'Up'|t }}</a>
+ </li>
+ {% endif %}
+ {% if next_url %}
+ <li class="book-pager__item book-pager__item--next">
+ <a href="{{ next_url }}" rel="next" title="{{ 'Go to next page'|t }}">{{ next_title }} <b>{{ '›'|t }}</b></a>
+ </li>
+ {% endif %}
+ </ul>
+ {% endif %}
+ </nav>
+{% endif %}
diff --git a/web/core/themes/claro/templates/classy/navigation/book-tree.html.twig b/web/core/themes/claro/templates/classy/navigation/book-tree.html.twig
new file mode 100644
index 0000000000..94fac5598b
--- /dev/null
+++ b/web/core/themes/claro/templates/classy/navigation/book-tree.html.twig
@@ -0,0 +1,55 @@
+{#
+/**
+ * @file
+ * Theme override to display a book tree.
+ *
+ * Returns HTML for a wrapper for a book sub-tree.
+ *
+ * Available variables:
+ * - items: A nested list of book items. Each book item contains:
+ * - attributes: HTML attributes for the book item.
+ * - below: The book item child items.
+ * - title: The book link title.
+ * - url: The book link URL, instance of \Drupal\Core\Url.
+ * - is_expanded: TRUE if the link has visible children within the current
+ * book tree.
+ * - is_collapsed: TRUE if the link has children within the current book tree
+ * that are not currently visible.
+ * - in_active_trail: TRUE if the link is in the active trail.
+ */
+#}
+{% import _self as book_tree %}
+
+{#
+ We call a macro which calls itself to render the full tree.
+ @see https://twig.symfony.com/doc/1.x/tags/macro.html
+#}
+{{ book_tree.book_links(items, attributes, 0) }}
+
+{% macro book_links(items, attributes, menu_level) %}
+ {% import _self as book_tree %}
+ {% if items %}
+ {% if menu_level == 0 %}
+ <ul{{ attributes.addClass('menu') }}>
+ {% else %}
+ <ul class="menu">
+ {% endif %}
+ {% for item in items %}
+ {%
+ set classes = [
+ 'menu-item',
+ item.is_expanded ? 'menu-item--expanded',
+ item.is_collapsed ? 'menu-item--collapsed',
+ item.in_active_trail ? 'menu-item--active-trail',
+ ]
+ %}
+ <li{{ item.attributes.addClass(classes) }}>
+ {{ link(item.title, item.url) }}
+ {% if item.below %}
+ {{ book_tree.book_links(item.below, attributes, menu_level + 1) }}
+ {% endif %}
+ </li>
+ {% endfor %}
+ </ul>
+ {% endif %}
+{% endmacro %}
diff --git a/web/core/themes/claro/templates/classy/navigation/menu.html.twig b/web/core/themes/claro/templates/classy/navigation/menu.html.twig
new file mode 100644
index 0000000000..b437f8760e
--- /dev/null
+++ b/web/core/themes/claro/templates/classy/navigation/menu.html.twig
@@ -0,0 +1,55 @@
+{#
+/**
+ * @file
+ * Theme override to display a menu.
+ *
+ * Available variables:
+ * - menu_name: The machine name of the menu.
+ * - items: A nested list of menu items. Each menu item contains:
+ * - attributes: HTML attributes for the menu item.
+ * - below: The menu item child items.
+ * - title: The menu link title.
+ * - url: The menu link url, instance of \Drupal\Core\Url
+ * - localized_options: Menu link localized options.
+ * - is_expanded: TRUE if the link has visible children within the current
+ * menu tree.
+ * - is_collapsed: TRUE if the link has children within the current menu tree
+ * that are not currently visible.
+ * - in_active_trail: TRUE if the link is in the active trail.
+ */
+#}
+{% import _self as menus %}
+
+{#
+ We call a macro which calls itself to render the full tree.
+ @see https://twig.symfony.com/doc/1.x/tags/macro.html
+#}
+{{ menus.menu_links(items, attributes, 0) }}
+
+{% macro menu_links(items, attributes, menu_level) %}
+ {% import _self as menus %}
+ {% if items %}
+ {% if menu_level == 0 %}
+ <ul{{ attributes.addClass('menu') }}>
+ {% else %}
+ <ul class="menu">
+ {% endif %}
+ {% for item in items %}
+ {%
+ set classes = [
+ 'menu-item',
+ item.is_expanded ? 'menu-item--expanded',
+ item.is_collapsed ? 'menu-item--collapsed',
+ item.in_active_trail ? 'menu-item--active-trail',
+ ]
+ %}
+ <li{{ item.attributes.addClass(classes) }}>
+ {{ link(item.title, item.url) }}
+ {% if item.below %}
+ {{ menus.menu_links(item.below, attributes, menu_level + 1) }}
+ {% endif %}
+ </li>
+ {% endfor %}
+ </ul>
+ {% endif %}
+{% endmacro %}
diff --git a/web/core/themes/claro/templates/classy/navigation/toolbar.html.twig b/web/core/themes/claro/templates/classy/navigation/toolbar.html.twig
new file mode 100644
index 0000000000..20f12d48b2
--- /dev/null
+++ b/web/core/themes/claro/templates/classy/navigation/toolbar.html.twig
@@ -0,0 +1,46 @@
+{#
+/**
+ * @file
+ * Theme override for the administrative toolbar.
+ *
+ * Available variables:
+ * - attributes: HTML attributes for the wrapper.
+ * - toolbar_attributes: HTML attributes to apply to the toolbar.
+ * - toolbar_heading: The heading or label for the toolbar.
+ * - tabs: List of tabs for the toolbar.
+ * - attributes: HTML attributes for the tab container.
+ * - link: Link or button for the menu tab.
+ * - trays: Toolbar tray list, each associated with a tab. Each tray in trays
+ * contains:
+ * - attributes: HTML attributes to apply to the tray.
+ * - label: The tray's label.
+ * - links: The tray menu links.
+ * - remainder: Any non-tray, non-tab elements left to be rendered.
+ *
+ * @see template_preprocess_toolbar()
+ */
+#}
+<div{{ attributes.addClass('toolbar') }}>
+ <nav{{ toolbar_attributes.addClass('toolbar-bar', 'clearfix') }}>
+ <h2 class="visually-hidden">{{ toolbar_heading }}</h2>
+ {% for key, tab in tabs %}
+ {% set tray = trays[key] %}
+ <div{{ tab.attributes.addClass('toolbar-tab') }}>
+ {{ tab.link }}
+ {% spaceless %}
+ <div{{ tray.attributes }}>
+ {% if tray.label %}
+ <nav class="toolbar-lining clearfix" role="navigation" aria-label="{{ tray.label }}">
+ <h3 class="toolbar-tray-name visually-hidden">{{ tray.label }}</h3>
+ {% else %}
+ <nav class="toolbar-lining clearfix" role="navigation">
+ {% endif %}
+ {{ tray.links }}
+ </nav>
+ </div>
+ {% endspaceless %}
+ </div>
+ {% endfor %}
+ </nav>
+ {{ remainder }}
+</div>
diff --git a/web/core/themes/claro/templates/classy/user/forum-submitted.html.twig b/web/core/themes/claro/templates/classy/user/forum-submitted.html.twig
new file mode 100644
index 0000000000..57311e96b5
--- /dev/null
+++ b/web/core/themes/claro/templates/classy/user/forum-submitted.html.twig
@@ -0,0 +1,21 @@
+{#
+/**
+ * @file
+ * Theme override for a forum post submission string.
+ *
+ * The submission string indicates when and by whom a topic was submitted.
+ *
+ * Available variables:
+ * - author: The author of the post.
+ * - time: How long ago the post was created.
+ * - topic: An object with the raw data of the post. Potentially unsafe. Be
+ * sure to clean this data before printing.
+ *
+ * @see template_preprocess_forum_submitted()
+ */
+#}
+{% if time %}
+ <span class="submitted">{% trans %}By {{ author }} {{ time }} ago{% endtrans %}</span>
+{% else %}
+ {{ 'n/a'|t }}
+{% endif %}
diff --git a/web/core/themes/claro/templates/classy/user/user.html.twig b/web/core/themes/claro/templates/classy/user/user.html.twig
new file mode 100644
index 0000000000..9a824effd3
--- /dev/null
+++ b/web/core/themes/claro/templates/classy/user/user.html.twig
@@ -0,0 +1,23 @@
+{#
+/**
+ * @file
+ * Theme override to present all user data.
+ *
+ * This template is used when viewing a registered user's page,
+ * e.g., example.com/user/123. 123 being the user's ID.
+ *
+ * Available variables:
+ * - content: A list of content items. Use 'content' to print all content, or
+ * print a subset such as 'content.field_example'. Fields attached to a user
+ * such as 'user_picture' are available as 'content.user_picture'.
+ * - attributes: HTML attributes for the container element.
+ * - user: A Drupal User entity.
+ *
+ * @see template_preprocess_user()
+ */
+#}
+<article{{ attributes.addClass('profile') }}>
+ {% if content %}
+ {{- content -}}
+ {% endif %}
+</article>
diff --git a/web/core/themes/claro/templates/classy/user/username.html.twig b/web/core/themes/claro/templates/classy/user/username.html.twig
new file mode 100644
index 0000000000..df694dff69
--- /dev/null
+++ b/web/core/themes/claro/templates/classy/user/username.html.twig
@@ -0,0 +1,29 @@
+{#
+/**
+ * @file
+ * Theme override for displaying a username.
+ *
+ * Available variables:
+ * - account: The full account information for the user.
+ * - uid: The user ID, or zero if not a user. As used in anonymous comments.
+ * - name: The user's name, sanitized, and optionally truncated.
+ * - name_raw: The user's name, un-truncated.
+ * - truncated: Whether the user's name was truncated.
+ * - extra: Additional text to append to the user's name, sanitized.
+ * - profile_access: Whether the current user has permission to access this
+ users profile page.
+ * - link_path: The path or URL of the user's profile page, home page,
+ * or other desired page to link to for more information about the user.
+ * - homepage: (optional) The home page of the account, only set for non users.
+ * - link_options: Options to set on the \Drupal\Core\Url object if linking the
+ * user's name to the user's page.
+ * - attributes: HTML attributes for the containing element.
+ *
+ * @see template_preprocess_username()
+ */
+#}
+{% if link_path -%}
+ <a{{ attributes.addClass('username') }}>{{ name }}{{ extra }}</a>
+{%- else -%}
+ <span{{ attributes }}>{{ name }}{{ extra }}</span>
+{%- endif -%}
diff --git a/web/core/themes/claro/templates/classy/views/views-view-grouping.html.twig b/web/core/themes/claro/templates/classy/views/views-view-grouping.html.twig
new file mode 100644
index 0000000000..44905e56b7
--- /dev/null
+++ b/web/core/themes/claro/templates/classy/views/views-view-grouping.html.twig
@@ -0,0 +1,20 @@
+{#
+/**
+ * @file
+ * Theme override to display a single views grouping.
+ *
+ * Available variables:
+ * - view: The view object.
+ * - grouping: The grouping instruction.
+ * - grouping_level: A number indicating the hierarchical level of the grouping.
+ * - title: The group heading.
+ * - content: The content to be grouped.
+ * - rows: The rows returned from the view.
+ *
+ * @see template_preprocess_views_view_grouping()
+ */
+#}
+<div class="view-grouping">
+ <div class="view-grouping-header">{{ title }}</div>
+ <div class="view-grouping-content">{{ content }}</div>
+</div>
diff --git a/web/core/themes/claro/templates/classy/views/views-view-row-rss.html.twig b/web/core/themes/claro/templates/classy/views/views-view-row-rss.html.twig
new file mode 100644
index 0000000000..aee08aee6e
--- /dev/null
+++ b/web/core/themes/claro/templates/classy/views/views-view-row-rss.html.twig
@@ -0,0 +1,30 @@
+{#
+/**
+ * @file
+ * Theme override to display an item in a views RSS feed.
+ *
+ * Available variables:
+ * - title: RSS item title.
+ * - link: RSS item link.
+ * - description: RSS body text.
+ * - item_elements: RSS item elements to be rendered as XML (pubDate, creator,
+ * guid).
+ *
+ * @see template_preprocess_views_view_row_rss()
+ *
+ * @ingroup themeable
+ */
+#}
+<item>
+ <title>{{ title }}</title>
+ <link>{{ link }}</link>
+ <description>{{ description }}</description>
+ {% for item in item_elements -%}
+ <{{ item.key }}{{ item.attributes -}}
+ {% if item.value -%}
+ >{{ item.value }}</{{ item.key }}>
+ {% else -%}
+ {{ ' />' }}
+ {% endif %}
+ {%- endfor %}
+</item>
diff --git a/web/core/themes/claro/templates/classy/views/views-view-summary-unformatted.html.twig b/web/core/themes/claro/templates/classy/views/views-view-summary-unformatted.html.twig
new file mode 100644
index 0000000000..151734e948
--- /dev/null
+++ b/web/core/themes/claro/templates/classy/views/views-view-summary-unformatted.html.twig
@@ -0,0 +1,31 @@
+{#
+/**
+ * @file
+ * Theme override for unformatted summary links.
+ *
+ * Available variables:
+ * - rows: The rows contained in this view.
+ * - url: The URL to this row's content.
+ * - count: The number of items this summary item represents.
+ * - separator: A separator between each row.
+ * - attributes: HTML attributes for a row.
+ * - active: A flag indicating whether the row is active.
+ * - options: Flags indicating how each row should be displayed. This contains:
+ * - count: A flag indicating whether the row's 'count' should be displayed.
+ * - inline: A flag indicating whether the item should be wrapped in an inline
+ * or block level HTML element.
+ *
+ * @see template_preprocess_views_view_summary_unformatted()
+ */
+#}
+{% for row in rows %}
+ {{ options.inline ? '<span' : '<div' }} class="views-summary views-summary-unformatted">
+ {% if row.separator -%}
+ {{ row.separator }}
+ {%- endif %}
+ <a href="{{ row.url }}"{{ row.attributes.addClass(row.active ? 'is-active')|without('href') }}>{{ row.link }}</a>
+ {% if options.count %}
+ ({{ row.count }})
+ {% endif %}
+ {{ options.inline ? '</span>' : '</div>' }}
+{% endfor %}
diff --git a/web/core/themes/claro/templates/classy/views/views-view-summary.html.twig b/web/core/themes/claro/templates/classy/views/views-view-summary.html.twig
new file mode 100644
index 0000000000..3190a45ada
--- /dev/null
+++ b/web/core/themes/claro/templates/classy/views/views-view-summary.html.twig
@@ -0,0 +1,31 @@
+{#
+/**
+ * @file
+ * Theme override to display a list of summary lines.
+ *
+ * Available variables:
+ * - rows: The rows contained in this view.
+ * Each row contains:
+ * - url: The summary link URL.
+ * - link: The summary link text.
+ * - count: The number of items under this grouping.
+ * - attributes: HTML attributes to apply to each row.
+ * - active: A flag indicating whether the row is active.
+ * - options: Flags indicating how the summary should be displayed.
+ * This contains:
+ * - count: A flag indicating whether the count should be displayed.
+ *
+ * @see template_preprocess_views_view_summary()
+ */
+#}
+<div class="item-list">
+ <ul class="views-summary">
+ {% for row in rows %}
+ <li><a href="{{ row.url }}"{{ row.attributes.addClass(row.active ? 'is-active')|without('href') }}>{{ row.link }}</a>
+ {% if options.count %}
+ ({{ row.count }})
+ {% endif %}
+ </li>
+ {% endfor %}
+ </ul>
+</div>
diff --git a/web/core/themes/claro/templates/classy/views/views-view-table.html.twig b/web/core/themes/claro/templates/classy/views/views-view-table.html.twig
new file mode 100644
index 0000000000..edc14983da
--- /dev/null
+++ b/web/core/themes/claro/templates/classy/views/views-view-table.html.twig
@@ -0,0 +1,120 @@
+{#
+/**
+ * @file
+ * Theme override for displaying a view as a table.
+ *
+ * Available variables:
+ * - attributes: Remaining HTML attributes for the element.
+ * - class: HTML classes that can be used to style contextually through CSS.
+ * - title : The title of this group of rows.
+ * - header: The table header columns.
+ * - attributes: Remaining HTML attributes for the element.
+ * - content: HTML classes to apply to each header cell, indexed by
+ * the header's key.
+ * - default_classes: A flag indicating whether default classes should be
+ * used.
+ * - caption_needed: Is the caption tag needed.
+ * - caption: The caption for this table.
+ * - accessibility_description: Extended description for the table details.
+ * - accessibility_summary: Summary for the table details.
+ * - rows: Table row items. Rows are keyed by row number.
+ * - attributes: HTML classes to apply to each row.
+ * - columns: Row column items. Columns are keyed by column number.
+ * - attributes: HTML classes to apply to each column.
+ * - content: The column content.
+ * - default_classes: A flag indicating whether default classes should be
+ * used.
+ * - responsive: A flag indicating whether table is responsive.
+ * - sticky: A flag indicating whether table header is sticky.
+ * - summary_element: A render array with table summary information (if any).
+ *
+ * @see template_preprocess_views_view_table()
+ */
+#}
+{%
+ set classes = [
+ 'views-table',
+ 'views-view-table',
+ 'cols-' ~ header|length,
+ responsive ? 'responsive-enabled',
+ sticky ? 'sticky-enabled',
+ ]
+%}
+<table{{ attributes.addClass(classes) }}>
+ {% if caption_needed %}
+ <caption>
+ {% if caption %}
+ {{ caption }}
+ {% else %}
+ {{ title }}
+ {% endif %}
+ {% if (summary_element is not empty) %}
+ {{ summary_element }}
+ {% endif %}
+ </caption>
+ {% endif %}
+ {% if header %}
+ <thead>
+ <tr>
+ {% for key, column in header %}
+ {% if column.default_classes %}
+ {%
+ set column_classes = [
+ 'views-field',
+ 'views-field-' ~ fields[key],
+ ]
+ %}
+ {% endif %}
+ <th{{ column.attributes.addClass(column_classes).setAttribute('scope', 'col') }}>
+ {%- if column.wrapper_element -%}
+ <{{ column.wrapper_element }}>
+ {%- if column.url -%}
+ <a href="{{ column.url }}" title="{{ column.title }}" rel="nofollow">{{ column.content }}{{ column.sort_indicator }}</a>
+ {%- else -%}
+ {{ column.content }}{{ column.sort_indicator }}
+ {%- endif -%}
+ </{{ column.wrapper_element }}>
+ {%- else -%}
+ {%- if column.url -%}
+ <a href="{{ column.url }}" title="{{ column.title }}" rel="nofollow">{{ column.content }}{{ column.sort_indicator }}</a>
+ {%- else -%}
+ {{- column.content }}{{ column.sort_indicator }}
+ {%- endif -%}
+ {%- endif -%}
+ </th>
+ {% endfor %}
+ </tr>
+ </thead>
+ {% endif %}
+ <tbody>
+ {% for row in rows %}
+ <tr{{ row.attributes }}>
+ {% for key, column in row.columns %}
+ {% if column.default_classes %}
+ {%
+ set column_classes = [
+ 'views-field'
+ ]
+ %}
+ {% for field in column.fields %}
+ {% set column_classes = column_classes|merge(['views-field-' ~ field]) %}
+ {% endfor %}
+ {% endif %}
+ <td{{ column.attributes.addClass(column_classes) }}>
+ {%- if column.wrapper_element -%}
+ <{{ column.wrapper_element }}>
+ {% for content in column.content %}
+ {{ content.separator }}{{ content.field_output }}
+ {% endfor %}
+ </{{ column.wrapper_element }}>
+ {%- else -%}
+ {% for content in column.content %}
+ {{- content.separator }}{{ content.field_output -}}
+ {% endfor %}
+ {%- endif %}
+ </td>
+ {% endfor %}
+ </tr>
+ {% endfor %}
+ </tbody>
+</table>
diff --git a/web/core/themes/claro/templates/classy/views/views-view.html.twig b/web/core/themes/claro/templates/classy/views/views-view.html.twig
new file mode 100644
index 0000000000..769a86849e
--- /dev/null
+++ b/web/core/themes/claro/templates/classy/views/views-view.html.twig
@@ -0,0 +1,95 @@
+{#
+/**
+ * @file
+ * Theme override for a main view template.
+ *
+ * Available variables:
+ * - attributes: Remaining HTML attributes for the element.
+ * - css_name: A CSS-safe version of the view name.
+ * - css_class: The user-specified classes names, if any.
+ * - header: The optional header.
+ * - footer: The optional footer.
+ * - rows: The results of the view query, if any.
+ * - empty: The content to display if there are no rows.
+ * - pager: The optional pager next/prev links to display.
+ * - exposed: Exposed widget form/info to display.
+ * - feed_icons: Optional feed icons to display.
+ * - more: An optional link to the next page of results.
+ * - title: Title of the view, only used when displaying in the admin preview.
+ * - title_prefix: Additional output populated by modules, intended to be
+ * displayed in front of the view title.
+ * - title_suffix: Additional output populated by modules, intended to be
+ * displayed after the view title.
+ * - attachment_before: An optional attachment view to be displayed before the
+ * view content.
+ * - attachment_after: An optional attachment view to be displayed after the
+ * view content.
+ * - dom_id: Unique id for every view being printed to give unique class for
+ * Javascript.
+ *
+ * @see template_preprocess_views_view()
+ */
+#}
+{%
+ set classes = [
+ 'view',
+ 'view-' ~ id|clean_class,
+ 'view-id-' ~ id,
+ 'view-display-id-' ~ display_id,
+ dom_id ? 'js-view-dom-id-' ~ dom_id,
+ ]
+%}
+<div{{ attributes.addClass(classes) }}>
+ {{ title_prefix }}
+ {% if title %}
+ {{ title }}
+ {% endif %}
+ {{ title_suffix }}
+ {% if header %}
+ <div class="view-header">
+ {{ header }}
+ </div>
+ {% endif %}
+ {% if exposed %}
+ <div class="view-filters">
+ {{ exposed }}
+ </div>
+ {% endif %}
+ {% if attachment_before %}
+ <div class="attachment attachment-before">
+ {{ attachment_before }}
+ </div>
+ {% endif %}
+
+ {% if rows %}
+ <div class="view-content">
+ {{ rows }}
+ </div>
+ {% elseif empty %}
+ <div class="view-empty">
+ {{ empty }}
+ </div>
+ {% endif %}
+
+ {% if pager %}
+ {{ pager }}
+ {% endif %}
+ {% if attachment_after %}
+ <div class="attachment attachment-after">
+ {{ attachment_after }}
+ </div>
+ {% endif %}
+ {% if more %}
+ {{ more }}
+ {% endif %}
+ {% if footer %}
+ <div class="view-footer">
+ {{ footer }}
+ </div>
+ {% endif %}
+ {% if feed_icons %}
+ <div class="feed-icons">
+ {{ feed_icons }}
+ </div>
+ {% endif %}
+</div>
diff --git a/web/core/themes/claro/templates/entity-add-list.html.twig b/web/core/themes/claro/templates/entity-add-list.html.twig
index 98683b0bb4..a4ba89cd40 100644
--- a/web/core/themes/claro/templates/entity-add-list.html.twig
+++ b/web/core/themes/claro/templates/entity-add-list.html.twig
@@ -1,7 +1,7 @@
{#
/**
* @file
- * Theme override to to present a list of available bundles.
+ * Theme override to present a list of available bundles.
*
* Available variables:
* - bundles: A list of bundles, each with the following properties:
diff --git a/web/core/themes/claro/templates/field/file-link.html.twig b/web/core/themes/claro/templates/field/file-link.html.twig
index 891c7a124d..07cd9e8561 100644
--- a/web/core/themes/claro/templates/field/file-link.html.twig
+++ b/web/core/themes/claro/templates/field/file-link.html.twig
@@ -14,5 +14,5 @@
* @see stable_preprocess_image_widget()
*/
#}
-{{ attach_library('classy/file') }}
+{{ attach_library('claro/classy.file') }}
<span{{ attributes }}>{{ link }} <span class="file__size">({{ file_size }})</span></span>
diff --git a/web/core/themes/claro/templates/form-element-label.html.twig b/web/core/themes/claro/templates/form-element-label.html.twig
index f05010d686..d0ec8a3b1a 100644
--- a/web/core/themes/claro/templates/form-element-label.html.twig
+++ b/web/core/themes/claro/templates/form-element-label.html.twig
@@ -2,11 +2,25 @@
/**
* @file
* Template override for a form element label.
+ *
+ * Available variables:
+ * - title: The label's text.
+ * - title_display: Elements title_display setting.
+ * - required: An indicator for whether the associated form element is required.
+ * - attributes: A list of HTML attributes for the label.
+ *
+ * @see template_preprocess_form_element_label()
*/
#}
-
-{% extends '@classy/form/form-element-label.html.twig' %}
-
{%
- set attributes = attributes.addClass('form-item__label')
+ set classes = [
+ 'form-item__label',
+ title_display == 'after' ? 'option',
+ title_display == 'invisible' ? 'visually-hidden',
+ required ? 'js-form-required',
+ required ? 'form-required',
+ ]
%}
+{% if title is not empty or required -%}
+ <label{{ attributes.addClass(classes) }}>{{ title }}</label>
+{%- endif %}
diff --git a/web/core/themes/claro/templates/form/checkboxes.html.twig b/web/core/themes/claro/templates/form/checkboxes.html.twig
new file mode 100644
index 0000000000..b7bbb9148f
--- /dev/null
+++ b/web/core/themes/claro/templates/form/checkboxes.html.twig
@@ -0,0 +1,15 @@
+{#
+/**
+ * @file
+ * Theme override for a 'checkboxes' #type form element.
+ *
+ * Available variables
+ * - attributes: A list of HTML attributes for the wrapper element.
+ * - children: The rendered checkboxes.
+ *
+ * @see template_preprocess_checkboxes()
+ */
+ @todo: remove this file once https://www.drupal.org/node/1819284 is resolved.
+ This is identical to core/modules/system/templates/container.html.twig
+#}
+<div{{ attributes.addClass('form-checkboxes','form-boolean-group') }}>{{ children }}</div>
diff --git a/web/core/themes/claro/templates/form/radios.html.twig b/web/core/themes/claro/templates/form/radios.html.twig
new file mode 100644
index 0000000000..4cfdd528f6
--- /dev/null
+++ b/web/core/themes/claro/templates/form/radios.html.twig
@@ -0,0 +1,13 @@
+{#
+/**
+ * @file
+ * Theme override for a 'radios' #type form element.
+ *
+ * Available variables
+ * - attributes: A list of HTML attributes for the wrapper element.
+ * - children: The rendered radios.
+ *
+ * @see template_preprocess_radios()
+ */
+#}
+<div{{ attributes.addClass('form-radios', 'form-boolean-group') }}>{{ children }}</div>
diff --git a/web/core/themes/claro/templates/system-themes-page.html.twig b/web/core/themes/claro/templates/system-themes-page.html.twig
index 1108c7f2f6..36d958dd36 100644
--- a/web/core/themes/claro/templates/system-themes-page.html.twig
+++ b/web/core/themes/claro/templates/system-themes-page.html.twig
@@ -22,6 +22,7 @@
* - notes: Identifies what context this theme is being used in, e.g.,
* default theme, admin theme.
* - incompatible: Text describing any compatibility issues.
+ * - module_dependencies: A list of modules that this theme requires.
* - operations: A list of operation links, e.g., Settings, Enable, Disable,
* etc. these links should only be displayed if the theme is compatible.
* - title_id: The unique id of the theme label.
@@ -97,6 +98,11 @@
</div>
<div class="card__footer">
+ {% if theme.module_dependencies %}
+ <div class="theme-info__requires">
+ {{ 'Requires: @module_dependencies'|t({ '@module_dependencies': theme.module_dependencies|render }) }}
+ </div>
+ {% endif %}
{# Display operation links only if the theme is compatible. #}
{% if theme.incompatible %}
<small class="incompatible">{{ theme.incompatible }}</small>
diff --git a/web/core/themes/classy/templates/field/field.html.twig b/web/core/themes/classy/templates/field/field.html.twig
index 0b10969a87..1cfbd651ce 100644
--- a/web/core/themes/classy/templates/field/field.html.twig
+++ b/web/core/themes/classy/templates/field/field.html.twig
@@ -43,6 +43,7 @@
'field--name-' ~ field_name|clean_class,
'field--type-' ~ field_type|clean_class,
'field--label-' ~ label_display,
+ label_display == 'inline' ? 'clearfix',
]
%}
{%
diff --git a/web/core/themes/classy/templates/field/image-formatter.html.twig b/web/core/themes/classy/templates/field/image-formatter.html.twig
index 465118eec9..512d7588e0 100644
--- a/web/core/themes/classy/templates/field/image-formatter.html.twig
+++ b/web/core/themes/classy/templates/field/image-formatter.html.twig
@@ -6,7 +6,6 @@
* Available variables:
* - image: A collection of image data.
* - image_style: An optional image style.
- * - path: An optional array containing the link 'path' and link 'options'.
* - url: An optional URL the image can be linked to.
*
* @see template_preprocess_image_formatter()
diff --git a/web/core/themes/classy/templates/views/views-view-table.html.twig b/web/core/themes/classy/templates/views/views-view-table.html.twig
index 8eccec0418..edc14983da 100644
--- a/web/core/themes/classy/templates/views/views-view-table.html.twig
+++ b/web/core/themes/classy/templates/views/views-view-table.html.twig
@@ -26,6 +26,7 @@
* used.
* - responsive: A flag indicating whether table is responsive.
* - sticky: A flag indicating whether table header is sticky.
+ * - summary_element: A render array with table summary information (if any).
*
* @see template_preprocess_views_view_table()
*/
@@ -47,15 +48,8 @@
{% else %}
{{ title }}
{% endif %}
- {% if (summary is not empty) or (description is not empty) %}
- <details>
- {% if summary is not empty %}
- <summary>{{ summary }}</summary>
- {% endif %}
- {% if description is not empty %}
- {{ description }}
- {% endif %}
- </details>
+ {% if (summary_element is not empty) %}
+ {{ summary_element }}
{% endif %}
</caption>
{% endif %}
@@ -75,14 +69,14 @@
{%- if column.wrapper_element -%}
<{{ column.wrapper_element }}>
{%- if column.url -%}
- <a href="{{ column.url }}" title="{{ column.title }}">{{ column.content }}{{ column.sort_indicator }}</a>
+ <a href="{{ column.url }}" title="{{ column.title }}" rel="nofollow">{{ column.content }}{{ column.sort_indicator }}</a>
{%- else -%}
{{ column.content }}{{ column.sort_indicator }}
{%- endif -%}
</{{ column.wrapper_element }}>
{%- else -%}
{%- if column.url -%}
- <a href="{{ column.url }}" title="{{ column.title }}">{{ column.content }}{{ column.sort_indicator }}</a>
+ <a href="{{ column.url }}" title="{{ column.title }}" rel="nofollow">{{ column.content }}{{ column.sort_indicator }}</a>
{%- else -%}
{{- column.content }}{{ column.sort_indicator }}
{%- endif -%}
diff --git a/web/core/themes/seven/css/base/elements.css b/web/core/themes/seven/css/base/elements.css
index 7fa40e5558..53cba224c6 100644
--- a/web/core/themes/seven/css/base/elements.css
+++ b/web/core/themes/seven/css/base/elements.css
@@ -164,6 +164,16 @@ details summary:focus {
text-decoration: underline;
outline: none;
}
+/**
+ * Unfortunately, text-decoration for details summary is not supported on all
+ * browsers. So we add a span (which can handle text-decoration) in Seven's
+ * templates/details.html.twig. In case there are other details templates that
+ * don't have the span, we leave the text-decoration in the parent selector.
+ * This provides maximum compatibility and coverage with minimal disruption.
+ */
+details summary:focus span {
+ text-decoration: underline;
+}
img {
max-width: 100%;
height: auto;
diff --git a/web/core/themes/seven/css/classy/README.txt b/web/core/themes/seven/css/classy/README.txt
new file mode 100644
index 0000000000..42514f5f0c
--- /dev/null
+++ b/web/core/themes/seven/css/classy/README.txt
@@ -0,0 +1,12 @@
+WHAT IS THIS DIRECTORY FOR?
+--------------------------------
+This directory is for CSS files previously inherited from the Classy theme.
+
+WHY ARE CLASSY CSS FILES BEING COPIED HERE?
+-------------------------------------------
+Classy will be deprecated during the Drupal 9 lifecycle. To prepare for Classy's
+removal, CSS files that would otherwise be inherited from Classy are copied
+here.
+
+CSS files that differ from the Classy versions should not be placed in this
+directory or any subdirectory.
diff --git a/web/core/themes/seven/css/classy/components/action-links.css b/web/core/themes/seven/css/classy/components/action-links.css
new file mode 100644
index 0000000000..274d798e18
--- /dev/null
+++ b/web/core/themes/seven/css/classy/components/action-links.css
@@ -0,0 +1,43 @@
+/**
+ * @file
+ * Styles for link buttons and action links.
+ */
+
+.action-links {
+ margin: 1em 0;
+ padding: 0;
+ list-style: none;
+}
+[dir="rtl"] .action-links {
+ /* This is required to win over specificity of [dir="rtl"] ul */
+ margin-right: 0;
+}
+.action-links li {
+ display: inline-block;
+ margin: 0 0.3em;
+}
+.action-links li:first-child {
+ margin-left: 0; /* LTR */
+}
+[dir="rtl"] .action-links li:first-child {
+ margin-right: 0;
+ margin-left: 0.3em;
+}
+.button-action {
+ display: inline-block;
+ padding: 0.2em 0.5em 0.3em;
+ text-decoration: none;
+ line-height: 160%;
+}
+.button-action:before {
+ margin-left: -0.1em; /* LTR */
+ padding-right: 0.2em; /* LTR */
+ content: "+";
+ font-weight: 900;
+}
+[dir="rtl"] .button-action:before {
+ margin-right: -0.1em;
+ margin-left: 0;
+ padding-right: 0;
+ padding-left: 0.2em;
+}
diff --git a/web/core/themes/seven/css/classy/components/book-navigation.css b/web/core/themes/seven/css/classy/components/book-navigation.css
new file mode 100644
index 0000000000..08728e27b5
--- /dev/null
+++ b/web/core/themes/seven/css/classy/components/book-navigation.css
@@ -0,0 +1,40 @@
+/**
+ * @file
+ * Styling for the Book module.
+ */
+
+.book-navigation .menu {
+ padding-top: 1em;
+ padding-bottom: 0;
+}
+.book-navigation .book-pager {
+ overflow: auto;
+ margin: 0;
+ padding: 0.5em 0;
+}
+.book-pager__item {
+ display: inline-block;
+ list-style-type: none;
+ vertical-align: top;
+}
+.book-pager__item--previous {
+ width: 45%;
+ text-align: left; /* LTR */
+}
+[dir="rtl"] .book-pager__item--previous {
+ float: right;
+ text-align: right;
+}
+.book-pager__item--center {
+ width: 8%;
+ text-align: center;
+}
+.book-pager__item--next {
+ float: right; /* LTR */
+ width: 45%;
+ text-align: right; /* LTR */
+}
+[dir="rtl"] .book-pager__item--next {
+ float: left;
+ text-align: left;
+}
diff --git a/web/core/themes/seven/css/classy/components/breadcrumb.css b/web/core/themes/seven/css/classy/components/breadcrumb.css
new file mode 100644
index 0000000000..1e6a7fac71
--- /dev/null
+++ b/web/core/themes/seven/css/classy/components/breadcrumb.css
@@ -0,0 +1,29 @@
+/**
+ * @file
+ * Styles for breadcrumbs.
+ */
+
+.breadcrumb {
+ padding-bottom: 0.5em;
+}
+.breadcrumb ol {
+ margin: 0;
+ padding: 0;
+}
+[dir="rtl"] .breadcrumb ol {
+ /* This is required to win over specificity of [dir="rtl"] ol */
+ margin-right: 0;
+}
+.breadcrumb li {
+ display: inline;
+ margin: 0;
+ padding: 0;
+ list-style-type: none;
+}
+/* IE8 does not support :not() and :last-child. */
+.breadcrumb li:before {
+ content: " \BB ";
+}
+.breadcrumb li:first-child:before {
+ content: none;
+}
diff --git a/web/core/themes/seven/css/classy/components/button.css b/web/core/themes/seven/css/classy/components/button.css
new file mode 100644
index 0000000000..5eb4f1ac13
--- /dev/null
+++ b/web/core/themes/seven/css/classy/components/button.css
@@ -0,0 +1,15 @@
+/**
+ * @file
+ * Visual styles for buttons.
+ */
+
+.button,
+.image-button {
+ margin-right: 1em;
+ margin-left: 1em;
+}
+.button:first-child,
+.image-button:first-child {
+ margin-right: 0;
+ margin-left: 0;
+}
diff --git a/web/core/themes/seven/css/classy/components/collapse-processed.css b/web/core/themes/seven/css/classy/components/collapse-processed.css
new file mode 100644
index 0000000000..c8c786882c
--- /dev/null
+++ b/web/core/themes/seven/css/classy/components/collapse-processed.css
@@ -0,0 +1,32 @@
+/**
+ * @file
+ * Visual styles for collapsible fieldsets.
+ */
+
+.collapse-processed > summary {
+ padding-right: 0.5em;
+ padding-left: 0.5em;
+}
+.collapse-processed > summary:before {
+ float: left; /* LTR */
+ width: 1em;
+ height: 1em;
+ content: "";
+ background: url(../../../../../misc/menu-expanded.png) 0 100% no-repeat; /* LTR */
+}
+[dir="rtl"] .collapse-processed > summary:before {
+ float: right;
+ background-position: 100% 100%;
+}
+.collapse-processed:not([open]) > summary:before {
+ -ms-transform: rotate(-90deg);
+ -webkit-transform: rotate(-90deg);
+ transform: rotate(-90deg);
+ background-position: 25% 35%; /* LTR */
+}
+[dir="rtl"] .collapse-processed:not([open]) > summary:before {
+ -ms-transform: rotate(90deg);
+ -webkit-transform: rotate(90deg);
+ transform: rotate(90deg);
+ background-position: 75% 35%;
+}
diff --git a/web/core/themes/seven/css/classy/components/container-inline.css b/web/core/themes/seven/css/classy/components/container-inline.css
new file mode 100644
index 0000000000..64b78f683b
--- /dev/null
+++ b/web/core/themes/seven/css/classy/components/container-inline.css
@@ -0,0 +1,22 @@
+/**
+ * @file
+ * Inline items.
+ */
+
+.container-inline label:after,
+.container-inline .label:after {
+ content: ":";
+}
+.form-type-radios .container-inline label:after,
+.form-type-checkboxes .container-inline label:after {
+ content: "";
+}
+.form-type-radios .container-inline .form-type-radio,
+.form-type-checkboxes .container-inline .form-type-checkbox {
+ margin: 0 1em;
+}
+.container-inline .form-actions,
+.container-inline.form-actions {
+ margin-top: 0;
+ margin-bottom: 0;
+}
diff --git a/web/core/themes/seven/css/classy/components/dropbutton.css b/web/core/themes/seven/css/classy/components/dropbutton.css
new file mode 100644
index 0000000000..5e971ba622
--- /dev/null
+++ b/web/core/themes/seven/css/classy/components/dropbutton.css
@@ -0,0 +1,33 @@
+/**
+ * @file
+ * General styles for dropbuttons.
+ */
+
+.js .dropbutton-widget {
+ border: 1px solid #ccc;
+ background-color: white;
+}
+.js .dropbutton-widget:hover {
+ border-color: #b8b8b8;
+}
+.dropbutton .dropbutton-action > * {
+ padding: 0.1em 0.5em;
+ white-space: nowrap;
+}
+.dropbutton .secondary-action {
+ border-top: 1px solid #e8e8e8;
+}
+.dropbutton-multiple .dropbutton {
+ border-right: 1px solid #e8e8e8; /* LTR */
+}
+[dir="rtl"] .dropbutton-multiple .dropbutton {
+ border-right: 0 none;
+ border-left: 1px solid #e8e8e8;
+}
+.dropbutton-multiple .dropbutton .dropbutton-action > * {
+ margin-right: 0.25em; /* LTR */
+}
+[dir="rtl"] .dropbutton-multiple .dropbutton .dropbutton-action > * {
+ margin-right: 0;
+ margin-left: 0.25em;
+}
diff --git a/web/core/themes/seven/css/classy/components/exposed-filters.css b/web/core/themes/seven/css/classy/components/exposed-filters.css
new file mode 100644
index 0000000000..b686902ef1
--- /dev/null
+++ b/web/core/themes/seven/css/classy/components/exposed-filters.css
@@ -0,0 +1,46 @@
+/**
+ * @file
+ * Visual styles for exposed filters.
+ */
+
+.exposed-filters .filters {
+ float: left; /* LTR */
+ margin-right: 1em; /* LTR */
+}
+[dir="rtl"] .exposed-filters .filters {
+ float: right;
+ margin-right: 0;
+ margin-left: 1em;
+}
+.exposed-filters .form-item {
+ margin: 0 0 0.1em 0;
+ padding: 0;
+}
+.exposed-filters .form-item label {
+ float: left; /* LTR */
+ width: 10em;
+ font-weight: normal;
+}
+[dir="rtl"] .exposed-filters .form-item label {
+ float: right;
+}
+.exposed-filters .form-select {
+ width: 14em;
+}
+/* Current filters */
+.exposed-filters .current-filters {
+ margin-bottom: 1em;
+}
+.exposed-filters .current-filters .placeholder {
+ font-weight: bold;
+ font-style: normal;
+}
+.exposed-filters .additional-filters {
+ float: left; /* LTR */
+ margin-right: 1em; /* LTR */
+}
+[dir="rtl"] .exposed-filters .additional-filters {
+ float: right;
+ margin-right: 0;
+ margin-left: 1em;
+}
diff --git a/web/core/themes/seven/css/classy/components/field.css b/web/core/themes/seven/css/classy/components/field.css
new file mode 100644
index 0000000000..ff7e9ab1fc
--- /dev/null
+++ b/web/core/themes/seven/css/classy/components/field.css
@@ -0,0 +1,25 @@
+/**
+ * @file
+ * Visual styles for fields.
+ */
+
+.field__label {
+ font-weight: bold;
+}
+.field--label-inline .field__label,
+.field--label-inline .field__items {
+ float: left; /* LTR */
+}
+.field--label-inline .field__label,
+.field--label-inline > .field__item,
+.field--label-inline .field__items {
+ padding-right: 0.5em;
+}
+[dir="rtl"] .field--label-inline .field__label,
+[dir="rtl"] .field--label-inline .field__items {
+ padding-right: 0;
+ padding-left: 0.5em;
+}
+.field--label-inline .field__label::after {
+ content: ":";
+}
diff --git a/web/core/themes/seven/css/classy/components/file.css b/web/core/themes/seven/css/classy/components/file.css
new file mode 100644
index 0000000000..8637242a54
--- /dev/null
+++ b/web/core/themes/seven/css/classy/components/file.css
@@ -0,0 +1,62 @@
+/**
+ * @file
+ * Default style for file module.
+ */
+
+/* File icons. */
+
+.file {
+ display: inline-block;
+ min-height: 16px;
+ padding-left: 20px; /* LTR */
+ background-repeat: no-repeat;
+ background-position: left center; /* LTR */
+}
+[dir="rtl"] .file {
+ padding-right: 20px;
+ padding-left: inherit;
+ background-position: right center;
+}
+.file--general,
+.file--application-octet-stream {
+ background-image: url(../../../images/classy/icons/application-octet-stream.png);
+}
+.file--package-x-generic {
+ background-image: url(../../../images/classy/icons/package-x-generic.png);
+}
+.file--x-office-spreadsheet {
+ background-image: url(../../../images/classy/icons/x-office-spreadsheet.png);
+}
+.file--x-office-document {
+ background-image: url(../../../images/classy/icons/x-office-document.png);
+}
+.file--x-office-presentation {
+ background-image: url(../../../images/classy/icons/x-office-presentation.png);
+}
+.file--text-x-script {
+ background-image: url(../../../images/classy/icons/text-x-script.png);
+}
+.file--text-html {
+ background-image: url(../../../images/classy/icons/text-html.png);
+}
+.file--text-plain {
+ background-image: url(../../../images/classy/icons/text-plain.png);
+}
+.file--application-pdf {
+ background-image: url(../../../images/classy/icons/application-pdf.png);
+}
+.file--application-x-executable {
+ background-image: url(../../../images/classy/icons/application-x-executable.png);
+}
+.file--audio {
+ background-image: url(../../../images/classy/icons/audio-x-generic.png);
+}
+.file--video {
+ background-image: url(../../../images/classy/icons/video-x-generic.png);
+}
+.file--text {
+ background-image: url(../../../images/classy/icons/text-x-generic.png);
+}
+.file--image {
+ background-image: url(../../../images/classy/icons/image-x-generic.png);
+}
diff --git a/web/core/themes/seven/css/classy/components/form.css b/web/core/themes/seven/css/classy/components/form.css
new file mode 100644
index 0000000000..7f8aa4b35f
--- /dev/null
+++ b/web/core/themes/seven/css/classy/components/form.css
@@ -0,0 +1,104 @@
+/**
+ * @file
+ * Visual styles for form components.
+ */
+
+form .field-multiple-table {
+ margin: 0;
+}
+form .field-multiple-table .field-multiple-drag {
+ width: 30px;
+ padding-right: 0; /* LTR */
+}
+[dir="rtl"] form .field-multiple-table .field-multiple-drag {
+ padding-left: 0;
+}
+form .field-multiple-table .field-multiple-drag .tabledrag-handle {
+ padding-right: 0.5em; /* LTR */
+}
+[dir="rtl"] form .field-multiple-table .field-multiple-drag .tabledrag-handle {
+ padding-right: 0;
+ padding-left: 0.5em;
+}
+form .field-add-more-submit {
+ margin: 0.5em 0 0;
+}
+
+/**
+ * Markup generated by Form API.
+ */
+.form-item,
+.form-actions {
+ margin-top: 1em;
+ margin-bottom: 1em;
+}
+tr.odd .form-item,
+tr.even .form-item {
+ margin-top: 0;
+ margin-bottom: 0;
+}
+.form-composite > .fieldset-wrapper > .description,
+.form-item .description {
+ font-size: 0.85em;
+}
+label.option {
+ display: inline;
+ font-weight: normal;
+}
+.form-composite > legend,
+.label {
+ display: inline;
+ margin: 0;
+ padding: 0;
+ font-size: inherit;
+ font-weight: bold;
+}
+.form-checkboxes .form-item,
+.form-radios .form-item {
+ margin-top: 0.4em;
+ margin-bottom: 0.4em;
+}
+.form-type-radio .description,
+.form-type-checkbox .description {
+ margin-left: 2.4em; /* LTR */
+}
+[dir="rtl"] .form-type-radio .description,
+[dir="rtl"] .form-type-checkbox .description {
+ margin-right: 2.4em;
+ margin-left: 0;
+}
+.marker {
+ color: #e00;
+}
+.form-required:after {
+ display: inline-block;
+ width: 6px;
+ height: 6px;
+ margin: 0 0.3em;
+ content: "";
+ vertical-align: super;
+ /* Use a background image to prevent screen readers from announcing the text. */
+ background-image: url(../../../../../misc/icons/ee0000/required.svg);
+ background-repeat: no-repeat;
+ background-size: 6px 6px;
+}
+abbr.tabledrag-changed,
+abbr.ajax-changed {
+ border-bottom: none;
+}
+.form-item input.error,
+.form-item textarea.error,
+.form-item select.error {
+ border: 2px solid red;
+}
+
+/* Inline error messages. */
+.form-item--error-message:before {
+ display: inline-block;
+ width: 14px;
+ height: 14px;
+ content: "";
+ vertical-align: sub;
+ background: url(../../../../../misc/icons/e32700/error.svg) no-repeat;
+ background-size: contain;
+}
diff --git a/web/core/themes/seven/css/classy/components/forum.css b/web/core/themes/seven/css/classy/components/forum.css
new file mode 100644
index 0000000000..c35e3f4411
--- /dev/null
+++ b/web/core/themes/seven/css/classy/components/forum.css
@@ -0,0 +1,46 @@
+/**
+ * @file
+ * Styling for the Forum module.
+ */
+
+.forum__description {
+ margin: 0.5em;
+ font-size: 0.9em;
+}
+.forum__icon {
+ float: left; /* LTR */
+ width: 24px;
+ height: 24px;
+ margin: 0 9px 0 0; /* LTR */
+ background-image: url(../../../images/classy/icons/forum-icons.png);
+ background-repeat: no-repeat;
+}
+[dir="rtl"] .forum__icon {
+ float: right;
+ margin: 0 0 0 9px;
+}
+.forum__title {
+ overflow: hidden;
+}
+.forum .indented {
+ margin-left: 20px; /* LTR */
+}
+[dir="rtl"] .forum .indented {
+ margin-right: 20px;
+ margin-left: 0;
+}
+.forum__topic-status--new {
+ background-position: -24px 0;
+}
+.forum__topic-status--hot {
+ background-position: -48px 0;
+}
+.forum__topic-status--hot-new {
+ background-position: -72px 0;
+}
+.forum__topic-status--sticky {
+ background-position: -96px 0;
+}
+.forum__topic-status--closed {
+ background-position: -120px 0;
+}
diff --git a/web/core/themes/seven/css/classy/components/icons.css b/web/core/themes/seven/css/classy/components/icons.css
new file mode 100644
index 0000000000..ab0245f4c5
--- /dev/null
+++ b/web/core/themes/seven/css/classy/components/icons.css
@@ -0,0 +1,21 @@
+/**
+ * @file
+ * Visual styles for icons.
+ */
+
+.icon-help {
+ padding: 1px 0 1px 20px; /* LTR */
+ background: url(../../../../../misc/help.png) 0 50% no-repeat; /* LTR */
+}
+[dir="rtl"] .icon-help {
+ padding: 1px 20px 1px 0;
+ background-position: 100% 50%;
+}
+.feed-icon {
+ display: block;
+ overflow: hidden;
+ width: 16px;
+ height: 16px;
+ text-indent: -9999px;
+ background: url(../../../../../misc/feed.svg) no-repeat;
+}
diff --git a/web/core/themes/seven/css/classy/components/image-widget.css b/web/core/themes/seven/css/classy/components/image-widget.css
new file mode 100644
index 0000000000..56777c41ea
--- /dev/null
+++ b/web/core/themes/seven/css/classy/components/image-widget.css
@@ -0,0 +1,33 @@
+/**
+ * @file
+ * Image upload widget.
+ *
+ * This CSS file is not used in this theme (Classy). It was intended to be used,
+ * but due to a bug, Drupal 8 shipped with it not being used. To not break
+ * backwards compatibility, we continue to not load it in Classy. Every
+ * subtheme of Classy is encouraged to use it, by attaching the
+ * classy/image-widget asset library in their image-widget.html.twig file.
+ *
+ * @see core/themes/seven/templates/content-edit/image-widget.html.twig.
+ *
+ * @todo In Drupal 9, let core/themes/classy/templates/content-edit/image-widget.html.twig
+ * attach the classy/image-widget asset library.
+ */
+
+.image-preview {
+ float: left; /* LTR */
+ padding: 0 10px 10px 0; /* LTR */
+}
+[dir="rtl"] .image-preview {
+ float: right;
+ padding: 0 0 10px 10px;
+}
+.image-widget-data {
+ float: left; /* LTR */
+}
+[dir="rtl"] .image-widget-data {
+ float: right;
+}
+.image-widget-data .text-field {
+ width: auto;
+}
diff --git a/web/core/themes/seven/css/classy/components/indented.css b/web/core/themes/seven/css/classy/components/indented.css
new file mode 100644
index 0000000000..6925a06363
--- /dev/null
+++ b/web/core/themes/seven/css/classy/components/indented.css
@@ -0,0 +1,16 @@
+
+/**
+ * @file
+ * Basic styling for comment module.
+ */
+
+/**
+ * Indent threaded comments.
+ */
+.indented {
+ margin-left: 25px; /* LTR */
+}
+[dir="rtl"] .indented {
+ margin-right: 25px;
+ margin-left: 0;
+}
diff --git a/web/core/themes/seven/css/classy/components/inline-form.css b/web/core/themes/seven/css/classy/components/inline-form.css
new file mode 100644
index 0000000000..b5201a78c9
--- /dev/null
+++ b/web/core/themes/seven/css/classy/components/inline-form.css
@@ -0,0 +1,33 @@
+/**
+ * @file
+ * Visual styles for inline forms.
+ */
+
+.form--inline .form-item {
+ float: left; /* LTR */
+ margin-right: 0.5em; /* LTR */
+}
+[dir="rtl"] .form--inline .form-item {
+ float: right;
+ margin-right: 0;
+ margin-left: 0.5em;
+}
+/* This is required to win over specificity of [dir="rtl"] .form--inline .form-item */
+[dir="rtl"] .views-filterable-options-controls .form-item {
+ margin-right: 2%;
+}
+.form--inline .form-item-separator {
+ margin-top: 2.3em;
+ margin-right: 1em; /* LTR */
+ margin-left: 0.5em; /* LTR */
+}
+[dir="rtl"] .form--inline .form-item-separator {
+ margin-right: 0.5em;
+ margin-left: 1em;
+}
+.form--inline .form-actions {
+ clear: left; /* LTR */
+}
+[dir="rtl"] .form--inline .form-actions {
+ clear: right;
+}
diff --git a/web/core/themes/seven/css/classy/components/item-list.css b/web/core/themes/seven/css/classy/components/item-list.css
new file mode 100644
index 0000000000..a8ce5d28a5
--- /dev/null
+++ b/web/core/themes/seven/css/classy/components/item-list.css
@@ -0,0 +1,32 @@
+/**
+ * @file
+ * Visual styles for item list.
+ */
+
+.item-list .title {
+ font-weight: bold;
+}
+.item-list ul {
+ margin: 0 0 0.75em 0;
+ padding: 0;
+}
+.item-list li {
+ margin: 0 0 0.25em 1.5em; /* LTR */
+ padding: 0;
+}
+[dir="rtl"] .item-list li {
+ margin: 0 1.5em 0.25em 0;
+}
+
+/**
+ * Comma separated lists.
+ */
+.item-list--comma-list {
+ display: inline;
+}
+.item-list--comma-list .item-list__comma-list,
+.item-list__comma-list li,
+[dir="rtl"] .item-list--comma-list .item-list__comma-list,
+[dir="rtl"] .item-list__comma-list li {
+ margin: 0;
+}
diff --git a/web/core/themes/seven/css/classy/components/link.css b/web/core/themes/seven/css/classy/components/link.css
new file mode 100644
index 0000000000..fa83f2bb2c
--- /dev/null
+++ b/web/core/themes/seven/css/classy/components/link.css
@@ -0,0 +1,16 @@
+/**
+ * @file
+ * Style another element as a link.
+ */
+
+button.link {
+ margin: 0;
+ padding: 0;
+ cursor: pointer;
+ border: 0;
+ background: transparent;
+ font-size: 1em;
+}
+label button.link {
+ font-weight: bold;
+}
diff --git a/web/core/themes/seven/css/classy/components/links.css b/web/core/themes/seven/css/classy/components/links.css
new file mode 100644
index 0000000000..e483253933
--- /dev/null
+++ b/web/core/themes/seven/css/classy/components/links.css
@@ -0,0 +1,23 @@
+/**
+ * @file
+ * Visual styles for links.
+ */
+
+ul.inline,
+ul.links.inline {
+ display: inline;
+ padding-left: 0; /* LTR */
+}
+[dir="rtl"] ul.inline,
+[dir="rtl"] ul.links.inline {
+ padding-right: 0;
+ padding-left: 15px;
+}
+ul.inline li {
+ display: inline;
+ padding: 0 0.5em;
+ list-style-type: none;
+}
+ul.links a.is-active {
+ color: #000;
+}
diff --git a/web/core/themes/seven/css/classy/components/media-embed-error.css b/web/core/themes/seven/css/classy/components/media-embed-error.css
new file mode 100644
index 0000000000..edb3ab24e6
--- /dev/null
+++ b/web/core/themes/seven/css/classy/components/media-embed-error.css
@@ -0,0 +1,20 @@
+/**
+ * @file
+ * Media Embed filter: default styling for media embed errors.
+ */
+
+/**
+ * The caption filter's styling overrides ours, so add a more specific selector
+ * to account for that.
+ */
+.media-embed-error,
+.caption > .media-embed-error {
+ max-width: 200px;
+ padding: 100px 20px 20px;
+ text-align: center;
+ background-color: #ebebeb;
+ background-image: url(../../../../../modules/media/images/icons/no-thumbnail.png);
+ background-repeat: no-repeat;
+ background-position: center top;
+ background-size: 100px 100px;
+}
diff --git a/web/core/themes/seven/css/classy/components/menu.css b/web/core/themes/seven/css/classy/components/menu.css
new file mode 100644
index 0000000000..80d3e14d86
--- /dev/null
+++ b/web/core/themes/seven/css/classy/components/menu.css
@@ -0,0 +1,34 @@
+/**
+ * @file
+ * Visual styles for menu.
+ */
+
+ul.menu {
+ margin-left: 1em; /* LTR */
+ padding: 0;
+ list-style: none outside;
+ text-align: left; /* LTR */
+}
+[dir="rtl"] ul.menu {
+ margin-right: 1em;
+ margin-left: 0;
+ text-align: right;
+}
+.menu-item--expanded {
+ list-style-type: circle;
+ list-style-image: url(../../../../../misc/menu-expanded.png);
+}
+.menu-item--collapsed {
+ list-style-type: disc;
+ list-style-image: url(../../../../../misc/menu-collapsed.png); /* LTR */
+}
+[dir="rtl"] .menu-item--collapsed {
+ list-style-image: url(../../../../../misc/menu-collapsed-rtl.png);
+}
+.menu-item {
+ margin: 0;
+ padding-top: 0.2em;
+}
+ul.menu a.is-active {
+ color: #000;
+}
diff --git a/web/core/themes/seven/css/classy/components/messages.css b/web/core/themes/seven/css/classy/components/messages.css
new file mode 100644
index 0000000000..47459468d2
--- /dev/null
+++ b/web/core/themes/seven/css/classy/components/messages.css
@@ -0,0 +1,72 @@
+/**
+ * @file
+ * Styles for system messages.
+ */
+
+.messages {
+ padding: 15px 20px 15px 35px; /* LTR */
+ word-wrap: break-word;
+ border: 1px solid;
+ border-width: 1px 1px 1px 0; /* LTR */
+ border-radius: 2px;
+ background: no-repeat 10px 17px; /* LTR */
+ overflow-wrap: break-word;
+}
+[dir="rtl"] .messages {
+ padding-right: 35px;
+ padding-left: 20px;
+ text-align: right;
+ border-width: 1px 0 1px 1px;
+ background-position: right 10px top 17px;
+}
+.messages + .messages {
+ margin-top: 1.538em;
+}
+.messages__list {
+ margin: 0;
+ padding: 0;
+ list-style: none;
+}
+.messages__item + .messages__item {
+ margin-top: 0.769em;
+}
+/* See .color-success in Seven's colors.css */
+.messages--status {
+ color: #325e1c;
+ border-color: #c9e1bd #c9e1bd #c9e1bd transparent; /* LTR */
+ background-color: #f3faef;
+ background-image: url(../../../../../misc/icons/73b355/check.svg);
+ box-shadow: -8px 0 0 #77b259; /* LTR */
+}
+[dir="rtl"] .messages--status {
+ margin-left: 0;
+ border-color: #c9e1bd transparent #c9e1bd #c9e1bd;
+ box-shadow: 8px 0 0 #77b259;
+}
+/* See .color-warning in Seven's colors.css */
+.messages--warning {
+ color: #734c00;
+ border-color: #f4daa6 #f4daa6 #f4daa6 transparent; /* LTR */
+ background-color: #fdf8ed;
+ background-image: url(../../../../../misc/icons/e29700/warning.svg);
+ box-shadow: -8px 0 0 #e09600; /* LTR */
+}
+[dir="rtl"] .messages--warning {
+ border-color: #f4daa6 transparent #f4daa6 #f4daa6;
+ box-shadow: 8px 0 0 #e09600;
+}
+/* See .color-error in Seven's colors.css */
+.messages--error {
+ color: #a51b00;
+ border-color: #f9c9bf #f9c9bf #f9c9bf transparent; /* LTR */
+ background-color: #fcf4f2;
+ background-image: url(../../../../../misc/icons/e32700/error.svg);
+ box-shadow: -8px 0 0 #e62600; /* LTR */
+}
+[dir="rtl"] .messages--error {
+ border-color: #f9c9bf transparent #f9c9bf #f9c9bf;
+ box-shadow: 8px 0 0 #e62600;
+}
+.messages--error p.error {
+ color: #a51b00;
+}
diff --git a/web/core/themes/seven/css/classy/components/more-link.css b/web/core/themes/seven/css/classy/components/more-link.css
new file mode 100644
index 0000000000..c604061317
--- /dev/null
+++ b/web/core/themes/seven/css/classy/components/more-link.css
@@ -0,0 +1,12 @@
+/**
+ * @file
+ * Markup generated by #type 'more_link'.
+ */
+
+.more-link {
+ display: block;
+ text-align: right; /* LTR */
+}
+[dir="rtl"] .more-link {
+ text-align: left;
+}
diff --git a/web/core/themes/seven/css/classy/components/node.css b/web/core/themes/seven/css/classy/components/node.css
new file mode 100644
index 0000000000..6b7cd5257d
--- /dev/null
+++ b/web/core/themes/seven/css/classy/components/node.css
@@ -0,0 +1,8 @@
+/**
+ * @file
+ * Visual styles for nodes.
+ */
+
+.node--unpublished {
+ background-color: #fff4f4;
+}
diff --git a/web/core/themes/seven/css/classy/components/pager.css b/web/core/themes/seven/css/classy/components/pager.css
new file mode 100644
index 0000000000..a9471fc037
--- /dev/null
+++ b/web/core/themes/seven/css/classy/components/pager.css
@@ -0,0 +1,16 @@
+/**
+ * @file
+ * Visual styles for pager.
+ */
+
+.pager__items {
+ clear: both;
+ text-align: center;
+}
+.pager__item {
+ display: inline;
+ padding: 0.5em;
+}
+.pager__item.is-active {
+ font-weight: bold;
+}
diff --git a/web/core/themes/seven/css/classy/components/progress.css b/web/core/themes/seven/css/classy/components/progress.css
new file mode 100644
index 0000000000..47da889350
--- /dev/null
+++ b/web/core/themes/seven/css/classy/components/progress.css
@@ -0,0 +1,69 @@
+/**
+ * @file
+ * Visual styles for progress bar.
+ *
+ * @see progress.js
+ */
+
+.progress__track {
+ border-color: #b3b3b3;
+ border-radius: 10em;
+ background-color: #f2f1eb;
+ background-image: -webkit-linear-gradient(#e7e7df, #f0f0f0);
+ background-image: linear-gradient(#e7e7df, #f0f0f0);
+ box-shadow: inset 0 1px 3px hsla(0, 0%, 0%, 0.16);
+}
+.progress__bar {
+ height: 16px;
+ margin-top: -1px;
+ margin-left: -1px; /* LTR */
+ padding: 0 1px;
+ -webkit-transition: width 0.5s ease-out;
+ transition: width 0.5s ease-out;
+ -webkit-animation: animate-stripes 3s linear infinite;
+ -moz-animation: animate-stripes 3s linear infinite;
+ border: 1px #07629a solid;
+ border-radius: 10em;
+ background: #057ec9;
+ background-image:
+ -webkit-linear-gradient(top, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.15)),
+ -webkit-linear-gradient(left top, #0094f0 0%, #0094f0 25%, #007ecc 25%, #007ecc 50%, #0094f0 50%, #0094f0 75%, #0094f0 100%);
+ background-image:
+ linear-gradient(to bottom, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.15)),
+ linear-gradient(to right bottom, #0094f0 0%, #0094f0 25%, #007ecc 25%, #007ecc 50%, #0094f0 50%, #0094f0 75%, #0094f0 100%);
+ background-size: 40px 40px;
+}
+[dir="rtl"] .progress__bar {
+ margin-right: -1px;
+ margin-left: 0;
+ -webkit-animation-direction: reverse;
+ -moz-animation-direction: reverse;
+ animation-direction: reverse;
+}
+
+@media screen and (prefers-reduced-motion: reduce) {
+ .progress__bar {
+ -webkit-transition: none;
+ transition: none;
+ -webkit-animation: none;
+ -moz-animation: none;
+ }
+}
+
+/**
+ * Progress bar animations.
+ */
+@-webkit-keyframes animate-stripes {
+ 0% { background-position: 0 0, 0 0; }
+ 100% { background-position: 0 0, -80px 0; }
+}
+
+@-ms-keyframes animate-stripes {
+ 0% { background-position: 0 0, 0 0; }
+ 100% { background-position: 0 0, -80px 0; }
+}
+
+@keyframes animate-stripes {
+ 0% { background-position: 0 0, 0 0; }
+ 100% { background-position: 0 0, -80px 0; }
+}
diff --git a/web/core/themes/seven/css/classy/components/search-results.css b/web/core/themes/seven/css/classy/components/search-results.css
new file mode 100644
index 0000000000..343ea8b5fb
--- /dev/null
+++ b/web/core/themes/seven/css/classy/components/search-results.css
@@ -0,0 +1,8 @@
+/**
+ * @file
+ * Stylesheet for results generated by the Search module.
+ */
+
+.search-results {
+ list-style: none;
+}
diff --git a/web/core/themes/seven/css/classy/components/tabledrag.css b/web/core/themes/seven/css/classy/components/tabledrag.css
new file mode 100644
index 0000000000..a197b24979
--- /dev/null
+++ b/web/core/themes/seven/css/classy/components/tabledrag.css
@@ -0,0 +1,14 @@
+/**
+ * @file
+ * Visual styles for table drag.
+ */
+
+tr.drag {
+ background-color: #fffff0;
+}
+tr.drag-previous {
+ background-color: #ffd;
+}
+body div.tabledrag-changed-warning {
+ margin-bottom: 0.5em;
+}
diff --git a/web/core/themes/seven/css/classy/components/tableselect.css b/web/core/themes/seven/css/classy/components/tableselect.css
new file mode 100644
index 0000000000..fcfb2a5aa4
--- /dev/null
+++ b/web/core/themes/seven/css/classy/components/tableselect.css
@@ -0,0 +1,19 @@
+/**
+ * @file
+ * Table select behavior.
+ *
+ * @see tableselect.js
+ */
+
+tr.selected td {
+ background: #ffc;
+}
+td.checkbox,
+th.checkbox {
+ text-align: center;
+}
+[dir="rtl"] td.checkbox,
+[dir="rtl"] th.checkbox {
+ /* This is required to win over specificity of [dir="rtl"] td */
+ text-align: center;
+}
diff --git a/web/core/themes/seven/css/classy/components/tablesort.css b/web/core/themes/seven/css/classy/components/tablesort.css
new file mode 100644
index 0000000000..44e5349404
--- /dev/null
+++ b/web/core/themes/seven/css/classy/components/tablesort.css
@@ -0,0 +1,11 @@
+/**
+ * @file
+ * Table sort indicator.
+ */
+
+th.is-active img {
+ display: inline;
+}
+td.is-active {
+ background-color: #ddd;
+}
diff --git a/web/core/themes/seven/css/classy/components/tabs.css b/web/core/themes/seven/css/classy/components/tabs.css
new file mode 100644
index 0000000000..16fb1223f0
--- /dev/null
+++ b/web/core/themes/seven/css/classy/components/tabs.css
@@ -0,0 +1,33 @@
+/**
+ * @file
+ * Visual styles for tabs.
+ */
+
+div.tabs {
+ margin: 1em 0;
+}
+ul.tabs {
+ margin: 0 0 0.5em;
+ padding: 0;
+ list-style: none;
+}
+.tabs > li {
+ display: inline-block;
+ margin-right: 0.3em; /* LTR */
+}
+[dir="rtl"] .tabs > li {
+ margin-right: 0;
+ margin-left: 0.3em;
+}
+.tabs a {
+ display: block;
+ padding: 0.2em 1em;
+ text-decoration: none;
+}
+.tabs a.is-active {
+ background-color: #eee;
+}
+.tabs a:focus,
+.tabs a:hover {
+ background-color: #f5f5f5;
+}
diff --git a/web/core/themes/seven/css/classy/components/textarea.css b/web/core/themes/seven/css/classy/components/textarea.css
new file mode 100644
index 0000000000..2661bae9c4
--- /dev/null
+++ b/web/core/themes/seven/css/classy/components/textarea.css
@@ -0,0 +1,11 @@
+/**
+ * @file
+ * Visual styles for a resizable textarea.
+ */
+
+.form-textarea-wrapper textarea {
+ display: block;
+ box-sizing: border-box;
+ width: 100%;
+ margin: 0;
+}
diff --git a/web/core/themes/seven/css/classy/components/ui-dialog.css b/web/core/themes/seven/css/classy/components/ui-dialog.css
new file mode 100644
index 0000000000..476c21ffdb
--- /dev/null
+++ b/web/core/themes/seven/css/classy/components/ui-dialog.css
@@ -0,0 +1,15 @@
+/**
+ * @file
+ * Styles for Classy's modal windows.
+ */
+
+.ui-dialog--narrow {
+ max-width: 500px;
+}
+
+@media screen and (max-width: 600px) {
+ .ui-dialog--narrow {
+ min-width: 95%;
+ max-width: 95%;
+ }
+}
diff --git a/web/core/themes/seven/css/classy/components/user.css b/web/core/themes/seven/css/classy/components/user.css
new file mode 100644
index 0000000000..8baa8f83a3
--- /dev/null
+++ b/web/core/themes/seven/css/classy/components/user.css
@@ -0,0 +1,66 @@
+/**
+ * @file
+ * Theme styling for user module.
+ */
+
+/* Visual styling for the Password strength indicator */
+.password-strength__meter {
+ margin-top: 0.5em;
+ background-color: #ebeae4;
+}
+.password-strength__indicator {
+ -webkit-transition: width 0.5s ease-out;
+ transition: width 0.5s ease-out;
+ background-color: #77b259;
+}
+.password-strength__indicator.is-weak {
+ background-color: #e62600;
+}
+.password-strength__indicator.is-fair {
+ background-color: #e09600;
+}
+.password-strength__indicator.is-good {
+ background-color: #0074bd;
+}
+.password-strength__indicator.is-strong {
+ background-color: #77b259;
+}
+
+.password-confirm,
+.password-field,
+.password-strength,
+.password-confirm-match {
+ width: 55%;
+}
+
+.password-suggestions {
+ max-width: 34.7em;
+ margin: 0.7em 0;
+ padding: 0.2em 0.5em;
+ border: 1px solid #b4b4b4;
+}
+.password-suggestions ul {
+ margin-bottom: 0;
+}
+
+.confirm-parent,
+.password-parent {
+ clear: left; /* LTR */
+ overflow: hidden;
+ max-width: 33em;
+ margin: 0;
+}
+[dir="rtl"] .confirm-parent,
+[dir="rtl"] .password-parent {
+ clear: right;
+}
+
+/* Styling for the status indicator of the passwords match test. */
+.password-confirm .ok {
+ color: #325e1c;
+ font-weight: bold;
+}
+.password-confirm .error {
+ color: #a51b00;
+ font-weight: bold;
+}
diff --git a/web/core/themes/seven/css/classy/layout/media-library.css b/web/core/themes/seven/css/classy/layout/media-library.css
new file mode 100644
index 0000000000..84dee10daa
--- /dev/null
+++ b/web/core/themes/seven/css/classy/layout/media-library.css
@@ -0,0 +1,28 @@
+/**
+ * @file
+ * Contains minimal layout styling for the media library.
+ */
+
+.media-library-wrapper {
+ display: flex;
+}
+
+.media-library-menu {
+ flex-basis: 20%;
+ flex-shrink: 0;
+}
+
+.media-library-content {
+ flex-grow: 1;
+}
+
+.media-library-views-form {
+ display: flex;
+ flex-wrap: wrap;
+}
+
+.media-library-views-form .media-library-item {
+ justify-content: space-between;
+ max-width: 23%;
+ margin: 1%;
+}
diff --git a/web/core/themes/seven/css/components/form.css b/web/core/themes/seven/css/components/form.css
index 98e78914e9..d4601b960e 100644
--- a/web/core/themes/seven/css/components/form.css
+++ b/web/core/themes/seven/css/components/form.css
@@ -13,17 +13,6 @@ fieldset:not(.fieldgroup) {
border-radius: 2px;
background-color: #fcfcfa;
}
-/**
- * We've temporarily added this Firefox specific rule here to fix fieldset
- * widths.
- * @todo remove once this Mozilla bug is fixed.
- * See https://bugzilla.mozilla.org/show_bug.cgi?id=504622
- */
-@media (min--moz-device-pixel-ratio: 0) {
- fieldset:not(.fieldgroup) {
- display: table-cell;
- }
-}
fieldset:not(.fieldgroup) > legend {
position: absolute;
top: 10px;
@@ -35,17 +24,6 @@ fieldset:not(.fieldgroup) > legend {
.fieldgroup {
min-width: 0;
}
-/**
- * We've temporarily added this Firefox specific rule here to fix fieldset
- * widths.
- * @todo remove once this Mozilla bug is fixed.
- * See https://bugzilla.mozilla.org/show_bug.cgi?id=504622
- */
-@media (min--moz-device-pixel-ratio: 0) {
- .fieldgroup {
- display: table-cell;
- }
-}
.form-item {
margin: 0.75em 0;
}
diff --git a/web/core/themes/seven/images/classy/README.txt b/web/core/themes/seven/images/classy/README.txt
new file mode 100644
index 0000000000..9df44f55ec
--- /dev/null
+++ b/web/core/themes/seven/images/classy/README.txt
@@ -0,0 +1,12 @@
+WHAT IS THIS DIRECTORY FOR?
+--------------------------------
+This directory is for image files previously inherited from the Classy theme.
+
+WHY ARE CLASSY IMAGE FILES BEING COPIED HERE?
+-------------------------------------------
+Classy will be deprecated during the Drupal 9 lifecycle. To prepare for Classy's
+removal, image files that would otherwise be inherited from Classy are copied
+here.
+
+Image files that differ from the Classy versions should not be placed in this
+directory or any subdirectory.
diff --git a/web/core/themes/seven/images/classy/icons/application-octet-stream.png b/web/core/themes/seven/images/classy/icons/application-octet-stream.png
new file mode 100644
index 0000000000..d5453217dc
--- /dev/null
+++ b/web/core/themes/seven/images/classy/icons/application-octet-stream.png
@@ -0,0 +1,3 @@
+�PNG
+
+���
IHDR�����������7����tEXtSoftware�Adobe ImageReadyq�e<���_IDAT(S�ͱ �@Dѩ�,�`�42���@����Z���#���d2!�4J�>dt�� `�
,=ޛ���{g8���C �PG(�<�h\���w�)E�o}�^�����IEND�B`�
\ No newline at end of file
diff --git a/web/core/themes/seven/images/classy/icons/application-pdf.png b/web/core/themes/seven/images/classy/icons/application-pdf.png
new file mode 100644
index 0000000000..36107d6e80
--- /dev/null
+++ b/web/core/themes/seven/images/classy/icons/application-pdf.png
@@ -0,0 +1,5 @@
+�PNG
+
+���
IHDR��������� ��a��!IDATxڍӱ��0 ��{ Aqs�]��M9p�I��#��� nN.
+..š�"����ic~�渢�\��/%�|�)����, ���{�sO�c ��RI�<"_Z ۶K���=�O-�8�k����z�h���Ff3��� �q\*:�@
���7���#��A�M��� p2y8�N��z=p���[� Av8 A ����Ѩ�%�Z
A��h<F��(���Ձl�W������n��v�r��� ��'@��2�W�_�F�:��_.
+�[-U����gB��ܣ*���()5h �����IEND�B`�
\ No newline at end of file
diff --git a/web/core/themes/seven/images/classy/icons/application-x-executable.png b/web/core/themes/seven/images/classy/icons/application-x-executable.png
new file mode 100644
index 0000000000..d5453217dc
--- /dev/null
+++ b/web/core/themes/seven/images/classy/icons/application-x-executable.png
@@ -0,0 +1,3 @@
+�PNG
+
+���
IHDR�����������7����tEXtSoftware�Adobe ImageReadyq�e<���_IDAT(S�ͱ �@Dѩ�,�`�42���@����Z���#���d2!�4J�>dt�� `�
,=ޛ���{g8���C �PG(�<�h\���w�)E�o}�^�����IEND�B`�
\ No newline at end of file
diff --git a/web/core/themes/seven/images/classy/icons/audio-x-generic.png b/web/core/themes/seven/images/classy/icons/audio-x-generic.png
new file mode 100644
index 0000000000..28d7f50862
--- /dev/null
+++ b/web/core/themes/seven/images/classy/icons/audio-x-generic.png
@@ -0,0 +1,3 @@
+�PNG
+
+���
IHDR��������� ��a��IDAT8Oc���?����'W1H-L �?�����w ���dC�q��n��� ����8 � <��0��w��~���Z��{���=�������ל��?y_�������W6��ׯ` >_��,6 L��P��0Hq�����N7�?ps����og��?���F#h� �c��a���^$I������V�#���v8���sy�g�����)�������������o�(3���/��i�)�����ۉ����IEND�B`�
\ No newline at end of file
diff --git a/web/core/themes/seven/images/classy/icons/forum-icons.png b/web/core/themes/seven/images/classy/icons/forum-icons.png
new file mode 100644
index 0000000000..e291de6725
--- /dev/null
+++ b/web/core/themes/seven/images/classy/icons/forum-icons.png
@@ -0,0 +1,10 @@
+�PNG
+
+���
IHDR����������"{�?��PLTE������������www�����������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������߯����������������������������������������������������������������������������������ۯ�������������������������������������������ד��������������������������������������tP[�����tRNS�
+
+ %***+,..001479=HKMX\ddhiimsvxxxxxxyy{}������������������������������������������������������������������������甐��IDATx^����E�JiS
+-�����/R܊hq�W�P|d�]b������&�����圼���o��*
�mۨt���w?8 ����e��O �ձ����]� ��e���y���E�Y�?�s� �8~@������t�8�A~��� ���?s�$�$����s�c�=z�9s�v+O��mKP�l&��w{���O�<�3I�}tj���̠"�p훼��gM>��0 ��y�F�?����{�;~��mnxcKۏ
+��f9�w�=�uy�y&(�aa ��g� e��f3���) `0h^v���Z��䙠�r�5H�$?.`�q�c�W^(g�!�>3��D�4�����;x��bIv��� ���<�x��Tܻ�Ш=K��M�k �,�q��F������!�#��90&�V��$��ӀP�=�y$hO��>|~Q�qDn�Qd&��cV�W��-�����¥�z�U�q��-�E!�(�Vl�|0b�v� =�8��x0�}�@ �x$>�G/L���"��W�Ϋ~�aE�� �(���4�E|s��<~rC�&�=7ݧl�s@!)<ɿ-�ԓ|=�Ŋ�8��sn��� a �u�r��Ql� Ls��� A�$��ʅ��7�h���t {4�0O���]��j\�� E9���մ� ��0�;�
��߭9y����a0OH���x��Y������4����қ�g��g�懕g��x�#(�9yƣH�sA��� 9��Ȍ�q
+�Þ�B��ѫ�/��U����k�������p(�)C��H.}
+�P-XUO[��O�,f��� @x5�LU�H@)��{�nz��/TU��"��Kf��'��Bc�<
+�q������~Z��˟ߠɷ9遟u]�<��%�>m�En�i�/�{TI?�<'*��K�ޣ �Y�{��ԏT�\�D�:�ˮ�� -�U� �}"�u��߄�{��ӿb�4(Hd2�f���I�Kua�*�[�Aɫu����\�k���}�d��/ݲį��� W ����=8�V��w�R����q�
>��{���I�F�E�2gz��L����IEND�B`�
\ No newline at end of file
diff --git a/web/core/themes/seven/images/classy/icons/image-x-generic.png b/web/core/themes/seven/images/classy/icons/image-x-generic.png
new file mode 100644
index 0000000000..c1b814f7cb
--- /dev/null
+++ b/web/core/themes/seven/images/classy/icons/image-x-generic.png
@@ -0,0 +1,6 @@
+�PNG
+
+���
IHDR��������� ��a��HIDATxڕ�=K�P���'�.��Z*����q�N��!�JDGE�YA��IT��`S�4I�QLnm�{��Z�聇��&��K"� $I� �� �D��1۶�p �^2*�S>�o���HϹ���|�/�e:����!�W��b�
+��
+�`�ȏ�א$\P#A���c�� j֚ЄQR0�i�܌����ܒx�-p�I���F��r!#Юk)��-��T�W��iT�i0cvq��:��x�~�+7�we��r1��I/��W���$ ����(�u���e� '��v#���mW��fnV�����\fۢ�0��;G@�
+�A �| �@ F����IEND�B`�
\ No newline at end of file
diff --git a/web/core/themes/seven/images/classy/icons/package-x-generic.png b/web/core/themes/seven/images/classy/icons/package-x-generic.png
new file mode 100644
index 0000000000..21fc382cba
--- /dev/null
+++ b/web/core/themes/seven/images/classy/icons/package-x-generic.png
@@ -0,0 +1,4 @@
+�PNG
+
+���
IHDR�����������7����tEXtSoftware�Adobe ImageReadyq�e<����IDAT(S��1�0�|�P�P�D�4��T�H�qPȲ>��c��h��<Y��(
+6**qO�0�'�_���u&�
Q�g�CW�p&[\���3�B{�;-N�BK*6T6���Ł�B��K�Q#Q �ј ����_s=oH�>-�".�;�C����0`"�a2�\�N�{ӆ�i��������IEND�B`�
\ No newline at end of file
diff --git a/web/core/themes/seven/images/classy/icons/text-html.png b/web/core/themes/seven/images/classy/icons/text-html.png
new file mode 100644
index 0000000000..9c7c7932c2
--- /dev/null
+++ b/web/core/themes/seven/images/classy/icons/text-html.png
@@ -0,0 +1,7 @@
+�PNG
+
+���
IHDR��������� ��a����IDATxڍ��
+�@�}�ަS��=@��7:G��� �� �w�۲
+��o@��vǁ� f��)�1q �� �s?����Z;��*W��
+PY�I0F�?? 3� �sI t�^AQD��+(�2�.0�0���_� ��ۄ��9�/O� 3��dwD�Ϧi�; ^�7/�W��~�t�"�\ÙW xB]�BP��@)]���m��� ��
+�c�0��������IEND�B`�
\ No newline at end of file
diff --git a/web/core/themes/seven/images/classy/icons/text-plain.png b/web/core/themes/seven/images/classy/icons/text-plain.png
new file mode 100644
index 0000000000..06804849b8
--- /dev/null
+++ b/web/core/themes/seven/images/classy/icons/text-plain.png
@@ -0,0 +1,4 @@
+�PNG
+
+���
IHDR�����������7����tEXtSoftware�Adobe ImageReadyq�e<���~IDAT(S��� �0 E3� 8��l���ɋ
+�� �km���<hh��)�@ E���f� #�^)h����"jq�I�Q�u���&0���A� � ��d�J�6t%� ����1r*A�?��?�T��f;�����������IEND�B`�
\ No newline at end of file
diff --git a/web/core/themes/seven/images/classy/icons/text-x-generic.png b/web/core/themes/seven/images/classy/icons/text-x-generic.png
new file mode 100644
index 0000000000..06804849b8
--- /dev/null
+++ b/web/core/themes/seven/images/classy/icons/text-x-generic.png
@@ -0,0 +1,4 @@
+�PNG
+
+���
IHDR�����������7����tEXtSoftware�Adobe ImageReadyq�e<���~IDAT(S��� �0 E3� 8��l���ɋ
+�� �km���<hh��)�@ E���f� #�^)h����"jq�I�Q�u���&0���A� � ��d�J�6t%� ����1r*A�?��?�T��f;�����������IEND�B`�
\ No newline at end of file
diff --git a/web/core/themes/seven/images/classy/icons/text-x-script.png b/web/core/themes/seven/images/classy/icons/text-x-script.png
new file mode 100644
index 0000000000..f9ecca8138
--- /dev/null
+++ b/web/core/themes/seven/images/classy/icons/text-x-script.png
@@ -0,0 +1,5 @@
+�PNG
+
+���
IHDR��������� ��a����IDATxڝ��
+�@E����U��}@ ?� ��E!D �� YRM�̗w���
�zpxsa�a ��q ��E�p�MP�5�e9��*S2�
+0Q
�E�ώ�U�$I .��V�R�B?қ1�eV���d<��ʣ<��Ȃ�(h�����&��_��d`#>˂�i���fƖ<륫K*{ �|�� �p "�_�F���ڶ��Eaw�_�� �>2���Z����IEND�B`�
\ No newline at end of file
diff --git a/web/core/themes/seven/images/classy/icons/video-x-generic.png b/web/core/themes/seven/images/classy/icons/video-x-generic.png
new file mode 100644
index 0000000000..a2b71f95d9
--- /dev/null
+++ b/web/core/themes/seven/images/classy/icons/video-x-generic.png
@@ -0,0 +1,5 @@
+�PNG
+
+���
IHDR�����������7����tEXtSoftware�Adobe ImageReadyq�e<���xIDAT(ϕ�11 �V>�(v�IEO��
+`��Av�2]4�� �F��BA10[���c� �K��pK�<�}c�=7S�b��Q0����,< �B=S�����\�
+�� �y�g7aA �πǴ"�j����IEND�B`�
\ No newline at end of file
diff --git a/web/core/themes/seven/images/classy/icons/x-office-document.png b/web/core/themes/seven/images/classy/icons/x-office-document.png
new file mode 100644
index 0000000000..40db538fcb
--- /dev/null
+++ b/web/core/themes/seven/images/classy/icons/x-office-document.png
@@ -0,0 +1,5 @@
+�PNG
+
+���
IHDR��������� ��a����IDATx�ՓA
+! E=k/��,��: ��܉�� TR�c3���l���� ⎵��ա�q�#�9cJI��\�
+(f{ z��;k�qF�IS��^�2dS�snB��� b�����5(�T�Z���:�����3�֎���@�|�� �~-�����IEND�B`�
\ No newline at end of file
diff --git a/web/core/themes/seven/images/classy/icons/x-office-presentation.png b/web/core/themes/seven/images/classy/icons/x-office-presentation.png
new file mode 100644
index 0000000000..fb119e5ba9
--- /dev/null
+++ b/web/core/themes/seven/images/classy/icons/x-office-presentation.png
@@ -0,0 +1,5 @@
+�PNG
+
+���
IHDR��������� ��a���|IDATx���
+� �}�^�st��o1=�r�`1�������
"����� �=�V�E)EJVS@9���F^���F S�RRȰ���&����+�F~ �~�z��}�GB�3��F�[�E
+. 4 ��;�����IEND�B`�
\ No newline at end of file
diff --git a/web/core/themes/seven/images/classy/icons/x-office-spreadsheet.png b/web/core/themes/seven/images/classy/icons/x-office-spreadsheet.png
new file mode 100644
index 0000000000..9af7b61ea1
--- /dev/null
+++ b/web/core/themes/seven/images/classy/icons/x-office-spreadsheet.png
@@ -0,0 +1,4 @@
+�PNG
+
+���
IHDR��������� ��a���~IDATx��� � E=u��:@��e ȳ�`M�B E"�C{臇��_4�pa��6��w�!�ؐR��UP�}j��"��<H�*��7ȰL8�z� B4�]�/5(�|������j�=�.E
+N� �8������IEND�B`�
\ No newline at end of file
diff --git a/web/core/themes/seven/js/classy/README.txt b/web/core/themes/seven/js/classy/README.txt
new file mode 100644
index 0000000000..efa01cfd10
--- /dev/null
+++ b/web/core/themes/seven/js/classy/README.txt
@@ -0,0 +1,12 @@
+WHAT IS THIS DIRECTORY FOR?
+--------------------------------
+This directory is for JS files previously inherited from the Classy theme.
+
+WHY ARE CLASSY JS FILES BEING COPIED HERE?
+-------------------------------------------
+Classy will be deprecated during the Drupal 9 lifecycle. To prepare for Classy's
+removal, JS files that would otherwise be inherited from Classy are copied
+here.
+
+JS files that differ from the Classy versions should not be placed in this
+directory or any subdirectory.
diff --git a/web/core/themes/seven/js/classy/media_embed_ckeditor.theme.es6.js b/web/core/themes/seven/js/classy/media_embed_ckeditor.theme.es6.js
new file mode 100644
index 0000000000..10193f7ba2
--- /dev/null
+++ b/web/core/themes/seven/js/classy/media_embed_ckeditor.theme.es6.js
@@ -0,0 +1,22 @@
+/**
+ * @file
+ * Classy theme overrides for the Media Embed CKEditor plugin.
+ */
+
+(Drupal => {
+ /**
+ * Themes the error displayed when the media embed preview fails.
+ *
+ * @param {string} error
+ * The error message to display
+ *
+ * @return {string}
+ * A string representing a DOM fragment.
+ *
+ * @see media-embed-error.html.twig
+ */
+ Drupal.theme.mediaEmbedPreviewError = () =>
+ `<div class="media-embed-error media-embed-error--preview-error">${Drupal.t(
+ 'An error occurred while trying to preview the media. Please save your work and reload this page.',
+ )}</div>`;
+})(Drupal);
diff --git a/web/core/themes/seven/js/classy/media_embed_ckeditor.theme.js b/web/core/themes/seven/js/classy/media_embed_ckeditor.theme.js
new file mode 100644
index 0000000000..6614288cb4
--- /dev/null
+++ b/web/core/themes/seven/js/classy/media_embed_ckeditor.theme.js
@@ -0,0 +1,12 @@
+/**
+* DO NOT EDIT THIS FILE.
+* See the following change record for more information,
+* https://www.drupal.org/node/2815083
+* @preserve
+**/
+
+(function (Drupal) {
+ Drupal.theme.mediaEmbedPreviewError = function () {
+ return '<div class="media-embed-error media-embed-error--preview-error">' + Drupal.t('An error occurred while trying to preview the media. Please save your work and reload this page.') + '</div>';
+ };
+})(Drupal);
\ No newline at end of file
diff --git a/web/core/themes/seven/js/nav-tabs.es6.js b/web/core/themes/seven/js/nav-tabs.es6.js
index 2100b6608f..06400b329f 100644
--- a/web/core/themes/seven/js/nav-tabs.es6.js
+++ b/web/core/themes/seven/js/nav-tabs.es6.js
@@ -38,7 +38,7 @@
}
/**
- * Initialise the tabs JS.
+ * Initialize the tabs JS.
*/
Drupal.behaviors.navTabs = {
attach(context, settings) {
diff --git a/web/core/themes/seven/seven.info.yml b/web/core/themes/seven/seven.info.yml
index 5f5763d03f..4cdaa654f8 100644
--- a/web/core/themes/seven/seven.info.yml
+++ b/web/core/themes/seven/seven.info.yml
@@ -28,6 +28,7 @@ libraries-override:
/core/themes/stable/css/system/components/system-status-counter.css: css/components/system-status-counter.css
/core/themes/stable/css/system/components/system-status-report-counters.css: css/components/system-status-report-counters.css
/core/themes/stable/css/system/components/system-status-report-general-info.css: css/components/system-status-report-general-info.css
+
core/drupal.vertical-tabs:
css:
component:
@@ -45,25 +46,74 @@ libraries-override:
classy/base:
css:
component:
+ css/components/action-links.css: css/classy/components/action-links.css
+ css/components/breadcrumb.css: css/classy/components/breadcrumb.css
+ css/components/button.css: css/classy/components/button.css
+ css/components/collapse-processed.css: css/classy/components/collapse-processed.css
+ css/components/container-inline.css: css/classy/components/container-inline.css
css/components/details.css: false
+ css/components/exposed-filters.css: css/classy/components/exposed-filters.css
+ css/components/field.css: css/classy/components/field.css
+ css/components/form.css: css/classy/components/form.css
+ css/components/icons.css: css/classy/components/icons.css
+ css/components/inline-form.css: css/classy/components/inline-form.css
+ css/components/item-list.css: css/classy/components/item-list.css
+ css/components/link.css: css/classy/components/link.css
+ css/components/links.css: css/classy/components/links.css
+ css/components/menu.css: css/classy/components/menu.css
+ css/components/more-link.css: css/classy/components/more-link.css
+ css/components/pager.css: css/classy/components/pager.css
+ css/components/tabledrag.css: css/classy/components/tabledrag.css
+ css/components/tableselect.css: css/classy/components/tableselect.css
+ css/components/tablesort.css: css/classy/components/tablesort.css
+ css/components/tabs.css: css/classy/components/tabs.css
+ css/components/textarea.css: css/classy/components/textarea.css
+ css/components/ui-dialog.css: css/classy/components/ui-dialog.css
+
classy/media_library:
css:
layout:
css/layout/media-library.css: false
+ classy/book-navigation: seven/classy.book-navigation
+ classy/dropbutton: seven/classy.dropbutton
+ classy/file: seven/classy.file
+ classy/forum: seven/classy.forum
+ classy/image-widget: seven/classy.image-widget
+ classy/indented: seven/classy.indented
+ classy/media_embed_ckeditor_theme: seven/classy.media_embed_ckeditor_theme
+ classy/media_embed_error: seven/classy.media_embed_error
+ classy/messages: seven/classy.messages
+ classy/node: seven/classy.node
+ classy/progress: seven/classy.progress
+ classy/search-results: seven/classy.search-results
+ classy/user: seven/classy.user
+
libraries-extend:
core/ckeditor:
- seven/ckeditor-dialog
+ core/drupal.dialog:
+ - seven/seven.drupal.dialog
+ core/drupal.dropbutton:
+ - seven/classy.dropbutton
+ core/drupal.progress:
+ - seven/classy.progress
core/drupal.vertical-tabs:
- seven/vertical-tabs
core/jquery.ui:
- seven/seven.jquery.ui
+ file/drupal.file:
+ - seven/classy.file
+ media/media_embed_ckeditor_theme:
+ - seven/classy.media_embed_ckeditor_theme
media_library/view:
- seven/media_library
media_library/widget:
- seven/media_library
tour/tour-styling:
- seven/tour-styling
+ user/drupal.user:
+ - seven/classy.user
quickedit_stylesheets:
- css/components/quickedit.css
regions:
@@ -78,3 +128,6 @@ regions:
sidebar_first: 'First sidebar'
regions_hidden:
- sidebar_first
+
+ckeditor_stylesheets:
+ - css/classy/components/media-embed-error.css
diff --git a/web/core/themes/seven/seven.libraries.yml b/web/core/themes/seven/seven.libraries.yml
index 72b13436fa..b253200041 100644
--- a/web/core/themes/seven/seven.libraries.yml
+++ b/web/core/themes/seven/seven.libraries.yml
@@ -149,3 +149,80 @@ layout_builder_content_translation_admin:
css:
component:
css/components/layout-builder-content-translation.css: {}
+
+classy.book-navigation:
+ version: VERSION
+ css:
+ component:
+ css/classy/components/book-navigation.css: {}
+
+classy.dropbutton:
+ version: VERSION
+ css:
+ component:
+ css/classy/components/dropbutton.css: { weight: -10 }
+
+classy.file:
+ version: VERSION
+ css:
+ component:
+ css/classy/components/file.css: { weight: -10 }
+
+classy.forum:
+ version: VERSION
+ css:
+ component:
+ css/classy/components/forum.css: { weight: -10 }
+
+classy.image-widget:
+ version: VERSION
+ css:
+ component:
+ css/classy/components/image-widget.css: {}
+
+classy.indented:
+ version: VERSION
+ css:
+ component:
+ css/classy/components/indented.css: {}
+
+classy.media_embed_ckeditor_theme:
+ version: VERSION
+ js:
+ js/classy/media_embed_ckeditor.theme.js: {}
+
+classy.media_embed_error:
+ version: VERSION
+ css:
+ component:
+ css/classy/components/media-embed-error.css: {}
+
+classy.messages:
+ version: VERSION
+ css:
+ component:
+ css/classy/components/messages.css: { weight: -10 }
+
+classy.node:
+ version: VERSION
+ css:
+ component:
+ css/classy/components/node.css: { weight: -10 }
+
+classy.progress:
+ version: VERSION
+ css:
+ component:
+ css/classy/components/progress.css: { weight: -10 }
+
+classy.search-results:
+ version: VERSION
+ css:
+ component:
+ css/classy/components/search-results.css: {}
+
+classy.user:
+ version: VERSION
+ css:
+ component:
+ css/classy/components/user.css: { weight: -10 }
diff --git a/web/core/themes/seven/templates/classy/README.txt b/web/core/themes/seven/templates/classy/README.txt
new file mode 100644
index 0000000000..8708a82e74
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/README.txt
@@ -0,0 +1,12 @@
+WHAT IS THIS DIRECTORY FOR?
+--------------------------------
+This directory is for templates previously inherited from the Classy theme.
+
+WHY ARE CLASSY TEMPLATES BEING COPIED HERE?
+-------------------------------------------
+Classy will be deprecated during the Drupal 9 lifecycle. To prepare for Classy's
+removal, templates that would otherwise be inherited from Classy are copied
+here.
+
+Templates that differ from the Classy versions should not be placed in this
+directory or any subdirectory.
diff --git a/web/core/themes/seven/templates/classy/block/block--local-tasks-block.html.twig b/web/core/themes/seven/templates/classy/block/block--local-tasks-block.html.twig
new file mode 100644
index 0000000000..0f25f59d83
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/block/block--local-tasks-block.html.twig
@@ -0,0 +1,14 @@
+{% extends "block.html.twig" %}
+{#
+/**
+ * @file
+ * Theme override for tabs.
+ */
+#}
+{% block content %}
+ {% if content %}
+ <nav class="tabs" role="navigation" aria-label="{{ 'Tabs'|t }}">
+ {{ content }}
+ </nav>
+ {% endif %}
+{% endblock %}
diff --git a/web/core/themes/seven/templates/classy/block/block--search-form-block.html.twig b/web/core/themes/seven/templates/classy/block/block--search-form-block.html.twig
new file mode 100644
index 0000000000..667202fb6b
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/block/block--search-form-block.html.twig
@@ -0,0 +1,45 @@
+{#
+/**
+ * @file
+ * Theme override for the search form block.
+ *
+ * Available variables:
+ * - plugin_id: The ID of the block implementation.
+ * - label: The configured label of the block if visible.
+ * - configuration: A list of the block's configuration values, including:
+ * - label: The configured label for the block.
+ * - label_display: The display settings for the label.
+ * - provider: The module or other provider that provided this block plugin.
+ * - Block plugin specific settings will also be stored here.
+ * - content: The content of this block.
+ * - attributes: A list HTML attributes populated by modules, intended to
+ * be added to the main container tag of this template. Includes:
+ * - id: A valid HTML ID and guaranteed unique.
+ * - title_attributes: Same as attributes, except applied to the main title
+ * tag that appears in the template.
+ * - title_prefix: Additional output populated by modules, intended to be
+ * displayed in front of the main title tag that appears in the template.
+ * - title_suffix: Additional output populated by modules, intended to be
+ * displayed after the main title tag that appears in the template.
+ *
+ * @see template_preprocess_block()
+ * @see search_preprocess_block()
+ */
+#}
+{%
+ set classes = [
+ 'block',
+ 'block-search',
+ 'container-inline',
+ ]
+%}
+<div{{ attributes.addClass(classes) }}>
+ {{ title_prefix }}
+ {% if label %}
+ <h2{{ title_attributes }}>{{ label }}</h2>
+ {% endif %}
+ {{ title_suffix }}
+ {% block content %}
+ {{ content }}
+ {% endblock %}
+</div>
diff --git a/web/core/themes/seven/templates/classy/block/block--system-branding-block.html.twig b/web/core/themes/seven/templates/classy/block/block--system-branding-block.html.twig
new file mode 100644
index 0000000000..57e9570e52
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/block/block--system-branding-block.html.twig
@@ -0,0 +1,30 @@
+{% extends "block.html.twig" %}
+{#
+/**
+ * @file
+ * Theme override for a branding block.
+ *
+ * Each branding element variable (logo, name, slogan) is only available if
+ * enabled in the block configuration.
+ *
+ * Available variables:
+ * - site_logo: Logo for site as defined in Appearance or theme settings.
+ * - site_name: Name for site as defined in Site information settings.
+ * - site_slogan: Slogan for site as defined in Site information settings.
+ */
+#}
+{% block content %}
+ {% if site_logo %}
+ <a href="{{ path('<front>') }}" rel="home" class="site-logo">
+ <img src="{{ site_logo }}" alt="{{ 'Home'|t }}" />
+ </a>
+ {% endif %}
+ {% if site_name %}
+ <div class="site-name">
+ <a href="{{ path('<front>') }}" title="{{ 'Home'|t }}" rel="home">{{ site_name }}</a>
+ </div>
+ {% endif %}
+ {% if site_slogan %}
+ <div class="site-slogan">{{ site_slogan }}</div>
+ {% endif %}
+{% endblock %}
diff --git a/web/core/themes/seven/templates/classy/block/block--system-menu-block.html.twig b/web/core/themes/seven/templates/classy/block/block--system-menu-block.html.twig
new file mode 100644
index 0000000000..407f8403fd
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/block/block--system-menu-block.html.twig
@@ -0,0 +1,56 @@
+{#
+/**
+ * @file
+ * Theme override for a menu block.
+ *
+ * Available variables:
+ * - plugin_id: The ID of the block implementation.
+ * - label: The configured label of the block if visible.
+ * - configuration: A list of the block's configuration values.
+ * - label: The configured label for the block.
+ * - label_display: The display settings for the label.
+ * - provider: The module or other provider that provided this block plugin.
+ * - Block plugin specific settings will also be stored here.
+ * - content: The content of this block.
+ * - attributes: HTML attributes for the containing element.
+ * - id: A valid HTML ID and guaranteed unique.
+ * - title_attributes: HTML attributes for the title element.
+ * - content_attributes: HTML attributes for the content element.
+ * - title_prefix: Additional output populated by modules, intended to be
+ * displayed in front of the main title tag that appears in the template.
+ * - title_suffix: Additional output populated by modules, intended to be
+ * displayed after the main title tag that appears in the template.
+ *
+ * Headings should be used on navigation menus that consistently appear on
+ * multiple pages. When this menu block's label is configured to not be
+ * displayed, it is automatically made invisible using the 'visually-hidden' CSS
+ * class, which still keeps it visible for screen-readers and assistive
+ * technology. Headings allow screen-reader and keyboard only users to navigate
+ * to or skip the links.
+ * See http://juicystudio.com/article/screen-readers-display-none.php and
+ * http://www.w3.org/TR/WCAG-TECHS/H42.html for more information.
+ */
+#}
+{%
+ set classes = [
+ 'block',
+ 'block-menu',
+ 'navigation',
+ 'menu--' ~ derivative_plugin_id|clean_class,
+ ]
+%}
+{% set heading_id = attributes.id ~ '-menu'|clean_id %}
+<nav role="navigation" aria-labelledby="{{ heading_id }}"{{ attributes.addClass(classes)|without('role', 'aria-labelledby') }}>
+ {# Label. If not displayed, we still provide it for screen readers. #}
+ {% if not configuration.label_display %}
+ {% set title_attributes = title_attributes.addClass('visually-hidden') %}
+ {% endif %}
+ {{ title_prefix }}
+ <h2{{ title_attributes.setAttribute('id', heading_id) }}>{{ configuration.label }}</h2>
+ {{ title_suffix }}
+
+ {# Menu. #}
+ {% block content %}
+ {{ content }}
+ {% endblock %}
+</nav>
diff --git a/web/core/themes/seven/templates/classy/block/block.html.twig b/web/core/themes/seven/templates/classy/block/block.html.twig
new file mode 100644
index 0000000000..fd3311be95
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/block/block.html.twig
@@ -0,0 +1,44 @@
+{#
+/**
+ * @file
+ * Theme override to display a block.
+ *
+ * Available variables:
+ * - plugin_id: The ID of the block implementation.
+ * - label: The configured label of the block if visible.
+ * - configuration: A list of the block's configuration values.
+ * - label: The configured label for the block.
+ * - label_display: The display settings for the label.
+ * - provider: The module or other provider that provided this block plugin.
+ * - Block plugin specific settings will also be stored here.
+ * - content: The content of this block.
+ * - attributes: array of HTML attributes populated by modules, intended to
+ * be added to the main container tag of this template.
+ * - id: A valid HTML ID and guaranteed unique.
+ * - title_attributes: Same as attributes, except applied to the main title
+ * tag that appears in the template.
+ * - title_prefix: Additional output populated by modules, intended to be
+ * displayed in front of the main title tag that appears in the template.
+ * - title_suffix: Additional output populated by modules, intended to be
+ * displayed after the main title tag that appears in the template.
+ *
+ * @see template_preprocess_block()
+ */
+#}
+{%
+ set classes = [
+ 'block',
+ 'block-' ~ configuration.provider|clean_class,
+ 'block-' ~ plugin_id|clean_class,
+ ]
+%}
+<div{{ attributes.addClass(classes) }}>
+ {{ title_prefix }}
+ {% if label %}
+ <h2{{ title_attributes }}>{{ label }}</h2>
+ {% endif %}
+ {{ title_suffix }}
+ {% block content %}
+ {{ content }}
+ {% endblock %}
+</div>
diff --git a/web/core/themes/seven/templates/classy/content-edit/file-managed-file.html.twig b/web/core/themes/seven/templates/classy/content-edit/file-managed-file.html.twig
new file mode 100644
index 0000000000..629335a839
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/content-edit/file-managed-file.html.twig
@@ -0,0 +1,22 @@
+{#
+/**
+ * @file
+ * Theme override to display a file form widget.
+ *
+ * Available variables:
+ * - element: Form element for the file upload.
+ * - attributes: HTML attributes for the containing element.
+ *
+ * @see template_preprocess_file_managed_file()
+ */
+#}
+{{ attach_library('seven/classy.file') }}
+{%
+ set classes = [
+ 'js-form-managed-file',
+ 'form-managed-file',
+ ]
+%}
+<div{{ attributes.addClass(classes) }}>
+ {{ element }}
+</div>
diff --git a/web/core/themes/seven/templates/classy/content-edit/filter-caption.html.twig b/web/core/themes/seven/templates/classy/content-edit/filter-caption.html.twig
new file mode 100644
index 0000000000..1e35795fc1
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/content-edit/filter-caption.html.twig
@@ -0,0 +1,18 @@
+{#
+/**
+ * @file
+ * Theme override for a filter caption.
+ *
+ * Returns HTML for a captioned image, audio, video or other tag.
+ *
+ * Available variables
+ * - string node: The complete HTML tag whose contents are being captioned.
+ * - string tag: The name of the HTML tag whose contents are being captioned.
+ * - string caption: The caption text.
+ * - string classes: The classes of the captioned HTML tag.
+ */
+#}
+<figure role="group" class="caption caption-{{ tag }}{%- if classes %} {{ classes }}{%- endif %}">
+{{ node }}
+<figcaption>{{ caption }}</figcaption>
+</figure>
diff --git a/web/core/themes/seven/templates/classy/content-edit/filter-guidelines.html.twig b/web/core/themes/seven/templates/classy/content-edit/filter-guidelines.html.twig
new file mode 100644
index 0000000000..afef2d2cfb
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/content-edit/filter-guidelines.html.twig
@@ -0,0 +1,29 @@
+{#
+/**
+ * @file
+ * Theme override for guidelines for a text format.
+ *
+ * Available variables:
+ * - format: Contains information about the current text format, including the
+ * following:
+ * - name: The name of the text format, potentially unsafe and needs to be
+ * escaped.
+ * - format: The machine name of the text format, e.g. 'basic_html'.
+ * - attributes: HTML attributes for the containing element.
+ * - tips: Descriptions and a CSS ID in the form of 'module-name/filter-id'
+ * (only used when 'long' is TRUE) for each filter in one or more text
+ * formats.
+ *
+ * @see template_preprocess_filter_tips()
+ */
+#}
+{%
+ set classes = [
+ 'filter-guidelines-item',
+ 'filter-guidelines-' ~ format.id,
+ ]
+%}
+<div{{ attributes.addClass(classes) }}>
+ <h4 class="label">{{ format.label }}</h4>
+ {{ tips }}
+</div>
diff --git a/web/core/themes/seven/templates/classy/content-edit/filter-tips.html.twig b/web/core/themes/seven/templates/classy/content-edit/filter-tips.html.twig
new file mode 100644
index 0000000000..25ed49d6ae
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/content-edit/filter-tips.html.twig
@@ -0,0 +1,61 @@
+{#
+/**
+ * @file
+ * Theme override for a set of filter tips.
+ *
+ * Available variables:
+ * - tips: Descriptions and a CSS ID in the form of 'module-name/filter-id'
+ * (only used when 'long' is TRUE) for each filter in one or more text
+ * formats.
+ * - long: A flag indicating whether the passed-in filter tips contain extended
+ * explanations, i.e. intended to be output on the path 'filter/tips'
+ * (TRUE), or are in a short format, i.e. suitable to be displayed below a
+ * form element. Defaults to FALSE.
+ * - multiple: A flag indicating there is more than one filter tip.
+ *
+ * @see template_preprocess_filter_tips()
+ */
+#}
+{% if multiple %}
+ <h2>{{ 'Text Formats'|t }}</h2>
+{% endif %}
+
+{% if tips|length %}
+ {% if multiple %}
+ <div class="compose-tips">
+ {% endif %}
+
+ {% for name, tip in tips %}
+ {% if multiple %}
+ {%
+ set tip_classes = [
+ 'filter-type',
+ 'filter-' ~ name|clean_class,
+ ]
+ %}
+ <div{{ tip.attributes.addClass(tip_classes) }}>
+ <h3>{{ tip.name }}</h3>
+ {% endif %}
+
+ {% if tip.list|length %}
+ <ul class="tips">
+ {% for item in tip.list %}
+ {%
+ set item_classes = [
+ long ? 'filter-' ~ item.id|replace({'/': '-'}),
+ ]
+ %}
+ <li{{ item.attributes.addClass(item_classes) }}>{{ item.tip }}</li>
+ {% endfor %}
+ </ul>
+ {% endif %}
+
+ {% if multiple %}
+ </div>
+ {% endif %}
+ {% endfor %}
+
+ {% if multiple %}
+ </div>
+ {% endif %}
+{% endif %}
diff --git a/web/core/themes/seven/templates/classy/content-edit/text-format-wrapper.html.twig b/web/core/themes/seven/templates/classy/content-edit/text-format-wrapper.html.twig
new file mode 100644
index 0000000000..08a88ca1ce
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/content-edit/text-format-wrapper.html.twig
@@ -0,0 +1,26 @@
+{#
+/**
+ * @file
+ * Theme override for a text format-enabled form element.
+ *
+ * Available variables:
+ * - children: Text format element children.
+ * - description: Text format element description.
+ * - attributes: HTML attributes for the containing element.
+ * - aria_description: Flag for whether or not an ARIA description has been
+ * added to the description container.
+ *
+ * @see template_preprocess_text_format_wrapper()
+ */
+#}
+<div class="js-text-format-wrapper text-format-wrapper js-form-item form-item">
+ {{ children }}
+ {% if description %}
+ {%
+ set classes = [
+ aria_description ? 'description',
+ ]
+ %}
+ <div{{ attributes.addClass(classes) }}>{{ description }}</div>
+ {% endif %}
+</div>
diff --git a/web/core/themes/seven/templates/classy/content/aggregator-item.html.twig b/web/core/themes/seven/templates/classy/content/aggregator-item.html.twig
new file mode 100644
index 0000000000..16f4428a03
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/content/aggregator-item.html.twig
@@ -0,0 +1,31 @@
+{#
+/**
+ * @file
+ * Theme override to present a feed item in an aggregator page.
+ *
+ * Available variables:
+ * - url: URL to the originating feed item.
+ * - title: (optional) Title of the feed item.
+ * - content: All field items. Use {{ content }} to print them all,
+ * or print a subset such as {{ content.field_example }}. Use
+ * {{ content|without('field_example') }} to temporarily suppress the printing
+ * of a given element.
+ * - attributes: HTML attributes for the wrapper.
+ * - title_prefix: Additional output populated by modules, intended to be
+ * displayed in front of the main title tag that appears in the template.
+ * - title_suffix: Additional output populated by modules, intended to be
+ * displayed after the main title tag that appears in the template.
+ *
+ * @see template_preprocess_aggregator_item()
+ */
+#}
+<article{{ attributes.addClass('aggregator-item') }}>
+ {{ title_prefix }}
+ {% if title %}
+ <h3 class="feed-item-title">
+ <a href="{{ url }}">{{ title }}</a>
+ </h3>
+ {% endif %}
+ {{ title_suffix }}
+ {{ content }}
+</article>
diff --git a/web/core/themes/seven/templates/classy/content/book-node-export-html.html.twig b/web/core/themes/seven/templates/classy/content/book-node-export-html.html.twig
new file mode 100644
index 0000000000..94a4c24dc7
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/content/book-node-export-html.html.twig
@@ -0,0 +1,20 @@
+{#
+/**
+ * @file
+ * Theme override for a single node in a printer-friendly outline.
+ *
+ * Available variables:
+ * - node: Fully loaded node.
+ * - depth: Depth of the current node inside the outline.
+ * - title: Node title.
+ * - content: Node content.
+ * - children: All the child nodes recursively rendered through this file.
+ *
+ * @see template_preprocess_book_node_export_html()
+ */
+#}
+<article id="node-{{ node.id }}" class="section-{{ depth }}">
+ <h1 class="book-heading">{{ title }}</h1>
+ {{ content }}
+ {{ children }}
+</article>
diff --git a/web/core/themes/seven/templates/classy/content/comment.html.twig b/web/core/themes/seven/templates/classy/content/comment.html.twig
new file mode 100644
index 0000000000..2630966f6c
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/content/comment.html.twig
@@ -0,0 +1,111 @@
+{#
+/**
+ * @file
+ * Theme override for comments.
+ *
+ * Available variables:
+ * - author: Comment author. Can be a link or plain text.
+ * - content: The content-related items for the comment display. Use
+ * {{ content }} to print them all, or print a subset such as
+ * {{ content.field_example }}. Use the following code to temporarily suppress
+ * the printing of a given child element:
+ * @code
+ * {{ content|without('field_example') }}
+ * @endcode
+ * - created: Formatted date and time for when the comment was created.
+ * Preprocess functions can reformat it by calling DateFormatter::format()
+ * with the desired parameters on the 'comment.created' variable.
+ * - changed: Formatted date and time for when the comment was last changed.
+ * Preprocess functions can reformat it by calling DateFormatter::format()
+ * with the desired parameters on the 'comment.changed' variable.
+ * - permalink: Comment permalink.
+ * - submitted: Submission information created from author and created
+ * during template_preprocess_comment().
+ * - user_picture: The comment author's profile picture.
+ * - status: Comment status. Possible values are:
+ * unpublished, published, or preview.
+ * - title: Comment title, linked to the comment.
+ * - attributes: HTML attributes for the containing element.
+ * The attributes.class may contain one or more of the following classes:
+ * - comment: The current template type; e.g., 'theming hook'.
+ * - by-anonymous: Comment by an unregistered user.
+ * - by-{entity-type}-author: Comment by the author of the parent entity,
+ * eg. by-node-author.
+ * - preview: When previewing a new or edited comment.
+ * The following applies only to viewers who are registered users:
+ * - unpublished: An unpublished comment visible only to administrators.
+ * - title_prefix: Additional output populated by modules, intended to be
+ * displayed in front of the main title tag that appears in the template.
+ * - title_suffix: Additional output populated by modules, intended to be
+ * displayed after the main title tag that appears in the template.
+ * - content_attributes: List of classes for the styling of the comment content.
+ * - title_attributes: Same as attributes, except applied to the main title
+ * tag that appears in the template.
+ * - threaded: A flag indicating whether the comments are threaded or not.
+ *
+ * These variables are provided to give context about the parent comment (if
+ * any):
+ * - parent_comment: Full parent comment entity (if any).
+ * - parent_author: Equivalent to author for the parent comment.
+ * - parent_created: Equivalent to created for the parent comment.
+ * - parent_changed: Equivalent to changed for the parent comment.
+ * - parent_title: Equivalent to title for the parent comment.
+ * - parent_permalink: Equivalent to permalink for the parent comment.
+ * - parent: A text string of parent comment submission information created from
+ * 'parent_author' and 'parent_created' during template_preprocess_comment().
+ * This information is presented to help screen readers follow lengthy
+ * discussion threads. You can hide this from sighted users using the class
+ * visually-hidden.
+ *
+ * These two variables are provided for context:
+ * - comment: Full comment object.
+ * - entity: Entity the comments are attached to.
+ *
+ * @see template_preprocess_comment()
+ */
+#}
+{% if threaded %}
+ {{ attach_library('seven/classy.indented') }}
+{% endif %}
+{%
+ set classes = [
+ 'comment',
+ 'js-comment',
+ status != 'published' ? status,
+ comment.owner.anonymous ? 'by-anonymous',
+ author_id and author_id == commented_entity.getOwnerId() ? 'by-' ~ commented_entity.getEntityTypeId() ~ '-author',
+ ]
+%}
+<article{{ attributes.addClass(classes) }}>
+ {#
+ Hide the "new" indicator by default, let a piece of JavaScript ask the
+ server which comments are new for the user. Rendering the final "new"
+ indicator here would break the render cache.
+ #}
+ <mark class="hidden" data-comment-timestamp="{{ new_indicator_timestamp }}"></mark>
+
+ <footer class="comment__meta">
+ {{ user_picture }}
+ <p class="comment__submitted">{{ submitted }}</p>
+
+ {#
+ Indicate the semantic relationship between parent and child comments for
+ accessibility. The list is difficult to navigate in a screen reader
+ without this information.
+ #}
+ {% if parent %}
+ <p class="parent visually-hidden">{{ parent }}</p>
+ {% endif %}
+
+ {{ permalink }}
+ </footer>
+
+ <div{{ content_attributes.addClass('content') }}>
+ {% if title %}
+ {{ title_prefix }}
+ <h3{{ title_attributes }}>{{ title }}</h3>
+ {{ title_suffix }}
+ {% endif %}
+ {{ content }}
+ </div>
+</article>
diff --git a/web/core/themes/seven/templates/classy/content/links--node.html.twig b/web/core/themes/seven/templates/classy/content/links--node.html.twig
new file mode 100644
index 0000000000..e6cda0d7bb
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/content/links--node.html.twig
@@ -0,0 +1,40 @@
+{#
+/**
+ * @file
+ * Theme override to display node links.
+ *
+ * Available variables:
+ * - attributes: Attributes for the UL containing the list of links.
+ * - links: Links to be output.
+ * Each link will have the following elements:
+ * - link: (optional) A render array that returns a link. See
+ * template_preprocess_links() for details how it is generated.
+ * - text: The link text.
+ * - attributes: HTML attributes for the list item element.
+ * - text_attributes: (optional) HTML attributes for the span element if no
+ * 'url' was supplied.
+ * - heading: (optional) A heading to precede the links.
+ * - text: The heading text.
+ * - level: The heading level (e.g. 'h2', 'h3').
+ * - attributes: (optional) A keyed list of attributes for the heading.
+ * If the heading is a string, it will be used as the text of the heading and
+ * the level will default to 'h2'.
+ *
+ * Headings should be used on navigation menus and any list of links that
+ * consistently appears on multiple pages. To make the heading invisible use
+ * the 'visually-hidden' CSS class. Do not use 'display:none', which
+ * removes it from screen readers and assistive technology. Headings allow
+ * screen reader and keyboard only users to navigate to or skip the links.
+ * See http://juicystudio.com/article/screen-readers-display-none.php and
+ * http://www.w3.org/TR/WCAG-TECHS/H42.html for more information.
+ *
+ * @see template_preprocess_links()
+ *
+ * @ingroup themeable
+ */
+#}
+{% if links %}
+ <div class="node__links">
+ {% include "links.html.twig" %}
+ </div>
+{% endif %}
diff --git a/web/core/themes/seven/templates/classy/content/mark.html.twig b/web/core/themes/seven/templates/classy/content/mark.html.twig
new file mode 100644
index 0000000000..9219915ce5
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/content/mark.html.twig
@@ -0,0 +1,20 @@
+{#
+/**
+ * @file
+ * Theme override for a marker for new or updated content.
+ *
+ * Available variables:
+ * - status: Number representing the marker status to display. Use the constants
+ * below for comparison:
+ * - MARK_NEW
+ * - MARK_UPDATED
+ * - MARK_READ
+ */
+#}
+{% if logged_in %}
+ {% if status is constant('MARK_NEW') %}
+ <span class="marker">{{ 'New'|t }}</span>
+ {% elseif status is constant('MARK_UPDATED') %}
+ <span class="marker">{{ 'Updated'|t }}</span>
+ {% endif %}
+{% endif %}
diff --git a/web/core/themes/seven/templates/classy/content/media-embed-error.html.twig b/web/core/themes/seven/templates/classy/content/media-embed-error.html.twig
new file mode 100644
index 0000000000..4b1dc926b6
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/content/media-embed-error.html.twig
@@ -0,0 +1,21 @@
+{#
+/**
+ * @file
+ * Theme override for a missing media error.
+ *
+ * Available variables
+ * - message: The message text.
+ * - attributes: HTML attributes for the containing element.
+ *
+ * When a response from the back end can't be returned, a related error message
+ * is displayed from JavaScript.
+ *
+ * @see Drupal.theme.mediaEmbedPreviewError
+ *
+ * @ingroup themeable
+ */
+#}
+{{ attach_library('seven/classy.media_embed_error') }}
+<div{{ attributes.addClass('media-embed-error', 'media-embed-error--missing-source') }}>
+ {{ message }}
+</div>
diff --git a/web/core/themes/seven/templates/classy/content/media.html.twig b/web/core/themes/seven/templates/classy/content/media.html.twig
new file mode 100644
index 0000000000..422030e9d0
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/content/media.html.twig
@@ -0,0 +1,28 @@
+{#
+/**
+ * @file
+ * Theme override to display a media item.
+ *
+ * Available variables:
+ * - name: Name of the media.
+ * - content: Media content.
+ *
+ * @see template_preprocess_media()
+ *
+ * @ingroup themeable
+ */
+#}
+{%
+ set classes = [
+ 'media',
+ 'media--type-' ~ media.bundle()|clean_class,
+ not media.isPublished() ? 'media--unpublished',
+ view_mode ? 'media--view-mode-' ~ view_mode|clean_class,
+ ]
+%}
+<article{{ attributes.addClass(classes) }}>
+ {{ title_suffix.contextual_links }}
+ {% if content %}
+ {{ content }}
+ {% endif %}
+</article>
diff --git a/web/core/themes/seven/templates/classy/content/node.html.twig b/web/core/themes/seven/templates/classy/content/node.html.twig
new file mode 100644
index 0000000000..fc2cb0c92a
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/content/node.html.twig
@@ -0,0 +1,108 @@
+{#
+/**
+ * @file
+ * Theme override to display a node.
+ *
+ * Available variables:
+ * - node: The node entity with limited access to object properties and methods.
+ * Only method names starting with "get", "has", or "is" and a few common
+ * methods such as "id", "label", and "bundle" are available. For example:
+ * - node.getCreatedTime() will return the node creation timestamp.
+ * - node.hasField('field_example') returns TRUE if the node bundle includes
+ * field_example. (This does not indicate the presence of a value in this
+ * field.)
+ * - node.isPublished() will return whether the node is published or not.
+ * Calling other methods, such as node.delete(), will result in an exception.
+ * See \Drupal\node\Entity\Node for a full list of public properties and
+ * methods for the node object.
+ * - label: (optional) The title of the node.
+ * - content: All node items. Use {{ content }} to print them all,
+ * or print a subset such as {{ content.field_example }}. Use
+ * {{ content|without('field_example') }} to temporarily suppress the printing
+ * of a given child element.
+ * - author_picture: The node author user entity, rendered using the "compact"
+ * view mode.
+ * - metadata: Metadata for this node.
+ * - date: (optional) Themed creation date field.
+ * - author_name: (optional) Themed author name field.
+ * - url: Direct URL of the current node.
+ * - display_submitted: Whether submission information should be displayed.
+ * - attributes: HTML attributes for the containing element.
+ * The attributes.class element may contain one or more of the following
+ * classes:
+ * - node: The current template type (also known as a "theming hook").
+ * - node--type-[type]: The current node type. For example, if the node is an
+ * "Article" it would result in "node--type-article". Note that the machine
+ * name will often be in a short form of the human readable label.
+ * - node--view-mode-[view_mode]: The View Mode of the node; for example, a
+ * teaser would result in: "node--view-mode-teaser", and
+ * full: "node--view-mode-full".
+ * The following are controlled through the node publishing options.
+ * - node--promoted: Appears on nodes promoted to the front page.
+ * - node--sticky: Appears on nodes ordered above other non-sticky nodes in
+ * teaser listings.
+ * - node--unpublished: Appears on unpublished nodes visible only to site
+ * admins.
+ * - title_attributes: Same as attributes, except applied to the main title
+ * tag that appears in the template.
+ * - content_attributes: Same as attributes, except applied to the main
+ * content tag that appears in the template.
+ * - author_attributes: Same as attributes, except applied to the author of
+ * the node tag that appears in the template.
+ * - title_prefix: Additional output populated by modules, intended to be
+ * displayed in front of the main title tag that appears in the template.
+ * - title_suffix: Additional output populated by modules, intended to be
+ * displayed after the main title tag that appears in the template.
+ * - view_mode: View mode; for example, "teaser" or "full".
+ * - teaser: Flag for the teaser state. Will be true if view_mode is 'teaser'.
+ * - page: Flag for the full page state. Will be true if view_mode is 'full'.
+ * - readmore: Flag for more state. Will be true if the teaser content of the
+ * node cannot hold the main body content.
+ * - logged_in: Flag for authenticated user status. Will be true when the
+ * current user is a logged-in member.
+ * - is_admin: Flag for admin user status. Will be true when the current user
+ * is an administrator.
+ *
+ * @see template_preprocess_node()
+ *
+ * @todo Remove the id attribute (or make it a class), because if that gets
+ * rendered twice on a page this is invalid CSS for example: two lists
+ * in different view modes.
+ */
+#}
+{%
+ set classes = [
+ 'node',
+ 'node--type-' ~ node.bundle|clean_class,
+ node.isPromoted() ? 'node--promoted',
+ node.isSticky() ? 'node--sticky',
+ not node.isPublished() ? 'node--unpublished',
+ view_mode ? 'node--view-mode-' ~ view_mode|clean_class,
+ ]
+%}
+{{ attach_library('seven/classy.node') }}
+<article{{ attributes.addClass(classes) }}>
+
+ {{ title_prefix }}
+ {% if label and not page %}
+ <h2{{ title_attributes }}>
+ <a href="{{ url }}" rel="bookmark">{{ label }}</a>
+ </h2>
+ {% endif %}
+ {{ title_suffix }}
+
+ {% if display_submitted %}
+ <footer class="node__meta">
+ {{ author_picture }}
+ <div{{ author_attributes.addClass('node__submitted') }}>
+ {% trans %}Submitted by {{ author_name }} on {{ date }}{% endtrans %}
+ {{ metadata }}
+ </div>
+ </footer>
+ {% endif %}
+
+ <div{{ content_attributes.addClass('node__content') }}>
+ {{ content }}
+ </div>
+
+</article>
diff --git a/web/core/themes/seven/templates/classy/content/page-title.html.twig b/web/core/themes/seven/templates/classy/content/page-title.html.twig
new file mode 100644
index 0000000000..e1de726607
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/content/page-title.html.twig
@@ -0,0 +1,19 @@
+{#
+/**
+ * @file
+ * Theme override for page titles.
+ *
+ * Available variables:
+ * - title_attributes: HTML attributes for the page title element.
+ * - title_prefix: Additional output populated by modules, intended to be
+ * displayed in front of the main title tag that appears in the template.
+ * - title: The page title, for use in the actual content.
+ * - title_suffix: Additional output populated by modules, intended to be
+ * displayed after the main title tag that appears in the template.
+ */
+#}
+{{ title_prefix }}
+{% if title %}
+ <h1{{ title_attributes.addClass('page-title') }}>{{ title }}</h1>
+{% endif %}
+{{ title_suffix }}
diff --git a/web/core/themes/seven/templates/classy/content/search-result.html.twig b/web/core/themes/seven/templates/classy/content/search-result.html.twig
new file mode 100644
index 0000000000..150b8d903e
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/content/search-result.html.twig
@@ -0,0 +1,72 @@
+{#
+/**
+ * @file
+ * Theme override for displaying a single search result.
+ *
+ * This template renders a single search result. The list of results is
+ * rendered using '#theme' => 'item_list', with suggestions of:
+ * - item_list__search_results__(plugin_id)
+ * - item_list__search_results
+ *
+ * Available variables:
+ * - url: URL of the result.
+ * - title: Title of the result.
+ * - snippet: A small preview of the result. Does not apply to user searches.
+ * - info: String of all the meta information ready for print. Does not apply
+ * to user searches.
+ * - plugin_id: The machine-readable name of the plugin being executed,such
+ * as "node_search" or "user_search".
+ * - title_prefix: Additional output populated by modules, intended to be
+ * displayed in front of the main title tag that appears in the template.
+ * - title_suffix: Additional output populated by modules, intended to be
+ * displayed after the main title tag that appears in the template.
+ * - info_split: Contains same data as info, but split into separate parts.
+ * - info_split.type: Node type (or item type string supplied by module).
+ * - info_split.user: Author of the node linked to users profile. Depends
+ * on permission.
+ * - info_split.date: Last update of the node. Short formatted.
+ * - info_split.comment: Number of comments output as "% comments", %
+ * being the count. (Depends on comment.module).
+ * @todo The info variable needs to be made drillable and each of these sub
+ * items should instead be within info and renamed info.foo, info.bar, etc.
+ *
+ * Other variables:
+ * - title_attributes: HTML attributes for the title.
+ * - content_attributes: HTML attributes for the content.
+ *
+ * Since info_split is keyed, a direct print of the item is possible.
+ * This array does not apply to user searches so it is recommended to check
+ * for its existence before printing. The default keys of 'type', 'user' and
+ * 'date' always exist for node searches. Modules may provide other data.
+ * @code
+ * {% if (info_split.comment) %}
+ * <span class="info-comment">
+ * {{ info_split.comment }}
+ * </span>
+ * {% endif %}
+ * @endcode
+ *
+ * To check for all available data within info_split, use the code below.
+ * @code
+ * <pre>
+ * {{ dump(info_split) }}
+ * </pre>
+ * @endcode
+ *
+ * @see template_preprocess_search_result()
+ */
+#}
+{{ attach_library('seven/classy.search-results') }}
+{{ title_prefix }}
+<h3{{ title_attributes.addClass('search-result__title') }}>
+ <a href="{{ url }}">{{ title }}</a>
+</h3>
+{{ title_suffix }}
+<div class="search-result__snippet-info">
+ {% if snippet %}
+ <p{{ content_attributes.addClass('search-result__snippet') }}>{{ snippet }}</p>
+ {% endif %}
+ {% if info %}
+ <p class="search-result__info">{{ info }}</p>
+ {% endif %}
+</div>
diff --git a/web/core/themes/seven/templates/classy/content/taxonomy-term.html.twig b/web/core/themes/seven/templates/classy/content/taxonomy-term.html.twig
new file mode 100644
index 0000000000..6478b507d0
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/content/taxonomy-term.html.twig
@@ -0,0 +1,41 @@
+{#
+/**
+ * @file
+ * Theme override to display a taxonomy term.
+ *
+ * Available variables:
+ * - url: URL of the current term.
+ * - name: (optional) Name of the current term.
+ * - content: Items for the content of the term (fields and description).
+ * Use 'content' to print them all, or print a subset such as
+ * 'content.description'. Use the following code to exclude the
+ * printing of a given child element:
+ * @code
+ * {{ content|without('description') }}
+ * @endcode
+ * - attributes: HTML attributes for the wrapper.
+ * - page: Flag for the full page state.
+ * - term: The taxonomy term entity, including:
+ * - id: The ID of the taxonomy term.
+ * - bundle: Machine name of the current vocabulary.
+ * - view_mode: View mode, e.g. 'full', 'teaser', etc.
+ *
+ * @see template_preprocess_taxonomy_term()
+ */
+#}
+{%
+ set classes = [
+ 'taxonomy-term',
+ 'vocabulary-' ~ term.bundle|clean_class,
+ ]
+%}
+<div{{ attributes.setAttribute('id', 'taxonomy-term-' ~ term.id).addClass(classes) }}>
+ {{ title_prefix }}
+ {% if name and not page %}
+ <h2><a href="{{ url }}">{{ name }}</a></h2>
+ {% endif %}
+ {{ title_suffix }}
+ <div class="content">
+ {{ content }}
+ </div>
+</div>
diff --git a/web/core/themes/seven/templates/classy/dataset/aggregator-feed.html.twig b/web/core/themes/seven/templates/classy/dataset/aggregator-feed.html.twig
new file mode 100644
index 0000000000..9eacccb604
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/dataset/aggregator-feed.html.twig
@@ -0,0 +1,36 @@
+{#
+/**
+ * @file
+ * Theme override to present an aggregator feed.
+ *
+ * The contents are rendered above feed listings when browsing source feeds.
+ * For example, "example.com/aggregator/sources/1".
+ *
+ * Available variables:
+ * - title: (optional) Title of the feed item.
+ * - content: All field items. Use {{ content }} to print them all,
+ * or print a subset such as {{ content.field_example }}. Use
+ * {{ content|without('field_example') }} to temporarily suppress the printing
+ * of a given element.
+ * - attributes: HTML attributes for the wrapper.
+ * - title_attributes: Same as attributes, except applied to the main title
+ * tag that appears in the template.
+ * - title_prefix: Additional output populated by modules, intended to be
+ * displayed in front of the main title tag that appears in the template.
+ * - title_suffix: Additional output populated by modules, intended to be
+ * displayed after the main title tag that appears in the template.
+ *
+ * @see template_preprocess_aggregator_feed()
+ */
+#}
+<div{{ attributes.addClass('aggregator-feed') }}>
+
+ {{ title_prefix }}
+ {% if title and not full %}
+ <h2{{ title_attributes }}>{{ title }}</h2>
+ {% endif %}
+ {{ title_suffix }}
+
+ {{ content }}
+
+</div>
diff --git a/web/core/themes/seven/templates/classy/dataset/forum-icon.html.twig b/web/core/themes/seven/templates/classy/dataset/forum-icon.html.twig
new file mode 100644
index 0000000000..d6be503bb2
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/dataset/forum-icon.html.twig
@@ -0,0 +1,30 @@
+{#
+/**
+ * @file
+ * Theme override to display a status icon for a forum post.
+ *
+ * Available variables:
+ * - attributes: HTML attributes to be applied to the wrapper element.
+ * - class: HTML classes that determine which icon to display. May be one of
+ * 'hot', 'hot-new', 'new', 'default', 'closed', or 'sticky'.
+ * - title: Text alternative for the forum icon.
+ * - icon_title: Text alternative for the forum icon, same as above.
+ * - new_posts: '1' when this topic contains new posts, otherwise '0'.
+ * - first_new: '1' when this is the first topic with new posts, otherwise '0'.
+ * - icon_status: Indicates which status icon should be used.
+ *
+ * @see template_preprocess_forum_icon()
+ */
+#}
+{%
+ set classes = [
+ 'forum__icon',
+ 'forum__topic-status--' ~ icon_status,
+ ]
+%}
+<div{{ attributes.addClass(classes) }}>
+ {% if first_new -%}
+ <a id="new"></a>
+ {%- endif %}
+ <span class="visually-hidden">{{ icon_title }}</span>
+</div>
diff --git a/web/core/themes/seven/templates/classy/dataset/forum-list.html.twig b/web/core/themes/seven/templates/classy/dataset/forum-list.html.twig
new file mode 100644
index 0000000000..ce610bb49b
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/dataset/forum-list.html.twig
@@ -0,0 +1,79 @@
+{#
+/**
+ * @file
+ * Theme override to display a list of forums and containers.
+ *
+ * Available variables:
+ * - forums: A collection of forums and containers to display. It is keyed to
+ * the numeric IDs of all child forums and containers. Each forum in forums
+ * contains:
+ * - is_container: A flag indicating if the forum can contain other
+ * forums. Otherwise, the forum can only contain topics.
+ * - depth: How deep the forum is in the current hierarchy.
+ * - zebra: 'even' or 'odd', used for row class.
+ * - icon_class: 'default' or 'new', used for forum icon class.
+ * - icon_title: Text alternative for the forum icon.
+ * - name: The name of the forum.
+ * - link: The URL to link to this forum.
+ * - description: The description field for the forum, containing:
+ * - value: The descriptive text for the forum.
+ * - new_topics: A flag indicating if the forum contains unread posts.
+ * - new_url: A URL to the forum's unread posts.
+ * - new_text: Text for the above URL, which tells how many new posts.
+ * - old_topics: A count of posts that have already been read.
+ * - num_posts: The total number of posts in the forum.
+ * - last_reply: Text representing the last time a forum was posted or
+ * commented in.
+ * - forum_id: Forum ID for the current forum. Parent to all items within the
+ * forums array.
+ *
+ * @see template_preprocess_forum_list()
+ */
+#}
+<table id="forum-{{ forum_id }}">
+ <thead>
+ <tr>
+ <th>{{ 'Forum'|t }}</th>
+ <th>{{ 'Topics'|t }}</th>
+ <th>{{ 'Posts'|t }}</th>
+ <th>{{ 'Last post'|t }}</th>
+ </tr>
+ </thead>
+ <tbody>
+ {% for child_id, forum in forums %}
+ <tr id="forum-list-{{ child_id }}" class="{{ forum.zebra }}">
+ <td {% if forum.is_container == true -%}
+ colspan="4" class="container"
+ {%- else -%}
+ class="forum-list__forum"
+ {%- endif -%}>
+ {#
+ Enclose the contents of this cell with X divs, where X is the
+ depth this forum resides at. This will allow us to use CSS
+ left-margin for indenting.
+ #}
+ {% for i in 1..forum.depth if forum.depth > 0 %}<div class="indented">{% endfor %}
+ <div class="forum__icon forum-status-{{ forum.icon_class }}" title="{{ forum.icon_title }}">
+ <span class="visually-hidden">{{ forum.icon_title }}</span>
+ </div>
+ <div class="forum__name"><a href="{{ forum.link }}">{{ forum.label }}</a></div>
+ {% if forum.description.value %}
+ <div class="forum__description">{{ forum.description.value }}</div>
+ {% endif %}
+ {% for i in 1..forum.depth if forum.depth > 0 %}</div>{% endfor %}
+ </td>
+ {% if forum.is_container == false %}
+ <td class="forum__topics">
+ {{ forum.num_topics }}
+ {% if forum.new_topics == true %}
+ <br />
+ <a href="{{ forum.new_url }}">{{ forum.new_text }}</a>
+ {% endif %}
+ </td>
+ <td class="forum__posts">{{ forum.num_posts }}</td>
+ <td class="forum__last-reply">{{ forum.last_reply }}</td>
+ {% endif %}
+ </tr>
+ {% endfor %}
+ </tbody>
+</table>
diff --git a/web/core/themes/seven/templates/classy/dataset/forums.html.twig b/web/core/themes/seven/templates/classy/dataset/forums.html.twig
new file mode 100644
index 0000000000..a1bf63c249
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/dataset/forums.html.twig
@@ -0,0 +1,24 @@
+{#
+/**
+ * @file
+ * Theme override to display a forum.
+ *
+ * May contain forum containers as well as forum topics.
+ *
+ * Available variables:
+ * - forums: The forums to display (as processed by forum-list.html.twig).
+ * - topics: The topics to display.
+ * - topics_pager: The topics pager.
+ * - forums_defined: A flag to indicate that the forums are configured.
+ *
+ * @see template_preprocess_forums()
+ */
+#}
+{{ attach_library('seven/classy.forum') }}
+{% if forums_defined %}
+ <div class="forum">
+ {{ forums }}
+ {{ topics }}
+ {{ topics_pager }}
+ </div>
+{% endif %}
diff --git a/web/core/themes/seven/templates/classy/dataset/item-list--search-results.html.twig b/web/core/themes/seven/templates/classy/dataset/item-list--search-results.html.twig
new file mode 100644
index 0000000000..e9928fd776
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/dataset/item-list--search-results.html.twig
@@ -0,0 +1,29 @@
+{% extends "item-list.html.twig" %}
+{#
+/**
+ * @file
+ * Theme override for an item list of search results.
+ *
+ * Available variables:
+ * - items: A list of items. Each item contains:
+ * - attributes: HTML attributes to be applied to each list item.
+ * - value: The content of the list element.
+ * - title: The title of the list.
+ * - list_type: The tag for list element ("ul" or "ol").
+ * - attributes: HTML attributes to be applied to the list.
+ * - empty: A message to display when there are no items. Allowed value is a
+ * string or render array.
+ * - context: An list of contextual data associated with the list. For search
+ * results, the following data is set:
+ * - plugin: The search plugin ID, for example "node_search".
+ *
+ * @see template_preprocess_item_list()
+ */
+#}
+{%
+ set classes = [
+ 'search-results',
+ context.plugin ~ '-results',
+ ]
+%}
+{% set attributes = attributes.addClass(classes) %}
diff --git a/web/core/themes/seven/templates/classy/dataset/item-list.html.twig b/web/core/themes/seven/templates/classy/dataset/item-list.html.twig
new file mode 100644
index 0000000000..20541b0b7e
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/dataset/item-list.html.twig
@@ -0,0 +1,41 @@
+{#
+/**
+ * @file
+ * Theme override for an item list.
+ *
+ * Available variables:
+ * - items: A list of items. Each item contains:
+ * - attributes: HTML attributes to be applied to each list item.
+ * - value: The content of the list element.
+ * - title: The title of the list.
+ * - list_type: The tag for list element ("ul" or "ol").
+ * - wrapper_attributes: HTML attributes to be applied to the list wrapper.
+ * - attributes: HTML attributes to be applied to the list.
+ * - empty: A message to display when there are no items. Allowed value is a
+ * string or render array.
+ * - context: A list of contextual data associated with the list. May contain:
+ * - list_style: The custom list style.
+ *
+ * @see template_preprocess_item_list()
+ */
+#}
+{% if context.list_style %}
+ {%- set wrapper_attributes = wrapper_attributes.addClass('item-list--' ~ context.list_style) %}
+ {%- set attributes = attributes.addClass('item-list__' ~ context.list_style) %}
+{% endif %}
+{% if items or empty -%}
+ <div{{ wrapper_attributes.addClass('item-list') }}>
+ {%- if title is not empty -%}
+ <h3>{{ title }}</h3>
+ {%- endif -%}
+ {%- if items -%}
+ <{{ list_type }}{{ attributes }}>
+ {%- for item in items -%}
+ <li{{ item.attributes }}>{{ item.value }}</li>
+ {%- endfor -%}
+ </{{ list_type }}>
+ {%- else -%}
+ {{- empty -}}
+ {%- endif -%}
+ </div>
+{%- endif %}
diff --git a/web/core/themes/seven/templates/classy/dataset/table.html.twig b/web/core/themes/seven/templates/classy/dataset/table.html.twig
new file mode 100644
index 0000000000..2afa9c1556
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/dataset/table.html.twig
@@ -0,0 +1,113 @@
+{#
+/**
+ * @file
+ * Theme override to display a table.
+ *
+ * Available variables:
+ * - attributes: HTML attributes to apply to the <table> tag.
+ * - caption: A localized string for the <caption> tag.
+ * - colgroups: Column groups. Each group contains the following properties:
+ * - attributes: HTML attributes to apply to the <col> tag.
+ * Note: Drupal currently supports only one table header row, see
+ * https://www.drupal.org/node/893530 and
+ * http://api.drupal.org/api/drupal/includes!theme.inc/function/theme_table/7#comment-5109.
+ * - header: Table header cells. Each cell contains the following properties:
+ * - tag: The HTML tag name to use; either 'th' or 'td'.
+ * - attributes: HTML attributes to apply to the tag.
+ * - content: A localized string for the title of the column.
+ * - field: Field name (required for column sorting).
+ * - sort: Default sort order for this column ("asc" or "desc").
+ * - sticky: A flag indicating whether to use a "sticky" table header.
+ * - rows: Table rows. Each row contains the following properties:
+ * - attributes: HTML attributes to apply to the <tr> tag.
+ * - data: Table cells.
+ * - no_striping: A flag indicating that the row should receive no
+ * 'even / odd' styling. Defaults to FALSE.
+ * - cells: Table cells of the row. Each cell contains the following keys:
+ * - tag: The HTML tag name to use; either 'th' or 'td'.
+ * - attributes: Any HTML attributes, such as "colspan", to apply to the
+ * table cell.
+ * - content: The string to display in the table cell.
+ * - active_table_sort: A boolean indicating whether the cell is the active
+ table sort.
+ * - footer: Table footer rows, in the same format as the rows variable.
+ * - empty: The message to display in an extra row if table does not have
+ * any rows.
+ * - no_striping: A boolean indicating that the row should receive no striping.
+ * - header_columns: The number of columns in the header.
+ *
+ * @see template_preprocess_table()
+ */
+#}
+<table{{ attributes }}>
+ {% if caption %}
+ <caption>{{ caption }}</caption>
+ {% endif %}
+
+ {% for colgroup in colgroups %}
+ {% if colgroup.cols %}
+ <colgroup{{ colgroup.attributes }}>
+ {% for col in colgroup.cols %}
+ <col{{ col.attributes }} />
+ {% endfor %}
+ </colgroup>
+ {% else %}
+ <colgroup{{ colgroup.attributes }} />
+ {% endif %}
+ {% endfor %}
+
+ {% if header %}
+ <thead>
+ <tr>
+ {% for cell in header %}
+ {%
+ set cell_classes = [
+ cell.active_table_sort ? 'is-active',
+ ]
+ %}
+ <{{ cell.tag }}{{ cell.attributes.addClass(cell_classes) }}>
+ {{- cell.content -}}
+ </{{ cell.tag }}>
+ {% endfor %}
+ </tr>
+ </thead>
+ {% endif %}
+
+ {% if rows %}
+ <tbody>
+ {% for row in rows %}
+ {%
+ set row_classes = [
+ not no_striping ? cycle(['odd', 'even'], loop.index0),
+ ]
+ %}
+ <tr{{ row.attributes.addClass(row_classes) }}>
+ {% for cell in row.cells %}
+ <{{ cell.tag }}{{ cell.attributes }}>
+ {{- cell.content -}}
+ </{{ cell.tag }}>
+ {% endfor %}
+ </tr>
+ {% endfor %}
+ </tbody>
+ {% elseif empty %}
+ <tbody>
+ <tr class="odd">
+ <td colspan="{{ header_columns }}" class="empty message">{{ empty }}</td>
+ </tr>
+ </tbody>
+ {% endif %}
+ {% if footer %}
+ <tfoot>
+ {% for row in footer %}
+ <tr{{ row.attributes }}>
+ {% for cell in row.cells %}
+ <{{ cell.tag }}{{ cell.attributes }}>
+ {{- cell.content -}}
+ </{{ cell.tag }}>
+ {% endfor %}
+ </tr>
+ {% endfor %}
+ </tfoot>
+ {% endif %}
+</table>
diff --git a/web/core/themes/seven/templates/classy/field/field--comment.html.twig b/web/core/themes/seven/templates/classy/field/field--comment.html.twig
new file mode 100644
index 0000000000..1ec3ee64b1
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/field/field--comment.html.twig
@@ -0,0 +1,57 @@
+{#
+/**
+ * @file
+ * Theme override for comment fields.
+ *
+ * Available variables:
+ * - attributes: HTML attributes for the containing element.
+ * - label_hidden: Whether to show the field label or not.
+ * - title_attributes: HTML attributes for the title.
+ * - label: The label for the field.
+ * - title_prefix: Additional output populated by modules, intended to be
+ * displayed in front of the main title tag that appears in the template.
+ * - title_suffix: Additional title output populated by modules, intended to
+ * be displayed after the main title tag that appears in the template.
+ * - comments: List of comments rendered through comment.html.twig.
+ * - comment_form: The 'Add new comment' form.
+ * - comment_display_mode: Is the comments are threaded.
+ * - comment_type: The comment type bundle ID for the comment field.
+ * - entity_type: The entity type to which the field belongs.
+ * - field_name: The name of the field.
+ * - field_type: The type of the field.
+ * - label_display: The display settings for the label.
+ *
+ * @see template_preprocess_field()
+ * @see comment_preprocess_field()
+ */
+#}
+{%
+ set classes = [
+ 'field',
+ 'field--name-' ~ field_name|clean_class,
+ 'field--type-' ~ field_type|clean_class,
+ 'field--label-' ~ label_display,
+ 'comment-wrapper',
+ ]
+%}
+{%
+ set title_classes = [
+ 'title',
+ label_display == 'visually_hidden' ? 'visually-hidden',
+ ]
+%}
+<section{{ attributes.addClass(classes) }}>
+ {% if comments and not label_hidden %}
+ {{ title_prefix }}
+ <h2{{ title_attributes.addClass(title_classes) }}>{{ label }}</h2>
+ {{ title_suffix }}
+ {% endif %}
+
+ {{ comments }}
+
+ {% if comment_form %}
+ <h2 class="title comment-form__title">{{ 'Add new comment'|t }}</h2>
+ {{ comment_form }}
+ {% endif %}
+
+</section>
diff --git a/web/core/themes/seven/templates/classy/field/field--node--created.html.twig b/web/core/themes/seven/templates/classy/field/field--node--created.html.twig
new file mode 100644
index 0000000000..72d5d6737d
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/field/field--node--created.html.twig
@@ -0,0 +1,34 @@
+{#
+/**
+ * @file
+ * Theme override for the node created field.
+ *
+ * This is an override of field.html.twig for the node created field. See that
+ * template for documentation about its details and overrides.
+ *
+ * Available variables:
+ * - attributes: HTML attributes for the containing span element.
+ * - items: List of all the field items. Each item contains:
+ * - attributes: List of HTML attributes for each item.
+ * - content: The field item content.
+ * - entity_type: The entity type to which the field belongs.
+ * - field_name: The name of the field.
+ * - field_type: The type of the field.
+ * - label_display: The display settings for the label.
+ *
+ * @see field.html.twig
+ */
+#}
+{%
+ set classes = [
+ 'field',
+ 'field--name-' ~ field_name|clean_class,
+ 'field--type-' ~ field_type|clean_class,
+ 'field--label-' ~ label_display,
+ ]
+%}
+<span{{ attributes.addClass(classes) }}>
+ {%- for item in items -%}
+ {{ item.content }}
+ {%- endfor -%}
+</span>
diff --git a/web/core/themes/seven/templates/classy/field/field--node--title.html.twig b/web/core/themes/seven/templates/classy/field/field--node--title.html.twig
new file mode 100644
index 0000000000..33b105f50b
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/field/field--node--title.html.twig
@@ -0,0 +1,34 @@
+{#
+/**
+ * @file
+ * Theme override for the node title field.
+ *
+ * This is an override of field.html.twig for the node title field. See that
+ * template for documentation about its details and overrides.
+ *
+ * Available variables:
+ * - attributes: HTML attributes for the containing span element.
+ * - items: List of all the field items. Each item contains:
+ * - attributes: List of HTML attributes for each item.
+ * - content: The field item content.
+ * - entity_type: The entity type to which the field belongs.
+ * - field_name: The name of the field.
+ * - field_type: The type of the field.
+ * - label_display: The display settings for the label.
+ *
+ * @see field.html.twig
+ */
+#}
+{%
+ set classes = [
+ 'field',
+ 'field--name-' ~ field_name|clean_class,
+ 'field--type-' ~ field_type|clean_class,
+ 'field--label-' ~ label_display,
+ ]
+%}
+<span{{ attributes.addClass(classes) }}>
+ {%- for item in items -%}
+ {{ item.content }}
+ {%- endfor -%}
+</span>
diff --git a/web/core/themes/seven/templates/classy/field/field--node--uid.html.twig b/web/core/themes/seven/templates/classy/field/field--node--uid.html.twig
new file mode 100644
index 0000000000..9afc591b71
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/field/field--node--uid.html.twig
@@ -0,0 +1,34 @@
+{#
+/**
+ * @file
+ * Theme override for the node user field.
+ *
+ * This is an override of field.html.twig for the node user field. See that
+ * template for documentation about its details and overrides.
+ *
+ * Available variables:
+ * - attributes: HTML attributes for the containing span element.
+ * - items: List of all the field items. Each item contains:
+ * - attributes: List of HTML attributes for each item.
+ * - content: The field item content.
+ * - entity_type: The entity type to which the field belongs.
+ * - field_name: The name of the field.
+ * - field_type: The type of the field.
+ * - label_display: The display settings for the label.
+ *
+ * @see field.html.twig
+ */
+#}
+{%
+ set classes = [
+ 'field',
+ 'field--name-' ~ field_name|clean_class,
+ 'field--type-' ~ field_type|clean_class,
+ 'field--label-' ~ label_display,
+ ]
+%}
+<span{{ attributes.addClass(classes) }}>
+ {%- for item in items -%}
+ {{ item.content }}
+ {%- endfor -%}
+</span>
diff --git a/web/core/themes/seven/templates/classy/field/field--text-long.html.twig b/web/core/themes/seven/templates/classy/field/field--text-long.html.twig
new file mode 100644
index 0000000000..07ce721d2d
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/field/field--text-long.html.twig
@@ -0,0 +1 @@
+{% extends "field--text.html.twig" %}
diff --git a/web/core/themes/seven/templates/classy/field/field--text-with-summary.html.twig b/web/core/themes/seven/templates/classy/field/field--text-with-summary.html.twig
new file mode 100644
index 0000000000..07ce721d2d
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/field/field--text-with-summary.html.twig
@@ -0,0 +1 @@
+{% extends "field--text.html.twig" %}
diff --git a/web/core/themes/seven/templates/classy/field/field--text.html.twig b/web/core/themes/seven/templates/classy/field/field--text.html.twig
new file mode 100644
index 0000000000..5d1690c3ec
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/field/field--text.html.twig
@@ -0,0 +1,28 @@
+{% extends "field.html.twig" %}
+{#
+/**
+ * @file
+ * Default theme implementation for a text field.
+ *
+ * A 'clearfix' class is added, because 'text' fields have a 'format' property
+ * that allows a Text Format to be associated with the entered text, which then
+ * applies filtering on output. A common use case is to align images to the left
+ * or right, and without this 'clearfix' class, such aligned images may be
+ * rendered outside of the 'text' field formatter's boundaries, and hence
+ * overlap with other fields. By setting the 'clearfix' class on all 'text'
+ * fields, we prevent that.
+ *
+ * @see https://www.drupal.org/node/2358529
+ *
+ * A 'text-formatted' class is added to assist with default styling of base
+ * elements such as paragraphs and lists that may not have classes assigned to
+ * them. This allows user entered content to have default styling without
+ * interfering with the styles of other UI components such as system generated
+ * lists or other dynamic content.
+ *
+ * @see https://www.drupal.org/node/2539860
+ *
+ * @ingroup themeable
+ */
+#}
+{% set attributes = attributes.addClass('clearfix', 'text-formatted') %}
diff --git a/web/core/themes/seven/templates/classy/field/field.html.twig b/web/core/themes/seven/templates/classy/field/field.html.twig
new file mode 100644
index 0000000000..1cfbd651ce
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/field/field.html.twig
@@ -0,0 +1,81 @@
+{#
+/**
+ * @file
+ * Theme override for a field.
+ *
+ * To override output, copy the "field.html.twig" from the templates directory
+ * to your theme's directory and customize it, just like customizing other
+ * Drupal templates such as page.html.twig or node.html.twig.
+ *
+ * Instead of overriding the theming for all fields, you can also just override
+ * theming for a subset of fields using
+ * @link themeable Theme hook suggestions. @endlink For example,
+ * here are some theme hook suggestions that can be used for a field_foo field
+ * on an article node type:
+ * - field--node--field-foo--article.html.twig
+ * - field--node--field-foo.html.twig
+ * - field--node--article.html.twig
+ * - field--field-foo.html.twig
+ * - field--text-with-summary.html.twig
+ * - field.html.twig
+ *
+ * Available variables:
+ * - attributes: HTML attributes for the containing element.
+ * - label_hidden: Whether to show the field label or not.
+ * - title_attributes: HTML attributes for the title.
+ * - label: The label for the field.
+ * - multiple: TRUE if a field can contain multiple items.
+ * - items: List of all the field items. Each item contains:
+ * - attributes: List of HTML attributes for each item.
+ * - content: The field item's content.
+ * - entity_type: The entity type to which the field belongs.
+ * - field_name: The name of the field.
+ * - field_type: The type of the field.
+ * - label_display: The display settings for the label.
+ *
+ *
+ * @see template_preprocess_field()
+ */
+#}
+{%
+ set classes = [
+ 'field',
+ 'field--name-' ~ field_name|clean_class,
+ 'field--type-' ~ field_type|clean_class,
+ 'field--label-' ~ label_display,
+ label_display == 'inline' ? 'clearfix',
+ ]
+%}
+{%
+ set title_classes = [
+ 'field__label',
+ label_display == 'visually_hidden' ? 'visually-hidden',
+ ]
+%}
+
+{% if label_hidden %}
+ {% if multiple %}
+ <div{{ attributes.addClass(classes, 'field__items') }}>
+ {% for item in items %}
+ <div{{ item.attributes.addClass('field__item') }}>{{ item.content }}</div>
+ {% endfor %}
+ </div>
+ {% else %}
+ {% for item in items %}
+ <div{{ attributes.addClass(classes, 'field__item') }}>{{ item.content }}</div>
+ {% endfor %}
+ {% endif %}
+{% else %}
+ <div{{ attributes.addClass(classes) }}>
+ <div{{ title_attributes.addClass(title_classes) }}>{{ label }}</div>
+ {% if multiple %}
+ <div class="field__items">
+ {% endif %}
+ {% for item in items %}
+ <div{{ item.attributes.addClass('field__item') }}>{{ item.content }}</div>
+ {% endfor %}
+ {% if multiple %}
+ </div>
+ {% endif %}
+ </div>
+{% endif %}
diff --git a/web/core/themes/seven/templates/classy/field/file-audio.html.twig b/web/core/themes/seven/templates/classy/field/file-audio.html.twig
new file mode 100644
index 0000000000..60ac095f99
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/field/file-audio.html.twig
@@ -0,0 +1,23 @@
+{#
+/**
+* @file
+* Default theme implementation to display the file entity as an audio tag.
+*
+* Available variables:
+* - attributes: An array of HTML attributes, intended to be added to the
+* audio tag.
+* - files: And array of files to be added as sources for the audio tag. Each
+* element is an array with the following elements:
+* - file: The full file object.
+* - source_attributes: An array of HTML attributes for to be added to the
+* source tag.
+*
+* @ingroup themeable
+*/
+#}
+{{ attach_library('seven/classy.file') }}
+<audio {{ attributes }}>
+ {% for file in files %}
+ <source {{ file.source_attributes }} />
+ {% endfor %}
+</audio>
diff --git a/web/core/themes/seven/templates/classy/field/file-link.html.twig b/web/core/themes/seven/templates/classy/field/file-link.html.twig
new file mode 100644
index 0000000000..fbf11fbc57
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/field/file-link.html.twig
@@ -0,0 +1,17 @@
+{#
+/**
+ * @file
+ * Theme override for a link to a file.
+ *
+ * Available variables:
+ * - attributes: The HTML attributes for the containing element.
+ * - link: A link to the file.
+ * - icon: The icon image representing the file type.
+ * - file_size: The size of the file.
+ *
+ * @see template_preprocess_file_link()
+ * @see stable_preprocess_image_widget()
+ */
+#}
+{{ attach_library('seven/classy.file') }}
+<span{{ attributes }}>{{ icon }} {{ link }}</span>
diff --git a/web/core/themes/seven/templates/classy/field/file-video.html.twig b/web/core/themes/seven/templates/classy/field/file-video.html.twig
new file mode 100644
index 0000000000..4ed6794a09
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/field/file-video.html.twig
@@ -0,0 +1,23 @@
+{#
+/**
+* @file
+* Default theme implementation to display the file entity as a video tag.
+*
+* Available variables:
+* - attributes: An array of HTML attributes, intended to be added to the
+* video tag.
+* - files: And array of files to be added as sources for the video tag. Each
+* element is an array with the following elements:
+* - file: The full file object.
+* - source_attributes: An array of HTML attributes for to be added to the
+* source tag.
+*
+* @ingroup themeable
+*/
+#}
+{{ attach_library('seven/classy.file') }}
+<video {{ attributes }}>
+ {% for file in files %}
+ <source {{ file.source_attributes }} />
+ {% endfor %}
+</video>
diff --git a/web/core/themes/seven/templates/classy/field/image.html.twig b/web/core/themes/seven/templates/classy/field/image.html.twig
new file mode 100644
index 0000000000..31f782bb60
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/field/image.html.twig
@@ -0,0 +1,18 @@
+{#
+/**
+ * @file
+ * Theme override of an image.
+ *
+ * Available variables:
+ * - attributes: HTML attributes for the img tag.
+ * - style_name: (optional) The name of the image style applied.
+ *
+ * @see template_preprocess_image()
+ */
+#}
+{%
+set classes = [
+ style_name ? 'image-style-' ~ style_name|clean_class,
+]
+%}
+<img{{ attributes.addClass(classes) }} />
diff --git a/web/core/themes/seven/templates/classy/field/link-formatter-link-separate.html.twig b/web/core/themes/seven/templates/classy/field/link-formatter-link-separate.html.twig
new file mode 100644
index 0000000000..cb94264c66
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/field/link-formatter-link-separate.html.twig
@@ -0,0 +1,22 @@
+{#
+/**
+ * @file
+ * Theme override of a link with separate title and URL elements.
+ *
+ * Available variables:
+ * - link: The link that has already been formatted by l().
+ * - title: (optional) A descriptive or alternate title for the link, which may
+ * be different than the actual link text.
+ *
+ * @see template_preprocess()
+ * @see template_preprocess_link_formatter_link_separate()
+ */
+#}
+{% spaceless %}
+ <div class="link-item">
+ {% if title %}
+ <div class="link-title">{{ title }}</div>
+ {% endif %}
+ <div class="link-url">{{ link }}</div>
+ </div>
+{% endspaceless %}
diff --git a/web/core/themes/seven/templates/classy/field/time.html.twig b/web/core/themes/seven/templates/classy/field/time.html.twig
new file mode 100644
index 0000000000..f2912b7f98
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/field/time.html.twig
@@ -0,0 +1,22 @@
+{#
+/**
+ * @file
+ * Theme override for a date / time element.
+ *
+ * Available variables
+ * - timestamp: (optional) A UNIX timestamp for the datetime attribute. If the
+ * datetime cannot be represented as a UNIX timestamp, use a valid datetime
+ * attribute value in attributes.datetime.
+ * - text: (optional) The content to display within the <time> element.
+ * Defaults to a human-readable representation of the timestamp value or the
+ * datetime attribute value using DateFormatter::format().
+ * - attributes: (optional) HTML attributes to apply to the <time> element.
+ * A datetime attribute in 'attributes' overrides the 'timestamp'. To
+ * create a valid datetime attribute value from a UNIX timestamp, use
+ * DateFormatter::format() with one of the predefined 'html_*' formats.
+ *
+ * @see template_preprocess_time()
+ * @see http://www.w3.org/TR/html5-author/the-time-element.html#attr-time-datetime
+ */
+#}
+<time{{ attributes.addClass('datetime') }}>{{ text }}</time>
diff --git a/web/core/themes/seven/templates/classy/form/datetime-form.html.twig b/web/core/themes/seven/templates/classy/form/datetime-form.html.twig
new file mode 100644
index 0000000000..f56182fdf2
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/form/datetime-form.html.twig
@@ -0,0 +1,15 @@
+{#
+/**
+ * @file
+ * Theme override of a datetime form element.
+ *
+ * Available variables:
+ * - attributes: HTML attributes for the datetime form element.
+ * - content: The datelist form element to be output.
+ *
+ * @see template_preprocess_datetime_form()
+ */
+#}
+<div{{ attributes.addClass('container-inline') }}>
+ {{ content }}
+</div>
diff --git a/web/core/themes/seven/templates/classy/form/datetime-wrapper.html.twig b/web/core/themes/seven/templates/classy/form/datetime-wrapper.html.twig
new file mode 100644
index 0000000000..5b52f2daa3
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/form/datetime-wrapper.html.twig
@@ -0,0 +1,36 @@
+{#
+/**
+ * @file
+ * Theme override of a datetime form wrapper.
+ *
+ * Available variables:
+ * - content: The form element to be output, usually a datelist, or datetime.
+ * - title: The title of the form element.
+ * - title_attributes: HTML attributes for the title wrapper.
+ * - description: Description text for the form element.
+ * - required: An indicator for whether the associated form element is required.
+ *
+ * @see template_preprocess_datetime_wrapper()
+ */
+#}
+{%
+ set title_classes = [
+ 'label',
+ required ? 'js-form-required',
+ required ? 'form-required',
+ ]
+%}
+{% if title %}
+ <h4{{ title_attributes.addClass(title_classes) }}>{{ title }}</h4>
+{% endif %}
+{{ content }}
+{% if errors %}
+ <div class="form-item--error-message">
+ <strong>{{ errors }}</strong>
+ </div>
+{% endif %}
+{% if description %}
+ <div{{ description_attributes.addClass('description') }}>
+ {{ description }}
+ </div>
+{% endif %}
diff --git a/web/core/themes/seven/templates/classy/form/fieldset.html.twig b/web/core/themes/seven/templates/classy/form/fieldset.html.twig
new file mode 100644
index 0000000000..0d089ed381
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/form/fieldset.html.twig
@@ -0,0 +1,60 @@
+{#
+/**
+ * @file
+ * Theme override for a fieldset element and its children.
+ *
+ * Available variables:
+ * - attributes: HTML attributes for the fieldset element.
+ * - errors: (optional) Any errors for this fieldset element, may not be set.
+ * - required: Boolean indicating whether the fieldeset element is required.
+ * - legend: The legend element containing the following properties:
+ * - title: Title of the fieldset, intended for use as the text of the legend.
+ * - attributes: HTML attributes to apply to the legend.
+ * - description: The description element containing the following properties:
+ * - content: The description content of the fieldset.
+ * - attributes: HTML attributes to apply to the description container.
+ * - children: The rendered child elements of the fieldset.
+ * - prefix: The content to add before the fieldset children.
+ * - suffix: The content to add after the fieldset children.
+ *
+ * @see template_preprocess_fieldset()
+ */
+#}
+{%
+ set classes = [
+ 'js-form-item',
+ 'form-item',
+ 'js-form-wrapper',
+ 'form-wrapper',
+ ]
+%}
+<fieldset{{ attributes.addClass(classes) }}>
+ {%
+ set legend_span_classes = [
+ 'fieldset-legend',
+ required ? 'js-form-required',
+ required ? 'form-required',
+ ]
+ %}
+ {# Always wrap fieldset legends in a <span> for CSS positioning. #}
+ <legend{{ legend.attributes }}>
+ <span{{ legend_span.attributes.addClass(legend_span_classes) }}>{{ legend.title }}</span>
+ </legend>
+ <div class="fieldset-wrapper">
+ {% if errors %}
+ <div class="form-item--error-message">
+ <strong>{{ errors }}</strong>
+ </div>
+ {% endif %}
+ {% if prefix %}
+ <span class="field-prefix">{{ prefix }}</span>
+ {% endif %}
+ {{ children }}
+ {% if suffix %}
+ <span class="field-suffix">{{ suffix }}</span>
+ {% endif %}
+ {% if description.content %}
+ <div{{ description.attributes.addClass('description') }}>{{ description.content }}</div>
+ {% endif %}
+ </div>
+</fieldset>
diff --git a/web/core/themes/seven/templates/classy/form/form-element-label.html.twig b/web/core/themes/seven/templates/classy/form/form-element-label.html.twig
new file mode 100644
index 0000000000..7c2f8f2223
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/form/form-element-label.html.twig
@@ -0,0 +1,25 @@
+{#
+/**
+ * @file
+ * Theme override for a form element label.
+ *
+ * Available variables:
+ * - title: The label's text.
+ * - title_display: Elements title_display setting.
+ * - required: An indicator for whether the associated form element is required.
+ * - attributes: A list of HTML attributes for the label.
+ *
+ * @see template_preprocess_form_element_label()
+ */
+#}
+{%
+ set classes = [
+ title_display == 'after' ? 'option',
+ title_display == 'invisible' ? 'visually-hidden',
+ required ? 'js-form-required',
+ required ? 'form-required',
+ ]
+%}
+{% if title is not empty or required -%}
+ <label{{ attributes.addClass(classes) }}>{{ title }}</label>
+{%- endif %}
diff --git a/web/core/themes/seven/templates/classy/form/form-element.html.twig b/web/core/themes/seven/templates/classy/form/form-element.html.twig
new file mode 100644
index 0000000000..3bde4f7115
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/form/form-element.html.twig
@@ -0,0 +1,95 @@
+{#
+/**
+ * @file
+ * Theme override for a form element.
+ *
+ * Available variables:
+ * - attributes: HTML attributes for the containing element.
+ * - errors: (optional) Any errors for this form element, may not be set.
+ * - prefix: (optional) The form element prefix, may not be set.
+ * - suffix: (optional) The form element suffix, may not be set.
+ * - required: The required marker, or empty if the associated form element is
+ * not required.
+ * - type: The type of the element.
+ * - name: The name of the element.
+ * - label: A rendered label element.
+ * - label_display: Label display setting. It can have these values:
+ * - before: The label is output before the element. This is the default.
+ * The label includes the #title and the required marker, if #required.
+ * - after: The label is output after the element. For example, this is used
+ * for radio and checkbox #type elements. If the #title is empty but the
+ * field is #required, the label will contain only the required marker.
+ * - invisible: Labels are critical for screen readers to enable them to
+ * properly navigate through forms but can be visually distracting. This
+ * property hides the label for everyone except screen readers.
+ * - attribute: Set the title attribute on the element to create a tooltip but
+ * output no label element. This is supported only for checkboxes and radios
+ * in \Drupal\Core\Render\Element\CompositeFormElementTrait::preRenderCompositeFormElement().
+ * It is used where a visual label is not needed, such as a table of
+ * checkboxes where the row and column provide the context. The tooltip will
+ * include the title and required marker.
+ * - description: (optional) A list of description properties containing:
+ * - content: A description of the form element, may not be set.
+ * - attributes: (optional) A list of HTML attributes to apply to the
+ * description content wrapper. Will only be set when description is set.
+ * - description_display: Description display setting. It can have these values:
+ * - before: The description is output before the element.
+ * - after: The description is output after the element. This is the default
+ * value.
+ * - invisible: The description is output after the element, hidden visually
+ * but available to screen readers.
+ * - disabled: True if the element is disabled.
+ * - title_display: Title display setting.
+ *
+ * @see template_preprocess_form_element()
+ */
+#}
+{%
+ set classes = [
+ 'js-form-item',
+ 'form-item',
+ 'js-form-type-' ~ type|clean_class,
+ 'form-type-' ~ type|clean_class,
+ 'js-form-item-' ~ name|clean_class,
+ 'form-item-' ~ name|clean_class,
+ title_display not in ['after', 'before'] ? 'form-no-label',
+ disabled == 'disabled' ? 'form-disabled',
+ errors ? 'form-item--error',
+ ]
+%}
+{%
+ set description_classes = [
+ 'description',
+ description_display == 'invisible' ? 'visually-hidden',
+ ]
+%}
+<div{{ attributes.addClass(classes) }}>
+ {% if label_display in ['before', 'invisible'] %}
+ {{ label }}
+ {% endif %}
+ {% if prefix is not empty %}
+ <span class="field-prefix">{{ prefix }}</span>
+ {% endif %}
+ {% if description_display == 'before' and description.content %}
+ <div{{ description.attributes }}>
+ {{ description.content }}
+ </div>
+ {% endif %}
+ {{ children }}
+ {% if suffix is not empty %}
+ <span class="field-suffix">{{ suffix }}</span>
+ {% endif %}
+ {% if label_display == 'after' %}
+ {{ label }}
+ {% endif %}
+ {% if errors %}
+ <div class="form-item--error-message">
+ <strong>{{ errors }}</strong>
+ </div>
+ {% endif %}
+ {% if description_display in ['after', 'invisible'] and description.content %}
+ <div{{ description.attributes.addClass(description_classes) }}>
+ {{ description.content }}
+ </div>
+ {% endif %}
+</div>
diff --git a/web/core/themes/seven/templates/classy/form/radios.html.twig b/web/core/themes/seven/templates/classy/form/radios.html.twig
new file mode 100644
index 0000000000..2e4bafd41c
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/form/radios.html.twig
@@ -0,0 +1,13 @@
+{#
+/**
+ * @file
+ * Theme override for a 'radios' #type form element.
+ *
+ * Available variables
+ * - attributes: A list of HTML attributes for the wrapper element.
+ * - children: The rendered radios.
+ *
+ * @see template_preprocess_radios()
+ */
+#}
+<div{{ attributes.addClass('form-radios') }}>{{ children }}</div>
diff --git a/web/core/themes/seven/templates/classy/form/textarea.html.twig b/web/core/themes/seven/templates/classy/form/textarea.html.twig
new file mode 100644
index 0000000000..99e1bde090
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/form/textarea.html.twig
@@ -0,0 +1,25 @@
+{#
+/**
+ * @file
+ * Theme override for a 'textarea' #type form element.
+ *
+ * Available variables
+ * - wrapper_attributes: A list of HTML attributes for the wrapper element.
+ * - attributes: A list of HTML attributes for the <textarea> element.
+ * - resizable: An indicator for whether the textarea is resizable.
+ * - required: An indicator for whether the textarea is required.
+ * - value: The textarea content.
+ *
+ * @see template_preprocess_textarea()
+ */
+#}
+{%
+ set classes = [
+ 'form-textarea',
+ resizable ? 'resize-' ~ resizable,
+ required ? 'required',
+ ]
+%}
+<div{{ wrapper_attributes.addClass('form-textarea-wrapper') }}>
+ <textarea{{ attributes.addClass(classes) }}>{{ value }}</textarea>
+</div>
diff --git a/web/core/themes/seven/templates/classy/layout/book-export-html.html.twig b/web/core/themes/seven/templates/classy/layout/book-export-html.html.twig
new file mode 100644
index 0000000000..ea33648d38
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/layout/book-export-html.html.twig
@@ -0,0 +1,45 @@
+{#
+/**
+ * @file
+ * Theme override for printed version of book outline.
+ *
+ * Available variables:
+ * - title: Top level node title.
+ * - head: Header tags.
+ * - language: Language object.
+ * - language_rtl: A flag indicating whether the current display language is a
+ * right to left language.
+ * - base_url: URL to the home page.
+ * - contents: Nodes within the current outline rendered through
+ * book-node-export-html.html.twig.
+ *
+ * @see template_preprocess_book_export_html()
+ */
+#}
+<!DOCTYPE html>
+<html{{ html_attributes }}>
+ <head>
+ <title>{{ title }}</title>
+ {{ page.head }}
+ <base href="{{ base_url }}" />
+ <link type="text/css" rel="stylesheet" href="misc/print.css" />
+ </head>
+ <body>
+ {#
+ The given node is embedded to its absolute depth in a top level section.
+ For example, a child node with depth 2 in the hierarchy is contained in
+ (otherwise empty) div elements corresponding to depth 0 and depth 1. This
+ is intended to support WYSIWYG output - e.g., level 3 sections always look
+ like level 3 sections, no matter their depth relative to the node selected
+ to be exported as printer-friendly HTML.
+ #}
+
+ {% for i in 1..depth-1 if depth > 1 %}
+ <div class="section-{{ i }}">
+ {% endfor %}
+ {{ contents }}
+ {% for i in 1..depth-1 if depth > 1 %}
+ </div>
+ {% endfor %}
+ </body>
+</html>
diff --git a/web/core/themes/seven/templates/classy/layout/html.html.twig b/web/core/themes/seven/templates/classy/layout/html.html.twig
new file mode 100644
index 0000000000..4fe57a01cf
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/layout/html.html.twig
@@ -0,0 +1,55 @@
+{#
+/**
+ * @file
+ * Theme override for the basic structure of a single Drupal page.
+ *
+ * Variables:
+ * - logged_in: A flag indicating if user is logged in.
+ * - root_path: The root path of the current page (e.g., node, admin, user).
+ * - node_type: The content type for the current node, if the page is a node.
+ * - head_title: List of text elements that make up the head_title variable.
+ * May contain one or more of the following:
+ * - title: The title of the page.
+ * - name: The name of the site.
+ * - slogan: The slogan of the site.
+ * - page_top: Initial rendered markup. This should be printed before 'page'.
+ * - page: The rendered page markup.
+ * - page_bottom: Closing rendered markup. This variable should be printed after
+ * 'page'.
+ * - db_offline: A flag indicating if the database is offline.
+ * - placeholder_token: The token for generating head, css, js and js-bottom
+ * placeholders.
+ *
+ * @see template_preprocess_html()
+ */
+#}
+{%
+ set body_classes = [
+ logged_in ? 'user-logged-in',
+ not root_path ? 'path-frontpage' : 'path-' ~ root_path|clean_class,
+ node_type ? 'page-node-type-' ~ node_type|clean_class,
+ db_offline ? 'db-offline',
+ ]
+%}
+<!DOCTYPE html>
+<html{{ html_attributes }}>
+ <head>
+ <head-placeholder token="{{ placeholder_token }}">
+ <title>{{ head_title|safe_join(' | ') }}</title>
+ <css-placeholder token="{{ placeholder_token }}">
+ <js-placeholder token="{{ placeholder_token }}">
+ </head>
+ <body{{ attributes.addClass(body_classes) }}>
+ {#
+ Keyboard navigation/accessibility link to main content section in
+ page.html.twig.
+ #}
+ <a href="#main-content" class="visually-hidden focusable skip-link">
+ {{ 'Skip to main content'|t }}
+ </a>
+ {{ page_top }}
+ {{ page }}
+ {{ page_bottom }}
+ <js-bottom-placeholder token="{{ placeholder_token }}">
+ </body>
+</html>
diff --git a/web/core/themes/seven/templates/classy/layout/region.html.twig b/web/core/themes/seven/templates/classy/layout/region.html.twig
new file mode 100644
index 0000000000..95e71cec37
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/layout/region.html.twig
@@ -0,0 +1,25 @@
+{#
+/**
+ * @file
+ * Theme override to display a region.
+ *
+ * Available variables:
+ * - content: The content for this region, typically blocks.
+ * - attributes: HTML attributes for the region <div>.
+ * - region: The name of the region variable as defined in the theme's
+ * .info.yml file.
+ *
+ * @see template_preprocess_region()
+ */
+#}
+{%
+ set classes = [
+ 'region',
+ 'region-' ~ region|clean_class,
+ ]
+%}
+{% if content %}
+ <div{{ attributes.addClass(classes) }}>
+ {{ content }}
+ </div>
+{% endif %}
diff --git a/web/core/themes/seven/templates/classy/media-library/container--media-library-content.html.twig b/web/core/themes/seven/templates/classy/media-library/container--media-library-content.html.twig
new file mode 100644
index 0000000000..7c930e2c7b
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/media-library/container--media-library-content.html.twig
@@ -0,0 +1,28 @@
+{#
+/**
+ * @file
+ * Theme implementation the content area of the modal media library dialog.
+ *
+ * The content area is everything that is not the menu of available media
+ * types. This includes the form to add new media items, if available, and
+ * the view of available media to select.
+ *
+ * Available variables:
+ * - attributes: HTML attributes for the containing element.
+ * - children: The rendered child elements of the container.
+ * - has_parent: A flag to indicate that the container has one or more parent
+ containers.
+ *
+ * @see template_preprocess_container()
+ *
+ * @ingroup themeable
+ */
+#}
+{%
+ set classes = [
+ has_parent ? 'js-form-wrapper',
+ has_parent ? 'form-wrapper',
+ 'media-library-content',
+ ]
+%}
+<div{{ attributes.addClass(classes) }}>{{ children }}</div>
diff --git a/web/core/themes/seven/templates/classy/media-library/container--media-library-widget-selection.html.twig b/web/core/themes/seven/templates/classy/media-library/container--media-library-widget-selection.html.twig
new file mode 100644
index 0000000000..7c0af44307
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/media-library/container--media-library-widget-selection.html.twig
@@ -0,0 +1,28 @@
+{#
+/**
+ * @file
+ * Theme implementation of a wrapper for selected media items.
+ *
+ * This is used to wrap around the set of media items that are currently
+ * selected in the media library widget (not the modal dialog), which may
+ * be used for entity reference fields that target media.
+ *
+ * Available variables:
+ * - attributes: HTML attributes for the containing element.
+ * - children: The rendered child elements of the container.
+ * - has_parent: A flag to indicate that the container has one or more parent
+ containers.
+ *
+ * @see template_preprocess_container()
+ *
+ * @ingroup themeable
+ */
+#}
+{%
+ set classes = [
+ has_parent ? 'js-form-wrapper',
+ has_parent ? 'form-wrapper',
+ 'media-library-selection',
+ ]
+%}
+<div{{ attributes.addClass(classes) }}>{{ children }}</div>
diff --git a/web/core/themes/seven/templates/classy/media-library/links--media-library-menu.html.twig b/web/core/themes/seven/templates/classy/media-library/links--media-library-menu.html.twig
new file mode 100644
index 0000000000..b2361574a8
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/media-library/links--media-library-menu.html.twig
@@ -0,0 +1,36 @@
+{% extends "links.html.twig" %}
+{#
+/**
+ * @file
+ * Theme implementation of the media type menu in the media library dialog.
+ *
+ * Available variables:
+ * - attributes: Attributes for the UL containing the list of links.
+ * - links: Links to be output.
+ * Each link will have the following elements:
+ * - link: (optional) A render array that returns a link. See
+ * template_preprocess_links() for details how it is generated.
+ * - text: The link text.
+ * - attributes: HTML attributes for the list item element.
+ * - text_attributes: (optional) HTML attributes for the span element if no
+ * 'url' was supplied.
+ * - heading: (optional) A heading to precede the links.
+ * - text: The heading text.
+ * - level: The heading level (e.g. 'h2', 'h3').
+ * - attributes: (optional) A keyed list of attributes for the heading.
+ * If the heading is a string, it will be used as the text of the heading and
+ * the level will default to 'h2'.
+ *
+ * Headings should be used on navigation menus and any list of links that
+ * consistently appears on multiple pages. To make the heading invisible use
+ * the 'visually-hidden' CSS class. Do not use 'display:none', which
+ * removes it from screen readers and assistive technology. Headings allow
+ * screen reader and keyboard only users to navigate to or skip the links.
+ * See http://juicystudio.com/article/screen-readers-display-none.php and
+ * http://www.w3.org/TR/WCAG-TECHS/H42.html for more information.
+ *
+ * @see classy_preprocess_links__media_library_menu()
+ * @see template_preprocess_links()
+ */
+#}
+{% set attributes = attributes.addClass('media-library-menu') %}
diff --git a/web/core/themes/seven/templates/classy/media-library/media--media-library.html.twig b/web/core/themes/seven/templates/classy/media-library/media--media-library.html.twig
new file mode 100644
index 0000000000..e88635424f
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/media-library/media--media-library.html.twig
@@ -0,0 +1,55 @@
+{#
+/**
+ * @file
+ * Theme override of a media item in the media library.
+ *
+ * This is used for media that the user can select from the grid of media
+ * items. It is not used for items that have already been selected in the
+ * corresponding field widget, or for items that have been previously selected
+ * before adding new media to the library.
+ *
+ * Available variables:
+ * - media: The entity with limited access to object properties and methods.
+ * Only method names starting with "get", "has", or "is" and a few common
+ * methods such as "id", "label", and "bundle" are available. For example:
+ * - entity.getEntityTypeId() will return the entity type ID.
+ * - entity.hasField('field_example') returns TRUE if the entity includes
+ * field_example. (This does not indicate the presence of a value in this
+ * field.)
+ * Calling other methods, such as entity.delete(), will result in an exception.
+ * See \Drupal\Core\Entity\EntityInterface for a full list of methods.
+ * - name: Name of the media.
+ * - content: Media content.
+ * - title_prefix: Additional output populated by modules, intended to be
+ * displayed in front of the main title tag that appears in the template.
+ * - title_suffix: Additional output populated by modules, intended to be
+ * displayed after the main title tag that appears in the template.
+ * - view_mode: View mode; for example, "teaser" or "full".
+ * - attributes: HTML attributes for the containing element.
+ * - title_attributes: Same as attributes, except applied to the main title
+ * tag that appears in the template.
+ * - url: Direct URL of the media.
+ * - preview_attributes: HTML attributes for the preview wrapper.
+ * - metadata_attributes: HTML attributes for the expandable metadata area.
+ * - status: Whether or not the Media is published.
+ *
+ * @see template_preprocess_media()
+ *
+ * @ingroup themeable
+ */
+#}
+<article{{ attributes }}>
+ {% if content %}
+ <div{{ preview_attributes.addClass('media-library-item__preview js-media-library-item-preview') }}>
+ {{ content|without('name') }}
+ </div>
+ {% if not status %}
+ <div class="media-library-item__status">{{ "unpublished" | t }}</div>
+ {% endif %}
+ <div{{ metadata_attributes.addClass('media-library-item__attributes') }}>
+ <div class="media-library-item__name">
+ {{ name }}
+ </div>
+ </div>
+ {% endif %}
+</article>
diff --git a/web/core/themes/seven/templates/classy/media-library/media-library-item--small.html.twig b/web/core/themes/seven/templates/classy/media-library/media-library-item--small.html.twig
new file mode 100644
index 0000000000..ba03858b7f
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/media-library/media-library-item--small.html.twig
@@ -0,0 +1,31 @@
+{#
+/**
+ * @file
+ * Default theme implementation of a media library item.
+ *
+ * This is used when displaying selected media items, either in the field
+ * widget or in the "Additional selected media" area when adding new
+ * media items in the media library modal dialog.
+ *
+ * Available variables:
+ * - attributes: HTML attributes for the containing element.
+ * - content: The content of the media library item, plus any additional
+ * fields or elements surrounding it.
+ *
+ * @see seven_preprocess_media_library_item__small()
+ * @see seven_preprocess_media_library_item__widget()
+ * @see template_preprocess_media_library_item()
+ *
+ * @ingroup themeable
+ */
+#}
+{%
+ set classes = [
+ 'media-library-item',
+ 'media-library-item--grid',
+ 'media-library-item--small',
+ ]
+%}
+<div{{ attributes.addClass(classes) }}>
+ {{ content }}
+</div>
diff --git a/web/core/themes/seven/templates/classy/media-library/media-library-item.html.twig b/web/core/themes/seven/templates/classy/media-library/media-library-item.html.twig
new file mode 100644
index 0000000000..297780e0f7
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/media-library/media-library-item.html.twig
@@ -0,0 +1,28 @@
+{#
+/**
+ * @file
+ * Default theme implementation of a media library item.
+ *
+ * This is used when displaying selected media items, either in the field
+ * widget or in the "Additional selected media" area when adding new
+ * media items in the media library modal dialog.
+ *
+ * Available variables:
+ * - attributes: HTML attributes for the containing element.
+ * - content: The content of the media library item, plus any additional
+ * fields or elements surrounding it.
+ *
+ * @see template_preprocess_media_library_item()
+ *
+ * @ingroup themeable
+ */
+#}
+{%
+ set classes = [
+ 'media-library-item',
+ 'media-library-item--grid',
+ ]
+%}
+<div{{ attributes.addClass(classes) }}>
+ {{ content }}
+</div>
diff --git a/web/core/themes/seven/templates/classy/media-library/media-library-wrapper.html.twig b/web/core/themes/seven/templates/classy/media-library/media-library-wrapper.html.twig
new file mode 100644
index 0000000000..850f63aa17
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/media-library/media-library-wrapper.html.twig
@@ -0,0 +1,21 @@
+{#
+/**
+ * @file
+ * Theme override of a container used to wrap the media library's modal dialog
+ * interface.
+ *
+ * Available variables:
+ * - attributes: HTML attributes for the containing element.
+ * - menu: The menu of availble media types to choose from.
+ * - content: The form to add new media items, followed by the grid or table of
+ * existing media items to choose from.
+ *
+ * @see template_preprocess_media_library_wrapper()
+ *
+ * @ingroup themeable
+ */
+#}
+<div{{ attributes.addClass('media-library-wrapper') }}>
+ {{ menu }}
+ {{ content }}
+</div>
diff --git a/web/core/themes/seven/templates/classy/misc/help-section.html.twig b/web/core/themes/seven/templates/classy/misc/help-section.html.twig
new file mode 100644
index 0000000000..6cfaa38da2
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/misc/help-section.html.twig
@@ -0,0 +1,48 @@
+{#
+/**
+ * @file
+ * Theme override for a section of the help page.
+ *
+ * This implementation divides the links into 4 columns.
+ *
+ * Available variables:
+ * - title: The section title.
+ * - description: The description text for the section.
+ * - links: Links to display in the section.
+ * - empty: Text to display if there are no links.
+ */
+#}
+<div class="clearfix">
+ <h2>{{ title }}</h2>
+ <p>{{ description }}</p>
+ {% if links %}
+ {# Calculate the column length, to divide links into 4 columns. #}
+ {% set size = links|length // 4 %}
+ {% if size * 4 < links|length %}
+ {% set size = size + 1 %}
+ {% endif %}
+
+ {# Output the links in 4 columns. #}
+ {% set count = 0 %}
+ {% for link in links %}
+ {% if count == 0 %}
+ {# Start a new column. #}
+ <div class="layout-column layout-column--quarter"><ul>
+ {% endif %}
+ <li>{{ link }}</li>
+ {% set count = count + 1 %}
+ {% if count >= size %}
+ {# End the current column. #}
+ {% set count = 0 %}
+ </ul></div>
+ {% endif %}
+ {% endfor %}
+
+ {# End the last column, if one is open. #}
+ {% if count > 0 %}
+ </ul></div>
+ {% endif %}
+ {% else %}
+ <p>{{ empty }}</p>
+ {% endif %}
+</div>
diff --git a/web/core/themes/seven/templates/classy/misc/progress-bar.html.twig b/web/core/themes/seven/templates/classy/misc/progress-bar.html.twig
new file mode 100644
index 0000000000..5c25bd7d3f
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/misc/progress-bar.html.twig
@@ -0,0 +1,22 @@
+{#
+/**
+ * @file
+ * Theme override for a progress bar.
+ *
+ * Note that the core Batch API uses this only for non-JavaScript batch jobs.
+ *
+ * Available variables:
+ * - label: The label of the working task.
+ * - percent: The percentage of the progress.
+ * - message: A string containing information to be displayed.
+ */
+#}
+{{ attach_library('seven/classy.progress') }}
+<div class="progress" data-drupal-progress>
+ {% if label %}
+ <div class="progress__label">{{ label }}</div>
+ {% endif %}
+ <div class="progress__track"><div class="progress__bar" style="width: {{ percent }}%"></div></div>
+ <div class="progress__percentage">{{ percent }}%</div>
+ <div class="progress__description">{{ message }}</div>
+</div>
diff --git a/web/core/themes/seven/templates/classy/misc/rdf-metadata.html.twig b/web/core/themes/seven/templates/classy/misc/rdf-metadata.html.twig
new file mode 100644
index 0000000000..acc62df16d
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/misc/rdf-metadata.html.twig
@@ -0,0 +1,20 @@
+{#
+/**
+ * @file
+ * Theme override for empty spans with RDF attributes.
+ *
+ * The XHTML+RDFa doctype allows either <span></span> or <span /> syntax to
+ * be used, but for maximum browser compatibility, W3C recommends the
+ * former when serving pages using the text/html media type, see
+ * http://www.w3.org/TR/xhtml1/#C_3.
+ *
+ * Available variables:
+ * - metadata: Each item within corresponds to its own set of attributes,
+ * and therefore, needs its own 'attributes' element.
+ *
+ * @see template_preprocess_rdf_metadata()
+ */
+#}
+{% for attributes in metadata %}
+ <span{{ attributes.addClass('rdf-meta', 'hidden') }}></span>
+{% endfor %}
diff --git a/web/core/themes/seven/templates/classy/misc/status-messages.html.twig b/web/core/themes/seven/templates/classy/misc/status-messages.html.twig
new file mode 100644
index 0000000000..7dda6c040c
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/misc/status-messages.html.twig
@@ -0,0 +1,55 @@
+{#
+/**
+ * @file
+ * Theme override for status messages.
+ *
+ * Displays status, error, and warning messages, grouped by type.
+ *
+ * An invisible heading identifies the messages for assistive technology.
+ * Sighted users see a colored box. See http://www.w3.org/TR/WCAG-TECHS/H69.html
+ * for info.
+ *
+ * Add an ARIA label to the contentinfo area so that assistive technology
+ * user agents will better describe this landmark.
+ *
+ * Available variables:
+ * - message_list: List of messages to be displayed, grouped by type.
+ * - status_headings: List of all status types.
+ * - attributes: HTML attributes for the element, including:
+ * - class: HTML classes.
+ */
+#}
+<div data-drupal-messages>
+{% block messages %}
+{% for type, messages in message_list %}
+ {%
+ set classes = [
+ 'messages',
+ 'messages--' ~ type,
+ ]
+ %}
+ <div role="contentinfo" aria-label="{{ status_headings[type] }}"{{ attributes.addClass(classes)|without('role', 'aria-label') }}>
+ {% if type == 'error' %}
+ <div role="alert">
+ {% endif %}
+ {% if status_headings[type] %}
+ <h2 class="visually-hidden">{{ status_headings[type] }}</h2>
+ {% endif %}
+ {% if messages|length > 1 %}
+ <ul class="messages__list">
+ {% for message in messages %}
+ <li class="messages__item">{{ message }}</li>
+ {% endfor %}
+ </ul>
+ {% else %}
+ {{ messages|first }}
+ {% endif %}
+ {% if type == 'error' %}
+ </div>
+ {% endif %}
+ </div>
+ {# Remove type specific classes. #}
+ {% set attributes = attributes.removeClass(classes) %}
+{% endfor %}
+{% endblock messages %}
+</div>
diff --git a/web/core/themes/seven/templates/classy/navigation/book-all-books-block.html.twig b/web/core/themes/seven/templates/classy/navigation/book-all-books-block.html.twig
new file mode 100644
index 0000000000..b4cb64de3d
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/navigation/book-all-books-block.html.twig
@@ -0,0 +1,22 @@
+{#
+/**
+ * @file
+ * Theme override for rendering book outlines within a block.
+ *
+ * This template is used only when the block is configured to "show block on all
+ * pages", which presents multiple independent books on all pages.
+ *
+ * Available variables:
+ * - book_menus: Book outlines.
+ * - id: The parent book ID.
+ * - title: The parent book title.
+ * - menu: The top-level book links.
+ *
+ * @see template_preprocess_book_all_books_block()
+ */
+#}
+{% for book in book_menus %}
+ <nav id="book-block-menu-{{ book.id }}" class="book-block-menu" role="navigation" aria-label="{% trans %}Book outline for {{ book.title }}{% endtrans %}">
+ {{ book.menu }}
+ </nav>
+{% endfor %}
diff --git a/web/core/themes/seven/templates/classy/navigation/book-navigation.html.twig b/web/core/themes/seven/templates/classy/navigation/book-navigation.html.twig
new file mode 100644
index 0000000000..eac98b4002
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/navigation/book-navigation.html.twig
@@ -0,0 +1,56 @@
+{#
+/**
+ * @file
+ * Theme override to navigate books.
+ *
+ * Presented under nodes that are a part of book outlines.
+ *
+ * Available variables:
+ * - tree: The immediate children of the current node rendered as an unordered
+ * list.
+ * - current_depth: Depth of the current node within the book outline. Provided
+ * for context.
+ * - prev_url: URL to the previous node.
+ * - prev_title: Title of the previous node.
+ * - parent_url: URL to the parent node.
+ * - parent_title: Title of the parent node. Not printed by default. Provided
+ * as an option.
+ * - next_url: URL to the next node.
+ * - next_title: Title of the next node.
+ * - has_links: Flags TRUE whenever the previous, parent or next data has a
+ * value.
+ * - book_id: The book ID of the current outline being viewed. Same as the node
+ * ID containing the entire outline. Provided for context.
+ * - book_url: The book/node URL of the current outline being viewed. Provided
+ * as an option. Not used by default.
+ * - book_title: The book/node title of the current outline being viewed.
+ *
+ * @see template_preprocess_book_navigation()
+ */
+#}
+{{ attach_library('seven/classy.book-navigation') }}
+{% if tree or has_links %}
+ <nav id="book-navigation-{{ book_id }}" class="book-navigation" role="navigation" aria-labelledby="book-label-{{ book_id }}">
+ {{ tree }}
+ {% if has_links %}
+ <h2 class="visually-hidden" id="book-label-{{ book_id }}">{{ 'Book traversal links for'|t }} {{ book_title }}</h2>
+ <ul class="book-pager">
+ {% if prev_url %}
+ <li class="book-pager__item book-pager__item--previous">
+ <a href="{{ prev_url }}" rel="prev" title="{{ 'Go to previous page'|t }}"><b>{{ '‹'|t }}</b> {{ prev_title }}</a>
+ </li>
+ {% endif %}
+ {% if parent_url %}
+ <li class="book-pager__item book-pager__item--center">
+ <a href="{{ parent_url }}" title="{{ 'Go to parent page'|t }}">{{ 'Up'|t }}</a>
+ </li>
+ {% endif %}
+ {% if next_url %}
+ <li class="book-pager__item book-pager__item--next">
+ <a href="{{ next_url }}" rel="next" title="{{ 'Go to next page'|t }}">{{ next_title }} <b>{{ '›'|t }}</b></a>
+ </li>
+ {% endif %}
+ </ul>
+ {% endif %}
+ </nav>
+{% endif %}
diff --git a/web/core/themes/seven/templates/classy/navigation/book-tree.html.twig b/web/core/themes/seven/templates/classy/navigation/book-tree.html.twig
new file mode 100644
index 0000000000..94fac5598b
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/navigation/book-tree.html.twig
@@ -0,0 +1,55 @@
+{#
+/**
+ * @file
+ * Theme override to display a book tree.
+ *
+ * Returns HTML for a wrapper for a book sub-tree.
+ *
+ * Available variables:
+ * - items: A nested list of book items. Each book item contains:
+ * - attributes: HTML attributes for the book item.
+ * - below: The book item child items.
+ * - title: The book link title.
+ * - url: The book link URL, instance of \Drupal\Core\Url.
+ * - is_expanded: TRUE if the link has visible children within the current
+ * book tree.
+ * - is_collapsed: TRUE if the link has children within the current book tree
+ * that are not currently visible.
+ * - in_active_trail: TRUE if the link is in the active trail.
+ */
+#}
+{% import _self as book_tree %}
+
+{#
+ We call a macro which calls itself to render the full tree.
+ @see https://twig.symfony.com/doc/1.x/tags/macro.html
+#}
+{{ book_tree.book_links(items, attributes, 0) }}
+
+{% macro book_links(items, attributes, menu_level) %}
+ {% import _self as book_tree %}
+ {% if items %}
+ {% if menu_level == 0 %}
+ <ul{{ attributes.addClass('menu') }}>
+ {% else %}
+ <ul class="menu">
+ {% endif %}
+ {% for item in items %}
+ {%
+ set classes = [
+ 'menu-item',
+ item.is_expanded ? 'menu-item--expanded',
+ item.is_collapsed ? 'menu-item--collapsed',
+ item.in_active_trail ? 'menu-item--active-trail',
+ ]
+ %}
+ <li{{ item.attributes.addClass(classes) }}>
+ {{ link(item.title, item.url) }}
+ {% if item.below %}
+ {{ book_tree.book_links(item.below, attributes, menu_level + 1) }}
+ {% endif %}
+ </li>
+ {% endfor %}
+ </ul>
+ {% endif %}
+{% endmacro %}
diff --git a/web/core/themes/seven/templates/classy/navigation/breadcrumb.html.twig b/web/core/themes/seven/templates/classy/navigation/breadcrumb.html.twig
new file mode 100644
index 0000000000..7dc08c5207
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/navigation/breadcrumb.html.twig
@@ -0,0 +1,25 @@
+{#
+/**
+ * @file
+ * Theme override for a breadcrumb trail.
+ *
+ * Available variables:
+ * - breadcrumb: Breadcrumb trail items.
+ */
+#}
+{% if breadcrumb %}
+ <nav class="breadcrumb" role="navigation" aria-labelledby="system-breadcrumb">
+ <h2 id="system-breadcrumb" class="visually-hidden">{{ 'Breadcrumb'|t }}</h2>
+ <ol>
+ {% for item in breadcrumb %}
+ <li>
+ {% if item.url %}
+ <a href="{{ item.url }}">{{ item.text }}</a>
+ {% else %}
+ {{ item.text }}
+ {% endif %}
+ </li>
+ {% endfor %}
+ </ol>
+ </nav>
+{% endif %}
diff --git a/web/core/themes/seven/templates/classy/navigation/menu-local-task.html.twig b/web/core/themes/seven/templates/classy/navigation/menu-local-task.html.twig
new file mode 100644
index 0000000000..b8559815b9
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/navigation/menu-local-task.html.twig
@@ -0,0 +1,17 @@
+{#
+/**
+ * @file
+ * Theme override for a local task link.
+ *
+ * Available variables:
+ * - attributes: HTML attributes for the wrapper element.
+ * - is_active: Whether the task item is an active tab.
+ * - link: A rendered link element.
+ *
+ * Note: This template renders the content for each task item in
+ * menu-local-tasks.html.twig.
+ *
+ * @see template_preprocess_menu_local_task()
+ */
+#}
+<li{{ attributes.addClass(is_active ? 'is-active') }}>{{ link }}</li>
diff --git a/web/core/themes/seven/templates/classy/navigation/menu.html.twig b/web/core/themes/seven/templates/classy/navigation/menu.html.twig
new file mode 100644
index 0000000000..b437f8760e
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/navigation/menu.html.twig
@@ -0,0 +1,55 @@
+{#
+/**
+ * @file
+ * Theme override to display a menu.
+ *
+ * Available variables:
+ * - menu_name: The machine name of the menu.
+ * - items: A nested list of menu items. Each menu item contains:
+ * - attributes: HTML attributes for the menu item.
+ * - below: The menu item child items.
+ * - title: The menu link title.
+ * - url: The menu link url, instance of \Drupal\Core\Url
+ * - localized_options: Menu link localized options.
+ * - is_expanded: TRUE if the link has visible children within the current
+ * menu tree.
+ * - is_collapsed: TRUE if the link has children within the current menu tree
+ * that are not currently visible.
+ * - in_active_trail: TRUE if the link is in the active trail.
+ */
+#}
+{% import _self as menus %}
+
+{#
+ We call a macro which calls itself to render the full tree.
+ @see https://twig.symfony.com/doc/1.x/tags/macro.html
+#}
+{{ menus.menu_links(items, attributes, 0) }}
+
+{% macro menu_links(items, attributes, menu_level) %}
+ {% import _self as menus %}
+ {% if items %}
+ {% if menu_level == 0 %}
+ <ul{{ attributes.addClass('menu') }}>
+ {% else %}
+ <ul class="menu">
+ {% endif %}
+ {% for item in items %}
+ {%
+ set classes = [
+ 'menu-item',
+ item.is_expanded ? 'menu-item--expanded',
+ item.is_collapsed ? 'menu-item--collapsed',
+ item.in_active_trail ? 'menu-item--active-trail',
+ ]
+ %}
+ <li{{ item.attributes.addClass(classes) }}>
+ {{ link(item.title, item.url) }}
+ {% if item.below %}
+ {{ menus.menu_links(item.below, attributes, menu_level + 1) }}
+ {% endif %}
+ </li>
+ {% endfor %}
+ </ul>
+ {% endif %}
+{% endmacro %}
diff --git a/web/core/themes/seven/templates/classy/navigation/toolbar.html.twig b/web/core/themes/seven/templates/classy/navigation/toolbar.html.twig
new file mode 100644
index 0000000000..20f12d48b2
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/navigation/toolbar.html.twig
@@ -0,0 +1,46 @@
+{#
+/**
+ * @file
+ * Theme override for the administrative toolbar.
+ *
+ * Available variables:
+ * - attributes: HTML attributes for the wrapper.
+ * - toolbar_attributes: HTML attributes to apply to the toolbar.
+ * - toolbar_heading: The heading or label for the toolbar.
+ * - tabs: List of tabs for the toolbar.
+ * - attributes: HTML attributes for the tab container.
+ * - link: Link or button for the menu tab.
+ * - trays: Toolbar tray list, each associated with a tab. Each tray in trays
+ * contains:
+ * - attributes: HTML attributes to apply to the tray.
+ * - label: The tray's label.
+ * - links: The tray menu links.
+ * - remainder: Any non-tray, non-tab elements left to be rendered.
+ *
+ * @see template_preprocess_toolbar()
+ */
+#}
+<div{{ attributes.addClass('toolbar') }}>
+ <nav{{ toolbar_attributes.addClass('toolbar-bar', 'clearfix') }}>
+ <h2 class="visually-hidden">{{ toolbar_heading }}</h2>
+ {% for key, tab in tabs %}
+ {% set tray = trays[key] %}
+ <div{{ tab.attributes.addClass('toolbar-tab') }}>
+ {{ tab.link }}
+ {% spaceless %}
+ <div{{ tray.attributes }}>
+ {% if tray.label %}
+ <nav class="toolbar-lining clearfix" role="navigation" aria-label="{{ tray.label }}">
+ <h3 class="toolbar-tray-name visually-hidden">{{ tray.label }}</h3>
+ {% else %}
+ <nav class="toolbar-lining clearfix" role="navigation">
+ {% endif %}
+ {{ tray.links }}
+ </nav>
+ </div>
+ {% endspaceless %}
+ </div>
+ {% endfor %}
+ </nav>
+ {{ remainder }}
+</div>
diff --git a/web/core/themes/seven/templates/classy/user/forum-submitted.html.twig b/web/core/themes/seven/templates/classy/user/forum-submitted.html.twig
new file mode 100644
index 0000000000..57311e96b5
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/user/forum-submitted.html.twig
@@ -0,0 +1,21 @@
+{#
+/**
+ * @file
+ * Theme override for a forum post submission string.
+ *
+ * The submission string indicates when and by whom a topic was submitted.
+ *
+ * Available variables:
+ * - author: The author of the post.
+ * - time: How long ago the post was created.
+ * - topic: An object with the raw data of the post. Potentially unsafe. Be
+ * sure to clean this data before printing.
+ *
+ * @see template_preprocess_forum_submitted()
+ */
+#}
+{% if time %}
+ <span class="submitted">{% trans %}By {{ author }} {{ time }} ago{% endtrans %}</span>
+{% else %}
+ {{ 'n/a'|t }}
+{% endif %}
diff --git a/web/core/themes/seven/templates/classy/user/user.html.twig b/web/core/themes/seven/templates/classy/user/user.html.twig
new file mode 100644
index 0000000000..9a824effd3
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/user/user.html.twig
@@ -0,0 +1,23 @@
+{#
+/**
+ * @file
+ * Theme override to present all user data.
+ *
+ * This template is used when viewing a registered user's page,
+ * e.g., example.com/user/123. 123 being the user's ID.
+ *
+ * Available variables:
+ * - content: A list of content items. Use 'content' to print all content, or
+ * print a subset such as 'content.field_example'. Fields attached to a user
+ * such as 'user_picture' are available as 'content.user_picture'.
+ * - attributes: HTML attributes for the container element.
+ * - user: A Drupal User entity.
+ *
+ * @see template_preprocess_user()
+ */
+#}
+<article{{ attributes.addClass('profile') }}>
+ {% if content %}
+ {{- content -}}
+ {% endif %}
+</article>
diff --git a/web/core/themes/seven/templates/classy/user/username.html.twig b/web/core/themes/seven/templates/classy/user/username.html.twig
new file mode 100644
index 0000000000..df694dff69
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/user/username.html.twig
@@ -0,0 +1,29 @@
+{#
+/**
+ * @file
+ * Theme override for displaying a username.
+ *
+ * Available variables:
+ * - account: The full account information for the user.
+ * - uid: The user ID, or zero if not a user. As used in anonymous comments.
+ * - name: The user's name, sanitized, and optionally truncated.
+ * - name_raw: The user's name, un-truncated.
+ * - truncated: Whether the user's name was truncated.
+ * - extra: Additional text to append to the user's name, sanitized.
+ * - profile_access: Whether the current user has permission to access this
+ users profile page.
+ * - link_path: The path or URL of the user's profile page, home page,
+ * or other desired page to link to for more information about the user.
+ * - homepage: (optional) The home page of the account, only set for non users.
+ * - link_options: Options to set on the \Drupal\Core\Url object if linking the
+ * user's name to the user's page.
+ * - attributes: HTML attributes for the containing element.
+ *
+ * @see template_preprocess_username()
+ */
+#}
+{% if link_path -%}
+ <a{{ attributes.addClass('username') }}>{{ name }}{{ extra }}</a>
+{%- else -%}
+ <span{{ attributes }}>{{ name }}{{ extra }}</span>
+{%- endif -%}
diff --git a/web/core/themes/seven/templates/classy/views/views-exposed-form.html.twig b/web/core/themes/seven/templates/classy/views/views-exposed-form.html.twig
new file mode 100644
index 0000000000..3c679ae583
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/views/views-exposed-form.html.twig
@@ -0,0 +1,21 @@
+{#
+/**
+ * @file
+ * Theme override for a views exposed form.
+ *
+ * Available variables:
+ * - form: A render element representing the form.
+ *
+ * @see template_preprocess_views_exposed_form()
+ */
+#}
+{% if q is not empty %}
+ {#
+ This ensures that, if clean URLs are off, the 'q' is added first,
+ as a hidden form element, so that it shows up first in the POST URL.
+ #}
+{{ q }}
+{% endif %}
+<div class="form--inline clearfix">
+ {{ form }}
+</div>
diff --git a/web/core/themes/seven/templates/classy/views/views-mini-pager.html.twig b/web/core/themes/seven/templates/classy/views/views-mini-pager.html.twig
new file mode 100644
index 0000000000..4b46f2bb1f
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/views/views-mini-pager.html.twig
@@ -0,0 +1,42 @@
+{#
+/**
+ * @file
+ * Theme override for a views mini-pager.
+ *
+ * Available variables:
+ * - heading_id: Pagination heading ID.
+ * - items: List of pager items.
+ *
+ * @see template_preprocess_views_mini_pager()
+ */
+#}
+{% if items.previous or items.next %}
+ <nav class="pager" role="navigation" aria-labelledby="{{ heading_id }}">
+ <h4 id="{{ heading_id }}" class="pager__heading visually-hidden">{{ 'Pagination'|t }}</h4>
+ <ul class="pager__items js-pager__items">
+ {% if items.previous %}
+ <li class="pager__item pager__item--previous">
+ <a href="{{ items.previous.href }}" title="{{ 'Go to previous page'|t }}" rel="prev"{{ items.previous.attributes|without('href', 'title', 'rel') }}>
+ <span class="visually-hidden">{{ 'Previous page'|t }}</span>
+ <span aria-hidden="true">{{ items.previous.text|default('‹‹'|t) }}</span>
+ </a>
+ </li>
+ {% endif %}
+ {% if items.current %}
+ <li class="pager__item is-active">
+ {% trans %}
+ Page {{ items.current }}
+ {% endtrans %}
+ </li>
+ {% endif %}
+ {% if items.next %}
+ <li class="pager__item pager__item--next">
+ <a href="{{ items.next.href }}" title="{{ 'Go to next page'|t }}" rel="next"{{ items.next.attributes|without('href', 'title', 'rel') }}>
+ <span class="visually-hidden">{{ 'Next page'|t }}</span>
+ <span aria-hidden="true">{{ items.next.text|default('››'|t) }}</span>
+ </a>
+ </li>
+ {% endif %}
+ </ul>
+ </nav>
+{% endif %}
diff --git a/web/core/themes/seven/templates/classy/views/views-view-grouping.html.twig b/web/core/themes/seven/templates/classy/views/views-view-grouping.html.twig
new file mode 100644
index 0000000000..44905e56b7
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/views/views-view-grouping.html.twig
@@ -0,0 +1,20 @@
+{#
+/**
+ * @file
+ * Theme override to display a single views grouping.
+ *
+ * Available variables:
+ * - view: The view object.
+ * - grouping: The grouping instruction.
+ * - grouping_level: A number indicating the hierarchical level of the grouping.
+ * - title: The group heading.
+ * - content: The content to be grouped.
+ * - rows: The rows returned from the view.
+ *
+ * @see template_preprocess_views_view_grouping()
+ */
+#}
+<div class="view-grouping">
+ <div class="view-grouping-header">{{ title }}</div>
+ <div class="view-grouping-content">{{ content }}</div>
+</div>
diff --git a/web/core/themes/seven/templates/classy/views/views-view-row-rss.html.twig b/web/core/themes/seven/templates/classy/views/views-view-row-rss.html.twig
new file mode 100644
index 0000000000..aee08aee6e
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/views/views-view-row-rss.html.twig
@@ -0,0 +1,30 @@
+{#
+/**
+ * @file
+ * Theme override to display an item in a views RSS feed.
+ *
+ * Available variables:
+ * - title: RSS item title.
+ * - link: RSS item link.
+ * - description: RSS body text.
+ * - item_elements: RSS item elements to be rendered as XML (pubDate, creator,
+ * guid).
+ *
+ * @see template_preprocess_views_view_row_rss()
+ *
+ * @ingroup themeable
+ */
+#}
+<item>
+ <title>{{ title }}</title>
+ <link>{{ link }}</link>
+ <description>{{ description }}</description>
+ {% for item in item_elements -%}
+ <{{ item.key }}{{ item.attributes -}}
+ {% if item.value -%}
+ >{{ item.value }}</{{ item.key }}>
+ {% else -%}
+ {{ ' />' }}
+ {% endif %}
+ {%- endfor %}
+</item>
diff --git a/web/core/themes/seven/templates/classy/views/views-view-summary-unformatted.html.twig b/web/core/themes/seven/templates/classy/views/views-view-summary-unformatted.html.twig
new file mode 100644
index 0000000000..151734e948
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/views/views-view-summary-unformatted.html.twig
@@ -0,0 +1,31 @@
+{#
+/**
+ * @file
+ * Theme override for unformatted summary links.
+ *
+ * Available variables:
+ * - rows: The rows contained in this view.
+ * - url: The URL to this row's content.
+ * - count: The number of items this summary item represents.
+ * - separator: A separator between each row.
+ * - attributes: HTML attributes for a row.
+ * - active: A flag indicating whether the row is active.
+ * - options: Flags indicating how each row should be displayed. This contains:
+ * - count: A flag indicating whether the row's 'count' should be displayed.
+ * - inline: A flag indicating whether the item should be wrapped in an inline
+ * or block level HTML element.
+ *
+ * @see template_preprocess_views_view_summary_unformatted()
+ */
+#}
+{% for row in rows %}
+ {{ options.inline ? '<span' : '<div' }} class="views-summary views-summary-unformatted">
+ {% if row.separator -%}
+ {{ row.separator }}
+ {%- endif %}
+ <a href="{{ row.url }}"{{ row.attributes.addClass(row.active ? 'is-active')|without('href') }}>{{ row.link }}</a>
+ {% if options.count %}
+ ({{ row.count }})
+ {% endif %}
+ {{ options.inline ? '</span>' : '</div>' }}
+{% endfor %}
diff --git a/web/core/themes/seven/templates/classy/views/views-view-summary.html.twig b/web/core/themes/seven/templates/classy/views/views-view-summary.html.twig
new file mode 100644
index 0000000000..3190a45ada
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/views/views-view-summary.html.twig
@@ -0,0 +1,31 @@
+{#
+/**
+ * @file
+ * Theme override to display a list of summary lines.
+ *
+ * Available variables:
+ * - rows: The rows contained in this view.
+ * Each row contains:
+ * - url: The summary link URL.
+ * - link: The summary link text.
+ * - count: The number of items under this grouping.
+ * - attributes: HTML attributes to apply to each row.
+ * - active: A flag indicating whether the row is active.
+ * - options: Flags indicating how the summary should be displayed.
+ * This contains:
+ * - count: A flag indicating whether the count should be displayed.
+ *
+ * @see template_preprocess_views_view_summary()
+ */
+#}
+<div class="item-list">
+ <ul class="views-summary">
+ {% for row in rows %}
+ <li><a href="{{ row.url }}"{{ row.attributes.addClass(row.active ? 'is-active')|without('href') }}>{{ row.link }}</a>
+ {% if options.count %}
+ ({{ row.count }})
+ {% endif %}
+ </li>
+ {% endfor %}
+ </ul>
+</div>
diff --git a/web/core/themes/seven/templates/classy/views/views-view-table.html.twig b/web/core/themes/seven/templates/classy/views/views-view-table.html.twig
new file mode 100644
index 0000000000..edc14983da
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/views/views-view-table.html.twig
@@ -0,0 +1,120 @@
+{#
+/**
+ * @file
+ * Theme override for displaying a view as a table.
+ *
+ * Available variables:
+ * - attributes: Remaining HTML attributes for the element.
+ * - class: HTML classes that can be used to style contextually through CSS.
+ * - title : The title of this group of rows.
+ * - header: The table header columns.
+ * - attributes: Remaining HTML attributes for the element.
+ * - content: HTML classes to apply to each header cell, indexed by
+ * the header's key.
+ * - default_classes: A flag indicating whether default classes should be
+ * used.
+ * - caption_needed: Is the caption tag needed.
+ * - caption: The caption for this table.
+ * - accessibility_description: Extended description for the table details.
+ * - accessibility_summary: Summary for the table details.
+ * - rows: Table row items. Rows are keyed by row number.
+ * - attributes: HTML classes to apply to each row.
+ * - columns: Row column items. Columns are keyed by column number.
+ * - attributes: HTML classes to apply to each column.
+ * - content: The column content.
+ * - default_classes: A flag indicating whether default classes should be
+ * used.
+ * - responsive: A flag indicating whether table is responsive.
+ * - sticky: A flag indicating whether table header is sticky.
+ * - summary_element: A render array with table summary information (if any).
+ *
+ * @see template_preprocess_views_view_table()
+ */
+#}
+{%
+ set classes = [
+ 'views-table',
+ 'views-view-table',
+ 'cols-' ~ header|length,
+ responsive ? 'responsive-enabled',
+ sticky ? 'sticky-enabled',
+ ]
+%}
+<table{{ attributes.addClass(classes) }}>
+ {% if caption_needed %}
+ <caption>
+ {% if caption %}
+ {{ caption }}
+ {% else %}
+ {{ title }}
+ {% endif %}
+ {% if (summary_element is not empty) %}
+ {{ summary_element }}
+ {% endif %}
+ </caption>
+ {% endif %}
+ {% if header %}
+ <thead>
+ <tr>
+ {% for key, column in header %}
+ {% if column.default_classes %}
+ {%
+ set column_classes = [
+ 'views-field',
+ 'views-field-' ~ fields[key],
+ ]
+ %}
+ {% endif %}
+ <th{{ column.attributes.addClass(column_classes).setAttribute('scope', 'col') }}>
+ {%- if column.wrapper_element -%}
+ <{{ column.wrapper_element }}>
+ {%- if column.url -%}
+ <a href="{{ column.url }}" title="{{ column.title }}" rel="nofollow">{{ column.content }}{{ column.sort_indicator }}</a>
+ {%- else -%}
+ {{ column.content }}{{ column.sort_indicator }}
+ {%- endif -%}
+ </{{ column.wrapper_element }}>
+ {%- else -%}
+ {%- if column.url -%}
+ <a href="{{ column.url }}" title="{{ column.title }}" rel="nofollow">{{ column.content }}{{ column.sort_indicator }}</a>
+ {%- else -%}
+ {{- column.content }}{{ column.sort_indicator }}
+ {%- endif -%}
+ {%- endif -%}
+ </th>
+ {% endfor %}
+ </tr>
+ </thead>
+ {% endif %}
+ <tbody>
+ {% for row in rows %}
+ <tr{{ row.attributes }}>
+ {% for key, column in row.columns %}
+ {% if column.default_classes %}
+ {%
+ set column_classes = [
+ 'views-field'
+ ]
+ %}
+ {% for field in column.fields %}
+ {% set column_classes = column_classes|merge(['views-field-' ~ field]) %}
+ {% endfor %}
+ {% endif %}
+ <td{{ column.attributes.addClass(column_classes) }}>
+ {%- if column.wrapper_element -%}
+ <{{ column.wrapper_element }}>
+ {% for content in column.content %}
+ {{ content.separator }}{{ content.field_output }}
+ {% endfor %}
+ </{{ column.wrapper_element }}>
+ {%- else -%}
+ {% for content in column.content %}
+ {{- content.separator }}{{ content.field_output -}}
+ {% endfor %}
+ {%- endif %}
+ </td>
+ {% endfor %}
+ </tr>
+ {% endfor %}
+ </tbody>
+</table>
diff --git a/web/core/themes/seven/templates/classy/views/views-view.html.twig b/web/core/themes/seven/templates/classy/views/views-view.html.twig
new file mode 100644
index 0000000000..769a86849e
--- /dev/null
+++ b/web/core/themes/seven/templates/classy/views/views-view.html.twig
@@ -0,0 +1,95 @@
+{#
+/**
+ * @file
+ * Theme override for a main view template.
+ *
+ * Available variables:
+ * - attributes: Remaining HTML attributes for the element.
+ * - css_name: A CSS-safe version of the view name.
+ * - css_class: The user-specified classes names, if any.
+ * - header: The optional header.
+ * - footer: The optional footer.
+ * - rows: The results of the view query, if any.
+ * - empty: The content to display if there are no rows.
+ * - pager: The optional pager next/prev links to display.
+ * - exposed: Exposed widget form/info to display.
+ * - feed_icons: Optional feed icons to display.
+ * - more: An optional link to the next page of results.
+ * - title: Title of the view, only used when displaying in the admin preview.
+ * - title_prefix: Additional output populated by modules, intended to be
+ * displayed in front of the view title.
+ * - title_suffix: Additional output populated by modules, intended to be
+ * displayed after the view title.
+ * - attachment_before: An optional attachment view to be displayed before the
+ * view content.
+ * - attachment_after: An optional attachment view to be displayed after the
+ * view content.
+ * - dom_id: Unique id for every view being printed to give unique class for
+ * Javascript.
+ *
+ * @see template_preprocess_views_view()
+ */
+#}
+{%
+ set classes = [
+ 'view',
+ 'view-' ~ id|clean_class,
+ 'view-id-' ~ id,
+ 'view-display-id-' ~ display_id,
+ dom_id ? 'js-view-dom-id-' ~ dom_id,
+ ]
+%}
+<div{{ attributes.addClass(classes) }}>
+ {{ title_prefix }}
+ {% if title %}
+ {{ title }}
+ {% endif %}
+ {{ title_suffix }}
+ {% if header %}
+ <div class="view-header">
+ {{ header }}
+ </div>
+ {% endif %}
+ {% if exposed %}
+ <div class="view-filters">
+ {{ exposed }}
+ </div>
+ {% endif %}
+ {% if attachment_before %}
+ <div class="attachment attachment-before">
+ {{ attachment_before }}
+ </div>
+ {% endif %}
+
+ {% if rows %}
+ <div class="view-content">
+ {{ rows }}
+ </div>
+ {% elseif empty %}
+ <div class="view-empty">
+ {{ empty }}
+ </div>
+ {% endif %}
+
+ {% if pager %}
+ {{ pager }}
+ {% endif %}
+ {% if attachment_after %}
+ <div class="attachment attachment-after">
+ {{ attachment_after }}
+ </div>
+ {% endif %}
+ {% if more %}
+ {{ more }}
+ {% endif %}
+ {% if footer %}
+ <div class="view-footer">
+ {{ footer }}
+ </div>
+ {% endif %}
+ {% if feed_icons %}
+ <div class="feed-icons">
+ {{ feed_icons }}
+ </div>
+ {% endif %}
+</div>
diff --git a/web/core/themes/seven/templates/details.html.twig b/web/core/themes/seven/templates/details.html.twig
index 8e30421eac..316dee2f63 100644
--- a/web/core/themes/seven/templates/details.html.twig
+++ b/web/core/themes/seven/templates/details.html.twig
@@ -30,7 +30,7 @@
]
%}
<summary{{ summary_attributes.addClass(summary_classes) }}>
- {{- title -}}
+ <span>{{ title }}</span>
</summary>
{%- endif -%}
<div class="seven-details__wrapper details-wrapper">
diff --git a/web/core/themes/seven/templates/entity-add-list.html.twig b/web/core/themes/seven/templates/entity-add-list.html.twig
index 3ff2e717df..04d493f44e 100644
--- a/web/core/themes/seven/templates/entity-add-list.html.twig
+++ b/web/core/themes/seven/templates/entity-add-list.html.twig
@@ -1,7 +1,7 @@
{#
/**
* @file
- * Theme override to to present a list of available bundles.
+ * Theme override to present a list of available bundles.
*
* Available variables:
* - bundles: A list of bundles, each with the following properties:
diff --git a/web/core/themes/seven/templates/image-widget.html.twig b/web/core/themes/seven/templates/image-widget.html.twig
index a7cf3ad48a..2d6f4014ed 100644
--- a/web/core/themes/seven/templates/image-widget.html.twig
+++ b/web/core/themes/seven/templates/image-widget.html.twig
@@ -3,10 +3,23 @@
* @file
* Theme override for an image field widget.
*
- * Included from Classy theme.
+ * Available variables:
+ * - attributes: HTML attributes for the containing element.
+ * - data: Render elements of the image widget.
*
* @see template_preprocess_image_widget()
*/
#}
-{% include '@classy/content-edit/image-widget.html.twig' %}
-{{ attach_library('classy/image-widget') }}
+{{ attach_library('seven/classy.image-widget') }}
+
+<div{{ attributes }}>
+ {% if data.preview %}
+ <div class="image-preview">
+ {{ data.preview }}
+ </div>
+ {% endif %}
+ <div class="image-widget-data">
+ {# Render widget data without the image preview that was output already. #}
+ {{ data|without('preview') }}
+ </div>
+</div>
diff --git a/web/core/themes/stable/templates/admin/system-themes-page.html.twig b/web/core/themes/stable/templates/admin/system-themes-page.html.twig
index 5a23f1a14c..5d157a1cae 100644
--- a/web/core/themes/stable/templates/admin/system-themes-page.html.twig
+++ b/web/core/themes/stable/templates/admin/system-themes-page.html.twig
@@ -22,6 +22,7 @@
* - notes: Identifies what context this theme is being used in, e.g.,
* default theme, admin theme.
* - incompatible: Text describing any compatibility issues.
+ * - module_dependencies: A list of modules that this theme requires.
* - operations: A list of operation links, e.g., Settings, Enable, Disable,
* etc. these links should only be displayed if the theme is compatible.
*
@@ -60,6 +61,11 @@
{%- endif -%}
</h3>
<div class="theme-info__description">{{ theme.description }}</div>
+ {% if theme.module_dependencies %}
+ <div class="theme-info__requires">
+ {{ 'Requires: @module_dependencies'|t({ '@module_dependencies': theme.module_dependencies|render }) }}
+ </div>
+ {% endif %}
{# Display operation links if the theme is compatible. #}
{% if theme.incompatible %}
<div class="incompatible">{{ theme.incompatible }}</div>
diff --git a/web/core/themes/stable/templates/admin/update-project-status.html.twig b/web/core/themes/stable/templates/admin/update-project-status.html.twig
index 5a6d2ecea7..db681b59ee 100644
--- a/web/core/themes/stable/templates/admin/update-project-status.html.twig
+++ b/web/core/themes/stable/templates/admin/update-project-status.html.twig
@@ -27,11 +27,11 @@
#}
{%
set status_classes = [
- project.status == constant('UPDATE_NOT_SECURE') ? 'project-update__status--security-error',
- project.status == constant('UPDATE_REVOKED') ? 'project-update__status--revoked',
- project.status == constant('UPDATE_NOT_SUPPORTED') ? 'project-update__status--not-supported',
- project.status == constant('UPDATE_NOT_CURRENT') ? 'project-update__status--not-current',
- project.status == constant('UPDATE_CURRENT') ? 'project-update__status--current',
+ project.status == constant('Drupal\\update\\UpdateManagerInterface::NOT_SECURE') ? 'project-update__status--security-error',
+ project.status == constant('Drupal\\update\\UpdateManagerInterface::REVOKED') ? 'project-update__status--revoked',
+ project.status == constant('Drupal\\update\\UpdateManagerInterface::NOT_SUPPORTED') ? 'project-update__status--not-supported',
+ project.status == constant('Drupal\\update\\UpdateManagerInterface::NOT_CURRENT') ? 'project-update__status--not-current',
+ project.status == constant('Drupal\\update\\UpdateManagerInterface::CURRENT') ? 'project-update__status--current',
]
%}
<div{{ status.attributes.addClass('project-update__status', status_classes) }}>
@@ -65,9 +65,9 @@
{%
set extra_classes = [
- project.status == constant('UPDATE_NOT_SECURE') ? 'project-not-secure',
- project.status == constant('UPDATE_REVOKED') ? 'project-revoked',
- project.status == constant('UPDATE_NOT_SUPPORTED') ? 'project-not-supported',
+ project.status == constant('Drupal\\update\\UpdateManagerInterface::NOT_SECURE') ? 'project-not-secure',
+ project.status == constant('Drupal\\update\\UpdateManagerInterface::REVOKED') ? 'project-revoked',
+ project.status == constant('Drupal\\update\\UpdateManagerInterface::NOT_SUPPORTED') ? 'project-not-supported',
]
%}
<div class="project-updates__details">
diff --git a/web/core/themes/stable/templates/field/responsive-image.html.twig b/web/core/themes/stable/templates/field/responsive-image.html.twig
index ae77ffb177..9fe132a43a 100644
--- a/web/core/themes/stable/templates/field/responsive-image.html.twig
+++ b/web/core/themes/stable/templates/field/responsive-image.html.twig
@@ -18,15 +18,9 @@
{% else %}
<picture>
{% if sources %}
- {#
- Internet Explorer 9 doesn't recognise source elements that are wrapped in
- picture tags. See http://scottjehl.github.io/picturefill/#ie9
- #}
- <!--[if IE 9]><video style="display: none;"><![endif]-->
{% for source_attributes in sources %}
<source{{ source_attributes }}/>
{% endfor %}
- <!--[if IE 9]></video><![endif]-->
{% endif %}
{# The controlling image, with the fallback image in srcset. #}
{{ img_element }}
diff --git a/web/core/themes/stable/templates/form/field-multiple-value-form.html.twig b/web/core/themes/stable/templates/form/field-multiple-value-form.html.twig
index b82324c7af..246ac41bfd 100644
--- a/web/core/themes/stable/templates/form/field-multiple-value-form.html.twig
+++ b/web/core/themes/stable/templates/form/field-multiple-value-form.html.twig
@@ -19,7 +19,6 @@
* @see template_preprocess_field_multiple_value_form()
*/
#}
-
{% if multiple %}
{%
set classes = [
diff --git a/web/core/themes/stable/templates/form/select.html.twig b/web/core/themes/stable/templates/form/select.html.twig
index 3150bdcb36..8af42616f7 100644
--- a/web/core/themes/stable/templates/form/select.html.twig
+++ b/web/core/themes/stable/templates/form/select.html.twig
@@ -4,8 +4,8 @@
* Theme override for a select element.
*
* Available variables:
- * - attributes: HTML attributes for the select tag.
- * - options: The option element children.
+ * - attributes: HTML attributes for the <select> tag.
+ * - options: The <option> element children.
*
* @see template_preprocess_select()
*/
diff --git a/web/core/themes/stable/templates/views/views-view-table.html.twig b/web/core/themes/stable/templates/views/views-view-table.html.twig
index 6806eb5899..a26eaeba85 100644
--- a/web/core/themes/stable/templates/views/views-view-table.html.twig
+++ b/web/core/themes/stable/templates/views/views-view-table.html.twig
@@ -26,6 +26,7 @@
* used.
* - responsive: A flag indicating whether table is responsive.
* - sticky: A flag indicating whether table header is sticky.
+ * - summary_element: A render array with table summary information (if any).
*
* @see template_preprocess_views_view_table()
*/
@@ -45,15 +46,8 @@
{% else %}
{{ title }}
{% endif %}
- {% if (summary is not empty) or (description is not empty) %}
- <details>
- {% if summary is not empty %}
- <summary>{{ summary }}</summary>
- {% endif %}
- {% if description is not empty %}
- {{ description }}
- {% endif %}
- </details>
+ {% if (summary_element is not empty) %}
+ {{ summary_element }}
{% endif %}
</caption>
{% endif %}
@@ -73,14 +67,14 @@
{%- if column.wrapper_element -%}
<{{ column.wrapper_element }}>
{%- if column.url -%}
- <a href="{{ column.url }}" title="{{ column.title }}">{{ column.content }}{{ column.sort_indicator }}</a>
+ <a href="{{ column.url }}" title="{{ column.title }}" rel="nofollow">{{ column.content }}{{ column.sort_indicator }}</a>
{%- else -%}
{{ column.content }}{{ column.sort_indicator }}
{%- endif -%}
</{{ column.wrapper_element }}>
{%- else -%}
{%- if column.url -%}
- <a href="{{ column.url }}" title="{{ column.title }}">{{ column.content }}{{ column.sort_indicator }}</a>
+ <a href="{{ column.url }}" title="{{ column.title }}" rel="nofollow">{{ column.content }}{{ column.sort_indicator }}</a>
{%- else -%}
{{- column.content }}{{ column.sort_indicator }}
{%- endif -%}
diff --git a/web/core/yarn.lock b/web/core/yarn.lock
index b078559805..83cd36a1f0 100644
--- a/web/core/yarn.lock
+++ b/web/core/yarn.lock
@@ -2,127 +2,193 @@
# yarn lockfile v1
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.5.5":
- version "7.5.5"
- resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.5.5.tgz#bc0782f6d69f7b7d49531219699b988f669a8f9d"
- integrity sha512-27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw==
+"@babel/code-frame@^7.10.1":
+ version "7.10.1"
+ resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.1.tgz#d5481c5095daa1c57e16e54c6f9198443afb49ff"
+ integrity sha512-IGhtTmpjGbYzcEDOw7DcQtbQSXcG9ftmAXtWTu9V936vDye4xjjekktFAtgZsWpzTj/X01jocB46mTywm/4SZw==
dependencies:
- "@babel/highlight" "^7.0.0"
+ "@babel/highlight" "^7.10.1"
"@babel/core@>=7.2.2":
- version "7.5.5"
- resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.5.5.tgz#17b2686ef0d6bc58f963dddd68ab669755582c30"
- integrity sha512-i4qoSr2KTtce0DmkuuQBV4AuQgGPUcPXMr9L5MyYAtk06z068lQ10a4O009fe5OB/DfNV+h+qqT7ddNV8UnRjg==
- dependencies:
- "@babel/code-frame" "^7.5.5"
- "@babel/generator" "^7.5.5"
- "@babel/helpers" "^7.5.5"
- "@babel/parser" "^7.5.5"
- "@babel/template" "^7.4.4"
- "@babel/traverse" "^7.5.5"
- "@babel/types" "^7.5.5"
- convert-source-map "^1.1.0"
+ version "7.10.2"
+ resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.10.2.tgz#bd6786046668a925ac2bd2fd95b579b92a23b36a"
+ integrity sha512-KQmV9yguEjQsXqyOUGKjS4+3K8/DlOCE2pZcq4augdQmtTy5iv5EHtmMSJ7V4c1BIPjuwtZYqYLCq9Ga+hGBRQ==
+ dependencies:
+ "@babel/code-frame" "^7.10.1"
+ "@babel/generator" "^7.10.2"
+ "@babel/helper-module-transforms" "^7.10.1"
+ "@babel/helpers" "^7.10.1"
+ "@babel/parser" "^7.10.2"
+ "@babel/template" "^7.10.1"
+ "@babel/traverse" "^7.10.1"
+ "@babel/types" "^7.10.2"
+ convert-source-map "^1.7.0"
debug "^4.1.0"
- json5 "^2.1.0"
+ gensync "^1.0.0-beta.1"
+ json5 "^2.1.2"
lodash "^4.17.13"
resolve "^1.3.2"
semver "^5.4.1"
source-map "^0.5.0"
-"@babel/generator@^7.5.5":
- version "7.5.5"
- resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.5.5.tgz#873a7f936a3c89491b43536d12245b626664e3cf"
- integrity sha512-ETI/4vyTSxTzGnU2c49XHv2zhExkv9JHLTwDAFz85kmcwuShvYG2H08FwgIguQf4JC75CBnXAUM5PqeF4fj0nQ==
+"@babel/generator@^7.10.1", "@babel/generator@^7.10.2":
+ version "7.10.2"
+ resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.10.2.tgz#0fa5b5b2389db8bfdfcc3492b551ee20f5dd69a9"
+ integrity sha512-AxfBNHNu99DTMvlUPlt1h2+Hn7knPpH5ayJ8OqDWSeLld+Fi2AYBTC/IejWDM9Edcii4UzZRCsbUt0WlSDsDsA==
dependencies:
- "@babel/types" "^7.5.5"
+ "@babel/types" "^7.10.2"
jsesc "^2.5.1"
lodash "^4.17.13"
source-map "^0.5.0"
- trim-right "^1.0.1"
-"@babel/helper-function-name@^7.1.0":
- version "7.1.0"
- resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz#a0ceb01685f73355d4360c1247f582bfafc8ff53"
- integrity sha512-A95XEoCpb3TO+KZzJ4S/5uW5fNe26DjBGqf1o9ucyLyCmi1dXq/B3c8iaWTfBk3VvetUxl16e8tIrd5teOCfGw==
+"@babel/helper-function-name@^7.10.1":
+ version "7.10.1"
+ resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.10.1.tgz#92bd63829bfc9215aca9d9defa85f56b539454f4"
+ integrity sha512-fcpumwhs3YyZ/ttd5Rz0xn0TpIwVkN7X0V38B9TWNfVF42KEkhkAAuPCQ3oXmtTRtiPJrmZ0TrfS0GKF0eMaRQ==
dependencies:
- "@babel/helper-get-function-arity" "^7.0.0"
- "@babel/template" "^7.1.0"
- "@babel/types" "^7.0.0"
+ "@babel/helper-get-function-arity" "^7.10.1"
+ "@babel/template" "^7.10.1"
+ "@babel/types" "^7.10.1"
-"@babel/helper-get-function-arity@^7.0.0":
- version "7.0.0"
- resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz#83572d4320e2a4657263734113c42868b64e49c3"
- integrity sha512-r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ==
+"@babel/helper-get-function-arity@^7.10.1":
+ version "7.10.1"
+ resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.1.tgz#7303390a81ba7cb59613895a192b93850e373f7d"
+ integrity sha512-F5qdXkYGOQUb0hpRaPoetF9AnsXknKjWMZ+wmsIRsp5ge5sFh4c3h1eH2pRTTuy9KKAA2+TTYomGXAtEL2fQEw==
+ dependencies:
+ "@babel/types" "^7.10.1"
+
+"@babel/helper-member-expression-to-functions@^7.10.1":
+ version "7.10.1"
+ resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.10.1.tgz#432967fd7e12a4afef66c4687d4ca22bc0456f15"
+ integrity sha512-u7XLXeM2n50gb6PWJ9hoO5oO7JFPaZtrh35t8RqKLT1jFKj9IWeD1zrcrYp1q1qiZTdEarfDWfTIP8nGsu0h5g==
+ dependencies:
+ "@babel/types" "^7.10.1"
+
+"@babel/helper-module-imports@^7.10.1":
+ version "7.10.1"
+ resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.10.1.tgz#dd331bd45bccc566ce77004e9d05fe17add13876"
+ integrity sha512-SFxgwYmZ3HZPyZwJRiVNLRHWuW2OgE5k2nrVs6D9Iv4PPnXVffuEHy83Sfx/l4SqF+5kyJXjAyUmrG7tNm+qVg==
+ dependencies:
+ "@babel/types" "^7.10.1"
+
+"@babel/helper-module-transforms@^7.10.1":
+ version "7.10.1"
+ resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.10.1.tgz#24e2f08ee6832c60b157bb0936c86bef7210c622"
+ integrity sha512-RLHRCAzyJe7Q7sF4oy2cB+kRnU4wDZY/H2xJFGof+M+SJEGhZsb+GFj5j1AD8NiSaVBJ+Pf0/WObiXu/zxWpFg==
+ dependencies:
+ "@babel/helper-module-imports" "^7.10.1"
+ "@babel/helper-replace-supers" "^7.10.1"
+ "@babel/helper-simple-access" "^7.10.1"
+ "@babel/helper-split-export-declaration" "^7.10.1"
+ "@babel/template" "^7.10.1"
+ "@babel/types" "^7.10.1"
+ lodash "^4.17.13"
+
+"@babel/helper-optimise-call-expression@^7.10.1":
+ version "7.10.1"
+ resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.1.tgz#b4a1f2561870ce1247ceddb02a3860fa96d72543"
+ integrity sha512-a0DjNS1prnBsoKx83dP2falChcs7p3i8VMzdrSbfLhuQra/2ENC4sbri34dz/rWmDADsmF1q5GbfaXydh0Jbjg==
+ dependencies:
+ "@babel/types" "^7.10.1"
+
+"@babel/helper-replace-supers@^7.10.1":
+ version "7.10.1"
+ resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.10.1.tgz#ec6859d20c5d8087f6a2dc4e014db7228975f13d"
+ integrity sha512-SOwJzEfpuQwInzzQJGjGaiG578UYmyi2Xw668klPWV5n07B73S0a9btjLk/52Mlcxa+5AdIYqws1KyXRfMoB7A==
+ dependencies:
+ "@babel/helper-member-expression-to-functions" "^7.10.1"
+ "@babel/helper-optimise-call-expression" "^7.10.1"
+ "@babel/traverse" "^7.10.1"
+ "@babel/types" "^7.10.1"
+
+"@babel/helper-simple-access@^7.10.1":
+ version "7.10.1"
+ resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.10.1.tgz#08fb7e22ace9eb8326f7e3920a1c2052f13d851e"
+ integrity sha512-VSWpWzRzn9VtgMJBIWTZ+GP107kZdQ4YplJlCmIrjoLVSi/0upixezHCDG8kpPVTBJpKfxTH01wDhh+jS2zKbw==
dependencies:
- "@babel/types" "^7.0.0"
+ "@babel/template" "^7.10.1"
+ "@babel/types" "^7.10.1"
-"@babel/helper-split-export-declaration@^7.4.4":
- version "7.4.4"
- resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz#ff94894a340be78f53f06af038b205c49d993677"
- integrity sha512-Ro/XkzLf3JFITkW6b+hNxzZ1n5OQ80NvIUdmHspih1XAhtN3vPTuUFT4eQnela+2MaZ5ulH+iyP513KJrxbN7Q==
+"@babel/helper-split-export-declaration@^7.10.1":
+ version "7.10.1"
+ resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.1.tgz#c6f4be1cbc15e3a868e4c64a17d5d31d754da35f"
+ integrity sha512-UQ1LVBPrYdbchNhLwj6fetj46BcFwfS4NllJo/1aJsT+1dLTEnXJL0qHqtY7gPzF8S2fXBJamf1biAXV3X077g==
dependencies:
- "@babel/types" "^7.4.4"
+ "@babel/types" "^7.10.1"
-"@babel/helpers@^7.5.5":
- version "7.5.5"
- resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.5.5.tgz#63908d2a73942229d1e6685bc2a0e730dde3b75e"
- integrity sha512-nRq2BUhxZFnfEn/ciJuhklHvFOqjJUD5wpx+1bxUF2axL9C+v4DE/dmp5sT2dKnpOs4orZWzpAZqlCy8QqE/7g==
+"@babel/helper-validator-identifier@^7.10.1":
+ version "7.10.1"
+ resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz#5770b0c1a826c4f53f5ede5e153163e0318e94b5"
+ integrity sha512-5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw==
+
+"@babel/helpers@^7.10.1":
+ version "7.10.1"
+ resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.10.1.tgz#a6827b7cb975c9d9cef5fd61d919f60d8844a973"
+ integrity sha512-muQNHF+IdU6wGgkaJyhhEmI54MOZBKsFfsXFhboz1ybwJ1Kl7IHlbm2a++4jwrmY5UYsgitt5lfqo1wMFcHmyw==
dependencies:
- "@babel/template" "^7.4.4"
- "@babel/traverse" "^7.5.5"
- "@babel/types" "^7.5.5"
+ "@babel/template" "^7.10.1"
+ "@babel/traverse" "^7.10.1"
+ "@babel/types" "^7.10.1"
-"@babel/highlight@^7.0.0":
- version "7.5.0"
- resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.5.0.tgz#56d11312bd9248fa619591d02472be6e8cb32540"
- integrity sha512-7dV4eu9gBxoM0dAnj/BCFDW9LFU0zvTrkq0ugM7pnHEgguOEeOz1so2ZghEdzviYzQEED0r4EAgpsBChKy1TRQ==
+"@babel/highlight@^7.10.1":
+ version "7.10.1"
+ resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.1.tgz#841d098ba613ba1a427a2b383d79e35552c38ae0"
+ integrity sha512-8rMof+gVP8mxYZApLF/JgNDAkdKa+aJt3ZYxF8z6+j/hpeXL7iMsKCPHa2jNMHu/qqBwzQF4OHNoYi8dMA/rYg==
dependencies:
+ "@babel/helper-validator-identifier" "^7.10.1"
chalk "^2.0.0"
- esutils "^2.0.2"
js-tokens "^4.0.0"
-"@babel/parser@^7.4.4", "@babel/parser@^7.5.5":
- version "7.5.5"
- resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.5.5.tgz#02f077ac8817d3df4a832ef59de67565e71cca4b"
- integrity sha512-E5BN68cqR7dhKan1SfqgPGhQ178bkVKpXTPEXnFJBrEt8/DKRZlybmy+IgYLTeN7tp1R5Ccmbm2rBk17sHYU3g==
+"@babel/parser@^7.10.1", "@babel/parser@^7.10.2":
+ version "7.10.2"
+ resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.10.2.tgz#871807f10442b92ff97e4783b9b54f6a0ca812d0"
+ integrity sha512-PApSXlNMJyB4JiGVhCOlzKIif+TKFTvu0aQAhnTvfP/z3vVSN6ZypH5bfUNwFXXjRQtUEBNFd2PtmCmG2Py3qQ==
+
+"@babel/runtime-corejs3@^7.8.3":
+ version "7.10.2"
+ resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.10.2.tgz#3511797ddf9a3d6f3ce46b99cc835184817eaa4e"
+ integrity sha512-+a2M/u7r15o3dV1NEizr9bRi+KUVnrs/qYxF0Z06DAPx/4VCWaz1WA7EcbE+uqGgt39lp5akWGmHsTseIkHkHg==
+ dependencies:
+ core-js-pure "^3.0.0"
+ regenerator-runtime "^0.13.4"
"@babel/runtime@^7.4.5":
- version "7.5.5"
- resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.5.5.tgz#74fba56d35efbeca444091c7850ccd494fd2f132"
- integrity sha512-28QvEGyQyNkB0/m2B4FU7IEZGK2NUrcMtT6BZEFALTguLk+AUT6ofsHtPk5QyjAdUkpMJ+/Em+quwz4HOt30AQ==
- dependencies:
- regenerator-runtime "^0.13.2"
-
-"@babel/template@^7.1.0", "@babel/template@^7.4.4":
- version "7.4.4"
- resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.4.4.tgz#f4b88d1225689a08f5bc3a17483545be9e4ed237"
- integrity sha512-CiGzLN9KgAvgZsnivND7rkA+AeJ9JB0ciPOD4U59GKbQP2iQl+olF1l76kJOupqidozfZ32ghwBEJDhnk9MEcw==
- dependencies:
- "@babel/code-frame" "^7.0.0"
- "@babel/parser" "^7.4.4"
- "@babel/types" "^7.4.4"
-
-"@babel/traverse@^7.5.5":
- version "7.5.5"
- resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.5.5.tgz#f664f8f368ed32988cd648da9f72d5ca70f165bb"
- integrity sha512-MqB0782whsfffYfSjH4TM+LMjrJnhCNEDMDIjeTpl+ASaUvxcjoiVCo/sM1GhS1pHOXYfWVCYneLjMckuUxDaQ==
- dependencies:
- "@babel/code-frame" "^7.5.5"
- "@babel/generator" "^7.5.5"
- "@babel/helper-function-name" "^7.1.0"
- "@babel/helper-split-export-declaration" "^7.4.4"
- "@babel/parser" "^7.5.5"
- "@babel/types" "^7.5.5"
+ version "7.10.2"
+ resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.10.2.tgz#d103f21f2602497d38348a32e008637d506db839"
+ integrity sha512-6sF3uQw2ivImfVIl62RZ7MXhO2tap69WeWK57vAaimT6AZbE4FbqjdEJIN1UqoD6wI6B+1n9UiagafH1sxjOtg==
+ dependencies:
+ regenerator-runtime "^0.13.4"
+
+"@babel/template@^7.10.1":
+ version "7.10.1"
+ resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.10.1.tgz#e167154a94cb5f14b28dc58f5356d2162f539811"
+ integrity sha512-OQDg6SqvFSsc9A0ej6SKINWrpJiNonRIniYondK2ViKhB06i3c0s+76XUft71iqBEe9S1OKsHwPAjfHnuvnCig==
+ dependencies:
+ "@babel/code-frame" "^7.10.1"
+ "@babel/parser" "^7.10.1"
+ "@babel/types" "^7.10.1"
+
+"@babel/traverse@^7.10.1":
+ version "7.10.1"
+ resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.10.1.tgz#bbcef3031e4152a6c0b50147f4958df54ca0dd27"
+ integrity sha512-C/cTuXeKt85K+p08jN6vMDz8vSV0vZcI0wmQ36o6mjbuo++kPMdpOYw23W2XH04dbRt9/nMEfA4W3eR21CD+TQ==
+ dependencies:
+ "@babel/code-frame" "^7.10.1"
+ "@babel/generator" "^7.10.1"
+ "@babel/helper-function-name" "^7.10.1"
+ "@babel/helper-split-export-declaration" "^7.10.1"
+ "@babel/parser" "^7.10.1"
+ "@babel/types" "^7.10.1"
debug "^4.1.0"
globals "^11.1.0"
lodash "^4.17.13"
-"@babel/types@^7.0.0", "@babel/types@^7.4.4", "@babel/types@^7.5.5":
- version "7.5.5"
- resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.5.5.tgz#97b9f728e182785909aa4ab56264f090a028d18a"
- integrity sha512-s63F9nJioLqOlW3UkyMd+BYhXt44YuaFm/VV0VwuteqjYwRrObkU7ra9pY4wAJR3oXi8hJrMcrcJdO/HH33vtw==
+"@babel/types@^7.10.1", "@babel/types@^7.10.2":
+ version "7.10.2"
+ resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.10.2.tgz#30283be31cad0dbf6fb00bd40641ca0ea675172d"
+ integrity sha512-AD3AwWBSz0AWF0AkCN9VPiWrvldXq+/e3cHa4J89vo4ymjz1XwrBFFVZmkJTsQIPNk+ZVomPSXUJqq8yyjZsng==
dependencies:
- esutils "^2.0.2"
+ "@babel/helper-validator-identifier" "^7.10.1"
lodash "^4.17.13"
to-fast-properties "^2.0.0"
@@ -139,6 +205,11 @@
resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b"
integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==
+"@types/color-name@^1.1.1":
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"
+ integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==
+
"@types/events@*":
version "3.0.0"
resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7"
@@ -159,27 +230,21 @@
integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
"@types/node@*":
- version "12.7.2"
- resolved "https://registry.yarnpkg.com/@types/node/-/node-12.7.2.tgz#c4e63af5e8823ce9cc3f0b34f7b998c2171f0c44"
- integrity sha512-dyYO+f6ihZEtNPDcWNR1fkoTDf3zAK3lAABDze3mz6POyIercH0lEUawUFXlG8xaQZmm1yEBON/4TsYv/laDYg==
-
-"@types/node@^8.0.7":
- version "8.10.51"
- resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.51.tgz#80600857c0a47a8e8bafc2dae6daed6db58e3627"
- integrity sha512-cArrlJp3Yv6IyFT/DYe+rlO8o3SIHraALbBW/+CcCYW/a9QucpLI+n2p4sRxAvl2O35TiecpX2heSZtJjvEO+Q==
+ version "14.0.9"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.9.tgz#43896ab87fc82bda1dfd600cdf44a0c8a64e11d2"
+ integrity sha512-0sCTiXKXELOBxvZLN4krQ0FPOAA7ij+6WwvD0k/PHd9/KAkr4dXel5J9fh6F4x1FwAQILqAWkmpeuS6mjf1iKA==
-"@types/unist@*", "@types/unist@^2.0.0":
+"@types/unist@*", "@types/unist@^2.0.0", "@types/unist@^2.0.2":
version "2.0.3"
resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.3.tgz#9c088679876f374eb5983f150d4787aa6fb32d7e"
integrity sha512-FvUupuM3rlRsRtCN+fDudtmytGO6iHJuuRKS1Ss0pG5z8oX0diNEw94UEL7hgDbpN94rgaK5R7sWm6RrSkZuAQ==
"@types/vfile-message@*":
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/@types/vfile-message/-/vfile-message-1.0.1.tgz#e1e9895cc6b36c462d4244e64e6d0b6eaf65355a"
- integrity sha512-mlGER3Aqmq7bqR1tTTIVHq8KSAFFRyGbrxuM8C/H82g6k7r2fS+IMEkIu3D7JHzG10NvPdR8DNx0jr0pwpp4dA==
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/@types/vfile-message/-/vfile-message-2.0.0.tgz#690e46af0fdfc1f9faae00cd049cc888957927d5"
+ integrity sha512-GpTIuDpb9u4zIO165fUy9+fXcULdD8HFRNli04GehoMVbeNq7D6OBnqSmg3lxZnC+UvgUhEWKxdKiwYUkGltIw==
dependencies:
- "@types/node" "*"
- "@types/unist" "*"
+ vfile-message "*"
"@types/vfile@^3.0.0":
version "3.0.2"
@@ -190,11 +255,6 @@
"@types/unist" "*"
"@types/vfile-message" "*"
-abbrev@1:
- version "1.1.1"
- resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
- integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
-
acorn-jsx@^3.0.0:
version "3.0.1"
resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-3.0.1.tgz#afdf9488fb1ecefc8348f6fb22f464e32a58b36b"
@@ -208,9 +268,9 @@ acorn@^3.0.4:
integrity sha1-ReN/s56No/JbruP/U2niu18iAXo=
acorn@^5.5.0:
- version "5.7.3"
- resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279"
- integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==
+ version "5.7.4"
+ resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.4.tgz#3e8d8a9947d0599a1796d10225d7432f4a4acf5e"
+ integrity sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==
agent-base@4, agent-base@^4.2.0, agent-base@^4.3.0:
version "4.3.0"
@@ -242,15 +302,20 @@ ajv@^5.2.3, ajv@^5.3.0:
json-schema-traverse "^0.3.0"
ajv@^6.10.2, ajv@^6.5.5:
- version "6.10.2"
- resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.2.tgz#d3cea04d6b017b2894ad69040fec8b623eb4bd52"
- integrity sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==
+ version "6.12.2"
+ resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.2.tgz#c629c5eced17baf314437918d2da88c99d5958cd"
+ integrity sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==
dependencies:
- fast-deep-equal "^2.0.1"
+ fast-deep-equal "^3.1.1"
fast-json-stable-stringify "^2.0.0"
json-schema-traverse "^0.4.1"
uri-js "^4.2.2"
+ansi-colors@3.2.3:
+ version "3.2.3"
+ resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.3.tgz#57d35b8686e851e2cc04c403f1c00203976a1813"
+ integrity sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw==
+
ansi-escapes@^3.0.0:
version "3.2.0"
resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
@@ -271,6 +336,11 @@ ansi-regex@^4.1.0:
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
+ansi-regex@^5.0.0:
+ version "5.0.0"
+ resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75"
+ integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==
+
ansi-styles@^2.2.1:
version "2.2.1"
resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
@@ -283,6 +353,14 @@ ansi-styles@^3.2.0, ansi-styles@^3.2.1:
dependencies:
color-convert "^1.9.0"
+ansi-styles@^4.1.0:
+ version "4.2.1"
+ resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.1.tgz#90ae75c424d008d2624c5bf29ead3177ebfcf359"
+ integrity sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==
+ dependencies:
+ "@types/color-name" "^1.1.1"
+ color-convert "^2.0.1"
+
anymatch@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
@@ -291,19 +369,6 @@ anymatch@^2.0.0:
micromatch "^3.1.4"
normalize-path "^2.1.1"
-aproba@^1.0.3:
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
- integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
-
-are-we-there-yet@~1.1.2:
- version "1.1.5"
- resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21"
- integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==
- dependencies:
- delegates "^1.0.0"
- readable-stream "^2.0.6"
-
argparse@^1.0.7:
version "1.0.10"
resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
@@ -339,13 +404,14 @@ array-find-index@^1.0.1:
resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
integrity sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=
-array-includes@^3.0.3:
- version "3.0.3"
- resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.0.3.tgz#184b48f62d92d7452bb31b323165c7f8bd02266d"
- integrity sha1-GEtI9i2S10UrsxsyMWXH+L0CJm0=
+array-includes@^3.0.3, array-includes@^3.1.1:
+ version "3.1.1"
+ resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.1.tgz#cdd67e6852bdf9c1215460786732255ed2459348"
+ integrity sha512-c2VXaCHl7zPsvpkFsw4nxvFie4fh1ur9bpcgsVkIjqn0H/Xwdg+7fv3n2r/isyS8EBj5b06M9kHyZuIr4El6WQ==
dependencies:
- define-properties "^1.1.2"
- es-abstract "^1.7.0"
+ define-properties "^1.1.3"
+ es-abstract "^1.17.0"
+ is-string "^1.0.5"
array-union@^1.0.1, array-union@^1.0.2:
version "1.0.2"
@@ -364,6 +430,14 @@ array-unique@^0.3.2:
resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
+array.prototype.flat@^1.2.1:
+ version "1.2.3"
+ resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz#0de82b426b0318dbfdb940089e38b043d37f6c7b"
+ integrity sha512-gBlRZV0VSmfPIeWfuuy56XZMvbVfbEUnOXUvt3F/eUUUSyzlgLxhEX4YAEpxNAogRGehPSnfXyPtYyKAhkzQhQ==
+ dependencies:
+ define-properties "^1.1.3"
+ es-abstract "^1.17.0-next.1"
+
arrify@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
@@ -402,9 +476,9 @@ ast-types-flow@0.0.7, ast-types-flow@^0.0.7:
integrity sha1-9wtzXGvKGlycItmCw+Oef+ujva0=
ast-types@0.x.x:
- version "0.13.2"
- resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.13.2.tgz#df39b677a911a83f3a049644fb74fdded23cea48"
- integrity sha512-uWMHxJxtfj/1oZClOxDEV1sQ1HCDkA4MG8Gr69KKeBjEVH0R84WlejZ0y2DcwyBlpAEMltmVYkVgqfLFb2oyiA==
+ version "0.13.3"
+ resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.13.3.tgz#50da3f28d17bdbc7969a3a2d83a0e4a72ae755a7"
+ integrity sha512-XTZ7xGML849LkQP86sWdQzfhwbt3YwIO6MqbX9mUNYY98VKaaVZP7YNNm70IpwecbkkxmfC5IYAzOQ/2p29zRA==
astral-regex@^1.0.0:
version "1.0.0"
@@ -421,23 +495,23 @@ asynckit@^0.4.0:
resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
-atob@^2.1.1:
+atob@^2.1.2:
version "2.1.2"
resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
autoprefixer@^9.0.0, autoprefixer@^9.6.1:
- version "9.6.1"
- resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.6.1.tgz#51967a02d2d2300bb01866c1611ec8348d355a47"
- integrity sha512-aVo5WxR3VyvyJxcJC3h4FKfwCQvQWb1tSI5VHNibddCVWrcD1NvlxEweg3TSgiPztMnWfjpy2FURKA2kvDE+Tw==
+ version "9.8.0"
+ resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.0.tgz#68e2d2bef7ba4c3a65436f662d0a56a741e56511"
+ integrity sha512-D96ZiIHXbDmU02dBaemyAg53ez+6F5yZmapmgKcjm35yEe1uVDYI8hGW3VYoGRaG290ZFf91YxHrR518vC0u/A==
dependencies:
- browserslist "^4.6.3"
- caniuse-lite "^1.0.30000980"
+ browserslist "^4.12.0"
+ caniuse-lite "^1.0.30001061"
chalk "^2.4.2"
normalize-range "^0.1.2"
num2fraction "^1.2.2"
- postcss "^7.0.17"
- postcss-value-parser "^4.0.0"
+ postcss "^7.0.30"
+ postcss-value-parser "^4.1.0"
aws-sign2@~0.7.0:
version "0.7.0"
@@ -445,16 +519,14 @@ aws-sign2@~0.7.0:
integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
aws4@^1.8.0:
- version "1.8.0"
- resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
- integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==
+ version "1.10.0"
+ resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.10.0.tgz#a17b3a8ea811060e74d47d306122400ad4497ae2"
+ integrity sha512-3YDiu347mtVtjpyV3u5kVqQLP242c06zwDOgpeRnybmXlYYsLbtTrUBUm8i8srONt+FWobl5aibnU1030PeeuA==
axobject-query@^2.0.2:
- version "2.0.2"
- resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.0.2.tgz#ea187abe5b9002b377f925d8bf7d1c561adf38f9"
- integrity sha512-MCeek8ZH7hKyO1rWUbKNQBbl4l2eY0ntk7OGi+q0RlafrCnfPxC06WZA+uebCfmYp4mNU9jRBP1AhGyf8+W3ww==
- dependencies:
- ast-types-flow "0.0.7"
+ version "2.1.2"
+ resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.1.2.tgz#2bdffc0371e643e5f03ba99065d5179b9ca79799"
+ integrity sha512-ICt34ZmrVt8UQnvPl6TVyDTkmhXmAyAT4Jh5ugfGUX4MOrZ+U/ZY6/sdylRw3qGNr9Ub5AJsaHeDMzNLehRdOQ==
babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
version "6.26.0"
@@ -973,9 +1045,9 @@ babylon@^6.18.0:
integrity sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==
bail@^1.0.0:
- version "1.0.4"
- resolved "https://registry.yarnpkg.com/bail/-/bail-1.0.4.tgz#7181b66d508aa3055d3f6c13f0a0c720641dde9b"
- integrity sha512-S8vuDB4w6YpRhICUDET3guPlQpaJl7od94tpZ0Fvnyp+MKW/HyDTcRDck+29C9g+d/qQHnddRH3+94kZdrW0Ww==
+ version "1.0.5"
+ resolved "https://registry.yarnpkg.com/bail/-/bail-1.0.5.tgz#b6fa133404a392cbc1f8c4bf63f5953351e7a776"
+ integrity sha512-xFbRxM1tahm08yHBP16MMjVUAvDaBMD38zsM9EMAUN61omwLmKlOpB/Zku5QkjZ8TZ4vn53pj+t518cH0S03RQ==
balanced-match@^1.0.0:
version "1.0.0"
@@ -1007,6 +1079,18 @@ binary-extensions@^1.0.0:
resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65"
integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==
+bindings@^1.5.0:
+ version "1.5.0"
+ resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df"
+ integrity sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==
+ dependencies:
+ file-uri-to-path "1.0.0"
+
+bluebird@^3.5.0:
+ version "3.7.2"
+ resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
+ integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
+
brace-expansion@^1.1.7:
version "1.1.11"
resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
@@ -1052,14 +1136,20 @@ browserslist@^3.2.6:
caniuse-lite "^1.0.30000844"
electron-to-chromium "^1.3.47"
-browserslist@^4.6.3:
- version "4.6.6"
- resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.6.6.tgz#6e4bf467cde520bc9dbdf3747dafa03531cec453"
- integrity sha512-D2Nk3W9JL9Fp/gIcWei8LrERCS+eXu9AM5cfXA8WEZ84lFks+ARnZ0q/R69m2SV3Wjma83QDDPxsNKXUwdIsyA==
+browserslist@^4.12.0:
+ version "4.12.0"
+ resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.12.0.tgz#06c6d5715a1ede6c51fc39ff67fd647f740b656d"
+ integrity sha512-UH2GkcEDSI0k/lRkuDSzFl9ZZ87skSy9w2XAn1MsZnL+4c4rqbBd3e82UWHbYDpztABrPBhZsTEeuxVfHppqDg==
dependencies:
- caniuse-lite "^1.0.30000984"
- electron-to-chromium "^1.3.191"
- node-releases "^1.1.25"
+ caniuse-lite "^1.0.30001043"
+ electron-to-chromium "^1.3.413"
+ node-releases "^1.1.53"
+ pkg-up "^2.0.0"
+
+buffer-crc32@~0.2.3:
+ version "0.2.13"
+ resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
+ integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=
buffer-from@^1.0.0:
version "1.1.1"
@@ -1136,15 +1226,20 @@ camelcase@^4.1.0:
resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=
+camelcase@^5.0.0:
+ version "5.3.1"
+ resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
+ integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
+
caniuse-db@^1.0.30000639:
- version "1.0.30000989"
- resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000989.tgz#bd8dd2789725685054a2c5ef95804f9e6e50fb32"
- integrity sha512-5pkU/t9nueoBgELZOCpK+wN4wK6MkIz1Q9lGZSgLwg4xR8EhLY9r0qj6T2bUI8Cq9pGbioEar+Zqgosk5fpbjg==
+ version "1.0.30001076"
+ resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30001076.tgz#bbd4b054164a81506f75c28acdc72261712ddb96"
+ integrity sha512-xakM7JFFxRXDZc5OJa97zBp0tRlW1NUgvLxLD0i9TUQ76wbHUAbpbFNb35uDOAur2eLqvHmoArqHXGMUoiK+oA==
-caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30000980, caniuse-lite@^1.0.30000984:
- version "1.0.30000989"
- resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000989.tgz#b9193e293ccf7e4426c5245134b8f2a56c0ac4b9"
- integrity sha512-vrMcvSuMz16YY6GSVZ0dWDTJP8jqk3iFQ/Aq5iqblPwxSVVZI+zxDyTX0VPqtQsDnfdrBDcsmhgTEOh5R8Lbpw==
+caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30001043, caniuse-lite@^1.0.30001061:
+ version "1.0.30001066"
+ resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001066.tgz#0a8a58a10108f2b9bf38e7b65c237b12fd9c5f04"
+ integrity sha512-Gfj/WAastBtfxLws0RCh2sDbTK/8rJuSeZMecrSkNGYxPcv7EzblmDGfWQCFEQcSqYE2BRgQiJh8HOD07N5hIw==
caseless@~0.12.0:
version "0.12.0"
@@ -1152,14 +1247,14 @@ caseless@~0.12.0:
integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
ccount@^1.0.0:
- version "1.0.4"
- resolved "https://registry.yarnpkg.com/ccount/-/ccount-1.0.4.tgz#9cf2de494ca84060a2a8d2854edd6dfb0445f386"
- integrity sha512-fpZ81yYfzentuieinmGnphk0pLkOTMm6MZdVqwd77ROvhko6iujLNGrHH5E7utq3ygWklwfmwuG+A7P+NpqT6w==
+ version "1.0.5"
+ resolved "https://registry.yarnpkg.com/ccount/-/ccount-1.0.5.tgz#ac82a944905a65ce204eb03023157edf29425c17"
+ integrity sha512-MOli1W+nfbPLlKEhInaxhRdp7KVLFxLN5ykwzHgLsLI3H3gs5jjFAK4Eoj3OzzcxCtumDaI8onoVDeQyWaNTkw==
-chai-nightwatch@^0.3.0:
- version "0.3.0"
- resolved "https://registry.yarnpkg.com/chai-nightwatch/-/chai-nightwatch-0.3.0.tgz#a3506a81942fbed6aed9e0a914ae32be187f9735"
- integrity sha512-NHpHLKQO0M7uNVJ10qlPIzHN9+6f873kYh6dYAn291a1CVESrrH6crbTJwZ3376trtzb6HPa80QYt3gMTL1o4g==
+chai-nightwatch@^0.4.0:
+ version "0.4.0"
+ resolved "https://registry.yarnpkg.com/chai-nightwatch/-/chai-nightwatch-0.4.0.tgz#028dc2bf234d9ef1e895cb134027795b1c7c9467"
+ integrity sha512-1xw74vR02XiHzo4wQfHqme2nqYPIzYnK5s3DMST7UW8FIHDWD7qplg+DTJ5FIPcmWiGYX/Re0CzvOcZQKJm1Uw==
dependencies:
assertion-error "1.0.0"
deep-eql "0.1.3"
@@ -1184,25 +1279,33 @@ chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.1, chalk@^2.4
escape-string-regexp "^1.0.5"
supports-color "^5.3.0"
+chalk@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4"
+ integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==
+ dependencies:
+ ansi-styles "^4.1.0"
+ supports-color "^7.1.0"
+
character-entities-html4@^1.0.0:
- version "1.1.3"
- resolved "https://registry.yarnpkg.com/character-entities-html4/-/character-entities-html4-1.1.3.tgz#5ce6e01618e47048ac22f34f7f39db5c6fd679ef"
- integrity sha512-SwnyZ7jQBCRHELk9zf2CN5AnGEc2nA+uKMZLHvcqhpPprjkYhiLn0DywMHgN5ttFZuITMATbh68M6VIVKwJbcg==
+ version "1.1.4"
+ resolved "https://registry.yarnpkg.com/character-entities-html4/-/character-entities-html4-1.1.4.tgz#0e64b0a3753ddbf1fdc044c5fd01d0199a02e125"
+ integrity sha512-HRcDxZuZqMx3/a+qrzxdBKBPUpxWEq9xw2OPZ3a/174ihfrQKVsFhqtthBInFy1zZ9GgZyFXOatNujm8M+El3g==
character-entities-legacy@^1.0.0:
- version "1.1.3"
- resolved "https://registry.yarnpkg.com/character-entities-legacy/-/character-entities-legacy-1.1.3.tgz#3c729991d9293da0ede6dddcaf1f2ce1009ee8b4"
- integrity sha512-YAxUpPoPwxYFsslbdKkhrGnXAtXoHNgYjlBM3WMXkWGTl5RsY3QmOyhwAgL8Nxm9l5LBThXGawxKPn68y6/fww==
+ version "1.1.4"
+ resolved "https://registry.yarnpkg.com/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz#94bc1845dce70a5bb9d2ecc748725661293d8fc1"
+ integrity sha512-3Xnr+7ZFS1uxeiUDvV02wQ+QDbc55o97tIV5zHScSPJpcLm/r0DFPcoY3tYRp+VZukxuMeKgXYmsXQHO05zQeA==
character-entities@^1.0.0:
- version "1.2.3"
- resolved "https://registry.yarnpkg.com/character-entities/-/character-entities-1.2.3.tgz#bbed4a52fe7ef98cc713c6d80d9faa26916d54e6"
- integrity sha512-yB4oYSAa9yLcGyTbB4ItFwHw43QHdH129IJ5R+WvxOkWlyFnR5FAaBNnUq4mcxsTVZGh28bHoeTHMKXH1wZf3w==
+ version "1.2.4"
+ resolved "https://registry.yarnpkg.com/character-entities/-/character-entities-1.2.4.tgz#e12c3939b7eaf4e5b15e7ad4c5e28e1d48c5b16b"
+ integrity sha512-iBMyeEHxfVnIakwOuDXpVkc54HijNgCyQB2w0VfGQThle6NXn50zU6V/u+LDhxHcDUPojn6Kpga3PTAD8W1bQw==
character-reference-invalid@^1.0.0:
- version "1.1.3"
- resolved "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-1.1.3.tgz#1647f4f726638d3ea4a750cf5d1975c1c7919a85"
- integrity sha512-VOq6PRzQBam/8Jm6XBGk2fNEnHXAdGd6go0rtd4weAGECBamHDwwCQSOT12TACIYUZegUXnV6xBXqUssijtxIg==
+ version "1.1.4"
+ resolved "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz#083329cda0eae272ab3dbbf37e9a382c13af1560"
+ integrity sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==
chardet@^0.4.0:
version "0.4.2"
@@ -1210,9 +1313,9 @@ chardet@^0.4.0:
integrity sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I=
chokidar@^2.0.0:
- version "2.1.6"
- resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.6.tgz#b6cad653a929e244ce8a834244164d241fa954c5"
- integrity sha512-V2jUo67OKkc6ySiRpJrjlpJKl9kDuG+Xb8VgsGzb+aEouhgS1D0weyPU4lEzdAcsCAvrih2J2BqyXqHWvVLw5g==
+ version "2.1.8"
+ resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917"
+ integrity sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==
dependencies:
anymatch "^2.0.0"
async-each "^1.0.1"
@@ -1228,11 +1331,6 @@ chokidar@^2.0.0:
optionalDependencies:
fsevents "^1.2.7"
-chownr@^1.1.1:
- version "1.1.2"
- resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.2.tgz#a18f1e0b269c8a6a5d3c86eb298beb14c3dd7bf6"
- integrity sha512-GkfeAQh+QNy3wquu9oIZr6SS5x7wGdSgNQvD10X3r+AZr1Oys22HW8kAmDMvNg2+Dm0TeGaEuO8gFwdBXxwO8A==
-
chromedriver@^75.1.0:
version "75.1.0"
resolved "https://registry.yarnpkg.com/chromedriver/-/chromedriver-75.1.0.tgz#edfef5d7a9b16b6f8a12ddb58cbac76ae52732fd"
@@ -1244,6 +1342,11 @@ chromedriver@^75.1.0:
request "^2.88.0"
tcp-port-used "^1.0.1"
+ci-info@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46"
+ integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==
+
circular-json@^0.3.1:
version "0.3.3"
resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.3.tgz#815c99ea84f6809529d2f45791bdf82711352d66"
@@ -1266,10 +1369,31 @@ cli-cursor@^2.1.0:
dependencies:
restore-cursor "^2.0.0"
+cli-cursor@^3.1.0:
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307"
+ integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==
+ dependencies:
+ restore-cursor "^3.1.0"
+
+cli-spinners@^2.2.0:
+ version "2.3.0"
+ resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.3.0.tgz#0632239a4b5aa4c958610142c34bb7a651fc8df5"
+ integrity sha512-Xs2Hf2nzrvJMFKimOR7YR0QwZ8fc0u98kdtwN1eNAZzNQgH3vK2pXzff6GJtKh7S5hoJ87ECiAiZFS2fb5Ii2w==
+
cli-width@^2.0.0:
- version "2.2.0"
- resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
- integrity sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=
+ version "2.2.1"
+ resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.1.tgz#b0433d0b4e9c847ef18868a4ef16fd5fc8271c48"
+ integrity sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==
+
+cliui@^5.0.0:
+ version "5.0.0"
+ resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5"
+ integrity sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==
+ dependencies:
+ string-width "^3.1.0"
+ strip-ansi "^5.2.0"
+ wrap-ansi "^5.1.0"
clone-regexp@^1.0.0:
version "1.0.1"
@@ -1279,20 +1403,20 @@ clone-regexp@^1.0.0:
is-regexp "^1.0.0"
is-supported-regexp-flag "^1.0.0"
+clone@^1.0.2:
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
+ integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4=
+
co@^4.6.0:
version "4.6.0"
resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=
-code-point-at@^1.0.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
- integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
-
collapse-white-space@^1.0.2:
- version "1.0.5"
- resolved "https://registry.yarnpkg.com/collapse-white-space/-/collapse-white-space-1.0.5.tgz#c2495b699ab1ed380d29a1091e01063e75dbbe3a"
- integrity sha512-703bOOmytCYAX9cXYqoikYIx6twmFCXsnzRQheBcTG3nzKYBR4P/+wkYeH+Mvj7qUz8zZDtdyzbxfnEi/kYzRQ==
+ version "1.0.6"
+ resolved "https://registry.yarnpkg.com/collapse-white-space/-/collapse-white-space-1.0.6.tgz#e63629c0016665792060dbbeb79c42239d2c5287"
+ integrity sha512-jEovNnrhMuqyCcjfEJA56v0Xq8SkIoPKDyaHahwo3POf4qcSXqMYuwNcOTzp74vTsR9Tn08z4MxWqAhcekogkQ==
collection-visit@^1.0.0:
version "1.0.0"
@@ -1309,12 +1433,19 @@ color-convert@^1.9.0:
dependencies:
color-name "1.1.3"
+color-convert@^2.0.1:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
+ integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
+ dependencies:
+ color-name "~1.1.4"
+
color-name@1.1.3:
version "1.1.3"
resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
-color-name@^1.1.4:
+color-name@^1.1.4, color-name@~1.1.4:
version "1.1.4"
resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
@@ -1326,15 +1457,10 @@ combined-stream@^1.0.6, combined-stream@~1.0.6:
dependencies:
delayed-stream "~1.0.0"
-commander@2.15.1:
- version "2.15.1"
- resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f"
- integrity sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==
-
commander@^2.11.0:
- version "2.20.0"
- resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"
- integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==
+ version "2.20.3"
+ resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
+ integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
component-emitter@^1.2.1:
version "1.3.0"
@@ -1346,7 +1472,7 @@ concat-map@0.0.1:
resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
-concat-stream@1.6.2, concat-stream@^1.6.0:
+concat-stream@^1.6.0, concat-stream@^1.6.2:
version "1.6.2"
resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
@@ -1357,24 +1483,19 @@ concat-stream@1.6.2, concat-stream@^1.6.0:
typedarray "^0.0.6"
confusing-browser-globals@^1.0.5:
- version "1.0.8"
- resolved "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.8.tgz#93ffec1f82a6e2bf2bc36769cc3a92fa20e502f3"
- integrity sha512-lI7asCibVJ6Qd3FGU7mu4sfG4try4LX3+GVS+Gv8UlrEf2AeW57piecapnog2UHZSbcX/P/1UDWVaTsblowlZg==
-
-console-control-strings@^1.0.0, console-control-strings@~1.1.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
- integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
+ version "1.0.9"
+ resolved "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.9.tgz#72bc13b483c0276801681871d4898516f8f54fdd"
+ integrity sha512-KbS1Y0jMtyPgIxjO7ZzMAuUpAKMt1SzCL9fsrKsX6b0zJPTaT0SiSPmewwVZg9UAO83HVIlEhZF84LIjZ0lmAw==
contains-path@^0.1.0:
version "0.1.0"
resolved "https://registry.yarnpkg.com/contains-path/-/contains-path-0.1.0.tgz#fe8cf184ff6670b6baef01a9d4861a5cbec4120a"
integrity sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo=
-convert-source-map@^1.1.0, convert-source-map@^1.5.1:
- version "1.6.0"
- resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.6.0.tgz#51b537a8c43e0f04dec1993bffcdd504e758ac20"
- integrity sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==
+convert-source-map@^1.5.1, convert-source-map@^1.7.0:
+ version "1.7.0"
+ resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442"
+ integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==
dependencies:
safe-buffer "~5.1.1"
@@ -1383,10 +1504,15 @@ copy-descriptor@^0.1.0:
resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
+core-js-pure@^3.0.0:
+ version "3.6.5"
+ resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.6.5.tgz#c79e75f5e38dbc85a662d91eea52b8256d53b813"
+ integrity sha512-lacdXOimsiD0QyNf9BC/mxivNJ/ybBGJXQFKzRekp1WTHoVUWsUHEn+2T8GJAzzIhyOuXA+gOxCVN3l+5PLPUA==
+
core-js@^2.4.0, core-js@^2.5.0:
- version "2.6.9"
- resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.9.tgz#6b4b214620c834152e179323727fc19741b084f2"
- integrity sha512-HOpZf6eXmnl7la+cUdMnLvUxKNqLUzJvgIziQ0DiF3JwSImNphIqdGqzj6hIKyX04MmV0poclQ7+wjWvxQyR2A==
+ version "2.6.11"
+ resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c"
+ integrity sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==
core-util-is@1.0.2, core-util-is@~1.0.0:
version "1.0.2"
@@ -1404,12 +1530,11 @@ cosmiconfig@^5.0.0:
parse-json "^4.0.0"
cross-env@^5.1.3:
- version "5.2.0"
- resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-5.2.0.tgz#6ecd4c015d5773e614039ee529076669b9d126f2"
- integrity sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==
+ version "5.2.1"
+ resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-5.2.1.tgz#b2c76c1ca7add66dc874d11798466094f551b34d"
+ integrity sha512-1yHhtcfAd1r4nwQgknowuUNfIT9E8dOMMspC36g45dN+iD1blloi7xp8X/xAIDnjHWyt1uQ8PHk2fkNaym7soQ==
dependencies:
cross-spawn "^6.0.5"
- is-windows "^1.0.0"
cross-spawn@^5.1.0:
version "5.1.0"
@@ -1431,15 +1556,10 @@ cross-spawn@^6.0.5:
shebang-command "^1.2.0"
which "^1.2.9"
-css-unit-converter@^1.1.1:
- version "1.1.1"
- resolved "https://registry.yarnpkg.com/css-unit-converter/-/css-unit-converter-1.1.1.tgz#d9b9281adcfd8ced935bdbaba83786897f64e996"
- integrity sha1-2bkoGtz9jO2TW9urqDeGiX9k6ZY=
-
-cssesc@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-2.0.0.tgz#3b13bd1bb1cb36e1bcb5a4dcd27f54c5dcb35703"
- integrity sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg==
+cssesc@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
+ integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
currently-unhandled@^0.4.1:
version "0.4.1"
@@ -1449,9 +1569,9 @@ currently-unhandled@^0.4.1:
array-find-index "^1.0.1"
damerau-levenshtein@^1.0.4:
- version "1.0.5"
- resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.5.tgz#780cf7144eb2e8dbd1c3bb83ae31100ccc31a414"
- integrity sha512-CBCRqFnpu715iPmw1KrdOrzRqbdFwQTwAWyyyYS42+iAgHCuXZ+/TdMgQkUENPomxEz9z1BEzuQU2Xw0kUuAgA==
+ version "1.0.6"
+ resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.6.tgz#143c1641cb3d85c60c32329e26899adea8701791"
+ integrity sha512-JVrozIeElnj3QzfUIt8tB8YMluBJom4Vw9qTPpjGYQ9fYlB3D/rb6OordUxf3xeFB35LKWs0xqcO5U6ySvBtug==
dashdash@^1.12.0:
version "1.14.1"
@@ -1460,14 +1580,12 @@ dashdash@^1.12.0:
dependencies:
assert-plus "^1.0.0"
-data-uri-to-buffer@2:
- version "2.0.1"
- resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-2.0.1.tgz#ca8f56fe38b1fd329473e9d1b4a9afcd8ce1c045"
- integrity sha512-OkVVLrerfAKZlW2ZZ3Ve2y65jgiWqBKsTfUIAFbn8nVbPcCZg6l6gikKlEYv0kXcmzqGm6mFq/Jf2vriuEkv8A==
- dependencies:
- "@types/node" "^8.0.7"
+data-uri-to-buffer@1:
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-1.2.0.tgz#77163ea9c20d8641b4707e8f18abdf9a78f34835"
+ integrity sha512-vKQ9DTQPN1FLYiiEEOQ6IBGFqvjCa5rSK3cWMy/Nespm5d/x3dGFT9UBZnkLxCwua/IXBi2TYnwTEpsOvhC4UQ==
-debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9:
+debug@2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9:
version "2.6.9"
resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
@@ -1481,7 +1599,14 @@ debug@3.1.0:
dependencies:
ms "2.0.0"
-debug@4, debug@^4.0.0, debug@^4.1.0:
+debug@3.2.6, debug@^3.1.0:
+ version "3.2.6"
+ resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
+ integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
+ dependencies:
+ ms "^2.1.1"
+
+debug@4, debug@^4.0.0, debug@^4.1.0, debug@^4.1.1:
version "4.1.1"
resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
@@ -1495,13 +1620,6 @@ debug@4.1.0:
dependencies:
ms "^2.1.1"
-debug@^3.1.0, debug@^3.2.6:
- version "3.2.6"
- resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
- integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
- dependencies:
- ms "^2.1.1"
-
decamelize-keys@^1.0.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9"
@@ -1510,7 +1628,7 @@ decamelize-keys@^1.0.0:
decamelize "^1.1.0"
map-obj "^1.0.0"
-decamelize@^1.1.0:
+decamelize@^1.1.0, decamelize@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
@@ -1527,16 +1645,18 @@ deep-eql@0.1.3:
dependencies:
type-detect "0.1.1"
-deep-extend@^0.6.0:
- version "0.6.0"
- resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
- integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
-
deep-is@^0.1.3, deep-is@~0.1.3:
version "0.1.3"
resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
+defaults@^1.0.3:
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d"
+ integrity sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=
+ dependencies:
+ clone "^1.0.2"
+
define-properties@^1.1.2, define-properties@^1.1.3:
version "1.1.3"
resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
@@ -1593,11 +1713,6 @@ delayed-stream@~1.0.0:
resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
-delegates@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
- integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
-
depd@~1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
@@ -1610,11 +1725,6 @@ detect-indent@^4.0.0:
dependencies:
repeating "^2.0.0"
-detect-libc@^1.0.2:
- version "1.0.3"
- resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
- integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
-
diff@3.5.0:
version "3.5.0"
resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
@@ -1643,9 +1753,9 @@ doctrine@^2.1.0:
esutils "^2.0.2"
dom-serializer@0:
- version "0.2.1"
- resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.1.tgz#13650c850daffea35d8b626a4cfc4d3a17643fdb"
- integrity sha512-sK3ujri04WyjwQXVoK4PU3y8ula1stq10GJZpqHIUgoGZdsGzAGu65BnU3d08aTVSvO7mGPZUc0wTEDL+qGE0Q==
+ version "0.2.2"
+ resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.2.tgz#1afb81f533717175d478655debc5e332d9f9bb51"
+ integrity sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==
dependencies:
domelementtype "^2.0.1"
entities "^2.0.0"
@@ -1675,12 +1785,12 @@ domutils@^1.5.1:
dom-serializer "0"
domelementtype "1"
-dot-prop@^4.1.1:
- version "4.2.0"
- resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.0.tgz#1f19e0c2e1aa0e32797c49799f2837ac6af69c57"
- integrity sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==
+dot-prop@^5.2.0:
+ version "5.2.0"
+ resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.2.0.tgz#c34ecc29556dc45f1f4c22697b6f4904e0cc4fcb"
+ integrity sha512-uEUyaDKoSQ1M4Oq8l45hSE26SnTxL6snNnqvK/VWx5wJhmff5z0FUVJDKDanor/6w3kzE3i7XZOk+7wC0EXr1A==
dependencies:
- is-obj "^1.0.0"
+ is-obj "^2.0.0"
dotenv-safe@^5.0.1:
version "5.0.1"
@@ -1707,15 +1817,15 @@ ecc-jsbn@~0.1.1:
jsbn "~0.1.0"
safer-buffer "^2.1.0"
-ejs@^2.5.9:
- version "2.6.2"
- resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.6.2.tgz#3a32c63d1cd16d11266cd4703b14fec4e74ab4f6"
- integrity sha512-PcW2a0tyTuPHz3tWyYqtK6r1fZ3gp+3Sop8Ph+ZYN81Ob5rwmbHEzaqs10N3BEsaGTkh/ooniXK+WwszGlc2+Q==
+ejs@^2.7.4:
+ version "2.7.4"
+ resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.7.4.tgz#48661287573dcc53e366c7a1ae52c3a120eec9ba"
+ integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==
-electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.191, electron-to-chromium@^1.3.47:
- version "1.3.227"
- resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.227.tgz#8dccc63b6456b7b63007b965f79920b99e86ddc0"
- integrity sha512-LQJmt0QcUzC/mLjG+ha5QhXgNQ2T2BOxRecuaU/hd92RnZt6G3ZGONsAe7Xvo9SoBvre/POElMoyK77mXjrr3w==
+electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.413, electron-to-chromium@^1.3.47:
+ version "1.3.456"
+ resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.456.tgz#5125bce136b04a8e39473696509e83038f679cbd"
+ integrity sha512-jaVZ9+8HG2qvEN7c9r5EVguvhtevITJou4L10XuqoiZUoXIMF5qLG1pB9raP3WFcME4exDZRq1b6qyCA+u5Vew==
emoji-regex@^7.0.1, emoji-regex@^7.0.2:
version "7.0.3"
@@ -1728,9 +1838,14 @@ entities@^1.1.1:
integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==
entities@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/entities/-/entities-2.0.0.tgz#68d6084cab1b079767540d80e56a39b423e4abf4"
- integrity sha512-D9f7V0JSRwIxlRI2mjMqufDrRDnx8p+eEOz7aUM9SuvF8gsBzra0/6tbjl1m8eQHrZlYj6PxqE00hZ1SAIKPLw==
+ version "2.0.2"
+ resolved "https://registry.yarnpkg.com/entities/-/entities-2.0.2.tgz#ac74db0bba8d33808bbf36809c3a5c3683531436"
+ integrity sha512-dmD3AvJQBUjKpcNkoqr+x+IF0SdRtPz9Vk0uTy4yWqga9ibB6s4v++QFWNohjiUGoMlF552ZvNyXDxz5iW0qmw==
+
+envinfo@^7.5.1:
+ version "7.5.1"
+ resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.5.1.tgz#93c26897225a00457c75e734d354ea9106a72236"
+ integrity sha512-hQBkDf2iO4Nv0CNHpCuSBeaSrveU6nThVxFGTrq/eDlV716UQk09zChaJae4mZRsos1x4YLY2TaH3LHUae3ZmQ==
error-ex@^1.2.0, error-ex@^1.3.1:
version "1.3.2"
@@ -1739,22 +1854,27 @@ error-ex@^1.2.0, error-ex@^1.3.1:
dependencies:
is-arrayish "^0.2.1"
-es-abstract@^1.11.0, es-abstract@^1.12.0, es-abstract@^1.7.0:
- version "1.13.0"
- resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.13.0.tgz#ac86145fdd5099d8dd49558ccba2eaf9b88e24e9"
- integrity sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==
+es-abstract@^1.17.0, es-abstract@^1.17.0-next.1, es-abstract@^1.17.5:
+ version "1.17.5"
+ resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.5.tgz#d8c9d1d66c8981fb9200e2251d799eee92774ae9"
+ integrity sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==
dependencies:
- es-to-primitive "^1.2.0"
+ es-to-primitive "^1.2.1"
function-bind "^1.1.1"
has "^1.0.3"
- is-callable "^1.1.4"
- is-regex "^1.0.4"
- object-keys "^1.0.12"
+ has-symbols "^1.0.1"
+ is-callable "^1.1.5"
+ is-regex "^1.0.5"
+ object-inspect "^1.7.0"
+ object-keys "^1.1.1"
+ object.assign "^4.1.0"
+ string.prototype.trimleft "^2.1.1"
+ string.prototype.trimright "^2.1.1"
-es-to-primitive@^1.2.0:
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.0.tgz#edf72478033456e8dda8ef09e00ad9650707f377"
- integrity sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==
+es-to-primitive@^1.2.1:
+ version "1.2.1"
+ resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
+ integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==
dependencies:
is-callable "^1.1.4"
is-date-object "^1.0.1"
@@ -1778,11 +1898,11 @@ escape-string-regexp@1.0.5, escape-string-regexp@^1.0.2, escape-string-regexp@^1
integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
escodegen@1.x.x:
- version "1.12.0"
- resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.12.0.tgz#f763daf840af172bb3a2b6dd7219c0e17f7ff541"
- integrity sha512-TuA+EhsanGcme5T3R0L80u4t8CpbXQjegRmf7+FPTJrtCTErXFeelblRgHQa1FofEzqYYJmJ/OqjTwREp9qgmg==
+ version "1.14.1"
+ resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.1.tgz#ba01d0c8278b5e95a9a45350142026659027a457"
+ integrity sha512-Bmt7NcRySdIfNPfU2ZoXDrrXsG9ZjvDxcAlMfDUgRBjLOWTuIACXPBFJH7Z+cLb40JeQco5toikyc9t9P8E9SQ==
dependencies:
- esprima "^3.1.3"
+ esprima "^4.0.1"
estraverse "^4.2.0"
esutils "^2.0.2"
optionator "^0.8.1"
@@ -1815,37 +1935,38 @@ eslint-config-prettier@^2.9.0:
get-stdin "^5.0.1"
eslint-import-resolver-node@^0.3.2:
- version "0.3.2"
- resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.2.tgz#58f15fb839b8d0576ca980413476aab2472db66a"
- integrity sha512-sfmTqJfPSizWu4aymbPr4Iidp5yKm8yDkHp+Ir3YiTHiiDfxh69mOUsmiqW6RZ9zRXFaF64GtYmN7e+8GHBv6Q==
+ version "0.3.3"
+ resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.3.tgz#dbaa52b6b2816b50bc6711af75422de808e98404"
+ integrity sha512-b8crLDo0M5RSe5YG8Pu2DYBj71tSB6OvXkfzwbJU2w7y8P4/yo0MyF8jU26IEuEuHF2K5/gcAJE3LhQGqBBbVg==
dependencies:
debug "^2.6.9"
- resolve "^1.5.0"
+ resolve "^1.13.1"
-eslint-module-utils@^2.4.0:
- version "2.4.1"
- resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.4.1.tgz#7b4675875bf96b0dbf1b21977456e5bb1f5e018c"
- integrity sha512-H6DOj+ejw7Tesdgbfs4jeS4YMFrT8uI8xwd1gtQqXssaR0EQ26L+2O/w6wkYFy2MymON0fTwHmXBvvfLNZVZEw==
+eslint-module-utils@^2.4.1:
+ version "2.6.0"
+ resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz#579ebd094f56af7797d19c9866c9c9486629bfa6"
+ integrity sha512-6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA==
dependencies:
- debug "^2.6.8"
+ debug "^2.6.9"
pkg-dir "^2.0.0"
eslint-plugin-import@^2.13.0:
- version "2.18.2"
- resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.18.2.tgz#02f1180b90b077b33d447a17a2326ceb400aceb6"
- integrity sha512-5ohpsHAiUBRNaBWAF08izwUGlbrJoJJ+W9/TBwsGoR1MnlgfwMIKrFeSjWbt6moabiXW9xNvtFz+97KHRfI4HQ==
+ version "2.20.2"
+ resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.20.2.tgz#91fc3807ce08be4837141272c8b99073906e588d"
+ integrity sha512-FObidqpXrR8OnCh4iNsxy+WACztJLXAHBO5hK79T1Hc77PgQZkyDGA5Ag9xAvRpglvLNxhH/zSmZ70/pZ31dHg==
dependencies:
array-includes "^3.0.3"
+ array.prototype.flat "^1.2.1"
contains-path "^0.1.0"
debug "^2.6.9"
doctrine "1.5.0"
eslint-import-resolver-node "^0.3.2"
- eslint-module-utils "^2.4.0"
+ eslint-module-utils "^2.4.1"
has "^1.0.3"
minimatch "^3.0.4"
object.values "^1.1.0"
read-pkg-up "^2.0.0"
- resolve "^1.11.0"
+ resolve "^1.12.0"
eslint-plugin-jsx-a11y@^6.0.3:
version "6.2.3"
@@ -1871,19 +1992,21 @@ eslint-plugin-prettier@^2.6.2:
jest-docblock "^21.0.0"
eslint-plugin-react@^7.10.0:
- version "7.14.3"
- resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.14.3.tgz#911030dd7e98ba49e1b2208599571846a66bdf13"
- integrity sha512-EzdyyBWC4Uz2hPYBiEJrKCUi2Fn+BJ9B/pJQcjw5X+x/H2Nm59S4MJIvL4O5NEE0+WbnQwEBxWY03oUk+Bc3FA==
+ version "7.20.0"
+ resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.20.0.tgz#f98712f0a5e57dfd3e5542ef0604b8739cd47be3"
+ integrity sha512-rqe1abd0vxMjmbPngo4NaYxTcR3Y4Hrmc/jg4T+sYz63yqlmJRknpEQfmWY+eDWPuMmix6iUIK+mv0zExjeLgA==
dependencies:
- array-includes "^3.0.3"
+ array-includes "^3.1.1"
doctrine "^2.1.0"
has "^1.0.3"
- jsx-ast-utils "^2.1.0"
- object.entries "^1.1.0"
- object.fromentries "^2.0.0"
- object.values "^1.1.0"
+ jsx-ast-utils "^2.2.3"
+ object.entries "^1.1.1"
+ object.fromentries "^2.0.2"
+ object.values "^1.1.1"
prop-types "^15.7.2"
- resolve "^1.10.1"
+ resolve "^1.15.1"
+ string.prototype.matchall "^4.0.2"
+ xregexp "^4.3.0"
eslint-scope@^3.7.1:
version "3.7.3"
@@ -1950,22 +2073,22 @@ espree@^3.5.4:
acorn "^5.5.0"
acorn-jsx "^3.0.0"
-esprima@3.x.x, esprima@^3.1.3:
+esprima@3.x.x:
version "3.1.3"
resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
integrity sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=
-esprima@^4.0.0:
+esprima@^4.0.0, esprima@^4.0.1:
version "4.0.1"
resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
esquery@^1.0.0:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.1.tgz#406c51658b1f5991a5f9b62b1dc25b00e3e5c708"
- integrity sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==
+ version "1.3.1"
+ resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.3.1.tgz#b78b5828aa8e214e29fb74c4d5b752e1c033da57"
+ integrity sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ==
dependencies:
- estraverse "^4.0.0"
+ estraverse "^5.1.0"
esrecurse@^4.1.0:
version "4.2.1"
@@ -1974,11 +2097,16 @@ esrecurse@^4.1.0:
dependencies:
estraverse "^4.1.0"
-estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0:
+estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0:
version "4.3.0"
resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
+estraverse@^5.1.0:
+ version "5.1.0"
+ resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.1.0.tgz#374309d39fd935ae500e7b92e8a6b4c720e59642"
+ integrity sha512-FyohXK+R0vE+y1nHLoBM7ZTyqRpqAlhdZHCWIWEviFLiGB8b04H6bQs8G+XTthacvT8VuwvteiP7RJSxMs8UEw==
+
esutils@^2.0.2:
version "2.0.3"
resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
@@ -2048,14 +2176,14 @@ extglob@^2.0.4:
to-regex "^3.0.1"
extract-zip@^1.6.7:
- version "1.6.7"
- resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.6.7.tgz#a840b4b8af6403264c8db57f4f1a74333ef81fe9"
- integrity sha1-qEC0uK9kAyZMjbV/Txp0Mz74H+k=
+ version "1.7.0"
+ resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.7.0.tgz#556cc3ae9df7f452c493a0cfb51cc30277940927"
+ integrity sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA==
dependencies:
- concat-stream "1.6.2"
- debug "2.6.9"
- mkdirp "0.5.1"
- yauzl "2.4.1"
+ concat-stream "^1.6.2"
+ debug "^2.6.9"
+ mkdirp "^0.5.4"
+ yauzl "^2.10.0"
extsprintf@1.3.0:
version "1.3.0"
@@ -2072,10 +2200,10 @@ fast-deep-equal@^1.0.0:
resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614"
integrity sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=
-fast-deep-equal@^2.0.1:
- version "2.0.1"
- resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
- integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=
+fast-deep-equal@^3.1.1:
+ version "3.1.1"
+ resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz#545145077c501491e33b15ec408c294376e94ae4"
+ integrity sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==
fast-diff@^1.1.1:
version "1.2.0"
@@ -2095,19 +2223,19 @@ fast-glob@^2.2.6:
micromatch "^3.1.10"
fast-json-stable-stringify@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
- integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I=
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
+ integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
-fast-levenshtein@~2.0.4:
+fast-levenshtein@~2.0.6:
version "2.0.6"
resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
-fd-slicer@~1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.0.1.tgz#8b5bcbd9ec327c5041bf9ab023fd6750f1177e65"
- integrity sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=
+fd-slicer@~1.1.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e"
+ integrity sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=
dependencies:
pend "~1.2.0"
@@ -2133,7 +2261,7 @@ file-entry-cache@^4.0.0:
dependencies:
flat-cache "^2.0.1"
-file-uri-to-path@1:
+file-uri-to-path@1, file-uri-to-path@1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"
integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==
@@ -2148,6 +2276,13 @@ fill-range@^4.0.0:
repeat-string "^1.6.1"
to-regex-range "^2.1.0"
+find-up@3.0.0, find-up@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
+ integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==
+ dependencies:
+ locate-path "^3.0.0"
+
find-up@^2.0.0, find-up@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
@@ -2174,15 +2309,22 @@ flat-cache@^2.0.1:
rimraf "2.6.3"
write "1.0.3"
+flat@^4.1.0:
+ version "4.1.0"
+ resolved "https://registry.yarnpkg.com/flat/-/flat-4.1.0.tgz#090bec8b05e39cba309747f1d588f04dbaf98db2"
+ integrity sha512-Px/TiLIznH7gEDlPXcUD4KnBusa6kR6ayRUVcnEAbreRIuhkqow/mun59BuRXwoYk7ZQOLW1ZM05ilIvK38hFw==
+ dependencies:
+ is-buffer "~2.0.3"
+
flatted@^2.0.0:
- version "2.0.1"
- resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.1.tgz#69e57caa8f0eacbc281d2e2cb458d46fdb449e08"
- integrity sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg==
+ version "2.0.2"
+ resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz#4575b21e2bcee7434aa9be662f4b7b5f9c2b5138"
+ integrity sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==
flatten@^1.0.2:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782"
- integrity sha1-2uRqnXj74lKSJYzB54CkHZXAN4I=
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.3.tgz#c1283ac9f27b368abc1e36d1ff7b04501a30356b"
+ integrity sha512-dVsPA/UwQ8+2uoFe5GHtiBMu48dWLTdsuEd7CKGlZlD78r1TTWBvDuFaFGKCo/ZfEr95Uk56vZoX86OsHkUeIg==
for-in@^1.0.2:
version "1.0.2"
@@ -2210,25 +2352,18 @@ fragment-cache@^0.2.1:
dependencies:
map-cache "^0.2.2"
-fs-minipass@^1.2.5:
- version "1.2.6"
- resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.6.tgz#2c5cc30ded81282bfe8a0d7c7c1853ddeb102c07"
- integrity sha512-crhvyXcMejjv3Z5d2Fa9sf5xLYVCF5O1c71QxbVnbLsmYMBEvDAftewesN/HhY03YRoA7zOMxjNGrF5svGaaeQ==
- dependencies:
- minipass "^2.2.1"
-
fs.realpath@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
fsevents@^1.2.7:
- version "1.2.9"
- resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.9.tgz#3f5ed66583ccd6f400b5a00db6f7e861363e388f"
- integrity sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==
+ version "1.2.13"
+ resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.13.tgz#f325cb0455592428bcf11b383370ef70e3bfcc38"
+ integrity sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==
dependencies:
+ bindings "^1.5.0"
nan "^2.12.1"
- node-pre-gyp "^0.12.0"
ftp@~0.3.10:
version "0.3.10"
@@ -2253,19 +2388,15 @@ gather-stream@^1.0.0:
resolved "https://registry.yarnpkg.com/gather-stream/-/gather-stream-1.0.0.tgz#b33994af457a8115700d410f317733cbe7a0904b"
integrity sha1-szmUr0V6gRVwDUEPMXczy+egkEs=
-gauge@~2.7.3:
- version "2.7.4"
- resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
- integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=
- dependencies:
- aproba "^1.0.3"
- console-control-strings "^1.0.0"
- has-unicode "^2.0.0"
- object-assign "^4.1.0"
- signal-exit "^3.0.0"
- string-width "^1.0.1"
- strip-ansi "^3.0.1"
- wide-align "^1.1.0"
+gensync@^1.0.0-beta.1:
+ version "1.0.0-beta.1"
+ resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.1.tgz#58f4361ff987e5ff6e1e7a210827aa371eaac269"
+ integrity sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==
+
+get-caller-file@^2.0.1:
+ version "2.0.5"
+ resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
+ integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
get-stdin@^5.0.1:
version "5.0.1"
@@ -2278,16 +2409,16 @@ get-stdin@^6.0.0:
integrity sha512-jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g==
get-uri@^2.0.0:
- version "2.0.3"
- resolved "https://registry.yarnpkg.com/get-uri/-/get-uri-2.0.3.tgz#fa13352269781d75162c6fc813c9e905323fbab5"
- integrity sha512-x5j6Ks7FOgLD/GlvjKwgu7wdmMR55iuRHhn8hj/+gA+eSbxQvZ+AEomq+3MgVEZj1vpi738QahGbCCSIDtXtkw==
+ version "2.0.4"
+ resolved "https://registry.yarnpkg.com/get-uri/-/get-uri-2.0.4.tgz#d4937ab819e218d4cb5ae18e4f5962bef169cc6a"
+ integrity sha512-v7LT/s8kVjs+Tx0ykk1I+H/rbpzkHvuIq87LmeXptcf5sNWm9uQiwjNAt94SJPA1zOlCntmnOlJvVWKmzsxG8Q==
dependencies:
- data-uri-to-buffer "2"
- debug "4"
+ data-uri-to-buffer "1"
+ debug "2"
extend "~3.0.2"
file-uri-to-path "1"
ftp "~0.3.10"
- readable-stream "3"
+ readable-stream "2"
get-value@^2.0.3, get-value@^2.0.6:
version "2.0.6"
@@ -2314,10 +2445,10 @@ glob-to-regexp@^0.3.0:
resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
integrity sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=
-glob@7.1.2:
- version "7.1.2"
- resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
- integrity sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==
+glob@7.1.3:
+ version "7.1.3"
+ resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
+ integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==
dependencies:
fs.realpath "^1.0.0"
inflight "^1.0.4"
@@ -2327,9 +2458,9 @@ glob@7.1.2:
path-is-absolute "^1.0.0"
glob@^7.0.3, glob@^7.1.2, glob@^7.1.3:
- version "7.1.4"
- resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255"
- integrity sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==
+ version "7.1.6"
+ resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
+ integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
dependencies:
fs.realpath "^1.0.0"
inflight "^1.0.4"
@@ -2395,16 +2526,16 @@ globjoin@^0.1.4:
integrity sha1-L0SUrIkZ43Z8XLtpHp9GMyQoXUM=
gonzales-pe@^4.2.3:
- version "4.2.4"
- resolved "https://registry.yarnpkg.com/gonzales-pe/-/gonzales-pe-4.2.4.tgz#356ae36a312c46fe0f1026dd6cb539039f8500d2"
- integrity sha512-v0Ts/8IsSbh9n1OJRnSfa7Nlxi4AkXIsWB6vPept8FDbL4bXn3FNuxjYtO/nmBGu7GDkL9MFeGebeSu6l55EPQ==
+ version "4.3.0"
+ resolved "https://registry.yarnpkg.com/gonzales-pe/-/gonzales-pe-4.3.0.tgz#fe9dec5f3c557eead09ff868c65826be54d067b3"
+ integrity sha512-otgSPpUmdWJ43VXyiNgEYE4luzHCL2pz4wQ0OnDluC6Eg4Ko3Vexy/SrSynglw/eR+OhkzmqFCZa/OFa/RgAOQ==
dependencies:
- minimist "1.1.x"
+ minimist "^1.2.5"
graceful-fs@^4.1.11, graceful-fs@^4.1.2:
- version "4.2.2"
- resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.2.tgz#6f0952605d0140c1cfdb138ed005775b92d67b02"
- integrity sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==
+ version "4.2.4"
+ resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
+ integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
growl@1.10.5:
version "1.10.5"
@@ -2416,7 +2547,7 @@ har-schema@^2.0.0:
resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
-har-validator@~5.1.0:
+har-validator@~5.1.3:
version "5.1.3"
resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080"
integrity sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==
@@ -2441,15 +2572,15 @@ has-flag@^3.0.0:
resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
-has-symbols@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz#ba1a8f1af2a0fc39650f5c850367704122063b44"
- integrity sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=
+has-flag@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
+ integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
-has-unicode@^2.0.0:
- version "2.0.1"
- resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
- integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=
+has-symbols@^1.0.0, has-symbols@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8"
+ integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==
has-value@^0.3.1:
version "0.3.1"
@@ -2482,17 +2613,17 @@ has-values@^1.0.0:
is-number "^3.0.0"
kind-of "^4.0.0"
-has@^1.0.1, has@^1.0.3:
+has@^1.0.3:
version "1.0.3"
resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
dependencies:
function-bind "^1.1.1"
-he@1.1.1:
- version "1.1.1"
- resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
- integrity sha1-k0EP0hsAlzUVH4howvJx80J+I/0=
+he@1.2.0:
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
+ integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
home-or-tmp@^2.0.0:
version "2.0.0"
@@ -2503,9 +2634,9 @@ home-or-tmp@^2.0.0:
os-tmpdir "^1.0.1"
hosted-git-info@^2.1.4:
- version "2.8.4"
- resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.4.tgz#44119abaf4bc64692a16ace34700fed9c03e2546"
- integrity sha512-pzXIvANXEFrc5oFFXRMkbLPQ2rXRoDERwDLyrcUxGhaZhgP54BBSl9Oheh7Vv0T090cszWBxPjkQQ5Sq1PbBRQ==
+ version "2.8.8"
+ resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488"
+ integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==
html-tags@^2.0.0:
version "2.0.0"
@@ -2552,28 +2683,21 @@ http-signature@~1.2.0:
jsprim "^1.2.2"
sshpk "^1.7.0"
-https-proxy-agent@^2.2.1:
- version "2.2.2"
- resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.2.tgz#271ea8e90f836ac9f119daccd39c19ff7dfb0793"
- integrity sha512-c8Ndjc9Bkpfx/vCJueCPy0jlP4ccCCSNDp8xwCZzPjKJUm+B+u9WX2x98Qx4n1PiMNTWo3D7KK5ifNV/yJyRzg==
+https-proxy-agent@^3.0.0:
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-3.0.1.tgz#b8c286433e87602311b01c8ea34413d856a4af81"
+ integrity sha512-+ML2Rbh6DAuee7d07tYGEKOEi2voWPUGan+ExdPbPW6Z3svq+JCqr0v8WmKPOkz1vOVykPCBSuobe7G8GJUtVg==
dependencies:
agent-base "^4.3.0"
debug "^3.1.0"
-iconv-lite@0.4.24, iconv-lite@^0.4.17, iconv-lite@^0.4.4:
+iconv-lite@0.4.24, iconv-lite@^0.4.17:
version "0.4.24"
resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
dependencies:
safer-buffer ">= 2.1.2 < 3"
-ignore-walk@^3.0.1:
- version "3.0.1"
- resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.1.tgz#a83e62e7d272ac0e3b551aaa82831a19b69f82f8"
- integrity sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==
- dependencies:
- minimatch "^3.0.4"
-
ignore@^3.3.3:
version "3.3.10"
resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043"
@@ -2585,9 +2709,9 @@ ignore@^4.0.3:
integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
ignore@^5.0.4:
- version "5.1.4"
- resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.4.tgz#84b7b3dbe64552b6ef0eca99f6743dbec6d97adf"
- integrity sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A==
+ version "5.1.8"
+ resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57"
+ integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==
import-fresh@^2.0.0:
version "2.0.0"
@@ -2625,12 +2749,12 @@ inflight@^1.0.4:
once "^1.3.0"
wrappy "1"
-inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3:
+inherits@2, inherits@2.0.4, inherits@^2.0.0, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3:
version "2.0.4"
resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
-ini@^1.3.5, ini@~1.3.0:
+ini@^1.3.5:
version "1.3.5"
resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
@@ -2655,6 +2779,15 @@ inquirer@^3.0.6:
strip-ansi "^4.0.0"
through "^2.3.6"
+internal-slot@^1.0.2:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.2.tgz#9c2e9fb3cd8e5e4256c6f45fe310067fcfa378a3"
+ integrity sha512-2cQNfwhAfJIkU4KZPkDI+Gj5yNNnbqi40W9Gge6dfnk4TocEVm00B3bdiL+JINrbGJil2TeHvM4rETGzk/f/0g==
+ dependencies:
+ es-abstract "^1.17.0-next.1"
+ has "^1.0.3"
+ side-channel "^1.0.2"
+
invariant@^2.2.2:
version "2.2.4"
resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
@@ -2672,7 +2805,7 @@ ip-regex@^4.1.0:
resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-4.1.0.tgz#5ad62f685a14edb421abebc2fff8db94df67b455"
integrity sha512-pKnZpbgCTfH/1NLIlOduP/V+WRXzC2MOz3Qo8xmxk8C5GudJLgK5QyLVXOSWy3ParAH7Eemurl3xjv/WXYFvMA==
-ip@^1.1.5:
+ip@1.1.5, ip@^1.1.5:
version "1.1.5"
resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=
@@ -2697,9 +2830,9 @@ is-accessor-descriptor@^1.0.0:
kind-of "^6.0.0"
is-alphabetical@^1.0.0:
- version "1.0.3"
- resolved "https://registry.yarnpkg.com/is-alphabetical/-/is-alphabetical-1.0.3.tgz#eb04cc47219a8895d8450ace4715abff2258a1f8"
- integrity sha512-eEMa6MKpHFzw38eKm56iNNi6GJ7lf6aLLio7Kr23sJPAECscgRtZvOBYybejWDQ2bM949Y++61PY+udzj5QMLA==
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/is-alphabetical/-/is-alphabetical-1.0.4.tgz#9e7d6b94916be22153745d184c298cbf986a686d"
+ integrity sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg==
is-alphanumeric@^1.0.0:
version "1.0.0"
@@ -2707,9 +2840,9 @@ is-alphanumeric@^1.0.0:
integrity sha1-Spzvcdr0wAHB2B1j0UDPU/1oifQ=
is-alphanumerical@^1.0.0:
- version "1.0.3"
- resolved "https://registry.yarnpkg.com/is-alphanumerical/-/is-alphanumerical-1.0.3.tgz#57ae21c374277b3defe0274c640a5704b8f6657c"
- integrity sha512-A1IGAPO5AW9vSh7omxIlOGwIqEvpW/TA+DksVOPM5ODuxKlZS09+TEM1E3275lJqO2oJ38vDpeAL3DCIiHE6eA==
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz#7eb9a2431f855f6b1ef1a78e326df515696c4dbf"
+ integrity sha512-UzoZUr+XfVz3t3v4KyGEniVL9BDRoQtY7tOyrRybkVNjDFWyo1yhXNGrrBTQxp3ib9BLAWs7k2YKBQsFRkZG9A==
dependencies:
is-alphabetical "^1.0.0"
is-decimal "^1.0.0"
@@ -2731,15 +2864,15 @@ is-buffer@^1.1.5:
resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
-is-buffer@^2.0.0:
- version "2.0.3"
- resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.3.tgz#4ecf3fcf749cbd1e472689e109ac66261a25e725"
- integrity sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw==
+is-buffer@^2.0.0, is-buffer@~2.0.3:
+ version "2.0.4"
+ resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.4.tgz#3e572f23c8411a5cfd9557c849e3665e0b290623"
+ integrity sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==
-is-callable@^1.1.4:
- version "1.1.4"
- resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75"
- integrity sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==
+is-callable@^1.1.4, is-callable@^1.1.5:
+ version "1.1.5"
+ resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.5.tgz#f7e46b596890456db74e7f6e976cb3273d06faab"
+ integrity sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==
is-data-descriptor@^0.1.4:
version "0.1.4"
@@ -2756,14 +2889,14 @@ is-data-descriptor@^1.0.0:
kind-of "^6.0.0"
is-date-object@^1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"
- integrity sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz#bda736f2cd8fd06d32844e7743bfa7494c3bfd7e"
+ integrity sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==
is-decimal@^1.0.0:
- version "1.0.3"
- resolved "https://registry.yarnpkg.com/is-decimal/-/is-decimal-1.0.3.tgz#381068759b9dc807d8c0dc0bfbae2b68e1da48b7"
- integrity sha512-bvLSwoDg2q6Gf+E2LEPiklHZxxiSi3XAh4Mav65mKqTfCO1HM3uBs24TjEH8iJX3bbDdLXKJXBTmGzuTUuAEjQ==
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/is-decimal/-/is-decimal-1.0.4.tgz#65a3a5958a1c5b63a706e1b333d7cd9f630d3fa5"
+ integrity sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw==
is-descriptor@^0.1.0:
version "0.1.6"
@@ -2806,18 +2939,9 @@ is-extglob@^2.1.0, is-extglob@^2.1.1:
integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
is-finite@^1.0.0:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa"
- integrity sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=
- dependencies:
- number-is-nan "^1.0.0"
-
-is-fullwidth-code-point@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
- integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs=
- dependencies:
- number-is-nan "^1.0.0"
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.1.0.tgz#904135c77fb42c0641d6aa1bcdbc4daa8da082f3"
+ integrity sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==
is-fullwidth-code-point@^2.0.0:
version "2.0.0"
@@ -2839,9 +2963,14 @@ is-glob@^4.0.0:
is-extglob "^2.1.1"
is-hexadecimal@^1.0.0:
- version "1.0.3"
- resolved "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-1.0.3.tgz#e8a426a69b6d31470d3a33a47bb825cda02506ee"
- integrity sha512-zxQ9//Q3D/34poZf8fiy3m3XVpbQc7ren15iKqrTtLPwkPD/t3Scy9Imp63FujULGxuK0ZlCwoo5xNpktFgbOA==
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz#cc35c97588da4bd49a8eedd6bc4082d44dcb23a7"
+ integrity sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==
+
+is-interactive@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/is-interactive/-/is-interactive-1.0.0.tgz#cea6e6ae5c870a7b0a0004070b7b587e0252912e"
+ integrity sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==
is-number@^3.0.0:
version "3.0.0"
@@ -2850,15 +2979,10 @@ is-number@^3.0.0:
dependencies:
kind-of "^3.0.2"
-is-number@^7.0.0:
- version "7.0.0"
- resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
- integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
-
-is-obj@^1.0.0:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
- integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8=
+is-obj@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982"
+ integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==
is-path-cwd@^2.0.0:
version "2.2.0"
@@ -2891,17 +3015,12 @@ is-plain-object@^2.0.3, is-plain-object@^2.0.4:
dependencies:
isobject "^3.0.1"
-is-promise@^2.1.0:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
- integrity sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=
-
-is-regex@^1.0.4:
- version "1.0.4"
- resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491"
- integrity sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=
+is-regex@^1.0.5:
+ version "1.0.5"
+ resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.5.tgz#39d589a358bf18967f726967120b8fc1aed74eae"
+ integrity sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==
dependencies:
- has "^1.0.1"
+ has "^1.0.3"
is-regexp@^1.0.0:
version "1.0.0"
@@ -2913,17 +3032,22 @@ is-resolvable@^1.0.0:
resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88"
integrity sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==
+is-string@^1.0.5:
+ version "1.0.5"
+ resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz#40493ed198ef3ff477b8c7f92f644ec82a5cd3a6"
+ integrity sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==
+
is-supported-regexp-flag@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/is-supported-regexp-flag/-/is-supported-regexp-flag-1.0.1.tgz#21ee16518d2c1dd3edd3e9a0d57e50207ac364ca"
integrity sha512-3vcJecUUrpgCqc/ca0aWeNu64UGgxcvO60K/Fkr1N6RSvfGCTU60UKN68JDmKokgba0rFFJs12EnzOQa14ubKQ==
is-symbol@^1.0.2:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.2.tgz#a055f6ae57192caee329e7a860118b497a950f38"
- integrity sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz#38e1014b9e6329be0de9d24a414fd7441ec61937"
+ integrity sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==
dependencies:
- has-symbols "^1.0.0"
+ has-symbols "^1.0.1"
is-typedarray@~1.0.0:
version "1.0.0"
@@ -2943,19 +3067,19 @@ is-url@^1.2.2:
integrity sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==
is-whitespace-character@^1.0.0:
- version "1.0.3"
- resolved "https://registry.yarnpkg.com/is-whitespace-character/-/is-whitespace-character-1.0.3.tgz#b3ad9546d916d7d3ffa78204bca0c26b56257fac"
- integrity sha512-SNPgMLz9JzPccD3nPctcj8sZlX9DAMJSKH8bP7Z6bohCwuNgX8xbWr1eTAYXX9Vpi/aSn8Y1akL9WgM3t43YNQ==
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/is-whitespace-character/-/is-whitespace-character-1.0.4.tgz#0858edd94a95594c7c9dd0b5c174ec6e45ee4aa7"
+ integrity sha512-SDweEzfIZM0SJV0EUga669UTKlmL0Pq8Lno0QDQsPnvECB3IM2aP0gdx5TrU0A01MAPfViaZiI2V1QMZLaKK5w==
-is-windows@^1.0.0, is-windows@^1.0.2:
+is-windows@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
is-word-character@^1.0.0:
- version "1.0.3"
- resolved "https://registry.yarnpkg.com/is-word-character/-/is-word-character-1.0.3.tgz#264d15541cbad0ba833d3992c34e6b40873b08aa"
- integrity sha512-0wfcrFgOOOBdgRNT9H33xe6Zi6yhX/uoc4U8NBZGeQQB0ctU1dnlNTyL9JM2646bHDTpsDm1Brb3VPoCIMrd/A==
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/is-word-character/-/is-word-character-1.0.4.tgz#ce0e73216f98599060592f62ff31354ddbeb0230"
+ integrity sha512-5SMO8RVennx3nZrqtKwCGyyetPE9VDba5ugvKLaD4KopPG5kR4mQ7tNt/r7feL5yt5h3lpuBbIUmCOG2eSzXHA==
is2@2.0.1:
version "2.0.1"
@@ -3004,9 +3128,9 @@ jest-docblock@^21.0.0:
integrity sha512-5IZ7sY9dBAYSV+YjQ0Ovb540Ku7AO9Z5o2Cg789xj167iQuZ2cG+z0f3Uct6WeYLbU6aQiM2pCs7sZ+4dotydw==
js-base64@^2.1.9:
- version "2.5.1"
- resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.5.1.tgz#1efa39ef2c5f7980bb1784ade4a8af2de3291121"
- integrity sha512-M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw==
+ version "2.5.2"
+ resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.5.2.tgz#313b6274dda718f714d00b3330bbae6e38e90209"
+ integrity sha512-Vg8czh0Q7sFBSUMWWArX/miJeBWYBPpdU/3M/DKSaekLMqrqVPaedp+5mZhie/r0lgrcaYBfwXatEew6gwgiQQ==
"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
version "4.0.0"
@@ -3018,7 +3142,7 @@ js-tokens@^3.0.2:
resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls=
-js-yaml@^3.13.1, js-yaml@^3.9.1:
+js-yaml@3.13.1:
version "3.13.1"
resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
@@ -3026,6 +3150,14 @@ js-yaml@^3.13.1, js-yaml@^3.9.1:
argparse "^1.0.7"
esprima "^4.0.0"
+js-yaml@^3.13.1, js-yaml@^3.9.1:
+ version "3.14.0"
+ resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.0.tgz#a7a34170f26a21bb162424d8adacb4113a69e482"
+ integrity sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==
+ dependencies:
+ argparse "^1.0.7"
+ esprima "^4.0.0"
+
jsbn@~0.1.0:
version "0.1.1"
resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
@@ -3081,12 +3213,12 @@ json5@^0.5.1:
resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=
-json5@^2.1.0:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.0.tgz#e7a0c62c48285c628d20a10b85c89bb807c32850"
- integrity sha512-8Mh9h6xViijj36g7Dxi+Y4S6hNGV96vcJZr/SrlHh1LR/pEn/8j/+qIBbs44YKl69Lrfctp4QD+AdWLTMqEZAQ==
+json5@^2.1.2:
+ version "2.1.3"
+ resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz#c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43"
+ integrity sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==
dependencies:
- minimist "^1.2.0"
+ minimist "^1.2.5"
jsprim@^1.2.2:
version "1.4.1"
@@ -3098,12 +3230,12 @@ jsprim@^1.2.2:
json-schema "0.2.3"
verror "1.10.0"
-jsx-ast-utils@^2.1.0, jsx-ast-utils@^2.2.1:
- version "2.2.1"
- resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.2.1.tgz#4d4973ebf8b9d2837ee91a8208cc66f3a2776cfb"
- integrity sha512-v3FxCcAf20DayI+uxnCuw795+oOIkVu6EnJ1+kSzhqqTZHNkTZ7B66ZgLp4oLJ/gbA64cI0B7WRoHZMSRdyVRQ==
+jsx-ast-utils@^2.2.1, jsx-ast-utils@^2.2.3:
+ version "2.3.0"
+ resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.3.0.tgz#edd727794ea284d7fda575015ed1b0cde0289ab6"
+ integrity sha512-3HNoc7nZ1hpZIKB3hJ7BlFRkzCx2BynRtfSwbkqZdpRdvAPsGMnzclPwrvDBS7/lalHTj21NwIeaEpysHBOudg==
dependencies:
- array-includes "^3.0.3"
+ array-includes "^3.1.1"
object.assign "^4.1.0"
kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
@@ -3126,9 +3258,9 @@ kind-of@^5.0.0:
integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==
kind-of@^6.0.0, kind-of@^6.0.2:
- version "6.0.2"
- resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
- integrity sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==
+ version "6.0.3"
+ resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
+ integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
known-css-properties@^0.11.0:
version "0.11.0"
@@ -3176,6 +3308,14 @@ locate-path@^2.0.0:
p-locate "^2.0.0"
path-exists "^3.0.0"
+locate-path@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"
+ integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==
+ dependencies:
+ p-locate "^3.0.0"
+ path-exists "^3.0.0"
+
lodash._arraycopy@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/lodash._arraycopy/-/lodash._arraycopy-3.0.0.tgz#76e7b7c1f1fb92547374878a562ed06a3e50f6e1"
@@ -3269,11 +3409,18 @@ lodash.merge@^4.6.2:
resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
-lodash@^4.1.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.4, lodash@^4.3.0:
+lodash@^4.1.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.4, lodash@^4.3.0:
version "4.17.15"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
+log-symbols@2.2.0, log-symbols@^2.0.0, log-symbols@^2.2.0:
+ version "2.2.0"
+ resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a"
+ integrity sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==
+ dependencies:
+ chalk "^2.0.1"
+
log-symbols@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-1.0.2.tgz#376ff7b58ea3086a0f09facc74617eca501e1a18"
@@ -3281,17 +3428,17 @@ log-symbols@^1.0.2:
dependencies:
chalk "^1.0.0"
-log-symbols@^2.0.0, log-symbols@^2.2.0:
- version "2.2.0"
- resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a"
- integrity sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==
+log-symbols@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-3.0.0.tgz#f3a08516a5dea893336a7dee14d18a1cfdab77c4"
+ integrity sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ==
dependencies:
- chalk "^2.0.1"
+ chalk "^2.4.2"
longest-streak@^2.0.1:
- version "2.0.3"
- resolved "https://registry.yarnpkg.com/longest-streak/-/longest-streak-2.0.3.tgz#3de7a3f47ee18e9074ded8575b5c091f5d0a4105"
- integrity sha512-9lz5IVdpwsKLMzQi0MQ+oD9EA0mIGcWYP7jXMTZVXP8D42PwuAk+M/HBFYQoxt1G5OR8m7aSIgb1UymfWGBWEw==
+ version "2.0.4"
+ resolved "https://registry.yarnpkg.com/longest-streak/-/longest-streak-2.0.4.tgz#b8599957da5b5dab64dee3fe316fa774597d90e4"
+ integrity sha512-vM6rUVCVUJJt33bnmHiZEvr7wPT78ztX7rojL+LW51bHtLh6HTjx84LA5W4+oa6aKEJA7jJu5LR6vQRBpA5DVg==
loose-envify@^1.0.0, loose-envify@^1.4.0:
version "1.4.0"
@@ -3308,7 +3455,7 @@ loud-rejection@^1.0.0:
currently-unhandled "^0.4.1"
signal-exit "^3.0.0"
-lru-cache@^4.0.1, lru-cache@^4.1.2:
+lru-cache@^4.0.1:
version "4.1.5"
resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==
@@ -3316,6 +3463,13 @@ lru-cache@^4.0.1, lru-cache@^4.1.2:
pseudomap "^1.0.2"
yallist "^2.1.2"
+lru-cache@^5.1.1:
+ version "5.1.1"
+ resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
+ integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==
+ dependencies:
+ yallist "^3.0.2"
+
map-cache@^0.2.2:
version "0.2.2"
resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
@@ -3339,9 +3493,9 @@ map-visit@^1.0.0:
object-visit "^1.0.0"
markdown-escapes@^1.0.0:
- version "1.0.3"
- resolved "https://registry.yarnpkg.com/markdown-escapes/-/markdown-escapes-1.0.3.tgz#6155e10416efaafab665d466ce598216375195f5"
- integrity sha512-XUi5HJhhV5R74k8/0H2oCbCiYf/u4cO/rX8tnGkRvrqhsr5BRNU6Mg0yt/8UIx1iIS8220BNJsDb7XnILhLepw==
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/markdown-escapes/-/markdown-escapes-1.0.4.tgz#c95415ef451499d7602b91095f3c8e8975f78535"
+ integrity sha512-8z4efJYk43E0upd0NbVXwgSTQs6cT3T06etieCMEg7dRbzCbxUCK/GHlX8mhHRDcp+OLlHkPKsvqQTCvsRl2cg==
markdown-table@^1.1.0:
version "1.1.3"
@@ -3349,14 +3503,14 @@ markdown-table@^1.1.0:
integrity sha512-1RUZVgQlpJSPWYbFSpmudq5nHY1doEIv89gBtF0s4gW1GF2XorxcA/70M5vq7rLv0a6mhOUccRsqkwhwLCIQ2Q==
mathml-tag-names@^2.0.1:
- version "2.1.1"
- resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.1.tgz#6dff66c99d55ecf739ca53c492e626f1d12a33cc"
- integrity sha512-pWB896KPGSGkp1XtyzRBftpTzwSOL0Gfk0wLvxt4f2mgzjY19o0LxJ3U25vNWTzsh7da+KTbuXQoQ3lOJZ8WHw==
+ version "2.1.3"
+ resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
+ integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
mdast-util-compact@^1.0.0:
- version "1.0.3"
- resolved "https://registry.yarnpkg.com/mdast-util-compact/-/mdast-util-compact-1.0.3.tgz#98a25cc8a7865761a41477b3a87d1dcef0b1e79d"
- integrity sha512-nRiU5GpNy62rZppDKbLwhhtw5DXoFMqw9UNZFmlPsNaQCZ//WLjGKUwWMdJrUH+Se7UvtO2gXtAMe0g/N+eI5w==
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/mdast-util-compact/-/mdast-util-compact-1.0.4.tgz#d531bb7667b5123abf20859be086c4d06c894593"
+ integrity sha512-3YDMQHI5vRiS2uygEFYaqckibpJtKq5Sj2c8JioeOQBU6INpKbdWzfyLqFFnDwEcEnRFIdMsguzs5pC1Jp4Isg==
dependencies:
unist-util-visit "^1.1.0"
@@ -3376,9 +3530,9 @@ meow@^5.0.0:
yargs-parser "^10.0.0"
merge2@^1.2.3:
- version "1.2.4"
- resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.2.4.tgz#c9269589e6885a60cf80605d9522d4b67ca646e3"
- integrity sha512-FYE8xI+6pjFOhokZu0We3S5NKCirLbCzSh2Usf3qEyr4X8U+0jNg9P8RZ4qz+V2UoECLVwSyzU3LxXBaLGtD3A==
+ version "1.3.0"
+ resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.3.0.tgz#5b366ee83b2f1582c48f87e47cf1a9352103ca81"
+ integrity sha512-2j4DAdlBOkiSZIsaXk4mTE3sRS02yBHAtfy127xRV3bQUFqXkjHCHLW6Scv7DwNRbIWNHH8zpnz9zMaKXIdvYw==
micromatch@^3.1.10, micromatch@^3.1.4:
version "3.1.10"
@@ -3399,23 +3553,28 @@ micromatch@^3.1.10, micromatch@^3.1.4:
snapdragon "^0.8.1"
to-regex "^3.0.2"
-mime-db@1.40.0:
- version "1.40.0"
- resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.40.0.tgz#a65057e998db090f732a68f6c276d387d4126c32"
- integrity sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==
+mime-db@1.44.0:
+ version "1.44.0"
+ resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92"
+ integrity sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==
mime-types@^2.1.12, mime-types@~2.1.19:
- version "2.1.24"
- resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.24.tgz#b6f8d0b3e951efb77dedeca194cff6d16f676f81"
- integrity sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==
+ version "2.1.27"
+ resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz#47949f98e279ea53119f5722e0f34e529bec009f"
+ integrity sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==
dependencies:
- mime-db "1.40.0"
+ mime-db "1.44.0"
mimic-fn@^1.0.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==
+mimic-fn@^2.1.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
+ integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
+
minimatch@3.0.4, minimatch@^3.0.2, minimatch@^3.0.4:
version "3.0.4"
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
@@ -3431,46 +3590,11 @@ minimist-options@^3.0.1:
arrify "^1.0.1"
is-plain-obj "^1.1.0"
-minimist@0.0.8:
- version "0.0.8"
- resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
- integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
-
-minimist@1.1.x:
- version "1.1.3"
- resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.1.3.tgz#3bedfd91a92d39016fcfaa1c681e8faa1a1efda8"
- integrity sha1-O+39kaktOQFvz6ocaB6Pqhoe/ag=
-
-minimist@^1.2.0:
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
- integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
-
-minimist@^1.2.2:
+minimist@^1.2.0, minimist@^1.2.2, minimist@^1.2.5:
version "1.2.5"
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
-minimist@~0.0.1:
- version "0.0.10"
- resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
- integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=
-
-minipass@^2.2.1, minipass@^2.3.5:
- version "2.3.5"
- resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.5.tgz#cacebe492022497f656b0f0f51e2682a9ed2d848"
- integrity sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==
- dependencies:
- safe-buffer "^5.1.2"
- yallist "^3.0.0"
-
-minizlib@^1.2.1:
- version "1.2.1"
- resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.2.1.tgz#dd27ea6136243c7c880684e8672bb3a45fd9b614"
- integrity sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==
- dependencies:
- minipass "^2.2.1"
-
mixin-deep@^1.2.0:
version "1.3.2"
resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566"
@@ -3479,40 +3603,64 @@ mixin-deep@^1.2.0:
for-in "^1.0.2"
is-extendable "^1.0.1"
-mkdirp@0.5.1, mkdirp@^0.5.0, mkdirp@^0.5.1:
- version "0.5.1"
- resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
- integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
+mkdirp@0.5.4:
+ version "0.5.4"
+ resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.4.tgz#fd01504a6797ec5c9be81ff43d204961ed64a512"
+ integrity sha512-iG9AK/dJLtJ0XNgTuDbSyNS3zECqDlAhnQW4CsNxBG3LQJBbHmRX1egw39DmtOdCAqY+dKXV+sgPgilNWUKMVw==
+ dependencies:
+ minimist "^1.2.5"
+
+mkdirp@^0.5.1, mkdirp@^0.5.4:
+ version "0.5.5"
+ resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
+ integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
dependencies:
- minimist "0.0.8"
+ minimist "^1.2.5"
mkpath@1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/mkpath/-/mkpath-1.0.0.tgz#ebb3a977e7af1c683ae6fda12b545a6ba6c5853d"
integrity sha1-67Opd+evHGg65v2hK1Raa6bFhT0=
-mocha@^5.2.0:
- version "5.2.0"
- resolved "https://registry.yarnpkg.com/mocha/-/mocha-5.2.0.tgz#6d8ae508f59167f940f2b5b3c4a612ae50c90ae6"
- integrity sha512-2IUgKDhc3J7Uug+FxMXuqIyYzH7gJjXECKe/w43IGgQHTSj3InJi+yAA7T24L9bQMRKiUEHxEX37G5JpVUGLcQ==
+mocha@^6.2.2:
+ version "6.2.3"
+ resolved "https://registry.yarnpkg.com/mocha/-/mocha-6.2.3.tgz#e648432181d8b99393410212664450a4c1e31912"
+ integrity sha512-0R/3FvjIGH3eEuG17ccFPk117XL2rWxatr81a57D+r/x2uTYZRbdZ4oVidEUMh2W2TJDa7MdAb12Lm2/qrKajg==
dependencies:
+ ansi-colors "3.2.3"
browser-stdout "1.3.1"
- commander "2.15.1"
- debug "3.1.0"
+ debug "3.2.6"
diff "3.5.0"
escape-string-regexp "1.0.5"
- glob "7.1.2"
+ find-up "3.0.0"
+ glob "7.1.3"
growl "1.10.5"
- he "1.1.1"
+ he "1.2.0"
+ js-yaml "3.13.1"
+ log-symbols "2.2.0"
minimatch "3.0.4"
- mkdirp "0.5.1"
- supports-color "5.4.0"
+ mkdirp "0.5.4"
+ ms "2.1.1"
+ node-environment-flags "1.0.5"
+ object.assign "4.1.0"
+ strip-json-comments "2.0.1"
+ supports-color "6.0.0"
+ which "1.3.1"
+ wide-align "1.1.3"
+ yargs "13.3.2"
+ yargs-parser "13.1.2"
+ yargs-unparser "1.6.0"
ms@2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
+ms@2.1.1:
+ version "2.1.1"
+ resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
+ integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
+
ms@^2.1.1:
version "2.1.2"
resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
@@ -3523,10 +3671,15 @@ mute-stream@0.0.7:
resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=
+mute-stream@0.0.8:
+ version "0.0.8"
+ resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
+ integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
+
nan@^2.12.1:
- version "2.14.0"
- resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c"
- integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==
+ version "2.14.1"
+ resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.1.tgz#d7be34dfa3105b91494c3147089315eff8874b01"
+ integrity sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw==
nanomatch@^1.2.9:
version "1.2.13"
@@ -3550,15 +3703,6 @@ natural-compare@^1.4.0:
resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
-needle@^2.2.1:
- version "2.4.0"
- resolved "https://registry.yarnpkg.com/needle/-/needle-2.4.0.tgz#6833e74975c444642590e15a750288c5f939b57c"
- integrity sha512-4Hnwzr3mi5L97hMYeNl8wRW/Onhy4nUKR/lVemJ8gJedxxUyBLm9kkrDColJvoSfwi0jCNhD+xCdOtiGDQiRZg==
- dependencies:
- debug "^3.2.6"
- iconv-lite "^0.4.4"
- sax "^1.2.4"
-
netmask@^1.0.6:
version "1.0.6"
resolved "https://registry.yarnpkg.com/netmask/-/netmask-1.0.6.tgz#20297e89d86f6f6400f250d9f4f6b4c1945fcd35"
@@ -3570,54 +3714,43 @@ nice-try@^1.0.4:
integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
nightwatch@^1.2.1:
- version "1.2.1"
- resolved "https://registry.yarnpkg.com/nightwatch/-/nightwatch-1.2.1.tgz#25cb8f54473fd18714bfb99cc160a58e76cbdfa7"
- integrity sha512-y9ihK6Xmo6A32B6zG4XlWumF5f6gIE5QQP54o4PHpnjC4+CA9xwVMtXZL6QlnNYlqS0n34Pk/wpvKL2znjCh0g==
+ version "1.3.6"
+ resolved "https://registry.yarnpkg.com/nightwatch/-/nightwatch-1.3.6.tgz#881c7884090c7969e0f6b13ac5700929e7145c77"
+ integrity sha512-61kz2mw3Ng8Rrs2CDZv6aVB+bW+oNIFXL543L9kOvOqft3zVh2j08W8ww6BxGDzmWZe1HGRXNEI5U8+I4hO4KA==
dependencies:
assertion-error "^1.1.0"
- chai-nightwatch "^0.3.0"
+ chai-nightwatch "^0.4.0"
+ ci-info "^2.0.0"
dotenv "7.0.0"
- ejs "^2.5.9"
+ ejs "^2.7.4"
+ envinfo "^7.5.1"
lodash.clone "3.0.3"
lodash.defaultsdeep "^4.6.1"
lodash.merge "^4.6.2"
minimatch "3.0.4"
+ minimist "^1.2.5"
mkpath "1.0.0"
- optimist "^0.6.1"
- proxy-agent "^3.0.0"
+ ora "^4.0.3"
+ proxy-agent "^3.1.1"
+ request "^2.88.2"
+ request-promise "^4.2.5"
+ semver "^6.3.0"
+ strip-ansi "^6.0.0"
optionalDependencies:
- mocha "^5.2.0"
-
-node-pre-gyp@^0.12.0:
- version "0.12.0"
- resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz#39ba4bb1439da030295f899e3b520b7785766149"
- integrity sha512-4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A==
- dependencies:
- detect-libc "^1.0.2"
- mkdirp "^0.5.1"
- needle "^2.2.1"
- nopt "^4.0.1"
- npm-packlist "^1.1.6"
- npmlog "^4.0.2"
- rc "^1.2.7"
- rimraf "^2.6.1"
- semver "^5.3.0"
- tar "^4"
+ mocha "^6.2.2"
-node-releases@^1.1.25:
- version "1.1.27"
- resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.27.tgz#b19ec8add2afe9a826a99dceccc516104c1edaf4"
- integrity sha512-9iXUqHKSGo6ph/tdXVbHFbhRVQln4ZDTIBJCzsa90HimnBYc5jw8RWYt4wBYFHehGyC3koIz5O4mb2fHrbPOuA==
+node-environment-flags@1.0.5:
+ version "1.0.5"
+ resolved "https://registry.yarnpkg.com/node-environment-flags/-/node-environment-flags-1.0.5.tgz#fa930275f5bf5dae188d6192b24b4c8bbac3d76a"
+ integrity sha512-VNYPRfGfmZLx0Ye20jWzHUjyTW/c+6Wq+iLhDzUI4XmhrDd9l/FozXV3F2xOaXjvp0co0+v1YSR3CMP6g+VvLQ==
dependencies:
- semver "^5.3.0"
+ object.getownpropertydescriptors "^2.0.3"
+ semver "^5.7.0"
-nopt@^4.0.1:
- version "4.0.1"
- resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
- integrity sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=
- dependencies:
- abbrev "1"
- osenv "^0.1.4"
+node-releases@^1.1.53:
+ version "1.1.57"
+ resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.57.tgz#f6754ce225fad0611e61228df3e09232e017ea19"
+ integrity sha512-ZQmnWS7adi61A9JsllJ2gdj2PauElcjnOwTp2O011iGzoakTxUsDGSe+6vD7wXbKdqhSFymC0OSx35aAMhrSdw==
normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
version "2.5.0"
@@ -3651,45 +3784,17 @@ normalize-selector@^0.2.0:
resolved "https://registry.yarnpkg.com/normalize-selector/-/normalize-selector-0.2.0.tgz#d0b145eb691189c63a78d201dc4fdb1293ef0c03"
integrity sha1-0LFF62kRicY6eNIB3E/bEpPvDAM=
-npm-bundled@^1.0.1:
- version "1.0.6"
- resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.6.tgz#e7ba9aadcef962bb61248f91721cd932b3fe6bdd"
- integrity sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g==
-
-npm-packlist@^1.1.6:
- version "1.4.4"
- resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.4.tgz#866224233850ac534b63d1a6e76050092b5d2f44"
- integrity sha512-zTLo8UcVYtDU3gdeaFu2Xu0n0EvelfHDGuqtNIn5RO7yQj4H1TqNdBc/yZjxnWA0PVB8D3Woyp0i5B43JwQ6Vw==
- dependencies:
- ignore-walk "^3.0.1"
- npm-bundled "^1.0.1"
-
-npmlog@^4.0.2:
- version "4.1.2"
- resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
- integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
- dependencies:
- are-we-there-yet "~1.1.2"
- console-control-strings "~1.1.0"
- gauge "~2.7.3"
- set-blocking "~2.0.0"
-
num2fraction@^1.2.2:
version "1.2.2"
resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"
integrity sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=
-number-is-nan@^1.0.0:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
- integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
-
oauth-sign@~0.9.0:
version "0.9.0"
resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
-object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
+object-assign@^4.0.1, object-assign@^4.1.1:
version "4.1.1"
resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
@@ -3703,7 +3808,12 @@ object-copy@^0.1.0:
define-property "^0.2.5"
kind-of "^3.0.3"
-object-keys@^1.0.11, object-keys@^1.0.12:
+object-inspect@^1.7.0:
+ version "1.7.0"
+ resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz#f4f6bd181ad77f006b5ece60bd0b6f398ff74a67"
+ integrity sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==
+
+object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
@@ -3715,7 +3825,7 @@ object-visit@^1.0.0:
dependencies:
isobject "^3.0.0"
-object.assign@^4.1.0:
+object.assign@4.1.0, object.assign@^4.1.0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da"
integrity sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==
@@ -3725,25 +3835,32 @@ object.assign@^4.1.0:
has-symbols "^1.0.0"
object-keys "^1.0.11"
-object.entries@^1.1.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.0.tgz#2024fc6d6ba246aee38bdb0ffd5cfbcf371b7519"
- integrity sha512-l+H6EQ8qzGRxbkHOd5I/aHRhHDKoQXQ8g0BYt4uSweQU1/J6dZUOyWh9a2Vky35YCKjzmgxOzta2hH6kf9HuXA==
+object.entries@^1.1.0, object.entries@^1.1.1:
+ version "1.1.2"
+ resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.2.tgz#bc73f00acb6b6bb16c203434b10f9a7e797d3add"
+ integrity sha512-BQdB9qKmb/HyNdMNWVr7O3+z5MUIx3aiegEIJqjMBbBf0YT9RRxTJSim4mzFqtyr7PDAHigq0N9dO0m0tRakQA==
dependencies:
define-properties "^1.1.3"
- es-abstract "^1.12.0"
- function-bind "^1.1.1"
+ es-abstract "^1.17.5"
has "^1.0.3"
-object.fromentries@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.0.tgz#49a543d92151f8277b3ac9600f1e930b189d30ab"
- integrity sha512-9iLiI6H083uiqUuvzyY6qrlmc/Gz8hLQFOcb/Ri/0xXFkSNS3ctV+CbE6yM2+AnkYfOB3dGjdzC0wrMLIhQICA==
+object.fromentries@^2.0.2:
+ version "2.0.2"
+ resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.2.tgz#4a09c9b9bb3843dd0f89acdb517a794d4f355ac9"
+ integrity sha512-r3ZiBH7MQppDJVLx6fhD618GKNG40CZYH9wgwdhKxBDDbQgjeWGGd4AtkZad84d291YxvWe7bJGuE65Anh0dxQ==
dependencies:
- define-properties "^1.1.2"
- es-abstract "^1.11.0"
+ define-properties "^1.1.3"
+ es-abstract "^1.17.0-next.1"
function-bind "^1.1.1"
- has "^1.0.1"
+ has "^1.0.3"
+
+object.getownpropertydescriptors@^2.0.3:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz#369bf1f9592d8ab89d712dced5cb81c7c5352649"
+ integrity sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==
+ dependencies:
+ define-properties "^1.1.3"
+ es-abstract "^1.17.0-next.1"
object.pick@^1.3.0:
version "1.3.0"
@@ -3752,13 +3869,13 @@ object.pick@^1.3.0:
dependencies:
isobject "^3.0.1"
-object.values@^1.1.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.0.tgz#bf6810ef5da3e5325790eaaa2be213ea84624da9"
- integrity sha512-8mf0nKLAoFX6VlNVdhGj31SVYpaNFtUnuoOXWyFEstsWRgU837AK+JYM0iAxwkSzGRbwn8cbFmgbyxj1j4VbXg==
+object.values@^1.1.0, object.values@^1.1.1:
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.1.tgz#68a99ecde356b7e9295a3c5e0ce31dc8c953de5e"
+ integrity sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA==
dependencies:
define-properties "^1.1.3"
- es-abstract "^1.12.0"
+ es-abstract "^1.17.0-next.1"
function-bind "^1.1.1"
has "^1.0.3"
@@ -3776,44 +3893,49 @@ onetime@^2.0.0:
dependencies:
mimic-fn "^1.0.0"
-optimist@^0.6.1:
- version "0.6.1"
- resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
- integrity sha1-2j6nRob6IaGaERwybpDrFaAZZoY=
+onetime@^5.1.0:
+ version "5.1.0"
+ resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.0.tgz#fff0f3c91617fe62bb50189636e99ac8a6df7be5"
+ integrity sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==
dependencies:
- minimist "~0.0.1"
- wordwrap "~0.0.2"
+ mimic-fn "^2.1.0"
optionator@^0.8.1, optionator@^0.8.2:
- version "0.8.2"
- resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"
- integrity sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=
+ version "0.8.3"
+ resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
+ integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==
dependencies:
deep-is "~0.1.3"
- fast-levenshtein "~2.0.4"
+ fast-levenshtein "~2.0.6"
levn "~0.3.0"
prelude-ls "~1.1.2"
type-check "~0.3.2"
- wordwrap "~1.0.0"
+ word-wrap "~1.2.3"
+
+ora@^4.0.3:
+ version "4.0.4"
+ resolved "https://registry.yarnpkg.com/ora/-/ora-4.0.4.tgz#e8da697cc5b6a47266655bf68e0fb588d29a545d"
+ integrity sha512-77iGeVU1cIdRhgFzCK8aw1fbtT1B/iZAvWjS+l/o1x0RShMgxHUZaD2yDpWsNCPwXg9z1ZA78Kbdvr8kBmG/Ww==
+ dependencies:
+ chalk "^3.0.0"
+ cli-cursor "^3.1.0"
+ cli-spinners "^2.2.0"
+ is-interactive "^1.0.0"
+ log-symbols "^3.0.0"
+ mute-stream "0.0.8"
+ strip-ansi "^6.0.0"
+ wcwidth "^1.0.1"
os-homedir@^1.0.0:
version "1.0.2"
resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
-os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.2:
+os-tmpdir@^1.0.1, os-tmpdir@~1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
-osenv@^0.1.4:
- version "0.1.5"
- resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
- integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==
- dependencies:
- os-homedir "^1.0.0"
- os-tmpdir "^1.0.0"
-
p-limit@^1.1.0:
version "1.3.0"
resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
@@ -3821,6 +3943,13 @@ p-limit@^1.1.0:
dependencies:
p-try "^1.0.0"
+p-limit@^2.0.0:
+ version "2.3.0"
+ resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
+ integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
+ dependencies:
+ p-try "^2.0.0"
+
p-locate@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
@@ -3828,6 +3957,13 @@ p-locate@^2.0.0:
dependencies:
p-limit "^1.1.0"
+p-locate@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
+ integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==
+ dependencies:
+ p-limit "^2.0.0"
+
p-map@^2.0.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175"
@@ -3838,16 +3974,21 @@ p-try@^1.0.0:
resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
integrity sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=
-pac-proxy-agent@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/pac-proxy-agent/-/pac-proxy-agent-3.0.0.tgz#11d578b72a164ad74bf9d5bac9ff462a38282432"
- integrity sha512-AOUX9jES/EkQX2zRz0AW7lSx9jD//hQS8wFXBvcnd/J2Py9KaMJMqV/LPqJssj1tgGufotb2mmopGPR15ODv1Q==
+p-try@^2.0.0:
+ version "2.2.0"
+ resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
+ integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
+
+pac-proxy-agent@^3.0.1:
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/pac-proxy-agent/-/pac-proxy-agent-3.0.1.tgz#115b1e58f92576cac2eba718593ca7b0e37de2ad"
+ integrity sha512-44DUg21G/liUZ48dJpUSjZnFfZro/0K5JTyFYLBcmh9+T6Ooi4/i4efwUiEy0+4oQusCBqWdhv16XohIj1GqnQ==
dependencies:
agent-base "^4.2.0"
- debug "^3.1.0"
+ debug "^4.1.1"
get-uri "^2.0.0"
http-proxy-agent "^2.1.0"
- https-proxy-agent "^2.2.1"
+ https-proxy-agent "^3.0.0"
pac-resolver "^3.0.0"
raw-body "^2.2.0"
socks-proxy-agent "^4.0.1"
@@ -3983,6 +4124,13 @@ pkg-dir@^2.0.0:
dependencies:
find-up "^2.1.0"
+pkg-up@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-2.0.0.tgz#c819ac728059a461cab1c3889a2be3c49a004d7f"
+ integrity sha1-yBmscoBZpGHKscOImivjxJoATX8=
+ dependencies:
+ find-up "^2.1.0"
+
plur@^2.1.2:
version "2.1.2"
resolved "https://registry.yarnpkg.com/plur/-/plur-2.1.2.tgz#7482452c1a0f508e3e344eaec312c91c29dc655a"
@@ -4001,19 +4149,18 @@ posix-character-classes@^0.1.0:
integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
postcss-calc@^7.0.1:
- version "7.0.1"
- resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-7.0.1.tgz#36d77bab023b0ecbb9789d84dcb23c4941145436"
- integrity sha512-oXqx0m6tb4N3JGdmeMSc/i91KppbYsFZKdH0xMOqK8V1rJlzrKlTdokz8ozUXLVejydRN6u2IddxpcijRj2FqQ==
+ version "7.0.2"
+ resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-7.0.2.tgz#504efcd008ca0273120568b0792b16cdcde8aac1"
+ integrity sha512-rofZFHUg6ZIrvRwPeFktv06GdbDYLcGqh9EwiMutZg+a0oePCCw1zHOEiji6LCpyRcjTREtPASuUqeAvYlEVvQ==
dependencies:
- css-unit-converter "^1.1.1"
- postcss "^7.0.5"
- postcss-selector-parser "^5.0.0-rc.4"
- postcss-value-parser "^3.3.1"
+ postcss "^7.0.27"
+ postcss-selector-parser "^6.0.2"
+ postcss-value-parser "^4.0.2"
postcss-custom-properties@^9.0.2:
- version "9.0.2"
- resolved "https://registry.yarnpkg.com/postcss-custom-properties/-/postcss-custom-properties-9.0.2.tgz#091aefaa309826302d53ec6d780fbe1df8f40fd4"
- integrity sha512-WHaQrEp3gJ6mgxBA4mGJKW6DSVfy2IFnKPFAb2IEulgxGUW8nWp1NkOD/rWR6e2uIuAdnTa0LXSupST7daniAw==
+ version "9.1.1"
+ resolved "https://registry.yarnpkg.com/postcss-custom-properties/-/postcss-custom-properties-9.1.1.tgz#55822d70ff48004f6d307a338ba64a7fb0a4bfff"
+ integrity sha512-GVu+j7vwMTKUGhGXckYAFAAG5tTJUkSt8LuSyimtZdVVmdAEZYYqserkAgX8vwMhgGDPA4vJtWt7VgFxgiooDA==
dependencies:
postcss "^7.0.17"
postcss-values-parser "^3.0.5"
@@ -4044,9 +4191,9 @@ postcss-import@^12.0.1:
resolve "^1.1.7"
postcss-jsx@^0.36.0:
- version "0.36.3"
- resolved "https://registry.yarnpkg.com/postcss-jsx/-/postcss-jsx-0.36.3.tgz#c91113eae2935a1c94f00353b788ece9acae3f46"
- integrity sha512-yV8Ndo6KzU8eho5mCn7LoLUGPkXrRXRjhMpX4AaYJ9wLJPv099xbtpbRQ8FrPnzVxb/cuMebbPR7LweSt+hTfA==
+ version "0.36.4"
+ resolved "https://registry.yarnpkg.com/postcss-jsx/-/postcss-jsx-0.36.4.tgz#37a68f300a39e5748d547f19a747b3257240bd50"
+ integrity sha512-jwO/7qWUvYuWYnpOb0+4bIIgJt7003pgU3P6nETBLaOyBXuTD55ho21xnals5nBrlpTIFodyd3/jBi6UO3dHvA==
dependencies:
"@babel/core" ">=7.2.2"
@@ -4096,11 +4243,11 @@ postcss-resolve-nested-selector@^0.1.1:
integrity sha1-Kcy8fDfe36wwTp//C/FZaz9qDk4=
postcss-safe-parser@^4.0.0:
- version "4.0.1"
- resolved "https://registry.yarnpkg.com/postcss-safe-parser/-/postcss-safe-parser-4.0.1.tgz#8756d9e4c36fdce2c72b091bbc8ca176ab1fcdea"
- integrity sha512-xZsFA3uX8MO3yAda03QrG3/Eg1LN3EPfjjf07vke/46HERLZyHrTsQ9E1r1w1W//fWEhtYNndo2hQplN2cVpCQ==
+ version "4.0.2"
+ resolved "https://registry.yarnpkg.com/postcss-safe-parser/-/postcss-safe-parser-4.0.2.tgz#a6d4e48f0f37d9f7c11b2a581bf00f8ba4870b96"
+ integrity sha512-Uw6ekxSWNLCPesSv/cmqf2bY/77z11O7jZGPax3ycZMFU/oi2DMH9i89AdHc1tRwFg/arFoEwX0IS3LCUxJh1g==
dependencies:
- postcss "^7.0.0"
+ postcss "^7.0.26"
postcss-sass@^0.3.5:
version "0.3.5"
@@ -4111,11 +4258,11 @@ postcss-sass@^0.3.5:
postcss "^7.0.1"
postcss-scss@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/postcss-scss/-/postcss-scss-2.0.0.tgz#248b0a28af77ea7b32b1011aba0f738bda27dea1"
- integrity sha512-um9zdGKaDZirMm+kZFKKVsnKPF7zF7qBAtIfTSnZXD1jZ0JNZIxdB6TxQOjCnlSzLRInVl2v3YdBh/M881C4ug==
+ version "2.1.1"
+ resolved "https://registry.yarnpkg.com/postcss-scss/-/postcss-scss-2.1.1.tgz#ec3a75fa29a55e016b90bf3269026c53c1d2b383"
+ integrity sha512-jQmGnj0hSGLd9RscFw9LyuSVAa5Bl1/KBPqG1NQw9w8ND55nY4ZEsdlVuYJvLPpV+y0nwTV5v/4rHPzZRihQbA==
dependencies:
- postcss "^7.0.0"
+ postcss "^7.0.6"
postcss-selector-parser@^2.0.0:
version "2.2.3"
@@ -4127,20 +4274,20 @@ postcss-selector-parser@^2.0.0:
uniq "^1.0.1"
postcss-selector-parser@^3.1.0:
- version "3.1.1"
- resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-3.1.1.tgz#4f875f4afb0c96573d5cf4d74011aee250a7e865"
- integrity sha1-T4dfSvsMllc9XPTXQBGu4lCn6GU=
+ version "3.1.2"
+ resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz#b310f5c4c0fdaf76f94902bbaa30db6aa84f5270"
+ integrity sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==
dependencies:
- dot-prop "^4.1.1"
+ dot-prop "^5.2.0"
indexes-of "^1.0.1"
uniq "^1.0.1"
-postcss-selector-parser@^5.0.0-rc.4:
- version "5.0.0"
- resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz#249044356697b33b64f1a8f7c80922dddee7195c"
- integrity sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==
+postcss-selector-parser@^6.0.2:
+ version "6.0.2"
+ resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz#934cf799d016c83411859e09dcecade01286ec5c"
+ integrity sha512-36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg==
dependencies:
- cssesc "^2.0.0"
+ cssesc "^3.0.0"
indexes-of "^1.0.1"
uniq "^1.0.1"
@@ -4157,23 +4304,22 @@ postcss-syntax@^0.36.2:
resolved "https://registry.yarnpkg.com/postcss-syntax/-/postcss-syntax-0.36.2.tgz#f08578c7d95834574e5593a82dfbfa8afae3b51c"
integrity sha512-nBRg/i7E3SOHWxF3PpF5WnJM/jQ1YpY9000OaVXlAQj6Zp/kIqJxEDWIZ67tAd7NLuk7zqN4yqe9nc0oNAOs1w==
-postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.0, postcss-value-parser@^3.3.1:
+postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.0:
version "3.3.1"
resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281"
integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==
-postcss-value-parser@^4.0.0:
- version "4.0.2"
- resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.0.2.tgz#482282c09a42706d1fc9a069b73f44ec08391dc9"
- integrity sha512-LmeoohTpp/K4UiyQCwuGWlONxXamGzCMtFxLq4W1nZVGIQLYvMCJx3yAF9qyyuFpflABI9yVdtJAqbihOsCsJQ==
+postcss-value-parser@^4.0.2, postcss-value-parser@^4.1.0:
+ version "4.1.0"
+ resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb"
+ integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==
postcss-values-parser@^3.0.5:
- version "3.0.5"
- resolved "https://registry.yarnpkg.com/postcss-values-parser/-/postcss-values-parser-3.0.5.tgz#9f83849fb89eaac74c2d5bf75e8e9715508a8c8d"
- integrity sha512-0N6EUBx2Vzl0c9LQipuus90EkVh7saBQFRhgAYpHHcDCIvxRt+K/q0zwcIYtDQVNs5Y9NGqei4AuCEvAOsePfQ==
+ version "3.2.1"
+ resolved "https://registry.yarnpkg.com/postcss-values-parser/-/postcss-values-parser-3.2.1.tgz#55114607de6631338ba8728d3e9c15785adcc027"
+ integrity sha512-SQ7/88VE9LhJh9gc27/hqnSU/aZaREVJcRVccXBmajgP2RkjdJzNyH/a9GCVMI5nsRhT0jC5HpUMwfkz81DVVg==
dependencies:
color-name "^1.1.4"
- is-number "^7.0.0"
is-url-superb "^3.0.0"
postcss "^7.0.5"
url-regex "^5.0.0"
@@ -4197,19 +4343,10 @@ postcss@^6.0.13:
source-map "^0.6.1"
supports-color "^5.4.0"
-postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.13, postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.7:
- version "7.0.17"
- resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.17.tgz#4da1bdff5322d4a0acaab4d87f3e782436bad31f"
- integrity sha512-546ZowA+KZ3OasvQZHsbuEpysvwTZNGJv9EfyCQdsIDltPSWHAeTQ5fQy/Npi2ZDtLI3zs7Ps/p6wThErhm9fQ==
- dependencies:
- chalk "^2.4.2"
- source-map "^0.6.1"
- supports-color "^6.1.0"
-
-postcss@^7.0.18, postcss@^7.0.5:
- version "7.0.18"
- resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.18.tgz#4b9cda95ae6c069c67a4d933029eddd4838ac233"
- integrity sha512-/7g1QXXgegpF+9GJj4iN7ChGF40sYuGYJ8WZu8DZWnmhQ/G36hfdk3q9LBJmoK+lZ+yzZ5KYpOoxq7LF1BxE8g==
+postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.13, postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.18, postcss@^7.0.2, postcss@^7.0.26, postcss@^7.0.27, postcss@^7.0.30, postcss@^7.0.5, postcss@^7.0.6, postcss@^7.0.7:
+ version "7.0.32"
+ resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.32.tgz#4310d6ee347053da3433db2be492883d62cec59d"
+ integrity sha512-03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw==
dependencies:
chalk "^2.4.2"
source-map "^0.6.1"
@@ -4221,9 +4358,9 @@ prelude-ls@~1.1.2:
integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
prettier@^1.14.0:
- version "1.18.2"
- resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.18.2.tgz#6823e7c5900017b4bd3acf46fe9ac4b4d7bda9ea"
- integrity sha512-OeHeMc0JhFE9idD4ZdtNibzY0+TPHSpSSb9h8FqtP+YnoZZ1sl8Vc9b1sasjfymH3SonAF4QcA2+mzHPhMvIiw==
+ version "1.19.1"
+ resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb"
+ integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==
private@^0.1.6, private@^0.1.8:
version "0.1.8"
@@ -4249,41 +4386,36 @@ prop-types@^15.7.2:
object-assign "^4.1.1"
react-is "^16.8.1"
-proxy-agent@^3.0.0:
- version "3.1.0"
- resolved "https://registry.yarnpkg.com/proxy-agent/-/proxy-agent-3.1.0.tgz#3cf86ee911c94874de4359f37efd9de25157c113"
- integrity sha512-IkbZL4ClW3wwBL/ABFD2zJ8iP84CY0uKMvBPk/OceQe/cEjrxzN1pMHsLwhbzUoRhG9QbSxYC+Z7LBkTiBNvrA==
+proxy-agent@^3.1.1:
+ version "3.1.1"
+ resolved "https://registry.yarnpkg.com/proxy-agent/-/proxy-agent-3.1.1.tgz#7e04e06bf36afa624a1540be247b47c970bd3014"
+ integrity sha512-WudaR0eTsDx33O3EJE16PjBRZWcX8GqCEeERw1W3hZJgH/F2a46g7jty6UGty6NeJ4CKQy8ds2CJPMiyeqaTvw==
dependencies:
agent-base "^4.2.0"
- debug "^3.1.0"
+ debug "4"
http-proxy-agent "^2.1.0"
- https-proxy-agent "^2.2.1"
- lru-cache "^4.1.2"
- pac-proxy-agent "^3.0.0"
+ https-proxy-agent "^3.0.0"
+ lru-cache "^5.1.1"
+ pac-proxy-agent "^3.0.1"
proxy-from-env "^1.0.0"
socks-proxy-agent "^4.0.1"
proxy-from-env@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.0.0.tgz#33c50398f70ea7eb96d21f7b817630a55791c7ee"
- integrity sha1-M8UDmPcOp+uW0h97gXYwpVeRx+4=
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"
+ integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==
pseudomap@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM=
-psl@^1.1.24:
- version "1.3.0"
- resolved "https://registry.yarnpkg.com/psl/-/psl-1.3.0.tgz#e1ebf6a3b5564fa8376f3da2275da76d875ca1bd"
- integrity sha512-avHdspHO+9rQTLbv1RO+MPYeP/SzsCoxofjVnHanETfQhTJrmB0HlDoW+EiN/R+C0BZ+gERab9NY0lPN2TxNag==
-
-punycode@^1.4.1:
- version "1.4.1"
- resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
- integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
+psl@^1.1.28:
+ version "1.8.0"
+ resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
+ integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==
-punycode@^2.1.0:
+punycode@^2.1.0, punycode@^2.1.1:
version "2.1.1"
resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
@@ -4308,20 +4440,10 @@ raw-body@^2.2.0:
iconv-lite "0.4.24"
unpipe "1.0.0"
-rc@^1.2.7:
- version "1.2.8"
- resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
- integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
- dependencies:
- deep-extend "^0.6.0"
- ini "~1.3.0"
- minimist "^1.2.0"
- strip-json-comments "~2.0.1"
-
react-is@^16.8.1:
- version "16.9.0"
- resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.9.0.tgz#21ca9561399aad0ff1a7701c01683e8ca981edcb"
- integrity sha512-tJBzzzIgnnRfEm046qRcURvwQnZVXmuCbscxUO5RWrGTXpon2d4c8mI0D8WE6ydVIm29JiLB6+RslkIvym9Rjw==
+ version "16.13.1"
+ resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
+ integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
read-cache@^1.0.0:
version "1.0.0"
@@ -4381,19 +4503,10 @@ readable-stream@1.1.x:
isarray "0.0.1"
string_decoder "~0.10.x"
-readable-stream@3, readable-stream@^3.1.1:
- version "3.4.0"
- resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.4.0.tgz#a51c26754658e0a3c21dbf59163bd45ba6f447fc"
- integrity sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==
- dependencies:
- inherits "^2.0.3"
- string_decoder "^1.1.1"
- util-deprecate "^1.0.1"
-
-readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.2.2:
- version "2.3.6"
- resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
- integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==
+readable-stream@2, readable-stream@^2.0.2, readable-stream@^2.2.2:
+ version "2.3.7"
+ resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
+ integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
dependencies:
core-util-is "~1.0.0"
inherits "~2.0.3"
@@ -4403,6 +4516,15 @@ readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.2.2:
string_decoder "~1.1.1"
util-deprecate "~1.0.1"
+readable-stream@^3.1.1:
+ version "3.6.0"
+ resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
+ integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
+ dependencies:
+ inherits "^2.0.3"
+ string_decoder "^1.1.1"
+ util-deprecate "^1.0.1"
+
readdirp@^2.2.1:
version "2.2.1"
resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525"
@@ -4430,10 +4552,10 @@ regenerator-runtime@^0.11.0:
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==
-regenerator-runtime@^0.13.2:
- version "0.13.3"
- resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz#7cf6a77d8f5c6f60eb73c5fc1955b2ceb01e6bf5"
- integrity sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw==
+regenerator-runtime@^0.13.4:
+ version "0.13.5"
+ resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz#d878a1d094b4306d10b9096484b33ebd55e26697"
+ integrity sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==
regenerator-transform@^0.10.0:
version "0.10.1"
@@ -4452,6 +4574,14 @@ regex-not@^1.0.0, regex-not@^1.0.2:
extend-shallow "^3.0.2"
safe-regex "^1.1.0"
+regexp.prototype.flags@^1.3.0:
+ version "1.3.0"
+ resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz#7aba89b3c13a64509dabcf3ca8d9fbb9bdf5cb75"
+ integrity sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ==
+ dependencies:
+ define-properties "^1.1.3"
+ es-abstract "^1.17.0-next.1"
+
regexpp@^1.0.1:
version "1.1.0"
resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-1.1.0.tgz#0e3516dd0b7904f413d2d4193dce4618c3a689ab"
@@ -4555,10 +4685,27 @@ replace-ext@1.0.0:
resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.0.tgz#de63128373fcbf7c3ccfa4de5a480c45a67958eb"
integrity sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=
-request@^2.88.0:
- version "2.88.0"
- resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
- integrity sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==
+request-promise-core@1.1.3:
+ version "1.1.3"
+ resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.3.tgz#e9a3c081b51380dfea677336061fea879a829ee9"
+ integrity sha512-QIs2+ArIGQVp5ZYbWD5ZLCY29D5CfWizP8eWnm8FoGD1TX61veauETVQbrV60662V0oFBkrDOuaBI8XgtuyYAQ==
+ dependencies:
+ lodash "^4.17.15"
+
+request-promise@^4.2.5:
+ version "4.2.5"
+ resolved "https://registry.yarnpkg.com/request-promise/-/request-promise-4.2.5.tgz#186222c59ae512f3497dfe4d75a9c8461bd0053c"
+ integrity sha512-ZgnepCykFdmpq86fKGwqntyTiUrHycALuGggpyCZwMvGaZWgxW6yagT0FHkgo5LzYvOaCNvxYwWYIjevSH1EDg==
+ dependencies:
+ bluebird "^3.5.0"
+ request-promise-core "1.1.3"
+ stealthy-require "^1.1.1"
+ tough-cookie "^2.3.3"
+
+request@^2.88.0, request@^2.88.2:
+ version "2.88.2"
+ resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
+ integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
dependencies:
aws-sign2 "~0.7.0"
aws4 "^1.8.0"
@@ -4567,7 +4714,7 @@ request@^2.88.0:
extend "~3.0.2"
forever-agent "~0.6.1"
form-data "~2.3.2"
- har-validator "~5.1.0"
+ har-validator "~5.1.3"
http-signature "~1.2.0"
is-typedarray "~1.0.0"
isstream "~0.1.2"
@@ -4577,10 +4724,20 @@ request@^2.88.0:
performance-now "^2.1.0"
qs "~6.5.2"
safe-buffer "^5.1.2"
- tough-cookie "~2.4.3"
+ tough-cookie "~2.5.0"
tunnel-agent "^0.6.0"
uuid "^3.3.2"
+require-directory@^2.1.1:
+ version "2.1.1"
+ resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
+ integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
+
+require-main-filename@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
+ integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
+
require-uncached@^1.0.3:
version "1.0.3"
resolved "https://registry.yarnpkg.com/require-uncached/-/require-uncached-1.0.3.tgz#4e0d56d6c9662fd31e43011c4b95aa49955421d3"
@@ -4609,10 +4766,10 @@ resolve-url@^0.2.1:
resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
-resolve@^1.1.7, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.11.0, resolve@^1.3.2, resolve@^1.5.0:
- version "1.12.0"
- resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.12.0.tgz#3fc644a35c84a48554609ff26ec52b66fa577df6"
- integrity sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==
+resolve@^1.1.7, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.15.1, resolve@^1.3.2:
+ version "1.17.0"
+ resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz#b25941b54968231cc2d1bb76a79cb7f2c0bf8444"
+ integrity sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==
dependencies:
path-parse "^1.0.6"
@@ -4624,6 +4781,14 @@ restore-cursor@^2.0.0:
onetime "^2.0.0"
signal-exit "^3.0.2"
+restore-cursor@^3.1.0:
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e"
+ integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==
+ dependencies:
+ onetime "^5.1.0"
+ signal-exit "^3.0.2"
+
ret@~0.1.10:
version "0.1.15"
resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
@@ -4636,7 +4801,7 @@ rimraf@2.6.3, rimraf@~2.6.2:
dependencies:
glob "^7.1.3"
-rimraf@^2.6.1, rimraf@^2.6.3:
+rimraf@^2.6.3:
version "2.7.1"
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
@@ -4644,11 +4809,9 @@ rimraf@^2.6.1, rimraf@^2.6.3:
glob "^7.1.3"
run-async@^2.2.0:
- version "2.3.0"
- resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"
- integrity sha1-A3GrSuC91yDUFm19/aZP96RFpsA=
- dependencies:
- is-promise "^2.1.0"
+ version "2.4.1"
+ resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455"
+ integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==
rx-lite-aggregates@^4.0.8:
version "4.0.8"
@@ -4663,9 +4826,9 @@ rx-lite@*, rx-lite@^4.0.8:
integrity sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=
safe-buffer@^5.0.1, safe-buffer@^5.1.2, safe-buffer@~5.2.0:
- version "5.2.0"
- resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz#b74daec49b1148f88c64b68d49b1e815c1f2f519"
- integrity sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==
+ version "5.2.1"
+ resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
+ integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
safe-buffer@~5.1.0, safe-buffer@~5.1.1:
version "5.1.2"
@@ -4684,17 +4847,17 @@ safe-regex@^1.1.0:
resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
-sax@^1.2.4:
- version "1.2.4"
- resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
- integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
-
-"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0:
+"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.7.0:
version "5.7.1"
resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
-set-blocking@~2.0.0:
+semver@^6.3.0:
+ version "6.3.0"
+ resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
+ integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
+
+set-blocking@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
@@ -4726,10 +4889,18 @@ shebang-regex@^1.0.0:
resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
+side-channel@^1.0.2:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.2.tgz#df5d1abadb4e4bf4af1cd8852bf132d2f7876947"
+ integrity sha512-7rL9YlPHg7Ancea1S96Pa8/QWb4BtXL/TZvS6B8XFetGBeuhAsfmUspK6DokBeZ64+Kj9TCNRD/30pVz1BvQNA==
+ dependencies:
+ es-abstract "^1.17.0-next.1"
+ object-inspect "^1.7.0"
+
signal-exit@^3.0.0, signal-exit@^3.0.2:
- version "3.0.2"
- resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
- integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=
+ version "3.0.3"
+ resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c"
+ integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==
slash@^1.0.0:
version "1.0.0"
@@ -4757,10 +4928,10 @@ slice-ansi@^2.1.0:
astral-regex "^1.0.0"
is-fullwidth-code-point "^2.0.0"
-smart-buffer@4.0.2:
- version "4.0.2"
- resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.0.2.tgz#5207858c3815cc69110703c6b94e46c15634395d"
- integrity sha512-JDhEpTKzXusOqXZ0BUIdH+CjFdO/CR3tLlf5CN34IypI+xMmXW1uB16OOY8z3cICbJlDAVJzNbwBhNO0wt9OAw==
+smart-buffer@^4.1.0:
+ version "4.1.0"
+ resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.1.0.tgz#91605c25d91652f4661ea69ccf45f1b331ca21ba"
+ integrity sha512-iVICrxOzCynf/SNaBQCw34eM9jROU/s5rzIhpOvzhzuYHfJR/DhZfDkXiZSgKXfgv26HT3Yni3AV/DGw0cGnnw==
snapdragon-node@^2.0.1:
version "2.1.1"
@@ -4801,19 +4972,19 @@ socks-proxy-agent@^4.0.1:
socks "~2.3.2"
socks@~2.3.2:
- version "2.3.2"
- resolved "https://registry.yarnpkg.com/socks/-/socks-2.3.2.tgz#ade388e9e6d87fdb11649c15746c578922a5883e"
- integrity sha512-pCpjxQgOByDHLlNqlnh/mNSAxIUkyBBuwwhTcV+enZGbDaClPvHdvm6uvOwZfFJkam7cGhBNbb4JxiP8UZkRvQ==
+ version "2.3.3"
+ resolved "https://registry.yarnpkg.com/socks/-/socks-2.3.3.tgz#01129f0a5d534d2b897712ed8aceab7ee65d78e3"
+ integrity sha512-o5t52PCNtVdiOvzMry7wU4aOqYWL0PeCXRWBEiJow4/i/wr+wpsJQ9awEu1EonLIqsfGd5qSgDdxEOvCdmBEpA==
dependencies:
- ip "^1.1.5"
- smart-buffer "4.0.2"
+ ip "1.1.5"
+ smart-buffer "^4.1.0"
source-map-resolve@^0.5.0:
- version "0.5.2"
- resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.2.tgz#72e2cc34095543e43b2c62b2c4c10d4a9054f259"
- integrity sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==
+ version "0.5.3"
+ resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a"
+ integrity sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==
dependencies:
- atob "^2.1.1"
+ atob "^2.1.2"
decode-uri-component "^0.2.0"
resolve-url "^0.2.1"
source-map-url "^0.4.0"
@@ -4842,22 +5013,22 @@ source-map@^0.6.1, source-map@~0.6.1:
integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
spdx-correct@^3.0.0:
- version "3.1.0"
- resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.0.tgz#fb83e504445268f154b074e218c87c003cd31df4"
- integrity sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==
+ version "3.1.1"
+ resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9"
+ integrity sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==
dependencies:
spdx-expression-parse "^3.0.0"
spdx-license-ids "^3.0.0"
spdx-exceptions@^2.1.0:
- version "2.2.0"
- resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz#2ea450aee74f2a89bfb94519c07fcd6f41322977"
- integrity sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==
+ version "2.3.0"
+ resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz#3f28ce1a77a00372683eade4a433183527a2163d"
+ integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==
spdx-expression-parse@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz#99e119b7a5da00e05491c9fa338b7904823b41d0"
- integrity sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679"
+ integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==
dependencies:
spdx-exceptions "^2.1.0"
spdx-license-ids "^3.0.0"
@@ -4900,9 +5071,9 @@ sshpk@^1.7.0:
tweetnacl "~0.14.0"
state-toggle@^1.0.0:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/state-toggle/-/state-toggle-1.0.2.tgz#75e93a61944116b4959d665c8db2d243631d6ddc"
- integrity sha512-8LpelPGR0qQM4PnfLiplOQNJcIN1/r2Gy0xKB2zKnIW2YzPMt2sR4I/+gtPjhN7Svh9kw+zqEg2SFwpBO9iNiw==
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/state-toggle/-/state-toggle-1.0.3.tgz#e123b16a88e143139b09c6852221bc9815917dfe"
+ integrity sha512-d/5Z4/2iiCnHw6Xzghyhb+GcmF89bxwgXG60wjIiZaxnymbyOmI8Hk4VqHXiVVp6u2ysaskFfXg3ekCj4WNftQ==
static-extend@^0.1.1:
version "0.1.2"
@@ -4917,14 +5088,10 @@ static-extend@^0.1.1:
resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
-string-width@^1.0.1:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
- integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=
- dependencies:
- code-point-at "^1.0.0"
- is-fullwidth-code-point "^1.0.0"
- strip-ansi "^3.0.0"
+stealthy-require@^1.1.1:
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
+ integrity sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=
"string-width@^1.0.2 || 2", string-width@^2.1.0, string-width@^2.1.1:
version "2.1.1"
@@ -4934,7 +5101,7 @@ string-width@^1.0.1:
is-fullwidth-code-point "^2.0.0"
strip-ansi "^4.0.0"
-string-width@^3.0.0:
+string-width@^3.0.0, string-width@^3.1.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==
@@ -4943,6 +5110,52 @@ string-width@^3.0.0:
is-fullwidth-code-point "^2.0.0"
strip-ansi "^5.1.0"
+string.prototype.matchall@^4.0.2:
+ version "4.0.2"
+ resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.2.tgz#48bb510326fb9fdeb6a33ceaa81a6ea04ef7648e"
+ integrity sha512-N/jp6O5fMf9os0JU3E72Qhf590RSRZU/ungsL/qJUYVTNv7hTG0P/dbPjxINVN9jpscu3nzYwKESU3P3RY5tOg==
+ dependencies:
+ define-properties "^1.1.3"
+ es-abstract "^1.17.0"
+ has-symbols "^1.0.1"
+ internal-slot "^1.0.2"
+ regexp.prototype.flags "^1.3.0"
+ side-channel "^1.0.2"
+
+string.prototype.trimend@^1.0.0:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz#85812a6b847ac002270f5808146064c995fb6913"
+ integrity sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==
+ dependencies:
+ define-properties "^1.1.3"
+ es-abstract "^1.17.5"
+
+string.prototype.trimleft@^2.1.1:
+ version "2.1.2"
+ resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz#4408aa2e5d6ddd0c9a80739b087fbc067c03b3cc"
+ integrity sha512-gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw==
+ dependencies:
+ define-properties "^1.1.3"
+ es-abstract "^1.17.5"
+ string.prototype.trimstart "^1.0.0"
+
+string.prototype.trimright@^2.1.1:
+ version "2.1.2"
+ resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz#c76f1cef30f21bbad8afeb8db1511496cfb0f2a3"
+ integrity sha512-ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg==
+ dependencies:
+ define-properties "^1.1.3"
+ es-abstract "^1.17.5"
+ string.prototype.trimend "^1.0.0"
+
+string.prototype.trimstart@^1.0.0:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz#14af6d9f34b053f7cfc89b72f8f2ee14b9039a54"
+ integrity sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==
+ dependencies:
+ define-properties "^1.1.3"
+ es-abstract "^1.17.5"
+
string_decoder@^1.1.1:
version "1.3.0"
resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
@@ -4972,7 +5185,7 @@ stringify-entities@^1.0.1:
is-alphanumerical "^1.0.0"
is-hexadecimal "^1.0.0"
-strip-ansi@^3.0.0, strip-ansi@^3.0.1:
+strip-ansi@^3.0.0:
version "3.0.1"
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=
@@ -4986,13 +5199,20 @@ strip-ansi@^4.0.0:
dependencies:
ansi-regex "^3.0.0"
-strip-ansi@^5.1.0:
+strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
version "5.2.0"
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
dependencies:
ansi-regex "^4.1.0"
+strip-ansi@^6.0.0:
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532"
+ integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==
+ dependencies:
+ ansi-regex "^5.0.0"
+
strip-bom@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
@@ -5003,7 +5223,7 @@ strip-indent@^2.0.0:
resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-2.0.0.tgz#5ef8db295d01e6ed6cbf7aab96998d7822527b68"
integrity sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g=
-strip-json-comments@~2.0.1:
+strip-json-comments@2.0.1, strip-json-comments@~2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
@@ -5126,10 +5346,10 @@ sugarss@^2.0.0:
dependencies:
postcss "^7.0.2"
-supports-color@5.4.0:
- version "5.4.0"
- resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54"
- integrity sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==
+supports-color@6.0.0:
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.0.0.tgz#76cfe742cf1f41bb9b1c29ad03068c05b4c0e40a"
+ integrity sha512-on9Kwidc1IUQo+bQdhi8+Tijpo0e1SS6RoGo2guUwn5vdaxw8RXOF9Vb2ws+ihWOmh4JnCJOvaziZWP1VABaLg==
dependencies:
has-flag "^3.0.0"
@@ -5159,6 +5379,13 @@ supports-color@^6.1.0:
dependencies:
has-flag "^3.0.0"
+supports-color@^7.1.0:
+ version "7.1.0"
+ resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1"
+ integrity sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==
+ dependencies:
+ has-flag "^4.0.0"
+
svg-tags@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/svg-tags/-/svg-tags-1.0.0.tgz#58f71cee3bd519b59d4b2a843b6c7de64ac04764"
@@ -5177,28 +5404,15 @@ table@4.0.2:
string-width "^2.1.1"
table@^5.0.0:
- version "5.4.5"
- resolved "https://registry.yarnpkg.com/table/-/table-5.4.5.tgz#c8f4ea2d8fee08c0027fac27b0ec0a4fe01dfa42"
- integrity sha512-oGa2Hl7CQjfoaogtrOHEJroOcYILTx7BZWLGsJIlzoWmB2zmguhNfPJZsWPKYek/MgCxfco54gEi31d1uN2hFA==
+ version "5.4.6"
+ resolved "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz#1292d19500ce3f86053b05f0e8e7e4a3bb21079e"
+ integrity sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==
dependencies:
ajv "^6.10.2"
lodash "^4.17.14"
slice-ansi "^2.1.0"
string-width "^3.0.0"
-tar@^4:
- version "4.4.10"
- resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.10.tgz#946b2810b9a5e0b26140cf78bea6b0b0d689eba1"
- integrity sha512-g2SVs5QIxvo6OLp0GudTqEf05maawKUxXru104iaayWA09551tFCTI8f1Asb4lPfkBr91k07iL4c11XO3/b0tA==
- dependencies:
- chownr "^1.1.1"
- fs-minipass "^1.2.5"
- minipass "^2.3.5"
- minizlib "^1.2.1"
- mkdirp "^0.5.0"
- safe-buffer "^5.1.2"
- yallist "^3.0.3"
-
tcp-port-used@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/tcp-port-used/-/tcp-port-used-1.0.1.tgz#46061078e2d38c73979a2c2c12b5a674e6689d70"
@@ -5223,9 +5437,9 @@ thunkify@^2.1.2:
integrity sha1-+qDp0jDFGsyVyhOjYawFyn4EVT0=
tlds@^1.203.0:
- version "1.203.1"
- resolved "https://registry.yarnpkg.com/tlds/-/tlds-1.203.1.tgz#4dc9b02f53de3315bc98b80665e13de3edfc1dfc"
- integrity sha512-7MUlYyGJ6rSitEZ3r1Q1QNV8uSIzapS8SmmhSusBuIc7uIxPPwsKllEP0GRp1NS6Ik6F+fRZvnjDWm3ecv2hDw==
+ version "1.207.0"
+ resolved "https://registry.yarnpkg.com/tlds/-/tlds-1.207.0.tgz#459264e644cf63ddc0965fece3898913286b1afd"
+ integrity sha512-k7d7Q1LqjtAvhtEOs3yN14EabsNO8ZCoY6RESSJDB9lst3bTx3as/m1UuAeCKzYxiyhR1qq72ZPhpSf+qlqiwg==
tmp@^0.0.33:
version "0.0.33"
@@ -5274,13 +5488,13 @@ toidentifier@1.0.0:
resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==
-tough-cookie@~2.4.3:
- version "2.4.3"
- resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781"
- integrity sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==
+tough-cookie@^2.3.3, tough-cookie@~2.5.0:
+ version "2.5.0"
+ resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
+ integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
dependencies:
- psl "^1.1.24"
- punycode "^1.4.1"
+ psl "^1.1.28"
+ punycode "^2.1.1"
trim-newlines@^2.0.0:
version "2.0.0"
@@ -5293,9 +5507,9 @@ trim-right@^1.0.1:
integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=
trim-trailing-lines@^1.0.0:
- version "1.1.2"
- resolved "https://registry.yarnpkg.com/trim-trailing-lines/-/trim-trailing-lines-1.1.2.tgz#d2f1e153161152e9f02fabc670fb40bec2ea2e3a"
- integrity sha512-MUjYItdrqqj2zpcHFTkMa9WAv4JHTI6gnRQGPFLrt5L9a6tRMiDnIqYl8JBvu2d2Tc3lWJKQwlGCp0K8AvCM+Q==
+ version "1.1.3"
+ resolved "https://registry.yarnpkg.com/trim-trailing-lines/-/trim-trailing-lines-1.1.3.tgz#7f0739881ff76657b7776e10874128004b625a94"
+ integrity sha512-4ku0mmjXifQcTVfYDfR5lpgV7zVqPg6zV9rdZmwOPqq0+Zq19xDqEgagqVbc4pOOShbncuAOIs59R3+3gcF3ZA==
trim@0.0.1:
version "0.0.1"
@@ -5303,9 +5517,9 @@ trim@0.0.1:
integrity sha1-WFhUf2spB1fulczMZm+1AITEYN0=
trough@^1.0.0:
- version "1.0.4"
- resolved "https://registry.yarnpkg.com/trough/-/trough-1.0.4.tgz#3b52b1f13924f460c3fbfd0df69b587dbcbc762e"
- integrity sha512-tdzBRDGWcI1OpPVmChbdSKhvSVurznZ8X36AYURAcl+0o2ldlCY2XPzyXNNxwJwwyIU+rIglTCG4kxtNKBQH7Q==
+ version "1.0.5"
+ resolved "https://registry.yarnpkg.com/trough/-/trough-1.0.5.tgz#b8b639cefad7d0bb2abd37d433ff8293efa5f406"
+ integrity sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA==
tunnel-agent@^0.6.0:
version "0.6.0"
@@ -5337,12 +5551,12 @@ typedarray@^0.0.6:
integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
unherit@^1.0.4:
- version "1.1.2"
- resolved "https://registry.yarnpkg.com/unherit/-/unherit-1.1.2.tgz#14f1f397253ee4ec95cec167762e77df83678449"
- integrity sha512-W3tMnpaMG7ZY6xe/moK04U9fBhi6wEiCYHUW5Mop/wQHf12+79EQGwxYejNdhEz2mkqkBlGwm7pxmgBKMVUj0w==
+ version "1.1.3"
+ resolved "https://registry.yarnpkg.com/unherit/-/unherit-1.1.3.tgz#6c9b503f2b41b262330c80e91c8614abdaa69c22"
+ integrity sha512-Ft16BJcnapDKp0+J/rqFC3Rrk6Y/Ng4nzsC028k2jdDII/rdZ7Wd3pPT/6+vIIxRagwRc9K0IUX0Ra4fKvw+WQ==
dependencies:
- inherits "^2.0.1"
- xtend "^4.0.1"
+ inherits "^2.0.0"
+ xtend "^4.0.0"
unified@^7.0.0:
version "7.1.0"
@@ -5374,9 +5588,9 @@ uniq@^1.0.1:
integrity sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=
unist-util-find-all-after@^1.0.2:
- version "1.0.4"
- resolved "https://registry.yarnpkg.com/unist-util-find-all-after/-/unist-util-find-all-after-1.0.4.tgz#2eeaba818fd98492d69c44f9bee52c6a25282eef"
- integrity sha512-CaxvMjTd+yF93BKLJvZnEfqdM7fgEACsIpQqz8vIj9CJnUb9VpyymFS3tg6TCtgrF7vfCJBF5jbT2Ox9CBRYRQ==
+ version "1.0.5"
+ resolved "https://registry.yarnpkg.com/unist-util-find-all-after/-/unist-util-find-all-after-1.0.5.tgz#5751a8608834f41d117ad9c577770c5f2f1b2899"
+ integrity sha512-lWgIc3rrTMTlK1Y0hEuL+k+ApzFk78h+lsaa2gHf63Gp5Ww+mt11huDniuaoq1H+XMK2lIIjjPkncxXcDp3QDw==
dependencies:
unist-util-is "^3.0.0"
@@ -5386,9 +5600,9 @@ unist-util-is@^3.0.0:
integrity sha512-sVZZX3+kspVNmLWBPAB6r+7D9ZgAFPNWm66f7YNb420RlQSbn+n8rG8dGZSkrER7ZIXGQYNm5pqC3v3HopH24A==
unist-util-remove-position@^1.0.0:
- version "1.1.3"
- resolved "https://registry.yarnpkg.com/unist-util-remove-position/-/unist-util-remove-position-1.1.3.tgz#d91aa8b89b30cb38bad2924da11072faa64fd972"
- integrity sha512-CtszTlOjP2sBGYc2zcKA/CvNdTdEs3ozbiJ63IPBxh8iZg42SCCb8m04f8z2+V1aSk5a7BxbZKEdoDjadmBkWA==
+ version "1.1.4"
+ resolved "https://registry.yarnpkg.com/unist-util-remove-position/-/unist-util-remove-position-1.1.4.tgz#ec037348b6102c897703eee6d0294ca4755a2020"
+ integrity sha512-tLqd653ArxJIPnKII6LMZwH+mb5q+n/GtXQZo6S6csPRs5zB0u79Yw8ouR3wTw8wxvdJFhpP6Y7jorWdCgLO0A==
dependencies:
unist-util-visit "^1.1.0"
@@ -5397,6 +5611,13 @@ unist-util-stringify-position@^1.0.0, unist-util-stringify-position@^1.1.1:
resolved "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-1.1.2.tgz#3f37fcf351279dcbca7480ab5889bb8a832ee1c6"
integrity sha512-pNCVrk64LZv1kElr0N1wPiHEUoXNVFERp+mlTg/s9R5Lwg87f9bM/3sQB99w+N9D/qnM9ar3+AKDBwo/gm/iQQ==
+unist-util-stringify-position@^2.0.0:
+ version "2.0.3"
+ resolved "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz#cce3bfa1cdf85ba7375d1d5b17bdc4cada9bd9da"
+ integrity sha512-3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g==
+ dependencies:
+ "@types/unist" "^2.0.2"
+
unist-util-visit-parents@^2.0.0:
version "2.1.2"
resolved "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-2.1.2.tgz#25e43e55312166f3348cae6743588781d112c1e9"
@@ -5425,9 +5646,9 @@ unset-value@^1.0.0:
isobject "^3.0.0"
upath@^1.1.1:
- version "1.1.2"
- resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.2.tgz#3db658600edaeeccbe6db5e684d67ee8c2acd068"
- integrity sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894"
+ integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==
uri-js@^4.2.2:
version "4.2.2"
@@ -5460,9 +5681,9 @@ util-deprecate@^1.0.1, util-deprecate@~1.0.1:
integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
uuid@^3.3.2:
- version "3.3.2"
- resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
- integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==
+ version "3.4.0"
+ resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
+ integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
validate-npm-package-license@^3.0.1:
version "3.0.4"
@@ -5482,9 +5703,17 @@ verror@1.10.0:
extsprintf "^1.2.0"
vfile-location@^2.0.0:
- version "2.0.5"
- resolved "https://registry.yarnpkg.com/vfile-location/-/vfile-location-2.0.5.tgz#c83eb02f8040228a8d2b3f10e485be3e3433e0a2"
- integrity sha512-Pa1ey0OzYBkLPxPZI3d9E+S4BmvfVwNAAXrrqGbwTVXWaX2p9kM1zZ+n35UtVM06shmWKH4RPRN8KI80qE3wNQ==
+ version "2.0.6"
+ resolved "https://registry.yarnpkg.com/vfile-location/-/vfile-location-2.0.6.tgz#8a274f39411b8719ea5728802e10d9e0dff1519e"
+ integrity sha512-sSFdyCP3G6Ka0CEmN83A2YCMKIieHx0EDaj5IDP4g1pa5ZJ4FJDvpO0WODLxo4LUX4oe52gmSCK7Jw4SBghqxA==
+
+vfile-message@*:
+ version "2.0.4"
+ resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-2.0.4.tgz#5b43b88171d409eae58477d13f23dd41d52c371a"
+ integrity sha512-DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ==
+ dependencies:
+ "@types/unist" "^2.0.0"
+ unist-util-stringify-position "^2.0.0"
vfile-message@^1.0.0:
version "1.1.1"
@@ -5503,29 +5732,45 @@ vfile@^3.0.0:
unist-util-stringify-position "^1.0.0"
vfile-message "^1.0.0"
-which@^1.2.9, which@^1.3.1:
+wcwidth@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"
+ integrity sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=
+ dependencies:
+ defaults "^1.0.3"
+
+which-module@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
+ integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
+
+which@1.3.1, which@^1.2.9, which@^1.3.1:
version "1.3.1"
resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
dependencies:
isexe "^2.0.0"
-wide-align@^1.1.0:
+wide-align@1.1.3:
version "1.1.3"
resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==
dependencies:
string-width "^1.0.2 || 2"
-wordwrap@~0.0.2:
- version "0.0.3"
- resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
- integrity sha1-o9XabNXAvAAI03I0u68b7WMFkQc=
+word-wrap@~1.2.3:
+ version "1.2.3"
+ resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
+ integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
-wordwrap@~1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
- integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=
+wrap-ansi@^5.1.0:
+ version "5.1.0"
+ resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09"
+ integrity sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==
+ dependencies:
+ ansi-styles "^3.2.0"
+ string-width "^3.0.0"
+ strip-ansi "^5.0.0"
wrappy@1:
version "1.0.2"
@@ -5561,20 +5806,40 @@ xregexp@2.0.0:
resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-2.0.0.tgz#52a63e56ca0b84a7f3a5f3d61872f126ad7a5943"
integrity sha1-UqY+VsoLhKfzpfPWGHLxJq16WUM=
-xtend@^4.0.1:
+xregexp@^4.3.0:
+ version "4.3.0"
+ resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.3.0.tgz#7e92e73d9174a99a59743f67a4ce879a04b5ae50"
+ integrity sha512-7jXDIFXh5yJ/orPn4SXjuVrWWoi4Cr8jfV1eHv9CixKSbU+jY4mxfrBwAuDvupPNKpMUY+FeIqsVw/JLT9+B8g==
+ dependencies:
+ "@babel/runtime-corejs3" "^7.8.3"
+
+xtend@^4.0.0, xtend@^4.0.1:
version "4.0.2"
resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
+y18n@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
+ integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
+
yallist@^2.1.2:
version "2.1.2"
resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
-yallist@^3.0.0, yallist@^3.0.3:
- version "3.0.3"
- resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9"
- integrity sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==
+yallist@^3.0.2:
+ version "3.1.1"
+ resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
+ integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
+
+yargs-parser@13.1.2, yargs-parser@^13.1.2:
+ version "13.1.2"
+ resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38"
+ integrity sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==
+ dependencies:
+ camelcase "^5.0.0"
+ decamelize "^1.2.0"
yargs-parser@^10.0.0:
version "10.1.0"
@@ -5583,9 +5848,35 @@ yargs-parser@^10.0.0:
dependencies:
camelcase "^4.1.0"
-yauzl@2.4.1:
- version "2.4.1"
- resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.4.1.tgz#9528f442dab1b2284e58b4379bb194e22e0c4005"
- integrity sha1-lSj0QtqxsihOWLQ3m7GU4i4MQAU=
+yargs-unparser@1.6.0:
+ version "1.6.0"
+ resolved "https://registry.yarnpkg.com/yargs-unparser/-/yargs-unparser-1.6.0.tgz#ef25c2c769ff6bd09e4b0f9d7c605fb27846ea9f"
+ integrity sha512-W9tKgmSn0DpSatfri0nx52Joq5hVXgeLiqR/5G0sZNDoLZFOr/xjBUDcShCOGNsBnEMNo1KAMBkTej1Hm62HTw==
+ dependencies:
+ flat "^4.1.0"
+ lodash "^4.17.15"
+ yargs "^13.3.0"
+
+yargs@13.3.2, yargs@^13.3.0:
+ version "13.3.2"
+ resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"
+ integrity sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==
+ dependencies:
+ cliui "^5.0.0"
+ find-up "^3.0.0"
+ get-caller-file "^2.0.1"
+ require-directory "^2.1.1"
+ require-main-filename "^2.0.0"
+ set-blocking "^2.0.0"
+ string-width "^3.0.0"
+ which-module "^2.0.0"
+ y18n "^4.0.0"
+ yargs-parser "^13.1.2"
+
+yauzl@^2.10.0:
+ version "2.10.0"
+ resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"
+ integrity sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=
dependencies:
- fd-slicer "~1.0.1"
+ buffer-crc32 "~0.2.3"
+ fd-slicer "~1.1.0"
diff --git a/web/sites/default/default.settings.php b/web/sites/default/default.settings.php
index 1c8dbee9e7..62f73e1b46 100644
--- a/web/sites/default/default.settings.php
+++ b/web/sites/default/default.settings.php
@@ -105,6 +105,16 @@
* webserver. For most other drivers, you must specify a
* username, password, host, and database name.
*
+ * Drupal core implements drivers for mysql, pgsql, and sqlite. Other drivers
+ * can be provided by contributed or custom modules. To use a contributed or
+ * custom driver, the "namespace" property must be set to the namespace of the
+ * driver. The code in this namespace must be autoloadable prior to connecting
+ * to the database, and therefore, prior to when module root namespaces are
+ * added to the autoloader. To add the driver's namespace to the autoloader,
+ * set the "autoload" property to the PSR-4 base directory of the driver's
+ * namespace. This is optional for projects managed with Composer if the
+ * driver's namespace is in Composer's autoloader.
+ *
* Transaction support is enabled by default for all drivers that support it,
* including MySQL. To explicitly disable it, set the 'transactions' key to
* FALSE.
@@ -224,6 +234,20 @@
* 'database' => '/path/to/databasefilename',
* ];
* @endcode
+ *
+ * Sample Database configuration format for a driver in a contributed module:
+ * @code
+ * $databases['default']['default'] = [
+ * 'driver' => 'mydriver',
+ * 'namespace' => 'Drupal\mymodule\Driver\Database\mydriver',
+ * 'autoload' => 'modules/mymodule/src/Driver/Database/mydriver/',
+ * 'database' => 'databasename',
+ * 'username' => 'sqlusername',
+ * 'password' => 'sqlpassword',
+ * 'host' => 'localhost',
+ * 'prefix' => '',
+ * ];
+ * @endcode
*/
/**
@@ -741,6 +765,19 @@
*/
$settings['entity_update_backup'] = TRUE;
+/**
+ * Node migration type.
+ *
+ * This is used to force the migration system to use the classic node migrations
+ * instead of the default complete node migrations. The migration system will
+ * use the classic node migration only if there are existing migrate_map tables
+ * for the classic node migrations and they contain data. These tables may not
+ * exist if you are developing custom migrations and do not want to use the
+ * complete node migrations. Set this to TRUE to force the use of the classic
+ * node migrations.
+ */
+$settings['migrate_node_migrate_type_classic'] = FALSE;
+
/**
* Load local development override configuration, if available.
*
diff --git a/web/sites/example.settings.local.php b/web/sites/example.settings.local.php
index 520cb4acd5..f91b9afb29 100644
--- a/web/sites/example.settings.local.php
+++ b/web/sites/example.settings.local.php
@@ -131,15 +131,15 @@
$settings['skip_permissions_hardening'] = TRUE;
/**
- * Exclude modules from configuration synchronisation.
+ * Exclude modules from configuration synchronization.
*
* On config export sync, no config or dependent config of any excluded module
* is exported. On config import sync, any config of any installed excluded
* module is ignored. In the exported configuration, it will be as if the
* excluded module had never been installed. When syncing configuration, if an
* excluded module is already installed, it will not be uninstalled by the
- * configuration synchronisation, and dependent configuration will remain
- * intact. This affects only configuration synchronisation; single import and
+ * configuration synchronization, and dependent configuration will remain
+ * intact. This affects only configuration synchronization; single import and
* export of configuration are not affected.
*
* Drupal does not validate or sanity check the list of excluded modules. For
@@ -148,7 +148,7 @@
* anymore.
*
* This is an advanced feature and using it means opting out of some of the
- * guarantees the configuration synchronisation provides. It is not recommended
+ * guarantees the configuration synchronization provides. It is not recommended
* to use this feature with modules that affect Drupal in a major way such as
* the language or field module.
*/
--
GitLab